optimize the code

Signed-off-by: yubonluo <[email protected]>
opensearch-project · Aug 22, 2024 · ae926a2 · ae926a2
1 parent 0ebb64e
commit ae926a2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/src/plugins/workspace/public/plugin.ts b/src/plugins/workspace/public/plugin.ts
@@ -386,10 +386,7 @@ export class WorkspacePlugin
       async mount() {
         const [coreStart] = await core.getStartServices();
         const { application, http, workspaces } = coreStart;
-        const urlParams = new URLSearchParams(location.search);
-        const navigateWorkspaceId = urlParams.get('workspaceId');
-        const workspaceList = workspaces.workspaceList$.getValue();
-        const workspace = workspaceList.find((ws) => ws.id === navigateWorkspaceId);
+        const workspace = workspaces.currentWorkspace$.getValue();
         if (workspace) {
           const availableUseCases = registeredUseCases$.getValue();
           const currentUseCase = availableUseCases.find(
@@ -402,7 +399,7 @@ export class WorkspacePlugin
         }
         return () => {};
       },
-      workspaceAvailability: WorkspaceAvailability.outsideWorkspace,
+      workspaceAvailability: WorkspaceAvailability.insideWorkspace,
     });
 
     // workspace list

diff --git a/src/plugins/workspace/server/plugin.test.ts b/src/plugins/workspace/server/plugin.test.ts
@@ -3,8 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { OnPostAuthHandler, OnPreRoutingHandler } from 'src/core/server';
-import { coreMock, httpServerMock } from '../../../core/server/mocks';
+import {
+  OnPostAuthHandler,
+  OnPreRoutingHandler,
+  SavedObjectsClientContract,
+} from 'src/core/server';
+import { coreMock, httpServerMock, savedObjectsClientMock } from '../../../core/server/mocks';
 import { WorkspacePlugin } from './plugin';
 import { getWorkspaceState, updateWorkspaceState } from '../../../core/server/utils';
 import * as utilsExports from './utils';
@@ -240,7 +244,7 @@ describe('Workspace server plugin', () => {
       await registerOnPostAuthFn(request, response, toolKitMock);
       expect(response.redirected).toBeCalledWith({
         headers: {
-          location: '/mock-server-basepath/app/workspace_navigation/?workspaceId=workspace-1',
+          location: '/mock-server-basepath/w/workspace-1/app/workspace_navigation',
         },
       });
     });
@@ -277,13 +281,14 @@ 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: () => null },
+          savedObjects: { getScopedClient: () => savedObjectsClient },
         },
         {},
         {},
@@ -307,7 +312,7 @@ describe('Workspace server plugin', () => {
       await registerOnPostAuthFn(request, response, toolKitMock);
       expect(response.redirected).toBeCalledWith({
         headers: {
-          location: '/mock-server-basepath/app/workspace_navigation/?workspaceId=default',
+          location: '/mock-server-basepath/w/default/app/workspace_navigation',
         },
       });
     });

diff --git a/src/plugins/workspace/server/plugin.ts b/src/plugins/workspace/server/plugin.ts
@@ -126,7 +126,7 @@ export class WorkspacePlugin implements Plugin<WorkspacePluginSetup, WorkspacePl
           if (workspaceList.length === 1) {
             return response.redirected({
               headers: {
-                location: `${basePath}/app/${WORKSPACE_NAVIGATION_APP_ID}/?workspaceId=${workspaceList[0].id}`,
+                location: `${basePath}/w/${workspaceList[0].id}/app/${WORKSPACE_NAVIGATION_APP_ID}`,
               },
             });
           }
@@ -144,7 +144,7 @@ export class WorkspacePlugin implements Plugin<WorkspacePluginSetup, WorkspacePl
           if (defaultWorkspace) {
             return response.redirected({
               headers: {
-                location: `${basePath}/app/${WORKSPACE_NAVIGATION_APP_ID}/?workspaceId=${defaultWorkspace.id}`,
+                location: `${basePath}/w/${defaultWorkspace.id}/app/${WORKSPACE_NAVIGATION_APP_ID}`,
               },
             });
           } else {