diff --git a/src/pages/Dashboard/AddUser/AddUser.jsx b/src/pages/Dashboard/AddUser/AddUser.jsx index b1e002680..8d0f18149 100644 --- 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 index d4213ff24..b1414bc27 100644 --- 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 && } diff --git a/src/pages/Dashboard/UserReadOnly/UserReadOnly.jsx b/src/pages/Dashboard/UserReadOnly/UserReadOnly.jsx index cf1a48eb8..72bc28f86 100644 --- 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 index ca7a63eaa..06f5e0cd6 100644 --- 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 = {(t) => t('dashboard.settings.userManagement.admin')}; - break; - case userRoles.CONTRIBUTOR: - role = {(t) => t('dashboard.settings.userManagement.contributor')}; - break; + if (isSuperAdmin) role = {(t) => t('dashboard.settings.userManagement.superAdmin')}; + else { + const requiredRole = roles?.filter((r) => { + return r.calendarId === calendarId; + }); - case userRoles.EDITOR: - role = {(t) => t('dashboard.settings.userManagement.editor')}; - break; + switch (requiredRole[0]?.role) { + case userRoles.ADMIN: + role = {(t) => t('dashboard.settings.userManagement.admin')}; + break; + case userRoles.CONTRIBUTOR: + role = {(t) => t('dashboard.settings.userManagement.contributor')}; + break; - case userRoles.GUEST: - role = {(t) => t('dashboard.settings.userManagement.guest')}; - break; + case userRoles.EDITOR: + role = {(t) => t('dashboard.settings.userManagement.editor')}; + break; - default: - role = {(t) => t('dashboard.settings.userManagement.superAdmin')}; - break; + case userRoles.GUEST: + role = {(t) => t('dashboard.settings.userManagement.guest')}; + break; + + default: + role = ''; + break; + } } return role; };