Merge pull request #534 from AI4Bharat/CL-618

fixed role editing issue
AI4Bharat · Jan 10, 2024 · d94068c · d94068c
2 parents 49b1b56 + 8342be4
commit d94068c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 11 deletions.
diff --git a/src/config/profileConfigs.js b/src/config/profileConfigs.js
@@ -1,4 +1,4 @@
-import { availability, roles } from "../utils/utils";
+import { availability } from "../utils/utils";
 
 export const profileOptions = [
   {
@@ -26,12 +26,6 @@ export const profileOptions = [
     name: "username",
     type: "textField",
   },
-  {
-    title: "Role",
-    name: "role",
-    type: "select",
-    iterator: roles,
-  },
   {
     title: "Availability Status",
     name: "availability",

diff --git a/src/containers/UserManagement/EditProfile.jsx b/src/containers/UserManagement/EditProfile.jsx
@@ -37,6 +37,7 @@ import {
   UpdateProfileAPI,
   setSnackBar,
   UpdateUserRoleAPI,
+  FetchUserRolesAPI,
 } from "redux/actions";
 
 const EditProfile = () => {
@@ -85,9 +86,15 @@ const EditProfile = () => {
     (state) => state.getSupportedLanguages.translationLanguage
   );
   const apiStatus = useSelector((state) => state.apiStatus);
+  const userRoles = useSelector((state) => state.getUserRoles.data);
+
+  const getUserRolesList = () => {
+    const userObj = new FetchUserRolesAPI();
+    dispatch(APITransport(userObj));
+  };
 
   useEffect(() => {
-    if (loggedInUserData && loggedInUserData.length) {
+    if (loggedInUserData && loggedInUserData.id) {
       const {
         organization: { organization_owner },
       } = loggedInUserData;
@@ -133,6 +140,7 @@ const EditProfile = () => {
     getUserData();
     getLoggedInUserData();
     getOrgList();
+    getUserRolesList();
 
     const langObj = new FetchSupportedLanguagesAPI("TRANSLATION");
     dispatch(APITransport(langObj));
@@ -334,6 +342,12 @@ const EditProfile = () => {
   profileLabels.current = [...profileOptions];
 
   profileLabels.current.push(
+    {
+      title: "Role",
+      name: "role",
+      type: "select",
+      iterator: userRoles,
+    },
     {
       title: "Organization",
       name: "org",
@@ -353,7 +367,11 @@ const EditProfile = () => {
     const { id: userId, role } = loggedInUserData;
 
     if (userId === +id) {
-      if (role === "ADMIN" || userId === orgOwnerId) {
+      if (
+        role === "ADMIN" ||
+        userId === orgOwnerId ||
+        role === "PROJECT_MANAGER"
+      ) {
         if (roleIsEdited) {
           updateRole();
         }
@@ -403,7 +421,8 @@ const EditProfile = () => {
 
               {(loggedInUserData.id === +id ||
                 loggedInUserData.role === "ADMIN" ||
-                loggedInUserData.id === orgOwnerId) && (
+                loggedInUserData.id === orgOwnerId ||
+                loggedInUserData.role === "PROJECT_MANAGER") && (
                 <Grid item xs={12} sm={12} md={3} lg={3} xl={3}>
                   <Button
                     variant="outlined"
@@ -422,7 +441,8 @@ const EditProfile = () => {
 
         {(loggedInUserData.id === +id ||
           loggedInUserData.role === "ADMIN" ||
-          loggedInUserData.id === orgOwnerId) && (
+          loggedInUserData.id === orgOwnerId ||
+          loggedInUserData.role === "PROJECT_MANAGER") && (
           <Grid
             container
             direction="row"