@openmrs/esm-form-engine-lib 2.1.0-pre.1564 → 2.1.0-pre.1565

package/package.json

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

package/src/components/renderer/field/fieldLogic.ts

@@ -1,6 +1,6 @@
 import { codedTypes } from '../../../constants';
 import { type FormContextProps } from '../../../provider/form-provider';
-import { type FormField } from '../../../types';
+import { type FormFieldValidator, type SessionMode, type ValidationResult, type FormField } from '../../../types';
 import { isTrue } from '../../../utils/boolean-utils';
 import { hasRendering } from '../../../utils/common-utils';
 import { evaluateAsyncExpression, evaluateExpression } from '../../../utils/expression-runner';
@@ -65,6 +65,21 @@ function evaluateFieldDependents(field: FormField, values: any, context: FormCon
           },
         ).then((result) => {
           setValue(dependent.id, result);
+          // validate calculated value
+          const { errors, warnings } = validateFieldValue(dependent, result, context.formFieldValidators, {
+            formFields,
+            values,
+            expressionContext: { patient, mode: sessionMode },
+          });
+          if (!dependent.meta.submission) {
+            dependent.meta.submission = {};
+          }
+          dependent.meta.submission.errors = errors;
+          dependent.meta.submission.warnings = warnings;
+          if (!errors.length) {
+            context.formFieldAdapters[dependent.type].transformFieldValue(dependent, result, context);
+          }
+          updateFormField(dependent);
         });
       }
       // evaluate hide
@@ -212,3 +227,48 @@ function evaluateFieldDependents(field: FormField, values: any, context: FormCon
     setForm(formJson);
   }
 }
+
+export interface ValidatorConfig {
+  formFields: FormField[];
+  values: Record<string, any>;
+  expressionContext: {
+    patient: fhir.Patient;
+    mode: SessionMode;
+  };
+}
+
+export function validateFieldValue(
+  field: FormField,
+  value: any,
+  validators: Record<string, FormFieldValidator>,
+  context: ValidatorConfig,
+): { errors: ValidationResult[]; warnings: ValidationResult[] } {
+  const errors: ValidationResult[] = [];
+  const warnings: ValidationResult[] = [];
+
+  if (field.meta.submission?.unspecified) {
+    return { errors: [], warnings: [] };
+  }
+
+  try {
+    field.validators.forEach((validatorConfig) => {
+      const results = validators[validatorConfig.type]?.validate?.(field, value, {
+        ...validatorConfig,
+        ...context,
+      });
+      if (results) {
+        results.forEach((result) => {
+          if (result.resultType === 'error') {
+            errors.push(result);
+          } else if (result.resultType === 'warning') {
+            warnings.push(result);
+          }
+        });
+      }
+    });
+  } catch (error) {
+    console.error(error);
+  }
+
+  return { errors, warnings };
+}

package/src/components/renderer/field/form-field-renderer.component.tsx

@@ -21,7 +21,7 @@ import { getFieldControlWithFallback, getRegisteredControl } from '../../../regi
 import styles from './form-field-renderer.scss';
 import { isTrue } from '../../../utils/boolean-utils';
 import UnspecifiedField from '../../inputs/unspecified/unspecified.component';
-import { handleFieldLogic } from './fieldLogic';
+import { handleFieldLogic, validateFieldValue } from './fieldLogic';
 
 export interface FormFieldRendererProps {
   fieldId: string;
@@ -221,51 +221,6 @@ function ErrorFallback({ error }) {
   );
 }
 
-export interface ValidatorConfig {
-  formFields: FormField[];
-  values: Record<string, any>;
-  expressionContext: {
-    patient: fhir.Patient;
-    mode: SessionMode;
-  };
-}
-
-function validateFieldValue(
-  field: FormField,
-  value: any,
-  validators: Record<string, FormFieldValidator>,
-  context: ValidatorConfig,
-): { errors: ValidationResult[]; warnings: ValidationResult[] } {
-  const errors: ValidationResult[] = [];
-  const warnings: ValidationResult[] = [];
-
-  if (field.meta.submission?.unspecified) {
-    return { errors: [], warnings: [] };
-  }
-
-  try {
-    field.validators.forEach((validatorConfig) => {
-      const results = validators[validatorConfig.type]?.validate?.(field, value, {
-        ...validatorConfig,
-        ...context,
-      });
-      if (results) {
-        results.forEach((result) => {
-          if (result.resultType === 'error') {
-            errors.push(result);
-          } else if (result.resultType === 'warning') {
-            warnings.push(result);
-          }
-        });
-      }
-    });
-  } catch (error) {
-    console.error(error);
-  }
-
-  return { errors, warnings };
-}
-
 /**
  * Determines whether a field can be unspecified
  */

package/src/form-engine.test.tsx

@@ -681,6 +681,8 @@ describe('Form engine component', () => {
 
   describe('Calculated values', () => {
     it('should evaluate BMI', async () => {
+      const saveEncounterMock = jest.spyOn(api, 'saveEncounter');
+
       await act(async () => renderForm(null, bmiForm));
 
       const bmiField = screen.getByRole('textbox', { name: /bmi/i });
@@ -694,9 +696,17 @@ describe('Form engine component', () => {
       expect(heightField).toHaveValue(150);
       expect(weightField).toHaveValue(50);
       expect(bmiField).toHaveValue('22.2');
+
+      await user.click(screen.getByRole('button', { name: /save/i }));
+
+      const encounter = saveEncounterMock.mock.calls[0][1];
+      expect(encounter.obs.length).toEqual(3);
+      expect(encounter.obs.find((obs) => obs.formFieldPath === 'rfe-forms-bmi').value).toBe(22.2);
     });
 
     it('should evaluate BSA', async () => {
+      const saveEncounterMock = jest.spyOn(api, 'saveEncounter');
+
       await act(async () => renderForm(null, bsaForm));
 
       const bsaField = screen.getByRole('textbox', { name: /bsa/i });
@@ -710,6 +720,12 @@ describe('Form engine component', () => {
       expect(heightField).toHaveValue(190.5);
       expect(weightField).toHaveValue(95);
       expect(bsaField).toHaveValue('2.24');
+
+      await user.click(screen.getByRole('button', { name: /save/i }));
+
+      const encounter = saveEncounterMock.mock.calls[0][1];
+      expect(encounter.obs.length).toEqual(3);
+      expect(encounter.obs.find((obs) => obs.formFieldPath === 'rfe-forms-bsa').value).toBe(2.24);
     });
 
     it('should evaluate EDD', async () => {