From 0de16b75f4d48bc0a106566cc1cbe7556f500934 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Tue, 17 Nov 2020 11:23:20 +0200 Subject: [PATCH] bulk reanalyse fix --- apps/red-ui/src/app/common/service/permissions.service.ts | 5 ++++- .../bulk-actions/bulk-actions.component.html | 2 +- .../bulk-actions/bulk-actions.component.ts | 4 ---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/apps/red-ui/src/app/common/service/permissions.service.ts b/apps/red-ui/src/app/common/service/permissions.service.ts index c544b548f..12f6ede12 100644 --- a/apps/red-ui/src/app/common/service/permissions.service.ts +++ b/apps/red-ui/src/app/common/service/permissions.service.ts @@ -53,7 +53,10 @@ export class PermissionsService { if (!fileStatus) { fileStatus = this._appStateService.activeFile; } - return (this.fileRequiresReanalysis(fileStatus) && this.isReviewerOrOwner(fileStatus)) || (fileStatus.isError && fileStatus.isUnassigned); + return ( + (this.fileRequiresReanalysis(fileStatus) && (this.isReviewerOrOwner(fileStatus) || fileStatus.isUnassigned)) || + (fileStatus.isError && fileStatus.isUnassigned) + ); } isFileReviewer(fileStatus?: FileStatusWrapper) { diff --git a/apps/red-ui/src/app/screens/project-overview-screen/bulk-actions/bulk-actions.component.html b/apps/red-ui/src/app/screens/project-overview-screen/bulk-actions/bulk-actions.component.html index 4a8ad6a4c..b79a2943a 100644 --- a/apps/red-ui/src/app/screens/project-overview-screen/bulk-actions/bulk-actions.component.html +++ b/apps/red-ui/src/app/screens/project-overview-screen/bulk-actions/bulk-actions.component.html @@ -24,7 +24,7 @@
-
diff --git a/apps/red-ui/src/app/screens/project-overview-screen/bulk-actions/bulk-actions.component.ts b/apps/red-ui/src/app/screens/project-overview-screen/bulk-actions/bulk-actions.component.ts index df4ce2349..a3b247fe7 100644 --- a/apps/red-ui/src/app/screens/project-overview-screen/bulk-actions/bulk-actions.component.ts +++ b/apps/red-ui/src/app/screens/project-overview-screen/bulk-actions/bulk-actions.component.ts @@ -49,10 +49,6 @@ export class BulkActionsComponent { return this.selectedFiles.reduce((acc, file) => acc && this._permissionsService.canAssignReviewer(file), true); } - public canReanalyse() { - return this._permissionsService.isProjectMember(); - } - public get reanalyseDisabled() { return !this.selectedFiles.reduce((acc, file) => acc && this._permissionsService.canReanalyseFile(file), true); }