@aehrc/smart-forms-renderer 0.36.0 → 0.37.2

package/src/stories/assets/questionnaires/QPrePopTester.ts

@@ -183,108 +183,246 @@ export const qSelectivePrePopTester: Questionnaire = {
           valueString: 'The patient that is to be used to pre-populate the form'
         }
       ]
+    },
+    {
+      url: 'http://hl7.org/fhir/StructureDefinition/variable',
+      valueExpression: {
+        name: 'ObsTobaccoSmokingStatus',
+        language: 'application/x-fhir-query',
+        expression: 'Observation?code=72166-2&_count=1&_sort=-date&patient={{%patient.id}}'
+      }
     }
   ],
   item: [
     {
-      linkId: 'display-description',
+      linkId: 'container',
       extension: [
         {
-          url: 'http://hl7.org/fhir/StructureDefinition/rendering-xhtml',
-          valueString:
-            '<div xmlns="http://www.w3.org/1999/xhtml">\r\n    <div style="font-size:0.875em"> This questionnaire is used by Playwright to do regression testing of the <pre style="display: inline">@aehrc/sdc-populate</pre> library\'s pre-population logic. Items will be incrementally added as needed.</div><br/></div>'
-        }
-      ],
-      text: "This questionnaire is used by Playwright to do regression testing of the @aehrc/sdc-populate library's pre-population logic. Items will be incrementally added as needed.",
-      type: 'display',
-      repeats: false
-    },
-    {
-      extension: [
-        {
-          url: 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression',
+          url: 'http://hl7.org/fhir/StructureDefinition/variable',
           valueExpression: {
+            name: 'sex',
             language: 'text/fhirpath',
-            expression: '%patient.gender'
+            expression: "item.where(linkId='sex-at-birth-initial-expression').answer.value"
           }
-        }
-      ],
-      linkId: 'gender-avs-url',
-      text: 'Administrative gender (answerValueSet url)',
-      type: 'choice',
-      repeats: false,
-      answerValueSet: 'http://hl7.org/fhir/ValueSet/administrative-gender'
-    },
-    {
-      extension: [
+        },
         {
-          url: 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression',
+          url: 'http://hl7.org/fhir/StructureDefinition/variable',
           valueExpression: {
+            name: 'smoker',
             language: 'text/fhirpath',
-            expression: '%patient.gender'
+            expression: "item.where(linkId='smoking-status-initial-expression').answer.value"
           }
         }
       ],
-      linkId: 'gender-avs-contained',
-      text: 'Administrative gender (answerValueSet contained)',
-      type: 'choice',
-      repeats: false,
-      answerValueSet: 'http://hl7.org/fhir/ValueSet/administrative-gender'
-    },
-    {
-      extension: [
+      text: '',
+      type: 'group',
+      item: [
         {
-          url: 'http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl',
-          valueCodeableConcept: {
-            coding: [
-              {
-                system: 'http://hl7.org/fhir/questionnaire-item-control',
-                code: 'gtable'
+          linkId: 'display-description',
+          extension: [
+            {
+              url: 'http://hl7.org/fhir/StructureDefinition/rendering-xhtml',
+              valueString:
+                '<div xmlns="http://www.w3.org/1999/xhtml">\r\n    <div style="font-size:0.875em"> This questionnaire is used by Playwright to do regression testing of the <pre style="display: inline">@aehrc/sdc-populate</pre> library\'s pre-population logic. Items will be incrementally added as needed.</div><br/></div>'
+            }
+          ],
+          text: "This questionnaire is used by Playwright to do regression testing of the @aehrc/sdc-populate library's pre-population logic. Items will be incrementally added as needed.",
+          type: 'display',
+          repeats: false
+        },
+        {
+          extension: [
+            {
+              url: 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression',
+              valueExpression: {
+                language: 'text/fhirpath',
+                expression: '%patient.gender'
               }
-            ]
-          }
+            }
+          ],
+          linkId: 'gender-avs-url',
+          text: 'Administrative gender (answerValueSet url)',
+          type: 'choice',
+          repeats: false,
+          answerValueSet: 'http://hl7.org/fhir/ValueSet/administrative-gender'
         },
         {
-          url: 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-itemPopulationContext',
-          valueExpression: {
-            name: 'ConditionRepeat',
-            language: 'text/fhirpath',
-            expression:
-              "%Condition.entry.resource.where(category.coding.exists(code='problem-list-item'))"
-          }
-        }
-      ],
-      linkId: 'medical-history',
-      text: 'Medical history and current problems list',
-      type: 'group',
-      repeats: true,
-      item: [
+          extension: [
+            {
+              url: 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression',
+              valueExpression: {
+                language: 'text/fhirpath',
+                expression: '%patient.gender'
+              }
+            }
+          ],
+          linkId: 'gender-avs-contained',
+          text: 'Administrative gender (answerValueSet contained)',
+          type: 'choice',
+          repeats: false,
+          answerValueSet: 'http://hl7.org/fhir/ValueSet/administrative-gender'
+        },
         {
           extension: [
+            {
+              url: 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression',
+              valueExpression: {
+                language: 'text/fhirpath',
+                expression:
+                  "%patient.extension.where(exists(url='http://hl7.org/fhir/StructureDefinition/individual-recordedSexOrGender' and extension.where(exists(url='type' and value.coding.code='1515311000168102')) and extension.where(url='effectivePeriod').value.end.empty())).extension.where(url='value').value.coding"
+              }
+            },
             {
               url: 'http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl',
               valueCodeableConcept: {
                 coding: [
                   {
                     system: 'http://hl7.org/fhir/questionnaire-item-control',
-                    code: 'autocomplete'
+                    code: 'drop-down'
                   }
                 ]
               }
-            },
+            }
+          ],
+          linkId: 'sex-at-birth-initial-expression',
+          text: 'Sex assigned at birth (initialExpression)',
+          type: 'choice',
+          repeats: false,
+          answerValueSet: 'https://healthterminologies.gov.au/fhir/ValueSet/biological-sex-1'
+        },
+        {
+          extension: [
+            {
+              url: 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-calculatedExpression',
+              valueExpression: {
+                description: 'Calculated Sex At Birth',
+                language: 'text/fhirpath',
+                expression: '%sex'
+              }
+            }
+          ],
+          linkId: 'sex-at-birth-calculated',
+          text: 'Sex assigned at birth (calculatedExpression)',
+          type: 'choice',
+          repeats: false,
+          readOnly: true,
+          answerValueSet: 'https://healthterminologies.gov.au/fhir/ValueSet/biological-sex-1'
+        },
+        {
+          extension: [
             {
               url: 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression',
               valueExpression: {
                 language: 'text/fhirpath',
                 expression:
-                  "%ConditionRepeat.code.select((coding.where(system='http://snomed.info/sct') | coding.where(system!='http://snomed.info/sct').first() | text ).first())"
+                  "%ObsTobaccoSmokingStatus.entry.resource.value.coding.where(system='http://snomed.info/sct')"
+              }
+            },
+            {
+              url: 'http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl',
+              valueCodeableConcept: {
+                coding: [
+                  {
+                    system: 'http://hl7.org/fhir/questionnaire-item-control',
+                    code: 'radio-button'
+                  }
+                ]
               }
             }
           ],
-          linkId: 'medical-history-condition',
-          text: 'Condition',
-          type: 'open-choice',
-          answerValueSet: '#MedicalHistory'
+          linkId: 'smoking-status-initial-expression',
+          text: 'Smoking status (initialExpression)',
+          type: 'choice',
+          repeats: false,
+          answerOption: [
+            {
+              valueCoding: {
+                system: 'http://snomed.info/sct',
+                code: '266919005',
+                display: 'Never smoked'
+              }
+            },
+            {
+              valueCoding: {
+                system: 'http://snomed.info/sct',
+                code: '77176002',
+                display: 'Smoker'
+              }
+            },
+            {
+              valueCoding: {
+                system: 'http://snomed.info/sct',
+                code: '8517006',
+                display: 'Ex-smoker'
+              }
+            },
+            {
+              valueCoding: {
+                system: 'http://snomed.info/sct',
+                code: '16090371000119103',
+                display: 'Exposure to second hand tobacco smoke'
+              }
+            },
+            {
+              valueString: 'Wants to quit'
+            },
+            {
+              valueString: 'Other tobacco use'
+            }
+          ]
+        },
+        {
+          extension: [
+            {
+              url: 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-calculatedExpression',
+              valueExpression: {
+                description: 'Calculated Smoking Status',
+                language: 'text/fhirpath',
+                expression: '%smoker'
+              }
+            }
+          ],
+          linkId: 'smoking-status-calculated',
+          text: 'Smoking status (calculatedExpression)',
+          type: 'choice',
+          repeats: false,
+          readOnly: true,
+          answerOption: [
+            {
+              valueCoding: {
+                system: 'http://snomed.info/sct',
+                code: '266919005',
+                display: 'Never smoked'
+              }
+            },
+            {
+              valueCoding: {
+                system: 'http://snomed.info/sct',
+                code: '77176002',
+                display: 'Smoker'
+              }
+            },
+            {
+              valueCoding: {
+                system: 'http://snomed.info/sct',
+                code: '8517006',
+                display: 'Ex-smoker'
+              }
+            },
+            {
+              valueCoding: {
+                system: 'http://snomed.info/sct',
+                code: '16090371000119103',
+                display: 'Exposure to second hand tobacco smoke'
+              }
+            },
+            {
+              valueString: 'Wants to quit'
+            },
+            {
+              valueString: 'Other tobacco use'
+            }
+          ]
         },
         {
           extension: [
@@ -294,23 +432,80 @@ export const qSelectivePrePopTester: Questionnaire = {
                 coding: [
                   {
                     system: 'http://hl7.org/fhir/questionnaire-item-control',
-                    code: 'drop-down'
+                    code: 'gtable'
                   }
                 ]
               }
             },
             {
-              url: 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression',
+              url: 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-itemPopulationContext',
               valueExpression: {
+                name: 'ConditionRepeat',
                 language: 'text/fhirpath',
-                expression: '%ConditionRepeat.clinicalStatus.coding'
+                expression:
+                  "%Condition.entry.resource.where(category.coding.exists(code='problem-list-item'))"
               }
             }
           ],
-          linkId: 'medical-history-status',
-          text: 'Clinical Status',
-          type: 'choice',
-          answerValueSet: 'http://hl7.org/fhir/ValueSet/condition-clinical'
+          linkId: 'medical-history',
+          text: 'Medical history and current problems list',
+          type: 'group',
+          repeats: true,
+          item: [
+            {
+              extension: [
+                {
+                  url: 'http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl',
+                  valueCodeableConcept: {
+                    coding: [
+                      {
+                        system: 'http://hl7.org/fhir/questionnaire-item-control',
+                        code: 'autocomplete'
+                      }
+                    ]
+                  }
+                },
+                {
+                  url: 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression',
+                  valueExpression: {
+                    language: 'text/fhirpath',
+                    expression:
+                      "%ConditionRepeat.code.select((coding.where(system='http://snomed.info/sct') | coding.where(system!='http://snomed.info/sct').first() | text ).first())"
+                  }
+                }
+              ],
+              linkId: 'medical-history-condition',
+              text: 'Condition',
+              type: 'open-choice',
+              answerValueSet: '#MedicalHistory'
+            },
+            {
+              extension: [
+                {
+                  url: 'http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl',
+                  valueCodeableConcept: {
+                    coding: [
+                      {
+                        system: 'http://hl7.org/fhir/questionnaire-item-control',
+                        code: 'drop-down'
+                      }
+                    ]
+                  }
+                },
+                {
+                  url: 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression',
+                  valueExpression: {
+                    language: 'text/fhirpath',
+                    expression: '%ConditionRepeat.clinicalStatus.coding'
+                  }
+                }
+              ],
+              linkId: 'medical-history-status',
+              text: 'Clinical Status',
+              type: 'choice',
+              answerValueSet: 'http://hl7.org/fhir/ValueSet/condition-clinical'
+            }
+          ]
         }
       ]
     }

package/src/stories/sdc/ItemControlGroup.stories.tsx

@@ -21,7 +21,10 @@ import {
   qItemControlDisplayTabContainer,
   qItemControlGroupGridMultiRow,
   qItemControlGroupGridSingleRow,
-  qItemControlGroupGTable
+  qItemControlGroupGTable,
+  qItemControlGroupPage,
+  qItemControlGroupPageContainer,
+  qItemControlGroupPageNonTopLevelPageContainer
 } from '../assets/questionnaires';
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
@@ -60,3 +63,21 @@ export const TabContainer: Story = {
     questionnaire: qItemControlDisplayTabContainer
   }
 };
+
+export const Page: Story = {
+  args: {
+    questionnaire: qItemControlGroupPage
+  }
+};
+
+export const PageContainer: Story = {
+  args: {
+    questionnaire: qItemControlGroupPageContainer
+  }
+};
+
+export const PageContainerNonSingleTopLevel: Story = {
+  args: {
+    questionnaire: qItemControlGroupPageNonTopLevelPageContainer
+  }
+};

package/src/stories/testing/AuCoreTester.stories.tsx

@@ -0,0 +1,196 @@
+/*
+ * 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 { Meta, StoryObj } from '@storybook/react';
+import PrePopWrapperForStorybook from '../storybookWrappers/PrePopWrapperForStorybook';
+import { mockFhirClient } from '../assets/fhirClient/mockFhirClient';
+import { patSmartForm } from '../assets/patients/PatSmartForm';
+import { pracPrimaryPeter } from '../assets/practitioners/PracPrimaryPeter';
+import {
+  QAuCoreAllergyIntolerance,
+  QAuCoreCondition,
+  QAuCoreEncounter,
+  QAuCoreImmunization,
+  QAuCoreMedicationRequest,
+  QAuCoreObservationBodyHeight,
+  QAuCoreObservationBodyWeight,
+  QAuCoreObservationBP,
+  QAuCoreObservationHeartRate,
+  QAuCoreObservationRespirationRate,
+  QAuCoreObservationSmokingStatus,
+  QAuCoreObservationWaistCircumference,
+  QAuCorePatient,
+  QAuCorePractitioner,
+  QAuCorePractitionerRole,
+  QAuCoreProcedure
+} from '../assets/questionnaires/QAuCoreTesting';
+
+// More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
+const meta = {
+  title: 'Component/Testing/AU Core Tester',
+  component: PrePopWrapperForStorybook,
+  // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
+  tags: []
+} satisfies Meta<typeof PrePopWrapperForStorybook>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+// More on writing stories with args: https://storybook.js.org/docs/react/writing-stories/args
+
+export const AuCoreAllergyIntolerance: Story = {
+  args: {
+    questionnaire: QAuCoreAllergyIntolerance,
+    fhirClient: mockFhirClient,
+    patient: patSmartForm,
+    user: pracPrimaryPeter
+  }
+};
+
+export const AuCoreCondition: Story = {
+  args: {
+    questionnaire: QAuCoreCondition,
+    fhirClient: mockFhirClient,
+    patient: patSmartForm,
+    user: pracPrimaryPeter
+  }
+};
+
+export const AuCoreEncounter: Story = {
+  args: {
+    questionnaire: QAuCoreEncounter,
+    fhirClient: mockFhirClient,
+    patient: patSmartForm,
+    user: pracPrimaryPeter
+  }
+};
+
+export const AuCoreImmunization: Story = {
+  args: {
+    questionnaire: QAuCoreImmunization,
+    fhirClient: mockFhirClient,
+    patient: patSmartForm,
+    user: pracPrimaryPeter
+  }
+};
+
+export const AuCoreMedicationRequest: Story = {
+  args: {
+    questionnaire: QAuCoreMedicationRequest,
+    fhirClient: mockFhirClient,
+    patient: patSmartForm,
+    user: pracPrimaryPeter
+  }
+};
+
+export const AuCorePatient: Story = {
+  args: {
+    questionnaire: QAuCorePatient,
+    fhirClient: mockFhirClient,
+    patient: patSmartForm,
+    user: pracPrimaryPeter
+  }
+};
+
+export const AuCorePractitioner: Story = {
+  args: {
+    questionnaire: QAuCorePractitioner,
+    fhirClient: mockFhirClient,
+    patient: patSmartForm,
+    user: pracPrimaryPeter
+  }
+};
+
+export const AuCorePractitionerRole: Story = {
+  args: {
+    questionnaire: QAuCorePractitionerRole,
+    fhirClient: mockFhirClient,
+    patient: patSmartForm,
+    user: pracPrimaryPeter
+  }
+};
+
+export const AuCoreProcedure: Story = {
+  args: {
+    questionnaire: QAuCoreProcedure,
+    fhirClient: mockFhirClient,
+    patient: patSmartForm,
+    user: pracPrimaryPeter
+  }
+};
+
+export const AuCoreObservationBP: Story = {
+  args: {
+    questionnaire: QAuCoreObservationBP,
+    fhirClient: mockFhirClient,
+    patient: patSmartForm,
+    user: pracPrimaryPeter
+  }
+};
+
+export const AuCoreObservationBodyHeight: Story = {
+  args: {
+    questionnaire: QAuCoreObservationBodyHeight,
+    fhirClient: mockFhirClient,
+    patient: patSmartForm,
+    user: pracPrimaryPeter
+  }
+};
+
+export const AuCoreObservationBodyWeight: Story = {
+  args: {
+    questionnaire: QAuCoreObservationBodyWeight,
+    fhirClient: mockFhirClient,
+    patient: patSmartForm,
+    user: pracPrimaryPeter
+  }
+};
+
+export const AuCoreObservationHeartRate: Story = {
+  args: {
+    questionnaire: QAuCoreObservationHeartRate,
+    fhirClient: mockFhirClient,
+    patient: patSmartForm,
+    user: pracPrimaryPeter
+  }
+};
+export const AuCoreObservationRespirationRate: Story = {
+  args: {
+    questionnaire: QAuCoreObservationRespirationRate,
+    fhirClient: mockFhirClient,
+    patient: patSmartForm,
+    user: pracPrimaryPeter
+  }
+};
+
+export const AuCoreObservationSmokingStatus: Story = {
+  args: {
+    questionnaire: QAuCoreObservationSmokingStatus,
+    fhirClient: mockFhirClient,
+    patient: patSmartForm,
+    user: pracPrimaryPeter
+  }
+};
+
+export const AuCoreObservationWaistCircumference: Story = {
+  args: {
+    questionnaire: QAuCoreObservationWaistCircumference,
+    fhirClient: mockFhirClient,
+    patient: patSmartForm,
+    user: pracPrimaryPeter
+  }
+};

package/src/utils/calculatedExpression.ts

@@ -224,7 +224,7 @@ function initialiseItemCalculatedExpressionValueRecursive(
         updateQrItemsInGroup(
           updatedChildQRItem,
           null,
-          updatedChildQRItem ?? { linkId: qItem.linkId, text: qItem.text, item: [] },
+          qrItem ?? { linkId: qItem.linkId, text: qItem.text, item: [] },
           indexMap
         );
       }

package/src/utils/fhirpath.ts

@@ -101,11 +101,6 @@ export function createFhirPathContext(
     rootResource: questionnaireResponse
   };
 
-  // Exit early if there are no QR items
-  if (!questionnaireResponse.item) {
-    return fhirPathContext;
-  }
-
   // Evaluate resource-level variables
   fhirPathContext = evaluateQuestionnaireLevelVariables(
     questionnaireResponse,