@inseefr/lunatic 2.5.1-testRoundaboutFix → 2.5.2-beta

package/lib/stories/questionnaires/simpsons/simpsons.stories.js

@@ -196,7 +196,9 @@ Filled.play = /*#__PURE__*/function () {
           _context.next = 54;
           return page.getByRole('combobox', {
             name: '➡ In which state do The Simpsons reside?'
-          }).locator('div').click();
+          })
+          // .locator('div')
+          .click();
         case 54:
           _context.next = 56;
           return page.getByText('Not in any state, you fool!').click();
@@ -410,9 +412,9 @@ Filled.play = /*#__PURE__*/function () {
           return page.getByText('Calendar days').click();
         case 132:
           _context.next = 134;
-          return page.getByRole('row', {
-            name: /Leave with pay/
-          }).fill('12');
+          return page.getByRole('button', {
+            name: 'Next'
+          }).click();
         case 134:
           _context.next = 136;
           return page.getByRole('button', {
@@ -420,35 +422,35 @@ Filled.play = /*#__PURE__*/function () {
           }).click();
         case 136:
           _context.next = 138;
-          return page.getByRole('button', {
-            name: 'Next'
-          }).click();
+          return page.getByLabel('➡ How many characters from the Simpsons family could you precisely describe?').click();
         case 138:
           _context.next = 140;
-          return page.getByLabel('➡ How many characters from the Simpsons family could you precisely describe?').click();
+          return page.getByLabel('➡ How many characters from the Simpsons family could you precisely describe?').fill('2');
         case 140:
           _context.next = 142;
-          return page.getByLabel('➡ How many characters from the Simpsons family could you precisely describe?').fill('2');
-        case 142:
-          _context.next = 144;
           return page.getByRole('button', {
             name: 'Next'
           }).click();
-        case 144:
-          _context.next = 146;
+        case 142:
+          _context.next = 144;
           return page.getByLabel('➡ What is the first name of this character?', {
             index: 0
           }).fill('Bart');
-        case 146:
-          _context.next = 148;
+        case 144:
+          _context.next = 146;
           return page.getByLabel('➡ How old is this character in the first episode of the Simpsons family?', {
             index: 0
           }).fill('14');
-        case 148:
-          _context.next = 150;
+        case 146:
+          _context.next = 148;
           return page.getByLabel('➡ What is the first name of this character?', {
             index: 1
           }).fill('Bart');
+        case 148:
+          _context.next = 150;
+          return page.getByRole('button', {
+            name: 'Next'
+          }).click();
         case 150:
           _context.next = 152;
           return page.getByRole('button', {
@@ -456,13 +458,13 @@ Filled.play = /*#__PURE__*/function () {
           }).click();
         case 152:
           _context.next = 154;
-          return page.getByRole('button', {
-            name: 'Next'
+          return page.getByRole('radio', {
+            name: '1 Yes'
           }).click();
         case 154:
           _context.next = 156;
-          return page.getByRole('radio', {
-            name: '1 Yes'
+          return page.getByRole('button', {
+            name: 'Next'
           }).click();
         case 156:
           _context.next = 158;
@@ -476,13 +478,13 @@ Filled.play = /*#__PURE__*/function () {
           }).click();
         case 160:
           _context.next = 162;
-          return page.getByRole('button', {
-            name: 'Next'
+          return page.getByRole('radio', {
+            name: '1 Yes'
           }).click();
         case 162:
           _context.next = 164;
-          return page.getByRole('radio', {
-            name: '1 Yes'
+          return page.getByRole('button', {
+            name: 'Next'
           }).click();
         case 164:
           _context.next = 166;
@@ -496,15 +498,15 @@ Filled.play = /*#__PURE__*/function () {
           }).click();
         case 168:
           _context.next = 170;
-          return page.getByRole('button', {
-            name: 'Next'
-          }).click();
+          return page.getByLabel('➡ Do you have any comment about the survey?').click();
         case 170:
           _context.next = 172;
-          return page.getByLabel('➡ Do you have any comment about the survey?').click();
+          return page.keyPress('x');
         case 172:
           _context.next = 174;
-          return page.keyPress('x');
+          return page.getByRole('button', {
+            name: 'Next'
+          }).click();
         case 174:
           _context.next = 176;
           return page.getByRole('button', {
@@ -512,13 +514,8 @@ Filled.play = /*#__PURE__*/function () {
           }).click();
         case 176:
           _context.next = 178;
-          return page.getByRole('button', {
-            name: 'Next'
-          }).click();
-        case 178:
-          _context.next = 180;
           return page.getByText('PAGE: 39').shouldBeVisible();
-        case 180:
+        case 178:
         case "end":
           return _context.stop();
       }

package/lib/stories/suggester/simple.json

@@ -46,6 +46,21 @@
 				"value": "true",
 				"type": "VTL"
 			},
+			"controls": [
+				{
+					"id": "age-controls",
+					"criticality": "ERROR",
+					"typeOfControl": "FORMAT",
+					"control": {
+						"value": "not(isnull(HELLO))",
+						"type": "VTL"
+					},
+					"errorMessage": {
+						"value": "\"Veuillez selectionner quelquechose\"",
+						"type": "VTL"
+					}
+				}
+			],
 			"response": {
 				"name": "HELLO"
 			},

package/lib/use-lunatic/commons/fill-components/fill-from-state.js

@@ -16,14 +16,18 @@ function fillFromState(component, state) {
     preferences = state.preferences,
     goToPage = state.goToPage,
     shortcut = state.shortcut,
-    getSuggesterStatus = state.getSuggesterStatus;
+    getSuggesterStatus = state.getSuggesterStatus,
+    goNextPage = state.goNextPage,
+    goPreviousPage = state.goPreviousPage;
   return _objectSpread(_objectSpread({}, component), {}, {
     handleChange: handleChange,
     executeExpression: executeExpression,
     preferences: preferences,
     goToPage: goToPage,
     shortcut: shortcut,
-    getSuggesterStatus: getSuggesterStatus
+    getSuggesterStatus: getSuggesterStatus,
+    goNextPage: goNextPage,
+    goPreviousPage: goPreviousPage
   });
 }
 var _default = fillFromState;

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

@@ -42,7 +42,7 @@ function getNextPager(pager, parent) {
 
   // We reached the end of the sequence
   var isEndSequence = subPage && pager.nbSubPages ? subPage >= pager.nbSubPages : false;
-  var moveUpOnEnd = parent === 'Roundabout';
+  var moveUpOnEnd = parent === 'Roundabout' && pager.nbIterations && pager.nbIterations > 1;
   // Move up at the end of a sequence (instead of going to the next Iteration)
   if (isEndSequence && moveUpOnEnd) {
     return _objectSpread(_objectSpread({}, pager), {}, {
@@ -74,7 +74,7 @@ function getPrevPager(pager, parent) {
     page = _ref4[0],
     subPage = _ref4[1];
   var iteration = pager.iteration;
-  var moveUpOnStart = parent === 'Roundabout';
+  var moveUpOnStart = parent === 'Roundabout' && pager.nbIterations && pager.nbIterations > 1;
 
   // We reached the start of the questionnaire
   if (page <= 0) {

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

@@ -46,11 +46,5 @@ function isPageEmpty(state) {
   if (visibleComponents.length === 0) {
     return true;
   }
-
-  // We have a roundabout with only one iteration
-  var firstComponent = visibleComponents[0];
-  if (visibleComponents.length === 1 && (firstComponent === null || firstComponent === void 0 ? void 0 : firstComponent.componentType) === 'Roundabout' && executeExpression(firstComponent.iterations) === 1) {
-    return true;
-  }
   return false;
 }

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

@@ -37,6 +37,8 @@ var INITIAL_STATE = {
   goToPage: function goToPage() {
     return undefined;
   },
+  goNextPage: function goNextPage() {},
+  goPreviousPage: function goPreviousPage() {},
   activeControls: false,
   getSuggesterStatus: function getSuggesterStatus(name) {
     return {

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

@@ -19,6 +19,7 @@ function autoExploreLoop(state) {
   var newPager = _objectSpread({}, state.pager);
   var pageId = (0, _page.getPageId)(newPager);
   var page = state.pages[pageId];
+  var hasExploredLoop = false;
   var isForward = direction === 'forward';
   var goInsideSubpage = function goInsideSubpage(subPages, nbIteration) {
     var maxSubPage = subPages.length;
@@ -26,8 +27,9 @@ 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);
+    newPager.nbIterations = nbIteration;
     newPager.iteration = isForward ? 0 : newPager.nbIterations - 1;
+    hasExploredLoop = true;
   };
 
   // The page is a loop
@@ -36,13 +38,17 @@ function autoExploreLoop(state) {
   }
 
   // The page contains a roundabout, go to the first iteration if it only has one iteration
-  var firstComponent = page.components[0];
-  if (page.components[0].componentType === 'Roundabout' && page.subPages && page.subPages.length > 0 && isForward) {
+  if (page.components[0].componentType === 'Roundabout' && page.subPages && page.subPages.length > 0) {
     var nbIterations = state.executeExpression(page.iterations);
     if (nbIterations === 1) {
       goInsideSubpage(page.subPages, 1);
     }
   }
+
+  // No loop were explored, don't mutate the state
+  if (!hasExploredLoop) {
+    return state;
+  }
   return _objectSpread(_objectSpread({}, state), {}, {
     isInLoop: newPager.nbIterations !== undefined,
     pager: newPager

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

@@ -27,17 +27,24 @@ function reduceGoNextPage(state) {
   if (!pages[pageId]) {
     throw new Error("Cannot reach next page ".concat(pageId));
   }
-
-  // If we reached a loop, go inside
-  var newState = (0, _autoExploreLoop.autoExploreLoop)(_objectSpread(_objectSpread({}, state), {}, {
+  var newState = _objectSpread(_objectSpread({}, state), {}, {
     pager: nextPager
-  }), 'forward');
+  });
 
   // We reached an empty page, move forward
   if ((0, _page.isPageEmpty)(newState)) {
     return reduceGoNextPage(newState);
   }
+
+  // If we reached a loop, go inside
+  newState = (0, _autoExploreLoop.autoExploreLoop)(newState, 'forward');
+
+  // We explored a loop, check if we reached an empty page, move forward
+  if (newState.pager !== nextPager && (0, _page.isPageEmpty)(newState)) {
+    return reduceGoNextPage(newState);
+  }
   return _objectSpread(_objectSpread({}, newState), {}, {
+    isInLoop: newState.pager.iteration !== undefined,
     pager: _objectSpread(_objectSpread({}, newState.pager), {}, {
       lastReachedPage: (0, _commons.getNewReachedPage)(newState.pager)
     })

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

@@ -24,17 +24,25 @@ function reduceGoPreviousPage(state) {
   if (!prevPage) {
     throw new Error("Cannot reach previous page ".concat(pageId));
   }
-
-  // If we reached a loop, go to the last iteration / sequence
-  var newState = (0, _autoExploreLoop.autoExploreLoop)(_objectSpread(_objectSpread({}, state), {}, {
+  var newState = _objectSpread(_objectSpread({}, state), {}, {
     pager: prevPager
-  }), 'backward');
+  });
 
   // We reached an empty page, keep going backward
   if ((0, _page.isPageEmpty)(newState)) {
     return reduceGoPreviousPage(newState);
   }
-  return newState;
+
+  // If we reached a loop, go to the last iteration / sequence
+  newState = (0, _autoExploreLoop.autoExploreLoop)(newState, 'backward');
+
+  // We explored a loop, check if we reached an empty page, move forward
+  if (newState.pager !== prevPager && (0, _page.isPageEmpty)(newState)) {
+    return reduceGoPreviousPage(newState);
+  }
+  return _objectSpread(_objectSpread({}, newState), {}, {
+    isInLoop: newState.pager.iteration !== undefined
+  });
 }
 var _default = reduceGoPreviousPage;
 exports["default"] = _default;

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

@@ -60,16 +60,17 @@ function reduceGoToPage(state, action) {
   }
 
   // Move forward if the page is empty
-  if ((0, _page.isPageEmpty)(state)) {
-    return (0, _reduceGoNextPage["default"])(state, {
+  var newState = _objectSpread(_objectSpread({}, state), {}, {
+    isInLoop: newPager.nbIterations !== undefined,
+    pager: newPager
+  });
+  if ((0, _page.isPageEmpty)(newState)) {
+    return (0, _reduceGoNextPage["default"])(newState, {
       type: _actions.ActionKind.GO_NEXT_PAGE,
       payload: {}
     });
   }
-  return _objectSpread(_objectSpread({}, state), {}, {
-    isInLoop: newPager.nbIterations !== undefined,
-    pager: newPager
-  });
+  return newState;
 }
 var _default = reduceGoToPage;
 exports["default"] = _default;

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

@@ -19,9 +19,6 @@ 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 refillValue(size, precSize, value) {
-  if (precSize > size) {
-    return new Array(size).fill(null);
-  }
   return (0, _commons2.resizeArrayVariable)(value, size, null);
 }
 function reduceResizingVariables(_ref) {

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

@@ -38,11 +38,11 @@ function getInitalValueFromCollected(variable, data) {
     fromData = COLLECTED !== null && COLLECTED !== void 0 ? COLLECTED : FORCED;
   }
   if ('values' in variable && variable.values) {
-    var _fromData;
+    var _ref, _fromData;
     var _variable$values = variable.values,
       _COLLECTED = _variable$values.COLLECTED,
       _FORCED = _variable$values.FORCED;
-    return (_fromData = fromData) !== null && _fromData !== void 0 ? _fromData : _FORCED !== null && _FORCED !== void 0 ? _FORCED : _COLLECTED;
+    return (_ref = (_fromData = fromData) !== null && _fromData !== void 0 ? _fromData : _FORCED) !== null && _ref !== void 0 ? _ref : _COLLECTED;
   }
   return undefined;
 }
@@ -100,10 +100,10 @@ function appendToObjectMap(map, variable, value) {
 function createVariables(source, data) {
   var _source$variables = source.variables,
     variables = _source$variables === void 0 ? [] : _source$variables;
-  var _variables$reduce = variables.reduce(function (_ref, variable) {
-      var _ref2 = _slicedToArray(_ref, 2),
-        mapType = _ref2[0],
-        mapVar = _ref2[1];
+  var _variables$reduce = variables.reduce(function (_ref2, variable) {
+      var _ref3 = _slicedToArray(_ref2, 2),
+        mapType = _ref3[0],
+        mapVar = _ref3[1];
       var type = variable.variableType;
       return [appendToArrayMap(mapType, type, variable), appendToObjectMap(mapVar, variable, getInitialValue(variable, data))];
     }, [{
@@ -179,7 +179,9 @@ function reduceOnInit(state, action) {
     management = payload.management,
     shortcut = payload.shortcut,
     activeControls = payload.activeControls,
-    goToPage = payload.goToPage;
+    goToPage = payload.goToPage,
+    goNextPage = payload.goNextPage,
+    goPreviousPage = payload.goPreviousPage;
   if (source && data) {
     var _initialPager$page;
     var variables = createVariables(source, data); // map des variables
@@ -225,6 +227,8 @@ function reduceOnInit(state, action) {
       savingType: savingType,
       activeControls: activeControls,
       goToPage: goToPage,
+      goNextPage: goNextPage,
+      goPreviousPage: goPreviousPage,
       shortcut: shortcut
     }), initialPager);
   }

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

@@ -177,9 +177,11 @@ function useLunatic(source) {
       handleChange: handleChange,
       activeControls: activeControls,
       goToPage: goToPage,
+      goNextPage: goNextPage,
+      goPreviousPage: goPreviousPage,
       withOverview: withOverview
     }));
-  }, [source, data, initialPage, features, preferences, savingType, management, shortcut, handleChange, activeControls, withOverview, goToPage, lastReachedPage]);
+  }, [source, data, initialPage, features, preferences, savingType, management, shortcut, handleChange, activeControls, withOverview, goToPage, goNextPage, goPreviousPage, lastReachedPage]);
   (0, _react.useEffect)(function () {
     dispatch(actions.updateState({
       getSuggesterStatus: getSuggesterStatus

package/package.json

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