From 6c0b48a941e024f1c811886fa0467e8bda027e12 Mon Sep 17 00:00:00 2001
From: Sven Heidemann <sven.heidemann@sh-edraft.de>
Date: Thu, 16 Feb 2023 17:00:55 +0100
Subject: [PATCH] Added logic to show createdAt & modifiedAt in auth user list
 #78

---
 kdb-bot/src/bot_api/model/auth_user_dto.py    |  18 +
 .../transformer/auth_user_transformer.py      |   4 +-
 kdb-bot/src/bot_data/model/auth_user.py       |   2 +-
 kdb-web/package.json                          |   2 +-
 kdb-web/src/app/models/auth/auth-user.dto.ts  |   4 +-
 .../auth-user/auth-user.component.html        | 405 ++++++++++--------
 kdb-web/src/assets/config.json                |   2 +-
 kdb-web/src/assets/i18n/de.json               |   4 +-
 8 files changed, 250 insertions(+), 191 deletions(-)

diff --git a/kdb-bot/src/bot_api/model/auth_user_dto.py b/kdb-bot/src/bot_api/model/auth_user_dto.py
index 8d0d98b3..6d80410b 100644
--- a/kdb-bot/src/bot_api/model/auth_user_dto.py
+++ b/kdb-bot/src/bot_api/model/auth_user_dto.py
@@ -1,3 +1,4 @@
+from datetime import datetime
 from typing import Optional
 
 from bot_api.abc.dto_abc import DtoABC
@@ -14,6 +15,8 @@ class AuthUserDTO(DtoABC):
         password: str = None,
         confirmation_id: Optional[str] = None,
         auth_role: AuthRoleEnum = None,
+        created_at: datetime = None,
+        modified_at: datetime = None,
     ):
         DtoABC.__init__(self)
 
@@ -24,6 +27,8 @@ class AuthUserDTO(DtoABC):
         self._password = password
         self._is_confirmed = confirmation_id is None
         self._auth_role = auth_role
+        self._created_at = created_at
+        self._modified_at = modified_at
 
     @property
     def id(self) -> int:
@@ -77,6 +82,14 @@ class AuthUserDTO(DtoABC):
     def auth_role(self, value: AuthRoleEnum):
         self._auth_role = value
 
+    @property
+    def created_at(self) -> datetime:
+        return self._created_at
+
+    @property
+    def modified_at(self) -> datetime:
+        return self._modified_at
+
     def from_dict(self, values: dict):
         self._id = values["id"]
         self._first_name = values["firstName"]
@@ -86,6 +99,9 @@ class AuthUserDTO(DtoABC):
         self._is_confirmed = values["isConfirmed"]
         self._auth_role = AuthRoleEnum(values["authRole"])
 
+        self._created_at = values["createdAt"]
+        self._modified_at = values["modifiedAt"]
+
     def to_dict(self) -> dict:
         return {
             "id": self._id,
@@ -95,4 +111,6 @@ class AuthUserDTO(DtoABC):
             "password": self._password,
             "isConfirmed": self._is_confirmed,
             "authRole": self._auth_role.value,
+            "createdAt": self._created_at,
+            "modifiedAt": self._modified_at,
         }
diff --git a/kdb-bot/src/bot_api/transformer/auth_user_transformer.py b/kdb-bot/src/bot_api/transformer/auth_user_transformer.py
index 56b35504..0e47ae35 100644
--- a/kdb-bot/src/bot_api/transformer/auth_user_transformer.py
+++ b/kdb-bot/src/bot_api/transformer/auth_user_transformer.py
@@ -1,4 +1,4 @@
-from datetime import datetime, timezone
+from datetime import datetime
 
 from bot_api.abc.transformer_abc import TransformerABC
 from bot_api.model.auth_user_dto import AuthUserDTO
@@ -34,4 +34,6 @@ class AuthUserTransformer(TransformerABC):
             "" if password is None else password,
             db.confirmation_id,
             db.auth_role,
+            db.created_at,
+            db.modified_at,
         )
diff --git a/kdb-bot/src/bot_data/model/auth_user.py b/kdb-bot/src/bot_data/model/auth_user.py
index 7a91373d..f3a46707 100644
--- a/kdb-bot/src/bot_data/model/auth_user.py
+++ b/kdb-bot/src/bot_data/model/auth_user.py
@@ -1,11 +1,11 @@
 import uuid
 from datetime import datetime
 from typing import Optional
+
 from cpl_core.database import TableABC
 from cpl_query.extension import List
 
 from bot_data.model.auth_role_enum import AuthRoleEnum
-from bot_data.model.server import Server
 from bot_data.model.user import User
 
 
diff --git a/kdb-web/package.json b/kdb-web/package.json
index 02ac81a3..0df95016 100644
--- a/kdb-web/package.json
+++ b/kdb-web/package.json
@@ -1,6 +1,6 @@
 {
     "name": "kdb-web",
-    "version": "0.3.dev89",
+    "version": "0.3.dev78",
     "scripts": {
         "ng": "ng",
         "update-version": "ts-node-esm update-version.ts",
diff --git a/kdb-web/src/app/models/auth/auth-user.dto.ts b/kdb-web/src/app/models/auth/auth-user.dto.ts
index 17604288..5f38cbeb 100644
--- a/kdb-web/src/app/models/auth/auth-user.dto.ts
+++ b/kdb-web/src/app/models/auth/auth-user.dto.ts
@@ -8,4 +8,6 @@ export interface AuthUserDTO {
     password: string | null;
     isConfirmed?: boolean
     authRole?: AuthRoles;
-}
\ No newline at end of file
+    createdAt?: string;
+    modifiedAt?: string;
+}
diff --git a/kdb-web/src/app/modules/admin/auth-users/components/auth-user/auth-user.component.html b/kdb-web/src/app/modules/admin/auth-users/components/auth-user/auth-user.component.html
index 9f810bda..86d29795 100644
--- a/kdb-web/src/app/modules/admin/auth-users/components/auth-user/auth-user.component.html
+++ b/kdb-web/src/app/modules/admin/auth-users/components/auth-user/auth-user.component.html
@@ -1,201 +1,236 @@
 <h1>
-    {{'admin.auth_users.header' | translate}}
+  {{'admin.auth_users.header' | translate}}
 </h1>
 <div class="content-wrapper">
-    <div class="content">
-        <p-table #dt [value]="users" dataKey="id" editMode="row" [rowHover]="true" [rows]="10"
-            [rowsPerPageOptions]="[10,25,50]" [paginator]="true" [loading]="loading" [totalRecords]="totalRecords"
-            [lazy]="true" (onLazyLoad)="nextPage($event)">
+  <div class="content">
+    <p-table #dt [value]="users" dataKey="id" editMode="row" [rowHover]="true" [rows]="10"
+             [rowsPerPageOptions]="[10,25,50]" [paginator]="true" [loading]="loading" [totalRecords]="totalRecords"
+             [lazy]="true" (onLazyLoad)="nextPage($event)">
 
-            <ng-template pTemplate="caption">
-                <div class="table-caption">
-                    <div class="table-caption-text">
-                        <ng-container *ngIf="!loading">{{users.length}} {{'admin.auth_users.of' | translate}}
-                            {{dt.totalRecords}}
-                        </ng-container>
-                        {{'admin.auth_users.users' | translate}}
-                    </div>
+      <ng-template pTemplate="caption">
+        <div class="table-caption">
+          <div class="table-caption-text">
+            <ng-container *ngIf="!loading">{{users.length}} {{'admin.auth_users.of' | translate}}
+              {{dt.totalRecords}}
+            </ng-container>
+            {{'admin.auth_users.users' | translate}}
+          </div>
 
-                    <div class="table-caption-btn-wrapper btn-wrapper">
-                        <button pButton label="{{'admin.auth_users.add' | translate}}" class="icon-btn btn"
-                            icon="pi pi-user-plus" (click)="addUser(dt)" [disabled]="isEditingNew">
-                        </button>
-                        <button pButton label="{{'admin.auth_users.reset_filters' | translate}}" icon="pi pi-undo"
-                            class="icon-btn btn" (click)="resetFilters(dt)">
-                        </button>
-                    </div>
-                </div>
-            </ng-template>
+          <div class="table-caption-btn-wrapper btn-wrapper">
+            <button pButton label="{{'admin.auth_users.add' | translate}}" class="icon-btn btn"
+                    icon="pi pi-user-plus" (click)="addUser(dt)" [disabled]="isEditingNew">
+            </button>
+            <button pButton label="{{'admin.auth_users.reset_filters' | translate}}" icon="pi pi-undo"
+                    class="icon-btn btn" (click)="resetFilters(dt)">
+            </button>
+          </div>
+        </div>
+      </ng-template>
 
-            <ng-template pTemplate="header">
-                <tr>
-                    <th pSortableColumn="firstName">
-                        <div class="table-header-label">
-                            <div class="table-header-text">{{'admin.auth_users.headers.first_name' | translate}}</div>
-                            <p-sortIcon icon="sort" field="firstName" class="table-header-icon"></p-sortIcon>
-                        </div>
-                    </th>
+      <ng-template pTemplate="header">
+        <tr>
+          <th pSortableColumn="firstName">
+            <div class="table-header-label">
+              <div class="table-header-text">{{'admin.auth_users.headers.first_name' | translate}}</div>
+              <p-sortIcon icon="sort" field="firstName" class="table-header-icon"></p-sortIcon>
+            </div>
+          </th>
 
-                    <th pSortableColumn="lastName">
-                        <div class="table-header-label">
-                            <div class="table-header-text">{{'admin.auth_users.headers.last_name' | translate}}</div>
-                            <p-sortIcon field="lastName" class="table-header-icon"></p-sortIcon>
-                        </div>
-                    </th>
+          <th pSortableColumn="lastName">
+            <div class="table-header-label">
+              <div class="table-header-text">{{'admin.auth_users.headers.last_name' | translate}}</div>
+              <p-sortIcon field="lastName" class="table-header-icon"></p-sortIcon>
+            </div>
+          </th>
 
-                    <th pSortableColumn="email">
-                        <div class="table-header-label">
-                            <div class="table-header-text">{{'admin.auth_users.headers.e_mail' | translate}}</div>
-                            <p-sortIcon field="email" class="table-header-icon"></p-sortIcon>
-                        </div>
-                    </th>
+          <th pSortableColumn="email">
+            <div class="table-header-label">
+              <div class="table-header-text">{{'admin.auth_users.headers.e_mail' | translate}}</div>
+              <p-sortIcon field="email" class="table-header-icon"></p-sortIcon>
+            </div>
+          </th>
 
-                    <th class="table-header-actions" pSortableColumn="confirmationId">
-                        <div class="table-header-label">
-                            <div class="table-header-text">{{'admin.auth_users.headers.active' | translate}}</div>
-                            <p-sortIcon field="confirmationId" class="table-header-icon"></p-sortIcon>
-                        </div>
-                    </th>
+          <th class="table-header-actions" pSortableColumn="confirmationId">
+            <div class="table-header-label">
+              <div class="table-header-text">{{'admin.auth_users.headers.active' | translate}}</div>
+              <p-sortIcon field="confirmationId" class="table-header-icon"></p-sortIcon>
+            </div>
+          </th>
 
-                    <th class="table-header-small-dropdown" pSortableColumn="authRole">
-                        <div class="table-header-label">
-                            <div class="table-header-text">{{'admin.auth_users.headers.role' | translate}}</div>
-                            <p-sortIcon field="authRole" class="table-header-icon"></p-sortIcon>
-                        </div>
-                    </th>
+          <th class="table-header-small-dropdown" pSortableColumn="authRole">
+            <div class="table-header-label">
+              <div class="table-header-text">{{'admin.auth_users.headers.role' | translate}}</div>
+              <p-sortIcon field="authRole" class="table-header-icon"></p-sortIcon>
+            </div>
+          </th>
 
-                    <th>
-                        <div class="table-header-label">
-                            <div class="table-header-text">{{'admin.auth_users.headers.password' | translate}}</div>
-                        </div>
-                    </th>
+          <th>
+            <div class="table-header-label">
+              <div class="table-header-text">{{'admin.auth_users.headers.password' | translate}}</div>
+            </div>
+          </th>
 
-                    <th class="table-header-actions">
-                        <div class="table-header-label">
-                            <div class="table-header-text">{{'admin.auth_users.headers.actions' | translate}}</div>
-                        </div>
-                    </th>
-                </tr>
-                <tr>
-                    <th>
-                        <form [formGroup]="filterForm">
-                            <input type="text" pInputText formControlName="firstName" placeholder="{{'admin.auth_users.headers.first_name' | translate}}">
-                        </form>
-                    </th>
-                    <th>
-                        <form [formGroup]="filterForm">
-                            <input type="text" pInputText formControlName="lastName" placeholder="{{'admin.auth_users.headers.last_name' | translate}}">
-                        </form>
-                    </th>
-                    <th>
-                        <form [formGroup]="filterForm">
-                            <input type="email" pInputText formControlName="email" placeholder="{{'admin.auth_users.headers.e_mail' | translate}}">
-                        </form>
-                    </th>
-                    <th></th>
-                    <th>
-                        <form [formGroup]="filterForm">
-                            <p-dropdown formControlName="authRole" [options]="authRoles"></p-dropdown>
-                        </form>
-                    </th>
-                    <th></th>
-                    <th></th>
-                </tr>
-            </ng-template>
+          <th class="table-header-small-dropdown">
+            <div class="table-header-label">
+              <div class="table-header-text">{{'admin.auth_users.headers.created_at' | translate}}</div>
+            </div>
+          </th>
 
-            <ng-template pTemplate="body" let-user let-editing="editing" let-ri="rowIndex">
-                <tr [pEditableRow]="user">
-                    <td>
-                        <p-cellEditor>
-                            <ng-template pTemplate="input">
-                                <input class="table-edit-input" pInputText type="text" [(ngModel)]="user.firstName"
-                                    [ngClass]="{ 'invalid-feedback-input': isFirstNameInvalid}">
-                            </ng-template>
-                            <ng-template pTemplate="output">
-                                {{user.firstName}}
-                            </ng-template>
-                        </p-cellEditor>
-                    </td>
-                    <td>
-                        <p-cellEditor>
-                            <ng-template pTemplate="input">
-                                <input class="table-edit-input" pInputText type="text" [(ngModel)]="user.lastName"
-                                    [ngClass]="{ 'invalid-feedback-input': isLastNameInvalid}">
-                            </ng-template>
-                            <ng-template pTemplate="output">
-                                {{user.lastName}}
-                            </ng-template>
-                        </p-cellEditor>
-                    </td>
-                    <td>
-                        <p-cellEditor>
-                            <ng-template pTemplate="input">
-                                <input class="table-edit-input" pInputText type="email" [(ngModel)]="user.email"
-                                    [ngClass]="{ 'invalid-feedback-input': isEMailInvalid}">
-                            </ng-template>
-                            <ng-template pTemplate="output">
-                                {{user.email}}
-                            </ng-template>
-                        </p-cellEditor>
-                    </td>
-                    <td>
-                        <p-cellEditor>
-                            <ng-template pTemplate="input">
-                                <p-checkbox [binary]="true" [(ngModel)]="user.isConfirmed"
-                                    [ngClass]="{ 'invalid-feedback-input': isEMailInvalid}" [disabled]="isEditingNew">
-                                </p-checkbox>
-                            </ng-template>
-                            <ng-template pTemplate="output">
-                                <p-checkbox [binary]="true" [ngModel]="user.isConfirmed" [disabled]="true">
-                                </p-checkbox>
-                            </ng-template>
-                        </p-cellEditor>
-                    </td>
-                    <td>
-                        <p-cellEditor>
-                            <ng-template pTemplate="input">
-                                <p-dropdown [options]="authRoles" [(ngModel)]="user.authRole"
-                                    [disabled]="user.email == loggedInUserEMail"></p-dropdown>
-                            </ng-template>
-                            <ng-template pTemplate="output">
-                                {{user.authRole | authRole}}
-                            </ng-template>
-                        </p-cellEditor>
-                    </td>
-                    <td>
-                        <p-cellEditor>
-                            <ng-template pTemplate="input">
-                                <input class="table-edit-input" pInputText type="password" [(ngModel)]="user.password"
-                                    [ngClass]="{ 'invalid-feedback-input': isPasswordInvalid}">
-                            </ng-template>
-                            <ng-template pTemplate="output">
-                            </ng-template>
-                        </p-cellEditor>
-                    </td>
-                    <td>
-                        <div class="btn-wrapper">
-                            <button *ngIf="!editing" pButton pInitEditableRow class="btn icon-btn" icon="pi pi-pencil"
-                                (click)="onRowEditInit(dt, user, ri)"></button>
-                            <button *ngIf="!editing" pButton class="btn icon-btn danger-icon-btn" icon="pi pi-trash"
-                                (click)="deleteUser(user)"></button>
+          <th class="table-header-small-dropdown">
+            <div class="table-header-label">
+              <div class="table-header-text">{{'admin.auth_users.headers.modified_at' | translate}}</div>
+            </div>
+          </th>
 
-                            <button *ngIf="editing" pButton pSaveEditableRow class="btn icon-btn"
-                                icon="pi pi-check-circle" (click)="onRowEditSave(dt, user, ri)"></button>
-                            <button *ngIf="editing" pButton pCancelEditableRow class="btn icon-btn danger-icon-btn"
-                                icon="pi pi-times-circle" (click)="onRowEditCancel(user, ri)"></button>
-                        </div>
-                    </td>
-                </tr>
-            </ng-template>
+          <th class="table-header-actions">
+            <div class="table-header-label">
+              <div class="table-header-text">{{'admin.auth_users.headers.actions' | translate}}</div>
+            </div>
+          </th>
 
-            <ng-template pTemplate="Invalidmessage">
-                <tr>
-                    <td colspan="7">{{'admin.auth_users.no_entries_found' | translate}}</td>
-                </tr>
-            </ng-template>
+        </tr>
+        <tr>
+          <th>
+            <form [formGroup]="filterForm">
+              <input type="text" pInputText formControlName="firstName" placeholder="{{'admin.auth_users.headers.first_name' | translate}}">
+            </form>
+          </th>
+          <th>
+            <form [formGroup]="filterForm">
+              <input type="text" pInputText formControlName="lastName" placeholder="{{'admin.auth_users.headers.last_name' | translate}}">
+            </form>
+          </th>
+          <th>
+            <form [formGroup]="filterForm">
+              <input type="email" pInputText formControlName="email" placeholder="{{'admin.auth_users.headers.e_mail' | translate}}">
+            </form>
+          </th>
+          <th></th>
+          <th>
+            <form [formGroup]="filterForm">
+              <p-dropdown formControlName="authRole" [options]="authRoles"></p-dropdown>
+            </form>
+          </th>
+          <th></th>
+          <th></th>
+          <th></th>
+          <th></th>
+        </tr>
+      </ng-template>
 
-            <ng-template pTemplate="paginatorleft">
-            </ng-template>
-        </p-table>
-    </div>
-</div>
\ No newline at end of file
+      <ng-template pTemplate="body" let-user let-editing="editing" let-ri="rowIndex">
+        <tr [pEditableRow]="user">
+          <td>
+            <p-cellEditor>
+              <ng-template pTemplate="input">
+                <input class="table-edit-input" pInputText type="text" [(ngModel)]="user.firstName"
+                       [ngClass]="{ 'invalid-feedback-input': isFirstNameInvalid}">
+              </ng-template>
+              <ng-template pTemplate="output">
+                {{user.firstName}}
+              </ng-template>
+            </p-cellEditor>
+          </td>
+          <td>
+            <p-cellEditor>
+              <ng-template pTemplate="input">
+                <input class="table-edit-input" pInputText type="text" [(ngModel)]="user.lastName"
+                       [ngClass]="{ 'invalid-feedback-input': isLastNameInvalid}">
+              </ng-template>
+              <ng-template pTemplate="output">
+                {{user.lastName}}
+              </ng-template>
+            </p-cellEditor>
+          </td>
+          <td>
+            <p-cellEditor>
+              <ng-template pTemplate="input">
+                <input class="table-edit-input" pInputText type="email" [(ngModel)]="user.email"
+                       [ngClass]="{ 'invalid-feedback-input': isEMailInvalid}">
+              </ng-template>
+              <ng-template pTemplate="output">
+                {{user.email}}
+              </ng-template>
+            </p-cellEditor>
+          </td>
+          <td>
+            <p-cellEditor>
+              <ng-template pTemplate="input">
+                <p-checkbox [binary]="true" [(ngModel)]="user.isConfirmed"
+                            [ngClass]="{ 'invalid-feedback-input': isEMailInvalid}" [disabled]="isEditingNew">
+                </p-checkbox>
+              </ng-template>
+              <ng-template pTemplate="output">
+                <p-checkbox [binary]="true" [ngModel]="user.isConfirmed" [disabled]="true">
+                </p-checkbox>
+              </ng-template>
+            </p-cellEditor>
+          </td>
+          <td>
+            <p-cellEditor>
+              <ng-template pTemplate="input">
+                <p-dropdown [options]="authRoles" [(ngModel)]="user.authRole"
+                            [disabled]="user.email == loggedInUserEMail"></p-dropdown>
+              </ng-template>
+              <ng-template pTemplate="output">
+                {{user.authRole | authRole}}
+              </ng-template>
+            </p-cellEditor>
+          </td>
+          <td>
+            <p-cellEditor>
+              <ng-template pTemplate="input">
+                <input class="table-edit-input" pInputText type="password" [(ngModel)]="user.password"
+                       [ngClass]="{ 'invalid-feedback-input': isPasswordInvalid}">
+              </ng-template>
+              <ng-template pTemplate="output">
+              </ng-template>
+            </p-cellEditor>
+          </td>
+          <td>
+            <p-cellEditor>
+              <ng-template pTemplate="input">
+                {{user.createdAt}}
+              </ng-template>
+              <ng-template pTemplate="output">
+                {{user.createdAt | date:'dd.MM.yy HH:mm'}}
+              </ng-template>
+            </p-cellEditor>
+          </td>
+          <td>
+            <p-cellEditor>
+              <ng-template pTemplate="input">
+                {{user.modifiedAt}}
+              </ng-template>
+              <ng-template pTemplate="output">
+                {{user.modifiedAt | date:'dd.MM.yy HH:mm'}}
+              </ng-template>
+            </p-cellEditor>
+          </td>
+          <td>
+            <div class="btn-wrapper">
+              <button *ngIf="!editing" pButton pInitEditableRow class="btn icon-btn" icon="pi pi-pencil"
+                      (click)="onRowEditInit(dt, user, ri)"></button>
+              <button *ngIf="!editing" pButton class="btn icon-btn danger-icon-btn" icon="pi pi-trash"
+                      (click)="deleteUser(user)"></button>
+
+              <button *ngIf="editing" pButton pSaveEditableRow class="btn icon-btn"
+                      icon="pi pi-check-circle" (click)="onRowEditSave(dt, user, ri)"></button>
+              <button *ngIf="editing" pButton pCancelEditableRow class="btn icon-btn danger-icon-btn"
+                      icon="pi pi-times-circle" (click)="onRowEditCancel(user, ri)"></button>
+            </div>
+          </td>
+        </tr>
+      </ng-template>
+
+      <ng-template pTemplate="Invalidmessage">
+        <tr>
+          <td colspan="7">{{'admin.auth_users.no_entries_found' | translate}}</td>
+        </tr>
+      </ng-template>
+
+      <ng-template pTemplate="paginatorleft">
+      </ng-template>
+    </p-table>
+  </div>
+</div>
diff --git a/kdb-web/src/assets/config.json b/kdb-web/src/assets/config.json
index 3aa6de44..87e33a65 100644
--- a/kdb-web/src/assets/config.json
+++ b/kdb-web/src/assets/config.json
@@ -3,7 +3,7 @@
     "WebVersion": {
         "Major": "0",
         "Minor": "3",
-        "Micro": "dev89"
+        "Micro": "dev78"
     },
     "Themes": [
         {
diff --git a/kdb-web/src/assets/i18n/de.json b/kdb-web/src/assets/i18n/de.json
index 94ffc852..9317f607 100644
--- a/kdb-web/src/assets/i18n/de.json
+++ b/kdb-web/src/assets/i18n/de.json
@@ -64,7 +64,9 @@
         "active": "Aktiv",
         "role": "Rolle",
         "password": "Passwort",
-        "actions": "Aktionen"
+        "actions": "Aktionen",
+        "created_at": "Erstellt am",
+        "modified_at": "Bearbeitet am"
       },
       "no_entries_found": "Keine Einträge gefunden",
       "message": {
-- 
2.45.2