@inseefr/lunatic 0.4.8-v2 → 0.4.11-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/input.scss

@@ -1,7 +1,8 @@
 .lunatic-component {
 	.lunatic-input,
 	.lunatic-datepicker,
-	.lunatic-textarea {
+	.lunatic-textarea,
+	.lunatic-input-number {
 		font: inherit;
 		border: 0;
 		border-bottom: 0.125rem double rgba(0, 0, 0, 0.42);

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

@@ -29,14 +29,17 @@ function InputNumber(_ref) {
       labelId = _ref.labelId,
       min = _ref.min,
       max = _ref.max,
-      step = _ref.step;
+      step = _ref.step,
+      unit = _ref.unit;
   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', {
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: "lunatic-input-number-container"
+  }, /*#__PURE__*/_react["default"].createElement("input", {
+    className: (0, _classnames["default"])('lunatic-input-number', {
       disabled: disabled,
       readOnly: readOnly
     }),
@@ -49,7 +52,7 @@ function InputNumber(_ref) {
     min: min,
     max: max,
     step: step
-  });
+  }), unit && /*#__PURE__*/_react["default"].createElement("span", null, unit));
 }
 
 var _default = (0, _commons.createCustomizableLunaticField)(InputNumber);

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

@@ -0,0 +1,7 @@
+// see input.scss
+
+.lunatic-component {
+	.lunatic-input-number {
+		display: inline-block;
+	}
+}

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); }
@@ -69,40 +71,22 @@ function BlockForLoop(_ref) {
       custom = _ref.custom,
       paginatedLoop = _ref.paginatedLoop,
       errors = _ref.errors;
+  var min = lines === null || lines === void 0 ? void 0 : lines.min;
+  var max = lines === null || lines === void 0 ? void 0 : lines.max;
+
+  var _useState = (0, _react.useState)(function () {
+    if (iterations) {
+      //This should be an Integer
+      return Number.parseInt(iterations);
+    }
 
-  var _useState = (0, _react.useState)(-1),
+    var initLength = (0, _getInitLength["default"])(valueMap);
+    return Math.max(initLength, min);
+  }),
       _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 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/input-number/input-number.stories.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.Default = void 0;
+exports["default"] = exports.UnitEuros = exports.Default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -13,6 +13,8 @@ var _source = _interopRequireDefault(require("./source"));
 
 var _defaultArgTypes = _interopRequireDefault(require("../utils/default-arg-types"));
 
+var _sourceEuros = _interopRequireDefault(require("./source-euros"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var stories = {
@@ -32,4 +34,10 @@ exports.Default = Default;
 Default.args = {
   id: 'input-number',
   source: _source["default"]
+};
+var UnitEuros = Template.bind({});
+exports.UnitEuros = UnitEuros;
+UnitEuros.args = {
+  id: 'input-number-euro',
+  source: _sourceEuros["default"]
 };

package/lib/stories/input-number/source-euros.json

@@ -0,0 +1,38 @@
+{
+	"components": [
+		{
+			"id": "kze792d8",
+			"componentType": "InputNumber",
+			"mandatory": false,
+			"page": "2",
+			"min": 0,
+			"max": 10,
+			"decimals": 0,
+			"unit":"€",
+			"label": { "value": "\"➡ 1. \" || \"NB \"", "type": "VTL|MD" },
+			"conditionFilter": { "value": "true", "type": "VTL" },
+			"hierarchy": {
+				"sequence": {
+					"id": "ksyjs7vy",
+					"page": "1",
+					"label": { "value": "S0", "type": "VTL|MD" }
+				}
+			},
+			"bindingDependencies": ["NB"],
+			"response": { "name": "NB" }
+		}
+	],
+	"variables": [
+		{
+			"variableType": "COLLECTED",
+			"name": "NB",
+			"values": {
+				"PREVIOUS": null,
+				"COLLECTED": null,
+				"FORCED": null,
+				"EDITED": null,
+				"INPUTED": null
+			}
+		}
+	]
+}