Fix bulk deleting roles without permissions

hasura · Mar 25, 2020 · 84298d4 · 84298d4
1 parent 94b3550
commit 84298d4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -95,3 +95,4 @@
 - server: add 'ID' to default scalars in custom types (fix #4061)
 - console: add design system base components (#3866)
 - docs: add docs for redeliver_event API
+- console: fix bulk deleting roles without permissions (#4193)
diff --git a/console/src/components/Services/Data/TablePermissions/Permissions.js b/console/src/components/Services/Data/TablePermissions/Permissions.js
@@ -286,6 +286,8 @@ class Permissions extends Component {
       };
 
       const getPermissionsTableBody = () => {
+        const rolePermissions = getTablePermissionsByRoles(tableSchema);
+
         const getBulkCheckbox = (role, isNewRole) => {
           const dispatchBulkSelect = e => {
             const isChecked = e.target.checked;
@@ -294,7 +296,10 @@ class Permissions extends Component {
           };
 
           return {
-            showCheckbox: !(role === 'admin' || isNewRole),
+            showCheckbox:
+              role !== 'admin' &&
+              !isNewRole &&
+              Object.keys(rolePermissions).includes(role),
             bulkSelect: permissionsState.bulkSelect,
             onChange: dispatchBulkSelect,
             role,
@@ -335,8 +340,6 @@ class Permissions extends Component {
           const getRoleQueryPermission = queryType => {
             let _permission;
 
-            const rolePermissions = getTablePermissionsByRoles(tableSchema);
-
             if (role === 'admin') {
               _permission = permissionsSymbols.fullAccess;
             } else if (!Object.keys(rolePermissions).includes(role)) {