@inseefr/lunatic 0.4.3-v2 → 0.4.4-v2

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

@@ -53,10 +53,10 @@
 					"id": "l14vfucm-CI-0",
 					"criticality": "WARN",
 					"control": {
-						"value": "not(cast(nvl(Q1,\"0\"),integer)) > 3)",
+						"value": "not(cast(Q1,integer) > 3)",
 						"type": "VTL"
 					},
-					"errorMessage": { "value": "Supérieur à 3", "type": "VTL|MD" },
+					"errorMessage": { "value": "\"Supérieur à 3\"", "type": "VTL|MD" },
 					"bindingDependencies": ["Q1"]
 				}
 			],
@@ -225,7 +225,7 @@
 							"id": "l5ghsjv2-CI-0",
 							"criticality": "WARN",
 							"control": { "value": "not(isnull(Q5))", "type": "VTL" },
-							"errorMessage": { "value": "Q5 est vide ", "type": "VTL|MD" },
+							"errorMessage": { "value": "\"Q5 est vide\"", "type": "VTL|MD" },
 							"bindingDependencies": ["Q5"]
 						}
 					],

package/lib/stories/questionnaires-test/controls/controls.stories.js

@@ -52,7 +52,7 @@ var stories = {
       control: 'boolean',
       defaultValue: false
     },
-    modalForControls: {
+    activeControls: {
       control: 'boolean',
       defaultValue: true
     }
@@ -78,7 +78,7 @@ SimpleNum.args = {
   id: 'controls-simple-num',
   source: _V2_ControlesNum_horsBoucle_PasPageFin["default"],
   pagination: true,
-  modalForControls: true
+  activeControls: true
 };
 var LinkedLoop = Template.bind({});
 exports.LinkedLoop = LinkedLoop;
@@ -86,7 +86,7 @@ LinkedLoop.args = {
   id: 'controls-linked-loop',
   source: _V2_Controles_BouclesLiees_PasPageFin["default"],
   pagination: true,
-  modalForControls: true
+  activeControls: true
 };
 var LinkedLoop2 = Template.bind({});
 exports.LinkedLoop2 = LinkedLoop2;
@@ -94,5 +94,5 @@ LinkedLoop2.args = {
   id: 'controls-linked-loop2',
   source: _V2_Controles_BouclesLiees2_PasPageFin["default"],
   pagination: true,
-  modalForControls: true
+  activeControls: true
 };

package/lib/stories/utils/default-arg-types.js

@@ -11,7 +11,7 @@ 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; }
 
-var fields = ['source', 'id', 'pagination', 'data', 'management', 'modalForControls', 'features', 'initialPage', 'getStoreInfo', 'missing', 'shortcut', 'activeGoNextForMissing', 'filterDescription'];
+var fields = ['source', 'id', 'pagination', 'data', 'management', 'activeControls', 'features', 'initialPage', 'getStoreInfo', 'missing', 'shortcut', 'activeGoNextForMissing', 'filterDescription'];
 var defaultArgTypes = fields.reduce(function (acc, f) {
   return _objectSpread(_objectSpread({}, acc), {}, _defineProperty({}, f, {
     table: {

package/lib/stories/utils/orchestrator.js

@@ -15,7 +15,7 @@ require("./custom-lunatic.scss");
 
 var _waiting = _interopRequireDefault(require("./waiting"));
 
-var _excluded = ["source", "data", "management", "modalForControls", "features", "initialPage", "getStoreInfo", "missing", "shortcut", "activeGoNextForMissing", "suggesterFetcher", "autoSuggesterLoading", "suggesters", "addExternal", "preferences", "custom", "filterDescription"],
+var _excluded = ["source", "data", "management", "activeControls", "features", "initialPage", "getStoreInfo", "missing", "shortcut", "activeGoNextForMissing", "suggesterFetcher", "autoSuggesterLoading", "suggesters", "addExternal", "preferences", "custom", "filterDescription"],
     _excluded2 = ["id", "componentType", "response", "storeName"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -42,7 +42,7 @@ function Pager(_ref) {
       isFirst = _ref.isFirst,
       pageTag = _ref.pageTag,
       maxPage = _ref.maxPage,
-      getState = _ref.getState;
+      getData = _ref.getData;
 
   if (maxPage && maxPage > 1) {
     var Button = lunatic.Button;
@@ -56,7 +56,7 @@ function Pager(_ref) {
       disabled: isLast
     }, "Next"), /*#__PURE__*/_react["default"].createElement(Button, {
       onClick: function onClick() {
-        return console.log(getState(true));
+        return console.log(getData(true));
       }
     }, "Get State"), /*#__PURE__*/_react["default"].createElement(Button, {
       onClick: function onClick() {
@@ -83,8 +83,8 @@ function OrchestratorForStories(_ref2) {
       data = _ref2.data,
       _ref2$management = _ref2.management,
       management = _ref2$management === void 0 ? false : _ref2$management,
-      _ref2$modalForControl = _ref2.modalForControls,
-      modalForControls = _ref2$modalForControl === void 0 ? false : _ref2$modalForControl,
+      _ref2$activeControls = _ref2.activeControls,
+      activeControls = _ref2$activeControls === void 0 ? false : _ref2$activeControls,
       features = _ref2.features,
       _ref2$initialPage = _ref2.initialPage,
       initialPage = _ref2$initialPage === void 0 ? '1' : _ref2$initialPage,
@@ -118,7 +118,7 @@ function OrchestratorForStories(_ref2) {
     suggesters: suggesters,
     suggesterFetcher: suggesterFetcher,
     management: management,
-    modalForControls: modalForControls
+    activeControls: activeControls
   }),
       getComponents = _lunatic$useLunatic.getComponents,
       goPreviousPage = _lunatic$useLunatic.goPreviousPage,
@@ -129,10 +129,17 @@ function OrchestratorForStories(_ref2) {
       isLastPage = _lunatic$useLunatic.isLastPage,
       waiting = _lunatic$useLunatic.waiting,
       getErrors = _lunatic$useLunatic.getErrors,
-      getState = _lunatic$useLunatic.getState;
+      getModalErrors = _lunatic$useLunatic.getModalErrors,
+      getCurrentErrors = _lunatic$useLunatic.getCurrentErrors,
+      getData = _lunatic$useLunatic.getData;
 
   var components = getComponents();
   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", {
@@ -157,7 +164,8 @@ function OrchestratorForStories(_ref2) {
       missingStrategy: goNextPage,
       shortcut: shortcut,
       custom: custom,
-      filterDescription: filterDescription
+      filterDescription: filterDescription,
+      errors: currentErrors
     })));
   })), /*#__PURE__*/_react["default"].createElement(Pager, {
     goPrevious: goPreviousPage,
@@ -167,10 +175,10 @@ function OrchestratorForStories(_ref2) {
     isFirst: isFirstPage,
     pageTag: pageTag,
     maxPage: maxPage,
-    getState: getState
+    getData: getData
   }), /*#__PURE__*/_react["default"].createElement(lunatic.Modal, {
     title: "Des points requi\xE8rent votre attention.",
-    errors: errors,
+    errors: modalErrors,
     goNext: goNextPage
   }), /*#__PURE__*/_react["default"].createElement(_waiting["default"], {
     status: waiting

package/lib/use-lunatic/actions.js

@@ -54,7 +54,7 @@ var onInit = function onInit(_ref3) {
       savingType = _ref3.savingType,
       management = _ref3.management,
       handleChange = _ref3.handleChange,
-      modalForControls = _ref3.modalForControls;
+      activeControls = _ref3.activeControls;
   return {
     type: ON_INIT,
     payload: {
@@ -66,7 +66,7 @@ var onInit = function onInit(_ref3) {
       savingType: savingType,
       management: management,
       handleChange: handleChange,
-      modalForControls: modalForControls
+      activeControls: activeControls
     }
   };
 };

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

@@ -66,6 +66,7 @@ function createRefreshCalculated(_ref) {
         linksIterations: linksIterations
       }) : undefined
     });
+    if (linksIterations !== undefined) return value;
 
     if (shapeFrom && iteration !== undefined) {
       if (bindings[name] === undefined) {

package/lib/use-lunatic/commons/index.js

@@ -45,10 +45,16 @@ Object.defineProperty(exports, "getComponentsFromState", {
     return _getComponentsFromState["default"];
   }
 });
+Object.defineProperty(exports, "getNewReachedPage", {
+  enumerable: true,
+  get: function get() {
+    return _pageTag.getNewReachedPage;
+  }
+});
 Object.defineProperty(exports, "getPageTag", {
   enumerable: true,
   get: function get() {
-    return _getPageTag["default"];
+    return _pageTag.getPageTag;
   }
 });
 Object.defineProperty(exports, "isFirstLastPage", {
@@ -57,6 +63,12 @@ Object.defineProperty(exports, "isFirstLastPage", {
     return _isFirstLastPage["default"];
   }
 });
+Object.defineProperty(exports, "isNewReachedPage", {
+  enumerable: true,
+  get: function get() {
+    return _pageTag.isNewReachedPage;
+  }
+});
 Object.defineProperty(exports, "isPaginatedLoop", {
   enumerable: true,
   get: function get() {
@@ -86,7 +98,7 @@ var _getComponentsFromState = _interopRequireDefault(require("./get-components-f
 
 var _useComponentsFromState = _interopRequireDefault(require("./use-components-from-state"));
 
-var _getPageTag = _interopRequireDefault(require("./get-page-tag"));
+var _pageTag = require("./page-tag");
 
 var _isFirstLastPage = _interopRequireDefault(require("./is-First-last-page"));
 

package/lib/use-lunatic/commons/page-tag.js

@@ -0,0 +1,83 @@
+"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.getNewReachedPage = getNewReachedPage;
+exports.getPageTag = getPageTag;
+exports.isNewReachedPage = isNewReachedPage;
+
+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 _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 _wrapRegExp() { _wrapRegExp = function _wrapRegExp(re, groups) { return new BabelRegExp(re, void 0, groups); }; var _super = RegExp.prototype, _groups = new WeakMap(); function BabelRegExp(re, flags, groups) { var _this = new RegExp(re, flags); return _groups.set(_this, groups || _groups.get(re)), _setPrototypeOf(_this, BabelRegExp.prototype); } function buildGroups(result, re) { var g = _groups.get(re); return Object.keys(g).reduce(function (groups, name) { return groups[name] = result[g[name]], groups; }, Object.create(null)); } return _inherits(BabelRegExp, RegExp), BabelRegExp.prototype.exec = function (str) { var result = _super.exec.call(this, str); return result && (result.groups = buildGroups(result, this)), result; }, BabelRegExp.prototype[Symbol.replace] = function (str, substitution) { if ("string" == typeof substitution) { var groups = _groups.get(this); return _super[Symbol.replace].call(this, str, substitution.replace(/\$<([^>]+)>/g, function (_, name) { return "$" + groups[name]; })); } if ("function" == typeof substitution) { var _this = this; return _super[Symbol.replace].call(this, str, function () { var args = arguments; return "object" != _typeof(args[args.length - 1]) && (args = [].slice.call(args)).push(buildGroups(args, _this)), substitution.apply(this, args); }); } return _super[Symbol.replace].call(this, str, substitution); }, _wrapRegExp.apply(this, arguments); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+function getPageTag(pager) {
+  var page = pager.page,
+      subPage = pager.subPage,
+      iteration = pager.iteration;
+
+  if (subPage !== undefined && iteration !== undefined) {
+    return "".concat(page, ".").concat(subPage + 1, "#").concat(iteration + 1);
+  }
+
+  return "".concat(page);
+}
+
+function getPagerFromPageTag(pageTag) {
+  var pattern = /*#__PURE__*/_wrapRegExp(/(\d+)\.?(\d+)?#?(\d+)?/g, {
+    page: 1,
+    subPagePlusUn: 2,
+    iterationPlusUn: 3
+  });
+
+  var match = _toConsumableArray(pageTag.matchAll(pattern));
+
+  var _match = _slicedToArray(match, 1),
+      _match$0$groups = _match[0].groups,
+      page = _match$0$groups.page,
+      subPagePlusUn = _match$0$groups.subPagePlusUn,
+      iterationPlusUn = _match$0$groups.iterationPlusUn;
+
+  return {
+    page: page,
+    subPage: subPagePlusUn - 1,
+    iteration: iterationPlusUn - 1
+  };
+}
+
+function isNewReachedPage(pager) {
+  var lastReachedPage = pager.lastReachedPage,
+      page = pager.page,
+      subPage = pager.subPage,
+      iteration = pager.iteration;
+  var reachedPager = getPagerFromPageTag(lastReachedPage);
+  return Number.parseInt(page) > Number.parseInt(reachedPager.page) || Number.parseInt(page) === Number.parseInt(reachedPager.page) && Number.parseInt(subPage) > Number.parseInt(reachedPager.subPage) || Number.parseInt(page) === Number.parseInt(reachedPager.page) && Number.parseInt(subPage) === Number.parseInt(reachedPager.subPage) && Number.parseInt(iteration) > Number.parseInt(reachedPager.iteration);
+}
+
+function getNewReachedPage(pager) {
+  return isNewReachedPage(pager) ? getPageTag(pager) : pager.lastReachedPage;
+}

package/lib/use-lunatic/initial-state.js

@@ -30,12 +30,14 @@ var INITIAL_STATE = {
   },
   waiting: false,
   errors: undefined,
+  currentErrors: undefined,
+  modalErrors: undefined,
 
   /* fonctionnalités vtl & md */
   updateBindings: function updateBindings() {},
   executeExpression: function executeExpression() {},
   handleChange: function handleChange() {},
-  modalForControls: false
+  activeControls: false
 };
 var _default = INITIAL_STATE;
 exports["default"] = _default;

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

@@ -34,40 +34,54 @@ function getNextPage(state) {
 function reduceNextSubPage(state) {
   var pager = state.pager;
   var subPage = pager.subPage;
+
+  var newPager = _objectSpread(_objectSpread({}, pager), {}, {
+    subPage: subPage + 1
+  });
+
   return _objectSpread(_objectSpread({}, state), {}, {
-    pager: _objectSpread(_objectSpread({}, pager), {}, {
-      subPage: subPage + 1
+    pager: _objectSpread(_objectSpread({}, newPager), {}, {
+      lastReachedPage: (0, _commons2.getNewReachedPage)(newPager)
     }),
-    errors: undefined
+    modalErrors: undefined
   });
 }
 
 function reduceNextIteration(state) {
   var pager = state.pager;
   var iteration = pager.iteration;
+
+  var newPager = _objectSpread(_objectSpread({}, pager), {}, {
+    subPage: 0,
+    iteration: iteration + 1
+  });
+
   return _objectSpread(_objectSpread({}, state), {}, {
-    pager: _objectSpread(_objectSpread({}, pager), {}, {
-      subPage: 0,
-      iteration: iteration + 1
+    pager: _objectSpread(_objectSpread({}, newPager), {}, {
+      lastReachedPage: (0, _commons2.getNewReachedPage)(newPager)
     }),
-    errors: undefined
+    modalErrors: undefined
   });
 }
 
 function reduceNextPage(state, _ref) {
   var next = _ref.next;
   var pager = state.pager;
+
+  var newPager = _objectSpread(_objectSpread({}, pager), {}, {
+    page: next,
+    iteration: undefined,
+    nbIterations: undefined,
+    subPage: undefined,
+    nbSubPages: undefined
+  });
+
   return _objectSpread(_objectSpread({}, state), {}, {
     isInLoop: false,
-    pager: _objectSpread(_objectSpread({}, pager), {}, {
-      page: next,
-      iteration: undefined,
-      nbIterations: undefined,
-      subPage: undefined,
-      nbSubPages: undefined,
-      lastReachedPage: lastReachedPage(pager, next)
+    pager: _objectSpread(_objectSpread({}, newPager), {}, {
+      lastReachedPage: (0, _commons2.getNewReachedPage)(newPager)
     }),
-    errors: undefined
+    modalErrors: undefined
   });
 }
 
@@ -83,16 +97,19 @@ function reduceStartLoop(state, _ref2) {
   if (!(0, _commons.validateLoopConditionFilter)(state, {
     next: next
   })) {
+    var newPager = _objectSpread(_objectSpread({}, pager), {}, {
+      page: next,
+      subPage: undefined,
+      nbSubPages: undefined,
+      iteration: undefined,
+      nbIterations: undefined
+    });
+
     return _objectSpread(_objectSpread({}, state), {}, {
-      pager: _objectSpread(_objectSpread({}, pager), {}, {
-        page: next,
-        subPage: undefined,
-        nbSubPages: undefined,
-        iteration: undefined,
-        nbIterations: undefined,
-        lastReachedPage: lastReachedPage(pager, next)
+      pager: _objectSpread(_objectSpread({}, newPager), {}, {
+        lastReachedPage: (0, _commons2.getNewReachedPage)(newPager)
       }),
-      errors: undefined
+      modalErrors: undefined
     });
   }
   /* 
@@ -108,30 +125,29 @@ function reduceStartLoop(state, _ref2) {
   });
 
   if (Array.isArray(subPages)) {
+    var _newPager = _objectSpread(_objectSpread({}, pager), {}, {
+      page: next,
+      subPage: 0,
+      nbSubPages: subPages.length,
+      iteration: 0,
+      nbIterations: nbIterations
+    });
+
     return _objectSpread(_objectSpread({}, state), {}, {
       isInLoop: true,
-      pager: _objectSpread(_objectSpread({}, pager), {}, {
-        page: next,
-        subPage: 0,
-        nbSubPages: subPages.length,
-        iteration: 0,
-        nbIterations: nbIterations,
-        lastReachedPage: lastReachedPage(pager, next)
+      pager: _objectSpread(_objectSpread({}, _newPager), {}, {
+        lastReachedPage: (0, _commons2.getNewReachedPage)(_newPager)
       }),
-      errors: undefined
+      modalErrors: undefined
     });
   }
 
   return state;
 }
 
-function lastReachedPage(pager, page) {
-  //TODO improve case with sub and iterations and cleaning !!!!
-  return Number.parseInt(page) > Number.parseInt(pager.lastReachedPage) ? page : pager.lastReachedPage;
-}
-
 function validateChange(state) {
   if ((0, _commons.isOnEmptyPage)(state)) {
+    // Is it necessary to wrap by control reducer ?
     return reduceGoNextPage(state);
   }
 
@@ -180,6 +196,6 @@ function reduceGoNextPage(state) {
   }));
 }
 
-var _default = (0, _validateControls.createValidateReducer)(reduceGoNextPage);
+var _default = (0, _validateControls.createModalControlsReducer)((0, _validateControls.createControlsReducer)(reduceGoNextPage));
 
 exports["default"] = _default;

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

@@ -34,19 +34,6 @@ function goStartLoop(state, _ref) {
       pager = state.pager,
       executeExpression = state.executeExpression;
   var subPages = pages[previous].subPages; //TODO: check if loop components are all filtered
-  // if (validateLoopConditionFilter(state, { next: previous })) {
-  // 	return {
-  // 		...state,
-  // 		pager: {
-  // 			...pager,
-  // 			page: previous,
-  // 			subPage: undefined,
-  // 			nbSubPages: undefined,
-  // 			iteration: undefined,
-  // 			nbIterations: undefined,
-  // 		},
-  // 	};
-  // }
 
   if (Array.isArray(subPages)) {
     var nbIterations = executeExpression((0, _commons2.getCompatibleVTLExpression)(iterations), {
@@ -93,19 +80,25 @@ function goPreviousIteration(state) {
 
 function goPreviousPage(state, _ref2) {
   var previous = _ref2.previous;
-  var pager = state.pager;
+  var pager = state.pager,
+      errors = state.errors;
   var page = pager.page;
 
+  var updatedPager = _objectSpread(_objectSpread({}, pager), {}, {
+    page: previous,
+    iteration: undefined,
+    nbIterations: undefined,
+    subPage: undefined,
+    nbSubPages: undefined
+  });
+
+  var currentErrors = errors ? errors[(0, _commons2.getPageTag)(updatedPager)] : undefined;
+
   if (previous !== page) {
     return _objectSpread(_objectSpread({}, state), {}, {
       isInLoop: false,
-      pager: _objectSpread(_objectSpread({}, pager), {}, {
-        page: previous,
-        iteration: undefined,
-        nbIterations: undefined,
-        subPage: undefined,
-        nbSubPages: undefined
-      })
+      pager: updatedPager,
+      currentErrors: currentErrors
     });
   }
 
@@ -113,11 +106,19 @@ function goPreviousPage(state, _ref2) {
 }
 
 function validateChange(state) {
-  if ((0, _commons.isOnEmptyPage)(state)) {
-    return reduceGoPreviousPage(state);
+  var pager = state.pager,
+      errors = state.errors;
+  var currentErrors = errors !== undefined ? errors[(0, _commons2.getPageTag)(pager)] : undefined;
+
+  var updatedState = _objectSpread(_objectSpread({}, state), {}, {
+    currentErrors: currentErrors
+  });
+
+  if ((0, _commons.isOnEmptyPage)(updatedState)) {
+    return reduceGoPreviousPage(updatedState);
   }
 
-  return state;
+  return updatedState;
 }
 
 function reduceGoPreviousPage(state) {

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

@@ -20,11 +20,19 @@ 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 validateChange(state) {
-  if ((0, _commons.isOnEmptyPage)(state)) {
-    return (0, _reduceGoNextPage["default"])(state);
+  var pager = state.pager,
+      errors = state.errors;
+  var currentErrors = errors !== undefined ? errors[(0, _commons.getPageTag)(pager)] : undefined;
+
+  var updatedState = _objectSpread(_objectSpread({}, state), {}, {
+    currentErrors: currentErrors
+  });
+
+  if ((0, _commons.isOnEmptyPage)(updatedState)) {
+    return (0, _reduceGoNextPage["default"])(updatedState);
   }
 
-  return state;
+  return updatedState;
 }
 
 function reduceGoToPage(state, action) {
@@ -46,6 +54,6 @@ function reduceGoToPage(state, action) {
   return validateChange(state);
 }
 
-var _default = (0, _validateControls.createValidateReducer)(reduceGoToPage);
+var _default = (0, _validateControls.createModalControlsReducer)(reduceGoToPage);
 
 exports["default"] = _default;

package/lib/use-lunatic/reducer/reduce-handle-change/reduce-handle-change.js

@@ -19,6 +19,8 @@ var _reduceLinksVariable = _interopRequireDefault(require("./reduce-links-variab
 
 var _compose = _interopRequireDefault(require("../../commons/compose"));
 
+var _validateControls = require("../validate-controls");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": 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; }
@@ -128,5 +130,6 @@ function reduceHandleChange(state, action) {
   return reducers(state, action);
 }
 
-var _default = reduceHandleChange;
+var _default = (0, _validateControls.createControlsReducer)(reduceHandleChange);
+
 exports["default"] = _default;

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

@@ -198,7 +198,7 @@ function reduceOnInit(state, action) {
       preferences = payload.preferences,
       savingType = payload.savingType,
       management = payload.management,
-      modalForControls = payload.modalForControls;
+      activeControls = payload.activeControls;
 
   if (source && data) {
     var variables = createVariables(source, data); // map des variables
@@ -245,7 +245,7 @@ function reduceOnInit(state, action) {
       preferences: preferences,
       management: management,
       savingType: savingType,
-      modalForControls: modalForControls
+      activeControls: activeControls
     }));
   }