From 19fe327cabc52c3fbb7ab18df281e89068459f07 Mon Sep 17 00:00:00 2001
From: rusikv <rvasylkiv@thingsboard.io>
Date: Tue, 7 Nov 2023 12:13:04 +0200
Subject: [PATCH] UI: added acknowldged and cleared properties to alarm ts
 model

---
 .../modules/home/components/alarm/alarm-table-config.ts   | 8 ++------
 .../widget/lib/alarm/alarms-table-widget.component.ts     | 6 ++----
 ui-ngx/src/app/shared/models/alarm.models.ts              | 4 ++++
 3 files changed, 8 insertions(+), 10 deletions(-)

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 15e3fb1952..865a1b8c8b 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
@@ -319,9 +319,7 @@ export class AlarmTableConfig extends EntityTableConfig<AlarmInfo, TimePageLink>
     if ($event) {
       $event.stopPropagation();
     }
-    const unacknowledgedAlarms = alarms.filter(alarm => {
-      return alarm.status === AlarmStatus.CLEARED_UNACK || alarm.status === AlarmStatus.ACTIVE_UNACK;
-    })
+    const unacknowledgedAlarms = alarms.filter(alarm => !alarm.acknowledged);
     let title = '';
     let content = '';
     if (!unacknowledgedAlarms.length) {
@@ -356,9 +354,7 @@ export class AlarmTableConfig extends EntityTableConfig<AlarmInfo, TimePageLink>
     if ($event) {
       $event.stopPropagation();
     }
-    const activeAlarms = alarms.filter(alarm => {
-      return alarm.status === AlarmStatus.ACTIVE_ACK || alarm.status === AlarmStatus.ACTIVE_UNACK;
-    })
+    const activeAlarms = alarms.filter(alarm => !alarm.cleared);
     let title = '';
     let content = '';
     if (!activeAlarms.length) {
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.ts
index 098f9a0939..b5907f2bf2 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.ts
@@ -889,8 +889,7 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
     }
     if (this.alarmsDatasource.selection.hasValue()) {
       const unacknowledgedAlarms = this.alarmsDatasource.selection.selected.filter(
-        (alarm) => alarm.id.id !== NULL_UUID && (alarm.status === AlarmStatus.CLEARED_UNACK ||
-          alarm.status === AlarmStatus.ACTIVE_UNACK)
+        alarm => alarm.id.id !== NULL_UUID && !alarm.acknowledged
       );
       let title = '';
       let content = '';
@@ -953,8 +952,7 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
     }
     if (this.alarmsDatasource.selection.hasValue()) {
       const activeAlarms = this.alarmsDatasource.selection.selected.filter(
-        (alarm) => alarm.id.id !== NULL_UUID && (alarm.status === AlarmStatus.ACTIVE_ACK ||
-          alarm.status === AlarmStatus.ACTIVE_UNACK)
+        alarm => alarm.id.id !== NULL_UUID && !alarm.cleared
       );
       let title = '';
       let content = '';
diff --git a/ui-ngx/src/app/shared/models/alarm.models.ts b/ui-ngx/src/app/shared/models/alarm.models.ts
index 49f780beeb..71d64f2df1 100644
--- a/ui-ngx/src/app/shared/models/alarm.models.ts
+++ b/ui-ngx/src/app/shared/models/alarm.models.ts
@@ -102,6 +102,8 @@ export interface Alarm extends BaseData<AlarmId> {
   originator: EntityId;
   severity: AlarmSeverity;
   status: AlarmStatus;
+  acknowledged: boolean;
+  cleared: boolean;
   startTs: number;
   endTs: number;
   ackTs: number;
@@ -181,6 +183,8 @@ export const simulatedAlarm: AlarmInfo = {
   type: 'TEMPERATURE',
   severity: AlarmSeverity.MAJOR,
   status: AlarmStatus.ACTIVE_UNACK,
+  acknowledged: false,
+  cleared: false,
   details: {
     message: 'Temperature is high!'
   },