diff --git a/src/components/modals/add-user-modal/AddUserModal.tsx b/src/components/modals/add-user-modal/AddUserModal.tsx index 37c846a8..855dd693 100644 --- a/src/components/modals/add-user-modal/AddUserModal.tsx +++ b/src/components/modals/add-user-modal/AddUserModal.tsx @@ -9,6 +9,7 @@ import { Radio, Row, Select, + Skeleton, Table, TableColumnProps, Tabs, @@ -23,6 +24,7 @@ import { User, UserGroup, UserRole, UserRoleId } from '@/models/User'; import { UsersService } from '@/services/UsersService'; import { kebabCaseToTitleCase, useServerLicense } from '@/utils/Utils'; import { isAdminUserOrRole } from '@/utils/UserMgmtUtils'; +import { ExternalLinks } from '@/constants/LinkAndImageConstants'; interface AddUserModalProps { isOpen: boolean; @@ -71,6 +73,7 @@ export default function AddUserModal({ const [groups, setGroups] = useState([]); const [selectedNetworkRoles, setSelectedNetworkRoles] = useState([]); const [activeTab, setActiveTab] = useState(defaultTabKey); + const [isLoadingPlatformRoles, setIsLoadingPlatformRoles] = useState(true); const palVal = Form.useWatch('platform_role_id', form); @@ -176,6 +179,8 @@ export default function AddUserModal({ message: 'Failed to load roles', description: extractErrorMsg(err as any), }); + } finally { + setIsLoadingPlatformRoles(false); } }, [notify]); @@ -342,17 +347,29 @@ export default function AddUserModal({ - - {platformRoles.map((role) => ( - - {kebabCaseToTitleCase(role.id)} - - ))} - + + Admins can access all features and manage all users. Platform users can log into the dashboard and + access the networks they are assigned to. Service users cannot log into the dashboard; they use{' '} + + RAC + {' '} + to access their assigned networks. + +
+
+ + + {platformRoles.map((role) => ( + + {kebabCaseToTitleCase(role.id)} + + ))} + +
diff --git a/src/components/modals/invite-user-modal/InviteUserModal.tsx b/src/components/modals/invite-user-modal/InviteUserModal.tsx index a3e591b3..068eaff8 100644 --- a/src/components/modals/invite-user-modal/InviteUserModal.tsx +++ b/src/components/modals/invite-user-modal/InviteUserModal.tsx @@ -10,6 +10,7 @@ import { Radio, Row, Select, + Skeleton, Steps, Table, TableColumnProps, @@ -28,6 +29,7 @@ import { copyTextToClipboard, kebabCaseToTitleCase, useServerLicense } from '@/u import { getInviteMagicLink } from '@/utils/RouteUtils'; import CreateUserGroupModal from '@/pages/users/CreateUserGroupModal'; import { isAdminUserOrRole } from '@/utils/UserMgmtUtils'; +import { ExternalLinks } from '@/constants/LinkAndImageConstants'; interface InviteUserModalProps { isOpen: boolean; @@ -85,6 +87,7 @@ export default function InviteUserModal({ isOpen, onInviteFinish, onClose, onCan const [isCreateGroupModalOpen, setIsCreateGroupModalOpen] = useState(false); const [activeTab, setActiveTab] = useState(defaultTabKey); const [isCreating, setIsCreating] = useState(false); + const [isLoadingPlatformRoles, setIsLoadingPlatformRoles] = useState(true); const userGroupsVal = Form.useWatch('user-groups', form); const palVal = Form.useWatch('platform_role_id', form); @@ -228,6 +231,8 @@ export default function InviteUserModal({ isOpen, onInviteFinish, onClose, onCan message: 'Failed to load roles', description: extractErrorMsg(err as any), }); + } finally { + setIsLoadingPlatformRoles(false); } }, [notify]); @@ -388,17 +393,30 @@ export default function InviteUserModal({ isOpen, onInviteFinish, onClose, onCan - - {platformRoles.map((role) => ( - - {kebabCaseToTitleCase(role.id)} - - ))} - + + Admins can access all features and manage all users. Platform users can log into the dashboard + and access the networks they are assigned to. Service users cannot log into the dashboard; + they use{' '} + + RAC + {' '} + to access their assigned networks. + +
+
+ + + {platformRoles.map((role) => ( + + {kebabCaseToTitleCase(role.id)} + + ))} + +