@movalib/movalib-commons 1.59.36 → 1.59.38

package/dist/src/models/Product.d.ts

@@ -6,11 +6,12 @@ export default class Product {
     name: string;
     code: string;
     type: ProductType;
+    order?: String;
     orderPreference?: OrderPreference;
     originReferences?: string[];
     operation?: Operation;
     orderState?: OrderState;
     supplier?: Supplier;
     application?: PartsApplicationType;
-    constructor(id: string, code: string, name: string, type: ProductType, orderPreference: OrderPreference, originReferences: string[]);
+    constructor(id: string, code: string, name: string, type: ProductType, orderPreference: OrderPreference, originReferences: string[], order?: string);
 }

package/dist/src/models/Product.js

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var Product = /** @class */ (function () {
-    function Product(id, code, name, type, orderPreference, originReferences) {
+    function Product(id, code, name, type, orderPreference, originReferences, order) {
         this.id = id;
         this.name = name;
         this.code = code;
         this.type = type;
         this.orderPreference = orderPreference;
         this.originReferences = originReferences;
+        this.order = order;
     }
     return Product;
 }());

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

@@ -6,5 +6,5 @@ export default class AuthenticationService {
     static login(appType: MovaAppType, phoneEmail: string, password: string): Promise<APIResponse<User>>;
     static ValidateSecurityCode(req: {
         securityCode: string;
-    }): Promise<APIResponse<User>>;
+    }, appType?: MovaAppType): Promise<APIResponse<User>>;
 }

package/dist/src/services/AuthenticationService.js

@@ -86,6 +86,14 @@ var AuthenticationService = /** @class */ (function () {
                                     password: password
                                 };
                                 break;
+                            case Enums_1.MovaAppType.ADMIN:
+                                url = "".concat(ApiHelper_1.API_BASE_URL, "/garage/login");
+                                tokenCookie = CookieUtils_1.COOKIE_ADMIN_TOKEN;
+                                req = {
+                                    email: phoneEmail,
+                                    password: password
+                                };
+                                break;
                         }
                         return [4 /*yield*/, (0, ApiHelper_1.request)({
                                 url: url,
@@ -97,7 +105,7 @@ var AuthenticationService = /** @class */ (function () {
                         tokenResponse = _a.sent();
                         if (!tokenResponse.success) return [3 /*break*/, 3];
                         // CSM CASE
-                        if (tokenResponse.data.accessToken === null && tokenResponse.data.role.includes('ROLE_CSM')) {
+                        if (tokenResponse.data.accessToken === null && (tokenResponse.data.role.includes('ROLE_CSM') || tokenResponse.data.role.includes('ROLE_SUPER_ADMIN'))) {
                             return [2 /*return*/, { success: true, data: tokenResponse.data }];
                         }
                         Logger_1.default.info(tokenResponse);
@@ -123,13 +131,13 @@ var AuthenticationService = /** @class */ (function () {
             });
         });
     };
-    AuthenticationService.ValidateSecurityCode = function (req) {
+    AuthenticationService.ValidateSecurityCode = function (req, appType) {
         return __awaiter(this, void 0, void 0, function () {
             var tokenResponse, tokenCookie, userResponse, errorMsg, error_2, errorMessage;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _a.trys.push([0, 5, , 6]);
+                        _a.trys.push([0, 8, , 9]);
                         return [4 /*yield*/, (0, ApiHelper_1.request)({
                                 url: "".concat(ApiHelper_1.API_BASE_URL, "/check-security-code"),
                                 method: Enums_1.APIMethod.POST,
@@ -138,26 +146,47 @@ var AuthenticationService = /** @class */ (function () {
                     case 1:
                         tokenResponse = _a.sent();
                         tokenCookie = CookieUtils_1.COOKIE_PRO_TOKEN;
-                        if (!tokenResponse.success) return [3 /*break*/, 3];
+                        if (appType) {
+                            switch (appType) {
+                                case Enums_1.MovaAppType.GARAGE:
+                                    tokenCookie = CookieUtils_1.COOKIE_PRO_TOKEN;
+                                    break;
+                                case Enums_1.MovaAppType.INDIVIDUAL:
+                                    tokenCookie = CookieUtils_1.COOKIE_INDIVIDUAL_TOKEN;
+                                    break;
+                                case Enums_1.MovaAppType.ADMIN:
+                                    tokenCookie = CookieUtils_1.COOKIE_ADMIN_TOKEN;
+                                    break;
+                            }
+                        }
+                        if (!tokenResponse.success) return [3 /*break*/, 6];
                         Logger_1.default.info(tokenResponse);
                         (0, CookieUtils_1.createCookie)(tokenCookie, tokenResponse.data.accessToken);
-                        return [4 /*yield*/, UserService_1.default.getCurrentUser(Enums_1.MovaAppType.GARAGE)];
+                        userResponse = void 0;
+                        if (!appType) return [3 /*break*/, 3];
+                        return [4 /*yield*/, UserService_1.default.getCurrentUser(appType)];
                     case 2:
                         userResponse = _a.sent();
+                        return [3 /*break*/, 5];
+                    case 3: return [4 /*yield*/, UserService_1.default.getCurrentUser(Enums_1.MovaAppType.GARAGE)];
+                    case 4:
+                        userResponse = _a.sent();
+                        _a.label = 5;
+                    case 5:
                         if (!userResponse || !userResponse.success) {
                             errorMsg = 'Erreur au chargement de votre profil';
                             Logger_1.default.error(errorMsg);
                             return [2 /*return*/, { success: false, error: errorMsg }];
                         }
                         return [2 /*return*/, { success: true, data: userResponse.data }];
-                    case 3: return [2 /*return*/, tokenResponse];
-                    case 4: return [3 /*break*/, 6];
-                    case 5:
+                    case 6: return [2 /*return*/, tokenResponse];
+                    case 7: return [3 /*break*/, 9];
+                    case 8:
                         error_2 = _a.sent();
                         Logger_1.default.error('Error occurred during login:', error_2);
                         errorMessage = error_2 instanceof Error ? error_2.message : 'Erreur inconnue';
                         return [2 /*return*/, { success: false, error: errorMessage }];
-                    case 6: return [2 /*return*/];
+                    case 9: return [2 /*return*/];
                 }
             });
         });

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

@@ -19,7 +19,7 @@ export default class GarageService {
     static sendGarageMandate(garageId: string): Promise<APIResponse<string>>;
     static getGarageAllData(garageId: string): Promise<APIResponse<Garage>>;
     static createGaragePrestationRequest(garageId: string, req: any): Promise<APIResponse<string>>;
-    static getGarageSettings({ garageId }: {
+    static getGarageSettings({ garageId, }: {
         garageId: string;
     }): Promise<APIResponse<Garage>>;
     static uploadLogo(garageId: string, formData: FormData): Promise<APIResponse<string>>;
@@ -44,6 +44,8 @@ export default class GarageService {
     static sendCustomerReminder(garageId: string, eventId: string, message: string): Promise<APIResponse<string>>;
     static updateGarageEvent(garageId: string, eventId: string, req: any): Promise<APIResponse<string>>;
     static sendSupplierRequest(garageId: string, eventId: string, req: any): Promise<APIResponse<string>>;
+    static deleteSupplierRequest(orderId: string): Promise<APIResponse<string>>;
+    static receiveSupplierRequest(orderId: string): Promise<APIResponse<string>>;
     static deleteGarageSupplier(garageId: string, supplierId: string): Promise<APIResponse<string>>;
     static createGarageSupplier(garageId: string, req: any): Promise<APIResponse<string>>;
     static updateGarageSupplier(garageId: string, supplierId: number, req: any): Promise<APIResponse<string>>;

package/dist/src/services/GarageService.js

@@ -65,7 +65,7 @@ var GarageService = /** @class */ (function () {
             url: "".concat(ApiHelper_1.API_BASE_URL, "/garage/").concat(garageId, "/prestation-category/").concat(categoryCode, "/color"),
             method: Enums_1.APIMethod.PATCH,
             appType: Enums_1.MovaAppType.GARAGE,
-            body: JSON.stringify({ color: color })
+            body: JSON.stringify({ color: color }),
         });
     };
     GarageService.updateGarageEventColor = function (garageId, eventId, color) {
@@ -73,7 +73,7 @@ var GarageService = /** @class */ (function () {
             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 })
+            body: JSON.stringify({ color: color }),
         });
     };
     GarageService.updateVehicleGarageEvent = function (garageId, eventId, req) {
@@ -81,7 +81,7 @@ var GarageService = /** @class */ (function () {
             url: "".concat(ApiHelper_1.API_BASE_URL, "/garage/").concat(garageId, "/event/").concat(eventId, "/vehicle"),
             method: Enums_1.APIMethod.PATCH,
             appType: Enums_1.MovaAppType.GARAGE,
-            body: JSON.stringify(req)
+            body: JSON.stringify(req),
         });
     };
     GarageService.uploadEventDocument = function (garageId, eventId, req) {
@@ -89,7 +89,7 @@ var GarageService = /** @class */ (function () {
             url: "".concat(ApiHelper_1.API_BASE_URL, "/garage/").concat(garageId, "/event/").concat(eventId, "/documents"),
             method: Enums_1.APIMethod.POST,
             appType: Enums_1.MovaAppType.GARAGE,
-            body: req
+            body: req,
         });
     };
     GarageService.deleteEventDocument = function (garageId, eventId, docId) {
@@ -294,6 +294,20 @@ var GarageService = /** @class */ (function () {
             body: JSON.stringify(req),
         });
     };
+    GarageService.deleteSupplierRequest = function (orderId) {
+        return (0, ApiHelper_1.request)({
+            url: "".concat(ApiHelper_1.API_BASE_URL, "/order/").concat(orderId),
+            method: Enums_1.APIMethod.DELETE,
+            appType: Enums_1.MovaAppType.GARAGE,
+        });
+    };
+    GarageService.receiveSupplierRequest = function (orderId) {
+        return (0, ApiHelper_1.request)({
+            url: "".concat(ApiHelper_1.API_BASE_URL, "/order/").concat(orderId, "/receive"),
+            method: Enums_1.APIMethod.PATCH,
+            appType: Enums_1.MovaAppType.GARAGE,
+        });
+    };
     GarageService.deleteGarageSupplier = function (garageId, supplierId) {
         return (0, ApiHelper_1.request)({
             url: "".concat(ApiHelper_1.API_BASE_URL, "/garage/").concat(garageId, "/suppliers/").concat(supplierId),

package/package.json

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

package/src/MovaLogin.tsx

@@ -2,6 +2,7 @@ import { CSSProperties, ChangeEvent, FormEvent, FunctionComponent, MouseEvent, R
 import { LoadingButton } from '@mui/lab';
 import LogoLarge from './assets/images/logo/logo_large_border.png';
 import LogoProLarge from './assets/images/logo/logo_pro_large_border.png';
+import LogoAdminLarge from './assets/images/logo/logo_admin_large.png';
 import LogoLargeDarkMode from './assets/images/logo/logo_large_dm.png';
 import LogoProLargeDarkMode from './assets/images/logo/logo_pro_large_dm.png';
 import GreenLeafImage from "./assets/images/leaf_green_large.png";
@@ -93,7 +94,7 @@ const MovaLogin: FunctionComponent<MovaLoginProps> = ({ loading, movaAppType, on
         let newForm: MovaLoginForm = { ...form };
         
         // Validator pour les champs obligatoires
-        if(movaAppType === MovaAppType.GARAGE){
+        if(movaAppType === MovaAppType.GARAGE || movaAppType === MovaAppType.ADMIN){
             newForm.email = validateField(form.email, value => !!value, 'Champ obligatoire');
             // Validator pour l'email
             newForm.email = validateField(form.email, validateEmail, 'Adresse email invalide');
@@ -112,7 +113,7 @@ const MovaLogin: FunctionComponent<MovaLoginProps> = ({ loading, movaAppType, on
 
         setForm(newForm);
 
-        return newForm.password.isValid && (movaAppType === MovaAppType.GARAGE ? newForm.email.isValid : true)
+        return newForm.password.isValid && ((movaAppType === MovaAppType.GARAGE || movaAppType === MovaAppType.ADMIN) ? newForm.email.isValid : true)
         && (movaAppType === MovaAppType.INDIVIDUAL ? newForm.phoneNumberEmail.isValid : true) ;
     }    
 
@@ -125,7 +126,7 @@ const MovaLogin: FunctionComponent<MovaLoginProps> = ({ loading, movaAppType, on
         } else {
             return movaAppType === MovaAppType.GARAGE ? LogoProLarge :
             movaAppType === MovaAppType.INDIVIDUAL ? LogoLarge : 
-            movaAppType === MovaAppType.ADMIN ? LogoLarge : LogoLarge;
+            movaAppType === MovaAppType.ADMIN ? LogoAdminLarge : LogoLarge;
         }
     }
 
@@ -147,7 +148,7 @@ const MovaLogin: FunctionComponent<MovaLoginProps> = ({ loading, movaAppType, on
         setOpenForgotPassword(false);
         // On appel de callback de soumission de la demande de réinitialisation du mot de passe
         if(onSubmitForgotPassword){
-            onSubmitForgotPassword(movaAppType === MovaAppType.GARAGE ? form.email.value : form.phoneNumberEmail.value);
+            onSubmitForgotPassword((movaAppType === MovaAppType.GARAGE || movaAppType === MovaAppType.ADMIN) ? form.email.value : form.phoneNumberEmail.value);
         }
     }
 
@@ -253,7 +254,7 @@ const MovaLogin: FunctionComponent<MovaLoginProps> = ({ loading, movaAppType, on
                         />
                     }
 
-                    {movaAppType === MovaAppType.GARAGE && 
+                    {(movaAppType === MovaAppType.GARAGE || movaAppType === MovaAppType.ADMIN) && 
                        <TextField
                             margin="normal"
                             required