Jayden/AFFiNE-Mirror
1
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-02-24 01:42:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix: remove member issues (#1026)

Browse Source
This commit is contained in:
Qi
2023-02-15 18:07:47 +08:00
committed by GitHub
parent c65adc5e25
commit d40bdb9699
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/web/src/components/workspace-setting/member/MembersPage.tsx
View File

@@ -20,7 +20,6 @@ import { InviteMemberModal } from './InviteMemberModal';
import { Menu, MenuItem } from '@affine/component'; import { Menu, MenuItem } from '@affine/component';
import { Empty } from '@affine/component'; import { Empty } from '@affine/component';
import { WorkspaceUnit } from '@affine/datacenter'; import { WorkspaceUnit } from '@affine/datacenter';
import { useConfirm } from '@/providers/ConfirmProvider';
import { toast } from '@affine/component'; import { toast } from '@affine/component';
import useMembers from '@/hooks/use-members'; import useMembers from '@/hooks/use-members';
import Loading from '@/components/loading'; import Loading from '@/components/loading';
@@ -33,7 +32,6 @@ export const MembersPage = ({ workspace }: { workspace: WorkspaceUnit }) => {
const { members, removeMember, loaded } = useMembers(); const { members, removeMember, loaded } = useMembers();
const { triggerEnableWorkspaceModal } = useModal(); const { triggerEnableWorkspaceModal } = useModal();
const { t } = useTranslation(); const { t } = useTranslation();
const confirm = useConfirm(store => store.confirm);
if (workspace.provider === 'affine') { if (workspace.provider === 'affine') {
return ( return (
@@ -101,16 +99,6 @@ export const MembersPage = ({ workspace }: { workspace: WorkspaceUnit }) => {
<> <>
<MenuItem <MenuItem
onClick={async () => { onClick={async () => {
const confirmRemove = await confirm({
title: t('Delete Member?'),
content: t('will delete member'),
confirmText: t('Delete'),
confirmType: 'danger',
});
if (!confirmRemove) {
return;
}
await removeMember(member.id); await removeMember(member.id);
toast( toast(
t('Member has been removed', { t('Member has been removed', {
@@ -120,7 +108,7 @@ export const MembersPage = ({ workspace }: { workspace: WorkspaceUnit }) => {
}} }}
icon={<TrashIcon />} icon={<TrashIcon />}
> >
{t('Delete')} {t('Remove from workspace')}
</MenuItem> </MenuItem>
</> </>
} }

1
packages/i18n/src/resources/en.json
View File

@@ -33,6 +33,7 @@
"Export to HTML": "Export to HTML", "Export to HTML": "Export to HTML",
"Export to Markdown": "Export to Markdown", "Export to Markdown": "Export to Markdown",
"Delete": "Delete", "Delete": "Delete",
"Remove from workspace": "Remove from workspace",
"Title": "Title", "Title": "Title",
"Untitled": "Untitled", "Untitled": "Untitled",
"Created": "Created", "Created": "Created",