Some minor change

Signed-off-by: gaobinlong <[email protected]>
gaobinlong · Sep 22, 2023 · c180e87 · c180e87
1 parent ab08ab9
commit c180e87
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 3 deletions.
diff --git a/src/core/server/saved_objects/permission_control/acl.test.ts b/src/core/server/saved_objects/permission_control/acl.test.ts
@@ -5,7 +5,7 @@
 
 import { Principals, Permissions, ACL } from './acl';
 
-describe('SavedObjectTypeRegistry', () => {
+describe('acl', () => {
   it('test has permission', () => {
     const principals: Principals = {
       users: ['user1'],
@@ -129,7 +129,7 @@ describe('SavedObjectTypeRegistry', () => {
     expect(result).toEqual({});
   });
 
-  it('test transform permission', () => {
+  it('test toFlatList', () => {
     const principals: Principals = {
       users: ['user1'],
       groups: ['group1', 'group2'],
@@ -257,5 +257,41 @@ describe('SavedObjectTypeRegistry', () => {
         },
       },
     });
+
+    result = ACL.generateGetPermittedSavedObjectsQueryDSL(['read'], principals);
+    expect(result).toEqual({
+      query: {
+        bool: {
+          filter: [
+            {
+              bool: {
+                should: [
+                  {
+                    terms: {
+                      'permissions.read.users': ['user1'],
+                    },
+                  },
+                  {
+                    term: {
+                      'permissions.read.users': '*',
+                    },
+                  },
+                  {
+                    terms: {
+                      'permissions.read.groups': ['group1'],
+                    },
+                  },
+                  {
+                    term: {
+                      'permissions.read.groups': '*',
+                    },
+                  },
+                ],
+              },
+            },
+          ],
+        },
+      },
+    });
   });
 });
diff --git a/src/core/server/saved_objects/permission_control/acl.ts b/src/core/server/saved_objects/permission_control/acl.ts
@@ -138,7 +138,8 @@ export class ACL {
   }
 
   /**
-   * transform permissions format
+   * transform permissions format, change the format from permissionType->principals to principal->permissionTypes,
+   * which is used to clearyly dispaly user/group list and their granted permissions in the UI
    * original permissions:   {
    *     read: {
    *         users:['user1']