Merge remote-tracking branch 'origin/main' into age-group-test

Author: roman-podrubny

apps/smart-forms-app/src/data/resources/Questionnaire/Questionnaire-AboriginalTorresStraitIslanderHealthCheckAssembled-0.4.0.json

@@ -3572,7 +3572,7 @@
           "valueExpression": {
             "name": "HealthPrioritiesSummaryAllergiesAdverseReactions",
             "language": "text/fhirpath",
-            "expression": "item.where(linkId='d4e4db07-a795-4a30-bd0f-9c109f96a22b').item.where(linkId='3e689aeb-69a1-4a9b-93bd-50377511dd9b').answer.value"
+            "expression": "item.where(linkId='allergy').item.where(linkId='3e689aeb-69a1-4a9b-93bd-50377511dd9b').answer.value"
           }
         },
         {

apps/smart-forms-app/src/test/aboriginalFormCalculation.test.tsx

@@ -304,7 +304,7 @@ describe('Health Priorities, Actions And Follow-Up Summary', () => {
     );
   });
 
-  test.skip('Allergies/adverse reactions is displayed on the Health Priorities Summary tab.', async () => {
+  test('Allergies/adverse reactions is displayed on the Health Priorities Summary tab.', async () => {
     const { container } = render(<AboriginalForm />);
     await waitFor(() => expect(container.innerHTML).toContain('Patient Details'));
     await inputInteger(container, 'Age', 33);