From 593d0612241b257e1b94bf314f6b56d425aa11b6 Mon Sep 17 00:00:00 2001
From: Erik Jan de Wit <erikjan.dewit@gmail.com>
Date: Wed, 27 Apr 2022 17:30:13 +0200
Subject: [PATCH] Changed the load to also include the existing values (#2507)

---
 .../authorization/PermissionDetails.tsx       |  4 +-
 .../authorization/ResourcesPolicySelect.tsx   | 72 +++++++++++++++----
 .../authorization/policy/Aggregate.tsx        |  6 +-
 3 files changed, 61 insertions(+), 21 deletions(-)

diff --git a/src/clients/authorization/PermissionDetails.tsx b/src/clients/authorization/PermissionDetails.tsx
index 6bdb1c4092..c4b2ce9dbd 100644
--- a/src/clients/authorization/PermissionDetails.tsx
+++ b/src/clients/authorization/PermissionDetails.tsx
@@ -296,8 +296,8 @@ export default function PermissionDetails() {
               >
                 <ResourcesPolicySelect
                   name="resources"
-                  searchFunction="listResources"
                   clientId={id}
+                  permissionId={permissionId}
                   preSelected={
                     permissionType === "scope" ? undefined : selectedId
                   }
@@ -343,8 +343,8 @@ export default function PermissionDetails() {
             >
               <ResourcesPolicySelect
                 name="policies"
-                searchFunction="listPolicies"
                 clientId={id}
+                permissionId={permissionId}
               />
             </FormGroup>
             <FormGroup
diff --git a/src/clients/authorization/ResourcesPolicySelect.tsx b/src/clients/authorization/ResourcesPolicySelect.tsx
index edaaf8250c..689729ebf0 100644
--- a/src/clients/authorization/ResourcesPolicySelect.tsx
+++ b/src/clients/authorization/ResourcesPolicySelect.tsx
@@ -3,14 +3,17 @@ import { useTranslation } from "react-i18next";
 import { Controller, useFormContext } from "react-hook-form";
 import { Select, SelectOption, SelectVariant } from "@patternfly/react-core";
 
+import type ResourceRepresentation from "@keycloak/keycloak-admin-client/lib/defs/resourceRepresentation";
 import type PolicyRepresentation from "@keycloak/keycloak-admin-client/lib/defs/policyRepresentation";
 import type { Clients } from "@keycloak/keycloak-admin-client/lib/resources/clients";
 import { useAdminClient, useFetch } from "../../context/auth/AdminClient";
 
+type Type = "resources" | "policies";
+
 type ResourcesPolicySelectProps = {
-  name: keyof PolicyRepresentation;
+  name: Type;
   clientId: string;
-  searchFunction: keyof Pick<Clients, "listPolicies" | "listResources">;
+  permissionId?: string;
   variant?: SelectVariant;
   preSelected?: string;
   isRequired?: boolean;
@@ -21,10 +24,31 @@ type Policies = {
   name?: string;
 };
 
+type TypeMapping = {
+  [key in Type]: {
+    searchFunction: keyof Pick<Clients, "listPolicies" | "listResources">;
+    fetchFunction: keyof Pick<
+      Clients,
+      "getAssociatedPolicies" | "getAssociatedResources"
+    >;
+  };
+};
+
+const typeMapping: TypeMapping = {
+  resources: {
+    searchFunction: "listResources",
+    fetchFunction: "getAssociatedResources",
+  },
+  policies: {
+    searchFunction: "listPolicies",
+    fetchFunction: "getAssociatedPolicies",
+  },
+};
+
 export const ResourcesPolicySelect = ({
   name,
-  searchFunction,
   clientId,
+  permissionId,
   variant = SelectVariant.typeaheadMulti,
   preSelected,
   isRequired = false,
@@ -40,20 +64,40 @@ export const ResourcesPolicySelect = ({
   const [search, setSearch] = useState("");
   const [open, setOpen] = useState(false);
 
+  const functions = typeMapping[name];
+
+  const convert = (
+    p: PolicyRepresentation | ResourceRepresentation
+  ): Policies => ({
+    id: "_id" in p ? p._id : "id" in p ? p.id : undefined,
+    name: p.name,
+  });
+
   useFetch(
     async () =>
       (
-        await adminClient.clients[searchFunction](
-          Object.assign(
-            { id: clientId, first: 0, max: 10 },
-            search === "" ? null : { name: search }
-          )
-        )
-      ).map((p) => ({
-        id: "_id" in p ? p._id : "id" in p ? p.id : undefined,
-        name: p.name,
-      })),
-    (policies) => setItems(policies),
+        await Promise.all([
+          adminClient.clients[functions.searchFunction](
+            Object.assign(
+              { id: clientId, first: 0, max: 10 },
+              search === "" ? null : { name: search }
+            )
+          ),
+          permissionId
+            ? adminClient.clients[functions.fetchFunction]({
+                id: clientId,
+                permissionId,
+              })
+            : Promise.resolve([]),
+        ])
+      )
+        .flat()
+        .map(convert)
+        .filter(
+          ({ id }, index, self) =>
+            index === self.findIndex(({ id: otherId }) => id === otherId)
+        ),
+    setItems,
     [search]
   );
 
diff --git a/src/clients/authorization/policy/Aggregate.tsx b/src/clients/authorization/policy/Aggregate.tsx
index 5527516a25..0910a17627 100644
--- a/src/clients/authorization/policy/Aggregate.tsx
+++ b/src/clients/authorization/policy/Aggregate.tsx
@@ -24,11 +24,7 @@ export const Aggregate = () => {
           />
         }
       >
-        <ResourcesPolicySelect
-          name="policies"
-          searchFunction="listPolicies"
-          clientId={id}
-        />
+        <ResourcesPolicySelect name="policies" clientId={id} />
       </FormGroup>
       <DecisionStrategySelect helpLabel="policyDecisionStagey" />
     </>