feat: some special logic on specific operation

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
ruanyl · Mar 22, 2024 · eaeef0c · eaeef0c
1 parent 637c9c4
commit eaeef0c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/src/plugins/workspace/server/saved_objects/workspace_id_consumer_wrapper.ts b/src/plugins/workspace/server/saved_objects/workspace_id_consumer_wrapper.ts
@@ -30,8 +30,8 @@ export class WorkspaceIdConsumerWrapper {
     const workspaceIdParsedFromRequest = workspaceState?.id;
     const workspaceIdsInUserOptions = options?.workspaces;
     let finalWorkspaces: string[] = [];
-    if (options?.hasOwnProperty('workspaces')) {
-      finalWorkspaces = workspaceIdsInUserOptions || [];
+    if (workspaceIdsInUserOptions) {
+      finalWorkspaces = workspaceIdsInUserOptions;
     } else if (workspaceIdParsedFromRequest) {
       finalWorkspaces = [workspaceIdParsedFromRequest];
     }

diff --git a/src/plugins/workspace/server/saved_objects/workspace_saved_objects_client_wrapper.ts b/src/plugins/workspace/server/saved_objects/workspace_saved_objects_client_wrapper.ts
@@ -468,6 +468,9 @@ export class WorkspaceSavedObjectsClientWrapper {
                 [WorkspacePermissionMode.LibraryRead, WorkspacePermissionMode.LibraryWrite]
               ),
             },
+            // By declaring workspaces as empty array,
+            // workspaces won't be appended automatically into the options.
+            workspaces: [],
           })
         ).saved_objects.map((item) => item.id);
 

diff --git a/src/plugins/workspace/server/workspace_client.ts b/src/plugins/workspace/server/workspace_client.ts
@@ -50,7 +50,15 @@ export class WorkspaceClient implements IWorkspaceClientImpl {
     requestDetail: IRequestDetail
   ): SavedObjectsClientContract | undefined {
     return this.savedObjects?.getScopedClient(requestDetail.request, {
-      excludedWrappers: [WORKSPACE_SAVED_OBJECTS_CLIENT_WRAPPER_ID],
+      excludedWrappers: [
+        WORKSPACE_SAVED_OBJECTS_CLIENT_WRAPPER_ID,
+        /**
+         * workspace object does not have workspaces field
+         * so need to bypass workspace id consumer wrapper
+         * for any kind of operation to saved objects client.
+         */
+        WORKSPACE_ID_CONSUMER_WRAPPER_ID,
+      ],
       includedHiddenTypes: [WORKSPACE_TYPE],
     });
   }
@@ -59,12 +67,6 @@ export class WorkspaceClient implements IWorkspaceClientImpl {
     requestDetail: IRequestDetail
   ): SavedObjectsClientContract {
     return this.savedObjects?.getScopedClient(requestDetail.request, {
-      /**
-       * workspace object does not have workspaces field
-       * so need to bypass the consumer wrapper
-       * or it will append workspaces into the options.workspaces
-       * when list all the workspaces inside a workspace
-       */
       excludedWrappers: [WORKSPACE_ID_CONSUMER_WRAPPER_ID],
       includedHiddenTypes: [WORKSPACE_TYPE],
     }) as SavedObjectsClientContract;