RANGER-4010 : [addendum] Update policy UI to support multiple resourc…

…e-sets for react ranger. Signed-off-by: Dineshkumar Yadav <[email protected]>
apache · Dec 4, 2023 · 2e4a8c1 · 2e4a8c1
1 parent ac76738
commit 2e4a8c1
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 13 deletions.
diff --git a/security-admin/src/main/webapp/react-webapp/src/components/Editable.jsx b/security-admin/src/main/webapp/react-webapp/src/components/Editable.jsx
@@ -160,7 +160,7 @@ const CustomCondition = (props) => {
   return (
     <>
       {conditionDefVal?.length > 0 &&
-        conditionDefVal.map((m, index) => {
+        conditionDefVal.map((m) => {
           let uiHintAttb =
             m.uiHint != undefined && m.uiHint != "" ? JSON.parse(m.uiHint) : "";
           if (uiHintAttb != "") {

diff --git a/security-admin/src/main/webapp/react-webapp/src/views/PolicyListing/PolicyPermissionItem.jsx b/security-admin/src/main/webapp/react-webapp/src/views/PolicyListing/PolicyPermissionItem.jsx
@@ -151,6 +151,8 @@ export default function PolicyPermissionItem(props) {
                   }
                 }
                 multiplePermissionItem = [...multiplePermissionItem, ...op];
+              } else {
+                multiplePermissionItem = [...srcOp];
               }
               break;
             }
@@ -498,6 +500,7 @@ export default function PolicyPermissionItem(props) {
                               </td>
                             );
                           } else {
+                            let accessTypeOptions = getAccessTypeOptions();
                             return (
                               <td key={colName} className="align-middle">
                                 <Field
@@ -509,18 +512,39 @@ export default function PolicyPermissionItem(props) {
                                       index
                                     )
                                   }
-                                  render={({ input }) => (
-                                    <div className="table-editable">
-                                      <Editable
-                                        {...input}
-                                        placement="auto"
-                                        type="checkbox"
-                                        options={getAccessTypeOptions()}
-                                        showSelectAll={true}
-                                        selectAllLabel="Select All"
-                                      />
-                                    </div>
-                                  )}
+                                  render={({ input, meta }) => {
+                                    if (
+                                      formValues[attrName][index]?.accesses &&
+                                      isArray(
+                                        formValues[attrName][index].accesses
+                                      ) &&
+                                      changePolicyItemPermissions
+                                    ) {
+                                      let accTypeVal = filter(
+                                        formValues[attrName][index].accesses,
+                                        (m) => {
+                                          if (some(accessTypeOptions, m)) {
+                                            return m;
+                                          }
+                                        }
+                                      );
+                                      if (!isEqual(input.value, accTypeVal)) {
+                                        input.onChange(accTypeVal);
+                                      }
+                                    }
+                                    return (
+                                      <div className="table-editable">
+                                        <Editable
+                                          {...input}
+                                          placement="auto"
+                                          type="checkbox"
+                                          options={accessTypeOptions}
+                                          showSelectAll={true}
+                                          selectAllLabel="Select All"
+                                        />
+                                      </div>
+                                    );
+                                  }}
                                 />
                               </td>
                             );