Browse Source

Merge bb68166929 into d4329f3b7c

pull/15760/merge
Burak Soykan 3 days ago
committed by GitHub
parent
commit
22dda40ebf
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 3
      ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.ts
  2. 3
      ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-table-widget.component.ts

3
ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.ts

@ -727,8 +727,7 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
? (key.type === EntityKeyType.ENTITY_FIELD || key.type === EntityKeyType.ALARM_FIELD ? 'entityField'
: key.type === EntityKeyType.TIME_SERIES ? 'timeseries' : 'attribute')
: 'entityField';
const keyFilters: KeyFilter[] = null; // TODO:
this.alarmsDatasource.loadAlarms(this.pageLink, sortOrderLabel, sortColumnType, keyFilters);
this.alarmsDatasource.loadAlarms(this.pageLink, sortOrderLabel, sortColumnType, null);
this.ctx.detectChanges();
}

3
ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-table-widget.component.ts

@ -621,8 +621,7 @@ export class EntitiesTableWidgetComponent extends PageComponent implements OnIni
? (key.type === EntityKeyType.ENTITY_FIELD ? 'entityField'
: key.type === EntityKeyType.TIME_SERIES ? 'timeseries' : 'attribute')
: 'entityField';
const keyFilters: KeyFilter[] = null; // TODO:
this.entityDatasource.loadEntities(this.pageLink, sortOrderLabel, sortColumnType, keyFilters);
this.entityDatasource.loadEntities(this.pageLink, sortOrderLabel, sortColumnType, null);
this.ctx.detectChanges();
}

Loading…
Cancel
Save