Merge pull request #25359 from mbenson/OEP_cf_array

Support catalogFilter array on OwnedEntityPicker; addresses https://g…

.changeset/silent-moose-eat.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Support `catalogFilter` array on `OwnedEntityPicker`

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 [{}];
+}