[navigation-next] fix: redirect to standard index pattern application…

…s while nav group is enabled (#7346) * [navigation-next] fix: redirect to standard index pattern applications while nav group is enabled (#7305) * feat: fix the incorrect jumping logic for Index pattern management Signed-off-by: SuZhou-Joe <[email protected]> * Changeset file for PR #7305 created/updated * feat: update Signed-off-by: SuZhou-Joe <[email protected]> * feat: update with comment Signed-off-by: SuZhou-Joe <[email protected]> * feat: update order and remove reset logic Signed-off-by: SuZhou-Joe <[email protected]> * feat: update Signed-off-by: SuZhou-Joe <[email protected]> * feat: update Signed-off-by: SuZhou-Joe <[email protected]> * feat: update snapshot Signed-off-by: SuZhou-Joe <[email protected]> * feat: some category change Signed-off-by: SuZhou-Joe <[email protected]> * feat: update category Signed-off-by: SuZhou-Joe <[email protected]> --------- Signed-off-by: SuZhou-Joe <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> (cherry picked from commit 2c708e3) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * feat: change the order Signed-off-by: SuZhou-Joe <[email protected]> * feat: hide left navigation when workspace enabled Signed-off-by: SuZhou-Joe <[email protected]> --------- Signed-off-by: SuZhou-Joe <[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> Co-authored-by: SuZhou-Joe <[email protected]> (cherry picked from commit d30677d) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-project · Jul 22, 2024 · 1c5e4ef · 1c5e4ef
1 parent c30287a
commit 1c5e4ef
Show file tree

Hide file tree

Showing 16 changed files with 182 additions and 109 deletions.
diff --git a/changelogs/fragments/7305.yml b/changelogs/fragments/7305.yml
@@ -0,0 +1,2 @@
+feat:
+- [navigation-next] fix: redirect to standard index pattern applications while nav group is enabled ([#7305](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/7305))
diff --git a/src/core/public/chrome/nav_group/nav_group_service.test.ts b/src/core/public/chrome/nav_group/nav_group_service.test.ts
@@ -311,53 +311,6 @@ describe('ChromeNavGroupService#start()', () => {
     expect(sessionStorageMock.getItem(CURRENT_NAV_GROUP_ID)).toBeFalsy();
     expect(currentNavGroup).toBeUndefined();
   });
-
-  it('should reset current nav group if app not belongs to any nav group', async () => {
-    const uiSettings = uiSettingsServiceMock.createSetupContract();
-    const navGroupEnabled$ = new Rx.BehaviorSubject(true);
-    uiSettings.get$.mockImplementation(() => navGroupEnabled$);
-
-    const chromeNavGroupService = new ChromeNavGroupService();
-    const chromeNavGroupServiceSetup = chromeNavGroupService.setup({ uiSettings });
-
-    chromeNavGroupServiceSetup.addNavLinksToGroup(
-      {
-        id: 'foo',
-        title: 'foo title',
-        description: 'foo description',
-      },
-      [{ id: 'foo-app1' }]
-    );
-
-    const chromeNavGroupServiceStart = await chromeNavGroupService.start({
-      navLinks: mockedNavLinkService,
-      application: mockedApplicationService,
-    });
-
-    // set an existing nav group id
-    chromeNavGroupServiceStart.setCurrentNavGroup('foo');
-
-    expect(sessionStorageMock.getItem(CURRENT_NAV_GROUP_ID)).toEqual('foo');
-
-    let currentNavGroup = await chromeNavGroupServiceStart
-      .getCurrentNavGroup$()
-      .pipe(first())
-      .toPromise();
-
-    expect(currentNavGroup?.id).toEqual('foo');
-
-    // navigate to app don't belongs to any nav group
-    mockedApplicationService.navigateToApp('bar-app');
-
-    currentNavGroup = await chromeNavGroupServiceStart
-      .getCurrentNavGroup$()
-      .pipe(first())
-      .toPromise();
-
-    // verify current nav group been reset
-    expect(currentNavGroup).toBeFalsy();
-    expect(sessionStorageMock.getItem(CURRENT_NAV_GROUP_ID)).toBeFalsy();
-  });
 });
 
 describe('nav group updater', () => {

diff --git a/src/core/public/chrome/nav_group/nav_group_service.ts b/src/core/public/chrome/nav_group/nav_group_service.ts
@@ -212,18 +212,6 @@ export class ChromeNavGroupService {
       }
     };
 
-    // erase current nav group when switch app don't belongs to any nav group
-    application.currentAppId$.subscribe((appId) => {
-      const navGroupMap = this.navGroupsMap$.getValue();
-      const appIdsWithNavGroup = Object.values(navGroupMap).flatMap(({ navLinks: links }) =>
-        links.map(({ id }) => id)
-      );
-
-      if (appId && !appIdsWithNavGroup.includes(appId)) {
-        setCurrentNavGroup(undefined);
-      }
-    });
-
     const currentNavGroupSorted$ = combineLatest([
       this.getSortedNavGroupsMap$(),
       this.currentNavGroup$,

diff --git a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav_group_enabled.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav_group_enabled.test.tsx.snap
diff --git a/src/core/public/chrome/ui/header/collapsible_nav_group_enabled.scss b/src/core/public/chrome/ui/header/collapsible_nav_group_enabled.scss
@@ -2,8 +2,8 @@
   border: none !important;
 
   .nav-link-item {
-    padding: $ouiSize / 4 $ouiSize;
-    border-radius: $ouiSize;
+    padding: calc($euiSize / 4) $euiSize;
+    border-radius: $euiSize;
     box-shadow: none;
     margin-bottom: 0;
     margin-top: 0;
@@ -39,11 +39,20 @@
   }
 
   .bottom-container {
-    padding: 0 $ouiSize;
+    padding: 0 $euiSize;
     display: flex;
+
+    &.bottom-container-collapsed {
+      flex-direction: column;
+      align-items: center;
+
+      > * {
+        margin: $euiSizeS 0;
+      }
+    }
   }
 
   .nav-controls-padding {
-    padding: $ouiSize;
+    padding: $euiSize;
   }
 }
diff --git a/src/core/public/chrome/ui/header/collapsible_nav_group_enabled.test.tsx b/src/core/public/chrome/ui/header/collapsible_nav_group_enabled.test.tsx
@@ -18,6 +18,7 @@ import { httpServiceMock } from '../../../mocks';
 import { getLogos } from '../../../../common';
 import { ALL_USE_CASE_ID, DEFAULT_NAV_GROUPS } from '../../../../public';
 import { CollapsibleNavTopProps } from './collapsible_nav_group_enabled_top';
+import { capabilitiesServiceMock } from '../../../application/capabilities/capabilities_service.mock';
 
 jest.mock('./collapsible_nav_group_enabled_top', () => ({
   CollapsibleNavTop: (props: CollapsibleNavTopProps) => (
@@ -166,6 +167,7 @@ describe('<CollapsibleNavGroupEnabled />', () => {
           currentNavGroup$.next(undefined);
         }
       },
+      capabilities: { ...capabilitiesServiceMock.createStartContract().capabilities },
       ...props,
     };
   }
@@ -223,4 +225,28 @@ describe('<CollapsibleNavGroupEnabled />', () => {
     fireEvent.click(getByTestId('back'));
     expect(getAllByTestId('collapsibleNavAppLink-link-in-analytics').length).toEqual(2);
   });
+
+  it('should hide left navigation when in home page when workspace is enabled', async () => {
+    const props = mockProps({
+      navGroupsMap: {
+        [DEFAULT_NAV_GROUPS.analytics.id]: {
+          ...DEFAULT_NAV_GROUPS.analytics,
+          navLinks: [
+            {
+              id: 'link-in-analytics',
+              title: 'link-in-analytics',
+              showInAllNavGroup: true,
+            },
+          ],
+        },
+      },
+    });
+    props.appId$ = new BehaviorSubject('home');
+    if (props.capabilities.workspaces) {
+      (props.capabilities.workspaces as Record<string, unknown>) = {};
+      (props.capabilities.workspaces as Record<string, unknown>).enabled = true;
+    }
+    const { container } = render(<CollapsibleNavGroupEnabled {...props} isNavOpen />);
+    expect(container).toMatchSnapshot();
+  });
 });
diff --git a/src/core/public/chrome/ui/header/collapsible_nav_group_enabled.tsx b/src/core/public/chrome/ui/header/collapsible_nav_group_enabled.tsx
@@ -19,7 +19,7 @@ import useObservable from 'react-use/lib/useObservable';
 import * as Rx from 'rxjs';
 import classNames from 'classnames';
 import { ChromeNavControl, ChromeNavLink } from '../..';
-import { NavGroupStatus } from '../../../../types';
+import { AppCategory, NavGroupStatus } from '../../../../types';
 import { InternalApplicationStart } from '../../../application/types';
 import { HttpStart } from '../../../http';
 import { OnIsLockedUpdate } from './';
@@ -36,7 +36,7 @@ import {
   LinkItem,
   LinkItemType,
 } from '../../utils';
-import { ALL_USE_CASE_ID } from '../../../../../core/utils';
+import { ALL_USE_CASE_ID, DEFAULT_APP_CATEGORIES } from '../../../../../core/utils';
 import { CollapsibleNavTop } from './collapsible_nav_group_enabled_top';
 import { HeaderNavControls } from './header_nav_controls';
 
@@ -58,6 +58,7 @@ export interface CollapsibleNavGroupEnabledProps {
   navControlsLeftBottom$: Rx.Observable<readonly ChromeNavControl[]>;
   currentNavGroup$: Rx.Observable<NavGroupItemInMap | undefined>;
   setCurrentNavGroup: ChromeNavGroupServiceStartContract['setCurrentNavGroup'];
+  capabilities: InternalApplicationStart['capabilities'];
 }
 
 interface NavGroupsProps {
@@ -164,6 +165,14 @@ export function NavGroups({
   );
 }
 
+// Custom category is used for those features not belong to any of use cases in all use case.
+// and the custom category should always sit before manage category
+const customCategory: AppCategory = {
+  id: 'custom',
+  label: i18n.translate('core.ui.customNavList.label', { defaultMessage: 'Custom' }),
+  order: (DEFAULT_APP_CATEGORIES.manage.order || 0) - 500,
+};
+
 export function CollapsibleNavGroupEnabled({
   basePath,
   id,
@@ -176,36 +185,14 @@ export function CollapsibleNavGroupEnabled({
   navigateToUrl,
   logos,
   setCurrentNavGroup,
+  capabilities,
   ...observables
 }: CollapsibleNavGroupEnabledProps) {
   const navLinks = useObservable(observables.navLinks$, []).filter((link) => !link.hidden);
   const appId = useObservable(observables.appId$, '');
   const navGroupsMap = useObservable(observables.navGroupsMap$, {});
   const currentNavGroup = useObservable(observables.currentNavGroup$, undefined);
 
-  const onGroupClick = (
-    e: React.MouseEvent<HTMLButtonElement, MouseEvent>,
-    group: NavGroupItemInMap
-  ) => {
-    const fulfilledLinks = fulfillRegistrationLinksToChromeNavLinks(
-      navGroupsMap[group.id]?.navLinks,
-      navLinks
-    );
-    setCurrentNavGroup(group.id);
-
-    // the `navGroupsMap[group.id]?.navLinks` has already been sorted
-    const firstLink = fulfilledLinks[0];
-    if (firstLink) {
-      const propsForEui = createEuiListItem({
-        link: firstLink,
-        appId,
-        dataTestSubj: 'collapsibleNavAppLink',
-        navigateToApp,
-      });
-      propsForEui.onClick(e);
-    }
-  };
-
   const navLinksForRender: ChromeNavLink[] = useMemo(() => {
     if (currentNavGroup) {
       return fulfillRegistrationLinksToChromeNavLinks(
@@ -234,7 +221,10 @@ export function CollapsibleNavGroupEnabled({
     navLinks
       .filter((link) => !linkIdsWithUseGroupInfo.includes(link.id))
       .forEach((navLink) => {
-        navLinksForAll.push(navLink);
+        navLinksForAll.push({
+          ...navLink,
+          category: customCategory,
+        });
       });
 
     // Append all the links registered to all use case
@@ -281,6 +271,37 @@ export function CollapsibleNavGroupEnabled({
     return 270;
   }, [isNavOpen]);
 
+  // For now, only home page need to hide left navigation
+  // when workspace is enabled.
+  // If there are more pages need to hide left navigation in the future
+  // need to come up with a mechanism to register.
+  if (capabilities.workspaces.enabled && appId === 'home') {
+    return null;
+  }
+
+  const onGroupClick = (
+    e: React.MouseEvent<HTMLButtonElement, MouseEvent>,
+    group: NavGroupItemInMap
+  ) => {
+    const fulfilledLinks = fulfillRegistrationLinksToChromeNavLinks(
+      navGroupsMap[group.id]?.navLinks,
+      navLinks
+    );
+    setCurrentNavGroup(group.id);
+
+    // the `navGroupsMap[group.id]?.navLinks` has already been sorted
+    const firstLink = fulfilledLinks[0];
+    if (firstLink) {
+      const propsForEui = createEuiListItem({
+        link: firstLink,
+        appId,
+        dataTestSubj: 'collapsibleNavAppLink',
+        navigateToApp,
+      });
+      propsForEui.onClick(e);
+    }
+  };
+
   return (
     <EuiFlyout
       data-test-subj="collapsibleNav"
@@ -335,7 +356,12 @@ export function CollapsibleNavGroupEnabled({
           </EuiPanel>
         </div>
         <EuiHorizontalRule margin="none" />
-        <div className="bottom-container" style={{ flexDirection: isNavOpen ? 'row' : 'column' }}>
+        <div
+          className={classNames({
+            'bottom-container': true,
+            'bottom-container-collapsed': !isNavOpen,
+          })}
+        >
           <HeaderNavControls
             navControls$={observables.navControlsLeftBottom$}
             className={classNames({ 'nav-controls-padding': isNavOpen })}

diff --git a/src/core/public/chrome/ui/header/header.tsx b/src/core/public/chrome/ui/header/header.tsx
@@ -288,6 +288,7 @@ export function Header({
             navControlsLeftBottom$={observables.navControlsLeftBottom$}
             currentNavGroup$={observables.currentNavGroup$}
             setCurrentNavGroup={setCurrentNavGroup}
+            capabilities={application.capabilities}
           />
         ) : (
           <CollapsibleNav

diff --git a/src/core/utils/default_app_categories.ts b/src/core/utils/default_app_categories.ts
@@ -122,6 +122,13 @@ export const DEFAULT_APP_CATEGORIES: Record<string, AppCategory> = Object.freeze
     label: i18n.translate('core.ui.manageNav.label', {
       defaultMessage: 'Manage',
     }),
-    order: 7000,
+    order: 8000,
+  },
+  manageData: {
+    id: 'manageData',
+    label: i18n.translate('core.ui.manageDataNav.label', {
+      defaultMessage: 'Manage data',
+    }),
+    order: 1000,
   },
 });
diff --git a/src/plugins/dashboard/public/plugin.tsx b/src/plugins/dashboard/public/plugin.tsx
@@ -456,14 +456,14 @@ export class DashboardPlugin
     core.chrome.navGroup.addNavLinksToGroup(DEFAULT_NAV_GROUPS.observability, [
       {
         id: app.id,
-        order: 300,
+        order: 400,
         category: undefined,
       },
     ]);
     core.chrome.navGroup.addNavLinksToGroup(DEFAULT_NAV_GROUPS['security-analytics'], [
       {
         id: app.id,
-        order: 300,
+        order: 400,
         category: undefined,
       },
     ]);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		feat:
		- [navigation-next] fix: redirect to standard index pattern applications while nav group is enabled ([#7305](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/7305))