Update routers

elastic · Jun 17, 2021 · a226623 · a226623
1 parent b4973b6
commit a226623
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 37 deletions.
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx
@@ -46,7 +46,6 @@ import { Overview } from './views/overview';
 import { RoleMappings } from './views/role_mappings';
 import { Security } from './views/security';
 import { SettingsRouter } from './views/settings';
-import { SettingsSubNav } from './views/settings/components/settings_sub_nav';
 import { SetupGuide } from './views/setup_guide';
 
 export const WorkplaceSearch: React.FC<InitialAppData> = (props) => {
@@ -149,13 +148,7 @@ export const WorkplaceSearchConfigured: React.FC<InitialAppData> = (props) => {
         </Layout>
       </Route>
       <Route path={ORG_SETTINGS_PATH}>
-        <Layout
-          navigation={<WorkplaceSearchNav settingsSubNav={<SettingsSubNav />} />}
-          restrictWidth
-          readOnlyMode={readOnlyMode}
-        >
-          <SettingsRouter />
-        </Layout>
+        <SettingsRouter />
       </Route>
       <Route>
         <Layout navigation={<WorkplaceSearchNav />} restrictWidth readOnlyMode={readOnlyMode}>

diff --git a/...prise_search/public/applications/workplace_search/views/settings/settings_router.test.tsx b/...prise_search/public/applications/workplace_search/views/settings/settings_router.test.tsx
@@ -14,8 +14,6 @@ import { Route, Redirect, Switch } from 'react-router-dom';
 
 import { shallow } from 'enzyme';
 
-import { FlashMessages } from '../../../shared/flash_messages';
-import { SetWorkplaceSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
 import { staticSourceData } from '../content_sources/source_data';
 
 import { Connectors } from './components/connectors';
@@ -37,8 +35,6 @@ describe('SettingsRouter', () => {
   it('renders', () => {
     const wrapper = shallow(<SettingsRouter />);
 
-    expect(wrapper.find(FlashMessages)).toHaveLength(1);
-    expect(wrapper.find(SetPageChrome)).toHaveLength(3);
     expect(wrapper.find(Switch)).toHaveLength(1);
     expect(wrapper.find(Route)).toHaveLength(NUM_ROUTES);
     expect(wrapper.find(Redirect)).toHaveLength(1);

diff --git a/...enterprise_search/public/applications/workplace_search/views/settings/settings_router.tsx b/...enterprise_search/public/applications/workplace_search/views/settings/settings_router.tsx
@@ -10,9 +10,6 @@ import { Redirect, Route, Switch } from 'react-router-dom';
 
 import { useActions } from 'kea';
 
-import { FlashMessages } from '../../../shared/flash_messages';
-import { SetWorkplaceSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
-import { NAV } from '../../constants';
 import {
   ORG_SETTINGS_PATH,
   ORG_SETTINGS_CUSTOMIZE_PATH,
@@ -35,28 +32,22 @@ export const SettingsRouter: React.FC = () => {
   }, []);
 
   return (
-    <>
-      <FlashMessages />
-      <Switch>
-        <Redirect exact from={ORG_SETTINGS_PATH} to={ORG_SETTINGS_CUSTOMIZE_PATH} />
-        <Route exact path={ORG_SETTINGS_CUSTOMIZE_PATH}>
-          <SetPageChrome trail={[NAV.SETTINGS]} />
-          <Customize />
+    <Switch>
+      <Redirect exact from={ORG_SETTINGS_PATH} to={ORG_SETTINGS_CUSTOMIZE_PATH} />
+      <Route exact path={ORG_SETTINGS_CUSTOMIZE_PATH}>
+        <Customize />
+      </Route>
+      <Route exact path={ORG_SETTINGS_CONNECTORS_PATH}>
+        <Connectors />
+      </Route>
+      <Route exact path={ORG_SETTINGS_OAUTH_APPLICATION_PATH}>
+        <OauthApplication />
+      </Route>
+      {staticSourceData.map(({ editPath }, i) => (
+        <Route key={i} exact path={editPath}>
+          <SourceConfig sourceIndex={i} />
         </Route>
-        <Route exact path={ORG_SETTINGS_CONNECTORS_PATH}>
-          <SetPageChrome trail={[NAV.SETTINGS, NAV.SETTINGS_SOURCE_PRIORITIZATION]} />
-          <Connectors />
-        </Route>
-        <Route exact path={ORG_SETTINGS_OAUTH_APPLICATION_PATH}>
-          <SetPageChrome trail={[NAV.SETTINGS, NAV.SETTINGS_OAUTH]} />
-          <OauthApplication />
-        </Route>
-        {staticSourceData.map(({ editPath }, i) => (
-          <Route key={i} exact path={editPath}>
-            <SourceConfig sourceIndex={i} />
-          </Route>
-        ))}
-      </Switch>
-    </>
+      ))}
+    </Switch>
   );
 };