@openmrs/esm-form-engine-lib 2.1.0-pre.1382 → 2.1.0-pre.1386

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-form-engine-lib",
-  "version": "2.1.0-pre.1382",
+  "version": "2.1.0-pre.1386",
   "description": "React Form Engine for O3",
   "browser": "dist/openmrs-esm-form-engine-lib.js",
   "main": "src/index.ts",

package/src/adapters/program-state-adapter.ts

@@ -29,7 +29,7 @@ export const ProgramStateAdapter: FormFieldValueAdapter = {
         .filter((state) => !state.endDate)
         .find((state) => state.state.programWorkflow?.uuid === field.questionOptions.workflowUuid)?.state;
       field.meta = { ...(field.meta || {}), previousValue: currentState };
-      return currentState.uuid;
+      return currentState?.uuid;
     }
     return null;
   },

package/src/processors/encounter/encounter-form-processor.ts

@@ -77,6 +77,7 @@ const contextInitializableTypes = [
   'encounterLocation',
   'patientIdentifier',
   'encounterRole',
+  'programState'
 ];
 export class EncounterFormProcessor extends FormProcessor {
   prepareFormSchema(schema: FormSchema) {

package/src/provider/form-factory-provider.tsx

@@ -83,7 +83,7 @@ export const FormFactoryProvider: React.FC<FormFactoryProviderProps> = ({
   const registerForm = useCallback((formId: string, context: FormContextProps) => {
     if (!rootForm.current) {
       rootForm.current = context;
-    } else {
+    } else if (rootForm.current.formJson.name !== formId) {
       subForms.current[formId] = context;
     }
   }, []);