[Proposal] Update schema errors routing to better work with nav/bread…

…crumbs - `exact` is required to make the parent schemas/ not gobble schema/{errorId} - added bonus breadcrumb for nicer schema navigation UX - No tests need to update AFAICT
elastic · Jun 18, 2021 · b6a62b6 · b6a62b6
1 parent d77ee41
commit b6a62b6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.ts
@@ -88,7 +88,7 @@ export const SOURCE_CONTENT_PATH = `${SOURCES_PATH}/:sourceId/content`;
 export const SOURCE_SCHEMAS_PATH = `${SOURCES_PATH}/:sourceId/schemas`;
 export const SOURCE_DISPLAY_SETTINGS_PATH = `${SOURCES_PATH}/:sourceId/display_settings`;
 export const SOURCE_SETTINGS_PATH = `${SOURCES_PATH}/:sourceId/settings`;
-export const REINDEX_JOB_PATH = `${SOURCES_PATH}/:sourceId/schema_errors/:activeReindexJobId`;
+export const REINDEX_JOB_PATH = `${SOURCE_SCHEMAS_PATH}/:activeReindexJobId`;
 
 export const DISPLAY_SETTINGS_SEARCH_RESULT_PATH = `${SOURCE_DISPLAY_SETTINGS_PATH}/`;
 export const DISPLAY_SETTINGS_RESULT_DETAIL_PATH = `${SOURCE_DISPLAY_SETTINGS_PATH}/result_detail`;

diff --git a/...cations/workplace_search/views/content_sources/components/schema/schema_change_errors.tsx b/...cations/workplace_search/views/content_sources/components/schema/schema_change_errors.tsx
@@ -32,7 +32,10 @@ export const SchemaChangeErrors: React.FC = () => {
   }, []);
 
   return (
-    <SourceLayout pageChrome={[NAV.SCHEMA]} pageViewTelemetry="source_schema">
+    <SourceLayout
+      pageChrome={[NAV.SCHEMA, SCHEMA_ERRORS_HEADING]}
+      pageViewTelemetry="source_schema"
+    >
       <ViewContentHeader title={SCHEMA_ERRORS_HEADING} />
       <SchemaErrorsAccordion fieldCoercionErrors={fieldCoercionErrors} schema={serverSchema} />
     </SourceLayout>

diff --git a/.../public/applications/workplace_search/views/content_sources/components/source_sub_nav.tsx b/.../public/applications/workplace_search/views/content_sources/components/source_sub_nav.tsx
@@ -48,7 +48,10 @@ export const useSourceSubNav = () => {
     navItems.push({
       id: 'sourceSchema',
       name: NAV.SCHEMA,
-      ...generateNavLink({ to: getContentSourcePath(SOURCE_SCHEMAS_PATH, id, isOrganization) }),
+      ...generateNavLink({
+        to: getContentSourcePath(SOURCE_SCHEMAS_PATH, id, isOrganization),
+        shouldShowActiveForSubroutes: true,
+      }),
     });
     navItems.push({
       id: 'sourceDisplaySettings',

diff --git a/...prise_search/public/applications/workplace_search/views/content_sources/source_router.tsx b/...prise_search/public/applications/workplace_search/views/content_sources/source_router.tsx
@@ -68,17 +68,17 @@ export const SourceRouter: React.FC = () => {
         <SourceContent />
       </Route>
       {isCustomSource && (
-        <Route path={sourcePath(SOURCE_SCHEMAS_PATH, sourceId, isOrganization)}>
+        <Route exact path={sourcePath(SOURCE_SCHEMAS_PATH, sourceId, isOrganization)}>
           <Schema />
         </Route>
       )}
       {isCustomSource && (
-        <Route path={getSourcesPath(REINDEX_JOB_PATH, isOrganization)}>
+        <Route exact path={getSourcesPath(REINDEX_JOB_PATH, isOrganization)}>
           <SchemaChangeErrors />
         </Route>
       )}
       {isCustomSource && (
-        <Route path={sourcePath(SOURCE_DISPLAY_SETTINGS_PATH, sourceId, isOrganization)}>
+        <Route exact path={sourcePath(SOURCE_DISPLAY_SETTINGS_PATH, sourceId, isOrganization)}>
           <DisplaySettingsRouter />
         </Route>
       )}