From f8d1ca646054c20bb5baa2553ba6ed8255e6d430 Mon Sep 17 00:00:00 2001
From: Johannes Batzill <johannes.batzill@harness.io>
Date: Tue, 15 Aug 2023 03:41:23 +0000
Subject: [PATCH] [UI] Membership Add Is not filtering for Users (#317)

---
 .../components/CreateBranchModal/CreateBranchModal.tsx    | 2 +-
 .../SpaceAccessControl/AddNewMember/AddNewMember.tsx      | 8 +++++---
 web/src/utils/FileUtils.ts                                | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/web/src/components/CreateBranchModal/CreateBranchModal.tsx b/web/src/components/CreateBranchModal/CreateBranchModal.tsx
index 16b8863af..18c42f269 100644
--- a/web/src/components/CreateBranchModal/CreateBranchModal.tsx
+++ b/web/src/components/CreateBranchModal/CreateBranchModal.tsx
@@ -22,7 +22,7 @@ import { get } from 'lodash-es'
 import { useModalHook } from '@harness/use-modal'
 import { useStrings } from 'framework/strings'
 import { getErrorMessage, permissionProps } from 'utils/Utils'
-import { CodeIcon, GitInfoProps, isGitBranchNameValid } from 'utils/GitUtils'
+import { GitInfoProps, isGitBranchNameValid } from 'utils/GitUtils'
 import { BranchTagSelect } from 'components/BranchTagSelect/BranchTagSelect'
 import type { RepoBranch } from 'services/code'
 import { useGetSpaceParam } from 'hooks/useGetSpaceParam'
diff --git a/web/src/pages/SpaceAccessControl/AddNewMember/AddNewMember.tsx b/web/src/pages/SpaceAccessControl/AddNewMember/AddNewMember.tsx
index 981d58356..3f3eb1b7a 100644
--- a/web/src/pages/SpaceAccessControl/AddNewMember/AddNewMember.tsx
+++ b/web/src/pages/SpaceAccessControl/AddNewMember/AddNewMember.tsx
@@ -6,12 +6,12 @@ import { Formik } from 'formik'
 import * as Yup from 'yup'
 
 import { useStrings } from 'framework/strings'
+import { useGet } from 'restful-react'
 import { useGetSpaceParam } from 'hooks/useGetSpaceParam'
 import {
   MembershipAddRequestBody,
   TypesMembershipUser,
   TypesPrincipalInfo,
-  useListPrincipals,
   useMembershipAdd,
   useMembershipUpdate
 } from 'services/code'
@@ -36,16 +36,18 @@ const useAddNewMember = ({ onClose }: { onClose: () => void }) => {
     user_uid: membershipDetails?.principal?.uid || ''
   })
 
-  const { data: users, loading: fetchingUsers } = useListPrincipals({
+  const { data: users, loading: fetchingUsers }  = useGet<TypesPrincipalInfo[]>({
+    path: `/api/v1/principals`,
     queryParams: {
       query: searchTerm,
       page: 1,
       limit: LIST_FETCHING_LIMIT,
-      type: ['user']
+      type: 'user'
     },
     debounce: 500
   })
 
+
   const roleOptions: SelectOption[] = useMemo(
     () =>
       roles.map(role => ({
diff --git a/web/src/utils/FileUtils.ts b/web/src/utils/FileUtils.ts
index b26bcff03..397f45ff1 100644
--- a/web/src/utils/FileUtils.ts
+++ b/web/src/utils/FileUtils.ts
@@ -1,4 +1,4 @@
-import { useEffect, useMemo } from 'react'
+import { useMemo } from 'react'
 import { pdfjs } from 'react-pdf'
 import { useAppContext } from 'AppContext'
 import type { RepoFileContent } from 'services/code'