From 89c44b36544499ac1fe4c04f165abf7b603d4a9c Mon Sep 17 00:00:00 2001
From: Matt Benson <gudnabrsam@gmail.com>
Date: Fri, 21 Jun 2024 19:23:44 -0500
Subject: [PATCH 1/2] Support catalogFilter array on OwnedEntityPicker;
 addresses https://github.com/backstage/backstage/issues/25358

Signed-off-by: Matt Benson <gudnabrsam@gmail.com>
---
 .changeset/silent-moose-eat.md                |  5 ++++
 .../OwnedEntityPicker/OwnedEntityPicker.tsx   | 23 ++++++++++---------
 2 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 .changeset/silent-moose-eat.md

diff --git a/.changeset/silent-moose-eat.md b/.changeset/silent-moose-eat.md
new file mode 100644
index 0000000000..735afa12f1
--- /dev/null
+++ b/.changeset/silent-moose-eat.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Support catalogFilter array on OwnedEntityPicker
diff --git a/plugins/scaffolder/src/components/fields/OwnedEntityPicker/OwnedEntityPicker.tsx b/plugins/scaffolder/src/components/fields/OwnedEntityPicker/OwnedEntityPicker.tsx
index d5351d54e5..02c437ceb6 100644
--- a/plugins/scaffolder/src/components/fields/OwnedEntityPicker/OwnedEntityPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/OwnedEntityPicker/OwnedEntityPicker.tsx
@@ -90,17 +90,11 @@ function buildEntityPickerUISchema(
     uiSchema?.['ui:options'] || {};
   const allowedKinds = uiOptions.allowedKinds;
 
-  const catalogFilter = {
-    ...uiOptions.catalogFilter,
-    ...(allowedKinds
-      ? {
-          kind: allowedKinds,
-          [`relations.${RELATION_OWNED_BY}`]: identityRefs || [],
-        }
-      : {
-          [`relations.${RELATION_OWNED_BY}`]: identityRefs || [],
-        }),
-  };
+  const catalogFilter = asArray(uiOptions.catalogFilter).map(e => ({
+    ...e,
+    ...(allowedKinds ? { kind: allowedKinds } : {}),
+    [`relations.${RELATION_OWNED_BY}`]: identityRefs || [],
+  }));
 
   return {
     'ui:options': {
@@ -108,3 +102,10 @@ function buildEntityPickerUISchema(
     },
   };
 }
+
+function asArray(catalogFilter: any): any[] {
+  if (catalogFilter) {
+    return Array.isArray(catalogFilter) ? catalogFilter : [catalogFilter];
+  }
+  return [{}];
+}

From 148a6f17b466c7a26468faa6695ff521594a6c31 Mon Sep 17 00:00:00 2001
From: Ben Lambert <blam@spotify.com>
Date: Mon, 24 Jun 2024 15:28:56 +0200
Subject: [PATCH 2/2] Update silent-moose-eat.md

Signed-off-by: Ben Lambert <blam@spotify.com>
---
 .changeset/silent-moose-eat.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/silent-moose-eat.md b/.changeset/silent-moose-eat.md
index 735afa12f1..bc66f55181 100644
--- a/.changeset/silent-moose-eat.md
+++ b/.changeset/silent-moose-eat.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-scaffolder': patch
 ---
 
-Support catalogFilter array on OwnedEntityPicker
+Support `catalogFilter` array on `OwnedEntityPicker`