Merge pull request #75 from batzionb/2561backport

fix(orchestrator): pass also initial form data to custom decorator
redhat-developer · Nov 26, 2024 · 359fb6a · 359fb6a
2 parents 08f6a06 + 524aced
commit 359fb6a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/workspaces/orchestrator/plugins/orchestrator-form-api/report.api.md b/workspaces/orchestrator/plugins/orchestrator-form-api/report.api.md
@@ -20,7 +20,7 @@ export type FormDecoratorProps = Pick<FormProps<JsonObject, JSONSchema7>, 'formD
 
 // @public
 export interface OrchestratorFormApi {
-    getFormDecorator(schema: JSONSchema7, uiSchema: UiSchema<JsonObject, JSONSchema7>): OrchestratorFormDecorator;
+    getFormDecorator(schema: JSONSchema7, uiSchema: UiSchema<JsonObject, JSONSchema7>, initialFormData?: JsonObject): OrchestratorFormDecorator;
 }
 
 // @public

diff --git a/workspaces/orchestrator/plugins/orchestrator-form-api/src/api.ts b/workspaces/orchestrator/plugins/orchestrator-form-api/src/api.ts
@@ -74,6 +74,7 @@ export interface OrchestratorFormApi {
   getFormDecorator(
     schema: JSONSchema7,
     uiSchema: UiSchema<JsonObject, JSONSchema7>,
+    initialFormData?: JsonObject,
   ): OrchestratorFormDecorator;
 }
 

diff --git a/...s/orchestrator/plugins/orchestrator-form-react/src/components/OrchestratorFormWrapper.tsx b/...s/orchestrator/plugins/orchestrator-form-react/src/components/OrchestratorFormWrapper.tsx
@@ -150,16 +150,19 @@ const FormComponent = (decoratorProps: FormDecoratorProps) => {
 const OrchestratorFormWrapper = ({
   schema,
   uiSchema,
+  formData,
   ...props
 }: OrchestratorFormWrapperProps) => {
   const formApi =
     useApiHolder().get(orchestratorFormApiRef) || defaultFormExtensionsApi;
   const NewComponent = React.useMemo(() => {
-    const formDecorator = formApi.getFormDecorator(schema, uiSchema);
+    const formDecorator = formApi.getFormDecorator(schema, uiSchema, formData);
     return formDecorator(FormComponent);
-  }, [schema, formApi, uiSchema]);
+  }, [schema, formApi, uiSchema, formData]);
   return (
-    <WrapperFormPropsContext.Provider value={{ schema, uiSchema, ...props }}>
+    <WrapperFormPropsContext.Provider
+      value={{ schema, uiSchema, formData, ...props }}
+    >
       <NewComponent />
     </WrapperFormPropsContext.Provider>
   );