From a28cb4fddead8b5b389fa314587ecf929fd48b23 Mon Sep 17 00:00:00 2001
From: Mathieu Poussin <mathieu.poussin@philips.com>
Date: Wed, 10 Jul 2024 12:58:13 +0200
Subject: [PATCH 1/3] Update getOrgMembers to support service accounts listing

---
 js/apps/admin-ui/src/phaseII/orgs/useOrgFetcher.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/js/apps/admin-ui/src/phaseII/orgs/useOrgFetcher.ts b/js/apps/admin-ui/src/phaseII/orgs/useOrgFetcher.ts
index 25e3a2ab7eac..872cb7e01760 100644
--- a/js/apps/admin-ui/src/phaseII/orgs/useOrgFetcher.ts
+++ b/js/apps/admin-ui/src/phaseII/orgs/useOrgFetcher.ts
@@ -167,15 +167,17 @@ export default function useOrgFetcher(realm: string) {
     first: number;
     max: number;
     search?: string;
+    includeServiceAccounts: boolean;
   };
   async function getOrgMembers(
     orgId: string,
     { first, max, search }: OrgMemberOptions = {
       first: 1,
       max: 100,
+      includeServiceAccounts: false
     },
   ): Promise<MembersOf[]> {
-    let query = `first=${first}&max=${max}`;
+    let query = `first=${first}&max=${max}&includeServiceAccounts=${includeServiceAccounts}`;
     query = search ? `${query}&search=${search}` : query;
     const resp = await fetchGet(`${baseUrl}/orgs/${orgId}/members?${query}`);
     const result = await resp.json();

From 179c86c029fd860592eb6475c1f11098771e6ff0 Mon Sep 17 00:00:00 2001
From: Mathieu Poussin <mathieu.poussin@philips.com>
Date: Tue, 16 Jul 2024 12:33:22 +0200
Subject: [PATCH 2/3] Fix issues indicating in PR review

---
 js/apps/admin-ui/src/phaseII/orgs/useOrgFetcher.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/js/apps/admin-ui/src/phaseII/orgs/useOrgFetcher.ts b/js/apps/admin-ui/src/phaseII/orgs/useOrgFetcher.ts
index 872cb7e01760..ed6bd165db92 100644
--- a/js/apps/admin-ui/src/phaseII/orgs/useOrgFetcher.ts
+++ b/js/apps/admin-ui/src/phaseII/orgs/useOrgFetcher.ts
@@ -167,18 +167,18 @@ export default function useOrgFetcher(realm: string) {
     first: number;
     max: number;
     search?: string;
-    includeServiceAccounts: boolean;
+    includeServiceAccounts?: boolean;
   };
   async function getOrgMembers(
     orgId: string,
-    { first, max, search }: OrgMemberOptions = {
+    { first, max, search, includeServiceAccounts }: OrgMemberOptions = {
       first: 1,
-      max: 100,
-      includeServiceAccounts: false
+      max: 100
     },
   ): Promise<MembersOf[]> {
-    let query = `first=${first}&max=${max}&includeServiceAccounts=${includeServiceAccounts}`;
+    let query = `first=${first}&max=${max}`;
     query = search ? `${query}&search=${search}` : query;
+    query = includeServiceAccounts ? `${query}&includeServiceAccounts=true` : query;
     const resp = await fetchGet(`${baseUrl}/orgs/${orgId}/members?${query}`);
     const result = await resp.json();
     return result;

From 9e29875437a3ddee049fc41c109360d0e18beb0c Mon Sep 17 00:00:00 2001
From: Mathieu Poussin <mathieu.poussin@philips.com>
Date: Tue, 16 Jul 2024 12:36:00 +0200
Subject: [PATCH 3/3] Fix parameter

---
 js/apps/admin-ui/src/phaseII/orgs/useOrgFetcher.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/apps/admin-ui/src/phaseII/orgs/useOrgFetcher.ts b/js/apps/admin-ui/src/phaseII/orgs/useOrgFetcher.ts
index ed6bd165db92..2b9d11783201 100644
--- a/js/apps/admin-ui/src/phaseII/orgs/useOrgFetcher.ts
+++ b/js/apps/admin-ui/src/phaseII/orgs/useOrgFetcher.ts
@@ -178,7 +178,7 @@ export default function useOrgFetcher(realm: string) {
   ): Promise<MembersOf[]> {
     let query = `first=${first}&max=${max}`;
     query = search ? `${query}&search=${search}` : query;
-    query = includeServiceAccounts ? `${query}&includeServiceAccounts=true` : query;
+    query = includeServiceAccounts ? `${query}&includeServiceAccounts=${includeServiceAccounts}` : query;
     const resp = await fetchGet(`${baseUrl}/orgs/${orgId}/members?${query}`);
     const result = await resp.json();
     return result;