@movalib/movalib-commons 1.62.1 → 1.62.3

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

@@ -94,11 +94,7 @@ var VehicleFullCard = function (_a) {
         }
     };
     var isVehicleTireSizeDefined = function (vehicle) {
-        return (vehicle.tireSize &&
-            vehicle.tireSize.diameter &&
-            vehicle.tireSize.height &&
-            vehicle.tireSize.speedIndex &&
-            vehicle.tireSize.width);
+        return (vehicle.tireSize && vehicle.tireSize.diameter && vehicle.tireSize.height);
     };
     var validateForm = function () {
         var newForm = __assign({}, form);

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

@@ -7,6 +7,7 @@ export declare const getApplicationsShortLabels: (applications: PartsApplication
 export declare const flexStart: CSSProperties;
 export declare const isSafariOniOS: () => boolean;
 export declare const isInvalidMobileNumber: (phoneNumber?: string) => boolean;
+export declare const isInvalidPhoneNumber: (phoneNumber?: string) => boolean;
 export declare const FR_WEEK_DAYS: string[];
 export declare const getDayOfWeekLabel: (day: DayOfWeek) => string | undefined;
 export declare const getDayOfWeekIndex: (day: DayOfWeek) => number;

package/dist/src/helpers/Tools.js

@@ -3,7 +3,7 @@ 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.getDayOfWeekIndex = exports.getDayOfWeekLabel = exports.FR_WEEK_DAYS = exports.isInvalidMobileNumber = 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.isInvalidPhoneNumber = exports.isInvalidMobileNumber = exports.isSafariOniOS = exports.flexStart = exports.getApplicationsShortLabels = void 0;
 var max_1 = __importDefault(require("libphonenumber-js/max"));
 var Enums_1 = require("./Enums");
 var getApplicationsShortLabels = function (applications) {
@@ -53,6 +53,31 @@ var isInvalidMobileNumber = function (phoneNumber) {
     }
 };
 exports.isInvalidMobileNumber = isInvalidMobileNumber;
+var isInvalidPhoneNumber = function (phoneNumber) {
+    var _a;
+    if (phoneNumber === void 0) { phoneNumber = ""; }
+    if (!phoneNumber || typeof phoneNumber !== "string")
+        return true;
+    // Nettoyage : supprime les espaces et convertit "00..." en "+..."
+    var cleaned = phoneNumber.replace(/\s+/g, "").replace(/^00/, "+");
+    // Si le numéro ne commence pas par +, on assume que c'est un numéro local français
+    var cleanedPhoneNumber = cleaned.startsWith("+")
+        ? cleaned
+        : "+33".concat(cleaned.replace(/^0/, ""));
+    try {
+        var parsed = (0, max_1.default)(cleanedPhoneNumber);
+        var type = (_a = parsed === null || parsed === void 0 ? void 0 : parsed.getType) === null || _a === void 0 ? void 0 : _a.call(parsed);
+        console.log(type);
+        console.log(parsed === null || parsed === void 0 ? void 0 : parsed.isValid());
+        console.log(["MOBILE", "MOBILE_OR_FIXED_LINE"].includes(type || ""));
+        return !((parsed === null || parsed === void 0 ? void 0 : parsed.isValid()) &&
+            ["MOBILE", "MOBILE_OR_FIXED_LINE", "FIXED_LINE"].includes(type || ""));
+    }
+    catch (_b) {
+        return true;
+    }
+};
+exports.isInvalidPhoneNumber = isInvalidPhoneNumber;
 exports.FR_WEEK_DAYS = [
     "Lundi",
     "Mardi",

package/dist/src/helpers/Validator.js

@@ -35,7 +35,7 @@ function validatePhoneNumber(phoneNumber) {
     if (phoneNumber === null || phoneNumber === undefined || phoneNumber === "") {
         return false;
     }
-    return !(0, Tools_1.isInvalidMobileNumber)(phoneNumber);
+    return !(0, Tools_1.isInvalidPhoneNumber)(phoneNumber);
 }
 exports.validatePhoneNumber = validatePhoneNumber;
 function validateText(text) {

package/package.json

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

package/src/components/vehicle/VehicleFullCard.tsx

@@ -207,11 +207,7 @@ const VehicleFullCard: FC<VehicleFullCardProps> = ({
 
   const isVehicleTireSizeDefined = (vehicle: Vehicle) => {
     return (
-      vehicle.tireSize &&
-      vehicle.tireSize.diameter &&
-      vehicle.tireSize.height &&
-      vehicle.tireSize.speedIndex &&
-      vehicle.tireSize.width
+      vehicle.tireSize && vehicle.tireSize.diameter && vehicle.tireSize.height
     );
   };
 

package/src/helpers/Tools.ts

@@ -58,6 +58,31 @@ export const isInvalidMobileNumber = (phoneNumber = "") => {
   }
 };
 
+export const isInvalidPhoneNumber = (phoneNumber = "") => {
+  if (!phoneNumber || typeof phoneNumber !== "string") return true;
+
+  // Nettoyage : supprime les espaces et convertit "00..." en "+..."
+  const cleaned = phoneNumber.replace(/\s+/g, "").replace(/^00/, "+");
+  // Si le numéro ne commence pas par +, on assume que c'est un numéro local français
+  const cleanedPhoneNumber = cleaned.startsWith("+")
+    ? cleaned
+    : `+33${cleaned.replace(/^0/, "")}`;
+
+  try {
+    const parsed = parsePhoneNumberFromString(cleanedPhoneNumber);
+    const type = parsed?.getType?.();
+    console.log(type);
+    console.log(parsed?.isValid());
+    console.log(["MOBILE", "MOBILE_OR_FIXED_LINE"].includes(type || ""));
+    return !(
+      parsed?.isValid() &&
+      ["MOBILE", "MOBILE_OR_FIXED_LINE", "FIXED_LINE"].includes(type || "")
+    );
+  } catch {
+    return true;
+  }
+};
+
 export const FR_WEEK_DAYS: string[] = [
   "Lundi",
   "Mardi",

package/src/helpers/Validator.ts

@@ -1,4 +1,4 @@
-import { isInvalidMobileNumber } from "./Tools";
+import { isInvalidPhoneNumber } from "./Tools";
 
 /**
  * Un email valide
@@ -41,7 +41,7 @@ export function validatePhoneNumber(phoneNumber: string): boolean {
   if (phoneNumber === null || phoneNumber === undefined || phoneNumber === "") {
     return false;
   }
-  return !isInvalidMobileNumber(phoneNumber);
+  return !isInvalidPhoneNumber(phoneNumber);
 }
 
 export function validateText(text: string): boolean {