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 index dd263c3bd69f5d..add490b9d64afd 100644 --- 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 = (props) => { @@ -149,13 +148,7 @@ export const WorkplaceSearchConfigured: React.FC = (props) => { - } />} - restrictWidth - readOnlyMode={readOnlyMode} - > - - + } restrictWidth readOnlyMode={readOnlyMode}> diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/settings_router.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/settings_router.test.tsx index 6a9104ceefde04..74092f17eadcf3 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/settings_router.test.tsx +++ b/x-pack/plugins/enterprise_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(); - 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/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/settings_router.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/settings_router.tsx index e6264103df6d82..f8c8050e201533 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/settings_router.tsx +++ b/x-pack/plugins/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 ( - <> - - - - - - + + + + + + + + + + + + {staticSourceData.map(({ editPath }, i) => ( + + - - - - - - - - - {staticSourceData.map(({ editPath }, i) => ( - - - - ))} - - + ))} + ); };