@inseefr/lunatic 2.4.7-beta → 2.4.7-go-to-page

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _actions = require("../actions");
+var _pageTag = require("../commons/page-tag");
 var _commons = require("./commons");
 var _reduceGoNextPage = _interopRequireDefault(require("./reduce-go-next-page"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -15,14 +16,13 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 validateChange(state) {
-  var updatedState = _objectSpread({}, state);
-  if ((0, _commons.isOnEmptyPage)(updatedState)) {
-    return (0, _reduceGoNextPage["default"])(updatedState, {
+  if ((0, _commons.isOnEmptyPage)(state)) {
+    return (0, _reduceGoNextPage["default"])(state, {
       type: _actions.ActionKind.GO_NEXT_PAGE,
       payload: {}
     });
   }
-  return updatedState;
+  return state;
 }
 function resolveSubPage(state, action) {
   var pager = state.pager,
@@ -54,26 +54,42 @@ function resolveSubPage(state, action) {
 function reduceGoToPage(state, action) {
   var isInLoop = state.isInLoop,
     pager = state.pager;
-  var _action$payload2 = action.payload,
-    newPage = _action$payload2.page,
-    iteration = _action$payload2.iteration;
-  if (iteration !== undefined) {
-    return resolveSubPage(state, action);
+  var newState = _objectSpread({}, state);
+
+  // The page contains non digit, extract information from it
+  if (action.payload.page.match(/\D/)) {
+    var _pager = (0, _pageTag.getPagerFromPageTag)(action.payload.page);
+    if (_pager) {
+      action.payload.iteration = _pager.iteration;
+      action.payload.subPage = _pager.subPage;
+      action.payload.page = _pager.page;
+    }
   }
-  if (!isInLoop) return _objectSpread(_objectSpread({}, state), {}, {
-    pager: _objectSpread(_objectSpread({}, pager), {}, {
-      subPage: undefined,
-      nbSubPages: undefined,
-      iteration: undefined,
-      nbIterations: undefined,
-      page: newPage
-    })
-  });
-  // TODO: fix when redirect to loop component
-  // How to calculate nbSubPages & nbIterations?
-  // How to calculate lazy variables we need?
-  // Handle setLoopBindings with the good iteration
-  return validateChange(state);
+
+  // The page is still not a number, cancel the action
+  if (action.payload.page.match(/\D/)) {
+    console.error("Cannot reach page \"".concat(action.payload.page, "\", not a number"));
+    return state;
+  }
+  if (action.payload.iteration !== undefined) {
+    newState = resolveSubPage(state, action);
+  } else if (!isInLoop) {
+    newState = _objectSpread(_objectSpread({}, state), {}, {
+      pager: _objectSpread(_objectSpread({}, pager), {}, {
+        subPage: undefined,
+        nbSubPages: undefined,
+        iteration: undefined,
+        nbIterations: undefined,
+        page: action.payload.page
+      })
+    });
+    // TODO: fix when redirect to loop component
+    // How to calculate nbSubPages & nbIterations?
+    // How to calculate lazy variables we need?
+    // Handle setLoopBindings with the good iteration
+  }
+
+  return validateChange(newState);
 }
 var _default = reduceGoToPage;
 exports["default"] = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "2.4.7-beta",
+	"version": "2.4.7-go-to-page",
 	"workersVersion": "0.2.5-experimental",
 	"description": "Library of questionnaire components",
 	"repository": {