From 858d0bd5114d28c87700efc569c4ae951bcbcbcc Mon Sep 17 00:00:00 2001
From: Timo <timo@devplant.ro>
Date: Fri, 14 May 2021 11:34:40 +0300
Subject: [PATCH] finished approver assign

---
 .../file-actions/file-actions.component.html           |  6 +++---
 .../assign-reviewer-approver-dialog.component.html     |  2 +-
 .../assign-reviewer-approver-dialog.component.ts       |  9 ++++++---
 .../file-preview-screen.component.html                 |  8 ++++----
 .../file-preview-screen.component.ts                   | 10 ++++++++++
 apps/red-ui/src/app/services/permissions.service.ts    |  6 ++++--
 6 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/apps/red-ui/src/app/modules/projects/components/file-actions/file-actions.component.html b/apps/red-ui/src/app/modules/projects/components/file-actions/file-actions.component.html
index 75a7b8604..c15d51686 100644
--- a/apps/red-ui/src/app/modules/projects/components/file-actions/file-actions.component.html
+++ b/apps/red-ui/src/app/modules/projects/components/file-actions/file-actions.component.html
@@ -30,7 +30,7 @@
 
         <redaction-circle-button
             (action)="assign($event)"
-            *ngIf="canAssign"
+            *ngIf="canAssign && screen === 'project-overview'"
             icon="red:assign"
             [tooltip]="assignTooltip"
             [tooltipPosition]="tooltipPosition"
@@ -39,7 +39,7 @@
 
         <redaction-circle-button
             (action)="assignToMe($event)"
-            *ngIf="canAssignToSelf"
+            *ngIf="canAssignToSelf && screen === 'project-overview'"
             icon="red:assign-me"
             tooltip="project-overview.assign-me"
             [tooltipPosition]="tooltipPosition"
@@ -80,7 +80,7 @@
         <!-- Back to review -->
         <redaction-circle-button
             (action)="setFileUnderReview($event, true)"
-            *ngIf="canUndoApproval"
+            *ngIf="canSetToUnderReview"
             [tooltipPosition]="tooltipPosition"
             [type]="buttonType"
             icon="red:undo"
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.html b/apps/red-ui/src/app/modules/projects/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.html
index 5d822b37b..86e23df90 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.html
+++ b/apps/red-ui/src/app/modules/projects/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.html
@@ -3,7 +3,7 @@
 
     <form (submit)="saveUsers()" [formGroup]="usersForm">
         <div class="dialog-content">
-            <div class="red-input-group w-300">
+            <div class="red-input-group w-300 required">
                 <mat-form-field floatLabel="always">
                     <mat-label>{{ 'assign-' + data.mode + '-owner.dialog.single-user' | translate }}</mat-label>
                     <mat-select formControlName="singleUser">
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts b/apps/red-ui/src/app/modules/projects/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts
index 53cd464c7..2598162e4 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/projects/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts
@@ -4,7 +4,7 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { AppStateService } from '@state/app-state.service';
 import { UserService } from '@services/user.service';
 import { NotificationService, NotificationType } from '@services/notification.service';
-import { FormBuilder, FormGroup } from '@angular/forms';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { FileStatusWrapper } from '@models/file/file-status.wrapper';
 import { ProjectWrapper } from '@state/model/project.wrapper';
 
@@ -105,9 +105,12 @@ export class AssignReviewerApproverDialogComponent {
                 uniqueReviewers.add(file.currentReviewer);
             }
         }
-        const singleUser = uniqueReviewers.size === 1 ? uniqueReviewers.values().next().value : this.userService.userId;
+        let singleUser = uniqueReviewers.size === 1 ? uniqueReviewers.values().next().value : this.userService.userId;
+
+        singleUser = this.singleUsersSelectOptions.indexOf(singleUser) >= 0 ? singleUser : this.singleUsersSelectOptions[0];
+
         this.usersForm = this._formBuilder.group({
-            singleUser: [singleUser]
+            singleUser: [singleUser, Validators.required]
         });
     }
 }
diff --git a/apps/red-ui/src/app/modules/projects/screens/file-preview-screen/file-preview-screen.component.html b/apps/red-ui/src/app/modules/projects/screens/file-preview-screen/file-preview-screen.component.html
index 6fbad582e..784a7edf3 100644
--- a/apps/red-ui/src/app/modules/projects/screens/file-preview-screen/file-preview-screen.component.html
+++ b/apps/red-ui/src/app/modules/projects/screens/file-preview-screen/file-preview-screen.component.html
@@ -79,20 +79,20 @@
                                     size="small"
                                 ></redaction-initials-avatar>
                             </mat-select-trigger>
-                            <mat-option *ngFor="let reviewerId of this.appStateService.activeProject.memberIds" [value]="reviewerId">
-                                <redaction-initials-avatar [userId]="reviewerId" [withName]="true" size="small"></redaction-initials-avatar>
+                            <mat-option *ngFor="let userId of singleUsersSelectOptions" [value]="userId">
+                                <redaction-initials-avatar [userId]="userId" [withName]="true" size="small"></redaction-initials-avatar>
                             </mat-option>
                         </mat-select>
                     </div>
                 </form>
             </ng-container>
 
-            <div *ngIf="permissionsService.canAssignUser()" class="assign-actions-wrapper">
+            <div *ngIf="permissionsService.canAssignUser() || permissionsService.canAssignToSelf()" class="assign-actions-wrapper">
                 <redaction-circle-button
                     (action)="editingReviewer = true"
                     *ngIf="!editingReviewer && permissionsService.canAssignUser() && appStateService.activeFile.currentReviewer"
                     icon="red:edit"
-                    tooltip="file-preview.assign-reviewer"
+                    [tooltip]="assignTooltip"
                     tooltipPosition="below"
                 >
                 </redaction-circle-button>
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 a1dd91afc..b45cb4c17 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
@@ -90,6 +90,14 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy, OnAttach,
         });
     }
 
+    get singleUsersSelectOptions() {
+        return this.appStateService.activeFile?.isUnderApproval ? this.appStateService.activeProject.approverIds : this.appStateService.activeProject.memberIds;
+    }
+
+    get assignTooltip() {
+        return this.appStateService.activeFile.isUnderApproval ? 'project-overview.assign-approver' : 'project-overview.assign-reviewer';
+    }
+
     get annotations(): AnnotationWrapper[] {
         return this.annotationData ? this.annotationData.visibleAnnotations : [];
     }
@@ -341,6 +349,8 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy, OnAttach,
     }
 
     async fileActionPerformed(action: string) {
+        this.editingReviewer = false;
+
         switch (action) {
             case 'delete':
                 await this._router.navigate([`/main/projects/${this.projectId}`]);
diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts
index ecaa1eb35..654e7f2ab 100644
--- a/apps/red-ui/src/app/services/permissions.service.ts
+++ b/apps/red-ui/src/app/services/permissions.service.ts
@@ -107,7 +107,7 @@ export class PermissionsService {
 
         const precondition = this.isProjectMember() && !fileStatus.isProcessing && !fileStatus.isError && !fileStatus.isExcluded && !fileStatus.isApproved;
         if (precondition) {
-            if (fileStatus.isUnassigned && !this.isApprover()) {
+            if ((fileStatus.isUnassigned || fileStatus.isUnderReview) && !this.isApprover()) {
                 return true;
             }
         }
@@ -122,7 +122,9 @@ export class PermissionsService {
             return false;
         }
 
-        const precondition = this.isProjectMember() && !fileStatus.isProcessing && !fileStatus.isError && !fileStatus.isExcluded && !fileStatus.isApproved;
+        const precondition =
+            this.isProjectMember() && !fileStatus.isProcessing && !fileStatus.isError && !fileStatus.isExcluded && !fileStatus.isApproved && this.isApprover();
+
         if (precondition) {
             if ((fileStatus.isUnassigned || fileStatus.isUnderReview) && this._appStateService.activeProject.hasMoreThanOneReviewer) {
                 return true;