From 7343afb876d213e178e39476b64baf4594a8f51c Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Thu, 9 Jul 2020 13:00:02 +0300
Subject: [PATCH] UI: Add alarmFields to AlarmDataQuery

---
 ui-ngx/src/app/core/api/alarm-data-subscription.ts | 6 ++++++
 ui-ngx/src/app/shared/models/query/query.models.ts | 1 +
 2 files changed, 7 insertions(+)

diff --git a/ui-ngx/src/app/core/api/alarm-data-subscription.ts b/ui-ngx/src/app/core/api/alarm-data-subscription.ts
index 9b05b680f8..bbdfa46861 100644
--- a/ui-ngx/src/app/core/api/alarm-data-subscription.ts
+++ b/ui-ngx/src/app/core/api/alarm-data-subscription.ts
@@ -91,6 +91,11 @@ export class AlarmDataSubscription {
       this.subscriber = new TelemetrySubscriber(this.telemetryService);
       this.alarmDataCommand = new AlarmDataCmd();
 
+      const alarmFields: Array<EntityKey> =
+        this.alarmDataSubscriptionOptions.dataKeys.filter(dataKey => dataKey.type === DataKeyType.alarm).map(
+          dataKey => ({ type: EntityKeyType.ALARM_FIELD, key: dataKey.name })
+        );
+
       const entityFields: Array<EntityKey> =
         this.alarmDataSubscriptionOptions.dataKeys.filter(dataKey => dataKey.type === DataKeyType.entityField).map(
           dataKey => ({ type: EntityKeyType.ENTITY_FIELD, key: dataKey.name })
@@ -116,6 +121,7 @@ export class AlarmDataSubscription {
         entityFilter: this.alarmDataSubscriptionOptions.entityFilter,
         pageLink: deepClone(this.alarmDataSubscriptionOptions.pageLink),
         keyFilters,
+        alarmFields,
         entityFields,
         latestValues
       };
diff --git a/ui-ngx/src/app/shared/models/query/query.models.ts b/ui-ngx/src/app/shared/models/query/query.models.ts
index 74d1a3e947..4136a86cd5 100644
--- a/ui-ngx/src/app/shared/models/query/query.models.ts
+++ b/ui-ngx/src/app/shared/models/query/query.models.ts
@@ -556,6 +556,7 @@ export interface EntityDataQuery extends AbstractDataQuery<EntityDataPageLink> {
 }
 
 export interface AlarmDataQuery extends AbstractDataQuery<AlarmDataPageLink> {
+  alarmFields?: Array<EntityKey>;
 }
 
 export interface TsValue {