optimize the test code and add newHomePage check

Signed-off-by: yubonluo <[email protected]>

src/plugins/workspace/public/components/workspace_detail/workspace_detail_panel.tsx

@@ -45,11 +45,8 @@ const overview = i18n.translate('workspace.detail.overview', {
 });
 
 function getOwners(currentWorkspace: WorkspaceAttributeWithPermission) {
-  if (currentWorkspace.permissions) {
-    const { groups = [], users = [] } = currentWorkspace.permissions.write;
-    return [...groups, ...users];
-  }
-  return [];
+  const { groups = [], users = [] } = currentWorkspace?.permissions?.write || {};
+  return [...groups, ...users];
 }
 
 interface WorkspaceDetailPanelProps {

src/plugins/workspace/public/plugin.test.ts

@@ -22,6 +22,9 @@ import { workspaceClientMock, WorkspaceClientMock } from './workspace_client.moc
 import { WorkspacePlugin, WorkspacePluginStartDeps } from './plugin';
 import { contentManagementPluginMocks } from '../../content_management/public';
 
+// Expect 6 app registrations: create, fatal error, detail, initial, navigation, and list apps.
+const registrationAppNumber = 6;
+
 describe('Workspace plugin', () => {
   const mockDependencies: WorkspacePluginStartDeps = {
     contentManagement: contentManagementPluginMocks.createStartContract(),
@@ -40,7 +43,7 @@ describe('Workspace plugin', () => {
       savedObjectsManagement: savedObjectManagementSetupMock,
       management: managementPluginMock.createSetupContract(),
     });
-    expect(setupMock.application.register).toBeCalledTimes(6);
+    expect(setupMock.application.register).toBeCalledTimes(registrationAppNumber);
     expect(WorkspaceClientMock).toBeCalledTimes(1);
     expect(savedObjectManagementSetupMock.columns.register).toBeCalledTimes(1);
   });
@@ -53,7 +56,7 @@ describe('Workspace plugin', () => {
     workspacePlugin.start(coreStart, mockDependencies);
     coreStart.workspaces.currentWorkspaceId$.next('foo');
     expect(coreStart.savedObjects.client.setCurrentWorkspace).toHaveBeenCalledWith('foo');
-    expect(setupMock.application.register).toBeCalledTimes(6);
+    expect(setupMock.application.register).toBeCalledTimes(registrationAppNumber);
     expect(WorkspaceClientMock).toBeCalledTimes(1);
     expect(workspaceClientMock.enterWorkspace).toBeCalledTimes(0);
   });
@@ -90,7 +93,7 @@ describe('Workspace plugin', () => {
     await workspacePlugin.setup(setupMock, {
       management: managementPluginMock.createSetupContract(),
     });
-    expect(setupMock.application.register).toBeCalledTimes(6);
+    expect(setupMock.application.register).toBeCalledTimes(registrationAppNumber);
     expect(WorkspaceClientMock).toBeCalledTimes(1);
     expect(workspaceClientMock.enterWorkspace).toBeCalledWith('workspaceId');
     expect(setupMock.getStartServices).toBeCalledTimes(2);

src/plugins/workspace/server/plugin.test.ts

@@ -3,12 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  OnPostAuthHandler,
-  OnPreRoutingHandler,
-  SavedObjectsClientContract,
-} from 'src/core/server';
-import { coreMock, httpServerMock, savedObjectsClientMock } from '../../../core/server/mocks';
+import { OnPostAuthHandler, OnPreRoutingHandler } from 'src/core/server';
+import { coreMock, httpServerMock, uiSettingsServiceMock } from '../../../core/server/mocks';
 import { WorkspacePlugin } from './plugin';
 import { getWorkspaceState, updateWorkspaceState } from '../../../core/server/utils';
 import * as utilsExports from './utils';
@@ -186,6 +182,24 @@ describe('Workspace server plugin', () => {
 
   describe('#setUpRedirectPage', () => {
     const setupMock = coreMock.createSetup();
+    const uiSettingsMock = uiSettingsServiceMock.createClient();
+    setupMock.getStartServices.mockResolvedValue([
+      {
+        ...coreMock.createStart(),
+        uiSettings: {
+          asScopedToClient: () => ({
+            ...uiSettingsMock,
+            get: jest.fn().mockImplementation((key) => {
+              if (key === 'home:useNewHomePage') {
+                return Promise.resolve(true);
+              }
+            }),
+          }),
+        },
+      },
+      {},
+      {},
+    ]);
     const initializerContextConfigMock = coreMock.createPluginInitializerContext({
       enabled: true,
       permission: {
@@ -281,14 +295,21 @@ describe('Workspace server plugin', () => {
       const request = httpServerMock.createOpenSearchDashboardsRequest({
         path: '/',
       });
-      const savedObjectsClient: jest.Mocked<SavedObjectsClientContract> = savedObjectsClientMock.create();
-      const mockUiSettings = {
-        get: jest.fn().mockResolvedValue('default'),
-      };
       setupMock.getStartServices.mockResolvedValue([
         {
-          uiSettings: { asScopedToClient: () => mockUiSettings },
-          savedObjects: { getScopedClient: () => savedObjectsClient },
+          ...coreMock.createStart(),
+          uiSettings: {
+            asScopedToClient: () => ({
+              ...uiSettingsMock,
+              get: jest.fn().mockImplementation((key) => {
+                if (key === 'defaultWorkspace') {
+                  return Promise.resolve('defaultWorkspace');
+                } else if (key === 'home:useNewHomePage') {
+                  return Promise.resolve('true');
+                }
+              }),
+            }),
+          },
         },
         {},
         {},
@@ -302,7 +323,7 @@ describe('Workspace server plugin', () => {
           per_page: 100,
           page: 1,
           workspaces: [
-            { id: 'default', name: 'default-workspace' },
+            { id: 'defaultWorkspace', name: 'default-workspace' },
             { id: 'workspace-2', name: 'workspace-2' },
           ],
         },
@@ -312,10 +333,33 @@ describe('Workspace server plugin', () => {
       await registerOnPostAuthFn(request, response, toolKitMock);
       expect(response.redirected).toBeCalledWith({
         headers: {
-          location: '/mock-server-basepath/w/default/app/workspace_navigation',
+          location: '/mock-server-basepath/w/defaultWorkspace/app/workspace_navigation',
         },
       });
     });
+
+    it('with / request path and home:useNewHomePage is false', async () => {
+      const request = httpServerMock.createOpenSearchDashboardsRequest({
+        path: '/',
+      });
+      setupMock.getStartServices.mockResolvedValue([
+        {
+          ...coreMock.createStart(),
+          uiSettings: {
+            asScopedToClient: () => ({
+              ...uiSettingsMock,
+              get: jest.fn().mockResolvedValue(false),
+            }),
+          },
+        },
+        {},
+        {},
+      ]);
+      const toolKitMock = httpServerMock.createToolkit();
+
+      await registerOnPostAuthFn(request, response, toolKitMock);
+      expect(toolKitMock.next).toBeCalledTimes(1);
+    });
   });
 
   it('#start', async () => {

src/plugins/workspace/server/plugin.ts

@@ -114,6 +114,15 @@ export class WorkspacePlugin implements Plugin<WorkspacePluginSetup, WorkspacePl
     core.http.registerOnPostAuth(async (request, response, toolkit) => {
       const path = request.url.pathname;
       if (path === '/') {
+        const [coreStart] = await core.getStartServices();
+        const uiSettings = coreStart.uiSettings.asScopedToClient(
+          coreStart.savedObjects.getScopedClient(request)
+        );
+        const useNewHomePage = await uiSettings.get('home:useNewHomePage');
+        if (!useNewHomePage) {
+          return toolkit.next();
+        }
+
         const workspaceListResponse = await this.client?.list(
           { request, logger: this.logger },
           { page: 1, perPage: 100 }
@@ -130,10 +139,6 @@ export class WorkspacePlugin implements Plugin<WorkspacePluginSetup, WorkspacePl
               },
             });
           }
-          const [coreStart] = await core.getStartServices();
-          const uiSettings = coreStart.uiSettings.asScopedToClient(
-            coreStart.savedObjects.getScopedClient(request)
-          );
           // Temporarily use defaultWorkspace as a placeholder
           const defaultWorkspaceId = await uiSettings.get('defaultWorkspace');
           const defaultWorkspace = workspaceList.find(