@openmrs/esm-form-engine-lib 2.1.0-pre.1376 → 2.1.0-pre.1384

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-form-engine-lib",
-  "version": "2.1.0-pre.1376",
+  "version": "2.1.0-pre.1384",
   "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) {
@@ -257,7 +258,11 @@ export class EncounterFormProcessor extends FormProcessor {
           const adapter = formFieldAdapters[field.type];
           initialValues[field.id] = emptyValues[field.questionOptions.rendering] ?? null;
           if (field.questionOptions.calculate?.calculateExpression) {
-            await evaluateCalculateExpression(field, initialValues, context);
+            try {
+              await evaluateCalculateExpression(field, initialValues, context);
+            } catch (error) {
+              console.error(error);
+            }
           }
           if (isEmpty(initialValues[field.id]) && contextInitializableTypes.includes(field.type)) {
             try {

package/src/provider/form-factory-helper.ts

@@ -17,6 +17,7 @@ export function validateForm(context: FormContextProps) {
   } = context;
   const values = getValues();
   const errors = formFields
+    .filter((field) => !field.isHidden && !field.isDisabled)
     .flatMap((field) =>
       field.validators?.flatMap((validatorConfig) => {
         const validator = formFieldValidators[validatorConfig.type];