diff --git a/src/app/core/_components/tables/hashlists-table/hashlists-table.component.ts b/src/app/core/_components/tables/hashlists-table/hashlists-table.component.ts index a3b45405..89fa04b1 100644 --- a/src/app/core/_components/tables/hashlists-table/hashlists-table.component.ts +++ b/src/app/core/_components/tables/hashlists-table/hashlists-table.component.ts @@ -68,6 +68,7 @@ export class HashlistsTableComponent extends BaseTableComponent implements OnIni this.dataSource.loadAll(); // Reload all data if input is empty } } + handleBackendSqlFilter(event: string) { if (event && event.trim().length > 0) { this.filter(event); diff --git a/src/app/core/_components/tables/ht-table/ht-table.component.ts b/src/app/core/_components/tables/ht-table/ht-table.component.ts index 468fa5a8..c8420dfa 100644 --- a/src/app/core/_components/tables/ht-table/ht-table.component.ts +++ b/src/app/core/_components/tables/ht-table/ht-table.component.ts @@ -555,12 +555,18 @@ export class HTTableComponent implements OnInit, AfterViewInit, OnDestroy { * Reloads the data in the table and the bulk menu. */ reload(): void { - this.dataSource.reset(true); + this.dataSource.reset(false); + const tableSettings = this.uiSettings['uiConfig']['tableSettings'][this.name]; + this.dataSource.pageSize = tableSettings['page']; + this.dataSource.pageAfter = tableSettings['start']; + this.dataSource.pageBefore = tableSettings['before']; + this.dataSource.index = tableSettings['index']; + this.dataSource.totalItems = tableSettings['totalItems']; this.dataSource.reload(); if (this.bulkMenu) { this.bulkMenu.reload(); } - this.filterQueryFormGroup.get('textFilter').setValue(''); + this.filterQueryFormGroup.get('textFilter').setValue('', { emitEvent: false}); } clearSearchBox(): void { this.filterQueryFormGroup.get('textFilter').setValue(''); diff --git a/src/app/core/_datasources/hashlists.datasource.ts b/src/app/core/_datasources/hashlists.datasource.ts index f61ac025..6fad8ce7 100644 --- a/src/app/core/_datasources/hashlists.datasource.ts +++ b/src/app/core/_datasources/hashlists.datasource.ts @@ -108,6 +108,7 @@ export class HashlistsDataSource extends BaseDataSource { this.clearSelection(); this.loadAll(); } + clearFilter(): void { this._currentFilter = null; this.setPaginationConfig(this.pageSize, undefined, undefined, undefined, 0);