From 8f19efb4aaa8bcf9bb33f4bfd6b3f7c2eb46575e Mon Sep 17 00:00:00 2001
From: Constance Chen <constance.chen.3@gmail.com>
Date: Wed, 23 Jun 2021 19:57:41 -0700
Subject: [PATCH] [WS] Improve Settings 404 UX

- This was the only remaining WS route I found that either did not have a 404 or a fallback to some overview page, so I tweaked the redirect order for a graceful redirect (vs a blank page)
---
 .../workplace_search/views/settings/settings_router.tsx      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 f8c8050e20153..d9aeba361d240 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
@@ -11,7 +11,6 @@ import { Redirect, Route, Switch } from 'react-router-dom';
 import { useActions } from 'kea';
 
 import {
-  ORG_SETTINGS_PATH,
   ORG_SETTINGS_CUSTOMIZE_PATH,
   ORG_SETTINGS_CONNECTORS_PATH,
   ORG_SETTINGS_OAUTH_APPLICATION_PATH,
@@ -33,7 +32,6 @@ export const SettingsRouter: React.FC = () => {
 
   return (
     <Switch>
-      <Redirect exact from={ORG_SETTINGS_PATH} to={ORG_SETTINGS_CUSTOMIZE_PATH} />
       <Route exact path={ORG_SETTINGS_CUSTOMIZE_PATH}>
         <Customize />
       </Route>
@@ -48,6 +46,9 @@ export const SettingsRouter: React.FC = () => {
           <SourceConfig sourceIndex={i} />
         </Route>
       ))}
+      <Route>
+        <Redirect to={ORG_SETTINGS_CUSTOMIZE_PATH} />
+      </Route>
     </Switch>
   );
 };