Fix case with getBranchItems

Author: ruscoder

package.json

@@ -1,7 +1,7 @@
 {
   "name": "sdc-qrf",
   "license": "MIT",
-  "version": "1.0.0-alpha.2-fhir.9",
+  "version": "1.0.0-alpha.2-fhir.10",
   "scripts": {
     "test": "vitest --watch=false",
     "test:watch": "vitest --watch",

src/components.tsx

@@ -65,7 +65,7 @@ export function QuestionItem(props: QuestionItemProps) {
             ? branchItems.qrItems.map((curQRItem) =>
                   calcContext(initialContext, variable, branchItems.qItem, curQRItem),
               )
-            : calcContext(initialContext, variable, branchItems.qItem, branchItems.qrItems[0]);
+            : calcContext(initialContext, variable, branchItems.qItem, branchItems.qrItems[0]!);
     const prevAnswers: FormAnswerItems[] | undefined = usePreviousValue(_.get(formValues, fieldPath));
 
     const itemContext = isGroupItem(questionItem, context) ? context[0] : context;

src/utils.ts

@@ -88,6 +88,10 @@ export function wrapAnswerValue(type: QuestionnaireItem['type'], value: any): An
     return { [type]: value };
 }
 
+function buildEmptyQuestionnaireResponseItem(qItem: QuestionnaireItem): QuestionnaireResponseItem {
+    return { linkId: qItem.linkId, ...(qItem.text ? { text: qItem.text } : {}) };
+}
+
 export function getBranchItems(
     fieldPath: string[],
     questionnaire: Questionnaire,
@@ -116,7 +120,17 @@ export function getBranchItems(
                 const index = i + 2 < fieldPath.length ? parseInt(fieldPath[i + 2]!, 10) : NaN;
                 if (isNaN(index)) {
                     // Leaf, return all items for repeatable item
-                    return { qItem, qrItems };
+
+                    return {
+                        qItem,
+                        qrItems: qrItems.length
+                            ? qrItems
+                            : // Repeatable required group always have at least one visible group
+                              // And any other repeatable item is visible
+                              qItem.required || qItem.type !== 'group'
+                              ? [buildEmptyQuestionnaireResponseItem(qItem)]
+                              : [],
+                    };
                 }
 
                 // Not leaf, move next moving down from the specified repeatable item
@@ -140,7 +154,10 @@ export function getBranchItems(
         }
     }
 
-    return { qItem, qrItems: qrItem ? [qrItem] : [] } as {
+    return {
+        qItem,
+        qrItems: qrItem ? [qrItem] : [buildEmptyQuestionnaireResponseItem(qItem as QuestionnaireItem)],
+    } as {
         qItem: QuestionnaireItem;
         qrItems: QuestionnaireResponseItem[];
     };
@@ -150,10 +167,9 @@ export function calcContext(
     initialContext: ItemContext,
     variables: FCEQuestionnaireItem['variable'],
     qItem: QuestionnaireItem,
-    qrItem: QuestionnaireResponseItem | undefined,
+    qrItem: QuestionnaireResponseItem,
 ): ItemContext {
     // TODO: add root variable support
-    qrItem = qrItem ?? { linkId: qItem.linkId };
     try {
         return {
             ...(variables || []).reduce(

tests/utils.test.ts

@@ -1801,6 +1801,15 @@ describe('getBranchItems', () => {
                     { linkId: 'dosage', type: 'string' },
                 ],
             },
+
+            {
+                linkId: 'medications-group-required',
+                type: 'group',
+                repeats: true,
+                required: true,
+                item: [{ linkId: 'medication-name-2', type: 'string' }],
+            },
+
             {
                 linkId: 'conditions-group',
                 type: 'group',
@@ -1844,6 +1853,11 @@ describe('getBranchItems', () => {
                         { linkId: 'dosage', answer: [{ valueString: '50mg' }] },
                     ],
                 },
+                {
+                    linkId: 'medications-group-required',
+                    item: [{ linkId: 'medication-name-2', answer: [{ valueString: 'Paracetamol' }] }],
+                },
+
                 {
                     linkId: 'known-allergies',
                     answer: [{ valueString: 'Peanuts' }, { valueString: 'Latex' }],
@@ -1909,6 +1923,24 @@ describe('getBranchItems', () => {
                     },
                 ],
             },
+            {
+                name: 'repeating required group (leaf = group instance)',
+                path: ['medications-group-required'],
+                expectedQItem: {
+                    linkId: 'medications-group-required',
+                    type: 'group',
+                    repeats: true,
+                    required: true,
+                    item: [{ linkId: 'medication-name-2', type: 'string' }],
+                },
+                expectedQRItems: [
+                    {
+                        linkId: 'medications-group-required',
+                        item: [{ linkId: 'medication-name-2', answer: [{ valueString: 'Paracetamol' }] }],
+                    },
+                ],
+            },
+
             {
                 name: 'repeating group → indexed instance → child question',
                 path: ['medications-group', 'items', '1', 'medication-name'],
@@ -1959,13 +1991,13 @@ describe('getBranchItems', () => {
                 name: 'non-repeating group → leaf question',
                 path: ['demographics-group', 'items', 'full-name'],
                 expectedQItem: { linkId: 'full-name', type: 'string' },
-                expectedQRItems: [],
+                expectedQRItems: [{ linkId: 'full-name' }],
             },
             {
                 name: 'non-repeating group → nested group → leaf question',
                 path: ['demographics-group', 'items', 'address-group', 'items', 'city'],
                 expectedQItem: { linkId: 'city', type: 'string' },
-                expectedQRItems: [],
+                expectedQRItems: [{ linkId: 'city' }],
             },
 
             {
@@ -1982,11 +2014,27 @@ describe('getBranchItems', () => {
                 },
                 expectedQRItems: [],
             },
+            {
+                name: 'repeating required group (leaf = group instance)',
+                path: ['medications-group-required'],
+                expectedQItem: {
+                    linkId: 'medications-group-required',
+                    type: 'group',
+                    repeats: true,
+                    required: true,
+                    item: [{ linkId: 'medication-name-2', type: 'string' }],
+                },
+                expectedQRItems: [
+                    {
+                        linkId: 'medications-group-required',
+                    },
+                ],
+            },
             {
                 name: 'repeating group → indexed instance → child question',
                 path: ['medications-group', 'items', '0', 'medication-name'],
                 expectedQItem: { linkId: 'medication-name', type: 'string' },
-                expectedQRItems: [],
+                expectedQRItems: [{ linkId: 'medication-name' }],
             },
             {
                 name: 'stand-alone repeating question',
@@ -1996,7 +2044,7 @@ describe('getBranchItems', () => {
                     type: 'string',
                     repeats: true,
                 },
-                expectedQRItems: [],
+                expectedQRItems: [{ linkId: 'known-allergies' }],
             },
         ];
 
@@ -2065,16 +2113,6 @@ describe('calcContext', () => {
     ];
     const qItem = questionnaire.item![0]!;
     const qrItem = questionnaireResponse.item![0]!;
-    test('without specified qr item', () => {
-        expect(calcContext(initialContext, variables, qItem, undefined)).toStrictEqual({
-            resource: questionnaireResponse,
-            questionnaire,
-            context: { linkId: qItem.linkId },
-            qitem: qItem,
-            Name: ['Alice'],
-            City: [],
-        });
-    });
 
     test('with specified qr item', () => {
         expect(calcContext(initialContext, variables, qItem, qrItem)).toStrictEqual({