From ebca34c9e5bef7061ac81d311e4a1b485a634314 Mon Sep 17 00:00:00 2001 From: DiamondThree <857159145@qq.com> Date: Mon, 6 Feb 2023 16:33:07 +0800 Subject: [PATCH] fix: workspace owner will delete himself --- .../workspace-setting/member/MembersPage.tsx | 73 ++++++++++--------- 1 file changed, 38 insertions(+), 35 deletions(-) diff --git a/packages/app/src/components/workspace-setting/member/MembersPage.tsx b/packages/app/src/components/workspace-setting/member/MembersPage.tsx index caa6047773..f7dec5cd31 100644 --- a/packages/app/src/components/workspace-setting/member/MembersPage.tsx +++ b/packages/app/src/components/workspace-setting/member/MembersPage.tsx @@ -32,7 +32,6 @@ import { EnableWorkspaceButton } from '@/components/enable-workspace'; export const MembersPage = ({ workspace }: { workspace: WorkspaceUnit }) => { const [isInviteModalShow, setIsInviteModalShow] = useState(false); const { members, removeMember, loaded } = useMembers(); - const { t } = useTranslation(); const { confirm } = useConfirm(); @@ -94,41 +93,45 @@ export const MembersPage = ({ workspace }: { workspace: WorkspaceUnit }) => { : t('Pending')} - - { - const confirmRemove = await confirm({ - title: t('Delete Member?'), - content: t('will delete member'), - confirmText: t('Delete'), - confirmType: 'danger', - }); + {member.type === 99 ? ( + <> + ) : ( + + { + 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); - toast( - t('Member has been removed', { - name: user.name, - }) - ); - }} - icon={} - > - {t('Delete')} - - - } - placement="bottom-end" - disablePortal={true} - > - - - - + if (!confirmRemove) { + return; + } + await removeMember(member.id); + toast( + t('Member has been removed', { + name: user.name, + }) + ); + }} + icon={} + > + {t('Delete')} + + + } + placement="bottom-end" + disablePortal={true} + > + + + + + )} );