From e305a461cff16c685eefa617ee145c6721f761fb Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Fri, 28 May 2021 14:09:14 +0300 Subject: [PATCH] assign reviewer for approvers --- .../file-preview-screen.component.html | 3 ++- apps/red-ui/src/app/services/permissions.service.ts | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) 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 56ae30d30..e95664b17 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 @@ -72,7 +72,8 @@ *ngIf=" !editingReviewer && !appStateService.activeFile.currentReviewer && - permissionsService.canAssignUser() + permissionsService.canAssignUser() && + appStateService.activeProject.hasMoreThanOneReviewer " class="assign-reviewer pointer" translate="file-preview.assign-reviewer" diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index 148eedc49..71169d87c 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -114,12 +114,13 @@ export class PermissionsService { !fileStatus.isError && !fileStatus.isApproved; + const isNotCurrentReviewer = fileStatus.currentReviewer !== this._userService.userId; + const isTheOnlyReviewer = !this._appStateService.activeProject.hasMoreThanOneReviewer; + if (precondition) { if ( - (fileStatus.isUnassigned || fileStatus.isUnderReview) && - (!this.isApprover() || - !this._appStateService.activeProject.hasMoreThanOneReviewer) && - fileStatus.currentReviewer !== this._userService.userId + (fileStatus.isUnassigned || (fileStatus.isUnderReview && isNotCurrentReviewer)) && + (this.isApprover() || isTheOnlyReviewer) ) { return true; }