From 8fb02f60c7678f39f572f07660b2a64608f645f1 Mon Sep 17 00:00:00 2001
From: Timo <timo@devplant.ro>
Date: Thu, 24 Jun 2021 13:22:34 +0300
Subject: [PATCH] fixed user profile update and file workload issue

---
 .../user-profile-screen.component.ts          |  9 +------
 .../file-preview-screen.component.ts          |  1 +
 .../user-button/user-button.component.html    |  2 +-
 .../initials-avatar.component.ts              |  4 +--
 apps/red-ui/src/app/services/user.service.ts  | 26 ++++++++++++++-----
 .../lib/api/redactionLogController.service.ts | 16 ++++++------
 6 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/apps/red-ui/src/app/components/user-profile/user-profile-screen.component.ts b/apps/red-ui/src/app/components/user-profile/user-profile-screen.component.ts
index 955df78ee..842637d4a 100644
--- a/apps/red-ui/src/app/components/user-profile/user-profile-screen.component.ts
+++ b/apps/red-ui/src/app/components/user-profile/user-profile-screen.component.ts
@@ -1,18 +1,11 @@
 import { Component, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { UserService } from '@services/user.service';
+import { ProfileModel, UserService } from '@services/user.service';
 import { PermissionsService } from '@services/permissions.service';
 import { LanguageService } from '@i18n/language.service';
 import { TranslateService } from '@ngx-translate/core';
 import { UserControllerService } from '@redaction/red-ui-http';
 
-interface ProfileModel {
-    email: string;
-    firstName: string;
-    lastName: string;
-    language: string;
-}
-
 @Component({
     selector: 'redaction-user-profile-screen',
     templateUrl: './user-profile-screen.component.html',
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts
index 868ad1585..4ea2644a5 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts
@@ -575,6 +575,7 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy, OnAttach,
 
     private async _loadFileData(performUpdate: boolean = false): Promise<void> {
         const fileData = await this._fileDownloadService.loadActiveFileData().toPromise();
+        console.log(fileData);
         if (!fileData.fileStatus.isPending && !fileData.fileStatus.isError) {
             if (performUpdate) {
                 this.fileData.redactionLog = fileData.redactionLog;
diff --git a/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.html b/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.html
index 09b1ee3ef..5390a4e5e 100644
--- a/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.html
@@ -1,6 +1,6 @@
 <button [class.overlay]="showDot" mat-button>
     <redaction-initials-avatar
-        [userId]="user?.id"
+        [user]="user"
         [withName]="true"
         size="small"
     ></redaction-initials-avatar>
diff --git a/apps/red-ui/src/app/modules/shared/components/initials-avatar/initials-avatar.component.ts b/apps/red-ui/src/app/modules/shared/components/initials-avatar/initials-avatar.component.ts
index 217215bf6..a50bdd46c 100644
--- a/apps/red-ui/src/app/modules/shared/components/initials-avatar/initials-avatar.component.ts
+++ b/apps/red-ui/src/app/modules/shared/components/initials-avatar/initials-avatar.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnChanges } from '@angular/core';
+import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
 import { UserService } from '@services/user.service';
 import { User } from '@redaction/red-ui-http';
 import { TranslateService } from '@ngx-translate/core';
@@ -46,7 +46,7 @@ export class InitialsAvatarComponent implements OnChanges {
         return this.user && this._userService.userId === this.user.userId;
     }
 
-    ngOnChanges(): void {
+    ngOnChanges(changes: SimpleChanges): void {
         const isSystemUser = this.userId && this.userId.toLowerCase() === 'system';
         if (isSystemUser) {
             this.displayName = 'System';
diff --git a/apps/red-ui/src/app/services/user.service.ts b/apps/red-ui/src/app/services/user.service.ts
index d746b0d9c..7d79f946c 100644
--- a/apps/red-ui/src/app/services/user.service.ts
+++ b/apps/red-ui/src/app/services/user.service.ts
@@ -6,13 +6,25 @@ import { User, UserControllerService } from '@redaction/red-ui-http';
 import { wipeCaches } from '@redaction/red-cache';
 import { BASE_HREF } from '../tokens';
 
-export class UserWrapper {
-    constructor(private _currentUser: KeycloakProfile, public roles: string[], public id: string) {}
+export interface ProfileModel {
+    email: string;
+    firstName: string;
+    lastName: string;
+    language: string;
+}
 
-    get name() {
-        return this._currentUser.firstName && this._currentUser.lastName
-            ? `${this._currentUser.firstName} ${this._currentUser.lastName}`
-            : this._currentUser.username;
+export class UserWrapper {
+    name: string;
+
+    constructor(private _currentUser: KeycloakProfile, public roles: string[], public id: string) {
+        this.name =
+            this._currentUser.firstName && this._currentUser.lastName
+                ? `${this._currentUser.firstName} ${this._currentUser.lastName}`
+                : this._currentUser.username;
+    }
+
+    get userId() {
+        return this.id;
     }
 
     get email() {
@@ -106,7 +118,7 @@ export class UserService {
         const decoded = jwt_decode(token) as any;
         const userId = decoded.sub;
         this._currentUser = new UserWrapper(
-            await this._keycloakService.loadUserProfile(false),
+            await this._keycloakService.loadUserProfile(true),
             this._keycloakService.getUserRoles(true),
             userId
         );
diff --git a/libs/red-ui-http/src/lib/api/redactionLogController.service.ts b/libs/red-ui-http/src/lib/api/redactionLogController.service.ts
index f6ea16eb2..79a1aac09 100644
--- a/libs/red-ui-http/src/lib/api/redactionLogController.service.ts
+++ b/libs/red-ui-http/src/lib/api/redactionLogController.service.ts
@@ -50,28 +50,28 @@ export class RedactionLogControllerService {
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getRedactionLog(
+    public getRedactionChangeLog(
         dossierId: string,
         fileId: string,
         observe?: 'body',
         reportProgress?: boolean
     ): Observable<RedactionChangeLog>;
 
-    public getRedactionLog(
+    public getRedactionChangeLog(
         dossierId: string,
         fileId: string,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<RedactionChangeLog>>;
 
-    public getRedactionLog(
+    public getRedactionChangeLog(
         dossierId: string,
         fileId: string,
         observe?: 'events',
         reportProgress?: boolean
     ): Observable<HttpEvent<RedactionChangeLog>>;
 
-    public getRedactionLog(
+    public getRedactionChangeLog(
         dossierId: string,
         fileId: string,
         observe: any = 'body',
@@ -130,28 +130,28 @@ export class RedactionLogControllerService {
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getRedactionChangeLog(
+    public getRedactionLog(
         dossierId: string,
         fileId: string,
         observe?: 'body',
         reportProgress?: boolean
     ): Observable<RedactionLog>;
 
-    public getRedactionChangeLog(
+    public getRedactionLog(
         dossierId: string,
         fileId: string,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<RedactionLog>>;
 
-    public getRedactionChangeLog(
+    public getRedactionLog(
         dossierId: string,
         fileId: string,
         observe?: 'events',
         reportProgress?: boolean
     ): Observable<HttpEvent<RedactionLog>>;
 
-    public getRedactionChangeLog(
+    public getRedactionLog(
         dossierId: string,
         fileId: string,
         observe: any = 'body',