From afbb1b6192e70a09a7dbc149a008d1d3a149572f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nuno=20G=C3=B3is?= Date: Tue, 18 Jun 2024 09:03:20 +0100 Subject: [PATCH] refactor: remove redundant ADMIN role check --- .../ProjectAccessAssign/ProjectAccessAssign.tsx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/frontend/src/component/project/ProjectAccess/ProjectAccessAssign/ProjectAccessAssign.tsx b/frontend/src/component/project/ProjectAccess/ProjectAccessAssign/ProjectAccessAssign.tsx index bcd0c57ab1..2fb5d03b14 100644 --- a/frontend/src/component/project/ProjectAccess/ProjectAccessAssign/ProjectAccessAssign.tsx +++ b/frontend/src/component/project/ProjectAccess/ProjectAccessAssign/ProjectAccessAssign.tsx @@ -39,6 +39,7 @@ import type { IServiceAccount } from 'interfaces/service-account'; import { MultipleRoleSelect } from 'component/common/MultipleRoleSelect/MultipleRoleSelect'; import type { IUserProjectRole } from '../../../../interfaces/userProjectRoles'; import { useCheckProjectPermissions } from 'hooks/useHasAccess'; +import { ADMIN } from 'component/providers/AccessProvider/permissions'; const StyledForm = styled('form')(() => ({ display: 'flex', @@ -326,12 +327,10 @@ export const ProjectAccessAssign = ({ const isValid = selectedOptions.length > 0 && selectedRoles.length > 0; const displayAllRoles = - checkPermissions('ADMIN') || + checkPermissions(ADMIN) || userRoles.length === 0 || - userRoles.some( - (userRole) => - userRole.name === 'Admin' || userRole.name === 'Owner', - ); + userRoles.some((userRole) => userRole.name === 'Owner'); + let filteredRoles: IRole[]; if (displayAllRoles) { filteredRoles = roles;