@legalplace/wizardx-core 4.5.5 → 4.6.0

package/dist/helpers/date.helper.js

@@ -1,5 +1,26 @@
 export const checkDateValidity = (date) => {
-    const [day, month, year] = (date === null || date === void 0 ? void 0 : date.toString().split("/")) || [];
-    const dateObject = new Date(`${year}-${month}-${day}`);
-    return new Date(dateObject).toString() !== "Invalid Date";
+    const dateComponents = date.split("/");
+    if (dateComponents.length !== 3) {
+        return false;
+    }
+    const day = parseInt(dateComponents[0], 10);
+    const month = parseInt(dateComponents[1], 10);
+    const year = parseInt(dateComponents[2], 10);
+    if (Number.isNaN(day) || Number.isNaN(month) || Number.isNaN(year)) {
+        return false;
+    }
+    if (month < 1 || month > 12) {
+        return false;
+    }
+    const daysInMonth = new Date(year, month, 0).getDate();
+    if (day < 1 || day > daysInMonth) {
+        return false;
+    }
+    if (year <= 1000) {
+        return false;
+    }
+    const dateObject = new Date(year, month - 1, day);
+    return (dateObject.getFullYear() === year &&
+        dateObject.getMonth() === month - 1 &&
+        dateObject.getDate() === day);
 };

package/dist/helpers/mandatoryVariable.d.ts

@@ -0,0 +1,2 @@
+import type { VariableV3 } from "@legalplace/models-v3-types";
+export declare const checkMandatoryVariable: (variable: Readonly<VariableV3>, value: string | number | boolean) => boolean;

package/dist/helpers/mandatoryVariable.js

@@ -0,0 +1,21 @@
+import { checkDateValidity } from "./date.helper";
+import { checkPhoneNumberValidity } from "./phoneNumber.helper";
+import { EMAIL_REGEX } from "../constants/emailValidation";
+const formatsCheck = {
+    email: (value) => EMAIL_REGEX.test(value),
+    user_email: (value) => EMAIL_REGEX.test(value),
+    date: (value) => checkDateValidity(value),
+    mask: (value, maskFormula) => value.toString().trim().length === (maskFormula === null || maskFormula === void 0 ? void 0 : maskFormula.length),
+    phone_number: (value) => checkPhoneNumberValidity(value.toString()),
+};
+export const checkMandatoryVariable = (variable, value) => {
+    const { type, mask, mandatory } = variable;
+    if (!mandatory || typeof value !== "string") {
+        return true;
+    }
+    const formatCheck = formatsCheck[type];
+    if (!formatCheck) {
+        return true;
+    }
+    return formatCheck(value.toString().trim(), mask === null || mask === void 0 ? void 0 : mask.formula);
+};

package/dist/redux/middlewares/mandatoriesWatcherMiddleware.js

@@ -1,14 +1,13 @@
+import { checkMandatoryVariable } from "../../helpers/mandatoryVariable";
 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";
 import { selectOptionRelations, selectOptionReference, selectSectionReference, selectVariableRelations, selectAllSectionsReferences, selectRadioSiblings, selectVariableReference, } from "../selectors/references";
 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 { UPDATE_OPTION_CONDITION, UPDATE_VARIABLE_CONDITION, UPDATE_SECTION_CONDITION, UPDATE_VARIABLE_VALIDATOR_CONDITION, } from "../constants/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";
 const validateSectionMandatory = (mpi, sectionId) => {
     const parentSection = selectSectionReference(sectionId);
     let childOptions = [...parentSection.options];
@@ -128,19 +127,16 @@ 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 variableRef = selectVariableReference(id);
+    const { validator } = variableRef;
     const conditionValue = action.type === UPDATE_VARIABLE_CONDITION
         ? action.value
         : selectVariableConditionValue(id, index) !== false;
     let mandatoryValue = !conditionValue || (conditionValue && inputValue);
-    if (variableType === "date" &&
-        typeof value === "string" &&
-        !checkDateValidity(value)) {
-        mandatoryValue = false;
-    }
-    if (variableType === "phone_number" &&
-        typeof value === "string" &&
-        !checkPhoneNumberValidity(value)) {
+    if ((type === UPDATE_VARIABLE_INPUT ||
+        type === UPDATE_VARIABLE_VALIDATOR_CONDITION) &&
+        (!checkMandatoryVariable(variableRef, value) ||
+            (validator && selectVariableValidatorConditionValue(id, index) === false))) {
         mandatoryValue = false;
     }
     mpi.dispatch(setMandatoryVariableAction(id, index, mandatoryValue));
@@ -212,6 +208,7 @@ const watchFetchModelSucceeded = (mpi, next, action) => {
 };
 const watchersEnum = {
     [UPDATE_OPTION_INPUT]: watchUpdateOptionInputCondition,
+    [UPDATE_VARIABLE_VALIDATOR_CONDITION]: watchUpdateVariableInputCondition,
     [UPDATE_OPTION_CONDITION]: watchUpdateOptionInputCondition,
     [UPDATE_VARIABLE_INPUT]: watchUpdateVariableInputCondition,
     [UPDATE_VARIABLE_CONDITION]: watchUpdateVariableInputCondition,

package/dist/redux/sagas/initInputs.js

@@ -1,4 +1,5 @@
 import { select, takeLatest, put } from "redux-saga/effects";
+import { checkMandatoryVariable } from "../../helpers/mandatoryVariable";
 import { INIT_INPUTS } from "../constants/inputs";
 import { selectMandatoryOptionItem, selectMandatoryOption, } from "../selectors/mandatories";
 import { initMandatoryOptionAction, initMandatoryVariableAction, } from "../actions/mandatories";
@@ -6,8 +7,6 @@ import { initOptionAction, initVariableAction } from "../actions/inputs";
 import { initConditionsAction } from "../actions/conditions";
 import { ConditionsInitiator } from "../../libs/ConditionsInitiator";
 import { selectOptionRelations, selectVariableReference, } from "../selectors/references";
-import { checkDateValidity } from "../../helpers/date.helper";
-import { checkPhoneNumberValidity } from "../../helpers/phoneNumber.helper";
 import { cancelOnResetState } from "../../helpers/sagaCancelOnResetState";
 const getValues = (arr1, arr2) => arr1.map((v, index) => arr2[index] || v);
 export function* initInputsDecorator(action) {
@@ -50,21 +49,18 @@ export function* initInputsDecorator(action) {
         }
     }
     const variablesIds = Object.keys(inputs.variables);
-    for (let i = 0; i < variablesIds.length; i += 1) {
-        const variableId = variablesIds[i];
+    for (let index = 0; index < variablesIds.length; index += 1) {
+        const variableId = variablesIds[index];
         const values = inputs.variables[variableId];
         yield put(initVariableAction(parseInt(variableId, 10), values));
         if (references.variables[variableId].mandatory === true)
             yield put(initMandatoryVariableAction(parseInt(variableId, 10), values.map((value) => {
-                const { type: variableType } = selectVariableReference(parseInt(variableId, 10));
-                if (variableType === "date" &&
-                    typeof value === "string" &&
-                    !checkDateValidity(value)) {
-                    return false;
-                }
-                if (variableType === "phone_number" &&
-                    typeof value === "string" &&
-                    !checkPhoneNumberValidity(value)) {
+                var _a, _b;
+                const variableRef = selectVariableReference(parseInt(variableId, 10));
+                const { validator, id } = variableRef;
+                if (!checkMandatoryVariable(variableRef, value) ||
+                    (validator &&
+                        ((_b = (_a = conditions.validators.variables) === null || _a === void 0 ? void 0 : _a[id]) === null || _b === void 0 ? void 0 : _b[index]) === false)) {
                     return false;
                 }
                 return `${value}`.trim().length > 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/wizardx-core",
-  "version": "4.5.5",
+  "version": "4.6.0",
   "author": "Moncef Hammou (moncef@legalplace.fr)",
   "license": "MIT",
   "files": [
@@ -26,7 +26,7 @@
     "@legalplace/model-healthcheck": "^1.1.5",
     "@legalplace/referencesparser": "^3.0.5",
     "@legalplace/storybook": "^2.171.0",
-    "@legalplace/typeorm-constants": "^3.20.0",
+    "@legalplace/typeorm-constants": "^3.20.1",
     "@loadable/component": "^5.15.0",
     "@redux-saga/core": "^1.1.3",
     "connected-react-router": "^6.8.0",
@@ -55,9 +55,9 @@
   },
   "devDependencies": {
     "@legalplace/eslint-config": "^2.2.0",
-    "@legalplace/models-v3-types": "^5.1.22",
+    "@legalplace/models-v3-types": "^5.1.23",
     "@legalplace/prettier-config": "^2.1.3",
-    "@legalplace/typeorm-entities": "^5.24.4",
+    "@legalplace/typeorm-entities": "^5.24.5",
     "@swc-node/jest": "^1.3.2",
     "@swc/core": "^1.2.93",
     "@swc/jest": "^0.2.4",
@@ -95,5 +95,5 @@
     "*.test.ts",
     "*.test.tsx"
   ],
-  "gitHead": "8284be459e1867d0acaf6919459d2bf050305e5c"
+  "gitHead": "eec1426c5120bf1a47a5cd9076341c0bf3e4084a"
 }