Merge pull request #21783 from solimant/20055

Use new option from RJSF 5.15
backstage · Dec 8, 2023 · 7211803 · 7211803
2 parents 782bbb1 + c8908d4
commit 7211803
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 0 deletions.
diff --git a/.changeset/tiny-coins-raise.md b/.changeset/tiny-coins-raise.md
@@ -0,0 +1,7 @@
+---
+'@backstage/plugin-scaffolder-react': patch
+'@backstage/plugin-scaffolder': patch
+'@backstage/plugin-home': patch
+---
+
+Use new option from RJSF 5.15
diff --git a/plugins/home/src/components/CustomHomepage/WidgetSettingsOverlay.tsx b/plugins/home/src/components/CustomHomepage/WidgetSettingsOverlay.tsx
@@ -91,6 +91,9 @@ export const WidgetSettingsOverlay = (props: WidgetSettingsOverlayProps) => {
                   setSettingsDialogOpen(false);
                 }
               }}
+              experimental_defaultFormStateBehavior={{
+                allOf: 'populateDefaults',
+              }}
             />
           </DialogContent>
         </Dialog>

diff --git a/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx b/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx
@@ -230,6 +230,9 @@ export const Stepper = (stepperProps: StepperProps) => {
             fields={fields}
             showErrorList={false}
             onChange={handleChange}
+            experimental_defaultFormStateBehavior={{
+              allOf: 'populateDefaults',
+            }}
             {...(props.formProps ?? {})}
           >
             <div className={styles.footer}>

diff --git a/plugins/scaffolder/src/legacy/MultistepJsonForm/MultistepJsonForm.tsx b/plugins/scaffolder/src/legacy/MultistepJsonForm/MultistepJsonForm.tsx
@@ -192,6 +192,9 @@ export const MultistepJsonForm = (props: MultistepJsonFormProps) => {
                   onSubmit={(e: IChangeEvent<any>) => {
                     if (e.errors.length === 0) handleNext();
                   }}
+                  experimental_defaultFormStateBehavior={{
+                    allOf: 'populateDefaults',
+                  }}
                   {...formProps}
                   {...transformSchemaToProps(schema, layouts)}
                 >

diff --git a/plugins/scaffolder/src/legacy/TemplateEditorPage/CustomFieldExplorer.tsx b/plugins/scaffolder/src/legacy/TemplateEditorPage/CustomFieldExplorer.tsx
@@ -161,6 +161,9 @@ export const CustomFieldExplorer = ({
               onSubmit={e => handleFieldConfigChange(e.formData)}
               validator={validator}
               schema={selectedField.schema?.uiOptions || {}}
+              experimental_defaultFormStateBehavior={{
+                allOf: 'populateDefaults',
+              }}
             >
               <Button
                 variant="contained"

diff --git a/plugins/scaffolder/src/next/TemplateEditorPage/CustomFieldExplorer.tsx b/plugins/scaffolder/src/next/TemplateEditorPage/CustomFieldExplorer.tsx
@@ -157,6 +157,9 @@ export const CustomFieldExplorer = ({
               onSubmit={e => handleFieldConfigChange(e.formData)}
               validator={validator}
               schema={selectedField.schema?.uiOptions || {}}
+              experimental_defaultFormStateBehavior={{
+                allOf: 'populateDefaults',
+              }}
             >
               <Button
                 variant="contained"