@movalib/movalib-commons 1.1.63 → 1.1.65

package/dist/src/AccountValidation.js

@@ -30,6 +30,7 @@ var MovaDialog_1 = __importDefault(require("./MovaDialog"));
 var logo_large_png_1 = __importDefault(require("./assets/images/logo/logo_large.png"));
 var logo_pro_large_png_1 = __importDefault(require("./assets/images/logo/logo_pro_large.png"));
 var ConfirmationDialog_1 = __importDefault(require("./ConfirmationDialog"));
+var Validator_1 = require("./helpers/Validator");
 var initialFormState = {
     password: { value: '', isValid: true },
     confirmation: { value: '', isValid: true },
@@ -93,6 +94,10 @@ var AccountValidation = function (_a) {
             var fieldName = e.target.name;
             var fieldValue = e.target.value;
             var newField = (_a = {}, _a[fieldName] = { value: fieldValue, isValid: true }, _a);
+            if (fieldName == "phoneNumber") {
+                if (!(0, Validator_1.validatePhoneNumber)(fieldValue))
+                    return;
+            }
             setValidationForm(__assign(__assign({}, validationForm), newField));
         }
     };
@@ -141,10 +146,11 @@ var AccountValidation = function (_a) {
     var handleOpenResendCode = function () {
         setOpenPhoneNumberInput(true);
     };
-    var validatePhoneNumber = function () {
+    var controlPhoneNumber = function () {
         var _a, _b, _c, _d, _e;
         var newForm = validationForm;
         var newField;
+        newForm.phoneNumber = (0, Tools_1.validateField)(validationForm.phoneNumber, function (value) { return !!value; }, 'Champ obligatoire');
         // Validator 'phoneNumber'
         if ((_a = newForm.phoneNumber) === null || _a === void 0 ? void 0 : _a.value) {
             if (((_b = newForm.phoneNumber) === null || _b === void 0 ? void 0 : _b.value.length) < 10) {
@@ -160,7 +166,7 @@ var AccountValidation = function (_a) {
     };
     var resendCode = function () {
         var _a;
-        if (validatePhoneNumber()) {
+        if (controlPhoneNumber()) {
             var req = {
                 phoneNumber: (_a = validationForm.phoneNumber) === null || _a === void 0 ? void 0 : _a.value
             };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@movalib/movalib-commons",
-  "version": "1.1.63",
+  "version": "1.1.65",
   "description": "Bibliothèque d'objets communs à l'ensemble des projets React de Movalib",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/AccountValidation.tsx

@@ -15,6 +15,7 @@ import MovaDialog from './MovaDialog';
 import LogoLarge from './assets/images/logo/logo_large.png';
 import LogoProLarge from './assets/images/logo/logo_pro_large.png';
 import ConfirmationDialog from './ConfirmationDialog';
+import { validatePhoneNumber } from './helpers/Validator';
 
 const initialFormState = {
     password: { value: '', isValid: true },
@@ -98,6 +99,11 @@ const AccountValidation: FunctionComponent<AccountValidationProps> = ({ movaAppT
             const fieldValue: string = e.target.value;
             const newField: MovaFormField = { [fieldName]: { value: fieldValue, isValid: true } };
     
+            if (fieldName == "phoneNumber"){
+                if(!validatePhoneNumber(fieldValue))
+                  return;
+              } 
+
             setValidationForm({ ...validationForm, ...newField});
         }
     }
@@ -165,29 +171,31 @@ const AccountValidation: FunctionComponent<AccountValidationProps> = ({ movaAppT
         setOpenPhoneNumberInput(true);
     }
 
-    const validatePhoneNumber = ():boolean => {
+    const controlPhoneNumber = ():boolean => {
 
         let newForm: MovaValidationForm = validationForm;
         let newField: MovaFormField;
 
+        newForm.phoneNumber = validateField(validationForm.phoneNumber, value => !!value, 'Champ obligatoire');
+
           // Validator 'phoneNumber'
-      if(newForm.phoneNumber?.value){
-        if(newForm.phoneNumber?.value.length < 10){
-          newField = { value: validationForm.phoneNumber?.value, error: "Le n° de téléphone est invalide."};
-        } else {
-            newField ={ value: validationForm.phoneNumber?.value, error: ''};
+        if(newForm.phoneNumber?.value){
+            if(newForm.phoneNumber?.value.length < 10){
+            newField = { value: validationForm.phoneNumber?.value, error: "Le n° de téléphone est invalide."};
+            } else {
+                newField ={ value: validationForm.phoneNumber?.value, error: ''};
+            }
+            newForm = { ...newForm, ...{ phoneNumber: newField } };
         }
-        newForm = { ...newForm, ...{ phoneNumber: newField } };
-      }
-      
-      setValidationForm(newForm);
+        
+        setValidationForm(newForm);
 
-      return !Boolean(newForm.phoneNumber?.error);
+        return !Boolean(newForm.phoneNumber?.error);
     }
 
     const resendCode = () => {
 
-        if(validatePhoneNumber()){
+        if(controlPhoneNumber()){
 
             let req = {
                 phoneNumber : validationForm.phoneNumber?.value