From 4f92af63d51e48600a38788c88572edb6ea38126 Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Thu, 23 Apr 2020 13:40:02 +0300
Subject: [PATCH] Fix: reset entity table sort and pagination on entities
 specific filtering changes

---
 .../home/components/alarm/alarm-table-header.component.ts     | 2 +-
 .../home/components/entity/entities-table.component.ts        | 4 ++--
 .../home/components/event/event-table-header.component.ts     | 2 +-
 .../modules/home/pages/asset/asset-table-header.component.ts  | 2 +-
 .../home/pages/device/device-table-header.component.ts        | 2 +-
 .../pages/entity-view/entity-view-table-header.component.ts   | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-table-header.component.ts b/ui-ngx/src/app/modules/home/components/alarm/alarm-table-header.component.ts
index 96633c1c3c..ff27e6cf8e 100644
--- a/ui-ngx/src/app/modules/home/components/alarm/alarm-table-header.component.ts
+++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-table-header.component.ts
@@ -43,6 +43,6 @@ export class AlarmTableHeaderComponent extends EntityTableHeaderComponent<AlarmI
 
   searchStatusChanged(searchStatus: AlarmSearchStatus) {
     this.alarmTableConfig.searchStatus = searchStatus;
-    this.alarmTableConfig.table.updateData();
+    this.alarmTableConfig.table.resetSortAndFilter(true, true);
   }
 }
diff --git a/ui-ngx/src/app/modules/home/components/entity/entities-table.component.ts b/ui-ngx/src/app/modules/home/components/entity/entities-table.component.ts
index 80a79b51d4..fadd508995 100644
--- a/ui-ngx/src/app/modules/home/components/entity/entities-table.component.ts
+++ b/ui-ngx/src/app/modules/home/components/entity/entities-table.component.ts
@@ -434,9 +434,9 @@ export class EntitiesTableComponent extends PageComponent implements AfterViewIn
     this.updateData();
   }
 
-  resetSortAndFilter(update: boolean = true) {
+  resetSortAndFilter(update: boolean = true, preserveTimewindow: boolean = false) {
     this.pageLink.textSearch = null;
-    if (this.entitiesTableConfig.useTimePageLink) {
+    if (this.entitiesTableConfig.useTimePageLink && !preserveTimewindow) {
       this.timewindow = historyInterval(DAY);
     }
     if (this.displayPagination) {
diff --git a/ui-ngx/src/app/modules/home/components/event/event-table-header.component.ts b/ui-ngx/src/app/modules/home/components/event/event-table-header.component.ts
index 7380f5f7b2..769f1e8585 100644
--- a/ui-ngx/src/app/modules/home/components/event/event-table-header.component.ts
+++ b/ui-ngx/src/app/modules/home/components/event/event-table-header.component.ts
@@ -40,6 +40,6 @@ export class EventTableHeaderComponent extends EntityTableHeaderComponent<Event>
 
   eventTypeChanged(eventType: EventType | DebugEventType) {
     this.eventTableConfig.eventType = eventType;
-    this.eventTableConfig.table.updateData();
+    this.eventTableConfig.table.resetSortAndFilter(true, true);
   }
 }
diff --git a/ui-ngx/src/app/modules/home/pages/asset/asset-table-header.component.ts b/ui-ngx/src/app/modules/home/pages/asset/asset-table-header.component.ts
index bb0700dad8..3c879e2eac 100644
--- a/ui-ngx/src/app/modules/home/pages/asset/asset-table-header.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/asset/asset-table-header.component.ts
@@ -36,7 +36,7 @@ export class AssetTableHeaderComponent extends EntityTableHeaderComponent<AssetI
 
   assetTypeChanged(assetType: string) {
     this.entitiesTableConfig.componentsData.assetType = assetType;
-    this.entitiesTableConfig.table.updateData();
+    this.entitiesTableConfig.table.resetSortAndFilter(true);
   }
 
 }
diff --git a/ui-ngx/src/app/modules/home/pages/device/device-table-header.component.ts b/ui-ngx/src/app/modules/home/pages/device/device-table-header.component.ts
index a8e060ad77..10eff975a5 100644
--- a/ui-ngx/src/app/modules/home/pages/device/device-table-header.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/device/device-table-header.component.ts
@@ -36,7 +36,7 @@ export class DeviceTableHeaderComponent extends EntityTableHeaderComponent<Devic
 
   deviceTypeChanged(deviceType: string) {
     this.entitiesTableConfig.componentsData.deviceType = deviceType;
-    this.entitiesTableConfig.table.updateData();
+    this.entitiesTableConfig.table.resetSortAndFilter(true);
   }
 
 }
diff --git a/ui-ngx/src/app/modules/home/pages/entity-view/entity-view-table-header.component.ts b/ui-ngx/src/app/modules/home/pages/entity-view/entity-view-table-header.component.ts
index 5e80aec3c1..104009ac4d 100644
--- a/ui-ngx/src/app/modules/home/pages/entity-view/entity-view-table-header.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/entity-view/entity-view-table-header.component.ts
@@ -36,7 +36,7 @@ export class EntityViewTableHeaderComponent extends EntityTableHeaderComponent<E
 
   entityViewTypeChanged(entityViewType: string) {
     this.entitiesTableConfig.componentsData.entityViewType = entityViewType;
-    this.entitiesTableConfig.table.updateData();
+    this.entitiesTableConfig.table.resetSortAndFilter(true);
   }
 
 }