Merge pull request #1311 from culturecreates/hotfix/tech-support-issu…

…e-88 Hotfix/tech support issue 88
culturecreates · Sep 10, 2024 · 64ce150 · 64ce150
2 parents a3dd36e + 3e2c893
commit 64ce150
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 25 deletions.
diff --git a/src/pages/Dashboard/AddUser/AddUser.jsx b/src/pages/Dashboard/AddUser/AddUser.jsx
@@ -117,7 +117,7 @@ const AddUser = () => {
         .unwrap()
         .then((response) => {
           const activeCalendars = response?.roles?.filter((r) => {
-            return r.status == userActivityStatus[0].key;
+            return r.status === userActivityStatus[0].key || r.status === userActivityStatus[2].key;
           });
           setSelectedCalendars(
             activeCalendars
@@ -147,7 +147,7 @@ const AddUser = () => {
         .unwrap()
         .then((response) => {
           const activeCalendars = response?.roles.filter((r) => {
-            return r.status == userActivityStatus[0].key;
+            return r.status == userActivityStatus[0].key || r.status == userActivityStatus[2].key;
           });
           setSelectedCalendars(
             activeCalendars

diff --git a/src/pages/Dashboard/Settings/UserManagement/UserManagement.jsx b/src/pages/Dashboard/Settings/UserManagement/UserManagement.jsx
@@ -608,7 +608,7 @@ const UserManagement = (props) => {
                           return listItemHandler(item?._id);
                         }}
                         title={createTitleHandler(item?.firstName, item?.lastName, item?.userName)}
-                        description={roleHandler({ roles: item?.roles, calendarId })}
+                        description={roleHandler({ roles: item?.roles, calendarId, isSuperAdmin: item?.isSuperAdmin })}
                         activityStatus={currentCalendarUserStatus(item)}
                         styles={handleListCardStyles(item)}
                         invitedBy={item?.invitedBy && <Username userName={item?.invitedBy} />}

diff --git a/src/pages/Dashboard/UserReadOnly/UserReadOnly.jsx b/src/pages/Dashboard/UserReadOnly/UserReadOnly.jsx
@@ -180,11 +180,11 @@ const UserReadOnly = () => {
                       },
                     })}
 
-                  {userInfo?.roles &&
+                  {(userInfo?.roles || userInfo?.isSuperAdmin) &&
                     createUserInfoRowItem({
                       isCopiableText: false,
                       infoType: 'userType',
-                      infoText: roleHandler({ roles: userInfo.roles, calendarId }),
+                      infoText: roleHandler({ roles: userInfo.roles, calendarId, isSuperAdmin: userInfo.isSuperAdmin }),
                     })}
 
                   {userInfo?.interfaceLanguage &&

diff --git a/src/utils/roleHandler.js b/src/utils/roleHandler.js
@@ -1,30 +1,34 @@
 import { Translation } from 'react-i18next';
 import { userRoles } from '../constants/userRoles';
 
-export const roleHandler = ({ roles, calendarId }) => {
-  const requiredRole = roles.filter((r) => {
-    return r.calendarId === calendarId;
-  });
+export const roleHandler = ({ roles, calendarId, isSuperAdmin }) => {
   let role = '';
-  switch (requiredRole[0]?.role) {
-    case userRoles.ADMIN:
-      role = <Translation>{(t) => t('dashboard.settings.userManagement.admin')}</Translation>;
-      break;
-    case userRoles.CONTRIBUTOR:
-      role = <Translation>{(t) => t('dashboard.settings.userManagement.contributor')}</Translation>;
-      break;
+  if (isSuperAdmin) role = <Translation>{(t) => t('dashboard.settings.userManagement.superAdmin')}</Translation>;
+  else {
+    const requiredRole = roles?.filter((r) => {
+      return r.calendarId === calendarId;
+    });
 
-    case userRoles.EDITOR:
-      role = <Translation>{(t) => t('dashboard.settings.userManagement.editor')}</Translation>;
-      break;
+    switch (requiredRole[0]?.role) {
+      case userRoles.ADMIN:
+        role = <Translation>{(t) => t('dashboard.settings.userManagement.admin')}</Translation>;
+        break;
+      case userRoles.CONTRIBUTOR:
+        role = <Translation>{(t) => t('dashboard.settings.userManagement.contributor')}</Translation>;
+        break;
 
-    case userRoles.GUEST:
-      role = <Translation>{(t) => t('dashboard.settings.userManagement.guest')}</Translation>;
-      break;
+      case userRoles.EDITOR:
+        role = <Translation>{(t) => t('dashboard.settings.userManagement.editor')}</Translation>;
+        break;
 
-    default:
-      role = <Translation>{(t) => t('dashboard.settings.userManagement.superAdmin')}</Translation>;
-      break;
+      case userRoles.GUEST:
+        role = <Translation>{(t) => t('dashboard.settings.userManagement.guest')}</Translation>;
+        break;
+
+      default:
+        role = '';
+        break;
+    }
   }
   return role;
 };