fix breadcrumbs not set properly when out a workspace

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Hailong-am · Jul 24, 2024 · 56939e8 · 56939e8
1 parent 67670fd
commit 56939e8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/plugins/workspace/public/components/workspace_detail_app.tsx b/src/plugins/workspace/public/components/workspace_detail_app.tsx
@@ -5,6 +5,7 @@
 
 import React, { useEffect } from 'react';
 import { I18nProvider } from '@osd/i18n/react';
+import { i18n } from '@osd/i18n';
 import { CoreStart } from 'opensearch-dashboards/public';
 import { useObservable } from 'react-use';
 import { EuiBreadcrumb } from '@elastic/eui';
@@ -34,6 +35,9 @@ export const WorkspaceDetailApp = (props: WorkspaceDetailProps) => {
       breadcrumbs.push({
         text: currentWorkspace.name,
       });
+      breadcrumbs.push({
+        text: i18n.translate('workspace.detail.breadcrumb', { defaultMessage: 'Workspace Detail' }),
+      });
     }
     chrome?.setBreadcrumbs(breadcrumbs);
   }, [chrome, currentWorkspace, application]);

diff --git a/src/plugins/workspace/public/utils.test.ts b/src/plugins/workspace/public/utils.test.ts
@@ -515,7 +515,7 @@ describe('workspace utils: prependWorkspaceToBreadcrumbs', () => {
   it('should not enrich breadcrumbs when out a workspace', async () => {
     const coreStart = coreMock.createStart();
     prependWorkspaceToBreadcrumbs(coreStart, null, 'app1', undefined, {});
-    expect(coreStart.chrome.setBreadcrumbsEnricher).toHaveBeenCalledWith(undefined);
+    expect(coreStart.chrome.setBreadcrumbsEnricher).not.toHaveBeenCalled();
   });
 
   it('should enrich breadcrumbs when in a workspace and use workspace use case as current nav group', async () => {

diff --git a/src/plugins/workspace/public/utils.ts b/src/plugins/workspace/public/utils.ts
@@ -295,6 +295,11 @@ export function prependWorkspaceToBreadcrumbs(
     core.chrome.setBreadcrumbsEnricher(undefined);
     return;
   }
+
+  /**
+   * when navigates in/out a workspace, page refreshes and breadcrumbs enricher will reset automatically
+   * so we don't need to reset the enricher if currentWorkspace is undefined/null
+   */
   if (currentWorkspace) {
     const useCase = getFirstUseCaseOfFeatureConfigs(currentWorkspace?.features || []);
     // get workspace the only use case
@@ -336,7 +341,5 @@ export function prependWorkspaceToBreadcrumbs(
         return [homeBreadcrumb, navGroupBreadcrumb, ...breadcrumbs];
       }
     });
-  } else {
-    core.chrome.setBreadcrumbsEnricher(undefined);
   }
 }