From ee245d7b74e57988a492983faa86dbb25dc077fb Mon Sep 17 00:00:00 2001
From: SuZhou-Joe <suzhou@amazon.com>
Date: Sun, 7 Apr 2024 15:29:16 +0800
Subject: [PATCH 1/2] fix: unit test (#318)

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
---
 src/plugins/workspace/public/plugin.test.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/workspace/public/plugin.test.ts b/src/plugins/workspace/public/plugin.test.ts
index 428d7bbc7d7..fc16bc20734 100644
--- a/src/plugins/workspace/public/plugin.test.ts
+++ b/src/plugins/workspace/public/plugin.test.ts
@@ -23,7 +23,7 @@ describe('Workspace plugin', () => {
     await workspacePlugin.setup(setupMock, {
       savedObjectsManagement: savedObjectManagementSetupMock,
     });
-    expect(setupMock.application.register).toBeCalledTimes(4);
+    expect(setupMock.application.register).toBeCalledTimes(5);
     expect(WorkspaceClientMock).toBeCalledTimes(1);
     expect(workspaceClientMock.enterWorkspace).toBeCalledTimes(0);
     expect(savedObjectManagementSetupMock.columns.register).toBeCalledTimes(1);
@@ -61,7 +61,7 @@ describe('Workspace plugin', () => {
     await workspacePlugin.setup(setupMock, {
       savedObjectsManagement: savedObjectsManagementPluginMock.createSetupContract(),
     });
-    expect(setupMock.application.register).toBeCalledTimes(4);
+    expect(setupMock.application.register).toBeCalledTimes(5);
     expect(WorkspaceClientMock).toBeCalledTimes(1);
     expect(workspaceClientMock.enterWorkspace).toBeCalledWith('workspaceId');
     expect(setupMock.getStartServices).toBeCalledTimes(1);

From 0f34d69d665366345c2a51b5b8a1b5aea940dab4 Mon Sep 17 00:00:00 2001
From: SuZhou-Joe <suzhou@amazon.com>
Date: Sun, 7 Apr 2024 15:29:51 +0800
Subject: [PATCH 2/2] [Workspace] Add APIs to support plugin state in request
 (#6303) (#315)

* feat: add APIs to support plugin state in request (#312)

* feat: add APIs to support plugin state in request



* feat: add APIs to support plugin state in request



---------



* feat: update CHANGELOG



* feat: update



* feat: use request app to store request workspace id



* feat: remove useless if



---------

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
---
 src/core/server/utils/workspace.test.ts |  4 ++--
 src/core/server/utils/workspace.ts      | 31 ++++++++++---------------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/src/core/server/utils/workspace.test.ts b/src/core/server/utils/workspace.test.ts
index 49382cfac38..7dfcff9e5d1 100644
--- a/src/core/server/utils/workspace.test.ts
+++ b/src/core/server/utils/workspace.test.ts
@@ -10,10 +10,10 @@ describe('updateWorkspaceState', () => {
   it('update with payload', () => {
     const requestMock = httpServerMock.createOpenSearchDashboardsRequest();
     updateWorkspaceState(requestMock, {
-      id: 'foo',
+      requestWorkspaceId: 'foo',
     });
     expect(getWorkspaceState(requestMock)).toEqual({
-      id: 'foo',
+      requestWorkspaceId: 'foo',
     });
   });
 });
diff --git a/src/core/server/utils/workspace.ts b/src/core/server/utils/workspace.ts
index c5dcf84b92d..2003e615d50 100644
--- a/src/core/server/utils/workspace.ts
+++ b/src/core/server/utils/workspace.ts
@@ -3,14 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * This file is using {@link PluginsStates} to store workspace info into request.
- * The best practice would be using {@link Server.register} to register plugins into the hapi server
- * but OSD is wrappering the hapi server and the hapi server instance is hidden as internal implementation.
- */
-import { PluginsStates } from '@hapi/hapi';
 import { OpenSearchDashboardsRequest, ensureRawRequest } from '../http/router';
 
+export interface WorkspaceState {
+  requestWorkspaceId?: string;
+}
+
 /**
  * This function will be used as a proxy
  * because `ensureRequest` is only importable from core module.
@@ -20,24 +18,19 @@ import { OpenSearchDashboardsRequest, ensureRawRequest } from '../http/router';
  */
 export const updateWorkspaceState = (
   request: OpenSearchDashboardsRequest,
-  payload: Partial<PluginsStates['workspace']>
+  payload: Partial<WorkspaceState>
 ) => {
   const rawRequest = ensureRawRequest(request);
 
-  if (!rawRequest.plugins) {
-    rawRequest.plugins = {};
-  }
-
-  if (!rawRequest.plugins.workspace) {
-    rawRequest.plugins.workspace = {};
-  }
-
-  rawRequest.plugins.workspace = {
-    ...rawRequest.plugins.workspace,
+  rawRequest.app = {
+    ...rawRequest.app,
     ...payload,
   };
 };
 
-export const getWorkspaceState = (request: OpenSearchDashboardsRequest) => {
-  return ensureRawRequest(request).plugins?.workspace;
+export const getWorkspaceState = (request: OpenSearchDashboardsRequest): WorkspaceState => {
+  const { requestWorkspaceId } = ensureRawRequest(request).app as WorkspaceState;
+  return {
+    requestWorkspaceId,
+  };
 };