Jayden/AFFiNE-Mirror
1
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-02-18 14:56:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): adjust admin permission (#9204)

Browse Source 
close AF-2001 AF-2002
This commit is contained in:
JimmFly
2024-12-20 02:26:17 +00:00
parent 0fdf2c4905
commit 7ff24e9c1c
7 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/new-workspace-setting-detail/members/cloud-members-panel.tsx
View File

@@ -62,6 +62,7 @@ export const CloudWorkspaceMembersPanel = ({
const permissionService = useService(WorkspacePermissionService);
const isOwner = useLiveData(permissionService.permission.isOwner$);
const isAdmin = useLiveData(permissionService.permission.isAdmin$);
const isOwnerOrAdmin = isOwner || isAdmin;
useEffect(() => {
permissionService.permission.revalidate();
}, [permissionService]);
@@ -233,8 +234,8 @@ export const CloudWorkspaceMembersPanel = ({
return (
<>
<SettingRow name={title} desc={desc} spreadCol={!!isOwner}>
{isOwner ? (
<SettingRow name={title} desc={desc} spreadCol={!!isOwnerOrAdmin}>
{isOwnerOrAdmin ? (
<>
<Button onClick={openInviteModal}>{t['Invite Members']()}</Button>
{!isTeam ? (

2
packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/new-workspace-setting-detail/members/member-list.tsx
View File

@@ -210,7 +210,7 @@ const MemberItem = ({
</div>
<div
className={clsx(styles.roleOrStatus, {
pending: !member.accepted,
pending: member.status !== WorkspaceMemberStatus.Accepted,
})}
>
{t.t(memberStatus)}

9
packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/new-workspace-setting-detail/members/member-option.tsx
View File

@@ -193,14 +193,17 @@ export const MemberOptions = ({
label: t['com.affine.payment.member.team.remove'](),
onClick: handleRemove,
show:
(isAdmin || isOwner) &&
member.status === WorkspaceMemberStatus.Accepted,
(isOwner && member.status === WorkspaceMemberStatus.Accepted) ||
(isAdmin &&
member.status === WorkspaceMemberStatus.Accepted &&
member.permission !== Permission.Owner &&
member.permission !== Permission.Admin),
},
{
label: t['com.affine.payment.member.team.change.collaborator'](),
onClick: handleChangeToCollaborator,
show:
(isAdmin || isOwner) &&
isOwner &&
member.status === WorkspaceMemberStatus.Accepted &&
member.permission === Permission.Admin,
},