fix: token issue when creating specific/all buckets token (#3835)

* fix: token issue when creating specific/all buckets token

* fix: tokens permission selection for all bucekts/telegrafs and specific ones

* fix: prettier

* fix: permissions test

Author: Palakp41

src/authorizations/components/EditResourceAccordion.tsx

@@ -21,9 +21,10 @@ const Filter = FilterList<Resource>()
 export class EditResourceAccordion extends Component<Props> {
   public render() {
     const {permissions} = this.props
-    if (!permissions) {
+    if (!permissions || isEmpty(permissions)) {
       return null
     }
+
     const allResourceNames = formatResources(Object.keys(permissions))
 
     return (
@@ -37,15 +38,16 @@ export class EditResourceAccordion extends Component<Props> {
             return (
               <Accordion key={resource} expanded={true}>
                 <ResourceAccordionHeader resourceName={resourceName} />
-                {isEmpty(permissions[resource].sublevelPermissions) ? (
+                {this.hideAllAccordion(permissions[resource]) ? null : (
                   <AllAccordionBody
                     resourceName={resourceName}
                     permissions={permissions[resource]}
                     disabled={true}
                   />
-                ) : (
-                  this.getAccordionBody(resourceName, resource)
                 )}
+                {this.hideAccordionBody(permissions[resource])
+                  ? this.getAccordionBody(resourceName, resource)
+                  : null}
               </Accordion>
             )
           }
@@ -60,6 +62,24 @@ export class EditResourceAccordion extends Component<Props> {
     )
   }
 
+  hideAllAccordion = resource => {
+    // if all resource read or all resource write is selected then don't hide all accordion body
+    if (!resource.read && !resource.write) {
+      return true
+    }
+    return false
+  }
+
+  hideAccordionBody = resource => {
+    // if all resource read and all resource write is selected then collapse accordion body
+    if (resource.read && resource.write) {
+      return false
+    } else if (isEmpty(resource.sublevelPermissions)) {
+      return false
+    }
+    return true
+  }
+
   getOtherResourceAccordionBody = allResourceNames => {
     const {permissions, searchTerm} = this.props
     const resourcePermissions = []

src/authorizations/components/ResourceAccordion.tsx

@@ -58,7 +58,7 @@ class ResourceAccordion extends Component<OwnProps> {
                   onToggleAll={onToggleAll}
                   disabled={false}
                 />
-                {!permissions[resource].read && !permissions[resource].write
+                {this.isCollapsible(resource)
                   ? !isEmpty(permissions[resource].sublevelPermissions) &&
                     this.getAccordionBody(resourceName, resource)
                   : null}
@@ -80,8 +80,7 @@ class ResourceAccordion extends Component<OwnProps> {
               onToggleAll={onToggleAll}
               disabled={false}
             />
-            {!permissions.otherResources.read &&
-            !permissions.otherResources.write
+            {this.isCollapsible('otherResources')
               ? this.otherResourcesAccordionBody()
               : null}
           </DapperScrollbars>
@@ -90,6 +89,15 @@ class ResourceAccordion extends Component<OwnProps> {
     )
   }
 
+  isCollapsible = resource => {
+    const {permissions} = this.props
+    // if all resource read and all resource write is selected then collapse accordion body
+    if (permissions[resource].read && permissions[resource].write) {
+      return false
+    }
+    return true
+  }
+
   otherResourcesAccordionBody = () => {
     const {onToggleAll, resources, permissions} = this.props
     const resourcePermissions = []

src/authorizations/utils/permissions.test.ts

@@ -805,8 +805,8 @@ const nonAllAcessAccordionPerms = {
 
 const nonAllAcessAccordionPerms2 = {
   buckets: {
-    read: true,
-    write: true,
+    read: false,
+    write: false,
     sublevelPermissions: {
       '25a6692ba25d7147': {
         id: '25a6692ba25d7147',
@@ -888,11 +888,6 @@ describe('Testing formatPermissionsObj function', () => {
       nonAllAcessAccordionPerms2
     )
   })
-  test('if all sublevel permissions are true, it updates the top level perms to true', () => {
-    expect(formatPermissionsObj(nonAllAcessApiPerms)).toEqual(
-      nonAllAcessAccordionPerms2
-    )
-  })
   test('for all access permissions, it creates an all access accordion api permission', () => {
     expect(formatPermissionsObj(orgsApiPerm)).toMatchObject(orgsAccordionPerm)
   })

src/authorizations/utils/permissions.ts

@@ -158,34 +158,14 @@ export const formatPermissionsObj = permissions => {
         accordionPermission = {
           read: action === 'read',
           write: action === 'write',
+          sublevelPermissions: {},
         }
       }
     }
 
     return {...acc, [type]: accordionPermission}
   }, {})
 
-  Object.keys(newPerms).forEach(resource => {
-    const accordionPermission = {...newPerms[resource]}
-    if (accordionPermission.sublevelPermissions) {
-      accordionPermission.read = Object.keys(
-        accordionPermission.sublevelPermissions
-      ).every(
-        key =>
-          accordionPermission.sublevelPermissions[key].permissions.read === true
-      )
-
-      accordionPermission.write = Object.keys(
-        accordionPermission.sublevelPermissions
-      ).every(
-        key =>
-          accordionPermission.sublevelPermissions[key].permissions.write ===
-          true
-      )
-
-      newPerms[resource] = accordionPermission
-    }
-  })
   return newPerms
 }