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

feat(server): always send invite email (#9168)

Browse Source 
fix AF-1976
This commit is contained in:
darkskygit
2024-12-16 04:45:12 +00:00
parent 87bbcae5e2
commit de2dab32c0
3 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -215,23 +215,24 @@ const MemberItem = ({
};
const getMemberStatus = (member: Member): I18nString => {
if (member.status === WorkspaceMemberStatus.Pending) {
return 'Pending';
} else if (member.status === WorkspaceMemberStatus.UnderReview) {
return 'Under-Review';
} else if (member.status === WorkspaceMemberStatus.Accepted) {
switch (member.permission) {
case Permission.Owner:
return 'Workspace Owner';
case Permission.Admin:
return 'Admin';
case Permission.Write:
return 'Collaborator';
default:
return 'Member';
}
} else {
return 'Need-More-Seats';
switch (member.status) {
case WorkspaceMemberStatus.NeedMoreSeat:
case WorkspaceMemberStatus.NeedMoreSeatAndReview:
case WorkspaceMemberStatus.Pending:
return 'Pending';
case WorkspaceMemberStatus.UnderReview:
return 'Under-Review';
case WorkspaceMemberStatus.Accepted:
switch (member.permission) {
case Permission.Owner:
return 'Workspace Owner';
case Permission.Admin:
return 'Admin';
case Permission.Write:
return 'Collaborator';
default:
return 'Member';
}
}
};

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

@@ -181,7 +181,11 @@ export const MemberOptions = ({
onClick: handleRevoke,
show:
(isAdmin || isOwner) &&
member.status === WorkspaceMemberStatus.Pending,
[
WorkspaceMemberStatus.NeedMoreSeat,
WorkspaceMemberStatus.NeedMoreSeatAndReview,
WorkspaceMemberStatus.Pending,
].includes(member.status),
},
{
label: t['com.affine.payment.member.team.remove'](),