From adfb075796e5022a16cfaa6311c7fd6cedcbf0e2 Mon Sep 17 00:00:00 2001 From: blam Date: Thu, 8 Sep 2022 14:25:09 +0200 Subject: [PATCH] chore: one last error Signed-off-by: blam --- .../src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx | 5 +---- .../src/next/TemplateWizardPage/Stepper/Stepper.tsx | 6 +++--- .../src/next/TemplateWizardPage/Stepper/schema.ts | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx index 870ec9dd53..451df857e5 100644 --- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx +++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx @@ -62,10 +62,7 @@ export interface RepoUrlPickerUiOptions { * @public */ export const RepoUrlPicker = ( - props: FieldExtensionComponentProps< - string | undefined, - RepoUrlPickerUiOptions - >, + props: FieldExtensionComponentProps, ) => { const { uiSchema, onChange, rawErrors, formData } = props; const [state, setState] = useState( diff --git a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/Stepper.tsx b/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/Stepper.tsx index ccdf32542a..ade7c982ff 100644 --- a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/Stepper.tsx +++ b/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/Stepper.tsx @@ -23,7 +23,7 @@ import { makeStyles, } from '@material-ui/core'; import { withTheme } from '@rjsf/core'; -import { FieldValidation } from '@rjsf/utils'; +import { ErrorSchema, FieldValidation } from '@rjsf/utils'; import { Theme as MuiTheme } from '@rjsf/material-ui'; import React, { useMemo, useState } from 'react'; import { FieldExtensionOptions } from '../../../extensions'; @@ -95,7 +95,7 @@ export const Stepper = (props: StepperProps) => { const returnedValidation = await validation(formData); const hasErrors = Object.values(returnedValidation).some(i => { - return i.__errors.length > 0; + return i.__errors?.length! > 0 ?? false; }); if (hasErrors) { @@ -127,7 +127,7 @@ export const Stepper = (props: StepperProps) => { {activeStep < steps.length ? (
{ const fieldValidation: FieldValidation = { __errors: [] as string[], addError: (message: string) => { - fieldValidation.__errors.push(message); + fieldValidation.__errors?.push(message); }, };