@aehrc/smart-forms-renderer 0.8.1 → 0.9.0

package/lib/utils/repopulateItems.js

@@ -16,10 +16,12 @@
  */
 import _isEqual from 'lodash/isEqual';
 import { containsTabs, isTabContainer } from './tabs';
-import { getShortText } from './itemControl';
-import { checkIsRepeatGroupToRepopulate, getRepeatGroupToRepopulate } from './repopulateRepeatGroup';
-export function getItemsToRepopulate(sourceQuestionnaire, itemTypes, tabs, populatedResponse, updatableResponse) {
+import { getShortText, isSpecificItemControl } from './itemControl';
+import { getQrItemsIndex, mapQItemsIndex } from './mapItem';
+import { isHidden } from './qItem';
+export function getItemsToRepopulate(params) {
     var _a;
+    const { sourceQuestionnaire, tabs, populatedResponse, updatableResponse, enableWhenIsActivated, enableWhenItems, enableWhenExpressions } = params;
     if (!sourceQuestionnaire.item ||
         sourceQuestionnaire.item.length === 0 ||
         !populatedResponse.item ||
@@ -28,27 +30,37 @@ export function getItemsToRepopulate(sourceQuestionnaire, itemTypes, tabs, popul
         updatableResponse.item.length === 0) {
         return {};
     }
-    const populatedItems = [];
-    for (const topLevelItem of populatedResponse.item) {
-        populatedItems.push(...getPopulatedItemsRecursive(topLevelItem, itemTypes));
-    }
-    const itemsToRepopulate = populatedItems.reduce((mapping, item) => {
-        mapping[item.linkId] = {
-            qItem: null,
-            heading: null,
-            newQRItem: item
-        };
-        return mapping;
-    }, {});
-    // Get corresponding old items from updatableResponse if they are different
-    for (const topLevelItem of updatableResponse.item) {
-        checkCorrespondingOldItemsRecursive(topLevelItem, itemTypes, itemsToRepopulate);
-    }
-    // Get corresponding old items from updatableResponse if they are different
-    for (const topLevelItem of sourceQuestionnaire.item) {
-        const heading = (_a = topLevelItem.text) !== null && _a !== void 0 ? _a : null;
-        const hasTabs = isTabContainer(topLevelItem) || containsTabs(topLevelItem);
-        getCorrespondingQuestionnaireItemsRecursive(topLevelItem, heading, tabs, hasTabs, itemsToRepopulate);
+    const topLevelQItems = sourceQuestionnaire.item;
+    const populatedTopLevelQRItems = populatedResponse.item;
+    const qItemsIndexMap = mapQItemsIndex(sourceQuestionnaire);
+    const populatedTopLevelQRItemsByIndex = getQrItemsIndex(topLevelQItems, populatedTopLevelQRItems, qItemsIndexMap);
+    const itemsToRepopulate = {};
+    for (const [index, topLevelQItem] of topLevelQItems.entries()) {
+        const populatedQrItemOrItems = populatedTopLevelQRItemsByIndex[index];
+        if (!populatedQrItemOrItems) {
+            continue;
+        }
+        const heading = (_a = topLevelQItem.text) !== null && _a !== void 0 ? _a : null;
+        const hasTabs = isTabContainer(topLevelQItem) || containsTabs(topLevelQItem);
+        getItemsToRepopulateRecursive({
+            qItem: topLevelQItem,
+            qrItemOrItems: populatedQrItemOrItems,
+            heading,
+            tabs,
+            hasTabs,
+            itemsToRepopulate,
+            enableWhenIsActivated,
+            enableWhenItems,
+            enableWhenExpressions
+        });
+    }
+    const oldTopLevelQRItemsByIndex = getQrItemsIndex(topLevelQItems, updatableResponse.item, qItemsIndexMap);
+    for (const [index, topLevelQItem] of topLevelQItems.entries()) {
+        const oldQrItemOrItems = oldTopLevelQRItemsByIndex[index];
+        if (!oldQrItemOrItems) {
+            continue;
+        }
+        checkCorrespondingOldItemsRecursive(topLevelQItem, oldQrItemOrItems, itemsToRepopulate);
     }
     return itemsToRepopulate;
 }
@@ -57,74 +69,243 @@ export function getItemsToRepopulate(sourceQuestionnaire, itemTypes, tabs, popul
 // 3. Compare old and new items in dialog - if there are none, show a dialog saying there is no new data
 // 4. Have checkboxes in dialog to update response
 // 5. Replace old answers with new answers
-function getCorrespondingQuestionnaireItemsRecursive(qItem, heading, tabs, hasTabs, itemsToRepopulate) {
+function getItemsToRepopulateRecursive(params) {
     var _a, _b;
-    if (qItem.type === 'group' && qItem.item && qItem.item.length > 0) {
+    const { qItem, qrItemOrItems, tabs, hasTabs, itemsToRepopulate, enableWhenIsActivated, enableWhenItems, enableWhenExpressions } = params;
+    let { heading } = params;
+    if (!qrItemOrItems) {
+        return;
+    }
+    // Return nothing if corresponding qItem is hidden
+    if (isHidden({
+        questionnaireItem: qItem,
+        enableWhenIsActivated,
+        enableWhenItems,
+        enableWhenExpressions
+    })) {
+        return null;
+    }
+    // For repeat groups
+    const hasMultipleAnswers = Array.isArray(qrItemOrItems);
+    if (hasMultipleAnswers) {
+        if (qrItemOrItems.length > 0) {
+            getRepeatGroupToRepopulate(qItem, qrItemOrItems, heading, itemsToRepopulate);
+        }
+        return;
+    }
+    const childQItems = qItem.item;
+    const childQRItems = qrItemOrItems.item;
+    if (childQItems && childQItems.length > 0 && childQRItems) {
         const isTab = !!tabs[qItem.linkId];
         if (isTab) {
             heading = (_b = (_a = getShortText(qItem)) !== null && _a !== void 0 ? _a : qItem.text) !== null && _b !== void 0 ? _b : null;
         }
-        // TODO it seems like there can only be one answer per linkId, we might need to do repeat groups differently
-        /* Repeat group implementation */
-        if (qItem.type === 'group' && qItem.repeats) {
-            const isRepeatGroupToRepopulate = checkIsRepeatGroupToRepopulate(qItem, itemsToRepopulate);
-            if (isRepeatGroupToRepopulate) {
-                const repeatGroupToRepopulate = getRepeatGroupToRepopulate(qItem, itemsToRepopulate);
-                if (repeatGroupToRepopulate) {
-                    itemsToRepopulate[qItem.linkId] = repeatGroupToRepopulate;
-                    return;
-                }
+        const qItemsIndexMap = mapQItemsIndex(qItem);
+        const populatedQRItemsByIndex = getQrItemsIndex(childQItems, childQRItems, qItemsIndexMap);
+        // For grid groups
+        const itemIsGrid = isSpecificItemControl(qItem, 'grid');
+        if (itemIsGrid) {
+            getGridTableToRepopulate({
+                qItem,
+                gridChildQItems: childQItems,
+                gridChildQRItemsByIndex: populatedQRItemsByIndex,
+                heading,
+                itemsToRepopulate,
+                enableWhenIsActivated,
+                enableWhenItems,
+                enableWhenExpressions
+            });
+            return;
+        }
+        // For normal groups with children
+        for (const [index, childQItem] of childQItems.entries()) {
+            const childQrItemOrItems = populatedQRItemsByIndex[index];
+            if (!childQrItemOrItems) {
+                continue;
             }
+            getItemsToRepopulateRecursive({
+                qItem: childQItem,
+                qrItemOrItems: childQrItemOrItems,
+                heading,
+                tabs,
+                hasTabs,
+                itemsToRepopulate,
+                enableWhenIsActivated,
+                enableWhenItems,
+                enableWhenExpressions
+            });
         }
-        // /* Grid implementation */
-        // if (qItem.type === 'group' && isSpecificItemControl(qItem, 'grid')) {
-        //   const isRepeatGroupToRepopulate = checkIsRepeatGroupToRepopulate(qItem, itemsToRepopulate);
-        //   if (isRepeatGroupToRepopulate) {
-        //     getRepeatGroupToRepopulate(qItem, itemsToRepopulate);
-        //   }
-        // }
-        for (const childItem of qItem.item) {
-            getCorrespondingQuestionnaireItemsRecursive(childItem, heading, tabs, hasTabs, itemsToRepopulate);
+        const hasSingleAnswer = !Array.isArray(qrItemOrItems);
+        if (hasSingleAnswer && qrItemOrItems.answer) {
+            getSingleItemToRepopulate(qItem, qrItemOrItems, heading, itemsToRepopulate);
         }
         return;
     }
-    if (!itemsToRepopulate[qItem.linkId]) {
+    // For single items without children
+    getSingleItemToRepopulate(qItem, qrItemOrItems, heading, itemsToRepopulate);
+}
+function getSingleItemToRepopulate(qItem, qrItem, heading, itemsToRepopulate) {
+    itemsToRepopulate[qItem.linkId] = {
+        qItem: qItem,
+        heading: heading,
+        newQRItem: qrItem,
+        newQRItems: []
+    };
+}
+function getRepeatGroupToRepopulate(qItem, qrItems, heading, itemsToRepopulate) {
+    itemsToRepopulate[qItem.linkId] = {
+        qItem: qItem,
+        heading: heading,
+        newQRItem: {
+            linkId: qItem.linkId
+        },
+        newQRItems: qrItems
+    };
+}
+function getGridTableToRepopulate(params) {
+    const { qItem, gridChildQItems, gridChildQRItemsByIndex, heading, itemsToRepopulate, enableWhenIsActivated, enableWhenItems, enableWhenExpressions } = params;
+    if (gridChildQItems.length === 0) {
         return;
     }
-    itemsToRepopulate[qItem.linkId].qItem = qItem;
-    itemsToRepopulate[qItem.linkId].heading = heading;
+    const gridChildQRItemsToRepopulate = gridChildQItems
+        .map((qItem, index) => {
+        if (isHidden({
+            questionnaireItem: qItem,
+            enableWhenIsActivated,
+            enableWhenItems,
+            enableWhenExpressions
+        })) {
+            return null;
+        }
+        const gridChildQrItemOrItems = gridChildQRItemsByIndex === null || gridChildQRItemsByIndex === void 0 ? void 0 : gridChildQRItemsByIndex[index];
+        if (gridChildQrItemOrItems && !Array.isArray(gridChildQrItemOrItems)) {
+            return gridChildQrItemOrItems;
+        }
+        return null;
+    })
+        .filter((item) => item !== null);
+    itemsToRepopulate[qItem.linkId] = {
+        qItem: qItem,
+        heading: heading,
+        newQRItem: {
+            linkId: qItem.linkId,
+            text: qItem.text,
+            item: gridChildQRItemsToRepopulate
+        },
+        newQRItems: []
+    };
 }
-function getPopulatedItemsRecursive(qrItem, itemTypes) {
-    const itemType = itemTypes[qrItem.linkId];
-    if (itemType === 'group' && qrItem.item && qrItem.item.length > 0) {
-        const populatedChildItems = [];
-        for (const childItem of qrItem.item) {
-            populatedChildItems.push(...getPopulatedItemsRecursive(childItem, itemTypes));
+function checkCorrespondingOldItemsRecursive(qItem, oldQrItemOrItems, itemsToRepopulate) {
+    // For repeat groups
+    const hasMultipleAnswers = Array.isArray(oldQrItemOrItems);
+    if (hasMultipleAnswers) {
+        retrieveRepeatGroupOldQRItems(qItem, oldQrItemOrItems, itemsToRepopulate);
+        return;
+    }
+    const childQItems = qItem.item;
+    const oldChildQRItems = oldQrItemOrItems.item;
+    if (childQItems && childQItems.length > 0 && oldChildQRItems) {
+        const qItemsIndexMap = mapQItemsIndex(qItem);
+        const oldQRItemsByIndex = getQrItemsIndex(childQItems, oldChildQRItems, qItemsIndexMap);
+        // For grid groups
+        const itemIsGrid = isSpecificItemControl(qItem, 'grid');
+        if (itemIsGrid) {
+            retrieveGridGroupOldQRItems(qItem, childQItems, oldQRItemsByIndex, itemsToRepopulate);
+            return;
+        }
+        // For normal groups with children
+        for (const [index, childQItem] of childQItems.entries()) {
+            const oldChildQrItemOrItems = oldQRItemsByIndex[index];
+            if (!oldChildQrItemOrItems) {
+                continue;
+            }
+            checkCorrespondingOldItemsRecursive(childQItem, oldChildQrItemOrItems, itemsToRepopulate);
         }
-        return populatedChildItems;
+        const hasSingleAnswer = !Array.isArray(oldQrItemOrItems);
+        if (hasSingleAnswer && oldQrItemOrItems.answer) {
+            retrieveSingleOldQRItem(qItem, oldQrItemOrItems, itemsToRepopulate);
+        }
+        return;
     }
-    // record item if it is not a group item
-    return [qrItem];
+    // For single items without children
+    retrieveSingleOldQRItem(qItem, oldQrItemOrItems, itemsToRepopulate);
 }
-function checkCorrespondingOldItemsRecursive(qrItem, itemTypes, itemsToRepopulate) {
+function retrieveSingleOldQRItem(qItem, oldQRItem, itemsToRepopulate) {
     var _a;
-    const itemType = itemTypes[qrItem.linkId];
-    if (itemType === 'group' && qrItem.item && qrItem.item.length > 0) {
-        for (const childItem of qrItem.item) {
-            checkCorrespondingOldItemsRecursive(childItem, itemTypes, itemsToRepopulate);
-        }
+    const newQRItem = (_a = itemsToRepopulate[qItem.linkId]) === null || _a === void 0 ? void 0 : _a.newQRItem;
+    if (!newQRItem) {
+        return;
+    }
+    if (_isEqual(oldQRItem, newQRItem)) {
+        delete itemsToRepopulate[qItem.linkId];
         return;
     }
-    const oldItem = qrItem;
-    const newItem = (_a = itemsToRepopulate[qrItem.linkId]) === null || _a === void 0 ? void 0 : _a.newQRItem;
-    if (!newItem) {
+    itemsToRepopulate[qItem.linkId].oldQRItem = oldQRItem;
+}
+function retrieveRepeatGroupOldQRItems(qItem, oldQRItems, itemsToRepopulate) {
+    var _a;
+    if (!(qItem && oldQRItems && oldQRItems.length > 0)) {
         return;
     }
-    if (_isEqual(oldItem, newItem)) {
-        delete itemsToRepopulate[qrItem.linkId];
+    const newQRItems = (_a = itemsToRepopulate[qItem.linkId]) === null || _a === void 0 ? void 0 : _a.newQRItems;
+    if (!newQRItems) {
+        return;
+    }
+    if (_isEqual(oldQRItems, newQRItems)) {
+        delete itemsToRepopulate[qItem.linkId];
+        return;
+    }
+    itemsToRepopulate[qItem.linkId].oldQRItems = oldQRItems;
+}
+function retrieveGridGroupOldQRItems(qItem, gridChildQItems, oldGridQRItemsByIndex, itemsToRepopulate) {
+    var _a;
+    if (gridChildQItems.length === 0) {
+        return;
+    }
+    const newGridQRItem = (_a = itemsToRepopulate[qItem.linkId]) === null || _a === void 0 ? void 0 : _a.newQRItem;
+    if (!newGridQRItem || !newGridQRItem.item) {
+        return;
+    }
+    const newGridChildQRItemMap = new Map();
+    for (const newGridChildQRItem of newGridQRItem.item) {
+        newGridChildQRItemMap.set(newGridChildQRItem.linkId, newGridChildQRItem);
+    }
+    // Get old qr items that are different from the new qr items
+    const oldGridChildQRItems = [];
+    for (const [index, gridChildQItem] of gridChildQItems.entries()) {
+        const oldGridChildQrItemOrItems = oldGridQRItemsByIndex[index];
+        if (!oldGridChildQrItemOrItems || Array.isArray(oldGridChildQrItemOrItems)) {
+            continue;
+        }
+        // At this point we have a single qrItem
+        const oldGridChildQrItem = oldGridChildQrItemOrItems;
+        const newGridChildQRItem = newGridChildQRItemMap.get(gridChildQItem.linkId);
+        if (!newGridChildQRItem) {
+            continue;
+        }
+        if (_isEqual(oldGridChildQrItem, newGridChildQRItem)) {
+            newGridChildQRItemMap.delete(gridChildQItem.linkId);
+        }
+        else {
+            oldGridChildQRItems.push(oldGridChildQrItem);
+        }
+    }
+    const newGridChildQRItemsToRepopulate = [...newGridChildQRItemMap.values()];
+    // Nothing to repopulate, delete whole item
+    if (newGridChildQRItemsToRepopulate.length === 0) {
+        delete itemsToRepopulate[qItem.linkId];
         return;
     }
-    // const filteredNewItems = newItems.filter((newItem) => !_isEqual(oldItem, newItem));
-    itemsToRepopulate[qrItem.linkId].oldQRItem = oldItem;
+    // Otherwise create both old and new grid qr item
+    itemsToRepopulate[qItem.linkId].newQRItem = {
+        linkId: qItem.linkId,
+        text: qItem.text,
+        item: newGridChildQRItemsToRepopulate
+    };
+    itemsToRepopulate[qItem.linkId].oldQRItem = {
+        linkId: qItem.linkId,
+        text: qItem.text,
+        item: oldGridChildQRItems
+    };
 }
 //# sourceMappingURL=repopulateItems.js.map

package/lib/utils/repopulateItems.js.map

@@ -1 +1 @@
-{"version":3,"file":"repopulateItems.js","sourceRoot":"","sources":["../../src/utils/repopulateItems.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"repopulateItems.js","sourceRoot":"","sources":["../../src/utils/repopulateItems.ts"],"names":[],"mappings":"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"}

package/lib/utils/repopulateRepeatGroup.js

@@ -30,8 +30,14 @@ export function getRepeatGroupToRepopulate(qItem, itemsToRepopulate) {
         return null;
     }
     const childLinkIds = qItem.item
-        .filter((childItem) => !!itemsToRepopulate[childItem.linkId])
+        // .filter((childItem) => !!itemsToRepopulate[childItem.linkId])
         .map((childItem) => childItem.linkId);
+    console.log(childLinkIds);
+    const aggr = childLinkIds
+        .map((linkId) => itemsToRepopulate[linkId])
+        .map((itemToRepopulate) => itemToRepopulate.newQRItems);
+    console.log(aggr);
+    // TODO ok good progress but how do we know to map sprased answers
     const childQRItemsToRepopulate = childLinkIds
         .reduce((result, linkId) => {
         if (itemsToRepopulate[linkId]) {
@@ -40,6 +46,8 @@ export function getRepeatGroupToRepopulate(qItem, itemsToRepopulate) {
         return result;
     }, [])
         .map((itemToRepopulate) => itemToRepopulate.newQRItem);
+    // console.log(cloneDeep(childQRItemsToRepopulate));
+    console.log(childQRItemsToRepopulate);
     const repeatGroupToRepopulate = {
         heading: (_a = qItem.text) !== null && _a !== void 0 ? _a : null,
         qItem: qItem,

package/lib/utils/repopulateRepeatGroup.js.map

@@ -1 +1 @@
-{"version":3,"file":"repopulateRepeatGroup.js","sourceRoot":"","sources":["../../src/utils/repopulateRepeatGroup.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAKH,MAAM,UAAU,8BAA8B,CAC5C,KAAwB,EACxB,iBAAmD;IAEnD,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;QACf,OAAO,KAAK,CAAC;KACd;IAED,KAAK,MAAM,SAAS,IAAI,KAAK,CAAC,IAAI,EAAE;QAClC,IAAI,iBAAiB,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE;YACvC,OAAO,IAAI,CAAC;SACb;KACF;AACH,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,KAAwB,EACxB,iBAAmD;;IAEnD,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;QACf,OAAO,IAAI,CAAC;KACb;IAED,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI;SAC5B,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;SAC5D,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAExC,MAAM,wBAAwB,GAAG,YAAY;SAC1C,MAAM,CAAC,CAAC,MAA0B,EAAE,MAAM,EAAE,EAAE;QAC7C,IAAI,iBAAiB,CAAC,MAAM,CAAC,EAAE;YAC7B,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;SACxC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,EAAE,EAAE,CAAC;SACL,GAAG,CAAC,CAAC,gBAAgB,EAAE,EAAE,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;IAEzD,MAAM,uBAAuB,GAAqB;QAChD,OAAO,EAAE,MAAA,KAAK,CAAC,IAAI,mCAAI,IAAI;QAC3B,KAAK,EAAE,KAAK;QACZ,SAAS,EAAE;YACT,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,IAAI,EAAE,wBAAwB;SAC/B;KACF,CAAC;IAEF,OAAO,uBAAuB,CAAC;AACjC,CAAC"}
+{"version":3,"file":"repopulateRepeatGroup.js","sourceRoot":"","sources":["../../src/utils/repopulateRepeatGroup.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAKH,MAAM,UAAU,8BAA8B,CAC5C,KAAwB,EACxB,iBAAmD;IAEnD,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;QACf,OAAO,KAAK,CAAC;KACd;IAED,KAAK,MAAM,SAAS,IAAI,KAAK,CAAC,IAAI,EAAE;QAClC,IAAI,iBAAiB,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE;YACvC,OAAO,IAAI,CAAC;SACb;KACF;AACH,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,KAAwB,EACxB,iBAAmD;;IAEnD,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;QACf,OAAO,IAAI,CAAC;KACb;IAED,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI;QAC7B,gEAAgE;SAC/D,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAExC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAE1B,MAAM,IAAI,GAAG,YAAY;SACtB,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;SAC1C,GAAG,CAAC,CAAC,gBAAgB,EAAE,EAAE,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;IAE1D,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAClB,kEAAkE;IAElE,MAAM,wBAAwB,GAAG,YAAY;SAC1C,MAAM,CAAC,CAAC,MAA0B,EAAE,MAAM,EAAE,EAAE;QAC7C,IAAI,iBAAiB,CAAC,MAAM,CAAC,EAAE;YAC7B,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;SACxC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,EAAE,EAAE,CAAC;SACL,GAAG,CAAC,CAAC,gBAAgB,EAAE,EAAE,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;IAEzD,oDAAoD;IACpD,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IAEtC,MAAM,uBAAuB,GAAqB;QAChD,OAAO,EAAE,MAAA,KAAK,CAAC,IAAI,mCAAI,IAAI;QAC3B,KAAK,EAAE,KAAK;QACZ,SAAS,EAAE;YACT,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,IAAI,EAAE,wBAAwB;SAC/B;KACF,CAAC;IAEF,OAAO,uBAAuB,CAAC;AACjC,CAAC"}

package/lib/utils/slider.d.ts

@@ -0,0 +1,28 @@
+import type { QuestionnaireItem } from 'fhir/r4';
+/**
+ * Get Questionnaire slider step value if its extension is present (http://hl7.org/fhir/StructureDefinition/questionnaire-sliderStepValue)
+ *
+ * @author Sean Fong
+ */
+export declare function getSliderStepValue(qItem: QuestionnaireItem): number | null;
+/**
+ * Get minimum value if its extension is present (http://hl7.org/fhir/StructureDefinition/minValue)
+ * Only supports valueInteger and valueDecimal for now
+ *
+ * @author Sean Fong
+ */
+export declare function getMinValue(qItem: QuestionnaireItem): number | null;
+/**
+ * Get maximum value if its extension is present (http://hl7.org/fhir/StructureDefinition/maxValue)
+ * Only supports valueInteger and valueDecimal for now
+ *
+ * @author Sean Fong
+ */
+export declare function getMaxValue(qItem: QuestionnaireItem): number | null;
+export declare function getSliderMarks(minValue: number, maxValue: number, minLabel: string, maxLabel: string, stepValue: number): {
+    value: number;
+    label: number;
+}[] | {
+    value: number;
+    label: string;
+}[];

package/lib/utils/slider.js

@@ -0,0 +1,89 @@
+/*
+ * Copyright 2023 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.
+ */
+/**
+ * Get Questionnaire slider step value if its extension is present (http://hl7.org/fhir/StructureDefinition/questionnaire-sliderStepValue)
+ *
+ * @author Sean Fong
+ */
+export function getSliderStepValue(qItem) {
+    var _a;
+    const itemControl = (_a = qItem.extension) === null || _a === void 0 ? void 0 : _a.find((extension) => extension.url === 'http://hl7.org/fhir/StructureDefinition/questionnaire-sliderStepValue');
+    if (itemControl) {
+        if (itemControl.valueInteger) {
+            return itemControl.valueInteger;
+        }
+    }
+    return null;
+}
+/**
+ * Get minimum value if its extension is present (http://hl7.org/fhir/StructureDefinition/minValue)
+ * Only supports valueInteger and valueDecimal for now
+ *
+ * @author Sean Fong
+ */
+export function getMinValue(qItem) {
+    var _a;
+    const itemControl = (_a = qItem.extension) === null || _a === void 0 ? void 0 : _a.find((extension) => extension.url === 'http://hl7.org/fhir/StructureDefinition/minValue');
+    if (itemControl) {
+        if (itemControl.valueInteger) {
+            return itemControl.valueInteger;
+        }
+        if (itemControl.valueDecimal) {
+            return itemControl.valueDecimal;
+        }
+    }
+    return null;
+}
+/**
+ * Get maximum value if its extension is present (http://hl7.org/fhir/StructureDefinition/maxValue)
+ * Only supports valueInteger and valueDecimal for now
+ *
+ * @author Sean Fong
+ */
+export function getMaxValue(qItem) {
+    var _a;
+    const itemControl = (_a = qItem.extension) === null || _a === void 0 ? void 0 : _a.find((extension) => extension.url === 'http://hl7.org/fhir/StructureDefinition/maxValue');
+    if (itemControl) {
+        if (itemControl.valueInteger) {
+            return itemControl.valueInteger;
+        }
+        if (itemControl.valueDecimal) {
+            return itemControl.valueDecimal;
+        }
+    }
+    return null;
+}
+export function getSliderMarks(minValue, maxValue, minLabel, maxLabel, stepValue) {
+    const numOfSteps = Math.ceil((maxValue - minValue) / stepValue);
+    if (numOfSteps > 20) {
+        return [
+            {
+                value: minValue,
+                label: minLabel !== '' ? minLabel : minValue.toString()
+            },
+            {
+                value: maxValue,
+                label: maxLabel !== '' ? maxLabel : maxValue.toString()
+            }
+        ];
+    }
+    return Array.from({ length: numOfSteps + 1 }, (_, i) => minValue + i * stepValue).map((value) => ({
+        value: value,
+        label: value
+    }));
+}
+//# sourceMappingURL=slider.js.map

package/lib/utils/slider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"slider.js","sourceRoot":"","sources":["../../src/utils/slider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAIH;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAC,KAAwB;;IACzD,MAAM,WAAW,GAAG,MAAA,KAAK,CAAC,SAAS,0CAAE,IAAI,CACvC,CAAC,SAAoB,EAAE,EAAE,CACvB,SAAS,CAAC,GAAG,KAAK,uEAAuE,CAC5F,CAAC;IAEF,IAAI,WAAW,EAAE;QACf,IAAI,WAAW,CAAC,YAAY,EAAE;YAC5B,OAAO,WAAW,CAAC,YAAY,CAAC;SACjC;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,WAAW,CAAC,KAAwB;;IAClD,MAAM,WAAW,GAAG,MAAA,KAAK,CAAC,SAAS,0CAAE,IAAI,CACvC,CAAC,SAAoB,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,KAAK,kDAAkD,CAC/F,CAAC;IAEF,IAAI,WAAW,EAAE;QACf,IAAI,WAAW,CAAC,YAAY,EAAE;YAC5B,OAAO,WAAW,CAAC,YAAY,CAAC;SACjC;QAED,IAAI,WAAW,CAAC,YAAY,EAAE;YAC5B,OAAO,WAAW,CAAC,YAAY,CAAC;SACjC;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,WAAW,CAAC,KAAwB;;IAClD,MAAM,WAAW,GAAG,MAAA,KAAK,CAAC,SAAS,0CAAE,IAAI,CACvC,CAAC,SAAoB,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,KAAK,kDAAkD,CAC/F,CAAC;IAEF,IAAI,WAAW,EAAE;QACf,IAAI,WAAW,CAAC,YAAY,EAAE;YAC5B,OAAO,WAAW,CAAC,YAAY,CAAC;SACjC;QAED,IAAI,WAAW,CAAC,YAAY,EAAE;YAC5B,OAAO,WAAW,CAAC,YAAY,CAAC;SACjC;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,QAAgB,EAChB,QAAgB,EAChB,QAAgB,EAChB,QAAgB,EAChB,SAAiB;IAEjB,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,GAAG,QAAQ,CAAC,GAAG,SAAS,CAAC,CAAC;IAChE,IAAI,UAAU,GAAG,EAAE,EAAE;QACnB,OAAO;YACL;gBACE,KAAK,EAAE,QAAQ;gBACf,KAAK,EAAE,QAAQ,KAAK,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE;aACxD;YACD;gBACE,KAAK,EAAE,QAAQ;gBACf,KAAK,EAAE,QAAQ,KAAK,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE;aACxD;SACF,CAAC;KACH;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,UAAU,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,QAAQ,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,CACnF,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACV,KAAK,EAAE,KAAK;QACZ,KAAK,EAAE,KAAK;KACb,CAAC,CACH,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aehrc/smart-forms-renderer",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "description": "FHIR Structured Data Captured (SDC) rendering engine for Smart Forms",
   "main": "lib/index.js",
   "scripts": {
@@ -23,19 +23,19 @@
   },
   "homepage": "https://github.com/aehrc/smart-forms#readme",
   "dependencies": {
-    "deep-diff": "^1.0.2",
+    "@aehrc/sdc-assemble": "^1.0.2",
     "@iconify/react": "^4.1.1",
+    "@types/fhir": "^0.0.37",
     "dayjs": "^1.11.10",
+    "deep-diff": "^1.0.2",
     "fhirclient": "^2.5.2",
-    "fhirpath": "^3.6.1",
+    "fhirpath": "^3.7.1",
     "html-react-parser": "^4.2.0",
     "lodash.clonedeep": "^4.5.0",
     "lodash.debounce": "^4.0.8",
     "nanoid": "^5.0.1",
-    "@types/fhir": "^0.0.37",
-    "zustand": "^4.4.1",
     "react-markdown": "^8.0.7",
-    "@aehrc/sdc-assemble": "^1.0.2"
+    "zustand": "^4.4.1"
   },
   "peerDependencies": {
     "@emotion/react": ">=11.11.0",
@@ -51,7 +51,7 @@
   "devDependencies": {
     "@babel/core": "^7.23.0",
     "@storybook/addon-essentials": "^7.4.6",
-    "@storybook/addon-interactions": "^7.4.3",
+    "@storybook/addon-interactions": "^7.4.6",
     "@storybook/addon-links": "^7.4.0",
     "@storybook/addon-onboarding": "^1.0.8",
     "@storybook/addon-styling": "^1.3.7",
@@ -62,12 +62,14 @@
     "@testing-library/jest-dom": "^6.1.2",
     "@testing-library/react": "^14.0.0",
     "@testing-library/react-hooks": "^7.0.2",
+    "@types/deep-diff": "^1.0.4",
     "@types/jest": "^29.5.5",
-    "@types/deep-diff": "^1.0.3",
+    "@types/lodash.debounce": "^4.0.7",
+    "@types/lodash.clonedeep": "^4.5.7",
     "@types/react": "^18.2.18",
     "@types/react-dom": "^18.2.9",
     "jest": "^29.7.0",
-    "jest-environment-jsdom": "^29.6.4",
+    "jest-environment-jsdom": "^29.7.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "storybook": "^7.4.5",

package/src/components/FormComponents/BooleanItem/BooleanItem.tsx

@@ -32,12 +32,12 @@ import Box from '@mui/material/Box';
 import useReadOnly from '../../../hooks/useReadOnly';
 
 interface BooleanItemProps
-  extends PropsWithQrItemChangeHandler<QuestionnaireResponseItem>,
+  extends PropsWithQrItemChangeHandler,
     PropsWithIsRepeatedAttribute,
     PropsWithIsTabledAttribute,
     PropsWithParentIsReadOnlyAttribute {
   qItem: QuestionnaireItem;
-  qrItem: QuestionnaireResponseItem;
+  qrItem: QuestionnaireResponseItem | null;
 }
 
 function BooleanItem(props: BooleanItemProps) {