From 7faab0378fd6be9f4a5536ec0ecdb995ce7ee2e3 Mon Sep 17 00:00:00 2001
From: Miguel Cabrerizo <30386061+doncicuto@users.noreply.github.com>
Date: Thu, 21 Sep 2023 09:42:11 +0200
Subject: [PATCH] feat(console): more emphasize to preferred login name in
 user's table and detail (#6588)

* feat: poc

* feat: more emphasize to preferred login name in user's table and detail

* fix: add @peintnermax suggestions

---------

Co-authored-by: Max Peintner <max@caos.ch>
---
 .../user-detail/user-detail.component.html         |  2 +-
 .../user-list/user-table/user-table.component.html | 14 ++++++++++++++
 .../user-list/user-table/user-table.component.ts   |  6 +++++-
 console/src/assets/i18n/bg.json                    |  1 +
 console/src/assets/i18n/de.json                    |  1 +
 console/src/assets/i18n/en.json                    |  1 +
 console/src/assets/i18n/es.json                    |  1 +
 console/src/assets/i18n/fr.json                    |  1 +
 console/src/assets/i18n/it.json                    |  1 +
 console/src/assets/i18n/ja.json                    |  1 +
 console/src/assets/i18n/mk.json                    |  1 +
 console/src/assets/i18n/pl.json                    |  1 +
 console/src/assets/i18n/pt.json                    |  1 +
 console/src/assets/i18n/zh.json                    |  1 +
 14 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/console/src/app/pages/users/user-detail/user-detail/user-detail.component.html b/console/src/app/pages/users/user-detail/user-detail/user-detail.component.html
index b8d6e10da..f59cc6dc7 100644
--- a/console/src/app/pages/users/user-detail/user-detail/user-detail.component.html
+++ b/console/src/app/pages/users/user-detail/user-detail/user-detail.component.html
@@ -78,7 +78,7 @@
 
         <ng-container *ngIf="currentSetting === 'general'">
           <ng-template cnslHasRole [hasRole]="['user.read$', 'user.read:' + user.id]">
-            <cnsl-card *ngIf="user.human" title="{{ 'USER.PROFILE.TITLE' | translate }}">
+            <cnsl-card *ngIf="user.human" title="{{ user.preferredLoginName }} - {{ 'USER.PROFILE.TITLE' | translate }}">
               <cnsl-detail-form
                 [preferredLoginName]="user.preferredLoginName"
                 [disabled]="(canWrite$ | async) === false"
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 d51fdf219..3e3c86cfc 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
@@ -124,6 +124,20 @@
         </td>
       </ng-container>
 
+      <ng-container matColumnDef="preferredLoginName">
+        <th
+          mat-header-cell
+          *matHeaderCellDef
+          mat-sort-header
+          [ngClass]="{ 'search-active': this.userSearchKey === UserListSearchKey.DISPLAY_NAME }"
+        >
+          {{ 'USER.PROFILE.PREFERREDLOGINNAME' | translate }}
+        </th>
+        <td mat-cell *matCellDef="let user" [routerLink]="user.id ? ['/users', user.id] : null">
+          <span *ngIf="user.human">{{ user.preferredLoginName }}</span>
+        </td>
+      </ng-container>
+
       <ng-container matColumnDef="username">
         <th
           mat-header-cell
diff --git a/console/src/app/pages/users/user-list/user-table/user-table.component.ts b/console/src/app/pages/users/user-list/user-table/user-table.component.ts
index 415fd6110..3406d931b 100644
--- a/console/src/app/pages/users/user-list/user-table/user-table.component.ts
+++ b/console/src/app/pages/users/user-list/user-table/user-table.component.ts
@@ -51,7 +51,7 @@ export class UserTableComponent implements OnInit {
   @Input() public displayedColumnsHuman: string[] = [
     'select',
     'displayName',
-    'username',
+    'preferredLoginName',
     'email',
     'state',
     'creationDate',
@@ -194,6 +194,10 @@ export class UserTableComponent implements OnInit {
         case 'username':
           sortingField = UserFieldName.USER_FIELD_NAME_USER_NAME;
           break;
+        case 'preferredLoginName':
+          // TODO: replace with preferred username sorting once implemented
+          sortingField = UserFieldName.USER_FIELD_NAME_USER_NAME;
+          break;
         case 'email':
           sortingField = UserFieldName.USER_FIELD_NAME_EMAIL;
           break;
diff --git a/console/src/assets/i18n/bg.json b/console/src/assets/i18n/bg.json
index 9ac62d642..47305d24f 100644
--- a/console/src/assets/i18n/bg.json
+++ b/console/src/assets/i18n/bg.json
@@ -489,6 +489,7 @@
       "LASTNAME": "Фамилия",
       "NICKNAME": "Псевдоним",
       "DISPLAYNAME": "Екранно име",
+      "PREFERREDLOGINNAME": "Предпочитано име за вход",
       "PREFERRED_LANGUAGE": "език",
       "GENDER": "Пол",
       "PASSWORD": "Парола",
diff --git a/console/src/assets/i18n/de.json b/console/src/assets/i18n/de.json
index c5642f507..c87b46533 100644
--- a/console/src/assets/i18n/de.json
+++ b/console/src/assets/i18n/de.json
@@ -495,6 +495,7 @@
       "LASTNAME": "Nachname",
       "NICKNAME": "Spitzname",
       "DISPLAYNAME": "Anzeigename",
+      "PREFERREDLOGINNAME": "Bevorzugter Anmeldename",
       "PREFERRED_LANGUAGE": "Sprache",
       "GENDER": "Geschlecht",
       "PASSWORD": "Passwort",
diff --git a/console/src/assets/i18n/en.json b/console/src/assets/i18n/en.json
index acb82883f..ea96cc7f3 100644
--- a/console/src/assets/i18n/en.json
+++ b/console/src/assets/i18n/en.json
@@ -496,6 +496,7 @@
       "LASTNAME": "Family Name",
       "NICKNAME": "Nickname",
       "DISPLAYNAME": "Display Name",
+      "PREFERREDLOGINNAME": "Preferred login name",
       "PREFERRED_LANGUAGE": "Language",
       "GENDER": "Gender",
       "PASSWORD": "Password",
diff --git a/console/src/assets/i18n/es.json b/console/src/assets/i18n/es.json
index c7c378cba..dd3a8dcdc 100644
--- a/console/src/assets/i18n/es.json
+++ b/console/src/assets/i18n/es.json
@@ -496,6 +496,7 @@
       "LASTNAME": "Apellidos",
       "NICKNAME": "Apodo",
       "DISPLAYNAME": "Nombre mostrado",
+      "PREFERREDLOGINNAME": "Nombre de inicio de sesión preferido",
       "PREFERRED_LANGUAGE": "Idioma",
       "GENDER": "Género",
       "PASSWORD": "Contraseña",
diff --git a/console/src/assets/i18n/fr.json b/console/src/assets/i18n/fr.json
index 558ac6d0e..b0b566108 100644
--- a/console/src/assets/i18n/fr.json
+++ b/console/src/assets/i18n/fr.json
@@ -495,6 +495,7 @@
       "LASTNAME": "Nom de famille",
       "NICKNAME": "Surnom",
       "DISPLAYNAME": "Nom d'affichage",
+      "PREFERREDLOGINNAME": "Nom de connexion préféré",
       "PREFERRED_LANGUAGE": "Langue",
       "GENDER": "Sexe",
       "PASSWORD": "Mot de passe",
diff --git a/console/src/assets/i18n/it.json b/console/src/assets/i18n/it.json
index eaa3c4b4b..482180e08 100644
--- a/console/src/assets/i18n/it.json
+++ b/console/src/assets/i18n/it.json
@@ -494,6 +494,7 @@
       "LASTNAME": "Cognome",
       "NICKNAME": "Soprannome",
       "DISPLAYNAME": "DisplayName",
+      "PREFERREDLOGINNAME": "Nome di accesso preferito",
       "PREFERRED_LANGUAGE": "Lingua",
       "GENDER": "Genere",
       "PASSWORD": "Password",
diff --git a/console/src/assets/i18n/ja.json b/console/src/assets/i18n/ja.json
index 68b75c2b9..907d4becf 100644
--- a/console/src/assets/i18n/ja.json
+++ b/console/src/assets/i18n/ja.json
@@ -496,6 +496,7 @@
       "LASTNAME": "姓",
       "NICKNAME": "ニックネーム",
       "DISPLAYNAME": "表示名",
+      "PREFERREDLOGINNAME": "優先ログイン名",
       "PREFERRED_LANGUAGE": "言語",
       "GENDER": "性別",
       "PASSWORD": "パスワード",
diff --git a/console/src/assets/i18n/mk.json b/console/src/assets/i18n/mk.json
index 4acda6725..16540aa09 100644
--- a/console/src/assets/i18n/mk.json
+++ b/console/src/assets/i18n/mk.json
@@ -496,6 +496,7 @@
       "LASTNAME": "Презиме",
       "NICKNAME": "Прекар",
       "DISPLAYNAME": "Име за приказ",
+      "PREFERREDLOGINNAME": "Претпочитано име за најава",
       "PREFERRED_LANGUAGE": "Јазик",
       "GENDER": "Пол",
       "PASSWORD": "Лозинка",
diff --git a/console/src/assets/i18n/pl.json b/console/src/assets/i18n/pl.json
index a1e064b69..dff2236b7 100644
--- a/console/src/assets/i18n/pl.json
+++ b/console/src/assets/i18n/pl.json
@@ -495,6 +495,7 @@
       "LASTNAME": "Nazwisko",
       "NICKNAME": "Przezwisko",
       "DISPLAYNAME": "Nazwa wyświetlana",
+      "PREFERREDLOGINNAME": "Preferowana nazwa logowania",
       "PREFERRED_LANGUAGE": "Język",
       "GENDER": "Płeć",
       "PASSWORD": "Hasło",
diff --git a/console/src/assets/i18n/pt.json b/console/src/assets/i18n/pt.json
index 6a3b89c22..c1176a391 100644
--- a/console/src/assets/i18n/pt.json
+++ b/console/src/assets/i18n/pt.json
@@ -496,6 +496,7 @@
       "LASTNAME": "Sobrenome",
       "NICKNAME": "Apelido",
       "DISPLAYNAME": "Nome de Exibição",
+      "PREFERREDLOGINNAME": "Nome de login preferido",
       "PREFERRED_LANGUAGE": "Idioma",
       "GENDER": "Gênero",
       "SENHA": "Senha",
diff --git a/console/src/assets/i18n/zh.json b/console/src/assets/i18n/zh.json
index b311e9aa1..d9dc7cc0c 100644
--- a/console/src/assets/i18n/zh.json
+++ b/console/src/assets/i18n/zh.json
@@ -495,6 +495,7 @@
       "LASTNAME": "姓",
       "NICKNAME": "昵称",
       "DISPLAYNAME": "展示名称",
+      "PREFERREDLOGINNAME": "首选登录名",
       "PREFERRED_LANGUAGE": "语言",
       "GENDER": "性别",
       "PASSWORD": "密码",