@movalib/movalib-commons 1.59.3 → 1.59.5

package/dist/src/ScheduleFields.js

@@ -33,6 +33,7 @@ var theme_1 = __importDefault(require("../theme")); // Import du thème personna
 var Enums_1 = require("./helpers/Enums");
 var Logger_1 = __importDefault(require("./helpers/Logger"));
 var Tools_1 = require("./helpers/Tools");
+var DateUtils_1 = require("./helpers/DateUtils");
 var ContentCopy_1 = __importDefault(require("@mui/icons-material/ContentCopy"));
 var initialSchedules = [
     { day: Enums_1.DayOfWeek.MONDAY, checked: false, allDay: false, intervals: [{ startTime: null, endTime: null, countryCode: Enums_1.CountryCode.FR, error: null }] },
@@ -147,8 +148,8 @@ var ScheduleFields = function (_a) {
                 newSchedule[dayIndex].intervals[intervalIndex].error = validateIntervals(newSchedule[dayIndex].intervals);
             }
             setSchedule(newSchedule);
-            if (type === 'endTime') {
-                // On invoque la callback de mise à jour uniquement sur l'intervalle de fin
+            if (type === 'endTime' || (type === 'startTime' && (0, DateUtils_1.isValidDate)(newSchedule[dayIndex].intervals[intervalIndex].endTime))) {
+                // On invoque la callback de mise à jour sur les deux intervalles, toutefois on contrôle que l'intervalle de fin est alimentée
                 onChange(newSchedule);
             }
         };
@@ -188,7 +189,7 @@ var ScheduleFields = function (_a) {
         onChange(newSchedule);
         setSchedule(newSchedule);
     }; };
-    return ((0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ container: true, spacing: 1, sx: { minWidth: '650px', maxWidth: '800px' } }, { children: schedule.map(function (daySchedule, dayIndex) { return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 2 }, { children: (0, jsx_runtime_1.jsx)(material_1.FormControlLabel, { control: (0, jsx_runtime_1.jsx)(material_1.Checkbox, { checked: daySchedule.checked, onChange: handleDayChecked(dayIndex) }), label: (0, Tools_1.getDayOfWeekLabel)(daySchedule.day) }) }), dayIndex + 1), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 7 }, { children: daySchedule.intervals.map(function (interval, intervalIndex) { return ((0, jsx_runtime_1.jsxs)(material_1.Grid, __assign({ container: true, style: { paddingTop: intervalIndex > 0 ? theme_1.default.spacing(1) : 0 } }, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 6, sx: { textAlign: 'center' } }, { children: (0, jsx_runtime_1.jsx)(x_date_pickers_1.TimePicker, { views: ['hours', 'minutes'], minutesStep: timePickerStep !== null && timePickerStep !== void 0 ? timePickerStep : 30, disabled: !daySchedule.checked, value: interval.startTime, formatDensity: 'dense', closeOnSelect: false, onAccept: handleIntervalChange(dayIndex, intervalIndex, 'startTime'), slotProps: {
+    return ((0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ container: true, spacing: 1, sx: { minWidth: '650px', maxWidth: '800px' } }, { children: schedule.map(function (daySchedule, dayIndex) { return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 2 }, { children: (0, jsx_runtime_1.jsx)(material_1.FormControlLabel, { control: (0, jsx_runtime_1.jsx)(material_1.Checkbox, { checked: daySchedule.checked, onChange: handleDayChecked(dayIndex) }), label: (0, Tools_1.getDayOfWeekLabel)(daySchedule.day) }) }), dayIndex + 1), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 7 }, { children: daySchedule.intervals.map(function (interval, intervalIndex) { return ((0, jsx_runtime_1.jsxs)(material_1.Grid, __assign({ container: true, style: { paddingTop: intervalIndex > 0 ? theme_1.default.spacing(1) : 0 } }, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 6, sx: { textAlign: 'center' } }, { children: (0, jsx_runtime_1.jsx)(x_date_pickers_1.TimePicker, { views: ['hours', 'minutes'], minutesStep: timePickerStep !== null && timePickerStep !== void 0 ? timePickerStep : 30, disabled: !daySchedule.checked, value: interval.startTime, formatDensity: 'dense', closeOnSelect: false, onChange: handleIntervalChange(dayIndex, intervalIndex, 'startTime'), slotProps: {
                                         textField: {
                                             size: 'small',
                                             sx: {
@@ -200,7 +201,7 @@ var ScheduleFields = function (_a) {
                                         actionBar: {
                                             sx: { display: 'none' },
                                         },
-                                    } }) }), (intervalIndex + 1) * Math.random()), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 6, sx: { display: 'contents' } }, { children: (0, jsx_runtime_1.jsx)(x_date_pickers_1.TimePicker, { minutesStep: timePickerStep !== null && timePickerStep !== void 0 ? timePickerStep : 30, disabled: !(interval.startTime instanceof Date), value: interval.endTime, formatDensity: 'dense', onAccept: handleIntervalChange(dayIndex, intervalIndex, 'endTime'), closeOnSelect: false, slotProps: {
+                                    } }) }), (intervalIndex + 1) * Math.random()), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 6, sx: { display: 'contents' } }, { children: (0, jsx_runtime_1.jsx)(x_date_pickers_1.TimePicker, { minutesStep: timePickerStep !== null && timePickerStep !== void 0 ? timePickerStep : 30, disabled: !(interval.startTime instanceof Date), value: interval.endTime, formatDensity: 'dense', onChange: handleIntervalChange(dayIndex, intervalIndex, 'endTime'), closeOnSelect: false, slotProps: {
                                         textField: {
                                             size: 'small',
                                             sx: {

package/dist/src/helpers/DateUtils.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="date-fns" />
 import { DateFormatTypes } from './Enums';
+export declare function isValidDate(date: unknown): date is Date;
 export declare const countryTimeZones: {
     [key: string]: string;
 };

package/dist/src/helpers/DateUtils.js

@@ -1,10 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLongFormattedDateTime = exports.formatDateByCountryCode = exports.toUTCToLocaleDate = exports.countryTimeZones = void 0;
+exports.getLongFormattedDateTime = exports.formatDateByCountryCode = exports.toUTCToLocaleDate = exports.countryTimeZones = exports.isValidDate = void 0;
 var date_fns_tz_1 = require("date-fns-tz");
 var locale_1 = require("date-fns/locale");
 var Enums_1 = require("./Enums");
 var Tools_1 = require("./Tools");
+function isValidDate(date) {
+    return date instanceof Date && !isNaN(date.getTime());
+}
+exports.isValidDate = isValidDate;
 // Tableau de correspondance entre les codes de pays et les fuseaux horaires
 exports.countryTimeZones = {
     'FR': 'Europe/Paris',

package/dist/src/services/GarageService.d.ts

@@ -8,6 +8,7 @@ export default class GarageService {
     static deleteEventEmployee(garageId: string, eventId: string): Promise<APIResponse<string>>;
     static updateEventEmployee(garageId: string, eventId: string, employeeId: string): Promise<APIResponse<string>>;
     static updateColorPrestationCategory(garageId: string, categoryCode: string, color: string): Promise<APIResponse<string>>;
+    static updateGarageEventColor(garageId: string, eventId: string, color: string): Promise<APIResponse<string>>;
     static updateVehicleGarageEvent(garageId: string, eventId: string, req: any): Promise<APIResponse<string>>;
     static sendGarageMandate(garageId: string): Promise<APIResponse<string>>;
     static getGarageAllData(garageId: string): Promise<APIResponse<Garage>>;

package/dist/src/services/GarageService.js

@@ -53,6 +53,14 @@ var GarageService = /** @class */ (function () {
             body: JSON.stringify({ color: color })
         });
     };
+    GarageService.updateGarageEventColor = function (garageId, eventId, color) {
+        return (0, ApiHelper_1.request)({
+            url: "".concat(ApiHelper_1.API_BASE_URL, "/garage/").concat(garageId, "/event/").concat(eventId, "/color"),
+            method: Enums_1.APIMethod.PATCH,
+            appType: Enums_1.MovaAppType.GARAGE,
+            body: JSON.stringify({ color: color })
+        });
+    };
     GarageService.updateVehicleGarageEvent = function (garageId, eventId, req) {
         return (0, ApiHelper_1.request)({
             url: "".concat(ApiHelper_1.API_BASE_URL, "/garage/").concat(garageId, "/event/").concat(eventId, "/vehicle"),

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@movalib/movalib-commons",
-  "version": "1.59.3",
+  "version": "1.59.5",
   "description": "Bibliothèque d'objets communs à l'ensemble des projets React de Movalib",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "private": false,
   "scripts": {
-    "start": "webpack-dev-server --entry ./devIndex.tsx --open",
+    "start": "webpack-dev-server --entry ./devIndex.tsx --open --https",
     "build": "rm -rf dist && tsc && npm run copy-assets",
     "copy-assets": "cp -r src/assets/ dist/src/assets/ && cp -r src/style/ dist/src/style/",
     "test": "echo \"Error: no test specified\" && exit 1",

package/src/ScheduleFields.tsx

@@ -9,7 +9,7 @@ import Schedule from './models/Schedule';
 import { CountryCode, DayOfWeek } from './helpers/Enums';
 import Logger from './helpers/Logger';
 import { flexCenter, getDayOfWeekIndex, getDayOfWeekLabel } from './helpers/Tools';
-import { toUTCToLocaleDate } from './helpers/DateUtils';
+import { isValidDate, toUTCToLocaleDate } from './helpers/DateUtils';
 import ContentCopyIcon from '@mui/icons-material/ContentCopy';
 
 
@@ -160,7 +160,7 @@ const ScheduleFields: FunctionComponent<ScheduleFieldsProps> = ({ timePickerStep
 
   const handleIntervalChange = (dayIndex: number, intervalIndex: number, type: 'startTime' | 'endTime') => 
   (newValue: "" | Date | null) => {
-
+    
     const newSchedule = [...schedule];
 
     newSchedule[dayIndex].intervals[intervalIndex][type] = newValue!;
@@ -180,8 +180,8 @@ const ScheduleFields: FunctionComponent<ScheduleFieldsProps> = ({ timePickerStep
 
     setSchedule(newSchedule);
 
-    if(type === 'endTime'){
-      // On invoque la callback de mise à jour uniquement sur l'intervalle de fin
+    if(type === 'endTime' || (type === 'startTime' && isValidDate(newSchedule[dayIndex].intervals[intervalIndex].endTime))){ 
+      // On invoque la callback de mise à jour sur les deux intervalles, toutefois on contrôle que l'intervalle de fin est alimentée
       onChange(newSchedule);
     }
 
@@ -264,7 +264,7 @@ const ScheduleFields: FunctionComponent<ScheduleFieldsProps> = ({ timePickerStep
                       value={interval.startTime}  
                       formatDensity='dense'        
                       closeOnSelect={false}            
-                      onAccept={handleIntervalChange(dayIndex, intervalIndex, 'startTime')}
+                      onChange={handleIntervalChange(dayIndex, intervalIndex, 'startTime')}
                       slotProps={{
                         textField: {
                           size: 'small',                          
@@ -286,7 +286,7 @@ const ScheduleFields: FunctionComponent<ScheduleFieldsProps> = ({ timePickerStep
                       disabled={!(interval.startTime instanceof Date)}
                       value={interval.endTime}
                       formatDensity='dense'
-                      onAccept={handleIntervalChange(dayIndex, intervalIndex, 'endTime')}
+                      onChange={handleIntervalChange(dayIndex, intervalIndex, 'endTime')}
                       closeOnSelect={false}
                       slotProps={{
                         textField: {

package/src/helpers/DateUtils.ts

@@ -3,6 +3,10 @@ import { fr } from 'date-fns/locale';
 import { DateFormatTypes } from './Enums';
 import { capitalizeFirstLetter } from './Tools';
 
+export function isValidDate(date: unknown): date is Date {
+    return date instanceof Date && !isNaN(date.getTime());
+}
+
 // Tableau de correspondance entre les codes de pays et les fuseaux horaires
 export const countryTimeZones: { [key: string]: string } = {
     'FR': 'Europe/Paris',

package/src/services/GarageService.ts

@@ -47,7 +47,14 @@ export default class GarageService {
       body: JSON.stringify({ color })
     });
   }
-
+  static updateGarageEventColor(garageId: string, eventId: string, color: string): Promise<APIResponse<string>> {
+    return request({
+      url: `${API_BASE_URL}/garage/${garageId}/event/${eventId}/color`,
+      method: APIMethod.PATCH,
+      appType: MovaAppType.GARAGE,
+      body: JSON.stringify({ color })
+    });
+  }
   static updateVehicleGarageEvent(garageId: string, eventId: string, req: any): Promise<APIResponse<string>> {
 
     return request({

package/webpack.config.js

@@ -41,4 +41,13 @@ module.exports = {
         'process.env.REACT_APP_MOVALIB_APP_URL': JSON.stringify(process.env.REACT_APP_MOVALIB_APP_URL)
       }),
     ],      
+
+    devServer: {
+      https: {
+        cert: path.resolve(__dirname, '/Users/Dimitri/localhost.pem'),
+        key: path.resolve(__dirname, '/Users/Dimitri/localhost-key.pem'),
+      },
+      open: true,
+      port: 8080, // ou un autre port si nécessaire
+    },
 };