@movalib/movalib-commons 1.59.15 → 1.59.17

package/devIndex.tsx

@@ -19,7 +19,7 @@ import Logger from './src/helpers/Logger';
 import Garage from './src/models/Garage';
 import ScheduleFields, { DaySchedule } from './src/ScheduleFields';
 import Schedule from './src/models/Schedule';
-import { flexCenter } from './src/helpers/Tools';
+import { flexCenter, formatVehicleTire } from './src/helpers/Tools';
 import AccountValidation from './src/AccountValidation';
 import VehiclePlateField from './src/components/vehicle/VehiclePlateField';
 import GaragePLV from './src/GaragePLV';
@@ -127,7 +127,7 @@ const App = () => {
           </Container>
           <Container style={flexCenter} sx={{ width: '400px', mt: 2}}>
             <MovaVehicleTireField onChangeVehicleTire={(vehicleTire) => {
-              console.log(vehicleTire);
+              console.log('formatVehicleTire', formatVehicleTire(vehicleTire));
             }}/>
           </Container>
 

package/dist/devIndex.js

@@ -133,7 +133,7 @@ var App = function () {
                                 } }), (0, jsx_runtime_1.jsx)(material_1.Container, __assign({ style: Tools_1.flexCenter, sx: { width: '400px', mt: 2 } }, { children: (0, jsx_runtime_1.jsx)(VehiclePlateField_1.default, { onValidVehiclePlate: function (vehiclePlate) {
                                         alert('plaque valide');
                                     } }) })), (0, jsx_runtime_1.jsx)(material_1.Container, __assign({ style: Tools_1.flexCenter, sx: { width: '400px', mt: 2 } }, { children: (0, jsx_runtime_1.jsx)(MovaVehicleTireField_1.default, { onChangeVehicleTire: function (vehicleTire) {
-                                        console.log(vehicleTire);
+                                        console.log('formatVehicleTire', (0, Tools_1.formatVehicleTire)(vehicleTire));
                                     } }) })), (0, jsx_runtime_1.jsx)(MovaLogin_1.default, { darkMode: false, movaAppType: Enums_1.MovaAppType.INDIVIDUAL, version: "0.1.3", onSubmit: function (form) {
                                     alert('Form Submitted !');
                                 }, onSubmitForgotPassword: function (email) {

package/dist/index.d.ts

@@ -2,7 +2,6 @@ export { default as VehicleService } from './src/services/VehicleService';
 export { default as AuthenticationService } from './src/services/AuthenticationService';
 export { default as GarageService } from './src/services/GarageService';
 export { default as UserService } from './src/services/UserService';
-export { default as UserConnected } from './src/services/UserConnected';
 export { default as DialogForgotPassword } from './src/DialogForgotPassword';
 export { default as IbanInput } from './src/IbanInput';
 export { default as GaragePLV } from './src/GaragePLV';
@@ -51,7 +50,7 @@ export type { APIRequest, APIResponse } from './src/helpers/ApiHelper';
 export type { DaySchedule, DayInterval } from './src/ScheduleFields';
 export type { MovaFormField, MovaLoginForm, MovaUserSignUpForm, MovaInterval, MovaVehicleForm, AddressFieldName, } from './src/helpers/Types';
 export { readCookie, deleteCookie } from './src/helpers/CookieUtils';
-export { validateField, formatVehicleTire, formatFrenchVehiclePlate, isEmpty, getApplicationShortLabel, capitalizeFirstLetter, flexLeftRow, formatPhoneNumber, getFormattedSchedule, getFormattedIntervals, findScheduleByDayOfWeek, getDayOfWeekLabel, isSafariOniOS, iAmOwner, getApplicationsShortLabels, } from './src/helpers/Tools';
+export { validateField, formatVehicleTire, formatFrenchVehiclePlate, isEmpty, getApplicationShortLabel, capitalizeFirstLetter, flexLeftRow, formatPhoneNumber, getFormattedSchedule, getFormattedIntervals, findScheduleByDayOfWeek, getDayOfWeekLabel, isSafariOniOS, getApplicationsShortLabels, } from './src/helpers/Tools';
 export { validatePhoneNumber, validateText, validateEmail } from './src/helpers/Validator';
 export { formatDateByCountryCode, getLongFormattedDateTime } from './src/helpers/DateUtils';
 export { request, API_BASE_URL } from './src/helpers/ApiHelper';

package/dist/index.js

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Event = exports.Schedule = exports.VehicleGarage = exports.Garage = exports.Document = exports.Vehicle = exports.Address = exports.Role = exports.User = exports.Customer = exports.Logger = exports.Operation = exports.Prestation = exports.Product = exports.Supplier = exports.Employee = exports.Absence = exports.Subscription = exports.LinkedDocumentDialog = exports.PrintSize = exports.PLVComponent = exports.QrCodePLVContainer = exports.ActivateAccount = exports.GenderSelector = exports.ConfirmationDialog = exports.MovaVehicleTireField = exports.MovaCopyright = exports.MovaSignUp = exports.MovaLogin = exports.MovaSnackbar = exports.TestButton = exports.oldRegexPlate = exports.regexPlate = exports.VehiclePlateField = exports.QRCode = exports.MovaDialog = exports.Loader = exports.MovaDigitalPassport = exports.VehicleFullCard = exports.ScheduleFields = exports.AddressFields = exports.AccountValidation = exports.GaragePLV = exports.IbanInput = exports.DialogForgotPassword = exports.UserConnected = exports.UserService = exports.GarageService = exports.AuthenticationService = exports.VehicleService = void 0;
-exports.SubscriptionType = exports.SubscriptionState = exports.CountryCode = exports.PrestationState = exports.PrestationType = exports.RegistrationState = exports.SubscriptionPaymentInterval = exports.VehiclePlateType = exports.SlotAlgorithm = exports.OrderState = exports.OrderPreference = exports.ProductType = exports.PartsApplicationType = exports.DateFormatTypes = exports.Gender = exports.DocumentState = exports.DigitalPassportIndex = exports.DocumentType = exports.EventType = exports.EventState = exports.DayOfWeek = exports.MovaAppType = exports.RoleType = exports.CustomerType = exports.API_BASE_URL = exports.request = exports.getLongFormattedDateTime = exports.formatDateByCountryCode = exports.validateEmail = exports.validateText = exports.validatePhoneNumber = exports.getApplicationsShortLabels = exports.iAmOwner = exports.isSafariOniOS = exports.getDayOfWeekLabel = exports.findScheduleByDayOfWeek = exports.getFormattedIntervals = exports.getFormattedSchedule = exports.formatPhoneNumber = exports.flexLeftRow = exports.capitalizeFirstLetter = exports.getApplicationShortLabel = exports.isEmpty = exports.formatFrenchVehiclePlate = exports.formatVehicleTire = exports.validateField = exports.deleteCookie = exports.readCookie = exports.CategoryPrestation = exports.VehicleTire = void 0;
-exports.StyledToggleButtonGroup = exports.StyledToggleButton = exports.openDialogPrint = exports.APIMethod = void 0;
+exports.VehicleTire = exports.Event = exports.Schedule = exports.VehicleGarage = exports.Garage = exports.Document = exports.Vehicle = exports.Address = exports.Role = exports.User = exports.Customer = exports.Logger = exports.Operation = exports.Prestation = exports.Product = exports.Supplier = exports.Employee = exports.Absence = exports.Subscription = exports.LinkedDocumentDialog = exports.PrintSize = exports.PLVComponent = exports.QrCodePLVContainer = exports.ActivateAccount = exports.GenderSelector = exports.ConfirmationDialog = exports.MovaVehicleTireField = exports.MovaCopyright = exports.MovaSignUp = exports.MovaLogin = exports.MovaSnackbar = exports.TestButton = exports.oldRegexPlate = exports.regexPlate = exports.VehiclePlateField = exports.QRCode = exports.MovaDialog = exports.Loader = exports.MovaDigitalPassport = exports.VehicleFullCard = exports.ScheduleFields = exports.AddressFields = exports.AccountValidation = exports.GaragePLV = exports.IbanInput = exports.DialogForgotPassword = exports.UserService = exports.GarageService = exports.AuthenticationService = exports.VehicleService = void 0;
+exports.openDialogPrint = exports.APIMethod = exports.SubscriptionType = exports.SubscriptionState = exports.CountryCode = exports.PrestationState = exports.PrestationType = exports.RegistrationState = exports.SubscriptionPaymentInterval = exports.VehiclePlateType = exports.SlotAlgorithm = exports.OrderState = exports.OrderPreference = exports.ProductType = exports.PartsApplicationType = exports.DateFormatTypes = exports.Gender = exports.DocumentState = exports.DigitalPassportIndex = exports.DocumentType = exports.EventType = exports.EventState = exports.DayOfWeek = exports.MovaAppType = exports.RoleType = exports.CustomerType = exports.API_BASE_URL = exports.request = exports.getLongFormattedDateTime = exports.formatDateByCountryCode = exports.validateEmail = exports.validateText = exports.validatePhoneNumber = exports.getApplicationsShortLabels = exports.isSafariOniOS = exports.getDayOfWeekLabel = exports.findScheduleByDayOfWeek = exports.getFormattedIntervals = exports.getFormattedSchedule = exports.formatPhoneNumber = exports.flexLeftRow = exports.capitalizeFirstLetter = exports.getApplicationShortLabel = exports.isEmpty = exports.formatFrenchVehiclePlate = exports.formatVehicleTire = exports.validateField = exports.deleteCookie = exports.readCookie = exports.CategoryPrestation = void 0;
+exports.StyledToggleButtonGroup = exports.StyledToggleButton = void 0;
 // Export des services
 var VehicleService_1 = require("./src/services/VehicleService");
 Object.defineProperty(exports, "VehicleService", { enumerable: true, get: function () { return __importDefault(VehicleService_1).default; } });
@@ -16,8 +16,6 @@ var GarageService_1 = require("./src/services/GarageService");
 Object.defineProperty(exports, "GarageService", { enumerable: true, get: function () { return __importDefault(GarageService_1).default; } });
 var UserService_1 = require("./src/services/UserService");
 Object.defineProperty(exports, "UserService", { enumerable: true, get: function () { return __importDefault(UserService_1).default; } });
-var UserConnected_1 = require("./src/services/UserConnected");
-Object.defineProperty(exports, "UserConnected", { enumerable: true, get: function () { return __importDefault(UserConnected_1).default; } });
 // Export des composants
 var DialogForgotPassword_1 = require("./src/DialogForgotPassword");
 Object.defineProperty(exports, "DialogForgotPassword", { enumerable: true, get: function () { return __importDefault(DialogForgotPassword_1).default; } });
@@ -129,7 +127,6 @@ Object.defineProperty(exports, "getFormattedIntervals", { enumerable: true, get:
 Object.defineProperty(exports, "findScheduleByDayOfWeek", { enumerable: true, get: function () { return Tools_1.findScheduleByDayOfWeek; } });
 Object.defineProperty(exports, "getDayOfWeekLabel", { enumerable: true, get: function () { return Tools_1.getDayOfWeekLabel; } });
 Object.defineProperty(exports, "isSafariOniOS", { enumerable: true, get: function () { return Tools_1.isSafariOniOS; } });
-Object.defineProperty(exports, "iAmOwner", { enumerable: true, get: function () { return Tools_1.iAmOwner; } });
 Object.defineProperty(exports, "getApplicationsShortLabels", { enumerable: true, get: function () { return Tools_1.getApplicationsShortLabels; } });
 var Validator_1 = require("./src/helpers/Validator");
 Object.defineProperty(exports, "validatePhoneNumber", { enumerable: true, get: function () { return Validator_1.validatePhoneNumber; } });

package/dist/src/MovaVehicleTireField.js

@@ -9,7 +9,7 @@ var react_1 = require("react");
 var VehicleTire_1 = __importDefault(require("./models/VehicleTire"));
 var Tools_1 = require("./helpers/Tools");
 // Regex pour une taille de pneumatique Française
-var regex = /^\d{9,10}[A-Za-z]$/;
+var regex = /^[A-Za-z0-9]{7}/;
 var MovaVehicleTireField = function (_a) {
     var vehicleTire = _a.vehicleTire, onChangeVehicleTire = _a.onChangeVehicleTire;
     var _b = (0, react_1.useState)(''), tireInfo = _b[0], setTireInfo = _b[1];
@@ -25,12 +25,13 @@ var MovaVehicleTireField = function (_a) {
         var rawValue = e.target.value;
         // Cette expression régulière supprimera tous les caractères qui ne sont pas des chiffres ou des lettres alphabétiques, à l'exception de "R" et "r".
         // On ne peut saisir que 10 caractères maximum (ex : 245551791V)
-        var value = rawValue.toUpperCase().replace(/[^0-9A-QS-Za-qs-z]/g, '').slice(0, 11);
+        var value = rawValue.toUpperCase().replace(/[^0-9A-QS-Za-qs-z]/g, '').slice(0, 15);
         // On valide la saisie (le champ n'est pas obligatoire)
         var isValid = value.length == 0 || (value.length > 0 && regex.test(value));
         setError(!regex.test(value));
         // Vérifier si l'utilisateur est en train de supprimer un caractère
-        var isDeleting = value.length < lastLength;
+        var isDeleting = rawValue.length < lastLength;
+        console.log(isDeleting);
         // Ajout du " / "
         if (value.length >= 3 && !(rawValue.length == 5 && isDeleting)) {
             value = "".concat(value.substring(0, 3), " / ").concat(value.substring(3));
@@ -39,19 +40,46 @@ var MovaVehicleTireField = function (_a) {
         if (value.length >= 8 && !(rawValue.length == 9 && isDeleting)) {
             value = "".concat(value.substring(0, 8), " R").concat(value.substring(8));
         }
+        var additonalChar = false;
+        if (value[12] && /^[A-Z]$/.test(value[12])) {
+            if (rawValue.length === 14 && isDeleting) {
+                value = "".concat(value.substring(0, 12));
+            }
+            else {
+                additonalChar = true;
+                value = "".concat(value.substring(0, 13), " ").concat(value.substring(13));
+            }
+        }
         // Ajout d'un espace après la saisie du diamètre des pneus
         if (value.length >= 12 && !(rawValue.length <= 12 && isDeleting)) {
             value = "".concat(value.substring(0, 12), " ").concat(value.substring(12));
         }
-        setTireInfo(value);
+        //console.log('2 valeu',JSON.stringify(value));
+        if (additonalChar) {
+            var endString = rawValue.substring(15);
+            value = value.substring(0, 15) + (endString !== undefined ? endString : '');
+            console.log(rawValue.split(' ')[5]);
+        }
+        else {
+            var endString = rawValue.substring(12);
+            if (endString && endString.length > 1) {
+                value = value.substring(0, 13) + endString.trimStart();
+            }
+        }
         var parts = value.split(" ");
-        if (value.length >= 16 && !(rawValue.length == 18 && isDeleting) && parts.length === 5) {
+        setTireInfo(value);
+        console.log(parts);
+        if (value.length >= 16) {
             var width = parts[0], _separator = parts[1], height = parts[2], diameter = parts[3], speedIndex = parts[4];
+            speedIndex = value.substring(13);
+            console.log('YYY', width, height, diameter, speedIndex, _separator);
             var vehicleTire_1 = new VehicleTire_1.default(width, height, diameter, speedIndex);
             onChangeVehicleTire(vehicleTire_1, isValid);
         }
         else {
             var width = parts[0], _separator = parts[1], height = parts[2], diameter = parts[3], speedIndex = parts[4];
+            speedIndex = value.substring(13);
+            console.log('XXX', width, height, diameter, speedIndex, _separator);
             var vehicleTire_2 = new VehicleTire_1.default(width !== null && width !== void 0 ? width : '', height !== null && height !== void 0 ? height : '', diameter !== null && diameter !== void 0 ? diameter : '', speedIndex !== null && speedIndex !== void 0 ? speedIndex : '');
             onChangeVehicleTire(vehicleTire_2, isValid);
         }

package/dist/src/components/vehicle/VehicleFullCard.d.ts

@@ -2,7 +2,9 @@ import { type FC } from 'react';
 import { MovaVehicleForm } from '../../helpers/Types';
 import Vehicle from '../../models/Vehicle';
 import { MovaAppType } from '../../helpers/Enums';
+import User from '../../models/User';
 interface VehicleFullCardProps {
+    currentUser: User;
     vehicle: Vehicle;
     onError: (message: string) => void;
     onUploadDocument: (data: FormData) => void;

package/dist/src/components/vehicle/VehicleFullCard.js

@@ -41,7 +41,7 @@ var initialUserFormState = {
 };
 var VehicleFullCard = function (_a) {
     var _b;
-    var vehicle = _a.vehicle, fullwidth = _a.fullwidth, onError = _a.onError, onUploadDocument = _a.onUploadDocument, onDeleteDocument = _a.onDeleteDocument, appType = _a.appType, _c = _a.editMode, editMode = _c === void 0 ? false : _c, _d = _a.focused, focused = _d === void 0 ? false : _d, onUpdate = _a.onUpdate, onDelete = _a.onDelete, currentUpload = _a.currentUpload;
+    var vehicle = _a.vehicle, fullwidth = _a.fullwidth, onError = _a.onError, onUploadDocument = _a.onUploadDocument, onDeleteDocument = _a.onDeleteDocument, appType = _a.appType, _c = _a.editMode, editMode = _c === void 0 ? false : _c, _d = _a.focused, focused = _d === void 0 ? false : _d, onUpdate = _a.onUpdate, onDelete = _a.onDelete, currentUpload = _a.currentUpload, currentUser = _a.currentUser;
     var theme = (0, material_1.useTheme)();
     var _e = (0, react_1.useState)(editMode), localEditMode = _e[0], setLocalEditMode = _e[1];
     var _f = (0, react_1.useState)(false), openConfirmDocumentDelete = _f[0], setOpenConfirmDocumentDelete = _f[1];
@@ -239,7 +239,7 @@ var VehicleFullCard = function (_a) {
                                                     '& input': { textTransform: 'uppercase' } // CSS pour forcer les majuscules dans l'input
                                                 }, helperText: Boolean(form.currentMileage.error && form.currentMileage.value > 0)
                                                     ? form.currentMileage.error : "Sur votre tableau de bord 😉" }) })), !localEditMode && (0, jsx_runtime_1.jsxs)(material_1.Grid, __assign({ container: true, textAlign: 'justify', sx: { pt: 2 } }, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 8 }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "body1", color: "text.secondary" }, { children: "Km moyen annuel :" })) })), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 4, sx: { textAlign: 'right' } }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "body1", color: "text.secondary" }, { children: (0, jsx_runtime_1.jsxs)("b", { children: [vehicle.averageMileagePerYear, " km"] }) })) }))] })), localEditMode && (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 12 }, { children: (0, jsx_runtime_1.jsxs)(material_1.FormControl, __assign({ fullWidth: true, margin: "normal", error: Boolean(form.averageMileagePerYear.error) }, { children: [(0, jsx_runtime_1.jsx)(material_1.InputLabel, __assign({ id: "averageMileagePerYear-label" }, { children: "Kilom\u00E9trage moyen annuel" })), (0, jsx_runtime_1.jsxs)(material_1.Select, __assign({ labelId: "averageMileagePerYear-label", id: "averageMileagePerYear", name: "averageMileagePerYear", value: form.averageMileagePerYear.value ?
-                                                            String(form.averageMileagePerYear.value) : '', onChange: function (e) { return handleSelectChange(e); }, label: "Kilom\u00E9trage moyen annuel" }, { children: [(0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 5000 }, { children: "5 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 10000 }, { children: "10 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 15000 }, { children: "15 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 20000 }, { children: "20 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 25000 }, { children: "25 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 30000 }, { children: "30 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 50000 }, { children: "50 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 75000 }, { children: "75 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 100000 }, { children: "100 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 999999 }, { children: "+100 000" }))] })), (0, jsx_runtime_1.jsx)(material_1.FormHelperText, { children: form.averageMileagePerYear.error })] })) })), !localEditMode && (0, jsx_runtime_1.jsxs)(material_1.Grid, __assign({ container: true, textAlign: 'justify', sx: { pt: 2 } }, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 6 }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "body1", color: "text.secondary" }, { children: "Pneumatiques :" })) })), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 6, sx: { textAlign: 'right' } }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "body1", color: "text.secondary" }, { children: isVehicleTireSizeDefined(vehicle) ? (0, jsx_runtime_1.jsx)("b", { children: (0, Tools_1.formatVehicleTire)(vehicle.tireSize) }) : '-' })) }))] })), localEditMode && (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 12, sx: { mt: 1 } }, { children: (0, jsx_runtime_1.jsx)(MovaVehicleTireField_1.default, { vehicleTire: form.tireSize.value, onChangeVehicleTire: handleOnChangeVehicleTire }) }))] })), !localEditMode && (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 12 }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "h6", component: "div", align: "center", sx: { mt: 3, mb: 1 }, color: (0, material_1.darken)(theme.palette.primary.main, 0.2) }, { children: "CARNET DU V\u00C9HICULE" })) })), vehicle.documents && ((_b = vehicle.documents) === null || _b === void 0 ? void 0 : _b.map(function (invoice, index) { return ((0, jsx_runtime_1.jsxs)(material_1.Grid, __assign({ container: true, sx: { justifyContent: 'space-between', alignItems: 'center' } }, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 11, sx: { textAlign: 'left' } }, { children: (0, jsx_runtime_1.jsx)(material_1.Tooltip, __assign({ title: invoice.originalFileName }, { children: (0, jsx_runtime_1.jsx)(material_1.Link, __assign({ color: (0, material_1.darken)('#F29ABA', 0.2), href: invoice.fileSignedUrl, target: "_blank", rel: "noopener" }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "body1" }, { children: invoice.fileName + ' ' + (0, DateUtils_1.formatDateByCountryCode)(invoice.creationDate, 'fr', Enums_1.DateFormatTypes.SHORT_FORMAT_DATE) })) })) })) }), (index + 1) * 50), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 1, sx: { textAlign: 'right' } }, { children: (0, jsx_runtime_1.jsx)(material_1.IconButton, __assign({ disabled: !(0, Tools_1.iAmOwner)(invoice === null || invoice === void 0 ? void 0 : invoice.ownerId), onClick: function (e) { return handleDeleteDocument(e, invoice === null || invoice === void 0 ? void 0 : invoice.id); } }, { children: (0, jsx_runtime_1.jsx)(CloseRounded_2.default, {}) })) }), (index + 1) * 100)] }), index + 1)); })), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ container: true }, { children: (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 12, sx: { mt: 2, textAlign: 'center' } }, { children: (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("input", { accept: "image/*, application/pdf", type: "file", style: { display: 'none' }, ref: invoiceInputRef, id: "raised-button-invoice", onChange: function (e) { return handleFileChange(e, docTypeCurrent.current); } }), (0, jsx_runtime_1.jsx)(material_1.Button, __assign({ size: 'large', disabled: currentUpload, onClick: function () { return setShowLinkedDocument(true); }, component: "span", variant: "outlined", startIcon: (0, jsx_runtime_1.jsx)(icons_material_1.AttachFile, {}), sx: { alignItems: 'center', width: '90%', mt: 2, mb: 1, height: '50px', p: 1, color: (0, material_1.darken)(theme.palette.primary.main, 0.2) } }, { children: "Ajouter un document" })), currentUpload && (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: 'body2', sx: { animation: 'blink 1.5s infinite' } }, { children: "Document en cours d'importation..." })), sizeLimit && (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: 'body1', sx: { animation: 'blink 1.5s infinite' }, color: theme.palette.warning.dark }, { children: "Echec de l'importation car la taille du fichier d\u00E9passe 10Mo" })), !sizeLimit && (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: 'body2' }, { children: "Taille maximale du fichier : 10Mo" }))] }) })) }))] })] })), (0, jsx_runtime_1.jsxs)(material_1.CardActions, __assign({ sx: { mt: 3, justifyContent: localEditMode ? 'center' : 'end' } }, { children: [!localEditMode &&
+                                                            String(form.averageMileagePerYear.value) : '', onChange: function (e) { return handleSelectChange(e); }, label: "Kilom\u00E9trage moyen annuel" }, { children: [(0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 5000 }, { children: "5 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 10000 }, { children: "10 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 15000 }, { children: "15 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 20000 }, { children: "20 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 25000 }, { children: "25 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 30000 }, { children: "30 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 50000 }, { children: "50 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 75000 }, { children: "75 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 100000 }, { children: "100 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 999999 }, { children: "+100 000" }))] })), (0, jsx_runtime_1.jsx)(material_1.FormHelperText, { children: form.averageMileagePerYear.error })] })) })), !localEditMode && (0, jsx_runtime_1.jsxs)(material_1.Grid, __assign({ container: true, textAlign: 'justify', sx: { pt: 2 } }, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 6 }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "body1", color: "text.secondary" }, { children: "Pneumatiques :" })) })), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 6, sx: { textAlign: 'right' } }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "body1", color: "text.secondary" }, { children: isVehicleTireSizeDefined(vehicle) ? (0, jsx_runtime_1.jsx)("b", { children: (0, Tools_1.formatVehicleTire)(vehicle.tireSize) }) : '-' })) }))] })), localEditMode && (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 12, sx: { mt: 1 } }, { children: (0, jsx_runtime_1.jsx)(MovaVehicleTireField_1.default, { vehicleTire: form.tireSize.value, onChangeVehicleTire: handleOnChangeVehicleTire }) }))] })), !localEditMode && (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 12 }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "h6", component: "div", align: "center", sx: { mt: 3, mb: 1 }, color: (0, material_1.darken)(theme.palette.primary.main, 0.2) }, { children: "CARNET DU V\u00C9HICULE" })) })), vehicle.documents && ((_b = vehicle.documents) === null || _b === void 0 ? void 0 : _b.map(function (invoice, index) { return ((0, jsx_runtime_1.jsxs)(material_1.Grid, __assign({ container: true, sx: { justifyContent: 'space-between', alignItems: 'center' } }, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 11, sx: { textAlign: 'left' } }, { children: (0, jsx_runtime_1.jsx)(material_1.Tooltip, __assign({ title: invoice.originalFileName }, { children: (0, jsx_runtime_1.jsx)(material_1.Link, __assign({ color: (0, material_1.darken)('#F29ABA', 0.2), href: invoice.fileSignedUrl, target: "_blank", rel: "noopener" }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "body1" }, { children: invoice.fileName + ' ' + (0, DateUtils_1.formatDateByCountryCode)(invoice.creationDate, 'fr', Enums_1.DateFormatTypes.SHORT_FORMAT_DATE) })) })) })) }), (index + 1) * 50), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 1, sx: { textAlign: 'right' } }, { children: (0, jsx_runtime_1.jsx)(material_1.IconButton, __assign({ disabled: !(invoice.ownerId.toString() == currentUser.id), onClick: function (e) { return handleDeleteDocument(e, invoice === null || invoice === void 0 ? void 0 : invoice.id); } }, { children: (0, jsx_runtime_1.jsx)(CloseRounded_2.default, {}) })) }), (index + 1) * 100)] }), index + 1)); })), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ container: true }, { children: (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 12, sx: { mt: 2, textAlign: 'center' } }, { children: (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("input", { accept: "image/*, application/pdf", type: "file", style: { display: 'none' }, ref: invoiceInputRef, id: "raised-button-invoice", onChange: function (e) { return handleFileChange(e, docTypeCurrent.current); } }), (0, jsx_runtime_1.jsx)(material_1.Button, __assign({ size: 'large', disabled: currentUpload, onClick: function () { return setShowLinkedDocument(true); }, component: "span", variant: "outlined", startIcon: (0, jsx_runtime_1.jsx)(icons_material_1.AttachFile, {}), sx: { alignItems: 'center', width: '90%', mt: 2, mb: 1, height: '50px', p: 1, color: (0, material_1.darken)(theme.palette.primary.main, 0.2) } }, { children: "Ajouter un document" })), currentUpload && (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: 'body2', sx: { animation: 'blink 1.5s infinite' } }, { children: "Document en cours d'importation..." })), sizeLimit && (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: 'body1', sx: { animation: 'blink 1.5s infinite' }, color: theme.palette.warning.dark }, { children: "Echec de l'importation car la taille du fichier d\u00E9passe 10Mo" })), !sizeLimit && (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: 'body2' }, { children: "Taille maximale du fichier : 10Mo" }))] }) })) }))] })] })), (0, jsx_runtime_1.jsxs)(material_1.CardActions, __assign({ sx: { mt: 3, justifyContent: localEditMode ? 'center' : 'end' } }, { children: [!localEditMode &&
                                     (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: (0, jsx_runtime_1.jsxs)(material_1.Button, __assign({ onClick: handleOnClickEdit, color: "inherit", sx: { width: '45%' }, variant: 'text' }, { children: [(0, jsx_runtime_1.jsx)(EditRounded_1.default, { sx: { mr: 1 } }), "MODIFIER"] })) }), localEditMode &&
                                     (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsxs)(material_1.Button, __assign({ onClick: handleOnClickCancel, sx: { width: '45%', color: theme.palette.text.secondary }, variant: 'text' }, { children: [(0, jsx_runtime_1.jsx)(CloseRounded_1.default, { sx: { mr: 1 } }), "ANNULER"] })), (0, jsx_runtime_1.jsxs)(material_1.Button, __assign({ onClick: handleOnClickValidate, sx: { width: '45%', color: (0, material_1.darken)(theme.palette.primary.main, 0.2) }, variant: 'text' }, { children: [(0, jsx_runtime_1.jsx)(EditRounded_1.default, { sx: { mr: 1 } }), "VALIDER"] }))] })] }))] })), isShowLinkedDocument && (0, jsx_runtime_1.jsx)(LinkedDocumentDialog_1.LinkedDocumentDialog, { isVehicle: true, isShowLinkedDocument: isShowLinkedDocument, appType: appType, toggleShowLinkedDocument: toggleShowLinkedDocument, message: messageRGPD }), localEditMode && onDelete &&
                 (0, jsx_runtime_1.jsx)(material_1.Button, __assign({ onClick: function (e) { return handleOnClickDeleteVehicle(e); }, sx: {

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

@@ -9,7 +9,6 @@ export declare const isSafariOniOS: () => boolean;
 export declare const FR_WEEK_DAYS: string[];
 export declare const getDayOfWeekLabel: (day: DayOfWeek) => string | undefined;
 export declare const getDayOfWeekIndex: (day: DayOfWeek) => number;
-export declare const iAmOwner: (ownreId: number) => boolean;
 export declare const formatPhoneNumber: (phoneNumber: string) => string;
 export declare const getFormattedSchedule: (schedule: Schedule | null, dayIndex: number) => string;
 export declare const getFormattedIntervals: (intervals: MovaInterval[]) => string | undefined;

package/dist/src/helpers/Tools.js

@@ -1,11 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateField = exports.formatVehicleTireStr = exports.formatVehicleTire = exports.formatFrenchVehiclePlate = exports.isEmpty = exports.flexCenter = exports.flexEnd = exports.getApplicationShortLabel = exports.capitalizeFirstLetter = exports.flexLeftRow = exports.getFrenchDayLabel = exports.getDayOfWeek = exports.findScheduleByDayOfWeek = exports.formatTime = exports.getFormattedIntervals = exports.getFormattedSchedule = exports.formatPhoneNumber = exports.iAmOwner = exports.getDayOfWeekIndex = exports.getDayOfWeekLabel = exports.FR_WEEK_DAYS = exports.isSafariOniOS = exports.flexStart = exports.getApplicationsShortLabels = void 0;
+exports.validateField = exports.formatVehicleTireStr = exports.formatVehicleTire = exports.formatFrenchVehiclePlate = exports.isEmpty = exports.flexCenter = exports.flexEnd = exports.getApplicationShortLabel = exports.capitalizeFirstLetter = exports.flexLeftRow = exports.getFrenchDayLabel = exports.getDayOfWeek = exports.findScheduleByDayOfWeek = exports.formatTime = exports.getFormattedIntervals = exports.getFormattedSchedule = exports.formatPhoneNumber = exports.getDayOfWeekIndex = exports.getDayOfWeekLabel = exports.FR_WEEK_DAYS = exports.isSafariOniOS = exports.flexStart = exports.getApplicationsShortLabels = void 0;
 var Enums_1 = require("./Enums");
-var UserConnected_1 = __importDefault(require("../services/UserConnected"));
 var getApplicationsShortLabels = function (applications) {
     if (!applications) {
         return '';
@@ -42,11 +38,6 @@ var getDayOfWeekIndex = function (day) {
     return -1;
 };
 exports.getDayOfWeekIndex = getDayOfWeekIndex;
-var iAmOwner = function (ownreId) {
-    var _a;
-    return ownreId === ((_a = UserConnected_1.default.getInstance().me) === null || _a === void 0 ? void 0 : _a.id);
-};
-exports.iAmOwner = iAmOwner;
 var formatPhoneNumber = function (phoneNumber) {
     var formattedNumber = "";
     if (phoneNumber) {
@@ -227,20 +218,18 @@ var formatVehicleTire = function (vehicleTire) {
 };
 exports.formatVehicleTire = formatVehicleTire;
 var formatVehicleTireStr = function (input) {
-    var formatted = input.toUpperCase().replace(/[^0-9A-QS-Za-qs-z]/g, '').slice(0, 10);
-    if (formatted.length >= 3) {
+    var formatted = input.toUpperCase().replace(/[^0-9A-QS-Za-qs-z]/g, '').slice(0, 7);
+    if (formatted.length > 3) {
         formatted = "".concat(formatted.substring(0, 3), " / ").concat(formatted.substring(3));
     }
-    var indexOfR = formatted.indexOf(" R");
-    if (formatted.length >= 8 && indexOfR === -1) {
-        formatted = "".concat(formatted.substring(0, 8), " R").concat(formatted.substring(8));
-        if (formatted.length >= 12 && indexOfR === -1)
-            formatted = "".concat(formatted.substring(0, 12), " ").concat(formatted.substring(12));
+    var indexOfRraw = input.indexOf("R");
+    var toAdd = indexOfRraw !== -1 ? input.substring(indexOfRraw + 3) : '';
+    if (toAdd.length > 0) {
+        toAdd = ' ' + toAdd;
     }
-    else if (indexOfR !== -1 && formatted.length > indexOfR + 2) {
-        formatted = "".concat(formatted.substring(0, indexOfR + 2), " ").concat(formatted.substring(indexOfR + 2));
+    if (formatted.length > 8) {
+        formatted = "".concat(formatted.substring(0, 8), " R").concat(formatted.substring(8)).concat(toAdd);
     }
-    console.log(formatted);
     return formatted;
 };
 exports.formatVehicleTireStr = formatVehicleTireStr;

package/dist/src/services/AuthenticationService.js

@@ -43,7 +43,6 @@ var ApiHelper_1 = require("../helpers/ApiHelper");
 var CookieUtils_1 = require("../helpers/CookieUtils");
 var Enums_1 = require("../helpers/Enums");
 var Logger_1 = __importDefault(require("../helpers/Logger"));
-var UserConnected_1 = __importDefault(require("./UserConnected"));
 var UserService_1 = __importDefault(require("./UserService"));
 var AuthenticationService = /** @class */ (function () {
     function AuthenticationService() {
@@ -111,7 +110,6 @@ var AuthenticationService = /** @class */ (function () {
                             Logger_1.default.error(errorMsg);
                             return [2 /*return*/, { success: false, error: errorMsg }];
                         }
-                        UserConnected_1.default.getInstance().me = userResponse.data;
                         return [2 /*return*/, { success: true, data: userResponse.data }];
                     case 3: return [2 /*return*/, tokenResponse];
                     case 4: return [3 /*break*/, 6];

package/index.ts

@@ -6,7 +6,6 @@ export { default as VehicleService } from './src/services/VehicleService';
 export { default as AuthenticationService } from './src/services/AuthenticationService';
 export { default as GarageService } from './src/services/GarageService';
 export { default as UserService } from './src/services/UserService';
-export { default as UserConnected } from './src/services/UserConnected';
 // Export des composants
 export { default as DialogForgotPassword } from './src/DialogForgotPassword';
 export { default as IbanInput } from './src/IbanInput';
@@ -81,7 +80,6 @@ export {
   findScheduleByDayOfWeek,
   getDayOfWeekLabel,
   isSafariOniOS,
-  iAmOwner,
   getApplicationsShortLabels,
 } from './src/helpers/Tools';
 export { validatePhoneNumber, validateText, validateEmail } from './src/helpers/Validator';

package/package.json

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

package/src/MovaVehicleTireField.tsx

@@ -9,7 +9,7 @@ interface MovaVehicleTireFieldProps {
 }
 
 // Regex pour une taille de pneumatique Française
-const regex = /^\d{9,10}[A-Za-z]$/;
+const regex = /^[A-Za-z0-9]{7}/;
 
 const MovaVehicleTireField: FC<MovaVehicleTireFieldProps> = ({ vehicleTire, onChangeVehicleTire }) => {
 
@@ -27,46 +27,67 @@ const MovaVehicleTireField: FC<MovaVehicleTireFieldProps> = ({ vehicleTire, onCh
     const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
         e.preventDefault();
         const rawValue = e.target.value;
-
         // Cette expression régulière supprimera tous les caractères qui ne sont pas des chiffres ou des lettres alphabétiques, à l'exception de "R" et "r".
         // On ne peut saisir que 10 caractères maximum (ex : 245551791V)
-        let value = rawValue.toUpperCase().replace(/[^0-9A-QS-Za-qs-z]/g, '').slice(0, 11);
+        let value = rawValue.toUpperCase().replace(/[^0-9A-QS-Za-qs-z]/g, '').slice(0, 15);
 
         // On valide la saisie (le champ n'est pas obligatoire)
         let isValid = value.length == 0  || (value.length > 0 && regex.test(value));
         setError(!regex.test(value));
 
         // Vérifier si l'utilisateur est en train de supprimer un caractère
-        const isDeleting = value.length < lastLength;
-
+        const isDeleting = rawValue.length < lastLength;
         // Ajout du " / "
         if (value.length >= 3 && !(rawValue.length == 5 && isDeleting)) {
             value = `${value.substring(0, 3)} / ${value.substring(3)}`;
         }
-
+    
         // Ajout du " R"
         if (value.length >= 8 && !(rawValue.length == 9 && isDeleting)) {
             value = `${value.substring(0, 8)} R${value.substring(8)}`;
         }
 
+        let additonalChar = false;
+
+        if (value[12] && /^[A-Z]$/.test(value[12])) {
+            if(rawValue.length === 14 && isDeleting) {
+                value = `${value.substring(0, 12)}`;
+            } else {
+            additonalChar = true;
+            value = `${value.substring(0, 13)} ${value.substring(13)}`;
+            }
+        }
+
 
         // Ajout d'un espace après la saisie du diamètre des pneus
         if (value.length >= 12 && !(rawValue.length <= 12 && isDeleting)) {
             value = `${value.substring(0, 12)} ${value.substring(12)}`;
         }
+        //console.log('2 valeu',JSON.stringify(value));
+        if (additonalChar) {
+            let endString = rawValue.substring(15);
+            value = value.substring(0,15) + (endString !== undefined ? endString :'');
+            console.log(rawValue.split(' ')[5]);
+        } else {
+            let endString = rawValue.substring(12);
+            if(endString && endString.length > 1) {
+                value = value.substring(0,13) + endString.trimStart();
+            } 
+        }
 
-        setTireInfo(value);
 
         const parts = value.split(" ");
 
-        if (value.length >= 16 && !(rawValue.length == 18 && isDeleting) && parts.length === 5) {
-                const [width, _separator, height, diameter, speedIndex] = parts;
+        setTireInfo(value);
+        if (value.length >= 16) {
+                let [width, _separator, height, diameter, speedIndex] = parts;
+                speedIndex = value.substring(13);
                 const vehicleTire = new VehicleTire(width, height, diameter, speedIndex);
                 onChangeVehicleTire(vehicleTire, isValid);
         } else {
-            const [width, _separator, height, diameter, speedIndex] = parts;
+            let [width, _separator, height, diameter, speedIndex] = parts;
+            speedIndex = value.substring(13);
             const vehicleTire = new VehicleTire(width ?? '', height ?? '', diameter ?? '', speedIndex ?? '');
-
             onChangeVehicleTire(vehicleTire, isValid);
         }
 

package/src/components/vehicle/VehicleFullCard.tsx

@@ -11,7 +11,7 @@ import VehicleTire from '../../models/VehicleTire';
 import MovaVehicleTireField from '../../MovaVehicleTireField';
 import ConfirmationDialog from '../../ConfirmationDialog';
 import { DocumentType, DateFormatTypes, MovaAppType } from '../../helpers/Enums';
-import { validateField, formatVehicleTire, formatFrenchVehiclePlate, iAmOwner } from '../../helpers/Tools';
+import { validateField, formatVehicleTire, formatFrenchVehiclePlate } from '../../helpers/Tools';
 import MovaDigitalPassport from '../../MovaDigitalPassport';
 import Loader from '../../Loader';
 import { formatDateByCountryCode } from '../../helpers/DateUtils';
@@ -21,8 +21,10 @@ import CloseIcon from '@mui/icons-material/CloseRounded';
 import Logger from '../../helpers/Logger';
 import { AttachFile } from '@mui/icons-material';
 import { LinkedDocumentDialog } from '../LinkedDocumentDialog';
+import User from '../../models/User';
 
 interface VehicleFullCardProps {
+    currentUser: User,
     vehicle: Vehicle,
     onError: (message: string) => void,
     onUploadDocument: (data: FormData) => void,
@@ -46,7 +48,7 @@ const initialUserFormState = {
     tireSpeedIndex: { value: '', isValid: true }
 }
 
-const VehicleFullCard: FC<VehicleFullCardProps> = ({ vehicle, fullwidth, onError, onUploadDocument, onDeleteDocument, appType, editMode = false, focused = false, onUpdate, onDelete, currentUpload }) => {
+const VehicleFullCard: FC<VehicleFullCardProps> = ({ vehicle, fullwidth, onError, onUploadDocument, onDeleteDocument, appType, editMode = false, focused = false, onUpdate, onDelete, currentUpload, currentUser }) => {
 
     const theme = useTheme();
     const [localEditMode, setLocalEditMode] = useState(editMode);
@@ -408,7 +410,7 @@ const VehicleFullCard: FC<VehicleFullCardProps> = ({ vehicle, fullwidth, onError
                                         </Tooltip>
                                     </Grid>
                                     <Grid item xs={1} key={(index + 1) * 100} sx={{ textAlign: 'right' }}>
-                                        <IconButton disabled={!iAmOwner(invoice?.ownerId)} onClick={(e) => handleDeleteDocument(e, invoice?.id)}>
+                                        <IconButton disabled={!(invoice.ownerId.toString() == currentUser.id)} onClick={(e) => handleDeleteDocument(e, invoice?.id)}>
                                             <CloseIcon />
                                         </IconButton>
                                     </Grid>

package/src/helpers/Tools.ts

@@ -4,7 +4,6 @@ import { MovaFormField, MovaInterval } from "./Types";
 import { CSSProperties } from "react";
 import { DayOfWeek, PartsApplicationType, VehiclePlateFormat } from "./Enums";
 import Schedule from "../models/Schedule";
-import UserConnected from "../services/UserConnected";
 
 export const getApplicationsShortLabels = (applications: PartsApplicationType[] | undefined): string => {
   if(!applications) {
@@ -47,9 +46,6 @@ export const getDayOfWeekIndex = (day: DayOfWeek) => {
   return -1;
 }
 
-export const iAmOwner = (ownreId: number): boolean => {
-    return ownreId === UserConnected.getInstance().me?.id;
-}
 
 export const formatPhoneNumber = (phoneNumber: string): string => {
   let formattedNumber = "";
@@ -243,26 +239,18 @@ export const formatVehicleTire = (vehicleTire: VehicleTire) => {
 }
 
 export const formatVehicleTireStr = (input: string) => {
-
-  let formatted = input.toUpperCase().replace(/[^0-9A-QS-Za-qs-z]/g, '').slice(0, 10);
-
-  if (formatted.length >= 3) {
+  let formatted = input.toUpperCase().replace(/[^0-9A-QS-Za-qs-z]/g, '').slice(0, 7);
+  if (formatted.length > 3) {
     formatted = `${formatted.substring(0, 3)} / ${formatted.substring(3)}`;
   }
-
-  const indexOfR = formatted.indexOf(" R");
-
-  if (formatted.length >= 8 && indexOfR === -1) {
-    formatted = `${formatted.substring(0, 8)} R${formatted.substring(8)}`;
-
-  if (formatted.length >= 12 && indexOfR === -1)
-    formatted = `${formatted.substring(0, 12)} ${formatted.substring(12)}`;
-
-  } else if (indexOfR !== -1 && formatted.length > indexOfR + 2) {
-    formatted = `${formatted.substring(0, indexOfR + 2)} ${formatted.substring(indexOfR + 2)}`;
+  const indexOfRraw = input.indexOf("R");
+  let toAdd = indexOfRraw !== -1 ? input.substring(indexOfRraw + 3) : '';
+  if(toAdd.length > 0) {
+    toAdd = ' ' + toAdd;
+  }
+  if(formatted.length > 8) {
+    formatted = `${formatted.substring(0, 8)} R${formatted.substring(8)}${toAdd}`;
   }
-
-  console.log(formatted);
   return formatted;
 };
 

package/src/services/AuthenticationService.ts

@@ -3,7 +3,6 @@ import { COOKIE_PRO_TOKEN, COOKIE_INDIVIDUAL_TOKEN, createCookie } from "../help
 import { APIMethod, MovaAppType } from "../helpers/Enums";
 import Logger from "../helpers/Logger";
 import User from "../models/User";
-import UserConnected from "./UserConnected";
 import UserService from "./UserService";
 
 export default class AuthenticationService {
@@ -69,7 +68,6 @@ export default class AuthenticationService {
                     Logger.error(errorMsg);
                     return { success: false, error: errorMsg };
                 }
-                UserConnected.getInstance().me = userResponse.data;
                 return { success: true, data: userResponse.data };
 
             } else {

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

@@ -1,9 +0,0 @@
-export default class UserConnected {
-    private static instance;
-    private _me;
-    private constructor();
-    static getInstance(): UserConnected;
-    get me(): any;
-    set me(user: any);
-    clearUser(): void;
-}

package/dist/src/services/UserConnected.js

@@ -1,59 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var UserService_1 = __importDefault(require("./UserService"));
-var UserConnected = /** @class */ (function () {
-    function UserConnected() {
-        var storedUser = localStorage.getItem('user');
-        this._me = storedUser ? JSON.parse(storedUser) : null;
-    }
-    UserConnected.getInstance = function () {
-        if (!UserConnected.instance) {
-            UserConnected.instance = new UserConnected();
-        }
-        return UserConnected.instance;
-    };
-    Object.defineProperty(UserConnected.prototype, "me", {
-        get: function () {
-            var _this = this;
-            if (!this._me) {
-                var storedUser = localStorage.getItem('user');
-                if (storedUser === undefined || storedUser === null || storedUser === 'undefined') {
-                    UserService_1.default.getCurrentUser()
-                        .then(function (response) {
-                        localStorage.setItem('user', JSON.stringify(response.data));
-                        _this._me = response.data;
-                        return _this._me;
-                    });
-                }
-                else {
-                    this._me = JSON.parse(storedUser);
-                    return this._me;
-                }
-            }
-            else {
-                return this._me;
-            }
-        },
-        set: function (user) {
-            this._me = user;
-            if (user) {
-                localStorage.setItem('user', JSON.stringify(user));
-            }
-            else {
-                localStorage.removeItem('user'); // Supprime les données si user est null ou undefined
-            }
-        },
-        enumerable: false,
-        configurable: true
-    });
-    UserConnected.prototype.clearUser = function () {
-        // Méthode pour effacer l'utilisateur
-        this._me = null;
-        localStorage.removeItem('user');
-    };
-    return UserConnected;
-}());
-exports.default = UserConnected;

package/src/services/UserConnected.ts

@@ -1,56 +0,0 @@
-import User from "../models/User";
-import UserService from "./UserService";
-
-export default class UserConnected {
-    private static instance: UserConnected;
-    private _me: User | null; // Replace 'any' with the appropriate type for the user information
-
-    private constructor() {
-        const storedUser = localStorage.getItem('user');
-        this._me = storedUser ? JSON.parse(storedUser) : null;
-    }
-
-    public static getInstance(): UserConnected {
-        if (!UserConnected.instance) {
-            UserConnected.instance = new UserConnected();
-        }
-
-        return UserConnected.instance;
-    }
-
-    public get me(): any {
-        if (!this._me) {
-            const storedUser = localStorage.getItem('user');
-            if(storedUser === undefined || storedUser === null || storedUser === 'undefined') {
-                UserService.getCurrentUser()
-                .then((response) => {
-                    localStorage.setItem('user', JSON.stringify(response.data));
-                    this._me = response.data as User;
-                    return this._me;
-                })
-            } else {
-                this._me = JSON.parse(storedUser);
-                return this._me;
-            }
-        } else {
-            return this._me;
-        } 
-    }
-
-
-    public set me(user: any) {
-        this._me = user;
-        if (user) {
-            localStorage.setItem('user', JSON.stringify(user));
-        } else {
-            localStorage.removeItem('user'); // Supprime les données si user est null ou undefined
-        }
-    }
-
-    public clearUser() {
-        // Méthode pour effacer l'utilisateur
-        this._me = null;
-        localStorage.removeItem('user');
-    }
-
-}