@openmrs/esm-form-engine-lib 2.1.0-pre.1594 → 2.1.0-pre.1604

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-form-engine-lib",
-  "version": "2.1.0-pre.1594",
+  "version": "2.1.0-pre.1604",
   "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

@@ -64,30 +64,40 @@ function evaluateFieldDependents(field: FormField, values: any, context: FormCon
             mode: sessionMode,
             patient,
           },
-        ).then((result) => {
-          setValue(dependent.id, result);
-          // validate calculated value
-          const { errors, warnings } = validateFieldValue(dependent, result, context.formFieldValidators, {
-            formFields,
-            values,
-            expressionContext: { patient, mode: sessionMode },
+        )
+          .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);
+          })
+          .catch((error) => {
+            reportError(error, 'Error evaluating calculate expression');
           });
-          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);
-        }).catch((error) => {
-          reportError(error, 'Error evaluating calculate expression');
-        });
       }
       // evaluate hide
       if (dependent.hide) {
-        evaluateHide({ value: dependent, type: 'field' }, formFields, values, sessionMode, patient, evaluateExpression);
+        evaluateHide(
+          { value: dependent, type: 'field' },
+          formFields,
+          values,
+          sessionMode,
+          patient,
+          evaluateExpression,
+          updateFormField,
+        );
       }
       // evaluate disabled
       if (typeof dependent.disabled === 'object' && dependent.disabled.disableWhenExpression) {
@@ -197,12 +207,8 @@ function evaluateFieldDependents(field: FormField, values: any, context: FormCon
             sessionMode,
             patient,
             evaluateExpression,
+            updateFormField,
           );
-          if (isTrue(section.isHidden)) {
-            section.questions.forEach((field) => {
-              field.isParentHidden = true;
-            });
-          }
           shouldUpdateForm = true;
           break;
         }
@@ -214,14 +220,15 @@ function evaluateFieldDependents(field: FormField, values: any, context: FormCon
   if (field.pageDependents) {
     field.pageDependents?.forEach((dep) => {
       const dependent = formJson.pages.find((f) => f.label == dep);
-      evaluateHide({ value: dependent, type: 'page' }, formFields, values, sessionMode, patient, evaluateExpression);
-      if (isTrue(dependent.isHidden)) {
-        dependent.sections.forEach((section) => {
-          section.questions.forEach((field) => {
-            field.isParentHidden = true;
-          });
-        });
-      }
+      evaluateHide(
+        { value: dependent, type: 'page' },
+        formFields,
+        values,
+        sessionMode,
+        patient,
+        evaluateExpression,
+        updateFormField,
+      );
       shouldUpdateForm = true;
     });
   }

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

@@ -46,6 +46,7 @@ export const FormFieldRenderer = ({ fieldId, valueAdapter, repeatOptions }: Form
     formFieldValidators,
     addInvalidField,
     removeInvalidField,
+    updateFormField,
   } = context;
 
   const fieldValue = useWatch({ control, name: fieldId, exact: true });
@@ -132,6 +133,18 @@ export const FormFieldRenderer = ({ fieldId, valueAdapter, repeatOptions }: Form
     }
     setWarnings(validationWarnings);
     handleFieldLogic(field, context);
+    if (field.meta.groupId) {
+      const group = formFields.find((f) => f.id === field.meta.groupId);
+      if (group) {
+        group.questions = group.questions.map((child) => {
+          if (child.id === field.id) {
+            return field;
+          }
+          return child;
+        });
+        updateFormField(group);
+      }
+    }
   };
 
   if (!inputComponentWrapper) {

package/src/form-engine.test.tsx

@@ -877,6 +877,49 @@ describe('Form engine component', () => {
   });
 
   describe('Obs group', () => {
+    it('should save obs group on form submission', async () => {
+      const saveEncounterMock = jest.spyOn(api, 'saveEncounter');
+      await act(async () => {
+        renderForm(null, obsGroupTestForm);
+      });
+
+      // Fill out the obs group fields
+      const dateOfBirth = screen.getByRole('textbox', { name: /date of birth/i });
+      const maleRadio = screen.getByRole('radio', { name: /^male$/i });
+
+      await user.click(dateOfBirth);
+      await user.paste('2020-09-09T00:00:00.000Z');
+      await user.click(maleRadio);
+
+      // Submit the form
+      await user.click(screen.getByRole('button', { name: /save/i }));
+
+      // Verify the encounter was saved with the correct structure
+      expect(saveEncounterMock).toHaveBeenCalledTimes(1);
+
+      const [_, encounter] = saveEncounterMock.mock.calls[0];
+      expect(encounter.obs.length).toBe(1);
+      expect(encounter.obs[0]).toEqual({
+        groupMembers: [
+          {
+            value: '1534AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+            concept: '1587AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+            formFieldNamespace: 'rfe-forms',
+            formFieldPath: 'rfe-forms-childSex',
+          },
+          {
+            value: '2020-09-09',
+            concept: '164802AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+            formFieldNamespace: 'rfe-forms',
+            formFieldPath: 'rfe-forms-birthDate',
+          },
+        ],
+        concept: '1c70c490-cafa-4c95-9fdd-a30b62bb78b8',
+        formFieldNamespace: 'rfe-forms',
+        formFieldPath: 'rfe-forms-myGroup',
+      });
+    });
+
     it('should test addition of a repeating group', async () => {
       await act(async () => {
         renderForm(null, obsGroupTestForm);

package/src/hooks/useEvaluateFormFieldExpressions.ts

@@ -109,7 +109,15 @@ export const useEvaluateFormFieldExpressions = (
   useEffect(() => {
     factoryContext.formJson?.pages?.forEach((page) => {
       if (page.hide) {
-        evaluateHide({ value: page, type: 'page' }, formFields, formValues, sessionMode, patient, evaluateExpression);
+        evaluateHide(
+          { value: page, type: 'page' },
+          formFields,
+          formValues,
+          sessionMode,
+          patient,
+          evaluateExpression,
+          null,
+        );
       } else {
         page.isHidden = false;
       }
@@ -122,6 +130,7 @@ export const useEvaluateFormFieldExpressions = (
             sessionMode,
             patient,
             evaluateExpression,
+            null,
           );
         } else {
           section.isHidden = false;

package/src/utils/form-helper.ts

@@ -95,6 +95,7 @@ export function evaluateHide(
   sessionMode: SessionMode,
   patient: fhir.Patient,
   expressionRunnerFn,
+  updateFormFieldFn: (field: FormField) => void | null,
 ) {
   const { value, type } = node;
   const isHidden = expressionRunnerFn(value['hide']?.hideWhenExpression, node, allFields, allValues, {
@@ -111,15 +112,20 @@ export function evaluateHide(
   if (type == 'page') {
     value['sections'].forEach((section) => {
       section.isParentHidden = isHidden;
-      cascadeVisibilityToChildFields(isHidden, section, allFields);
+      cascadeVisibilityToChildFields(isHidden, section, allFields, updateFormFieldFn);
     });
   }
   if (type == 'section') {
-    cascadeVisibilityToChildFields(isHidden, value, allFields);
+    cascadeVisibilityToChildFields(isHidden, value, allFields, updateFormFieldFn);
   }
 }
 
-function cascadeVisibilityToChildFields(visibility: boolean, section: FormSection, allFields: Array<FormField>) {
+function cascadeVisibilityToChildFields(
+  visibility: boolean,
+  section: FormSection,
+  allFields: Array<FormField>,
+  updateFormFieldFn: (field: FormField) => void,
+) {
   const candidateIds = section.questions.map((q) => q.id);
   allFields
     .filter((field) => candidateIds.includes(field.id))
@@ -130,6 +136,7 @@ function cascadeVisibilityToChildFields(visibility: boolean, section: FormSectio
           member.isParentHidden = visibility;
         });
       }
+      updateFormFieldFn?.(field);
     });
 }