@inseefr/lunatic 0.4.3-v2 → 0.4.4-v2

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

@@ -0,0 +1,59 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _validationUtils = require("./validation-utils");
+
+var _commons = require("../../commons");
+
+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) { 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...)
+
+  return components.reduce(function (errors, component) {
+    var controls = component.controls;
+
+    if (Array.isArray(controls)) {
+      var componentErrors = (0, _validationUtils.resolveComponentControls)(state, controls);
+
+      if (componentErrors.length) {
+        return _objectSpread(_objectSpread({}, errors), {}, _defineProperty({}, (0, _commons.getPageTag)(pager), componentErrors));
+      }
+    } // If no error we remove the possible previous errors
+
+
+    return _objectSpread(_objectSpread({}, errors), {}, _defineProperty({}, (0, _commons.getPageTag)(pager), []));
+  }, {});
+}
+
+function createControlsReducer(reducer) {
+  // Nothing to init
+  return function (state, action) {
+    var activeControls = state.activeControls;
+    var updatedState = reducer(state, action);
+    if (!activeControls || state.pager.lastReachedPage !== updatedState.pager.lastReachedPage) //if no active controls or is the first time we reach the page
+      return _objectSpread(_objectSpread({}, updatedState), {}, {
+        currentErrors: undefined
+      });
+    var components = (0, _commons.getComponentsFromState)(updatedState);
+
+    var errors = _objectSpread(_objectSpread({}, state.errors), validateComponents(updatedState, components));
+
+    var pager = updatedState.pager;
+    return _objectSpread(_objectSpread({}, updatedState), {}, {
+      errors: errors,
+      currentErrors: errors[(0, _commons.getPageTag)(pager)]
+    });
+  };
+}
+
+var _default = createControlsReducer;
+exports["default"] = _default;

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

@@ -0,0 +1,88 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+exports.isErrors = isErrors;
+
+var _validationUtils = require("./validation-utils");
+
+var _commons = require("../../commons");
+
+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) { 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...)
+
+  return components.reduce(function (errors, component) {
+    var controls = component.controls;
+
+    if (Array.isArray(controls)) {
+      var componentErrors = (0, _validationUtils.resolveComponentControls)(state, controls);
+
+      if (componentErrors.length) {
+        return _objectSpread(_objectSpread({}, errors), {}, _defineProperty({}, (0, _commons.getPageTag)(pager), componentErrors));
+      }
+    }
+
+    return errors;
+  }, {});
+}
+
+function isErrors(errors) {
+  if (errors) {
+    return Object.keys(errors).length > 0;
+  }
+
+  return false;
+}
+
+function createModalControlsReducer(reducer) {
+  // Nothing to init
+  return function (state, action) {
+    var payload = action.payload;
+    var activeControls = state.activeControls,
+        errors = state.errors;
+    var block = payload.block;
+    if (!activeControls) return reducer(_objectSpread(_objectSpread({}, state), {}, {
+      modalErrors: undefined
+    }), action);
+    var components = (0, _commons.getComponentsFromState)(state);
+    var prec = state.modalErrors;
+
+    if (block) {
+      // 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)]
+      });
+    }
+
+    if (prec) {
+      return reducer(_objectSpread(_objectSpread({}, state), {}, {
+        modalErrors: undefined
+      }), action);
+    }
+
+    var modalErrors = validateComponentsForModal(state, components);
+
+    if (isErrors(modalErrors)) {
+      return _objectSpread(_objectSpread({}, state), {}, {
+        modalErrors: modalErrors,
+        errors: _objectSpread(_objectSpread({}, errors), modalErrors)
+      });
+    }
+
+    return reducer(_objectSpread(_objectSpread({}, state), {}, {
+      modalErrors: undefined
+    }), action);
+  };
+}
+
+var _default = createModalControlsReducer;
+exports["default"] = _default;

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

@@ -3,13 +3,21 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "createValidateReducer", {
+Object.defineProperty(exports, "createControlsReducer", {
   enumerable: true,
   get: function get() {
-    return _createValidateReducer["default"];
+    return _createControlsReducer["default"];
   }
 });
+Object.defineProperty(exports, "createModalControlsReducer", {
+  enumerable: true,
+  get: function get() {
+    return _createModalControlsReducer["default"];
+  }
+});
+
+var _createControlsReducer = _interopRequireDefault(require("./create-controls-reducer"));
 
-var _createValidateReducer = _interopRequireDefault(require("./create-validate-reducer"));
+var _createModalControlsReducer = _interopRequireDefault(require("./create-modal-controls-reducer"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }

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

@@ -0,0 +1,71 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.resolveComponentControls = resolveComponentControls;
+
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+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 resolveControl(state, control) {
+  var executeExpression = state.executeExpression,
+      _state$pager = state.pager,
+      pager = _state$pager === void 0 ? {} : _state$pager;
+  var iteration = pager.iteration;
+  var criticality = control.criticality,
+      errorMessage = control.errorMessage,
+      id = control.id,
+      blocking = control.blocking;
+  var _control$control = control.control;
+  _control$control = _control$control === void 0 ? {} : _control$control;
+  var _control$control$valu = _control$control.value,
+      value = _control$control$valu === void 0 ? 'true' : _control$control$valu;
+
+  try {
+    var result = executeExpression(value, {
+      iteration: iteration
+    });
+
+    if (!result) {
+      var labelValue = errorMessage.value;
+      var label = executeExpression(labelValue, {
+        iteration: iteration
+      });
+      return {
+        criticality: criticality,
+        errorMessage: label,
+        id: id,
+        blocking: blocking,
+        formula: value,
+        labelFormula: labelValue
+      };
+    }
+
+    return undefined;
+  } catch (e) {
+    console.log("Error on validating control ".concat(value));
+    return undefined;
+  }
+}
+
+function resolveComponentControls(state, controls) {
+  return controls.reduce(function (errors, control) {
+    var error = resolveControl(state, control);
+
+    if (error) {
+      return [].concat(_toConsumableArray(errors), [error]);
+    }
+
+    return errors;
+  }, []);
+}

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

@@ -79,8 +79,8 @@ function useLunatic(source) {
       autoSuggesterLoading = _ref$autoSuggesterLoa === void 0 ? false : _ref$autoSuggesterLoa,
       suggestersConfiguration = _ref.suggesters,
       suggesterFetcher = _ref.suggesterFetcher,
-      _ref$modalForControls = _ref.modalForControls,
-      modalForControls = _ref$modalForControls === void 0 ? false : _ref$modalForControls;
+      _ref$activeControls = _ref.activeControls,
+      activeControls = _ref$activeControls === void 0 ? false : _ref$activeControls;
 
   var _useReducer = (0, _react.useReducer)(_reducer["default"], _initialState["default"]),
       _useReducer2 = _slicedToArray(_useReducer, 2),
@@ -89,7 +89,9 @@ function useLunatic(source) {
 
   var pager = state.pager,
       waiting = state.waiting,
-      errors = state.errors;
+      modalErrors = state.modalErrors,
+      errors = state.errors,
+      currentErrors = state.currentErrors;
   var components = (0, _commons.useComponentsFromState)(state);
   var suggesters = source.suggesters;
   (0, _react.useEffect)(function () {
@@ -139,6 +141,12 @@ function useLunatic(source) {
   var getErrors = (0, _react.useCallback)(function () {
     return errors;
   }, [errors]);
+  var getModalErrors = (0, _react.useCallback)(function () {
+    return modalErrors;
+  }, [modalErrors]);
+  var getCurrentErrors = (0, _react.useCallback)(function () {
+    return currentErrors;
+  }, [currentErrors]);
   var goPreviousPage = (0, _react.useCallback)(function () {
     dispatch(actions.goPreviousPage());
   }, [dispatch]);
@@ -183,15 +191,17 @@ function useLunatic(source) {
       savingType: savingType,
       management: management,
       handleChange: handleChange,
-      modalForControls: modalForControls
+      activeControls: activeControls
     }));
-  }, [source, data, initialPage, features, preferences, savingType, management, handleChange, modalForControls]);
+  }, [source, data, initialPage, features, preferences, savingType, management, handleChange, activeControls]);
   return {
     getComponents: getComponents,
     goPreviousPage: goPreviousPage,
     goNextPage: goNextPage,
     goToPage: goToPage,
     getErrors: getErrors,
+    getModalErrors: getModalErrors,
+    getCurrentErrors: getCurrentErrors,
     pageTag: pageTag,
     isFirstPage: isFirstPage,
     isLastPage: isLastPage,

package/package.json

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

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

@@ -1,21 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-function getPageTag(pager) {
-  var page = pager.page,
-      subPage = pager.subPage,
-      iteration = pager.iteration;
-
-  if (subPage !== undefined && iteration !== undefined) {
-    return "".concat(page, ".").concat(subPage + 1, "#").concat(iteration + 1);
-  }
-
-  return "".concat(page);
-}
-
-var _default = getPageTag;
-exports["default"] = _default;

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

@@ -1,146 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _commons = require("../../commons");
-
-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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-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; }
-
-// export const CRITICALITY = {
-// 	INFO: 'INFO',
-// 	WARN: 'WARN',
-// };
-function resolveControl(state, control) {
-  var executeExpression = state.executeExpression,
-      _state$pager = state.pager,
-      pager = _state$pager === void 0 ? {} : _state$pager;
-  var iteration = pager.iteration;
-  var criticality = control.criticality,
-      errorMessage = control.errorMessage,
-      id = control.id;
-  var _control$control = control.control;
-  _control$control = _control$control === void 0 ? {} : _control$control;
-  var _control$control$valu = _control$control.value,
-      value = _control$control$valu === void 0 ? 'true' : _control$control$valu;
-
-  try {
-    var result = executeExpression(value, {
-      iteration: iteration
-    });
-
-    if (!result) {
-      return {
-        criticality: criticality,
-        errorMessage: errorMessage,
-        id: id
-      };
-    }
-
-    return undefined;
-  } catch (e) {
-    console.log("Error on validating control ".concat(value));
-    return undefined;
-  }
-}
-
-function resolveComponentControls(state, controls) {
-  return controls.reduce(function (errors, control) {
-    var error = resolveControl(state, control);
-
-    if (error) {
-      return [].concat(_toConsumableArray(errors), [error]);
-    }
-
-    return errors;
-  }, []);
-}
-
-function validateComponents(state, components) {
-  // TODO check components in components (Loop, etc...)
-  return components.reduce(function (errors, component) {
-    var controls = component.controls,
-        id = component.id;
-
-    if (Array.isArray(controls)) {
-      var componentErrors = resolveComponentControls(state, controls);
-
-      if (componentErrors.length) {
-        return _objectSpread(_objectSpread({}, errors), {}, _defineProperty({}, id, componentErrors));
-      }
-    }
-
-    return errors;
-  }, {});
-} // function isBlockingErrors(errors) {
-// 	// TODO find criticality WARN
-// 	return false;
-// }
-
-
-function isErrors(errors) {
-  if (errors) {
-    return Object.keys(errors).length > 0;
-  }
-
-  return false;
-}
-
-function createValidateReducer(reducer) {
-  // Nothing to init
-  return function (state, action) {
-    var payload = action.payload;
-    var modalForControls = state.modalForControls;
-    var block = payload.block;
-    if (!modalForControls) return reducer(_objectSpread(_objectSpread({}, state), {}, {
-      errors: undefined
-    }), action);
-    var components = (0, _commons.getComponentsFromState)(state);
-    var prec = state.errors;
-
-    if (block) {
-      return _objectSpread(_objectSpread({}, state), {}, {
-        errors: undefined
-      });
-    }
-
-    if (prec) {
-      return reducer(_objectSpread(_objectSpread({}, state), {}, {
-        errors: undefined
-      }), action);
-    }
-
-    var errors = validateComponents(state, components);
-
-    if (isErrors(errors)) {
-      return _objectSpread(_objectSpread({}, state), {}, {
-        errors: errors
-      });
-    }
-
-    return reducer(_objectSpread(_objectSpread({}, state), {}, {
-      errors: undefined
-    }), action);
-  };
-}
-
-var _default = createValidateReducer;
-exports["default"] = _default;