@inseefr/lunatic 2.0.0-v2 → 2.0.1-v2

package/lib/use-lunatic/commons/get-errors-without-empty-value.js

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+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 _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 _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 _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 getErrorsWithoutEmptyValue(errors) {
+  return errors ? Object.fromEntries(Object.entries(errors).filter(function (_ref) {
+    var _ref2 = _slicedToArray(_ref, 2),
+        key = _ref2[0],
+        value = _ref2[1];
+
+    return Array.isArray(value) && value.length;
+  })) : {};
+}
+
+var _default = getErrorsWithoutEmptyValue;
+exports["default"] = _default;

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

@@ -45,6 +45,12 @@ Object.defineProperty(exports, "getComponentsFromState", {
     return _getComponentsFromState["default"];
   }
 });
+Object.defineProperty(exports, "getErrorsWithoutEmptyValue", {
+  enumerable: true,
+  get: function get() {
+    return _getErrorsWithoutEmptyValue["default"];
+  }
+});
 Object.defineProperty(exports, "getNewReachedPage", {
   enumerable: true,
   get: function get() {
@@ -112,4 +118,6 @@ var _loadSuggesters = _interopRequireDefault(require("./load-suggesters"));
 
 var _getCompatibleVtlExpression = _interopRequireDefault(require("./get-compatible-vtl-expression"));
 
+var _getErrorsWithoutEmptyValue = _interopRequireDefault(require("./get-errors-without-empty-value"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }

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

@@ -26,6 +26,7 @@ var INITIAL_STATE = {
     subPage: undefined,
     nbSubPages: undefined,
     iteration: undefined,
+    shallowIteration: undefined,
     nbIterations: undefined
   },
   waiting: false,

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

@@ -36,7 +36,8 @@ function reduceNextSubPage(state) {
   var subPage = pager.subPage;
 
   var newPager = _objectSpread(_objectSpread({}, pager), {}, {
-    subPage: subPage + 1
+    subPage: subPage + 1,
+    shallowIteration: undefined
   });
 
   return _objectSpread(_objectSpread({}, state), {}, {
@@ -73,7 +74,8 @@ function reduceNextPage(state, _ref) {
     iteration: undefined,
     nbIterations: undefined,
     subPage: undefined,
-    nbSubPages: undefined
+    nbSubPages: undefined,
+    shallowIteration: undefined
   });
 
   return _objectSpread(_objectSpread({}, state), {}, {
@@ -102,7 +104,8 @@ function reduceStartLoop(state, _ref2) {
       subPage: undefined,
       nbSubPages: undefined,
       iteration: undefined,
-      nbIterations: undefined
+      nbIterations: undefined,
+      shallowIteration: undefined
     });
 
     return _objectSpread(_objectSpread({}, state), {}, {
@@ -130,7 +133,8 @@ function reduceStartLoop(state, _ref2) {
       subPage: 0,
       nbSubPages: subPages.length,
       iteration: 0,
-      nbIterations: nbIterations
+      nbIterations: nbIterations,
+      shallowIteration: undefined
     });
 
     return _objectSpread(_objectSpread({}, state), {}, {
@@ -147,7 +151,6 @@ function reduceStartLoop(state, _ref2) {
 
 function validateChange(state) {
   if ((0, _commons.isOnEmptyPage)(state)) {
-    // Is it necessary to wrap by control reducer ?
     return reduceGoNextPage(state);
   }
 
@@ -182,15 +185,19 @@ function reduceGoNextPage(state) {
       isLoop = _pages$next.isLoop,
       iterations = _pages$next.iterations,
       loopDependencies = _pages$next.loopDependencies;
+  var pageComponents = pages[page].components.map(function (_ref3) {
+    var componentType = _ref3.componentType;
+    return componentType;
+  });
 
-  if (isInLoop && !isLoop) {
-    //End of the loop, we reset bindings
+  if (isInLoop && !isLoop || pageComponents.includes('PairwiseLinks')) {
+    //End of the loop or PairwiseLinks, we reset bindings
     resetLoopBindings(variables);
   }
 
   if (next === page) {
-    // TODO on devrait jamais en arriver là !
-    console.log("next === page, we shoudn't be there");
+    // TODO: check why next === page, doesn't seems to be normal
+    return state;
   }
 
   if (isLoop) {

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

@@ -89,7 +89,8 @@ function goPreviousPage(state, _ref2) {
     iteration: undefined,
     nbIterations: undefined,
     subPage: undefined,
-    nbSubPages: undefined
+    nbSubPages: undefined,
+    shallowIteration: undefined
   });
 
   var currentErrors = errors ? errors[(0, _commons2.getPageTag)(updatedPager)] : undefined;

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

@@ -52,7 +52,8 @@ function updateVariables(state, action) {
       index = args.index,
       length = args.length,
       linksIterations = args.linksIterations,
-      paginatedLoop = args.paginatedLoop;
+      paginatedLoop = args.paginatedLoop,
+      shallowIteration = args.shallowIteration;
   var pager = state.pager,
       variables = state.variables;
   var nbIterations = pager.nbIterations,
@@ -95,6 +96,12 @@ function updateVariables(state, action) {
       value: value
     });
 
+    if (loop) return _objectSpread(_objectSpread({}, state), {}, {
+      variables: _variablesNext3,
+      pager: _objectSpread(_objectSpread({}, pager), {}, {
+        shallowIteration: shallowIteration
+      })
+    });
     return _objectSpread(_objectSpread({}, state), {}, {
       variables: _variablesNext3
     });

package/lib/use-lunatic/reducer/validate-controls/create-controls-reducer.js

@@ -16,21 +16,28 @@ 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 validateComponents(state, components) {
-  var pager = state.pager; // TODO check components in components (Loop, etc...)
-
+  var pager = state.pager;
   return components.reduce(function (errors, component) {
-    var controls = component.controls;
+    var controls = component.controls,
+        componentType = component.componentType,
+        id = component.id;
 
     if (Array.isArray(controls)) {
       var componentErrors = (0, _validationUtils.resolveComponentControls)(state, controls);
+      var shallowIteration = pager.shallowIteration;
+      var idC = shallowIteration !== undefined ? "".concat(id, "-").concat(shallowIteration) : id;
+      return _objectSpread(_objectSpread({}, errors), {}, _defineProperty({}, idC, componentErrors));
+    } //Thanks to init which split basic Loops, we only go into unPaginatedLoops
+
 
-      if (componentErrors.length) {
-        return _objectSpread(_objectSpread({}, errors), {}, _defineProperty({}, (0, _commons.getPageTag)(pager), componentErrors));
-      }
+    if (['Loop', 'RosterForLoop'].includes(componentType)) {
+      var _components = component.components;
+      var recurs = validateComponents(state, _components);
+      return _objectSpread(_objectSpread(_objectSpread({}, (state.errors || {})[(0, _commons.getPageTag)(pager)] || {}), errors), recurs);
     } // If no error we remove the possible previous errors
 
 
-    return _objectSpread(_objectSpread({}, errors), {}, _defineProperty({}, (0, _commons.getPageTag)(pager), []));
+    return {};
   }, {});
 }
 
@@ -44,13 +51,16 @@ function createControlsReducer(reducer) {
         currentErrors: undefined
       });
     var components = (0, _commons.getComponentsFromState)(updatedState);
+    var pager = updatedState.pager;
+    var _state$errors = state.errors,
+        errors = _state$errors === void 0 ? {} : _state$errors;
+    var pageTag = (0, _commons.getPageTag)(pager);
 
-    var errors = _objectSpread(_objectSpread({}, state.errors), validateComponents(updatedState, components));
+    var e = _objectSpread(_objectSpread({}, errors), {}, _defineProperty({}, pageTag, validateComponents(updatedState, components)));
 
-    var pager = updatedState.pager;
     return _objectSpread(_objectSpread({}, updatedState), {}, {
-      errors: errors,
-      currentErrors: errors[(0, _commons.getPageTag)(pager)]
+      errors: e,
+      currentErrors: e[pageTag]
     });
   };
 }

package/lib/use-lunatic/reducer/validate-controls/create-modal-controls-reducer.js

@@ -17,20 +17,32 @@ 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 validateComponentsForModal(state, components) {
-  var pager = state.pager; // TODO check components in components (Loop, etc...)
-
+  var pager = state.pager;
   return components.reduce(function (errors, component) {
-    var controls = component.controls;
+    var controls = component.controls,
+        componentType = component.componentType,
+        id = component.id;
 
     if (Array.isArray(controls)) {
       var componentErrors = (0, _validationUtils.resolveComponentControls)(state, controls);
 
       if (componentErrors.length) {
-        return _objectSpread(_objectSpread({}, errors), {}, _defineProperty({}, (0, _commons.getPageTag)(pager), componentErrors));
+        var shallowIteration = pager.shallowIteration;
+        var idC = shallowIteration !== undefined ? "".concat(id, "-").concat(shallowIteration) : id;
+        return (0, _commons.getErrorsWithoutEmptyValue)(_objectSpread(_objectSpread({}, errors), {}, _defineProperty({}, idC, componentErrors)));
       }
-    }
+    } //Thanks to init which split basic Loops, we only go into unPaginatedLoops
+
+
+    if (['Loop', 'RosterForLoop'].includes(componentType)) {
+      // TODO handle the case where shallowInteration hasn't been initalized because not handleChange fired
+      var _components = component.components;
+      var recurs = validateComponentsForModal(state, _components);
+      return (0, _commons.getErrorsWithoutEmptyValue)(_objectSpread(_objectSpread(_objectSpread({}, (state.errors || {})[(0, _commons.getPageTag)(pager)] || {}), errors), recurs));
+    } // If no error we remove the possible previous errors
+
 
-    return errors;
+    return {};
   }, {});
 }
 
@@ -59,7 +71,7 @@ function createModalControlsReducer(reducer) {
       // Block the modal and stay in page so we add the error in the current page
       return _objectSpread(_objectSpread({}, state), {}, {
         modalErrors: undefined,
-        currentErrors: prec[(0, _commons.getPageTag)(state.pager)]
+        currentErrors: prec
       });
     }
 

package/lib/use-lunatic/reducer/validate-controls/validation-utils.js

@@ -21,7 +21,8 @@ function resolveControl(state, control) {
   var executeExpression = state.executeExpression,
       _state$pager = state.pager,
       pager = _state$pager === void 0 ? {} : _state$pager;
-  var iteration = pager.iteration;
+  var iteration = pager.iteration,
+      shallowIteration = pager.shallowIteration;
   var criticality = control.criticality,
       errorMessage = control.errorMessage,
       id = control.id,
@@ -32,14 +33,15 @@ function resolveControl(state, control) {
       value = _control$control$valu === void 0 ? 'true' : _control$control$valu;
 
   try {
+    var it = shallowIteration !== null && shallowIteration !== void 0 ? shallowIteration : iteration;
     var result = executeExpression(value, {
-      iteration: iteration
+      iteration: it
     });
 
     if (!result) {
       var labelValue = errorMessage.value;
       var label = executeExpression(labelValue, {
-        iteration: iteration
+        iteration: it
       });
       return {
         criticality: criticality,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "2.0.0-v2",
+	"version": "2.0.1-v2",
 	"workersVersion": "0.2.4-experimental",
 	"description": "Library of questionnaire components",
 	"repository": {
@@ -48,7 +48,7 @@
 		"library"
 	],
 	"dependencies": {
-		"@inseefr/trevas": "^0.1.15",
+		"@inseefr/trevas": "^0.1.16",
 		"@inseefr/vtl-2.0-antlr-tools": "^0.1.0-bundle",
 		"antlr4": "4.8.0",
 		"classnames": "^2.3.1",

package/lib/components/checkbox/checkbox-group/checkbox-option.js

@@ -1,57 +0,0 @@
-"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["default"] = void 0;
-
-var _react = _interopRequireWildcard(require("react"));
-
-var _classnames = _interopRequireDefault(require("classnames"));
-
-var _icons = require("../../commons/icons");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-function CheckboxOption(_ref) {
-  var disabled = _ref.disabled,
-      checked = _ref.checked,
-      id = _ref.id,
-      value = _ref.value,
-      onClick = _ref.onClick,
-      labelledBy = _ref.labelledBy;
-  var onClickOption = (0, _react.useCallback)(function () {
-    onClick(value);
-  }, [value, onClick]);
-  var handleKeyDown = (0, _react.useCallback)(function (e) {
-    var key = e.key;
-
-    if (key === 'Space') {// TODO
-    }
-  }, []);
-  var Icon = checked ? _icons.CheckboxChecked : _icons.CheckboxUnchecked;
-  return /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])('checkbox-modality', 'checkbox-modality-block', {
-      checked: checked,
-      disabled: disabled
-    })
-  }, /*#__PURE__*/_react["default"].createElement("span", {
-    id: id,
-    role: "checkbox",
-    className: "lunatic-input-checkbox",
-    "aria-checked": checked,
-    tabIndex: "0",
-    onClick: onClickOption,
-    onKeyDown: handleKeyDown,
-    "aria-labelledby": labelledBy
-  }, /*#__PURE__*/_react["default"].createElement(Icon, null)));
-}
-
-var _default = CheckboxOption;
-exports["default"] = _default;

package/lib/components/checkbox/checkbox.scss

@@ -1 +0,0 @@
-.lunatic-checkbox-boolean{}

package/lib/components/pairwise/block/index.js

@@ -1,15 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function get() {
-    return _pairwiseBlock["default"];
-  }
-});
-
-var _pairwiseBlock = _interopRequireDefault(require("./pairwise-block"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }

package/lib/components/pairwise/block/pairwise-block.js

@@ -1,17 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-var PairwiseBlock = function PairwiseBlock() {
-  return /*#__PURE__*/_react["default"].createElement("div", null, "TODO: PairwiseBlock");
-};
-
-var _default = PairwiseBlock;
-exports["default"] = _default;

package/lib/stories/pairwise/block/block.json

@@ -1,3 +0,0 @@
-{
-	"components": []
-}

package/lib/stories/pairwise/block/pairwise-block.stories.js

@@ -1,36 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = exports.Default = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _orchestrator = _interopRequireDefault(require("../../utils/orchestrator"));
-
-var _block = _interopRequireDefault(require("./block"));
-
-var _defaultArgTypes = _interopRequireDefault(require("../../utils/default-arg-types"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-var stories = {
-  title: 'Pairwise/Block',
-  component: _orchestrator["default"],
-  argTypes: _defaultArgTypes["default"]
-};
-var _default = stories;
-exports["default"] = _default;
-
-var Template = function Template(args) {
-  return /*#__PURE__*/_react["default"].createElement(_orchestrator["default"], args);
-};
-
-var Default = Template.bind({});
-exports.Default = Default;
-Default.args = {
-  id: 'block',
-  source: _block["default"],
-  pagination: true
-};

package/lib/stories/pairwise/links/data.json

@@ -1,12 +0,0 @@
-{
-	"COLLECTED": {
-		"PRENOM": { "COLLECTED": ["Toto", "Titi", "Tata"] },
-		"LINKS": {
-			"COLLECTED": [
-				[null, "1", "2"],
-				["1", null, "2"],
-				["3", "3", null]
-			]
-		}
-	}
-}