Handle other permission group types (#1715) (#1718)

Signed-off-by: Craig Perkins <[email protected]> (cherry picked from commit ac38d9d) Co-authored-by: Craig Perkins <[email protected]>
opensearch-project · Jan 4, 2024 · 3b18f53 · 3b18f53
1 parent 45dc18e
commit 3b18f53
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/public/apps/configuration/panels/role-edit/role-edit.tsx b/public/apps/configuration/panels/role-edit/role-edit.tsx
@@ -176,7 +176,9 @@ export function RoleEdit(props: RoleEditDeps) {
     {
       label: 'Other permission groups',
       options: actionGroups
-        .filter((actionGroup) => actionGroup[1].type === undefined)
+        .filter(
+          (actionGroup) => !['cluster', 'index', 'kibana'].includes(actionGroup[1].type || '')
+        )
         .map((actionGroup) => actionGroup[0])
         .map(stringToComboBoxOption),
     },
@@ -197,7 +199,9 @@ export function RoleEdit(props: RoleEditDeps) {
     {
       label: 'Other permission groups',
       options: actionGroups
-        .filter((actionGroup) => actionGroup[1].type === undefined)
+        .filter(
+          (actionGroup) => !['cluster', 'index', 'kibana'].includes(actionGroup[1].type || '')
+        )
         .map((actionGroup) => actionGroup[0])
         .map(stringToComboBoxOption),
     },

diff --git a/public/apps/configuration/panels/role-edit/test/role-edit-filtering.test.tsx b/public/apps/configuration/panels/role-edit/test/role-edit-filtering.test.tsx
@@ -74,6 +74,14 @@ describe('Role edit filtering', () => {
       description: 'Custom group',
       static: true,
     },
+    unlimited: {
+      reserved: false,
+      hidden: false,
+      allowed_actions: ['*'],
+      type: 'all',
+      description: 'Unlimited group',
+      static: true,
+    },
   });
 
   it('basic cluster permission panel rendering', async () => {
@@ -118,6 +126,9 @@ describe('Role edit filtering', () => {
           {
             label: 'custom',
           },
+          {
+            label: 'unlimited',
+          },
         ],
       },
       {
@@ -171,6 +182,9 @@ describe('Role edit filtering', () => {
           {
             label: 'custom',
           },
+          {
+            label: 'unlimited',
+          },
         ],
       },
       {