@movalib/movalib-commons 1.1.4 → 1.1.6

package/dist/src/AccountValidation.d.ts

@@ -2,8 +2,7 @@ import { FunctionComponent } from 'react';
 import { MovaAppType } from './helpers/Enums';
 interface AccountValidationProps {
     movaAppType: MovaAppType;
-    onSuccess: () => void;
-    onError: () => void;
+    onSubmit: (success: boolean, message: string) => void;
 }
 declare const AccountValidation: FunctionComponent<AccountValidationProps>;
 export default AccountValidation;

package/dist/src/AccountValidation.js

@@ -32,7 +32,7 @@ var initialFormState = {
     confirmation: { value: '', isValid: true },
 };
 var AccountValidation = function (_a) {
-    var movaAppType = _a.movaAppType, onSuccess = _a.onSuccess, onError = _a.onError;
+    var movaAppType = _a.movaAppType, onSubmit = _a.onSubmit;
     var _b = (0, react_1.useState)(true), loading = _b[0], setLoading = _b[1];
     var _c = (0, react_1.useState)(initialFormState), passwordForm = _c[0], setPasswordForm = _c[1];
     var location = (0, react_router_dom_1.useLocation)();
@@ -58,18 +58,24 @@ var AccountValidation = function (_a) {
     }, [location]);
     var activateAccount = function (req) {
         if (req) {
-            Logger_1.default.info(req);
             UserService_1.default.validateAccount(req)
                 .then(function (response) {
-                // Affichage notification utilisateur
+                var _a, _b;
                 Logger_1.default.info(response);
-                if (onSuccess) {
-                    onSuccess();
+                if (response.success) {
+                    if (onSubmit) {
+                        onSubmit(response.success, (_a = response.data) !== null && _a !== void 0 ? _a : '');
+                    }
+                }
+                else {
+                    if (onSubmit) {
+                        onSubmit(response.success, (_b = response.error) !== null && _b !== void 0 ? _b : '');
+                    }
                 }
             }).catch(function (error) {
                 Logger_1.default.error(error);
-                if (onError) {
-                    onError();
+                if (onSubmit) {
+                    onSubmit(false, error);
                 }
             });
         }

package/dist/src/ScheduleFields.js

@@ -102,7 +102,9 @@ var ScheduleFields = function (_a) {
         newSchedule[dayIndex].checked = event.target.checked;
         // On réinitialise aussi les intervals
         newSchedule[dayIndex].intervals = [{ startTime: null, endTime: null, countryCode: 'fr', error: null }];
-        onChange(newSchedule);
+        // L'activation ne doit pas déclencher le onChange
+        if (!event.target.checked)
+            onChange(newSchedule);
         setSchedule(newSchedule);
     }; };
     var handleAllDayChecked = function (e, value, dayIndex) { return function (event) {
@@ -124,7 +126,6 @@ var ScheduleFields = function (_a) {
         var sortedIntervals = __spreadArray([], intervals, true).sort(function (a, b) {
             return a.startTime && b.startTime ? a.startTime.toISOString().localeCompare(b.startTime.toISOString()) : 0;
         });
-        console.log(sortedIntervals);
         for (var i = 0; i < sortedIntervals.length; i++) {
             if (((_a = sortedIntervals[i].startTime) === null || _a === void 0 ? void 0 : _a.toString().localeCompare((_b = sortedIntervals[i].endTime) === null || _b === void 0 ? void 0 : _b.toString())) >= 0 ||
                 (i < sortedIntervals.length - 1 &&
@@ -146,7 +147,9 @@ var ScheduleFields = function (_a) {
                 newSchedule[dayIndex].intervals[intervalIndex].error = validateIntervals(newSchedule[dayIndex].intervals);
             }
             setSchedule(newSchedule);
-            onChange(newSchedule);
+            // On invoque la callback de mise à jour uniquement sur l'intervalle de fin
+            if (type === 'endTime')
+                onChange(newSchedule);
         };
     };
     var addInterval = function (dayIndex) { return function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@movalib/movalib-commons",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "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

@@ -19,11 +19,10 @@ const initialFormState = {
 
 interface AccountValidationProps {
     movaAppType: MovaAppType,
-    onSuccess: () => void,
-    onError: () => void,
+    onSubmit: (success:boolean, message:string) => void,
 }
 
-const AccountValidation: FunctionComponent<AccountValidationProps> = ({ movaAppType, onSuccess, onError }) => {
+const AccountValidation: FunctionComponent<AccountValidationProps> = ({ movaAppType, onSubmit }) => {
 
     const [loading, setLoading] = useState(true);
     const [passwordForm, setPasswordForm] = useState<MovaPasswordForm>(initialFormState);
@@ -60,21 +59,25 @@ const AccountValidation: FunctionComponent<AccountValidationProps> = ({ movaAppT
     const activateAccount = (req: any) => {
         if(req){
 
-            Logger.info(req);
-
             UserService.validateAccount(req)
             .then(response => {
 
-                // Affichage notification utilisateur
                 Logger.info(response);
-                if(onSuccess){
-                    onSuccess();
+
+                if(response.success){
+                    if(onSubmit){
+                        onSubmit(response.success, response.data ?? '');
+                    }
+                }else{
+                    if(onSubmit){
+                        onSubmit(response.success, response.error ?? '');
+                    }
                 }
 
             }).catch(error => {
                 Logger.error(error);
-                if(onError){
-                    onError();
+                if(onSubmit){
+                    onSubmit(false, error);
                 }
             });
         }

package/src/ScheduleFields.tsx

@@ -116,7 +116,10 @@ const ScheduleFields: FunctionComponent<ScheduleFieldsProps> = ({ timePickerStep
     newSchedule[dayIndex].checked = event.target.checked;
     // On réinitialise aussi les intervals
     newSchedule[dayIndex].intervals = [{startTime: null, endTime: null, countryCode: 'fr', error: null}];
-    onChange(newSchedule);
+    // L'activation ne doit pas déclencher le onChange
+    if(!event.target.checked)
+      onChange(newSchedule);
+
     setSchedule(newSchedule);
   };
 
@@ -142,7 +145,6 @@ const ScheduleFields: FunctionComponent<ScheduleFieldsProps> = ({ timePickerStep
     const sortedIntervals = [...intervals].sort((a, b) => 
       a.startTime && b.startTime ? a.startTime.toISOString().localeCompare(b.startTime.toISOString()) : 0);
 
-  console.log(sortedIntervals)
     for (let i = 0; i < sortedIntervals.length; i++) {
         if (
           sortedIntervals[i].startTime?.toString().localeCompare(sortedIntervals[i].endTime?.toString()!)! >= 0 ||
@@ -177,7 +179,10 @@ const ScheduleFields: FunctionComponent<ScheduleFieldsProps> = ({ timePickerStep
     }
 
     setSchedule(newSchedule);
-    onChange(newSchedule);
+
+    // On invoque la callback de mise à jour uniquement sur l'intervalle de fin
+    if(type === 'endTime')
+      onChange(newSchedule);
   };
 
   const addInterval = (dayIndex: number) => () => {