From 732533d5339a35f94995826b4a572f588b526260 Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo.bejan.ext@iqser.com>
Date: Wed, 28 Jul 2021 14:13:16 +0300
Subject: [PATCH] comment permissions - RED-1867

---
 .../dossier/components/comments/comments.component.html   | 2 +-
 .../dossier/components/comments/comments.component.ts     | 4 ----
 apps/red-ui/src/app/services/permissions.service.ts       | 8 ++++++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.html b/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.html
index 263104ef6..2bbe4f149 100644
--- a/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.html
+++ b/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.html
@@ -7,7 +7,7 @@
         <div class="comment-actions">
             <redaction-circle-button
                 (action)="deleteComment(comment)"
-                *ngIf="isCommentOwner(comment)"
+                *ngIf="permissionsService.canDeleteComment(comment)"
                 [iconSize]="10"
                 [size]="20"
                 class="pointer"
diff --git a/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.ts b/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.ts
index 4957063d7..0e0443763 100644
--- a/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.ts
@@ -60,10 +60,6 @@ export class CommentsComponent {
         });
     }
 
-    isCommentOwner(comment: Comment): boolean {
-        return comment.user === this._userService.userId;
-    }
-
     getOwnerName(comment: Comment): string {
         return this._userService.getNameForId(comment.user);
     }
diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts
index 313d708dd..990c5bf9e 100644
--- a/apps/red-ui/src/app/services/permissions.service.ts
+++ b/apps/red-ui/src/app/services/permissions.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { AppStateService } from '@state/app-state.service';
 import { UserService, UserWrapper } from './user.service';
 import { FileStatusWrapper } from '@models/file/file-status.wrapper';
-import { User } from '@redaction/red-ui-http';
+import { User, Comment } from '@redaction/red-ui-http';
 import { DossierWrapper } from '@state/model/dossier.wrapper';
 
 @Injectable({
@@ -182,10 +182,14 @@ export class PermissionsService {
     }
 
     canAddComment(fileStatus = this._activeFile): boolean {
-        return this.isFileReviewer(fileStatus) || this.isApprover();
+        return (this.isFileReviewer(fileStatus) || this.isApprover()) && !fileStatus.isApproved;
     }
 
     canExcludePages(fileStatus = this._activeFile): boolean {
         return ['UNDER_REVIEW', 'UNDER_APPROVAL'].includes(fileStatus.status) && (this.isFileReviewer(fileStatus) || this.isApprover());
     }
+
+    canDeleteComment(comment: Comment, fileStatus = this._activeFile) {
+        return (comment.user === this._userService.userId || this.isApprover()) && !fileStatus.isApproved;
+    }
 }