fix(scaffolder): more fixes

plugins/scaffolder/package.json

@@ -35,7 +35,7 @@
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-lazylog": "^4.5.2",
-    "react-router": "^5.2.0",
+    "react-router": "6.0.0-alpha.5",
     "react-router-dom": "6.0.0-alpha.5",
     "react-use": "^14.2.0",
     "swr": "^0.2.2"

plugins/scaffolder/src/components/JobStage/JobStage.tsx

@@ -79,7 +79,7 @@ type Props = {
   log: string[];
   startedAt: string;
   endedAt?: string;
-  status?: Job['status'];
+  status: Job['status'];
 };
 
 export const JobStage = ({ endedAt, startedAt, name, log, status }: Props) => {
@@ -102,7 +102,8 @@ export const JobStage = ({ endedAt, startedAt, name, log, status }: Props) => {
       TransitionProps={{ unmountOnExit: true }}
       className={cn(
         classes.expansionPanel,
-        classes[status.toLowerCase()] ?? classes.neutral,
+        classes[status.toLowerCase() as keyof ReturnType<typeof useStyles>] ??
+          classes.neutral,
       )}
       expanded={expanded}
       onChange={(_, newState) => setExpanded(newState)}

plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx

@@ -33,7 +33,7 @@ const Form = withTheme(MuiTheme);
 type Step = {
   schema: JSONSchema;
   label: string;
-} & Partial<FormProps>;
+} & Partial<Omit<FormProps<any>, 'schema'>>;
 
 type Props = {
   /**

plugins/scaffolder/src/index.ts

@@ -15,4 +15,5 @@
  */
 
 export { plugin } from './plugin';
+export { ScaffolderApi, scaffolderApiRef } from './api';
 export { rootRoute, templateRoute } from './routes';