From c1f5541d5c1d8a640210e05fcafee40c4af6368c Mon Sep 17 00:00:00 2001 From: blam Date: Thu, 10 Nov 2022 17:35:09 +0100 Subject: [PATCH 1/4] chore: fixing the type for the return of the `createNextScaffolderFieldExtension` Signed-off-by: blam --- .../components/scaffolder/customScaffolderExtensions.tsx | 8 +++++--- plugins/scaffolder/src/extensions/index.tsx | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/app/src/components/scaffolder/customScaffolderExtensions.tsx b/packages/app/src/components/scaffolder/customScaffolderExtensions.tsx index 2a4dedf080..3265d347a2 100644 --- a/packages/app/src/components/scaffolder/customScaffolderExtensions.tsx +++ b/packages/app/src/components/scaffolder/customScaffolderExtensions.tsx @@ -14,10 +14,12 @@ * limitations under the License. */ import React from 'react'; -import type { FieldValidation } from '@rjsf/core'; +import type { FieldValidation } from '@rjsf/utils'; import { + createNextScaffolderFieldExtension, createScaffolderFieldExtension, FieldExtensionComponentProps, + NextFieldExtensionComponentProps, scaffolderPlugin, } from '@backstage/plugin-scaffolder'; @@ -64,7 +66,7 @@ export const LowerCaseValuePickerFieldExtension = scaffolderPlugin.provide( ); const MockDelayComponent = ( - props: FieldExtensionComponentProps<{ test?: string }>, + props: NextFieldExtensionComponentProps<{ test?: string }>, ) => { const { onChange, formData, rawErrors } = props; return ( @@ -80,7 +82,7 @@ const MockDelayComponent = ( }; export const DelayingComponentFieldExtension = scaffolderPlugin.provide( - createScaffolderFieldExtension({ + createNextScaffolderFieldExtension({ name: 'DelayingComponent', component: MockDelayComponent, validation: async ( diff --git a/plugins/scaffolder/src/extensions/index.tsx b/plugins/scaffolder/src/extensions/index.tsx index 08075b5b9d..3d9e8dde77 100644 --- a/plugins/scaffolder/src/extensions/index.tsx +++ b/plugins/scaffolder/src/extensions/index.tsx @@ -72,7 +72,7 @@ export function createNextScaffolderFieldExtension< TInputProps extends UIOptionsType = {}, >( options: NextFieldExtensionOptions, -): Extension> { +): Extension { return { expose() { const FieldExtensionDataHolder: any = () => null; From b2bb48a6f447d4d7f247771e83a1fcde015044fa Mon Sep 17 00:00:00 2001 From: blam Date: Thu, 10 Nov 2022 17:36:00 +0100 Subject: [PATCH 2/4] chore: add changeset Signed-off-by: blam --- .changeset/tidy-avocados-ring.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/tidy-avocados-ring.md diff --git a/.changeset/tidy-avocados-ring.md b/.changeset/tidy-avocados-ring.md new file mode 100644 index 0000000000..bc1a0f330d --- /dev/null +++ b/.changeset/tidy-avocados-ring.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-scaffolder': patch +--- + +Fix the return type for the `createNextScaffodlerFieldExtension` type as before it wasn't a component type for the extension From d293d8ec229d6156585104d9c6d429e561ab894c Mon Sep 17 00:00:00 2001 From: blam Date: Thu, 10 Nov 2022 17:41:08 +0100 Subject: [PATCH 3/4] chore: heres the actual fix Signed-off-by: blam --- plugins/scaffolder/src/extensions/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/scaffolder/src/extensions/index.tsx b/plugins/scaffolder/src/extensions/index.tsx index 3d9e8dde77..08ab3e603c 100644 --- a/plugins/scaffolder/src/extensions/index.tsx +++ b/plugins/scaffolder/src/extensions/index.tsx @@ -72,7 +72,7 @@ export function createNextScaffolderFieldExtension< TInputProps extends UIOptionsType = {}, >( options: NextFieldExtensionOptions, -): Extension { +): Extension> { return { expose() { const FieldExtensionDataHolder: any = () => null; From 0a0365e87748733eb8dfcbf8ba59b89df2a9f451 Mon Sep 17 00:00:00 2001 From: blam Date: Fri, 11 Nov 2022 12:08:14 +0100 Subject: [PATCH 4/4] chore: fixing the return type in the api-report Signed-off-by: blam --- plugins/scaffolder/api-report.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/scaffolder/api-report.md b/plugins/scaffolder/api-report.md index 158c75e5bd..27eb863a16 100644 --- a/plugins/scaffolder/api-report.md +++ b/plugins/scaffolder/api-report.md @@ -42,7 +42,7 @@ export function createNextScaffolderFieldExtension< TInputProps extends UIOptionsType = {}, >( options: NextFieldExtensionOptions, -): Extension>; +): Extension>; // @public export function createScaffolderFieldExtension<