@aehrc/smart-forms-renderer 0.27.4 → 0.28.0

package/src/components/FormComponents/ChoiceItems/ChoiceRadioAnswerValueSetItem.tsx

@@ -82,6 +82,10 @@ function ChoiceRadioAnswerValueSetItem(props: ChoiceRadioAnswerValueSetItemProps
     }
   }
 
+  function handleClear() {
+    onQrItemChange(createEmptyQrItem(qItem));
+  }
+
   if (isRepeated) {
     return (
       <ChoiceRadioAnswerValueSetFields
@@ -93,6 +97,7 @@ function ChoiceRadioAnswerValueSetItem(props: ChoiceRadioAnswerValueSetItemProps
         terminologyError={terminologyError}
         isTabled={isTabled}
         onCheckedChange={handleChange}
+        onClear={handleClear}
       />
     );
   }
@@ -112,6 +117,7 @@ function ChoiceRadioAnswerValueSetItem(props: ChoiceRadioAnswerValueSetItemProps
           terminologyError={terminologyError}
           isTabled={isTabled}
           onCheckedChange={handleChange}
+          onClear={handleClear}
         />
       </ItemFieldGrid>
     </FullWidthFormComponentBox>

package/src/components/FormComponents/ChoiceItems/ChoiceSelectAnswerOptionItem.tsx

@@ -79,6 +79,10 @@ function ChoiceSelectAnswerOptionItem(props: ChoiceSelectAnswerOptionItemProps)
     );
   }
 
+  function handleClear() {
+    onQrItemChange(createEmptyQrItem(qItem));
+  }
+
   return (
     <ChoiceSelectAnswerOptionView
       qItem={qItem}
@@ -90,6 +94,7 @@ function ChoiceSelectAnswerOptionItem(props: ChoiceSelectAnswerOptionItemProps)
       isTabled={isTabled}
       onFocusLinkId={() => onFocusLinkId(qItem.linkId)}
       onSelectChange={handleChange}
+      onClear={handleClear}
     />
   );
 }

package/src/components/FormComponents/ChoiceItems/ChoiceSelectAnswerOptionView.tsx

@@ -35,6 +35,7 @@ interface ChoiceSelectAnswerOptionViewProps
   calcExpUpdated: boolean;
   onSelectChange: (linkId: string) => void;
   onFocusLinkId: () => void;
+  onClear: () => void;
 }
 
 function ChoiceSelectAnswerOptionView(props: ChoiceSelectAnswerOptionViewProps) {
@@ -47,7 +48,8 @@ function ChoiceSelectAnswerOptionView(props: ChoiceSelectAnswerOptionViewProps)
     readOnly,
     calcExpUpdated,
     onFocusLinkId,
-    onSelectChange
+    onSelectChange,
+    onClear
   } = props;
 
   if (isRepeated) {

package/src/components/FormComponents/DateTimeItems/CustomDateTimeItem/DateTimeField.tsx

@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import React, { Dispatch, SetStateAction } from 'react';
+import type { Dispatch, SetStateAction } from 'react';
+import React from 'react';
 import type { PropsWithIsTabledAttribute } from '../../../../interfaces/renderProps.interface';
 import CustomDateField from '../CustomDateItem/CustomDateField';
 import CustomTimeField from './CustomTimeField';

package/src/components/FormComponents/DecimalItem/DecimalItem.tsx

@@ -40,6 +40,7 @@ import useDecimalCalculatedExpression from '../../../hooks/useDecimalCalculatedE
 import useStringInput from '../../../hooks/useStringInput';
 import useReadOnly from '../../../hooks/useReadOnly';
 import { useQuestionnaireStore } from '../../../stores';
+import Box from '@mui/material/Box';
 
 interface DecimalItemProps
   extends PropsWithQrItemChangeHandler,
@@ -127,18 +128,20 @@ function DecimalItem(props: DecimalItemProps) {
 
   if (isRepeated) {
     return (
-      <DecimalField
-        linkId={qItem.linkId}
-        input={input}
-        feedback={feedback}
-        displayPrompt={displayPrompt}
-        displayUnit={displayUnit}
-        entryFormat={entryFormat}
-        readOnly={readOnly}
-        calcExpUpdated={calcExpUpdated}
-        isTabled={isTabled}
-        onInputChange={handleInputChange}
-      />
+      <Box data-test="q-item-decimal-box">
+        <DecimalField
+          linkId={qItem.linkId}
+          input={input}
+          feedback={feedback}
+          displayPrompt={displayPrompt}
+          displayUnit={displayUnit}
+          entryFormat={entryFormat}
+          readOnly={readOnly}
+          calcExpUpdated={calcExpUpdated}
+          isTabled={isTabled}
+          onInputChange={handleInputChange}
+        />
+      </Box>
     );
   }
 

package/src/hooks/useValidationFeedback.ts

@@ -70,7 +70,7 @@ function useValidationFeedback(qItem: QuestionnaireItem, input: string): string
     return `Input is lower than the expected minimum value of ${minValue}.`;
   }
 
-  // Test min value
+  // Test max value
   if (
     invalidType === ValidationResult.maxValue &&
     (typeof maxValue === 'string' || typeof maxValue === 'number')

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

@@ -81,3 +81,33 @@ export const qShortText: Questionnaire = {
     }
   ]
 };
+
+export const qQuestionnaireUnit: Questionnaire = {
+  resourceType: 'Questionnaire',
+  id: 'QuestionnaireUnit',
+  name: 'QuestionnaireUnit',
+  title: 'Questionnaire Unit',
+  version: '0.1.0',
+  status: 'draft',
+  publisher: 'AEHRC CSIRO',
+  date: '2024-05-01',
+  url: 'https://smartforms.csiro.au/docs/advanced/additional-display/questionnaire-unit',
+  item: [
+    {
+      extension: [
+        {
+          url: 'http://hl7.org/fhir/StructureDefinition/questionnaire-unit',
+          valueCoding: {
+            system: 'http://unitsofmeasure.org',
+            code: 'cm',
+            display: 'cm'
+          }
+        }
+      ],
+      linkId: 'height',
+      text: 'Height',
+      type: 'decimal',
+      repeats: false
+    }
+  ]
+};

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

@@ -21,7 +21,6 @@ export const qRequired: Questionnaire = {
   ]
 };
 
-// FIXME requires a parent container
 export const qRepeatsAutocomplete: Questionnaire = {
   resourceType: 'Questionnaire',
   id: 'RepeatsAutocomplete',
@@ -35,7 +34,7 @@ export const qRepeatsAutocomplete: Questionnaire = {
   item: [
     {
       linkId: 'parent-container',
-      text: 'Parent container',
+      text: '',
       type: 'group',
       repeats: false,
       item: [

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

@@ -57,6 +57,34 @@ export const qRenderingXhtmlDisplayListItem: Questionnaire = {
   ]
 };
 
+export const qRenderingXhtmlDisplayBase64ImageItem: Questionnaire = {
+  resourceType: 'Questionnaire',
+  id: 'RenderingXhtml-3',
+  name: 'RenderingXhtml-3',
+  title: 'Rendering XHTML 3',
+  version: '0.1.0',
+  status: 'draft',
+  publisher: 'AEHRC CSIRO',
+  date: '2024-05-01',
+  url: 'https://smartforms.csiro.au/docs/advanced/text/rendering-xhtml-3',
+  item: [
+    {
+      linkId: 'CD-in-progress-1',
+      text: 'In progress',
+      _text: {
+        extension: [
+          {
+            url: 'http://hl7.org/fhir/StructureDefinition/rendering-xhtml',
+            valueString:
+              '<div title="Section completed" xmlns="http://www.w3.org/1999/xhtml">\r\n\t<div style="display: flex; flex-direction: row;">\r\n\t\t<img width=\'64\' height=\'64\' src=\'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4=\'\r\n\t\tstyle="align-self: center;"/>\r\n\t</div>\r\n</div>'
+          }
+        ]
+      },
+      type: 'display'
+    }
+  ]
+};
+
 export const qDisplayCategoryInstructions: Questionnaire = {
   resourceType: 'Questionnaire',
   id: 'DisplayCategoryInstructions',

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

@@ -121,7 +121,7 @@ export const qMinLength: Questionnaire = {
       extension: [
         {
           url: 'http://hl7.org/fhir/StructureDefinition/minLength',
-          valueInteger: 9
+          valueInteger: 10
         }
       ],
       linkId: 'phone-feedback',

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

@@ -63,7 +63,7 @@ export const qBooleanCalculation: Questionnaire = {
   status: 'draft',
   publisher: 'AEHRC CSIRO',
   date: '2024-05-01',
-  url: 'https://smartforms.csiro.au/docs/components/boolean',
+  url: 'https://smartforms.csiro.au/docs/components/boolean/calculation',
   extension: [
     {
       url: 'http://hl7.org/fhir/StructureDefinition/variable',

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

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { Questionnaire, QuestionnaireResponse } from 'fhir/r4';
+import type { Questionnaire, QuestionnaireResponse } from 'fhir/r4';
 
 export const qChoiceAnswerOptionBasic: Questionnaire = {
   resourceType: 'Questionnaire',
@@ -135,3 +135,359 @@ export const qrChoiceAnswerValueSetBasicResponse: QuestionnaireResponse = {
   ],
   questionnaire: 'https://smartforms.csiro.au/docs/components/choice/answervalueset-basic'
 };
+
+export const qChoiceAnswerOptionCalculation: Questionnaire = {
+  resourceType: 'Questionnaire',
+  id: 'ChoiceAnswerOptionCalculation',
+  name: 'ChoiceAnswerOptionCalculation',
+  title: 'Choice AnswerOption Calculation',
+  version: '0.1.0',
+  status: 'draft',
+  publisher: 'AEHRC CSIRO',
+  date: '2024-05-01',
+  url: 'https://smartforms.csiro.au/docs/components/choice/answeroption-calculation',
+  extension: [
+    {
+      url: 'http://hl7.org/fhir/StructureDefinition/variable',
+      valueExpression: {
+        name: 'painLevel',
+        language: 'text/fhirpath',
+        expression: "item.where(linkId = 'pain-level').answer.value"
+      }
+    }
+  ],
+  item: [
+    {
+      extension: [
+        {
+          url: 'http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl',
+          valueCodeableConcept: {
+            coding: [
+              {
+                system: 'http://hl7.org/fhir/questionnaire-item-control',
+                code: 'slider'
+              }
+            ]
+          }
+        },
+        {
+          url: 'http://hl7.org/fhir/StructureDefinition/questionnaire-sliderStepValue',
+          valueInteger: 1
+        },
+        {
+          url: 'http://hl7.org/fhir/StructureDefinition/minValue',
+          valueInteger: 0
+        },
+        {
+          url: 'http://hl7.org/fhir/StructureDefinition/maxValue',
+          valueInteger: 10
+        }
+      ],
+      linkId: 'pain-level',
+      text: 'Pain level',
+      type: 'integer',
+      repeats: false,
+      item: [
+        {
+          extension: [
+            {
+              url: 'http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl',
+              valueCodeableConcept: {
+                coding: [
+                  {
+                    system: 'http://hl7.org/fhir/questionnaire-item-control',
+                    code: 'lower'
+                  }
+                ]
+              }
+            }
+          ],
+          linkId: 'pain-level-lower',
+          text: 'No pain',
+          type: 'display'
+        },
+        {
+          extension: [
+            {
+              url: 'http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl',
+              valueCodeableConcept: {
+                coding: [
+                  {
+                    system: 'http://hl7.org/fhir/questionnaire-item-control',
+                    code: 'upper'
+                  }
+                ]
+              }
+            }
+          ],
+          linkId: 'pain-level-upper',
+          text: 'Unbearable pain',
+          type: 'display'
+        }
+      ]
+    },
+    {
+      extension: [
+        {
+          url: 'http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl',
+          valueCodeableConcept: {
+            coding: [
+              {
+                system: 'http://hl7.org/fhir/questionnaire-item-control',
+                code: 'radio-button'
+              }
+            ]
+          }
+        },
+        {
+          url: 'http://hl7.org/fhir/StructureDefinition/questionnaire-choiceOrientation',
+          valueCode: 'horizontal'
+        },
+        {
+          url: 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-calculatedExpression',
+          valueExpression: {
+            language: 'text/fhirpath',
+            expression: "iif(%painLevel.empty(), '', iif(%painLevel < 5, 'Y', 'N'))"
+          }
+        }
+      ],
+      linkId: 'pain-low',
+      text: 'Low pain (Level < 5)',
+      type: 'choice',
+      repeats: false,
+      readOnly: true,
+      answerOption: [
+        {
+          valueCoding: {
+            system: 'http://terminology.hl7.org/CodeSystem/v2-0532',
+            code: 'Y',
+            display: 'Yes'
+          }
+        },
+        {
+          valueCoding: {
+            system: 'http://terminology.hl7.org/CodeSystem/v2-0532',
+            code: 'N',
+            display: 'No'
+          }
+        }
+      ]
+    }
+  ]
+};
+
+export const qChoiceAnswerValueSetCalculation: Questionnaire = {
+  resourceType: 'Questionnaire',
+  id: 'ChoiceAnswerValueSetCalculation',
+  name: 'ChoiceAnswerValueSetCalculation',
+  title: 'Choice AnswerValueSet Calculation',
+  version: '0.1.0',
+  status: 'draft',
+  publisher: 'AEHRC CSIRO',
+  date: '2024-05-01',
+  url: 'https://smartforms.csiro.au/docs/components/choice/answervalueset-calculation',
+  contained: [
+    {
+      resourceType: 'ValueSet',
+      id: 'australian-states-territories-2',
+      meta: {
+        profile: [
+          'http://hl7.org/fhir/StructureDefinition/shareablevalueset',
+          'https://healthterminologies.gov.au/fhir/StructureDefinition/composed-value-set-4'
+        ]
+      },
+      url: 'https://healthterminologies.gov.au/fhir/ValueSet/australian-states-territories-2',
+      identifier: [
+        {
+          system: 'urn:ietf:rfc:3986',
+          value: 'urn:oid:1.2.36.1.2001.1004.201.10026'
+        }
+      ],
+      version: '2.0.2',
+      name: 'AustralianStatesAndTerritories',
+      title: 'Australian States and Territories',
+      status: 'active',
+      experimental: false,
+      date: '2020-05-31',
+      publisher: 'Australian Digital Health Agency',
+      contact: [
+        {
+          telecom: [
+            {
+              system: 'email',
+              value: 'help@digitalhealth.gov.au'
+            }
+          ]
+        }
+      ],
+      description:
+        'The Australian States and Territories value set includes values that represent the Australian states and territories.',
+      copyright:
+        'Copyright © 2018 Australian Digital Health Agency - All rights reserved. Except for the material identified below, this content is licensed under a Creative Commons Attribution 4.0 International License. See https://creativecommons.org/licenses/by/4.0/. \n\nThis resource includes material that is based on Australian Institute of Health and Welfare material. \n\nAll copies of this resource must include this copyright statement and all information contained in this statement.',
+      compose: {
+        include: [
+          {
+            system:
+              'https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1',
+            concept: [
+              {
+                code: 'ACT'
+              },
+              {
+                code: 'NSW'
+              },
+              {
+                code: 'NT'
+              },
+              {
+                code: 'OTHER'
+              },
+              {
+                code: 'QLD'
+              },
+              {
+                code: 'SA'
+              },
+              {
+                code: 'TAS'
+              },
+              {
+                code: 'VIC'
+              },
+              {
+                code: 'WA'
+              }
+            ]
+          }
+        ]
+      },
+      expansion: {
+        identifier: 'e9439195-c1d8-4069-a349-98c1d552a351',
+        timestamp: '2023-06-20T04:20:58+00:00',
+        total: 9,
+        offset: 0,
+        parameter: [
+          {
+            name: 'version',
+            valueUri:
+              'https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1|1.1.3'
+          },
+          {
+            name: 'count',
+            valueInteger: 2147483647
+          },
+          {
+            name: 'offset',
+            valueInteger: 0
+          }
+        ],
+        contains: [
+          {
+            system:
+              'https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1',
+            code: 'ACT',
+            display: 'Australian Capital Territory'
+          },
+          {
+            system:
+              'https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1',
+            code: 'NSW',
+            display: 'New South Wales'
+          },
+          {
+            system:
+              'https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1',
+            code: 'NT',
+            display: 'Northern Territory'
+          },
+          {
+            system:
+              'https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1',
+            code: 'OTHER',
+            display: 'Other territories'
+          },
+          {
+            system:
+              'https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1',
+            code: 'QLD',
+            display: 'Queensland'
+          },
+          {
+            system:
+              'https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1',
+            code: 'SA',
+            display: 'South Australia'
+          },
+          {
+            system:
+              'https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1',
+            code: 'TAS',
+            display: 'Tasmania'
+          },
+          {
+            system:
+              'https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1',
+            code: 'VIC',
+            display: 'Victoria'
+          },
+          {
+            system:
+              'https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1',
+            code: 'WA',
+            display: 'Western Australia'
+          }
+        ]
+      }
+    }
+  ],
+  extension: [
+    {
+      url: 'http://hl7.org/fhir/StructureDefinition/variable',
+      valueExpression: {
+        name: 'stateCode',
+        language: 'text/fhirpath',
+        expression: "item.where(linkId = 'state-controller').answer.value"
+      }
+    }
+  ],
+  item: [
+    {
+      linkId: 'state-controller-instructions',
+      text: 'Feel free to play around with the following state codes: ACT, NSW, NT, OTHER, QLD, SA, TAS, VIC, WA',
+      _text: {
+        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">Feel free to play around with the following state codes:</div>\r\n    <ul style="font-size:0.875em">\r\n      <li>ACT</li>\r\n      <li>NSW</li>\r\n      <li>NT</li>\r\n      <li>OTHER</li>\r\n      <li>QLD</li>\r\n      <li>SA</li>\r\n      <li>TAS</li>\r\n      <li>VIC</li>\r\n      <li>WA</li>\r\n    </ul>\r\n    </div>'
+          }
+        ]
+      },
+      type: 'display',
+      repeats: false
+    },
+    {
+      linkId: 'state-controller',
+      text: 'State (string)',
+      type: 'string',
+      repeats: false
+    },
+    {
+      extension: [
+        {
+          url: 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-calculatedExpression',
+          valueExpression: {
+            language: 'text/fhirpath',
+            expression: '%stateCode'
+          }
+        }
+      ],
+      linkId: 'state-choice',
+      text: 'State (choice)',
+      type: 'choice',
+      repeats: false,
+      readOnly: true,
+      answerValueSet: '#australian-states-territories-2'
+    }
+  ]
+};

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

@@ -16,7 +16,7 @@
  */
 
 import type { Questionnaire } from 'fhir/r4';
-import { QuestionnaireResponse } from 'fhir/r4';
+import type { QuestionnaireResponse } from 'fhir/r4';
 
 export const qDateBasic: Questionnaire = {
   resourceType: 'Questionnaire',

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

@@ -16,7 +16,7 @@
  */
 
 import type { Questionnaire } from 'fhir/r4';
-import { QuestionnaireResponse } from 'fhir/r4';
+import type { QuestionnaireResponse } from 'fhir/r4';
 
 export const qDateTimeBasic: Questionnaire = {
   resourceType: 'Questionnaire',

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

@@ -16,7 +16,7 @@
  */
 
 import type { Questionnaire } from 'fhir/r4';
-import { QuestionnaireResponse } from 'fhir/r4';
+import type { QuestionnaireResponse } from 'fhir/r4';
 
 export const qDecimalBasic: Questionnaire = {
   resourceType: 'Questionnaire',

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

@@ -16,7 +16,7 @@
  */
 
 import type { Questionnaire } from 'fhir/r4';
-import { QuestionnaireResponse } from 'fhir/r4';
+import type { QuestionnaireResponse } from 'fhir/r4';
 
 export const qIntegerBasic: Questionnaire = {
   resourceType: 'Questionnaire',