Merge pull request aehrc#1778 from fongsean/issue/1774-revised

Issue/1774 revised

Author: clinnygee

packages/smart-forms-renderer/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,

packages/smart-forms-renderer/src/test/manageForm.test.ts

@@ -207,7 +207,7 @@ describe('manageForm utils', () => {
       expect(mockResetUrl).toHaveBeenCalledTimes(1);
       expect(mockBuildSourceQuestionnaire).toHaveBeenCalledWith(
         mockQuestionnaire,
-        mockQuestionnaireResponse,
+        undefined,
         undefined,
         undefined,
         false,
@@ -261,7 +261,7 @@ describe('manageForm utils', () => {
       expect(mockSetUrl).toHaveBeenCalledWith(terminologyServerUrl);
       expect(mockBuildSourceQuestionnaire).toHaveBeenCalledWith(
         mockQuestionnaire,
-        mockQuestionnaireResponse,
+        undefined,
         additionalContext,
         terminologyServerUrl,
         true,

packages/smart-forms-renderer/src/utils/manageForm.ts

@@ -116,26 +116,27 @@ 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,
       qItemOverrideComponents,
       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);