Ensure that updates to the form context state are propagated to the f…

…orm-factory provider.
openmrs · Sep 25, 2024 · 1b7a217 · 1b7a217
1 parent 8e9ae10
commit 1b7a217
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/src/components/processor-factory/form-processor-factory.component.tsx b/src/components/processor-factory/form-processor-factory.component.tsx
@@ -113,6 +113,7 @@ const FormProcessorFactory = ({
         <FormRenderer
           processorContext={processorContext}
           initialValues={initialValues}
+          isSubForm={isSubForm}
           setIsLoadingFormDependencies={setIsLoadingFormDependencies}
         />
       )}

diff --git a/src/components/renderer/form/form-renderer.component.tsx b/src/components/renderer/form/form-renderer.component.tsx
@@ -13,10 +13,16 @@ import { useFormStateHelpers } from '../../../hooks/useFormStateHelpers';
 export type FormRendererProps = {
   processorContext: FormProcessorContextProps;
   initialValues: Record<string, any>;
+  isSubForm: boolean;
   setIsLoadingFormDependencies: (isLoading: boolean) => void;
 };
 
-export const FormRenderer = ({ processorContext, initialValues, setIsLoadingFormDependencies }: FormRendererProps) => {
+export const FormRenderer = ({
+  processorContext,
+  initialValues,
+  isSubForm,
+  setIsLoadingFormDependencies,
+}: FormRendererProps) => {
   const { evaluatedFields, evaluatedFormJson } = useEvaluateFormFieldExpressions(initialValues, processorContext);
   const { registerForm, setIsFormDirty, workspaceLayout } = useFormFactory();
   const methods = useForm({
@@ -64,8 +70,8 @@ export const FormRenderer = ({ processorContext, initialValues, setIsLoadingForm
   }, [processorContext, workspaceLayout, methods, formFields, formJson, invalidFields]);
 
   useEffect(() => {
-    registerForm(formJson.name, context);
-  }, [formJson.name, context]);
+    registerForm(formJson.name, isSubForm, context);
+  }, [formJson.name, isSubForm, context]);
 
   useEffect(() => {
     setIsFormDirty(isDirty);
@@ -91,12 +97,7 @@ export const FormRenderer = ({ processorContext, initialValues, setIsLoadingForm
             />
           );
         }
-        return (
-          <PageRenderer
-            key={page.label}
-            page={page}
-          />
-        );
+        return <PageRenderer key={page.label} page={page} />;
       })}
     </FormProvider>
   );

diff --git a/src/form-engine.component.tsx b/src/form-engine.component.tsx
@@ -35,7 +35,6 @@ interface FormEngineProps {
 // TODOs:
 // - Implement sidebar
 // - Conditionally render the button set
-// - Patient banner
 const FormEngine = ({
   formJson,
   patientUUID,

diff --git a/src/provider/form-factory-provider.tsx b/src/provider/form-factory-provider.tsx
@@ -26,7 +26,7 @@ interface FormFactoryProviderContextProps {
   visit: OpenmrsResource;
   location: OpenmrsResource;
   provider: OpenmrsResource;
-  registerForm: (formId: string, context: FormContextProps) => void;
+  registerForm: (formId: string, isSubForm: boolean, context: FormContextProps) => void;
   setCurrentPage: (page: string) => void;
   handleConfirmQuestionDeletion?: (question: Readonly<FormField>) => Promise<void>;
   setIsFormDirty: (isFormDirty: boolean) => void;
@@ -80,11 +80,11 @@ export const FormFactoryProvider: React.FC<FormFactoryProviderProps> = ({
 
   const abortController = new AbortController();
 
-  const registerForm = useCallback((formId: string, context: FormContextProps) => {
-    if (!rootForm.current) {
-      rootForm.current = context;
-    } else if (rootForm.current.formJson.name !== formId) {
+  const registerForm = useCallback((formId: string, isSubForm: boolean, context: FormContextProps) => {
+    if (isSubForm) {
       subForms.current[formId] = context;
+    } else {
+      rootForm.current = context;
     }
   }, []);