From f015af8e88b6aecbb9dd5a6bea98d5be884d9d79 Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia Date: Fri, 13 Sep 2024 14:58:05 +0530 Subject: [PATCH 1/2] fix: project member validation --- web/core/components/project/settings/member-columns.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/core/components/project/settings/member-columns.tsx b/web/core/components/project/settings/member-columns.tsx index 118311b73bd..ecf3f10d1e0 100644 --- a/web/core/components/project/settings/member-columns.tsx +++ b/web/core/components/project/settings/member-columns.tsx @@ -104,10 +104,10 @@ export const AccountTypeColumn: React.FC = observer((props) => const currentMemberWorkspaceRole = getWorkspaceMemberDetails(value)?.role as EUserPermissions | undefined; if (!value || !currentMemberWorkspaceRole) return ROLE; - const isGuestOrViewer = [EUserPermissions.GUEST].includes(currentMemberWorkspaceRole); + const isGuestOROwner = [EUserPermissions.ADMIN, EUserPermissions.GUEST].includes(currentMemberWorkspaceRole); return Object.fromEntries( - Object.entries(ROLE).filter(([key]) => !isGuestOrViewer || [5, 10].includes(parseInt(key))) + Object.entries(ROLE).filter(([key]) => !isGuestOROwner || [currentMemberWorkspaceRole].includes(parseInt(key))) ); }; From caf368f96ff80deb35a7e1ee8898cce458492a25 Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia Date: Fri, 13 Sep 2024 15:58:11 +0530 Subject: [PATCH 2/2] fix: project member validation --- web/core/components/project/settings/member-columns.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/core/components/project/settings/member-columns.tsx b/web/core/components/project/settings/member-columns.tsx index ecf3f10d1e0..dae12532385 100644 --- a/web/core/components/project/settings/member-columns.tsx +++ b/web/core/components/project/settings/member-columns.tsx @@ -97,8 +97,8 @@ export const AccountTypeColumn: React.FC = observer((props) => // derived values const isCurrentUser = currentUser?.id === rowData.member.id; - const isAdminRole = currentProjectRole === EUserPermissions.ADMIN; - const isRoleNonEditable = isCurrentUser || !isAdminRole; + const isAdminOrGuest = [EUserPermissions.ADMIN, EUserPermissions.GUEST].includes(rowData.role); + const isRoleNonEditable = isCurrentUser || isAdminOrGuest; const checkCurrentOptionWorkspaceRole = (value: string) => { const currentMemberWorkspaceRole = getWorkspaceMemberDetails(value)?.role as EUserPermissions | undefined;