From c88ec5c06d19182c48a96c0b1af5dc0d96af10f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Vit=C3=A1sek?= Date: Tue, 30 Jan 2024 11:42:05 +0100 Subject: [PATCH] bare minimum to resolve large datasets problem MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ladislav Vitásek --- .changeset/four-walls-perform.md | 3 +-- .../src/components/fields/EntityPicker/EntityPicker.tsx | 9 +-------- .../src/components/fields/EntityPicker/schema.ts | 7 ------- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/.changeset/four-walls-perform.md b/.changeset/four-walls-perform.md index b8e4c80416..5275da7b79 100644 --- a/.changeset/four-walls-perform.md +++ b/.changeset/four-walls-perform.md @@ -2,5 +2,4 @@ '@backstage/plugin-scaffolder': minor --- -Updating the `EntityPicker` to only select by default `kind` `metadata.name` `metadata.namespace` and `metadata.title` by default to improve performance on larger datasets. - +Updating the `EntityPicker` to only select `kind` `metadata.name` and `metadata.namespace` by default to improve performance on larger datasets. diff --git a/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.tsx b/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.tsx index 6a74b9ae51..c9b74b49c7 100644 --- a/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.tsx +++ b/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.tsx @@ -61,20 +61,13 @@ export const EntityPicker = (props: EntityPickerProps) => { } = props; const catalogFilter = buildCatalogFilter(uiSchema); const defaultKind = uiSchema['ui:options']?.defaultKind; - const customFields = uiSchema['ui:options']?.fields; const defaultNamespace = uiSchema['ui:options']?.defaultNamespace || undefined; const catalogApi = useApi(catalogApiRef); const { value: entities, loading } = useAsync(async () => { - const defaultFields = [ - 'metadata.name', - 'metadata.namespace', - 'metadata.title', - 'kind', - ]; - const fields = customFields || defaultFields; + const fields = ['metadata.name', 'metadata.namespace', 'kind']; const { items } = await catalogApi.getEntities( catalogFilter ? { filter: catalogFilter, fields: fields } diff --git a/plugins/scaffolder/src/components/fields/EntityPicker/schema.ts b/plugins/scaffolder/src/components/fields/EntityPicker/schema.ts index 0b9ddbe672..eb1bba364b 100644 --- a/plugins/scaffolder/src/components/fields/EntityPicker/schema.ts +++ b/plugins/scaffolder/src/components/fields/EntityPicker/schema.ts @@ -41,13 +41,6 @@ export const EntityPickerFieldSchema = makeFieldSchemaFromZod( .describe( 'DEPRECATED: Use `catalogFilter` instead. List of kinds of entities to derive options from', ), - fields: z - .array(z.string()) - .optional() - .describe( - 'Download only the parts of each entity that match the field declarations.' + - " Defaults to: fields: ['metadata.name', 'metadata.namespace', 'metadata.title', 'kind']", - ), defaultKind: z .string() .optional()