@aehrc/smart-forms-renderer 1.2.11 → 1.2.13

package/src/stores/questionnaireStore.ts

@@ -39,6 +39,7 @@ import type { Variables } from '../interfaces/variables.interface';
 import { processCalculatedExpressions } from '../utils/calculatedExpression';
 import { applyComputedUpdates } from '../utils/computedUpdates';
 import {
+  assignPopulatedAnswersToEnableWhen,
   mutateRepeatEnableWhenItemInstances,
   updateEnableWhenItemAnswer
 } from '../utils/enableWhen';
@@ -441,6 +442,7 @@ export const questionnaireStore = createStore<QuestionnaireStoreType>()((set, ge
 
     4. Re-run calculatedExpressions as a final step to ensure all calculations are up-to-date, incorporating any toggled options or dynamic value set changes.
     5. Update store state based on the expressions that changed
+    6. (If initial update) Initialise enableWhen items
     */
 
     const {
@@ -450,6 +452,7 @@ export const questionnaireStore = createStore<QuestionnaireStoreType>()((set, ge
       variables,
       targetConstraints,
       answerOptionsToggleExpressions,
+      enableWhenItems,
       enableWhenExpressions,
       processedValueSets,
       calculatedExpressions,
@@ -471,6 +474,8 @@ export const questionnaireStore = createStore<QuestionnaireStoreType>()((set, ge
         enableWhenExpressions?: EnableWhenExpressions;
         answerOptionsToggleExpressions?: Record<string, AnswerOptionsToggleExpression[]>;
         processedValueSets?: Record<string, ProcessedValueSet>;
+        enableWhenItems?: EnableWhenItems;
+        enableWhenLinkedQuestions?: Record<string, string[]>;
       }
     ) {
       // Update QuestionnaireStore state
@@ -489,6 +494,12 @@ export const questionnaireStore = createStore<QuestionnaireStoreType>()((set, ge
         }),
         ...(otherExpressions?.processedValueSets && {
           processedValueSets: otherExpressions.processedValueSets
+        }),
+        ...(otherExpressions?.enableWhenItems && {
+          enableWhenItems: otherExpressions.enableWhenItems
+        }),
+        ...(otherExpressions?.enableWhenLinkedQuestions && {
+          enableWhenLinkedQuestions: otherExpressions.enableWhenLinkedQuestions
         })
       }));
 
@@ -573,6 +584,8 @@ export const questionnaireStore = createStore<QuestionnaireStoreType>()((set, ge
       enableWhenExpressions: EnableWhenExpressions;
       answerOptionsToggleExpressions: Record<string, AnswerOptionsToggleExpression[]>;
       processedValueSets: Record<string, ProcessedValueSet>;
+      enableWhenItems: EnableWhenItems;
+      enableWhenLinkedQuestions: Record<string, string[]>;
     }> = {};
     if (targetConstraintsUpdate.isUpdated) {
       otherExpressionsToUpdate.targetConstraints = targetConstraintsUpdate.value;
@@ -588,6 +601,16 @@ export const questionnaireStore = createStore<QuestionnaireStoreType>()((set, ge
       otherExpressionsToUpdate.processedValueSets = processedValueSetsUpdate.value;
     }
 
+    // Step 6: Evaluate enableWhen on the first update
+    if (isInitialUpdate) {
+      const {
+        initialisedItems: initialisedEnableWhenItems,
+        linkedQuestions: initialisedEnableWhenLinkedQuestions
+      } = assignPopulatedAnswersToEnableWhen(enableWhenItems, lastUpdatedResponse);
+      otherExpressionsToUpdate.enableWhenItems = initialisedEnableWhenItems;
+      otherExpressionsToUpdate.enableWhenLinkedQuestions = initialisedEnableWhenLinkedQuestions;
+    }
+
     updateStoreState(
       lastUpdatedResponse,
       updatedCalculatedExpressions,

package/src/utils/calculatedExpression.ts

@@ -370,13 +370,9 @@ function applyCalculatedExpressionValuesRecursive(
     );
   }
 
-  let qrItem = qrItemOrItems;
+  const qrItem = qrItemOrItems;
   const childQItems = qItem.item;
   if (childQItems && childQItems.length > 0) {
-    // If item.type is 'group', create empty group qrItem
-    if (qItem.type === 'group') {
-      qrItem = qrItemOrItems ?? structuredClone(createEmptyQrGroup(qItem));
-    }
     const childQrItems = qrItem?.item ?? [];
 
     const indexMap = mapQItemsIndex(qItem);

package/src/utils/extensions.ts

@@ -15,7 +15,13 @@
  * limitations under the License.
  */
 
-import type { Coding, Extension, QuestionnaireItem, QuestionnaireItemAnswerOption } from 'fhir/r4';
+import type {
+  Coding,
+  Element,
+  Extension,
+  QuestionnaireItem,
+  QuestionnaireItemAnswerOption
+} from 'fhir/r4';
 import type { RegexValidation } from '../interfaces/regex.interface';
 import { structuredDataCapture } from 'fhir-sdc-helpers';
 import { default as htmlParse } from 'html-react-parser';
@@ -160,8 +166,8 @@ export function getXHtmlString(qItem: QuestionnaireItem): string | null {
  *
  * @author Sean Fong
  */
-export function getMarkdownString(qItem: QuestionnaireItem): string | null {
-  const extension = qItem._text?.extension?.find(
+export function getMarkdownString(element: Element | undefined): string | null {
+  const extension = element?.extension?.find(
     (extension: Extension) =>
       extension.url === 'http://hl7.org/fhir/StructureDefinition/rendering-markdown'
   );

package/src/utils/manageForm.ts

@@ -116,19 +116,13 @@ export async function buildForm(params: BuildFormParams): Promise<void> {
     terminologyServerStore.getState().resetUrl();
   }
 
-  // Initialise an empty questionnaireResponse from a given questionnaire
-  // Optionally takes in an existing questionnaireResponse to be initialised
-  const initialisedQuestionnaireResponse = initialiseQuestionnaireResponse(
-    questionnaire,
-    questionnaireResponse
-  );
-
-  // The buildSourceQuestionnaire function now takes the initialisedQuestionnaireResponse, which includes item.initial values from the Questionnaire.
+  // QR is set to undefined here to prevent it from being initialised twice. This is defined like that for backward compatibility purposes.
+  // Warning: setting the QR here breaks pre-pop. For initialisation logic, do it in questionnaireStore.getState().updateExpressions() with isInitialUpdate=true.
   await questionnaireStore
     .getState()
     .buildSourceQuestionnaire(
       questionnaire,
-      initialisedQuestionnaireResponse,
+      undefined,
       additionalContext,
       terminologyServerUrl,
       readOnly,
@@ -136,6 +130,13 @@ export async function buildForm(params: BuildFormParams): Promise<void> {
       sdcUiOverrideComponents
     );
 
+  // Initialise an empty questionnaireResponse from a given questionnaire
+  // Optionally takes in an existing questionnaireResponse to be initialised
+  const initialisedQuestionnaireResponse = initialiseQuestionnaireResponse(
+    questionnaire,
+    questionnaireResponse
+  );
+
   // Set initialised QuestionnaireResponse as the source response in the store
   questionnaireResponseStore.getState().buildSourceResponse(initialisedQuestionnaireResponse);
 

package/src/utils/qrItem.ts

@@ -312,3 +312,15 @@ export function updateQrNestedItems(
     return;
   }
 }
+
+/**
+ * Gets the Id of the QR Item, if it has a Calculated Expression, then it returns a new Id, else it returns the passed Id.
+ *
+ * @author Janardhan Vignarajan
+ */
+export function getQRItemId(answerKey: string | undefined) {
+  // If the answerKey is through CalculatedExpression, then we assign a new random ID so that it does not fire again when user changes the value
+  return answerKey && answerKey.includes('calculatedExpression')
+    ? Math.random().toString(36).slice(2)
+    : answerKey;
+}