IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Client: EditGroupMembersDialog: Fix showing owner role for portal owner instead of room owner

Browse Source
This commit is contained in:
Aleksandr Lushkin 2024-08-23 17:21:43 +02:00
parent 826a4fae00
commit cec3ebad3b
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
packages/client/src/components/dialogs/EditGroupMembersDialog/sub-components/GroupMember/index.tsx
View File

@ -59,7 +59,7 @@ const GroupMember = ({ member, infoPanelSelection }: GroupMemberProps) => {
const [isLoading, setIsLoading] = useState(false);
const { t } = useTranslation("Common");
const userRole = user.isOwner
const userRole = member.owner
? getUserRoleOptions(t).portalAdmin
: getUserRoleOptionsByUserAccess(
t,
@ -74,6 +74,10 @@ const GroupMember = ({ member, infoPanelSelection }: GroupMemberProps) => {
const userRoleOptions = filterUserRoleOptions(fullRoomRoleOptions, user);
const hasIndividualRightsInRoom =
member.owner ||
(member.userAccess && member.userAccess !== member.groupAccess);
let type;
if (user.isOwner) type = "owner";
else if (user.isAdmin) type = "admin";
@ -146,20 +150,18 @@ const GroupMember = ({ member, infoPanelSelection }: GroupMemberProps) => {
</div>
<div className="individual-rights-tooltip">
{member.userAccess &&
member.userAccess !== member.groupAccess &&
!user.isOwner && (
<HelpButton
place="left"
offsetRight={0}
openOnClick={false}
tooltipContent={
<Text fontSize="12px" fontWeight={600}>
{t("PeopleTranslations:IndividualRights")}
</Text>
}
/>
)}
{hasIndividualRightsInRoom && (
<HelpButton
place="left"
offsetRight={0}
openOnClick={false}
tooltipContent={
<Text fontSize="12px" fontWeight={600}>
{t("PeopleTranslations:IndividualRights")}
</Text>
}
/>
)}
</div>
{userRole && userRoleOptions && (