From df87907299c0a9f27ac43ee617d01504f3f77dc2 Mon Sep 17 00:00:00 2001
From: Miguel Cabrerizo <30386061+doncicuto@users.noreply.github.com>
Date: Thu, 22 Jun 2023 09:24:44 +0200
Subject: [PATCH] feat(console): user table show timestamp instead of x ago
 (#6034)

Co-authored-by: Max Peintner <max@caos.ch>
---
 .../user-list/user-table/user-table.component.html |  4 ++--
 .../localized-date-pipe/localized-date.pipe.ts     | 14 +++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/console/src/app/pages/users/user-list/user-table/user-table.component.html b/console/src/app/pages/users/user-list/user-table/user-table.component.html
index 347b738e99..d51fdf2197 100644
--- a/console/src/app/pages/users/user-list/user-table/user-table.component.html
+++ b/console/src/app/pages/users/user-list/user-table/user-table.component.html
@@ -170,14 +170,14 @@
       <ng-container matColumnDef="creationDate">
         <th mat-header-cell *matHeaderCellDef mat-sort-header>{{ 'USER.TABLE.CREATIONDATE' | translate }}</th>
         <td mat-cell *matCellDef="let user" [routerLink]="user.id ? ['/users', user.id] : null">
-          <span class="no-break">{{ user.details.creationDate | timestampToDate | localizedDate : 'fromNow' }}</span>
+          <span class="no-break">{{ user.details.creationDate | timestampToDate | localizedDate : 'regular' }}</span>
         </td>
       </ng-container>
 
       <ng-container matColumnDef="changeDate">
         <th mat-header-cell *matHeaderCellDef>{{ 'USER.TABLE.CHANGEDATE' | translate }}</th>
         <td mat-cell *matCellDef="let user" [routerLink]="user.id ? ['/users', user.id] : null">
-          <span class="no-break">{{ user.details.changeDate | timestampToDate | localizedDate : 'fromNow' }}</span>
+          <span class="no-break">{{ user.details.changeDate | timestampToDate | localizedDate : 'regular' }}</span>
         </td>
       </ng-container>
 
diff --git a/console/src/app/pipes/localized-date-pipe/localized-date.pipe.ts b/console/src/app/pipes/localized-date-pipe/localized-date.pipe.ts
index ce4b094169..6030dc463c 100644
--- a/console/src/app/pipes/localized-date-pipe/localized-date.pipe.ts
+++ b/console/src/app/pipes/localized-date-pipe/localized-date.pipe.ts
@@ -18,14 +18,22 @@ export class LocalizedDatePipe implements PipeTransform {
       if (moment().diff(date, 'days') <= 2) {
         return date.fromNow(); // '2 days ago' etc.
       } else {
-        const localeData = moment(value).localeData();
-        const format = localeData.longDateFormat('L');
-        return moment(value).format(`${format}, HH:mm`);
+        return this.getDateInRegularFormat(value);
       }
+    }
+    if (pattern && pattern === 'regular') {
+      moment.locale(this.translateService.currentLang ?? 'en');
+      return this.getDateInRegularFormat(value);
     } else {
       const lang = supportedLanguages.includes(this.translateService.currentLang) ? this.translateService.currentLang : 'en';
       const datePipe: DatePipe = new DatePipe(lang);
       return datePipe.transform(value, pattern ?? 'mediumDate');
     }
   }
+
+  private getDateInRegularFormat(value: any): string {
+    const localeData = moment(value).localeData();
+    const format = localeData.longDateFormat('L');
+    return moment(value).format(`${format}, HH:mm`);
+  }
 }