Fix engine routes that are meta engine or non-meta-engine specific (e…

…lastic#104757) - to include conditionals in their routing - this matches their nav link behavior - we should have checks in routes as well just in case # Conflicts: # x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.test.tsx
cee-chen · Jul 8, 2021 · 98cea53 · 98cea53
1 parent 0b282ef
commit 98cea53
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/...enterprise_search/public/applications/app_search/components/engine/engine_router.test.tsx b/...enterprise_search/public/applications/app_search/components/engine/engine_router.test.tsx
@@ -39,6 +39,7 @@ describe('EngineRouter', () => {
     ...mockEngineValues,
     dataLoading: false,
     engineNotFound: false,
+    isMetaEngine: false,
     myRole: {},
   };
   const actions = {
@@ -181,8 +182,19 @@ describe('EngineRouter', () => {
     expect(wrapper.find(SearchUI)).toHaveLength(1);
   });
 
+  it('renders a source engines view', () => {
+    setMockValues({
+      ...values,
+      myRole: { canViewMetaEngineSourceEngines: true },
+      isMetaEngine: true,
+    });
+    const wrapper = shallow(<EngineRouter />);
+
+    expect(wrapper.find(SourceEngines)).toHaveLength(1);
+  });
+
   it('renders a crawler view', () => {
-    setMockValues({ ...values, myRole: { canViewEngineCrawler: true } });
+    setMockValues({ ...values, myRole: { canViewEngineCrawler: true }, isMetaEngine: false });
     const wrapper = shallow(<EngineRouter />);
 
     expect(wrapper.find(CrawlerRouter)).toHaveLength(1);

diff --git a/...gins/enterprise_search/public/applications/app_search/components/engine/engine_router.tsx b/...gins/enterprise_search/public/applications/app_search/components/engine/engine_router.tsx
@@ -66,7 +66,7 @@ export const EngineRouter: React.FC = () => {
   } = useValues(AppLogic);
 
   const { engineName: engineNameFromUrl } = useParams() as { engineName: string };
-  const { engineName, dataLoading, engineNotFound } = useValues(EngineLogic);
+  const { engineName, dataLoading, engineNotFound, isMetaEngine } = useValues(EngineLogic);
   const { setEngineName, initializeEngine, pollEmptyEngine, stopPolling, clearEngine } = useActions(
     EngineLogic
   );
@@ -120,12 +120,12 @@ export const EngineRouter: React.FC = () => {
           <SchemaRouter />
         </Route>
       )}
-      {canViewMetaEngineSourceEngines && (
+      {canViewMetaEngineSourceEngines && isMetaEngine && (
         <Route path={META_ENGINE_SOURCE_ENGINES_PATH}>
           <SourceEngines />
         </Route>
       )}
-      {canViewEngineCrawler && (
+      {canViewEngineCrawler && !isMetaEngine && (
         <Route path={ENGINE_CRAWLER_PATH}>
           <CrawlerRouter />
         </Route>