update ceph source to reef 18.2.1

[ceph.git] / ceph / src / pybind / mgr / dashboard / frontend / src / app / shared / pipes / relative-date.pipe.ts

diff --git a/ceph/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/relative-date.pipe.ts b/ceph/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/relative-date.pipe.ts
index f802b6b2add174a0124dad8eb1a20c3bc9b7b24c..251ab055e951609a68952f31865f2707cc0eec88 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/relative-date.pipe.ts
+++ b/ceph/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/relative-date.pipe.ts
@@ -40,10 +40,11 @@ export class RelativeDatePipe implements PipeTransform {
    */
   transform(value: Date | string | number, upperFirst = true): string {
     let date: moment.Moment;
+    const offset = moment().utcOffset();
     if (_.isNumber(value)) {
-      date = moment.unix(value);
+      date = moment.parseZone(moment.unix(value)).utc().utcOffset(offset).local();
     } else {
-      date = moment(value);
+      date = moment.parseZone(value).utc().utcOffset(offset).local();
     }
     if (!date.isValid()) {
       return '';