diff --git a/ui-ngx/src/app/core/api/alias-controller.ts b/ui-ngx/src/app/core/api/alias-controller.ts index d6d90eadad..af0e64ddb6 100644 --- a/ui-ngx/src/app/core/api/alias-controller.ts +++ b/ui-ngx/src/app/core/api/alias-controller.ts @@ -252,7 +252,7 @@ export class AliasController implements IAliasController { newDatasource.keyFilters = this.getKeyFilters(newDatasource.filterId); } if (newDatasource.type === DatasourceType.alarmCount) { - newDatasource.alarmFilter = this.entityService.resolveAlarmFilter(newDatasource.alarmFilterConfig); + newDatasource.alarmFilter = this.entityService.resolveAlarmFilter(newDatasource.alarmFilterConfig, false); } if (newDatasource.entityAliasId) { return this.getAliasInfo(newDatasource.entityAliasId).pipe( diff --git a/ui-ngx/src/app/core/http/entity.service.ts b/ui-ngx/src/app/core/http/entity.service.ts index a1e116b350..9c3570310e 100644 --- a/ui-ngx/src/app/core/http/entity.service.ts +++ b/ui-ngx/src/app/core/http/entity.service.ts @@ -1011,14 +1011,14 @@ export class EntityService { ); } - public resolveAlarmFilter(alarmFilterConfig?: AlarmFilterConfig): AlarmFilter { + public resolveAlarmFilter(alarmFilterConfig?: AlarmFilterConfig, searchPropagatedByDefault = true): AlarmFilter { const alarmFilter: AlarmFilter = {}; if (alarmFilterConfig) { alarmFilter.typeList = alarmFilterConfig.typeList; alarmFilter.severityList = alarmFilterConfig.severityList; alarmFilter.statusList = alarmFilterConfig.statusList; alarmFilter.searchPropagatedAlarms = isDefined(alarmFilterConfig.searchPropagatedAlarms) ? - alarmFilterConfig.searchPropagatedAlarms : true; + alarmFilterConfig.searchPropagatedAlarms : searchPropagatedByDefault; if (alarmFilterConfig.assignedToCurrentUser) { const authUser = getCurrentAuthUser(this.store); alarmFilter.assigneeId = new UserId(authUser.userId); diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-table-config.ts b/ui-ngx/src/app/modules/home/components/alarm/alarm-table-config.ts index 3c06506dbd..1fc9545aea 100644 --- a/ui-ngx/src/app/modules/home/components/alarm/alarm-table-config.ts +++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-table-config.ts @@ -157,7 +157,7 @@ export class AlarmTableConfig extends EntityTableConfig } fetchAlarms(pageLink: TimePageLink): Observable> { - const alarmFilter = this.entityService.resolveAlarmFilter(this.alarmFilterConfig); + const alarmFilter = this.entityService.resolveAlarmFilter(this.alarmFilterConfig, false); const query = new AlarmQueryV2(this.entityId, pageLink, alarmFilter); switch (this.alarmsMode) { case AlarmsMode.ALL: