Restore videos list components

3 files changed, 59 insertions, 243 deletions

diff --git a/client/src/app/shared/video/abstract-video-list.html b/client/src/app/shared/video/abstract-video-list.html
index 1f97bc389..e134654a3 100644
--- a/client/src/app/shared/video/abstract-video-list.html
+++ b/client/src/app/shared/video/abstract-video-list.html
@@ -19,13 +19,10 @@
 
   <div class="no-results" i18n *ngIf="pagination.totalItems === 0">No results.</div>
   <div
-    myInfiniteScroller
-    [pageHeight]="pageHeight" [firstLoadedPage]="firstLoadedPage"
-    (nearOfTop)="onNearOfTop()" (nearOfBottom)="onNearOfBottom()" (pageChanged)="onPageChanged($event)"
-    class="videos" #videosElement
+    myInfiniteScroller (nearOfBottom)="onNearOfBottom()" [autoInit]="true"
+    class="videos"
   >
-    <div *ngFor="let videos of videoPages; trackBy: pageByVideoId" class="videos-page">
-      <my-video-miniature *ngFor="let video of videos; trackBy: videoById" [video]="video" [user]="user" [ownerDisplayType]="ownerDisplayType"></my-video-miniature>
-    </div>
+    <my-video-miniature *ngFor="let video of videos; trackBy: videoById" [video]="video" [user]="user" [ownerDisplayType]="ownerDisplayType">
+    </my-video-miniature>
   </div>
 </div>
diff --git a/client/src/app/shared/video/abstract-video-list.ts b/client/src/app/shared/video/abstract-video-list.ts
index 2cd5bc393..467f629ea 100644
--- a/client/src/app/shared/video/abstract-video-list.ts
+++ b/client/src/app/shared/video/abstract-video-list.ts
@@ -1,66 +1,52 @@
 import { debounceTime } from 'rxjs/operators'
-import { ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core'
+import { OnDestroy, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
-import { Location } from '@angular/common'
-import { InfiniteScrollerDirective } from '@app/shared/video/infinite-scroller.directive'
 import { fromEvent, Observable, Subscription } from 'rxjs'
 import { AuthService } from '../../core/auth'
 import { ComponentPagination } from '../rest/component-pagination.model'
 import { VideoSortField } from './sort-field.type'
 import { Video } from './video.model'
-import { I18n } from '@ngx-translate/i18n-polyfill'
 import { ScreenService } from '@app/shared/misc/screen.service'
 import { OwnerDisplayType } from '@app/shared/video/video-miniature.component'
 import { Syndication } from '@app/shared/video/syndication.model'
-import { Notifier } from '@app/core'
-
-export abstract class AbstractVideoList implements OnInit, OnDestroy {
-  private static LINES_PER_PAGE = 4
-
-  @ViewChild('videosElement') videosElement: ElementRef
-  @ViewChild(InfiniteScrollerDirective) infiniteScroller: InfiniteScrollerDirective
+import { Notifier, ServerService } from '@app/core'
+import { DisableForReuseHook } from '@app/core/routing/disable-for-reuse-hook'
 
+export abstract class AbstractVideoList implements OnInit, OnDestroy, DisableForReuseHook {
   pagination: ComponentPagination = {
     currentPage: 1,
-    itemsPerPage: 10,
+    itemsPerPage: 25,
     totalItems: null
   }
   sort: VideoSortField = '-publishedAt'
+
   categoryOneOf?: number
   defaultSort: VideoSortField = '-publishedAt'
+
   syndicationItems: Syndication[] = []
 
   loadOnInit = true
   marginContent = true
-  pageHeight: number
-  videoWidth: number
-  videoHeight: number
-  videoPages: Video[][] = []
+  videos: Video[] = []
   ownerDisplayType: OwnerDisplayType = 'account'
-  firstLoadedPage: number
   displayModerationBlock = false
   titleTooltip: string
 
-  protected baseVideoWidth = 238
-  protected baseVideoHeight = 225
+  disabled = false
 
   protected abstract notifier: Notifier
   protected abstract authService: AuthService
-  protected abstract router: Router
   protected abstract route: ActivatedRoute
+  protected abstract serverService: ServerService
   protected abstract screenService: ScreenService
-  protected abstract i18n: I18n
-  protected abstract location: Location
-  protected abstract currentRoute: string
+  protected abstract router: Router
   abstract titlePage: string
 
-  protected loadedPages: { [ id: number ]: Video[] } = {}
-  protected loadingPage: { [ id: number ]: boolean } = {}
-  protected otherRouteParams = {}
-
   private resizeSubscription: Subscription
+  private angularState: number
+
+  abstract getVideosObservable (page: number): Observable<{ videos: Video[], totalVideos: number }>
 
-  abstract getVideosObservable (page: number): Observable<{ videos: Video[], totalVideos: number}>
   abstract generateSyndicationList (): void
 
   get user () {
@@ -77,207 +63,87 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy {
       .subscribe(() => this.calcPageSizes())
 
     this.calcPageSizes()
-    if (this.loadOnInit === true) this.loadMoreVideos(this.pagination.currentPage)
+    if (this.loadOnInit === true) this.loadMoreVideos()
   }
 
   ngOnDestroy () {
     if (this.resizeSubscription) this.resizeSubscription.unsubscribe()
   }
 
-  pageByVideoId (index: number, page: Video[]) {
-    // Video are unique in all pages
-    return page.length !== 0 ? page[0].id : 0
+  disableForReuse () {
+    this.disabled = true
   }
 
-  videoById (index: number, video: Video) {
-    return video.id
+  enabledForReuse () {
+    this.disabled = false
   }
 
-  onNearOfTop () {
-    this.previousPage()
+  videoById (index: number, video: Video) {
+    return video.id
   }
 
   onNearOfBottom () {
-    if (this.hasMoreVideos()) {
-      this.nextPage()
-    }
-  }
+    if (this.disabled) return
 
-  onPageChanged (page: number) {
-    this.pagination.currentPage = page
-    this.setNewRouteParams()
-  }
+    // Last page
+    if (this.pagination.totalItems <= (this.pagination.currentPage * this.pagination.itemsPerPage)) return
 
-  reloadVideos () {
-    this.loadedPages = {}
-    this.loadMoreVideos(this.pagination.currentPage)
-  }
-
-  loadMoreVideos (page: number, loadOnTop = false) {
-    this.adjustVideoPageHeight()
+    this.pagination.currentPage += 1
 
-    const currentY = window.scrollY
+    this.setScrollRouteParams()
 
-    if (this.loadedPages[page] !== undefined) return
-    if (this.loadingPage[page] === true) return
+    this.loadMoreVideos()
+  }
 
-    this.loadingPage[page] = true
-    const observable = this.getVideosObservable(page)
+  loadMoreVideos () {
+    const observable = this.getVideosObservable(this.pagination.currentPage)
 
     observable.subscribe(
       ({ videos, totalVideos }) => {
-        this.loadingPage[page] = false
-
-        if (this.firstLoadedPage === undefined || this.firstLoadedPage > page) this.firstLoadedPage = page
-
-        // Paging is too high, return to the first one
-        if (this.pagination.currentPage > 1 && totalVideos <= ((this.pagination.currentPage - 1) * this.pagination.itemsPerPage)) {
-          this.pagination.currentPage = 1
-          this.setNewRouteParams()
-          return this.reloadVideos()
-        }
-
-        this.loadedPages[page] = videos
-        this.buildVideoPages()
         this.pagination.totalItems = totalVideos
-
-        // Initialize infinite scroller now we loaded the first page
-        if (Object.keys(this.loadedPages).length === 1) {
-          // Wait elements creation
-          setTimeout(() => {
-            this.infiniteScroller.initialize()
-
-            // At our first load, we did not load the first page
-            // Load the previous page so the user can move on the top (and browser previous pages)
-            if (this.pagination.currentPage > 1) this.loadMoreVideos(this.pagination.currentPage - 1, true)
-          }, 500)
-        }
-
-        // Insert elements on the top but keep the scroll in the previous position
-        if (loadOnTop) setTimeout(() => { window.scrollTo(0, currentY + this.pageHeight) }, 0)
+        this.videos = this.videos.concat(videos)
       },
-      error => {
-        this.loadingPage[page] = false
-        this.notifier.error(error.message)
-      }
-    )
-  }
-
-  toggleModerationDisplay () {
-    throw new Error('toggleModerationDisplay is not implemented')
-  }
 
-  protected hasMoreVideos () {
-    // No results
-    if (this.pagination.totalItems === 0) return false
-
-    // Not loaded yet
-    if (!this.pagination.totalItems) return true
-
-    const maxPage = this.pagination.totalItems / this.pagination.itemsPerPage
-    return maxPage > this.maxPageLoaded()
-  }
-
-  protected previousPage () {
-    const min = this.minPageLoaded()
-
-    if (min > 1) {
-      this.loadMoreVideos(min - 1, true)
-    }
+      error => this.notifier.error(error.message)
+    )
   }
 
-  protected nextPage () {
-    this.loadMoreVideos(this.maxPageLoaded() + 1)
+  reloadVideos () {
+    this.pagination.currentPage = 1
+    this.videos = []
+    this.loadMoreVideos()
   }
 
-  protected buildRouteParams () {
-    // There is always a sort and a current page
-    const params = {
-      sort: this.sort,
-      page: this.pagination.currentPage
-    }
-
-    return Object.assign(params, this.otherRouteParams)
+  toggleModerationDisplay () {
+    throw new Error('toggleModerationDisplay is not implemented')
   }
 
   protected loadRouteParams (routeParams: { [ key: string ]: any }) {
-    this.sort = routeParams['sort'] as VideoSortField || this.defaultSort
-    this.categoryOneOf = routeParams['categoryOneOf']
-    if (routeParams['page'] !== undefined) {
-      this.pagination.currentPage = parseInt(routeParams['page'], 10)
-    } else {
-      this.pagination.currentPage = 1
-    }
-  }
-
-  protected setNewRouteParams () {
-    const paramsObject = this.buildRouteParams()
-
-    const queryParams = Object.keys(paramsObject)
-                              .map(p => p + '=' + paramsObject[p])
-                              .join('&')
-    this.location.replaceState(this.currentRoute, queryParams)
-  }
-
-  protected buildVideoPages () {
-    this.videoPages = Object.values(this.loadedPages)
-  }
-
-  protected adjustVideoPageHeight () {
-    const numberOfPagesLoaded = Object.keys(this.loadedPages).length
-    if (!numberOfPagesLoaded) return
-
-    this.pageHeight = this.videosElement.nativeElement.offsetHeight / numberOfPagesLoaded
-  }
-
-  protected buildVideoHeight () {
-    // Same ratios than base width/height
-    return this.videosElement.nativeElement.offsetWidth * (this.baseVideoHeight / this.baseVideoWidth)
-  }
-
-  private minPageLoaded () {
-    return Math.min(...Object.keys(this.loadedPages).map(e => parseInt(e, 10)))
-  }
-
-  private maxPageLoaded () {
-    return Math.max(...Object.keys(this.loadedPages).map(e => parseInt(e, 10)))
+    this.sort = routeParams[ 'sort' ] as VideoSortField || this.defaultSort
+    this.categoryOneOf = routeParams[ 'categoryOneOf' ]
+    this.angularState = routeParams[ 'a-state' ]
   }
 
   private calcPageSizes () {
-    if (this.screenService.isInMobileView() || this.baseVideoWidth === -1) {
+    if (this.screenService.isInMobileView()) {
       this.pagination.itemsPerPage = 5
-
-      // Video takes all the width
-      this.videoWidth = -1
-      this.videoHeight = this.buildVideoHeight()
-      this.pageHeight = this.pagination.itemsPerPage * this.videoHeight
-    } else {
-      this.videoWidth = this.baseVideoWidth
-      this.videoHeight = this.baseVideoHeight
-
-      const videosWidth = this.videosElement.nativeElement.offsetWidth
-      this.pagination.itemsPerPage = Math.floor(videosWidth / this.videoWidth) * AbstractVideoList.LINES_PER_PAGE
-      this.pageHeight = this.videoHeight * AbstractVideoList.LINES_PER_PAGE
     }
+  }
 
-    // Rebuild pages because maybe we modified the number of items per page
-    const videos = [].concat(...this.videoPages)
-    this.loadedPages = {}
+  private setScrollRouteParams () {
+    // Already set
+    if (this.angularState) return
 
-    let i = 1
-    // Don't include the last page if it not complete
-    while (videos.length >= this.pagination.itemsPerPage && i < 10000) { // 10000 -> Hard limit in case of infinite loop
-      this.loadedPages[i] = videos.splice(0, this.pagination.itemsPerPage)
-      i++
-    }
+    this.angularState = 42
 
-    // Re fetch the last page
-    if (videos.length !== 0) {
-      this.loadMoreVideos(i)
-    } else {
-      this.buildVideoPages()
+    const queryParams = {
+      'a-state': this.angularState,
+      categoryOneOf: this.categoryOneOf
     }
 
-    console.log('Rebuilt pages with %s elements per page.', this.pagination.itemsPerPage)
+    let path = this.router.url
+    if (!path || path === '/') path = this.serverService.getConfig().instance.defaultClientRoute
+
+    this.router.navigate([ path ], { queryParams, replaceUrl: true, queryParamsHandling: 'merge' })
   }
 }
diff --git a/client/src/app/shared/video/infinite-scroller.directive.ts b/client/src/app/shared/video/infinite-scroller.directive.ts
index a9e75007c..5f8a1dd6e 100644
--- a/client/src/app/shared/video/infinite-scroller.directive.ts
+++ b/client/src/app/shared/video/infinite-scroller.directive.ts
@@ -6,24 +6,15 @@ import { fromEvent, Subscription } from 'rxjs'
   selector: '[myInfiniteScroller]'
 })
 export class InfiniteScrollerDirective implements OnInit, OnDestroy {
-  @Input() containerHeight: number
-  @Input() pageHeight: number
-  @Input() firstLoadedPage = 1
   @Input() percentLimit = 70
   @Input() autoInit = false
   @Input() onItself = false
 
   @Output() nearOfBottom = new EventEmitter<void>()
-  @Output() nearOfTop = new EventEmitter<void>()
-  @Output() pageChanged = new EventEmitter<number>()
 
   private decimalLimit = 0
   private lastCurrentBottom = -1
-  private lastCurrentTop = 0
   private scrollDownSub: Subscription
-  private scrollUpSub: Subscription
-  private pageChangeSub: Subscription
-  private middleScreen: number
   private container: HTMLElement
 
   constructor (private el: ElementRef) {
@@ -36,8 +27,6 @@ export class InfiniteScrollerDirective implements OnInit, OnDestroy {
 
   ngOnDestroy () {
     if (this.scrollDownSub) this.scrollDownSub.unsubscribe()
-    if (this.scrollUpSub) this.scrollUpSub.unsubscribe()
-    if (this.pageChangeSub) this.pageChangeSub.unsubscribe()
   }
 
   initialize () {
@@ -45,8 +34,6 @@ export class InfiniteScrollerDirective implements OnInit, OnDestroy {
       this.container = this.el.nativeElement
     }
 
-    this.middleScreen = window.innerHeight / 2
-
     // Emit the last value
     const throttleOptions = { leading: true, trailing: true }
 
@@ -72,40 +59,6 @@ export class InfiniteScrollerDirective implements OnInit, OnDestroy {
         filter(({ current, maximumScroll }) => maximumScroll <= 0 || (current / maximumScroll) > this.decimalLimit)
       )
       .subscribe(() => this.nearOfBottom.emit())
-
-    // Scroll up
-    this.scrollUpSub = scrollObservable
-      .pipe(
-        // Check we scroll up
-        filter(({ current }) => {
-          const res = this.lastCurrentTop > current
-
-          this.lastCurrentTop = current
-          return res
-        }),
-        filter(({ current, maximumScroll }) => {
-          return current !== 0 && (1 - (current / maximumScroll)) > this.decimalLimit
-        })
-      )
-      .subscribe(() => this.nearOfTop.emit())
-
-    // Page change
-    this.pageChangeSub = scrollObservable
-      .pipe(
-        distinct(),
-        map(({ current }) => this.calculateCurrentPage(current)),
-        distinctUntilChanged()
-      )
-      .subscribe(res => this.pageChanged.emit(res))
-  }
-
-  private calculateCurrentPage (current: number) {
-    const scrollY = current + this.middleScreen
-
-    const page = Math.max(1, Math.ceil(scrollY / this.pageHeight))
-
-    // Offset page
-    return page + (this.firstLoadedPage - 1)
   }
 
   private getScrollInfo () {