Browse Source

Merge pull request #9620 from ArtemDzhereleiko/AD/bug-fix/alarm-table/infinite-loading

Fixed infinity alarm loading on unresolved data sources
pull/9782/head
Igor Kulikov 3 years ago
committed by GitHub
parent
commit
b5050ee0b2
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      ui-ngx/src/app/core/api/alarm-data.service.ts

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

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

Loading…
Cancel
Save