hasura · rikinsk-zz · Feb 17, 2019 · Feb 6, 2019 · Feb 6, 2019 · Feb 13, 2019
@@ -260,9 +260,9 @@ const compareChecks = (permObj, check, query, columns) => {
     }
   } else if (query === 'insert') {
     // eslint-disable-line no-lonely-if
-    expect(permObj.check[getColName(0)]._eq === '1').to.be.true; // eslint-dsable-line eqeqeq
+    expect(permObj.check[getColName(0)]._eq === 1).to.be.true;
   } else {
-    expect(permObj.filter[getColName(0)]._eq === '1').to.be.true;
+    expect(permObj.filter[getColName(0)]._eq === 1).to.be.true;
     if (query === 'select' || query === 'update') {
       columns.forEach((col, index) => {
         expect(permObj.columns.includes(getColName(index)));
@@ -319,7 +319,6 @@ export const validatePermission = (
   };
   const requestOptions = makeDataAPIOptions(dataApiUrl, adminSecret, reqBody);
   cy.request(requestOptions).then(response => {
-    cy.log(JSON.stringify(response));
     const tableSchema = response.body.find(
       table => table.table_name === tableName
     );

@@ -109,14 +109,14 @@ class QueryBuilderJson extends React.Component {
         Object.keys(object).forEach((key, i) => {
           objectArray.push({ key: key, value: object[key] });
           // replace unselected key with array position
-          if (unselectedElements.indexOf(key) !== -1) {
+          if (unselectedElements.includes(key)) {
             unselectedElements[unselectedElements.indexOf(key)] = i;
           }
         });
       }
 
       objectArray.forEach((_object, i) => {
-        const unselected = unselectedElements.indexOf(i) !== -1;
+        const unselected = unselectedElements.includes(i);
         _jsonObject.push(
           <div
             key={i}
@@ -138,7 +138,7 @@ class QueryBuilderJson extends React.Component {
 
       elements.forEach((element, i) => {
         /* eslint-disable no-use-before-define */
-        const unselected = unselectedElements.indexOf(i) !== -1;
+        const unselected = unselectedElements.includes(i);
         _jsonArray.push(
           <div
             key={i}

@@ -2,7 +2,7 @@ import React from 'react';
 
 import Helmet from 'react-helmet';
 import CommonTabLayout from '../../../Layout/CommonTabLayout/CommonTabLayout';
-// import { Link } from 'react-router';
+import { Link } from 'react-router';
 import { push } from 'react-router-redux';
 
 import { pageTitle, appPrefix } from '../Modify/constants';
@@ -82,14 +82,14 @@ class Permission extends React.Component {
           applicable to the data returned by this function
         </p>
         <div className={styles.commonBtn}>
-          <a href={permissionTableUrl}>
+          <Link to={permissionTableUrl}>
             <button
               className={styles.yellow_button}
               data-test={'custom-function-permission-btn'}
             >
               {`${setOffTable} Permissions`}
             </button>
-          </a>
+          </Link>
         </div>
       </div>
     );

@@ -265,7 +265,7 @@ hr
     word-wrap: break-word;
     .columnListElement {
       float: left;
-      margin-right: 75px;
+      margin-right: 50px;
     }
 
     .toggleAll {

@@ -53,9 +53,9 @@ export const SET_TYPE_CONFIG = 'ModifyTable/SET_TYPE_CONFIG';
 
 /* */
 
-const getQueriesWithPermColumns = insert => {
+const getQueriesWithPermColumns = allowInsert => {
   const queries = ['select', 'update'];
-  if (insert) {
+  if (allowInsert) {
     queries.push('insert');
   }
   return queries;
@@ -455,7 +455,7 @@ const applySamePermissionsBulk = tableSchema => {
     const table = tableSchema.table_name;
     const currentQueryType = permissionsState.query;
     const toBeAppliedPermission = permissionsState[currentQueryType];
-    const selectedRoles = permissionsState.applySamePermissions;
+    const selectedRoles = permissionsState.applySamePermissions.concat([permissionsState.role]);
 
     const permissionsUpQueries = [];
     const permissionsDownQueries = [];
@@ -465,10 +465,11 @@ const applySamePermissionsBulk = tableSchema => {
       // find out if selected role has an existing permission of the same query type.
       // if so add a drop permission and then create the new permission.
 
-      const currentRolePermission = currentPermissions.filter(el => {
+      const currentRolePermission = currentPermissions.find(el => {
         return el.role_name === role;
       });
-      if (currentRolePermission[0].permissions[currentQueryType]) {
+
+      if (currentRolePermission && currentRolePermission.permissions[currentQueryType]) {
         // existing permission is there. so drop and recreate.
         const deleteQuery = {
           type: 'drop_' + currentQueryType + '_permission',
@@ -482,7 +483,7 @@ const applySamePermissionsBulk = tableSchema => {
           args: {
             table: { name: table, schema: currentSchema },
             role: role,
-            permission: currentRolePermission[0].permissions[currentQueryType],
+            permission: currentRolePermission.permissions[currentQueryType],
           },
         };
         permissionsUpQueries.push(deleteQuery);