Skip to content

Commit

Permalink
Add ability to bulk delete comments
Browse files Browse the repository at this point in the history
  • Loading branch information
Chocobozzz committed Nov 20, 2020
1 parent 4749078 commit 9399177
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,18 @@ <h1>
[showCurrentPageReport]="true" i18n-currentPageReportTemplate
currentPageReportTemplate="Showing {{'{first}'}} to {{'{last}'}} of {{'{totalRecords}'}} comments"
(onPage)="onPage($event)" [expandedRowKeys]="expandedRows"
[(selection)]="selectedComments"
>
<ng-template pTemplate="caption">
<div class="caption">
<div>
<my-action-dropdown
*ngIf="isInSelectionMode()" i18n-label label="Batch actions" theme="orange"
[actions]="bulkCommentActions" [entry]="selectedComments"
>
</my-action-dropdown>
</div>

<div class="ml-auto">
<div class="input-group has-feedback has-clear">
<div class="input-group-prepend c-hand" ngbDropdown placement="bottom-left auto" container="body">
Expand All @@ -42,6 +51,9 @@ <h6 class="dropdown-header" i18n>Advanced comments filters</h6>

<ng-template pTemplate="header">
<tr>
<th style="width: 40px">
<p-tableHeaderCheckbox></p-tableHeaderCheckbox>
</th>
<th style="width: 40px"></th>
<th style="width: 150px;"></th>
<th style="width: 300px" i18n>Account</th>
Expand All @@ -52,7 +64,12 @@ <h6 class="dropdown-header" i18n>Advanced comments filters</h6>
</ng-template>

<ng-template pTemplate="body" let-videoComment let-expanded="expanded">
<tr>
<tr [pSelectableRow]="videoComment">

<td class="checkbox-cell">
<p-tableCheckbox [value]="videoComment"></p-tableCheckbox>
</td>

<td class="expand-cell c-hand" [pRowToggler]="videoComment" i18n-ngbTooltip ngbTooltip="More information" placement="top-left" container="body">
<span class="expander">
<i [ngClass]="expanded ? 'glyphicon glyphicon-menu-down' : 'glyphicon glyphicon-menu-right'"></i>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ my-global-icon {
}

a {
@include ellipsis
@include ellipsis;

color: pvar(--mainForegroundColor);
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { SortMeta } from 'primeng/api'
import { filter } from 'rxjs/operators'
import { AfterViewInit, Component, OnInit } from '@angular/core'
import { ActivatedRoute, Params, Router } from '@angular/router'
import { ActivatedRoute, Router } from '@angular/router'
import { AuthService, ConfirmService, MarkdownService, Notifier, RestPagination, RestTable } from '@app/core'
import { DropdownAction } from '@app/shared/shared-main'
import { BulkService } from '@app/shared/shared-moderation'
Expand Down Expand Up @@ -41,6 +40,9 @@ export class VideoCommentListComponent extends RestTable implements OnInit, Afte
}
]

selectedComments: VideoCommentAdmin[] = []
bulkCommentActions: DropdownAction<VideoCommentAdmin[]>[] = []

get authUser () {
return this.auth.getUser()
}
Expand Down Expand Up @@ -78,6 +80,15 @@ export class VideoCommentListComponent extends RestTable implements OnInit, Afte
ngOnInit () {
this.initialize()
this.listenToSearchChange()

this.bulkCommentActions = [
{
label: $localize`Delete`,
handler: comments => this.removeComments(comments),
isDisplayed: () => this.authUser.hasRight(UserRight.REMOVE_ANY_VIDEO_COMMENT),
iconName: 'delete'
}
]
}

ngAfterViewInit () {
Expand All @@ -92,6 +103,10 @@ export class VideoCommentListComponent extends RestTable implements OnInit, Afte
return this.markdownRenderer.textMarkdownToHTML(text, true, true)
}

isInSelectionMode () {
return this.selectedComments.length !== 0
}

protected loadData () {
this.videoCommentService.getAdminVideoComments({
pagination: this.pagination,
Expand All @@ -114,6 +129,21 @@ export class VideoCommentListComponent extends RestTable implements OnInit, Afte
)
}

private async removeComments (comments: VideoCommentAdmin[]) {
const commentArgs = comments.map(c => ({ videoId: c.video.id, commentId: c.id }))

this.videoCommentService.deleteVideoComments(commentArgs).subscribe(
() => {
this.notifier.success($localize`${commentArgs.length} comments deleted.`)
this.loadData()
},

err => this.notifier.error(err.message),

() => this.selectedComments = []
)
}

private deleteComment (comment: VideoCommentAdmin) {
this.videoCommentService.deleteVideoComment(comment.video.id, comment.id)
.subscribe(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Observable } from 'rxjs'
import { catchError, map } from 'rxjs/operators'
import { SortMeta } from 'primeng/api'
import { from, Observable } from 'rxjs'
import { catchError, concatMap, map, toArray } from 'rxjs/operators'
import { HttpClient, HttpParams } from '@angular/common/http'
import { Injectable } from '@angular/core'
import { ComponentPaginationLight, RestExtractor, RestPagination, RestService } from '@app/core'
Expand All @@ -15,7 +16,6 @@ import {
import { environment } from '../../../environments/environment'
import { VideoCommentThreadTree } from './video-comment-thread-tree.model'
import { VideoComment } from './video-comment.model'
import { SortMeta } from 'primeng/api'

@Injectable()
export class VideoCommentService {
Expand Down Expand Up @@ -118,6 +118,14 @@ export class VideoCommentService {
)
}

deleteVideoComments (comments: { videoId: number | string, commentId: number }[]) {
return from(comments)
.pipe(
concatMap(c => this.deleteVideoComment(c.videoId, c.commentId)),
toArray()
)
}

getVideoCommentsFeeds (videoUUID?: string) {
const feeds = [
{
Expand Down
2 changes: 1 addition & 1 deletion client/src/sass/primeng-custom.scss
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,7 @@ p-toast {
.notification-block {
display: flex;
align-items: center;
padding: 10px;
padding: 10px 20px;

.message {
flex-grow: 1;
Expand Down

0 comments on commit 9399177

Please sign in to comment.