mirror of
https://github.com/toeverything/AFFiNE.git
synced 2026-02-15 05:37:32 +00:00
refactor(core): adjust merbers module apis (#9695)
This commit is contained in:
@@ -95,19 +95,18 @@ export const CloudWorkspaceMembersPanel = ({
|
||||
|
||||
const onGenerateInviteLink = useCallback(
|
||||
async (expireTime: WorkspaceInviteLinkExpireTime) => {
|
||||
const { link } =
|
||||
await permissionService.permission.generateInviteLink(expireTime);
|
||||
const { link } = await membersService.generateInviteLink(expireTime);
|
||||
workspaceShareSettingService.sharePreview.revalidate();
|
||||
return link;
|
||||
},
|
||||
[permissionService.permission, workspaceShareSettingService.sharePreview]
|
||||
[membersService, workspaceShareSettingService.sharePreview]
|
||||
);
|
||||
|
||||
const onRevokeInviteLink = useCallback(async () => {
|
||||
const success = await permissionService.permission.revokeInviteLink();
|
||||
const success = await membersService.revokeInviteLink();
|
||||
workspaceShareSettingService.sharePreview.revalidate();
|
||||
return success;
|
||||
}, [permissionService.permission, workspaceShareSettingService.sharePreview]);
|
||||
}, [membersService, workspaceShareSettingService.sharePreview]);
|
||||
|
||||
const onInviteBatchConfirm = useAsyncCallback(
|
||||
async ({
|
||||
@@ -125,10 +124,7 @@ export const CloudWorkspaceMembersPanel = ({
|
||||
setIsMutating(false);
|
||||
return;
|
||||
}
|
||||
const results = await permissionService.permission.inviteMembers(
|
||||
uniqueEmails,
|
||||
true
|
||||
);
|
||||
const results = await membersService.inviteMembers(uniqueEmails, true);
|
||||
const unSuccessInvites = results.reduce<string[]>((acc, result) => {
|
||||
if (!result.sentSuccess) {
|
||||
acc.push(result.email);
|
||||
@@ -151,14 +147,7 @@ export const CloudWorkspaceMembersPanel = ({
|
||||
}
|
||||
setIsMutating(false);
|
||||
},
|
||||
[
|
||||
isTeam,
|
||||
membersService.members,
|
||||
permissionService.permission,
|
||||
t,
|
||||
workspaceQuota,
|
||||
workspaceQuotaService.quota,
|
||||
]
|
||||
[isTeam, membersService, t, workspaceQuota, workspaceQuotaService.quota]
|
||||
);
|
||||
|
||||
const onImportCSV = useAsyncCallback(
|
||||
|
||||
@@ -4,7 +4,6 @@ import { type AuthAccountInfo, AuthService } from '@affine/core/modules/cloud';
|
||||
import {
|
||||
type Member,
|
||||
WorkspaceMembersService,
|
||||
WorkspacePermissionService,
|
||||
} from '@affine/core/modules/permissions';
|
||||
import { WorkspaceService } from '@affine/core/modules/workspace';
|
||||
import {
|
||||
@@ -143,7 +142,6 @@ const MemberItem = ({
|
||||
const membersService = useService(WorkspaceMembersService);
|
||||
const workspace = useService(WorkspaceService).workspace;
|
||||
const workspaceName = useLiveData(workspace.name$);
|
||||
const permission = useService(WorkspacePermissionService).permission;
|
||||
const isEquals = workspaceName === inputValue;
|
||||
|
||||
const show = useMemo(
|
||||
@@ -163,7 +161,7 @@ const MemberItem = ({
|
||||
}, []);
|
||||
|
||||
const confirmAssign = useCallback(() => {
|
||||
permission
|
||||
membersService
|
||||
.adjustMemberPermission(member.id, Permission.Owner)
|
||||
.then(result => {
|
||||
if (result) {
|
||||
@@ -183,7 +181,7 @@ const MemberItem = ({
|
||||
message: error.message,
|
||||
});
|
||||
});
|
||||
}, [permission, member, t, membersService]);
|
||||
}, [member, t, membersService]);
|
||||
|
||||
const memberStatus = useMemo(() => getMemberStatus(member), [member]);
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ export const MemberOptions = ({
|
||||
variant: 'error',
|
||||
},
|
||||
onConfirm: () =>
|
||||
permission
|
||||
membersService
|
||||
.revokeMember(member.id)
|
||||
.then(result => {
|
||||
if (result) {
|
||||
@@ -58,7 +58,7 @@ export const MemberOptions = ({
|
||||
}),
|
||||
});
|
||||
},
|
||||
[member, membersService, openConfirmModal, permission, t]
|
||||
[member, membersService, openConfirmModal, t]
|
||||
);
|
||||
|
||||
const handleAssignOwner = useCallback(() => {
|
||||
@@ -75,7 +75,7 @@ export const MemberOptions = ({
|
||||
}, [openRemoveConfirmModal, member, t]);
|
||||
|
||||
const handleApprove = useCallback(() => {
|
||||
permission
|
||||
membersService
|
||||
.approveMember(member.id)
|
||||
.then(result => {
|
||||
if (result) {
|
||||
@@ -96,7 +96,7 @@ export const MemberOptions = ({
|
||||
message: error.message,
|
||||
});
|
||||
});
|
||||
}, [member, membersService, permission, t]);
|
||||
}, [member, membersService, t]);
|
||||
|
||||
const handleDecline = useCallback(() => {
|
||||
openRemoveConfirmModal({
|
||||
@@ -117,7 +117,7 @@ export const MemberOptions = ({
|
||||
}, [member, openRemoveConfirmModal, t]);
|
||||
|
||||
const handleChangeToAdmin = useCallback(() => {
|
||||
permission
|
||||
membersService
|
||||
.adjustMemberPermission(member.id, Permission.Admin)
|
||||
.then(result => {
|
||||
if (result) {
|
||||
@@ -138,9 +138,9 @@ export const MemberOptions = ({
|
||||
message: error.message,
|
||||
});
|
||||
});
|
||||
}, [member, membersService, permission, t]);
|
||||
}, [member, membersService, t]);
|
||||
const handleChangeToCollaborator = useCallback(() => {
|
||||
permission
|
||||
membersService
|
||||
.adjustMemberPermission(member.id, Permission.Write)
|
||||
.then(result => {
|
||||
if (result) {
|
||||
@@ -161,7 +161,7 @@ export const MemberOptions = ({
|
||||
message: error.message,
|
||||
});
|
||||
});
|
||||
}, [member, membersService, permission, t]);
|
||||
}, [member, membersService, t]);
|
||||
|
||||
const operationButtonInfo = useMemo(() => {
|
||||
return [
|
||||
|
||||
Reference in New Issue
Block a user