@inseefr/lunatic 3.4.19 → 3.4.20
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/components/Duration/Duration.js +3 -2
- package/components/Duration/Duration.js.map +1 -1
- package/esm/components/Duration/Duration.js +3 -2
- package/esm/components/Duration/Duration.js.map +1 -1
- package/esm/use-lunatic/hooks/use-page-has-response.js +2 -1
- package/esm/use-lunatic/hooks/use-page-has-response.js.map +1 -1
- package/esm/use-lunatic/props/propValue.js +1 -1
- package/esm/use-lunatic/props/propValue.js.map +1 -1
- package/package.json +2 -1
- package/src/components/Duration/Duration.test.tsx +52 -0
- package/src/components/Duration/Duration.tsx +17 -4
- package/src/use-lunatic/hooks/use-page-has-response.ts +1 -0
- package/src/use-lunatic/props/propValue.ts +1 -1
- package/tsconfig.build.tsbuildinfo +1 -1
- package/use-lunatic/hooks/use-page-has-response.js +2 -1
- package/use-lunatic/hooks/use-page-has-response.js.map +1 -1
- package/use-lunatic/props/propValue.js +1 -1
- package/use-lunatic/props/propValue.js.map +1 -1
|
@@ -15,11 +15,12 @@ const object_1 = require("../../utils/object");
|
|
|
15
15
|
const slottableComponent_1 = require("../shared/HOC/slottableComponent");
|
|
16
16
|
const ComponentErrors_1 = require("../shared/ComponentErrors/ComponentErrors");
|
|
17
17
|
const Declarations_1 = require("../shared/Declarations/Declarations");
|
|
18
|
+
const Fieldset_1 = require("../shared/Fieldset/Fieldset");
|
|
18
19
|
function Duration({ handleChanges, response, errors, ...props }) {
|
|
19
20
|
return ((0, jsx_runtime_1.jsx)(exports.CustomDuration, { ...props, onChange: (value) => handleChanges([{ name: response.name, value }]), errors: (0, ComponentErrors_1.getComponentErrors)(errors, props.id) }));
|
|
20
21
|
}
|
|
21
22
|
exports.CustomDuration = (0, slottableComponent_1.slottableComponent)('Duration', (props) => {
|
|
22
|
-
const { errors, value, label, format, onChange, declarations, id } = props;
|
|
23
|
+
const { errors, value, label, format, onChange, declarations, id, description, } = props;
|
|
23
24
|
// We need to keep an internal state since one field can be empty (null value in duration)
|
|
24
25
|
// but we still send "0" and we don't want the field to display "0"
|
|
25
26
|
const [duration, setDuration] = (0, react_1.useState)((0, getDurationFromValue_1.getDurationFromValue)(value, format));
|
|
@@ -33,6 +34,6 @@ exports.CustomDuration = (0, slottableComponent_1.slottableComponent)('Duration'
|
|
|
33
34
|
onChange((0, formatDuration_1.formatDuration)(newDuration));
|
|
34
35
|
setDuration(newDuration);
|
|
35
36
|
};
|
|
36
|
-
return ((0, jsx_runtime_1.jsxs)(
|
|
37
|
+
return ((0, jsx_runtime_1.jsxs)(Fieldset_1.Fieldset, { className: (0, classnames_1.default)('lunatic-input'), legend: label, description: description, children: [(0, jsx_runtime_1.jsx)(Declarations_1.Declarations, { type: "AFTER_QUESTION_TEXT", declarations: declarations, id: id }), (0, jsx_runtime_1.jsx)("div", { className: "duration-fields", children: (0, object_1.objectKeys)(duration).map((unit) => ((0, jsx_runtime_1.jsxs)("div", { className: "duration-field", children: [(0, jsx_runtime_1.jsx)("label", { htmlFor: `${unit}Input`, className: "input-label", children: durationUtils_1.labelByUnit[unit] }), (0, jsx_runtime_1.jsx)("input", { id: `${unit}Input`, type: "number", value: duration[unit] ?? '', className: "input-field", onChange: changeHandler(unit), ...durationUtils_1.propsByUnit[unit] })] }, unit))) }), (0, jsx_runtime_1.jsx)(ComponentErrors_1.ComponentErrors, { errors: errors })] }));
|
|
37
38
|
});
|
|
38
39
|
//# sourceMappingURL=Duration.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Duration.js","sourceRoot":"","sources":["../../src/components/Duration/Duration.tsx"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"Duration.js","sourceRoot":"","sources":["../../src/components/Duration/Duration.tsx"],"names":[],"mappings":";;;;;;AAgBA,4BAaC;;AA5BD,iCAAiC;AACjC,iEAA8D;AAC9D,mDAA0E;AAC1E,qDAAkD;AAClD,4DAAoC;AACpC,+CAAgD;AAChD,yEAAsE;AAEtE,+EAGmD;AACnD,sEAAmE;AACnE,0DAAuD;AAEvD,SAAgB,QAAQ,CAAC,EACxB,aAAa,EACb,QAAQ,EACR,MAAM,EACN,GAAG,KAAK,EAC2B;IACnC,OAAO,CACN,uBAAC,sBAAc,OACV,KAAK,EACT,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,EACpE,MAAM,EAAE,IAAA,oCAAkB,EAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,GAC3C,CACF,CAAC;AACH,CAAC;AAUY,QAAA,cAAc,GAAG,IAAA,uCAAkB,EAC/C,UAAU,EACV,CAAC,KAAK,EAAE,EAAE;IACT,MAAM,EACL,MAAM,EACN,KAAK,EACL,KAAK,EACL,MAAM,EACN,QAAQ,EACR,YAAY,EACZ,EAAE,EACF,WAAW,GACX,GAAG,KAAK,CAAC;IACV,0FAA0F;IAC1F,mEAAmE;IACnE,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,EACvC,IAAA,2CAAoB,EAAC,KAAK,EAAE,MAAM,CAAC,CACnC,CAAC;IAEF,8DAA8D;IAC9D,MAAM,aAAa,GAClB,CAAC,IAA8C,EAAE,EAAE,CACnD,CAAC,CAGA,EAAE,EAAE;QACJ,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,CAAC;YAC/B,OAAO;QACR,CAAC;QACD,MAAM,UAAU,GAAG,IAAA,6BAAa,EAC/B,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,EACpE,IAAI,CACJ,CAAC;QACF,MAAM,WAAW,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC;QACxD,QAAQ,CAAC,IAAA,+BAAc,EAAC,WAAW,CAAC,CAAC,CAAC;QACtC,WAAW,CAAC,WAAW,CAAC,CAAC;IAC1B,CAAC,CAAC;IAEH,OAAO,CACN,wBAAC,mBAAQ,IACR,SAAS,EAAE,IAAA,oBAAU,EAAC,eAAe,CAAC,EACtC,MAAM,EAAE,KAAK,EACb,WAAW,EAAE,WAAW,aAExB,uBAAC,2BAAY,IACZ,IAAI,EAAC,qBAAqB,EAC1B,YAAY,EAAE,YAAY,EAC1B,EAAE,EAAE,EAAE,GACL,EACF,gCAAK,SAAS,EAAC,iBAAiB,YAC9B,IAAA,mBAAU,EAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CACnC,iCAAK,SAAS,EAAC,gBAAgB,aAC9B,kCAAO,OAAO,EAAE,GAAG,IAAI,OAAO,EAAE,SAAS,EAAC,aAAa,YACrD,2BAAW,CAAC,IAAI,CAAC,GACX,EACR,kCACC,EAAE,EAAE,GAAG,IAAI,OAAO,EAClB,IAAI,EAAC,QAAQ,EACb,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,EAC3B,SAAS,EAAC,aAAa,EACvB,QAAQ,EAAE,aAAa,CAAC,IAAI,CAAC,KACzB,2BAAW,CAAC,IAAI,CAAC,GACpB,KAXkC,IAAI,CAYnC,CACN,CAAC,GACG,EACN,uBAAC,iCAAe,IAAC,MAAM,EAAE,MAAM,GAAI,IACzB,CACX,CAAC;AACH,CAAC,CACD,CAAC"}
|
|
@@ -8,11 +8,12 @@ import { objectKeys } from '../../utils/object';
|
|
|
8
8
|
import { slottableComponent } from '../shared/HOC/slottableComponent';
|
|
9
9
|
import { ComponentErrors, getComponentErrors, } from '../shared/ComponentErrors/ComponentErrors';
|
|
10
10
|
import { Declarations } from '../shared/Declarations/Declarations';
|
|
11
|
+
import { Fieldset } from '../shared/Fieldset/Fieldset';
|
|
11
12
|
export function Duration({ handleChanges, response, errors, ...props }) {
|
|
12
13
|
return (_jsx(CustomDuration, { ...props, onChange: (value) => handleChanges([{ name: response.name, value }]), errors: getComponentErrors(errors, props.id) }));
|
|
13
14
|
}
|
|
14
15
|
export const CustomDuration = slottableComponent('Duration', (props) => {
|
|
15
|
-
const { errors, value, label, format, onChange, declarations, id } = props;
|
|
16
|
+
const { errors, value, label, format, onChange, declarations, id, description, } = props;
|
|
16
17
|
// We need to keep an internal state since one field can be empty (null value in duration)
|
|
17
18
|
// but we still send "0" and we don't want the field to display "0"
|
|
18
19
|
const [duration, setDuration] = useState(getDurationFromValue(value, format));
|
|
@@ -26,7 +27,7 @@ export const CustomDuration = slottableComponent('Duration', (props) => {
|
|
|
26
27
|
onChange(formatDuration(newDuration));
|
|
27
28
|
setDuration(newDuration);
|
|
28
29
|
};
|
|
29
|
-
return (_jsxs(
|
|
30
|
+
return (_jsxs(Fieldset, { className: classnames('lunatic-input'), legend: label, description: description, children: [_jsx(Declarations, { type: "AFTER_QUESTION_TEXT", declarations: declarations, id: id }), _jsx("div", { className: "duration-fields", children: objectKeys(duration).map((unit) => {
|
|
30
31
|
var _a;
|
|
31
32
|
return (_jsxs("div", { className: "duration-field", children: [_jsx("label", { htmlFor: `${unit}Input`, className: "input-label", children: labelByUnit[unit] }), _jsx("input", { id: `${unit}Input`, type: "number", value: (_a = duration[unit]) !== null && _a !== void 0 ? _a : '', className: "input-field", onChange: changeHandler(unit), ...propsByUnit[unit] })] }, unit));
|
|
32
33
|
}) }), _jsx(ComponentErrors, { errors: errors })] }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Duration.js","sourceRoot":"","sources":["../../../src/components/Duration/Duration.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAEtE,OAAO,EACN,eAAe,EACf,kBAAkB,GAClB,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"Duration.js","sourceRoot":"","sources":["../../../src/components/Duration/Duration.tsx"],"names":[],"mappings":"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"}
|
|
@@ -50,7 +50,8 @@ function hasOneResponse(components, executeExpression) {
|
|
|
50
50
|
return true;
|
|
51
51
|
}
|
|
52
52
|
// For rosterForLoop we need to inspect child components
|
|
53
|
-
if ('
|
|
53
|
+
if (component.componentType === 'RosterForLoop' &&
|
|
54
|
+
'components' in component &&
|
|
54
55
|
Array.isArray(component.components) &&
|
|
55
56
|
!isSubComponentsEmpty(component.components, executeExpression)) {
|
|
56
57
|
return true;
|
|
@@ -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,OAAO,cAAc,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;IACtD,CAAC,EAAE,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC,CAAC;AACrC,CAAC;AAED,SAAS,cAAc,CACtB,UAAmC,EACnC,iBAA2D;;IAE3D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3D,OAAO,IAAI,CAAC;IACb,CAAC;IAED,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACpC,wDAAwD;QACxD,+DAA+D;QAC/D,IACC,CAAC,eAAe,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC,QAAQ,CAClE,MAAA,SAAS,CAAC,aAAa,mCAAI,EAAE,CAC7B,EACA,CAAC;YACF,OAAO,IAAI,CAAC;QACb,CAAC;QAED,gDAAgD;QAChD,IACC,iBAAiB,IAAI,SAAS;YAC9B,SAAS,CAAC,eAAe;YACzB,SAAS,CAAC,eAAe,CAAC,KAAK,EAC9B,CAAC;YACF,OAAO,IAAI,CAAC;QACb,CAAC;QAED,mDAAmD;QACnD,IAAI,gBAAgB,IAAI,SAAS,IAAI,SAAS,CAAC,cAAc,EAAE,CAAC;YAC/D,OAAO,IAAI,CAAC;QACb,CAAC;QAED,iGAAiG;QACjG,IAAI,SAAS,CAAC,aAAa,KAAK,OAAO,EAAE,CAAC;YACzC,iGAAiG;YACjG,MAAM,iBAAiB,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE;gBAC1D,MAAM,eAAe,GAAG,GAAG,CAAC,MAAM,CACjC,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,eAAe,IAAI,IAAI,CACnD,CAAC;gBACF,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,eAAe,CAAC,CAAC;YACnC,CAAC,EAAE,EAA6B,CAAC,CAAC;YAClC,OAAO,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,CAAC;QACpE,CAAC;QAED,+DAA+D;QAC/D,IAAI,OAAO,IAAI,SAAS,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YACvD,OAAO,IAAI,CAAC;QACb,CAAC;QAED,+CAA+C;QAC/C,IACC,SAAS,CAAC,aAAa,KAAK,UAAU;YACtC,YAAY,IAAI,SAAS;YACzB,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC;YACnC,cAAc,CAAC,SAAS,CAAC,UAAU,EAAE,iBAAiB,CAAC,EACtD,CAAC;YACF,OAAO,IAAI,CAAC;QACb,CAAC;QAED,wDAAwD;QACxD,IACC,YAAY,IAAI,SAAS;YACzB,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC;YACnC,CAAC,oBAAoB,CAAC,SAAS,CAAC,UAAU,EAAE,iBAAiB,CAAC,EAC7D,CAAC;YACF,OAAO,IAAI,CAAC;QACb,CAAC;IACF,CAAC;IAED,OAAO,KAAK,CAAC;AACd,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,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,CAAC,KAAK,EAAE,IAAI,KAAK,KAAK,KAAK,CAAC;AAChD,CAAC;AAED;;GAEG;AACH,SAAS,oBAAoB,CAC5B,UAAkE,EAClE,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,IACC,CAAC,OAAO,CACP,iBAAiB,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAA,QAAQ,CAAC,QAAQ,0CAAE,IAAI,EAAE,CAAC,CAClE,EACA,CAAC;oBACF,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,OAAO,SAAS,CAAC,QAAQ,CAAC,IAAI,KAAK,QAAQ;YAC3C,CAAC,OAAO,CACP,iBAAiB,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAClE,EACA,CAAC;YACF,OAAO,KAAK,CAAC;QACd,CAAC;IACF,CAAC;IAED,OAAO,IAAI,CAAC;AACb,CAAC"}
|
|
1
|
+
{"version":3,"file":"use-page-has-response.js","sourceRoot":"","sources":["../../../src/use-lunatic/hooks/use-page-has-response.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@ export function getValueProp(component, args) {
|
|
|
18
18
|
return args.variables.get(component.response.name, iteration);
|
|
19
19
|
}
|
|
20
20
|
// For loop, value will be a map of child component values
|
|
21
|
-
if ('
|
|
21
|
+
if (component.componentType === 'Loop') {
|
|
22
22
|
return getChildResponseValues(component.components, args.variables);
|
|
23
23
|
}
|
|
24
24
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"propValue.js","sourceRoot":"","sources":["../../../src/use-lunatic/props/propValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAIjE,MAAM,UAAU,YAAY,CAC3B,SAAqC,EACrC,IAGC;;IAED,IAAI,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;QAC7C,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;QACxB,CAAC,CAAC,SAAS,CAAC;IACb,IAAI,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC;QAChC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC;IACxC,CAAC;IACD,IAAI,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC;QAC7B,OAAO,MAAM,CAAC,WAAW,CACxB,MAAA,MAAA,SAAS,CAAC,SAAS,0CAAE,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;YAC1C,QAAQ,CAAC,IAAI;YACb,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;SAC5C,CAAC,mCAAI,EAAE,CACR,CAAC;IACH,CAAC;IACD,IAAI,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC/D,CAAC;IACD,0DAA0D;IAC1D,IAAI,
|
|
1
|
+
{"version":3,"file":"propValue.js","sourceRoot":"","sources":["../../../src/use-lunatic/props/propValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAIjE,MAAM,UAAU,YAAY,CAC3B,SAAqC,EACrC,IAGC;;IAED,IAAI,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;QAC7C,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;QACxB,CAAC,CAAC,SAAS,CAAC;IACb,IAAI,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC;QAChC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC;IACxC,CAAC;IACD,IAAI,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC;QAC7B,OAAO,MAAM,CAAC,WAAW,CACxB,MAAA,MAAA,SAAS,CAAC,SAAS,0CAAE,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;YAC1C,QAAQ,CAAC,IAAI;YACb,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;SAC5C,CAAC,mCAAI,EAAE,CACR,CAAC;IACH,CAAC;IACD,IAAI,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC/D,CAAC;IACD,0DAA0D;IAC1D,IAAI,SAAS,CAAC,aAAa,KAAK,MAAM,EAAE,CAAC;QACxC,OAAO,sBAAsB,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACrE,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC;AAED;;GAEG;AACH,SAAS,sBAAsB,CAC9B,UAAwC,EACxC,SAAgC;IAEhC,OAAO,MAAM,CAAC,WAAW,CACxB,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACxB,IAAI,UAAU,IAAI,CAAC,EAAE,CAAC;YACrB,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC5D,CAAC;QACD,IAAI,YAAY,IAAI,CAAC,EAAE,CAAC;YACvB,OAAO,MAAM,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC;QACxE,CAAC;QACD,OAAO,EAAE,CAAC;IACX,CAAC,CAAC,CACF,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@inseefr/lunatic",
|
|
3
|
-
"version": "3.4.
|
|
3
|
+
"version": "3.4.20",
|
|
4
4
|
"description": "Library of questionnaire components",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -51,6 +51,7 @@
|
|
|
51
51
|
"src/components/Dropdown/__snapshots__/Dropdown.spec.tsx.snap",
|
|
52
52
|
"src/components/Dropdown/renderer/SimpleLabelRenderer.tsx",
|
|
53
53
|
"src/components/Dropdown/renderer/SimpleOptionRenderer.tsx",
|
|
54
|
+
"src/components/Duration/Duration.test.tsx",
|
|
54
55
|
"src/components/Duration/Duration.tsx",
|
|
55
56
|
"src/components/Duration/durationUtils.ts",
|
|
56
57
|
"src/components/Duration/formatDuration.spec.ts",
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import { afterEach, describe, expect, it, vi } from 'vitest';
|
|
2
|
+
import { Duration } from './Duration';
|
|
3
|
+
import { render } from '@testing-library/react';
|
|
4
|
+
import { Formats } from './durationUtils';
|
|
5
|
+
|
|
6
|
+
describe('Duration', () => {
|
|
7
|
+
const mockOnChange = vi.fn();
|
|
8
|
+
|
|
9
|
+
const baseDeclarations = [
|
|
10
|
+
{
|
|
11
|
+
id: '1',
|
|
12
|
+
label: 'Declaration 1',
|
|
13
|
+
declarationType: 'COMMENT' as const,
|
|
14
|
+
position: 'AFTER_QUESTION_TEXT',
|
|
15
|
+
},
|
|
16
|
+
{
|
|
17
|
+
id: '2',
|
|
18
|
+
label: 'Declaration 2',
|
|
19
|
+
declarationType: 'COMMENT' as const,
|
|
20
|
+
position: 'AFTER_QUESTION_TEXT',
|
|
21
|
+
},
|
|
22
|
+
];
|
|
23
|
+
|
|
24
|
+
const baseProps = {
|
|
25
|
+
handleChanges: mockOnChange,
|
|
26
|
+
response: { name: 'demo' },
|
|
27
|
+
format: 'PTnHnM' as Formats,
|
|
28
|
+
value: 'PT5H1M',
|
|
29
|
+
id: 'duration',
|
|
30
|
+
label: 'label',
|
|
31
|
+
description: 'description',
|
|
32
|
+
declarations: baseDeclarations,
|
|
33
|
+
};
|
|
34
|
+
|
|
35
|
+
afterEach(() => {
|
|
36
|
+
vi.clearAllMocks();
|
|
37
|
+
});
|
|
38
|
+
|
|
39
|
+
it('renders label, declarations and description', () => {
|
|
40
|
+
const { getByText } = render(<Duration {...baseProps} />);
|
|
41
|
+
|
|
42
|
+
// label is displayed
|
|
43
|
+
expect(getByText(baseProps.label)).toBeInTheDocument();
|
|
44
|
+
|
|
45
|
+
// all declarations are displayed
|
|
46
|
+
expect(getByText('Declaration 1')).toBeInTheDocument();
|
|
47
|
+
expect(getByText('Declaration 2')).toBeInTheDocument();
|
|
48
|
+
|
|
49
|
+
// description is displayed
|
|
50
|
+
expect(getByText(baseProps.description)).toBeInTheDocument();
|
|
51
|
+
});
|
|
52
|
+
});
|
|
@@ -12,6 +12,7 @@ import {
|
|
|
12
12
|
getComponentErrors,
|
|
13
13
|
} from '../shared/ComponentErrors/ComponentErrors';
|
|
14
14
|
import { Declarations } from '../shared/Declarations/Declarations';
|
|
15
|
+
import { Fieldset } from '../shared/Fieldset/Fieldset';
|
|
15
16
|
|
|
16
17
|
export function Duration({
|
|
17
18
|
handleChanges,
|
|
@@ -39,7 +40,16 @@ type CustomProps = Omit<
|
|
|
39
40
|
export const CustomDuration = slottableComponent<CustomProps>(
|
|
40
41
|
'Duration',
|
|
41
42
|
(props) => {
|
|
42
|
-
const {
|
|
43
|
+
const {
|
|
44
|
+
errors,
|
|
45
|
+
value,
|
|
46
|
+
label,
|
|
47
|
+
format,
|
|
48
|
+
onChange,
|
|
49
|
+
declarations,
|
|
50
|
+
id,
|
|
51
|
+
description,
|
|
52
|
+
} = props;
|
|
43
53
|
// We need to keep an internal state since one field can be empty (null value in duration)
|
|
44
54
|
// but we still send "0" and we don't want the field to display "0"
|
|
45
55
|
const [duration, setDuration] = useState(
|
|
@@ -66,8 +76,11 @@ export const CustomDuration = slottableComponent<CustomProps>(
|
|
|
66
76
|
};
|
|
67
77
|
|
|
68
78
|
return (
|
|
69
|
-
<
|
|
70
|
-
{
|
|
79
|
+
<Fieldset
|
|
80
|
+
className={classnames('lunatic-input')}
|
|
81
|
+
legend={label}
|
|
82
|
+
description={description}
|
|
83
|
+
>
|
|
71
84
|
<Declarations
|
|
72
85
|
type="AFTER_QUESTION_TEXT"
|
|
73
86
|
declarations={declarations}
|
|
@@ -91,7 +104,7 @@ export const CustomDuration = slottableComponent<CustomProps>(
|
|
|
91
104
|
))}
|
|
92
105
|
</div>
|
|
93
106
|
<ComponentErrors errors={errors} />
|
|
94
|
-
</
|
|
107
|
+
</Fieldset>
|
|
95
108
|
);
|
|
96
109
|
}
|
|
97
110
|
);
|
|
@@ -77,6 +77,7 @@ function hasOneResponse(
|
|
|
77
77
|
|
|
78
78
|
// For rosterForLoop we need to inspect child components
|
|
79
79
|
if (
|
|
80
|
+
component.componentType === 'RosterForLoop' &&
|
|
80
81
|
'components' in component &&
|
|
81
82
|
Array.isArray(component.components) &&
|
|
82
83
|
!isSubComponentsEmpty(component.components, executeExpression)
|
|
@@ -28,7 +28,7 @@ export function getValueProp(
|
|
|
28
28
|
return args.variables.get(component.response.name, iteration);
|
|
29
29
|
}
|
|
30
30
|
// For loop, value will be a map of child component values
|
|
31
|
-
if ('
|
|
31
|
+
if (component.componentType === 'Loop') {
|
|
32
32
|
return getChildResponseValues(component.components, args.variables);
|
|
33
33
|
}
|
|
34
34
|
return null;
|