Merge branch 'release/5.0.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / shared / shared-custom-markup / peertube-custom-tags / videos-list-markup.component.ts

diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.ts b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.ts
index d4402dd9f75d9d43bc0ac94450ffe35b073e6bce..7d3498d4cb7a33bbddddc988ff21d3b57e32aa10 100644 (file)
--- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.ts
+++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.ts
@@ -1,11 +1,13 @@
-import { Component, Input, OnInit } from '@angular/core'
-import { AuthService } from '@app/core'
-import { VideoFilter, VideoSortField } from '@shared/models'
+import { finalize } from 'rxjs/operators'
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
+import { AuthService, Notifier } from '@app/core'
+import { VideoSortField } from '@shared/models'
 import { Video, VideoService } from '../../shared-main'
 import { MiniatureDisplayOptions } from '../../shared-video-miniature'
+import { CustomMarkupComponent } from './shared'
 
 /*
- * Markup component list videos depending on criterias
+ * Markup component list videos depending on criteria
 */
 
 @Component({
@@ -13,14 +15,19 @@ import { MiniatureDisplayOptions } from '../../shared-video-miniature'
   templateUrl: 'videos-list-markup.component.html',
   styleUrls: [ 'videos-list-markup.component.scss' ]
 })
-export class VideosListMarkupComponent implements OnInit {
+export class VideosListMarkupComponent implements CustomMarkupComponent, OnInit {
   @Input() sort: string
   @Input() categoryOneOf: number[]
   @Input() languageOneOf: string[]
   @Input() count: number
   @Input() onlyDisplayTitle: boolean
-  @Input() filter: VideoFilter
+  @Input() isLocal: boolean
+  @Input() isLive: boolean
   @Input() maxRows: number
+  @Input() channelHandle: string
+  @Input() accountHandle: string
+
+  @Output() loaded = new EventEmitter<boolean>()
 
   videos: Video[]
 
@@ -37,7 +44,8 @@ export class VideosListMarkupComponent implements OnInit {
 
   constructor (
     private auth: AuthService,
-    private videoService: VideoService
+    private videoService: VideoService,
+    private notifier: Notifier
   ) { }
 
   getUser () {
@@ -61,6 +69,16 @@ export class VideosListMarkupComponent implements OnInit {
       }
     }
 
+    return this.getVideosObservable()
+      .pipe(finalize(() => this.loaded.emit(true)))
+      .subscribe({
+        next: ({ data }) => this.videos = data,
+
+        error: err => this.notifier.error($localize`Error in videos list component: ${err.message}`)
+      })
+  }
+
+  getVideosObservable () {
     const options = {
       videoPagination: {
         currentPage: 1,
@@ -68,11 +86,16 @@ export class VideosListMarkupComponent implements OnInit {
       },
       categoryOneOf: this.categoryOneOf,
       languageOneOf: this.languageOneOf,
-      filter: this.filter,
-      sort: this.sort as VideoSortField
+      isLocal: this.isLocal,
+      isLive: this.isLive,
+      sort: this.sort as VideoSortField,
+      account: { nameWithHost: this.accountHandle },
+      videoChannel: { nameWithHost: this.channelHandle }
     }
 
-    this.videoService.getVideos(options)
-      .subscribe(({ data }) => this.videos = data)
+    if (this.channelHandle) return this.videoService.getVideoChannelVideos(options)
+    if (this.accountHandle) return this.videoService.getAccountVideos(options)
+
+    return this.videoService.getVideos(options)
   }
 }