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=dfd8dc745e3a76351d975fce90748cc1bde518ec;hb=1fd61899eaea245a5844e33e21f04b2562f16e5e;hp=c0ac3224218df09879d9016bf7e2bdbb995744a1;hpb=8b381422b88a02a971f5e50422b5b4b79b1101e5;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 c0ac32242..dfd8dc745 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,24 +1,23 @@ -import { Component, OnInit, AfterViewInit } from '@angular/core' import { SortMeta } from 'primeng/api' -import { Notifier, ServerService } from '@app/core' -import { ConfirmService } from '../../../core' -import { RestPagination, RestTable, VideoBlockService } from '../../../shared' -import { VideoBlacklist, VideoBlacklistType } from '../../../../../../shared' -import { I18n } from '@ngx-translate/i18n-polyfill' -import { DropdownAction } from '../../../shared/buttons/action-dropdown.component' -import { Video } from '../../../shared/video/video.model' -import { MarkdownService } from '@app/shared/renderer' -import { Params, ActivatedRoute, Router } from '@angular/router' -import { filter, switchMap } from 'rxjs/operators' -import { VideoService } from '@app/shared/video/video.service' +import { switchMap } from 'rxjs/operators' +import { buildVideoLink, buildVideoOrPlaylistEmbed } from 'src/assets/player/utils' +import { environment } from 'src/environments/environment' +import { AfterViewInit, Component, OnInit } from '@angular/core' +import { DomSanitizer } from '@angular/platform-browser' +import { ActivatedRoute, Params, 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 { 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 })[] = [] + blocklist: (VideoBlacklist & { reasonHtml?: string, embedHtml?: string })[] = [] totalRecords = 0 sort: SortMeta = { field: 'createdAt', order: -1 } pagination: RestPagination = { count: this.rowsPerPage, start: 0 } @@ -26,64 +25,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.notifier.success($localize`Video ${videoBlock.video.name} switched to manual block.`) this.loadData() }, 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) @@ -104,39 +116,13 @@ export class VideoBlockListComponent extends RestTable implements OnInit, AfterV }) 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() - }) + this.listenToSearchChange() } ngAfterViewInit () { - if (this.search) this.setTableFilter(this.search) - } - - /* Table filter functions */ - onBlockSearch (event: Event) { - this.onSearch(event) - this.setQueryParams((event.target as HTMLInputElement).value) - } - - setQueryParams (search: string) { - const queryParams: Params = {} - if (search) Object.assign(queryParams, { search }) - this.router.navigate([ '/admin/moderation/video-blocks/list' ], { queryParams }) + if (this.search) this.setTableFilter(this.search, false) } - resetTableFilter () { - this.setTableFilter('') - this.setQueryParams('') - this.resetSearch() - } - /* END Table filter functions */ - getIdentifier () { return 'VideoBlockListComponent' } @@ -145,27 +131,19 @@ export class VideoBlockListComponent extends RestTable implements OnInit, AfterV return Video.buildClientUrl(videoBlock.video.uuid) } - booleanToText (value: boolean) { - if (value === true) return this.i18n('yes') - - return this.i18n('no') - } - toHtml (text: string) { return this.markdownRenderer.textMarkdownToHTML(text) } 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.notifier.success($localize`Video ${entry.video.name} unblocked.`) this.loadData() }, @@ -173,6 +151,17 @@ export class VideoBlockListComponent extends RestTable implements OnInit, AfterV ) } + getVideoEmbed (entry: VideoBlacklist) { + return buildVideoOrPlaylistEmbed( + buildVideoLink({ + baseUrl: `${environment.originServerUrl}/videos/embed/${entry.video.uuid}`, + title: false, + warningTitle: false + }), + entry.video.name + ) + } + protected loadData () { this.videoBlocklistService.listBlocks({ pagination: this.pagination, @@ -186,7 +175,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)) + }) } },