From 200232b7a3938bf98c0028cb793a6fa550397fb0 Mon Sep 17 00:00:00 2001
From: rikinsk <rikin.kachhia@gmail.com>
Date: Fri, 22 Feb 2019 22:21:24 +0530
Subject: [PATCH 1/3] update console permissions

---
 .../Services/Data/TableModify/Modify.scss     | 25 +++++---
 .../Services/Data/TablePermissions/Actions.js |  6 +-
 .../Data/TablePermissions/Permissions.js      | 57 ++++++++++---------
 3 files changed, 51 insertions(+), 37 deletions(-)

diff --git a/console/src/components/Services/Data/TableModify/Modify.scss b/console/src/components/Services/Data/TableModify/Modify.scss
index 11890a3322c08..0ea740ea1a607 100644
--- a/console/src/components/Services/Data/TableModify/Modify.scss
+++ b/console/src/components/Services/Data/TableModify/Modify.scss
@@ -183,9 +183,10 @@ hr
   .newRoleTd {
     padding-top: 13px;
   }
-  .permissionDelete {
-    cursor: pointer;
-  }
+  //.permissionDelete {
+  //  cursor: pointer;
+  //  margin-left: 10px;
+  //}
 
   .editPermissionLink {
     font-size: 12px;
@@ -195,10 +196,6 @@ hr
     cursor: pointer;
   }
 
-  .bulkSelect {
-    margin-right: 10px !important;
-  }
-
   .clickableCell {
     cursor: pointer;
   }
@@ -225,6 +222,20 @@ hr
   }
 }
 
+.permissionSymbolNA {
+  color: firebrick;
+}
+
+.permissionSymbolFA {
+  color: green;
+}
+
+.permissionSymbolNA,
+.permissionSymbolFA,
+.permissionSymbolPA {
+  font-size: 16px;
+}
+
 .applyBulkPermissions {
   display: inline-block;
 }
diff --git a/console/src/components/Services/Data/TablePermissions/Actions.js b/console/src/components/Services/Data/TablePermissions/Actions.js
index 404e65ffaf9ff..f244e055ac001 100644
--- a/console/src/components/Services/Data/TablePermissions/Actions.js
+++ b/console/src/components/Services/Data/TablePermissions/Actions.js
@@ -418,9 +418,9 @@ const permRemoveMultipleRoles = tableSchema => {
     // Apply migration
     const migrationName = 'remove_roles_' + currentSchema + '_table_' + table;
 
-    const requestMsg = 'Removing roles...';
-    const successMsg = 'Roles removed';
-    const errorMsg = 'Removing roles failed';
+    const requestMsg = 'Removing permissions...';
+    const successMsg = 'Permissions removed';
+    const errorMsg = 'Removing permissions failed';
 
     const customOnSuccess = () => {
       // reset new role name
diff --git a/console/src/components/Services/Data/TablePermissions/Permissions.js b/console/src/components/Services/Data/TablePermissions/Permissions.js
index b5fe24caa7c68..20d134cef7325 100644
--- a/console/src/components/Services/Data/TablePermissions/Permissions.js
+++ b/console/src/components/Services/Data/TablePermissions/Permissions.js
@@ -389,38 +389,41 @@ class Permissions extends Component {
         dispatch(permSetBulkSelect(isChecked, selectedRole));
       };
 
-      const dispatchDeletePermission = () => {
-        const isConfirm = window.confirm(
-          'Are you sure you want to delete the permission for role ' + role + '?'
-        );
-        if (isConfirm) {
-          dispatch(permRemoveRole(tableSchema, role));
-        }
-      };
+      // const dispatchDeletePermission = () => {
+      //   const isConfirm = window.confirm(
+      //     'Are you sure you want to delete the permission for role ' + role + '?'
+      //   );
+      //   if (isConfirm) {
+      //     dispatch(permRemoveRole(tableSchema, role));
+      //   }
+      // };
 
       const _permissionsRowHtml = [];
       if (role === 'admin' || role === '') {
         _permissionsRowHtml.push(<td key={-1} />);
       } else {
         const bulkSelect = permsState.bulkSelect;
-        const currentInputSelection = (
-          <input
-            onChange={dispatchBulkSelect}
-            checked={bulkSelect.filter(e => e === role).length}
-            data-role={role}
-            className={styles.bulkSelect}
-            type="checkbox"
-          />
-        );
+
+        // const deleteIcon = (
+        //   <i
+        //     onClick={dispatchDeletePermission}
+        //     className={styles.permissionDelete + ' fa fa-close'}
+        //     title="Remove all permissions"
+        //     aria-hidden="true"
+        //   />
+        // );
+
         _permissionsRowHtml.push(
           <td key={-1}>
             <div>
-              {currentInputSelection}
-              <i
-                onClick={dispatchDeletePermission}
-                className={styles.permissionDelete + ' fa fa-trash'}
-                aria-hidden="true"
+              <input
+                onChange={dispatchBulkSelect}
+                checked={bulkSelect.filter(e => e === role).length}
+                data-role={role}
+                title="Select for bulk actions"
+                type="checkbox"
               />
+              {/*{deleteIcon}*/}
             </div>
           </td>
         );
@@ -472,7 +475,7 @@ class Permissions extends Component {
             key={i}
             className={className}
             onClick={onClick}
-            title="Click to edit permissions"
+            title="Edit permissions"
             data-test={`${role}-${queryType}`}
           >
             {getRoleQueryPermission(
@@ -595,9 +598,9 @@ class Permissions extends Component {
 
     const getPermissionsTable = (tableSchema, queryTypes, permsState, roleList) => {
       const permissionsSymbols = {
-        fullAccess: <i className="fa fa-check" aria-hidden="true" />,
-        noAccess: <i className="fa fa-times" aria-hidden="true" />,
-        partialAccess: <i className="fa fa-filter" aria-hidden="true" />,
+        fullAccess: <i className={'fa fa-check ' + styles.permissionSymbolFA} aria-hidden="true" />,
+        noAccess: <i className={'fa fa-times ' + styles.permissionSymbolNA} aria-hidden="true" />,
+        partialAccess: <i className={'fa fa-filter ' + styles.permissionSymbolPA} aria-hidden="true" />,
       };
 
       return (
@@ -1726,7 +1729,7 @@ class Permissions extends Component {
           </div>
           <div className={styles.padd_bottom}>
             <Button onClick={handleBulkRemoveClick} color="red" size="sm">
-              Remove Permissions
+              Remove All Permissions
             </Button>
           </div>
         </div>

From 92340abe528a2f980e32aa5108b5c43cf1c1067a Mon Sep 17 00:00:00 2001
From: rikinsk <rikin.kachhia@gmail.com>
Date: Sun, 24 Feb 2019 01:32:51 +0530
Subject: [PATCH 2/3] fix new role input value

---
 .../Services/Data/TablePermissions/Permissions.js   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/console/src/components/Services/Data/TablePermissions/Permissions.js b/console/src/components/Services/Data/TablePermissions/Permissions.js
index 20d134cef7325..477241edcfc40 100644
--- a/console/src/components/Services/Data/TablePermissions/Permissions.js
+++ b/console/src/components/Services/Data/TablePermissions/Permissions.js
@@ -358,13 +358,14 @@ class Permissions extends Component {
     const getPermissionsTableRow = (
       tableSchema,
       role,
+      roleList,
       queryTypes,
       permissionsSymbols,
       permsState,
-      isNewPerm
+      newPermRow
     ) => {
       const dispatchOpenEdit = queryType => () => {
-        if (isNewPerm && permsState.newRole !== '') {
+        if (newPermRow && permsState.newRole !== '') {
           dispatch(permOpenEdit(tableSchema, permsState.newRole, queryType));
         } else if (role !== '') {
           const allowInsertPermColumns = semverCheck('insertPermRestrictColumns', this.props.serverVersion);
@@ -429,7 +430,9 @@ class Permissions extends Component {
         );
       }
 
-      if (isNewPerm) {
+      if (newPermRow) {
+        const isNewRole = !roleList.includes(permsState.newRole);
+
         _permissionsRowHtml.push(
           <td key={-2}>
             <input
@@ -438,7 +441,7 @@ class Permissions extends Component {
               onChange={dispatchRoleNameChange}
               type="text"
               placeholder="Enter new role"
-              value={permsState.newRole}
+              value={isNewRole ? permsState.newRole : ''}
               data-test="role-textbox"
             />
           </td>
@@ -510,6 +513,7 @@ class Permissions extends Component {
             {getPermissionsTableRow(
               tableSchema,
               role,
+              roleList,
               queryTypes,
               permissionsSymbols,
               permsState
@@ -524,6 +528,7 @@ class Permissions extends Component {
           {getPermissionsTableRow(
             tableSchema,
             '',
+            roleList,
             queryTypes,
             permissionsSymbols,
             permsState,

From 60d890971c1cfd0c766e8b58a538757d0390b247 Mon Sep 17 00:00:00 2001
From: rikinsk <rikin.kachhia@gmail.com>
Date: Mon, 25 Feb 2019 14:56:47 +0530
Subject: [PATCH 3/3] fix insert permission symbol logic

---
 .../Data/TablePermissions/Permissions.js      | 53 +++++++++----------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/console/src/components/Services/Data/TablePermissions/Permissions.js b/console/src/components/Services/Data/TablePermissions/Permissions.js
index 477241edcfc40..ec18a51fb84ba 100644
--- a/console/src/components/Services/Data/TablePermissions/Permissions.js
+++ b/console/src/components/Services/Data/TablePermissions/Permissions.js
@@ -316,40 +316,37 @@ class Permissions extends Component {
       } else {
         const permissions = rolePermissions[role][queryType];
 
-        /* eslint-disable no-fallthrough */
         if (permissions) {
-          let checkColumns = false;
+          let checkColumns;
           let filterKey;
-          switch (queryType) {
-            case 'select':
-            case 'update':
-              checkColumns = true;
-            case 'delete':
-              filterKey = 'filter';
-            case 'insert':
-              filterKey = filterKey || 'check';
-
-              if (JSON.stringify(permissions[filterKey]) === '{}') {
-                if (
-                  checkColumns &&
-                  !permissions.columns.includes('*') &&
-                  permissions.columns.length !== tableSchema.columns.length
-                ) {
-                  _permission = permissionsSymbols.partialAccess;
-                } else {
-                  _permission = permissionsSymbols.fullAccess;
-                }
-              } else {
-                _permission = permissionsSymbols.partialAccess;
-              }
-              break;
-            default:
-              _permission = permissionsSymbols.noAccess;
+
+          if (queryType === 'select' || queryType === 'update') {
+            checkColumns = true;
+            filterKey = 'filter';
+          } else if (queryType === 'insert') {
+            checkColumns = true;
+            filterKey = 'check';
+          } else if (queryType === 'delete') {
+            checkColumns = false;
+            filterKey = 'filter';
+          }
+
+          if (JSON.stringify(permissions[filterKey]) === '{}') {
+            if (
+              checkColumns &&
+              !permissions.columns.includes('*') &&
+              permissions.columns.length !== tableSchema.columns.length
+            ) {
+              _permission = permissionsSymbols.partialAccess;
+            } else {
+              _permission = permissionsSymbols.fullAccess;
+            }
+          } else {
+            _permission = permissionsSymbols.partialAccess;
           }
         } else {
           _permission = permissionsSymbols.noAccess;
         }
-        /* eslint-enable no-fallthrough */
       }
 
       return _permission;