From 00ab0252e97890f7086bc30b8633dd8fffd8da6e Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo@devplant.ro>
Date: Fri, 6 Nov 2020 21:02:57 +0200
Subject: [PATCH] fixed various issues

---
 apps/red-ui/src/app/app.module.ts             |  7 +---
 .../initials-avatar.component.scss            |  1 +
 .../file-preview-screen.component.html        |  5 +++
 .../screens/file/model/file-status.wrapper.ts |  4 +++
 .../project-listing-screen.component.html     |  4 +--
 .../project-listing-screen.component.ts       |  3 +-
 .../project-details.component.html            | 33 ++++++++++++-------
 .../project-overview-screen.component.html    |  5 ++-
 .../project-overview-screen.component.ts      |  7 +---
 apps/red-ui/src/assets/i18n/en.json           |  3 +-
 .../src/assets/styles/red-page-layout.scss    | 14 +-------
 11 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts
index d2975bc4a..aa140d8c4 100644
--- a/apps/red-ui/src/app/app.module.ts
+++ b/apps/red-ui/src/app/app.module.ts
@@ -163,12 +163,7 @@ export function HttpLoaderFactory(httpClient: HttpClient) {
                         component: ProjectOverviewScreenComponent,
                         canActivate: [CompositeRouteGuard],
                         data: {
-                            routeGuards: [
-                                AuthGuard,
-                                RedRoleGuard,
-                                ProjectMemberGuard,
-                                AppStateGuard
-                            ]
+                            routeGuards: [AuthGuard, RedRoleGuard, AppStateGuard]
                         }
                     },
                     {
diff --git a/apps/red-ui/src/app/common/initials-avatar/initials-avatar.component.scss b/apps/red-ui/src/app/common/initials-avatar/initials-avatar.component.scss
index d7424a376..9388ce641 100644
--- a/apps/red-ui/src/app/common/initials-avatar/initials-avatar.component.scss
+++ b/apps/red-ui/src/app/common/initials-avatar/initials-avatar.component.scss
@@ -1,5 +1,6 @@
 @import '../../../assets/styles/red-variables';
 
 .flex-row {
+    width: fit-content;
     gap: 12px;
 }
diff --git a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html
index 19929d5eb..626b61059 100644
--- a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html
+++ b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html
@@ -11,6 +11,11 @@
                 *ngIf="appStateService.fileNotUpToDateWithDictionary()"
                 class="pill"
                 translate="project-overview.new-rule.label"
+            ></span>
+            <span
+                *ngIf="!appStateService.canPerformAnnotationActionsOnCurrentFile()"
+                class="pill"
+                translate="readonly-pill"
             ></span
             >&nbsp;<span>{{ appStateService.activeFile.filename }}</span>
         </div>
diff --git a/apps/red-ui/src/app/screens/file/model/file-status.wrapper.ts b/apps/red-ui/src/app/screens/file/model/file-status.wrapper.ts
index 15b1a53c2..9b97c7c61 100644
--- a/apps/red-ui/src/app/screens/file/model/file-status.wrapper.ts
+++ b/apps/red-ui/src/app/screens/file/model/file-status.wrapper.ts
@@ -94,6 +94,10 @@ export class FileStatusWrapper {
         return this.status === 'APPROVED' || this.status === 'UNDER_APPROVAL';
     }
 
+    get isUnassigned() {
+        return this.status === 'UNASSIGNED';
+    }
+
     get canApprove() {
         return this.status === 'UNDER_REVIEW' || this.status === 'UNDER_APPROVAL';
     }
diff --git a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html
index 40dbacb45..882d6c9b8 100644
--- a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html
+++ b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html
@@ -191,13 +191,11 @@
                                         | translate
                                 "
                                 [matTooltipPosition]="'above'"
+                                *ngIf="appStateService.isManagerAndOwner(pw.project) && pw.hasFiles"
                             >
                                 <button
                                     mat-icon-button
                                     (click)="downloadRedactionReport($event, pw.project)"
-                                    *ngIf="
-                                        appStateService.isManagerAndOwner(pw.project) && pw.hasFiles
-                                    "
                                     [disabled]="!pw.allFilesApproved"
                                     color="accent"
                                 >
diff --git a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.ts b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.ts
index fd66f0d44..70e534967 100644
--- a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.ts
+++ b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.ts
@@ -99,7 +99,8 @@ export class ProjectListingScreenComponent implements OnInit {
     }
 
     public canOpenProject(pw: ProjectWrapper): boolean {
-        return this.userService.isManager(this.user) || pw.project.memberIds.includes(this.user.id);
+        // return this.userService.isManager(this.user) || pw.project.memberIds.includes(this.user.id);
+        return true;
     }
 
     public openAddProjectDialog(): void {
diff --git a/apps/red-ui/src/app/screens/project-overview-screen/project-details/project-details.component.html b/apps/red-ui/src/app/screens/project-overview-screen/project-details/project-details.component.html
index 7379e3003..9975b8c77 100644
--- a/apps/red-ui/src/app/screens/project-overview-screen/project-details/project-details.component.html
+++ b/apps/red-ui/src/app/screens/project-overview-screen/project-details/project-details.component.html
@@ -1,21 +1,32 @@
-<div class="actions-row">
+<div class="actions-row" *ngIf="userService.isManager()">
     <button
         (click)="openDeleteProjectDialog($event)"
-        *ngIf="userService.isManager(user)"
+        *ngIf="userService.isManager()"
         mat-icon-button
     >
         <mat-icon svgIcon="red:trash"></mat-icon>
     </button>
-    <button
-        (click)="openEditProjectDialog($event)"
-        *ngIf="userService.isManager(user)"
-        mat-icon-button
-    >
+    <button (click)="openEditProjectDialog($event)" *ngIf="userService.isManager()" mat-icon-button>
         <mat-icon svgIcon="red:edit"></mat-icon>
     </button>
-    <button (click)="downloadRedactionReport($event)" mat-icon-button>
-        <mat-icon svgIcon="red:report"></mat-icon>
-    </button>
+    <div
+        [matTooltip]="
+            (appStateService.activeProject.allFilesApproved
+                ? 'report.action'
+                : 'report.unavailable'
+            ) | translate
+        "
+        *ngIf="appStateService.isActiveProjectOwnerAndManager"
+        [matTooltipPosition]="'above'"
+    >
+        <button
+            (click)="downloadRedactionReport($event)"
+            mat-icon-button
+            [disabled]="!appStateService.activeProject.allFilesApproved"
+        >
+            <mat-icon svgIcon="red:report"></mat-icon>
+        </button>
+    </div>
 </div>
 
 <div class="heading-xl mt-16">
@@ -40,7 +51,7 @@
         </div>
         <div
             (click)="openAssignProjectMembersDialog()"
-            *ngIf="userService.isManager(user)"
+            *ngIf="userService.isManager()"
             class="member pointer"
         >
             <div class="oval red-white large">+</div>
diff --git a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html
index bbd7ff889..b196f3a9c 100644
--- a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html
+++ b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html
@@ -237,7 +237,9 @@
                                 (click)="openDeleteFileDialog($event, fileStatus)"
                                 *ngIf="
                                     userService.isManager(user) ||
-                                    appStateService.isActiveProjectOwnerAndManager
+                                    appStateService.isActiveProjectOwnerAndManager ||
+                                    fileStatus.isUnassigned ||
+                                    fileStatus.isError
                                 "
                                 [matTooltip]="'project-overview.delete.action' | translate"
                                 [matTooltipPosition]="'above'"
@@ -254,6 +256,7 @@
                                         : 'report.unavailable-single'
                                     ) | translate
                                 "
+                                *ngIf="appStateService.isActiveProjectOwnerAndManager"
                                 [matTooltipPosition]="'above'"
                             >
                                 <button
diff --git a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts
index 69ca9ab1a..fc96f9fe3 100644
--- a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts
+++ b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts
@@ -101,10 +101,6 @@ export class ProjectOverviewScreenComponent implements OnInit, OnDestroy {
         );
     }
 
-    public toggleBulkSelect() {
-        this.bulkSelectActive = !this.bulkSelectActive;
-    }
-
     private _displayNewRuleToast() {
         // @ts-ignore
         if (
@@ -158,7 +154,6 @@ export class ProjectOverviewScreenComponent implements OnInit, OnDestroy {
     private _calculateData(): void {
         this._computeAllFilters();
         this._filterFiles();
-        console.log('calculate parent');
         this._projectDetailsComponent?.calculateChartConfig();
         this._changeDetectorRef.detectChanges();
     }
@@ -251,7 +246,7 @@ export class ProjectOverviewScreenComponent implements OnInit, OnDestroy {
         return (
             !this.isError(fileStatusWrapper) &&
             !this.isProcessing(fileStatusWrapper) &&
-            this.appStateService.isReviewerOrOwner(fileStatusWrapper)
+            this.appStateService.isActiveProjectMember
         );
     }
 
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index 0039a2a62..320ecc530 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -330,5 +330,6 @@
         "number-of-pages": "Number of pages",
         "number-of-analyses": "Number of analyses",
         "custom": "Custom"
-    }
+    },
+    "readonly-pill": "Readonly"
 }
diff --git a/apps/red-ui/src/assets/styles/red-page-layout.scss b/apps/red-ui/src/assets/styles/red-page-layout.scss
index 7c8c8fd5c..9cc469fc4 100644
--- a/apps/red-ui/src/assets/styles/red-page-layout.scss
+++ b/apps/red-ui/src/assets/styles/red-page-layout.scss
@@ -43,19 +43,7 @@ body {
     .actions-row {
         display: flex;
         height: 40px;
-
-        > div {
-            padding: 10px;
-
-            mat-icon {
-                cursor: pointer;
-                width: 14px;
-
-                &:hover {
-                    color: $primary;
-                }
-            }
-        }
+        margin-left: -10px;
     }
 }