@aehrc/smart-forms-renderer 0.35.2 → 0.35.4

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.
Files changed (28) hide show
  1. package/lib/components/FormComponents/ItemParts/ItemFieldGrid.js +3 -3
  2. package/lib/components/FormComponents/Tables/GroupTableRow.js +1 -1
  3. package/lib/components/FormComponents/Tables/GroupTableRow.js.map +1 -1
  4. package/lib/components/FormComponents/Tables/GroupTableRowCells.js +1 -1
  5. package/lib/components/FormComponents/Tables/GroupTableRowCells.js.map +1 -1
  6. package/lib/components/FormComponents/Tables/GroupTableView.js +2 -2
  7. package/lib/components/FormComponents/Tables/GroupTableView.js.map +1 -1
  8. package/lib/components/FormComponents/Tables/SelectRowButton.js +1 -1
  9. package/lib/components/FormComponents/Tables/SelectRowButton.js.map +1 -1
  10. package/lib/components/FormComponents/Tables/Table.styles.d.ts +0 -1
  11. package/lib/components/FormComponents/Tables/Table.styles.js +3 -3
  12. package/lib/components/FormComponents/Tables/Table.styles.js.map +1 -1
  13. package/lib/components/Renderer/FormBodyTabbed.js +3 -3
  14. package/lib/components/Renderer/FormBodyTabbed.js.map +1 -1
  15. package/lib/utils/openChoice.js +2 -1
  16. package/lib/utils/openChoice.js.map +1 -1
  17. package/package.json +1 -1
  18. package/src/components/FormComponents/ItemParts/ItemFieldGrid.tsx +3 -3
  19. package/src/components/FormComponents/Tables/GroupTableRow.tsx +1 -1
  20. package/src/components/FormComponents/Tables/GroupTableRowCells.tsx +1 -1
  21. package/src/components/FormComponents/Tables/GroupTableView.tsx +2 -2
  22. package/src/components/FormComponents/Tables/SelectRowButton.tsx +1 -1
  23. package/src/components/FormComponents/Tables/Table.styles.tsx +3 -3
  24. package/src/components/Renderer/FormBodyTabbed.tsx +3 -3
  25. package/src/stories/assets/questionnaires/QPrePopTester.ts +201 -0
  26. package/src/stories/testing/BuildFormButtonTesterWrapper.stories.tsx +0 -8
  27. package/src/stories/testing/PrePopButtonTesterWrapper.stories.tsx +12 -2
  28. package/src/utils/openChoice.ts +1 -1
package/lib/components/FormComponents/ItemParts/ItemFieldGrid.js CHANGED
@@ -22,10 +22,10 @@ import useRenderingExtensions from '../../../hooks/useRenderingExtensions';
22
22
  function ItemFieldGrid(props) {
23
23
  const { children, qItem, readOnly } = props;
24
24
  const { displayInstructions } = useRenderingExtensions(qItem);
25
- return (React.createElement(Grid, { container: true, columnSpacing: 6 },
26
- React.createElement(Grid, { item: true, xs: 5 },
25
+ return (React.createElement(Grid, { container: true, columnSpacing: 4 },
26
+ React.createElement(Grid, { item: true, xs: 4 },
27
27
  React.createElement(LabelWrapper, { qItem: qItem, readOnly: readOnly })),
28
- React.createElement(Grid, { item: true, xs: 7 },
28
+ React.createElement(Grid, { item: true, xs: 8 },
29
29
  children,
30
30
  React.createElement(DisplayInstructions, { displayInstructions: displayInstructions, readOnly: readOnly }))));
31
31
  }
package/lib/components/FormComponents/Tables/GroupTableRow.js CHANGED
@@ -27,7 +27,7 @@ function GroupTableRow(props) {
27
27
  const { nanoId, index, tableQItem, answeredQrItem, nullableQrItem, readOnly, hoverDisabled, tableRows, itemIsSelected, qItemsIndexMap, showMinimalView, parentIsReadOnly, onRowChange, onRemoveRow, onSelectRow } = props;
28
28
  return (React.createElement(Draggable, { draggableId: nanoId, index: index }, (draggableProvided, snapshot) => (React.createElement(StyledGroupTableRow, Object.assign({ itemIsDragged: snapshot.isDragging, itemIsSelected: itemIsSelected, hoverDisabled: hoverDisabled, hover: !hoverDisabled, ref: draggableProvided.innerRef }, draggableProvided.draggableProps),
29
29
  showMinimalView ? null : (React.createElement(React.Fragment, null,
30
- React.createElement(TableCell, { padding: "checkbox" },
30
+ React.createElement(TableCell, { padding: "none" },
31
31
  React.createElement(Box, Object.assign({ display: "flex", alignItems: "center", justifyContent: "center" }, (readOnly ? {} : draggableProvided.dragHandleProps)),
32
32
  React.createElement(DragIndicator, { fontSize: "small", sx: { color: readOnly ? 'text.disabled' : 'inherit' } }))),
33
33
  React.createElement(SelectRowButton, { isSelected: itemIsSelected, readOnly: readOnly, onSelectItem: () => onSelectRow(nanoId) }))),
package/lib/components/FormComponents/Tables/GroupTableRow.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"GroupTableRow.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/Tables/GroupTableRow.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,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;AAsBrD,SAAS,aAAa,CAAC,KAAyB;IAC9C,MAAM,EACJ,MAAM,EACN,KAAK,EACL,UAAU,EACV,cAAc,EACd,cAAc,EACd,QAAQ,EACR,aAAa,EACb,SAAS,EACT,cAAc,EACd,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,WAAW,EACX,WAAW,EACX,WAAW,EACZ,GAAG,KAAK,CAAC;IAEV,OAAO,CACL,oBAAC,SAAS,IAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,IACzC,CAAC,iBAAiB,EAAE,QAAQ,EAAE,EAAE,CAAC,CAChC,oBAAC,mBAAmB,kBAClB,aAAa,EAAE,QAAQ,CAAC,UAAU,EAClC,cAAc,EAAE,cAAc,EAC9B,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,CAAC,aAAa,EACrB,GAAG,EAAE,iBAAiB,CAAC,QAAQ,IAC3B,iBAAiB,CAAC,cAAc;QACnC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CACxB;YACE,oBAAC,SAAS,IAAC,OAAO,EAAC,UAAU;gBAC3B,oBAAC,GAAG,kBACF,OAAO,EAAC,MAAM,EACd,UAAU,EAAC,QAAQ,EACnB,cAAc,EAAC,QAAQ,IACnB,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,iBAAiB,CAAC,eAAe,CAAC;oBACvD,oBAAC,aAAa,IACZ,QAAQ,EAAC,OAAO,EAChB,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,EAAE,GACrD,CACE,CACI;YACZ,oBAAC,eAAe,IACd,UAAU,EAAE,cAAc,EAC1B,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,GACvC,CACD,CACJ;QACD,oBAAC,kBAAkB,IACjB,KAAK,EAAE,UAAU,EACjB,MAAM,EAAE,cAAc,EACtB,cAAc,EAAE,cAAc,EAC9B,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,WAAW,CAAC,UAAU,EAAE,KAAK,CAAC,GAC9D;QACD,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CACxB,oBAAC,eAAe,IACd,cAAc,EAAE,cAAc,EAC9B,SAAS,EAAE,SAAS,CAAC,MAAM,EAC3B,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,GACtC,CACH,CACmB,CACvB,CACS,CACb,CAAC;AACJ,CAAC;AAED,eAAe,aAAa,CAAC"}
1
+ {"version":3,"file":"GroupTableRow.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/Tables/GroupTableRow.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,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;AAsBrD,SAAS,aAAa,CAAC,KAAyB;IAC9C,MAAM,EACJ,MAAM,EACN,KAAK,EACL,UAAU,EACV,cAAc,EACd,cAAc,EACd,QAAQ,EACR,aAAa,EACb,SAAS,EACT,cAAc,EACd,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,WAAW,EACX,WAAW,EACX,WAAW,EACZ,GAAG,KAAK,CAAC;IAEV,OAAO,CACL,oBAAC,SAAS,IAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,IACzC,CAAC,iBAAiB,EAAE,QAAQ,EAAE,EAAE,CAAC,CAChC,oBAAC,mBAAmB,kBAClB,aAAa,EAAE,QAAQ,CAAC,UAAU,EAClC,cAAc,EAAE,cAAc,EAC9B,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,CAAC,aAAa,EACrB,GAAG,EAAE,iBAAiB,CAAC,QAAQ,IAC3B,iBAAiB,CAAC,cAAc;QACnC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CACxB;YACE,oBAAC,SAAS,IAAC,OAAO,EAAC,MAAM;gBACvB,oBAAC,GAAG,kBACF,OAAO,EAAC,MAAM,EACd,UAAU,EAAC,QAAQ,EACnB,cAAc,EAAC,QAAQ,IACnB,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,iBAAiB,CAAC,eAAe,CAAC;oBACvD,oBAAC,aAAa,IACZ,QAAQ,EAAC,OAAO,EAChB,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,EAAE,GACrD,CACE,CACI;YACZ,oBAAC,eAAe,IACd,UAAU,EAAE,cAAc,EAC1B,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,GACvC,CACD,CACJ;QACD,oBAAC,kBAAkB,IACjB,KAAK,EAAE,UAAU,EACjB,MAAM,EAAE,cAAc,EACtB,cAAc,EAAE,cAAc,EAC9B,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,WAAW,CAAC,UAAU,EAAE,KAAK,CAAC,GAC9D;QACD,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CACxB,oBAAC,eAAe,IACd,cAAc,EAAE,cAAc,EAC9B,SAAS,EAAE,SAAS,CAAC,MAAM,EAC3B,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,GACtC,CACH,CACmB,CACvB,CACS,CACb,CAAC;AACJ,CAAC;AAED,eAAe,aAAa,CAAC"}
package/lib/components/FormComponents/Tables/GroupTableRowCells.js CHANGED
@@ -38,7 +38,7 @@ function GroupTableRowCells(props) {
38
38
  if (Array.isArray(qrItem)) {
39
39
  return null;
40
40
  }
41
- return (React.createElement(StandardTableCell, { key: index, numOfColumns: rowItems.length, isFirst: index === 0 },
41
+ return (React.createElement(StandardTableCell, { key: index, numOfColumns: rowItems.length },
42
42
  React.createElement(SingleItem, { key: qItem.linkId, qItem: rowItem, qrItem: qrItem !== null && qrItem !== void 0 ? qrItem : null, isRepeated: true, isTabled: true, groupCardElevation: 1, showMinimalView: true, parentIsReadOnly: parentIsReadOnly, onQrItemChange: handleQrRowItemChange })));
43
43
  })));
44
44
  }
package/lib/components/FormComponents/Tables/GroupTableRowCells.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"GroupTableRowCells.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/Tables/GroupTableRowCells.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AACjF,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAcnD,SAAS,kBAAkB,CAAC,KAA8B;IACxD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,gBAAgB,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC;IAElF,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,CAAC,YAAuC;QACpE,MAAM,KAAK,qBAAmC,GAAG,CAAE,CAAC;QACpD,oBAAoB,CAAC,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;QAChE,cAAc,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;IAED,MAAM,cAAc,GAAG,eAAe,CAAC,QAAQ,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC;IAE7E,OAAO,CACL,0CACG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;QAC/B,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;QAErC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACzB,OAAO,IAAI,CAAC;SACb;QAED,OAAO,CACL,oBAAC,iBAAiB,IAAC,GAAG,EAAE,KAAK,EAAE,YAAY,EAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,KAAK,CAAC;YAChF,oBAAC,UAAU,IACT,GAAG,EAAE,KAAK,CAAC,MAAM,EACjB,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,IAAI,EACtB,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,kBAAkB,EAAE,CAAC,EACrB,eAAe,EAAE,IAAI,EACrB,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,qBAAqB,GACrC,CACgB,CACrB,CAAC;IACJ,CAAC,CAAC,CACD,CACJ,CAAC;AACJ,CAAC;AAED,eAAe,kBAAkB,CAAC"}
1
+ {"version":3,"file":"GroupTableRowCells.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/Tables/GroupTableRowCells.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AACjF,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAcnD,SAAS,kBAAkB,CAAC,KAA8B;IACxD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,gBAAgB,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC;IAElF,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,CAAC,YAAuC;QACpE,MAAM,KAAK,qBAAmC,GAAG,CAAE,CAAC;QACpD,oBAAoB,CAAC,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;QAChE,cAAc,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;IAED,MAAM,cAAc,GAAG,eAAe,CAAC,QAAQ,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC;IAE7E,OAAO,CACL,0CACG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;QAC/B,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;QAErC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACzB,OAAO,IAAI,CAAC;SACb;QAED,OAAO,CACL,oBAAC,iBAAiB,IAAC,GAAG,EAAE,KAAK,EAAE,YAAY,EAAE,QAAQ,CAAC,MAAM;YAC1D,oBAAC,UAAU,IACT,GAAG,EAAE,KAAK,CAAC,MAAM,EACjB,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,IAAI,EACtB,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,kBAAkB,EAAE,CAAC,EACrB,eAAe,EAAE,IAAI,EACrB,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,qBAAqB,GACrC,CACgB,CACrB,CAAC;IACJ,CAAC,CAAC,CACD,CACJ,CAAC;AACJ,CAAC;AAED,eAAe,kBAAkB,CAAC"}
package/lib/components/FormComponents/Tables/GroupTableView.js CHANGED
@@ -56,8 +56,8 @@ function GroupTableView(props) {
56
56
  React.createElement(AddRowButton, { repeatGroups: tableRows, readOnly: readOnly, onAddItem: onAddRow })),
57
57
  React.createElement(TableHead, null,
58
58
  React.createElement(TableRow, null,
59
- React.createElement(HeaderTableCell, { padding: "checkbox" }),
60
- React.createElement(HeaderTableCell, { padding: "checkbox" },
59
+ React.createElement(HeaderTableCell, { padding: "none" }),
60
+ React.createElement(HeaderTableCell, { padding: "none" },
61
61
  React.createElement(Checkbox, { color: "primary", size: "small", indeterminate: selectedIds.length > 0 && selectedIds.length < tableRows.length, checked: tableRows.length > 0 && selectedIds.length === tableRows.length, disabled: readOnly, onChange: onSelectAll })),
62
62
  itemLabels.map((itemLabel) => (React.createElement(HeaderTableCell, { key: itemLabel }, itemLabel))),
63
63
  React.createElement(TableCell, null))),
package/lib/components/FormComponents/Tables/GroupTableView.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"GroupTableView.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/Tables/GroupTableView.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"GroupTableView.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/Tables/GroupTableView.tsx"],"names":[],"mappings":"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"}
package/lib/components/FormComponents/Tables/SelectRowButton.js CHANGED
@@ -19,7 +19,7 @@ import Checkbox from '@mui/material/Checkbox';
19
19
  import TableCell from '@mui/material/TableCell';
20
20
  function SelectRowButton(props) {
21
21
  const { isSelected, readOnly, onSelectItem } = props;
22
- return (React.createElement(TableCell, { padding: "checkbox" },
22
+ return (React.createElement(TableCell, { padding: "none" },
23
23
  React.createElement(Checkbox, { color: "primary", size: "small", checked: isSelected, disabled: readOnly, onChange: onSelectItem })));
24
24
  }
25
25
  export default SelectRowButton;
package/lib/components/FormComponents/Tables/SelectRowButton.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SelectRowButton.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/Tables/SelectRowButton.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,QAAQ,MAAM,wBAAwB,CAAC;AAC9C,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAQhD,SAAS,eAAe,CAAC,KAA2B;IAClD,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC;IAErD,OAAO,CACL,oBAAC,SAAS,IAAC,OAAO,EAAC,UAAU;QAC3B,oBAAC,QAAQ,IACP,KAAK,EAAC,SAAS,EACf,IAAI,EAAC,OAAO,EACZ,OAAO,EAAE,UAAU,EACnB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,YAAY,GACtB,CACQ,CACb,CAAC;AACJ,CAAC;AAED,eAAe,eAAe,CAAC"}
1
+ {"version":3,"file":"SelectRowButton.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/Tables/SelectRowButton.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,QAAQ,MAAM,wBAAwB,CAAC;AAC9C,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAQhD,SAAS,eAAe,CAAC,KAA2B;IAClD,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC;IAErD,OAAO,CACL,oBAAC,SAAS,IAAC,OAAO,EAAC,MAAM;QACvB,oBAAC,QAAQ,IACP,KAAK,EAAC,SAAS,EACf,IAAI,EAAC,OAAO,EACZ,OAAO,EAAE,UAAU,EACnB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,YAAY,GACtB,CACQ,CACb,CAAC;AACJ,CAAC;AAED,eAAe,eAAe,CAAC"}
package/lib/components/FormComponents/Tables/Table.styles.d.ts CHANGED
@@ -2,7 +2,6 @@
2
2
  export declare const HeaderTableCell: import("@emotion/styled").StyledComponent<import("@mui/material/TableCell").TableCellProps & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme>, {}, {}>;
3
3
  export declare const StandardTableCell: import("@emotion/styled").StyledComponent<import("@mui/material/TableCell").TableCellProps & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme> & {
4
4
  numOfColumns: number;
5
- isFirst: boolean;
6
5
  }, {}, {}>;
7
6
  export declare const DeleteButtonTableCell: import("@emotion/styled").StyledComponent<import("@mui/material/TableCell").TableCellProps & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme>, {}, {}>;
8
7
  export declare const GridTextTableCell: import("@emotion/styled").StyledComponent<import("@mui/material/TableCell").TableCellProps & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme>, {}, {}>;
package/lib/components/FormComponents/Tables/Table.styles.js CHANGED
@@ -23,10 +23,10 @@ export const HeaderTableCell = styled(TableCell)(() => ({
23
23
  lineHeight: 'normal'
24
24
  }));
25
25
  export const StandardTableCell = styled(TableCell, {
26
- shouldForwardProp: (prop) => prop !== 'numOfColumns' && prop !== 'isFirst'
27
- })(({ numOfColumns, isFirst }) => ({
26
+ shouldForwardProp: (prop) => prop !== 'numOfColumns'
27
+ })(({ numOfColumns }) => ({
28
28
  width: `${100 / numOfColumns}%`,
29
- paddingLeft: isFirst ? 8 : 4,
29
+ paddingLeft: 4,
30
30
  paddingRight: 4
31
31
  }));
32
32
  export const DeleteButtonTableCell = styled(TableCell)(() => ({
package/lib/components/FormComponents/Tables/Table.styles.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Table.styles.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/Tables/Table.styles.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,QAAQ,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE5C,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IACtD,QAAQ,EAAE,EAAE;IACZ,UAAU,EAAE,QAAQ;CACrB,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,SAAS,EAAE;IACjD,iBAAiB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,cAAc,IAAI,IAAI,KAAK,SAAS;CAC3E,CAAC,CAA6C,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;IAC7E,KAAK,EAAE,GAAG,GAAG,GAAG,YAAY,GAAG;IAC/B,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5B,YAAY,EAAE,CAAC;CAChB,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,MAAM,qBAAqB,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC5D,WAAW,EAAE,CAAC;IACd,YAAY,EAAE,CAAC;CAChB,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;IACjE,KAAK,EAAE,KAAK;IACZ,WAAW,EAAE,MAAM;IACnB,YAAY,EAAE,MAAM;IACpB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS;CACpC,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAC,SAAS,EAAE;IACnD,iBAAiB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,cAAc;CACrD,CAAC,CAA2B,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC;IAClD,KAAK,EAAE,GAAG,EAAE,GAAG,YAAY,GAAG;IAC9B,WAAW,EAAE,CAAC;IACd,YAAY,EAAE,CAAC;CAChB,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAC,QAAQ,EAAE;IAClD,iBAAiB,EAAE,CAAC,IAAI,EAAE,EAAE,CAC1B,IAAI,KAAK,eAAe,IAAI,IAAI,KAAK,gBAAgB,IAAI,IAAI,KAAK,eAAe;CACpF,CAAC,CACA,CAAC,EAAE,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,+BAC3D,eAAe,EAAE,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,IACjD,CAAC,aAAa;IACf,CAAC,CAAC,EAAE;IACJ,CAAC,CAAC;QACE,0BAA0B,EAAE;YAC1B,eAAe,EAAE,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;SACzD;KACF,CAAC,GACH,CAAC,aAAa;IACf,CAAC,CAAC;QACE,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,EAAE;QACjC,OAAO,EAAE,CAAC;QACV,eAAe,EAAE,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;KACxD;IACH,CAAC,CAAC,EAAE,CAAC,EACP,CACH,CAAC"}
1
+ {"version":3,"file":"Table.styles.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/Tables/Table.styles.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,QAAQ,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE5C,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IACtD,QAAQ,EAAE,EAAE;IACZ,UAAU,EAAE,QAAQ;CACrB,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,SAAS,EAAE;IACjD,iBAAiB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,cAAc;CACrD,CAAC,CAA2B,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC;IAClD,KAAK,EAAE,GAAG,GAAG,GAAG,YAAY,GAAG;IAC/B,WAAW,EAAE,CAAC;IACd,YAAY,EAAE,CAAC;CAChB,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,MAAM,qBAAqB,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC5D,WAAW,EAAE,CAAC;IACd,YAAY,EAAE,CAAC;CAChB,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;IACjE,KAAK,EAAE,KAAK;IACZ,WAAW,EAAE,MAAM;IACnB,YAAY,EAAE,MAAM;IACpB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS;CACpC,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAC,SAAS,EAAE;IACnD,iBAAiB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,cAAc;CACrD,CAAC,CAA2B,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC;IAClD,KAAK,EAAE,GAAG,EAAE,GAAG,YAAY,GAAG;IAC9B,WAAW,EAAE,CAAC;IACd,YAAY,EAAE,CAAC;CAChB,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAC,QAAQ,EAAE;IAClD,iBAAiB,EAAE,CAAC,IAAI,EAAE,EAAE,CAC1B,IAAI,KAAK,eAAe,IAAI,IAAI,KAAK,gBAAgB,IAAI,IAAI,KAAK,eAAe;CACpF,CAAC,CACA,CAAC,EAAE,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,+BAC3D,eAAe,EAAE,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,IACjD,CAAC,aAAa;IACf,CAAC,CAAC,EAAE;IACJ,CAAC,CAAC;QACE,0BAA0B,EAAE;YAC1B,eAAe,EAAE,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;SACzD;KACF,CAAC,GACH,CAAC,aAAa;IACf,CAAC,CAAC;QACE,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,EAAE;QACjC,OAAO,EAAE,CAAC;QACV,eAAe,EAAE,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;KACxD;IACH,CAAC,CAAC,EAAE,CAAC,EACP,CACH,CAAC"}
package/lib/components/Renderer/FormBodyTabbed.js CHANGED
@@ -39,11 +39,11 @@ function FormBodyTabbed(props) {
39
39
  return React.createElement(React.Fragment, null, "Unable to load form");
40
40
  }
41
41
  const qrItemsByIndex = getQrItemsIndex(qItems, qrItems, indexMap);
42
- return (React.createElement(Grid, { container: true, spacing: 2 },
42
+ return (React.createElement(Grid, { container: true, spacing: 1.5 },
43
43
  React.createElement(TabContext, { value: currentTab.toString() },
44
- React.createElement(Grid, { item: true, xs: 12, md: 3.5, lg: 3, xl: 2.75 },
44
+ React.createElement(Grid, { item: true, xs: 12, md: 3, lg: 2.75 },
45
45
  React.createElement(FormBodyTabListWrapper, { topLevelItems: qItems, currentTabIndex: currentTab, tabs: tabs })),
46
- React.createElement(Grid, { item: true, xs: 12, md: 8.5, lg: 9, xl: 9.25 }, qItems.map((qItem, i) => {
46
+ React.createElement(Grid, { item: true, xs: 12, md: 9, lg: 9.25 }, qItems.map((qItem, i) => {
47
47
  var _a, _b;
48
48
  const qrItem = qrItemsByIndex[i];
49
49
  const isNotRepeatGroup = !Array.isArray(qrItem);
package/lib/components/Renderer/FormBodyTabbed.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"FormBodyTabbed.js","sourceRoot":"","sources":["../../../src/components/Renderer/FormBodyTabbed.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"FormBodyTabbed.js","sourceRoot":"","sources":["../../../src/components/Renderer/FormBodyTabbed.tsx"],"names":[],"mappings":"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"}
package/lib/utils/openChoice.js CHANGED
@@ -100,11 +100,12 @@ export function getOpenChoiceControlType(qItem) {
100
100
  * @author Sean Fong
101
101
  */
102
102
  export function getAnswerOptionLabel(option) {
103
+ var _a;
103
104
  if (typeof option === 'string') {
104
105
  return option;
105
106
  }
106
107
  if (option['valueCoding']) {
107
- return `${option.valueCoding.display}`;
108
+ return (_a = option.valueCoding.display) !== null && _a !== void 0 ? _a : `${option.valueCoding.code}`;
108
109
  }
109
110
  else if (option['valueString']) {
110
111
  return option.valueString;
package/lib/utils/openChoice.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"openChoice.js","sourceRoot":"","sources":["../../src/utils/openChoice.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"openChoice.js","sourceRoot":"","sources":["../../src/utils/openChoice.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": "0.35.2",
3
+ "version": "0.35.4",
4
4
  "description": "FHIR Structured Data Captured (SDC) rendering engine for Smart Forms",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {
package/src/components/FormComponents/ItemParts/ItemFieldGrid.tsx CHANGED
@@ -35,11 +35,11 @@ function ItemFieldGrid(props: ItemFieldGridProps) {
35
35
  const { displayInstructions } = useRenderingExtensions(qItem);
36
36
 
37
37
  return (
38
- <Grid container columnSpacing={6}>
39
- <Grid item xs={5}>
38
+ <Grid container columnSpacing={4}>
39
+ <Grid item xs={4}>
40
40
  <LabelWrapper qItem={qItem} readOnly={readOnly} />
41
41
  </Grid>
42
- <Grid item xs={7}>
42
+ <Grid item xs={8}>
43
43
  {children}
44
44
  <DisplayInstructions displayInstructions={displayInstructions} readOnly={readOnly} />
45
45
  </Grid>
package/src/components/FormComponents/Tables/GroupTableRow.tsx CHANGED
@@ -83,7 +83,7 @@ function GroupTableRow(props: GroupTableRowProps) {
83
83
  {...draggableProvided.draggableProps}>
84
84
  {showMinimalView ? null : (
85
85
  <>
86
- <TableCell padding="checkbox">
86
+ <TableCell padding="none">
87
87
  <Box
88
88
  display="flex"
89
89
  alignItems="center"
package/src/components/FormComponents/Tables/GroupTableRowCells.tsx CHANGED
@@ -63,7 +63,7 @@ function GroupTableRowCells(props: GroupTableRowCellsProps) {
63
63
  }
64
64
 
65
65
  return (
66
- <StandardTableCell key={index} numOfColumns={rowItems.length} isFirst={index === 0}>
66
+ <StandardTableCell key={index} numOfColumns={rowItems.length}>
67
67
  <SingleItem
68
68
  key={qItem.linkId}
69
69
  qItem={rowItem}
package/src/components/FormComponents/Tables/GroupTableView.tsx CHANGED
@@ -139,8 +139,8 @@ function GroupTableView(props: GroupTableViewProps) {
139
139
  </caption>
140
140
  <TableHead>
141
141
  <TableRow>
142
- <HeaderTableCell padding="checkbox" />
143
- <HeaderTableCell padding="checkbox">
142
+ <HeaderTableCell padding="none" />
143
+ <HeaderTableCell padding="none">
144
144
  <Checkbox
145
145
  color="primary"
146
146
  size="small"
package/src/components/FormComponents/Tables/SelectRowButton.tsx CHANGED
@@ -29,7 +29,7 @@ function SelectRowButton(props: SelectRowButtonProps) {
29
29
  const { isSelected, readOnly, onSelectItem } = props;
30
30
 
31
31
  return (
32
- <TableCell padding="checkbox">
32
+ <TableCell padding="none">
33
33
  <Checkbox
34
34
  color="primary"
35
35
  size="small"
package/src/components/FormComponents/Tables/Table.styles.tsx CHANGED
@@ -26,10 +26,10 @@ export const HeaderTableCell = styled(TableCell)(() => ({
26
26
  }));
27
27
 
28
28
  export const StandardTableCell = styled(TableCell, {
29
- shouldForwardProp: (prop) => prop !== 'numOfColumns' && prop !== 'isFirst'
30
- })<{ numOfColumns: number; isFirst: boolean }>(({ numOfColumns, isFirst }) => ({
29
+ shouldForwardProp: (prop) => prop !== 'numOfColumns'
30
+ })<{ numOfColumns: number }>(({ numOfColumns }) => ({
31
31
  width: `${100 / numOfColumns}%`,
32
- paddingLeft: isFirst ? 8 : 4,
32
+ paddingLeft: 4,
33
33
  paddingRight: 4
34
34
  }));
35
35
 
package/src/components/Renderer/FormBodyTabbed.tsx CHANGED
@@ -65,13 +65,13 @@ function FormBodyTabbed(props: FormBodyTabbedProps) {
65
65
  const qrItemsByIndex = getQrItemsIndex(qItems, qrItems, indexMap);
66
66
 
67
67
  return (
68
- <Grid container spacing={2}>
68
+ <Grid container spacing={1.5}>
69
69
  <TabContext value={currentTab.toString()}>
70
- <Grid item xs={12} md={3.5} lg={3} xl={2.75}>
70
+ <Grid item xs={12} md={3} lg={2.75}>
71
71
  <FormBodyTabListWrapper topLevelItems={qItems} currentTabIndex={currentTab} tabs={tabs} />
72
72
  </Grid>
73
73
 
74
- <Grid item xs={12} md={8.5} lg={9} xl={9.25}>
74
+ <Grid item xs={12} md={9} lg={9.25}>
75
75
  {qItems.map((qItem, i) => {
76
76
  const qrItem = qrItemsByIndex[i];
77
77
 
package/src/stories/assets/questionnaires/QPrePopTester.ts ADDED
@@ -0,0 +1,201 @@
1
+ /*
2
+ * Copyright 2024 Commonwealth Scientific and Industrial Research
3
+ * Organisation (CSIRO) ABN 41 687 119 230.
4
+ *
5
+ * Licensed under the Apache License, Version 2.0 (the "License");
6
+ * you may not use this file except in compliance with the License.
7
+ * You may obtain a copy of the License at
8
+ *
9
+ * http://www.apache.org/licenses/LICENSE-2.0
10
+ *
11
+ * Unless required by applicable law or agreed to in writing, software
12
+ * distributed under the License is distributed on an "AS IS" BASIS,
13
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14
+ * See the License for the specific language governing permissions and
15
+ * limitations under the License.
16
+ */
17
+
18
+ import type { Questionnaire } from 'fhir/r4';
19
+
20
+ export const qSelectivePrePopTester: Questionnaire = {
21
+ resourceType: 'Questionnaire',
22
+ id: 'SelectivePrePopTester',
23
+ name: 'SelectivePrePopTester',
24
+ title: 'Selective Pre-pop Tester',
25
+ version: '0.1.0',
26
+ status: 'draft',
27
+ publisher: 'AEHRC CSIRO',
28
+ date: '2024-05-01',
29
+ url: 'https://smartforms.csiro.au/docs/tester/prepop-1',
30
+ contained: [
31
+ {
32
+ resourceType: 'ValueSet',
33
+ id: 'administrative-gender',
34
+ meta: {
35
+ profile: ['http://hl7.org/fhir/StructureDefinition/shareablevalueset']
36
+ },
37
+ extension: [
38
+ {
39
+ url: 'http://hl7.org/fhir/StructureDefinition/structuredefinition-wg',
40
+ valueCode: 'pa'
41
+ },
42
+ {
43
+ url: 'http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status',
44
+ valueCode: 'normative'
45
+ },
46
+ {
47
+ url: 'http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm',
48
+ valueInteger: 5
49
+ },
50
+ {
51
+ url: 'http://hl7.org/fhir/StructureDefinition/structuredefinition-normative-version',
52
+ valueCode: '4.0.0'
53
+ }
54
+ ],
55
+ url: 'http://hl7.org/fhir/ValueSet/administrative-gender',
56
+ identifier: [
57
+ {
58
+ system: 'urn:ietf:rfc:3986',
59
+ value: 'urn:oid:2.16.840.1.113883.4.642.3.1'
60
+ }
61
+ ],
62
+ version: '4.0.1',
63
+ name: 'AdministrativeGender',
64
+ title: 'AdministrativeGender',
65
+ status: 'active',
66
+ experimental: false,
67
+ date: '2019-11-01T09:29:23+11:00',
68
+ publisher: 'HL7 (FHIR Project)',
69
+ contact: [
70
+ {
71
+ telecom: [
72
+ {
73
+ system: 'url',
74
+ value: 'http://hl7.org/fhir'
75
+ },
76
+ {
77
+ system: 'email',
78
+ value: 'fhir@lists.hl7.org'
79
+ }
80
+ ]
81
+ }
82
+ ],
83
+ description: 'The gender of a person used for administrative purposes.',
84
+ immutable: true,
85
+ copyright: 'Copyright © 2011+ HL7. Licensed under Creative Commons "No Rights Reserved".',
86
+ compose: {
87
+ include: [
88
+ {
89
+ system: 'http://hl7.org/fhir/administrative-gender'
90
+ }
91
+ ]
92
+ },
93
+ expansion: {
94
+ identifier: 'urn:uuid:50f050c9-3975-48d6-bdb7-baae4ebc70cd',
95
+ timestamp: '2024-04-05T12:31:27+10:00',
96
+ total: 4,
97
+ parameter: [
98
+ {
99
+ name: 'version',
100
+ valueUri: 'http://hl7.org/fhir/administrative-gender|4.0.1'
101
+ },
102
+ {
103
+ name: 'used-codesystem',
104
+ valueUri: 'http://hl7.org/fhir/administrative-gender|4.0.1'
105
+ }
106
+ ],
107
+ contains: [
108
+ {
109
+ system: 'http://hl7.org/fhir/administrative-gender',
110
+ code: 'female',
111
+ display: 'Female'
112
+ },
113
+ {
114
+ system: 'http://hl7.org/fhir/administrative-gender',
115
+ code: 'male',
116
+ display: 'Male'
117
+ },
118
+ {
119
+ system: 'http://hl7.org/fhir/administrative-gender',
120
+ code: 'other',
121
+ display: 'Other'
122
+ },
123
+ {
124
+ system: 'http://hl7.org/fhir/administrative-gender',
125
+ code: 'unknown',
126
+ display: 'Unknown'
127
+ }
128
+ ]
129
+ }
130
+ }
131
+ ],
132
+ extension: [
133
+ {
134
+ url: 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext',
135
+ extension: [
136
+ {
137
+ url: 'name',
138
+ valueCoding: {
139
+ system: 'http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext',
140
+ code: 'patient'
141
+ }
142
+ },
143
+ {
144
+ url: 'type',
145
+ valueCode: 'Patient'
146
+ },
147
+ {
148
+ url: 'description',
149
+ valueString: 'The patient that is to be used to pre-populate the form'
150
+ }
151
+ ]
152
+ }
153
+ ],
154
+ item: [
155
+ {
156
+ linkId: 'display-description',
157
+ extension: [
158
+ {
159
+ url: 'http://hl7.org/fhir/StructureDefinition/rendering-xhtml',
160
+ valueString:
161
+ '<div xmlns="http://www.w3.org/1999/xhtml">\r\n <div style="font-size:0.875em"> This questionnaire is used by Playwright to do regression testing of the <pre style="display: inline">@aehrc/sdc-populate</pre> library\'s pre-population logic. Items will be incrementally added as needed.</div><br/></div>'
162
+ }
163
+ ],
164
+ text: "This questionnaire is used by Playwright to do regression testing of the @aehrc/sdc-populate library's pre-population logic. Items will be incrementally added as needed.",
165
+ type: 'display',
166
+ repeats: false
167
+ },
168
+ {
169
+ extension: [
170
+ {
171
+ url: 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression',
172
+ valueExpression: {
173
+ language: 'text/fhirpath',
174
+ expression: '%patient.gender'
175
+ }
176
+ }
177
+ ],
178
+ linkId: 'gender-avs-url',
179
+ text: 'Administrative gender (answerValueSet url)',
180
+ type: 'choice',
181
+ repeats: false,
182
+ answerValueSet: 'http://hl7.org/fhir/ValueSet/administrative-gender'
183
+ },
184
+ {
185
+ extension: [
186
+ {
187
+ url: 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression',
188
+ valueExpression: {
189
+ language: 'text/fhirpath',
190
+ expression: '%patient.gender'
191
+ }
192
+ }
193
+ ],
194
+ linkId: 'gender-avs-contained',
195
+ text: 'Administrative gender (answerValueSet contained)',
196
+ type: 'choice',
197
+ repeats: false,
198
+ answerValueSet: 'http://hl7.org/fhir/ValueSet/administrative-gender'
199
+ }
200
+ ]
201
+ };
package/src/stories/testing/BuildFormButtonTesterWrapper.stories.tsx CHANGED
@@ -18,7 +18,6 @@
18
18
  import type { Meta, StoryObj } from '@storybook/react';
19
19
  import BuildFormButtonTesterWrapperForStorybook from '../storybookWrappers/BuildFormButtonTesterWrapperForStorybook';
20
20
  import { qButtonTester, qrButtonTesterResponse } from '../assets/questionnaires/QButtonTester';
21
- import { qBooleanBasic, qrBooleanBasicResponse } from '../assets/questionnaires';
22
21
 
23
22
  // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
24
23
  const meta = {
@@ -39,10 +38,3 @@ export const BuildFormButtonTester: Story = {
39
38
  questionnaireResponse: qrButtonTesterResponse
40
39
  }
41
40
  };
42
-
43
- export const BuildFormButtonTesterBoolean: Story = {
44
- args: {
45
- questionnaire: qBooleanBasic,
46
- questionnaireResponse: qrBooleanBasicResponse
47
- }
48
- };
package/src/stories/testing/PrePopButtonTesterWrapper.stories.tsx CHANGED
@@ -21,10 +21,11 @@ import { mockFhirClient } from '../assets/fhirClient/mockFhirClient';
21
21
  import { patSmartForm } from '../assets/patients/PatSmartForm';
22
22
  import { pracPrimaryPeter } from '../assets/practitioners/PracPrimaryPeter';
23
23
  import { qButtonTester } from '../assets/questionnaires/QButtonTester';
24
+ import { qSelectivePrePopTester } from '../assets/questionnaires/QPrePopTester';
24
25
 
25
26
  // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
26
27
  const meta = {
27
- title: 'Component/Testing/Pre Pop Button Tester',
28
+ title: 'Component/Testing/Pre Pop Tester',
28
29
  component: PrePopWrapperForStorybook,
29
30
  // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
30
31
  tags: []
@@ -35,7 +36,7 @@ type Story = StoryObj<typeof meta>;
35
36
 
36
37
  // More on writing stories with args: https://storybook.js.org/docs/react/writing-stories/args
37
38
 
38
- export const PrePopButtonTester: Story = {
39
+ export const BasicPrePopTester: Story = {
39
40
  args: {
40
41
  questionnaire: qButtonTester,
41
42
  fhirClient: mockFhirClient,
@@ -43,3 +44,12 @@ export const PrePopButtonTester: Story = {
43
44
  user: pracPrimaryPeter
44
45
  }
45
46
  };
47
+
48
+ export const SelectivePrePopTester: Story = {
49
+ args: {
50
+ questionnaire: qSelectivePrePopTester,
51
+ fhirClient: mockFhirClient,
52
+ patient: patSmartForm,
53
+ user: pracPrimaryPeter
54
+ }
55
+ };
package/src/utils/openChoice.ts CHANGED
@@ -153,7 +153,7 @@ export function getAnswerOptionLabel(option: QuestionnaireItemAnswerOption | str
153
153
  }
154
154
 
155
155
  if (option['valueCoding']) {
156
- return `${option.valueCoding.display}`;
156
+ return option.valueCoding.display ?? `${option.valueCoding.code}`;
157
157
  } else if (option['valueString']) {
158
158
  return option.valueString;
159
159
  } else if (option['valueInteger']) {