feat: remove permissionModes in savedobject client find method

Signed-off-by: Lin Wang <wonglam@amazon.com>
ruanyl · Sep 19, 2023 · 9201b6d · 9201b6d
1 parent 6c2a6ae
commit 9201b6d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
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
@@ -30,7 +30,6 @@ import {
   SavedObjectsErrorHelpers,
 } from '../../../../core/server';
 import { SavedObjectsPermissionControlContract } from '../permission_control/client';
-import { WorkspaceFindOptions } from '../types';
 
 const ALL_WORKSPACE_INNER_DATA_PERMISSION_MODES: string[] = [
   WorkspacePermissionMode.LibraryRead,
@@ -360,7 +359,7 @@ export class WorkspaceSavedObjectsClientWrapper {
     };
 
     const findWithWorkspacePermissionControl = async <T = unknown>(
-      options: SavedObjectsFindOptions & Pick<WorkspaceFindOptions, 'permissionModes'>
+      options: SavedObjectsFindOptions
     ) => {
       const principals = this.permissionControl.getPrincipalsFromRequest(wrapperOptions.request);
       if (!options.ACLSearchParams) {

diff --git a/src/plugins/workspace/server/workspace_client.ts b/src/plugins/workspace/server/workspace_client.ts
@@ -116,13 +116,15 @@ export class WorkspaceClientWithSavedObject implements IWorkspaceDBImpl {
     options: WorkspaceFindOptions
   ): ReturnType<IWorkspaceDBImpl['list']> {
     try {
+      const { permissionModes, ...restOptions } = options;
       const {
         saved_objects: savedObjects,
         ...others
       } = await this.getSavedObjectClientsFromRequestDetail(requestDetail).find<WorkspaceAttribute>(
         {
-          ...options,
+          ...restOptions,
           type: WORKSPACE_TYPE,
+          ...(permissionModes ? { ACLSearchParams: { permissionModes } } : {}),
         }
       );
       return {