X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Badmin%2Fmoderation%2Fvideo-block-list%2Fvideo-block-list.component.ts;h=4fe5ec441d0770c2098de60c5b4a8b3af5a1712d;hb=15a7eafb892441957ba7dd6fcbf556086fe5b2b3;hp=c03f9248ed0fcd3206134771cf9596251ed84ab4;hpb=67ed6552b831df66713bac9e672738796128d33f;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts index c03f9248e..4fe5ec441 100644 --- a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts +++ b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts @@ -1,20 +1,24 @@ import { SortMeta } from 'primeng/api' -import { filter, switchMap } from 'rxjs/operators' -import { AfterViewInit, Component, OnInit } from '@angular/core' -import { ActivatedRoute, Params, Router } from '@angular/router' +import { switchMap } from 'rxjs/operators' +import { buildVideoOrPlaylistEmbed } from 'src/assets/player/utils' +import { environment } from 'src/environments/environment' +import { Component, OnInit } from '@angular/core' +import { DomSanitizer } from '@angular/platform-browser' +import { ActivatedRoute, Router } from '@angular/router' import { ConfirmService, MarkdownService, Notifier, RestPagination, RestTable, ServerService } from '@app/core' +import { AdvancedInputFilter } from '@app/shared/shared-forms' import { DropdownAction, Video, VideoService } from '@app/shared/shared-main' import { VideoBlockService } from '@app/shared/shared-moderation' -import { I18n } from '@ngx-translate/i18n-polyfill' +import { buildVideoEmbedLink, decorateVideoLink } from '@shared/core-utils' import { VideoBlacklist, VideoBlacklistType } from '@shared/models' @Component({ selector: 'my-video-block-list', templateUrl: './video-block-list.component.html', - styleUrls: [ '../moderation.component.scss', './video-block-list.component.scss' ] + styleUrls: [ '../../../shared/shared-moderation/moderation.scss', './video-block-list.component.scss' ] }) -export class VideoBlockListComponent extends RestTable implements OnInit, AfterViewInit { - blocklist: (VideoBlacklist & { reasonHtml?: string })[] = [] +export class VideoBlockListComponent extends RestTable implements OnInit { + blocklist: (VideoBlacklist & { reasonHtml?: string, embedHtml?: string })[] = [] totalRecords = 0 sort: SortMeta = { field: 'createdAt', order: -1 } pagination: RestPagination = { count: this.rowsPerPage, start: 0 } @@ -22,64 +26,77 @@ export class VideoBlockListComponent extends RestTable implements OnInit, AfterV videoBlocklistActions: DropdownAction[][] = [] + inputFilters: AdvancedInputFilter[] = [ + { + queryParams: { 'search': 'type:auto' }, + label: $localize`Automatic blocks` + }, + { + queryParams: { 'search': 'type:manual' }, + label: $localize`Manual blocks` + } + ] + constructor ( + protected route: ActivatedRoute, + protected router: Router, private notifier: Notifier, private serverService: ServerService, private confirmService: ConfirmService, private videoBlocklistService: VideoBlockService, private markdownRenderer: MarkdownService, - private videoService: VideoService, - private route: ActivatedRoute, - private router: Router, - private i18n: I18n + private sanitizer: DomSanitizer, + private videoService: VideoService ) { super() this.videoBlocklistActions = [ [ { - label: this.i18n('Internal actions'), - isHeader: true + label: $localize`Internal actions`, + isHeader: true, + isDisplayed: videoBlock => videoBlock.type === VideoBlacklistType.AUTO_BEFORE_PUBLISHED }, { - label: this.i18n('Switch video block to manual'), + label: $localize`Switch video block to manual`, handler: videoBlock => { this.videoBlocklistService.unblockVideo(videoBlock.video.id).pipe( switchMap(_ => this.videoBlocklistService.blockVideo(videoBlock.video.id, undefined, true)) ).subscribe( () => { - this.notifier.success(this.i18n('Video {{name}} switched to manual block.', { name: videoBlock.video.name })) - this.loadData() + this.notifier.success($localize`Video ${videoBlock.video.name} switched to manual block.`) + this.reloadData() }, err => this.notifier.error(err.message) ) - } + }, + isDisplayed: videoBlock => videoBlock.type === VideoBlacklistType.AUTO_BEFORE_PUBLISHED } ], [ { - label: this.i18n('Actions for the video'), + label: $localize`Actions for the video`, isHeader: true }, { - label: this.i18n('Unblock video'), + label: $localize`Unblock`, handler: videoBlock => this.unblockVideo(videoBlock) }, { - label: this.i18n('Delete video'), + label: $localize`Delete`, handler: async videoBlock => { const res = await this.confirmService.confirm( - this.i18n('Do you really want to delete this video?'), - this.i18n('Delete') + $localize`Do you really want to delete this video?`, + $localize`Delete` ) if (res === false) return this.videoService.removeVideo(videoBlock.video.id) .subscribe( () => { - this.notifier.success(this.i18n('Video deleted.')) + this.notifier.success($localize`Video deleted.`) }, err => this.notifier.error(err.message) @@ -91,60 +108,22 @@ export class VideoBlockListComponent extends RestTable implements OnInit, AfterV } ngOnInit () { - this.serverService.getConfig() - .subscribe(config => { - // don't filter if auto-blacklist is not enabled as this will be the only list - if (config.autoBlacklist.videos.ofUsers.enabled) { - this.blocklistTypeFilter = VideoBlacklistType.MANUAL - } - }) - - this.initialize() - - this.route.queryParams - .pipe(filter(params => params.search !== undefined && params.search !== null)) - .subscribe(params => { - this.search = params.search - this.setTableFilter(params.search) - this.loadData() - }) - } - - ngAfterViewInit () { - if (this.search) this.setTableFilter(this.search) - } - - /* Table filter functions */ - onBlockSearch (event: Event) { - this.onSearch(event) - this.setQueryParams((event.target as HTMLInputElement).value) - } + const serverConfig = this.serverService.getHTMLConfig() - setQueryParams (search: string) { - const queryParams: Params = {} - if (search) Object.assign(queryParams, { search }) - this.router.navigate([ '/admin/moderation/video-blocks/list' ], { queryParams }) - } + // Don't filter if auto-blacklist is not enabled as this will be the only list + if (serverConfig.autoBlacklist.videos.ofUsers.enabled) { + this.blocklistTypeFilter = VideoBlacklistType.MANUAL + } - resetTableFilter () { - this.setTableFilter('') - this.setQueryParams('') - this.resetSearch() + this.initialize() } - /* END Table filter functions */ getIdentifier () { return 'VideoBlockListComponent' } getVideoUrl (videoBlock: VideoBlacklist) { - return Video.buildClientUrl(videoBlock.video.uuid) - } - - booleanToText (value: boolean) { - if (value === true) return this.i18n('yes') - - return this.i18n('no') + return Video.buildWatchUrl(videoBlock.video) } toHtml (text: string) { @@ -152,24 +131,34 @@ export class VideoBlockListComponent extends RestTable implements OnInit, AfterV } async unblockVideo (entry: VideoBlacklist) { - const confirmMessage = this.i18n( - 'Do you really want to unblock this video? It will be available again in the videos list.' - ) + const confirmMessage = $localize`Do you really want to unblock this video? It will be available again in the videos list.` - const res = await this.confirmService.confirm(confirmMessage, this.i18n('Unblock')) + const res = await this.confirmService.confirm(confirmMessage, $localize`Unblock`) if (res === false) return this.videoBlocklistService.unblockVideo(entry.video.id).subscribe( () => { - this.notifier.success(this.i18n('Video {{name}} unblocked.', { name: entry.video.name })) - this.loadData() + this.notifier.success($localize`Video ${entry.video.name} unblocked.`) + this.reloadData() }, err => this.notifier.error(err.message) ) } - protected loadData () { + getVideoEmbed (entry: VideoBlacklist) { + return buildVideoOrPlaylistEmbed( + decorateVideoLink({ + url: buildVideoEmbedLink(entry.video, environment.originServerUrl), + + title: false, + warningTitle: false + }), + entry.video.name + ) + } + + protected reloadData () { this.videoBlocklistService.listBlocks({ pagination: this.pagination, sort: this.sort, @@ -182,7 +171,10 @@ export class VideoBlockListComponent extends RestTable implements OnInit, AfterV this.blocklist = resultList.data for (const element of this.blocklist) { - Object.assign(element, { reasonHtml: await this.toHtml(element.reason) }) + Object.assign(element, { + reasonHtml: await this.toHtml(element.reason), + embedHtml: this.sanitizer.bypassSecurityTrustHtml(this.getVideoEmbed(element)) + }) } },