luulam/AFFiNE
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #825 from toeverything/bugfix/delete-member

Browse Source 
fix: workspace owner will delete himself
This commit is contained in:
DarkSky
2023-02-06 18:06:25 +08:00
committed by GitHub
parent b28668d947 0e5ef7844c
commit 22ba80c95d
1 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
packages/app/src/components/workspace-setting/member/MembersPage.tsx
View File

@@ -32,7 +32,6 @@ import { EnableWorkspaceButton } from '@/components/enable-workspace';
export const MembersPage = ({ workspace }: { workspace: WorkspaceUnit }) => { export const MembersPage = ({ workspace }: { workspace: WorkspaceUnit }) => {
const [isInviteModalShow, setIsInviteModalShow] = useState(false); const [isInviteModalShow, setIsInviteModalShow] = useState(false);
const { members, removeMember, loaded } = useMembers(); const { members, removeMember, loaded } = useMembers();
const { t } = useTranslation(); const { t } = useTranslation();
const { confirm } = useConfirm(); const { confirm } = useConfirm();
@@ -94,41 +93,45 @@ export const MembersPage = ({ workspace }: { workspace: WorkspaceUnit }) => {
: t('Pending')} : t('Pending')}
</StyledMemberRoleContainer> </StyledMemberRoleContainer>
<StyledMoreVerticalButton> <StyledMoreVerticalButton>
<Menu {member.type === 99 ? (
content={ <></>
<> ) : (
<MenuItem <Menu
onClick={async () => { content={
const confirmRemove = await confirm({ <>
title: t('Delete Member?'), <MenuItem
content: t('will delete member'), onClick={async () => {
confirmText: t('Delete'), const confirmRemove = await confirm({
confirmType: 'danger', title: t('Delete Member?'),
}); content: t('will delete member'),
confirmText: t('Delete'),
confirmType: 'danger',
});
if (!confirmRemove) { if (!confirmRemove) {
return; return;
} }
await removeMember(member.id); await removeMember(member.id);
toast( toast(
t('Member has been removed', { t('Member has been removed', {
name: user.name, name: user.name,
}) })
); );
}} }}
icon={<TrashIcon />} icon={<TrashIcon />}
> >
{t('Delete')} {t('Delete')}
</MenuItem> </MenuItem>
</> </>
} }
placement="bottom-end" placement="bottom-end"
disablePortal={true} disablePortal={true}
> >
<IconButton> <IconButton>
<MoreVerticalIcon /> <MoreVerticalIcon />
</IconButton> </IconButton>
</Menu> </Menu>
)}
</StyledMoreVerticalButton> </StyledMoreVerticalButton>
</StyledMemberListItem> </StyledMemberListItem>
); );