From e94f8ff0d5365f015b9fe6c604002c060a23448c Mon Sep 17 00:00:00 2001
From: Constance Chen <constance.chen.3@gmail.com>
Date: Mon, 10 Aug 2020 11:27:25 -0700
Subject: [PATCH] Fix root redirects not working as expected

- If enterpriseSearchUrl hasn't been set, all pages should redirect to SetupGuide, not just root
- The engines redirect simply wasn't working at all - it would always show a blank page when '/' was clicked in the Kibana breadcrumbs. Not sure if this is a Kibana issue - had to change to a component load to fix
+ Simplify index.test.tsx (probably unreasonable and not super helpful to add assertions for each new route)
---
 .../applications/app_search/index.test.tsx    | 39 ++++++-------------
 .../public/applications/app_search/index.tsx  | 18 +++++++--
 2 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/index.test.tsx
index 2bdde42a3fd6484..9e660d10053ec40 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/index.test.tsx
@@ -10,39 +10,22 @@ import React, { useContext } from 'react';
 import { Redirect } from 'react-router-dom';
 import { shallow } from 'enzyme';
 
-import { SideNav, SideNavLink } from '../shared/layout';
-import { SetupGuide } from './components/setup_guide';
-import { EngineOverview } from './components/engine_overview';
-
+import { Layout, SideNav, SideNavLink } from '../shared/layout';
 import { AppSearch, AppSearchNav } from './';
 
-describe('App Search Routes', () => {
-  describe('/', () => {
-    it('redirects to Setup Guide when enterpriseSearchUrl is not set', () => {
-      (useContext as jest.Mock).mockImplementationOnce(() => ({ enterpriseSearchUrl: '' }));
-      const wrapper = shallow(<AppSearch />);
-
-      expect(wrapper.find(Redirect)).toHaveLength(1);
-      expect(wrapper.find(EngineOverview)).toHaveLength(0);
-    });
-
-    it('renders Engine Overview when enterpriseSearchUrl is set', () => {
-      (useContext as jest.Mock).mockImplementationOnce(() => ({
-        enterpriseSearchUrl: 'https://foo.bar',
-      }));
-      const wrapper = shallow(<AppSearch />);
-
-      expect(wrapper.find(EngineOverview)).toHaveLength(1);
-      expect(wrapper.find(Redirect)).toHaveLength(0);
-    });
+describe('AppSearch', () => {
+  it('renders', () => {
+    const wrapper = shallow(<AppSearch />);
+
+    expect(wrapper.find(Layout)).toHaveLength(1);
   });
 
-  describe('/setup_guide', () => {
-    it('renders', () => {
-      const wrapper = shallow(<AppSearch />);
+  it('redirects to Setup Guide when enterpriseSearchUrl is not set', () => {
+    (useContext as jest.Mock).mockImplementationOnce(() => ({ enterpriseSearchUrl: '' }));
+    const wrapper = shallow(<AppSearch />);
 
-      expect(wrapper.find(SetupGuide)).toHaveLength(1);
-    });
+    expect(wrapper.find(Redirect)).toHaveLength(1);
+    expect(wrapper.find(Layout)).toHaveLength(0);
   });
 });
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx
index ff14b20704e593f..ec6355fbfd891e3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx
@@ -18,18 +18,30 @@ import { EngineOverview } from './components/engine_overview';
 
 export const AppSearch: React.FC = () => {
   const { enterpriseSearchUrl } = useContext(KibanaContext) as IKibanaContext;
+  if (!enterpriseSearchUrl)
+    return (
+      <Switch>
+        <Route exact path="/setup_guide">
+          <SetupGuide />
+        </Route>
+        <Route>
+          <Redirect to="/setup_guide" />
+          <SetupGuide />
+        </Route>
+      </Switch>
+    );
 
   return (
     <Switch>
-      <Route exact path="/">
-        {!enterpriseSearchUrl ? <Redirect to="/setup_guide" /> : <Redirect to="/engines" />}
-      </Route>
       <Route exact path="/setup_guide">
         <SetupGuide />
       </Route>
       <Route>
         <Layout navigation={<AppSearchNav />}>
           <Switch>
+            <Route exact path="/">
+              <EngineOverview />
+            </Route>
             <Route exact path="/engines">
               <EngineOverview />
             </Route>