@aehrc/smart-forms-renderer 0.43.1 → 0.44.0

package/src/utils/questionnaireStoreUtils/createQuestionaireModel.ts

@@ -29,7 +29,7 @@ import { extractOtherExtensions } from './extractOtherExtensions';
 import type { Variables } from '../../interfaces/variables.interface';
 import { resolveValueSets } from './resolveValueSets';
 import { addAdditionalVariables } from './addAdditionalVariables';
-import { getLinkIdTypeTuples } from '../qItem';
+import { getLinkIdPreferredTerminologyServerTuples, getLinkIdTypeTuples } from '../qItem';
 import { addDisplayToAnswerOptions, addDisplayToProcessedCodings } from './addDisplayToCodings';
 
 export async function createQuestionnaireModel(
@@ -42,6 +42,9 @@ export async function createQuestionnaireModel(
   }
 
   const itemTypes: Record<string, string> = Object.fromEntries(getLinkIdTypeTuples(questionnaire));
+  const itemPreferredTerminologyServers: Record<string, string> = Object.fromEntries(
+    getLinkIdPreferredTerminologyServerTuples(questionnaire)
+  );
   const tabs: Tabs = extractTabs(questionnaire);
   const pages: Pages = extractPages(questionnaire);
 
@@ -62,6 +65,7 @@ export async function createQuestionnaireModel(
     questionnaire,
     variables,
     valueSetPromises,
+    itemPreferredTerminologyServers,
     terminologyServerUrl
   );
 
@@ -100,6 +104,7 @@ export async function createQuestionnaireModel(
 
   return {
     itemTypes,
+    itemPreferredTerminologyServers,
     tabs,
     pages,
     variables,
@@ -119,6 +124,7 @@ export async function createQuestionnaireModel(
 function createEmptyModel(): QuestionnaireModel {
   return {
     itemTypes: {},
+    itemPreferredTerminologyServers: {},
     tabs: {},
     pages: {},
     variables: { fhirPathVariables: {}, xFhirQueryVariables: {} },

package/src/utils/questionnaireStoreUtils/extractOtherExtensions.ts

@@ -65,6 +65,7 @@ export function extractOtherExtensions(
   questionnaire: Questionnaire,
   variables: Variables,
   valueSetPromises: Record<string, ValueSetPromise>,
+  itemPreferredTerminologyServers: Record<string, string>,
   terminologyServerUrl: string
 ): ReturnParamsRecursive {
   const enableWhenItems: EnableWhenItems = { singleItems: {}, repeatItems: {} };
@@ -106,6 +107,7 @@ export function extractOtherExtensions(
       answerExpressions,
       answerOptions,
       valueSetPromises,
+      itemPreferredTerminologyServers,
       defaultTerminologyServerUrl: terminologyServerUrl,
       parentRepeatGroupLinkId: isRepeatGroup ? topLevelItem.linkId : undefined
     });
@@ -134,6 +136,7 @@ interface extractExtensionsFromItemRecursiveParams {
   answerExpressions: Record<string, AnswerExpression>;
   answerOptions: Record<string, QuestionnaireItemAnswerOption[]>;
   valueSetPromises: Record<string, ValueSetPromise>;
+  itemPreferredTerminologyServers: Record<string, string>;
   defaultTerminologyServerUrl: string;
   parentRepeatGroupLinkId?: string;
 }
@@ -152,6 +155,7 @@ function extractExtensionsFromItemRecursive(
     answerExpressions,
     answerOptions,
     valueSetPromises,
+    itemPreferredTerminologyServers,
     defaultTerminologyServerUrl,
     parentRepeatGroupLinkId
   } = params;
@@ -234,7 +238,12 @@ function extractExtensionsFromItemRecursive(
   const valueSetUrl = item.answerValueSet;
   if (valueSetUrl) {
     if (!valueSetPromises[valueSetUrl] && !valueSetUrl.startsWith('#')) {
-      const terminologyServerUrl = getTerminologyServerUrl(item) ?? defaultTerminologyServerUrl;
+      const preferredTerminologyServerUrl = itemPreferredTerminologyServers[item.linkId];
+      const terminologyServerUrl =
+        getTerminologyServerUrl(item) ??
+        preferredTerminologyServerUrl ??
+        defaultTerminologyServerUrl;
+
       valueSetPromises[valueSetUrl] = {
         promise: getValueSetPromise(valueSetUrl, terminologyServerUrl)
       };

package/src/utils/valueSet.ts

@@ -36,6 +36,7 @@ const VALID_VALUE_SET_URL_REGEX =
 
 const VALID_FHIRPATH_VARIABLE_REGEX = /%(.*?)\./;
 
+// Mainly for backwards compatibility, doesn't exist in the SDC spec anymore
 export function getTerminologyServerUrl(qItem: QuestionnaireItem): string | undefined {
   const itemControl = qItem.extension?.find(
     (extension: Extension) =>