1 files changed, 17 insertions, 7 deletions
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/cd-date.pipe.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/cd-date.pipe.ts
index 911f32041..887d8d6bf 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/cd-date.pipe.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/cd-date.pipe.ts
@@ -1,20 +1,30 @@
-import { DatePipe } from '@angular/common';
 import { Pipe, PipeTransform } from '@angular/core';
+import _ from 'lodash';
+import moment from 'moment';
 
 @Pipe({
   name: 'cdDate'
 })
 export class CdDatePipe implements PipeTransform {
-  constructor(private datePipe: DatePipe) {}
+  constructor() {}
 
   transform(value: any): any {
     if (value === null || value === '') {
       return '';
     }
-    return (
-      this.datePipe.transform(value, 'shortDate') +
-      ' ' +
-      this.datePipe.transform(value, 'mediumTime')
-    );
+    let date: string;
+    const offset = moment().utcOffset();
+    if (_.isNumber(value)) {
+      date = moment
+        .parseZone(moment.unix(value))
+        .utc()
+        .utcOffset(offset)
+        .local()
+        .format('D/M/YY hh:mm A');
+    } else {
+      value = value?.replace('Z', '');
+      date = moment.parseZone(value).utc().utcOffset(offset).local().format('D/M/YY hh:mm A');
+    }
+    return date;
   }
 }