From 9f4c552157ab9a7875c76dac3b195a84f29eba60 Mon Sep 17 00:00:00 2001 From: blam Date: Fri, 7 Jan 2022 18:10:11 +0100 Subject: [PATCH] chore: some code review comments Signed-off-by: blam --- .../src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx | 4 ++-- plugins/scaffolder/src/extensions/index.tsx | 4 ++-- plugins/scaffolder/src/extensions/types.ts | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx index ba85bdaeb1..fea96dfe7f 100644 --- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx +++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx @@ -20,7 +20,7 @@ import { GithubRepoPicker } from './GithubRepoPicker'; import { GitlabRepoPicker } from './GitlabRepoPicker'; import { AzureRepoPicker } from './AzureRepoPicker'; import { BitbucketRepoPicker } from './BitbucketRepoPicker'; -import { CustomFieldExtension } from '../../../extensions'; +import { FieldExtensionComponentProps } from '../../../extensions'; import { RepoUrlPickerHost } from './RepoUrlPickerHost'; import { splitFormData, serializeFormData } from './utils'; @@ -34,7 +34,7 @@ export const RepoUrlPicker = ({ onChange, rawErrors, formData, -}: CustomFieldExtension) => { +}: FieldExtensionComponentProps) => { const [state, setState] = useState<{ host?: string; owner?: string; diff --git a/plugins/scaffolder/src/extensions/index.tsx b/plugins/scaffolder/src/extensions/index.tsx index 9d5cf4f0b4..f9c167a6b0 100644 --- a/plugins/scaffolder/src/extensions/index.tsx +++ b/plugins/scaffolder/src/extensions/index.tsx @@ -18,7 +18,7 @@ import React from 'react'; import { CustomFieldValidator, FieldExtensionOptions, - CustomFieldExtension, + FieldExtensionComponentProps, } from './types'; import { Extension, attachComponentData } from '@backstage/core-plugin-api'; @@ -53,7 +53,7 @@ attachComponentData( export type { CustomFieldValidator, FieldExtensionOptions, - CustomFieldExtension, + FieldExtensionComponentProps, }; export { DEFAULT_SCAFFOLDER_FIELD_EXTENSIONS } from './default'; diff --git a/plugins/scaffolder/src/extensions/types.ts b/plugins/scaffolder/src/extensions/types.ts index 12339f5be7..2fdb80e684 100644 --- a/plugins/scaffolder/src/extensions/types.ts +++ b/plugins/scaffolder/src/extensions/types.ts @@ -30,8 +30,10 @@ export type FieldExtensionOptions = { validation?: CustomFieldValidator; }; -export interface CustomFieldExtension - extends FieldProps { +export interface FieldExtensionComponentProps< + ReturnValue, + UiOptions extends {} = {}, +> extends FieldProps { uiSchema: { 'ui:options'?: UiOptions; };