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 6473e9ba064f500ba00f1af254a6c59fb379ea5f..7c2e7db6a1bbc5fc7668074d9c2a4087a67131ab 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,19 +1,20 @@
 import { finalize } from 'rxjs/operators'
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
 import { AuthService, Notifier } from '@app/core'
-import { VideoFilter, VideoSortField } from '@shared/models'
+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({
   selector: 'my-videos-list-markup',
   templateUrl: 'videos-list-markup.component.html',
-  styleUrls: [ 'videos-list-markup.component.scss' ]
+  styleUrls: [ 'videos-list-markup.component.scss' ],
+  changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class VideosListMarkupComponent implements CustomMarkupComponent, OnInit {
   @Input() sort: string
@@ -21,7 +22,7 @@ export class VideosListMarkupComponent implements CustomMarkupComponent, OnInit
   @Input() languageOneOf: string[]
   @Input() count: number
   @Input() onlyDisplayTitle: boolean
-  @Input() filter: VideoFilter
+  @Input() isLocal: boolean
   @Input() isLive: boolean
   @Input() maxRows: number
   @Input() channelHandle: string
@@ -45,7 +46,8 @@ export class VideosListMarkupComponent implements CustomMarkupComponent, OnInit
   constructor (
     private auth: AuthService,
     private videoService: VideoService,
-    private notifier: Notifier
+    private notifier: Notifier,
+    private cd: ChangeDetectorRef
   ) { }
 
   getUser () {
@@ -71,11 +73,14 @@ export class VideosListMarkupComponent implements CustomMarkupComponent, OnInit
 
     return this.getVideosObservable()
       .pipe(finalize(() => this.loaded.emit(true)))
-      .subscribe(
-        ({ data }) => this.videos = data,
+      .subscribe({
+        next: ({ data }) => {
+          this.videos = data
+          this.cd.markForCheck()
+        },
 
-        err => this.notifier.error($localize`Error in videos list component: ${err.message}`)
-      )
+        error: err => this.notifier.error($localize`Error in videos list component: ${err.message}`)
+      })
   }
 
   getVideosObservable () {
@@ -86,7 +91,7 @@ export class VideosListMarkupComponent implements CustomMarkupComponent, OnInit
       },
       categoryOneOf: this.categoryOneOf,
       languageOneOf: this.languageOneOf,
-      filter: this.filter,
+      isLocal: this.isLocal,
       isLive: this.isLive,
       sort: this.sort as VideoSortField,
       account: { nameWithHost: this.accountHandle },