Browse Source

Fix: reset entity table sort and pagination on entities specific filtering changes

pull/2667/head
Igor Kulikov 7 years ago
parent
commit
4f92af63d5
  1. 2
      ui-ngx/src/app/modules/home/components/alarm/alarm-table-header.component.ts
  2. 4
      ui-ngx/src/app/modules/home/components/entity/entities-table.component.ts
  3. 2
      ui-ngx/src/app/modules/home/components/event/event-table-header.component.ts
  4. 2
      ui-ngx/src/app/modules/home/pages/asset/asset-table-header.component.ts
  5. 2
      ui-ngx/src/app/modules/home/pages/device/device-table-header.component.ts
  6. 2
      ui-ngx/src/app/modules/home/pages/entity-view/entity-view-table-header.component.ts

2
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);
}
}

4
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) {

2
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);
}
}

2
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);
}
}

2
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);
}
}

2
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);
}
}

Loading…
Cancel
Save