admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed I shouldn't be able to remove myself from a workspace #3330 (#3349)

Browse Source 
* correct delete workspace member condition

* fix lit error
This commit is contained in:
Brendan
2024-01-10 14:48:32 +00:00
committed by GitHub
parent 2713285a0f
commit 4f9ea78258
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/twenty-front/src/pages/settings/SettingsWorkspaceMembers.tsx
View File

@ -2,6 +2,7 @@ import { useState } from 'react';
import styled from '@emotion/styled'; import styled from '@emotion/styled';
import { useRecoilValue } from 'recoil'; import { useRecoilValue } from 'recoil';
import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState'; import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular'; import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord'; import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord';
@ -43,6 +44,7 @@ export const SettingsWorkspaceMembers = () => {
objectNameSingular: CoreObjectNameSingular.WorkspaceMember, objectNameSingular: CoreObjectNameSingular.WorkspaceMember,
}); });
const currentWorkspace = useRecoilValue(currentWorkspaceState); const currentWorkspace = useRecoilValue(currentWorkspaceState);
const currentWorkspaceMember = useRecoilValue(currentWorkspaceMemberState);
const handleRemoveWorkspaceMember = async (workspaceMemberId: string) => { const handleRemoveWorkspaceMember = async (workspaceMemberId: string) => {
await deleteOneWorkspaceMember?.(workspaceMemberId); await deleteOneWorkspaceMember?.(workspaceMemberId);
@ -74,7 +76,7 @@ export const SettingsWorkspaceMembers = () => {
key={member.id} key={member.id}
workspaceMember={member as WorkspaceMember} workspaceMember={member as WorkspaceMember}
accessory={ accessory={
currentWorkspace?.id !== member.id && ( currentWorkspaceMember?.id !== member.id && (
<StyledButtonContainer> <StyledButtonContainer>
<IconButton <IconButton
onClick={() => { onClick={() => {