@aehrc/smart-forms-renderer 1.0.0-alpha.57 → 1.0.0-alpha.59
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/components/FormComponents/Tables/GroupTable.js +11 -2
- package/lib/components/FormComponents/Tables/GroupTable.js.map +1 -1
- package/lib/components/FormComponents/Tables/GroupTableBody.d.ts +1 -0
- package/lib/components/FormComponents/Tables/GroupTableBody.js +2 -2
- package/lib/components/FormComponents/Tables/GroupTableBody.js.map +1 -1
- package/lib/components/FormComponents/Tables/GroupTableRow.d.ts +1 -0
- package/lib/components/FormComponents/Tables/GroupTableRow.js +3 -3
- package/lib/components/FormComponents/Tables/GroupTableRow.js.map +1 -1
- package/lib/components/FormComponents/Tables/GroupTableRowCell.d.ts +9 -0
- package/lib/components/FormComponents/Tables/GroupTableRowCell.js +15 -0
- package/lib/components/FormComponents/Tables/GroupTableRowCell.js.map +1 -0
- package/lib/components/FormComponents/Tables/GroupTableRowCells.d.ts +1 -0
- package/lib/components/FormComponents/Tables/GroupTableRowCells.js +10 -4
- package/lib/components/FormComponents/Tables/GroupTableRowCells.js.map +1 -1
- package/lib/components/FormComponents/Tables/GroupTableView.d.ts +1 -1
- package/lib/components/FormComponents/Tables/GroupTableView.js +5 -5
- package/lib/components/FormComponents/Tables/GroupTableView.js.map +1 -1
- package/lib/components/FormComponents/Textfield.styles.js +8 -1
- package/lib/components/FormComponents/Textfield.styles.js.map +1 -1
- package/lib/utils/qItem.d.ts +8 -0
- package/lib/utils/qItem.js +26 -0
- package/lib/utils/qItem.js.map +1 -1
- package/package.json +4 -4
- package/src/components/FormComponents/Tables/GroupTable.tsx +22 -3
- package/src/components/FormComponents/Tables/GroupTableBody.tsx +3 -0
- package/src/components/FormComponents/Tables/GroupTableRow.tsx +4 -0
- package/src/components/FormComponents/Tables/GroupTableRowCells.tsx +19 -4
- package/src/components/FormComponents/Tables/GroupTableView.tsx +16 -12
- package/src/components/FormComponents/Textfield.styles.ts +8 -1
- package/src/utils/qItem.ts +38 -0
|
@@ -33,6 +33,8 @@ import useGroupTableRows from '../../../hooks/useGroupTableRows';
|
|
|
33
33
|
import { flushSync } from 'react-dom';
|
|
34
34
|
import { generateNewRepeatId } from '../../../utils/repeatId';
|
|
35
35
|
import useInitialiseGroupTableRows from '../../../hooks/useInitialiseGroupTableRows';
|
|
36
|
+
import { isItemHidden } from '../../../utils/qItem';
|
|
37
|
+
import { useQuestionnaireStore, useRendererStylingStore } from '../../../stores';
|
|
36
38
|
/**
|
|
37
39
|
* Main component to render a Group Table (gtable) Questionnaire item.
|
|
38
40
|
* @see {@link https://hl7.org/fhir/extensions/CodeSystem-questionnaire-item-control.html}
|
|
@@ -41,12 +43,19 @@ import useInitialiseGroupTableRows from '../../../hooks/useInitialiseGroupTableR
|
|
|
41
43
|
*/
|
|
42
44
|
function GroupTable(props) {
|
|
43
45
|
const { qItem, qrItems, itemPath, groupCardElevation, isRepeated, showMinimalView, parentIsReadOnly, parentStyles, onQrRepeatGroupChange } = props;
|
|
46
|
+
const enableWhenIsActivated = useQuestionnaireStore.use.enableWhenIsActivated();
|
|
47
|
+
const enableWhenItems = useQuestionnaireStore.use.enableWhenItems();
|
|
48
|
+
const enableWhenExpressions = useQuestionnaireStore.use.enableWhenExpressions();
|
|
49
|
+
const enableWhenAsReadOnly = useRendererStylingStore.use.enableWhenAsReadOnly();
|
|
44
50
|
const initialGroupTableRows = useInitialiseGroupTableRows(qItem.linkId, qrItems);
|
|
45
51
|
const { tableRows, selectedIds, setTableRows, setSelectedIds } = useGroupTableRows(initialGroupTableRows);
|
|
46
52
|
const readOnly = useReadOnly(qItem, parentIsReadOnly);
|
|
47
53
|
// Generate item labels as table headers
|
|
48
54
|
const qItems = qItem.item;
|
|
49
|
-
const
|
|
55
|
+
const visibleItemLabels = useMemo(() => {
|
|
56
|
+
var _a;
|
|
57
|
+
return (_a = qItems === null || qItems === void 0 ? void 0 : qItems.filter((item) => !isItemHidden(item, enableWhenIsActivated, enableWhenItems, enableWhenExpressions, enableWhenAsReadOnly)).map((item) => { var _a; return (_a = item.text) !== null && _a !== void 0 ? _a : ''; })) !== null && _a !== void 0 ? _a : [];
|
|
58
|
+
}, [qItems]);
|
|
50
59
|
const qItemsIndexMap = useMemo(() => mapQItemsIndex(qItem), [qItem]);
|
|
51
60
|
// Check if there are columns within the group table
|
|
52
61
|
if (!qItems || qItems.length === 0) {
|
|
@@ -132,7 +141,7 @@ function GroupTable(props) {
|
|
|
132
141
|
});
|
|
133
142
|
});
|
|
134
143
|
}
|
|
135
|
-
return (_jsx(GroupTableView, { qItem: qItem, qItemsIndexMap: qItemsIndexMap, itemPath: itemPath, groupCardElevation: groupCardElevation, isRepeated: isRepeated, readOnly: readOnly, tableRows: tableRows, selectedIds: selectedIds,
|
|
144
|
+
return (_jsx(GroupTableView, { qItem: qItem, qItemsIndexMap: qItemsIndexMap, itemPath: itemPath, groupCardElevation: groupCardElevation, isRepeated: isRepeated, readOnly: readOnly, tableRows: tableRows, selectedIds: selectedIds, visibleItemLabels: visibleItemLabels, showMinimalView: showMinimalView, parentIsReadOnly: parentIsReadOnly, parentStyles: parentStyles, onAddRow: handleAddRow, onRowChange: handleRowChange, onRemoveRow: handleRemoveRow, onSelectRow: handleSelectRow, onSelectAll: handleSelectAll, onReorderRows: handleReorderRows }));
|
|
136
145
|
}
|
|
137
146
|
export default GroupTable;
|
|
138
147
|
//# sourceMappingURL=GroupTable.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GroupTable.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/Tables/GroupTable.tsx"],"names":[],"mappings":";;;;;;;;;;AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAc,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAGvC,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAQxD,OAAO,WAAW,MAAM,4BAA4B,CAAC;AACrD,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,2BAA2B,MAAM,4CAA4C,CAAC;
|
|
1
|
+
{"version":3,"file":"GroupTable.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/Tables/GroupTable.tsx"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ interface GroupTableBodyProps extends PropsWithItemPathAttribute, PropsWithIsRep
|
|
|
8
8
|
tableRows: GroupTableRowModel[];
|
|
9
9
|
selectedIds: string[];
|
|
10
10
|
qItemsIndexMap: Record<string, number>;
|
|
11
|
+
visibleItemLabels: string[];
|
|
11
12
|
onRowChange: (newQrRow: QuestionnaireResponseItem, index: number, targetItemPath?: ItemPath) => void;
|
|
12
13
|
onRemoveRow: (index: number) => void;
|
|
13
14
|
onSelectRow: (rowId: string) => void;
|
|
@@ -6,7 +6,7 @@ import { reorderRows } from '../../../utils/groupTable';
|
|
|
6
6
|
import TableBody from '@mui/material/TableBody';
|
|
7
7
|
import { appendRepeatIndexToLastSegment } from '../../../utils/itemPath';
|
|
8
8
|
function GroupTableBody(props) {
|
|
9
|
-
const { tableQItem, readOnly, tableRows, selectedIds, qItemsIndexMap, itemPath, isRepeated, showMinimalView, parentIsReadOnly, onRowChange, onRemoveRow, onSelectRow, onReorderRows } = props;
|
|
9
|
+
const { tableQItem, readOnly, tableRows, selectedIds, qItemsIndexMap, visibleItemLabels, itemPath, isRepeated, showMinimalView, parentIsReadOnly, onRowChange, onRemoveRow, onSelectRow, onReorderRows } = props;
|
|
10
10
|
function onDragEnd(result) {
|
|
11
11
|
if (!result.destination) {
|
|
12
12
|
return;
|
|
@@ -23,7 +23,7 @@ function GroupTableBody(props) {
|
|
|
23
23
|
if (nullableQrItem) {
|
|
24
24
|
answeredQrItem.item = nullableQrItem.item;
|
|
25
25
|
}
|
|
26
|
-
return (_jsx(GroupTableRow, { index: index, rowId: id, tableQItem: tableQItem, answeredQrItem: answeredQrItem, nullableQrItem: nullableQrItem, readOnly: readOnly, isRepeated: isRepeated, hoverDisabled: snapshot.isDraggingOver, tableRows: tableRows, itemIsSelected: itemIsSelected, selectedIds: selectedIds, qItemsIndexMap: qItemsIndexMap, itemPath: appendRepeatIndexToLastSegment(itemPath, index), showMinimalView: showMinimalView, parentIsReadOnly: parentIsReadOnly, onRowChange: onRowChange, onRemoveRow: onRemoveRow, onSelectRow: onSelectRow }, id));
|
|
26
|
+
return (_jsx(GroupTableRow, { index: index, rowId: id, tableQItem: tableQItem, answeredQrItem: answeredQrItem, nullableQrItem: nullableQrItem, readOnly: readOnly, isRepeated: isRepeated, hoverDisabled: snapshot.isDraggingOver, tableRows: tableRows, itemIsSelected: itemIsSelected, selectedIds: selectedIds, qItemsIndexMap: qItemsIndexMap, visibleItemLabels: visibleItemLabels, itemPath: appendRepeatIndexToLastSegment(itemPath, index), showMinimalView: showMinimalView, parentIsReadOnly: parentIsReadOnly, onRowChange: onRowChange, onRemoveRow: onRemoveRow, onSelectRow: onSelectRow }, id));
|
|
27
27
|
}), droppableProvided.placeholder] }))) })) })));
|
|
28
28
|
}
|
|
29
29
|
export default GroupTableBody;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GroupTableBody.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/Tables/GroupTableBody.tsx"],"names":[],"mappings":";AAkBA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAS1D,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,8BAA8B,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"GroupTableBody.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/Tables/GroupTableBody.tsx"],"names":[],"mappings":";AAkBA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAS1D,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,8BAA8B,EAAE,MAAM,yBAAyB,CAAC;AAwBzE,SAAS,cAAc,CAAC,KAA0B;IAChD,MAAM,EACJ,UAAU,EACV,QAAQ,EACR,SAAS,EACT,WAAW,EACX,cAAc,EACd,iBAAiB,EACjB,QAAQ,EACR,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,WAAW,EACX,WAAW,EACX,WAAW,EACX,aAAa,EACd,GAAG,KAAK,CAAC;IAEV,SAAS,SAAS,CAAC,MAAkB;QACnC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YACvB,OAAO;SACR;QAED,IAAI,MAAM,CAAC,WAAW,CAAC,KAAK,KAAK,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE;YACpD,OAAO;SACR;QAED,MAAM,aAAa,GAAG,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAE5F,aAAa,CAAC,aAAa,CAAC,CAAC;IAC/B,CAAC;IAED,OAAO,CACL,KAAC,eAAe,kBAAC,SAAS,EAAE,SAAS,gBACnC,KAAC,SAAS,kBAAC,WAAW,EAAC,aAAa,EAAC,SAAS,EAAC,UAAU,gBACtD,CAAC,iBAAiB,EAAE,QAAQ,EAAE,EAAE,CAAC,CAChC,MAAC,SAAS,kBAAC,GAAG,EAAE,iBAAiB,CAAC,QAAQ,IAAM,iBAAiB,CAAC,cAAc,eAC7E,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,EAAE,KAAK,EAAE,EAAE;wBACvD,MAAM,cAAc,GAAG,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;wBACtD,MAAM,cAAc,GAAG,iBAAiB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;wBAChE,IAAI,cAAc,EAAE;4BAClB,cAAc,CAAC,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC;yBAC3C;wBAED,OAAO,CACL,KAAC,aAAa,IAEZ,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,EAAE,EACT,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,cAAc,EAC9B,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,QAAQ,CAAC,cAAc,EACtC,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,cAAc,EAC9B,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,cAAc,EAC9B,iBAAiB,EAAE,iBAAiB,EACpC,QAAQ,EAAE,8BAA8B,CAAC,QAAQ,EAAE,KAAK,CAAC,EACzD,eAAe,EAAE,eAAe,EAChC,gBAAgB,EAAE,gBAAgB,EAClC,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,WAAW,IAnBnB,EAAE,CAoBP,CACH,CAAC;oBACJ,CAAC,CAAC,EACD,iBAAiB,CAAC,WAAW,KACpB,CACb,IACS,IACI,CACnB,CAAC;AACJ,CAAC;AAED,eAAe,cAAc,CAAC"}
|
|
@@ -16,6 +16,7 @@ interface GroupTableRowProps extends PropsWithItemPathAttribute, PropsWithIsRepe
|
|
|
16
16
|
itemIsSelected: boolean;
|
|
17
17
|
selectedIds: string[];
|
|
18
18
|
qItemsIndexMap: Record<string, number>;
|
|
19
|
+
visibleItemLabels: string[];
|
|
19
20
|
onRowChange: (newQrRow: QuestionnaireResponseItem, index: number, targetItemPath?: ItemPath) => void;
|
|
20
21
|
onRemoveRow: (index: number) => void;
|
|
21
22
|
onSelectRow: (nanoId: string) => void;
|
|
@@ -9,11 +9,11 @@ import Box from '@mui/material/Box';
|
|
|
9
9
|
import { Draggable } from 'react-beautiful-dnd';
|
|
10
10
|
import { StyledGroupTableRow } from './Table.styles';
|
|
11
11
|
function GroupTableRow(props) {
|
|
12
|
-
const { rowId, index, tableQItem, answeredQrItem, nullableQrItem, readOnly, isRepeated, hoverDisabled, tableRows, itemIsSelected, qItemsIndexMap, itemPath, showMinimalView, onRowChange, onRemoveRow, onSelectRow } = props;
|
|
12
|
+
const { rowId, index, tableQItem, answeredQrItem, nullableQrItem, readOnly, isRepeated, hoverDisabled, tableRows, itemIsSelected, qItemsIndexMap, visibleItemLabels, itemPath, showMinimalView, onRowChange, onRemoveRow, onSelectRow } = props;
|
|
13
13
|
if (isRepeated) {
|
|
14
|
-
return (_jsx(Draggable, Object.assign({ draggableId: rowId, index: index }, { children: (draggableProvided, snapshot) => (_jsxs(StyledGroupTableRow, Object.assign({ itemIsDragged: snapshot.isDragging, itemIsSelected: itemIsSelected, hoverDisabled: hoverDisabled, hover: !hoverDisabled, ref: draggableProvided.innerRef }, draggableProvided.draggableProps, { children: [showMinimalView || !isRepeated ? (_jsx(TableCell, { padding: "checkbox" })) : (_jsxs(_Fragment, { children: [_jsx(TableCell, Object.assign({ padding: "none" }, { children: _jsx(Box, Object.assign({ display: "flex", alignItems: "center", justifyContent: "center" }, (readOnly ? {} : draggableProvided.dragHandleProps), { children: _jsx(DragIndicator, { fontSize: "small", sx: { color: readOnly ? 'text.disabled' : 'inherit' } }) })) })), _jsx(SelectRowButton, { isChecked: itemIsSelected, readOnly: readOnly, onSelectItem: () => onSelectRow(rowId) })] })), _jsx(GroupTableRowCells, { qItem: tableQItem, qrItem: answeredQrItem, qItemsIndexMap: qItemsIndexMap, itemPath: itemPath, parentIsReadOnly: readOnly, onQrItemChange: (newQrGroup) => onRowChange(newQrGroup, index) }), showMinimalView || !isRepeated ? (_jsx(TableCell, { padding: "checkbox" })) : (_jsx(RemoveRowButton, { nullableQrItem: nullableQrItem, numOfRows: tableRows.length, readOnly: readOnly, onRemoveItem: () => onRemoveRow(index) }))] }))) })));
|
|
14
|
+
return (_jsx(Draggable, Object.assign({ draggableId: rowId, index: index }, { children: (draggableProvided, snapshot) => (_jsxs(StyledGroupTableRow, Object.assign({ itemIsDragged: snapshot.isDragging, itemIsSelected: itemIsSelected, hoverDisabled: hoverDisabled, hover: !hoverDisabled, ref: draggableProvided.innerRef }, draggableProvided.draggableProps, { children: [showMinimalView || !isRepeated ? (_jsx(TableCell, { padding: "checkbox" })) : (_jsxs(_Fragment, { children: [_jsx(TableCell, Object.assign({ padding: "none" }, { children: _jsx(Box, Object.assign({ display: "flex", alignItems: "center", justifyContent: "center" }, (readOnly ? {} : draggableProvided.dragHandleProps), { children: _jsx(DragIndicator, { fontSize: "small", sx: { color: readOnly ? 'text.disabled' : 'inherit' } }) })) })), _jsx(SelectRowButton, { isChecked: itemIsSelected, readOnly: readOnly, onSelectItem: () => onSelectRow(rowId) })] })), _jsx(GroupTableRowCells, { qItem: tableQItem, qrItem: answeredQrItem, qItemsIndexMap: qItemsIndexMap, visibleItemLabels: visibleItemLabels, itemPath: itemPath, parentIsReadOnly: readOnly, onQrItemChange: (newQrGroup) => onRowChange(newQrGroup, index) }), showMinimalView || !isRepeated ? (_jsx(TableCell, { padding: "checkbox" })) : (_jsx(RemoveRowButton, { nullableQrItem: nullableQrItem, numOfRows: tableRows.length, readOnly: readOnly, onRemoveItem: () => onRemoveRow(index) }))] }))) })));
|
|
15
15
|
}
|
|
16
|
-
return (_jsxs(TableRow, { children: [showMinimalView || !isRepeated ? (_jsx(TableCell, { padding: "checkbox" })) : (_jsxs(_Fragment, { children: [_jsx(TableCell, Object.assign({ padding: "none" }, { children: _jsx(Box, Object.assign({ display: "flex", alignItems: "center", justifyContent: "center" }, { children: _jsx(DragIndicator, { fontSize: "small", sx: { color: readOnly ? 'text.disabled' : 'inherit' } }) })) })), _jsx(SelectRowButton, { isChecked: itemIsSelected, readOnly: readOnly, onSelectItem: () => onSelectRow(rowId) })] })), _jsx(GroupTableRowCells, { qItem: tableQItem, qrItem: answeredQrItem, qItemsIndexMap: qItemsIndexMap, itemPath: itemPath, parentIsReadOnly: readOnly, onQrItemChange: (newQrGroup) => onRowChange(newQrGroup, index) }), showMinimalView || !isRepeated ? (_jsx(TableCell, { padding: "checkbox" })) : (_jsx(RemoveRowButton, { nullableQrItem: nullableQrItem, numOfRows: tableRows.length, readOnly: readOnly, onRemoveItem: () => onRemoveRow(index) }))] }));
|
|
16
|
+
return (_jsxs(TableRow, { children: [showMinimalView || !isRepeated ? (_jsx(TableCell, { padding: "checkbox" })) : (_jsxs(_Fragment, { children: [_jsx(TableCell, Object.assign({ padding: "none" }, { children: _jsx(Box, Object.assign({ display: "flex", alignItems: "center", justifyContent: "center" }, { children: _jsx(DragIndicator, { fontSize: "small", sx: { color: readOnly ? 'text.disabled' : 'inherit' } }) })) })), _jsx(SelectRowButton, { isChecked: itemIsSelected, readOnly: readOnly, onSelectItem: () => onSelectRow(rowId) })] })), _jsx(GroupTableRowCells, { qItem: tableQItem, qrItem: answeredQrItem, qItemsIndexMap: qItemsIndexMap, visibleItemLabels: visibleItemLabels, itemPath: itemPath, parentIsReadOnly: readOnly, onQrItemChange: (newQrGroup) => onRowChange(newQrGroup, index) }), showMinimalView || !isRepeated ? (_jsx(TableCell, { padding: "checkbox" })) : (_jsx(RemoveRowButton, { nullableQrItem: nullableQrItem, numOfRows: tableRows.length, readOnly: readOnly, onRemoveItem: () => onRemoveRow(index) }))] }));
|
|
17
17
|
}
|
|
18
18
|
export default GroupTableRow;
|
|
19
19
|
//# sourceMappingURL=GroupTableRow.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GroupTableRow.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/Tables/GroupTableRow.tsx"],"names":[],"mappings":";AA0BA,OAAO,QAAQ,MAAM,wBAAwB,CAAC;AAC9C,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AACtD,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAEhD,OAAO,aAAa,MAAM,mCAAmC,CAAC;AAC9D,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,GAAG,MAAM,mBAAmB,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"GroupTableRow.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/Tables/GroupTableRow.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
|
|
2
|
+
import { PropsWithItemPathAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithQrItemChangeHandler } from '../../../interfaces/renderProps.interface';
|
|
3
|
+
interface GroupTableRowCellProps extends PropsWithItemPathAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithQrItemChangeHandler {
|
|
4
|
+
rowItem: QuestionnaireItem;
|
|
5
|
+
qrItem: QuestionnaireResponseItem | null;
|
|
6
|
+
numOfColumns: number;
|
|
7
|
+
}
|
|
8
|
+
declare function GroupTableRowCell(props: GroupTableRowCellProps): import("react/jsx-runtime").JSX.Element | null;
|
|
9
|
+
export default GroupTableRowCell;
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
+
import { StandardTableCell } from './Table.styles';
|
|
3
|
+
import SingleItem from '../SingleItem/SingleItem';
|
|
4
|
+
import { extendItemPath } from '../../../utils/itemPath';
|
|
5
|
+
import { useHidden } from '../../../hooks';
|
|
6
|
+
function GroupTableRowCell(props) {
|
|
7
|
+
const { rowItem, qrItem, numOfColumns, itemPath, parentIsReadOnly, onQrItemChange } = props;
|
|
8
|
+
const rowItemIsHidden = useHidden(rowItem);
|
|
9
|
+
if (rowItemIsHidden) {
|
|
10
|
+
return null;
|
|
11
|
+
}
|
|
12
|
+
return (_jsx(StandardTableCell, Object.assign({ numOfColumns: numOfColumns }, { children: _jsx(SingleItem, { qItem: rowItem, qrItem: qrItem !== null && qrItem !== void 0 ? qrItem : null, itemPath: extendItemPath(itemPath, rowItem.linkId), isRepeated: true, isTabled: true, groupCardElevation: 1, showMinimalView: true, parentIsReadOnly: parentIsReadOnly, onQrItemChange: onQrItemChange }, rowItem.linkId) })));
|
|
13
|
+
}
|
|
14
|
+
export default GroupTableRowCell;
|
|
15
|
+
//# sourceMappingURL=GroupTableRowCell.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"GroupTableRowCell.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/Tables/GroupTableRowCell.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAOzD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAW3C,SAAS,iBAAiB,CAAC,KAA6B;IACtD,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC;IAE5F,MAAM,eAAe,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IAC3C,IAAI,eAAe,EAAE;QACnB,OAAO,IAAI,CAAC;KACb;IAED,OAAO,CACL,KAAC,iBAAiB,kBAAC,YAAY,EAAE,YAAY,gBAC3C,KAAC,UAAU,IAET,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,IAAI,EACtB,QAAQ,EAAE,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,EAClD,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,kBAAkB,EAAE,CAAC,EACrB,eAAe,EAAE,IAAI,EACrB,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,cAAc,IATzB,OAAO,CAAC,MAAM,CAUnB,IACgB,CACrB,CAAC;AACJ,CAAC;AAED,eAAe,iBAAiB,CAAC"}
|
|
@@ -4,6 +4,7 @@ interface GroupTableRowCellsProps extends PropsWithQrItemChangeHandler, PropsWit
|
|
|
4
4
|
qItem: QuestionnaireItem;
|
|
5
5
|
qrItem: QuestionnaireResponseItem | null;
|
|
6
6
|
qItemsIndexMap: Record<string, number>;
|
|
7
|
+
visibleItemLabels: string[];
|
|
7
8
|
}
|
|
8
9
|
declare function GroupTableRowCells(props: GroupTableRowCellsProps): import("react/jsx-runtime").JSX.Element | null;
|
|
9
10
|
export default GroupTableRowCells;
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
|
|
2
2
|
import { createEmptyQrGroup, updateQrItemsInGroup } from '../../../utils/qrItem';
|
|
3
|
-
import SingleItem from '../SingleItem/SingleItem';
|
|
4
3
|
import { getQrItemsIndex } from '../../../utils/mapItem';
|
|
5
|
-
import { StandardTableCell } from './Table.styles';
|
|
6
4
|
import { extendItemPath } from '../../../utils/itemPath';
|
|
5
|
+
import { SingleItem } from '../SingleItem';
|
|
6
|
+
import { StandardTableCell } from './Table.styles';
|
|
7
7
|
function GroupTableRowCells(props) {
|
|
8
|
-
const { qItem, qrItem, qItemsIndexMap, itemPath, parentIsReadOnly, onQrItemChange } = props;
|
|
8
|
+
const { qItem, qrItem, qItemsIndexMap, visibleItemLabels, itemPath, parentIsReadOnly, onQrItemChange } = props;
|
|
9
9
|
const rowItems = qItem.item;
|
|
10
10
|
const row = qrItem && qrItem.item ? qrItem : createEmptyQrGroup(qItem);
|
|
11
11
|
const rowQrItems = row.item;
|
|
@@ -19,11 +19,17 @@ function GroupTableRowCells(props) {
|
|
|
19
19
|
}
|
|
20
20
|
const qrItemsByIndex = getQrItemsIndex(rowItems, rowQrItems, qItemsIndexMap);
|
|
21
21
|
return (_jsx(_Fragment, { children: rowItems.map((rowItem, index) => {
|
|
22
|
+
var _a;
|
|
22
23
|
const qrItem = qrItemsByIndex[index];
|
|
24
|
+
// Something went wrong here
|
|
23
25
|
if (Array.isArray(qrItem)) {
|
|
24
26
|
return null;
|
|
25
27
|
}
|
|
26
|
-
|
|
28
|
+
// If the cell is not visible, skip rendering it
|
|
29
|
+
if (!visibleItemLabels.includes((_a = rowItem.text) !== null && _a !== void 0 ? _a : '')) {
|
|
30
|
+
return null;
|
|
31
|
+
}
|
|
32
|
+
return (_jsx(StandardTableCell, Object.assign({ numOfColumns: visibleItemLabels.length }, { children: _jsx(SingleItem, { qItem: rowItem, qrItem: qrItem !== null && qrItem !== void 0 ? qrItem : null, itemPath: extendItemPath(itemPath, rowItem.linkId), isRepeated: true, isTabled: true, groupCardElevation: 1, showMinimalView: true, parentIsReadOnly: parentIsReadOnly, onQrItemChange: handleQrRowItemChange }, rowItem.linkId) }), index));
|
|
27
33
|
}) }));
|
|
28
34
|
}
|
|
29
35
|
export default GroupTableRowCells;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GroupTableRowCells.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/Tables/GroupTableRowCells.tsx"],"names":[],"mappings":";AAmBA,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AACjF,OAAO,
|
|
1
|
+
{"version":3,"file":"GroupTableRowCells.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/Tables/GroupTableRowCells.tsx"],"names":[],"mappings":";AAmBA,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAMzD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAYnD,SAAS,kBAAkB,CAAC,KAA8B;IACxD,MAAM,EACJ,KAAK,EACL,MAAM,EACN,cAAc,EACd,iBAAiB,EACjB,QAAQ,EACR,gBAAgB,EAChB,cAAc,EACf,GAAG,KAAK,CAAC;IAEV,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC;IAC5B,MAAM,GAAG,GAAG,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;IACvE,MAAM,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC;IAE5B,IAAI,CAAC,QAAQ,IAAI,CAAC,UAAU,EAAE;QAC5B,OAAO,IAAI,CAAC;KACb;IAED,SAAS,qBAAqB,CAC5B,YAAuC,EACvC,cAAyB;QAEzB,MAAM,KAAK,qBAAmC,GAAG,CAAE,CAAC;QACpD,oBAAoB,CAAC,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;QAChE,cAAc,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;IACxC,CAAC;IAED,MAAM,cAAc,GAAG,eAAe,CAAC,QAAQ,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC;IAE7E,OAAO,CACL,4BACG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;;YAC/B,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;YAErC,4BAA4B;YAC5B,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;gBACzB,OAAO,IAAI,CAAC;aACb;YAED,gDAAgD;YAChD,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,MAAA,OAAO,CAAC,IAAI,mCAAI,EAAE,CAAC,EAAE;gBACnD,OAAO,IAAI,CAAC;aACb;YAED,OAAO,CACL,KAAC,iBAAiB,kBAAa,YAAY,EAAE,iBAAiB,CAAC,MAAM,gBACnE,KAAC,UAAU,IAET,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,IAAI,EACtB,QAAQ,EAAE,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,EAClD,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,kBAAkB,EAAE,CAAC,EACrB,eAAe,EAAE,IAAI,EACrB,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,qBAAqB,IAThC,OAAO,CAAC,MAAM,CAUnB,KAZoB,KAAK,CAaT,CACrB,CAAC;QACJ,CAAC,CAAC,GACD,CACJ,CAAC;AACJ,CAAC;AAED,eAAe,kBAAkB,CAAC"}
|
|
@@ -9,7 +9,7 @@ interface GroupTableViewProps extends PropsWithIsRepeatedAttribute, PropsWithIte
|
|
|
9
9
|
readOnly: boolean;
|
|
10
10
|
tableRows: GroupTableRowModel[];
|
|
11
11
|
selectedIds: string[];
|
|
12
|
-
|
|
12
|
+
visibleItemLabels: string[];
|
|
13
13
|
onAddRow: () => void;
|
|
14
14
|
onRowChange: (newQrRow: QuestionnaireResponseItem, index: number, targetItemPath?: ItemPath) => void;
|
|
15
15
|
onRemoveRow: (index: number) => void;
|
|
@@ -20,7 +20,7 @@ import AccordionDetails from '@mui/material/AccordionDetails';
|
|
|
20
20
|
import GroupHeading from '../GroupItem/GroupHeading';
|
|
21
21
|
import { StandardCheckbox } from '../../Checkbox.styles';
|
|
22
22
|
function GroupTableView(props) {
|
|
23
|
-
const { qItem, qItemsIndexMap, groupCardElevation, isRepeated, readOnly, tableRows, selectedIds,
|
|
23
|
+
const { qItem, qItemsIndexMap, groupCardElevation, isRepeated, readOnly, tableRows, selectedIds, visibleItemLabels, itemPath, showMinimalView, parentIsReadOnly, parentStyles, onAddRow, onRowChange, onRemoveRow, onSelectRow, onSelectAll, onReorderRows } = props;
|
|
24
24
|
const onFocusLinkId = useQuestionnaireStore.use.onFocusLinkId();
|
|
25
25
|
const readOnlyVisualStyle = useRendererStylingStore.use.readOnlyVisualStyle();
|
|
26
26
|
const groupCollapsibleValue = getGroupCollapsible(qItem);
|
|
@@ -34,19 +34,19 @@ function GroupTableView(props) {
|
|
|
34
34
|
if (showMinimalView) {
|
|
35
35
|
return (_jsxs(GroupAccordion, Object.assign({ disableGutters: true, defaultExpanded: isDefaultOpen, elevation: groupCardElevation, slotProps: {
|
|
36
36
|
transition: { unmountOnExit: true, timeout: 250 }
|
|
37
|
-
} }, { children: [_jsx(AccordionSummary, Object.assign({ expandIcon: _jsx(ExpandMoreIcon, {}), sx: { minHeight: '28px' } }, { children: _jsx(GroupHeading, { qItem: qItem, readOnly: readOnly, groupCardElevation: groupCardElevation }) })), _jsxs(AccordionDetails, Object.assign({ sx: { pt: 0 } }, { children: [qItem.text ? _jsx(Divider, { sx: { mb: 1.5, opacity: 0.6 } }) : null, _jsx(TableContainer, Object.assign({ component: Paper, elevation: groupCardElevation }, { children: _jsxs(Table, Object.assign({ size: "small" }, { children: [_jsx(TableHead, { children: _jsxs(TableRow, { children: [
|
|
37
|
+
} }, { children: [_jsx(AccordionSummary, Object.assign({ expandIcon: _jsx(ExpandMoreIcon, {}), sx: { minHeight: '28px' } }, { children: _jsx(GroupHeading, { qItem: qItem, readOnly: readOnly, groupCardElevation: groupCardElevation }) })), _jsxs(AccordionDetails, Object.assign({ sx: { pt: 0 } }, { children: [qItem.text ? _jsx(Divider, { sx: { mb: 1.5, opacity: 0.6 } }) : null, _jsx(TableContainer, Object.assign({ component: Paper, elevation: groupCardElevation }, { children: _jsxs(Table, Object.assign({ size: "small" }, { children: [_jsx(TableHead, { children: _jsxs(TableRow, { children: [visibleItemLabels.map((visibleItemLabel) => (_jsx(HeaderTableCell, Object.assign({ size: "medium" }, { children: visibleItemLabel }), visibleItemLabel))), _jsx(TableCell, {})] }) }), _jsx(TableBody, { children: _jsx(GroupTableBody, { tableQItem: qItem, readOnly: readOnly, tableRows: tableRows, selectedIds: selectedIds, qItemsIndexMap: qItemsIndexMap, visibleItemLabels: visibleItemLabels, itemPath: itemPath, isRepeated: isRepeated, showMinimalView: showMinimalView, parentIsReadOnly: parentIsReadOnly, onRowChange: onRowChange, onRemoveRow: onRemoveRow, onSelectRow: onSelectRow, onReorderRows: onReorderRows }) })] })) }))] }))] })));
|
|
38
38
|
}
|
|
39
39
|
// Non-minimal Accordion
|
|
40
40
|
return (_jsxs(GroupAccordion, Object.assign({ disableGutters: true, defaultExpanded: isDefaultOpen, elevation: groupCardElevation, slotProps: {
|
|
41
41
|
transition: { unmountOnExit: true, timeout: 250 }
|
|
42
|
-
} }, { children: [_jsx(AccordionSummary, Object.assign({ expandIcon: _jsx(ExpandMoreIcon, {}), sx: { minHeight: '28px' } }, { children: _jsx(GroupHeading, { qItem: qItem, readOnly: readOnly, groupCardElevation: groupCardElevation }) })), _jsxs(AccordionDetails, Object.assign({ sx: { pt: 0 } }, { children: [qItem.text ? _jsx(Divider, { sx: { mb: 1.5, opacity: 0.6 } }) : null, _jsx(TableContainer, Object.assign({ component: Paper, elevation: groupCardElevation }, { children: _jsxs(Table, { children: [isRepeated ? (_jsx("caption", { children: _jsx(AddRowButton, { repeatGroups: tableRows, readOnly: readOnly, onAddItem: onAddRow }) })) : null, _jsx(TableHead, { children: _jsxs(TableRow, { children: [_jsx(HeaderTableCell, { padding: "none" }), isRepeated ? (_jsx(HeaderTableCell, Object.assign({ padding: "none" }, { children: _jsx(StandardCheckbox, { color: "primary", size: "small", indeterminate: indeterminateValue, checked: checkedValue, disabled: readOnly && readOnlyVisualStyle === 'disabled', readOnly: readOnly && readOnlyVisualStyle === 'readonly', "aria-readonly": readOnly && readOnlyVisualStyle === 'readonly', role: "checkbox", "aria-checked": ariaCheckedValue, onChange: onSelectAll }) }))) : null,
|
|
42
|
+
} }, { children: [_jsx(AccordionSummary, Object.assign({ expandIcon: _jsx(ExpandMoreIcon, {}), sx: { minHeight: '28px' } }, { children: _jsx(GroupHeading, { qItem: qItem, readOnly: readOnly, groupCardElevation: groupCardElevation }) })), _jsxs(AccordionDetails, Object.assign({ sx: { pt: 0 } }, { children: [qItem.text ? _jsx(Divider, { sx: { mb: 1.5, opacity: 0.6 } }) : null, _jsx(TableContainer, Object.assign({ component: Paper, elevation: groupCardElevation }, { children: _jsxs(Table, { children: [isRepeated ? (_jsx("caption", { children: _jsx(AddRowButton, { repeatGroups: tableRows, readOnly: readOnly, onAddItem: onAddRow }) })) : null, _jsx(TableHead, { children: _jsxs(TableRow, { children: [_jsx(HeaderTableCell, { padding: "none" }), isRepeated ? (_jsx(HeaderTableCell, Object.assign({ padding: "none" }, { children: _jsx(StandardCheckbox, { color: "primary", size: "small", indeterminate: indeterminateValue, checked: checkedValue, disabled: readOnly && readOnlyVisualStyle === 'disabled', readOnly: readOnly && readOnlyVisualStyle === 'readonly', "aria-readonly": readOnly && readOnlyVisualStyle === 'readonly', role: "checkbox", "aria-checked": ariaCheckedValue, onChange: onSelectAll }) }))) : null, visibleItemLabels.map((visibleItemLabel) => (_jsx(HeaderTableCell, { children: visibleItemLabel }, visibleItemLabel))), _jsx(TableCell, { padding: "checkbox" })] }) }), _jsx(GroupTableBody, { tableQItem: qItem, readOnly: readOnly, tableRows: tableRows, selectedIds: selectedIds, qItemsIndexMap: qItemsIndexMap, visibleItemLabels: visibleItemLabels, itemPath: itemPath, isRepeated: isRepeated, showMinimalView: showMinimalView, parentIsReadOnly: parentIsReadOnly, onRowChange: onRowChange, onRemoveRow: onRemoveRow, onSelectRow: onSelectRow, onReorderRows: onReorderRows })] }) }))] }))] })));
|
|
43
43
|
}
|
|
44
44
|
// Minimal + Regular GTable
|
|
45
45
|
if (showMinimalView) {
|
|
46
|
-
return (_jsx(QGroupContainerBox, Object.assign({ cardElevation: groupCardElevation, isRepeated: false, py: 1, style: parentStyles || undefined }, { children: _jsx(TableContainer, Object.assign({ component: Paper, elevation: groupCardElevation }, { children: _jsxs(Table, Object.assign({ size: "small" }, { children: [_jsx(TableHead, { children: _jsxs(TableRow, { children: [
|
|
46
|
+
return (_jsx(QGroupContainerBox, Object.assign({ cardElevation: groupCardElevation, isRepeated: false, py: 1, style: parentStyles || undefined }, { children: _jsx(TableContainer, Object.assign({ component: Paper, elevation: groupCardElevation }, { children: _jsxs(Table, Object.assign({ size: "small" }, { children: [_jsx(TableHead, { children: _jsxs(TableRow, { children: [visibleItemLabels.map((visibleItemLabel) => (_jsx(HeaderTableCell, Object.assign({ size: "medium" }, { children: visibleItemLabel }), visibleItemLabel))), _jsx(TableCell, {})] }) }), _jsx(TableBody, { children: _jsx(GroupTableBody, { tableQItem: qItem, readOnly: readOnly, tableRows: tableRows, selectedIds: selectedIds, qItemsIndexMap: qItemsIndexMap, visibleItemLabels: visibleItemLabels, itemPath: itemPath, isRepeated: isRepeated, showMinimalView: showMinimalView, parentIsReadOnly: parentIsReadOnly, onRowChange: onRowChange, onRemoveRow: onRemoveRow, onSelectRow: onSelectRow, onReorderRows: onReorderRows }) })] })) })) })));
|
|
47
47
|
}
|
|
48
48
|
// Regular GTable (not minimal)
|
|
49
|
-
return (_jsxs(QGroupContainerBox, Object.assign({ cardElevation: groupCardElevation, isRepeated: false, py: 3, "data-linkid": qItem.linkId, onClick: () => onFocusLinkId(qItem.linkId), style: parentStyles || undefined }, { children: [_jsxs(_Fragment, { children: [_jsx(GroupHeading, { qItem: qItem, readOnly: readOnly, groupCardElevation: groupCardElevation }), _jsx(Divider, { sx: { my: 1, opacity: 0.6 } })] }), _jsx(TableContainer, Object.assign({ component: Paper, elevation: groupCardElevation }, { children: _jsxs(Table, { children: [isRepeated ? (_jsx("caption", { children: _jsx(AddRowButton, { repeatGroups: tableRows, readOnly: readOnly, onAddItem: onAddRow }) })) : null, _jsx(TableHead, { children: _jsxs(TableRow, { children: [_jsx(HeaderTableCell, { padding: "none" }), isRepeated ? (_jsx(HeaderTableCell, Object.assign({ padding: "none" }, { children: _jsx(StandardCheckbox, { color: "primary", size: "small", indeterminate: indeterminateValue, checked: checkedValue, disabled: readOnly && readOnlyVisualStyle === 'disabled', readOnly: readOnly && readOnlyVisualStyle === 'readonly', "aria-readonly": readOnly && readOnlyVisualStyle === 'readonly', role: "checkbox", "aria-checked": ariaCheckedValue, onChange: onSelectAll }) }))) : null,
|
|
49
|
+
return (_jsxs(QGroupContainerBox, Object.assign({ cardElevation: groupCardElevation, isRepeated: false, py: 3, "data-linkid": qItem.linkId, onClick: () => onFocusLinkId(qItem.linkId), style: parentStyles || undefined }, { children: [_jsxs(_Fragment, { children: [_jsx(GroupHeading, { qItem: qItem, readOnly: readOnly, groupCardElevation: groupCardElevation }), _jsx(Divider, { sx: { my: 1, opacity: 0.6 } })] }), _jsx(TableContainer, Object.assign({ component: Paper, elevation: groupCardElevation }, { children: _jsxs(Table, { children: [isRepeated ? (_jsx("caption", { children: _jsx(AddRowButton, { repeatGroups: tableRows, readOnly: readOnly, onAddItem: onAddRow }) })) : null, _jsx(TableHead, { children: _jsxs(TableRow, { children: [_jsx(HeaderTableCell, { padding: "none" }), isRepeated ? (_jsx(HeaderTableCell, Object.assign({ padding: "none" }, { children: _jsx(StandardCheckbox, { color: "primary", size: "small", indeterminate: indeterminateValue, checked: checkedValue, disabled: readOnly && readOnlyVisualStyle === 'disabled', readOnly: readOnly && readOnlyVisualStyle === 'readonly', "aria-readonly": readOnly && readOnlyVisualStyle === 'readonly', role: "checkbox", "aria-checked": ariaCheckedValue, onChange: onSelectAll }) }))) : null, visibleItemLabels.map((visibleItemLabel) => (_jsx(HeaderTableCell, { children: visibleItemLabel }, visibleItemLabel))), _jsx(TableCell, { padding: "checkbox" })] }) }), _jsx(GroupTableBody, { tableQItem: qItem, readOnly: readOnly, tableRows: tableRows, selectedIds: selectedIds, qItemsIndexMap: qItemsIndexMap, visibleItemLabels: visibleItemLabels, itemPath: itemPath, isRepeated: isRepeated, showMinimalView: showMinimalView, parentIsReadOnly: parentIsReadOnly, onRowChange: onRowChange, onRemoveRow: onRemoveRow, onSelectRow: onSelectRow, onReorderRows: onReorderRows })] }) }))] })));
|
|
50
50
|
}
|
|
51
51
|
export default GroupTableView;
|
|
52
52
|
//# sourceMappingURL=GroupTableView.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GroupTableView.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/Tables/GroupTableView.tsx"],"names":[],"mappings":";AAkBA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,cAAc,MAAM,8BAA8B,CAAC;AAC1D,OAAO,KAAK,MAAM,qBAAqB,CAAC;AACxC,OAAO,KAAK,MAAM,qBAAqB,CAAC;AACxC,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,QAAQ,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,OAAO,MAAM,uBAAuB,CAAC;AAC5C,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAS1C,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,gBAAgB,MAAM,gCAAgC,CAAC;AAC9D,OAAO,cAAc,MAAM,gCAAgC,CAAC;AAC5D,OAAO,gBAAgB,MAAM,gCAAgC,CAAC;AAC9D,OAAO,YAAY,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AA4BzD,SAAS,cAAc,CAAC,KAA0B;IAChD,MAAM,EACJ,KAAK,EACL,cAAc,EACd,kBAAkB,EAClB,UAAU,EACV,QAAQ,EACR,SAAS,EACT,WAAW,EACX,
|
|
1
|
+
{"version":3,"file":"GroupTableView.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/Tables/GroupTableView.tsx"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,13 @@ export const StandardTextField = styled(TextField, {
|
|
|
23
23
|
// Set textFieldWidth (defaults to 320 in rendererStylingStore) as the standard width for a field
|
|
24
24
|
// Set a theoretical infinite maxWidth (3000) if field is within a table to fill the table row
|
|
25
25
|
maxWidth: !isTabled ? textFieldWidth : 3000,
|
|
26
|
-
minWidth: 160
|
|
26
|
+
minWidth: 160,
|
|
27
|
+
// When text field is read-only, prevent text/input I-beam cursor
|
|
28
|
+
'& .MuiOutlinedInput-root.Mui-readOnly': {
|
|
29
|
+
cursor: 'default',
|
|
30
|
+
'& .MuiInputBase-input': {
|
|
31
|
+
cursor: 'default'
|
|
32
|
+
}
|
|
33
|
+
}
|
|
27
34
|
}));
|
|
28
35
|
//# sourceMappingURL=Textfield.styles.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Textfield.styles.js","sourceRoot":"","sources":["../../../src/components/FormComponents/Textfield.styles.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAEhD,8DAA8D;AAC9D,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,SAAS,EAAE;IACjD,iBAAiB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,gBAAgB;CAC9E,CAAC,CAAgD,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,CAAC;IACnF,iGAAiG;IACjG,8FAA8F;IAC9F,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI;IAC3C,QAAQ,EAAE,GAAG;
|
|
1
|
+
{"version":3,"file":"Textfield.styles.js","sourceRoot":"","sources":["../../../src/components/FormComponents/Textfield.styles.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAEhD,8DAA8D;AAC9D,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,SAAS,EAAE;IACjD,iBAAiB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,gBAAgB;CAC9E,CAAC,CAAgD,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,CAAC;IACnF,iGAAiG;IACjG,8FAA8F;IAC9F,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI;IAC3C,QAAQ,EAAE,GAAG;IACb,iEAAiE;IACjE,uCAAuC,EAAE;QACvC,MAAM,EAAE,SAAS;QACjB,uBAAuB,EAAE;YACvB,MAAM,EAAE,SAAS;SAClB;KACF;CACF,CAAC,CAAC,CAAC"}
|
package/lib/utils/qItem.d.ts
CHANGED
|
@@ -21,4 +21,12 @@ export declare function getLinkIdTypeTuplesFromItemRecursive(qItem: Questionnair
|
|
|
21
21
|
export declare function getLinkIdPreferredTerminologyServerTuples(questionnaire: Questionnaire): [string, string][];
|
|
22
22
|
export type CollapsibleType = 'default-open' | 'default-closed';
|
|
23
23
|
export declare function getGroupCollapsible(qItem: QuestionnaireItem): CollapsibleType | null;
|
|
24
|
+
/**
|
|
25
|
+
* Plain function to determine if a QuestionnaireItem is hidden via item.hidden, enableWhens, enableWhenExpressions.
|
|
26
|
+
* When checking for repeating group enableWhen items, the parentRepeatGroupIndex should be provided.
|
|
27
|
+
* Recommended to use the `useHidden` hook instead for React components, where applicable.
|
|
28
|
+
*
|
|
29
|
+
* @author Sean Fong
|
|
30
|
+
*/
|
|
31
|
+
export declare function isItemHidden(qItem: QuestionnaireItem, enableWhenIsActivated: boolean, enableWhenItems: EnableWhenItems, enableWhenExpressions: EnableWhenExpressions, enableWhenAsReadOnly: boolean | Set<QuestionnaireItem['type']>, parentRepeatGroupIndex?: number): boolean;
|
|
24
32
|
export {};
|
package/lib/utils/qItem.js
CHANGED
|
@@ -17,6 +17,7 @@
|
|
|
17
17
|
import { getChoiceControlType } from './choice';
|
|
18
18
|
import { ChoiceItemControl, OpenChoiceItemControl } from '../interfaces/choice.enum';
|
|
19
19
|
import { getOpenChoiceControlType } from './openChoice';
|
|
20
|
+
import { structuredDataCapture } from 'fhir-sdc-helpers';
|
|
20
21
|
export function isHiddenByEnableWhen(params) {
|
|
21
22
|
const { linkId, enableWhenIsActivated, enableWhenItems, enableWhenExpressions, parentRepeatGroupIndex } = params;
|
|
22
23
|
// If enableWhen is not activated, items are not hidden by enableWhen
|
|
@@ -141,4 +142,29 @@ export function getGroupCollapsible(qItem) {
|
|
|
141
142
|
}
|
|
142
143
|
return null;
|
|
143
144
|
}
|
|
145
|
+
/**
|
|
146
|
+
* Plain function to determine if a QuestionnaireItem is hidden via item.hidden, enableWhens, enableWhenExpressions.
|
|
147
|
+
* When checking for repeating group enableWhen items, the parentRepeatGroupIndex should be provided.
|
|
148
|
+
* Recommended to use the `useHidden` hook instead for React components, where applicable.
|
|
149
|
+
*
|
|
150
|
+
* @author Sean Fong
|
|
151
|
+
*/
|
|
152
|
+
export function isItemHidden(qItem, enableWhenIsActivated, enableWhenItems, enableWhenExpressions, enableWhenAsReadOnly, parentRepeatGroupIndex) {
|
|
153
|
+
if (structuredDataCapture.getHidden(qItem)) {
|
|
154
|
+
return true;
|
|
155
|
+
}
|
|
156
|
+
// If enableWhenAsReadOnly is true, then items hidden by enableWhen should be displayed, but set as readOnly
|
|
157
|
+
// If enableWhenAsReadOnly is a Set, all item types in the set should be displayed, but set as readOnly
|
|
158
|
+
if (enableWhenAsReadOnly === true ||
|
|
159
|
+
(enableWhenAsReadOnly instanceof Set && enableWhenAsReadOnly.has(qItem.type))) {
|
|
160
|
+
return false;
|
|
161
|
+
}
|
|
162
|
+
return isHiddenByEnableWhen({
|
|
163
|
+
linkId: qItem.linkId,
|
|
164
|
+
enableWhenIsActivated,
|
|
165
|
+
enableWhenItems,
|
|
166
|
+
enableWhenExpressions,
|
|
167
|
+
parentRepeatGroupIndex
|
|
168
|
+
});
|
|
169
|
+
}
|
|
144
170
|
//# sourceMappingURL=qItem.js.map
|
package/lib/utils/qItem.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"qItem.js","sourceRoot":"","sources":["../../src/utils/qItem.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACrF,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"qItem.js","sourceRoot":"","sources":["../../src/utils/qItem.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aehrc/smart-forms-renderer",
|
|
3
|
-
"version": "1.0.0-alpha.
|
|
3
|
+
"version": "1.0.0-alpha.59",
|
|
4
4
|
"description": "FHIR Structured Data Captured (SDC) rendering engine for Smart Forms",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
},
|
|
28
28
|
"homepage": "https://github.com/aehrc/smart-forms#readme",
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@aehrc/sdc-populate": "^4.
|
|
30
|
+
"@aehrc/sdc-populate": "^4.3.0",
|
|
31
31
|
"@emotion/react": "^11.14.0",
|
|
32
32
|
"@emotion/styled": "^11.14.0",
|
|
33
33
|
"@fontsource/inter": "^5.2.5",
|
|
@@ -63,7 +63,7 @@
|
|
|
63
63
|
"react-dom": "^18.0.0 || ^19.0.0"
|
|
64
64
|
},
|
|
65
65
|
"devDependencies": {
|
|
66
|
-
"@babel/core": "^7.
|
|
66
|
+
"@babel/core": "^7.27.4",
|
|
67
67
|
"@chromatic-com/storybook": "^1.9.0",
|
|
68
68
|
"@storybook/addon-essentials": "^8.6.3",
|
|
69
69
|
"@storybook/addon-interactions": "^8.6.3",
|
|
@@ -74,7 +74,7 @@
|
|
|
74
74
|
"@storybook/react": "^8.6.12",
|
|
75
75
|
"@storybook/react-vite": "^8.6.3",
|
|
76
76
|
"@storybook/test": "^8.6.3",
|
|
77
|
-
"@storybook/types": "^8.6.
|
|
77
|
+
"@storybook/types": "^8.6.14",
|
|
78
78
|
"@testing-library/jest-dom": "^6.6.3",
|
|
79
79
|
"@testing-library/react": "^16.3.0",
|
|
80
80
|
"@types/deep-diff": "^1.0.5",
|
|
@@ -35,6 +35,8 @@ import { flushSync } from 'react-dom';
|
|
|
35
35
|
import { generateNewRepeatId } from '../../../utils/repeatId';
|
|
36
36
|
import useInitialiseGroupTableRows from '../../../hooks/useInitialiseGroupTableRows';
|
|
37
37
|
import type { ItemPath } from '../../../interfaces/itemPath.interface';
|
|
38
|
+
import { isItemHidden } from '../../../utils/qItem';
|
|
39
|
+
import { useQuestionnaireStore, useRendererStylingStore } from '../../../stores';
|
|
38
40
|
|
|
39
41
|
interface GroupTableProps
|
|
40
42
|
extends PropsWithQrRepeatGroupChangeHandler,
|
|
@@ -67,6 +69,11 @@ function GroupTable(props: GroupTableProps) {
|
|
|
67
69
|
onQrRepeatGroupChange
|
|
68
70
|
} = props;
|
|
69
71
|
|
|
72
|
+
const enableWhenIsActivated = useQuestionnaireStore.use.enableWhenIsActivated();
|
|
73
|
+
const enableWhenItems = useQuestionnaireStore.use.enableWhenItems();
|
|
74
|
+
const enableWhenExpressions = useQuestionnaireStore.use.enableWhenExpressions();
|
|
75
|
+
const enableWhenAsReadOnly = useRendererStylingStore.use.enableWhenAsReadOnly();
|
|
76
|
+
|
|
70
77
|
const initialGroupTableRows = useInitialiseGroupTableRows(qItem.linkId, qrItems);
|
|
71
78
|
const { tableRows, selectedIds, setTableRows, setSelectedIds } =
|
|
72
79
|
useGroupTableRows(initialGroupTableRows);
|
|
@@ -75,8 +82,20 @@ function GroupTable(props: GroupTableProps) {
|
|
|
75
82
|
|
|
76
83
|
// Generate item labels as table headers
|
|
77
84
|
const qItems = qItem.item;
|
|
78
|
-
const
|
|
79
|
-
() =>
|
|
85
|
+
const visibleItemLabels: string[] = useMemo(
|
|
86
|
+
() =>
|
|
87
|
+
qItems
|
|
88
|
+
?.filter(
|
|
89
|
+
(item) =>
|
|
90
|
+
!isItemHidden(
|
|
91
|
+
item,
|
|
92
|
+
enableWhenIsActivated,
|
|
93
|
+
enableWhenItems,
|
|
94
|
+
enableWhenExpressions,
|
|
95
|
+
enableWhenAsReadOnly
|
|
96
|
+
)
|
|
97
|
+
)
|
|
98
|
+
.map((item) => item.text ?? '') ?? [],
|
|
80
99
|
[qItems]
|
|
81
100
|
);
|
|
82
101
|
|
|
@@ -200,7 +219,7 @@ function GroupTable(props: GroupTableProps) {
|
|
|
200
219
|
readOnly={readOnly}
|
|
201
220
|
tableRows={tableRows}
|
|
202
221
|
selectedIds={selectedIds}
|
|
203
|
-
|
|
222
|
+
visibleItemLabels={visibleItemLabels}
|
|
204
223
|
showMinimalView={showMinimalView}
|
|
205
224
|
parentIsReadOnly={parentIsReadOnly}
|
|
206
225
|
parentStyles={parentStyles}
|
|
@@ -43,6 +43,7 @@ interface GroupTableBodyProps
|
|
|
43
43
|
tableRows: GroupTableRowModel[];
|
|
44
44
|
selectedIds: string[];
|
|
45
45
|
qItemsIndexMap: Record<string, number>;
|
|
46
|
+
visibleItemLabels: string[];
|
|
46
47
|
onRowChange: (
|
|
47
48
|
newQrRow: QuestionnaireResponseItem,
|
|
48
49
|
index: number,
|
|
@@ -60,6 +61,7 @@ function GroupTableBody(props: GroupTableBodyProps) {
|
|
|
60
61
|
tableRows,
|
|
61
62
|
selectedIds,
|
|
62
63
|
qItemsIndexMap,
|
|
64
|
+
visibleItemLabels,
|
|
63
65
|
itemPath,
|
|
64
66
|
isRepeated,
|
|
65
67
|
showMinimalView,
|
|
@@ -111,6 +113,7 @@ function GroupTableBody(props: GroupTableBodyProps) {
|
|
|
111
113
|
itemIsSelected={itemIsSelected}
|
|
112
114
|
selectedIds={selectedIds}
|
|
113
115
|
qItemsIndexMap={qItemsIndexMap}
|
|
116
|
+
visibleItemLabels={visibleItemLabels}
|
|
114
117
|
itemPath={appendRepeatIndexToLastSegment(itemPath, index)}
|
|
115
118
|
showMinimalView={showMinimalView}
|
|
116
119
|
parentIsReadOnly={parentIsReadOnly}
|
|
@@ -54,6 +54,7 @@ interface GroupTableRowProps
|
|
|
54
54
|
itemIsSelected: boolean;
|
|
55
55
|
selectedIds: string[];
|
|
56
56
|
qItemsIndexMap: Record<string, number>;
|
|
57
|
+
visibleItemLabels: string[];
|
|
57
58
|
onRowChange: (
|
|
58
59
|
newQrRow: QuestionnaireResponseItem,
|
|
59
60
|
index: number,
|
|
@@ -76,6 +77,7 @@ function GroupTableRow(props: GroupTableRowProps) {
|
|
|
76
77
|
tableRows,
|
|
77
78
|
itemIsSelected,
|
|
78
79
|
qItemsIndexMap,
|
|
80
|
+
visibleItemLabels,
|
|
79
81
|
itemPath,
|
|
80
82
|
showMinimalView,
|
|
81
83
|
onRowChange,
|
|
@@ -121,6 +123,7 @@ function GroupTableRow(props: GroupTableRowProps) {
|
|
|
121
123
|
qItem={tableQItem}
|
|
122
124
|
qrItem={answeredQrItem}
|
|
123
125
|
qItemsIndexMap={qItemsIndexMap}
|
|
126
|
+
visibleItemLabels={visibleItemLabels}
|
|
124
127
|
itemPath={itemPath}
|
|
125
128
|
parentIsReadOnly={readOnly}
|
|
126
129
|
onQrItemChange={(newQrGroup) => onRowChange(newQrGroup, index)}
|
|
@@ -166,6 +169,7 @@ function GroupTableRow(props: GroupTableRowProps) {
|
|
|
166
169
|
qItem={tableQItem}
|
|
167
170
|
qrItem={answeredQrItem}
|
|
168
171
|
qItemsIndexMap={qItemsIndexMap}
|
|
172
|
+
visibleItemLabels={visibleItemLabels}
|
|
169
173
|
itemPath={itemPath}
|
|
170
174
|
parentIsReadOnly={readOnly}
|
|
171
175
|
onQrItemChange={(newQrGroup) => onRowChange(newQrGroup, index)}
|
|
@@ -18,9 +18,7 @@
|
|
|
18
18
|
import React from 'react';
|
|
19
19
|
import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
|
|
20
20
|
import { createEmptyQrGroup, updateQrItemsInGroup } from '../../../utils/qrItem';
|
|
21
|
-
import SingleItem from '../SingleItem/SingleItem';
|
|
22
21
|
import { getQrItemsIndex } from '../../../utils/mapItem';
|
|
23
|
-
import { StandardTableCell } from './Table.styles';
|
|
24
22
|
import type {
|
|
25
23
|
PropsWithItemPathAttribute,
|
|
26
24
|
PropsWithParentIsReadOnlyAttribute,
|
|
@@ -28,6 +26,8 @@ import type {
|
|
|
28
26
|
} from '../../../interfaces/renderProps.interface';
|
|
29
27
|
import { extendItemPath } from '../../../utils/itemPath';
|
|
30
28
|
import type { ItemPath } from '../../../interfaces/itemPath.interface';
|
|
29
|
+
import { SingleItem } from '../SingleItem';
|
|
30
|
+
import { StandardTableCell } from './Table.styles';
|
|
31
31
|
|
|
32
32
|
interface GroupTableRowCellsProps
|
|
33
33
|
extends PropsWithQrItemChangeHandler,
|
|
@@ -36,10 +36,19 @@ interface GroupTableRowCellsProps
|
|
|
36
36
|
qItem: QuestionnaireItem;
|
|
37
37
|
qrItem: QuestionnaireResponseItem | null;
|
|
38
38
|
qItemsIndexMap: Record<string, number>;
|
|
39
|
+
visibleItemLabels: string[];
|
|
39
40
|
}
|
|
40
41
|
|
|
41
42
|
function GroupTableRowCells(props: GroupTableRowCellsProps) {
|
|
42
|
-
const {
|
|
43
|
+
const {
|
|
44
|
+
qItem,
|
|
45
|
+
qrItem,
|
|
46
|
+
qItemsIndexMap,
|
|
47
|
+
visibleItemLabels,
|
|
48
|
+
itemPath,
|
|
49
|
+
parentIsReadOnly,
|
|
50
|
+
onQrItemChange
|
|
51
|
+
} = props;
|
|
43
52
|
|
|
44
53
|
const rowItems = qItem.item;
|
|
45
54
|
const row = qrItem && qrItem.item ? qrItem : createEmptyQrGroup(qItem);
|
|
@@ -65,12 +74,18 @@ function GroupTableRowCells(props: GroupTableRowCellsProps) {
|
|
|
65
74
|
{rowItems.map((rowItem, index) => {
|
|
66
75
|
const qrItem = qrItemsByIndex[index];
|
|
67
76
|
|
|
77
|
+
// Something went wrong here
|
|
68
78
|
if (Array.isArray(qrItem)) {
|
|
69
79
|
return null;
|
|
70
80
|
}
|
|
71
81
|
|
|
82
|
+
// If the cell is not visible, skip rendering it
|
|
83
|
+
if (!visibleItemLabels.includes(rowItem.text ?? '')) {
|
|
84
|
+
return null;
|
|
85
|
+
}
|
|
86
|
+
|
|
72
87
|
return (
|
|
73
|
-
<StandardTableCell key={index} numOfColumns={
|
|
88
|
+
<StandardTableCell key={index} numOfColumns={visibleItemLabels.length}>
|
|
74
89
|
<SingleItem
|
|
75
90
|
key={rowItem.linkId}
|
|
76
91
|
qItem={rowItem}
|
|
@@ -57,7 +57,7 @@ interface GroupTableViewProps
|
|
|
57
57
|
readOnly: boolean;
|
|
58
58
|
tableRows: GroupTableRowModel[];
|
|
59
59
|
selectedIds: string[];
|
|
60
|
-
|
|
60
|
+
visibleItemLabels: string[];
|
|
61
61
|
onAddRow: () => void;
|
|
62
62
|
onRowChange: (
|
|
63
63
|
newQrRow: QuestionnaireResponseItem,
|
|
@@ -80,7 +80,7 @@ function GroupTableView(props: GroupTableViewProps) {
|
|
|
80
80
|
readOnly,
|
|
81
81
|
tableRows,
|
|
82
82
|
selectedIds,
|
|
83
|
-
|
|
83
|
+
visibleItemLabels,
|
|
84
84
|
itemPath,
|
|
85
85
|
showMinimalView,
|
|
86
86
|
parentIsReadOnly,
|
|
@@ -130,9 +130,9 @@ function GroupTableView(props: GroupTableViewProps) {
|
|
|
130
130
|
<Table size="small">
|
|
131
131
|
<TableHead>
|
|
132
132
|
<TableRow>
|
|
133
|
-
{
|
|
134
|
-
<HeaderTableCell key={
|
|
135
|
-
{
|
|
133
|
+
{visibleItemLabels.map((visibleItemLabel) => (
|
|
134
|
+
<HeaderTableCell key={visibleItemLabel} size="medium">
|
|
135
|
+
{visibleItemLabel}
|
|
136
136
|
</HeaderTableCell>
|
|
137
137
|
))}
|
|
138
138
|
<TableCell />
|
|
@@ -145,6 +145,7 @@ function GroupTableView(props: GroupTableViewProps) {
|
|
|
145
145
|
tableRows={tableRows}
|
|
146
146
|
selectedIds={selectedIds}
|
|
147
147
|
qItemsIndexMap={qItemsIndexMap}
|
|
148
|
+
visibleItemLabels={visibleItemLabels}
|
|
148
149
|
itemPath={itemPath}
|
|
149
150
|
isRepeated={isRepeated}
|
|
150
151
|
showMinimalView={showMinimalView}
|
|
@@ -202,8 +203,8 @@ function GroupTableView(props: GroupTableViewProps) {
|
|
|
202
203
|
/>
|
|
203
204
|
</HeaderTableCell>
|
|
204
205
|
) : null}
|
|
205
|
-
{
|
|
206
|
-
<HeaderTableCell key={
|
|
206
|
+
{visibleItemLabels.map((visibleItemLabel) => (
|
|
207
|
+
<HeaderTableCell key={visibleItemLabel}>{visibleItemLabel}</HeaderTableCell>
|
|
207
208
|
))}
|
|
208
209
|
<TableCell padding="checkbox" />
|
|
209
210
|
</TableRow>
|
|
@@ -214,6 +215,7 @@ function GroupTableView(props: GroupTableViewProps) {
|
|
|
214
215
|
tableRows={tableRows}
|
|
215
216
|
selectedIds={selectedIds}
|
|
216
217
|
qItemsIndexMap={qItemsIndexMap}
|
|
218
|
+
visibleItemLabels={visibleItemLabels}
|
|
217
219
|
itemPath={itemPath}
|
|
218
220
|
isRepeated={isRepeated}
|
|
219
221
|
showMinimalView={showMinimalView}
|
|
@@ -242,9 +244,9 @@ function GroupTableView(props: GroupTableViewProps) {
|
|
|
242
244
|
<Table size="small">
|
|
243
245
|
<TableHead>
|
|
244
246
|
<TableRow>
|
|
245
|
-
{
|
|
246
|
-
<HeaderTableCell key={
|
|
247
|
-
{
|
|
247
|
+
{visibleItemLabels.map((visibleItemLabel) => (
|
|
248
|
+
<HeaderTableCell key={visibleItemLabel} size="medium">
|
|
249
|
+
{visibleItemLabel}
|
|
248
250
|
</HeaderTableCell>
|
|
249
251
|
))}
|
|
250
252
|
<TableCell />
|
|
@@ -257,6 +259,7 @@ function GroupTableView(props: GroupTableViewProps) {
|
|
|
257
259
|
tableRows={tableRows}
|
|
258
260
|
selectedIds={selectedIds}
|
|
259
261
|
qItemsIndexMap={qItemsIndexMap}
|
|
262
|
+
visibleItemLabels={visibleItemLabels}
|
|
260
263
|
itemPath={itemPath}
|
|
261
264
|
isRepeated={isRepeated}
|
|
262
265
|
showMinimalView={showMinimalView}
|
|
@@ -312,8 +315,8 @@ function GroupTableView(props: GroupTableViewProps) {
|
|
|
312
315
|
/>
|
|
313
316
|
</HeaderTableCell>
|
|
314
317
|
) : null}
|
|
315
|
-
{
|
|
316
|
-
<HeaderTableCell key={
|
|
318
|
+
{visibleItemLabels.map((visibleItemLabel) => (
|
|
319
|
+
<HeaderTableCell key={visibleItemLabel}>{visibleItemLabel}</HeaderTableCell>
|
|
317
320
|
))}
|
|
318
321
|
<TableCell padding="checkbox" />
|
|
319
322
|
</TableRow>
|
|
@@ -324,6 +327,7 @@ function GroupTableView(props: GroupTableViewProps) {
|
|
|
324
327
|
tableRows={tableRows}
|
|
325
328
|
selectedIds={selectedIds}
|
|
326
329
|
qItemsIndexMap={qItemsIndexMap}
|
|
330
|
+
visibleItemLabels={visibleItemLabels}
|
|
327
331
|
itemPath={itemPath}
|
|
328
332
|
isRepeated={isRepeated}
|
|
329
333
|
showMinimalView={showMinimalView}
|
|
@@ -25,5 +25,12 @@ export const StandardTextField = styled(TextField, {
|
|
|
25
25
|
// Set textFieldWidth (defaults to 320 in rendererStylingStore) as the standard width for a field
|
|
26
26
|
// Set a theoretical infinite maxWidth (3000) if field is within a table to fill the table row
|
|
27
27
|
maxWidth: !isTabled ? textFieldWidth : 3000,
|
|
28
|
-
minWidth: 160
|
|
28
|
+
minWidth: 160,
|
|
29
|
+
// When text field is read-only, prevent text/input I-beam cursor
|
|
30
|
+
'& .MuiOutlinedInput-root.Mui-readOnly': {
|
|
31
|
+
cursor: 'default',
|
|
32
|
+
'& .MuiInputBase-input': {
|
|
33
|
+
cursor: 'default'
|
|
34
|
+
}
|
|
35
|
+
}
|
|
29
36
|
}));
|
package/src/utils/qItem.ts
CHANGED
|
@@ -20,6 +20,7 @@ import { getChoiceControlType } from './choice';
|
|
|
20
20
|
import { ChoiceItemControl, OpenChoiceItemControl } from '../interfaces/choice.enum';
|
|
21
21
|
import { getOpenChoiceControlType } from './openChoice';
|
|
22
22
|
import type { EnableWhenExpressions, EnableWhenItems } from '../interfaces/enableWhen.interface';
|
|
23
|
+
import { structuredDataCapture } from 'fhir-sdc-helpers';
|
|
23
24
|
|
|
24
25
|
interface isHiddenByEnableWhensParams {
|
|
25
26
|
linkId: string;
|
|
@@ -221,3 +222,40 @@ export function getGroupCollapsible(qItem: QuestionnaireItem): CollapsibleType |
|
|
|
221
222
|
|
|
222
223
|
return null;
|
|
223
224
|
}
|
|
225
|
+
|
|
226
|
+
/**
|
|
227
|
+
* Plain function to determine if a QuestionnaireItem is hidden via item.hidden, enableWhens, enableWhenExpressions.
|
|
228
|
+
* When checking for repeating group enableWhen items, the parentRepeatGroupIndex should be provided.
|
|
229
|
+
* Recommended to use the `useHidden` hook instead for React components, where applicable.
|
|
230
|
+
*
|
|
231
|
+
* @author Sean Fong
|
|
232
|
+
*/
|
|
233
|
+
export function isItemHidden(
|
|
234
|
+
qItem: QuestionnaireItem,
|
|
235
|
+
enableWhenIsActivated: boolean,
|
|
236
|
+
enableWhenItems: EnableWhenItems,
|
|
237
|
+
enableWhenExpressions: EnableWhenExpressions,
|
|
238
|
+
enableWhenAsReadOnly: boolean | Set<QuestionnaireItem['type']>,
|
|
239
|
+
parentRepeatGroupIndex?: number
|
|
240
|
+
): boolean {
|
|
241
|
+
if (structuredDataCapture.getHidden(qItem)) {
|
|
242
|
+
return true;
|
|
243
|
+
}
|
|
244
|
+
|
|
245
|
+
// If enableWhenAsReadOnly is true, then items hidden by enableWhen should be displayed, but set as readOnly
|
|
246
|
+
// If enableWhenAsReadOnly is a Set, all item types in the set should be displayed, but set as readOnly
|
|
247
|
+
if (
|
|
248
|
+
enableWhenAsReadOnly === true ||
|
|
249
|
+
(enableWhenAsReadOnly instanceof Set && enableWhenAsReadOnly.has(qItem.type))
|
|
250
|
+
) {
|
|
251
|
+
return false;
|
|
252
|
+
}
|
|
253
|
+
|
|
254
|
+
return isHiddenByEnableWhen({
|
|
255
|
+
linkId: qItem.linkId,
|
|
256
|
+
enableWhenIsActivated,
|
|
257
|
+
enableWhenItems,
|
|
258
|
+
enableWhenExpressions,
|
|
259
|
+
parentRepeatGroupIndex
|
|
260
|
+
});
|
|
261
|
+
}
|