From f6da8d71b292b03b4cef21ba67fb928d9445a753 Mon Sep 17 00:00:00 2001
From: Nizamudeen A <nia@redhat.com>
Date: Thu, 6 Nov 2025 12:03:26 +0530
Subject: [PATCH] mgr/dashboard: fix upgrade's cluster alerts popover

keep the legacy view so that it shows the alert types when opening the
popover

Fixes: https://tracker.ceph.com/issues/73733
Signed-off-by: Nizamudeen A <nia@redhat.com>
---
 .../src/app/ceph/cluster/upgrade/upgrade.component.html    | 3 ++-
 .../ceph/shared/health-checks/health-checks.component.html | 7 ++++++-
 .../ceph/shared/health-checks/health-checks.component.ts   | 3 +++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/upgrade/upgrade.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/upgrade/upgrade.component.html
index 04bedd508e5..d1a84b68f2b 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/upgrade/upgrade.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/upgrade/upgrade.component.html
@@ -59,7 +59,8 @@
             </div>
             <div cdsToggletipContent>
               <div class="cds--popover-scroll-container">
-                <cd-health-checks [healthData]="healthData.health.checks"></cd-health-checks>
+                <cd-health-checks [healthData]="healthData.health.checks"
+                                  [legacyHealthChecks]="true"></cd-health-checks>
               </div>
             </div>
           </cds-toggletip>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/health-checks/health-checks.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/health-checks/health-checks.component.html
index cd1105e1284..c33632ebfac 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/health-checks/health-checks.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/health-checks/health-checks.component.html
@@ -7,6 +7,11 @@
   <li *ngFor="let check of healthData |  keyvalue">
     <span [ngStyle]="check.value.severity | healthColor"
           [class.health-warn-description]="check.value.severity === 'HEALTH_WARN'">
-    {{ check.key }}</span>: {{ check.value.summary.message }} <br>
+    @if (legacyHealthChecks) {
+    {{ check.value.type }}
+    } @else {
+    {{ check.key }}
+    }
+  </span>: {{ check.value.summary.message }} <br>
   </li>
 </ul>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/health-checks/health-checks.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/health-checks/health-checks.component.ts
index 6c047bc4b78..1bf84902f0e 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/health-checks/health-checks.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/health-checks/health-checks.component.ts
@@ -12,6 +12,9 @@ export class HealthChecksComponent {
   @Input()
   healthData: any;
 
+  @Input()
+  legacyHealthChecks = false;
+
   icons = Icons;
 
   permissions: Permissions;
-- 
2.47.3