tests and fix for removing help items from questionnaire response

ruberino · ruberino · commit 4a4ce78be59b · 2025-02-13T09:52:36.000+01:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,21 @@
+## 16.4.1
+
+- Exclude items with the "help item-control extension from the questionnaire response
+
+```json
+{
+  "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
+  "valueCodeableConcept": {
+    "coding": [
+      {
+        "system": "http://hl7.org/fhir/ValueSet/questionnaire-item-control",
+        "code": "help"
+      }
+    ]
+  }
+}
+```
+
 ## 16.4.0
 
 ---
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@helsenorge/refero",
-  "version": "16.4.0",
+  "version": "16.4.1",
   "description": "Refero is a library that uses a fhir r4 schema and creates a interactive form using helsenorge packages.",
   "keywords": [
     "react",
diff --git a/src/actions/generateQuestionnaireResponse.ts b/src/actions/generateQuestionnaireResponse.ts
@@ -7,6 +7,11 @@ import { createQuestionnaireResponseAnswer } from '../util/createQuestionnaireRe
 import { getCalculatedExpressionExtension, getCopyExtension, getMinOccursExtensionValue } from '../util/extension';
 import { evaluateFhirpathExpressionToGetString } from '@/util/fhirpathHelper';
 import ItemType from '../constants/itemType';
+import { isHelpItem } from '@/util/help';
+
+const shouldNotAddItemToResponse = (item: QuestionnaireItem): boolean => {
+  return isHelpItem(item);
+};
 
 export function generateQuestionnaireResponse(questionnaire: Questionnaire): QuestionnaireResponse | undefined {
   const response: QuestionnaireResponse = {
@@ -27,6 +32,9 @@ export function generateQuestionnaireResponse(questionnaire: Questionnaire): Que
     }
 
     for (let j = 0; j < getMinOccurs(i); j++) {
+      if (shouldNotAddItemToResponse(i)) {
+        continue;
+      }
       const responseItem = createQuestionnaireResponseItem(i);
       addChildrenItemsToResponseItem(i, responseItem);
 
@@ -45,6 +53,9 @@ function addChildrenItemsToResponseItem(item: QuestionnaireItem, response: Quest
     for (let j = 0; j < getMinOccurs(i); j++) {
       const responseItem = createQuestionnaireResponseItem(i);
       addChildrenItemsToResponseItem(i, responseItem);
+      if (shouldNotAddItemToResponse(i)) {
+        continue;
+      }
       addResponseItemtoResponse(item, response, responseItem);
     }
   });
diff --git a/src/components/formcomponents/choice-common/__tests__/autosuggest-view-spec.tsx b/src/components/formcomponents/choice-common/__tests__/autosuggest-view-spec.tsx
@@ -152,6 +152,9 @@ describe('autosuggest-view', () => {
       await userEvent.click(await screen.findByText(/Fyrstekake/i));
       await clickButtonTimes(/-repeat-button/i, 1);
 
+      await userEvent.type(screen.getAllByLabelText(/Mistenkt legemiddel/i)[1], 'f');
+      await userEvent.click(await screen.findByText(/Fyrstekake/i));
+
       expect(screen.getByTestId(/-delete-button/i)).toBeInTheDocument();
       await clickButtonTimes(/-delete-button/i, 1);
 
@@ -173,6 +176,9 @@ describe('autosuggest-view', () => {
       await userEvent.click(await screen.findByText(/Fyrstekake/i));
       await clickButtonTimes(/-repeat-button/i, 1);
 
+      await userEvent.type(screen.getAllByLabelText(/Mistenkt legemiddel/i)[1], 'f');
+      await userEvent.click(await screen.findByText(/Fyrstekake/i));
+
       expect(screen.getByTestId(/-delete-button/i)).toBeInTheDocument();
 
       await clickButtonTimes(/-delete-button/i, 1);
diff --git a/src/components/formcomponents/choice/__tests__/choice-checkbox-view-spec.tsx b/src/components/formcomponents/choice/__tests__/choice-checkbox-view-spec.tsx
@@ -1,5 +1,5 @@
 import { Questionnaire } from 'fhir/r4';
-import { findByRole, renderRefero, userEvent } from '@test/test-utils.tsx';
+import { findByRole, renderRefero, screen, userEvent } from '@test/test-utils.tsx';
 import { checkboxView as q } from './__data__/index';
 import { ReferoProps } from '../../../../types/referoProps';
 import { Extensions } from '../../../../constants/extensions';
@@ -123,6 +123,9 @@ describe('checkbox-view - choice', () => {
 
       await repeatCheckboxTimes(/Ja/i, 1);
 
+      const elm2 = screen.getAllByLabelText(/Ja/i);
+      await userEvent.click(elm2[1]);
+
       expect(getByTestId(/-delete-button/i)).toBeInTheDocument();
       await clickButtonTimes(/-delete-button/i, 1);
 
@@ -136,6 +139,10 @@ describe('checkbox-view - choice', () => {
       const { getByTestId, queryByTestId } = createWrapper(questionnaire);
 
       await repeatCheckboxTimes(/Ja/i, 1);
+
+      const elm2 = screen.getAllByLabelText(/Ja/i);
+      await userEvent.click(elm2[1]);
+
       expect(getByTestId(/-delete-button/i)).toBeInTheDocument();
 
       await clickButtonTimes(/-delete-button/i, 1);
diff --git a/src/components/formcomponents/choice/__tests__/choice-radio-view-spec.tsx b/src/components/formcomponents/choice/__tests__/choice-radio-view-spec.tsx
@@ -1,5 +1,5 @@
 import { Questionnaire } from 'fhir/r4';
-import { findByRole, renderRefero, userEvent, waitFor } from '@test/test-utils.tsx';
+import { findByRole, renderRefero, screen, userEvent, waitFor } from '@test/test-utils.tsx';
 import { radioView as q } from './__data__/index';
 import { ReferoProps } from '../../../../types/referoProps';
 import { Extensions } from '../../../../constants/extensions';
@@ -122,6 +122,9 @@ describe('Radio-view - choice', () => {
 
       await repeatCheckboxTimes(/Ja/i, 1);
 
+      const elm2 = screen.getAllByLabelText(/Ja/i);
+      await userEvent.click(elm2[1]);
+
       expect(getByTestId(/-delete-button/i)).toBeInTheDocument();
       await clickButtonTimes(/-delete-button/i, 1);
 
@@ -135,6 +138,10 @@ describe('Radio-view - choice', () => {
       const { getByTestId, queryByTestId } = await createWrapper(questionnaire);
 
       await repeatCheckboxTimes(/Ja/i, 1);
+
+      const elm2 = screen.getAllByLabelText(/Ja/i);
+      await userEvent.click(elm2[1]);
+
       expect(getByTestId(/-delete-button/i)).toBeInTheDocument();
 
       await clickButtonTimes(/-delete-button/i, 1);
diff --git a/src/components/formcomponents/date/__tests__/date-time-spec.tsx b/src/components/formcomponents/date/__tests__/date-time-spec.tsx
@@ -172,6 +172,21 @@ describe('Date time', () => {
 
       await repeatDateTimeNTimes(/Dato/i, 'hours-test', 'minutes-test', '12.12.2024', '12', '30', 1);
 
+      const dateElement2 = screen.queryAllByLabelText(/Dato/i)[1];
+      const hoursElement2 = screen.queryAllByTestId('hours-test')[1];
+      const minutesElement2 = screen.queryAllByTestId('minutes-test')[1];
+      if (dateElement2 && hoursElement2 && minutesElement2) {
+        const hoursInput2 = hoursElement2.querySelector('input');
+        const minutesInput2 = minutesElement2.querySelector('input');
+
+        await userEvent.type(dateElement2, '12.12.2024');
+
+        if (hoursInput2 && minutesInput2) {
+          await userEvent.type(hoursInput2, '12');
+          await userEvent.type(minutesInput2, '30');
+        }
+      }
+
       await waitFor(async () => expect(getByTestId(/-delete-button/i)).toBeInTheDocument());
 
       await clickButtonTimes(/-delete-button/i, 1);
@@ -187,6 +202,20 @@ describe('Date time', () => {
 
       await repeatDateTimeNTimes(/Dato/i, 'hours-test', 'minutes-test', '12.12.2024', '12', '30', 1);
 
+      const dateElement2 = screen.queryAllByLabelText(/Dato/i)[1];
+      const hoursElement2 = screen.queryAllByTestId('hours-test')[1];
+      const minutesElement2 = screen.queryAllByTestId('minutes-test')[1];
+      if (dateElement2 && hoursElement2 && minutesElement2) {
+        const hoursInput2 = hoursElement2.querySelector('input');
+        const minutesInput2 = minutesElement2.querySelector('input');
+
+        await userEvent.type(dateElement2, '12.12.2024');
+
+        if (hoursInput2 && minutesInput2) {
+          await userEvent.type(hoursInput2, '12');
+          await userEvent.type(minutesInput2, '30');
+        }
+      }
       await waitFor(async () => expect(getByTestId(/-delete-button/i)).toBeInTheDocument());
 
       await clickButtonTimes(/-delete-button/i, 1);
diff --git a/src/components/formcomponents/open-choice/__tests__/openchoice-checkbox-view-spec.tsx b/src/components/formcomponents/open-choice/__tests__/openchoice-checkbox-view-spec.tsx
@@ -1,5 +1,5 @@
 import { Questionnaire, QuestionnaireItemAnswerOption } from 'fhir/r4';
-import { findByRole, renderRefero, userEvent, waitFor } from '@test/test-utils.tsx';
+import { findByRole, renderRefero, screen, userEvent, waitFor } from '@test/test-utils.tsx';
 import { clickButtonTimes, repeatCheckboxTimes, selectCheckboxOption, submitForm } from '../../../../../test/selectors';
 import { checkboxView as q } from './__data__/index';
 import { ReferoProps } from '../../../../types/referoProps';
@@ -93,6 +93,10 @@ describe('checkbox-view - openchoice', () => {
       const { getByTestId } = await createWrapper(questionnaire);
 
       await repeatCheckboxTimes(/Ja/i, 1);
+
+      const elm2 = screen.getAllByLabelText(/Ja/i);
+      await userEvent.click(elm2[1]);
+
       await clickButtonTimes(/-delete-button/i, 1);
 
       expect(getByTestId(/-delete-confirm-modal/i)).toBeInTheDocument();
@@ -102,6 +106,10 @@ describe('checkbox-view - openchoice', () => {
       const { getByTestId, queryByTestId } = await createWrapper(questionnaire);
 
       await repeatCheckboxTimes(/Ja/i, 1);
+
+      const elm2 = screen.getAllByLabelText(/Ja/i);
+      await userEvent.click(elm2[1]);
+
       await clickButtonTimes(/-delete-button/i, 1);
       await userEvent.click(await findByRole(getByTestId(/-delete-confirm-modal/i), 'button', { name: /Forkast endringer/i }));
       expect(queryByTestId(/-delete-button/i)).not.toBeInTheDocument();
diff --git a/src/components/formcomponents/open-choice/__tests__/openchoice-radio-view-spec.tsx b/src/components/formcomponents/open-choice/__tests__/openchoice-radio-view-spec.tsx
@@ -1,5 +1,5 @@
 import { Questionnaire, QuestionnaireItemAnswerOption } from 'fhir/r4';
-import { findByRole, renderRefero, userEvent, waitFor } from '@test/test-utils.tsx';
+import { findByRole, renderRefero, screen, userEvent, waitFor } from '@test/test-utils.tsx';
 import { radioView as q } from './__data__/index';
 import { ReferoProps } from '../../../../types/referoProps';
 import { Extensions } from '../../../../constants/extensions';
@@ -110,6 +110,9 @@ describe('Radio-view - choice', () => {
 
       await repeatCheckboxTimes(/Ja/i, 1);
 
+      const elm2 = screen.getAllByLabelText(/Ja/i);
+      await userEvent.click(elm2[1]);
+
       expect(getByTestId(/-delete-button/i)).toBeInTheDocument();
       await clickButtonTimes(/-delete-button/i, 1);
 
@@ -121,6 +124,9 @@ describe('Radio-view - choice', () => {
 
       await repeatCheckboxTimes(/Ja/i, 1);
 
+      const elm2 = screen.getAllByLabelText(/Ja/i);
+      await userEvent.click(elm2[1]);
+
       expect(getByTestId(/-delete-button/i)).toBeInTheDocument();
       await clickButtonTimes(/-delete-button/i, 1);
 
diff --git a/src/components/formcomponents/string/__tests__/__data__/q.json b/src/components/formcomponents/string/__tests__/__data__/q.json
@@ -71,14 +71,6 @@
           "url": "http://helsenorge.no/fhir/StructureDefinition/sdf-sublabel",
           "valueMarkdown": "**String sublabel**"
         },
-        {
-          "url": "http://hl7.org/fhir/StructureDefinition/regex",
-          "valueString": "^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$"
-        },
-        {
-          "url": "http://hl7.org/fhir/StructureDefinition/minLength",
-          "valueInteger": 10
-        },
         {
           "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-minOccurs",
           "valueInteger": 1
diff --git a/test/selectors.tsx b/test/selectors.tsx
@@ -1,4 +1,3 @@
-import exp from 'constants';
 import { Matcher, screen, userEvent } from './test-utils';
 
 export async function selectCheckboxOption(id: Matcher): Promise<void> {
@@ -14,6 +13,7 @@ export async function repeatNTimes(input: string, n: number, labelText: Matcher)
   for (let i = 0; i < n; i++) {
     await userEvent.type(screen.queryAllByLabelText(labelText)[i], input);
     await clickButtonTimes(/-repeat-button/i, 1);
+    await userEvent.type(screen.queryAllByLabelText(labelText)[i + 1], input);
   }
 }
 export async function repeatDateTimeNTimes(
@@ -34,6 +34,7 @@ export async function repeatDateTimeNTimes(
     const minutesInput = minutesElement.querySelector('input');
 
     await userEvent.type(dateElement, dateString);
+
     if (hoursInput && minutesInput) {
       await userEvent.type(hoursInput, hoursString);
       await userEvent.type(minutesInput, minutesString);
@@ -76,9 +77,9 @@ export async function clickByLabelText(id: Matcher): Promise<void> {
   expect(elm).toBeInTheDocument();
   await userEvent.click(elm);
 }
-export async function repeatCheckboxTimes(id: Matcher, n: number): Promise<void> {
+export async function repeatCheckboxTimes(matcher: Matcher, n: number): Promise<void> {
   for (let i = 0; i < n; i++) {
-    const elm = screen.getAllByLabelText(id);
+    const elm = screen.getAllByLabelText(matcher);
     await userEvent.click(elm[i]);
     await clickButtonTimes(/-repeat-button/i, 1);
   }
@@ -89,6 +90,9 @@ export async function repeatSliderTimes(linkId: string, n: number): Promise<void
     const itemToClick = elm.querySelectorAll('div.slider__track__step')[0];
     await userEvent.click(itemToClick);
     await clickButtonTimes(/-repeat-button/i, 1);
+    const elm2 = await screen.findByTestId(`item_${linkId}^${i + 1}-${i + 1}-slider-choice`);
+    const itemToClick2 = elm2.querySelectorAll('div.slider__track__step')[0];
+    await userEvent.click(itemToClick2);
   }
 }
 export async function clickSliderValue(linkId: Matcher, index: number, sliderItemIndex: undefined | number = 0): Promise<void> {
@@ -104,6 +108,7 @@ export async function repeatDropDownTimes(
   for (let i = 0; i < n; i++) {
     await userEvent.selectOptions(screen.getAllByLabelText(id)[i], screen.getAllByRole('option', { name: optionName })[i]);
     await clickButtonTimes(/-repeat-button/i, 1);
+    await userEvent.selectOptions(screen.getAllByLabelText(id)[i + 1], screen.getAllByRole('option', { name: optionName })[i + 1]);
   }
 }
 export async function typeAndTabByLabelText(id: Matcher, value: string): Promise<void> {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@helsenorge/refero",`
`3`		`- "version": "16.4.0",`
	`3`	`+ "version": "16.4.1",`
`4`	`4`	`"description": "Refero is a library that uses a fhir r4 schema and creates a interactive form using helsenorge packages.",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"react",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import exp from 'constants';`
`2`	`1`	`import { Matcher, screen, userEvent } from './test-utils';`
`3`	`2`
`4`	`3`	`export async function selectCheckboxOption(id: Matcher): Promise<void> {`
`@@ -14,6 +13,7 @@ export async function repeatNTimes(input: string, n: number, labelText: Matcher)`
`14`	`13`	`for (let i = 0; i < n; i++) {`
`15`	`14`	`await userEvent.type(screen.queryAllByLabelText(labelText)[i], input);`
`16`	`15`	`await clickButtonTimes(/-repeat-button/i, 1);`
	`16`	`+ await userEvent.type(screen.queryAllByLabelText(labelText)[i + 1], input);`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`	`export async function repeatDateTimeNTimes(`
`@@ -34,6 +34,7 @@ export async function repeatDateTimeNTimes(`
`34`	`34`	`const minutesInput = minutesElement.querySelector('input');`
`35`	`35`
`36`	`36`	`await userEvent.type(dateElement, dateString);`
	`37`	`+`
`37`	`38`	`if (hoursInput && minutesInput) {`
`38`	`39`	`await userEvent.type(hoursInput, hoursString);`
`39`	`40`	`await userEvent.type(minutesInput, minutesString);`
`@@ -76,9 +77,9 @@ export async function clickByLabelText(id: Matcher): Promise<void> {`
`76`	`77`	`expect(elm).toBeInTheDocument();`
`77`	`78`	`await userEvent.click(elm);`
`78`	`79`	`}`
`79`		`-export async function repeatCheckboxTimes(id: Matcher, n: number): Promise<void> {`
	`80`	`+export async function repeatCheckboxTimes(matcher: Matcher, n: number): Promise<void> {`
`80`	`81`	`for (let i = 0; i < n; i++) {`
`81`		`- const elm = screen.getAllByLabelText(id);`
	`82`	`+ const elm = screen.getAllByLabelText(matcher);`
`82`	`83`	`await userEvent.click(elm[i]);`
`83`	`84`	`await clickButtonTimes(/-repeat-button/i, 1);`
`84`	`85`	`}`
`@@ -89,6 +90,9 @@ export async function repeatSliderTimes(linkId: string, n: number): Promise<void`
`89`	`90`	`const itemToClick = elm.querySelectorAll('div.slider__track__step')[0];`
`90`	`91`	`await userEvent.click(itemToClick);`
`91`	`92`	`await clickButtonTimes(/-repeat-button/i, 1);`
	`93`	+ const elm2 = await screen.findByTestId(`item_${linkId}^${i + 1}-${i + 1}-slider-choice`);
	`94`	`+ const itemToClick2 = elm2.querySelectorAll('div.slider__track__step')[0];`
	`95`	`+ await userEvent.click(itemToClick2);`
`92`	`96`	`}`
`93`	`97`	`}`
`94`	`98`	`export async function clickSliderValue(linkId: Matcher, index: number, sliderItemIndex: undefined \| number = 0): Promise<void> {`
`@@ -104,6 +108,7 @@ export async function repeatDropDownTimes(`
`104`	`108`	`for (let i = 0; i < n; i++) {`
`105`	`109`	`await userEvent.selectOptions(screen.getAllByLabelText(id)[i], screen.getAllByRole('option', { name: optionName })[i]);`
`106`	`110`	`await clickButtonTimes(/-repeat-button/i, 1);`
	`111`	`+ await userEvent.selectOptions(screen.getAllByLabelText(id)[i + 1], screen.getAllByRole('option', { name: optionName })[i + 1]);`
`107`	`112`	`}`
`108`	`113`	`}`
`109`	`114`	`export async function typeAndTabByLabelText(id: Matcher, value: string): Promise<void> {`