@inseefr/lunatic 0.4.28-v2 → 0.4.30-v2

package/lib/components/checkbox/checkbox-boolean/lunatic-checkbox-boolean.js

@@ -31,7 +31,8 @@ function LunaticCheckboxBoolean(_ref) {
     custom: custom,
     label: label
   }), /*#__PURE__*/_react["default"].createElement(_commons.Errors, {
-    errors: errors
+    errors: errors,
+    activeId: id
   }));
 }
 

package/lib/components/checkbox/checkbox-group/lunatic-checkbox-group.js

@@ -29,7 +29,8 @@ function LunaticCheckboxGroup(_ref) {
     custom: custom,
     label: label
   }), /*#__PURE__*/_react["default"].createElement(_commons.Errors, {
-    errors: errors
+    errors: errors,
+    activeId: id
   }));
 }
 

package/lib/components/checkbox/checkbox-one/lunatic-checkbox-one.js

@@ -25,10 +25,12 @@ function LunaticCheckboxOne(_ref) {
   var errors = _ref.errors,
       props = _objectWithoutProperties(_ref, _excluded);
 
+  var id = props.id;
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_radio["default"], _extends({}, props, {
     checkboxStyle: true
   })), /*#__PURE__*/_react["default"].createElement(_commons.Errors, {
-    errors: errors
+    errors: errors,
+    activeId: id
   }));
 }
 

package/lib/components/commons/components/combo-box/combo-box.scss

@@ -1,25 +1,25 @@
-// @mixin preventSelect() {
-// 	-moz-user-select: -moz-none;
-// 	-khtml-user-select: none;
-// 	-webkit-user-select: none;
-// }
-
-// @mixin placeholder {
-// 	color: gray;
-// 	@include defaultFont();
-// 	font-size: 15px;
-// 	line-height: 34px;
-// 	vertical-align: middle;
-// 	font-weight: normal;
-// }
-
-// @mixin defaultFont {
-// 	font-family: 'Roboto', 'Helvetica', 'Arial', sans-serif;
-// }
-
-// @mixin selection() {
-// 	@include defaultFont();
-// }
+@mixin preventSelect() {
+	-moz-user-select: -moz-none;
+	-khtml-user-select: none;
+	-webkit-user-select: none;
+}
+
+@mixin placeholder {
+	color: gray;
+	@include defaultFont();
+	font-size: 15px;
+	line-height: 34px;
+	vertical-align: middle;
+	font-weight: normal;
+}
+
+@mixin defaultFont {
+	font-family: 'Roboto', 'Helvetica', 'Arial', sans-serif;
+}
+
+@mixin selection() {
+	@include defaultFont();
+}
 
 .lunatic-combo-box-container {
 	position: relative;
@@ -51,11 +51,11 @@
 						line-height: 34px;
 						font-size: 15px;
 						padding-left: 4px;
-						// @include selection();
+						@include selection();
 
-						// &::placeholder {
-						// 	@include placeholder();
-						// }
+						&::placeholder {
+							@include placeholder();
+						}
 					}
 
 					.lunatic-combo-box-selected {
@@ -64,14 +64,11 @@
 						background-color: var(--color-combo-box-background);
 						border-radius: 5px;
 						padding-left: 4px;
-						// @include selection();
+						@include selection();
 						outline: none;
 
 						display: block;
-						// @include placeholder();
-
-						.placeholder {
-						}
+						@include placeholder();
 
 						.selection {
 							display: inline-block;
@@ -86,7 +83,7 @@
 				}
 
 				.lunatic-combo-box-panel {
-					// @include defaultFont();
+					@include defaultFont();
 					height: 0;
 					opacity: 0;
 					background-color: var(--color-combo-box-background);
@@ -183,11 +180,6 @@
 					&.displayed {
 						display: block;
 					}
-
-					.placeholder {
-					}
-					.selection {
-					}
 				}
 			}
 
@@ -207,7 +199,7 @@
 				}
 				.lunatic-combo-box-option {
 					white-space: nowrap;
-					// @include preventSelect();
+					@include preventSelect();
 				}
 			}
 		}

package/lib/components/commons/components/errors/errors.js

@@ -11,13 +11,33 @@ require("./errors.scss");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-function Errors(_ref) {
-  var errors = _ref.errors;
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-  if (Array.isArray(errors)) {
-    var content = errors.map(function (_ref2) {
-      var id = _ref2.id,
-          errorMessage = _ref2.errorMessage;
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+function Errors(_ref) {
+  var errors = _ref.errors,
+      activeId = _ref.activeId;
+  var activeErrors = Object.entries(errors || {}).find(function (_ref2) {
+    var _ref3 = _slicedToArray(_ref2, 1),
+        k = _ref3[0];
+
+    return activeId.trim().endsWith(k);
+  });
+  if (!activeErrors) return null;
+
+  if (Array.isArray(activeErrors[1])) {
+    var content = activeErrors[1].map(function (_ref4) {
+      var id = _ref4.id,
+          errorMessage = _ref4.errorMessage;
       return /*#__PURE__*/_react["default"].createElement("div", {
         key: "error-".concat(id),
         className: "lunatic-error"

package/lib/components/commons/components/orchestrated-component.js

@@ -34,7 +34,8 @@ function OrchestratedComponent(_ref) {
       iteration = _ref.iteration,
       linksIterations = _ref.linksIterations,
       executeExpression = _ref.executeExpression,
-      custom = _ref.custom;
+      custom = _ref.custom,
+      errors = _ref.errors;
   var componentType = component.componentType;
   var componentFilled = (0, _commons.fillComponentExpressions)(component, {
     executeExpression: executeExpression,
@@ -58,7 +59,8 @@ function OrchestratedComponent(_ref) {
       shortcut: shortcut,
       value: value,
       executeExpression: executeExpression,
-      custom: custom
+      custom: custom,
+      errors: errors
     }));
   }
 

package/lib/components/commons/create-row-orchestrator.js

@@ -23,7 +23,8 @@ function createRowOrchestrator(Row) {
         executeExpression = _ref.executeExpression,
         iteration = _ref.iteration,
         xAxisIterations = _ref.xAxisIterations,
-        custom = _ref.custom;
+        custom = _ref.custom,
+        errors = _ref.errors;
 
     if (nbRows > 0) {
       return new Array(nbRows).fill(null).map(function (_, index) {
@@ -45,7 +46,8 @@ function createRowOrchestrator(Row) {
           features: features,
           shortcut: shortcut,
           preferences: preferences,
-          missing: missing
+          missing: missing,
+          errors: errors
         });
       });
     }

package/lib/components/datepicker/lunatic-datepicker.js

@@ -25,8 +25,10 @@ var LunaticDatepicker = function LunaticDatepicker(_ref) {
   var errors = _ref.errors,
       props = _objectWithoutProperties(_ref, _excluded);
 
+  var id = props.id;
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_datepicker["default"], props), /*#__PURE__*/_react["default"].createElement(_commons.Errors, {
-    errors: errors
+    errors: errors,
+    activeId: id
   }));
 };
 

package/lib/components/dropdown/lunatic-dropdown.js

@@ -37,7 +37,8 @@ function LunaticDropdown(_ref) {
     value: value,
     className: "lunatic-dropdown"
   }), /*#__PURE__*/_react["default"].createElement(_commons.Errors, {
-    errors: errors
+    errors: errors,
+    activeId: id
   }));
 }
 

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

@@ -25,8 +25,10 @@ var LunaticInput = function LunaticInput(_ref) {
   var errors = _ref.errors,
       props = _objectWithoutProperties(_ref, _excluded);
 
+  var id = props.id;
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_input["default"], props), /*#__PURE__*/_react["default"].createElement(_commons.Errors, {
-    errors: errors
+    errors: errors,
+    activeId: id
   }));
 };
 

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

@@ -23,8 +23,10 @@ var LunaticInputNumber = function LunaticInputNumber(_ref) {
   var errors = _ref.errors,
       props = _objectWithoutProperties(_ref, _excluded);
 
+  var id = props.id;
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_inputNumber["default"], props), /*#__PURE__*/_react["default"].createElement(_commons.Errors, {
-    errors: errors
+    errors: errors,
+    activeId: id
   }));
 };
 

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

@@ -117,7 +117,8 @@ function BlockForLoop(_ref) {
       v[args.index] = value;
       handleChange(response, v, {
         loop: true,
-        length: nbRows
+        length: nbRows,
+        shallowIteration: args.index
       });
     } else handleChange(response, value, _objectSpread(_objectSpread({}, args), {}, {
       loop: true,
@@ -145,7 +146,8 @@ function BlockForLoop(_ref) {
       features: features,
       preferences: preferences,
       executeExpression: executeExpression,
-      custom: custom
+      custom: custom,
+      errors: errors
     }), /*#__PURE__*/_react["default"].createElement(_declarations.DeclarationsDetachable, {
       declarations: declarations,
       id: id,
@@ -158,9 +160,7 @@ function BlockForLoop(_ref) {
       onClick: removeRow,
       disabled: nbRows === 1,
       custom: custom
-    }, _i18n["default"].DEFAULT_BUTTON_REMOVE)), /*#__PURE__*/_react["default"].createElement(_commons.Errors, {
-      errors: errors
-    }));
+    }, _i18n["default"].DEFAULT_BUTTON_REMOVE)));
   }
 
   return null;

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

@@ -39,7 +39,8 @@ function Row(_ref) {
       preferences = _ref.preferences,
       rowIndex = _ref.rowIndex,
       executeExpression = _ref.executeExpression,
-      custom = _ref.custom;
+      custom = _ref.custom,
+      errors = _ref.errors;
   var handleChangeRow = (0, _react.useCallback)(function (response, value) {
     handleChange(response, value, {
       index: rowIndex
@@ -48,7 +49,7 @@ function Row(_ref) {
   return components.reduce(function (row, component) {
     var response = component.response,
         id = component.id;
-    var idComponent = "".concat(id, "-").concat(rowIndex + 1, " ");
+    var idComponent = "".concat(id, "-").concat(rowIndex, " ");
     var value = undefined;
 
     if (response) {
@@ -73,7 +74,8 @@ function Row(_ref) {
       preferences: preferences,
       iteration: rowIndex,
       executeExpression: executeExpression,
-      custom: custom
+      custom: custom,
+      errors: errors
     })]);
   }, []);
 }

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

@@ -128,7 +128,8 @@ function RosterforLoop(_ref) {
       management: management,
       missing: missing,
       shortcut: shortcut,
-      custom: custom
+      custom: custom,
+      errors: errors
     }), /*#__PURE__*/_react["default"].createElement(_declarations.DeclarationsDetachable, {
       declarations: declarations,
       id: id,
@@ -141,9 +142,7 @@ function RosterforLoop(_ref) {
       onClick: removeRow,
       disabled: nbRows === 1,
       custom: custom
-    }, _i18n["default"].DEFAULT_BUTTON_REMOVE)), /*#__PURE__*/_react["default"].createElement(_commons.Errors, {
-      errors: errors
-    }));
+    }, _i18n["default"].DEFAULT_BUTTON_REMOVE)));
   }
 
   return null;

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

@@ -29,7 +29,8 @@ function Row(_ref) {
       management = _ref.management,
       preferences = _ref.preferences,
       executeExpression = _ref.executeExpression,
-      custom = _ref.custom;
+      custom = _ref.custom,
+      errors = _ref.errors;
   var handleChangeRow = (0, _react.useCallback)(function (response, value) {
     handleChange(response, value, {
       index: rowIndex
@@ -44,7 +45,7 @@ function Row(_ref) {
     }, components.map(function (component) {
       var response = component.response,
           id = component.id;
-      var idComponent = "".concat(id, "-").concat(rowIndex + 1, " ");
+      var idComponent = "".concat(id, "-").concat(rowIndex, " ");
       var value = undefined;
       var key = "".concat(id, "-").concat(rowIndex);
 
@@ -72,7 +73,8 @@ function Row(_ref) {
         preferences: preferences,
         iteration: rowIndex,
         executeExpression: executeExpression,
-        custom: custom
+        custom: custom,
+        errors: errors
       }));
     }));
   }

package/lib/components/pairwise/links/pairwise-links.js

@@ -13,8 +13,6 @@ var _linksOrchestrator = _interopRequireDefault(require("./links-orchestrator"))
 
 var _declarations = require("../../declarations");
 
-var _commons = require("../../commons");
-
 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); }
@@ -67,8 +65,6 @@ var PairwiseLinks = function PairwiseLinks(_ref) {
     declarations: declarations,
     id: id,
     custom: custom
-  }), /*#__PURE__*/_react["default"].createElement(_commons.Errors, {
-    errors: errors
   }));
   return null;
 };

package/lib/components/radio/lunatic-radio-group.js

@@ -31,7 +31,8 @@ function LunaticRadioGroup(props) {
     checkboxStyle: checkboxStyle,
     custom: custom
   }), /*#__PURE__*/_react["default"].createElement(_commons.Errors, {
-    errors: errors
+    errors: errors,
+    activeId: id
   }));
 }
 

package/lib/components/suggester/lunatic-suggester.js

@@ -51,7 +51,8 @@ function LunaticSuggester(props) {
     value: value,
     custom: custom
   }), /*#__PURE__*/_react["default"].createElement(_commons.Errors, {
-    errors: errors
+    errors: errors,
+    activeId: id
   }));
 }
 

package/lib/components/table/lunatic-table.js

@@ -69,9 +69,12 @@ function LunaticTable(_ref) {
     handleChange: handleChange,
     iteration: iteration,
     nbRows: nbRows,
-    valueMap: value
-  })), /*#__PURE__*/_react["default"].createElement(_commons.Errors, {
+    valueMap: value //TODO propagate
+    ,
     errors: errors
+  })), /*#__PURE__*/_react["default"].createElement(_commons.Errors, {
+    errors: errors,
+    activeId: id
   }));
 }
 

package/lib/components/textarea/lunatic-textarea.js

@@ -25,8 +25,10 @@ var LunaticTextarea = function LunaticTextarea(_ref) {
   var errors = _ref.errors,
       props = _objectWithoutProperties(_ref, _excluded);
 
+  var id = props.id;
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_textarea["default"], props), /*#__PURE__*/_react["default"].createElement(_commons.Errors, {
-    errors: errors
+    errors: errors,
+    activeId: id
   }));
 };
 

package/lib/stories/questionnaires-test/controls/V2_Controles_BouclesLiees_PasPageFin.json

@@ -120,19 +120,6 @@
 		{
 			"componentType": "InputNumber",
 			"controls": [
-				{
-					"criticality": "ERROR",
-					"errorMessage": {
-						"type": "VTL|MD",
-						"value": "\"Vous devez saisir un nombre.\""
-					},
-					"typeOfControl": "FORMAT",
-					"control": {
-						"type": "VTL",
-						"value": "not(not(isnull(Q1)) and not(isNaN(Q1)))"
-					},
-					"id": "l14vfucm-formatNumber"
-				},
 				{
 					"criticality": "ERROR",
 					"errorMessage": {
@@ -142,9 +129,9 @@
 					"typeOfControl": "FORMAT",
 					"control": {
 						"type": "VTL",
-						"value": "not(not(isnull(Q1)) and (1>Q1 or 5<Q1)))"
+						"value": "not(not(isnull(Q1)) and (1>Q1 or 5<Q1))"
 					},
-					"id": "l14vfucm-formatBorneInfSup"
+					"id": "l14vfucm-format-borne-inf-sup"
 				},
 				{
 					"criticality": "ERROR",
@@ -155,9 +142,9 @@
 					"typeOfControl": "FORMAT",
 					"control": {
 						"type": "VTL",
-						"value": "not(not(isnull(Q1)) and trunc(Q1,0)<>Q1)"
+						"value": "not(not(isnull(Q1))  and round(Q1,0)<>Q1)"
 					},
-					"id": "l14vfucm-formatDec"
+					"id": "l14vfucm-format-decimal"
 				},
 				{
 					"bindingDependencies": ["Q1"],
@@ -306,19 +293,6 @@
 				{
 					"componentType": "InputNumber",
 					"controls": [
-						{
-							"criticality": "ERROR",
-							"errorMessage": {
-								"type": "VTL|MD",
-								"value": "\"Vous devez saisir un nombre.\""
-							},
-							"typeOfControl": "FORMAT",
-							"control": {
-								"type": "VTL",
-								"value": "not(not(isnull(Q3)) and not(isNaN(Q3)))"
-							},
-							"id": "l5ggvqgj-formatNumber"
-						},
 						{
 							"criticality": "ERROR",
 							"errorMessage": {
@@ -328,9 +302,9 @@
 							"typeOfControl": "FORMAT",
 							"control": {
 								"type": "VTL",
-								"value": "not(not(isnull(Q3)) and (0>Q3 or 20<Q3)))"
+								"value": "not(not(isnull(Q3)) and (0>Q3 or 20<Q3))"
 							},
-							"id": "l5ggvqgj-formatBorneInfSup"
+							"id": "l5ggvqgj-format-borne-inf-sup"
 						},
 						{
 							"criticality": "ERROR",
@@ -341,9 +315,9 @@
 							"typeOfControl": "FORMAT",
 							"control": {
 								"type": "VTL",
-								"value": "not(not(isnull(Q3)) and trunc(Q3,0)<>Q3)"
+								"value": "not(not(isnull(Q3))  and round(Q3,0)<>Q3)"
 							},
-							"id": "l5ggvqgj-formatDec"
+							"id": "l5ggvqgj-format-decimal"
 						}
 					],
 					"max": 20,
@@ -375,19 +349,6 @@
 				{
 					"componentType": "InputNumber",
 					"controls": [
-						{
-							"criticality": "ERROR",
-							"errorMessage": {
-								"type": "VTL|MD",
-								"value": "\"Vous devez saisir un nombre.\""
-							},
-							"typeOfControl": "FORMAT",
-							"control": {
-								"type": "VTL",
-								"value": "not(not(isnull(Q4)) and not(isNaN(Q4)))"
-							},
-							"id": "l5ggzuuo-formatNumber"
-						},
 						{
 							"criticality": "ERROR",
 							"errorMessage": {
@@ -397,9 +358,9 @@
 							"typeOfControl": "FORMAT",
 							"control": {
 								"type": "VTL",
-								"value": "not(not(isnull(Q4)) and (0>Q4 or 20<Q4)))"
+								"value": "not(not(isnull(Q4)) and (0>Q4 or 20<Q4))"
 							},
-							"id": "l5ggzuuo-formatBorneInfSup"
+							"id": "l5ggzuuo-format-borne-inf-sup"
 						},
 						{
 							"criticality": "ERROR",
@@ -410,9 +371,9 @@
 							"typeOfControl": "FORMAT",
 							"control": {
 								"type": "VTL",
-								"value": "not(not(isnull(Q4)) and trunc(Q4,0)<>Q4)"
+								"value": "not(not(isnull(Q4))  and round(Q4,0)<>Q4)"
 							},
-							"id": "l5ggzuuo-formatDec"
+							"id": "l5ggzuuo-format-decimal"
 						},
 						{
 							"bindingDependencies": ["Q3", "Q4"],
@@ -565,7 +526,7 @@
 	"lunaticModelVersion": "2.2.14-rc",
 	"modele": "TESTCONTBOUCL",
 	"enoCoreVersion": "2.3.10-controls-type",
-	"generatingDate": "08-09-2022 12:16:00",
+	"generatingDate": "22-09-2022 11:21:08",
 	"missing": false,
 	"id": "l5gghitu",
 	"maxPage": "8"