changes to permission settings UI

magda-io · Aug 29, 2023 · 0aebcf3 · 0aebcf3
1 parent ccf16c8
commit 0aebcf3
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 2 deletions.
diff --git a/magda-web-client/src/Components/Settings/PermissionDataGrid.tsx b/magda-web-client/src/Components/Settings/PermissionDataGrid.tsx
@@ -266,6 +266,14 @@ const PermissionDataGrid: FunctionComponent<PropsType> = (props) => {
                             )}
                         </Cell>
                     </Column>
+                    <Column width={120} resizable>
+                        <HeaderCell>Allow Exemption</HeaderCell>
+                        <Cell align="center">
+                            {(rowData: RolePermissionRecord) => (
+                                <CheckBoxIcon value={rowData.allow_exemption} />
+                            )}
+                        </Cell>
+                    </Column>
                     <Column width={120} fixed="right">
                         <HeaderCell align="center">Action</HeaderCell>
                         <Cell

diff --git a/magda-web-client/src/Components/Settings/PermissionFormPopUp.tsx b/magda-web-client/src/Components/Settings/PermissionFormPopUp.tsx
@@ -3,7 +3,8 @@ import React, {
     useState,
     forwardRef,
     useImperativeHandle,
-    useRef
+    useRef,
+    useCallback
 } from "react";
 import Modal from "rsuite/Modal";
 import Button from "rsuite/Button";
@@ -21,6 +22,7 @@ import "./PermissionFormPopUp.scss";
 import Form from "rsuite/Form";
 import Notification from "rsuite/Notification";
 import { toaster } from "rsuite";
+import Toggle from "rsuite/Toggle";
 import { ItemDataType } from "rsuite/esm/@types/common";
 import {
     getPermissionById,
@@ -110,6 +112,21 @@ const constraintTooltip = (
     </Popover>
 );
 
+const constraintExemptionTooltip = (
+    <Popover style={{ width: "500px" }}>
+        <p>
+            Users might set some resources as "public" (via supported resources'
+            `access-control.constraintExemption`) to allow users with
+            "restricted" permissions to access the resources regardless of their
+            current scope & the constraints of the permission granted to them.
+            <br />
+            This option allows system admin to specify whether the permission's
+            restrctions / constraints can be ignored when access those "public"
+            resources.
+        </p>
+    </Popover>
+);
+
 const PermissionFormPopUp: ForwardRefRenderFunction<RefType, PropsType> = (
     props,
     ref
@@ -123,6 +140,18 @@ const PermissionFormPopUp: ForwardRefRenderFunction<RefType, PropsType> = (
     const [dataReloadToken, setdataReloadToken] = useState<string>("");
     const selectedResourceId = permission?.resource_id;
 
+    const toggleAllowExemption = useCallback(
+        () =>
+            setPermission(
+                (p) =>
+                    ({
+                        ...p,
+                        allow_exemption: !p?.allow_exemption
+                    } as any)
+            ),
+        []
+    );
+
     useImperativeHandle(ref, () => ({
         open: (
             selectPermissionId?: string,
@@ -243,7 +272,8 @@ const PermissionFormPopUp: ForwardRefRenderFunction<RefType, PropsType> = (
                 pre_authorised_constraint: permission.pre_authorised_constraint
                     ? true
                     : false,
-                operationIds: permission.operationIds
+                operationIds: permission.operationIds,
+                allow_exemption: permission.allow_exemption ? true : false
             };
             if (isCreateForm) {
                 const newPermission = await createRolePermission(
@@ -455,6 +485,29 @@ const PermissionFormPopUp: ForwardRefRenderFunction<RefType, PropsType> = (
                                     </Checkbox>
                                 </Form.Control>
                             </Form.Group>
+                            <Form.Group controlId="ctrl-constraint-exemption">
+                                <span>
+                                    Allow Exemption?{" "}
+                                    <Whisper
+                                        placement="top"
+                                        controlId="ctrl-constraint-exemption-tooltip-hover"
+                                        trigger="hover"
+                                        speaker={constraintExemptionTooltip}
+                                    >
+                                        <span>
+                                            <MdInfoOutline />
+                                        </span>
+                                    </Whisper>
+                                </span>
+                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <Toggle
+                                    size="lg"
+                                    checkedChildren="Yes"
+                                    unCheckedChildren="No"
+                                    checked={permission?.allow_exemption}
+                                    onChange={toggleAllowExemption}
+                                />
+                            </Form.Group>
                             <Form.Group controlId="ctrl-description">
                                 <Form.ControlLabel>
                                     Description: