(fix): do not show pencil icon if only need to delete

src/app/modules/comments/comment/comment.component.html

@@ -58,7 +58,7 @@
  <i class="material-icons">public</i>
  </li>
  <li class="m-commentRibbon__item"
- *ngIf="comment.owner_guid == session.getLoggedInUser()?.guid || session.isAdmin() || parent.owner_guid == session.getLoggedInUser()?.guid || canEdit"
+ *ngIf="comment.owner_guid == session.getLoggedInUser()?.guid || session.isAdmin() || parent.owner_guid == session.getLoggedInUser()?.guid || canDelete"
  (click)="delete(); toggle.value = false"
  title="Delete"
  i18n-title="@@M__ACTION__DELETE"

src/app/modules/comments/comment/comment.component.ts

@@ -78,6 +78,7 @@ export class CommentComponentV2 implements OnChanges {
  translateToggle: boolean = false;
  commentAge$: Observable<number>;
  @Input() canEdit: boolean = false;
+ @Input() canDelete: boolean = false;
 
  @Output() onReply = new EventEmitter();
 

src/app/modules/comments/thread/thread.component.html

@@ -51,6 +51,7 @@
  [parent]="parent"
  [level]="level"
  [canEdit]="canEdit"
+ [canDelete]="canDelete"
  [showReplies]="comment.show_replies"
  (delete)="delete(i)"
  (saved)="edited(i, $event)"

src/app/modules/comments/thread/thread.component.ts

@@ -33,6 +33,7 @@ export class CommentsThreadComponent {
  @Input() entity;
  @Input() entityGuid;
  @Input() canEdit: boolean = false;
+ @Input() canDelete: boolean = false;
  @Input() readonly: boolean = false;
  @Input() conversation: boolean = false;
  @Input() limit: number = 12;

src/app/modules/comments/tree/tree.component.html

@@ -2,6 +2,7 @@
  [entity]="entity"
  [parent]="entity"
  [canEdit]="canEdit"
+ [canDelete]="canDelete"
  [readonly]="readonly"
  [level]="0"
  [limit]="limit"

src/app/modules/comments/tree/tree.component.ts

@@ -56,6 +56,7 @@ export class CommentsTreeComponent {
  @Input() scrollable: boolean = false;
  @Input() readonly: boolean = false;
  @Input() canEdit: boolean = false;
+ @Input() canDelete: boolean = false;
 
  private shouldReuseRouteFn;
 
@@ -89,8 +90,8 @@ export class CommentsTreeComponent {
  if (this.entity.entity_guid)
  this.guid = this.entity.entity_guid;
  this.parent = this.entity;
- if (!this.canEdit) {
- this.canEdit = this.entity.owner_guid == this.session.getLoggedInUser().guid;
+ if (!this.canDelete) {
+ this.canDelete = this.entity.owner_guid == this.session.getLoggedInUser().guid;
  }
  }
 

src/app/modules/groups/profile/conversation/conversation.component.html

@@ -4,7 +4,7 @@
  [limit]="24"
  [entity]="group"
  [conversation]="true"
- [canEdit]="group['is:moderator'] || group['is:creator']"
+ [canDelete]="group['is:moderator'] || group['is:creator']"
  [readonly]="!group['is:member']"
  [scrollable]="true"
 >

src/app/modules/legacy/components/cards/activity/activity.html

@@ -240,7 +240,7 @@
 <m-comments__tree
  *ngIf="commentsToggle"
  [entity]="activity"
- [canEdit]="canDelete"
+ [canDelete]="canDelete"
  >
 </m-comments__tree>