@inseefr/lunatic 3.6.6 → 3.6.8-rc.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.
- package/README.md +25 -0
- package/components/Loop/Loop.d.ts +1 -1
- package/components/Loop/Loop.js +5 -27
- package/components/Loop/Loop.js.map +1 -1
- package/components/Loop/utils.d.ts +8 -0
- package/components/Loop/utils.js +66 -0
- package/components/Loop/utils.js.map +1 -0
- package/components/RosterForLoop/RosterForLoop.js +4 -27
- package/components/RosterForLoop/RosterForLoop.js.map +1 -1
- package/esm/components/Loop/Loop.d.ts +1 -1
- package/esm/components/Loop/Loop.js +5 -28
- package/esm/components/Loop/Loop.js.map +1 -1
- package/esm/components/Loop/utils.d.ts +8 -0
- package/esm/components/Loop/utils.js +63 -0
- package/esm/components/Loop/utils.js.map +1 -0
- package/esm/components/RosterForLoop/RosterForLoop.js +5 -29
- package/esm/components/RosterForLoop/RosterForLoop.js.map +1 -1
- package/esm/use-lunatic/commons/compile-controls.js +8 -0
- package/esm/use-lunatic/commons/compile-controls.js.map +1 -1
- package/esm/use-lunatic/props/propIterations.js +12 -1
- package/esm/use-lunatic/props/propIterations.js.map +1 -1
- package/esm/use-lunatic/reducer/controls/check-base-control.js.map +1 -1
- package/package.json +15 -3
- package/src/components/Loop/Loop.tsx +6 -35
- package/src/components/Loop/utils.test.ts +61 -0
- package/src/components/Loop/utils.ts +74 -0
- package/src/components/RosterForLoop/RosterForLoop.tsx +3 -33
- package/src/stories/behaviour/controls/controls.stories.tsx +12 -3
- package/src/stories/behaviour/controls/data-standalone-loop.json +17 -0
- package/src/stories/behaviour/controls/source-standalone-loop.json +5503 -0
- package/src/stories/loop/source-paginated.json +1 -1
- package/src/stories/roundabout/sourceWithControl.json +14 -0
- package/src/use-lunatic/commons/compile-controls.ts +13 -0
- package/src/use-lunatic/props/propIterations.ts +30 -15
- package/src/use-lunatic/reducer/controls/check-base-control.ts +0 -1
- package/src/use-lunatic/use-lunatic-bug.test.ts +42 -0
- package/tsconfig.build.tsbuildinfo +1 -1
- package/use-lunatic/commons/compile-controls.js +7 -0
- package/use-lunatic/commons/compile-controls.js.map +1 -1
- package/use-lunatic/props/propIterations.js +12 -1
- package/use-lunatic/props/propIterations.js.map +1 -1
- package/use-lunatic/reducer/controls/check-base-control.js.map +1 -1
- /package/src/stories/behaviour/controls/{source-loop.json → source-roster-for-loop.json} +0 -0
package/README.md
CHANGED
|
@@ -251,3 +251,28 @@ We build this library in ESM and CJS. ESM is the standard when you develop a fro
|
|
|
251
251
|
But if you need test which use `@inseefr/lunatic`, you need lunatic library as CJS lib (to allow to run in node environnement).
|
|
252
252
|
So we have two build: one for ESM and one for CJS.
|
|
253
253
|
You have nothing to change in your code base, it's simply working.
|
|
254
|
+
|
|
255
|
+
## Testing with playwright
|
|
256
|
+
|
|
257
|
+
If this is the first time you've run tests with your computer, run the command :
|
|
258
|
+
|
|
259
|
+
- `npx playwright install chromium`
|
|
260
|
+
|
|
261
|
+
Then you can run directly:
|
|
262
|
+
|
|
263
|
+
- `npx playwright test --reporter=html`
|
|
264
|
+
|
|
265
|
+
or with UI (launched in your local browser):
|
|
266
|
+
|
|
267
|
+
- `npx playwright test --ui-port=8888 --ui-host=localhost`
|
|
268
|
+
|
|
269
|
+
> Tests are launched in built mode i.e the storybook is built before testing
|
|
270
|
+
|
|
271
|
+
### Alternative
|
|
272
|
+
|
|
273
|
+
To have real time test (refreshed when you're coding), you need to run storybook in a separate command prompt and launch test.
|
|
274
|
+
|
|
275
|
+
- `yarn storbook`
|
|
276
|
+
- `npx playwright test`
|
|
277
|
+
|
|
278
|
+
The inconvenient is that “dev” mode can be too slow to display storybook pages and fails test. (timeout exceeded)..
|
|
@@ -4,7 +4,7 @@ import type { LunaticError } from '../../use-lunatic/type';
|
|
|
4
4
|
/**
|
|
5
5
|
* Loop without specific markup (stack of subcomponents)
|
|
6
6
|
*/
|
|
7
|
-
export declare function Loop(
|
|
7
|
+
export declare function Loop(props: LunaticComponentProps<'Loop'>): import("react/jsx-runtime").JSX.Element | null;
|
|
8
8
|
type CustomProps = Omit<LunaticComponentProps<'RosterForLoop' | 'Loop'>, 'response' | 'handleChanges' | 'errors' | 'lines' | 'iterations' | 'value' | 'getComponents'> & PropsWithChildren<{
|
|
9
9
|
errors?: LunaticError[];
|
|
10
10
|
addRow?: () => void;
|
package/components/Loop/Loop.js
CHANGED
|
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.CustomLoop = void 0;
|
|
7
7
|
exports.Loop = Loop;
|
|
8
8
|
const jsx_runtime_1 = require("react/jsx-runtime");
|
|
9
|
-
const react_1 = require("react");
|
|
10
9
|
const i18n_1 = __importDefault(require("../../i18n"));
|
|
11
10
|
const array_1 = require("../../utils/array");
|
|
12
11
|
const LunaticComponents_1 = require("../LunaticComponents");
|
|
@@ -16,35 +15,14 @@ const Label_1 = require("../shared/Label/Label");
|
|
|
16
15
|
const Declarations_1 = require("../shared/Declarations/Declarations");
|
|
17
16
|
const Button_1 = require("../shared/Button/Button");
|
|
18
17
|
const ComponentErrors_1 = require("../shared/ComponentErrors/ComponentErrors");
|
|
18
|
+
const utils_1 = require("./utils");
|
|
19
19
|
/**
|
|
20
20
|
* Loop without specific markup (stack of subcomponents)
|
|
21
21
|
*/
|
|
22
|
-
function Loop(
|
|
23
|
-
const min
|
|
24
|
-
const
|
|
25
|
-
|
|
26
|
-
return Math.max(iterations, min);
|
|
27
|
-
});
|
|
28
|
-
const addRow = (0, react_1.useCallback)(() => {
|
|
29
|
-
if (nbRows < max) {
|
|
30
|
-
setNbRows(nbRows + 1);
|
|
31
|
-
}
|
|
32
|
-
}, [max, nbRows]);
|
|
33
|
-
const removeRow = (0, react_1.useCallback)(() => {
|
|
34
|
-
if (nbRows > 1) {
|
|
35
|
-
const newNbRows = nbRows - 1;
|
|
36
|
-
setNbRows(newNbRows);
|
|
37
|
-
// Downsize all variables by 1
|
|
38
|
-
const newResponses = Object.entries(value).map(([k, v]) => {
|
|
39
|
-
return {
|
|
40
|
-
name: k,
|
|
41
|
-
value: v?.filter((_, i) => i < newNbRows),
|
|
42
|
-
};
|
|
43
|
-
});
|
|
44
|
-
handleChanges(newResponses);
|
|
45
|
-
}
|
|
46
|
-
}, [nbRows, handleChanges, value]);
|
|
47
|
-
if (nbRows <= 0) {
|
|
22
|
+
function Loop(props) {
|
|
23
|
+
const { min, max, nbRows, addRow, removeRow } = (0, utils_1.useLoopUtils)(props);
|
|
24
|
+
const { getComponents, errors } = props;
|
|
25
|
+
if (nbRows === 0) {
|
|
48
26
|
return null;
|
|
49
27
|
}
|
|
50
28
|
return ((0, jsx_runtime_1.jsx)(exports.CustomLoop, { ...props, errors: (0, ComponentErrors_1.getComponentErrors)(errors, props.id), addRow: nbRows === max ? undefined : addRow, removeRow: nbRows === 1 || nbRows === min ? undefined : removeRow, canControlRows: min !== max && Number.isFinite(max), children: (0, array_1.times)(nbRows, (n) => ((0, jsx_runtime_1.jsx)(LunaticComponents_1.LunaticComponents, { blocklist: constant_1.blockedInLoopComponents, components: getComponents(n), componentProps: (c) => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Loop.js","sourceRoot":"","sources":["../../src/components/Loop/Loop.tsx"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"Loop.js","sourceRoot":"","sources":["../../src/components/Loop/Loop.tsx"],"names":[],"mappings":";;;;;;AAoBA,oBAgCC;;AAnDD,sDAA2B;AAC3B,6CAA0C;AAC1C,4DAAyD;AAEzD,yCAAqD;AACrD,yEAAsE;AACtE,iDAA8C;AAC9C,sEAAmE;AACnE,oDAAiD;AACjD,+EAGmD;AAEnD,mCAAuC;AAEvC;;GAEG;AACH,SAAgB,IAAI,CAAC,KAAoC;IACxD,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,oBAAY,EAAC,KAAK,CAAC,CAAC;IACpE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IAExC,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC;IACb,CAAC;IAED,OAAO,CACN,uBAAC,kBAAU,OACN,KAAK,EACT,MAAM,EAAE,IAAA,oCAAkB,EAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,EAC5C,MAAM,EAAE,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,EAC3C,SAAS,EAAE,MAAM,KAAK,CAAC,IAAI,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,EACjE,cAAc,EAAE,GAAG,KAAK,GAAG,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,YAElD,IAAA,aAAK,EAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CACrB,uBAAC,qCAAiB,IACjB,SAAS,EAAE,kCAAuB,EAElC,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC,EAC5B,cAAc,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACvB,GAAG,KAAK;gBACR,GAAG,CAAC;gBACJ,SAAS,EAAE,CAAC;gBACZ,EAAE,EAAE,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE;gBAClB,MAAM;aACN,CAAC,IARG,CAAC,CASL,CACF,CAAC,GACU,CACb,CAAC;AACH,CAAC;AAmBY,QAAA,UAAU,GAAG,IAAA,uCAAkB,EAAc,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;IAC3E,MAAM,EACL,YAAY,EACZ,EAAE,EACF,KAAK,EACL,cAAc,EACd,QAAQ,EACR,MAAM,EACN,MAAM,EACN,SAAS,GACT,GAAG,KAAK,CAAC;IAEV,OAAO,CACN,6DACC,uBAAC,aAAK,IAAC,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,YACnC,KAAK,GACC,EACR,uBAAC,2BAAY,IACZ,IAAI,EAAC,qBAAqB,EAC1B,YAAY,EAAE,YAAY,EAC1B,EAAE,EAAE,EAAE,GACL,EACD,QAAQ,EACT,uBAAC,iCAAe,IAAC,MAAM,EAAE,MAAM,GAAI,EAClC,cAAc,IAAI,CAClB,6DACC,uBAAC,eAAM,IAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,MAAM,YACxC,cAAC,CAAC,kBAAkB,GACb,EACT,uBAAC,eAAM,IAAC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,SAAS,YAC9C,cAAC,CAAC,qBAAqB,GAChB,IACP,CACH,IACC,CACH,CAAC;AACH,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { LunaticComponentProps } from '../type';
|
|
2
|
+
export declare const useLoopUtils: (props: Pick<LunaticComponentProps<"RosterForLoop"> | LunaticComponentProps<"Loop">, "lines" | "iterations" | "value" | "handleChanges">) => {
|
|
3
|
+
min: number;
|
|
4
|
+
max: number;
|
|
5
|
+
nbRows: number;
|
|
6
|
+
addRow: () => void;
|
|
7
|
+
removeRow: () => void;
|
|
8
|
+
};
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.useLoopUtils = void 0;
|
|
4
|
+
const react_1 = require("react");
|
|
5
|
+
const commons_1 = require("../../use-lunatic/reducer/commons");
|
|
6
|
+
const DEFAULT_MIN_ROWS = 1;
|
|
7
|
+
const DEFAULT_MAX_ROWS = 12;
|
|
8
|
+
const useLoopUtils = (props) => {
|
|
9
|
+
const { lines, iterations, value: valueMap, handleChanges } = props;
|
|
10
|
+
const min = lines?.min ?? DEFAULT_MIN_ROWS;
|
|
11
|
+
const max = lines?.max ?? DEFAULT_MAX_ROWS;
|
|
12
|
+
const [nbRows, setNbRows] = (0, react_1.useState)(Math.max(min, iterations ?? DEFAULT_MIN_ROWS));
|
|
13
|
+
/**
|
|
14
|
+
* For Loop & rosterForLoop,
|
|
15
|
+
* Value can be inconsistent i.e the value has not the right size
|
|
16
|
+
* The function add null values to the end of value (array), only when component is mount
|
|
17
|
+
*
|
|
18
|
+
* This the case when size of value is defined by VTL (but the value is not triggered by change)
|
|
19
|
+
* - ex: external variable indicate the size of variable
|
|
20
|
+
* - ex: min != max
|
|
21
|
+
*
|
|
22
|
+
* Improvment: do some kind of dynamic resizing and remove this useEffect.
|
|
23
|
+
* Variables must be consistent in variable-store.
|
|
24
|
+
*/
|
|
25
|
+
(0, react_1.useEffect)(() => {
|
|
26
|
+
const initialResponses = Object.entries(valueMap)
|
|
27
|
+
.filter(([, v]) => (v?.length ?? 0) < nbRows)
|
|
28
|
+
.map(([k, v]) => ({
|
|
29
|
+
name: k,
|
|
30
|
+
value: (0, commons_1.resizeArrayVariable)(v, nbRows, null),
|
|
31
|
+
}));
|
|
32
|
+
if (initialResponses.length > 0)
|
|
33
|
+
handleChanges(initialResponses);
|
|
34
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
35
|
+
}, []);
|
|
36
|
+
const addRow = (0, react_1.useCallback)(() => {
|
|
37
|
+
if (nbRows < max) {
|
|
38
|
+
const newNbRows = nbRows + 1;
|
|
39
|
+
setNbRows(newNbRows);
|
|
40
|
+
const newResponses = Object.entries(valueMap).map(([k]) => ({
|
|
41
|
+
name: k,
|
|
42
|
+
value: null,
|
|
43
|
+
iteration: [nbRows],
|
|
44
|
+
}));
|
|
45
|
+
handleChanges(newResponses);
|
|
46
|
+
}
|
|
47
|
+
}, [max, nbRows, valueMap, handleChanges]);
|
|
48
|
+
const removeRow = (0, react_1.useCallback)(() => {
|
|
49
|
+
if (nbRows <= min) {
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
const newNbRows = nbRows - 1;
|
|
53
|
+
setNbRows(newNbRows);
|
|
54
|
+
// Downsize all variables by 1
|
|
55
|
+
const newResponses = Object.entries(valueMap).map(([k, v]) => {
|
|
56
|
+
return {
|
|
57
|
+
name: k,
|
|
58
|
+
value: v?.filter((_, i) => i < newNbRows),
|
|
59
|
+
};
|
|
60
|
+
});
|
|
61
|
+
handleChanges(newResponses);
|
|
62
|
+
}, [nbRows, min, valueMap, handleChanges]);
|
|
63
|
+
return { min, max, nbRows, addRow, removeRow };
|
|
64
|
+
};
|
|
65
|
+
exports.useLoopUtils = useLoopUtils;
|
|
66
|
+
//# sourceMappingURL=utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/components/Loop/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,41 +9,18 @@ const LunaticComponents_1 = require("../LunaticComponents");
|
|
|
9
9
|
const constant_1 = require("../Loop/constant");
|
|
10
10
|
const ComponentErrors_1 = require("../shared/ComponentErrors/ComponentErrors");
|
|
11
11
|
const Loop_1 = require("../Loop/Loop");
|
|
12
|
-
const
|
|
13
|
-
const DEFAULT_MAX_ROWS = 12;
|
|
12
|
+
const utils_1 = require("../Loop/utils");
|
|
14
13
|
/**
|
|
15
14
|
* Loop displayed as a table
|
|
16
15
|
*/
|
|
17
16
|
const RosterForLoop = (props) => {
|
|
18
|
-
const {
|
|
17
|
+
const { min, max, nbRows, addRow, removeRow } = (0, utils_1.useLoopUtils)(props);
|
|
18
|
+
const { errors,
|
|
19
19
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
20
|
-
declarations, header,
|
|
20
|
+
declarations, header, id, getComponents,
|
|
21
21
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
22
22
|
label, ...otherProps // These props will be passed down to the child components
|
|
23
23
|
} = props;
|
|
24
|
-
const min = lines?.min ?? DEFAULT_MIN_ROWS;
|
|
25
|
-
const max = lines?.max ?? DEFAULT_MAX_ROWS;
|
|
26
|
-
const [nbRows, setNbRows] = (0, react_1.useState)(Math.max(min, iterations));
|
|
27
|
-
const addRow = (0, react_1.useCallback)(() => {
|
|
28
|
-
if (nbRows < max) {
|
|
29
|
-
setNbRows(nbRows + 1);
|
|
30
|
-
}
|
|
31
|
-
}, [max, nbRows]);
|
|
32
|
-
const removeRow = (0, react_1.useCallback)(() => {
|
|
33
|
-
if (nbRows <= min) {
|
|
34
|
-
return;
|
|
35
|
-
}
|
|
36
|
-
const newNbRows = nbRows - 1;
|
|
37
|
-
setNbRows(newNbRows);
|
|
38
|
-
// Downsize all variables by 1
|
|
39
|
-
const newResponses = Object.entries(valueMap).map(([k, v]) => {
|
|
40
|
-
return {
|
|
41
|
-
name: k,
|
|
42
|
-
value: v?.filter((_, i) => i < newNbRows),
|
|
43
|
-
};
|
|
44
|
-
});
|
|
45
|
-
handleChanges(newResponses);
|
|
46
|
-
}, [nbRows, min, valueMap, handleChanges]);
|
|
47
24
|
if (nbRows === 0) {
|
|
48
25
|
return null;
|
|
49
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RosterForLoop.js","sourceRoot":"","sources":["../../src/components/RosterForLoop/RosterForLoop.tsx"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"RosterForLoop.js","sourceRoot":"","sources":["../../src/components/RosterForLoop/RosterForLoop.tsx"],"names":[],"mappings":";;;;AAAA,iCAAiC;AAEjC,2CAAoE;AACpE,6CAA0C;AAC1C,4DAAyD;AACzD,+CAA2D;AAC3D,+EAGmD;AACnD,uCAA0C;AAC1C,yCAA6C;AAE7C;;GAEG;AACI,MAAM,aAAa,GAAG,CAC5B,KAA6C,EAC5C,EAAE;IACH,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,oBAAY,EAAC,KAAK,CAAC,CAAC;IACpE,MAAM,EACL,MAAM;IACN,6DAA6D;IAC7D,YAAY,EACZ,MAAM,EACN,EAAE,EACF,aAAa;IACb,6DAA6D;IAC7D,KAAK,EACL,GAAG,UAAU,CAAC,0DAA0D;MACxE,GAAG,KAAK,CAAC;IAEV,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC;IACb,CAAC;IAED,IAAI,IAAI,GAAG,CAAC,CAAC;IAEb,OAAO,CACN,uBAAC,iBAAU,OACN,KAAK,EACT,MAAM,EAAE,IAAA,oCAAkB,EAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,EAC5C,MAAM,EAAE,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,EAC3C,SAAS,EAAE,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,EACjD,cAAc,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,IAAI,GAAG,KAAK,GAAG,CAAC,YAE7C,wBAAC,aAAK,IAAC,EAAE,EAAE,EAAE,aACX,MAAM,IAAI,uBAAC,mBAAW,IAAC,MAAM,EAAE,MAAM,GAAI,EAC1C,uBAAC,aAAK,cACJ,IAAA,aAAK,EAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE;wBACpB,MAAM,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;wBACpC,MAAM,UAAU,GAAG,IAAA,oCAAkB,EAAC,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;wBAClE,MAAM,aAAa,GAAG,CAAC,CAAC,UAAU,EAAE,MAAM,CAAC;wBAC3C,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC;wBACzB,OAAO,CACN,wBAAC,gBAAQ,eACR,uBAAC,UAAE,IACF,GAAG,EAAE,CAAC,EAEN,SAAS,EACR,aAAa,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,SAAS,YAGpD,uBAAC,qCAAiB,IACjB,SAAS,EAAE,kCAAuB,EAClC,UAAU,EAAE,UAAU,EACtB,IAAI,QACJ,cAAc,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;4CACvB,GAAG,UAAU;4CACb,GAAG,CAAC;4CACJ,EAAE,EAAE,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE;4CAClB,SAAS,EAAE,CAAC;4CACZ,MAAM;yCACN,CAAC,EACF,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,uBAAC,UAAE,OAAK,KAAK,GAAI,GACpC,IAjBG,CAAC,CAkBF,EACJ,aAAa,IAAI,CACjB,uBAAC,UAAE,IAAC,SAAS,EAAC,gBAAgB,YAE7B,uBAAC,UAAE,IAAC,OAAO,EAAE,IAAI,YAChB,uBAAC,iCAAe,IAAC,MAAM,EAAE,UAAU,GAAI,GACnC,GACD,CACL,KA7Ba,CAAC,CA8BL,CACX,CAAC;oBACH,CAAC,CAAC,GACK,IACD,GACI,CACb,CAAC;AACH,CAAC,CAAC;AA5EW,QAAA,aAAa,iBA4ExB"}
|
|
@@ -4,7 +4,7 @@ import type { LunaticError } from '../../use-lunatic/type';
|
|
|
4
4
|
/**
|
|
5
5
|
* Loop without specific markup (stack of subcomponents)
|
|
6
6
|
*/
|
|
7
|
-
export declare function Loop(
|
|
7
|
+
export declare function Loop(props: LunaticComponentProps<'Loop'>): import("react/jsx-runtime").JSX.Element | null;
|
|
8
8
|
type CustomProps = Omit<LunaticComponentProps<'RosterForLoop' | 'Loop'>, 'response' | 'handleChanges' | 'errors' | 'lines' | 'iterations' | 'value' | 'getComponents'> & PropsWithChildren<{
|
|
9
9
|
errors?: LunaticError[];
|
|
10
10
|
addRow?: () => void;
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
-
import { useCallback, useState } from 'react';
|
|
3
2
|
import D from '../../i18n';
|
|
4
3
|
import { times } from '../../utils/array';
|
|
5
4
|
import { LunaticComponents } from '../LunaticComponents';
|
|
@@ -9,36 +8,14 @@ import { Label } from '../shared/Label/Label';
|
|
|
9
8
|
import { Declarations } from '../shared/Declarations/Declarations';
|
|
10
9
|
import { Button } from '../shared/Button/Button';
|
|
11
10
|
import { ComponentErrors, getComponentErrors, } from '../shared/ComponentErrors/ComponentErrors';
|
|
11
|
+
import { useLoopUtils } from './utils';
|
|
12
12
|
/**
|
|
13
13
|
* Loop without specific markup (stack of subcomponents)
|
|
14
14
|
*/
|
|
15
|
-
export function Loop(
|
|
16
|
-
|
|
17
|
-
const
|
|
18
|
-
|
|
19
|
-
const [nbRows, setNbRows] = useState(() => {
|
|
20
|
-
return Math.max(iterations, min);
|
|
21
|
-
});
|
|
22
|
-
const addRow = useCallback(() => {
|
|
23
|
-
if (nbRows < max) {
|
|
24
|
-
setNbRows(nbRows + 1);
|
|
25
|
-
}
|
|
26
|
-
}, [max, nbRows]);
|
|
27
|
-
const removeRow = useCallback(() => {
|
|
28
|
-
if (nbRows > 1) {
|
|
29
|
-
const newNbRows = nbRows - 1;
|
|
30
|
-
setNbRows(newNbRows);
|
|
31
|
-
// Downsize all variables by 1
|
|
32
|
-
const newResponses = Object.entries(value).map(([k, v]) => {
|
|
33
|
-
return {
|
|
34
|
-
name: k,
|
|
35
|
-
value: v === null || v === void 0 ? void 0 : v.filter((_, i) => i < newNbRows),
|
|
36
|
-
};
|
|
37
|
-
});
|
|
38
|
-
handleChanges(newResponses);
|
|
39
|
-
}
|
|
40
|
-
}, [nbRows, handleChanges, value]);
|
|
41
|
-
if (nbRows <= 0) {
|
|
15
|
+
export function Loop(props) {
|
|
16
|
+
const { min, max, nbRows, addRow, removeRow } = useLoopUtils(props);
|
|
17
|
+
const { getComponents, errors } = props;
|
|
18
|
+
if (nbRows === 0) {
|
|
42
19
|
return null;
|
|
43
20
|
}
|
|
44
21
|
return (_jsx(CustomLoop, { ...props, errors: getComponentErrors(errors, props.id), addRow: nbRows === max ? undefined : addRow, removeRow: nbRows === 1 || nbRows === min ? undefined : removeRow, canControlRows: min !== max && Number.isFinite(max), children: times(nbRows, (n) => (_jsx(LunaticComponents, { blocklist: blockedInLoopComponents, components: getComponents(n), componentProps: (c) => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Loop.js","sourceRoot":"","sources":["../../../src/components/Loop/Loop.tsx"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"Loop.js","sourceRoot":"","sources":["../../../src/components/Loop/Loop.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { LunaticComponentProps } from '../type';
|
|
2
|
+
export declare const useLoopUtils: (props: Pick<LunaticComponentProps<"RosterForLoop"> | LunaticComponentProps<"Loop">, "lines" | "iterations" | "value" | "handleChanges">) => {
|
|
3
|
+
min: number;
|
|
4
|
+
max: number;
|
|
5
|
+
nbRows: number;
|
|
6
|
+
addRow: () => void;
|
|
7
|
+
removeRow: () => void;
|
|
8
|
+
};
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import { useCallback, useEffect, useState } from 'react';
|
|
2
|
+
import { resizeArrayVariable } from '../../use-lunatic/reducer/commons';
|
|
3
|
+
const DEFAULT_MIN_ROWS = 1;
|
|
4
|
+
const DEFAULT_MAX_ROWS = 12;
|
|
5
|
+
export const useLoopUtils = (props) => {
|
|
6
|
+
var _a, _b;
|
|
7
|
+
const { lines, iterations, value: valueMap, handleChanges } = props;
|
|
8
|
+
const min = (_a = lines === null || lines === void 0 ? void 0 : lines.min) !== null && _a !== void 0 ? _a : DEFAULT_MIN_ROWS;
|
|
9
|
+
const max = (_b = lines === null || lines === void 0 ? void 0 : lines.max) !== null && _b !== void 0 ? _b : DEFAULT_MAX_ROWS;
|
|
10
|
+
const [nbRows, setNbRows] = useState(Math.max(min, iterations !== null && iterations !== void 0 ? iterations : DEFAULT_MIN_ROWS));
|
|
11
|
+
/**
|
|
12
|
+
* For Loop & rosterForLoop,
|
|
13
|
+
* Value can be inconsistent i.e the value has not the right size
|
|
14
|
+
* The function add null values to the end of value (array), only when component is mount
|
|
15
|
+
*
|
|
16
|
+
* This the case when size of value is defined by VTL (but the value is not triggered by change)
|
|
17
|
+
* - ex: external variable indicate the size of variable
|
|
18
|
+
* - ex: min != max
|
|
19
|
+
*
|
|
20
|
+
* Improvment: do some kind of dynamic resizing and remove this useEffect.
|
|
21
|
+
* Variables must be consistent in variable-store.
|
|
22
|
+
*/
|
|
23
|
+
useEffect(() => {
|
|
24
|
+
const initialResponses = Object.entries(valueMap)
|
|
25
|
+
.filter(([, v]) => { var _a; return ((_a = v === null || v === void 0 ? void 0 : v.length) !== null && _a !== void 0 ? _a : 0) < nbRows; })
|
|
26
|
+
.map(([k, v]) => ({
|
|
27
|
+
name: k,
|
|
28
|
+
value: resizeArrayVariable(v, nbRows, null),
|
|
29
|
+
}));
|
|
30
|
+
if (initialResponses.length > 0)
|
|
31
|
+
handleChanges(initialResponses);
|
|
32
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
33
|
+
}, []);
|
|
34
|
+
const addRow = useCallback(() => {
|
|
35
|
+
if (nbRows < max) {
|
|
36
|
+
const newNbRows = nbRows + 1;
|
|
37
|
+
setNbRows(newNbRows);
|
|
38
|
+
const newResponses = Object.entries(valueMap).map(([k]) => ({
|
|
39
|
+
name: k,
|
|
40
|
+
value: null,
|
|
41
|
+
iteration: [nbRows],
|
|
42
|
+
}));
|
|
43
|
+
handleChanges(newResponses);
|
|
44
|
+
}
|
|
45
|
+
}, [max, nbRows, valueMap, handleChanges]);
|
|
46
|
+
const removeRow = useCallback(() => {
|
|
47
|
+
if (nbRows <= min) {
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
50
|
+
const newNbRows = nbRows - 1;
|
|
51
|
+
setNbRows(newNbRows);
|
|
52
|
+
// Downsize all variables by 1
|
|
53
|
+
const newResponses = Object.entries(valueMap).map(([k, v]) => {
|
|
54
|
+
return {
|
|
55
|
+
name: k,
|
|
56
|
+
value: v === null || v === void 0 ? void 0 : v.filter((_, i) => i < newNbRows),
|
|
57
|
+
};
|
|
58
|
+
});
|
|
59
|
+
handleChanges(newResponses);
|
|
60
|
+
}, [nbRows, min, valueMap, handleChanges]);
|
|
61
|
+
return { min, max, nbRows, addRow, removeRow };
|
|
62
|
+
};
|
|
63
|
+
//# sourceMappingURL=utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/components/Loop/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,47 +1,23 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
-
import { Fragment
|
|
2
|
+
import { Fragment } from 'react';
|
|
3
3
|
import { Table, Tbody, Td, Tr, TableHeader } from '../shared/Table';
|
|
4
4
|
import { times } from '../../utils/array';
|
|
5
5
|
import { LunaticComponents } from '../LunaticComponents';
|
|
6
6
|
import { blockedInLoopComponents } from '../Loop/constant';
|
|
7
7
|
import { ComponentErrors, getComponentErrors, } from '../shared/ComponentErrors/ComponentErrors';
|
|
8
8
|
import { CustomLoop } from '../Loop/Loop';
|
|
9
|
-
|
|
10
|
-
const DEFAULT_MAX_ROWS = 12;
|
|
9
|
+
import { useLoopUtils } from '../Loop/utils';
|
|
11
10
|
/**
|
|
12
11
|
* Loop displayed as a table
|
|
13
12
|
*/
|
|
14
13
|
export const RosterForLoop = (props) => {
|
|
15
|
-
|
|
16
|
-
const {
|
|
14
|
+
const { min, max, nbRows, addRow, removeRow } = useLoopUtils(props);
|
|
15
|
+
const { errors,
|
|
17
16
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
18
|
-
declarations, header,
|
|
17
|
+
declarations, header, id, getComponents,
|
|
19
18
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
20
19
|
label, ...otherProps // These props will be passed down to the child components
|
|
21
20
|
} = props;
|
|
22
|
-
const min = (_a = lines === null || lines === void 0 ? void 0 : lines.min) !== null && _a !== void 0 ? _a : DEFAULT_MIN_ROWS;
|
|
23
|
-
const max = (_b = lines === null || lines === void 0 ? void 0 : lines.max) !== null && _b !== void 0 ? _b : DEFAULT_MAX_ROWS;
|
|
24
|
-
const [nbRows, setNbRows] = useState(Math.max(min, iterations));
|
|
25
|
-
const addRow = useCallback(() => {
|
|
26
|
-
if (nbRows < max) {
|
|
27
|
-
setNbRows(nbRows + 1);
|
|
28
|
-
}
|
|
29
|
-
}, [max, nbRows]);
|
|
30
|
-
const removeRow = useCallback(() => {
|
|
31
|
-
if (nbRows <= min) {
|
|
32
|
-
return;
|
|
33
|
-
}
|
|
34
|
-
const newNbRows = nbRows - 1;
|
|
35
|
-
setNbRows(newNbRows);
|
|
36
|
-
// Downsize all variables by 1
|
|
37
|
-
const newResponses = Object.entries(valueMap).map(([k, v]) => {
|
|
38
|
-
return {
|
|
39
|
-
name: k,
|
|
40
|
-
value: v === null || v === void 0 ? void 0 : v.filter((_, i) => i < newNbRows),
|
|
41
|
-
};
|
|
42
|
-
});
|
|
43
|
-
handleChanges(newResponses);
|
|
44
|
-
}, [nbRows, min, valueMap, handleChanges]);
|
|
45
21
|
if (nbRows === 0) {
|
|
46
22
|
return null;
|
|
47
23
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RosterForLoop.js","sourceRoot":"","sources":["../../../src/components/RosterForLoop/RosterForLoop.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"RosterForLoop.js","sourceRoot":"","sources":["../../../src/components/RosterForLoop/RosterForLoop.tsx"],"names":[],"mappings":"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"}
|
|
@@ -102,6 +102,7 @@ function computeIterations(component, executeExpression) {
|
|
|
102
102
|
* Errors are returned using a map of id suffixed with the iteration index (ex: {prenom-1: [], prenom-3: []})
|
|
103
103
|
*/
|
|
104
104
|
function checkComponentInLoop(state, component, errors) {
|
|
105
|
+
var _a;
|
|
105
106
|
// For Question, loop over children
|
|
106
107
|
if (component.componentType === 'Question') {
|
|
107
108
|
for (const child of component.components) {
|
|
@@ -126,6 +127,13 @@ function checkComponentInLoop(state, component, errors) {
|
|
|
126
127
|
if (!('controls' in component) || !component.controls) {
|
|
127
128
|
continue;
|
|
128
129
|
}
|
|
130
|
+
// For Roundabout, we don't check controls for iterations that are disabled
|
|
131
|
+
if (component.componentType === 'Roundabout' && component.item.disabled) {
|
|
132
|
+
const isIterationDisabled = state.executeExpression({ value: (_a = component.item.disabled) === null || _a === void 0 ? void 0 : _a.value, type: 'VTL' }, iterationPager);
|
|
133
|
+
if (isIterationDisabled) {
|
|
134
|
+
continue;
|
|
135
|
+
}
|
|
136
|
+
}
|
|
129
137
|
// The component is filtered on this iteration, skip it
|
|
130
138
|
if (
|
|
131
139
|
// conditionFilter can be the interpreted expression, or the object representing the expression
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile-controls.js","sourceRoot":"","sources":["../../../src/use-lunatic/commons/compile-controls.ts"],"names":[],"mappings":"AAMA,OAAO,EACN,wBAAwB,GAExB,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAoBrE;;GAEG;AACH,MAAM,eAAe,GAAG,CACvB,SAAqD,EACb,EAAE;IAC1C,OAAO,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;AACpE,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,qBAAqB,GAAG,CAC7B,SAAqD,EACP,EAAE;IAChD,OAAO,SAAS,CAAC,aAAa,KAAK,YAAY,CAAC;AACjD,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAC3B,SAAqD,EACpD,EAAE;IACH,OAAO,UAAU,KAAK,SAAS,CAAC,aAAa,CAAC;AAC/C,CAAC,CAAC;AAEF;;;GAGG;AACH,SAAS,eAAe,CACvB,KAAuB,EACvB,UAA0D,EAC1D,aAA8C;IAE9C,IAAI,MAAM,GAAG,aAAa,aAAb,aAAa,cAAb,aAAa,GAAK,EAAqC,CAAC;IAErE,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACpC,0CAA0C;QAC1C,IAAI,UAAU,IAAI,SAAS,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;YAClE,MAAM,eAAe,GAAG,aAAa,CACpC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,EAClD,KAAK,CAAC,iBAAiB,EACvB,KAAK,CAAC,KAAK,CACX,CAAC;YACF,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAChC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC;YACxC,CAAC;QACF,CAAC;QAED,kEAAkE;QAClE,IAAI,qBAAqB,CAAC,SAAS,CAAC;YACnC,MAAM,GAAG,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAEpD,+CAA+C;QAC/C,IAAI,eAAe,CAAC,SAAS,CAAC;YAC7B,MAAM,GAAG,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAE9C,mCAAmC;QACnC,IAAI,mBAAmB,CAAC,SAAS,CAAC;YACjC,MAAM,GAAG,eAAe,CAAC,KAAK,EAAE,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAChE,CAAC;IAED,OAAO,MAAM,CAAC;AACf,CAAC;AAED,SAAS,eAAe,CACvB,KAAuB,EACvB,SAAyC,EACzC,MAAsC;;IAEtC,MAAM,WAAW,GAAG,MAAA,SAAS,CAAC,QAAQ,0CAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC;IACxE,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,EAAE,CAAC;QACzB,MAAM,GAAG,oBAAoB,CAC5B,KAAK,EACL,EAAE,GAAG,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,EACvC,MAAM,CACN,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AACf,CAAC;AAED,SAAS,SAAS,CACjB,KAAuB,EACvB,SAAmC,EACnC,MAAsC;;IAEtC,MAAM,WAAW,GAAG,MAAA,SAAS,CAAC,QAAQ,0CAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC;IACxE,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,EAAE,CAAC;QACzB,MAAM,GAAG,oBAAoB,CAC5B,KAAK,EACL,EAAE,GAAG,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,EACvC,MAAM,CACN,CAAC;IACH,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,SAAS,CAAC,UAAU,EAAE,CAAC;QAC1C,MAAM,GAAG,oBAAoB,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IACrD,CAAC;IACD,OAAO,MAAM,CAAC;AACf,CAAC;AAED,SAAS,aAAa,CACrB,QAA0B,EAC1B,iBAA2D,EAC3D,KAAmC;IAEnC,OAAO,QAAQ;SACb,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QAChB,IAAI,OAAO,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;YACnC,OAAO,sBAAsB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;QAC3D,CAAC;QACD,OAAO,gBAAgB,CAAC,OAAO,EAAE,iBAAiB,EAAE,KAAK,CAAC,CAAC;IAC5D,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;AAC1C,CAAC;AAED;;GAEG;AACH,SAAS,iBAAiB,CACzB,SAAqD,EACrD,iBAA2D;IAE3D,IACC,YAAY,IAAI,SAAS;QACzB,SAAS,CAAC,UAAU;QACpB,OAAO,SAAS,CAAC,UAAU,KAAK,QAAQ;QACxC,OAAO,IAAI,SAAS,CAAC,UAAU,EAC9B,CAAC;QACF,OAAO,iBAAiB,CAAS,SAAS,CAAC,UAAU,CAAC,CAAC;IACxD,CAAC;IACD,IAAI,UAAU,IAAI,SAAS,EAAE,CAAC;QAC7B,MAAM,KAAK,GAAG,iBAAiB,CAAC;YAC/B,IAAI,EAAE,KAAK;YACX,KAAK,EAAE,SAAS,CAAC,QAAQ,CAAC,IAAI;SAC9B,CAAC,CAAC;QACH,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,KAAK,CAAC,MAAM,CAAC;QACrB,CAAC;IACF,CAAC;IACD,+CAA+C;IAC/C,IAAI,YAAY,IAAI,SAAS,EAAE,CAAC;QAC/B,OAAO,IAAI,CAAC,GAAG,CACd,GAAG,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACjC,iBAAiB,CAAC,CAAC,EAAE,iBAAiB,CAAC,CACvC,CACD,CAAC;IACH,CAAC;IACD,OAAO,CAAC,CAAC;AACV,CAAC;AAED;;;GAGG;AACH,SAAS,oBAAoB,CAC5B,KAAuB,EACvB,SAGiC,EACjC,MAAsC
|
|
1
|
+
{"version":3,"file":"compile-controls.js","sourceRoot":"","sources":["../../../src/use-lunatic/commons/compile-controls.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ export function getIterationsProp(definition, state) {
|
|
|
12
12
|
}
|
|
13
13
|
// Iterations expression is not present on the component definition
|
|
14
14
|
// infer it from the value of child components
|
|
15
|
-
return definition.
|
|
15
|
+
return getFlatComponentsInLoop(definition).reduce((acc, component) => {
|
|
16
16
|
if (!hasResponse(component)) {
|
|
17
17
|
return acc;
|
|
18
18
|
}
|
|
@@ -23,4 +23,15 @@ export function getIterationsProp(definition, state) {
|
|
|
23
23
|
return acc;
|
|
24
24
|
}, 0);
|
|
25
25
|
}
|
|
26
|
+
function getFlatComponentsInLoop(definition) {
|
|
27
|
+
if (definition.componentType !== 'RosterForLoop' &&
|
|
28
|
+
definition.componentType !== 'Loop') {
|
|
29
|
+
return [definition];
|
|
30
|
+
}
|
|
31
|
+
return definition.components.reduce((acc, component) => {
|
|
32
|
+
if (component.componentType === 'Question')
|
|
33
|
+
return [...acc, ...component.components];
|
|
34
|
+
return [...acc, component];
|
|
35
|
+
}, []);
|
|
36
|
+
}
|
|
26
37
|
//# sourceMappingURL=propIterations.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"propIterations.js","sourceRoot":"","sources":["../../../src/use-lunatic/props/propIterations.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGnD,MAAM,UAAU,iBAAiB,CAChC,UAAsC,EACtC,KAIC;IAED,IAAI,YAAY,IAAI,UAAU,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC;QACzD,OAAO,QAAQ,CACd,KAAK,CAAC,iBAAiB,CAAC,UAAU,CAAC,UAAU,EAAE;YAC9C,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS;SAChC,CAAC,CACF,CAAC;IACH,CAAC;IAED,IACC,UAAU,CAAC,aAAa,KAAK,eAAe;QAC5C,UAAU,CAAC,aAAa,KAAK,MAAM,EAClC,CAAC;QACF,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,mEAAmE;IACnE,8CAA8C;
|
|
1
|
+
{"version":3,"file":"propIterations.js","sourceRoot":"","sources":["../../../src/use-lunatic/props/propIterations.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGnD,MAAM,UAAU,iBAAiB,CAChC,UAAsC,EACtC,KAIC;IAED,IAAI,YAAY,IAAI,UAAU,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC;QACzD,OAAO,QAAQ,CACd,KAAK,CAAC,iBAAiB,CAAC,UAAU,CAAC,UAAU,EAAE;YAC9C,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS;SAChC,CAAC,CACF,CAAC;IACH,CAAC;IAED,IACC,UAAU,CAAC,aAAa,KAAK,eAAe;QAC5C,UAAU,CAAC,aAAa,KAAK,MAAM,EAClC,CAAC;QACF,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,mEAAmE;IACnE,8CAA8C;IAE9C,OAAO,uBAAuB,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE;QACpE,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,OAAO,GAAG,CAAC;QACZ,CAAC;QACD,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,GAAG,CAChC,SAAS,CAAC,QAAQ,CAAC,IAAI,EACvB,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CACrE,CAAC;QACF,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;YAChD,OAAO,KAAK,CAAC,MAAM,CAAC;QACrB,CAAC;QACD,OAAO,GAAG,CAAC;IACZ,CAAC,EAAE,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,uBAAuB,CAC/B,UAAsC;IAEtC,IACC,UAAU,CAAC,aAAa,KAAK,eAAe;QAC5C,UAAU,CAAC,aAAa,KAAK,MAAM,EAClC,CAAC;QACF,OAAO,CAAC,UAAU,CAAC,CAAC;IACrB,CAAC;IAED,OAAO,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE;QACtD,IAAI,SAAS,CAAC,aAAa,KAAK,UAAU;YACzC,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;QAC1C,OAAO,CAAC,GAAG,GAAG,EAAE,SAAS,CAAC,CAAC;IAC5B,CAAC,EAAE,EAAkC,CAAC,CAAC;AACxC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check-base-control.js","sourceRoot":"","sources":["../../../../src/use-lunatic/reducer/controls/check-base-control.ts"],"names":[],"mappings":"AAOA,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,aAAf,eAAe,cAAf,eAAe,GAAI,SAAS;KACvC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"check-base-control.js","sourceRoot":"","sources":["../../../../src/use-lunatic/reducer/controls/check-base-control.ts"],"names":[],"mappings":"AAOA,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,aAAf,eAAe,cAAf,eAAe,GAAI,SAAS;KACvC,CAAC,CAAC;IACH,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,WAAM,CAAC;QACR,OAAO,CAAC,IAAI,CAAC,+BAA+B,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;QAC7D,OAAO,SAAS,CAAC;IAClB,CAAC;AACF,CAAC"}
|