From fc56480dbeb1af1e0662581cf87d0f63429b4e83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina@devplant.ro>
Date: Thu, 12 Nov 2020 19:22:58 +0200
Subject: [PATCH] Add reviewer name on file preview screen

---
 .../file-actions/file-actions.component.html  | 50 +++++++++++--------
 .../file-actions/file-actions.component.scss  | 11 ++++
 apps/red-ui/src/assets/i18n/en.json           |  4 +-
 3 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/apps/red-ui/src/app/common/file-actions/file-actions.component.html b/apps/red-ui/src/app/common/file-actions/file-actions.component.html
index 6944c5325..b3dcac44d 100644
--- a/apps/red-ui/src/app/common/file-actions/file-actions.component.html
+++ b/apps/red-ui/src/app/common/file-actions/file-actions.component.html
@@ -1,18 +1,35 @@
 <div class="file-actions">
+    <div *ngIf="screen === 'file-preview'" class="reviewer">
+        <div class="reviewer-label"><span translate="file-preview.reviewer"></span>:</div>
+        <span *ngIf="fileStatus.reviewerName">{{ fileStatus.reviewerName }}</span>
+        <span *ngIf="!fileStatus.reviewerName" translate="file-preview.unassigned"></span>
+    </div>
+
+    <button
+        (click)="assignReviewer($event, fileStatus)"
+        *ngIf="permissionsService.canAssignReviewer(fileStatus)"
+        [matTooltipPosition]="tooltipPosition"
+        [matTooltip]="'project-overview.assign.action' | translate"
+        color="accent"
+        mat-icon-button
+    >
+        <mat-icon svgIcon="red:assign"></mat-icon>
+    </button>
+
     <button
         (click)="openDeleteFileDialog($event, fileStatus)"
         *ngIf="permissionsService.canDeleteFile(fileStatus)"
-        [matTooltip]="'project-overview.delete.action' | translate"
         [matTooltipPosition]="tooltipPosition"
+        [matTooltip]="'project-overview.delete.action' | translate"
         color="accent"
         mat-icon-button
     >
         <mat-icon svgIcon="red:trash"></mat-icon>
     </button>
     <div
-        [matTooltip]="(fileStatus.isApproved ? 'report.action' : 'report.unavailable-single') | translate"
         *ngIf="permissionsService.canShowRedactionReportDownloadBtn(fileStatus)"
         [matTooltipPosition]="tooltipPosition"
+        [matTooltip]="(fileStatus.isApproved ? 'report.action' : 'report.unavailable-single') | translate"
     >
         <button (click)="downloadFileRedactionReport($event, fileStatus)" [disabled]="!fileStatus.isApproved" color="accent" mat-icon-button>
             <mat-icon svgIcon="red:report"></mat-icon>
@@ -20,12 +37,12 @@
     </div>
 
     <button
-        (click)="reanalyseFile($event, fileStatus)"
-        class="warn"
-        *ngIf="permissionsService.canReanalyseFile(fileStatus) && screen === 'file-preview'"
-        mat-icon-button
         #reanalyseTooltip="matTooltip"
+        (click)="reanalyseFile($event, fileStatus)"
+        *ngIf="permissionsService.canReanalyseFile(fileStatus) && screen === 'file-preview'"
         [matTooltip]="'file-preview.reanalyse-notification' | translate"
+        class="warn"
+        mat-icon-button
         matTooltipClass="warn small"
     >
         <mat-icon svgIcon="red:refresh"></mat-icon>
@@ -34,30 +51,19 @@
     <button
         (click)="reanalyseFile($event, fileStatus)"
         *ngIf="permissionsService.canReanalyseFile(fileStatus) && screen !== 'file-preview'"
-        [matTooltip]="'project-overview.reanalyse.action' | translate"
         [matTooltipPosition]="tooltipPosition"
+        [matTooltip]="'project-overview.reanalyse.action' | translate"
         color="accent"
         mat-icon-button
     >
         <mat-icon svgIcon="red:refresh"></mat-icon>
     </button>
 
-    <button
-        (click)="assignReviewer($event, fileStatus)"
-        *ngIf="permissionsService.canAssignReviewer(fileStatus)"
-        [matTooltip]="'project-overview.assign.action' | translate"
-        [matTooltipPosition]="tooltipPosition"
-        color="accent"
-        mat-icon-button
-    >
-        <mat-icon svgIcon="red:assign"></mat-icon>
-    </button>
-
     <button
         (click)="setFileApproved($event, fileStatus)"
         *ngIf="permissionsService.canApprove(fileStatus)"
-        [matTooltip]="'project-overview.approve' | translate"
         [matTooltipPosition]="tooltipPosition"
+        [matTooltip]="'project-overview.approve' | translate"
         color="accent"
         mat-icon-button
     >
@@ -66,8 +72,8 @@
     <button
         (click)="setFileUnderApproval($event, fileStatus)"
         *ngIf="permissionsService.canSetUnderApproval(fileStatus)"
-        [matTooltip]="'project-overview.under-approval' | translate"
         [matTooltipPosition]="tooltipPosition"
+        [matTooltip]="'project-overview.under-approval' | translate"
         color="accent"
         mat-icon-button
     >
@@ -76,8 +82,8 @@
     <button
         (click)="setFileUnderApproval($event, fileStatus)"
         *ngIf="permissionsService.canUndoApproval(fileStatus)"
-        [matTooltip]="'project-overview.under-approval' | translate"
         [matTooltipPosition]="tooltipPosition"
+        [matTooltip]="'project-overview.under-approval' | translate"
         color="accent"
         mat-icon-button
     >
@@ -86,8 +92,8 @@
     <button
         (click)="setFileUnderReview($event, fileStatus)"
         *ngIf="permissionsService.canUndoUnderApproval(fileStatus)"
-        [matTooltip]="'project-overview.under-review' | translate"
         [matTooltipPosition]="tooltipPosition"
+        [matTooltip]="'project-overview.under-review' | translate"
         color="accent"
         mat-icon-button
     >
diff --git a/apps/red-ui/src/app/common/file-actions/file-actions.component.scss b/apps/red-ui/src/app/common/file-actions/file-actions.component.scss
index 36fe9c897..dbbf24e1a 100644
--- a/apps/red-ui/src/app/common/file-actions/file-actions.component.scss
+++ b/apps/red-ui/src/app/common/file-actions/file-actions.component.scss
@@ -1,3 +1,14 @@
 .file-actions {
     display: flex;
 }
+
+.reviewer {
+    display: flex;
+    align-items: center;
+    margin-right: 8px;
+}
+
+.reviewer-label {
+    margin-right: 5px;
+    font-weight: bold;
+}
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index 8e9a2622a..a17915cf1 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -264,7 +264,9 @@
             "annotations": {
                 "label": "Workload"
             }
-        }
+        },
+        "reviewer": "Reviewer",
+        "unassigned": "Unassigned"
     },
     "annotation-actions": {
         "accept-suggestion": {