From fb9a9dfba25a7f7aef26ae4a691df3c19c0b9a87 Mon Sep 17 00:00:00 2001
From: diallolatoile <diallo.latoile@gmail.com>
Date: Sat, 17 Jan 2026 14:06:26 +0000
Subject: [PATCH] feat: Add Health Check Endpoint

---
 .../merchant-config-view.html                 | 31 ++++++++++---------
 .../merchant-config-view.ts                   | 17 +++++++++-
 .../merchant-config/merchant-config.ts        |  4 +--
 3 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/src/app/modules/merchant-config/merchant-config-view/merchant-config-view.html b/src/app/modules/merchant-config/merchant-config-view/merchant-config-view.html
index 952ddfc..81e4c61 100644
--- a/src/app/modules/merchant-config/merchant-config-view/merchant-config-view.html
+++ b/src/app/modules/merchant-config/merchant-config-view/merchant-config-view.html
@@ -7,11 +7,13 @@
           <h4 class="mb-1">Profil Marchand</h4>
           <nav aria-label="breadcrumb">
             <ol class="breadcrumb mb-0">
-              <li class="breadcrumb-item">
-                <a href="javascript:void(0)" (click)="goBack()" class="text-decoration-none cursor-pointer">
-                  Marchands
-                </a>
-              </li>
+              @if(isHubUser){
+                <li class="breadcrumb-item">
+                  <a href="javascript:void(0)" (click)="goBack()" class="text-decoration-none cursor-pointer">
+                    Marchands
+                  </a>
+                </li>
+              }
               <li class="breadcrumb-item active" aria-current="page">
                 {{ merchant?.name || 'Chargement...' }}
               </li>
@@ -29,15 +31,16 @@
             <ng-icon name="lucideRefreshCw" class="me-1" [class.spin]="loading"></ng-icon>
             Actualiser
           </button>
-          
-          <!-- Bouton retour -->
-          <button 
-            class="btn btn-outline-secondary"
-            (click)="goBack()"
-          >
-            <ng-icon name="lucideArrowLeft" class="me-1"></ng-icon>
-            Retour
-          </button>
+          @if(isHubUser){
+            <!-- Bouton retour -->
+            <button 
+              class="btn btn-outline-secondary"
+              (click)="goBack()"
+            >
+              <ng-icon name="lucideArrowLeft" class="me-1"></ng-icon>
+              Retour
+            </button>
+          }
         </div>
       </div>
     </div>
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 a4288d4..272060b 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
@@ -21,7 +21,7 @@ import { MerchantConfigService } from '../merchant-config.service';
 import { MerchantDataAdapter } from '../merchant-data-adapter.service';
 import { RoleManagementService } from '@core/services/hub-users-roles-management.service';
 import { AuthService } from '@core/services/auth.service';
-import { UserRole } from '@core/models/dcb-bo-hub-user.model';
+import { UserRole, UserType } from '@core/models/dcb-bo-hub-user.model';
 import { MinioService } from '@core/services/minio.service';
 import { DomSanitizer } from '@angular/platform-browser';
 
@@ -218,6 +218,9 @@ export class MerchantConfigView implements OnInit, OnDestroy {
   // Gestion des permissions
   currentUserRole: UserRole | null = null;
   currentMerchantPartnerId: string = '';
+  // Déterminer le type d'utilisateur
+  isMerchantUser = false;
+  isHubUser = false;
 
   // Édition des configurations
   editingConfigId: number | null = null;
@@ -470,6 +473,18 @@ export class MerchantConfigView implements OnInit, OnDestroy {
       .subscribe({
         next: (profile) => {
           this.currentUserRole = this.authService.getCurrentUserRole();
+          // Déterminer si c'est un utilisateur marchand
+          if (this.currentUserRole === UserRole.DCB_PARTNER_ADMIN ||
+              this.currentUserRole === UserRole.DCB_PARTNER_MANAGER ||
+              this.currentUserRole === UserRole.DCB_PARTNER_SUPPORT ||
+              this.currentUserRole === UserRole.MERCHANT_CONFIG_MANAGER ||
+              this.currentUserRole === UserRole.MERCHANT_CONFIG_TECHNICAL ||
+              this.currentUserRole === UserRole.MERCHANT_CONFIG_VIEWER) {
+            this.isMerchantUser = true;
+          } else {
+            this.isHubUser = profile?.userType === UserType.HUB;
+            this.isMerchantUser = profile?.userType === UserType.MERCHANT_PARTNER;
+          }
           this.cdRef.detectChanges();
         },
         error: (error) => {
diff --git a/src/app/modules/merchant-config/merchant-config.ts b/src/app/modules/merchant-config/merchant-config.ts
index dd53491..1f27dcf 100644
--- a/src/app/modules/merchant-config/merchant-config.ts
+++ b/src/app/modules/merchant-config/merchant-config.ts
@@ -88,7 +88,7 @@ export class MerchantConfigManagement implements OnInit, OnDestroy {
   logoChanged = false;
 
   // État de l'interface
-  activeTab: 'list' | 'merchant-profile' = 'list';
+  activeTab: 'list' | 'merchant-profile' = 'merchant-profile';
   selectedMerchantId: number | null = null;
   selectedConfigId: number | null = null;
   selectedUserId: string | null = null;
@@ -256,8 +256,6 @@ export class MerchantConfigManagement implements OnInit, OnDestroy {
             }
           } else {
             console.warn('No merchant found for current user');
-            // Si aucun marchand trouvé, revenir à la liste
-            this.activeTab = 'list';
           }
           
           this.loadingUserMerchant = false;