@legalplace/wizardx-core 4.4.4 → 4.5.0

package/dist/redux/middlewares/mandatoriesWatcherMiddleware.js

@@ -1,3 +1,4 @@
+import { EMAIL_REGEX } from "../../constants/emailValidation";
 import { UPDATE_OPTION_INPUT, UPDATE_VARIABLE_INPUT, ADD_MULTIPLE_OCCURENCY, DELETE_MULTIPLE_OCCURENCY, } from "../constants/inputs";
 import { selectVariableInputByIndex, selectOptionInputByIndex, selectOptionInput, } from "../selectors/inputs";
 import { SET_MANDATORY_OPTION, SET_MANDATORY_VARIABLE, } from "../constants/mandatories";
@@ -5,7 +6,7 @@ import { selectOptionRelations, selectOptionReference, selectSectionReference, s
 import { selectMandatoryOption, selectMandatoryVariable, } from "../selectors/mandatories";
 import { setMandatoryOptionAction, setMandatorySectionAction, setMandatoryVariableAction, } from "../actions/mandatories";
 import { UPDATE_OPTION_CONDITION, UPDATE_VARIABLE_CONDITION, UPDATE_SECTION_CONDITION, } from "../constants/conditions";
-import { selectOptionConditionValue, selectVariableConditionValue, selectIsOptionDisplayed, selectIsVariableDisplayed, } from "../selectors/conditions";
+import { selectOptionConditionValue, selectVariableConditionValue, selectIsOptionDisplayed, selectIsVariableDisplayed, selectVariableValidatorConditionValue, } from "../selectors/conditions";
 import { FETCH_MODEL_SUCCEEDED } from "../constants/app";
 import { checkDateValidity } from "../../helpers/date.helper";
 import { checkPhoneNumberValidity } from "../../helpers/phoneNumber.helper";
@@ -120,6 +121,7 @@ const watchSectionMandatory = (mpi, next, action) => {
         validateSectionMandatory(mpi, sectionId);
 };
 const watchUpdateVariableInputCondition = (mpi, next, action, ignoreNext) => {
+    var _a;
     const { type, id, index, value } = action;
     if (ignoreNext !== true)
         next(action);
@@ -128,19 +130,29 @@ const watchUpdateVariableInputCondition = (mpi, next, action, ignoreNext) => {
     const inputValue = type === UPDATE_VARIABLE_INPUT
         ? `${value}`.trim().length > 0
         : `${selectVariableInputByIndex(id, index)}`.trim().length > 0;
-    const { type: variableType } = selectVariableReference(id);
+    const { type: variableType, mask } = selectVariableReference(id);
     const conditionValue = action.type === UPDATE_VARIABLE_CONDITION
         ? action.value
         : selectVariableConditionValue(id, index) !== false;
     let mandatoryValue = !conditionValue || (conditionValue && inputValue);
-    if (variableType === "date" &&
+    const emailInvalidCheck = (variableType === "email" || variableType === "user_email") &&
         typeof value === "string" &&
-        !checkDateValidity(value)) {
-        mandatoryValue = false;
-    }
-    if (variableType === "phone_number" &&
+        !EMAIL_REGEX.test(value.toString());
+    const dateInvalidCheck = variableType === "date" &&
+        typeof value === "string" &&
+        !checkDateValidity(value);
+    const phoneNumberInvalidCheck = variableType === "phone_number" &&
+        typeof value === "string" &&
+        !checkPhoneNumberValidity(value);
+    const maskInvalidityCheck = variableType === "mask" &&
         typeof value === "string" &&
-        !checkPhoneNumberValidity(value)) {
+        !(value.toString().trim().length === ((_a = mask === null || mask === void 0 ? void 0 : mask.formula) === null || _a === void 0 ? void 0 : _a.length));
+    const customValidatorInvalidCheck = selectVariableValidatorConditionValue(id, index) === false;
+    if (emailInvalidCheck ||
+        dateInvalidCheck ||
+        phoneNumberInvalidCheck ||
+        maskInvalidityCheck ||
+        customValidatorInvalidCheck) {
         mandatoryValue = false;
     }
     mpi.dispatch(setMandatoryVariableAction(id, index, mandatoryValue));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/wizardx-core",
-  "version": "4.4.4",
+  "version": "4.5.0",
   "author": "Moncef Hammou (moncef@legalplace.fr)",
   "license": "MIT",
   "files": [
@@ -95,5 +95,5 @@
     "*.test.ts",
     "*.test.tsx"
   ],
-  "gitHead": "bc6c068f7f4db0d04786c920ac5eccc47487e506"
+  "gitHead": "c8d086ebb96ba3f5c61b81b2d297bfb06a24e9d6"
 }