From d0cbf4efd17081d4dfe168bf64295bfb5a1ef90c Mon Sep 17 00:00:00 2001
From: ViacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Tue, 27 Jun 2023 11:53:09 +0300
Subject: [PATCH 1/2] Add acknowledged and cleared properties to
 AlarmNotificationInfo

---
 .../notification/rule/trigger/AlarmTriggerProcessor.java        | 2 ++
 .../java/org/thingsboard/server/common/data/alarm/Alarm.java    | 1 -
 .../common/data/notification/info/AlarmNotificationInfo.java    | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/AlarmTriggerProcessor.java b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/AlarmTriggerProcessor.java
index d69d502aa2..a942dce736 100644
--- a/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/AlarmTriggerProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/AlarmTriggerProcessor.java
@@ -108,6 +108,8 @@ public class AlarmTriggerProcessor implements NotificationRuleTriggerProcessor<A
                 .alarmOriginatorName(alarmInfo.getOriginatorName())
                 .alarmSeverity(alarmInfo.getSeverity())
                 .alarmStatus(alarmInfo.getStatus())
+                .acknowledged(alarmInfo.isAcknowledged())
+                .cleared(alarmInfo.isCleared())
                 .alarmCustomerId(alarmInfo.getCustomerId())
                 .build();
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/Alarm.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/Alarm.java
index 34fec2cd82..c96b55b61d 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/Alarm.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/Alarm.java
@@ -153,7 +153,6 @@ public class Alarm extends BaseData<AlarmId> implements HasName, HasTenantId, Ha
     }
 
     public static AlarmStatus toStatus(boolean cleared, boolean acknowledged) {
-
         if (cleared) {
             return acknowledged ? AlarmStatus.CLEARED_ACK : AlarmStatus.CLEARED_UNACK;
         } else {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/AlarmNotificationInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/AlarmNotificationInfo.java
index d3af30907d..fd1b4ee0f8 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/AlarmNotificationInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/AlarmNotificationInfo.java
@@ -42,6 +42,8 @@ public class AlarmNotificationInfo implements RuleOriginatedNotificationInfo {
     private String alarmOriginatorName;
     private AlarmSeverity alarmSeverity;
     private AlarmStatus alarmStatus;
+    private boolean acknowledged;
+    private boolean cleared;
     private CustomerId alarmCustomerId;
 
     @Override

From c870e03eb2de4e7fa48e7f127fff58cfefc82209 Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Tue, 27 Jun 2023 17:36:20 +0300
Subject: [PATCH 2/2] UI: Hide alarm style in notification when alarm cleared

---
 .../shared/components/notification/notification.component.html  | 2 +-
 .../shared/components/notification/notification.component.ts    | 2 +-
 ui-ngx/src/app/shared/models/notification.models.ts             | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui-ngx/src/app/shared/components/notification/notification.component.html b/ui-ngx/src/app/shared/components/notification/notification.component.html
index 361d3589fb..b9ce3a840f 100644
--- a/ui-ngx/src/app/shared/components/notification/notification.component.html
+++ b/ui-ngx/src/app/shared/components/notification/notification.component.html
@@ -41,7 +41,7 @@
             matTooltip="{{ 'notification.mark-as-read' | translate }}" matTooltipPosition="above">
       <mat-icon>check_circle_outline</mat-icon>
     </button>
-    <div class="alarm-severity" *ngIf="notification.type === notificationType.ALARM"
+    <div class="alarm-severity" *ngIf="notification.type === notificationType.ALARM && !notification.info.cleared"
          [ngStyle]="{backgroundColor: alarmColorSeverity(0.06)}">
       <span [ngStyle]="notificationIconColor()" class="severity">
         {{alarmSeverityTranslations.get(notification.info.alarmSeverity) | translate}}
diff --git a/ui-ngx/src/app/shared/components/notification/notification.component.ts b/ui-ngx/src/app/shared/components/notification/notification.component.ts
index ad543c43c1..6e1ff508a7 100644
--- a/ui-ngx/src/app/shared/components/notification/notification.component.ts
+++ b/ui-ngx/src/app/shared/components/notification/notification.component.ts
@@ -139,7 +139,7 @@ export class NotificationComponent implements OnInit {
   }
 
   notificationColor(): string {
-    if (this.notification.type === NotificationType.ALARM) {
+    if (this.notification.type === NotificationType.ALARM && !this.notification.info.cleared) {
       return AlarmSeverityNotificationColors.get(this.notification.info.alarmSeverity);
     }
     return 'transparent';
diff --git a/ui-ngx/src/app/shared/models/notification.models.ts b/ui-ngx/src/app/shared/models/notification.models.ts
index 2cef7c6cc2..4d8a9cffcd 100644
--- a/ui-ngx/src/app/shared/models/notification.models.ts
+++ b/ui-ngx/src/app/shared/models/notification.models.ts
@@ -48,6 +48,8 @@ export interface NotificationInfo {
   alarmStatus?: AlarmStatus;
   alarmType?: string;
   stateEntityId?: EntityId;
+  acknowledged?: boolean;
+  cleared?: boolean;
 }
 
 export interface NotificationRequest extends Omit<BaseData<NotificationRequestId>, 'label'> {