@movalib/movalib-commons 1.44.0 → 1.46.0

package/devIndex.tsx

@@ -26,6 +26,8 @@ import GaragePLV from './src/GaragePLV';
 import AddressFields from './src/AddressFields';
 import IbanInput from './src/IbanInput';
 import GenderSelector from './src/GenderSelector';
+import {VehicleTire} from "./index";
+import MovaVehicleTireField from "./src/MovaVehicleTireField";
 
 const App = () => {
 
@@ -123,6 +125,11 @@ const App = () => {
                 alert('plaque valide');
               } } />
           </Container>
+          <Container style={flexCenter} sx={{ width: '400px', mt: 2}}>
+            <MovaVehicleTireField onChangeVehicleTire={(vehicleTire) => {
+              console.log(vehicleTire);
+            }}/>
+          </Container>
 
 
             <MovaLogin

package/dist/devIndex.js

@@ -63,6 +63,7 @@ var GaragePLV_1 = __importDefault(require("./src/GaragePLV"));
 var AddressFields_1 = __importDefault(require("./src/AddressFields"));
 var IbanInput_1 = __importDefault(require("./src/IbanInput"));
 var GenderSelector_1 = __importDefault(require("./src/GenderSelector"));
+var MovaVehicleTireField_1 = __importDefault(require("./src/MovaVehicleTireField"));
 var App = function () {
     Logger_1.default.enableLogging();
     // Chargement de données garage de test
@@ -130,6 +131,8 @@ var App = function () {
                                     gender: undefined
                                 } }), (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);
                                     } }) })), (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/src/MovaVehicleTireField.d.ts

@@ -1,7 +1,7 @@
 import { type FC } from 'react';
 import VehicleTire from './models/VehicleTire';
 interface MovaVehicleTireFieldProps {
-    vehicleTire: VehicleTire;
+    vehicleTire?: VehicleTire;
     onChangeVehicleTire: (vehicleTire: VehicleTire, isValid: boolean) => void;
 }
 declare const MovaVehicleTireField: FC<MovaVehicleTireFieldProps>;

package/dist/src/MovaVehicleTireField.js

@@ -12,59 +12,50 @@ var Tools_1 = require("./helpers/Tools");
 var regex = /^\d{9}[A-Za-z]$/;
 var MovaVehicleTireField = function (_a) {
     var vehicleTire = _a.vehicleTire, onChangeVehicleTire = _a.onChangeVehicleTire;
-    var _b = (0, react_1.useState)(''), rawValue = _b[0], setRawValue = _b[1];
-    var _c = (0, react_1.useState)(''), tireInfo = _c[0], setTireInfo = _c[1];
-    var _d = (0, react_1.useState)(false), error = _d[0], setError = _d[1];
-    var _e = (0, react_1.useState)(0), lastLength = _e[0], setLastLength = _e[1]; // Ajout d'un état pour stocker la longueur précédente
+    var _b = (0, react_1.useState)(''), tireInfo = _b[0], setTireInfo = _b[1];
+    var _c = (0, react_1.useState)(false), error = _c[0], setError = _c[1];
+    var _d = (0, react_1.useState)(0), lastLength = _d[0], setLastLength = _d[1]; // Ajout d'un état pour stocker la longueur précédente
     (0, react_1.useEffect)(function () {
-        setRawValue((0, Tools_1.formatVehicleTire)(vehicleTire));
-        setTireInfo((0, Tools_1.formatVehicleTire)(vehicleTire));
+        if (vehicleTire) {
+            setTireInfo((0, Tools_1.formatVehicleTire)(vehicleTire));
+        }
     }, [vehicleTire]);
-    (0, react_1.useEffect)(function () {
+    var handleChange = function (e) {
+        e.preventDefault();
+        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, 10);
-        console.log(value);
         // 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));
-        console.log(isValid);
         // Vérifier si l'utilisateur est en train de supprimer un caractère
         var isDeleting = value.length < lastLength;
-        console.log("Deleting : ".concat(isDeleting));
         // Ajout du " / "
         if (value.length >= 3 && !(rawValue.length == 5 && isDeleting)) {
-            console.log('Ajout : /');
             value = "".concat(value.substring(0, 3), " / ").concat(value.substring(3));
         }
         // Ajout du " R"
         if (value.length >= 8 && !(rawValue.length == 9 && isDeleting)) {
-            console.log('Ajout : R');
             value = "".concat(value.substring(0, 8), " R").concat(value.substring(8));
         }
         // Ajout d'un espace après la saisie du diamètre des pneus
         if (value.length >= 12 && !(rawValue.length <= 12 && isDeleting)) {
-            console.log('Ajout : " "');
             value = "".concat(value.substring(0, 12), " ").concat(value.substring(12));
         }
         setTireInfo(value);
-        console.log(value.length);
-        if (value.length >= 16 && !(rawValue.length == 17 && isDeleting)) {
-            var parts = value.split(" ");
-            if (parts.length === 5) {
-                var width = parts[0], separator = parts[1], height = parts[2], diameter = parts[3], speedIndex = parts[4];
-                var vehicleTire_1 = new VehicleTire_1.default(width, height, diameter, speedIndex);
-                onChangeVehicleTire(vehicleTire_1, isValid);
-            }
+        var parts = value.split(" ");
+        if (value.length >= 16 && !(rawValue.length == 17 && isDeleting) && parts.length === 5) {
+            var width = parts[0], _separator = parts[1], height = parts[2], diameter = parts[3], speedIndex = parts[4];
+            var vehicleTire_1 = new VehicleTire_1.default(width, height, diameter, speedIndex);
+            onChangeVehicleTire(vehicleTire_1, isValid);
         }
         else {
-            onChangeVehicleTire(vehicleTire, isValid);
+            var width = parts[0], _separator = parts[1], height = parts[2], diameter = parts[3], speedIndex = parts[4];
+            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);
         }
         setLastLength(value.length); // Mettre à jour la longueur précédente
-    }, [rawValue]);
-    var handleChange = function (e) {
-        e.preventDefault();
-        setRawValue(e.target.value);
     };
     return ((0, jsx_runtime_1.jsx)(material_1.TextField, { label: "Taille des pneumatiques", variant: "outlined", value: tireInfo, onChange: handleChange, fullWidth: true, placeholder: 'XXX XX RXX XXX', sx: {
             width: '100%',

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

@@ -1,14 +1,10 @@
 import { APIMethod, MovaAppType } from "./Enums";
 export declare const API_BASE_URL: string;
-type APISuccess<T> = {
-    success: true;
-    data: T;
+export type APIResponse<T> = {
+    success: boolean;
+    data?: T;
+    error?: string;
 };
-type APIError = {
-    success: false;
-    error: string;
-};
-export type APIResponse<T> = APISuccess<T> | APIError;
 export type APIRequest = {
     url: string;
     method: APIMethod;
@@ -22,4 +18,3 @@ export type APIRequest = {
  * @returns
  */
 export declare const request: (options: APIRequest) => Promise<APIResponse<any>>;
-export {};

package/package.json

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

@@ -4,87 +4,77 @@ import VehicleTire from './models/VehicleTire';
 import { formatVehicleTire } from './helpers/Tools';
 
 interface MovaVehicleTireFieldProps {
-    vehicleTire: VehicleTire,
+    vehicleTire?: VehicleTire,
     onChangeVehicleTire: (vehicleTire: VehicleTire, isValid: boolean) => void;
 }
 
 // Regex pour une taille de pneumatique Française
-const regex = /^\d{9}[A-Za-z]$/; 
+const regex = /^\d{9}[A-Za-z]$/;
 
 const MovaVehicleTireField: FC<MovaVehicleTireFieldProps> = ({ vehicleTire, onChangeVehicleTire }) => {
 
-    const [rawValue, setRawValue] = useState('');
     const [tireInfo, setTireInfo] = useState('');
     const [error, setError] = useState<boolean>(false);
     const [lastLength, setLastLength] = useState<number>(0); // Ajout d'un état pour stocker la longueur précédente
 
     useEffect(() => {
-            setRawValue(formatVehicleTire(vehicleTire));
+        if(vehicleTire) {
             setTireInfo(formatVehicleTire(vehicleTire));
+        }
     }, [vehicleTire]);
 
-    useEffect(() => {
+
+    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, 10);
 
-        console.log(value);
 
         // 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));
 
-        console.log(isValid);
-
         // Vérifier si l'utilisateur est en train de supprimer un caractère
         const isDeleting = value.length < lastLength;
-        console.log(`Deleting : ${isDeleting}`);
-        
+
         // Ajout du " / "
         if (value.length >= 3 && !(rawValue.length == 5 && isDeleting)) {
-            console.log('Ajout : /')
             value = `${value.substring(0, 3)} / ${value.substring(3)}`;
         }
 
         // Ajout du " R"
         if (value.length >= 8 && !(rawValue.length == 9 && isDeleting)) {
-            console.log('Ajout : R')
             value = `${value.substring(0, 8)} R${value.substring(8)}`;
         }
 
 
         // Ajout d'un espace après la saisie du diamètre des pneus
         if (value.length >= 12 && !(rawValue.length <= 12 && isDeleting)) {
-            console.log('Ajout : " "')
             value = `${value.substring(0, 12)} ${value.substring(12)}`;
         }
 
         setTireInfo(value);
-        console.log(value.length);
-
-        if (value.length >= 16 && !(rawValue.length == 17 && isDeleting)) {
 
-            const parts = value.split(" ");
+        const parts = value.split(" ");
 
-            if (parts.length === 5) {
-                let [width, separator, height, diameter, speedIndex] = parts;
+        if (value.length >= 16 && !(rawValue.length == 17 && isDeleting) && parts.length === 5) {
+                const [width, _separator, height, diameter, speedIndex] = parts;
                 const vehicleTire = new VehicleTire(width, height, diameter, speedIndex);
                 onChangeVehicleTire(vehicleTire, isValid);
-            }
         } else {
+            const [width, _separator, height, diameter, speedIndex] = parts;
+            const vehicleTire = new VehicleTire(width ?? '', height ?? '', diameter ?? '', speedIndex ?? '');
+
             onChangeVehicleTire(vehicleTire, isValid);
         }
 
         setLastLength(value.length); // Mettre à jour la longueur précédente
 
-    }, [rawValue]);
+    };
 
-    const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-        e.preventDefault();
-        setRawValue(e.target.value);
-      };
-    
     return (
         <TextField
             label="Taille des pneumatiques"
@@ -93,14 +83,14 @@ const MovaVehicleTireField: FC<MovaVehicleTireFieldProps> = ({ vehicleTire, onCh
             onChange={handleChange}
             fullWidth
             placeholder='XXX XX RXX XXX'
-            sx={{ 
-                width: '100%', 
+            sx={{
+                width: '100%',
                 '& input': { textTransform: 'uppercase' } // CSS pour forcer les majuscules dans l'input
               }}
-            error={error && tireInfo.length > 0}              
-            helperText={error && tireInfo.length > 0 ? "Saisie invalide" : ''}            
+            error={error && tireInfo.length > 0}
+            helperText={error && tireInfo.length > 0 ? "Saisie invalide" : ''}
         />
     );
 }
 
-export default MovaVehicleTireField;
+export default MovaVehicleTireField;

package/src/helpers/ApiHelper.ts

@@ -13,8 +13,16 @@ type APIError = {
     success: false;
     error: string;
 };
+// This inference type is not ready yet, we have to be sure
+// that we handle all the backend return cases before changing this
+// export type APIResponse<T> = APISuccess<T> | APIError;
 
-export type APIResponse<T> = APISuccess<T> | APIError;
+export type APIResponse<T> = {
+    success: boolean,
+    data?: T,
+    error?: string
+
+}
 
 export type APIRequest = {
     url: string,