@inseefr/lunatic 2.0.0-v2 → 2.0.0-v2test

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

@@ -4,146 +4,116 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _commons = require("../commons");
-
+var _pageTag = require("../commons/page-tag");
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 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 _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 _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0) { ; } } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 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 _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 _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 _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; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-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 _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); }
 /* à bouger d'ici */
+
 function getInitalValueFromCollected(variable) {
   var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var values = variable.values,
-      name = variable.name;
+    name = variable.name;
   var fromData;
-
   if (name in data) {
     var _data$name = data[name],
-        COLLECTED = _data$name.COLLECTED,
-        FORCED = _data$name.FORCED;
+      COLLECTED = _data$name.COLLECTED,
+      FORCED = _data$name.FORCED;
     fromData = COLLECTED || FORCED;
   }
-
   if (values) {
     var _COLLECTED = values.COLLECTED,
-        _FORCED = values.FORCED;
+      _FORCED = values.FORCED;
     return fromData || _FORCED || _COLLECTED;
   }
-
   return undefined;
 }
-
 function getInitialValueFromExternal(variable) {
   var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var name = variable.name;
-
   if (name in data) {
     return data[name];
   }
-
   return undefined;
 }
-
 function getInitialValue(variable) {
   var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var COLLECTED = data.COLLECTED,
-      EXTERNAL = data.EXTERNAL,
-      CALCULATED = data.CALCULATED;
+    EXTERNAL = data.EXTERNAL,
+    CALCULATED = data.CALCULATED;
   var variableType = variable.variableType;
-
   switch (variableType) {
     case 'COLLECTED':
       return getInitalValueFromCollected(variable, COLLECTED);
-
     case 'EXTERNAL':
       return getInitialValueFromExternal(variable, EXTERNAL);
-
     case 'CALCULATED':
       return getInitialValueFromExternal(variable, CALCULATED);
-
     default:
       return null;
   }
 }
-
 function appendToArrayMap(map, key, entry) {
   if (key in map) {
     return _objectSpread(_objectSpread({}, map), {}, _defineProperty({}, key, [].concat(_toConsumableArray(map[key]), [entry])));
   }
-
   return _objectSpread(_objectSpread({}, map), {}, _defineProperty({}, key, [entry]));
 }
-
 function appendToObjectMap(map, key, object) {
   if (key in map) {
     return _objectSpread(_objectSpread({}, map), {}, _defineProperty({}, key, _objectSpread(_objectSpread({}, map[key]), object)));
   }
-
   return _objectSpread(_objectSpread({}, map), {}, _defineProperty({}, key, object));
 }
+
 /**
  *
  * @param {*} source
  * @param {*} data
  * @returns
  */
-
-
 function createVariables(source, data) {
   var _source$variables = source.variables,
-      variables = _source$variables === void 0 ? [] : _source$variables;
-
+    variables = _source$variables === void 0 ? [] : _source$variables;
   var _variables$reduce = variables.reduce(function (_ref, variable) {
-    var _ref2 = _slicedToArray(_ref, 2),
+      var _ref2 = _slicedToArray(_ref, 2),
         mapType = _ref2[0],
         mapVar = _ref2[1];
-
-    var type = variable.variableType,
+      var type = variable.variableType,
         name = variable.name;
-    return [appendToArrayMap(mapType, type, variable), appendToObjectMap(mapVar, name, {
-      variable: variable,
-      type: type,
-      value: getInitialValue(variable, data)
-    })];
-  }, [{}, {}]),
-      _variables$reduce2 = _slicedToArray(_variables$reduce, 2),
-      mapVariablesTypes = _variables$reduce2[0],
-      mapVariables = _variables$reduce2[1]; //
-
-
+      return [appendToArrayMap(mapType, type, variable), appendToObjectMap(mapVar, name, {
+        variable: variable,
+        type: type,
+        value: getInitialValue(variable, data)
+      })];
+    }, [{}, {}]),
+    _variables$reduce2 = _slicedToArray(_variables$reduce, 2),
+    mapVariablesTypes = _variables$reduce2[0],
+    mapVariables = _variables$reduce2[1];
+  //
   var _mapVariablesTypes$CA = mapVariablesTypes.CALCULATED,
-      CALCULATED = _mapVariablesTypes$CA === void 0 ? [] : _mapVariablesTypes$CA;
+    CALCULATED = _mapVariablesTypes$CA === void 0 ? [] : _mapVariablesTypes$CA;
   CALCULATED.forEach(function (calculated) {
     var _calculated$bindingDe = calculated.bindingDependencies,
-        bindingDependencies = _calculated$bindingDe === void 0 ? [] : _calculated$bindingDe;
+      bindingDependencies = _calculated$bindingDe === void 0 ? [] : _calculated$bindingDe;
     bindingDependencies.forEach(function (name) {
       if (name in mapVariables) {
         var variable = mapVariables[name];
         var CalculatedLinked = variable.CalculatedLinked;
-
         if (CalculatedLinked) {
           CalculatedLinked.push(calculated);
         } else {
@@ -156,70 +126,69 @@ function createVariables(source, data) {
 }
 /* */
 
-
-function checkInLoop(state) {
+function checkInLoop(state, initialPager) {
   var pager = state.pager,
-      pages = state.pages,
-      executeExpression = state.executeExpression;
+    pages = state.pages,
+    executeExpression = state.executeExpression;
   var page = pager.page;
-
   if (page in pages) {
     var _pages$page = pages[page],
-        isLoop = _pages$page.isLoop,
-        subPages = _pages$page.subPages,
-        iterations = _pages$page.iterations,
-        loopDependencies = _pages$page.loopDependencies;
-
+      isLoop = _pages$page.isLoop,
+      subPages = _pages$page.subPages,
+      iterations = _pages$page.iterations,
+      loopDependencies = _pages$page.loopDependencies;
     if (isLoop) {
       return _objectSpread(_objectSpread({}, state), {}, {
+        isInLoop: true,
         pager: _objectSpread(_objectSpread({}, pager), {}, {
-          subPage: 0,
+          subPage: initialPager.subPage || 0,
           nbSubPages: subPages.length,
-          iteration: 0,
+          iteration: initialPager.iteration || 0,
           nbIterations: executeExpression(iterations, {
-            iteration: 0,
+            iteration: undefined,
             bindingDependencies: loopDependencies
           })
         })
       });
     }
   }
-
   return state;
 }
-
 function reduceOnInit(state, action) {
   var payload = action.payload;
   var source = payload.source,
-      data = payload.data,
-      initialPage = payload.initialPage,
-      features = payload.features,
-      handleChange = payload.handleChange,
-      preferences = payload.preferences,
-      savingType = payload.savingType,
-      management = payload.management,
-      activeControls = payload.activeControls;
-
+    data = payload.data,
+    initialPage = payload.initialPage,
+    features = payload.features,
+    handleChange = payload.handleChange,
+    preferences = payload.preferences,
+    savingType = payload.savingType,
+    management = payload.management,
+    activeControls = payload.activeControls;
   if (source && data) {
     var variables = createVariables(source, data); // map des variables
-
     var _createExecuteExpress = (0, _commons.createExecuteExpression)(variables, features),
-        _createExecuteExpress2 = _slicedToArray(_createExecuteExpress, 4),
-        executeExpression = _createExecuteExpress2[0],
-        updateBindings = _createExecuteExpress2[1],
-        setLoopBindings = _createExecuteExpress2[2],
-        resetLoopBindings = _createExecuteExpress2[3];
-
+      _createExecuteExpress2 = _slicedToArray(_createExecuteExpress, 4),
+      executeExpression = _createExecuteExpress2[0],
+      updateBindings = _createExecuteExpress2[1],
+      setLoopBindings = _createExecuteExpress2[2],
+      resetLoopBindings = _createExecuteExpress2[3];
     var pages = (0, _commons.checkLoops)((0, _commons.createMapPages)(source));
     var maxPage = source.maxPage,
-        _source$cleaning = source.cleaning,
-        cleaning = _source$cleaning === void 0 ? {} : _source$cleaning,
-        _source$missingBlock = source.missingBlock,
-        missingBlock = _source$missingBlock === void 0 ? {} : _source$missingBlock,
-        _source$resizing = source.resizing,
-        resizing = _source$resizing === void 0 ? {} : _source$resizing;
+      _source$cleaning = source.cleaning,
+      cleaning = _source$cleaning === void 0 ? {} : _source$cleaning,
+      _source$missingBlock = source.missingBlock,
+      missingBlock = _source$missingBlock === void 0 ? {} : _source$missingBlock,
+      _source$resizing = source.resizing,
+      resizing = _source$resizing === void 0 ? {} : _source$resizing;
+    var initialPager = (0, _pageTag.getPagerFromPageTag)(initialPage);
+    if (!initialPager) {
+      initialPager = {
+        page: 1
+      };
+    }
     var pager = {
-      page: initialPage,
+      page: initialPager.page,
       maxPage: maxPage,
       subPage: undefined,
       nbSubPages: undefined,
@@ -227,11 +196,9 @@ function reduceOnInit(state, action) {
       nbIterations: undefined,
       lastReachedPage: initialPage
     };
-
     var _isFirstLastPage = (0, _commons.isFirstLastPage)(pager),
-        isFirstPage = _isFirstLastPage.isFirstPage,
-        isLastPage = _isFirstLastPage.isLastPage;
-
+      isFirstPage = _isFirstLastPage.isFirstPage,
+      isLastPage = _isFirstLastPage.isLastPage;
     return checkInLoop(_objectSpread(_objectSpread({}, state), {}, {
       cleaning: cleaning,
       missingBlock: missingBlock,
@@ -250,11 +217,9 @@ function reduceOnInit(state, action) {
       management: management,
       savingType: savingType,
       activeControls: activeControls
-    }));
+    }), initialPager);
   }
-
   return state;
 }
-
 var _default = reduceOnInit;
 exports["default"] = _default;

package/lib/use-lunatic/reducer/reduce-on-set-waiting.js

@@ -4,13 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-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 _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 reduceOnSetWaiting(state, action) {
   var payload = action.payload;
   var status = payload.status;
@@ -18,6 +17,5 @@ function reduceOnSetWaiting(state, action) {
     waiting: status
   });
 }
-
 var _default = reduceOnSetWaiting;
 exports["default"] = _default;

package/lib/use-lunatic/reducer/reducer.js

@@ -1,58 +1,38 @@
 "use strict";
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _reduceOnInit = _interopRequireDefault(require("./reduce-on-init"));
-
 var _reduceGoPreviousPage = _interopRequireDefault(require("./reduce-go-previous-page"));
-
 var _reduceGoNextPage = _interopRequireDefault(require("./reduce-go-next-page"));
-
 var _reduceGoToPage = _interopRequireDefault(require("./reduce-go-to-page"));
-
 var _reduceHandleChange = _interopRequireDefault(require("./reduce-handle-change"));
-
 var _reduceOnSetWaiting = _interopRequireDefault(require("./reduce-on-set-waiting"));
-
 var actions = _interopRequireWildcard(require("../actions"));
-
 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); }
-
 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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 function reducer(state, action) {
   var type = action.type;
-
   switch (type) {
     case actions.ON_INIT:
       return (0, _reduceOnInit["default"])(state, action);
-
     case actions.GO_PREVIOUS_PAGE:
       return (0, _reduceGoPreviousPage["default"])(state, action);
-
     case actions.GO_NEXT_PAGE:
       return (0, _reduceGoNextPage["default"])(state, action);
-
     case actions.GO_TO_PAGE:
       return (0, _reduceGoToPage["default"])(state, action);
-
     case actions.HANDLE_CHANGE:
       return (0, _reduceHandleChange["default"])(state, action);
-
     case actions.ON_SET_WAITING:
       return (0, _reduceOnSetWaiting["default"])(state, action);
-
     default:
       return state;
   }
 }
-
 var _default = reducer;
 exports["default"] = _default;

package/lib/use-lunatic/reducer/validate-controls/create-controls-reducer.js

@@ -4,56 +4,57 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _validationUtils = require("./validation-utils");
-
 var _commons = require("../../commons");
-
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-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 _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 validateComponents(state, components) {
-  var pager = state.pager; // TODO check components in components (Loop, etc...)
-
+  var pager = state.pager;
   return components.reduce(function (errors, component) {
-    var controls = component.controls;
-
+    var controls = component.controls,
+      componentType = component.componentType,
+      id = component.id;
     if (Array.isArray(controls)) {
       var componentErrors = (0, _validationUtils.resolveComponentControls)(state, controls);
-
-      if (componentErrors.length) {
-        return _objectSpread(_objectSpread({}, errors), {}, _defineProperty({}, (0, _commons.getPageTag)(pager), componentErrors));
-      }
-    } // If no error we remove the possible previous errors
-
-
-    return _objectSpread(_objectSpread({}, errors), {}, _defineProperty({}, (0, _commons.getPageTag)(pager), []));
+      var shallowIteration = pager.shallowIteration;
+      var idC = shallowIteration !== undefined ? "".concat(id, "-").concat(shallowIteration) : id;
+      return _objectSpread(_objectSpread({}, errors), {}, _defineProperty({}, idC, componentErrors));
+    }
+    //Thanks to init which split basic Loops, we only go into unPaginatedLoops
+    if (['Loop', 'RosterForLoop'].includes(componentType)) {
+      var _components = component.components;
+      var recurs = validateComponents(state, _components);
+      return _objectSpread(_objectSpread(_objectSpread({}, (state.errors || {})[(0, _commons.getPageTag)(pager)] || {}), errors), recurs);
+    }
+    // If no error we remove the possible previous errors
+    return {};
   }, {});
 }
-
 function createControlsReducer(reducer) {
   // Nothing to init
   return function (state, action) {
     var activeControls = state.activeControls;
     var updatedState = reducer(state, action);
-    if (!activeControls || state.pager.lastReachedPage !== updatedState.pager.lastReachedPage) //if no active controls or is the first time we reach the page
+    if (!activeControls || state.pager.lastReachedPage !== updatedState.pager.lastReachedPage)
+      //if no active controls or is the first time we reach the page
       return _objectSpread(_objectSpread({}, updatedState), {}, {
         currentErrors: undefined
       });
     var components = (0, _commons.getComponentsFromState)(updatedState);
-
-    var errors = _objectSpread(_objectSpread({}, state.errors), validateComponents(updatedState, components));
-
     var pager = updatedState.pager;
+    var _state$errors = state.errors,
+      errors = _state$errors === void 0 ? {} : _state$errors;
+    var pageTag = (0, _commons.getPageTag)(pager);
+    var e = _objectSpread(_objectSpread({}, errors), {}, _defineProperty({}, pageTag, validateComponents(updatedState, components)));
     return _objectSpread(_objectSpread({}, updatedState), {}, {
-      errors: errors,
-      currentErrors: errors[(0, _commons.getPageTag)(pager)]
+      errors: e,
+      currentErrors: e[pageTag]
     });
   };
 }
-
 var _default = createControlsReducer;
 exports["default"] = _default;

package/lib/use-lunatic/reducer/validate-controls/create-modal-controls-reducer.js

@@ -5,84 +5,80 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 exports.isErrors = isErrors;
-
 var _validationUtils = require("./validation-utils");
-
 var _commons = require("../../commons");
-
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-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 _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 validateComponentsForModal(state, components) {
-  var pager = state.pager; // TODO check components in components (Loop, etc...)
-
+  var pager = state.pager;
   return components.reduce(function (errors, component) {
-    var controls = component.controls;
-
+    var controls = component.controls,
+      componentType = component.componentType,
+      id = component.id;
     if (Array.isArray(controls)) {
       var componentErrors = (0, _validationUtils.resolveComponentControls)(state, controls);
-
       if (componentErrors.length) {
-        return _objectSpread(_objectSpread({}, errors), {}, _defineProperty({}, (0, _commons.getPageTag)(pager), componentErrors));
+        var shallowIteration = pager.shallowIteration;
+        var idC = shallowIteration !== undefined ? "".concat(id, "-").concat(shallowIteration) : id;
+        return (0, _commons.getErrorsWithoutEmptyValue)(_objectSpread(_objectSpread({}, errors), {}, _defineProperty({}, idC, componentErrors)));
       }
     }
-
-    return errors;
+    //Thanks to init which split basic Loops, we only go into unPaginatedLoops
+    if (['Loop', 'RosterForLoop'].includes(componentType)) {
+      // TODO handle the case where shallowInteration hasn't been initalized because not handleChange fired
+      var _components = component.components;
+      var recurs = validateComponentsForModal(state, _components);
+      return (0, _commons.getErrorsWithoutEmptyValue)(_objectSpread(_objectSpread(_objectSpread({}, (state.errors || {})[(0, _commons.getPageTag)(pager)] || {}), errors), recurs));
+    }
+    // If no error we remove the possible previous errors
+    return {};
   }, {});
 }
-
 function isErrors(errors) {
   if (errors) {
     return Object.keys(errors).length > 0;
   }
-
   return false;
 }
-
 function createModalControlsReducer(reducer) {
   // Nothing to init
   return function (state, action) {
     var payload = action.payload;
     var activeControls = state.activeControls,
-        errors = state.errors;
+      errors = state.errors;
     var block = payload.block;
     if (!activeControls) return reducer(_objectSpread(_objectSpread({}, state), {}, {
       modalErrors: undefined
     }), action);
     var components = (0, _commons.getComponentsFromState)(state);
     var prec = state.modalErrors;
-
     if (block) {
       // Block the modal and stay in page so we add the error in the current page
       return _objectSpread(_objectSpread({}, state), {}, {
         modalErrors: undefined,
-        currentErrors: prec[(0, _commons.getPageTag)(state.pager)]
+        currentErrors: prec
       });
     }
-
     if (prec) {
       return reducer(_objectSpread(_objectSpread({}, state), {}, {
         modalErrors: undefined
       }), action);
     }
-
     var modalErrors = validateComponentsForModal(state, components);
-
     if (isErrors(modalErrors)) {
       return _objectSpread(_objectSpread({}, state), {}, {
         modalErrors: modalErrors,
         errors: _objectSpread(_objectSpread({}, errors), modalErrors)
       });
     }
-
     return reducer(_objectSpread(_objectSpread({}, state), {}, {
       modalErrors: undefined
     }), action);
   };
 }
-
 var _default = createModalControlsReducer;
 exports["default"] = _default;

package/lib/use-lunatic/reducer/validate-controls/index.js

@@ -15,9 +15,6 @@ Object.defineProperty(exports, "createModalControlsReducer", {
     return _createModalControlsReducer["default"];
   }
 });
-
 var _createControlsReducer = _interopRequireDefault(require("./create-controls-reducer"));
-
 var _createModalControlsReducer = _interopRequireDefault(require("./create-modal-controls-reducer"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }