diff --git a/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.tsx b/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.tsx index 0a0fcfdc2b..073b364720 100644 --- a/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.tsx +++ b/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.tsx @@ -71,14 +71,8 @@ export const MultiEntityPicker = (props: MultiEntityPickerProps) => { const { items } = await catalogApi.getEntities( catalogFilter ? { filter: catalogFilter } : undefined, ); - const primaryTitles: string[] = []; - for (const item of items) { - const entityPresentation = (await entityPresentationApi.forEntity(item) - ?.promise) as EntityRefPresentationSnapshot[]; - entityPresentation.map(e => primaryTitles.push(e.primaryTitle)); - } - return { items, primaryTitles }; + return items; }); const allowArbitraryValues = uiSchema['ui:options']?.allowArbitraryValues ?? true; @@ -134,10 +128,10 @@ export const MultiEntityPicker = (props: MultiEntityPickerProps) => { ); useEffect(() => { - if (entities?.items?.length === 1) { - onChange([stringifyEntityRef(entities.items[0])]); + if (entities?.length === 1) { + onChange([stringifyEntityRef(entities[0])]); } - }, [entities?.items, onChange]); + }, [entities, onChange]); return ( { formData && formData.includes(stringifyEntityRef(e)), - ) ?? - (allowArbitraryValues && formData - ? entities?.primaryTitles || [] - : []) - } loading={loading} onChange={onSelect} - options={entities?.items || []} + options={entities || []} renderOption={option => } getOptionLabel={option => // option can be a string due to freeSolo.