@inseefr/lunatic 0.4.4-v2 → 0.4.7-v2

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

@@ -7,9 +7,9 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _commons = require("../commons");
+var _commons = require("../../commons");
 
-var _commons2 = require("../../commons");
+var _commons2 = require("../commons");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -24,7 +24,7 @@ function CheckBoxOptionWrapper(_ref) {
       handleChange = _ref.handleChange,
       response = _ref.response;
   var booleanValue = value || false;
-  var onClickOption = (0, _commons2.useOnHandleChange)({
+  var onClickOption = (0, _commons.useOnHandleChange)({
     handleChange: handleChange,
     response: response,
     value: booleanValue
@@ -35,7 +35,7 @@ function CheckBoxOptionWrapper(_ref) {
   // 	[handleChange, response]
   // );
 
-  return /*#__PURE__*/_react["default"].createElement(_commons.CheckboxOption, {
+  return /*#__PURE__*/_react["default"].createElement(_commons2.CheckboxOption, {
     id: checkboxId,
     labelledBy: labelId,
     checked: checked,
@@ -70,7 +70,7 @@ function CheckboxGroup(_ref3) {
         var labelId = "lunatic-checkbox-label-".concat(id, "-").concat(name);
         return /*#__PURE__*/_react["default"].createElement(CheckboxGroupContainer, {
           key: checkboxId
-        }, /*#__PURE__*/_react["default"].createElement(_commons2.Label, {
+        }, /*#__PURE__*/_react["default"].createElement(_commons.Label, {
           id: labelId,
           htmlFor: checkboxId
         }, label), /*#__PURE__*/_react["default"].createElement(CheckBoxOptionWrapper, {
@@ -89,6 +89,6 @@ function CheckboxGroup(_ref3) {
   });
 }
 
-var _default = (0, _commons2.createCustomizableLunaticField)(CheckboxGroup);
+var _default = (0, _commons.createCustomizableLunaticField)(CheckboxGroup);
 
 exports["default"] = _default;

package/lib/components/datepicker/datepicker.js

@@ -25,7 +25,9 @@ function Datepicker(_ref) {
       value = _ref.value,
       onChange = _ref.onChange,
       labelId = _ref.labelId,
-      id = _ref.id;
+      id = _ref.id,
+      min = _ref.min,
+      max = _ref.max;
   var handleChange = (0, _react.useCallback)(function (e) {
     var value = e.target.value;
     onChange(value);
@@ -41,7 +43,9 @@ function Datepicker(_ref) {
     readOnly: readOnly,
     disabled: disabled,
     value: value,
-    onChange: handleChange
+    onChange: handleChange,
+    min: min,
+    max: max
   });
 }
 

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
+var _react = _interopRequireDefault(require("react"));
+
 var _datepicker = _interopRequireDefault(require("./datepicker"));
 
 var _commons = require("../commons");
@@ -23,7 +25,7 @@ var LunaticDatepicker = function LunaticDatepicker(_ref) {
   var errors = _ref.errors,
       props = _objectWithoutProperties(_ref, _excluded);
 
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_datepicker["default"], props), /*#__PURE__*/React.createElement(_commons.Errors, {
+  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_datepicker["default"], props), /*#__PURE__*/_react["default"].createElement(_commons.Errors, {
     errors: errors
   }));
 };

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
+var _react = _interopRequireDefault(require("react"));
+
 var _input = _interopRequireDefault(require("./input"));
 
 var _commons = require("../commons");
@@ -23,7 +25,7 @@ var LunaticInput = function LunaticInput(_ref) {
   var errors = _ref.errors,
       props = _objectWithoutProperties(_ref, _excluded);
 
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_input["default"], props), /*#__PURE__*/React.createElement(_commons.Errors, {
+  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_input["default"], props), /*#__PURE__*/_react["default"].createElement(_commons.Errors, {
     errors: errors
   }));
 };

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

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

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
+var _react = _interopRequireDefault(require("react"));
+
 var _inputNumber = _interopRequireDefault(require("./input-number"));
 
 var _commons = require("../commons");
@@ -21,7 +23,7 @@ var LunaticInputNumber = function LunaticInputNumber(_ref) {
   var errors = _ref.errors,
       props = _objectWithoutProperties(_ref, _excluded);
 
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_inputNumber["default"], props), /*#__PURE__*/React.createElement(_commons.Errors, {
+  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_inputNumber["default"], props), /*#__PURE__*/_react["default"].createElement(_commons.Errors, {
     errors: errors
   }));
 };

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

@@ -15,6 +15,10 @@ var _declarations = require("../../declarations");
 
 var _blockForLoopOchestrator = _interopRequireDefault(require("./block-for-loop-ochestrator"));
 
+var _handleRowButton = _interopRequireDefault(require("../commons/handle-row-button"));
+
+var _i18n = _interopRequireDefault(require("../../../i18n"));
+
 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); }
@@ -27,6 +31,14 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
 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."); }
@@ -42,6 +54,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function BlockForLoop(_ref) {
   var declarations = _ref.declarations,
       id = _ref.id,
+      label = _ref.label,
       lines = _ref.lines,
       components = _ref.components,
       handleChange = _ref.handleChange,
@@ -90,6 +103,30 @@ function BlockForLoop(_ref) {
       setNbRows(min);
     }
   }, [min, max, iterations]);
+  var addRow = (0, _react.useCallback)(function () {
+    if (nbRows < max) {
+      setNbRows(nbRows + 1);
+    }
+  }, [max, nbRows]);
+  var removeRow = (0, _react.useCallback)(function () {
+    if (nbRows > 1) {
+      var newNbRows = nbRows - 1;
+      setNbRows(newNbRows);
+      Object.entries(valueMap).forEach(function (_ref2) {
+        var _ref3 = _slicedToArray(_ref2, 2),
+            k = _ref3[0],
+            v = _ref3[1];
+
+        var newValue = v.reduce(function (acc, e, i) {
+          if (i < newNbRows) return [].concat(_toConsumableArray(acc), [e]);
+          return acc;
+        }, []);
+        handleChange({
+          name: k
+        }, newValue);
+      });
+    }
+  }, [nbRows, handleChange, valueMap]);
   var handleChangeLoop = (0, _react.useCallback)(function (response, value, args) {
     if (!paginatedLoop) {
       var v = valueMap[response.name];
@@ -129,7 +166,15 @@ function BlockForLoop(_ref) {
       declarations: declarations,
       id: id,
       custom: custom
-    }), /*#__PURE__*/_react["default"].createElement(_commons.Errors, {
+    }), min && max && min !== max && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_handleRowButton["default"], {
+      onClick: addRow,
+      disabled: nbRows === max,
+      custom: custom
+    }, label || _i18n["default"].DEFAULT_BUTTON_ADD), /*#__PURE__*/_react["default"].createElement(_handleRowButton["default"], {
+      onClick: removeRow,
+      disabled: nbRows === 1,
+      custom: custom
+    }, _i18n["default"].DEFAULT_BUTTON_REMOVE)), /*#__PURE__*/_react["default"].createElement(_commons.Errors, {
       errors: errors
     }));
   }

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

@@ -15,7 +15,7 @@ var _rosterTable = _interopRequireDefault(require("./roster-table"));
 
 var _commons = require("../../commons");
 
-var _handleRowButton = _interopRequireDefault(require("./handle-row-button"));
+var _handleRowButton = _interopRequireDefault(require("../commons/handle-row-button"));
 
 var _i18n = _interopRequireDefault(require("../../../i18n"));
 
@@ -45,6 +45,7 @@ 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_MAX_ROWS = 12;
 
 function getTableLength(value) {
@@ -72,6 +73,7 @@ function RosterforLoop(_ref) {
       management = _ref.management,
       custom = _ref.custom,
       errors = _ref.errors;
+  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),
@@ -95,6 +97,14 @@ function RosterforLoop(_ref) {
       setNbRows(nbRows + 1);
     }
   }, [max, nbRows]);
+  var handleChangeLoop = (0, _react.useCallback)(function (response, value, args) {
+    var v = valueMap[response.name];
+    v[args.index] = value;
+    handleChange(response, v, {
+      loop: true,
+      length: nbRows
+    });
+  }, [handleChange, nbRows, valueMap]);
   var removeRow = (0, _react.useCallback)(function () {
     if (nbRows > 1) {
       var newNbRows = nbRows - 1;
@@ -130,7 +140,7 @@ function RosterforLoop(_ref) {
       nbRows: nbRows,
       executeExpression: executeExpression,
       header: headers,
-      handleChange: handleChange,
+      handleChange: handleChangeLoop,
       valueMap: valueMap,
       management: management,
       missing: missing,
@@ -140,7 +150,7 @@ function RosterforLoop(_ref) {
       declarations: declarations,
       id: id,
       custom: custom
-    }), /*#__PURE__*/_react["default"].createElement(_handleRowButton["default"], {
+    }), min && max && min !== max && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_handleRowButton["default"], {
       onClick: addRow,
       disabled: nbRows === max,
       custom: custom
@@ -148,7 +158,7 @@ function RosterforLoop(_ref) {
       onClick: removeRow,
       disabled: nbRows === 1,
       custom: custom
-    }, _i18n["default"].DEFAULT_BUTTON_REMOVE), /*#__PURE__*/_react["default"].createElement(_commons.Errors, {
+    }, _i18n["default"].DEFAULT_BUTTON_REMOVE)), /*#__PURE__*/_react["default"].createElement(_commons.Errors, {
       errors: errors
     }));
   }

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
+var _react = _interopRequireDefault(require("react"));
+
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _commons = require("../commons");
@@ -23,7 +25,7 @@ var LunaticTextarea = function LunaticTextarea(_ref) {
   var errors = _ref.errors,
       props = _objectWithoutProperties(_ref, _excluded);
 
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_textarea["default"], props), /*#__PURE__*/React.createElement(_commons.Errors, {
+  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_textarea["default"], props), /*#__PURE__*/_react["default"].createElement(_commons.Errors, {
     errors: errors
   }));
 };

package/lib/stories/date-picker/data.json

@@ -0,0 +1,3 @@
+{
+	"COLLECTED": {}
+}

package/lib/stories/date-picker/datepicker.stories.js

@@ -0,0 +1,38 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = exports.Default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _orchestrator = _interopRequireDefault(require("../utils/orchestrator"));
+
+var _source = _interopRequireDefault(require("./source"));
+
+var _data = _interopRequireDefault(require("./data"));
+
+var _defaultArgTypes = _interopRequireDefault(require("../utils/default-arg-types"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var stories = {
+  title: 'Components/DatePicker',
+  component: _orchestrator["default"],
+  argTypes: _defaultArgTypes["default"]
+};
+var _default = stories;
+exports["default"] = _default;
+
+var Template = function Template(args) {
+  return /*#__PURE__*/_react["default"].createElement(_orchestrator["default"], args);
+};
+
+var Default = Template.bind({});
+exports.Default = Default;
+Default.args = {
+  id: 'input',
+  source: _source["default"],
+  data: _data["default"]
+};

package/lib/stories/date-picker/source.json

@@ -0,0 +1,140 @@
+{
+	"cleaning": {},
+	"variables": [
+		{
+			"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": "Q1"
+		},
+		{
+			"variableType": "CALCULATED",
+			"expression": { "type": "VTL", "value": "true" },
+			"name": "FILTER_RESULT_Q1",
+			"inFilter": "false"
+		}
+	],
+	"components": [
+		{
+			"componentType": "Sequence",
+			"hierarchy": {
+				"sequence": {
+					"id": "l7ovaca8",
+					"page": "1",
+					"label": { "type": "VTL|MD", "value": "\"I - \" || \"S1\"" }
+				}
+			},
+			"conditionFilter": { "type": "VTL", "value": "true" },
+			"id": "l7ovaca8",
+			"page": "1",
+			"label": { "type": "VTL|MD", "value": "\"I - \" || \"S1\"" }
+		},
+		{
+			"componentType": "Datepicker",
+			"controls": [
+				{
+					"criticality": "ERROR",
+					"errorMessage": {
+						"type": "VTL|MD",
+						"value": "Le format de la date YYYY-MM-DD n'est pas respecté."
+					},
+					"control": {
+						"type": "VTL",
+						"value": "not(cast(\\\"Q1\\\", date, \\\"YYYY-MM-DD\\\"))"
+					},
+					"id": "l7ovm2rv-format"
+				},
+				{
+					"criticality": "ERROR",
+					"errorMessage": {
+						"type": "VTL|MD",
+						"value": "La date saisie doit être comprise entre 1900-01-01 et 2100-01-01."
+					},
+					"control": {
+						"type": "VTL",
+						"value": "not(cast(\\\"Q1\\\", date, \\\"YYYY-MM-DD\\\")>cast(\\\"2100-01-01\\\", date, \\\"YYYY-MM-DD\\\") or cast(\\\"Q1\\\", date, \\\"YYYY-MM-DD\\\")<cast(\\\"1900-01-01\\\", date, \\\"YYYY-MM-DD\\\"))"
+					},
+					"id": "l7ovm2rv-formatborne"
+				}
+			],
+			"max": "2100-01-01",
+			"dateFormat": "YYYY-MM-DD",
+			"hierarchy": {
+				"sequence": {
+					"id": "l7ovaca8",
+					"page": "1",
+					"label": { "type": "VTL|MD", "value": "\"I - \" || \"S1\"" }
+				}
+			},
+			"conditionFilter": { "type": "VTL", "value": "true" },
+			"label": { "type": "VTL|MD", "value": "\"➡ 1. \" || \"Q1\"" },
+			"mandatory": false,
+			"bindingDependencies": ["Q1"],
+			"min": "1900-01-01",
+			"response": { "name": "Q1" },
+			"id": "l7ovm2rv",
+			"page": "2"
+		},
+		{
+			"componentType": "Sequence",
+			"hierarchy": {
+				"sequence": {
+					"id": "COMMENT-SEQ",
+					"page": "3",
+					"label": { "type": "VTL|MD", "value": "\"Commentaire\"" }
+				}
+			},
+			"conditionFilter": { "type": "VTL", "value": "true" },
+			"id": "COMMENT-SEQ",
+			"page": "3",
+			"label": { "type": "VTL|MD", "value": "\"Commentaire\"" }
+		},
+		{
+			"componentType": "Textarea",
+			"bindingDependencies": ["COMMENT_QE"],
+			"response": { "name": "COMMENT_QE" },
+			"hierarchy": {
+				"sequence": {
+					"id": "COMMENT-SEQ",
+					"page": "3",
+					"label": { "type": "VTL|MD", "value": "\"Commentaire\"" }
+				}
+			},
+			"conditionFilter": { "type": "VTL", "value": "true" },
+			"id": "COMMENT-QUESTION",
+			"page": "4",
+			"label": {
+				"type": "VTL|MD",
+				"value": "\"Avez-vous des remarques concernant l'enquête ou des commentaires ?\""
+			},
+			"mandatory": false,
+			"maxLength": 2000
+		}
+	],
+	"pagination": "question",
+	"resizing": {},
+	"label": { "type": "VTL|MD", "value": "DatePicker" },
+	"lunaticModelVersion": "2.2.13",
+	"modele": "DATEPICKER",
+	"enoCoreVersion": "2.3.10",
+	"generatingDate": "05-09-2022 14:37:43",
+	"missing": false,
+	"id": "l7ovbqou",
+	"maxPage": "4"
+}

package/lib/stories/input/data.json

@@ -1,5 +1 @@
-{
-	"COLLECTED": {
-		"NAME": { "COLLECTED": "toto", "FORCED": "Titi", "EDITED": "Toto" }
-	}
-}
+{}

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

@@ -53,7 +53,7 @@
 					"id": "l14vfucm-CI-0",
 					"criticality": "WARN",
 					"control": {
-						"value": "not(cast(Q1,integer) > 3)",
+						"value": "not(Q1 > 3)",
 						"type": "VTL"
 					},
 					"errorMessage": { "value": "\"Supérieur à 3\"", "type": "VTL|MD" },
@@ -81,8 +81,8 @@
 			"bindingDependencies": ["Q1", "Q2"],
 			"loopDependencies": ["Q1"],
 			"lines": {
-				"min": { "value": "cast(nvl(Q1,\"0\"),integer)", "type": "VTL" },
-				"max": { "value": "cast(nvl(Q1,\"0\"),integer)", "type": "VTL" }
+				"min": { "value": "nvl(Q1,0)", "type": "VTL" },
+				"max": { "value": "nvl(Q1,0)", "type": "VTL" }
 			},
 			"components": [
 				{
@@ -191,7 +191,7 @@
 							"id": "l5ggzuuo-CI-0",
 							"criticality": "WARN",
 							"control": {
-								"value": "not(cast(nvl(Q3,\"0\"),integer) > cast(nvl(Q4,\"0\"),integer))",
+								"value": "not(nvl(Q3,0) > nvl(Q4,0))",
 								"type": "VTL"
 							},
 							"errorMessage": { "value": "\"Q3 > Q4\"", "type": "VTL|MD" },
@@ -361,7 +361,7 @@
 	"cleaning": {},
 	"resizing": {
 		"Q1": {
-			"size": "cast(nvl(Q1,\"0\"),integer)",
+			"size": "nvl(Q1,0)",
 			"variables": ["Q2", "Q3", "Q4", "Q5"]
 		}
 	}

package/lib/use-lunatic/commons/execute-expression/create-refresh-calculated.js

@@ -141,7 +141,7 @@ function createRefreshCalculated(_ref) {
           linksIterations: linksIterations,
           bindings: bindings
         });
-        if (type !== _constants.CALCULATED || iteration === undefined) toRefreshVariables["delete"](name);
+        if (iteration !== undefined) toRefreshVariables["delete"](name);
         return _objectSpread(_objectSpread({}, sub), {}, _defineProperty({}, name, value));
       }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "0.4.4-v2",
+	"version": "0.4.7-v2",
 	"workersVersion": "0.2.4-experimental",
 	"description": "Library of questionnaire components",
 	"repository": {