@inseefr/lunatic 0.4.7-v2 → 0.4.8-v2

package/lib/stories/utils/orchestrator.js

@@ -137,9 +137,6 @@ function OrchestratorForStories(_ref2) {
   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", {

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

@@ -122,6 +122,25 @@ function createExecuteExpression(variables, features) {
 
     pushToLazy(name);
   }
+  /**
+   *
+   * @param {*} variables
+   * @param {*} iteration
+   */
+
+
+  function setLoopBindings(variables, iteration) {
+    Object.entries(bindings).forEach(function (_ref3) {
+      var _ref4 = _slicedToArray(_ref3, 2),
+          k = _ref4[0],
+          v = _ref4[1];
+
+      var _variables$k = variables[k],
+          type = _variables$k.type,
+          value = _variables$k.value;
+      if (!Array.isArray(v) && type === _constants.COLLECTED && Array.isArray(value)) bindings[k] = value[iteration];
+    });
+  }
 
   function getVariablesAndCach(expression) {
     if (tokensMap.has(expression)) {
@@ -163,9 +182,9 @@ function createExecuteExpression(variables, features) {
     return {};
   }
 
-  function resolveUseContext(name, _ref3) {
-    var iteration = _ref3.iteration,
-        linksIterations = _ref3.linksIterations;
+  function resolveUseContext(name, _ref5) {
+    var iteration = _ref5.iteration,
+        linksIterations = _ref5.linksIterations;
     var value = bindings[name];
 
     if ([_constants.X_AXIS, _constants.Y_AXIS].includes(name) && linksIterations !== undefined) {
@@ -195,13 +214,13 @@ function createExecuteExpression(variables, features) {
     return (0, _vtl["default"])(value);
   }
 
-  function fillVariablesValues(map, _ref4) {
-    var iteration = _ref4.iteration,
-        linksIterations = _ref4.linksIterations;
-    return Object.entries(map).reduce(function (sub, _ref5) {
-      var _ref6 = _slicedToArray(_ref5, 2),
-          name = _ref6[0],
-          _ = _ref6[1];
+  function fillVariablesValues(map, _ref6) {
+    var iteration = _ref6.iteration,
+        linksIterations = _ref6.linksIterations;
+    return Object.entries(map).reduce(function (sub, _ref7) {
+      var _ref8 = _slicedToArray(_ref7, 2),
+          name = _ref8[0],
+          _ = _ref8[1];
 
       return _objectSpread(_objectSpread({}, sub), {}, _defineProperty({}, name, resolveUseContext(name, {
         iteration: iteration,
@@ -257,7 +276,7 @@ function createExecuteExpression(variables, features) {
     return memoized;
   }
 
-  return [execute, updateBindings];
+  return [execute, updateBindings, setLoopBindings];
 }
 
 var _default = createExecuteExpression;

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

@@ -157,7 +157,9 @@ function validateChange(state) {
 function reduceGoNextPage(state) {
   var pages = state.pages,
       isInLoop = state.isInLoop,
-      pager = state.pager;
+      pager = state.pager,
+      setLoopBindings = state.setLoopBindings,
+      variables = state.variables;
   var iteration = pager.iteration,
       nbIterations = pager.nbIterations,
       subPage = pager.subPage,
@@ -169,6 +171,7 @@ function reduceGoNextPage(state) {
   }
 
   if (isInLoop && subPage === nbSubPages - 1 && iteration < nbIterations - 1) {
+    setLoopBindings(variables, iteration + 1);
     return validateChange(reduceNextIteration(state));
   }
 

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

@@ -124,7 +124,9 @@ function validateChange(state) {
 function reduceGoPreviousPage(state) {
   var pages = state.pages,
       pager = state.pager,
-      isInLoop = state.isInLoop;
+      isInLoop = state.isInLoop,
+      setLoopBindings = state.setLoopBindings,
+      variables = state.variables;
   var iteration = pager.iteration,
       subPage = pager.subPage; // dans une boucle et l'itération courante n'est pas finie
 
@@ -134,6 +136,7 @@ function reduceGoPreviousPage(state) {
 
 
   if (isInLoop && subPage === 0 && iteration > 0) {
+    setLoopBindings(variables, iteration - 1);
     return validateChange(goPreviousIteration(state));
   }
 

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

@@ -50,6 +50,7 @@ function reduceGoToPage(state, action) {
   }); // 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);
 }

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

@@ -204,9 +204,10 @@ function reduceOnInit(state, action) {
     var variables = createVariables(source, data); // map des variables
 
     var _createExecuteExpress = (0, _commons.createExecuteExpression)(variables, features),
-        _createExecuteExpress2 = _slicedToArray(_createExecuteExpress, 2),
+        _createExecuteExpress2 = _slicedToArray(_createExecuteExpress, 3),
         executeExpression = _createExecuteExpress2[0],
-        updateBindings = _createExecuteExpress2[1];
+        updateBindings = _createExecuteExpress2[1],
+        setLoopBindings = _createExecuteExpress2[2];
 
     var pages = (0, _commons.checkLoops)((0, _commons.createMapPages)(source));
     var maxPage = source.maxPage,
@@ -241,6 +242,7 @@ function reduceOnInit(state, action) {
       pager: pager,
       executeExpression: executeExpression,
       updateBindings: updateBindings,
+      setLoopBindings: setLoopBindings,
       handleChange: handleChange,
       preferences: preferences,
       management: management,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "0.4.7-v2",
+	"version": "0.4.8-v2",
 	"workersVersion": "0.2.4-experimental",
 	"description": "Library of questionnaire components",
 	"repository": {