Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

comment permissions - RED-1867

Browse Source
This commit is contained in:
Timo Bejan 2021-07-28 14:13:16 +03:00
parent ddb909c56c
commit 732533d533
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/red-ui/src/app/modules/dossier/components/comments/comments.component.html
View File

@ -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"

4
apps/red-ui/src/app/modules/dossier/components/comments/comments.component.ts
View File

@ -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);
}

8
apps/red-ui/src/app/services/permissions.service.ts
View File

@ -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;
}
}