From 939917705fa3fa93ab7036b5e7e9aaf5f1d0023e Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 20 Nov 2020 13:55:33 +0100 Subject: [PATCH] Add ability to bulk delete comments --- .../video-comment-list.component.html | 19 ++++++++++- .../video-comment-list.component.scss | 4 ++- .../video-comment-list.component.ts | 34 +++++++++++++++++-- .../video-comment.service.ts | 14 ++++++-- client/src/sass/primeng-custom.scss | 2 +- 5 files changed, 65 insertions(+), 8 deletions(-) diff --git a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.html b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.html index 330ee2478..8b7c12ba3 100644 --- a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.html +++ b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.html @@ -13,9 +13,18 @@ [showCurrentPageReport]="true" i18n-currentPageReportTemplate currentPageReportTemplate="Showing {{'{first}'}} to {{'{last}'}} of {{'{totalRecords}'}} comments" (onPage)="onPage($event)" [expandedRowKeys]="expandedRows" + [(selection)]="selectedComments" >
+
+ + +
+
@@ -42,6 +51,9 @@ + + + Account @@ -52,7 +64,12 @@ - + + + + + + diff --git a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.scss b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.scss index 439835899..d208944fe 100644 --- a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.scss +++ b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.scss @@ -45,7 +45,9 @@ my-global-icon { } a { - @include ellipsis + @include ellipsis; + + color: pvar(--mainForegroundColor); } } diff --git a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.ts b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.ts index 284ec541d..529e28f11 100644 --- a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.ts +++ b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.ts @@ -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' @@ -41,6 +40,9 @@ export class VideoCommentListComponent extends RestTable implements OnInit, Afte } ] + selectedComments: VideoCommentAdmin[] = [] + bulkCommentActions: DropdownAction[] = [] + get authUser () { return this.auth.getUser() } @@ -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 () { @@ -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, @@ -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( diff --git a/client/src/app/shared/shared-video-comment/video-comment.service.ts b/client/src/app/shared/shared-video-comment/video-comment.service.ts index 1ab996a76..c107a33ab 100644 --- a/client/src/app/shared/shared-video-comment/video-comment.service.ts +++ b/client/src/app/shared/shared-video-comment/video-comment.service.ts @@ -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' @@ -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 { @@ -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 = [ { diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index a48f797fc..ed32a7b38 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss @@ -924,7 +924,7 @@ p-toast { .notification-block { display: flex; align-items: center; - padding: 10px; + padding: 10px 20px; .message { flex-grow: 1;