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=84f022ad29b7afb6b97626f70a07e516160869b7;hb=f8c00564e7e66c7c9d65ea044a4c1485df0e4c7c;hp=bbe86af730e3e97abf7aeed516dfca8666d31fe1;hpb=e2409062dedf8856c56ef1bdc98ca623e21c4f3b;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 bbe86af73..84f022ad2 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,45 +1,50 @@ -import { concat, Observable } from 'rxjs' -import { tap, toArray } from 'rxjs/operators' -import { Component, Inject, LOCALE_ID, OnDestroy, OnInit, 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 { immutableAssign } from '@app/shared/misc/utils' -import { ComponentPagination } from '@app/shared/rest/component-pagination.model' -import { Notifier, ServerService } 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 { I18n } from '@ngx-translate/i18n-polyfill' -import { VideoPrivacy, VideoState } from '../../../../../shared/models/videos' -import { ScreenService } from '@app/shared/misc/screen.service' -import { VideoChangeOwnershipComponent } from './video-change-ownership/video-change-ownership.component' -import { MiniatureDisplayOptions } from '@app/shared/video/video-miniature.component' +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 { DropdownAction, Video, VideoService } from '@app/shared/shared-main' +import { LiveStreamInformationComponent } from '@app/shared/shared-video-live' +import { MiniatureDisplayOptions, OwnerDisplayType, SelectionType, VideosSelectionComponent } from '@app/shared/shared-video-miniature' +import { VideoSortField } from '@shared/models' +import { VideoChangeOwnershipComponent } from './modals/video-change-ownership.component' @Component({ selector: 'my-account-videos', templateUrl: './my-account-videos.component.html', styleUrls: [ './my-account-videos.component.scss' ] }) -export class MyAccountVideosComponent extends AbstractVideoList implements OnInit, OnDestroy { - @ViewChild('videoChangeOwnershipModal') videoChangeOwnershipModal: VideoChangeOwnershipComponent +export class MyAccountVideosComponent implements OnInit, DisableForReuseHook { + @ViewChild('videosSelection', { static: true }) videosSelection: VideosSelectionComponent + @ViewChild('videoChangeOwnershipModal', { static: true }) videoChangeOwnershipModal: VideoChangeOwnershipComponent + @ViewChild('liveStreamInformationModal', { static: true }) liveStreamInformationModal: LiveStreamInformationComponent titlePage: string - checkedVideos: { [ id: number ]: boolean } = {} + selection: SelectionType = {} pagination: ComponentPagination = { currentPage: 1, - itemsPerPage: 5, + itemsPerPage: 10, totalItems: null } miniatureDisplayOptions: MiniatureDisplayOptions = { date: true, views: true, - by: false, + by: true, privacyLabel: false, privacyText: true, state: true, blacklistInfo: true } + ownerDisplayType: OwnerDisplayType = 'videoChannel' + + videoActions: DropdownAction<{ video: Video }>[] = [] + + videos: Video[] = [] + videosSearch: string + videosSearchChanged = new Subject() + getVideosObservableFunction = this.getVideosObservable.bind(this) constructor ( protected router: Router, @@ -48,50 +53,56 @@ export class MyAccountVideosComponent extends AbstractVideoList implements OnIni protected authService: AuthService, protected notifier: Notifier, protected screenService: ScreenService, - 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') + this.titlePage = $localize`My videos` } ngOnInit () { - super.ngOnInit() - } + this.buildActions() - ngOnDestroy () { - super.ngOnDestroy() + this.videosSearchChanged + .pipe(debounceTime(500)) + .subscribe(() => { + this.videosSelection.reloadVideos() + }) } - abortSelectionMode () { - this.checkedVideos = {} + resetSearch () { + this.videosSearch = '' + this.onVideosSearchChanged() } - isInSelectionMode () { - return Object.keys(this.checkedVideos).some(k => this.checkedVideos[ k ] === true) + onVideosSearchChanged () { + this.videosSearchChanged.next() } - getVideosObservable (page: number) { - const newPagination = immutableAssign(this.pagination, { currentPage: page }) + disableForReuse () { + this.videosSelection.disableForReuse() + } - 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( - this.i18n('Do you really want to delete {{deleteLength}} videos?', { deleteLength: toDeleteVideosIds.length }), - this.i18n('Delete') + $localize`Do you really want to delete ${toDeleteVideosIds.length} videos?`, + $localize`Delete` ) if (res === false) return @@ -107,9 +118,8 @@ export class MyAccountVideosComponent extends AbstractVideoList implements OnIni .pipe(toArray()) .subscribe( () => { - this.notifier.success(this.i18n('{{deleteLength}} videos deleted.', { deleteLength: toDeleteVideosIds.length })) - - this.abortSelectionMode() + this.notifier.success($localize`${toDeleteVideosIds.length} videos deleted.`) + this.selection = {} }, err => this.notifier.error(err.message) @@ -118,49 +128,52 @@ export class MyAccountVideosComponent extends AbstractVideoList implements OnIni async deleteVideo (video: Video) { const res = await this.confirmService.confirm( - this.i18n('Do you really want to delete {{videoName}}?', { videoName: video.name }), - this.i18n('Delete') + $localize`Do you really want to delete ${video.name}?`, + $localize`Delete` ) if (res === false) return this.videoService.removeVideo(video.id) .subscribe( () => { - this.notifier.success(this.i18n('Video {{videoName}} deleted.', { videoName: video.name })) - this.reloadVideos() + this.notifier.success($localize`Video ${video.name} deleted.`) + this.removeVideoFromArray(video.id) }, error => this.notifier.error(error.message) ) } - changeOwnership (event: Event, video: Video) { - event.preventDefault() + changeOwnership (video: Video) { 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 + displayLiveInformation (video: Video) { + this.liveStreamInformationModal.show(video) } private removeVideoFromArray (id: number) { this.videos = this.videos.filter(v => v.id !== id) } + + private buildActions () { + this.videoActions = [ + { + label: $localize`Display live information`, + handler: ({ video }) => this.displayLiveInformation(video), + isDisplayed: ({ video }) => video.isLive, + iconName: 'live' + }, + { + label: $localize`Change ownership`, + handler: ({ video }) => this.changeOwnership(video), + iconName: 'ownership-change' + }, + { + label: $localize`Delete`, + handler: ({ video }) => this.deleteVideo(video), + iconName: 'delete' + } + ] + } }