@inseefr/lunatic 3.0.0-rc.29 → 3.0.0-rc.31
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/shared/HOC/slottableComponent.d.ts +1 -1
- package/lib/components/shared/MDLabel/MDLabel.d.ts +1 -3
- package/lib/components/shared/MDLabel/MDLabel.js +8 -10
- package/lib/components/shared/MDLabel/MDLabel.js.map +1 -1
- package/lib/components/shared/MDLabel/MDLabel.spec.js +21 -6
- package/lib/components/shared/MDLabel/MDLabel.spec.js.map +1 -1
- package/lib/components/shared/MDLabel/MDLabelLink.js +3 -3
- package/lib/components/shared/MDLabel/MDLabelLink.js.map +1 -1
- package/lib/components/type.d.ts +1 -1
- package/lib/hooks/useDebounce.d.ts +1 -1
- package/lib/tests/setup.d.ts +1 -0
- package/lib/tests/setup.js +18 -0
- package/lib/tests/setup.js.map +1 -0
- package/lib/tests/utils/lunatic.d.ts +19 -0
- package/lib/tests/utils/lunatic.js +31 -0
- package/lib/tests/utils/lunatic.js.map +1 -0
- package/lib/tests/utils/timer.d.ts +1 -0
- package/lib/tests/utils/timer.js +4 -0
- package/lib/tests/utils/timer.js.map +1 -0
- package/lib/use-lunatic/commons/compose.d.ts +1 -1
- package/lib/use-lunatic/commons/fill-components/fill-component-expressions.d.ts +20 -611
- package/lib/use-lunatic/commons/fill-components/fill-component-expressions.js +108 -91
- package/lib/use-lunatic/commons/fill-components/fill-component-expressions.js.map +1 -1
- package/lib/use-lunatic/commons/fill-components/fill-component-expressions.spec.js +71 -11
- package/lib/use-lunatic/commons/fill-components/fill-component-expressions.spec.js.map +1 -1
- package/lib/use-lunatic/hooks/use-page-has-response.js +1 -1
- package/lib/use-lunatic/hooks/use-page-has-response.js.map +1 -1
- package/lib/use-lunatic/hooks/useOverview.js +20 -19
- package/lib/use-lunatic/hooks/useOverview.js.map +1 -1
- package/lib/use-lunatic/reducer/controls/check-base-control.d.ts +1 -1
- package/lib/use-lunatic/reducer/controls/check-base-control.js +8 -5
- package/lib/use-lunatic/reducer/controls/check-base-control.js.map +1 -1
- package/lib/use-lunatic/reducer/overview/overviewOnInit.js +1 -1
- package/lib/use-lunatic/reducer/overview/overviewOnInit.js.map +1 -1
- package/lib/use-lunatic/reducer/reducerInitializer.js +3 -2
- package/lib/use-lunatic/reducer/reducerInitializer.js.map +1 -1
- package/lib/use-lunatic/replace-component-sequence.d.ts +3 -3
- package/lib/use-lunatic/type-source.d.ts +1 -1
- package/lib/use-lunatic/type.d.ts +2 -2
- package/lib/utils/array.d.ts +1 -1
- package/lib/utils/array.js +1 -1
- package/lib/utils/constants/features.d.ts +1 -0
- package/lib/utils/constants/features.js +1 -0
- package/lib/utils/constants/features.js.map +1 -1
- package/lib/utils/vtl.js +2 -2
- package/lib/utils/vtl.js.map +1 -1
- package/package.json +34 -43
|
@@ -1,106 +1,123 @@
|
|
|
1
1
|
import { isObject } from '../../../utils/is-object';
|
|
2
|
-
import { firstValueItem } from '../../../utils/array';
|
|
3
2
|
const VTL_ATTRIBUTES = [
|
|
4
|
-
'label',
|
|
5
|
-
'options.label',
|
|
6
|
-
'declarations.label',
|
|
7
|
-
'description',
|
|
8
|
-
'iterations',
|
|
9
|
-
'responses.label',
|
|
10
|
-
'responses.description',
|
|
11
|
-
'options.description',
|
|
12
|
-
'controls.iterations',
|
|
13
|
-
'lines.min',
|
|
14
|
-
'lines.max',
|
|
15
|
-
'xAxisIterations',
|
|
16
|
-
'yAxisIterations',
|
|
17
|
-
'conditionFilter',
|
|
18
|
-
'header.label',
|
|
19
|
-
'disabled',
|
|
20
|
-
'readOnly',
|
|
3
|
+
['label', null],
|
|
4
|
+
['options.label', null],
|
|
5
|
+
['declarations.label', null],
|
|
6
|
+
['description', null],
|
|
7
|
+
['iterations', castNumber],
|
|
8
|
+
['responses.label', null],
|
|
9
|
+
['responses.description', null],
|
|
10
|
+
['options.description', null],
|
|
11
|
+
['controls.iterations', castNumber],
|
|
12
|
+
['lines.min', castNumber],
|
|
13
|
+
['lines.max', castNumber],
|
|
14
|
+
['xAxisIterations', castNumber],
|
|
15
|
+
['yAxisIterations', castNumber],
|
|
16
|
+
['conditionFilter', castBool],
|
|
17
|
+
['header.label', null],
|
|
18
|
+
['disabled', castBool],
|
|
19
|
+
['readOnly', castBool],
|
|
21
20
|
// For suggesters
|
|
22
|
-
'arbitrary.label',
|
|
23
|
-
'arbitrary.inputLabel',
|
|
21
|
+
['arbitrary.label', castString],
|
|
22
|
+
['arbitrary.inputLabel', castString],
|
|
24
23
|
];
|
|
25
|
-
function
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
try {
|
|
32
|
-
const result = executeExpression(candidate, {
|
|
33
|
-
iteration: linksIterations ?? iteration,
|
|
34
|
-
});
|
|
35
|
-
return {
|
|
36
|
-
...object,
|
|
37
|
-
// Todo : replace this with a casting system on execute
|
|
38
|
-
[path]: Array.isArray(result) ? firstValueItem(result) : result,
|
|
39
|
-
};
|
|
40
|
-
}
|
|
41
|
-
catch (e) {
|
|
42
|
-
return {
|
|
43
|
-
...object,
|
|
44
|
-
[path]: e instanceof Error ? e.toString() : e,
|
|
45
|
-
};
|
|
46
|
-
}
|
|
24
|
+
function castNumber(v) {
|
|
25
|
+
if (typeof v === 'number') {
|
|
26
|
+
return v;
|
|
27
|
+
}
|
|
28
|
+
if (typeof v === 'string') {
|
|
29
|
+
return parseInt(v, 10);
|
|
47
30
|
}
|
|
48
|
-
|
|
49
|
-
return
|
|
50
|
-
? entry.map((e) => crawl(path, e))
|
|
51
|
-
: crawl(path, entry);
|
|
31
|
+
if (Array.isArray(v) && v.length > 0) {
|
|
32
|
+
return castNumber(v[0]);
|
|
52
33
|
}
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
return
|
|
58
|
-
const flattedEntry = buildCrawlEntry(entry, path);
|
|
59
|
-
return [...stack, flattedEntry];
|
|
60
|
-
}, []);
|
|
34
|
+
throw new Error(`Cannot cast "${v}" to number`);
|
|
35
|
+
}
|
|
36
|
+
function castBool(v) {
|
|
37
|
+
if (typeof v === 'boolean') {
|
|
38
|
+
return v;
|
|
61
39
|
}
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
*/
|
|
65
|
-
function crawl(path, object) {
|
|
66
|
-
const [step, ...rest] = path;
|
|
67
|
-
if (!isObject(object)) {
|
|
68
|
-
throw new Error('Cannot crawl something that is not an object');
|
|
69
|
-
}
|
|
70
|
-
if (step in object && rest.length === 0) {
|
|
71
|
-
return executeAndFillObject(object, step);
|
|
72
|
-
}
|
|
73
|
-
else if (step in object) {
|
|
74
|
-
const value = object[step];
|
|
75
|
-
if (Array.isArray(value)) {
|
|
76
|
-
return { ...object, [step]: crawlArray(value, rest) };
|
|
77
|
-
}
|
|
78
|
-
return { ...object, [step]: crawl(rest, value) };
|
|
79
|
-
}
|
|
80
|
-
return object;
|
|
40
|
+
if (Array.isArray(v) && v.length > 0) {
|
|
41
|
+
return castBool(v[0]);
|
|
81
42
|
}
|
|
82
|
-
|
|
43
|
+
if (Array.isArray(v)) {
|
|
44
|
+
return false;
|
|
45
|
+
}
|
|
46
|
+
return Boolean(v);
|
|
83
47
|
}
|
|
84
|
-
function
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
48
|
+
function castString(v) {
|
|
49
|
+
if (typeof v === 'string') {
|
|
50
|
+
return v;
|
|
51
|
+
}
|
|
52
|
+
if (typeof v === 'number') {
|
|
53
|
+
return v.toString();
|
|
54
|
+
}
|
|
55
|
+
if (Array.isArray(v)) {
|
|
56
|
+
return v.map(castString).join(', ');
|
|
57
|
+
}
|
|
58
|
+
if (!v) {
|
|
59
|
+
return '';
|
|
60
|
+
}
|
|
61
|
+
return v.toString();
|
|
93
62
|
}
|
|
94
63
|
/**
|
|
95
|
-
*
|
|
64
|
+
* Interpret every VTL expression inside a component
|
|
65
|
+
*
|
|
66
|
+
* ## Example
|
|
67
|
+
*
|
|
68
|
+
* For instance a component like this :
|
|
69
|
+
*
|
|
70
|
+
* ```json
|
|
71
|
+
* {
|
|
72
|
+
* "label": {"value": "\"Hello world\"", "type": "VTL"}
|
|
73
|
+
* }
|
|
74
|
+
* ```
|
|
75
|
+
*
|
|
76
|
+
* Would see its expression interpreted like this
|
|
77
|
+
*
|
|
78
|
+
* ```json
|
|
79
|
+
* {
|
|
80
|
+
* "label": "Hello world"
|
|
81
|
+
* }
|
|
82
|
+
* ```
|
|
96
83
|
*/
|
|
97
84
|
export function fillComponentExpressions(component, state) {
|
|
98
|
-
|
|
99
|
-
const
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
85
|
+
let filledComponent = component; // This is too dynamic to be typed correctly, allow any here
|
|
86
|
+
for (const attribute of VTL_ATTRIBUTES) {
|
|
87
|
+
const propertyPath = attribute[0].split('.');
|
|
88
|
+
const caster = attribute[1];
|
|
89
|
+
// Function that will convert expression into the desired type
|
|
90
|
+
const convert = (expression) => {
|
|
91
|
+
const result = state.executeExpression(expression, {
|
|
92
|
+
iteration: state.pager.linksIterations ?? state.pager.iteration,
|
|
93
|
+
});
|
|
94
|
+
return caster ? caster(result) : result;
|
|
95
|
+
};
|
|
96
|
+
filledComponent = interpretPropertyAtPath(filledComponent, propertyPath, convert);
|
|
97
|
+
}
|
|
98
|
+
return filledComponent;
|
|
99
|
+
}
|
|
100
|
+
/**
|
|
101
|
+
* Interpret a property at the specified path
|
|
102
|
+
* - if the value is an array, keep explorer for each item
|
|
103
|
+
* - if the property does not exist, the object is not modified
|
|
104
|
+
*/
|
|
105
|
+
function interpretPropertyAtPath(obj, path, interpreter) {
|
|
106
|
+
// For arrays, we need to keep exploring for each item
|
|
107
|
+
if (Array.isArray(obj)) {
|
|
108
|
+
return obj.map((item) => interpretPropertyAtPath(item, path, interpreter));
|
|
109
|
+
}
|
|
110
|
+
// We reached the property we want to translate
|
|
111
|
+
if (path.length === 0) {
|
|
112
|
+
return interpreter(obj);
|
|
113
|
+
}
|
|
114
|
+
const [property, ...rest] = path;
|
|
115
|
+
if (!isObject(obj) || !(property in obj)) {
|
|
116
|
+
return obj;
|
|
117
|
+
}
|
|
118
|
+
return {
|
|
119
|
+
...obj,
|
|
120
|
+
[property]: interpretPropertyAtPath(obj[property], rest, interpreter),
|
|
121
|
+
};
|
|
105
122
|
}
|
|
106
123
|
//# sourceMappingURL=fill-component-expressions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fill-component-expressions.js","sourceRoot":"","sources":["../../../../src/use-lunatic/commons/fill-components/fill-component-expressions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"fill-component-expressions.js","sourceRoot":"","sources":["../../../../src/use-lunatic/commons/fill-components/fill-component-expressions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,25 +1,85 @@
|
|
|
1
|
-
import { describe, expect,
|
|
1
|
+
import { describe, expect, it } from 'vitest';
|
|
2
2
|
import { fillComponentExpressions } from './fill-component-expressions';
|
|
3
3
|
describe('fillComponentExpressions', () => {
|
|
4
|
-
const exp = (s) => ({
|
|
4
|
+
const exp = (s) => ({
|
|
5
|
+
value: s.toString(),
|
|
6
|
+
type: 'VTL',
|
|
7
|
+
});
|
|
5
8
|
const component = {
|
|
6
9
|
label: exp('label'),
|
|
7
|
-
|
|
8
|
-
|
|
10
|
+
page: '1',
|
|
11
|
+
id: 'a',
|
|
12
|
+
componentType: 'CheckboxGroup',
|
|
13
|
+
responses: [
|
|
14
|
+
{
|
|
15
|
+
label: exp('Response 1'),
|
|
16
|
+
response: { name: 'A' },
|
|
17
|
+
id: 'a',
|
|
18
|
+
},
|
|
19
|
+
{
|
|
20
|
+
label: exp('Response 2'),
|
|
21
|
+
response: { name: 'B' },
|
|
22
|
+
id: 'b',
|
|
23
|
+
},
|
|
24
|
+
],
|
|
9
25
|
};
|
|
10
|
-
|
|
11
|
-
|
|
26
|
+
const loopComponent = {
|
|
27
|
+
label: exp('label'),
|
|
28
|
+
page: '1',
|
|
29
|
+
id: 'b',
|
|
30
|
+
componentType: 'RosterForLoop',
|
|
31
|
+
components: [],
|
|
32
|
+
lines: { min: exp('1'), max: exp('10') },
|
|
33
|
+
positioning: 'HORIZONTAL',
|
|
34
|
+
};
|
|
35
|
+
const fillComponent = (component) => {
|
|
36
|
+
return fillComponentExpressions(component, {
|
|
12
37
|
executeExpression: (expression) => expression.value,
|
|
13
38
|
pager: {
|
|
14
39
|
iteration: 1,
|
|
15
40
|
linksIterations: [1, 2],
|
|
16
41
|
},
|
|
17
42
|
});
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
43
|
+
};
|
|
44
|
+
it('convert expressions inside components', () => {
|
|
45
|
+
expect(fillComponent(component)).toMatchInlineSnapshot(`
|
|
46
|
+
{
|
|
47
|
+
"componentType": "CheckboxGroup",
|
|
48
|
+
"id": "a",
|
|
49
|
+
"label": "label",
|
|
50
|
+
"page": "1",
|
|
51
|
+
"responses": [
|
|
52
|
+
{
|
|
53
|
+
"id": "a",
|
|
54
|
+
"label": "Response 1",
|
|
55
|
+
"response": {
|
|
56
|
+
"name": "A",
|
|
57
|
+
},
|
|
58
|
+
},
|
|
59
|
+
{
|
|
60
|
+
"id": "b",
|
|
61
|
+
"label": "Response 2",
|
|
62
|
+
"response": {
|
|
63
|
+
"name": "B",
|
|
64
|
+
},
|
|
65
|
+
},
|
|
66
|
+
],
|
|
67
|
+
}
|
|
68
|
+
`);
|
|
69
|
+
expect(fillComponent(loopComponent)).toMatchInlineSnapshot(`
|
|
70
|
+
{
|
|
71
|
+
"componentType": "RosterForLoop",
|
|
72
|
+
"components": [],
|
|
73
|
+
"id": "b",
|
|
74
|
+
"label": "label",
|
|
75
|
+
"lines": {
|
|
76
|
+
"max": 10,
|
|
77
|
+
"min": 1,
|
|
78
|
+
},
|
|
79
|
+
"page": "1",
|
|
80
|
+
"positioning": "HORIZONTAL",
|
|
81
|
+
}
|
|
82
|
+
`);
|
|
23
83
|
});
|
|
24
84
|
});
|
|
25
85
|
//# sourceMappingURL=fill-component-expressions.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fill-component-expressions.spec.js","sourceRoot":"","sources":["../../../../src/use-lunatic/commons/fill-components/fill-component-expressions.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"fill-component-expressions.spec.js","sourceRoot":"","sources":["../../../../src/use-lunatic/commons/fill-components/fill-component-expressions.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAExE,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACzC,MAAM,GAAG,GAAG,CAAC,CAAkB,EAAE,EAAE,CAAC,CAAC;QACpC,KAAK,EAAE,CAAC,CAAC,QAAQ,EAAE;QACnB,IAAI,EAAE,KAAc;KACpB,CAAC,CAAC;IACH,MAAM,SAAS,GAAG;QACjB,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC;QACnB,IAAI,EAAE,GAAG;QACT,EAAE,EAAE,GAAG;QACP,aAAa,EAAE,eAAe;QAC9B,SAAS,EAAE;YACV;gBACC,KAAK,EAAE,GAAG,CAAC,YAAY,CAAC;gBACxB,QAAQ,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE;gBACvB,EAAE,EAAE,GAAG;aACP;YACD;gBACC,KAAK,EAAE,GAAG,CAAC,YAAY,CAAC;gBACxB,QAAQ,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE;gBACvB,EAAE,EAAE,GAAG;aACP;SACD;KACwD,CAAC;IAE3D,MAAM,aAAa,GAAG;QACrB,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC;QACnB,IAAI,EAAE,GAAG;QACT,EAAE,EAAE,GAAG;QACP,aAAa,EAAE,eAAe;QAC9B,UAAU,EAAE,EAAE;QACd,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;QACxC,WAAW,EAAE,YAAY;KACgC,CAAC;IAE3D,MAAM,aAAa,GAAG,CACrB,SAAyD,EACxD,EAAE;QACH,OAAO,wBAAwB,CAAC,SAAS,EAAE;YAC1C,iBAAiB,EAAE,CAAC,UAAe,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK;YACxD,KAAK,EAAE;gBACN,SAAS,EAAE,CAAC;gBACZ,eAAe,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;aACvB;SACD,CAAC,CAAC;IACJ,CAAC,CAAC;IAEF,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAChD,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;;;;;;;GAuBtD,CAAC,CAAC;QACH,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;GAa1D,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -59,7 +59,7 @@ function isEmpty(value) {
|
|
|
59
59
|
if (typeof value === 'object' && value !== null) {
|
|
60
60
|
return isEmpty(Object.values(value));
|
|
61
61
|
}
|
|
62
|
-
return (value ?? '') === '';
|
|
62
|
+
return (value ?? '') === '' || value === false;
|
|
63
63
|
}
|
|
64
64
|
/**
|
|
65
65
|
* For complex component we need to inspect child components, interpret the response value
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-page-has-response.js","sourceRoot":"","sources":["../../../src/use-lunatic/hooks/use-page-has-response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAIjD;;GAEG;AACH,MAAM,UAAU,kBAAkB,CACjC,UAAmC,EACnC,iBAA2D;IAE3D,OAAO,WAAW,CAAC,GAAG,EAAE;QACvB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3D,OAAO,IAAI,CAAC;QACb,CAAC;QAED,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACpC,wDAAwD;YACxD,+DAA+D;YAC/D,IACC,CAAC,eAAe,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC,QAAQ,CAClE,SAAS,CAAC,aAAa,IAAI,EAAE,CAC7B,EACA,CAAC;gBACF,OAAO,IAAI,CAAC;YACb,CAAC;YAED,gDAAgD;YAChD,IACC,iBAAiB,IAAI,SAAS;gBAC9B,SAAS,CAAC,eAAe;gBACzB,SAAS,CAAC,eAAe,CAAC,KAAK,EAC9B,CAAC;gBACF,OAAO,IAAI,CAAC;YACb,CAAC;YAED,iGAAiG;YACjG,IAAI,SAAS,CAAC,aAAa,KAAK,OAAO,EAAE,CAAC;gBACzC,iGAAiG;gBACjG,MAAM,iBAAiB,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE;oBAC1D,MAAM,eAAe,GAAG,GAAG,CAAC,MAAM,CACjC,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,eAAe,IAAI,IAAI,CACnD,CAAC;oBACF,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,eAAe,CAAC,CAAC;gBACnC,CAAC,EAAE,EAA6B,CAAC,CAAC;gBAClC,OAAO,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,CAAC;YACpE,CAAC;YAED,gDAAgD;YAChD,IAAI,OAAO,IAAI,SAAS,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;gBACvD,OAAO,IAAI,CAAC;YACb,CAAC;YAED,wDAAwD;YACxD,IACC,YAAY,IAAI,SAAS;gBACzB,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC;gBACnC,CAAC,oBAAoB,CAAC,SAAS,CAAC,UAAU,EAAE,iBAAiB,CAAC,EAC7D,CAAC;gBACF,OAAO,IAAI,CAAC;YACb,CAAC;QACF,CAAC;QAED,OAAO,KAAK,CAAC;IACd,CAAC,EAAE,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC,CAAC;AACrC,CAAC;AAED;;;;;GAKG;AACH,SAAS,OAAO,CAAC,KAAc;IAC9B,wCAAwC;IACxC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,sCAAsC;QACtC,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC;IACrD,CAAC;IACD,iCAAiC;IACjC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACjD,OAAO,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IACtC,CAAC;IACD,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"use-page-has-response.js","sourceRoot":"","sources":["../../../src/use-lunatic/hooks/use-page-has-response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAIjD;;GAEG;AACH,MAAM,UAAU,kBAAkB,CACjC,UAAmC,EACnC,iBAA2D;IAE3D,OAAO,WAAW,CAAC,GAAG,EAAE;QACvB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3D,OAAO,IAAI,CAAC;QACb,CAAC;QAED,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACpC,wDAAwD;YACxD,+DAA+D;YAC/D,IACC,CAAC,eAAe,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC,QAAQ,CAClE,SAAS,CAAC,aAAa,IAAI,EAAE,CAC7B,EACA,CAAC;gBACF,OAAO,IAAI,CAAC;YACb,CAAC;YAED,gDAAgD;YAChD,IACC,iBAAiB,IAAI,SAAS;gBAC9B,SAAS,CAAC,eAAe;gBACzB,SAAS,CAAC,eAAe,CAAC,KAAK,EAC9B,CAAC;gBACF,OAAO,IAAI,CAAC;YACb,CAAC;YAED,iGAAiG;YACjG,IAAI,SAAS,CAAC,aAAa,KAAK,OAAO,EAAE,CAAC;gBACzC,iGAAiG;gBACjG,MAAM,iBAAiB,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE;oBAC1D,MAAM,eAAe,GAAG,GAAG,CAAC,MAAM,CACjC,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,eAAe,IAAI,IAAI,CACnD,CAAC;oBACF,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,eAAe,CAAC,CAAC;gBACnC,CAAC,EAAE,EAA6B,CAAC,CAAC;gBAClC,OAAO,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,CAAC;YACpE,CAAC;YAED,gDAAgD;YAChD,IAAI,OAAO,IAAI,SAAS,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;gBACvD,OAAO,IAAI,CAAC;YACb,CAAC;YAED,wDAAwD;YACxD,IACC,YAAY,IAAI,SAAS;gBACzB,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC;gBACnC,CAAC,oBAAoB,CAAC,SAAS,CAAC,UAAU,EAAE,iBAAiB,CAAC,EAC7D,CAAC;gBACF,OAAO,IAAI,CAAC;YACb,CAAC;QACF,CAAC;QAED,OAAO,KAAK,CAAC;IACd,CAAC,EAAE,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC,CAAC;AACrC,CAAC;AAED;;;;;GAKG;AACH,SAAS,OAAO,CAAC,KAAc;IAC9B,wCAAwC;IACxC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,sCAAsC;QACtC,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC;IACrD,CAAC;IACD,iCAAiC;IACjC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACjD,OAAO,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IACtC,CAAC;IACD,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,KAAK,EAAE,IAAI,KAAK,KAAK,KAAK,CAAC;AAChD,CAAC;AAED;;GAEG;AACH,SAAS,oBAAoB,CAC5B,UAIG,EACH,iBAA2D;IAE3D,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACpC,IAAI,WAAW,IAAI,SAAS,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC;YACpE,KAAK,MAAM,QAAQ,IAAI,SAAS,CAAC,SAAS,EAAE,CAAC;gBAC5C,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC;oBAC1D,OAAO,KAAK,CAAC;gBACd,CAAC;YACF,CAAC;QACF,CAAC;QACD,IACC,UAAU,IAAI,SAAS;YACvB,SAAS,CAAC,QAAQ;YAClB,OAAO,SAAS,CAAC,QAAQ,KAAK,QAAQ;YACtC,MAAM,IAAI,SAAS,CAAC,QAAQ;YAC5B,CAAC,OAAO,CAAC,iBAAiB,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EACnD,CAAC;YACF,OAAO,KAAK,CAAC;QACd,CAAC;IACF,CAAC;IAED,OAAO,IAAI,CAAC;AACb,CAAC"}
|
|
@@ -40,10 +40,9 @@ const interpretOverviewItem = (items, item, executeExpression, pager, iteration)
|
|
|
40
40
|
// We reached a loop item, we need to add it multiple time
|
|
41
41
|
if (item.iterations && iteration === undefined) {
|
|
42
42
|
const iterations = executeExpression(item.iterations) ?? 0;
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
}
|
|
46
|
-
return items;
|
|
43
|
+
return Array.from({ length: iterations }).reduce((acc, _, k) => {
|
|
44
|
+
return interpretOverviewItem(acc, item, executeExpression, pager, k);
|
|
45
|
+
}, items);
|
|
47
46
|
}
|
|
48
47
|
const isVisible = !!executeExpression(item.conditionFilter, {
|
|
49
48
|
iteration: iteration,
|
|
@@ -53,21 +52,23 @@ const interpretOverviewItem = (items, item, executeExpression, pager, iteration)
|
|
|
53
52
|
}
|
|
54
53
|
// Append the item to the list of items
|
|
55
54
|
const page = `${item.pageTag}${iteration !== undefined ? `#${iteration + 1}` : ''}`;
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
:
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
:
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
55
|
+
return [
|
|
56
|
+
...items,
|
|
57
|
+
{
|
|
58
|
+
id: item.id,
|
|
59
|
+
type: item.type,
|
|
60
|
+
label: executeExpression(item.label, { iteration }),
|
|
61
|
+
description: item.description
|
|
62
|
+
? executeExpression(item.description, { iteration })
|
|
63
|
+
: undefined,
|
|
64
|
+
children: [],
|
|
65
|
+
reached: pageTagComparator(pager?.lastReachedPage ?? '-1', page) >= 0
|
|
66
|
+
? true
|
|
67
|
+
: false,
|
|
68
|
+
page: page,
|
|
69
|
+
current: false,
|
|
70
|
+
},
|
|
71
|
+
];
|
|
71
72
|
};
|
|
72
73
|
/**
|
|
73
74
|
* Set the current property in the correct overview item
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useOverview.js","sourceRoot":"","sources":["../../../src/use-lunatic/hooks/useOverview.ts"],"names":[],"mappings":"AAKA,OAAO,EAAuC,OAAO,EAAE,MAAM,OAAO,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAapE;;GAEG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CAC1B,EACC,QAAQ,EACR,iBAAiB,EACjB,KAAK,GACkE,EACxE,IAAoB,EACnB,EAAE;IACH,OAAO,OAAO,CACb,GAAG,EAAE,CAAC,iBAAiB,CAAC,QAAQ,EAAE,iBAAiB,EAAE,KAAK,CAAC;IAC3D,uDAAuD;IACvD,CAAC,GAAG,IAAI,EAAE,QAAQ,CAAC,CACnB,CAAC;AACH,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,iBAAiB,GAAG,CACzB,aAAoC,EACpC,iBAA2D,EAC3D,KAAoC,EACnC,EAAE;IACH,iCAAiC;IACjC,IAAI,KAAK,GAAG,aAAa,CAAC,MAAM,CAC/B,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,qBAAqB,CAAC,GAAG,EAAE,IAAI,EAAE,iBAAiB,EAAE,KAAK,CAAC,EACzE,EAAsC,CACtC,CAAC;IACF,4BAA4B;IAC5B,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAChE,wFAAwF;IACxF,MAAM,SAAS,GAAG,EAAkB,CAAC;IACrC,IAAI,MAAM,GAAG,IAA6C,CAAC;IAE3D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QAC1B,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YAC9B,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACrB,MAAM,GAAG,IAAI,CAAC;QACf,CAAC;aAAM,CAAC;YACP,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7B,CAAC;IACF,CAAC;IAED,IAAI,KAAK,EAAE,CAAC;QACX,gBAAgB,CAAC,SAAS,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;IAChD,CAAC;IAED,OAAO,SAAS,CAAC;AAClB,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,qBAAqB,GAAG,CAC7B,KAAuC,EACvC,IAAyB,EACzB,iBAA2D,EAC3D,KAAoC,EACpC,SAAkB,EACiB,EAAE;IACrC,0DAA0D;IAC1D,IAAI,IAAI,CAAC,UAAU,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAChD,MAAM,UAAU,GAAG,iBAAiB,CAAS,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACnE,KAAK,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"useOverview.js","sourceRoot":"","sources":["../../../src/use-lunatic/hooks/useOverview.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import type { LunaticControl, LunaticError, LunaticReducerState } from '../../type';
|
|
2
|
-
export declare function checkBaseControl(
|
|
2
|
+
export declare function checkBaseControl(controlItem: LunaticControl, executeExpression: LunaticReducerState['executeExpression'], pager: LunaticReducerState['pager']): LunaticError | undefined;
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
import {} from 'react';
|
|
2
|
-
export function checkBaseControl(
|
|
2
|
+
export function checkBaseControl(controlItem, executeExpression, pager) {
|
|
3
3
|
const { iteration, linksIterations } = pager;
|
|
4
|
-
const { criticality, errorMessage, id, typeOfControl } =
|
|
5
|
-
|
|
6
|
-
|
|
4
|
+
const { criticality, errorMessage, id, typeOfControl, control } = controlItem;
|
|
5
|
+
// There is no control expression for this control (this is unexpected)
|
|
6
|
+
if (!control) {
|
|
7
|
+
return undefined;
|
|
8
|
+
}
|
|
9
|
+
const result = executeExpression(control, {
|
|
7
10
|
iteration: linksIterations ?? iteration,
|
|
8
11
|
});
|
|
9
12
|
try {
|
|
@@ -26,7 +29,7 @@ export function checkBaseControl(control, executeExpression, pager) {
|
|
|
26
29
|
};
|
|
27
30
|
}
|
|
28
31
|
catch (e) {
|
|
29
|
-
console.warn(`Error on validating control ${value}`);
|
|
32
|
+
console.warn(`Error on validating control ${control.value}`);
|
|
30
33
|
return undefined;
|
|
31
34
|
}
|
|
32
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check-base-control.js","sourceRoot":"","sources":["../../../../src/use-lunatic/reducer/controls/check-base-control.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,MAAM,OAAO,CAAC;AAOvC,MAAM,UAAU,gBAAgB,CAC/B,
|
|
1
|
+
{"version":3,"file":"check-base-control.js","sourceRoot":"","sources":["../../../../src/use-lunatic/reducer/controls/check-base-control.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,MAAM,OAAO,CAAC;AAOvC,MAAM,UAAU,gBAAgB,CAC/B,WAA2B,EAC3B,iBAA2D,EAC3D,KAAmC;IAEnC,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,GAAG,KAAK,CAAC;IAC7C,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;IAE9E,uEAAuE;IACvE,IAAI,CAAC,OAAO,EAAE,CAAC;QACd,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,MAAM,MAAM,GAAG,iBAAiB,CAAC,OAAO,EAAE;QACzC,SAAS,EAAE,eAAe,IAAI,SAAS;KACvC,CAAC,CAAC;IAEH,IAAI,CAAC;QACJ;;;;;WAKG;QACH,IAAI,MAAM;YAAE,OAAO,SAAS,CAAC;QAE7B,MAAM,KAAK,GAAG,iBAAiB,CAAY,YAAY,EAAE;YACxD,SAAS;SACT,CAAC,CAAC;QACH,OAAO;YACN,WAAW;YACX,YAAY,EAAE,KAAK;YACnB,EAAE;YACF,aAAa;SACb,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACZ,OAAO,CAAC,IAAI,CAAC,+BAA+B,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;QAC7D,OAAO,SAAS,CAAC;IAClB,CAAC;AACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"overviewOnInit.js","sourceRoot":"","sources":["../../../../src/use-lunatic/reducer/overview/overviewOnInit.ts"],"names":[],"mappings":"AAQA;;GAEG;AACH,SAAS,qBAAqB,CAC7B,KAA4B,EAC5B,SAAwB,EACxB,QAAsC,EAAE;IAExC,0DAA0D;IAC1D,IAAI,SAAS,CAAC,aAAa,KAAK,MAAM,EAAE,CAAC;QACxC,OAAO,gBAAgB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAC3C,CAAC;IAED,kEAAkE;IAClE,IACC,SAAS,CAAC,aAAa,KAAK,aAAa;QACzC,SAAS,CAAC,aAAa,KAAK,UAAU,EACrC,CAAC;QACF,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,IAAI,SAAS,CAAC,QAAQ,CAAC;QAClD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC9B,KAAK,CAAC,IAAI,CAAC;YACV,EAAE,EAAE,SAAS,CAAC,EAAE;YAChB,IAAI,EAAE,SAAS,CAAC,aAAa;YAC7B,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;YAC5B,KAAK,EAAE,SAAS,CAAC,KAAK;YACtB,WAAW,EAAE,SAAS,CAAC,WAAW;YAClC,eAAe,EAAE,SAAS,CAAC,eAAe;YAC1C,GAAG,KAAK;SACR,CAAC,CAAC;IACJ,CAAC;IAED,OAAO,KAAK,CAAC;AACd,CAAC;AAED;;GAEG;AACH,SAAS,gBAAgB,CACxB,KAA4B,EAC5B,SAAgD;IAEhD,uEAAuE;IACvE,IAAI,CAAC,CAAC,YAAY,IAAI,SAAS,CAAC,EAAE,CAAC;QAClC,OAAO,KAAK,CAAC;IACd,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,SAAS,CAAC,UAAU,EAAE,CAAC;QAC1C,KAAK,GAAG,qBAAqB,CAAC,KAAK,EAAE,KAAK,EAAE;YAC3C,UAAU,EAAE,SAAS,CAAC,UAAU
|
|
1
|
+
{"version":3,"file":"overviewOnInit.js","sourceRoot":"","sources":["../../../../src/use-lunatic/reducer/overview/overviewOnInit.ts"],"names":[],"mappings":"AAQA;;GAEG;AACH,SAAS,qBAAqB,CAC7B,KAA4B,EAC5B,SAAwB,EACxB,QAAsC,EAAE;IAExC,0DAA0D;IAC1D,IAAI,SAAS,CAAC,aAAa,KAAK,MAAM,EAAE,CAAC;QACxC,OAAO,gBAAgB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAC3C,CAAC;IAED,kEAAkE;IAClE,IACC,SAAS,CAAC,aAAa,KAAK,aAAa;QACzC,SAAS,CAAC,aAAa,KAAK,UAAU,EACrC,CAAC;QACF,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,IAAI,SAAS,CAAC,QAAQ,CAAC;QAClD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC9B,KAAK,CAAC,IAAI,CAAC;YACV,EAAE,EAAE,SAAS,CAAC,EAAE;YAChB,IAAI,EAAE,SAAS,CAAC,aAAa;YAC7B,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;YAC5B,KAAK,EAAE,SAAS,CAAC,KAAK;YACtB,WAAW,EAAE,SAAS,CAAC,WAAW;YAClC,eAAe,EAAE,SAAS,CAAC,eAAe;YAC1C,GAAG,KAAK;SACR,CAAC,CAAC;IACJ,CAAC;IAED,OAAO,KAAK,CAAC;AACd,CAAC;AAED;;GAEG;AACH,SAAS,gBAAgB,CACxB,KAA4B,EAC5B,SAAgD;IAEhD,uEAAuE;IACvE,IAAI,CAAC,CAAC,YAAY,IAAI,SAAS,CAAC,EAAE,CAAC;QAClC,OAAO,KAAK,CAAC;IACd,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,SAAS,CAAC,UAAU,EAAE,CAAC;QAC1C,KAAK,GAAG,qBAAqB,CAAC,KAAK,EAAE,KAAK,EAAE;YAC3C,UAAU,EAAE,SAAS,CAAC,UAAU;SAChC,CAAC,CAAC;IACJ,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,MAAqB;IAClD,OAAO,MAAM,CAAC,UAAU,CAAC,MAAM,CAC9B,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,qBAAqB,CAAC,GAAG,EAAE,CAAC,CAAC,EACzC,EAA2B,CAC3B,CAAC;AACH,CAAC"}
|
|
@@ -43,10 +43,11 @@ export function reducerInitializer({ source, data, features = ['VTL'], initialPa
|
|
|
43
43
|
}
|
|
44
44
|
// Remove above code on next update
|
|
45
45
|
const expressionType = getExpressionType(expression);
|
|
46
|
+
const expressionString = getExpressionAsString(expression);
|
|
47
|
+
// If VTL is not supported, or the expression does not use VTL, return the uninterpreted value
|
|
46
48
|
if (!features?.includes(VTL) || !expressionType.includes(VTL)) {
|
|
47
|
-
return
|
|
49
|
+
return expressionString;
|
|
48
50
|
}
|
|
49
|
-
const expressionString = getExpressionAsString(expression);
|
|
50
51
|
try {
|
|
51
52
|
const result = variables.run(expressionString, {
|
|
52
53
|
...args,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reducerInitializer.js","sourceRoot":"","sources":["../../../src/use-lunatic/reducer/reducerInitializer.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAC;AACrF,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAE3E,MAAM,SAAS,GAAG;IACjB,SAAS,EAAE,IAAI,qBAAqB,EAAE;IACtC,KAAK,EAAE;QACN,IAAI,EAAE,CAAC;QACP,OAAO,EAAE,CAAC;QACV,OAAO,EAAE,SAAS;QAClB,UAAU,EAAE,SAAS;QACrB,SAAS,EAAE,SAAS;QACpB,gBAAgB,EAAE,SAAS;QAC3B,YAAY,EAAE,SAAS;KACvB;IACD,KAAK,EAAE,EAAE;IACT,QAAQ,EAAE,KAAK;IACf,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;IACrB,QAAQ,EAAE,EAAE;IACZ,cAAc,EAAE,GAAG,EAAE,GAAE,CAAC;IACxB,iBAAiB,EAAE,GAAO,EAAE,CAAC,IAAS;CACR,CAAC;AAEhC,MAAM,UAAU,kBAAkB,CAAC,EAClC,MAAM,EACN,IAAI,EACJ,QAAQ,GAAG,CAAC,KAAK,CAAC,EAClB,WAAW,GAAG,GAAG,EACjB,eAAe,GAAG,SAAS,EAC3B,YAAY,GAAG,KAAK,EACpB,cAAc,GASd;IACA,MAAM,SAAS,GAAG,qBAAqB,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACrE,MAAM,KAAK,GAAG,UAAU,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;IAEjD,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QACtB,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,sBAAsB;IACtB,IAAI,cAAc,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;QACzC,kBAAkB,CAAC,MAAM,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;IACvD,CAAC;IAED,MAAM,iBAAiB,GAA6C,CACnE,UAAU,EACV,IAAI,GAAG,EAAE,EACR,EAAE;QACH,gDAAgD;QAChD,IAAI,IAAI,EAAE,mBAAmB,EAAE,CAAC;YAC/B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,mBAAmB,CAAC;QACtC,CAAC;QACD,mCAAmC;QACnC,MAAM,cAAc,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC;QACrD,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/D,OAAO,
|
|
1
|
+
{"version":3,"file":"reducerInitializer.js","sourceRoot":"","sources":["../../../src/use-lunatic/reducer/reducerInitializer.tsx"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ export declare function replaceComponentSequence(components: Array<LunaticCompon
|
|
|
14
14
|
} & {
|
|
15
15
|
paginatedLoop: true;
|
|
16
16
|
maxPage: string;
|
|
17
|
-
iterations: import("./type-source").LabelType<"VTL" | "VTL|MD">;
|
|
17
|
+
iterations: import("./type-source").LabelType<"VTL" | "VTL|MD" | "TXT">;
|
|
18
18
|
}) | (import("./type-source").ComponentTypeBase & {
|
|
19
19
|
componentType: "Loop";
|
|
20
20
|
loopDependencies: string[];
|
|
@@ -23,7 +23,7 @@ export declare function replaceComponentSequence(components: Array<LunaticCompon
|
|
|
23
23
|
} & {
|
|
24
24
|
paginatedLoop: false;
|
|
25
25
|
lines: {
|
|
26
|
-
min: import("./type-source").LabelType<"VTL" | "VTL|MD">;
|
|
27
|
-
max: import("./type-source").LabelType<"VTL" | "VTL|MD">;
|
|
26
|
+
min: import("./type-source").LabelType<"VTL" | "VTL|MD" | "TXT">;
|
|
27
|
+
max: import("./type-source").LabelType<"VTL" | "VTL|MD" | "TXT">;
|
|
28
28
|
};
|
|
29
29
|
}) | (import("./type-source").ComponentTypeBase & import("./type-source").ComponentTableType) | (import("./type-source").ComponentTypeBase & import("./type-source").ComponentNumberType) | (import("./type-source").ComponentTypeBase & import("./type-source").ComponentDatePickerType) | (import("./type-source").ComponentTypeBase & import("./type-source").ComponentDurationType) | (import("./type-source").ComponentTypeBase & import("./type-source").ComponentCheckboxGroupType) | (import("./type-source").ComponentTypeBase & import("./type-source").ComponentCheckboxBooleanType) | (import("./type-source").ComponentTypeBase & import("./type-source").ComponentRadioType) | (import("./type-source").ComponentTypeBase & import("./type-source").ComponentFilterDescriptionType) | (import("./type-source").ComponentTypeBase & import("./type-source").ComponentDropdownType) | (Omit<import("./type-source").ComponentTypeBase, "label"> & import("./type-source").ComponentPairWiseLinksType) | (import("./type-source").ComponentTypeBase & import("./type-source").ComponentRoundaboutType) | (import("./type-source").ComponentTypeBase & import("./type-source").ComponentSuggesterType) | (import("./type-source").ComponentTypeBase & import("./type-source").ComponentInputOrTextareaType) | (import("./type-source").ComponentTypeBase & import("./type-source").ComponentCheckboxOneType) | (import("./type-source").ComponentTypeBase & import("./type-source").ComponentQuestionType))[];
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Types used for source data (lunatic models and data.json)
|
|
3
3
|
*/
|
|
4
|
-
export type LabelType<T extends 'VTL' | 'VTL|MD' = 'VTL' | 'VTL|MD'> = {
|
|
4
|
+
export type LabelType<T extends 'VTL' | 'VTL|MD' | 'TXT' = 'VTL' | 'VTL|MD' | 'TXT'> = {
|
|
5
5
|
value: string;
|
|
6
6
|
type: T;
|
|
7
7
|
};
|
|
@@ -16,7 +16,7 @@ export type LunaticOverviewItem = {
|
|
|
16
16
|
description: LunaticExpression | undefined;
|
|
17
17
|
type: string;
|
|
18
18
|
conditionFilter?: LunaticExpression;
|
|
19
|
-
iterations?:
|
|
19
|
+
iterations?: LunaticExpression;
|
|
20
20
|
};
|
|
21
21
|
export type VTLBindings = {
|
|
22
22
|
[variableName: string]: unknown;
|
|
@@ -31,7 +31,7 @@ export type LunaticError = Pick<ControlType, 'id' | 'criticality' | 'typeOfContr
|
|
|
31
31
|
errorMessage: ReactNode;
|
|
32
32
|
};
|
|
33
33
|
export type VariableType = 'COLLECTED' | 'EXTERNAL' | 'CALCULATED';
|
|
34
|
-
export type ExpressionType = 'VTL' | 'VTL|MD';
|
|
34
|
+
export type ExpressionType = 'VTL' | 'VTL|MD' | 'TXT';
|
|
35
35
|
export type LunaticExpression = {
|
|
36
36
|
value: string;
|
|
37
37
|
type: ExpressionType;
|
package/lib/utils/array.d.ts
CHANGED
|
@@ -12,7 +12,7 @@ export declare function setAtIndex<T>(arr: T, index: number | number[], newValue
|
|
|
12
12
|
export declare function getAtIndex(arr: unknown, indexes: number[]): unknown;
|
|
13
13
|
export declare function resizeArray<T = unknown>(array: unknown, newLength: number, defaultValue?: T): T[];
|
|
14
14
|
/**
|
|
15
|
-
* Return the first non
|
|
15
|
+
* Return the first non-null/undefined value of an array
|
|
16
16
|
*/
|
|
17
17
|
export declare function firstValueItem<T = unknown>(items: T | T[]): T | undefined;
|
|
18
18
|
/**
|
package/lib/utils/array.js
CHANGED
|
@@ -51,7 +51,7 @@ export function resizeArray(array, newLength, defaultValue) {
|
|
|
51
51
|
}, []);
|
|
52
52
|
}
|
|
53
53
|
/**
|
|
54
|
-
* Return the first non
|
|
54
|
+
* Return the first non-null/undefined value of an array
|
|
55
55
|
*/
|
|
56
56
|
export function firstValueItem(items) {
|
|
57
57
|
if (!Array.isArray(items)) {
|