ActivityPub-federated video streaming platform using P2P directly in your web browser
Fix restoring sort after search
Chocobozzzd3366bbaeb80
diff --git a/client/src/app/shared/shared-tables/table.component.ts b/client/src/app/shared/shared-tables/table.component.tsindex 93313834d6..5a1010553f 100644--- a/client/src/app/shared/shared-tables/table.component.ts+++ b/client/src/app/shared/shared-tables/table.component.ts@@ -150,7 +150,10 @@ export class TableComponent<Data, ColumnName = string, QueryParams extends TabletotalRecords = 0rowsPerPageOptions = [ 5, 10, 20, 50, 100 ]+sort: SortMeta = { field: undefined, order: -1 }+ saveSort: SortMeta+pagination: RestPaginationsearch: string@@ -169,12 +172,7 @@ export class TableComponent<Data, ColumnName = string, QueryParams extends Tableprivate routeSubscription: SubscriptionngOnInit (): void {- this.sort = {- field: this.defaultSort(),- order: this.defaultSortOrder() === 'desc'- ? -1- : 1- }+ this.setDefaultSort()this.pagination = {count: this.defaultRowsPerPage(),@@ -226,15 +224,25 @@ export class TableComponent<Data, ColumnName = string, QueryParams extends Table// ---------------------------------------------------------------------------- onSearch (search: string, useMatchSort = false) {- debugLogger('On search', { search, useMatchSort })+ onSearch (search: string, canUseMatchSort = false) {+ debugLogger('On search', { search, canUseMatchSort })this.search = search- if (useMatchSort) {- this.sort = {- field: 'match' as any,- order: -1+ if (this.search) {+ if (canUseMatchSort && this.sort.field !== 'match') {+ debugLogger('Saving previous sort on search', { saveSort: this.sort })++ this.saveSort = { ...this.sort }++ this.sort = { field: 'match', order: -1 }+ }+ } else if (this.sort.field === 'match') {+ if (this.saveSort) {+ this.sort = { ...this.saveSort }+ this.saveSort = undefined+ } else {+ this.setDefaultSort()}}@@ -265,6 +273,15 @@ export class TableComponent<Data, ColumnName = string, QueryParams extends Tablethis.expandedRows = {}}+ private setDefaultSort () {+ this.sort = {+ field: this.defaultSort(),+ order: this.defaultSortOrder() === 'desc'+ ? -1+ : 1+ }+ }+// ---------------------------------------------------------------------------saveSelectedColumns () {@@ -308,7 +325,10 @@ export class TableComponent<Data, ColumnName = string, QueryParams extends Table}private saveTableSettings () {- peertubeLocalStorage.setItem(this.getSortLocalStorageKey(), JSON.stringify(this.sort))+ if (this.sort.field !== 'match') {+ peertubeLocalStorage.setItem(this.getSortLocalStorageKey(), JSON.stringify(this.sort))+ }+peertubeLocalStorage.setItem(this.getCountLocalStorageKey(), JSON.stringify(this.pagination.count))}