X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Bmy-account%2Fmy-account-videos%2Fmy-account-videos.component.ts;h=2274c6a7b0f2a9e50c6b902be70c2d7944f84d03;hb=d607fc24631808fc70ce9fb8ddc323d8f856f8ed;hp=41608f796f69562c1aea5f9ce760f64a688890a8;hpb=88108880bbdba473cfe36ecbebc1c3c4f972e102;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/+my-account/my-account-videos/my-account-videos.component.ts b/client/src/app/+my-account/my-account-videos/my-account-videos.component.ts index 41608f796..2274c6a7b 100644 --- a/client/src/app/+my-account/my-account-videos/my-account-videos.component.ts +++ b/client/src/app/+my-account/my-account-videos/my-account-videos.component.ts @@ -1,19 +1,14 @@ -import { from as observableFrom, Observable } from 'rxjs' -import { concatAll, tap } from 'rxjs/operators' -import { Component, OnDestroy, OnInit, Inject, LOCALE_ID, ViewChild } from '@angular/core' +import { concat, Observable, Subject } from 'rxjs' +import { debounceTime, tap, toArray } from 'rxjs/operators' +import { Component, OnInit, ViewChild } from '@angular/core' import { ActivatedRoute, Router } from '@angular/router' -import { Location } from '@angular/common' -import { immutableAssign } from '@app/shared/misc/utils' -import { ComponentPagination } from '@app/shared/rest/component-pagination.model' -import { Notifier } from '@app/core' -import { AuthService } from '../../core/auth' -import { ConfirmService } from '../../core/confirm' -import { AbstractVideoList } from '../../shared/video/abstract-video-list' -import { Video } from '../../shared/video/video.model' -import { VideoService } from '../../shared/video/video.service' +import { AuthService, ComponentPagination, ConfirmService, Notifier, ScreenService, ServerService } from '@app/core' +import { DisableForReuseHook } from '@app/core/routing/disable-for-reuse-hook' +import { immutableAssign } from '@app/helpers' +import { Video, VideoService } from '@app/shared/shared-main' +import { MiniatureDisplayOptions, OwnerDisplayType, SelectionType, VideosSelectionComponent } from '@app/shared/shared-video-miniature' import { I18n } from '@ngx-translate/i18n-polyfill' -import { VideoPrivacy, VideoState } from '../../../../../shared/models/videos' -import { ScreenService } from '@app/shared/misc/screen.service' +import { VideoSortField } from '@shared/models' import { VideoChangeOwnershipComponent } from './video-change-ownership/video-change-ownership.component' @Component({ @@ -21,67 +16,84 @@ import { VideoChangeOwnershipComponent } from './video-change-ownership/video-ch templateUrl: './my-account-videos.component.html', styleUrls: [ './my-account-videos.component.scss' ] }) -export class MyAccountVideosComponent extends AbstractVideoList implements OnInit, OnDestroy { +export class MyAccountVideosComponent implements OnInit, DisableForReuseHook { + @ViewChild('videosSelection', { static: true }) videosSelection: VideosSelectionComponent + @ViewChild('videoChangeOwnershipModal', { static: true }) videoChangeOwnershipModal: VideoChangeOwnershipComponent + titlePage: string - currentRoute = '/my-account/videos' - checkedVideos: { [ id: number ]: boolean } = {} + selection: SelectionType = {} pagination: ComponentPagination = { currentPage: 1, - itemsPerPage: 5, + itemsPerPage: 10, totalItems: null } + miniatureDisplayOptions: MiniatureDisplayOptions = { + date: true, + views: true, + by: true, + privacyLabel: false, + privacyText: true, + state: true, + blacklistInfo: true + } + ownerDisplayType: OwnerDisplayType = 'videoChannel' - protected baseVideoWidth = -1 - protected baseVideoHeight = 155 - - @ViewChild('videoChangeOwnershipModal') videoChangeOwnershipModal: VideoChangeOwnershipComponent + videos: Video[] = [] + videosSearch: string + videosSearchChanged = new Subject() + getVideosObservableFunction = this.getVideosObservable.bind(this) constructor ( protected router: Router, + protected serverService: ServerService, protected route: ActivatedRoute, protected authService: AuthService, protected notifier: Notifier, - protected location: Location, protected screenService: ScreenService, - protected i18n: I18n, + private i18n: I18n, private confirmService: ConfirmService, - private videoService: VideoService, - @Inject(LOCALE_ID) private localeId: string + private videoService: VideoService ) { - super() - this.titlePage = this.i18n('My videos') } ngOnInit () { - super.ngOnInit() + this.videosSearchChanged + .pipe(debounceTime(500)) + .subscribe(() => { + this.videosSelection.reloadVideos() + }) } - ngOnDestroy () { - super.ngOnDestroy() + resetSearch () { + this.videosSearch = '' + this.onVideosSearchChanged() } - abortSelectionMode () { - this.checkedVideos = {} + onVideosSearchChanged () { + this.videosSearchChanged.next() } - isInSelectionMode () { - return Object.keys(this.checkedVideos).some(k => this.checkedVideos[ k ] === true) + disableForReuse () { + this.videosSelection.disableForReuse() } - getVideosObservable (page: number) { - const newPagination = immutableAssign(this.pagination, { currentPage: page }) - - return this.videoService.getMyVideos(newPagination, this.sort) + enabledForReuse () { + this.videosSelection.enabledForReuse() } - generateSyndicationList () { - throw new Error('Method not implemented.') + getVideosObservable (page: number, sort: VideoSortField) { + const newPagination = immutableAssign(this.pagination, { currentPage: page }) + + return this.videoService.getMyVideos(newPagination, sort, this.videosSearch) + .pipe( + tap(res => this.pagination.totalItems = res.total) + ) } async deleteSelectedVideos () { - const toDeleteVideosIds = Object.keys(this.checkedVideos) - .filter(k => this.checkedVideos[ k ] === true) + const toDeleteVideosIds = Object.keys(this.selection) + .filter(k => this.selection[ k ] === true) .map(k => parseInt(k, 10)) const res = await this.confirmService.confirm( @@ -93,19 +105,18 @@ export class MyAccountVideosComponent extends AbstractVideoList implements OnIni const observables: Observable[] = [] for (const videoId of toDeleteVideosIds) { const o = this.videoService.removeVideo(videoId) - .pipe(tap(() => this.spliceVideosById(videoId))) + .pipe(tap(() => this.removeVideoFromArray(videoId))) observables.push(o) } - observableFrom(observables) - .pipe(concatAll()) + concat(...observables) + .pipe(toArray()) .subscribe( - res => { + () => { this.notifier.success(this.i18n('{{deleteLength}} videos deleted.', { deleteLength: toDeleteVideosIds.length })) - this.abortSelectionMode() - this.reloadVideos() + this.selection = {} }, err => this.notifier.error(err.message) @@ -123,7 +134,7 @@ export class MyAccountVideosComponent extends AbstractVideoList implements OnIni .subscribe( () => { this.notifier.success(this.i18n('Video {{videoName}} deleted.', { videoName: video.name })) - this.reloadVideos() + this.removeVideoFromArray(video.id) }, error => this.notifier.error(error.message) @@ -135,41 +146,7 @@ export class MyAccountVideosComponent extends AbstractVideoList implements OnIni this.videoChangeOwnershipModal.show(video) } - getStateLabel (video: Video) { - let suffix: string - - if (video.privacy.id !== VideoPrivacy.PRIVATE && video.state.id === VideoState.PUBLISHED) { - suffix = this.i18n('Published') - } else if (video.scheduledUpdate) { - const updateAt = new Date(video.scheduledUpdate.updateAt.toString()).toLocaleString(this.localeId) - suffix = this.i18n('Publication scheduled on ') + updateAt - } else if (video.state.id === VideoState.TO_TRANSCODE && video.waitTranscoding === true) { - suffix = this.i18n('Waiting transcoding') - } else if (video.state.id === VideoState.TO_TRANSCODE) { - suffix = this.i18n('To transcode') - } else if (video.state.id === VideoState.TO_IMPORT) { - suffix = this.i18n('To import') - } else { - return '' - } - - return ' - ' + suffix - } - - protected buildVideoHeight () { - // In account videos, the video height is fixed - return this.baseVideoHeight - } - - private spliceVideosById (id: number) { - for (const key of Object.keys(this.loadedPages)) { - const videos: Video[] = this.loadedPages[ key ] - const index = videos.findIndex(v => v.id === id) - - if (index !== -1) { - videos.splice(index, 1) - return - } - } + private removeVideoFromArray (id: number) { + this.videos = this.videos.filter(v => v.id !== id) } }