Merge pull request ceph#61012 from rhcs-dashboard/fix-69172-main

mgr/dashboard: Show correct token expiration date in Manage Clusters page

Reviewed-by: Afreen Misbah <[email protected]>

Author: afreen23

src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/multi-cluster/multi-cluster-list/multi-cluster-list.component.html

@@ -77,7 +77,7 @@ <h4 class="mt-3">This cluster is already managed by cluster -
        [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

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();
             }
           });
         }