feat: merge

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
ruanyl · Apr 7, 2024 · d5ccfad · d5ccfad
2 parents a5b8c70 + 0f34d69
commit d5ccfad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/core/server/utils/workspace.ts b/src/core/server/utils/workspace.ts
@@ -22,10 +22,6 @@ export const updateWorkspaceState = (
 ) => {
   const rawRequest = ensureRawRequest(request);
 
-  if (!rawRequest.app) {
-    rawRequest.app = {};
-  }
-
   rawRequest.app = {
     ...rawRequest.app,
     ...payload,

diff --git 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);