@inseefr/lunatic 0.4.7-v2 → 0.4.10-v2

package/lib/components/input/input.js

@@ -20,7 +20,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function checkValue(value) {
-  return value || '';
+  return value !== null && value !== void 0 ? value : '';
 }
 
 function Input(_ref) {

package/lib/components/input-number/input-number.js

@@ -33,7 +33,7 @@ function InputNumber(_ref) {
   var valueEffective = value !== null && value !== void 0 ? value : '';
   var handleChange = (0, _react.useCallback)(function (e) {
     var val = e.target.valueAsNumber;
-    onChange(isNaN(val) ? null : val);
+    onChange(val);
   }, [onChange]);
   return /*#__PURE__*/_react["default"].createElement("input", {
     className: (0, _classnames["default"])('lunatic-input', {

package/lib/components/loop/block-for-loop/block-for-loop.js

@@ -19,6 +19,8 @@ var _handleRowButton = _interopRequireDefault(require("../commons/handle-row-but
 
 var _i18n = _interopRequireDefault(require("../../../i18n"));
 
+var _getInitLength = _interopRequireDefault(require("../commons/get-init-length"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -70,39 +72,15 @@ function BlockForLoop(_ref) {
       paginatedLoop = _ref.paginatedLoop,
       errors = _ref.errors;
 
-  var _useState = (0, _react.useState)(-1),
+  var _useState = (0, _react.useState)(function () {
+    return Number.parseInt(iterations) ? iterations : (0, _getInitLength["default"])(valueMap);
+  }),
       _useState2 = _slicedToArray(_useState, 2),
       nbRows = _useState2[0],
       setNbRows = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(undefined),
-      _useState4 = _slicedToArray(_useState3, 2),
-      min = _useState4[0],
-      setMin = _useState4[1];
-
-  var _useState5 = (0, _react.useState)(undefined),
-      _useState6 = _slicedToArray(_useState5, 2),
-      max = _useState6[0],
-      setMax = _useState6[1];
-
-  (0, _react.useEffect)(function () {
-    if (lines) {
-      var _min = lines.min,
-          _max = lines.max;
-
-      if (_min !== undefined && _max !== undefined) {
-        setMin(_min);
-        setMax(_max);
-      }
-    }
-  }, [lines]);
-  (0, _react.useEffect)(function () {
-    if (Number.parseInt(iterations)) {
-      setNbRows(iterations);
-    } else if (min && max) {
-      setNbRows(min);
-    }
-  }, [min, max, iterations]);
+  var min = lines === null || lines === void 0 ? void 0 : lines.min;
+  var max = lines === null || lines === void 0 ? void 0 : lines.max;
   var addRow = (0, _react.useCallback)(function () {
     if (nbRows < max) {
       setNbRows(nbRows + 1);

package/lib/components/loop/commons/get-init-length.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+function getInitLength(value) {
+  return Object.values(value).reduce(function (length, variable) {
+    if (Array.isArray(variable)) {
+      return Math.max(length, variable.length);
+    }
+
+    return length;
+  }, 1);
+}
+
+var _default = getInitLength;
+exports["default"] = _default;

package/lib/components/loop/commons/index.js

@@ -9,7 +9,15 @@ Object.defineProperty(exports, "RowComponent", {
     return _rowComponent["default"];
   }
 });
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function get() {
+    return _getInitLength["default"];
+  }
+});
 
 var _rowComponent = _interopRequireDefault(require("./row-component"));
 
+var _getInitLength = _interopRequireDefault(require("./get-init-length"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }

package/lib/components/loop/roster-for-loop/roster-for-loop.js

@@ -19,6 +19,8 @@ var _handleRowButton = _interopRequireDefault(require("../commons/handle-row-but
 
 var _i18n = _interopRequireDefault(require("../../../i18n"));
 
+var _getInitLength = _interopRequireDefault(require("../commons/get-init-length"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -45,19 +47,9 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var DEFAULT_MIN_ROWS = 0;
+var DEFAULT_MIN_ROWS = 1;
 var DEFAULT_MAX_ROWS = 12;
 
-function getTableLength(value) {
-  return Object.values(value).reduce(function (length, variable) {
-    if (Array.isArray(variable)) {
-      return Math.max(length, variable.length);
-    }
-
-    return length;
-  }, 1);
-}
-
 function RosterforLoop(_ref) {
   var valueMap = _ref.valueMap,
       lines = _ref.lines,
@@ -76,22 +68,13 @@ function RosterforLoop(_ref) {
   var min = (lines === null || lines === void 0 ? void 0 : lines.min) || DEFAULT_MIN_ROWS;
   var max = (lines === null || lines === void 0 ? void 0 : lines.max) || DEFAULT_MAX_ROWS;
 
-  var _useState = (0, _react.useState)(false),
+  var _useState = (0, _react.useState)(function () {
+    return (0, _getInitLength["default"])(valueMap);
+  }),
       _useState2 = _slicedToArray(_useState, 2),
-      init = _useState2[0],
-      setInit = _useState2[1];
-
-  var _useState3 = (0, _react.useState)(-1),
-      _useState4 = _slicedToArray(_useState3, 2),
-      nbRows = _useState4[0],
-      setNbRows = _useState4[1];
-
-  (0, _react.useEffect)(function () {
-    if (!init && valueMap) {
-      setNbRows(getTableLength(valueMap));
-      setInit(true);
-    }
-  }, [init, valueMap]);
+      nbRows = _useState2[0],
+      setNbRows = _useState2[1];
+
   var addRow = (0, _react.useCallback)(function () {
     if (nbRows < max) {
       setNbRows(nbRows + 1);

package/lib/components/modal-controls/close-or-skip.js

@@ -17,13 +17,10 @@ function CloseOrSkip(_ref) {
       onSkip = _ref.onSkip;
   var flattenErrors = Object.values(errors).flat();
   var bloc = flattenErrors.reduce(function (status, _ref2) {
-    var criticality = _ref2.criticality;
-    return status || criticality === 'WARN';
+    var criticality = _ref2.criticality,
+        typeOfControl = _ref2.typeOfControl;
+    return status || typeOfControl === 'FORMAT' && criticality === 'ERROR';
   }, false);
-  var onlyCorrect = flattenErrors.map(function (_ref3) {
-    var blocking = _ref3.blocking;
-    return blocking;
-  }).includes(true);
 
   if (bloc) {
     return /*#__PURE__*/_react["default"].createElement("div", {
@@ -31,16 +28,18 @@ function CloseOrSkip(_ref) {
     }, /*#__PURE__*/_react["default"].createElement(_button["default"], {
       className: "modal-button",
       onClick: onClose
-    }, "Correct"), !onlyCorrect && /*#__PURE__*/_react["default"].createElement(_button["default"], {
-      className: "modal-button",
-      onClick: onSkip
-    }, "Ignore"));
+    }, "Correct"));
   }
 
-  return /*#__PURE__*/_react["default"].createElement(_button["default"], {
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: "modal-buttons"
+  }, /*#__PURE__*/_react["default"].createElement(_button["default"], {
+    className: "modal-button",
+    onClick: onClose
+  }, "Correct"), /*#__PURE__*/_react["default"].createElement(_button["default"], {
     className: "modal-button",
     onClick: onSkip
-  }, "Next");
+  }, "Ignore"));
 }
 
 var _default = CloseOrSkip;

package/lib/stories/questionnaires-test/boucles-n.json

@@ -0,0 +1,334 @@
+{
+	"variables": [
+		{
+			"variableType": "COLLECTED",
+			"values": {
+				"COLLECTED": null,
+				"EDITED": null,
+				"INPUTED": null,
+				"FORCED": null,
+				"PREVIOUS": null
+			},
+			"name": "Q11_1_1"
+		},
+		{
+			"variableType": "COLLECTED",
+			"values": {
+				"COLLECTED": null,
+				"EDITED": null,
+				"INPUTED": null,
+				"FORCED": null,
+				"PREVIOUS": null
+			},
+			"name": "Q11_2_1"
+		},
+		{
+			"variableType": "COLLECTED",
+			"values": {
+				"COLLECTED": null,
+				"EDITED": null,
+				"INPUTED": null,
+				"FORCED": null,
+				"PREVIOUS": null
+			},
+			"name": "Q11_3_1"
+		},
+		{
+			"variableType": "COLLECTED",
+			"values": {
+				"COLLECTED": null,
+				"EDITED": null,
+				"INPUTED": null,
+				"FORCED": null,
+				"PREVIOUS": null
+			},
+			"name": "Q11_4_1"
+		},
+		{
+			"variableType": "COLLECTED",
+			"values": {
+				"COLLECTED": null,
+				"EDITED": null,
+				"INPUTED": null,
+				"FORCED": null,
+				"PREVIOUS": null
+			},
+			"name": "COMMENT_QE"
+		},
+		{
+			"variableType": "COLLECTED",
+			"values": {
+				"COLLECTED": [null],
+				"EDITED": [null],
+				"INPUTED": [null],
+				"FORCED": [null],
+				"PREVIOUS": [null]
+			},
+			"name": "PRENOM2"
+		},
+		{
+			"variableType": "COLLECTED",
+			"values": {
+				"COLLECTED": null,
+				"EDITED": null,
+				"INPUTED": null,
+				"FORCED": null,
+				"PREVIOUS": null
+			},
+			"name": "Q11"
+		},
+		{
+			"variableType": "CALCULATED",
+			"expression": { "type": "VTL", "value": "true" },
+			"name": "FILTER_RESULT_PRENOM2",
+			"inFilter": "false",
+			"shapeFrom": "PRENOM2"
+		},
+		{
+			"variableType": "CALCULATED",
+			"expression": { "type": "VTL", "value": "true" },
+			"name": "FILTER_RESULT_Q1",
+			"inFilter": "false"
+		}
+	],
+	"components": [
+		{
+			"componentType": "Sequence",
+			"hierarchy": {
+				"sequence": {
+					"id": "l7g7ovp6",
+					"page": "1",
+					"label": {
+						"type": "VTL|MD",
+						"value": "\"I - \" || \"S3 - boucle de 1 à 4\""
+					}
+				}
+			},
+			"conditionFilter": { "type": "VTL", "value": "true" },
+			"id": "l7g7ovp6",
+			"page": "1",
+			"label": {
+				"type": "VTL|MD",
+				"value": "\"I - \" || \"S3 - boucle de 1 à 4\""
+			}
+		},
+		{
+			"paginatedLoop": false,
+			"componentType": "Loop",
+			"components": [
+				{
+					"componentType": "Subsequence",
+					"goToPage": "2",
+					"hierarchy": {
+						"sequence": {
+							"id": "l7g7ovp6",
+							"page": "1",
+							"label": {
+								"type": "VTL|MD",
+								"value": "\"I - \" || \"S3 - boucle de 1 à 4\""
+							}
+						},
+						"subSequence": {
+							"id": "l7g7ou85",
+							"page": "2",
+							"label": { "type": "VTL|MD", "value": "SS31" }
+						}
+					},
+					"conditionFilter": { "type": "VTL", "value": "true" },
+					"id": "l7g7ou85",
+					"page": "2",
+					"label": { "type": "VTL|MD", "value": "SS31" }
+				},
+				{
+					"componentType": "Input",
+					"bindingDependencies": ["PRENOM2"],
+					"response": { "name": "PRENOM2" },
+					"hierarchy": {
+						"sequence": {
+							"id": "l7g7ovp6",
+							"page": "1",
+							"label": {
+								"type": "VTL|MD",
+								"value": "\"I - \" || \"S3 - boucle de 1 à 4\""
+							}
+						},
+						"subSequence": {
+							"id": "l7g7ou85",
+							"page": "2",
+							"label": { "type": "VTL|MD", "value": "SS31" }
+						}
+					},
+					"conditionFilter": { "type": "VTL", "value": "true" },
+					"id": "l7g7tek6",
+					"page": "2",
+					"label": {
+						"type": "VTL|MD",
+						"value": "\"➡ 1. \" || \"bOUCLE DE 1 A 4\""
+					},
+					"mandatory": false,
+					"maxLength": 249
+				}
+			],
+			"bindingDependencies": ["PRENOM2"],
+			"depth": 1,
+			"hierarchy": {
+				"sequence": {
+					"id": "l7g7ovp6",
+					"page": "1",
+					"label": {
+						"type": "VTL|MD",
+						"value": "\"I - \" || \"S3 - boucle de 1 à 4\""
+					}
+				}
+			},
+			"conditionFilter": { "type": "VTL", "value": "true" },
+			"id": "l7g7lw1o",
+			"page": "2",
+			"label": { "type": "VTL|MD", "value": "Ajouter" },
+			"lines": {
+				"min": { "type": "VTL", "value": "1" },
+				"max": { "type": "VTL", "value": "4" }
+			}
+		},
+		{
+			"componentType": "Subsequence",
+			"goToPage": "3",
+			"hierarchy": {
+				"sequence": {
+					"id": "l7g7ovp6",
+					"page": "1",
+					"label": {
+						"type": "VTL|MD",
+						"value": "\"I - \" || \"S3 - boucle de 1 à 4\""
+					}
+				},
+				"subSequence": {
+					"id": "l7g7lnew",
+					"page": "3",
+					"label": { "type": "VTL|MD", "value": "\"SS32\"" }
+				}
+			},
+			"conditionFilter": { "type": "VTL", "value": "true" },
+			"id": "l7g7lnew",
+			"label": { "type": "VTL|MD", "value": "\"SS32\"" }
+		},
+		{
+			"componentType": "Table",
+			"bindingDependencies": [
+				"Q11",
+				"Q11_1_1",
+				"Q11_2_1",
+				"Q11_3_1",
+				"Q11_4_1"
+			],
+			"positioning": "HORIZONTAL",
+			"hierarchy": {
+				"sequence": {
+					"id": "l7g7ovp6",
+					"page": "1",
+					"label": {
+						"type": "VTL|MD",
+						"value": "\"I - \" || \"S3 - boucle de 1 à 4\""
+					}
+				},
+				"subSequence": {
+					"id": "l7g7lnew",
+					"page": "3",
+					"label": { "type": "VTL|MD", "value": "\"SS32\"" }
+				}
+			},
+			"header": [{ "label": { "type": "VTL|MD", "value": "AAA" } }],
+			"conditionFilter": { "type": "VTL", "value": "true" },
+			"id": "kx05sq4y",
+			"page": "3",
+			"label": { "type": "VTL|MD", "value": "\"➡ 2. \" || \"TAB DYNAMIQUE\"" },
+			"body": [
+				[
+					{
+						"componentType": "Input",
+						"bindingDependencies": ["Q11_1_1"],
+						"response": { "name": "Q11_1_1" },
+						"id": "kx05sq4y-QOP-l7os96f2",
+						"maxLength": 249
+					}
+				],
+				[
+					{
+						"componentType": "Input",
+						"bindingDependencies": ["Q11_2_1"],
+						"response": { "name": "Q11_2_1" },
+						"id": "kx05sq4y-QOP-l7os96f2",
+						"maxLength": 249
+					}
+				],
+				[
+					{
+						"componentType": "Input",
+						"bindingDependencies": ["Q11_3_1"],
+						"response": { "name": "Q11_3_1" },
+						"id": "kx05sq4y-QOP-l7os96f2",
+						"maxLength": 249
+					}
+				],
+				[
+					{
+						"componentType": "Input",
+						"bindingDependencies": ["Q11_4_1"],
+						"response": { "name": "Q11_4_1" },
+						"id": "kx05sq4y-QOP-l7os96f2",
+						"maxLength": 249
+					}
+				]
+			],
+			"lines": {
+				"min": { "type": "VTL", "value": "1" },
+				"max": { "type": "VTL", "value": "4" }
+			},
+			"mandatory": false
+		},
+		{
+			"componentType": "Sequence",
+			"hierarchy": {
+				"sequence": {
+					"id": "COMMENT-SEQ",
+					"page": "4",
+					"label": { "type": "VTL|MD", "value": "\"Commentaire\"" }
+				}
+			},
+			"conditionFilter": { "type": "VTL", "value": "true" },
+			"id": "COMMENT-SEQ",
+			"page": "4",
+			"label": { "type": "VTL|MD", "value": "\"Commentaire\"" }
+		},
+		{
+			"componentType": "Textarea",
+			"bindingDependencies": ["COMMENT_QE"],
+			"response": { "name": "COMMENT_QE" },
+			"hierarchy": {
+				"sequence": {
+					"id": "COMMENT-SEQ",
+					"page": "4",
+					"label": { "type": "VTL|MD", "value": "\"Commentaire\"" }
+				}
+			},
+			"conditionFilter": { "type": "VTL", "value": "true" },
+			"id": "COMMENT-QUESTION",
+			"page": "5",
+			"label": {
+				"type": "VTL|MD",
+				"value": "\"Avez-vous des remarques concernant l'enquête ou des commentaires ?\""
+			},
+			"mandatory": false,
+			"maxLength": 2000
+		}
+	],
+	"pagination": "question",
+	"lunaticModelVersion": "2.2.14-rc",
+	"modele": "TESTANNE",
+	"enoCoreVersion": "2.3.10-controls-type",
+	"generatingDate": "06-09-2022 12:45:58",
+	"missing": false,
+	"id": "l7k6exiv",
+	"label": { "type": "VTL|MD", "value": "AHS - boucle et tab dynamique" },
+	"maxPage": "5"
+}