Browse Source

UI: Fixed alarm loaded

pull/9620/head
Artem Dzhereleiko 3 years ago
parent
commit
68160936f8
  1. 8
      ui-ngx/src/app/core/api/alarm-data.service.ts

8
ui-ngx/src/app/core/api/alarm-data.service.ts

@ -16,8 +16,8 @@
import { SubscriptionTimewindow } from '@shared/models/time/time.models';
import { Datasource, DatasourceType } from '@shared/models/widget.models';
import { PageData } from '@shared/models/page/page-data';
import { AlarmData, AlarmDataPageLink, KeyFilter } from '@shared/models/query/query.models';
import { emptyPageData, PageData } from '@shared/models/page/page-data';
import { AlarmData, AlarmDataPageLink, EntityData, KeyFilter } from '@shared/models/query/query.models';
import { Injectable } from '@angular/core';
import { TelemetryWebsocketService } from '@core/ws/telemetry-websocket.service';
import {
@ -26,6 +26,7 @@ import {
AlarmSubscriptionDataKey
} from '@core/api/alarm-data-subscription';
import { deepClone } from '@core/utils';
import { of } from 'rxjs';
export interface AlarmDataListener {
subscriptionTimewindow?: SubscriptionTimewindow;
@ -50,7 +51,8 @@ export class AlarmDataService {
const alarmSource = listener.alarmSource;
listener.alarmDataSubscriptionOptions = this.createAlarmSubscriptionOptions(listener, pageLink, keyFilters);
if (alarmSource.type === DatasourceType.entity && (!alarmSource.entityFilter || !pageLink)) {
return;
listener.alarmsLoaded(emptyPageData<AlarmData>(), 0, 0);
return of(null);
}
listener.subscription = new AlarmDataSubscription(listener, this.telemetryService);
return listener.subscription.subscribe();

Loading…
Cancel
Save