diff --git a/.changeset/rude-penguins-press.md b/.changeset/rude-penguins-press.md new file mode 100644 index 0000000000..967b04bc19 --- /dev/null +++ b/.changeset/rude-penguins-press.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-scaffolder': patch +--- + +Title and description in RepoUrlPicker are now correctly displayed. diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.test.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.test.tsx index da86e6e4b8..fb0b478556 100644 --- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.test.tsx +++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.test.tsx @@ -132,6 +132,38 @@ describe('RepoUrlPicker', () => { getByRole('option', { name: 'dev.azure.com' }), ).toBeInTheDocument(); }); + + it('should render properly with title and description', async () => { + const { getByText } = await renderInTestApp( + + +
, + }} + /> + + , + ); + + expect(getByText('test title')).toBeInTheDocument(); + expect(getByText('test description')).toBeInTheDocument(); + }); }); describe('requestUserCredentials', () => { diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx index 57cebb3d96..7fc71d8338 100644 --- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx +++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx @@ -31,6 +31,7 @@ import { RepoUrlPickerProps } from './schema'; import { RepoUrlPickerState } from './types'; import useDebounce from 'react-use/lib/useDebounce'; import { useTemplateSecrets } from '@backstage/plugin-scaffolder-react'; +import { Box, Divider, Typography } from '@material-ui/core'; export { RepoUrlPickerSchema } from './schema'; @@ -41,7 +42,7 @@ export { RepoUrlPickerSchema } from './schema'; * @public */ export const RepoUrlPicker = (props: RepoUrlPickerProps) => { - const { uiSchema, onChange, rawErrors, formData } = props; + const { uiSchema, onChange, rawErrors, formData, schema } = props; const [state, setState] = useState( parseRepoPickerUrl(formData), ); @@ -157,9 +158,17 @@ export const RepoUrlPicker = (props: RepoUrlPickerProps) => { const hostType = (state.host && integrationApi.byHost(state.host)?.type) ?? null; - return ( <> + {schema.title && ( + + {schema.title} + + + )} + {schema.description && ( + {schema.description} + )}