From 6ed865136e08b5946f9e39df61b5684752fcb7dc Mon Sep 17 00:00:00 2001 From: Nikunj Hudka Date: Sun, 23 Feb 2025 22:58:14 -0400 Subject: [PATCH] feat: ui:disabled allowed in EntityPicker Signed-off-by: Nikunj Hudka --- .../fields/EntityPicker/EntityPicker.test.tsx | 68 +++++++++++++++++++ .../fields/EntityPicker/EntityPicker.tsx | 9 ++- 2 files changed, 74 insertions(+), 3 deletions(-) diff --git a/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.test.tsx b/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.test.tsx index 3f8b1adc5a..6b5f3ee83f 100644 --- a/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.test.tsx +++ b/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.test.tsx @@ -28,6 +28,7 @@ import { EntityPickerProps } from './schema'; import { ScaffolderRJSFFieldProps as FieldProps } from '@backstage/plugin-scaffolder-react'; import { DefaultEntityPresentationApi } from '@backstage/plugin-catalog'; import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils'; +import userEvent from '@testing-library/user-event'; const makeEntity = (kind: string, namespace: string, name: string): Entity => ({ apiVersion: 'scaffolder.backstage.io/v1beta3', @@ -261,6 +262,73 @@ describe('', () => { }); }); + describe('ui:disabled EntityPicker', () => { + beforeEach(() => { + uiSchema = { + 'ui:options': { + catalogFilter: [ + { + kind: ['Group'], + 'metadata.name': 'test-entity', + }, + { + kind: ['User'], + 'metadata.name': 'test-entity', + }, + ], + }, + }; + props = { + onChange, + schema, + required: true, + uiSchema, + rawErrors, + formData, + } as unknown as FieldProps; + + catalogApi.getEntities.mockResolvedValue({ items: entities }); + }); + it('Prevents user from modifying input when ui:disabled is true', async () => { + props.uiSchema = { 'ui:disabled': true }; + props.formData = 'component:default/myentity'; + + await renderInTestApp( + + + , + ); + + const input = screen.getByRole('textbox'); + + // Expect input to be disabled + expect(input).toBeDisabled(); + expect(input).toHaveValue('component:default/myentity'); + }); + + it('Allows user to edit when ui:disabled is false', async () => { + props.uiSchema = { 'ui:disabled': false }; + props.formData = 'component:default/myentity'; + + await renderInTestApp( + + + , + ); + + const input = screen.getByRole('textbox'); + expect(input).not.toBeDisabled(); + + fireEvent.change(input, { + target: { value: 'component:default/mynewentity' }, + }); + fireEvent.blur(input); + + expect(input).toHaveValue('component:default/mynewentity'); + expect(onChange).toHaveBeenCalledWith('component:default/mynewentity'); + }); + }); + describe('catalogFilter should take precedence over allowedKinds', () => { beforeEach(() => { uiSchema = { diff --git a/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.tsx b/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.tsx index e1f34638dc..32cdcd73f4 100644 --- a/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.tsx +++ b/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.tsx @@ -73,6 +73,7 @@ export const EntityPicker = (props: EntityPickerProps) => { const defaultKind = uiSchema['ui:options']?.defaultKind; const defaultNamespace = uiSchema['ui:options']?.defaultNamespace || undefined; + const isDisabled = uiSchema?.['ui:disabled'] ?? false; const catalogApi = useApi(catalogApiRef); const entityPresentationApi = useApi(entityPresentationApiRef); @@ -185,9 +186,10 @@ export const EntityPicker = (props: EntityPickerProps) => { > { FormHelperTextProps={{ margin: 'dense', style: { marginLeft: 0 } }} variant="outlined" required={required} + disabled={isDisabled} InputProps={params.InputProps} /> )}