@inseefr/lunatic 0.4.6-v2 → 0.4.9-v2

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(val);
+    onChange(isNaN(val) ? null : 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

@@ -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/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/stories/utils/orchestrator.js

@@ -137,9 +137,6 @@ function OrchestratorForStories(_ref2) {
   var errors = getErrors();
   var modalErrors = getModalErrors();
   var currentErrors = getCurrentErrors();
-  console.log('errors: ', errors);
-  console.log('modalErrors: ', modalErrors);
-  console.log('currentErrors: ', currentErrors);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "container"
   }, /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -122,6 +122,25 @@ function createExecuteExpression(variables, features) {
 
     pushToLazy(name);
   }
+  /**
+   *
+   * @param {*} variables
+   * @param {*} iteration
+   */
+
+
+  function setLoopBindings(variables, iteration) {
+    Object.entries(bindings).forEach(function (_ref3) {
+      var _ref4 = _slicedToArray(_ref3, 2),
+          k = _ref4[0],
+          v = _ref4[1];
+
+      var _variables$k = variables[k],
+          type = _variables$k.type,
+          value = _variables$k.value;
+      if (!Array.isArray(v) && type === _constants.COLLECTED && Array.isArray(value)) bindings[k] = value[iteration];
+    });
+  }
 
   function getVariablesAndCach(expression) {
     if (tokensMap.has(expression)) {
@@ -163,9 +182,9 @@ function createExecuteExpression(variables, features) {
     return {};
   }
 
-  function resolveUseContext(name, _ref3) {
-    var iteration = _ref3.iteration,
-        linksIterations = _ref3.linksIterations;
+  function resolveUseContext(name, _ref5) {
+    var iteration = _ref5.iteration,
+        linksIterations = _ref5.linksIterations;
     var value = bindings[name];
 
     if ([_constants.X_AXIS, _constants.Y_AXIS].includes(name) && linksIterations !== undefined) {
@@ -195,13 +214,13 @@ function createExecuteExpression(variables, features) {
     return (0, _vtl["default"])(value);
   }
 
-  function fillVariablesValues(map, _ref4) {
-    var iteration = _ref4.iteration,
-        linksIterations = _ref4.linksIterations;
-    return Object.entries(map).reduce(function (sub, _ref5) {
-      var _ref6 = _slicedToArray(_ref5, 2),
-          name = _ref6[0],
-          _ = _ref6[1];
+  function fillVariablesValues(map, _ref6) {
+    var iteration = _ref6.iteration,
+        linksIterations = _ref6.linksIterations;
+    return Object.entries(map).reduce(function (sub, _ref7) {
+      var _ref8 = _slicedToArray(_ref7, 2),
+          name = _ref8[0],
+          _ = _ref8[1];
 
       return _objectSpread(_objectSpread({}, sub), {}, _defineProperty({}, name, resolveUseContext(name, {
         iteration: iteration,
@@ -257,7 +276,7 @@ function createExecuteExpression(variables, features) {
     return memoized;
   }
 
-  return [execute, updateBindings];
+  return [execute, updateBindings, setLoopBindings];
 }
 
 var _default = createExecuteExpression;

package/lib/use-lunatic/reducer/reduce-go-next-page.js

@@ -157,7 +157,9 @@ function validateChange(state) {
 function reduceGoNextPage(state) {
   var pages = state.pages,
       isInLoop = state.isInLoop,
-      pager = state.pager;
+      pager = state.pager,
+      setLoopBindings = state.setLoopBindings,
+      variables = state.variables;
   var iteration = pager.iteration,
       nbIterations = pager.nbIterations,
       subPage = pager.subPage,
@@ -169,6 +171,7 @@ function reduceGoNextPage(state) {
   }
 
   if (isInLoop && subPage === nbSubPages - 1 && iteration < nbIterations - 1) {
+    setLoopBindings(variables, iteration + 1);
     return validateChange(reduceNextIteration(state));
   }
 

package/lib/use-lunatic/reducer/reduce-go-previous-page.js

@@ -124,7 +124,9 @@ function validateChange(state) {
 function reduceGoPreviousPage(state) {
   var pages = state.pages,
       pager = state.pager,
-      isInLoop = state.isInLoop;
+      isInLoop = state.isInLoop,
+      setLoopBindings = state.setLoopBindings,
+      variables = state.variables;
   var iteration = pager.iteration,
       subPage = pager.subPage; // dans une boucle et l'itération courante n'est pas finie
 
@@ -134,6 +136,7 @@ function reduceGoPreviousPage(state) {
 
 
   if (isInLoop && subPage === 0 && iteration > 0) {
+    setLoopBindings(variables, iteration - 1);
     return validateChange(goPreviousIteration(state));
   }
 

package/lib/use-lunatic/reducer/reduce-go-to-page.js

@@ -50,6 +50,7 @@ function reduceGoToPage(state, action) {
   }); // TODO: fix when redirect to loop component
   // How to calculate nbSubPages & nbIterations?
   // How to calculate lazy variables we need?
+  // Handle setLoopBindings with the good iteration
 
   return validateChange(state);
 }

package/lib/use-lunatic/reducer/reduce-on-init.js

@@ -204,9 +204,10 @@ function reduceOnInit(state, action) {
     var variables = createVariables(source, data); // map des variables
 
     var _createExecuteExpress = (0, _commons.createExecuteExpression)(variables, features),
-        _createExecuteExpress2 = _slicedToArray(_createExecuteExpress, 2),
+        _createExecuteExpress2 = _slicedToArray(_createExecuteExpress, 3),
         executeExpression = _createExecuteExpress2[0],
-        updateBindings = _createExecuteExpress2[1];
+        updateBindings = _createExecuteExpress2[1],
+        setLoopBindings = _createExecuteExpress2[2];
 
     var pages = (0, _commons.checkLoops)((0, _commons.createMapPages)(source));
     var maxPage = source.maxPage,
@@ -241,6 +242,7 @@ function reduceOnInit(state, action) {
       pager: pager,
       executeExpression: executeExpression,
       updateBindings: updateBindings,
+      setLoopBindings: setLoopBindings,
       handleChange: handleChange,
       preferences: preferences,
       management: management,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "0.4.6-v2",
+	"version": "0.4.9-v2",
 	"workersVersion": "0.2.4-experimental",
 	"description": "Library of questionnaire components",
 	"repository": {
@@ -48,7 +48,7 @@
 		"library"
 	],
 	"dependencies": {
-		"@inseefr/trevas": "^0.1.0-bundle",
+		"@inseefr/trevas": "^0.1.15",
 		"@inseefr/vtl-2.0-antlr-tools": "^0.1.0-bundle",
 		"antlr4": "4.8.0",
 		"classnames": "^2.3.1",