diff --git a/src/apps/profiles/src/member-profile/profile-completeness/ProfileCompleteness.tsx b/src/apps/profiles/src/member-profile/profile-completeness/ProfileCompleteness.tsx index 33c81cee0..46111f0f8 100644 --- a/src/apps/profiles/src/member-profile/profile-completeness/ProfileCompleteness.tsx +++ b/src/apps/profiles/src/member-profile/profile-completeness/ProfileCompleteness.tsx @@ -12,7 +12,7 @@ interface ProfileCompletenessProps { const ProfileCompleteness: FC = props => { const completeness = useProfileCompleteness(props.profile.handle) - const completed = completeness.percent + const completed = Number(completeness.percent?.toFixed(2)) const isLoading = completeness.isLoading const isCompleted = completed === 100 diff --git a/src/apps/profiles/src/member-profile/profile-header/ProfileHeader.tsx b/src/apps/profiles/src/member-profile/profile-header/ProfileHeader.tsx index f8443e19d..ccdcf2dbb 100644 --- a/src/apps/profiles/src/member-profile/profile-header/ProfileHeader.tsx +++ b/src/apps/profiles/src/member-profile/profile-header/ProfileHeader.tsx @@ -6,6 +6,7 @@ import moment from 'moment' import { NamesAndHandleAppearance, UserProfile, + UserRole, } from '~/libs/core' import { ProfilePicture, useCheckIsMobile } from '~/libs/shared' import { Tooltip } from '~/libs/ui' @@ -32,6 +33,17 @@ const ProfileHeader: FC = (props: ProfileHeaderProps) => { const hasProfilePicture = !!props.profile.photoURL const canEdit: boolean = props.authProfile?.handle === props.profile.handle + + const roles = props.authProfile?.roles || [] + + const isPrivilegedViewer + = !canEdit + && ( + roles.includes(UserRole.administrator) + || roles.includes(UserRole.projectManager) + || roles.includes(UserRole.talentManager) + ) + const canSeeActivityBadge = props.profile.recentActivity const [isNameEditMode, setIsNameEditMode]: [boolean, Dispatch>] @@ -95,9 +107,20 @@ const ProfileHeader: FC = (props: ProfileHeaderProps) => { } function renderOpenForWork(): JSX.Element { + const showMyStatusLabel = canEdit + const showAdminLabel = isPrivilegedViewer + return (
- My status: + {showMyStatusLabel && My status:} + + {showAdminLabel && ( + + {props.profile.firstName} + {' '} + is + + )} = (props: ProfileHeaderProps) => { { // Showing only when they can edit until we have the talent search app // and enough data to make this useful - canEdit ? renderOpenForWork() : undefined + canEdit || isPrivilegedViewer ? renderOpenForWork() : undefined } {