@aehrc/smart-forms-renderer 0.26.2 → 0.27.0

package/lib/utils/questionnaireStoreUtils/resolveValueSets.js

@@ -23,7 +23,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { createValueSetToXFhirQueryVariableNameMap, getValueSetCodings, getValueSetPromise, resolvePromises } from '../valueSet';
+import { createValueSetToXFhirQueryVariableNameMap, getValueSetCodings, getValueSetPromise, resolveValueSetPromises } from '../valueSet';
 export function resolveValueSets(variables, valueSetPromises, processedValueSetCodings, terminologyServerUrl) {
     return __awaiter(this, void 0, void 0, function* () {
         // Create a <valueSetUrl, XFhirQueryVariableName> map
@@ -36,7 +36,7 @@ export function resolveValueSets(variables, valueSetPromises, processedValueSetC
             }
         }
         // Resolve promises and store valueSet codings in preprocessedValueSetCodings AND XFhirQueryVariables
-        const resolvedPromises = yield resolvePromises(valueSetPromises);
+        const resolvedPromises = yield resolveValueSetPromises(valueSetPromises);
         for (const valueSetUrl in resolvedPromises) {
             const valueSet = resolvedPromises[valueSetUrl].valueSet;
             if (valueSet) {

package/lib/utils/questionnaireStoreUtils/resolveValueSets.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveValueSets.js","sourceRoot":"","sources":["../../../src/utils/questionnaireStoreUtils/resolveValueSets.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;;;;;;;;;;AAGH,OAAO,EACL,yCAAyC,EACzC,kBAAkB,EAClB,kBAAkB,EAClB,eAAe,EAChB,MAAM,aAAa,CAAC;AAIrB,MAAM,UAAgB,gBAAgB,CACpC,SAAoB,EACpB,gBAAiD,EACjD,wBAAkD,EAClD,oBAA4B;;QAE5B,qDAAqD;QACrD,MAAM,mCAAmC,GACvC,yCAAyC,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC;QAE3E,IAAI,MAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/D,KAAK,MAAM,WAAW,IAAI,mCAAmC,EAAE;gBAC7D,gBAAgB,CAAC,WAAW,CAAC,GAAG;oBAC9B,OAAO,EAAE,kBAAkB,CAAC,WAAW,EAAE,oBAAoB,CAAC;iBAC/D,CAAC;aACH;SACF;QAED,qGAAqG;QACrG,MAAM,gBAAgB,GAAG,MAAM,eAAe,CAAC,gBAAgB,CAAC,CAAC;QAEjE,KAAK,MAAM,WAAW,IAAI,gBAAgB,EAAE;YAC1C,MAAM,QAAQ,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC;YAExD,IAAI,QAAQ,EAAE;gBACZ,IAAI,mCAAmC,CAAC,WAAW,CAAC,EAAE;oBACpD,6DAA6D;oBAC7D,MAAM,YAAY,GAAG,mCAAmC,CAAC,WAAW,CAAC,CAAC;oBACtE,MAAM,QAAQ,GAAG,SAAS,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC;oBAC7D,SAAS,CAAC,mBAAmB,CAAC,YAAY,CAAC,mCACtC,QAAQ,KACX,MAAM,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAC,QAAQ,GAC/C,CAAC;iBACH;qBAAM;oBACL,gFAAgF;oBAChF,wBAAwB,CAAC,WAAW,CAAC,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;iBACtE;aACF;SACF;QAED,OAAO,EAAE,SAAS,EAAE,wBAAwB,EAAE,CAAC;IACjD,CAAC;CAAA"}
+{"version":3,"file":"resolveValueSets.js","sourceRoot":"","sources":["../../../src/utils/questionnaireStoreUtils/resolveValueSets.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;;;;;;;;;;AAGH,OAAO,EACL,yCAAyC,EACzC,kBAAkB,EAClB,kBAAkB,EAClB,uBAAuB,EACxB,MAAM,aAAa,CAAC;AAIrB,MAAM,UAAgB,gBAAgB,CACpC,SAAoB,EACpB,gBAAiD,EACjD,wBAAkD,EAClD,oBAA4B;;QAE5B,qDAAqD;QACrD,MAAM,mCAAmC,GACvC,yCAAyC,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC;QAE3E,IAAI,MAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/D,KAAK,MAAM,WAAW,IAAI,mCAAmC,EAAE;gBAC7D,gBAAgB,CAAC,WAAW,CAAC,GAAG;oBAC9B,OAAO,EAAE,kBAAkB,CAAC,WAAW,EAAE,oBAAoB,CAAC;iBAC/D,CAAC;aACH;SACF;QAED,qGAAqG;QACrG,MAAM,gBAAgB,GAAG,MAAM,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;QAEzE,KAAK,MAAM,WAAW,IAAI,gBAAgB,EAAE;YAC1C,MAAM,QAAQ,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC;YAExD,IAAI,QAAQ,EAAE;gBACZ,IAAI,mCAAmC,CAAC,WAAW,CAAC,EAAE;oBACpD,6DAA6D;oBAC7D,MAAM,YAAY,GAAG,mCAAmC,CAAC,WAAW,CAAC,CAAC;oBACtE,MAAM,QAAQ,GAAG,SAAS,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC;oBAC7D,SAAS,CAAC,mBAAmB,CAAC,YAAY,CAAC,mCACtC,QAAQ,KACX,MAAM,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAC,QAAQ,GAC/C,CAAC;iBACH;qBAAM;oBACL,gFAAgF;oBAChF,wBAAwB,CAAC,WAAW,CAAC,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;iBACtE;aACF;SACF;QAED,OAAO,EAAE,SAAS,EAAE,wBAAwB,EAAE,CAAC;IACjD,CAAC;CAAA"}

package/lib/utils/valueSet.d.ts

@@ -4,7 +4,7 @@ import type { VariableXFhirQuery } from '../interfaces/variables.interface';
 import type { ValueSetPromise } from '../interfaces/valueSet.interface';
 export declare function getTerminologyServerUrl(qItem: QuestionnaireItem): string | undefined;
 export declare function getValueSetPromise(url: string, terminologyServerUrl: string): Promise<ValueSet>;
-export declare function resolvePromises(valueSetPromises: Record<string, ValueSetPromise>): Promise<Record<string, ValueSetPromise>>;
+export declare function resolveValueSetPromises(valueSetPromises: Record<string, ValueSetPromise>): Promise<Record<string, ValueSetPromise>>;
 /**
  * Sets an array of codings with the values from a valueSet
  *

package/lib/utils/valueSet.js

@@ -57,7 +57,7 @@ function addTimeoutToPromise(promise, timeoutMs) {
         return Promise.race([promise, timeoutPromise]);
     });
 }
-export function resolvePromises(valueSetPromises) {
+export function resolveValueSetPromises(valueSetPromises) {
     return __awaiter(this, void 0, void 0, function* () {
         const newValueSetPromises = {};
         const valueSetPromiseKeys = Object.keys(valueSetPromises);

package/lib/utils/valueSet.js.map

@@ -1 +1 @@
-{"version":3,"file":"valueSet.js","sourceRoot":"","sources":["../../src/utils/valueSet.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"valueSet.js","sourceRoot":"","sources":["../../src/utils/valueSet.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aehrc/smart-forms-renderer",
-  "version": "0.26.2",
+  "version": "0.27.0",
   "description": "FHIR Structured Data Captured (SDC) rendering engine for Smart Forms",
   "main": "lib/index.js",
   "scripts": {

package/src/components/FormComponents/ChoiceItems/ChoiceAutocompleteField.tsx

@@ -67,7 +67,7 @@ function ChoiceAutocompleteField(props: ChoiceAutocompleteFieldsProps) {
       id={qItem.id}
       value={valueCoding ?? null}
       options={options}
-      getOptionLabel={(option) => `${option.display}`}
+      getOptionLabel={(option) => option.display ?? `${option.code}`}
       isOptionEqualToValue={(option, value) => option.id === value.id}
       disabled={readOnly}
       loading={loading}

package/src/components/FormComponents/ChoiceItems/ChoiceSelectAnswerValueSetFields.tsx

@@ -56,7 +56,7 @@ function ChoiceSelectAnswerValueSetFields(props: ChoiceSelectAnswerValueSetField
       <Autocomplete
         id={qItem.id}
         options={codings}
-        getOptionLabel={(option) => `${option.display}`}
+        getOptionLabel={(option) => option.display ?? `${option.code}`}
         value={valueCoding ?? null}
         onChange={(_, newValue) => onSelectChange(newValue)}
         openOnFocus

package/src/components/FormComponents/OpenChoiceItems/OpenChoiceAutocompleteField.tsx

@@ -73,7 +73,9 @@ function OpenChoiceAutocompleteField(props: OpenChoiceAutocompleteFieldProps) {
         id={qItem.id}
         value={valueAutocomplete}
         options={options}
-        getOptionLabel={(option) => (typeof option === 'string' ? option : `${option.display}`)}
+        getOptionLabel={(option) =>
+          typeof option === 'string' ? option : option.display ?? `${option.code}`
+        }
         disabled={readOnly}
         loading={loading}
         loadingText={'Fetching results...'}

package/src/components/FormComponents/OpenChoiceItems/OpenChoiceSelectAnswerValueSetField.tsx

@@ -33,7 +33,9 @@ function OpenChoiceSelectAnswerValueSetField(props: OpenChoiceSelectAnswerValueS
         id={qItem.id}
         value={valueSelect ?? null}
         options={options}
-        getOptionLabel={(option) => (typeof option === 'string' ? option : `${option.display}`)}
+        getOptionLabel={(option) =>
+          typeof option === 'string' ? option : option.display ?? `${option.code}`
+        }
         onChange={(_, newValue) => onValueChange(newValue)}
         onInputChange={(_, newValue) => onValueChange(newValue)}
         freeSolo

package/src/hooks/useValueSetCodings.ts

@@ -27,6 +27,7 @@ import { getAnswerExpression } from '../utils/getExpressionsFromItem';
 import fhirpath from 'fhirpath';
 import fhirpath_r4_model from 'fhirpath/fhir-context/r4';
 import { useQuestionnaireStore, useSmartConfigStore, useTerminologyServerStore } from '../stores';
+import { addDisplayToCodingArray } from '../utils/questionnaireStoreUtils/addDisplayToCodings';
 
 export interface TerminologyError {
   error: Error | null;
@@ -140,12 +141,18 @@ function useValueSetCodings(qItem: QuestionnaireItem): {
     const promise = getValueSetPromise(valueSetUrl, terminologyServerUrl);
     if (promise) {
       promise
-        .then((valueSet: ValueSet) => {
+        .then(async (valueSet: ValueSet) => {
           const codings = getValueSetCodings(valueSet);
-          if (codings.length > 0) {
-            addCodingToCache(valueSetUrl, codings);
-            setCodings(codings);
-          }
+          addDisplayToCodingArray(codings, terminologyServerUrl)
+            .then((codingsWithDisplay) => {
+              if (codingsWithDisplay.length > 0) {
+                addCodingToCache(valueSetUrl, codingsWithDisplay);
+                setCodings(codings);
+              }
+            })
+            .catch((error: Error) => {
+              setServerError(error);
+            });
         })
         .catch((error: Error) => {
           setServerError(error);

package/src/{stories/assets/QStringItem.ts → interfaces/lookup.interface.ts}

@@ -15,24 +15,10 @@
  * limitations under the License.
  */
 
-import type { Questionnaire } from 'fhir/r4';
+import type { Coding } from 'fhir/r4';
 
-export const QStringItem: Questionnaire = {
-  resourceType: 'Questionnaire',
-  id: 'StringComponent',
-  name: 'StringComponent',
-  title: 'String Component',
-  version: '0.1.0',
-  status: 'draft',
-  publisher: 'AEHRC CSIRO',
-  date: '2024-05-01',
-  url: 'https://smartforms.csiro.au/docs/components/string',
-  item: [
-    {
-      linkId: 'name',
-      type: 'string',
-      repeats: false,
-      text: 'Name'
-    }
-  ]
-};
+export interface CodeSystemLookupPromise {
+  promise: Promise<Parameters<any>>;
+  oldCoding: Coding;
+  newCoding?: Coding;
+}

package/src/utils/calculatedExpression.ts

@@ -75,7 +75,8 @@ export function evaluateInitialCalculatedExpressions(
   const updatedFhirPathContext = createFhirPathContext(
     initialResponse,
     initialResponseItemMap,
-    variablesFhirPath
+    variablesFhirPath,
+    existingFhirPathContext
   );
 
   for (const linkId in initialCalculatedExpressions) {

package/src/utils/enableWhenExpression.ts

@@ -30,6 +30,7 @@ interface EvaluateInitialEnableWhenExpressionsParams {
   initialResponseItemMap: Record<string, QuestionnaireResponseItem[]>;
   enableWhenExpressions: EnableWhenExpressions;
   variablesFhirPath: Record<string, Expression[]>;
+  existingFhirPathContext: Record<string, any>;
 }
 
 export function evaluateInitialEnableWhenExpressions(
@@ -38,8 +39,13 @@ export function evaluateInitialEnableWhenExpressions(
   initialEnableWhenExpressions: EnableWhenExpressions;
   updatedFhirPathContext: Record<string, any>;
 } {
-  const { initialResponse, initialResponseItemMap, enableWhenExpressions, variablesFhirPath } =
-    params;
+  const {
+    initialResponse,
+    initialResponseItemMap,
+    enableWhenExpressions,
+    variablesFhirPath,
+    existingFhirPathContext
+  } = params;
 
   const initialEnableWhenExpressions: EnableWhenExpressions = {
     ...enableWhenExpressions
@@ -47,7 +53,8 @@ export function evaluateInitialEnableWhenExpressions(
   const updatedFhirPathContext = createFhirPathContext(
     initialResponse,
     initialResponseItemMap,
-    variablesFhirPath
+    variablesFhirPath,
+    existingFhirPathContext
   );
 
   const initialEnableWhenSingleExpressions = evaluateEnableWhenSingleExpressions(
@@ -273,6 +280,7 @@ export function mutateRepeatEnableWhenExpressionInstances(
     questionnaireResponse,
     questionnaireResponseItemMap,
     variablesFhirPath,
+    existingFhirPathContext,
     enableWhenExpressions,
     parentRepeatGroupLinkId,
     parentRepeatGroupIndex,
@@ -284,7 +292,8 @@ export function mutateRepeatEnableWhenExpressionInstances(
   const updatedFhirPathContext = createFhirPathContext(
     questionnaireResponse,
     questionnaireResponseItemMap,
-    variablesFhirPath
+    variablesFhirPath,
+    existingFhirPathContext
   );
 
   let isUpdated = false;

package/src/utils/fhirpath.ts

@@ -62,7 +62,8 @@ export function evaluateUpdatedExpressions(params: EvaluateUpdatedExpressionsPar
   const updatedFhirPathContext = createFhirPathContext(
     updatedResponse,
     updatedResponseItemMap,
-    variablesFhirPath
+    variablesFhirPath,
+    existingFhirPathContext
   );
 
   // Update enableWhenExpressions
@@ -90,15 +91,20 @@ export function evaluateUpdatedExpressions(params: EvaluateUpdatedExpressionsPar
 export function createFhirPathContext(
   questionnaireResponse: QuestionnaireResponse,
   questionnaireResponseItemMap: Record<string, QuestionnaireResponseItem[]>,
-  variablesFhirPath: Record<string, Expression[]>
+  variablesFhirPath: Record<string, Expression[]>,
+  existingFhirPathContext: Record<string, any>
 ): Record<string, any> {
+  // Add latest resource to fhirPathContext
+  let fhirPathContext: Record<string, any> = {
+    ...existingFhirPathContext,
+    resource: questionnaireResponse
+  };
+
+  // Exit early if there are no QR items
   if (!questionnaireResponse.item) {
-    return {};
+    return fhirPathContext;
   }
 
-  // Add latest resource to fhirPathContext
-  let fhirPathContext: Record<string, any> = { resource: questionnaireResponse };
-
   // Evaluate resource-level variables
   fhirPathContext = evaluateQuestionnaireLevelVariables(
     questionnaireResponse,

package/src/utils/initialise.ts

@@ -344,10 +344,11 @@ export function initialiseFormFromResponse(params: initialFormFromResponseParams
     enableWhenExpressions,
     calculatedExpressions,
     variablesFhirPath,
-    tabs
+    tabs,
+    fhirPathContext
   } = params;
   const initialResponseItemMap = createQuestionnaireResponseItemMap(questionnaireResponse);
-  let updatedFhirPathContext = params.fhirPathContext;
+  let updatedFhirPathContext = {};
 
   const { initialisedItems, linkedQuestions } = assignPopulatedAnswersToEnableWhen(
     enableWhenItems,
@@ -358,7 +359,8 @@ export function initialiseFormFromResponse(params: initialFormFromResponseParams
     initialResponse: questionnaireResponse,
     initialResponseItemMap: initialResponseItemMap,
     enableWhenExpressions: enableWhenExpressions,
-    variablesFhirPath: variablesFhirPath
+    variablesFhirPath: variablesFhirPath,
+    existingFhirPathContext: fhirPathContext
   });
   const { initialEnableWhenExpressions } = evaluateInitialEnableWhenExpressionsResult;
   updatedFhirPathContext = evaluateInitialEnableWhenExpressionsResult.updatedFhirPathContext;
@@ -368,7 +370,7 @@ export function initialiseFormFromResponse(params: initialFormFromResponseParams
     initialResponseItemMap: initialResponseItemMap,
     calculatedExpressions: calculatedExpressions,
     variablesFhirPath: variablesFhirPath,
-    existingFhirPathContext: updatedFhirPathContext
+    existingFhirPathContext: fhirPathContext
   });
   const { initialCalculatedExpressions } = evaluateInitialCalculatedExpressionsResult;
   updatedFhirPathContext = evaluateInitialEnableWhenExpressionsResult.updatedFhirPathContext;

package/src/utils/questionnaireStoreUtils/addDisplayToCodings.ts

@@ -0,0 +1,143 @@
+/*
+ * Copyright 2024 Commonwealth Scientific and Industrial Research
+ * Organisation (CSIRO) ABN 41 687 119 230.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { Coding } from 'fhir/r4';
+import type { CodeSystemLookupPromise } from '../../interfaces/lookup.interface';
+import * as FHIR from 'fhirclient';
+
+// Use this for QuestionnaireStore.ProcessedCodings
+export async function addDisplayToProcessedCodings(
+  processedCodings: Record<string, Coding[]>,
+  terminologyServerUrl: string
+): Promise<Record<string, Coding[]>> {
+  // Store code system lookup promises for codings without displays
+  const codeSystemLookupPromises: Record<string, CodeSystemLookupPromise> = {};
+  for (const key in processedCodings) {
+    const codings = processedCodings[key];
+    for (const coding of codings) {
+      if (!coding.display) {
+        const query = `system=${coding.system}&code=${coding.code}`;
+        codeSystemLookupPromises[query] = {
+          promise: getCodeSystemLookupPromise(query, terminologyServerUrl),
+          oldCoding: coding
+        };
+      }
+    }
+  }
+
+  // Resolves lookup promises in one go and assign newCodings to processedCodings
+  const resolvedCodeSystemLookupPromises = await resolveLookupPromises(codeSystemLookupPromises);
+  for (const key in processedCodings) {
+    const codings = processedCodings[key];
+
+    for (const coding of codings) {
+      const lookUpKey = `system=${coding.system}&code=${coding.code}`;
+      const resolvedLookup = resolvedCodeSystemLookupPromises[lookUpKey];
+      if (resolvedLookup?.newCoding?.display) {
+        coding.display = resolvedLookup.newCoding.display;
+      }
+    }
+  }
+
+  return processedCodings;
+}
+
+// Use this for an array of codings
+export async function addDisplayToCodingArray(
+  codings: Coding[],
+  terminologyServerUrl: string
+): Promise<Coding[]> {
+  // Store code system lookup promises for codings without displays
+  const codeSystemLookupPromises: Record<string, CodeSystemLookupPromise> = {};
+  for (const coding of codings) {
+    if (!coding.display) {
+      const query = `system=${coding.system}&code=${coding.code}`;
+      codeSystemLookupPromises[query] = {
+        promise: getCodeSystemLookupPromise(query, terminologyServerUrl),
+        oldCoding: coding
+      };
+    }
+  }
+
+  // Resolves lookup promises in one go and assign newCodings to processedCodings
+  const resolvedCodeSystemLookupPromises = await resolveLookupPromises(codeSystemLookupPromises);
+  for (const coding of codings) {
+    const lookUpKey = `system=${coding.system}&code=${coding.code}`;
+    const resolvedLookup = resolvedCodeSystemLookupPromises[lookUpKey];
+    if (resolvedLookup?.newCoding?.display) {
+      coding.display = resolvedLookup.newCoding.display;
+    }
+  }
+
+  return codings;
+}
+
+export function getCodeSystemLookupPromise(query: string, terminologyServerUrl: string) {
+  return FHIR.client({ serverUrl: terminologyServerUrl }).request({
+    url: `CodeSystem/$lookup?${query}`
+  });
+}
+
+export async function resolveLookupPromises(
+  codeSystemLookupPromises: Record<string, CodeSystemLookupPromise>
+): Promise<Record<string, CodeSystemLookupPromise>> {
+  const newCodeSystemLookupPromises: Record<string, CodeSystemLookupPromise> = {};
+
+  const lookupPromiseKeys = Object.keys(codeSystemLookupPromises);
+  const lookupPromiseValues = Object.values(codeSystemLookupPromises);
+
+  const promises = lookupPromiseValues.map((lookupPromise) => lookupPromise.promise);
+  const lookupResults = await Promise.all(promises);
+
+  for (const [i, lookupResult] of lookupResults.entries()) {
+    if (!lookupResponseIsValid(lookupResult)) {
+      continue;
+    }
+
+    const key = lookupPromiseKeys[i];
+    const lookupPromise = lookupPromiseValues[i];
+
+    if (key && lookupPromise) {
+      lookupPromise.newCoding = {
+        ...lookupPromise.oldCoding,
+        display: lookupResult.parameter.find((p) => p.name === 'display')?.valueString ?? undefined
+      };
+      newCodeSystemLookupPromises[key] = lookupPromise;
+    }
+  }
+
+  return newCodeSystemLookupPromises;
+}
+
+export interface LookupResponse {
+  parameter: [DisplayParameter];
+}
+
+export interface DisplayParameter {
+  name: 'display';
+  valueString: string;
+}
+
+export function lookupResponseIsValid(response: any): response is LookupResponse {
+  return (
+    response &&
+    response.resourceType === 'Parameters' &&
+    response.parameter &&
+    response.parameter.find((p: any) => p.name === 'display') &&
+    response.parameter.find((p: any) => p.name === 'display').valueString
+  );
+}

package/src/utils/questionnaireStoreUtils/createQuestionaireModel.ts

@@ -28,6 +28,7 @@ import type { Variables } from '../../interfaces/variables.interface';
 import { resolveValueSets } from './resolveValueSets';
 import { addAdditionalVariables } from './addAdditionalVariables';
 import { getLinkIdTypeTuples } from '../qItem';
+import { addDisplayToProcessedCodings } from './addDisplayToCodings';
 
 export async function createQuestionnaireModel(
   questionnaire: Questionnaire,
@@ -76,6 +77,12 @@ export async function createQuestionnaireModel(
   variables = resolveValueSetsResult.variables;
   processedValueSetCodings = resolveValueSetsResult.processedValueSetCodings;
 
+  // In processedCodings, add display values to codings lacking them
+  processedValueSetCodings = await addDisplayToProcessedCodings(
+    processedValueSetCodings,
+    terminologyServerUrl
+  );
+
   return {
     itemTypes,
     tabs,

package/src/utils/questionnaireStoreUtils/resolveValueSets.ts

@@ -20,7 +20,7 @@ import {
   createValueSetToXFhirQueryVariableNameMap,
   getValueSetCodings,
   getValueSetPromise,
-  resolvePromises
+  resolveValueSetPromises
 } from '../valueSet';
 import type { Variables } from '../../interfaces/variables.interface';
 import type { ValueSetPromise } from '../../interfaces/valueSet.interface';
@@ -44,7 +44,7 @@ export async function resolveValueSets(
   }
 
   // Resolve promises and store valueSet codings in preprocessedValueSetCodings AND XFhirQueryVariables
-  const resolvedPromises = await resolvePromises(valueSetPromises);
+  const resolvedPromises = await resolveValueSetPromises(valueSetPromises);
 
   for (const valueSetUrl in resolvedPromises) {
     const valueSet = resolvedPromises[valueSetUrl].valueSet;

package/src/utils/valueSet.ts

@@ -74,7 +74,7 @@ async function addTimeoutToPromise(promise: Promise<any>, timeoutMs: number) {
   return Promise.race([promise, timeoutPromise]);
 }
 
-export async function resolvePromises(
+export async function resolveValueSetPromises(
   valueSetPromises: Record<string, ValueSetPromise>
 ): Promise<Record<string, ValueSetPromise>> {
   const newValueSetPromises: Record<string, ValueSetPromise> = {};