From 11e7090dc756a7d7c295a01f131aa3f1f4d24dd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Tue, 7 Dec 2021 05:43:05 +0200 Subject: [PATCH] RED-2787 --- apps/red-ui/src/app/services/permissions.service.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index 65f8c7b24..fd313f45f 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -30,9 +30,15 @@ export class PermissionsService { return file.assignee === this._userService.currentUser.id; } + // https://jira.iqser.com/browse/RED-2787 canDeleteFile(file: File): boolean { const dossier = this._getDossier(file); - return (this.isOwner(dossier) && !file.isApproved) || file.isNew; + return ( + file.isNew || + (file.isUnderReview && !file.assignee && this.isDossierMember(dossier)) || + (file.isUnderApproval && !file.assignee && this.isApprover(dossier)) || + (file.assignee && !file.isApproved && (this.isFileAssignee(file) || this.isOwner(dossier))) + ); } canAssignToSelf(file: File, dossier = this._getDossier(file)): boolean {