From 6acaedb962fce171e2528b61df18acb18cd4778d Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Thu, 18 Aug 2022 14:51:15 +0200
Subject: [PATCH] chore: things are working pretty nicely now with the later
 version and the next version of scaffolder

Signed-off-by: blam <ben@blam.sh>
---
 package.json                                                | 3 ++-
 plugins/scaffolder/package.json                             | 6 ++++--
 .../src/components/MultistepJsonForm/MultistepJsonForm.tsx  | 6 ++++--
 .../src/next/TemplateWizardPage/Stepper/Stepper.tsx         | 2 ++
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 1013b2a049..267fccc029 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,8 @@
   "workspaces": {
     "packages": [
       "packages/*",
-      "plugins/*"
+      "plugins/*",
+      "../react-jsonschema-form/packages/*"
     ]
   },
   "resolutions": {
diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index 9b81d6593a..1d9c6013b7 100644
--- a/plugins/scaffolder/package.json
+++ b/plugins/scaffolder/package.json
@@ -54,8 +54,10 @@
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.57",
     "@react-hookz/web": "^15.0.0",
-    "@rjsf/core": "^3.2.1",
-    "@rjsf/material-ui": "^3.2.1",
+    "@rjsf/core": "file:../../../react-jsonschema-form/packages/core",
+    "@rjsf/material-ui": "file:../../../react-jsonschema-form/packages/material-ui",
+    "@rjsf/utils": "file:../../../react-jsonschema-form/packages/utils",
+    "@rjsf/validator-ajv6": "file:../../../react-jsonschema-form/packages/validator-ajv6",
     "@types/json-schema": "^7.0.9",
     "@uiw/react-codemirror": "^4.9.3",
     "classnames": "^2.2.6",
diff --git a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
index 8c71df67b6..60d242e0a1 100644
--- a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
+++ b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
@@ -30,7 +30,8 @@ import {
   featureFlagsApiRef,
 } from '@backstage/core-plugin-api';
 import { FormProps, IChangeEvent, UiSchema, withTheme } from '@rjsf/core';
-import { Theme as MuiTheme } from '@rjsf/material-ui';
+import { Theme } from '@rjsf/material-ui';
+import validator from '@rjsf/validator-ajv6';
 import React, { useState } from 'react';
 import { transformSchemaToProps } from './schema';
 import { Content, StructuredMetadataTable } from '@backstage/core-components';
@@ -38,7 +39,6 @@ import cloneDeep from 'lodash/cloneDeep';
 import * as fieldOverrides from './FieldOverrides';
 import { LayoutOptions } from '../../layouts';
 
-const Form = withTheme(MuiTheme);
 type Step = {
   schema: JsonObject;
   title: string;
@@ -123,6 +123,7 @@ export const MultistepJsonForm = (props: Props) => {
     finishButtonLabel,
     layouts,
   } = props;
+  const Form = withTheme(Theme);
   const [activeStep, setActiveStep] = useState(0);
   const [disableButtons, setDisableButtons] = useState(false);
   const errorApi = useApi(errorApiRef);
@@ -206,6 +207,7 @@ export const MultistepJsonForm = (props: Props) => {
               </StepLabel>
               <StepContent key={title}>
                 <Form
+                  validator={validator}
                   showErrorList={false}
                   fields={{ ...fieldOverrides, ...fields }}
                   widgets={widgets}
diff --git a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/Stepper.tsx b/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/Stepper.tsx
index f5656092c1..8ae26ebf4a 100644
--- a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/Stepper.tsx
+++ b/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/Stepper.tsx
@@ -30,6 +30,7 @@ import { TemplateParameterSchema } from '../../../types';
 import { createAsyncValidators } from './createAsyncValidators';
 import { useTemplateSchema } from './useTemplateSchema';
 import { ReviewState } from './ReviewState';
+import validator from '@rjsf/validator-ajv6';
 
 const useStyles = makeStyles(theme => ({
   backButton: {
@@ -124,6 +125,7 @@ export const Stepper = (props: StepperProps) => {
       <div className={styles.formWrapper}>
         {activeStep < steps.length ? (
           <Form
+            validator={validator}
             extraErrors={errors}
             formData={formState}
             schema={steps[activeStep].schema}