diff --git a/Source/DesignSystem/molecules/NavigationBar/NavigationBar.tsx b/Source/DesignSystem/molecules/NavigationBar/NavigationBar.tsx index 1f1c213be..924b8a492 100644 --- a/Source/DesignSystem/molecules/NavigationBar/NavigationBar.tsx +++ b/Source/DesignSystem/molecules/NavigationBar/NavigationBar.tsx @@ -89,7 +89,7 @@ export const NavigationBar = ({ logo, primaryNavigationItems, secondaryNavigatio - {logo && } + {logo && } {primaryNavigationItems} diff --git a/Source/SelfService/Web/applications/backupsScreen.tsx b/Source/SelfService/Web/applications/backupsScreen.tsx index c580dbf89..314510817 100644 --- a/Source/SelfService/Web/applications/backupsScreen.tsx +++ b/Source/SelfService/Web/applications/backupsScreen.tsx @@ -61,7 +61,7 @@ export const BackupsScreen = () => { } return ( - + } /> } /> diff --git a/Source/SelfService/Web/applications/containerRegistryScreen.tsx b/Source/SelfService/Web/applications/containerRegistryScreen.tsx index 5205f2ebd..e1b08d400 100644 --- a/Source/SelfService/Web/applications/containerRegistryScreen.tsx +++ b/Source/SelfService/Web/applications/containerRegistryScreen.tsx @@ -50,7 +50,7 @@ export const ContainerRegistryScreen = withRouteApplicationState(({ routeApplica } return ( - + } /> } /> diff --git a/Source/SelfService/Web/applications/logsScreen.tsx b/Source/SelfService/Web/applications/logsScreen.tsx index a37db67ab..02e6307bd 100644 --- a/Source/SelfService/Web/applications/logsScreen.tsx +++ b/Source/SelfService/Web/applications/logsScreen.tsx @@ -88,7 +88,7 @@ export const LogsScreen = withRouteApplicationState(({ routeApplicationParams }) } return ( - + Logs diff --git a/Source/SelfService/Web/applications/m3connectorScreen.tsx b/Source/SelfService/Web/applications/m3connectorScreen.tsx index 356616e08..36d19904e 100644 --- a/Source/SelfService/Web/applications/m3connectorScreen.tsx +++ b/Source/SelfService/Web/applications/m3connectorScreen.tsx @@ -46,7 +46,7 @@ export const M3ConnectorScreen = () => { } return ( - + } /> diff --git a/Source/SelfService/Web/applications/microservice/microserviceDetails/configurationFilesSection/environmentSection/environmentVariableSection.tsx b/Source/SelfService/Web/applications/microservice/microserviceDetails/configurationFilesSection/environmentSection/environmentVariableSection.tsx index 2fb08022a..6ed365cf4 100644 --- a/Source/SelfService/Web/applications/microservice/microserviceDetails/configurationFilesSection/environmentSection/environmentVariableSection.tsx +++ b/Source/SelfService/Web/applications/microservice/microserviceDetails/configurationFilesSection/environmentSection/environmentVariableSection.tsx @@ -20,9 +20,6 @@ import { envVariableColumns } from './tableColumns'; const styles = { buttonWrapper: { - display: 'flex', - flexDirection: { xs: 'column', xl: 'row' }, - alignItems: 'start', mb: 1.5, button: { 'mr': 2.5, diff --git a/Source/SelfService/Web/applications/microservicesScreen.tsx b/Source/SelfService/Web/applications/microservicesScreen.tsx index 013feb8d6..52ab084ab 100644 --- a/Source/SelfService/Web/applications/microservicesScreen.tsx +++ b/Source/SelfService/Web/applications/microservicesScreen.tsx @@ -68,7 +68,7 @@ export const MicroservicesScreen = withRouteApplicationState(({ routeApplication } return ( - + } /> } /> diff --git a/Source/SelfService/Web/applications/setupScreen.tsx b/Source/SelfService/Web/applications/setupScreen.tsx index 42ca719b4..9d3c67d9c 100644 --- a/Source/SelfService/Web/applications/setupScreen.tsx +++ b/Source/SelfService/Web/applications/setupScreen.tsx @@ -53,7 +53,7 @@ export const SetupScreen = withRouteApplicationState(({ routeApplicationParams } } return ( - + } /> diff --git a/Source/SelfService/Web/assets/favicons/favicon-32x32.png b/Source/SelfService/Web/assets/favicons/favicon-32x32.png deleted file mode 100644 index 206c9715e..000000000 Binary files a/Source/SelfService/Web/assets/favicons/favicon-32x32.png and /dev/null differ diff --git a/Source/SelfService/Web/components/layout/workSpaceLayoutLinks.tsx b/Source/SelfService/Web/components/layout/workSpaceLayoutLinks.tsx index a56b504ab..99b4cdd73 100644 --- a/Source/SelfService/Web/components/layout/workSpaceLayoutLinks.tsx +++ b/Source/SelfService/Web/components/layout/workSpaceLayoutLinks.tsx @@ -26,7 +26,7 @@ const PrimaryNavigation = () => { }, { label: 'applications', - selected: location.pathname.includes('/microservices'), + selected: location.pathname.includes('/application/'), overrides: { component: Link, to: `/microservices/application/${currentApplicationId}/overview`, @@ -66,6 +66,7 @@ const SecondaryNavigation = () => { overrides: { component: 'a', href: '/.auth/cookies/logout', + onClick: () => localStorage.clear(), }, }, ]; @@ -74,11 +75,12 @@ const SecondaryNavigation = () => { // Put before log out link if there is more than one customer. secondaryNavigationItems.splice(secondaryNavigationItems.length - 1, 0, { id: 'change-organization', - label: 'Change Organization', + label: 'Change Customer', icon: 'SupervisedUserCircleRounded', overrides: { component: 'a', href: '/.auth/cookies/initiate', + onClick: () => localStorage.clear(), }, }); } diff --git a/Source/SelfService/Web/assets/favicons/apple-touch-icon.png b/Source/SelfService/Web/favicon.png similarity index 100% rename from Source/SelfService/Web/assets/favicons/apple-touch-icon.png rename to Source/SelfService/Web/favicon.png diff --git a/Source/SelfService/Web/index.ejs b/Source/SelfService/Web/index.ejs index 013679ec4..48356b295 100644 --- a/Source/SelfService/Web/index.ejs +++ b/Source/SelfService/Web/index.ejs @@ -3,19 +3,17 @@ + + + <%- htmlWebpackPlugin.options.metadata.title %> - - - - - - - + + diff --git a/Source/SelfService/Web/integrations/index.tsx b/Source/SelfService/Web/integrations/index.tsx index 39329a944..8ddc09559 100644 --- a/Source/SelfService/Web/integrations/index.tsx +++ b/Source/SelfService/Web/integrations/index.tsx @@ -40,7 +40,7 @@ export const IntegrationsIndex = () => { if (isLoading) return null; return ( - + {/* Temporary replacement for breadcrumbs */} diff --git a/Source/SelfService/Web/webpack.config.ts b/Source/SelfService/Web/webpack.config.ts index 084587d8d..e91fc1204 100644 --- a/Source/SelfService/Web/webpack.config.ts +++ b/Source/SelfService/Web/webpack.config.ts @@ -140,16 +140,10 @@ function webpack(env: Args, argv: Args) { new CopyPlugin({ patterns: [ { - from: './assets/favicons/apple-touch-icon.png', - to: './assets/favicons/', - }, - { - from: './assets/favicons/favicon-32x32.png', - to: './assets/favicons/', + from: 'favicon.png', }, { from: 'favicon.ico', - to: './', }, ], }),