From 942cadfc7395d7aa8419f4948b7c20547aa7c03b Mon Sep 17 00:00:00 2001
From: ArtemDzhereleiko <dgerik2015@gmail.com>
Date: Tue, 21 Sep 2021 18:41:13 +0300
Subject: [PATCH] Fix whitespeces and translation

---
 .../home/pages/profile/profile.component.html        |  6 +++---
 .../home/pages/profile/profile.component.scss        |  4 ++++
 .../modules/home/pages/profile/profile.component.ts  | 12 ++++++------
 ui-ngx/src/assets/locale/locale.constant-ru_RU.json  |  2 +-
 ui-ngx/src/assets/locale/locale.constant-uk_UA.json  |  2 +-
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/pages/profile/profile.component.html b/ui-ngx/src/app/modules/home/pages/profile/profile.component.html
index 4312b89d77..32ecd28bd3 100644
--- a/ui-ngx/src/app/modules/home/pages/profile/profile.component.html
+++ b/ui-ngx/src/app/modules/home/pages/profile/profile.component.html
@@ -86,12 +86,12 @@
           </div>
           <div fxLayout="row" fxLayoutAlign=" center" style="padding-bottom: 16px;">
             <button mat-raised-button ngxClipboard
-                    (cbOnSuccess)="onTokenCopied($event)"
-                    [cbContent]="token">
+                    (cbOnSuccess)="onTokenCopied()"
+                    [cbContent]="jwtToken">
               <mat-icon svgIcon="mdi:clipboard-arrow-left"></mat-icon>
               <span>{{ 'profile.copy-jwt-token' | translate }}</span>
             </button>
-            <span style="padding: 10px; opacity: 0.7;">{{getExpirationDate}}</span>
+            <span class="profile-btn-subtext">{{ expirationJwtData }}</span>
           </div>
           <div fxLayout="row" class="layout-wrap">
             <span fxFlex></span>
diff --git a/ui-ngx/src/app/modules/home/pages/profile/profile.component.scss b/ui-ngx/src/app/modules/home/pages/profile/profile.component.scss
index a72519090d..0832ef03f3 100644
--- a/ui-ngx/src/app/modules/home/pages/profile/profile.component.scss
+++ b/ui-ngx/src/app/modules/home/pages/profile/profile.component.scss
@@ -38,6 +38,10 @@
       font-size: 16px;
       font-weight: 400;
     }
+    .profile-btn-subtext {
+      opacity: 0.7;
+      padding: 10px;
+    }
     .tb-home-dashboard {
       tb-dashboard-autocomplete {
         @media #{$mat-gt-sm} {
diff --git a/ui-ngx/src/app/modules/home/pages/profile/profile.component.ts b/ui-ngx/src/app/modules/home/pages/profile/profile.component.ts
index cb746be964..47497b3ebc 100644
--- a/ui-ngx/src/app/modules/home/pages/profile/profile.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/profile/profile.component.ts
@@ -34,7 +34,7 @@ import { AuthService } from '@core/auth/auth.service';
 import { ActivatedRoute } from '@angular/router';
 import { isDefinedAndNotNull } from '@core/utils';
 import { getCurrentAuthUser } from '@core/auth/auth.selectors';
-import {ActionNotificationShow} from "@core/notification/notification.actions";
+import { ActionNotificationShow } from '@core/notification/notification.actions';
 import { DatePipe } from '@angular/common';
 
 @Component({
@@ -50,14 +50,14 @@ export class ProfileComponent extends PageComponent implements OnInit, HasConfir
   languageList = env.supportedLangs;
   private readonly authUser: AuthUser;
 
-  get token() {
+  get jwtToken(): string {
     return `Bearer ${localStorage.getItem('jwt_token')}`;
   }
 
-  get getExpirationDate() {
+  get expirationJwtData(): string {
     const expirationData = this.datePipe.transform(localStorage.getItem('jwt_token_expiration'), 'yyyy-MM-dd HH:mm:ss');
-    return this.translate.instant('profile.valid-till', {expirationData});
-  };
+    return this.translate.instant('profile.valid-till', { expirationData });
+  }
 
   constructor(protected store: Store<AppState>,
               private route: ActivatedRoute,
@@ -153,7 +153,7 @@ export class ProfileComponent extends PageComponent implements OnInit, HasConfir
     return this.authUser.authority === Authority.SYS_ADMIN;
   }
 
-  onTokenCopied($event) {
+  onTokenCopied() {
     this.store.dispatch(new ActionNotificationShow({
       message: this.translate.instant('profile.tokenCopiedMessage'),
       type: 'success',
diff --git a/ui-ngx/src/assets/locale/locale.constant-ru_RU.json b/ui-ngx/src/assets/locale/locale.constant-ru_RU.json
index 6c10c92a0a..e03828a36c 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ru_RU.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ru_RU.json
@@ -1264,7 +1264,7 @@
         "change-password": "Изменить пароль",
         "current-password": "Текущий пароль",
         "copy-jwt-token": "Копировать JWT токен",
-        "valid-till": "Годен до {{expirationData}}",
+        "valid-till": "Действителен до {{expirationData}}",
         "tokenCopiedMessage": "JWT токен скопирован в буфер обмена"
     },
     "relation": {
diff --git a/ui-ngx/src/assets/locale/locale.constant-uk_UA.json b/ui-ngx/src/assets/locale/locale.constant-uk_UA.json
index e1406e02fa..b857a8bbbe 100644
--- a/ui-ngx/src/assets/locale/locale.constant-uk_UA.json
+++ b/ui-ngx/src/assets/locale/locale.constant-uk_UA.json
@@ -1679,7 +1679,7 @@
         "change-password": "Змінити пароль",
         "current-password": "Поточний пароль",
         "copy-jwt-token": "Копіювати JWT токен",
-        "valid-till": "Придатний до {{expirationData}}",
+        "valid-till": "Дійсний до {{expirationData}}",
         "tokenCopiedMessage": "JWT токен скопійовано в буфер обміну"
     },
     "relation": {