Fix group permissions convert (opensearch-project#321)

Signed-off-by: Lin Wang <wonglam@amazon.com>
raintygao · Apr 8, 2024 · e2a8ae2 · e2a8ae2
1 parent 4fc9e70
commit e2a8ae2
Show file tree

Hide file tree

Showing 2 changed files with 99 additions and 32 deletions.
diff --git a/src/plugins/workspace/public/components/workspace_form/utils.test.ts b/src/plugins/workspace/public/components/workspace_form/utils.test.ts
@@ -0,0 +1,70 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { WorkspacePermissionMode } from '../../../common/constants';
+import { WorkspacePermissionItemType } from './constants';
+import {
+  convertPermissionSettingsToPermissions,
+  convertPermissionsToPermissionSettings,
+} from './utils';
+
+describe('convertPermissionSettingsToPermissions', () => {
+  it('should return undefined if permission items not provided', () => {
+    expect(convertPermissionSettingsToPermissions(undefined)).toBeUndefined();
+    expect(convertPermissionSettingsToPermissions([])).toBeUndefined();
+  });
+
+  it('should return consistent permission settings', () => {
+    expect(
+      convertPermissionSettingsToPermissions([
+        {
+          type: WorkspacePermissionItemType.User,
+          userId: 'foo',
+          modes: [WorkspacePermissionMode.LibraryRead, WorkspacePermissionMode.Read],
+        },
+        {
+          type: WorkspacePermissionItemType.Group,
+          group: 'bar',
+          modes: [WorkspacePermissionMode.LibraryWrite],
+        },
+      ])
+    ).toEqual({
+      library_read: { users: ['foo'] },
+      library_write: { groups: ['bar'] },
+      read: { users: ['foo'] },
+    });
+  });
+});
+
+describe('convertPermissionsToPermissionSettings', () => {
+  it('should return consistent permission settings', () => {
+    expect(
+      convertPermissionsToPermissionSettings({
+        library_read: { users: ['foo'] },
+        library_write: { groups: ['bar'] },
+        read: { users: ['foo'] },
+        write: { groups: ['bar'] },
+      })
+    ).toEqual([
+      {
+        type: WorkspacePermissionItemType.User,
+        userId: 'foo',
+        modes: [WorkspacePermissionMode.LibraryRead, WorkspacePermissionMode.Read],
+      },
+      {
+        type: WorkspacePermissionItemType.Group,
+        group: 'bar',
+        modes: [WorkspacePermissionMode.LibraryWrite, WorkspacePermissionMode.Write],
+      },
+    ]);
+  });
+  it('should only convert workspace supported permissions', () => {
+    expect(
+      convertPermissionsToPermissionSettings({
+        another_read: { users: ['foo'] },
+      })
+    ).toEqual([]);
+  });
+});
diff --git a/src/plugins/workspace/public/components/workspace_form/utils.ts b/src/plugins/workspace/public/components/workspace_form/utils.ts
@@ -136,38 +136,35 @@ export const convertPermissionsToPermissionSettings = (permissions: SavedObjectP
     if (!isWorkspacePermissionMode(mode)) {
       return;
     }
-    if (permissions[mode].users) {
-      permissions[mode].users?.forEach((userId) => {
-        const settingTypeKey = `userId-${userId}`;
-        const modes = settingType2Modes[settingTypeKey] ? settingType2Modes[settingTypeKey] : [];
-
-        modes.push(mode);
-        if (modes.length === 1) {
-          userPermissionSettings.push({
-            type: WorkspacePermissionItemType.User,
-            userId,
-            modes,
-          });
-          settingType2Modes[settingTypeKey] = modes;
-        }
-      });
-      permissions[mode].groups?.forEach((group) => {
-        const settingTypeKey = `group-${group}`;
-        const modes = settingType2Modes[settingTypeKey] ? settingType2Modes[settingTypeKey] : [];
-
-        modes.push(mode);
-        if (modes.length === 1) {
-          userPermissionSettings.push({
-            type: WorkspacePermissionItemType.Group,
-            group,
-            modes,
-          });
-        }
-      });
-    }
+    permissions[mode].users?.forEach((userId) => {
+      const settingTypeKey = `userId-${userId}`;
+      const modes = settingType2Modes[settingTypeKey] ?? [];
+
+      modes.push(mode);
+      if (modes.length === 1) {
+        userPermissionSettings.push({
+          type: WorkspacePermissionItemType.User,
+          userId,
+          modes,
+        });
+        settingType2Modes[settingTypeKey] = modes;
+      }
+    });
+    permissions[mode].groups?.forEach((group) => {
+      const settingTypeKey = `group-${group}`;
+      const modes = settingType2Modes[settingTypeKey] ?? [];
+
+      modes.push(mode);
+      if (modes.length === 1) {
+        groupPermissionSettings.push({
+          type: WorkspacePermissionItemType.Group,
+          group,
+          modes,
+        });
+        settingType2Modes[settingTypeKey] = modes;
+      }
+    });
   });
 
-  return [...userPermissionSettings, ...groupPermissionSettings].filter(
-    isValidWorkspacePermissionSetting
-  );
+  return [...userPermissionSettings, ...groupPermissionSettings];
 };