@aehrc/smart-forms-renderer 0.12.1 → 0.13.1

package/src/components/FormComponents/OpenChoiceItems/OpenChoiceSelectAnswerOptionItem.tsx

@@ -16,7 +16,6 @@
  */
 
 import React from 'react';
-import Grid from '@mui/material/Grid';
 import type {
   QuestionnaireItem,
   QuestionnaireItemAnswerOption,
@@ -31,10 +30,9 @@ import type {
   PropsWithParentIsReadOnlyAttribute,
   PropsWithQrItemChangeHandler
 } from '../../../interfaces/renderProps.interface';
-import DisplayInstructions from '../DisplayItem/DisplayInstructions';
-import LabelWrapper from '../ItemParts/ItemLabelWrapper';
 import OpenChoiceSelectAnswerOptionField from './OpenChoiceSelectAnswerOptionField';
 import useReadOnly from '../../../hooks/useReadOnly';
+import ItemFieldGrid from '../ItemParts/ItemFieldGrid';
 
 interface OpenChoiceSelectAnswerOptionItemProps
   extends PropsWithQrItemChangeHandler,
@@ -49,7 +47,7 @@ function OpenChoiceSelectAnswerOptionItem(props: OpenChoiceSelectAnswerOptionIte
   const { qItem, qrItem, isRepeated, isTabled, parentIsReadOnly, onQrItemChange } = props;
 
   const readOnly = useReadOnly(qItem, parentIsReadOnly);
-  const { displayInstructions } = useRenderingExtensions(qItem);
+  const { displayInstructions, required } = useRenderingExtensions(qItem);
 
   // Init input value
   const answerOptions = qItem.answerOption;
@@ -109,22 +107,20 @@ function OpenChoiceSelectAnswerOptionItem(props: OpenChoiceSelectAnswerOptionIte
 
   return (
     <FullWidthFormComponentBox data-test="q-item-open-choice-select-answer-option-box">
-      <Grid container columnSpacing={6}>
-        <Grid item xs={5}>
-          <LabelWrapper qItem={qItem} readOnly={readOnly} />
-        </Grid>
-        <Grid item xs={7}>
-          <OpenChoiceSelectAnswerOptionField
-            qItem={qItem}
-            options={answerOptions}
-            valueSelect={valueSelect}
-            readOnly={readOnly}
-            isTabled={isTabled}
-            onChange={handleChange}
-          />
-          <DisplayInstructions displayInstructions={displayInstructions} readOnly={readOnly} />
-        </Grid>
-      </Grid>
+      <ItemFieldGrid
+        qItem={qItem}
+        displayInstructions={displayInstructions}
+        required={required}
+        readOnly={readOnly}>
+        <OpenChoiceSelectAnswerOptionField
+          qItem={qItem}
+          options={answerOptions}
+          valueSelect={valueSelect}
+          readOnly={readOnly}
+          isTabled={isTabled}
+          onChange={handleChange}
+        />
+      </ItemFieldGrid>
     </FullWidthFormComponentBox>
   );
 }

package/src/components/FormComponents/OpenChoiceItems/OpenChoiceSelectAnswerValueSetItem.tsx

@@ -16,7 +16,6 @@
  */
 
 import React from 'react';
-import Grid from '@mui/material/Grid';
 import type { Coding, QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
 import { createEmptyQrItem } from '../../../utils/qrItem';
 import { FullWidthFormComponentBox } from '../../Box.styles';
@@ -28,10 +27,9 @@ import type {
   PropsWithParentIsReadOnlyAttribute,
   PropsWithQrItemChangeHandler
 } from '../../../interfaces/renderProps.interface';
-import DisplayInstructions from '../DisplayItem/DisplayInstructions';
-import LabelWrapper from '../ItemParts/ItemLabelWrapper';
 import OpenChoiceSelectAnswerValueSetField from './OpenChoiceSelectAnswerValueSetField';
 import useReadOnly from '../../../hooks/useReadOnly';
+import ItemFieldGrid from '../ItemParts/ItemFieldGrid';
 
 interface OpenChoiceSelectAnswerValueSetItemProps
   extends PropsWithQrItemChangeHandler,
@@ -46,7 +44,7 @@ function OpenChoiceSelectAnswerValueSetItem(props: OpenChoiceSelectAnswerValueSe
   const { qItem, qrItem, isRepeated, isTabled, parentIsReadOnly, onQrItemChange } = props;
 
   const readOnly = useReadOnly(qItem, parentIsReadOnly);
-  const { displayInstructions } = useRenderingExtensions(qItem);
+  const { displayInstructions, required } = useRenderingExtensions(qItem);
 
   // Init input value
   const qrOpenChoice = qrItem ?? createEmptyQrItem(qItem);
@@ -93,23 +91,21 @@ function OpenChoiceSelectAnswerValueSetItem(props: OpenChoiceSelectAnswerValueSe
 
   return (
     <FullWidthFormComponentBox>
-      <Grid container columnSpacing={6}>
-        <Grid item xs={5}>
-          <LabelWrapper qItem={qItem} readOnly={readOnly} />
-        </Grid>
-        <Grid item xs={7}>
-          <OpenChoiceSelectAnswerValueSetField
-            qItem={qItem}
-            options={codings}
-            valueSelect={valueSelect}
-            serverError={serverError}
-            isTabled={isTabled}
-            readOnly={readOnly}
-            onValueChange={handleValueChange}
-          />
-          <DisplayInstructions displayInstructions={displayInstructions} readOnly={readOnly} />
-        </Grid>
-      </Grid>
+      <ItemFieldGrid
+        qItem={qItem}
+        displayInstructions={displayInstructions}
+        required={required}
+        readOnly={readOnly}>
+        <OpenChoiceSelectAnswerValueSetField
+          qItem={qItem}
+          options={codings}
+          valueSelect={valueSelect}
+          serverError={serverError}
+          isTabled={isTabled}
+          readOnly={readOnly}
+          onValueChange={handleValueChange}
+        />
+      </ItemFieldGrid>
     </FullWidthFormComponentBox>
   );
 }

package/src/components/FormComponents/RepeatItem/RepeatItem.tsx

@@ -18,9 +18,9 @@
 import React, { useState } from 'react';
 import type {
   PropsWithParentIsReadOnlyAttribute,
-  PropsWithQrItemChangeHandler
+  PropsWithQrItemChangeHandler,
+  PropsWithShowMinimalViewAttribute
 } from '../../../interfaces/renderProps.interface';
-import type { PropsWithShowMinimalViewAttribute } from '../../../interfaces/renderProps.interface';
 import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
 import { nanoid } from 'nanoid';
 import useRenderingExtensions from '../../../hooks/useRenderingExtensions';
@@ -46,7 +46,7 @@ function RepeatItem(props: RepeatItemProps) {
   const { qItem, qrItem, showMinimalView, parentIsReadOnly, onQrItemChange } = props;
 
   const readOnly = useReadOnly(qItem, parentIsReadOnly);
-  const { displayInstructions } = useRenderingExtensions(qItem);
+  const { displayInstructions, required } = useRenderingExtensions(qItem);
 
   const initialRepeatAnswers = useInitialiseRepeatAnswers(qItem, qrItem);
 
@@ -119,7 +119,11 @@ function RepeatItem(props: RepeatItemProps) {
 
   return (
     <FullWidthFormComponentBox data-test="q-item-repeat-box">
-      <ItemFieldGrid qItem={qItem} displayInstructions={displayInstructions} readOnly={readOnly}>
+      <ItemFieldGrid
+        qItem={qItem}
+        displayInstructions={displayInstructions}
+        required={required}
+        readOnly={readOnly}>
         <TransitionGroup>
           {repeatAnswers.map(({ nanoId, answer }, index) => {
             const repeatAnswerQrItem = createEmptyQrItem(qItem);

package/src/components/FormComponents/SliderItem/SliderItem.tsx

@@ -45,7 +45,7 @@ function SliderItem(props: SliderItemProps) {
   const { qItem, qrItem, isRepeated, isTabled, parentIsReadOnly, onQrItemChange } = props;
 
   const readOnly = useReadOnly(qItem, parentIsReadOnly);
-  const { displayInstructions } = useRenderingExtensions(qItem);
+  const { displayInstructions, required } = useRenderingExtensions(qItem);
   const { minValue, maxValue, stepValue, minLabel, maxLabel } = useSliderExtensions(qItem);
 
   const isInteracted = !!qrItem?.answer;
@@ -91,7 +91,11 @@ function SliderItem(props: SliderItemProps) {
 
   return (
     <FullWidthFormComponentBox data-test="q-item-slider-box">
-      <ItemFieldGrid qItem={qItem} displayInstructions={displayInstructions} readOnly={readOnly}>
+      <ItemFieldGrid
+        qItem={qItem}
+        displayInstructions={displayInstructions}
+        required={required}
+        readOnly={readOnly}>
         <Box px={4}>
           <SliderField
             linkId={qItem.linkId}

package/src/components/FormComponents/StringItem/StringItem.tsx

@@ -24,7 +24,7 @@ import type {
 } from '../../../interfaces/renderProps.interface';
 import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
 import useRenderingExtensions from '../../../hooks/useRenderingExtensions';
-import useValidationError from '../../../hooks/useValidationError';
+import useValidationFeedback from '../../../hooks/useValidationFeedback';
 import debounce from 'lodash.debounce';
 import { createEmptyQrItem } from '../../../utils/qrItem';
 import { DEBOUNCE_DURATION } from '../../../utils/debounce';
@@ -52,7 +52,9 @@ function StringItem(props: StringItemProps) {
     displayPrompt,
     displayInstructions,
     entryFormat,
+    required,
     regexValidation,
+    minLength,
     maxLength
   } = useRenderingExtensions(qItem);
 
@@ -64,7 +66,7 @@ function StringItem(props: StringItemProps) {
   const [input, setInput] = useStringInput(valueString);
 
   // Perform validation checks
-  const feedback = useValidationError(input, regexValidation, maxLength);
+  const feedback = useValidationFeedback(input, regexValidation, minLength, maxLength);
 
   // Process calculated expressions
   const { calcExpUpdated } = useStringCalculatedExpression({
@@ -113,7 +115,11 @@ function StringItem(props: StringItemProps) {
   }
   return (
     <FullWidthFormComponentBox data-test="q-item-string-box">
-      <ItemFieldGrid qItem={qItem} displayInstructions={displayInstructions} readOnly={readOnly}>
+      <ItemFieldGrid
+        qItem={qItem}
+        displayInstructions={displayInstructions}
+        required={required}
+        readOnly={readOnly}>
         <StringField
           linkId={qItem.linkId}
           input={input}

package/src/components/FormComponents/TextItem/TextItem.tsx

@@ -23,7 +23,7 @@ import type {
 } from '../../../interfaces/renderProps.interface';
 import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
 import useRenderingExtensions from '../../../hooks/useRenderingExtensions';
-import useValidationError from '../../../hooks/useValidationError';
+import useValidationFeedback from '../../../hooks/useValidationFeedback';
 import debounce from 'lodash.debounce';
 import { createEmptyQrItem } from '../../../utils/qrItem';
 import { DEBOUNCE_DURATION } from '../../../utils/debounce';
@@ -51,7 +51,9 @@ function TextItem(props: TextItemProps) {
     displayPrompt,
     displayInstructions,
     entryFormat,
+    required,
     regexValidation,
+    minLength,
     maxLength
   } = useRenderingExtensions(qItem);
 
@@ -63,7 +65,7 @@ function TextItem(props: TextItemProps) {
   const [input, setInput] = useStringInput(valueText);
 
   // Perform validation checks
-  const feedback = useValidationError(input, regexValidation, maxLength);
+  const feedback = useValidationFeedback(input, regexValidation, minLength, maxLength);
 
   // Process calculated expressions
   const { calcExpUpdated } = useStringCalculatedExpression({
@@ -111,7 +113,11 @@ function TextItem(props: TextItemProps) {
   }
   return (
     <FullWidthFormComponentBox data-test="q-item-text-box">
-      <ItemFieldGrid qItem={qItem} displayInstructions={displayInstructions} readOnly={readOnly}>
+      <ItemFieldGrid
+        qItem={qItem}
+        displayInstructions={displayInstructions}
+        required={required}
+        readOnly={readOnly}>
         <TextField
           linkId={qItem.linkId}
           input={input}

package/src/components/FormComponents/TimeItem/TimeItem.tsx

@@ -45,7 +45,8 @@ function TimeItem(props: TimeItemProps) {
   const { qItem, qrItem, isRepeated, isTabled, parentIsReadOnly, onQrItemChange } = props;
 
   const readOnly = useReadOnly(qItem, parentIsReadOnly);
-  const { displayPrompt, displayInstructions, entryFormat } = useRenderingExtensions(qItem);
+  const { displayPrompt, displayInstructions, entryFormat, required } =
+    useRenderingExtensions(qItem);
 
   // Init input value
   let timeString: string | null = null;
@@ -79,7 +80,11 @@ function TimeItem(props: TimeItemProps) {
 
   return (
     <FullWidthFormComponentBox>
-      <ItemFieldGrid qItem={qItem} displayInstructions={displayInstructions} readOnly={readOnly}>
+      <ItemFieldGrid
+        qItem={qItem}
+        displayInstructions={displayInstructions}
+        required={required}
+        readOnly={readOnly}>
         <TimeField
           value={timeDayJs}
           displayPrompt={displayPrompt}

package/src/components/FormComponents/UrlItem/UrlItem.tsx

@@ -24,7 +24,7 @@ import type {
 } from '../../../interfaces/renderProps.interface';
 import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
 import useRenderingExtensions from '../../../hooks/useRenderingExtensions';
-import useValidationError from '../../../hooks/useValidationError';
+import useValidationFeedback from '../../../hooks/useValidationFeedback';
 import debounce from 'lodash.debounce';
 import { createEmptyQrItem } from '../../../utils/qrItem';
 import { DEBOUNCE_DURATION } from '../../../utils/debounce';
@@ -50,7 +50,9 @@ function UrlItem(props: UrlItemProps) {
     displayPrompt,
     displayInstructions,
     entryFormat,
+    required,
     regexValidation,
+    minLength,
     maxLength
   } = useRenderingExtensions(qItem);
 
@@ -62,7 +64,7 @@ function UrlItem(props: UrlItemProps) {
   const [input, setInput] = useState(valueUri);
 
   // Perform validation checks
-  const feedback = useValidationError(input, regexValidation, maxLength);
+  const feedback = useValidationFeedback(input, regexValidation, minLength, maxLength);
 
   // Event handlers
   function handleChange(newInput: string) {
@@ -100,7 +102,11 @@ function UrlItem(props: UrlItemProps) {
   }
   return (
     <FullWidthFormComponentBox data-test="q-item-string-box">
-      <ItemFieldGrid qItem={qItem} displayInstructions={displayInstructions} readOnly={readOnly}>
+      <ItemFieldGrid
+        qItem={qItem}
+        displayInstructions={displayInstructions}
+        required={required}
+        readOnly={readOnly}>
         <UrlField
           linkId={qItem.linkId}
           input={input}

package/src/components/Renderer/BaseRenderer.tsx

@@ -32,6 +32,7 @@ function BaseRenderer() {
   const readOnly = useQuestionnaireStore.use.readOnly();
 
   const updatableResponse = useQuestionnaireResponseStore.use.updatableResponse();
+  const updateRequiredValidity = useQuestionnaireResponseStore.use.validateQuestionnaire();
   const updateResponse = useQuestionnaireResponseStore.use.updateResponse();
 
   const qItemsIndexMap = useMemo(() => mapQItemsIndex(sourceQuestionnaire), [sourceQuestionnaire]);
@@ -45,6 +46,7 @@ function BaseRenderer() {
     updateQrItemsInGroup(newTopLevelQRItem, null, updatedResponse, qItemsIndexMap);
 
     updateExpressions(updatedResponse);
+    updateRequiredValidity(sourceQuestionnaire, updatedResponse);
     updateResponse(updatedResponse);
   }
 
@@ -57,6 +59,7 @@ function BaseRenderer() {
     updateQrItemsInGroup(null, newTopLevelQRItems, updatedResponse, qItemsIndexMap);
 
     updateExpressions(updatedResponse);
+    updateRequiredValidity(sourceQuestionnaire, updatedResponse);
     updateResponse(updatedResponse);
   }
 

package/src/hooks/useRenderingExtensions.ts

@@ -16,8 +16,6 @@
  */
 
 import {
-  getMaxLength,
-  getReadOnly,
   getRegexValidation,
   getTextDisplayInstructions,
   getTextDisplayPrompt,
@@ -26,6 +24,7 @@ import {
 import type { QuestionnaireItem } from 'fhir/r4';
 import type { RegexValidation } from '../interfaces/regex.interface';
 import { structuredDataCapture } from 'fhir-sdc-helpers';
+import { useMemo } from 'react';
 
 interface RenderingExtensions {
   displayUnit: string;
@@ -33,20 +32,27 @@ interface RenderingExtensions {
   displayInstructions: string;
   readOnly: boolean;
   entryFormat: string;
+  required: boolean;
   regexValidation: RegexValidation | null;
+  minLength: number | null;
   maxLength: number | null;
 }
 
 function useRenderingExtensions(qItem: QuestionnaireItem): RenderingExtensions {
-  return {
-    displayUnit: getTextDisplayUnit(qItem),
-    displayPrompt: getTextDisplayPrompt(qItem),
-    displayInstructions: getTextDisplayInstructions(qItem),
-    readOnly: getReadOnly(qItem),
-    entryFormat: structuredDataCapture.getEntryFormat(qItem) ?? '',
-    regexValidation: getRegexValidation(qItem),
-    maxLength: getMaxLength(qItem)
-  };
+  return useMemo(
+    () => ({
+      displayUnit: getTextDisplayUnit(qItem),
+      displayPrompt: getTextDisplayPrompt(qItem),
+      displayInstructions: getTextDisplayInstructions(qItem),
+      readOnly: !!qItem.readOnly,
+      entryFormat: structuredDataCapture.getEntryFormat(qItem) ?? '',
+      required: qItem.required ?? false,
+      regexValidation: getRegexValidation(qItem),
+      minLength: structuredDataCapture.getMinLength(qItem) ?? null,
+      maxLength: qItem.maxLength ?? null
+    }),
+    [qItem]
+  );
 }
 
 export default useRenderingExtensions;

package/src/hooks/{useValidationError.ts → useValidationFeedback.ts}

@@ -16,33 +16,35 @@
  */
 
 import type { RegexValidation } from '../interfaces/regex.interface';
+import { getInputInvalidType } from '../utils/validateQuestionnaire';
 
-function useValidationError(
+function useValidationFeedback(
   input: string,
   regexValidation: RegexValidation | null,
+  minLength: number | null,
   maxLength: number | null
 ): string {
-  let feedback = '';
-
-  if (input) {
-    // Test regex
-    if (regexValidation) {
-      if (!regexValidation.expression.test(input)) {
-        feedback =
-          regexValidation.feedback ??
-          `Input should match the specified regex ${regexValidation.expression}`;
-      }
-    }
-
-    // Test max character limit
-    if (maxLength) {
-      if (input.length > maxLength) {
-        feedback = 'Input exceeds maximum character limit.';
-      }
-    }
+  const invalidType = getInputInvalidType(input, regexValidation, minLength, maxLength);
+
+  if (!invalidType) {
+    return '';
+  }
+
+  if (invalidType === 'regex' && regexValidation) {
+    return `Input should match the specified regex ${regexValidation.expression}`;
+  }
+
+  // Test min character limit
+  if (invalidType === 'minLength' && minLength) {
+    return `Enter at least ${minLength} characters.`;
+  }
+
+  // Test max character limit
+  if (invalidType === 'maxLength' && maxLength) {
+    return `Input exceeds maximum character limit of ${maxLength}.`;
   }
 
-  return feedback;
+  return '';
 }
 
-export default useValidationError;
+export default useValidationFeedback;

package/src/stores/questionnaireResponseStore.ts

@@ -16,17 +16,26 @@
  */
 
 import { createStore } from 'zustand/vanilla';
-import type { QuestionnaireResponse } from 'fhir/r4';
+import type { Questionnaire, QuestionnaireResponse } from 'fhir/r4';
 import { emptyResponse } from '../utils/emptyResource';
 import cloneDeep from 'lodash.clonedeep';
 import type { Diff } from 'deep-diff';
 import { diff } from 'deep-diff';
 import { createSelectors } from './selector';
+import type { InvalidType } from '../utils/validateQuestionnaire';
+import { validateQuestionnaire } from '../utils/validateQuestionnaire';
+import { questionnaireStore } from './questionnaireStore';
 
 interface QuestionnaireResponseStoreType {
   sourceResponse: QuestionnaireResponse;
   updatableResponse: QuestionnaireResponse;
   formChangesHistory: (Diff<QuestionnaireResponse, QuestionnaireResponse>[] | null)[];
+  invalidItems: Record<string, InvalidType>;
+  responseIsValid: boolean;
+  validateQuestionnaire: (
+    questionnaire: Questionnaire,
+    updatedResponse: QuestionnaireResponse
+  ) => void;
   buildSourceResponse: (response: QuestionnaireResponse) => void;
   setUpdatableResponseAsPopulated: (populatedResponse: QuestionnaireResponse) => void;
   updateResponse: (updatedResponse: QuestionnaireResponse) => void;
@@ -40,6 +49,32 @@ export const questionnaireResponseStore = createStore<QuestionnaireResponseStore
     sourceResponse: cloneDeep(emptyResponse),
     updatableResponse: cloneDeep(emptyResponse),
     formChangesHistory: [],
+    invalidItems: {},
+    responseIsValid: true,
+    validateQuestionnaire: (
+      questionnaire: Questionnaire,
+      updatedResponse: QuestionnaireResponse
+    ) => {
+      const tempInvalidItems = get().invalidItems;
+
+      const enableWhenIsActivated = questionnaireStore.getState().enableWhenIsActivated;
+      const enableWhenItems = questionnaireStore.getState().enableWhenItems;
+      const enableWhenExpressions = questionnaireStore.getState().enableWhenExpressions;
+
+      validateQuestionnaire({
+        questionnaire,
+        questionnaireResponse: updatedResponse,
+        invalidItems: tempInvalidItems,
+        enableWhenIsActivated,
+        enableWhenItems,
+        enableWhenExpressions
+      });
+
+      set(() => ({
+        invalidItems: tempInvalidItems,
+        responseIsValid: Object.keys(tempInvalidItems).length === 0
+      }));
+    },
     buildSourceResponse: (questionnaireResponse: QuestionnaireResponse) => {
       set(() => ({
         sourceResponse: questionnaireResponse,

package/src/utils/itemControl.ts

@@ -15,13 +15,7 @@
  * limitations under the License.
  */
 
-import type {
-  Coding,
-  Expression,
-  Extension,
-  QuestionnaireItem,
-  QuestionnaireResponse
-} from 'fhir/r4';
+import type { Coding, Expression, Extension, QuestionnaireItem } from 'fhir/r4';
 import type { RegexValidation } from '../interfaces/regex.interface';
 
 /**
@@ -220,28 +214,6 @@ export function getMarkdownString(qItem: QuestionnaireItem): string | null {
   return null;
 }
 
-/**
- * Get questionnaire name from questionnaireResponse
- * If questionnaireResponse does not have a name, fallback to questionnaireResponse questionnaireId
- *
- * @author Sean Fong
- */
-export function getQuestionnaireNameFromResponse(
-  questionnaireResponse: QuestionnaireResponse
-): string {
-  const itemControl = questionnaireResponse._questionnaire?.extension?.find(
-    (extension: Extension) => extension.url === 'http://hl7.org/fhir/StructureDefinition/display'
-  );
-
-  if (itemControl) {
-    if (itemControl.valueString) {
-      return itemControl.valueString.charAt(0).toUpperCase() + itemControl.valueString.slice(1);
-    }
-  }
-
-  return questionnaireResponse.id ?? 'Unnamed Response';
-}
-
 /**
  * Get text display prompt for items with itemControlCode prompt and has a prompt childItem
  *
@@ -259,15 +231,6 @@ export function getTextDisplayPrompt(qItem: QuestionnaireItem): string {
   return '';
 }
 
-/**
- * Check if item is readonly
- *
- * @author Sean Fong
- */
-export function getReadOnly(qItem: QuestionnaireItem): boolean {
-  return !!qItem.readOnly;
-}
-
 /**
  * Get decimal text display unit for items with itemControlCode unit and has a unit childItem
  *
@@ -332,26 +295,6 @@ export function getTextDisplayInstructions(qItem: QuestionnaireItem): string {
   return '';
 }
 
-/**
- * Get entry format if its extension is present
- * i.e. DD-MM-YYYY for dates, HH:MM for times etc.
- *
- * @author Sean Fong
- */
-export function getEntryFormat(qItem: QuestionnaireItem): string {
-  const itemControl = qItem.extension?.find(
-    (extension: Extension) =>
-      extension.url === 'http://hl7.org/fhir/StructureDefinition/entryFormat'
-  );
-
-  if (itemControl) {
-    if (itemControl.valueString) {
-      return itemControl.valueString;
-    }
-  }
-  return '';
-}
-
 /**
  * Get entry format if its extension is present
  * i.e. DD-MM-YYYY for dates, HH:MM for times etc.
@@ -388,12 +331,3 @@ export function getRegexValidation(qItem: QuestionnaireItem): RegexValidation |
 
   return null;
 }
-
-/**
- * Get maximum length of characters allowed if present
- *
- * @author Sean Fong
- */
-export function getMaxLength(qItem: QuestionnaireItem): number | null {
-  return qItem.maxLength ?? null;
-}

package/src/utils/mapItem.ts

@@ -23,6 +23,8 @@ import { isRepeatItemAndNotCheckbox } from './qItem';
  * QuestionnaireItems without a corresponding QuestionnaireResponseItem is set as undefined.
  * i.e. QItems = [QItem0, QItem1, QItem2]. Only QItem0 and QItem2 have QrItems
  * Generated array: [QrItem0, undefined, QrItem2]
+ * Note: There's a bug where if the qItems are child items from a repeat group, the function fails at the isRepeatGroup line.
+ *       Ensure that repeat groups are handled prior to calling this function.
  *
  * @author Sean Fong
  */