feat: do not append workspaces field when no workspaces present (#6)

* feat: do not append workspaces field when no workspaces present Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: do not append workspaces field when no workspaces present Signed-off-by: SuZhou-Joe <suzhou@amazon.com> --------- Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
SuZhou-Joe · Mar 7, 2024 · 7ba2d5e · 7ba2d5e
1 parent e7279f9
commit 7ba2d5e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/src/plugins/workspace/server/saved_objects/workspace_saved_objects_client_wrapper.test.ts b/src/plugins/workspace/server/saved_objects/workspace_saved_objects_client_wrapper.test.ts
@@ -556,8 +556,6 @@ describe('WorkspaceSavedObjectsClientWrapper', () => {
         });
         expect(clientMock.find).toHaveBeenCalledWith({
           type: 'dashboard',
-          workspaces: ['workspace-1'],
-          workspacesSearchOperator: 'OR',
           ACLSearchParams: {
             permissionModes: ['read', 'write'],
             principals: { users: ['user-1'] },

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
@@ -495,12 +495,9 @@ export class WorkspaceSavedObjectsClientWrapper {
           options.workspaces = permittedWorkspaces;
         } else {
           /**
-           * Select all the docs that
-           * 1. ACL matches read / write / user passed permission OR
-           * 2. workspaces matches library_read or library_write OR
+           * If no workspaces present, find all the docs that
+           * ACL matches read / write / user passed permission
            */
-          options.workspaces = permittedWorkspaceIds;
-          options.workspacesSearchOperator = 'OR';
           options.ACLSearchParams.permissionModes = getDefaultValuesForEmpty(
             options.ACLSearchParams.permissionModes,
             [WorkspacePermissionMode.Read, WorkspacePermissionMode.Write]