Update routers

cee-chen · cee-chen · commit aebdca9ff014 · 2021-06-16T22:56:52.000-07:00
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
@@ -41,7 +41,6 @@ import { SourceAdded } from './views/content_sources/components/source_added';
 import { SourceSubNav } from './views/content_sources/components/source_sub_nav';
 import { ErrorState } from './views/error_state';
 import { GroupsRouter } from './views/groups';
-import { GroupSubNav } from './views/groups/components/group_sub_nav';
 import { Overview } from './views/overview';
 import { RoleMappings } from './views/role_mappings';
 import { Security } from './views/security';
@@ -64,7 +63,6 @@ export const WorkplaceSearchConfigured: React.FC<InitialAppData> = (props) => {
 
   // We don't want so show the subnavs on the container root pages.
   const showSourcesSubnav = pathname !== SOURCES_PATH && pathname !== PERSONAL_SOURCES_PATH;
-  const showGroupsSubnav = pathname !== GROUPS_PATH;
 
   /**
    * Personal dashboard urls begin with /p/
@@ -132,13 +130,7 @@ export const WorkplaceSearchConfigured: React.FC<InitialAppData> = (props) => {
         </Layout>
       </Route>
       <Route path={GROUPS_PATH}>
-        <Layout
-          navigation={<WorkplaceSearchNav groupsSubNav={showGroupsSubnav && <GroupSubNav />} />}
-          restrictWidth
-          readOnlyMode={readOnlyMode}
-        >
-          <GroupsRouter />
-        </Layout>
+        <GroupsRouter />
       </Route>
       <Route path={ROLE_MAPPINGS_PATH}>
         <RoleMappings />
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/group_router.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/group_router.test.tsx
@@ -15,9 +15,6 @@ import { Route, Switch } from 'react-router-dom';
 
 import { shallow } from 'enzyme';
 
-import { FlashMessages } from '../../../shared/flash_messages';
-import { SetWorkplaceSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
-
 import { GroupOverview } from './components/group_overview';
 import { GroupSourcePrioritization } from './components/group_source_prioritization';
 import { ManageUsersModal } from './components/manage_users_modal';
@@ -40,10 +37,10 @@ describe('GroupRouter', () => {
       resetGroup,
     });
   });
+
   it('renders', () => {
     const wrapper = shallow(<GroupRouter />);
 
-    expect(wrapper.find(FlashMessages)).toHaveLength(1);
     expect(wrapper.find(Switch)).toHaveLength(1);
     expect(wrapper.find(Route)).toHaveLength(2);
     expect(wrapper.find(GroupOverview)).toHaveLength(1);
@@ -62,22 +59,4 @@ describe('GroupRouter', () => {
     expect(wrapper.find(ManageUsersModal)).toHaveLength(1);
     expect(wrapper.find(SharedSourcesModal)).toHaveLength(1);
   });
-
-  it('handles breadcrumbs while loading', () => {
-    setMockValues({
-      sharedSourcesModalVisible: false,
-      manageUsersModalVisible: false,
-      group: {},
-    });
-
-    const loadingBreadcrumbs = ['Groups', '...'];
-
-    const wrapper = shallow(<GroupRouter />);
-
-    const firstBreadCrumb = wrapper.find(SetPageChrome).first();
-    const lastBreadCrumb = wrapper.find(SetPageChrome).last();
-
-    expect(firstBreadCrumb.prop('trail')).toEqual([...loadingBreadcrumbs, 'Source Prioritization']);
-    expect(lastBreadCrumb.prop('trail')).toEqual(loadingBreadcrumbs);
-  });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/group_router.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/group_router.tsx
@@ -10,10 +10,6 @@ import { Route, Switch, useParams } from 'react-router-dom';
 
 import { useActions, useValues } from 'kea';
 
-import { FlashMessages } from '../../../shared/flash_messages';
-import { SetWorkplaceSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
-import { SendWorkplaceSearchTelemetry as SendTelemetry } from '../../../shared/telemetry';
-import { NAV } from '../../constants';
 import { GROUP_SOURCE_PRIORITIZATION_PATH, GROUP_PATH } from '../../routes';
 
 import { GroupOverview } from './components/group_overview';
@@ -26,11 +22,7 @@ export const GroupRouter: React.FC = () => {
   const { groupId } = useParams() as { groupId: string };
 
   const { initializeGroup, resetGroup } = useActions(GroupLogic);
-  const {
-    sharedSourcesModalVisible,
-    manageUsersModalVisible,
-    group: { name },
-  } = useValues(GroupLogic);
+  const { sharedSourcesModalVisible, manageUsersModalVisible } = useValues(GroupLogic);
 
   useEffect(() => {
     initializeGroup(groupId);
@@ -39,15 +31,11 @@ export const GroupRouter: React.FC = () => {
 
   return (
     <>
-      <FlashMessages />
       <Switch>
         <Route path={GROUP_SOURCE_PRIORITIZATION_PATH}>
-          <SetPageChrome trail={[NAV.GROUPS, name || '...', NAV.SOURCE_PRIORITIZATION]} />
           <GroupSourcePrioritization />
         </Route>
         <Route path={GROUP_PATH}>
-          <SetPageChrome trail={[NAV.GROUPS, name || '...']} />
-          <SendTelemetry action="viewed" metric="group_overview" />
           <GroupOverview />
         </Route>
       </Switch>
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups_router.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups_router.tsx
@@ -10,9 +10,6 @@ import { Route, Switch } from 'react-router-dom';
 
 import { useActions } from 'kea';
 
-import { SetWorkplaceSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
-import { SendWorkplaceSearchTelemetry as SendTelemetry } from '../../../shared/telemetry';
-import { NAV } from '../../constants';
 import { GROUP_PATH, GROUPS_PATH } from '../../routes';
 
 import { GroupRouter } from './group_router';
@@ -31,8 +28,6 @@ export const GroupsRouter: React.FC = () => {
   return (
     <Switch>
       <Route exact path={GROUPS_PATH}>
-        <SetPageChrome trail={[NAV.GROUPS]} />
-        <SendTelemetry action="viewed" metric="groups" />
         <Groups />
       </Route>
       <Route path={GROUP_PATH}>
