@aehrc/smart-forms-renderer 0.44.3 → 1.0.0-alpha.10

package/src/stories/sdc/AdvancedOther.stories.tsx

@@ -28,7 +28,7 @@ import {
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
 const meta = {
-  title: 'Component/SDC/8.1.4 Advanced Other',
+  title: 'SDC/8.1.4 Advanced Other',
   component: BuildFormWrapperForStorybook,
   // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
   tags: []

package/src/stories/sdc/AdvancedTextAppearance.stories.tsx

@@ -29,7 +29,7 @@ import {
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
 const meta = {
-  title: 'Component/SDC/8.1.1 Advanced Text Appearance',
+  title: 'SDC/8.1.1 Advanced Text Appearance',
   component: BuildFormWrapperForStorybook,
   // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
   tags: []

package/src/stories/sdc/BehaviorCalculations.stories.tsx

@@ -27,7 +27,7 @@ import {
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
 const meta = {
-  title: 'Component/SDC/9.1.3 Form Behavior Calculations',
+  title: 'SDC/9.1.3 Form Behavior Calculations',
   component: BuildFormWrapperForStorybook,
   // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
   tags: []

package/src/stories/sdc/BehaviorChoiceRestriction.stories.tsx

@@ -28,7 +28,7 @@ import {
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
 const meta = {
-  title: 'Component/SDC/9.1.2 Form Behavior Choice Restriction',
+  title: 'SDC/9.1.2 Form Behavior Choice Restriction',
   component: BuildFormWrapperForStorybook,
   // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
   tags: []

package/src/stories/sdc/BehaviorOther.stories.tsx

@@ -31,7 +31,7 @@ import {
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
 const meta = {
-  title: 'Component/SDC/9.1.4 Form Behavior Other Control',
+  title: 'SDC/9.1.4 Form Behavior Other Control',
   component: BuildFormWrapperForStorybook,
   // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
   tags: []

package/src/stories/sdc/BehaviorValueConstraints.stories.tsx

@@ -34,7 +34,7 @@ import {
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
 const meta = {
-  title: 'Component/SDC/9.1.1 Form Behavior Value Constraints',
+  title: 'SDC/9.1.1 Form Behavior Value Constraints',
   component: BuildFormWrapperForStorybook,
   // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
   tags: []

package/src/stories/sdc/FormPopulation.stories.tsx

@@ -31,7 +31,7 @@ import { pracPrimaryPeter } from '../assets/practitioners/PracPrimaryPeter';
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
 const meta = {
-  title: 'Component/SDC/12 Form Population',
+  title: 'SDC/12 Form Population',
   component: PrePopWrapperForStorybook,
   // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
   tags: []

package/src/stories/sdc/ItemControlDisplay.stories.tsx

@@ -27,7 +27,7 @@ import {
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
 const meta = {
-  title: 'Component/SDC/8.1.2 Advanced Control Appearance - Item Control Display',
+  title: 'SDC/8.1.2 Advanced Control Appearance - Item Control Display',
   component: BuildFormWrapperForStorybook,
   // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
   tags: []

package/src/stories/sdc/ItemControlGroup.stories.tsx

@@ -30,7 +30,7 @@ import {
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
 const meta = {
-  title: 'Component/SDC/8.1.2 Advanced Control Appearance - Item Control Group',
+  title: 'SDC/8.1.2 Advanced Control Appearance - Item Control Group',
   component: BuildFormWrapperForStorybook,
   // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
   tags: []

package/src/stories/sdc/ItemControlQuestion.stories.tsx

@@ -34,7 +34,7 @@ import {
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
 const meta = {
-  title: 'Component/SDC/8.1.2 Advanced Control Appearance - Item Control Question',
+  title: 'SDC/8.1.2 Advanced Control Appearance - Item Control Question',
   component: BuildFormWrapperForStorybook,
   // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
   tags: []

package/src/stories/sdc/OtherExtensions.stories.tsx

@@ -21,7 +21,7 @@ import { qPreferredTerminologyServer } from '../assets/questionnaires';
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
 const meta = {
-  title: 'Component/SDC/Other Extensions',
+  title: 'SDC/Other Extensions',
   component: BuildFormWrapperForStorybook,
   // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
   tags: []

package/src/stories/testing/AuCoreTester.stories.tsx

@@ -41,7 +41,7 @@ import {
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
 const meta = {
-  title: 'Component/Testing/AU Core Tester',
+  title: 'Testing/AU Core Tester',
   component: PrePopWrapperForStorybook,
   // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
   tags: []

package/src/stories/testing/BuildFormButtonTesterWrapper.stories.tsx

@@ -21,7 +21,7 @@ import { qButtonTester, qrButtonTesterResponse } from '../assets/questionnaires/
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
 const meta = {
-  title: 'Component/Testing/Build Form Button Tester',
+  title: 'Testing/Build Form Button Tester',
   component: BuildFormButtonTesterWrapperForStorybook,
   // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
   tags: []

package/src/stories/testing/GroupTableTester.stories.tsx

@@ -21,7 +21,7 @@ import { qGTableWithBoolean } from '../assets/questionnaires/QGroupTableTester';
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
 const meta = {
-  title: 'Component/Testing/Group Table Tester',
+  title: 'Testing/Group Table Tester',
   component: BuildFormWrapperForStorybook,
   // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
   tags: []

package/src/stories/testing/IdRemoverDebuggerWrapper.stories.tsx

@@ -21,7 +21,7 @@ import { qMyPatient } from '../assets/questionnaires/QIdRemoverDebugger';
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
 const meta = {
-  title: 'Component/Testing/ID Remover Debugger',
+  title: 'Testing/ID Remover Debugger',
   component: IdRemoverDebuggerWrapperForStorybook,
   // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
   tags: []

package/src/stories/testing/Mbs715Tester.stories.tsx

@@ -27,7 +27,7 @@ import { pracPrimaryPeter } from '../assets/practitioners/PracPrimaryPeter';
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
 const meta = {
-  title: 'Component/Testing/MBS 715 Tester',
+  title: 'Testing/MBS 715 Tester',
   component: PrePopWrapperForStorybook,
   // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
   tags: []

package/src/stories/testing/PrePopButtonTesterWrapper.stories.tsx

@@ -25,7 +25,7 @@ import { qSelectivePrePopTester } from '../assets/questionnaires/QPrePopTester';
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
 const meta = {
-  title: 'Component/Testing/Pre Pop Tester',
+  title: 'Testing/Pre Pop Tester',
   component: PrePopWrapperForStorybook,
   // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
   tags: []

package/src/stories/testing/ValidateFormTesterWrapper.stories.tsx

@@ -21,7 +21,7 @@ import { qValidateTester } from '../assets/questionnaires/QValidateTester';
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
 const meta = {
-  title: 'Component/Testing/Validate Tester',
+  title: 'Testing/Validate Tester',
   component: ValidationFormTesterWrapper,
   // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
   tags: []

package/src/utils/calculatedExpression.ts

@@ -28,7 +28,7 @@ import type {
   QuestionnaireResponseItemAnswer
 } from 'fhir/r4';
 import { emptyResponse } from './emptyResource';
-import { createFhirPathContext } from './fhirpath';
+import { createFhirPathContext, handleFhirPathResult } from './fhirpath';
 import { getQrItemsIndex, mapQItemsIndex } from './mapItem';
 import { updateQrItemsInGroup } from './qrItem';
 import dayjs from 'dayjs';
@@ -41,20 +41,22 @@ interface EvaluateInitialCalculatedExpressionsParams {
   calculatedExpressions: Record<string, CalculatedExpression[]>;
   variablesFhirPath: Record<string, Expression[]>;
   existingFhirPathContext: Record<string, any>;
+  terminologyServerUrl: string;
 }
 
-export function evaluateInitialCalculatedExpressions(
+export async function evaluateInitialCalculatedExpressions(
   params: EvaluateInitialCalculatedExpressionsParams
-): {
+): Promise<{
   initialCalculatedExpressions: Record<string, CalculatedExpression[]>;
   updatedFhirPathContext: Record<string, any>;
-} {
+}> {
   const {
     initialResponse,
     initialResponseItemMap,
     calculatedExpressions,
     variablesFhirPath,
-    existingFhirPathContext
+    existingFhirPathContext,
+    terminologyServerUrl
   } = params;
 
   // Return early if initialResponse is empty or there are no calculated expressions to evaluate
@@ -72,11 +74,12 @@ export function evaluateInitialCalculatedExpressions(
     ...calculatedExpressions
   };
 
-  const updatedFhirPathContext = createFhirPathContext(
+  const updatedFhirPathContext = await createFhirPathContext(
     initialResponse,
     initialResponseItemMap,
     variablesFhirPath,
-    existingFhirPathContext
+    existingFhirPathContext,
+    terminologyServerUrl
   );
 
   for (const linkId in initialCalculatedExpressions) {
@@ -84,12 +87,17 @@ export function evaluateInitialCalculatedExpressions(
 
     for (const calcExpression of itemCalcExpressions) {
       try {
-        const result = fhirpath.evaluate(
+        const fhirPathResult = fhirpath.evaluate(
           {},
           calcExpression.expression,
           updatedFhirPathContext,
-          fhirpath_r4_model
+          fhirpath_r4_model,
+          {
+            async: true,
+            terminologyUrl: terminologyServerUrl
+          }
         );
+        const result = await handleFhirPathResult(fhirPathResult);
 
         // Only update calculatedExpressions if length of result array > 0
         if (result.length > 0 && !isEqual(calcExpression.value, result[0])) {
@@ -109,13 +117,14 @@ export function evaluateInitialCalculatedExpressions(
   };
 }
 
-export function evaluateCalculatedExpressions(
+export async function evaluateCalculatedExpressions(
   fhirPathContext: Record<string, any>,
-  calculatedExpressions: Record<string, CalculatedExpression[]>
-): {
+  calculatedExpressions: Record<string, CalculatedExpression[]>,
+  terminologyServerUrl: string
+): Promise<{
   calculatedExpsIsUpdated: boolean;
   updatedCalculatedExpressions: Record<string, CalculatedExpression[]>;
-} {
+}> {
   const updatedCalculatedExpressions: Record<string, CalculatedExpression[]> = {
     ...calculatedExpressions
   };
@@ -126,12 +135,17 @@ export function evaluateCalculatedExpressions(
 
     for (const calcExpression of itemCalcExpressions) {
       try {
-        const result = fhirpath.evaluate(
+        const fhirPathResult = fhirpath.evaluate(
           {},
           calcExpression.expression,
           fhirPathContext,
-          fhirpath_r4_model
+          fhirpath_r4_model,
+          {
+            async: true,
+            terminologyUrl: terminologyServerUrl
+          }
         );
+        const result = await handleFhirPathResult(fhirPathResult);
 
         // Update calculatedExpressions if length of result array > 0
         // Only update when current calcExpression value is different from the result, otherwise it will result in an infinite loop as per issue #733

package/src/utils/enableWhenExpression.ts

@@ -16,7 +16,7 @@
  */
 
 import type { Expression, QuestionnaireResponse, QuestionnaireResponseItem } from 'fhir/r4';
-import { createFhirPathContext } from './fhirpath';
+import { createFhirPathContext, handleFhirPathResult } from './fhirpath';
 import fhirpath from 'fhirpath';
 import fhirpath_r4_model from 'fhirpath/fhir-context/r4';
 import type {
@@ -31,40 +31,45 @@ interface EvaluateInitialEnableWhenExpressionsParams {
   enableWhenExpressions: EnableWhenExpressions;
   variablesFhirPath: Record<string, Expression[]>;
   existingFhirPathContext: Record<string, any>;
+  terminologyServerUrl: string;
 }
 
-export function evaluateInitialEnableWhenExpressions(
+export async function evaluateInitialEnableWhenExpressions(
   params: EvaluateInitialEnableWhenExpressionsParams
-): {
+): Promise<{
   initialEnableWhenExpressions: EnableWhenExpressions;
   updatedFhirPathContext: Record<string, any>;
-} {
+}> {
   const {
     initialResponse,
     initialResponseItemMap,
     enableWhenExpressions,
     variablesFhirPath,
-    existingFhirPathContext
+    existingFhirPathContext,
+    terminologyServerUrl
   } = params;
 
   const initialEnableWhenExpressions: EnableWhenExpressions = {
     ...enableWhenExpressions
   };
-  const updatedFhirPathContext = createFhirPathContext(
+  const updatedFhirPathContext = await createFhirPathContext(
     initialResponse,
     initialResponseItemMap,
     variablesFhirPath,
-    existingFhirPathContext
+    existingFhirPathContext,
+    terminologyServerUrl
   );
 
-  const initialEnableWhenSingleExpressions = evaluateEnableWhenSingleExpressions(
+  const initialEnableWhenSingleExpressions = await evaluateEnableWhenSingleExpressions(
     initialEnableWhenExpressions.singleExpressions,
-    updatedFhirPathContext
+    updatedFhirPathContext,
+    terminologyServerUrl
   );
 
-  const initialEnableWhenRepeatExpressions = evaluateEnableWhenRepeatExpressions(
+  const initialEnableWhenRepeatExpressions = await evaluateEnableWhenRepeatExpressions(
     initialEnableWhenExpressions.repeatExpressions,
-    updatedFhirPathContext
+    updatedFhirPathContext,
+    terminologyServerUrl
   );
 
   return {
@@ -76,20 +81,31 @@ export function evaluateInitialEnableWhenExpressions(
   };
 }
 
-function evaluateEnableWhenSingleExpressions(
+async function evaluateEnableWhenSingleExpressions(
   enableWhenSingleExpressions: Record<string, EnableWhenSingleExpression>,
-  updatedFhirPathContext: Record<string, any>
-): {
+  updatedFhirPathContext: Record<string, any>,
+  terminologyServerUrl: string
+): Promise<{
   updatedExpressions: Record<string, EnableWhenSingleExpression>;
   isUpdated: boolean;
-} {
+}> {
   let isUpdated = false;
   for (const linkId in enableWhenSingleExpressions) {
     const initialValue = enableWhenSingleExpressions[linkId].isEnabled;
     const expression = enableWhenSingleExpressions[linkId].expression;
 
     try {
-      const result = fhirpath.evaluate('', expression, updatedFhirPathContext, fhirpath_r4_model);
+      const fhirPathResult = fhirpath.evaluate(
+        {},
+        expression,
+        updatedFhirPathContext,
+        fhirpath_r4_model,
+        {
+          async: true,
+          terminologyUrl: terminologyServerUrl
+        }
+      );
+      const result = await handleFhirPathResult(fhirPathResult);
 
       // Update enableWhenExpressions if length of result array > 0
       // Only update when current isEnabled value is different from the result, otherwise it will result in an infinite loop as per issue #733
@@ -124,35 +140,43 @@ function evaluateEnableWhenSingleExpressions(
   return { updatedExpressions: enableWhenSingleExpressions, isUpdated };
 }
 
-function getNumOfEnableWhenExpressionItemInstances(
+async function getNumOfEnableWhenExpressionItemInstances(
   enableWhenExpression: EnableWhenRepeatExpression,
-  fhirPathContext: Record<string, any>
+  fhirPathContext: Record<string, any>,
+  terminologyServerUrl: string
 ) {
-  const result = fhirpath.evaluate(
-    '',
+  const fhirPathResult = fhirpath.evaluate(
+    {},
     `%resource.descendants().where(linkId = '${enableWhenExpression.parentLinkId}').count()`,
     fhirPathContext,
-    fhirpath_r4_model
+    fhirpath_r4_model,
+    {
+      async: true,
+      terminologyUrl: terminologyServerUrl
+    }
   );
+  const result = await handleFhirPathResult(fhirPathResult);
 
   return typeof result[0] === 'number' ? result[0] : null;
 }
 
-function evaluateEnableWhenRepeatExpressions(
+async function evaluateEnableWhenRepeatExpressions(
   enableWhenRepeatExpressions: Record<string, EnableWhenRepeatExpression>,
-  fhirPathContext: Record<string, any>
-): {
+  fhirPathContext: Record<string, any>,
+  terminologyServerUrl: string
+): Promise<{
   updatedExpressions: Record<string, EnableWhenRepeatExpression>;
   isUpdated: boolean;
-} {
+}> {
   let aggregatedUpdated = false;
   for (const linkId in enableWhenRepeatExpressions) {
     // Get number of repeat group instances in the QR
     const enableWhenExpression = enableWhenRepeatExpressions[linkId];
 
-    const numOfInstances = getNumOfEnableWhenExpressionItemInstances(
+    const numOfInstances = await getNumOfEnableWhenExpressionItemInstances(
       enableWhenExpression,
-      fhirPathContext
+      fhirPathContext,
+      terminologyServerUrl
     );
     if (!numOfInstances) {
       continue;
@@ -164,12 +188,13 @@ function evaluateEnableWhenRepeatExpressions(
     }
 
     for (let i = 0; i < numOfInstances; i++) {
-      const { isEnabled, isUpdated } = evaluateEnableWhenRepeatExpressionInstance(
+      const { isEnabled, isUpdated } = await evaluateEnableWhenRepeatExpressionInstance(
         linkId,
         fhirPathContext,
         enableWhenExpression,
         lastLinkIdIndex,
-        i
+        i,
+        terminologyServerUrl
       );
 
       if (typeof isEnabled === 'boolean') {
@@ -183,13 +208,14 @@ function evaluateEnableWhenRepeatExpressions(
   return { updatedExpressions: enableWhenRepeatExpressions, isUpdated: aggregatedUpdated };
 }
 
-export function evaluateEnableWhenRepeatExpressionInstance(
+export async function evaluateEnableWhenRepeatExpressionInstance(
   linkId: string,
   fhirPathContext: Record<string, any>,
   enableWhenRepeatExpression: EnableWhenRepeatExpression,
   lastLinkIdIndex: number,
-  instanceIndex: number
-): { isEnabled: boolean | null; isUpdated: boolean } {
+  instanceIndex: number,
+  terminologyServerUrl: string
+): Promise<{ isEnabled: boolean | null; isUpdated: boolean }> {
   const expression = enableWhenRepeatExpression.expression;
   const parentLinkId = enableWhenRepeatExpression.parentLinkId;
   const initialValue = enableWhenRepeatExpression.enabledIndexes[instanceIndex];
@@ -202,7 +228,17 @@ export function evaluateEnableWhenRepeatExpressionInstance(
   let isEnabled = null;
   let isUpdated = false;
   try {
-    const result = fhirpath.evaluate('', modifiedExpression, fhirPathContext, fhirpath_r4_model);
+    const fhirPathResult = fhirpath.evaluate(
+      {},
+      modifiedExpression,
+      fhirPathContext,
+      fhirpath_r4_model,
+      {
+        async: true,
+        terminologyUrl: terminologyServerUrl
+      }
+    );
+    const result = await handleFhirPathResult(fhirPathResult);
 
     // Update enableWhenExpressions if length of result array > 0
     // Only update when current isEnabled value is different from the result, otherwise it will result in am infinite loop as per #733
@@ -229,25 +265,28 @@ export function evaluateEnableWhenRepeatExpressionInstance(
   return { isEnabled, isUpdated };
 }
 
-export function evaluateEnableWhenExpressions(
+export async function evaluateEnableWhenExpressions(
   fhirPathContext: Record<string, any>,
-  enableWhenExpressions: EnableWhenExpressions
-): {
+  enableWhenExpressions: EnableWhenExpressions,
+  terminologyServerUrl: string
+): Promise<{
   enableWhenExpsIsUpdated: boolean;
   updatedEnableWhenExpressions: EnableWhenExpressions;
-} {
+}> {
   const updatedEnableWhenExpressions: EnableWhenExpressions = {
     ...enableWhenExpressions
   };
 
-  const updatedEnableWhenSingleExpressions = evaluateEnableWhenSingleExpressions(
+  const updatedEnableWhenSingleExpressions = await evaluateEnableWhenSingleExpressions(
     updatedEnableWhenExpressions.singleExpressions,
-    fhirPathContext
+    fhirPathContext,
+    terminologyServerUrl
   );
 
-  const updatedEnableWhenRepeatExpressions = evaluateEnableWhenRepeatExpressions(
+  const updatedEnableWhenRepeatExpressions = await evaluateEnableWhenRepeatExpressions(
     updatedEnableWhenExpressions.repeatExpressions,
-    fhirPathContext
+    fhirPathContext,
+    terminologyServerUrl
   );
 
   const isUpdated =
@@ -271,11 +310,12 @@ interface MutateRepeatEnableWhenExpressionInstancesParams {
   parentRepeatGroupLinkId: string;
   parentRepeatGroupIndex: number;
   actionType: 'add' | 'remove';
+  terminologyServerUrl: string;
 }
 
-export function mutateRepeatEnableWhenExpressionInstances(
+export async function mutateRepeatEnableWhenExpressionInstances(
   params: MutateRepeatEnableWhenExpressionInstancesParams
-): { updatedEnableWhenExpressions: EnableWhenExpressions; isUpdated: boolean } {
+): Promise<{ updatedEnableWhenExpressions: EnableWhenExpressions; isUpdated: boolean }> {
   const {
     questionnaireResponse,
     questionnaireResponseItemMap,
@@ -284,16 +324,18 @@ export function mutateRepeatEnableWhenExpressionInstances(
     enableWhenExpressions,
     parentRepeatGroupLinkId,
     parentRepeatGroupIndex,
-    actionType
+    actionType,
+    terminologyServerUrl
   } = params;
 
   const { repeatExpressions } = enableWhenExpressions;
 
-  const updatedFhirPathContext = createFhirPathContext(
+  const updatedFhirPathContext = await createFhirPathContext(
     questionnaireResponse,
     questionnaireResponseItemMap,
     variablesFhirPath,
-    existingFhirPathContext
+    existingFhirPathContext,
+    terminologyServerUrl
   );
 
   let isUpdated = false;
@@ -303,12 +345,13 @@ export function mutateRepeatEnableWhenExpressionInstances(
     }
 
     if (actionType === 'add') {
-      const { isEnabled } = evaluateEnableWhenRepeatExpressionInstance(
+      const { isEnabled } = await evaluateEnableWhenRepeatExpressionInstance(
         linkId,
         updatedFhirPathContext,
         repeatExpressions[linkId],
         repeatExpressions[linkId].expression.lastIndexOf('.where(linkId'),
-        parentRepeatGroupIndex
+        parentRepeatGroupIndex,
+        terminologyServerUrl
       );
 
       if (typeof isEnabled === 'boolean') {