@aehrc/smart-forms-renderer 0.40.2 → 0.41.0

package/src/utils/repeatId.ts

@@ -16,12 +16,6 @@
  */
 
 import { nanoid } from 'nanoid';
-import type {
-  QuestionnaireItem,
-  QuestionnaireResponseItem,
-  QuestionnaireResponseItemAnswer
-} from 'fhir/r4';
-import { getQrItemsIndex, mapQItemsIndex } from './mapItem';
 
 export function generateNewRepeatId(linkId: string): string {
   return `${linkId}-repeat-${nanoid()}`;
@@ -31,93 +25,3 @@ export function generateExistingRepeatId(linkId: string, index: number): string
   const paddedIndex = index.toString().padStart(6, '0');
   return `${linkId}-repeat-${paddedIndex}`;
 }
-
-export function removeInternalRepeatIdsRecursive(
-  qItem: QuestionnaireItem,
-  qrItemOrItems: QuestionnaireResponseItem | QuestionnaireResponseItem[] | null
-): QuestionnaireResponseItem | QuestionnaireResponseItem[] | null {
-  // Process repeating group items separately
-  const hasMultipleAnswers = Array.isArray(qrItemOrItems);
-  if (hasMultipleAnswers) {
-    return removeInternalRepeatIdsFromRepeatGroup(qItem, qrItemOrItems);
-  }
-
-  // At this point qrItemOrItems is a single QuestionnaireResponseItem
-  const qrItem = qrItemOrItems;
-
-  // Process items with child items
-  const childQItems = qItem.item ?? [];
-  const childQrItems = qrItem?.item ?? [];
-  const updatedChildQrItems: QuestionnaireResponseItem[] = [];
-  if (childQItems.length > 0) {
-    const indexMap = mapQItemsIndex(qItem);
-    const qrItemsByIndex = getQrItemsIndex(childQItems, childQrItems, indexMap);
-
-    // Iterate child items
-    for (const [index, childQItem] of childQItems.entries()) {
-      const childQRItemOrItems = qrItemsByIndex[index];
-
-      const updatedChildQRItemOrItems = removeInternalRepeatIdsRecursive(
-        childQItem,
-        childQRItemOrItems ?? null
-      );
-
-      if (Array.isArray(updatedChildQRItemOrItems)) {
-        if (updatedChildQRItemOrItems.length > 0) {
-          updatedChildQrItems.push(...updatedChildQRItemOrItems);
-        }
-        continue;
-      }
-
-      if (updatedChildQRItemOrItems) {
-        updatedChildQrItems.push(updatedChildQRItemOrItems);
-      }
-    }
-  }
-
-  // Construct updated qrItem
-  return removeInternalRepeatIdsFromItem(qItem, qrItem, updatedChildQrItems);
-}
-
-function removeInternalRepeatIdsFromRepeatGroup(
-  qItem: QuestionnaireItem,
-  qrItems: QuestionnaireResponseItem[]
-) {
-  if (!qItem.item) {
-    return [];
-  }
-
-  return qrItems
-    .flatMap((childQrItem) => removeInternalRepeatIdsRecursive(qItem, childQrItem))
-    .filter((childQRItem): childQRItem is QuestionnaireResponseItem => !!childQRItem);
-}
-
-function removeInternalRepeatIdsFromItem(
-  qItem: QuestionnaireItem,
-  qrItem: QuestionnaireResponseItem | null,
-  childQrItems: QuestionnaireResponseItem[]
-): QuestionnaireResponseItem | null {
-  if (!qrItem) {
-    return null;
-  }
-
-  // Remove internal repeatId from all answers
-  const updatedAnswers: QuestionnaireResponseItemAnswer[] =
-    qrItem.answer
-      ?.map(
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        ({ id, ...rest }) => {
-          return {
-            ...rest
-          };
-        }
-      )
-      .filter((answer) => !!answer && Object.keys(answer).length > 0) ?? [];
-
-  return {
-    linkId: qItem.linkId,
-    ...(qItem.text && { text: qItem.text }),
-    ...(childQrItems.length > 0 && { item: childQrItems }),
-    ...(updatedAnswers.length > 0 && { answer: updatedAnswers })
-  };
-}

package/src/utils/repopulateItems.ts

@@ -22,9 +22,6 @@ import type {
   QuestionnaireResponseItem
 } from 'fhir/r4';
 import type { Tabs } from '../interfaces/tab.interface';
-import _isEqual from 'lodash/isEqual';
-import _intersection from 'lodash/intersection';
-import _difference from 'lodash/difference';
 import { containsTabs, isTabContainer } from './tabs';
 import { getShortText, isSpecificItemControl } from './itemControl';
 import { getQrItemsIndex, mapQItemsIndex } from './mapItem';
@@ -34,6 +31,9 @@ import { questionnaireResponseStore, questionnaireStore } from '../stores';
 import cloneDeep from 'lodash.clonedeep';
 import { createQuestionnaireResponseItemMap } from './questionnaireResponseStoreUtils/updatableResponseItems';
 import { getQuestionnaireItem, getSectionHeading } from './misc';
+import difference from 'lodash.difference';
+import intersection from 'lodash.intersection';
+import isEqual from 'lodash.isequal';
 
 /**
  * ItemToRepopulate interface
@@ -99,11 +99,11 @@ export function generateItemsToRepopulate(populatedResponse: QuestionnaireRespon
   // Get linkIds that are different between current QRItems and populated QRItems
   // Doesn't work with repeat groups, but at the same time I'm not sure if it's needed, given you can't delete completely the first repeat group
   const populatedResponseItemMap = createQuestionnaireResponseItemMap(populatedResponse);
-  const diffLinkIds = _difference(
+  const diffLinkIds = difference(
     Object.keys(updatableResponseItems),
     Object.keys(populatedResponseItemMap)
   );
-  const diffLinkIdsWithInitialExpressions = _intersection(
+  const diffLinkIdsWithInitialExpressions = intersection(
     Object.keys(initialExpressions),
     diffLinkIds
   );
@@ -468,7 +468,7 @@ function retrieveSingleOldQRItem(
     return;
   }
 
-  if (_isEqual(oldQRItem, newQRItem)) {
+  if (isEqual(oldQRItem, newQRItem)) {
     delete itemsToRepopulate[qItem.linkId];
     return;
   }
@@ -490,7 +490,7 @@ function retrieveRepeatGroupOldQRItems(
     return;
   }
 
-  if (_isEqual(oldQRItems, newQRItems)) {
+  if (isEqual(oldQRItems, newQRItems)) {
     delete itemsToRepopulate[qItem.linkId];
     return;
   }
@@ -535,7 +535,7 @@ function retrieveGridGroupOldQRItems(
       continue;
     }
 
-    if (_isEqual(oldGridChildQrItem, newGridChildQRItem)) {
+    if (isEqual(oldGridChildQrItem, newGridChildQRItem)) {
       newGridChildQRItemMap.delete(gridChildQItem.linkId);
     } else {
       oldGridChildQRItems.push(oldGridChildQrItem);

package/lib/hooks/useInitialiseGroupTable.d.ts

@@ -1,4 +0,0 @@
-import type { QuestionnaireResponseItem } from 'fhir/r4';
-import type { GroupTableRowModel } from '../interfaces/groupTable.interface';
-declare function useInitialiseGroupTable(linkId: string, qrItems: QuestionnaireResponseItem[]): GroupTableRowModel[];
-export default useInitialiseGroupTable;

package/lib/hooks/useInitialiseGroupTable.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useInitialiseGroupTable.js","sourceRoot":"","sources":["../../src/hooks/useInitialiseGroupTable.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAIH,OAAO,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAElF,SAAS,uBAAuB,CAC9B,MAAc,EACd,OAAoC;IAEpC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QACxB,OAAO,CAAC,EAAE,EAAE,EAAE,mBAAmB,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;KAC5D;IAED,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;QACnC,OAAO;YACL,EAAE,EAAE,wBAAwB,CAAC,MAAM,EAAE,KAAK,CAAC;YAC3C,MAAM;SACP,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,eAAe,uBAAuB,CAAC"}

package/lib/hooks/useNumberInput.d.ts

@@ -1,3 +0,0 @@
-import type { Dispatch, SetStateAction } from 'react';
-declare function useNumberInput(valueFromProps: number): [number, Dispatch<SetStateAction<number>>];
-export default useNumberInput;

package/lib/hooks/useNumberInput.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useNumberInput.js","sourceRoot":"","sources":["../../src/hooks/useNumberInput.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAE5C,SAAS,cAAc,CAAC,cAAsB;IAC5C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,cAAc,CAAC,CAAC;IAEnD,SAAS,CACP,GAAG,EAAE;QACH,IAAI,KAAK,KAAK,cAAc,EAAE;YAC5B,QAAQ,CAAC,cAAc,CAAC,CAAC;SAC1B;IACH,CAAC;IACD,iDAAiD;IACjD,uDAAuD;IACvD,CAAC,cAAc,CAAC,CACjB,CAAC;IAEF,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;AAC3B,CAAC;AAED,eAAe,cAAc,CAAC"}

package/lib/hooks/useRepeatGroups.d.ts

@@ -1,4 +0,0 @@
-import type { Dispatch, SetStateAction } from 'react';
-import type { RepeatGroupSingle } from '../interfaces/repeatGroup.interface';
-declare function useRepeatGroups(valueFromProps: RepeatGroupSingle[]): [RepeatGroupSingle[], Dispatch<SetStateAction<RepeatGroupSingle[]>>];
-export default useRepeatGroups;

package/lib/hooks/useRepeatGroups.js

@@ -1,38 +0,0 @@
-/*
- * 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 { useEffect, useState } from 'react';
-import _isEqual from 'lodash/isEqual';
-function useRepeatGroups(valueFromProps) {
-    const [repeatGroups, setRepeatGroups] = useState(valueFromProps);
-    useEffect(() => {
-        const valueFromPropsQRItems = valueFromProps
-            .map((repeatGroupSingle) => repeatGroupSingle.qrItem)
-            .filter((qrItem) => qrItem !== null);
-        const repeatGroupsQRItems = repeatGroups
-            .map((repeatGroupSingle) => repeatGroupSingle.qrItem)
-            .filter((qrItem) => qrItem !== null);
-        if (!_isEqual(valueFromPropsQRItems, repeatGroupsQRItems)) {
-            setRepeatGroups(valueFromProps);
-        }
-    }, 
-    // Only trigger this effect if prop value changes
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [valueFromProps]);
-    return [repeatGroups, setRepeatGroups];
-}
-export default useRepeatGroups;
-//# sourceMappingURL=useRepeatGroups.js.map

package/lib/hooks/useRepeatGroups.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useRepeatGroups.js","sourceRoot":"","sources":["../../src/hooks/useRepeatGroups.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAE5C,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AAGtC,SAAS,eAAe,CACtB,cAAmC;IAEnC,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,cAAc,CAAC,CAAC;IAEjE,SAAS,CACP,GAAG,EAAE;QACH,MAAM,qBAAqB,GAAG,cAAc;aACzC,GAAG,CAAC,CAAC,iBAAiB,EAAE,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC;aACpD,MAAM,CAAC,CAAC,MAAM,EAAuC,EAAE,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC;QAE5E,MAAM,mBAAmB,GAAG,YAAY;aACrC,GAAG,CAAC,CAAC,iBAAiB,EAAE,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC;aACpD,MAAM,CAAC,CAAC,MAAM,EAAuC,EAAE,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC;QAE5E,IAAI,CAAC,QAAQ,CAAC,qBAAqB,EAAE,mBAAmB,CAAC,EAAE;YACzD,eAAe,CAAC,cAAc,CAAC,CAAC;SACjC;IACH,CAAC;IACD,iDAAiD;IACjD,uDAAuD;IACvD,CAAC,cAAc,CAAC,CACjB,CAAC;IAEF,OAAO,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;AACzC,CAAC;AAED,eAAe,eAAe,CAAC"}

package/lib/hooks/useStringInput.d.ts

@@ -1,3 +0,0 @@
-import type { Dispatch, SetStateAction } from 'react';
-declare function useStringInput(valueFromProps: string): [string, Dispatch<SetStateAction<string>>];
-export default useStringInput;

package/lib/hooks/useStringInput.js

@@ -1,32 +0,0 @@
-/*
- * 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 { useEffect, useState } from 'react';
-// The purpose of this hook to sync the string state from external changes i.e. re-population changes etc.
-function useStringInput(valueFromProps) {
-    const [input, setInput] = useState(valueFromProps);
-    useEffect(() => {
-        if (input !== valueFromProps) {
-            setInput(valueFromProps);
-        }
-    }, 
-    // Only trigger this effect if prop value changes
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [valueFromProps]);
-    return [input, setInput];
-}
-export default useStringInput;
-//# sourceMappingURL=useStringInput.js.map

package/lib/hooks/useStringInput.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useStringInput.js","sourceRoot":"","sources":["../../src/hooks/useStringInput.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAE5C,0GAA0G;AAC1G,SAAS,cAAc,CAAC,cAAsB;IAC5C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,cAAc,CAAC,CAAC;IAEnD,SAAS,CACP,GAAG,EAAE;QACH,IAAI,KAAK,KAAK,cAAc,EAAE;YAC5B,QAAQ,CAAC,cAAc,CAAC,CAAC;SAC1B;IACH,CAAC;IACD,iDAAiD;IACjD,uDAAuD;IACvD,CAAC,cAAc,CAAC,CACjB,CAAC;IAEF,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;AAC3B,CAAC;AAED,eAAe,cAAc,CAAC"}

package/src/hooks/useNumberInput.ts

@@ -1,38 +0,0 @@
-/*
- * 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 { Dispatch, SetStateAction } from 'react';
-import { useEffect, useState } from 'react';
-
-function useNumberInput(valueFromProps: number): [number, Dispatch<SetStateAction<number>>] {
-  const [value, setValue] = useState(valueFromProps);
-
-  useEffect(
-    () => {
-      if (value !== valueFromProps) {
-        setValue(valueFromProps);
-      }
-    },
-    // Only trigger this effect if prop value changes
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [valueFromProps]
-  );
-
-  return [value, setValue];
-}
-
-export default useNumberInput;

package/src/hooks/useRepeatGroups.ts

@@ -1,51 +0,0 @@
-/*
- * 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 { Dispatch, SetStateAction } from 'react';
-import { useEffect, useState } from 'react';
-import type { RepeatGroupSingle } from '../interfaces/repeatGroup.interface';
-import _isEqual from 'lodash/isEqual';
-import type { QuestionnaireResponseItem } from 'fhir/r4';
-
-function useRepeatGroups(
-  valueFromProps: RepeatGroupSingle[]
-): [RepeatGroupSingle[], Dispatch<SetStateAction<RepeatGroupSingle[]>>] {
-  const [repeatGroups, setRepeatGroups] = useState(valueFromProps);
-
-  useEffect(
-    () => {
-      const valueFromPropsQRItems = valueFromProps
-        .map((repeatGroupSingle) => repeatGroupSingle.qrItem)
-        .filter((qrItem): qrItem is QuestionnaireResponseItem => qrItem !== null);
-
-      const repeatGroupsQRItems = repeatGroups
-        .map((repeatGroupSingle) => repeatGroupSingle.qrItem)
-        .filter((qrItem): qrItem is QuestionnaireResponseItem => qrItem !== null);
-
-      if (!_isEqual(valueFromPropsQRItems, repeatGroupsQRItems)) {
-        setRepeatGroups(valueFromProps);
-      }
-    },
-    // Only trigger this effect if prop value changes
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [valueFromProps]
-  );
-
-  return [repeatGroups, setRepeatGroups];
-}
-
-export default useRepeatGroups;

package/src/hooks/useStringInput.ts

@@ -1,39 +0,0 @@
-/*
- * 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 { Dispatch, SetStateAction } from 'react';
-import { useEffect, useState } from 'react';
-
-// The purpose of this hook to sync the string state from external changes i.e. re-population changes etc.
-function useStringInput(valueFromProps: string): [string, Dispatch<SetStateAction<string>>] {
-  const [input, setInput] = useState(valueFromProps);
-
-  useEffect(
-    () => {
-      if (input !== valueFromProps) {
-        setInput(valueFromProps);
-      }
-    },
-    // Only trigger this effect if prop value changes
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [valueFromProps]
-  );
-
-  return [input, setInput];
-}
-
-export default useStringInput;