@aehrc/smart-forms-renderer 0.16.0 → 0.16.2
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/OpenChoiceItems/OpenChoiceAutocompleteField.js +5 -3
- package/lib/components/FormComponents/OpenChoiceItems/OpenChoiceAutocompleteField.js.map +1 -1
- package/lib/hooks/useHidden.js +2 -2
- package/lib/hooks/useHidden.js.map +1 -1
- package/lib/utils/index.d.ts +1 -1
- package/lib/utils/index.js +1 -1
- package/lib/utils/index.js.map +1 -1
- package/lib/utils/qItem.d.ts +1 -15
- package/lib/utils/qItem.js +1 -21
- package/lib/utils/qItem.js.map +1 -1
- package/lib/utils/removeEmptyAnswers.js +6 -6
- package/lib/utils/removeEmptyAnswers.js.map +1 -1
- package/lib/utils/repopulateItems.js +5 -5
- package/lib/utils/repopulateItems.js.map +1 -1
- package/lib/utils/tabs.js +12 -9
- package/lib/utils/tabs.js.map +1 -1
- package/lib/utils/validateQuestionnaire.js +3 -3
- package/lib/utils/validateQuestionnaire.js.map +1 -1
- package/package.json +2 -2
- package/src/components/FormComponents/OpenChoiceItems/OpenChoiceAutocompleteField.tsx +2 -2
- package/src/hooks/useHidden.ts +2 -2
- package/src/utils/index.ts +1 -1
- package/src/utils/qItem.ts +1 -31
- package/src/utils/removeEmptyAnswers.ts +6 -6
- package/src/utils/repopulateItems.ts +5 -5
- package/src/utils/tabs.ts +17 -14
- package/src/utils/validateQuestionnaire.ts +3 -3
|
@@ -31,10 +31,12 @@ function OpenChoiceAutocompleteField(props) {
|
|
|
31
31
|
const { qItem, options, valueAutocomplete, input, loading, feedback, readOnly, isTabled, onInputChange, onValueChange, onUnfocus } = props;
|
|
32
32
|
const { displayUnit, displayPrompt, entryFormat } = useRenderingExtensions(qItem);
|
|
33
33
|
return (React.createElement(Box, { display: "flex" },
|
|
34
|
-
React.createElement(Autocomplete, { id: qItem.id, value: valueAutocomplete, options: options, getOptionLabel: (option) => (typeof option === 'string' ? option : `${option.display}`), disabled: readOnly, loading: loading, loadingText: 'Fetching results...', clearOnEscape: true, freeSolo: true,
|
|
34
|
+
React.createElement(Autocomplete, { id: qItem.id, value: valueAutocomplete, options: options, getOptionLabel: (option) => (typeof option === 'string' ? option : `${option.display}`), disabled: readOnly, loading: loading, loadingText: 'Fetching results...', clearOnEscape: true, freeSolo: true, sx: { maxWidth: !isTabled ? TEXT_FIELD_WIDTH : 3000, minWidth: 220, flexGrow: 1 }, onChange: (_, newValue) => onValueChange(newValue), filterOptions: (x) => x, renderInput: (params) => (React.createElement(StandardTextField, Object.assign({}, params, { value: input, onBlur: onUnfocus, onChange: (e) => onInputChange(e.target.value), isTabled: isTabled, label: displayPrompt, size: "small", placeholder: entryFormat, InputProps: Object.assign(Object.assign({}, params.InputProps), { startAdornment: (React.createElement(React.Fragment, null,
|
|
35
35
|
!valueAutocomplete || valueAutocomplete === '' ? (React.createElement(SearchIcon, { fontSize: "small", sx: { ml: 0.5 } })) : null,
|
|
36
|
-
params.InputProps.startAdornment)),
|
|
37
|
-
|
|
36
|
+
params.InputProps.startAdornment)),
|
|
37
|
+
// Warning indicator should not show up in open-choice autocomplete
|
|
38
|
+
endAdornment: (React.createElement(React.Fragment, null,
|
|
39
|
+
loading ? (React.createElement(CircularProgress, { color: "inherit", size: 16 })) : feedback && feedback.color !== 'warning' ? (React.createElement(Fade, { in: !!feedback, timeout: 300 },
|
|
38
40
|
React.createElement(Tooltip, { title: feedback.message, arrow: true, sx: { ml: 1 } }, {
|
|
39
41
|
info: React.createElement(InfoIcon, { fontSize: "small", color: "info" }),
|
|
40
42
|
warning: React.createElement(WarningAmberIcon, { fontSize: "small", color: "warning" }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenChoiceAutocompleteField.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/OpenChoiceItems/OpenChoiceAutocompleteField.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAM,mBAAmB,CAAC;AACpC,OAAO,YAAY,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC1E,OAAO,UAAU,MAAM,4BAA4B,CAAC;AACpD,OAAO,gBAAgB,MAAM,gCAAgC,CAAC;AAC9D,OAAO,IAAI,MAAM,oBAAoB,CAAC;AACtC,OAAO,OAAO,MAAM,uBAAuB,CAAC;AAC5C,OAAO,QAAQ,MAAM,0BAA0B,CAAC;AAChD,OAAO,gBAAgB,MAAM,kCAAkC,CAAC;AAChE,OAAO,QAAQ,MAAM,0BAA0B,CAAC;AAChD,OAAO,SAAS,MAAM,2BAA2B,CAAC;AAMlD,OAAO,sBAAsB,MAAM,uCAAuC,CAAC;AAkB3E,SAAS,2BAA2B,CAAC,KAAuC;IAC1E,MAAM,EACJ,KAAK,EACL,OAAO,EACP,iBAAiB,EACjB,KAAK,EACL,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,aAAa,EACb,aAAa,EACb,SAAS,EACV,GAAG,KAAK,CAAC;IAEV,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAElF,OAAO,CACL,oBAAC,GAAG,IAAC,OAAO,EAAC,MAAM;QACjB,oBAAC,YAAY,IACX,EAAE,EAAE,KAAK,CAAC,EAAE,EACZ,KAAK,EAAE,iBAAiB,EACxB,OAAO,EAAE,OAAO,EAChB,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC,EACvF,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,qBAAqB,EAClC,aAAa,QACb,QAAQ,QACR,
|
|
1
|
+
{"version":3,"file":"OpenChoiceAutocompleteField.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/OpenChoiceItems/OpenChoiceAutocompleteField.tsx"],"names":[],"mappings":"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"}
|
package/lib/hooks/useHidden.js
CHANGED
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
* limitations under the License.
|
|
16
16
|
*/
|
|
17
17
|
import { useQuestionnaireStore } from '../stores';
|
|
18
|
-
import {
|
|
18
|
+
import { isHiddenByEnableWhen } from '../utils/qItem';
|
|
19
19
|
import { structuredDataCapture } from 'fhir-sdc-helpers';
|
|
20
20
|
function useHidden(qItem) {
|
|
21
21
|
const enableWhenIsActivated = useQuestionnaireStore.use.enableWhenIsActivated();
|
|
@@ -24,7 +24,7 @@ function useHidden(qItem) {
|
|
|
24
24
|
if (structuredDataCapture.getHidden(qItem)) {
|
|
25
25
|
return true;
|
|
26
26
|
}
|
|
27
|
-
return
|
|
27
|
+
return isHiddenByEnableWhen({
|
|
28
28
|
linkId: qItem.linkId,
|
|
29
29
|
enableWhenIsActivated,
|
|
30
30
|
enableWhenItems,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useHidden.js","sourceRoot":"","sources":["../../src/hooks/useHidden.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAClD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"useHidden.js","sourceRoot":"","sources":["../../src/hooks/useHidden.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,SAAS,SAAS,CAAC,KAAwB;IACzC,MAAM,qBAAqB,GAAG,qBAAqB,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC;IAChF,MAAM,eAAe,GAAG,qBAAqB,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC;IACpE,MAAM,qBAAqB,GAAG,qBAAqB,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC;IAEhF,IAAI,qBAAqB,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;QAC1C,OAAO,IAAI,CAAC;KACb;IAED,OAAO,oBAAoB,CAAC;QAC1B,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,qBAAqB;QACrB,eAAe;QACf,qBAAqB;KACtB,CAAC,CAAC;AACL,CAAC;AAED,eAAe,SAAS,CAAC"}
|
package/lib/utils/index.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export { isSpecificItemControl } from './itemControl';
|
|
2
|
-
export { isRepeatItemAndNotCheckbox
|
|
2
|
+
export { isRepeatItemAndNotCheckbox } from './qItem';
|
package/lib/utils/index.js
CHANGED
package/lib/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,0BAA0B,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,0BAA0B,EAAE,MAAM,SAAS,CAAC"}
|
package/lib/utils/qItem.d.ts
CHANGED
|
@@ -1,26 +1,12 @@
|
|
|
1
1
|
import type { Questionnaire, QuestionnaireItem } from 'fhir/r4';
|
|
2
2
|
import type { EnableWhenExpression, EnableWhenItems } from '../interfaces/enableWhen.interface';
|
|
3
|
-
interface isHiddenParams {
|
|
4
|
-
questionnaireItem: QuestionnaireItem;
|
|
5
|
-
enableWhenIsActivated: boolean;
|
|
6
|
-
enableWhenItems: EnableWhenItems;
|
|
7
|
-
enableWhenExpressions: Record<string, EnableWhenExpression>;
|
|
8
|
-
}
|
|
9
|
-
/**
|
|
10
|
-
* Test the given QItem on a series of checks to verify if the item should be displayed
|
|
11
|
-
* Check if qItem has hidden attribute
|
|
12
|
-
* Check if qItem fulfilled its enableWhen criteria
|
|
13
|
-
*
|
|
14
|
-
* @author Sean Fong
|
|
15
|
-
*/
|
|
16
|
-
export declare function isHidden(params: isHiddenParams): boolean;
|
|
17
3
|
interface isHiddenByEnableWhensParams {
|
|
18
4
|
linkId: string;
|
|
19
5
|
enableWhenIsActivated: boolean;
|
|
20
6
|
enableWhenItems: EnableWhenItems;
|
|
21
7
|
enableWhenExpressions: Record<string, EnableWhenExpression>;
|
|
22
8
|
}
|
|
23
|
-
export declare function
|
|
9
|
+
export declare function isHiddenByEnableWhen(params: isHiddenByEnableWhensParams): boolean;
|
|
24
10
|
/**
|
|
25
11
|
* Check if qItem is a repeat item AND if it isn't a checkbox item
|
|
26
12
|
* Note: repeat checkbox items are rendered as multi-select checkbox instead of being rendered as a traditional repeat item
|
package/lib/utils/qItem.js
CHANGED
|
@@ -17,27 +17,7 @@
|
|
|
17
17
|
import { getChoiceControlType } from './choice';
|
|
18
18
|
import { ChoiceItemControl, OpenChoiceItemControl } from '../interfaces/choice.enum';
|
|
19
19
|
import { getOpenChoiceControlType } from './openChoice';
|
|
20
|
-
|
|
21
|
-
/**
|
|
22
|
-
* Test the given QItem on a series of checks to verify if the item should be displayed
|
|
23
|
-
* Check if qItem has hidden attribute
|
|
24
|
-
* Check if qItem fulfilled its enableWhen criteria
|
|
25
|
-
*
|
|
26
|
-
* @author Sean Fong
|
|
27
|
-
*/
|
|
28
|
-
export function isHidden(params) {
|
|
29
|
-
const { questionnaireItem, enableWhenIsActivated, enableWhenItems, enableWhenExpressions } = params;
|
|
30
|
-
if (structuredDataCapture.getHidden(questionnaireItem)) {
|
|
31
|
-
return true;
|
|
32
|
-
}
|
|
33
|
-
return isHiddenByEnableWhens({
|
|
34
|
-
linkId: questionnaireItem.linkId,
|
|
35
|
-
enableWhenIsActivated,
|
|
36
|
-
enableWhenItems,
|
|
37
|
-
enableWhenExpressions
|
|
38
|
-
});
|
|
39
|
-
}
|
|
40
|
-
export function isHiddenByEnableWhens(params) {
|
|
20
|
+
export function isHiddenByEnableWhen(params) {
|
|
41
21
|
const { linkId, enableWhenIsActivated, enableWhenItems, enableWhenExpressions } = params;
|
|
42
22
|
if (enableWhenIsActivated) {
|
|
43
23
|
if (enableWhenItems[linkId]) {
|
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":"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;AAUxD,MAAM,UAAU,oBAAoB,CAAC,MAAmC;IACtE,MAAM,EAAE,MAAM,EAAE,qBAAqB,EAAE,eAAe,EAAE,qBAAqB,EAAE,GAAG,MAAM,CAAC;IAEzF,IAAI,qBAAqB,EAAE;QACzB,IAAI,eAAe,CAAC,MAAM,CAAC,EAAE;YAC3B,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC;SAC3C;QAED,IAAI,qBAAqB,CAAC,MAAM,CAAC,EAAE;YACjC,OAAO,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC;SACjD;KACF;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,0BAA0B,CAAC,KAAwB;IACjE,MAAM,UAAU,GACd,oBAAoB,CAAC,KAAK,CAAC,KAAK,iBAAiB,CAAC,QAAQ;QAC1D,wBAAwB,CAAC,KAAK,CAAC,KAAK,qBAAqB,CAAC,QAAQ,CAAC;IAErE,OAAO,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,+BAA+B,CAAC,aAA4B;;IAC1E,MAAM,WAAW,GAAG,MAAA,MAAA,aAAa,CAAC,MAAM,0CAAE,SAAS,0CAAE,IAAI,CACvD,CAAC,SAAoB,EAAE,EAAE,CACvB,SAAS,CAAC,GAAG,KAAK,yDAAyD,CAC9E,CAAC;IAEF,IAAI,WAAW,EAAE;QACf,IAAI,WAAW,CAAC,WAAW,EAAE;YAC3B,OAAO,WAAW,CAAC,WAAW,CAAC;SAChC;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,aAA4B;IAC9D,IAAI,CAAC,aAAa,CAAC,IAAI,IAAI,aAAa,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QAC1D,OAAO,EAAE,CAAC;KACX;IAED,MAAM,OAAO,GAAuB,EAAE,CAAC;IACvC,KAAK,MAAM,YAAY,IAAI,aAAa,CAAC,IAAI,EAAE;QAC7C,OAAO,CAAC,IAAI,CAAC,GAAG,oCAAoC,CAAC,YAAY,CAAC,CAAC,CAAC;KACrE;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,oCAAoC,CAAC,KAAwB;IAC3E,MAAM,OAAO,GAAuB,EAAE,CAAC;IAEvC,IAAI,KAAK,CAAC,MAAM,EAAE;QAChB,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;KAC1C;IAED,IAAI,KAAK,CAAC,IAAI,EAAE;QACd,KAAK,MAAM,SAAS,IAAI,KAAK,CAAC,IAAI,EAAE;YAClC,OAAO,CAAC,IAAI,CAAC,GAAG,oCAAoC,CAAC,SAAS,CAAC,CAAC,CAAC;SAClE;KACF;IAED,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
* See the License for the specific language governing permissions and
|
|
15
15
|
* limitations under the License.
|
|
16
16
|
*/
|
|
17
|
-
import {
|
|
17
|
+
import { isHiddenByEnableWhen } from './qItem';
|
|
18
18
|
/**
|
|
19
19
|
* Recursively go through the questionnaireResponse and remove qrItems whose qItems are empty in the form
|
|
20
20
|
*
|
|
@@ -51,9 +51,9 @@ function removeEmptyAnswersFromItemRecursive(params) {
|
|
|
51
51
|
const qrItems = qrItem.item;
|
|
52
52
|
// Process group items
|
|
53
53
|
if (qItems && qItems.length > 0) {
|
|
54
|
-
// Return nothing if corresponding qItem is hidden
|
|
55
|
-
if (
|
|
56
|
-
|
|
54
|
+
// Return nothing if corresponding qItem is hidden via enableWhen
|
|
55
|
+
if (isHiddenByEnableWhen({
|
|
56
|
+
linkId: qItem.linkId,
|
|
57
57
|
enableWhenIsActivated,
|
|
58
58
|
enableWhenItems,
|
|
59
59
|
enableWhenExpressions
|
|
@@ -101,8 +101,8 @@ function removeEmptyAnswersFromItemRecursive(params) {
|
|
|
101
101
|
}
|
|
102
102
|
function answerIsEmpty(qItem, qrItem, enableWhenIsActivated, enableWhenItems, enableWhenExpressions) {
|
|
103
103
|
var _a;
|
|
104
|
-
if (
|
|
105
|
-
|
|
104
|
+
if (isHiddenByEnableWhen({
|
|
105
|
+
linkId: qItem.linkId,
|
|
106
106
|
enableWhenIsActivated,
|
|
107
107
|
enableWhenItems,
|
|
108
108
|
enableWhenExpressions
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"removeEmptyAnswers.js","sourceRoot":"","sources":["../../src/utils/removeEmptyAnswers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AASH,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"removeEmptyAnswers.js","sourceRoot":"","sources":["../../src/utils/removeEmptyAnswers.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@ import _isEqual from 'lodash/isEqual';
|
|
|
18
18
|
import { containsTabs, isTabContainer } from './tabs';
|
|
19
19
|
import { getShortText, isSpecificItemControl } from './itemControl';
|
|
20
20
|
import { getQrItemsIndex, mapQItemsIndex } from './mapItem';
|
|
21
|
-
import {
|
|
21
|
+
import { isHiddenByEnableWhen } from './qItem';
|
|
22
22
|
export function getItemsToRepopulate(params) {
|
|
23
23
|
var _a;
|
|
24
24
|
const { sourceQuestionnaire, tabs, populatedResponse, updatableResponse, enableWhenIsActivated, enableWhenItems, enableWhenExpressions } = params;
|
|
@@ -77,8 +77,8 @@ function getItemsToRepopulateRecursive(params) {
|
|
|
77
77
|
return;
|
|
78
78
|
}
|
|
79
79
|
// Return nothing if corresponding qItem is hidden
|
|
80
|
-
if (
|
|
81
|
-
|
|
80
|
+
if (isHiddenByEnableWhen({
|
|
81
|
+
linkId: qItem.linkId,
|
|
82
82
|
enableWhenIsActivated,
|
|
83
83
|
enableWhenItems,
|
|
84
84
|
enableWhenExpressions
|
|
@@ -169,8 +169,8 @@ function getGridTableToRepopulate(params) {
|
|
|
169
169
|
}
|
|
170
170
|
const gridChildQRItemsToRepopulate = gridChildQItems
|
|
171
171
|
.map((qItem, index) => {
|
|
172
|
-
if (
|
|
173
|
-
|
|
172
|
+
if (isHiddenByEnableWhen({
|
|
173
|
+
linkId: qItem.linkId,
|
|
174
174
|
enableWhenIsActivated,
|
|
175
175
|
enableWhenItems,
|
|
176
176
|
enableWhenExpressions
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repopulateItems.js","sourceRoot":"","sources":["../../src/utils/repopulateItems.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AASH,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE5D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"repopulateItems.js","sourceRoot":"","sources":["../../src/utils/repopulateItems.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/tabs.js
CHANGED
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
* limitations under the License.
|
|
16
16
|
*/
|
|
17
17
|
import { isSpecificItemControl } from './itemControl';
|
|
18
|
-
import {
|
|
18
|
+
import { isHiddenByEnableWhen } from './qItem';
|
|
19
19
|
import { structuredDataCapture } from 'fhir-sdc-helpers';
|
|
20
20
|
export function getFirstVisibleTab(tabs, enableWhenItems, enableWhenExpressions) {
|
|
21
21
|
return Object.entries(tabs)
|
|
@@ -118,7 +118,7 @@ export function constructTabsWithProperties(qItems, hasTabContainer) {
|
|
|
118
118
|
export function constructTabsWithVisibility(params) {
|
|
119
119
|
const { tabs, enableWhenIsActivated, enableWhenItems, enableWhenExpressions } = params;
|
|
120
120
|
return Object.entries(tabs).map(([linkId]) => {
|
|
121
|
-
const isVisible = !
|
|
121
|
+
const isVisible = !isHiddenByEnableWhen({
|
|
122
122
|
linkId,
|
|
123
123
|
enableWhenIsActivated,
|
|
124
124
|
enableWhenItems,
|
|
@@ -177,23 +177,26 @@ export function getContextDisplays(item) {
|
|
|
177
177
|
export function isTabHidden(params) {
|
|
178
178
|
const { qItem, contextDisplayItems, isTab, enableWhenIsActivated, enableWhenItems, enableWhenExpressions, completedTabsCollapsed } = params;
|
|
179
179
|
if (!isTab ||
|
|
180
|
-
|
|
181
|
-
|
|
180
|
+
isHiddenByEnableWhen({
|
|
181
|
+
linkId: qItem.linkId,
|
|
182
182
|
enableWhenIsActivated,
|
|
183
183
|
enableWhenItems,
|
|
184
184
|
enableWhenExpressions
|
|
185
|
-
})
|
|
185
|
+
}) ||
|
|
186
|
+
structuredDataCapture.getHidden(qItem)) {
|
|
186
187
|
return true;
|
|
187
188
|
}
|
|
188
189
|
if (completedTabsCollapsed) {
|
|
189
190
|
const completedDisplayItem = contextDisplayItems.find((contextDisplayItem) => contextDisplayItem.text === 'Complete');
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
191
|
+
const isHidden = (completedDisplayItem &&
|
|
192
|
+
isHiddenByEnableWhen({
|
|
193
|
+
linkId: completedDisplayItem.linkId,
|
|
193
194
|
enableWhenIsActivated,
|
|
194
195
|
enableWhenItems,
|
|
195
196
|
enableWhenExpressions
|
|
196
|
-
}))
|
|
197
|
+
})) ||
|
|
198
|
+
structuredDataCapture.getHidden(completedDisplayItem);
|
|
199
|
+
if (!isHidden) {
|
|
197
200
|
return true;
|
|
198
201
|
}
|
|
199
202
|
}
|
package/lib/utils/tabs.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tabs.js","sourceRoot":"","sources":["../../src/utils/tabs.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAKH,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"tabs.js","sourceRoot":"","sources":["../../src/utils/tabs.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAKH,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,MAAM,UAAU,kBAAkB,CAChC,IAAU,EACV,eAAgC,EAChC,qBAA2D;IAE3D,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;SACxB,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;SAC3D,SAAS,CAAC,CAAC,CAAC,SAAS,EAAE,GAAG,CAAC,EAAE,EAAE;QAC9B,IAAI,GAAG,CAAC,QAAQ,EAAE;YAChB,OAAO,KAAK,CAAC;SACd;QAED,IAAI,eAAe,CAAC,SAAS,CAAC,EAAE;YAC9B,OAAO,eAAe,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC;SAC7C;QAED,IAAI,qBAAqB,CAAC,SAAS,CAAC,EAAE;YACpC,OAAO,qBAAqB,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC;SACnD;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACP,CAAC;AACD;;;;;;;;;;;;;;;GAeG;AAEH;;;;;GAKG;AACH,MAAM,UAAU,YAAY,CAAC,aAAgC;IAC3D,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE;QACvB,OAAO,KAAK,CAAC;KACd;IAED,MAAM,IAAI,GAAG,cAAc,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAChD,OAAO,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;AACzB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAAC,aAAgC;IAC7D,OAAO,qBAAqB,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;AAC/D,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAAC,KAA0B;IACvD,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAoB,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1D,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,KAAK,CAAC,IAAuB;;IAC3C,MAAM,WAAW,GAAG,MAAA,IAAI,CAAC,SAAS,0CAAE,IAAI,CACtC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,mEAAmE,CACrF,CAAC;IAEF,IAAI,WAAW,EAAE;QACf,MAAM,SAAS,GAAG,MAAA,MAAA,WAAW,CAAC,oBAAoB,0CAAE,MAAM,0CAAE,IAAI,CAC9D,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAChC,CAAC;QACF,IAAI,SAAS,EAAE;YACb,OAAO,IAAI,CAAC;SACb;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,2BAA2B,CACzC,MAAuC,EACvC,eAAwB;;IAExB,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IAEvB,MAAM,SAAS,GAAG,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAElE,MAAM,IAAI,GAAS,EAAE,CAAC;IACtB,KAAK,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,SAAS,CAAC,OAAO,EAAE,EAAE;QAC5C,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG;YACnB,QAAQ,EAAE,CAAC;YACX,UAAU,EAAE,KAAK;YACjB,QAAQ,EAAE,MAAA,qBAAqB,CAAC,SAAS,CAAC,KAAK,CAAC,mCAAI,KAAK;SAC1D,CAAC;KACH;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AASD,MAAM,UAAU,2BAA2B,CACzC,MAAyC;IAEzC,MAAM,EAAE,IAAI,EAAE,qBAAqB,EAAE,eAAe,EAAE,qBAAqB,EAAE,GAAG,MAAM,CAAC;IAEvF,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE;QAC3C,MAAM,SAAS,GAAG,CAAC,oBAAoB,CAAC;YACtC,MAAM;YACN,qBAAqB;YACrB,eAAe;YACf,qBAAqB;SACtB,CAAC,CAAC;QAEH,OAAO;YACL,MAAM;YACN,SAAS;SACV,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AASD;;;;GAIG;AACH,MAAM,UAAU,sBAAsB,CAAC,MAAoC;IACzE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,qBAAqB,EAAE,eAAe,EAAE,qBAAqB,EAAE,GAC5F,MAAM,CAAC;IAET,MAAM,kBAAkB,GAAG,2BAA2B,CAAC;QACrD,IAAI;QACJ,qBAAqB;QACrB,eAAe;QACf,qBAAqB;KACtB,CAAC,CAAC;IAEH,IAAI,YAAY,GAAG,eAAe,GAAG,CAAC,CAAC;IACvC,MAAM,qBAAqB,GAAG,KAAK,CAAC;IACpC,OAAO,CAAC,qBAAqB,EAAE;QAC7B,IAAI,kBAAkB,CAAC,YAAY,CAAC,CAAC,SAAS,EAAE;YAC9C,OAAO,YAAY,CAAC;SACrB;QACD,YAAY,EAAE,CAAC;KAChB;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAClC,IAAU,EACV,qBAA8B,EAC9B,eAAgC,EAChC,qBAA2D;IAE3D,MAAM,kBAAkB,GAAG,2BAA2B,CAAC;QACrD,IAAI;QACJ,qBAAqB;QACrB,eAAe;QACf,qBAAqB;KACtB,CAAC,CAAC;IACH,OAAO,kBAAkB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;AAClE,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,IAAuB;IACxD,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QACxC,OAAO,EAAE,CAAC;KACX;IAED,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CACrB,CAAC,SAAS,EAAE,EAAE,CACZ,qBAAqB,CAAC,SAAS,EAAE,iBAAiB,CAAC,IAAI,SAAS,CAAC,IAAI,KAAK,SAAS,CACtF,CAAC;AACJ,CAAC;AAYD,MAAM,UAAU,WAAW,CAAC,MAAyB;IACnD,MAAM,EACJ,KAAK,EACL,mBAAmB,EACnB,KAAK,EACL,qBAAqB,EACrB,eAAe,EACf,qBAAqB,EACrB,sBAAsB,EACvB,GAAG,MAAM,CAAC;IAEX,IACE,CAAC,KAAK;QACN,oBAAoB,CAAC;YACnB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,qBAAqB;YACrB,eAAe;YACf,qBAAqB;SACtB,CAAC;QACF,qBAAqB,CAAC,SAAS,CAAC,KAAK,CAAC,EACtC;QACA,OAAO,IAAI,CAAC;KACb;IAED,IAAI,sBAAsB,EAAE;QAC1B,MAAM,oBAAoB,GAAG,mBAAmB,CAAC,IAAI,CACnD,CAAC,kBAAkB,EAAE,EAAE,CAAC,kBAAkB,CAAC,IAAI,KAAK,UAAU,CAC/D,CAAC;QACF,MAAM,QAAQ,GACZ,CAAC,oBAAoB;YACnB,oBAAoB,CAAC;gBACnB,MAAM,EAAE,oBAAoB,CAAC,MAAM;gBACnC,qBAAqB;gBACrB,eAAe;gBACf,qBAAqB;aACtB,CAAC,CAAC;YACL,qBAAqB,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;QAExD,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,IAAI,CAAC;SACb;KACF;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
* limitations under the License.
|
|
16
16
|
*/
|
|
17
17
|
import { getQrItemsIndex, mapQItemsIndex } from './mapItem';
|
|
18
|
-
import {
|
|
18
|
+
import { isHiddenByEnableWhen } from './qItem';
|
|
19
19
|
import { getRegexValidation } from './itemControl';
|
|
20
20
|
import { structuredDataCapture } from 'fhir-sdc-helpers';
|
|
21
21
|
/**
|
|
@@ -61,8 +61,8 @@ export function validateQuestionnaire(params) {
|
|
|
61
61
|
function validateItemRecursive(params) {
|
|
62
62
|
var _a, _b;
|
|
63
63
|
const { qItem, qrItem, invalidItems, enableWhenIsActivated, enableWhenItems, enableWhenExpressions } = params;
|
|
64
|
-
if (
|
|
65
|
-
|
|
64
|
+
if (isHiddenByEnableWhen({
|
|
65
|
+
linkId: qItem.linkId,
|
|
66
66
|
enableWhenIsActivated,
|
|
67
67
|
enableWhenItems,
|
|
68
68
|
enableWhenExpressions
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateQuestionnaire.js","sourceRoot":"","sources":["../../src/utils/validateQuestionnaire.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AASH,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE5D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"validateQuestionnaire.js","sourceRoot":"","sources":["../../src/utils/validateQuestionnaire.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.16.
|
|
3
|
+
"version": "0.16.2",
|
|
4
4
|
"description": "FHIR Structured Data Captured (SDC) rendering engine for Smart Forms",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -68,7 +68,7 @@
|
|
|
68
68
|
"@testing-library/react": "^14.2.1",
|
|
69
69
|
"@testing-library/react-hooks": "^7.0.2",
|
|
70
70
|
"@types/deep-diff": "^1.0.4",
|
|
71
|
-
"@types/jest": "^29.5.
|
|
71
|
+
"@types/jest": "^29.5.12",
|
|
72
72
|
"@types/lodash.clonedeep": "^4.5.9",
|
|
73
73
|
"@types/lodash.debounce": "^4.0.7",
|
|
74
74
|
"@types/react": ">=17.0.0",
|
|
@@ -79,7 +79,6 @@ function OpenChoiceAutocompleteField(props: OpenChoiceAutocompleteFieldProps) {
|
|
|
79
79
|
loadingText={'Fetching results...'}
|
|
80
80
|
clearOnEscape
|
|
81
81
|
freeSolo
|
|
82
|
-
autoHighlight
|
|
83
82
|
sx={{ maxWidth: !isTabled ? TEXT_FIELD_WIDTH : 3000, minWidth: 220, flexGrow: 1 }}
|
|
84
83
|
onChange={(_, newValue) => onValueChange(newValue)}
|
|
85
84
|
filterOptions={(x) => x}
|
|
@@ -103,11 +102,12 @@ function OpenChoiceAutocompleteField(props: OpenChoiceAutocompleteFieldProps) {
|
|
|
103
102
|
{params.InputProps.startAdornment}
|
|
104
103
|
</>
|
|
105
104
|
),
|
|
105
|
+
// Warning indicator should not show up in open-choice autocomplete
|
|
106
106
|
endAdornment: (
|
|
107
107
|
<>
|
|
108
108
|
{loading ? (
|
|
109
109
|
<CircularProgress color="inherit" size={16} />
|
|
110
|
-
) : feedback ? (
|
|
110
|
+
) : feedback && feedback.color !== 'warning' ? (
|
|
111
111
|
<Fade in={!!feedback} timeout={300}>
|
|
112
112
|
<Tooltip title={feedback.message} arrow sx={{ ml: 1 }}>
|
|
113
113
|
{
|
package/src/hooks/useHidden.ts
CHANGED
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
|
|
18
18
|
import type { QuestionnaireItem } from 'fhir/r4';
|
|
19
19
|
import { useQuestionnaireStore } from '../stores';
|
|
20
|
-
import {
|
|
20
|
+
import { isHiddenByEnableWhen } from '../utils/qItem';
|
|
21
21
|
import { structuredDataCapture } from 'fhir-sdc-helpers';
|
|
22
22
|
|
|
23
23
|
function useHidden(qItem: QuestionnaireItem): boolean {
|
|
@@ -29,7 +29,7 @@ function useHidden(qItem: QuestionnaireItem): boolean {
|
|
|
29
29
|
return true;
|
|
30
30
|
}
|
|
31
31
|
|
|
32
|
-
return
|
|
32
|
+
return isHiddenByEnableWhen({
|
|
33
33
|
linkId: qItem.linkId,
|
|
34
34
|
enableWhenIsActivated,
|
|
35
35
|
enableWhenItems,
|
package/src/utils/index.ts
CHANGED
package/src/utils/qItem.ts
CHANGED
|
@@ -20,36 +20,6 @@ import { getChoiceControlType } from './choice';
|
|
|
20
20
|
import { ChoiceItemControl, OpenChoiceItemControl } from '../interfaces/choice.enum';
|
|
21
21
|
import { getOpenChoiceControlType } from './openChoice';
|
|
22
22
|
import type { EnableWhenExpression, EnableWhenItems } from '../interfaces/enableWhen.interface';
|
|
23
|
-
import { structuredDataCapture } from 'fhir-sdc-helpers';
|
|
24
|
-
|
|
25
|
-
interface isHiddenParams {
|
|
26
|
-
questionnaireItem: QuestionnaireItem;
|
|
27
|
-
enableWhenIsActivated: boolean;
|
|
28
|
-
enableWhenItems: EnableWhenItems;
|
|
29
|
-
enableWhenExpressions: Record<string, EnableWhenExpression>;
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
/**
|
|
33
|
-
* Test the given QItem on a series of checks to verify if the item should be displayed
|
|
34
|
-
* Check if qItem has hidden attribute
|
|
35
|
-
* Check if qItem fulfilled its enableWhen criteria
|
|
36
|
-
*
|
|
37
|
-
* @author Sean Fong
|
|
38
|
-
*/
|
|
39
|
-
export function isHidden(params: isHiddenParams): boolean {
|
|
40
|
-
const { questionnaireItem, enableWhenIsActivated, enableWhenItems, enableWhenExpressions } =
|
|
41
|
-
params;
|
|
42
|
-
if (structuredDataCapture.getHidden(questionnaireItem)) {
|
|
43
|
-
return true;
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
return isHiddenByEnableWhens({
|
|
47
|
-
linkId: questionnaireItem.linkId,
|
|
48
|
-
enableWhenIsActivated,
|
|
49
|
-
enableWhenItems,
|
|
50
|
-
enableWhenExpressions
|
|
51
|
-
});
|
|
52
|
-
}
|
|
53
23
|
|
|
54
24
|
interface isHiddenByEnableWhensParams {
|
|
55
25
|
linkId: string;
|
|
@@ -58,7 +28,7 @@ interface isHiddenByEnableWhensParams {
|
|
|
58
28
|
enableWhenExpressions: Record<string, EnableWhenExpression>;
|
|
59
29
|
}
|
|
60
30
|
|
|
61
|
-
export function
|
|
31
|
+
export function isHiddenByEnableWhen(params: isHiddenByEnableWhensParams): boolean {
|
|
62
32
|
const { linkId, enableWhenIsActivated, enableWhenItems, enableWhenExpressions } = params;
|
|
63
33
|
|
|
64
34
|
if (enableWhenIsActivated) {
|
|
@@ -22,7 +22,7 @@ import type {
|
|
|
22
22
|
QuestionnaireResponseItem
|
|
23
23
|
} from 'fhir/r4';
|
|
24
24
|
import type { EnableWhenExpression, EnableWhenItems } from '../interfaces/enableWhen.interface';
|
|
25
|
-
import {
|
|
25
|
+
import { isHiddenByEnableWhen } from './qItem';
|
|
26
26
|
|
|
27
27
|
interface removeEmptyAnswersParams {
|
|
28
28
|
questionnaire: Questionnaire;
|
|
@@ -92,10 +92,10 @@ function removeEmptyAnswersFromItemRecursive(
|
|
|
92
92
|
|
|
93
93
|
// Process group items
|
|
94
94
|
if (qItems && qItems.length > 0) {
|
|
95
|
-
// Return nothing if corresponding qItem is hidden
|
|
95
|
+
// Return nothing if corresponding qItem is hidden via enableWhen
|
|
96
96
|
if (
|
|
97
|
-
|
|
98
|
-
|
|
97
|
+
isHiddenByEnableWhen({
|
|
98
|
+
linkId: qItem.linkId,
|
|
99
99
|
enableWhenIsActivated,
|
|
100
100
|
enableWhenItems,
|
|
101
101
|
enableWhenExpressions
|
|
@@ -170,8 +170,8 @@ function answerIsEmpty(
|
|
|
170
170
|
enableWhenExpressions: Record<string, EnableWhenExpression>
|
|
171
171
|
) {
|
|
172
172
|
if (
|
|
173
|
-
|
|
174
|
-
|
|
173
|
+
isHiddenByEnableWhen({
|
|
174
|
+
linkId: qItem.linkId,
|
|
175
175
|
enableWhenIsActivated,
|
|
176
176
|
enableWhenItems,
|
|
177
177
|
enableWhenExpressions
|
|
@@ -27,7 +27,7 @@ import { containsTabs, isTabContainer } from './tabs';
|
|
|
27
27
|
import { getShortText, isSpecificItemControl } from './itemControl';
|
|
28
28
|
import { getQrItemsIndex, mapQItemsIndex } from './mapItem';
|
|
29
29
|
import type { EnableWhenExpression, EnableWhenItems } from '../interfaces/enableWhen.interface';
|
|
30
|
-
import {
|
|
30
|
+
import { isHiddenByEnableWhen } from './qItem';
|
|
31
31
|
|
|
32
32
|
export interface ItemToRepopulate {
|
|
33
33
|
qItem: QuestionnaireItem | null;
|
|
@@ -162,8 +162,8 @@ function getItemsToRepopulateRecursive(params: getItemsToRepopulateRecursivePara
|
|
|
162
162
|
|
|
163
163
|
// Return nothing if corresponding qItem is hidden
|
|
164
164
|
if (
|
|
165
|
-
|
|
166
|
-
|
|
165
|
+
isHiddenByEnableWhen({
|
|
166
|
+
linkId: qItem.linkId,
|
|
167
167
|
enableWhenIsActivated,
|
|
168
168
|
enableWhenItems,
|
|
169
169
|
enableWhenExpressions
|
|
@@ -300,8 +300,8 @@ function getGridTableToRepopulate(params: getGridTableToRepopulateParams) {
|
|
|
300
300
|
const gridChildQRItemsToRepopulate = gridChildQItems
|
|
301
301
|
.map((qItem, index) => {
|
|
302
302
|
if (
|
|
303
|
-
|
|
304
|
-
|
|
303
|
+
isHiddenByEnableWhen({
|
|
304
|
+
linkId: qItem.linkId,
|
|
305
305
|
enableWhenIsActivated,
|
|
306
306
|
enableWhenItems,
|
|
307
307
|
enableWhenExpressions
|
package/src/utils/tabs.ts
CHANGED
|
@@ -19,7 +19,7 @@ import type { Tabs } from '../interfaces/tab.interface';
|
|
|
19
19
|
import type { EnableWhenExpression, EnableWhenItems } from '../interfaces/enableWhen.interface';
|
|
20
20
|
import type { Coding, QuestionnaireItem } from 'fhir/r4';
|
|
21
21
|
import { isSpecificItemControl } from './itemControl';
|
|
22
|
-
import {
|
|
22
|
+
import { isHiddenByEnableWhen } from './qItem';
|
|
23
23
|
import { structuredDataCapture } from 'fhir-sdc-helpers';
|
|
24
24
|
|
|
25
25
|
export function getFirstVisibleTab(
|
|
@@ -154,7 +154,7 @@ export function constructTabsWithVisibility(
|
|
|
154
154
|
const { tabs, enableWhenIsActivated, enableWhenItems, enableWhenExpressions } = params;
|
|
155
155
|
|
|
156
156
|
return Object.entries(tabs).map(([linkId]) => {
|
|
157
|
-
const isVisible = !
|
|
157
|
+
const isVisible = !isHiddenByEnableWhen({
|
|
158
158
|
linkId,
|
|
159
159
|
enableWhenIsActivated,
|
|
160
160
|
enableWhenItems,
|
|
@@ -258,12 +258,13 @@ export function isTabHidden(params: IsTabHiddenParams): boolean {
|
|
|
258
258
|
|
|
259
259
|
if (
|
|
260
260
|
!isTab ||
|
|
261
|
-
|
|
262
|
-
|
|
261
|
+
isHiddenByEnableWhen({
|
|
262
|
+
linkId: qItem.linkId,
|
|
263
263
|
enableWhenIsActivated,
|
|
264
264
|
enableWhenItems,
|
|
265
265
|
enableWhenExpressions
|
|
266
|
-
})
|
|
266
|
+
}) ||
|
|
267
|
+
structuredDataCapture.getHidden(qItem)
|
|
267
268
|
) {
|
|
268
269
|
return true;
|
|
269
270
|
}
|
|
@@ -272,15 +273,17 @@ export function isTabHidden(params: IsTabHiddenParams): boolean {
|
|
|
272
273
|
const completedDisplayItem = contextDisplayItems.find(
|
|
273
274
|
(contextDisplayItem) => contextDisplayItem.text === 'Complete'
|
|
274
275
|
);
|
|
275
|
-
|
|
276
|
-
completedDisplayItem &&
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
276
|
+
const isHidden =
|
|
277
|
+
(completedDisplayItem &&
|
|
278
|
+
isHiddenByEnableWhen({
|
|
279
|
+
linkId: completedDisplayItem.linkId,
|
|
280
|
+
enableWhenIsActivated,
|
|
281
|
+
enableWhenItems,
|
|
282
|
+
enableWhenExpressions
|
|
283
|
+
})) ||
|
|
284
|
+
structuredDataCapture.getHidden(completedDisplayItem);
|
|
285
|
+
|
|
286
|
+
if (!isHidden) {
|
|
284
287
|
return true;
|
|
285
288
|
}
|
|
286
289
|
}
|
|
@@ -24,7 +24,7 @@ import type {
|
|
|
24
24
|
} from 'fhir/r4';
|
|
25
25
|
import { getQrItemsIndex, mapQItemsIndex } from './mapItem';
|
|
26
26
|
import type { EnableWhenExpression, EnableWhenItems } from '../interfaces/enableWhen.interface';
|
|
27
|
-
import {
|
|
27
|
+
import { isHiddenByEnableWhen } from './qItem';
|
|
28
28
|
import { getRegexValidation } from './itemControl';
|
|
29
29
|
import { structuredDataCapture } from 'fhir-sdc-helpers';
|
|
30
30
|
import type { RegexValidation } from '../interfaces/regex.interface';
|
|
@@ -121,8 +121,8 @@ function validateItemRecursive(params: ValidateItemRecursiveParams) {
|
|
|
121
121
|
} = params;
|
|
122
122
|
|
|
123
123
|
if (
|
|
124
|
-
|
|
125
|
-
|
|
124
|
+
isHiddenByEnableWhen({
|
|
125
|
+
linkId: qItem.linkId,
|
|
126
126
|
enableWhenIsActivated,
|
|
127
127
|
enableWhenItems,
|
|
128
128
|
enableWhenExpressions
|