From 68160936f8400d10b3794b1379db38ecddcd32a1 Mon Sep 17 00:00:00 2001 From: Artem Dzhereleiko Date: Mon, 13 Nov 2023 13:13:28 +0200 Subject: [PATCH 1/3] UI: Fixed alarm loaded --- ui-ngx/src/app/core/api/alarm-data.service.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ui-ngx/src/app/core/api/alarm-data.service.ts b/ui-ngx/src/app/core/api/alarm-data.service.ts index b65f69179b..1f98636f93 100644 --- a/ui-ngx/src/app/core/api/alarm-data.service.ts +++ b/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(), 0, 0); + return of(null); } listener.subscription = new AlarmDataSubscription(listener, this.telemetryService); return listener.subscription.subscribe(); From 89dbb7b54a4eeb71e974babd5aa0d5c6d6887dd5 Mon Sep 17 00:00:00 2001 From: Artem Dzhereleiko Date: Mon, 13 Nov 2023 13:18:22 +0200 Subject: [PATCH 2/3] UI: optimize imports --- ui-ngx/src/app/core/api/alarm-data.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui-ngx/src/app/core/api/alarm-data.service.ts b/ui-ngx/src/app/core/api/alarm-data.service.ts index 1f98636f93..86635b7799 100644 --- a/ui-ngx/src/app/core/api/alarm-data.service.ts +++ b/ui-ngx/src/app/core/api/alarm-data.service.ts @@ -17,7 +17,7 @@ import { SubscriptionTimewindow } from '@shared/models/time/time.models'; import { Datasource, DatasourceType } from '@shared/models/widget.models'; import { emptyPageData, PageData } from '@shared/models/page/page-data'; -import { AlarmData, AlarmDataPageLink, EntityData, KeyFilter } from '@shared/models/query/query.models'; +import { AlarmData, AlarmDataPageLink, KeyFilter } from '@shared/models/query/query.models'; import { Injectable } from '@angular/core'; import { TelemetryWebsocketService } from '@core/ws/telemetry-websocket.service'; import { From 910dde39ce8dbd0e3dcfde1a00e16eae6b08fcc5 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 5 Dec 2023 17:37:38 +0200 Subject: [PATCH 3/3] Update alarm-data.service.ts --- ui-ngx/src/app/core/api/alarm-data.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui-ngx/src/app/core/api/alarm-data.service.ts b/ui-ngx/src/app/core/api/alarm-data.service.ts index 86635b7799..283960ea8d 100644 --- a/ui-ngx/src/app/core/api/alarm-data.service.ts +++ b/ui-ngx/src/app/core/api/alarm-data.service.ts @@ -52,7 +52,7 @@ export class AlarmDataService { listener.alarmDataSubscriptionOptions = this.createAlarmSubscriptionOptions(listener, pageLink, keyFilters); if (alarmSource.type === DatasourceType.entity && (!alarmSource.entityFilter || !pageLink)) { listener.alarmsLoaded(emptyPageData(), 0, 0); - return of(null); + return; } listener.subscription = new AlarmDataSubscription(listener, this.telemetryService); return listener.subscription.subscribe();