move layouts prop out of FormProps

Signed-off-by: Paul Cowan <paul.cowan@cutting.scot>

plugins/scaffolder-react/src/next/components/Stepper/Stepper.test.tsx

@@ -21,6 +21,7 @@ import { act, fireEvent } from '@testing-library/react';
 import type { RJSFValidationError } from '@rjsf/utils';
 import { JsonValue } from '@backstage/types';
 import { NextFieldExtensionComponentProps } from '../../extensions';
+import { LayoutTemplate } from '../../types';
 
 describe('Stepper', () => {
   it('should render the step titles for each step of the manifest', async () => {
@@ -426,7 +427,7 @@ describe('Stepper', () => {
         <Stepper
           manifest={manifest}
           extensions={[]}
-          onComplete={jest.fn()}
+          onCreate={jest.fn()}
           layouts={[{ name: 'Layout', component: ScaffolderLayout }]}
         />,
       );

plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx

@@ -31,11 +31,8 @@ import { createAsyncValidators } from './createAsyncValidators';
 import type { FormProps, LayoutOptions } from '../../types';
 import { ReviewState, type ReviewStateProps } from '../ReviewState';
 import { useTemplateSchema } from '../../hooks/useTemplateSchema';
-import { useFormDataFromQuery } from '../../hooks/useFormDataFromQuery';
 import validator from '@rjsf/validator-ajv6';
 import { useFormDataFromQuery } from '../../hooks';
-import type { FormProps } from '../../types';
-import { selectedTemplateRouteRef } from '../../../routes';
 
 const useStyles = makeStyles(theme => ({
   backButton: {
@@ -179,7 +176,7 @@ export const Stepper = (stepperProps: StepperProps) => {
             fields={extensions}
             showErrorList={false}
             onChange={handleChange}
-            {...(formProps ?? {})}
+            {...(props.FormProps ?? {})}
           >
             <div className={styles.footer}>
               <Button

plugins/scaffolder-react/src/next/components/Workflow/Workflow.tsx

@@ -51,7 +51,7 @@ export type WorkflowProps = {
   onError(error: Error | undefined): JSX.Element | null;
 } & Pick<
   StepperProps,
-  'extensions' | 'FormProps' | 'components' | 'onCreate' | 'initialState'
+  'extensions' | 'FormProps' | 'components' | 'onCreate' | 'initialState' | 'layouts'
 >;
 
 /**