@inseefr/lunatic 2.5.0-beta → 2.5.0-fast-forward

package/lib/src/use-lunatic/actions.d.ts

@@ -41,6 +41,7 @@ export type ActionInit = {
         data: LunaticData;
         source: LunaticSource;
         initialPage: string;
+        lastReachedPage: string;
         features: LunaticState['features'];
         preferences: LunaticState['preferences'];
         savingType: LunaticState['savingType'];
@@ -102,6 +103,7 @@ export declare const onInit: (payload: {
     data: LunaticData;
     source: LunaticSource;
     initialPage: string;
+    lastReachedPage: string;
     features: LunaticState['features'];
     preferences: LunaticState['preferences'];
     savingType: LunaticState['savingType'];

package/lib/src/use-lunatic/reducer/reduce-on-init.d.ts

@@ -1,5 +1,5 @@
-import { LunaticState, LunaticVariable } from '../type';
 import { ActionInit } from '../actions';
+import { LunaticState, LunaticVariable } from '../type';
 export type VariablesByType = {
     EXTERNAL: (LunaticVariable & {
         variableType: 'EXTERNAL';

package/lib/src/use-lunatic/use-lunatic.d.ts

@@ -5,7 +5,7 @@ import { LunaticComponentType } from '../components/type';
 declare const nothing: LunaticState['handleChange'];
 declare function useLunatic(source: LunaticSource, data: Partial<Record<"EXTERNAL" | "CALCULATED", Record<string, unknown>> & {
     COLLECTED: Record<string, import("./type").LunaticCollectedValue>;
-}> | undefined, { features, preferences, savingType, onChange, management, shortcut, initialPage, autoSuggesterLoading, activeControls, getReferentiel, custom, withOverview, missing, missingStrategy, missingShortcut, dontKnowButton, refusedButton, }: {
+}> | undefined, { features, preferences, savingType, onChange, management, shortcut, initialPage, lastReachedPage, autoSuggesterLoading, activeControls, getReferentiel, custom, withOverview, missing, missingStrategy, missingShortcut, dontKnowButton, refusedButton, }: {
     features?: LunaticState['features'];
     preferences?: LunaticState['preferences'];
     savingType?: LunaticState['savingType'];
@@ -13,6 +13,7 @@ declare function useLunatic(source: LunaticSource, data: Partial<Record<"EXTERNA
     management?: boolean;
     shortcut?: boolean;
     initialPage?: string;
+    lastReachedPage?: string;
     autoSuggesterLoading?: boolean;
     getReferentiel?: (name: string) => Promise<Array<unknown>>;
     activeControls?: boolean;
@@ -257,7 +258,7 @@ declare function useLunatic(source: LunaticSource, data: Partial<Record<"EXTERNA
                 }[];
             };
         })[] | undefined;
-        except?: keyof {
+        except?: (keyof {
             InputNumber: import("../components/type").LunaticBaseProps<number | null> & {
                 min: number;
                 max: number;
@@ -485,7 +486,7 @@ declare function useLunatic(source: LunaticSource, data: Partial<Record<"EXTERNA
                     iterations?: number | undefined;
                 }[];
             };
-        } | undefined;
+        })[] | undefined;
     }) => import("./commons/fill-components/fill-components").LunaticComponentProps<"Sequence" | "Subsequence" | "RosterForLoop" | "Loop" | "Table" | "Input" | "InputNumber" | "Datepicker" | "CheckboxGroup" | "CheckboxOne" | "CheckboxBoolean" | "Radio" | "Dropdown" | "Textarea" | "FilterDescription" | "PairwiseLinks" | "Suggester" | "ComponentSet" | "Roundabout" | "QuestionExplication">[];
     goPreviousPage: () => void;
     goNextPage: (payload?: {}) => void;

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

@@ -3,14 +3,19 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.ReadOnly = exports.Default = void 0;
+exports["default"] = exports.ReadOnly = exports.Filled = exports.Default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _orchestrator = _interopRequireDefault(require("../utils/orchestrator"));
 var _sourceRoster = _interopRequireDefault(require("./source-roster"));
 var _defaultArgTypes = _interopRequireDefault(require("../utils/default-arg-types"));
+var _e2e = require("../../../tests/utils/e2e");
+var _timer = require("../../../tests/utils/timer");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 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 _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 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) { 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; }
@@ -38,4 +43,82 @@ ReadOnly.args = {
   id: 'roster-for-loop',
   source: _sourceRoster["default"],
   readOnly: true
-};
+};
+var Filled = Template.bind({});
+exports.Filled = Filled;
+Filled.args = {
+  id: 'roster-for-loop',
+  source: _sourceRoster["default"]
+};
+Filled.play = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
+    var args, canvasElement, page;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          args = _ref.args, canvasElement = _ref.canvasElement;
+          page = (0, _e2e.playwrightToUserEvent)(canvasElement);
+          _context.next = 4;
+          return (0, _timer.sleep)(100);
+        case 4:
+          _context.next = 6;
+          return page.getByRole('button', {
+            name: 'Ajouter un individu'
+          }).click();
+        case 6:
+          _context.next = 8;
+          return page.getByLabel('Prénom', {
+            index: 0
+          }).fill('John');
+        case 8:
+          _context.next = 10;
+          return page.getByLabel('Prénom', {
+            index: 1
+          }).fill('Jane');
+        case 10:
+          _context.next = 12;
+          return page.getByRole('button', {
+            name: 'Next'
+          }).click();
+        case 12:
+          _context.next = 14;
+          return page.getByLabel('John, quel est vôtre âge ?').fill('18');
+        case 14:
+          _context.next = 16;
+          return page.getByRole('button', {
+            name: 'Next'
+          }).click();
+        case 16:
+          _context.next = 18;
+          return page.getByLabel('Jane, quel est vôtre âge ?').fill('21');
+        case 18:
+          _context.next = 20;
+          return page.getByLabel(/Page/).fill('2.1#1');
+        case 20:
+          _context.next = 22;
+          return page.getByRole('button', {
+            name: /Go to page/
+          }).click();
+        case 22:
+          _context.next = 24;
+          return page.getByRole('button', {
+            name: 'Next'
+          }).click();
+        case 24:
+          _context.next = 26;
+          return page.getByRole('button', {
+            name: 'Next'
+          }).click();
+        case 26:
+          _context.next = 28;
+          return page.getByText('End').shouldBeVisible();
+        case 28:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function (_x) {
+    return _ref2.apply(this, arguments);
+  };
+}();

package/lib/stories/utils/orchestrator.js

@@ -9,9 +9,9 @@ require("./custom-lunatic.scss");
 require("./orchestrator.scss");
 var lunatic = _interopRequireWildcard(require("../.."));
 var _react = _interopRequireWildcard(require("react"));
+var _logger = require("../../utils/logger");
 var _overview = require("./overview");
 var _waiting = _interopRequireDefault(require("./waiting"));
-var _logger = require("../../utils/logger");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["source", "data", "management", "shortcut", "activeControls", "features", "initialPage", "getStoreInfo", "missing", "missingStrategy", "missingShortcut", "autoSuggesterLoading", "addExternal", "preferences", "custom", "showOverview", "filterDescription", "getReferentiel", "dontKnowButton", "refusedButton", "readOnly"],
   _excluded2 = ["id", "componentType", "response", "storeName", "conditionFilter"];
@@ -36,7 +36,8 @@ function getStoreInfoRequired() {
 }
 function DevOptions(_ref) {
   var goToPage = _ref.goToPage,
-    getData = _ref.getData;
+    getData = _ref.getData,
+    lastReachedPage = _ref.lastReachedPage;
   var _useState = (0, _react.useState)(1),
     _useState2 = _slicedToArray(_useState, 2),
     toPage = _useState2[0],
@@ -63,6 +64,13 @@ function DevOptions(_ref) {
           });
         },
         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,
@@ -78,6 +86,7 @@ function Pager(_ref2) {
   var goPrevious = _ref2.goPrevious,
     goNext = _ref2.goNext,
     goToPage = _ref2.goToPage,
+    lastReachedPage = _ref2.lastReachedPage,
     isLast = _ref2.isLast,
     isFirst = _ref2.isFirst,
     pageTag = _ref2.pageTag,
@@ -101,7 +110,8 @@ function Pager(_ref2) {
         children: ["PAGE: ", pageTag]
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(DevOptions, {
         goToPage: goToPage,
-        getData: getData
+        getData: getData,
+        lastReachedPage: lastReachedPage
       })]
     });
   }
@@ -172,6 +182,7 @@ function OrchestratorForStories(_ref3) {
     goPreviousPage = _lunatic$useLunatic.goPreviousPage,
     goNextPage = _lunatic$useLunatic.goNextPage,
     goToPage = _lunatic$useLunatic.goToPage,
+    pager = _lunatic$useLunatic.pager,
     pageTag = _lunatic$useLunatic.pageTag,
     isFirstPage = _lunatic$useLunatic.isFirstPage,
     isLastPage = _lunatic$useLunatic.isLastPage,
@@ -181,6 +192,7 @@ function OrchestratorForStories(_ref3) {
     getData = _lunatic$useLunatic.getData,
     Provider = _lunatic$useLunatic.Provider;
   var components = getComponents();
+  var lastReachedPage = pager.lastReachedPage;
   var _useState3 = (0, _react.useState)({}),
     _useState4 = _slicedToArray(_useState3, 2),
     errorActive = _useState4[0],
@@ -239,6 +251,7 @@ function OrchestratorForStories(_ref3) {
         goPrevious: goPreviousPage,
         goNext: handleGoNext,
         goToPage: goToPage,
+        lastReachedPage: lastReachedPage,
         isLast: isLastPage,
         isFirst: isFirstPage,
         pageTag: pageTag,

package/lib/use-lunatic/reducer/commons/auto-explore-loop.js

@@ -27,9 +27,7 @@ function autoExploreLoop(state) {
     newPager.page = firstSubPage[0].toString();
     newPager.subPage = firstSubPage[1] - 1; // Subpage starts at 0
     newPager.nbSubPages = maxSubPage;
-    newPager.nbIterations = state.executeExpression(page.iterations, {
-      iteration: newPager.iteration
-    });
+    newPager.nbIterations = state.executeExpression(page.iterations);
     newPager.iteration = isForward ? 0 : newPager.nbIterations - 1;
   }
   return _objectSpread(_objectSpread({}, state), {}, {

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

@@ -51,9 +51,7 @@ function reduceGoToPage(state, action) {
   if (action.payload.subPage !== undefined) {
     var _parentPage$subPages;
     newPager.nbSubPages = (_parentPage$subPages = parentPage.subPages) === null || _parentPage$subPages === void 0 ? void 0 : _parentPage$subPages.length;
-    newPager.nbIterations = state.executeExpression(parentPage.iterations, {
-      iteration: newPager.iteration
-    });
+    newPager.nbIterations = state.executeExpression(parentPage.iterations);
   }
 
   // Prevent an out of bound iteration

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

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _commons = require("../commons");
-var _pageTag = require("../commons/page-tag");
 var _compose = _interopRequireDefault(require("../commons/compose"));
+var _pageTag = require("../commons/page-tag");
 var _overviewOnInit = require("./overview/overview-on-init");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 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); }
@@ -171,6 +171,7 @@ function reduceOnInit(state, action) {
   var source = payload.source,
     data = payload.data,
     initialPage = payload.initialPage,
+    lastReachedPage = payload.lastReachedPage,
     features = payload.features,
     handleChange = payload.handleChange,
     preferences = payload.preferences,
@@ -202,7 +203,7 @@ function reduceOnInit(state, action) {
       nbSubPages: undefined,
       iteration: undefined,
       nbIterations: undefined,
-      lastReachedPage: initialPage
+      lastReachedPage: lastReachedPage
     };
     var _isFirstLastPage = (0, _commons.isFirstLastPage)(pager),
       isFirstPage = _isFirstLastPage.isFirstPage,

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

@@ -56,6 +56,8 @@ function useLunatic(source) {
     shortcut = _ref$shortcut === void 0 ? false : _ref$shortcut,
     _ref$initialPage = _ref.initialPage,
     initialPage = _ref$initialPage === void 0 ? '1' : _ref$initialPage,
+    _ref$lastReachedPage = _ref.lastReachedPage,
+    lastReachedPage = _ref$lastReachedPage === void 0 ? '1' : _ref$lastReachedPage,
     _ref$autoSuggesterLoa = _ref.autoSuggesterLoading,
     autoSuggesterLoading = _ref$autoSuggesterLoa === void 0 ? false : _ref$autoSuggesterLoa,
     _ref$activeControls = _ref.activeControls,
@@ -161,11 +163,13 @@ function useLunatic(source) {
   var _isFirstLastPage = (0, _commons.isFirstLastPage)(pager),
     isFirstPage = _isFirstLastPage.isFirstPage,
     isLastPage = _isFirstLastPage.isLastPage;
+  console.log('State overview', state.overview);
   (0, _react.useEffect)(function () {
     dispatch(actions.onInit({
       source: source,
       data: data,
       initialPage: initialPage,
+      lastReachedPage: lastReachedPage,
       features: features,
       preferences: preferences,
       savingType: savingType,
@@ -176,7 +180,7 @@ function useLunatic(source) {
       goToPage: goToPage,
       withOverview: withOverview
     }));
-  }, [source, data, initialPage, features, preferences, savingType, management, shortcut, handleChange, activeControls, withOverview, goToPage]);
+  }, [source, data, initialPage, features, preferences, savingType, management, shortcut, handleChange, activeControls, withOverview, goToPage, lastReachedPage]);
   (0, _react.useEffect)(function () {
     dispatch(actions.updateState({
       getSuggesterStatus: getSuggesterStatus

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

@@ -1,11 +1,11 @@
 "use strict";
 
-var _vitest = require("vitest");
 var _reactHooks = require("@testing-library/react-hooks");
+var _vitest = require("vitest");
 var _useLunatic = _interopRequireDefault(require("./use-lunatic"));
-var _source = _interopRequireDefault(require("../stories/questionnaires/simpsons/source.json"));
+var _source = _interopRequireDefault(require("../stories/overview/source.json"));
 var _source2 = _interopRequireDefault(require("../stories/questionnaires/logement/source.json"));
-var _source3 = _interopRequireDefault(require("../stories/overview/source.json"));
+var _source3 = _interopRequireDefault(require("../stories/questionnaires/simpsons/source.json"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 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; }
@@ -29,7 +29,7 @@ var dataFromObject = function dataFromObject(o) {
   };
 };
 (0, _vitest.describe)('use-lunatic()', function () {
-  var defaultParams = [_source["default"], dataFromObject({}), {}];
+  var defaultParams = [_source3["default"], dataFromObject({}), {}];
   (0, _vitest.it)('should initialize correcly', function () {
     var _renderHook = (0, _reactHooks.renderHook)(function () {
         return _useLunatic["default"].apply(void 0, defaultParams);
@@ -53,7 +53,7 @@ var dataFromObject = function dataFromObject(o) {
     (0, _vitest.expect)(result.current.pager.lastReachedPage).toBe('2');
   });
   (0, _vitest.it)('should jump to a specific page', function () {
-    var params = [_source["default"], dataFromObject({
+    var params = [_source3["default"], dataFromObject({
       COMMENT: 'Hello world',
       READY: true,
       NAME_CHAR: ['a', 'b']
@@ -142,7 +142,7 @@ var dataFromObject = function dataFromObject(o) {
     });
     (0, _vitest.it)('should be empty when no hierarchy', function () {
       var _renderHook8 = (0, _reactHooks.renderHook)(function () {
-          return (0, _useLunatic["default"])(_source3["default"], undefined, lunaticConfiguration);
+          return (0, _useLunatic["default"])(_source["default"], undefined, lunaticConfiguration);
         }),
         result = _renderHook8.result;
       (0, _vitest.expect)(result.current.overview).toHaveLength(0);
@@ -152,7 +152,9 @@ var dataFromObject = function dataFromObject(o) {
         var _renderHook9 = (0, _reactHooks.renderHook)(function () {
             return (0, _useLunatic["default"])(_source2["default"], advancedQestionnaireData, _objectSpread(_objectSpread({}, lunaticConfiguration), {}, {
               // hack on initialPage : useLunatic SHOULD find lastReachedPage from COLLECTED data
-              initialPage: '16'
+              initialPage: '1',
+              // use lastReachedPage saved by orchestrator
+              lastReachedPage: '16'
             }));
           }),
           result = _renderHook9.result;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "2.5.0-beta",
+	"version": "2.5.0-fast-forward",
 	"workersVersion": "0.2.5-experimental",
 	"description": "Library of questionnaire components",
 	"repository": {