@inseefr/lunatic 2.7.4 → 2.7.6

package/lib/stories/table/table.stories.js

@@ -3,12 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.RosterMui = exports.Roster = exports.DynamicTable = exports.Default = void 0;
+exports["default"] = exports.RosterMui = exports.Roster = exports.DynamicTable = exports.Default = exports.Colspan = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _orchestrator = _interopRequireDefault(require("../utils/orchestrator"));
 var _source = _interopRequireDefault(require("./source.json"));
 var _data = _interopRequireDefault(require("./data.json"));
 var _sourceRoster = _interopRequireDefault(require("./source-roster.json"));
+var _sourceColspan = _interopRequireDefault(require("./source-colspan.json"));
 var _tableDynamique = _interopRequireDefault(require("./table-dynamique.json"));
 var _dataRoster = _interopRequireDefault(require("./data-roster.json"));
 var _defaultArgTypes = _interopRequireDefault(require("../utils/default-arg-types"));
@@ -44,6 +45,11 @@ Roster.args = {
   source: _sourceRoster["default"],
   data: _dataRoster["default"]
 };
+var Colspan = exports.Colspan = Template.bind({});
+Colspan.args = {
+  id: 'table',
+  source: _sourceColspan["default"]
+};
 var RosterMui = exports.RosterMui = Template.bind({});
 RosterMui.args = {
   id: 'table',

package/lib/stories/textarea/source.json

@@ -4,34 +4,18 @@
 			"id": "name",
 			"componentType": "Textarea",
 			"label": {
-				"value": "\"What you say\"",
+				"value": "\"Label\"",
+				"type": "VTL|MD"
+			},
+			"description": {
+				"value": "\"Description\"",
 				"type": "VTL|MD"
 			},
 			"conditionFilter": { "value": "true", "type": "VTL" },
 			"maxLength": 30,
 			"response": {
 				"name": "SOMETHING"
-			},
-			"declarations": [
-				{
-					"id": "kb9hi4j0-krnoclfe",
-					"declarationType": "INSTRUCTION",
-					"position": "BEFORE_QUESTION_TEXT",
-					"label": {
-						"value": "\"## Can you say something, please?\nwhat you want't.\n\"",
-						"type": "VTL|MD"
-					}
-				},
-				{
-					"id": "kb9hi4j0-krnoclfe",
-					"declarationType": "HELP",
-					"position": "AFTER_QUESTION_TEXT",
-					"label": {
-						"value": "\"For example,hello World!\"",
-						"type": "VTL|MD"
-					}
-				}
-			]
+			}
 		}
 	],
 	"variables": [

package/lib/stories/utils/orchestrator.js

@@ -47,38 +47,29 @@ function DevOptions(_ref) {
   }
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: "dev-options",
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: "title",
-      children: "Options d\xE9veloppeur"
-    }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-      className: "conteneur",
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      style: {
+        display: 'flex'
+      },
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(lunatic.Button, {
         onClick: function onClick() {
           return _logger.Logger.log(getData(true));
         },
-        children: "Get State"
+        children: "Get Data"
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(lunatic.Button, {
         onClick: function onClick() {
           return goToPage({
             page: "".concat(toPage)
           });
         },
-        children: "Go to page ".concat(toPage)
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(lunatic.Button, {
-        onClick: function onClick() {
-          return goToPage({
-            page: "".concat(lastReachedPage)
-          });
-        },
-        children: "Go to lastReachedPage : ".concat(lastReachedPage)
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(lunatic.Input, {
-        id: "page-to-jump",
-        value: toPage,
-        handleChange: handleChange,
-        min: 1,
-        label: 'Page',
-        description: 'the page where you want to jump'
+        children: "Go to \"".concat(toPage, "\"")
       })]
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(lunatic.Input, {
+      id: "page-to-jump",
+      value: toPage,
+      handleChange: handleChange,
+      min: 1,
+      label: 'Page to reach : '
     })]
   });
 }
@@ -91,7 +82,8 @@ function Pager(_ref2) {
     isFirst = _ref2.isFirst,
     pageTag = _ref2.pageTag,
     maxPage = _ref2.maxPage,
-    getData = _ref2.getData;
+    getData = _ref2.getData,
+    pager = _ref2.pager;
   if (maxPage && maxPage > 1) {
     var Button = lunatic.Button;
     return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
@@ -105,13 +97,35 @@ function Pager(_ref2) {
           onClick: goNext,
           disabled: isLast,
           children: "Next"
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          style: {
+            fontSize: '.8em',
+            opacity: 0.7,
+            marginTop: '.3em'
+          },
+          children: "You can use PgDown / PgUp shortcut"
         })]
-      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-        children: ["PAGE: ", pageTag]
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(DevOptions, {
         goToPage: goToPage,
         getData: getData,
         lastReachedPage: lastReachedPage
+      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+        className: "story-pager",
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("h3", {
+          children: "Pager"
+        }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("ul", {
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("li", {
+            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("strong", {
+              children: "PageTag:"
+            }), " ", JSON.stringify(pageTag)]
+          }), Object.keys(pager).map(function (key) {
+            return /*#__PURE__*/(0, _jsxRuntime.jsxs)("li", {
+              children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("strong", {
+                children: [key, ":"]
+              }), " ", JSON.stringify(pager[key])]
+            }, key);
+          })]
+        })]
       })]
     });
   }
@@ -220,9 +234,32 @@ function OrchestratorForStories(_ref3) {
       });
     } else goNextPage();
   }, [compileControls, errorActive, goNextPage, pageTag]);
+
+  // Allow PageDown / PageUp shortcut to ease navigation
+  (0, _react.useEffect)(function () {
+    var listener = function listener(e) {
+      var stopPropagation = false;
+      if (e.key === 'PageDown') {
+        handleGoNext();
+        stopPropagation = true;
+      }
+      if (e.key === 'PageUp') {
+        goPreviousPage();
+        stopPropagation = true;
+      }
+      if (stopPropagation) {
+        e.preventDefault();
+        e.stopPropagation();
+      }
+    };
+    document.addEventListener('keydown', listener);
+    return function () {
+      document.removeEventListener('keydown', listener);
+    };
+  }, [handleGoNext, goPreviousPage]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(Provider, {
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-      className: "container",
+      className: "container story-with-sidebar",
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: "components",
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_2.LunaticComponents, {
@@ -237,30 +274,33 @@ function OrchestratorForStories(_ref3) {
             }, storeName ? getStoreInfo(storeName) : {});
           }
         })
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(Pager, {
-        goPrevious: goPreviousPage,
-        goNext: handleGoNext,
-        goToPage: goToPage,
-        lastReachedPage: lastReachedPage,
-        isLast: isLastPage,
-        isFirst: isFirstPage,
-        pageTag: pageTag,
-        maxPage: maxPage,
-        getData: getData
-      }), showOverview && /*#__PURE__*/(0, _jsxRuntime.jsx)(_overview.Overview, {
-        overview: overview,
-        goToPage: goToPage
-      }), errorsForModal && /*#__PURE__*/(0, _jsxRuntime.jsx)(lunatic.Modal, {
-        errors: errorsForModal.currentErrors,
-        goNext: skip,
-        onClose: closeModal,
-        isCritical: errorsForModal.isCritical
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_waiting["default"], {
-        status: waiting,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: "waiting-orchestrator",
-          children: "Initialisation des donn\xE9es de suggestion..."
-        })
+      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("aside", {
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(Pager, {
+          goPrevious: goPreviousPage,
+          goNext: handleGoNext,
+          goToPage: goToPage,
+          lastReachedPage: lastReachedPage,
+          isLast: isLastPage,
+          isFirst: isFirstPage,
+          pageTag: pageTag,
+          maxPage: maxPage,
+          getData: getData,
+          pager: pager
+        }), showOverview && /*#__PURE__*/(0, _jsxRuntime.jsx)(_overview.Overview, {
+          overview: overview,
+          goToPage: goToPage
+        }), errorsForModal && /*#__PURE__*/(0, _jsxRuntime.jsx)(lunatic.Modal, {
+          errors: errorsForModal.currentErrors,
+          goNext: skip,
+          onClose: closeModal,
+          isCritical: errorsForModal.isCritical
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_waiting["default"], {
+          status: waiting,
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+            className: "waiting-orchestrator",
+            children: "Initialisation des donn\xE9es de suggestion..."
+          })
+        })]
       })]
     })
   });

package/lib/stories/utils/orchestrator.scss

@@ -2,4 +2,53 @@
 	background-color: antiquewhite;
 	padding: 5px 5px;
 	border: solid burlywood 2px;
+	display: grid;
+	grid-template-columns: 1fr;
+	gap: 1rem;
+}
+
+.story-with-sidebar {
+	font-family: sans-serif;
+	display: grid;
+	height: 100%;
+	grid-template-columns: 1fr 300px;
+	align-items: flex-start;
+}
+
+.story-with-sidebar aside label {
+	display: block;
+	font-weight: bold;
+	margin-bottom: .3em;
+}
+
+.story-with-sidebar aside {
+	display: grid;
+	grid-template-columns: 1fr;
+	gap: 1rem;
+	padding: 1rem;
+	box-shadow: 0 4px 3px rgba(0, 0, 0, 0.07), 0px 2px 2px rgba(0, 0, 0, 0.06);
+	background-color: #f1f5f9;
+
+	.pagination {
+		margin-top: 0;
+	}
+}
+
+.story-pager h3 {
+	font-size: 1rem;
+	padding-bottom: .3rem;
+	margin-bottom: .5rem;
+	border-bottom: solid 1px rgba(0, 0, 0, 0.3);
+}
+
+.story-pager ul {
+	margin: 0;
+	padding: 0 0 0 20px;
+	line-height: 1.4;
+	font-size: 0.9rem;
+	color: rgba(0, 0, 0, 0.75)
+}
+
+.story-pager ul strong {
+	color: #000;
 }

package/lib/stories/utils/referentiel.js

@@ -14,19 +14,23 @@ var getReferentiel = exports.getReferentiel = /*#__PURE__*/function () {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.t0 = name;
-          _context.next = _context.t0 === 'naf-rev2-stop' ? 3 : _context.t0 === 'naf-rev2' ? 3 : _context.t0 === 'cog-communes' ? 4 : 5;
+          _context.next = _context.t0 === 'libelle-pcs2020' ? 3 : _context.t0 === 'naf-rev2-stop' ? 4 : _context.t0 === 'naf-rev2' ? 4 : _context.t0 === 'cog-communes' ? 5 : 6;
           break;
         case 3:
-          return _context.abrupt("return", fetch('https://inseefr.github.io/Lunatic/storybook/naf-rev2.json').then(function (r) {
+          return _context.abrupt("return", fetch('/libelles-pcs-2020.json').then(function (r) {
             return r.json();
           }));
         case 4:
-          return _context.abrupt("return", fetch('https://inseefr.github.io/Lunatic/storybook/communes-2019.json').then(function (r) {
+          return _context.abrupt("return", fetch('https://inseefr.github.io/Lunatic/storybook/naf-rev2.json').then(function (r) {
             return r.json();
           }));
         case 5:
-          throw new Error("Unkonw r\xE9f\xE9rentiel ".concat(name));
+          return _context.abrupt("return", fetch('https://inseefr.github.io/Lunatic/storybook/communes-2019.json').then(function (r) {
+            return r.json();
+          }));
         case 6:
+          throw new Error("Unkonw r\xE9f\xE9rentiel ".concat(name));
+        case 7:
         case "end":
           return _context.stop();
       }

package/lib/use-lunatic/commons/compile-controls.js

@@ -1,71 +1,172 @@
 "use strict";
 
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.compileControls = compileControls;
 var _commons = require("../reducer/commons");
-var _resolveComponentControls = require("../reducer/resolve-component-controls");
 var _replaceComponentSequence = require("../replace-component-sequence");
 var _typeSource = require("../type-source");
 var _fillComponentExpressions = _interopRequireDefault(require("./fill-components/fill-component-expressions"));
 var _getComponentsFromState = _interopRequireDefault(require("./get-components-from-state"));
-var _getErrorsWithoutEmptyValue = _interopRequireDefault(require("./get-errors-without-empty-value"));
+var _checkRoundaboutControl = require("../reducer/controls/check-roundabout-control");
+var _checkBaseControl = require("../reducer/controls/check-base-control");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+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; }
 /**
- * Check if components of current page have errors
+ * Check if components of the current page have errors, and return a map of error (indexed by component ID)
  */
-function validateComponents(state, components) {
-  var pager = state.pager;
-  return components.reduce(function (errors, component) {
-    var controls = component.controls,
-      id = component.id;
-    if (Array.isArray(controls)) {
-      var componentErrors = (0, _resolveComponentControls.resolveComponentControls)(state, controls);
-      var shallowIteration = pager.shallowIteration;
-      var idC = shallowIteration !== undefined ? "".concat(id, "-").concat(shallowIteration) : id;
-      return (0, _getErrorsWithoutEmptyValue["default"])(_objectSpread(_objectSpread({}, errors), {}, _defineProperty({}, idC, componentErrors)));
+function checkComponents(state, components) {
+  var errors = {};
+  var _iterator = _createForOfIteratorHelper(components),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var component = _step.value;
+      var controls = component.controls,
+        id = component.id;
+      // The component has global level controls
+      if (Array.isArray(controls)) {
+        var componentErrors = checkControls(controls.filter(function (c) {
+          return c.type !== _typeSource.ControlTypeEnum.row;
+        }), state.executeExpression, state.pager);
+        if (componentErrors.length > 0) {
+          errors[id] = componentErrors;
+        }
+      }
+
+      // For loop, inspect children
+      if ((0, _commons.isLoopComponent)(component)) {
+        var _component$controls;
+        var rowControls = (_component$controls = component.controls) === null || _component$controls === void 0 ? void 0 : _component$controls.filter(function (c) {
+          return c.type === _typeSource.ControlTypeEnum.row;
+        });
+        if (rowControls !== null && rowControls !== void 0 && rowControls.length) {
+          errors = checkComponentInLoop(state, _objectSpread(_objectSpread({}, component), {}, {
+            controls: rowControls
+          }), errors);
+        }
+        var _iterator2 = _createForOfIteratorHelper(component.components),
+          _step2;
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var child = _step2.value;
+            errors = checkComponentInLoop(state, child, errors);
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
+        }
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return errors;
+}
+function checkControls(controls, executeExpression, pager) {
+  return controls.map(function (control) {
+    switch (control.type) {
+      case _typeSource.ControlTypeEnum.roundabout:
+        return (0, _checkRoundaboutControl.checkRoundaboutControl)(control, executeExpression);
+      default:
+        return (0, _checkBaseControl.checkBaseControl)(control, executeExpression, pager);
     }
+  }).filter(function (error) {
+    return error !== undefined;
+  });
+}
 
-    //Thanks to init which split basic Loops, we only go into unPaginatedLoops
-    if ((0, _commons.isLoopComponent)(component)) {
-      var _components = component.components;
-      var recurs = validateComponents(state, _components);
-      return (0, _getErrorsWithoutEmptyValue["default"])(_objectSpread(_objectSpread({}, errors), recurs));
+/**
+ * Figure out the number of iterations of a component
+ */
+function computeIterations(component, executeExpression) {
+  if ('iterations' in component) {
+    return executeExpression(component.iterations.value);
+  }
+  if ('response' in component) {
+    var value = executeExpression(component.response.name);
+    if (Array.isArray(value)) {
+      return value.length;
     }
-    // Keep previous errors to allow multiple controls in same page (multiple question/component in the same page)
+  }
+  // Look at the first component
+  if ('components' in component) {
+    return computeIterations(component.components[0], executeExpression);
+  }
+  return 0;
+}
+
+/**
+ * Check controls on a component for each iteration
+ * Errors are returned using a map of id suffixed with the iteration index (ex: {prenom-1: [], prenom-3: []})
+ */
+function checkComponentInLoop(state, component, errors) {
+  // The component has no controls, skip it
+  if (!Array.isArray(component.controls)) {
     return errors;
-  }, {});
+  }
+
+  // Execute control for each iteration
+  var iterations = computeIterations(component, state.executeExpression);
+  for (var i = 0; i < iterations; i++) {
+    // Create a pager representing the iteration we want to check
+    var iterationPager = _objectSpread(_objectSpread({}, state.pager), {}, {
+      iteration: i,
+      nbIterations: iterations
+    });
+    // The component is filtered on this iteration, skip it
+    if (component.conditionFilter && !state.executeExpression(component.conditionFilter.value, iterationPager)) {
+      continue;
+    }
+    var componentErrors = checkControls(component.controls, state.executeExpression, iterationPager);
+    if (componentErrors.length > 0) {
+      errors["".concat(component.id, "-").concat(i)] = componentErrors;
+    }
+  }
+  return errors;
 }
-function isCriticalErrors(errors) {
-  if (errors) {
-    return Object.values(errors).flat().reduce(function (status, _ref) {
-      var criticality = _ref.criticality,
-        typeOfControl = _ref.typeOfControl;
-      return status || typeOfControl === _typeSource.TypeOfControl.FORMAT || criticality.startsWith(_typeSource.Criticality.ERROR);
-    }, false);
+
+/**
+ * Check if there is a critical error (type: "Error" and criticality: "Format")
+ */
+function hasCriticalError(errors) {
+  if (!errors) {
+    return false;
   }
-  return false;
+  // Look for at least one critical error in the list
+  var criticalError = Object.values(errors).flat().find(function (error) {
+    return error.criticality.startsWith(_typeSource.Criticality.ERROR) || error.typeOfControl === _typeSource.TypeOfControl.FORMAT;
+  });
+  return criticalError !== undefined;
 }
+
+/**
+ * Check controls for currently visible components and output errors
+ */
 function compileControls(state) {
   var components = (0, _replaceComponentSequence.replaceComponentSequence)((0, _getComponentsFromState["default"])(state));
   var componentFiltered = components.map(function (component) {
     return (0, _fillComponentExpressions["default"])(component, state);
-  }).filter(function (_ref2) {
-    var conditionFilter = _ref2.conditionFilter;
+  }).filter(function (_ref) {
+    var conditionFilter = _ref.conditionFilter;
     return conditionFilter !== null && conditionFilter !== void 0 ? conditionFilter : true;
   });
-  var errors = validateComponents(state, componentFiltered);
+  var errors = checkComponents(state, componentFiltered);
   var currentErrors = Object.keys(errors).length > 0 ? errors : undefined;
-  var isCritical = isCriticalErrors(currentErrors);
   return {
     currentErrors: currentErrors,
-    isCritical: isCritical
+    isCritical: hasCriticalError(currentErrors)
   };
 }

package/lib/use-lunatic/commons/fill-components/fill-component-value.js

@@ -32,5 +32,15 @@ function getValueForComponent(component, state) {
   if ((0, _component.hasResponse)(component)) {
     return state.variables.get(component.response.name, iteration);
   }
+  // For loop, value will be a map of child component values
+  if ('components' in component) {
+    return Object.fromEntries(component.components.map(function (c) {
+      return 'response' in c ? c.response.name : null;
+    }).filter(function (name) {
+      return name !== null;
+    }).map(function (name) {
+      return [name, state.variables.get(name)];
+    }));
+  }
   return null;
 }

package/lib/use-lunatic/commons/fill-components/fill-specific-expression.js

@@ -114,7 +114,10 @@ function fillTable(component, state) {
         if ((0, _component.hasComponentType)(component)) {
           return (0, _fillComponents.fillComponent)(component, state);
         }
-        return state.executeExpression((0, _vtl.getVTLCompatibleValue)(component.label));
+        // We can have a non typed component with extra attributes (colspan, rowspan)
+        return _objectSpread(_objectSpread({}, component), {}, {
+          label: state.executeExpression((0, _vtl.getVTLCompatibleValue)(component.label))
+        });
       });
     })
   });

package/lib/use-lunatic/commons/variables/behaviours/cleaning-behaviour.js

@@ -24,16 +24,21 @@ function cleaningBehaviour(store, cleaning) {
       return;
     }
     for (var variableName in cleaningInfo) {
-      var _initialValues$variab;
-      var skipCleaning = store.run(cleaningInfo[variableName], {
-        iteration: e.detail.iteration
-      });
-      if (skipCleaning) {
-        continue;
+      try {
+        var _initialValues$variab;
+        var skipCleaning = store.run(cleaningInfo[variableName], {
+          iteration: e.detail.iteration
+        });
+        if (skipCleaning) {
+          continue;
+        }
+        store.set(variableName, (_initialValues$variab = initialValues[variableName]) !== null && _initialValues$variab !== void 0 ? _initialValues$variab : null, {
+          iteration: e.detail.iteration
+        });
+      } catch (e) {
+        // If we have an error, skip this cleaning
+        console.error(e);
       }
-      store.set(variableName, (_initialValues$variab = initialValues[variableName]) !== null && _initialValues$variab !== void 0 ? _initialValues$variab : null, {
-        iteration: e.detail.iteration
-      });
     }
   });
 }

package/lib/use-lunatic/commons/variables/get-questionnaire-data.js

@@ -53,7 +53,12 @@ function getQuestionnaireData(store, variables) {
           COLLECTED: store.get(variable.name)
         });
       } else {
-        result[variable.variableType][variable.name] = store.get(variable.name);
+        try {
+          result[variable.variableType][variable.name] = store.get(variable.name);
+        } catch (e) {
+          // Error can happen when calculating variable, send null to prevent crashing the mehod
+          result[variable.variableType][variable.name] = null;
+        }
       }
     }
   } catch (err) {