From 87d72473ab05e6785d70473b0c6689f193534147 Mon Sep 17 00:00:00 2001
From: diallolatoile <diallo.latoile@gmail.com>
Date: Tue, 16 Dec 2025 22:26:43 +0000
Subject: [PATCH] feat: add DCB User Service API - Authentication system with
 KEYCLOAK - Modular architecture with services for each feature

---
 src/app/modules/hub-users-management/merchant-users.html    | 4 ++--
 .../merchant-config-view/merchant-config-view.ts            | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/modules/hub-users-management/merchant-users.html b/src/app/modules/hub-users-management/merchant-users.html
index 51a31f5..f6ddd8c 100644
--- a/src/app/modules/hub-users-management/merchant-users.html
+++ b/src/app/modules/hub-users-management/merchant-users.html
@@ -323,9 +323,9 @@
             (change)="onRoleSelectionChange($any($event.target).value)"
             name="role"
             required
-            [disabled]="creatingUser || !canManageRoles"
+            [disabled]="creatingUser"
           >
-            <option value="" disabled>Sélectionnez un rôle</option>
+            <option value="" >Sélectionnez un rôle</option>
             @for (role of availableRoles; track role.value) {
               <option 
                 [value]="role.value"
diff --git a/src/app/modules/merchant-config/merchant-config-view/merchant-config-view.ts b/src/app/modules/merchant-config/merchant-config-view/merchant-config-view.ts
index c0559c5..348b4f3 100644
--- a/src/app/modules/merchant-config/merchant-config-view/merchant-config-view.ts
+++ b/src/app/modules/merchant-config/merchant-config-view/merchant-config-view.ts
@@ -694,8 +694,8 @@ export class MerchantConfigView implements OnInit, OnDestroy {
     return [
       //{ value: UserRole.DCB_PARTNER, label: 'Partenaire' },
       { value: UserRole.DCB_PARTNER_ADMIN, label: 'Admin Partenaire' },
-      { value: UserRole.DCB_ADMIN, label: 'Administrateur' },
-      { value: UserRole.DCB_SUPPORT, label: 'Support' }
+      { value: UserRole.DCB_PARTNER_MANAGER, label: 'Administrateur' },
+      { value: UserRole.DCB_PARTNER_SUPPORT, label: 'Support' }
     ].filter(role => 
       // Filtrer selon les permissions de l'utilisateur courant
       this.canAssignRole(role.value)
@@ -741,7 +741,7 @@ export class MerchantConfigView implements OnInit, OnDestroy {
   }
 
   canManageAllMerchants(): boolean {
-    const adminRoles = [UserRole.DCB_ADMIN, UserRole.DCB_SUPPORT, UserRole.DCB_PARTNER_ADMIN];
+    const adminRoles = [UserRole.DCB_ADMIN, UserRole.DCB_SUPPORT];
     return this.currentUserRole ? adminRoles.includes(this.currentUserRole) : false;
   }