dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8832 from vvlladd28/feature/notification/clear-alarm/style

Browse Source 
Remove specify alarm notification style for cleared alarm notification
This commit is contained in:
Igor Kulikov 2023-06-28 13:19:43 +03:00 committed by GitHub
commit b563a68fb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/AlarmTriggerProcessor.java
View File

@ -108,6 +108,8 @@ public class AlarmTriggerProcessor implements NotificationRuleTriggerProcessor<A
.alarmOriginatorName(alarmInfo.getOriginatorName()) .alarmOriginatorName(alarmInfo.getOriginatorName())
.alarmSeverity(alarmInfo.getSeverity()) .alarmSeverity(alarmInfo.getSeverity())
.alarmStatus(alarmInfo.getStatus()) .alarmStatus(alarmInfo.getStatus())
.acknowledged(alarmInfo.isAcknowledged())
.cleared(alarmInfo.isCleared())
.alarmCustomerId(alarmInfo.getCustomerId()) .alarmCustomerId(alarmInfo.getCustomerId())
.build(); .build();
} }

1
common/data/src/main/java/org/thingsboard/server/common/data/alarm/Alarm.java
View File

@ -153,7 +153,6 @@ public class Alarm extends BaseData<AlarmId> implements HasName, HasTenantId, Ha
} }
public static AlarmStatus toStatus(boolean cleared, boolean acknowledged) { public static AlarmStatus toStatus(boolean cleared, boolean acknowledged) {
if (cleared) { if (cleared) {
return acknowledged ? AlarmStatus.CLEARED_ACK : AlarmStatus.CLEARED_UNACK; return acknowledged ? AlarmStatus.CLEARED_ACK : AlarmStatus.CLEARED_UNACK;
} else { } else {

2
common/data/src/main/java/org/thingsboard/server/common/data/notification/info/AlarmNotificationInfo.java
View File

@ -42,6 +42,8 @@ public class AlarmNotificationInfo implements RuleOriginatedNotificationInfo {
private String alarmOriginatorName; private String alarmOriginatorName;
private AlarmSeverity alarmSeverity; private AlarmSeverity alarmSeverity;
private AlarmStatus alarmStatus; private AlarmStatus alarmStatus;
private boolean acknowledged;
private boolean cleared;
private CustomerId alarmCustomerId; private CustomerId alarmCustomerId;
@Override @Override

2
ui-ngx/src/app/shared/components/notification/notification.component.html
View File

@ -41,7 +41,7 @@
matTooltip="{{ 'notification.mark-as-read' | translate }}" matTooltipPosition="above"> matTooltip="{{ 'notification.mark-as-read' | translate }}" matTooltipPosition="above">
<mat-icon>check_circle_outline</mat-icon> <mat-icon>check_circle_outline</mat-icon>
</button> </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)}"> [ngStyle]="{backgroundColor: alarmColorSeverity(0.06)}">
<span [ngStyle]="notificationIconColor()" class="severity"> <span [ngStyle]="notificationIconColor()" class="severity">
{{alarmSeverityTranslations.get(notification.info.alarmSeverity) | translate}} {{alarmSeverityTranslations.get(notification.info.alarmSeverity) | translate}}

2
ui-ngx/src/app/shared/components/notification/notification.component.ts
View File

@ -139,7 +139,7 @@ export class NotificationComponent implements OnInit {
} }
notificationColor(): string { 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 AlarmSeverityNotificationColors.get(this.notification.info.alarmSeverity);
} }
return 'transparent'; return 'transparent';

2
ui-ngx/src/app/shared/models/notification.models.ts
View File

@ -48,6 +48,8 @@ export interface NotificationInfo {
alarmStatus?: AlarmStatus; alarmStatus?: AlarmStatus;
alarmType?: string; alarmType?: string;
stateEntityId?: EntityId; stateEntityId?: EntityId;
acknowledged?: boolean;
cleared?: boolean;
} }
export interface NotificationRequest extends Omit<BaseData<NotificationRequestId>, 'label'> { export interface NotificationRequest extends Omit<BaseData<NotificationRequestId>, 'label'> {