From 7ca20f19d7ab98ad69e1146affedd97f97c885bc Mon Sep 17 00:00:00 2001
From: Timo <timo@devplant.ro>
Date: Tue, 13 Apr 2021 22:19:56 +0300
Subject: [PATCH] Fixed most UI issues discussed

---
 .../components/base-screen/base-screen.component.html  |  9 ++-------
 .../user-profile/user-profile-screen.component.ts      | 10 +++-------
 .../user-listing/user-listing-screen.component.ts      |  4 ++--
 .../components/file-actions/file-actions.component.ts  |  1 +
 .../file-preview-screen.component.ts                   |  5 +++--
 5 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.html b/apps/red-ui/src/app/components/base-screen/base-screen.component.html
index 80627f016..91bc70f43 100644
--- a/apps/red-ui/src/app/components/base-screen/base-screen.component.html
+++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.html
@@ -72,14 +72,9 @@
             <redaction-notifications class="mr-8" *ngIf="userPreferenceService.areDevFeaturesEnabled"></redaction-notifications>
             <redaction-user-button [user]="user" [matMenuTriggerFor]="userMenu" [showDot]="showPendingDownloadsDot"></redaction-user-button>
             <mat-menu #userMenu="matMenu" class="user-menu" xPosition="before">
+                <button [routerLink]="'/ui/my-profile'" mat-menu-item translate="top-bar.navigation-items.my-account.children.my-profile"></button>
                 <button
-                    *ngIf="permissionsService.isUser()"
-                    [routerLink]="'/ui/my-profile'"
-                    mat-menu-item
-                    translate="top-bar.navigation-items.my-account.children.my-profile"
-                ></button>
-                <button
-                    *ngIf="permissionsService.isManager()"
+                    *ngIf="permissionsService.isManager() || permissionsService.isUserAdmin()"
                     (click)="appStateService.reset()"
                     [routerLink]="'/ui/admin'"
                     mat-menu-item
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 4967e06a0..cb1e9b5fb 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
@@ -93,13 +93,9 @@ export class UserProfileScreenComponent implements OnInit {
             delete value.language;
 
             await this._userControllerService
-                .updateProfile(
-                    {
-                        ...value,
-                        roles: this._user.roles
-                    },
-                    this._user.userId
-                )
+                .updateMyProfile({
+                    ...value
+                })
                 .toPromise();
         }
 
diff --git a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts
index fa559f668..8c8253bb2 100644
--- a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { PermissionsService } from '../../../../services/permissions.service';
 import { UserService } from '../../../../services/user.service';
-import { RuleSetModel, User, UserControllerService } from '@redaction/red-ui-http';
+import { User, UserControllerService } from '@redaction/red-ui-http';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { debounce } from '../../../../utils/debounce';
 import { AdminDialogService } from '../../services/admin-dialog.service';
@@ -77,7 +77,7 @@ export class UserListingScreenComponent implements OnInit {
     }
 
     private async _loadData() {
-        this.users = (await this._userControllerService.getAllUsers({}).toPromise()).users;
+        this.users = (await this._userControllerService.getAllUsers({ requestId: new Date().toISOString() }).toPromise()).users;
         this._executeSearch();
         this._computeStats();
         this.viewReady = true;
diff --git a/apps/red-ui/src/app/modules/projects/components/file-actions/file-actions.component.ts b/apps/red-ui/src/app/modules/projects/components/file-actions/file-actions.component.ts
index 119062504..299939f46 100644
--- a/apps/red-ui/src/app/modules/projects/components/file-actions/file-actions.component.ts
+++ b/apps/red-ui/src/app/modules/projects/components/file-actions/file-actions.component.ts
@@ -109,6 +109,7 @@ export class FileActionsComponent implements OnInit {
         $event.stopPropagation();
         await this._fileActionService.toggleAnalysis(this.fileStatus).toPromise();
         await this.appStateService.getFiles();
+        this.actionPerformed.emit(this.fileStatus.isExcluded ? 'enable-analysis' : 'disable-analysis');
     }
 
     get toggleTooltip(): string {
diff --git a/apps/red-ui/src/app/modules/projects/screens/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/projects/screens/file-preview-screen/file-preview-screen.component.ts
index 88bba9c3b..c2ed3bdb7 100644
--- a/apps/red-ui/src/app/modules/projects/screens/file-preview-screen/file-preview-screen.component.ts
+++ b/apps/red-ui/src/app/modules/projects/screens/file-preview-screen/file-preview-screen.component.ts
@@ -111,11 +111,11 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy {
     }
 
     get canSwitchToRedactedView() {
-        return !this.permissionsService.fileRequiresReanalysis();
+        return !this.permissionsService.fileRequiresReanalysis() && !this.fileData.fileStatus.isExcluded;
     }
 
     get canSwitchToDeltaView() {
-        return this.fileData?.redactionChangeLog?.redactionLogEntry?.length > 0;
+        return this.fileData?.redactionChangeLog?.redactionLogEntry?.length > 0 && !this.fileData.fileStatus.isExcluded;
     }
 
     get displayData() {
@@ -335,6 +335,7 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy {
                 await this._router.navigate([`/ui/projects/${this.projectId}`]);
                 return;
 
+            case 'enable-analysis':
             case 'reanalyse':
                 this.viewReady = false;
                 this._startAnalysisTimer();