From a75edbaa327ec2af49523c13996ac283061da7d8 Mon Sep 17 00:00:00 2001 From: Sabir Hassan Date: Sun, 26 Jun 2022 01:49:07 +0500 Subject: [PATCH] fix: do not show admin users in add permission modal --- web/src/containers/Settings/addPermissionModal.tsx | 9 +++++++-- web/src/utils/types.ts | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/web/src/containers/Settings/addPermissionModal.tsx b/web/src/containers/Settings/addPermissionModal.tsx index ac113b8..1395a85 100644 --- a/web/src/containers/Settings/addPermissionModal.tsx +++ b/web/src/containers/Settings/addPermissionModal.tsx @@ -66,8 +66,13 @@ const AddPermissionModal = ({ .get(`/SASjsApi/${principalType}`) .then((res: any) => { if (res.data) { - if (principalType === 'user') setUserPrincipals(res.data) - else setGroupPrincipals(res.data) + if (principalType === 'user') { + const users: UserResponse[] = res.data + const nonAdminUsers = users.filter((user) => !user.isAdmin) + setUserPrincipals(nonAdminUsers) + } else { + setGroupPrincipals(res.data) + } } }) .catch((err) => { diff --git a/web/src/utils/types.ts b/web/src/utils/types.ts index 9dd74d2..46fd226 100644 --- a/web/src/utils/types.ts +++ b/web/src/utils/types.ts @@ -2,6 +2,7 @@ export interface UserResponse { id: number username: string displayName: string + isAdmin: boolean } export interface GroupResponse {