Merge branch 'release/4.1.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / core / rest / rest-table.ts

diff --git a/client/src/app/core/rest/rest-table.ts b/client/src/app/core/rest/rest-table.ts
index 9baab8a3905591c0512742e1e8f325ee55f89aef..d8b0391876cf63ed53cccfdbb9233d823454c611 100644 (file)
--- a/client/src/app/core/rest/rest-table.ts
+++ b/client/src/app/core/rest/rest-table.ts
@@ -1,25 +1,22 @@
 import * as debug from 'debug'
 import { LazyLoadEvent, SortMeta } from 'primeng/api'
-import { Subject } from 'rxjs'
 import { ActivatedRoute, Router } from '@angular/router'
 import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage'
-import { RouteFilter } from '../routing'
 import { RestPagination } from './rest-pagination'
 
 const logger = debug('peertube:tables:RestTable')
 
-export abstract class RestTable extends RouteFilter {
+export abstract class RestTable {
 
   abstract totalRecords: number
   abstract sort: SortMeta
   abstract pagination: RestPagination
 
-  search: string
   rowsPerPageOptions = [ 10, 20, 50, 100 ]
   rowsPerPage = this.rowsPerPageOptions[0]
   expandedRows = {}
 
-  protected searchStream: Subject<string>
+  search: string
 
   protected route: ActivatedRoute
   protected router: Router
@@ -28,7 +25,6 @@ export abstract class RestTable extends RouteFilter {
 
   initialize () {
     this.loadSort()
-    this.initSearch()
   }
 
   loadSort () {
@@ -51,12 +47,16 @@ export abstract class RestTable extends RouteFilter {
       field: event.sortField
     }
 
+    this.rowsPerPage = event.rows
+
     this.pagination = {
       start: event.first,
       count: this.rowsPerPage
     }
 
-    this.loadData()
+    this.expandedRows = {}
+
+    this.reloadData()
     this.saveSort()
   }
 
@@ -64,23 +64,12 @@ export abstract class RestTable extends RouteFilter {
     peertubeLocalStorage.setItem(this.getSortLocalStorageKey(), JSON.stringify(this.sort))
   }
 
-  onPage (event: { first: number, rows: number }) {
-    logger('On page %o.', event)
-
-    if (this.rowsPerPage !== event.rows) {
-      this.rowsPerPage = event.rows
-      this.pagination = {
-        start: event.first,
-        count: this.rowsPerPage
-      }
-
-      this.loadData()
-    }
-
-    this.expandedRows = {}
+  onSearch (search: string) {
+    this.search = search
+    this.reloadData()
   }
 
-  protected abstract loadData (): void
+  protected abstract reloadData (): void
 
   private getSortLocalStorageKey () {
     return 'rest-table-sort-' + this.getIdentifier()