Merge branch 'main' into jdk-21

derek-ho · Jun 17, 2024 · 0af3ceb · 0af3ceb
2 parents 86299ae + cac7e08
commit 0af3ceb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/public/apps/configuration/app-router.tsx b/public/apps/configuration/app-router.tsx
@@ -165,7 +165,7 @@ export function AppRouter(props: AppDependencies) {
 
   return (
     <DataSourceContext.Provider value={{ dataSource, setDataSource }}>
-      <Router basename={props.params.appBasePath}>
+      <Router>
         <EuiPage>
           {allNavPanelUrls(multitenancyEnabled).map((route) => (
             // Create different routes to update the 'selected' nav item .

diff --git a/public/apps/configuration/test/__snapshots__/app-router.test.tsx.snap b/public/apps/configuration/test/__snapshots__/app-router.test.tsx.snap
@@ -12,9 +12,7 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
     }
   }
 >
-  <HashRouter
-    basename=""
-  >
+  <HashRouter>
     <EuiPage>
       <Route
         exact={true}