Fix/cypress

.github/workflows/backport.yml

@@ -31,7 +31,7 @@ jobs:
           app_id: ${{ secrets.APP_ID }}
           private_key: ${{ secrets.APP_PRIVATE_KEY }}
           # opensearch-trigger-bot installation ID
-          installation_id: 22958780
+          installation_id: 41494816
 
       - name: Backport
         uses: VachaShah/[email protected]

.github/workflows/cypress_workflow.yml

@@ -55,7 +55,8 @@ jobs:
         with:
           path: ${{ env.FTR_PATH }}
           repository: opensearch-project/opensearch-dashboards-functional-test
-          ref: '${{ github.base_ref }}'
+          # revert this to '${{ github.base_ref }}'
+          ref: 'workspace'
 
       - name: Get Cypress version
         id: cypress_version
@@ -88,7 +89,7 @@ jobs:
           name: ftr-cypress-screenshots
           path: ${{ env.FTR_PATH }}/cypress/screenshots
           retention-days: 1
-      
+
       - uses: actions/upload-artifact@v3
         if: always()
         with:
@@ -101,4 +102,4 @@ jobs:
         with:
           name: ftr-cypress-results
           path: ${{ env.FTR_PATH }}/cypress/results
-          retention-days: 1
+          retention-days: 1

config/opensearch_dashboards.yml

@@ -268,3 +268,6 @@
 # Set the value of this setting to true to enable plugin augmentation on Dashboard
 # vis_augmenter.pluginAugmentationEnabled: true
 
+# Set the backend roles, whoever has the backend roles defined in this config will be regard as dashboard admin.
+# Dashboard admin will have the access to all the workspaces and objects inside OpenSearch Dashboards.
+# workspace.dashboardAdmin.backendRoles: ["dashboard_admin"]

cypress/integration/with-security/check_advanced_settings.js

@@ -13,7 +13,7 @@ const loginPage = new LoginPage(cy);
 
 describe('verify the advanced settings are saved', () => {
   beforeEach(() => {
-    miscUtils.visitPage('app/management/opensearch-dashboards/settings');
+    miscUtils.visitPage('app/settings');
     loginPage.enterUserName('admin');
     loginPage.enterPassword('admin');
     loginPage.submit();

cypress/integration/with-security/helpers/generate_data.js

@@ -13,7 +13,7 @@ const loginPage = new LoginPage(cy);
 
 describe('Generating BWC test data with security', () => {
   beforeEach(() => {
-    miscUtils.visitPage('app/management/opensearch-dashboards/settings');
+    miscUtils.visitPage('app/settings');
     loginPage.enterUserName('admin');
     loginPage.enterPassword('admin');
     loginPage.submit();
@@ -29,7 +29,7 @@ describe('Generating BWC test data with security', () => {
   });
 
   it('adds advanced settings', () => {
-    miscUtils.visitPage('app/management/opensearch-dashboards/settings');
+    miscUtils.visitPage('app/settings');
     cy.get('[data-test-subj="advancedSetting-editField-theme:darkMode"]').click();
     cy.get('[data-test-subj="advancedSetting-editField-timeline:max_buckets"]').type(
       '{selectAll}4'

cypress/integration/without-security/check_advanced_settings.js

@@ -9,7 +9,7 @@ const miscUtils = new MiscUtils(cy);
 
 describe('verify the advanced settings are saved', () => {
   beforeEach(() => {
-    miscUtils.visitPage('app/management/opensearch-dashboards/settings');
+    miscUtils.visitPage('app/settings');
   });
 
   it('the dark mode is on', () => {

cypress/integration/without-security/helpers/generate_data.js

@@ -12,7 +12,7 @@ describe('Generating BWC test data without security', () => {
     miscUtils.visitPage('app');
   });
   it('adds advanced settings', () => {
-    miscUtils.visitPage('app/management/opensearch-dashboards/settings');
+    miscUtils.visitPage('app/settings');
     cy.get('[data-test-subj="advancedSetting-editField-theme:darkMode"]').click();
     cy.get('[data-test-subj="advancedSetting-editField-timeline:max_buckets"]').type(
       '{selectAll}4'

src/core/public/application/types.ts

@@ -47,6 +47,7 @@ import { IUiSettingsClient } from '../ui_settings';
 import { SavedObjectsStart } from '../saved_objects';
 import { AppCategory } from '../../types';
 import { ScopedHistory } from './scoped_history';
+import { WorkspaceStart } from '../workspace';
 
 /**
  * Accessibility status of an application.
@@ -244,6 +245,16 @@ export interface App<HistoryLocationState = unknown> {
    * ```
    */
   exactRoute?: boolean;
+
+  /**
+   * The dependencies of one application, required feature will be automatic select and can't
+   * be unselect in the workspace configuration.
+   */
+  dependencies?: {
+    [key: string]: {
+      type: 'required' | 'optional';
+    };
+  };
 }
 
 /**
@@ -334,6 +345,8 @@ export interface AppMountContext {
     injectedMetadata: {
       getInjectedVar: (name: string, defaultValue?: any) => unknown;
     };
+    /** {@link WorkspaceService} */
+    workspaces: WorkspaceStart;
   };
 }
 

src/core/public/chrome/chrome_service.mock.ts

@@ -37,6 +37,8 @@ const createStartContractMock = () => {
     getHeaderComponent: jest.fn(),
     navLinks: {
       getNavLinks$: jest.fn(),
+      getFilteredNavLinks$: jest.fn(),
+      setFilteredNavLinks: jest.fn(),
       has: jest.fn(),
       get: jest.fn(),
       getAll: jest.fn(),

src/core/public/chrome/chrome_service.test.ts

@@ -41,6 +41,7 @@ import { notificationServiceMock } from '../notifications/notifications_service.
 import { uiSettingsServiceMock } from '../ui_settings/ui_settings_service.mock';
 import { ChromeService } from './chrome_service';
 import { getAppInfo } from '../application/utils';
+import { workspacesServiceMock } from '../workspace/workspaces_service.mock';
 
 class FakeApp implements App {
   public title = `${this.id} App`;
@@ -67,6 +68,7 @@ function defaultStartDeps(availableApps?: App[]) {
     injectedMetadata: injectedMetadataServiceMock.createStartContract(),
     notifications: notificationServiceMock.createStartContract(),
     uiSettings: uiSettingsServiceMock.createStartContract(),
+    workspaces: workspacesServiceMock.createStartContract(),
   };
 
   if (availableApps) {

src/core/public/chrome/chrome_service.tsx

@@ -34,7 +34,7 @@ import { FormattedMessage } from '@osd/i18n/react';
 import { BehaviorSubject, combineLatest, merge, Observable, of, ReplaySubject } from 'rxjs';
 import { flatMap, map, takeUntil } from 'rxjs/operators';
 import { EuiLink } from '@elastic/eui';
-import { mountReactNode } from '../utils/mount';
+import { mountReactNode } from '../utils';
 import { InternalApplicationStart } from '../application';
 import { DocLinksStart } from '../doc_links';
 import { HttpStart } from '../http';
@@ -48,7 +48,7 @@ import { ChromeNavLinks, NavLinksService, ChromeNavLink } from './nav_links';
 import { ChromeRecentlyAccessed, RecentlyAccessedService } from './recently_accessed';
 import { Header } from './ui';
 import { ChromeHelpExtensionMenuLink } from './ui/header/header_help_menu';
-import { Branding } from '../';
+import { Branding, WorkspaceStart } from '../';
 export { ChromeNavControls, ChromeRecentlyAccessed, ChromeDocTitle };
 
 const IS_LOCKED_KEY = 'core.chrome.isLocked';
@@ -99,6 +99,7 @@ interface StartDeps {
   injectedMetadata: InjectedMetadataStart;
   notifications: NotificationsStart;
   uiSettings: IUiSettingsClient;
+  workspaces: WorkspaceStart;
 }
 
 /** @internal */
@@ -152,6 +153,7 @@ export class ChromeService {
     injectedMetadata,
     notifications,
     uiSettings,
+    workspaces,
   }: StartDeps): Promise<InternalChromeStart> {
     this.initVisibility(application);
 
@@ -243,15 +245,15 @@ export class ChromeService {
           badge$={badge$.pipe(takeUntil(this.stop$))}
           basePath={http.basePath}
           breadcrumbs$={breadcrumbs$.pipe(takeUntil(this.stop$))}
-          customNavLink$={customNavLink$.pipe(takeUntil(this.stop$))}
           opensearchDashboardsDocLink={docLinks.links.opensearchDashboards.introduction}
           forceAppSwitcherNavigation$={navLinks.getForceAppSwitcherNavigation$()}
           helpExtension$={helpExtension$.pipe(takeUntil(this.stop$))}
           helpSupportUrl$={helpSupportUrl$.pipe(takeUntil(this.stop$))}
           homeHref={http.basePath.prepend('/app/home')}
           isVisible$={this.isVisible$}
           opensearchDashboardsVersion={injectedMetadata.getOpenSearchDashboardsVersion()}
-          navLinks$={navLinks.getNavLinks$()}
+          navLinks$={navLinks.getFilteredNavLinks$()}
+          customNavLink$={customNavLink$.pipe(takeUntil(this.stop$))}
           recentlyAccessed$={recentlyAccessed.get$()}
           navControlsLeft$={navControls.getLeft$()}
           navControlsCenter$={navControls.getCenter$()}
@@ -262,6 +264,7 @@ export class ChromeService {
           isLocked$={getIsNavDrawerLocked$}
           branding={injectedMetadata.getBranding()}
           survey={injectedMetadata.getSurvey()}
+          workspaces={workspaces}
         />
       ),
 

src/core/public/chrome/nav_links/nav_link.ts

@@ -93,15 +93,22 @@ export interface ChromeNavLink {
    * Disables a link from being clickable.
    *
    * @internalRemarks
-   * This is only used by the ML and Graph plugins currently. They use this field
+   * This is used by the ML and Graph plugins. They use this field
    * to disable the nav link when the license is expired.
+   * This is also used by recently visited category in left menu
+   * to disable "No recently visited items".
    */
   readonly disabled?: boolean;
 
   /**
    * Hides a link from the navigation.
    */
   readonly hidden?: boolean;
+
+  /**
+   * Links can be navigated through url.
+   */
+  readonly externalLink?: boolean;
 }
 
 /** @public */

src/core/public/chrome/nav_links/nav_links_service.ts

@@ -53,6 +53,16 @@ export interface ChromeNavLinks {
    */
   getNavLinks$(): Observable<Array<Readonly<ChromeNavLink>>>;
 
+  /**
+   * Set an observable for a sorted list of filtered navlinks.
+   */
+  getFilteredNavLinks$(): Observable<Array<Readonly<ChromeNavLink>>>;
+
+  /**
+   * Set filtered navlinks.
+   */
+  setFilteredNavLinks(filteredNavLinks: ReadonlyMap<string, ChromeNavLink>): void;
+
   /**
    * Get the state of a navlink at this point in time.
    * @param id
@@ -116,6 +126,9 @@ type LinksUpdater = (navLinks: Map<string, NavLinkWrapper>) => Map<string, NavLi
 
 export class NavLinksService {
   private readonly stop$ = new ReplaySubject(1);
+  private filteredNavLinks$ = new BehaviorSubject<ReadonlyMap<string, ChromeNavLink> | undefined>(
+    undefined
+  );
 
   public start({ application, http }: StartDeps): ChromeNavLinks {
     const appLinks$ = application.applications$.pipe(
@@ -140,8 +153,8 @@ export class NavLinksService {
           return linkUpdaters.reduce((links, updater) => updater(links), appLinks);
         })
       )
-      .subscribe((navlinks) => {
-        navLinks$.next(navlinks);
+      .subscribe((navLinks) => {
+        navLinks$.next(navLinks);
       });
 
     const forceAppSwitcherNavigation$ = new BehaviorSubject(false);
@@ -151,6 +164,21 @@ export class NavLinksService {
         return navLinks$.pipe(map(sortNavLinks), takeUntil(this.stop$));
       },
 
+      setFilteredNavLinks: (filteredNavLinks: ReadonlyMap<string, ChromeNavLink>) => {
+        this.filteredNavLinks$.next(filteredNavLinks);
+      },
+
+      getFilteredNavLinks$: () => {
+        return combineLatest([navLinks$, this.filteredNavLinks$]).pipe(
+          map(([navLinks, filteredNavLinks]) =>
+            filteredNavLinks === undefined
+              ? sortNavLinks(navLinks)
+              : sortChromeNavLinks(filteredNavLinks)
+          ),
+          takeUntil(this.stop$)
+        );
+      },
+
       get(id: string) {
         const link = navLinks$.value.get(id);
         return link && link.properties;
@@ -215,3 +243,10 @@ function sortNavLinks(navLinks: ReadonlyMap<string, NavLinkWrapper>) {
     'order'
   );
 }
+
+function sortChromeNavLinks(chromeNavLinks: ReadonlyMap<string, ChromeNavLink>) {
+  return sortBy(
+    [...chromeNavLinks.values()].map((link) => link as Readonly<ChromeNavLink>),
+    'order'
+  );
+}