From cb6d1838acc08956d127e1c9dad5e189099789a4 Mon Sep 17 00:00:00 2001
From: Aashish Sharma
 <aasharma@li-e74156cc-2f67-11b2-a85c-e98659a63c5c.ibm.com>
Date: Tue, 10 Dec 2024 12:33:47 +0530
Subject: [PATCH] mgr/dashboard: Show correct token expiration date in Manage
 Clusters page

Currently wrong date is being displayed if we hover of the Token Expires
filed in the Clusters list table in Manage Clusters page. This PR
intends to fix this issue.

Fixes: https://tracker.ceph.com/issues/69172

Signed-off-by: Aashish Sharma <aasharma@redhat.com>
---
 .../multi-cluster-list/multi-cluster-list.component.html        | 2 +-
 .../multi-cluster-list/multi-cluster-list.component.ts          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/multi-cluster/multi-cluster-list/multi-cluster-list.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/multi-cluster/multi-cluster-list/multi-cluster-list.component.html
index b05d07fb31b..79cd60c970f 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/multi-cluster/multi-cluster-list/multi-cluster-list.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/multi-cluster/multi-cluster-list/multi-cluster-list.component.html
@@ -77,7 +77,7 @@
        [class.icon-danger-color]="row.remainingDays < 2"
        [class.icon-warning-color]="row.remainingDays < 8"
        class="{{ icons.warning }}"></i>
-    <span title="{{ value | cdDate }}">{{ row.remainingTimeWithoutSeconds / 1000 | duration }}</span>
+    <span title="{{ row.expiryDate }}">{{ row.remainingTimeWithoutSeconds / 1000 | duration }}</span>
   </span>
   <span *ngIf="row.remainingTimeWithoutSeconds <= 0 && row.remainingDays <=0 && row.cluster_alias !== 'local-cluster'">
     <i i18n-title
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/multi-cluster/multi-cluster-list/multi-cluster-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/multi-cluster/multi-cluster-list/multi-cluster-list.component.ts
index 78b4c9c1859..cfdc2e1720e 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/multi-cluster/multi-cluster-list/multi-cluster-list.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/multi-cluster/multi-cluster-list/multi-cluster-list.component.ts
@@ -115,6 +115,7 @@ export class MultiClusterListComponent extends ListWithDetails implements OnInit
                 cluster['ttl']
               );
               cluster['remainingDays'] = this.getRemainingDays(cluster['ttl']);
+              cluster['expiryDate'] = new Date(Date.now() + cluster['ttl']).toLocaleString();
             }
           });
         }
-- 
2.47.3