(fix) O3-3274: Fix failing expressions (#292)

* Update src/form-engine.component.tsx

Co-authored-by: Dennis Kigen <kigen.work@gmail.com>

* ---------

Co-authored-by: samuelmale <samuelsmalek@gmail.com>

---------

Co-authored-by: Ian <ian.c.bacher@gmail.com>

adding HD instance to async xps

* downsize lodash imports

* expand context to include visitType

* cleanup

---------

Co-authored-by: Dennis Kigen <kigen.work@gmail.com>
Co-authored-by: kyampeire Hadijah <30952856+hadijahkyampeire@users.noreply.github.com>

src/form-engine.component.tsx

@@ -126,7 +126,6 @@ const FormEngine: React.FC<FormProps> = ({
     if (sessionMode === 'embedded-view') {
       return false;
     }
-
     return workspaceLayout === 'minimized' || (workspaceLayout === 'maximized' && scrollablePages.size <= 1);
   }, [sessionMode, workspaceLayout, scrollablePages]);
 

src/utils/expression-runner.ts

@@ -1,4 +1,5 @@
 import { getRegisteredExpressionHelpers } from '../registry/registry';
+import { isEmpty } from 'lodash-es';
 import { type OpenmrsEncounter, type FormField, type FormPage, type FormSection } from '../types';
 import { CommonExpressionHelpers } from './common-expression-helpers';
 import { findAndRegisterReferencedFields, linkReferencedFieldValues, parseExpression } from './expression-parser';
@@ -46,13 +47,18 @@ export function evaluateExpression(
   const HD = new HistoricalDataSourceService();
 
   HD.putObject('prevEnc', {
-    value: context.previousEncounter,
+    value: context.previousEncounter || { obs: [] },
     getValue(concept) {
       return this.value.obs.find((obs) => obs.concept.uuid == concept);
     },
   });
 
-  const visitTypeUuid = context.visit?.visitType.uuid ?? '';
+  const visitType = context.visit?.visitType || { uuid: '' };
+  const visitTypeUuid = visitType.uuid ?? '';
+
+  const _ = {
+    isEmpty,
+  };
 
   const expressionContext = {
     ...new CommonExpressionHelpers(node, patient, fields, fieldValues, allFieldsKeys),
@@ -64,7 +70,9 @@ export function evaluateExpression(
     sex,
     age,
     HD,
+    visitType,
     visitTypeUuid,
+    _,
   };
 
   expression = linkReferencedFieldValues(fields, fieldValues, parts);
@@ -91,7 +99,9 @@ export async function evaluateAsyncExpression(
   const allFieldsKeys = fields.map((f) => f.id);
   let parts = parseExpression(expression.trim());
 
-  const visitTypeUuid = context.visit?.visitType.uuid ?? '';
+  const visitType = context.visit?.visitType || { uuid: '' };
+  const visitTypeUuid = visitType.uuid ?? '';
+
   // register dependencies
   findAndRegisterReferencedFields(node, parts, fields);
 
@@ -102,6 +112,19 @@ export async function evaluateAsyncExpression(
     myValue = fieldValues[node.value['id']];
   }
 
+  const HD = new HistoricalDataSourceService();
+
+  HD.putObject('prevEnc', {
+    value: context.previousEncounter || { obs: [] },
+    getValue(concept) {
+      return this.value.obs.find((obs) => obs.concept.uuid == concept);
+    },
+  });
+
+  const _ = {
+    isEmpty,
+  };
+
   const expressionContext = {
     ...new CommonExpressionHelpers(node, patient, fields, fieldValues, allFieldsKeys),
     ...getRegisteredExpressionHelpers(),
@@ -112,7 +135,10 @@ export async function evaluateAsyncExpression(
     sex,
     age,
     temporaryObjectsMap: {},
+    HD,
+    visitType,
     visitTypeUuid,
+    _,
   };
 
   expression = linkReferencedFieldValues(fields, fieldValues, parts);