@inseefr/lunatic 3.13.5-rc.3 → 3.13.6-rc-fix-multimode.0
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.
|
@@ -45,26 +45,37 @@ import { forceInt } from '../utils/number';
|
|
|
45
45
|
*/
|
|
46
46
|
export function useMultimode(source, store) {
|
|
47
47
|
const getMultimode = useCallback(() => {
|
|
48
|
-
var _a;
|
|
48
|
+
var _a, _b, _c, _d, _e, _f;
|
|
49
49
|
if (!source.multimode) {
|
|
50
50
|
return {};
|
|
51
51
|
}
|
|
52
|
-
|
|
52
|
+
// Initialize rules to empty objects if they do not exist
|
|
53
|
+
const questionnaireRules = ((_a = source.multimode.questionnaire) === null || _a === void 0 ? void 0 : _a.rules) || {};
|
|
54
|
+
const leafRules = ((_b = source.multimode.leaf) === null || _b === void 0 ? void 0 : _b.rules) || {};
|
|
55
|
+
// If neither has rules, return an empty object
|
|
56
|
+
if (Object.keys(questionnaireRules).length === 0 && Object.keys(leafRules).length === 0) {
|
|
57
|
+
return {};
|
|
58
|
+
}
|
|
59
|
+
// Get unique rule keys
|
|
53
60
|
const keys = new Set([
|
|
54
|
-
...Object.keys(
|
|
55
|
-
...Object.keys(
|
|
61
|
+
...Object.keys(questionnaireRules),
|
|
62
|
+
...Object.keys(leafRules),
|
|
56
63
|
]);
|
|
57
|
-
|
|
64
|
+
// Handle the case where leaf.source exists to retrieve iterations
|
|
65
|
+
let iterations = 0;
|
|
66
|
+
if ((_c = source.multimode.leaf) === null || _c === void 0 ? void 0 : _c.source) {
|
|
67
|
+
const roundabout = findComponentById(source.components, source.multimode.leaf.source);
|
|
68
|
+
iterations = forceInt((_f = store.run((_e = (_d = roundabout === null || roundabout === void 0 ? void 0 : roundabout.iterations) === null || _d === void 0 ? void 0 : _d.value) !== null && _e !== void 0 ? _e : '')) !== null && _f !== void 0 ? _f : 0);
|
|
69
|
+
}
|
|
58
70
|
return Object.fromEntries(Array.from(keys).map((key) => {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
const questionnaireExpression = (_a = source.multimode) === null || _a === void 0 ? void 0 : _a.questionnaire.rules[key];
|
|
71
|
+
// Check the rule at the questionnaire level
|
|
72
|
+
const questionnaireExpression = questionnaireRules[key];
|
|
62
73
|
if (questionnaireExpression &&
|
|
63
74
|
store.run(questionnaireExpression.value)) {
|
|
64
75
|
return [key, true];
|
|
65
76
|
}
|
|
66
|
-
|
|
67
|
-
|
|
77
|
+
// Check the rule at the leaf level
|
|
78
|
+
const leafExpression = leafRules[key];
|
|
68
79
|
if (!leafExpression) {
|
|
69
80
|
return [key, false];
|
|
70
81
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMultimode.js","sourceRoot":"","sources":["../../src/hooks/useMultimode.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,MAAM,UAAU,YAAY,CAC3B,MAAqB,EACrB,KAA4B;IAE5B,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,EAAE;;QACrC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YACvB,OAAO,EAAE,CAAC;QACX,CAAC;QAED,MAAM,
|
|
1
|
+
{"version":3,"file":"useMultimode.js","sourceRoot":"","sources":["../../src/hooks/useMultimode.ts"],"names":[],"mappings":"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"}
|
package/hooks/useMultimode.js
CHANGED
|
@@ -51,21 +51,33 @@ function useMultimode(source, store) {
|
|
|
51
51
|
if (!source.multimode) {
|
|
52
52
|
return {};
|
|
53
53
|
}
|
|
54
|
-
|
|
54
|
+
// Initialize rules to empty objects if they do not exist
|
|
55
|
+
const questionnaireRules = source.multimode.questionnaire?.rules || {};
|
|
56
|
+
const leafRules = source.multimode.leaf?.rules || {};
|
|
57
|
+
// If neither has rules, return an empty object
|
|
58
|
+
if (Object.keys(questionnaireRules).length === 0 && Object.keys(leafRules).length === 0) {
|
|
59
|
+
return {};
|
|
60
|
+
}
|
|
61
|
+
// Get unique rule keys
|
|
55
62
|
const keys = new Set([
|
|
56
|
-
...Object.keys(
|
|
57
|
-
...Object.keys(
|
|
63
|
+
...Object.keys(questionnaireRules),
|
|
64
|
+
...Object.keys(leafRules),
|
|
58
65
|
]);
|
|
59
|
-
|
|
66
|
+
// Handle the case where leaf.source exists to retrieve iterations
|
|
67
|
+
let iterations = 0;
|
|
68
|
+
if (source.multimode.leaf?.source) {
|
|
69
|
+
const roundabout = (0, getArticulationState_1.findComponentById)(source.components, source.multimode.leaf.source);
|
|
70
|
+
iterations = (0, number_1.forceInt)(store.run(roundabout?.iterations?.value ?? '') ?? 0);
|
|
71
|
+
}
|
|
60
72
|
return Object.fromEntries(Array.from(keys).map((key) => {
|
|
61
|
-
// Check the
|
|
62
|
-
const questionnaireExpression =
|
|
73
|
+
// Check the rule at the questionnaire level
|
|
74
|
+
const questionnaireExpression = questionnaireRules[key];
|
|
63
75
|
if (questionnaireExpression &&
|
|
64
76
|
store.run(questionnaireExpression.value)) {
|
|
65
77
|
return [key, true];
|
|
66
78
|
}
|
|
67
|
-
|
|
68
|
-
|
|
79
|
+
// Check the rule at the leaf level
|
|
80
|
+
const leafExpression = leafRules[key];
|
|
69
81
|
if (!leafExpression) {
|
|
70
82
|
return [key, false];
|
|
71
83
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMultimode.js","sourceRoot":"","sources":["../src/hooks/useMultimode.ts"],"names":[],"mappings":";;AAgDA,
|
|
1
|
+
{"version":3,"file":"useMultimode.js","sourceRoot":"","sources":["../src/hooks/useMultimode.ts"],"names":[],"mappings":";;AAgDA,oCAmEC;AAjHD,iCAAoC;AACpC,wEAAkE;AAClE,4CAA2C;AAE3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,SAAgB,YAAY,CAC3B,MAAqB,EACrB,KAA4B;IAE5B,MAAM,YAAY,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QACrC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YACvB,OAAO,EAAE,CAAC;QACX,CAAC;QAED,yDAAyD;QACzD,MAAM,kBAAkB,GAAG,MAAM,CAAC,SAAS,CAAC,aAAa,EAAE,KAAK,IAAI,EAAE,CAAC;QACvE,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;QAErD,+CAA+C;QAC/C,IAAI,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzF,OAAO,EAAE,CAAC;QACX,CAAC;QAED,uBAAuB;QACvB,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC;YACpB,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC;YAClC,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;SACzB,CAAC,CAAC;QAEH,kEAAkE;QAClE,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,IAAI,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;YACnC,MAAM,UAAU,GAAG,IAAA,wCAAiB,EACnC,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAC5B,CAAC;YACF,UAAU,GAAG,IAAA,iBAAQ,EACpB,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,CACnD,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC,WAAW,CACxB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAC5B,4CAA4C;YAC5C,MAAM,uBAAuB,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;YACxD,IACC,uBAAuB;gBACvB,KAAK,CAAC,GAAG,CAAC,uBAAuB,CAAC,KAAK,CAAC,EACvC,CAAC;gBACF,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YACpB,CAAC;YAED,mCAAmC;YACnC,MAAM,cAAc,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;YACtC,IAAI,CAAC,cAAc,EAAE,CAAC;gBACrB,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACrB,CAAC;YAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,IAAI,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;oBACzD,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;gBACpB,CAAC;YACF,CAAC;YAED,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACrB,CAAC,CAAC,CACF,CAAC;IACH,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;IAEpB,OAAO;QACN,YAAY;KACZ,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -55,22 +55,37 @@ export function useMultimode(
|
|
|
55
55
|
return {};
|
|
56
56
|
}
|
|
57
57
|
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
58
|
+
// Initialize rules to empty objects if they do not exist
|
|
59
|
+
const questionnaireRules = source.multimode.questionnaire?.rules || {};
|
|
60
|
+
const leafRules = source.multimode.leaf?.rules || {};
|
|
61
|
+
|
|
62
|
+
// If neither has rules, return an empty object
|
|
63
|
+
if (Object.keys(questionnaireRules).length === 0 && Object.keys(leafRules).length === 0) {
|
|
64
|
+
return {};
|
|
65
|
+
}
|
|
62
66
|
|
|
67
|
+
// Get unique rule keys
|
|
63
68
|
const keys = new Set([
|
|
64
|
-
...Object.keys(
|
|
65
|
-
...Object.keys(
|
|
69
|
+
...Object.keys(questionnaireRules),
|
|
70
|
+
...Object.keys(leafRules),
|
|
66
71
|
]);
|
|
67
|
-
|
|
72
|
+
|
|
73
|
+
// Handle the case where leaf.source exists to retrieve iterations
|
|
74
|
+
let iterations = 0;
|
|
75
|
+
if (source.multimode.leaf?.source) {
|
|
76
|
+
const roundabout = findComponentById(
|
|
77
|
+
source.components,
|
|
78
|
+
source.multimode.leaf.source
|
|
79
|
+
);
|
|
80
|
+
iterations = forceInt(
|
|
81
|
+
store.run(roundabout?.iterations?.value ?? '') ?? 0
|
|
82
|
+
);
|
|
83
|
+
}
|
|
68
84
|
|
|
69
85
|
return Object.fromEntries(
|
|
70
86
|
Array.from(keys).map((key) => {
|
|
71
|
-
// Check the
|
|
72
|
-
const questionnaireExpression =
|
|
73
|
-
source.multimode?.questionnaire.rules[key];
|
|
87
|
+
// Check the rule at the questionnaire level
|
|
88
|
+
const questionnaireExpression = questionnaireRules[key];
|
|
74
89
|
if (
|
|
75
90
|
questionnaireExpression &&
|
|
76
91
|
store.run(questionnaireExpression.value)
|
|
@@ -78,9 +93,8 @@ export function useMultimode(
|
|
|
78
93
|
return [key, true];
|
|
79
94
|
}
|
|
80
95
|
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
// There is no expression for the leaf
|
|
96
|
+
// Check the rule at the leaf level
|
|
97
|
+
const leafExpression = leafRules[key];
|
|
84
98
|
if (!leafExpression) {
|
|
85
99
|
return [key, false];
|
|
86
100
|
}
|