Merge pull request #3099 from OneCommunityGlobal/sriram-fix-owner-manage-all-permissions

Sriram fix owner manage all permissions

Author: one-community

src/components/PermissionsManagement/PermissionList.jsx

@@ -21,6 +21,10 @@ function PermissionList(props) {
     setPermissions = () => {},
     // runs when permission is added or removed
     onChange = () => {},
+
+    removedDefaultPermissions = [],
+
+    setRemovedDefaultPermissions = () => {},
   } = props;
   return (
     <ul className="user-role-tab__permissionList">
@@ -29,6 +33,8 @@ function PermissionList(props) {
           key={permission.label}
           rolePermissions={rolePermissions}
           immutablePermissions={immutablePermissions}
+          removedDefaultPermissions={removedDefaultPermissions}
+          setRemovedDefaultPermissions={setRemovedDefaultPermissions}
           label={permission.label}
           permission={permission.key}
           subperms={permission.subperms}

src/components/PermissionsManagement/PermissionListItem.jsx

@@ -23,13 +23,16 @@ function PermissionListItem(props) {
     editable,
     depth,
     setPermissions,
+    setRemovedDefaultPermissions,
+    removedDefaultPermissions,
   } = props;
   const isCategory = !!subperms;
   const [infoRoleModal, setinfoRoleModal] = useState(false);
   const [modalContent, setContent] = useState(null);
   const [isMobile, setIsMobile] = useState(false);
   const hasThisPermission =
-    rolePermissions.includes(permission) || immutablePermissions.includes(permission);
+    rolePermissions.includes(permission) ||
+    (immutablePermissions.includes(permission) && !removedDefaultPermissions?.includes(permission));
   const { updateModalStatus } = useContext(ModalContext);
 
   const darkMode = useSelector(state => state.theme.darkMode);
@@ -51,16 +54,23 @@ function PermissionListItem(props) {
   const toggleInfoRoleModal = () => {
     setinfoRoleModal(!infoRoleModal);
   };
-
   const togglePermission = permissionKey => {
-    if (rolePermissions.includes(permissionKey) || immutablePermissions.includes(permissionKey)) {
+    // Default perms can only be managed (Add/Delete) by users with "putUserProfilePermissions" perm.
+    if (immutablePermissions.includes(permissionKey)) {
+      if (!removedDefaultPermissions?.includes(permissionKey)) {
+        // deleteing default perm
+        setRemovedDefaultPermissions(previous => [...previous, permissionKey]);
+      } else {
+        // adding the default perm back
+        setRemovedDefaultPermissions(previous => previous.filter(perm => perm !== permissionKey));
+      }
+    } else if (rolePermissions.includes(permissionKey)) {
       setPermissions(previous => previous.filter(perm => perm !== permissionKey));
     } else if (rolePermissions.includes('showModal')) {
       setPermissions(previous => [...previous, permissionKey]);
     } else {
       setPermissions(previous => [...previous, permissionKey]);
     }
-
     props.onChange();
   };
 
@@ -214,7 +224,9 @@ function PermissionListItem(props) {
                 updateModalStatus(true);
               }}
               disabled={
-                !props.hasPermission('putRole') || immutablePermissions.includes(permission)
+                !props.hasPermission('putRole') ||
+                (immutablePermissions.includes(permission) &&
+                  !props.hasPermission('putUserProfilePermissions'))
               }
               style={darkMode ? boxStyleDark : boxStyle}
             >
@@ -241,6 +253,8 @@ function PermissionListItem(props) {
             onChange={props.onChange}
             depth={isMobile ? depth : depth + 1}
             darkMode={darkMode}
+            removedDefaultPermissions={removedDefaultPermissions}
+            setRemovedDefaultPermissions={setRemovedDefaultPermissions}
           />
         </li>
       ) : null}

src/components/PermissionsManagement/UserPermissionsPopUp.jsx

@@ -34,6 +34,7 @@ function UserPermissionsPopUp({
   const [searchText, onInputChange] = useState('');
   const [actualUserProfile, setActualUserProfile] = useState();
   const [userPermissions, setUserPermissions] = useState();
+  const [userRemovedDefaultPermissions, setUserRemovedDefaultPermissions] = useState(); // defulat perms taht were deleted
   const [isOpen, setIsOpen] = useState(false);
   const [isInputFocus, setIsInputFocus] = useState(false);
   const [actualUserRolePermission, setActualUserRolePermission] = useState();
@@ -46,6 +47,9 @@ function UserPermissionsPopUp({
 
   useEffect(() => {
     setUserPermissions(actualUserProfile?.permissions?.frontPermissions);
+    setUserRemovedDefaultPermissions(
+      actualUserProfile?.permissions?.removedDefaultPermissions || [],
+    );
   }, [actualUserProfile]);
 
   const refInput = useRef();
@@ -82,7 +86,13 @@ function UserPermissionsPopUp({
 
     const url = ENDPOINTS.USER_PROFILE(userId);
     const allUserInfo = await axios.get(url).then(res => res.data);
-    const newUserInfo = { ...allUserInfo, permissions: { frontPermissions: userPermissions } };
+    const newUserInfo = {
+      ...allUserInfo,
+      permissions: {
+        frontPermissions: userPermissions,
+        removedDefaultPermissions: userRemovedDefaultPermissions,
+      },
+    };
 
     axios
       .put(url, newUserInfo)
@@ -233,6 +243,8 @@ function UserPermissionsPopUp({
               immutablePermissions={actualUserRolePermission}
               editable={!!actualUserProfile}
               setPermissions={setUserPermissions}
+              removedDefaultPermissions={userRemovedDefaultPermissions}
+              setRemovedDefaultPermissions={setUserRemovedDefaultPermissions}
             />
           </ul>
         </div>

src/utils/permissions.js

@@ -9,16 +9,23 @@ const hasPermission = (action, viewingUser = false) => {
     const state = getState();
     const rolePermissions = state.role.roles;
     const userRole = viewingUser ? state.userProfile.role : state.auth.user.role;
+
     const userPermissions = viewingUser
       ? state.userProfile.permissions?.frontPermissions
       : state.auth.user.permissions?.frontPermissions;
+
+    const removedDefaultPermissions = viewingUser
+      ? state.userProfile.permissions?.removedDefaultPermissions
+      : state.auth.user.permissions?.removedDefaultPermissions || [];
+
     if (userRole && rolePermissions && rolePermissions.length !== 0) {
       const roleIndex = rolePermissions?.findIndex(({ roleName }) => roleName === userRole);
       let permissions = [];
       if (roleIndex !== -1) {
         permissions = rolePermissions[roleIndex].permissions;
       }
-      return userPermissions?.includes(action) || permissions?.includes(action);
+      const rolePerms = permissions.filter(perm => !removedDefaultPermissions.includes(perm));
+      return userPermissions?.includes(action) || rolePerms?.includes(action);
     }
     return false;
   };