[Bug][Workspace] Navigate to detail page when clicking all use case w…

…orkspace (#7405) (#7431) * [Bug] Clicking workspace with all use case in the picker should navigate to workspace details page * Changeset file for PR #7405 created/updated --------- (cherry picked from commit 67670fd) Signed-off-by: yubonluo <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
opensearch-project · Jul 24, 2024 · 587b319 · 587b319
1 parent f5d4a8c
commit 587b319
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 20 deletions.
diff --git a/changelogs/fragments/7405.yml b/changelogs/fragments/7405.yml
@@ -0,0 +1,2 @@
+fix:
+- [Bug][Workspace] Navigate to detail page when clicking all use case workspace ([#7405](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/7405))
diff --git a/src/plugins/workspace/public/components/workspace_menu/workspace_menu.test.tsx b/src/plugins/workspace/public/components/workspace_menu/workspace_menu.test.tsx
@@ -4,12 +4,12 @@
  */
 
 import React from 'react';
-import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { fireEvent, render, screen } from '@testing-library/react';
 
 import { WorkspaceMenu } from './workspace_menu';
 import { coreMock } from '../../../../../core/public/mocks';
 import { CoreStart } from '../../../../../core/public';
-import { BehaviorSubject, of } from 'rxjs';
+import { BehaviorSubject } from 'rxjs';
 import { IntlProvider } from 'react-intl';
 import { recentWorkspaceManager } from '../../recent_workspace_manager';
 import { WORKSPACE_USE_CASES } from '../../../common/constants';
@@ -109,7 +109,7 @@ describe('<WorkspaceMenu />', () => {
     expect(screen.getByText('Observability')).toBeInTheDocument();
   });
 
-  it('should navigate to the workspace', () => {
+  it('should navigate to the first feature of workspace use case', () => {
     coreStartMock.workspaces.workspaceList$.next([
       { id: 'workspace-1', name: 'workspace 1', features: ['use-case-observability'] },
     ]);
@@ -134,6 +134,31 @@ describe('<WorkspaceMenu />', () => {
     });
   });
 
+  it('should navigate to the workspace detail page when use case is all', () => {
+    coreStartMock.workspaces.workspaceList$.next([
+      { id: 'workspace-1', name: 'workspace 1', features: ['use-case-all'] },
+    ]);
+
+    const originalLocation = window.location;
+    Object.defineProperty(window, 'location', {
+      value: {
+        assign: jest.fn(),
+      },
+    });
+
+    render(<WorkspaceMenuCreatorComponent />);
+    fireEvent.click(screen.getByTestId('workspace-select-button'));
+    fireEvent.click(screen.getByText(/workspace 1/i));
+
+    expect(window.location.assign).toHaveBeenCalledWith(
+      'https://test.com/w/workspace-1/app/workspace_detail'
+    );
+
+    Object.defineProperty(window, 'location', {
+      value: originalLocation,
+    });
+  });
+
   it('should navigate to workspace management page', () => {
     coreStartMock.workspaces.currentWorkspace$.next({
       id: 'workspace-1',

diff --git a/src/plugins/workspace/public/components/workspace_menu/workspace_menu.tsx b/src/plugins/workspace/public/components/workspace_menu/workspace_menu.tsx
@@ -29,7 +29,7 @@ import {
   WORKSPACE_DETAIL_APP_ID,
 } from '../../../common/constants';
 import { formatUrlWithWorkspaceId } from '../../../../../core/public/utils';
-import { CoreStart, WorkspaceObject } from '../../../../../core/public';
+import { ALL_USE_CASE_ID, CoreStart, WorkspaceObject } from '../../../../../core/public';
 import { getFirstUseCaseOfFeatureConfigs } from '../../utils';
 import { recentWorkspaceManager } from '../../recent_workspace_manager';
 import { WorkspaceUseCase } from '../../types';
@@ -126,7 +126,9 @@ export const WorkspaceMenu = ({ coreStart, registeredUseCases$ }: Props) => {
 
   const getWorkspaceListGroup = (filterWorkspaceList: WorkspaceObject[], itemType: string) => {
     const listItems = filterWorkspaceList.map((workspace: WorkspaceObject) => {
-      const appId = getUseCase(workspace)?.features[0] ?? WORKSPACE_DETAIL_APP_ID;
+      const useCase = getUseCase(workspace);
+      const appId =
+        (useCase?.id !== ALL_USE_CASE_ID && useCase?.features?.[0]) || WORKSPACE_DETAIL_APP_ID;
       const useCaseURL = formatUrlWithWorkspaceId(
         coreStart.application.getUrlForApp(appId, {
           absolute: false,
@@ -138,6 +140,7 @@ export const WorkspaceMenu = ({ coreStart, registeredUseCases$ }: Props) => {
         <EuiListGroupItem
           key={workspace.id}
           style={{ paddingLeft: '0' }}
+          className="eui-textTruncate"
           size="s"
           data-test-subj={`workspace-menu-item-${itemType}-${workspace.id}`}
           icon={
@@ -149,17 +152,7 @@ export const WorkspaceMenu = ({ coreStart, registeredUseCases$ }: Props) => {
               initialsLength={2}
             />
           }
-          label={
-            <EuiToolTip
-              anchorClassName="eui-textTruncate"
-              position="bottom"
-              content={workspace.name}
-            >
-              <EuiText style={{ maxWidth: '220px' }} className="eui-textTruncate">
-                {workspace.name}
-              </EuiText>
-            </EuiToolTip>
-          }
+          label={workspace.name}
           onClick={() => {
             closePopover();
             window.location.assign(useCaseURL);
@@ -172,7 +165,7 @@ export const WorkspaceMenu = ({ coreStart, registeredUseCases$ }: Props) => {
         <EuiTitle size="xxs">
           <h4>{itemType === 'all' ? allWorkspacesTitle : recentWorkspacesTitle}</h4>
         </EuiTitle>
-        <EuiListGroup flush gutterSize="none" maxWidth={280}>
+        <EuiListGroup showToolTips flush gutterSize="none" wrapText maxWidth={240}>
           {listItems}
         </EuiListGroup>
       </>
@@ -210,16 +203,16 @@ export const WorkspaceMenu = ({ coreStart, registeredUseCases$ }: Props) => {
               <EuiFlexItem grow={false} data-test-subj="workspace-menu-current-workspace-name">
                 <EuiToolTip
                   anchorClassName="eui-textTruncate"
-                  position="bottom"
+                  position="right"
                   content={currentWorkspaceName}
                 >
-                  <EuiText style={{ maxWidth: '220px' }} className="eui-textTruncate">
+                  <EuiText size="s" style={{ maxWidth: '195px' }} className="eui-textTruncate">
                     {currentWorkspaceName}
                   </EuiText>
                 </EuiToolTip>
               </EuiFlexItem>
               <EuiFlexItem grow={false} data-test-subj="workspace-menu-current-use-case">
-                {getUseCase(currentWorkspace)?.title ?? ''}
+                <EuiText size="s">{getUseCase(currentWorkspace)?.title ?? ''}</EuiText>
               </EuiFlexItem>
               <EuiFlexItem grow={false}>
                 <EuiButton
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		fix:
		- [Bug][Workspace] Navigate to detail page when clicking all use case workspace ([#7405](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/7405))