From 5b3be818867a6c512982757e14070efaae868597 Mon Sep 17 00:00:00 2001 From: YevhenBondarenko Date: Fri, 21 Apr 2023 18:41:23 +0200 Subject: [PATCH] renamed msg types --- .../rule/engine/filter/TbMsgTypeSwitchNode.java | 4 ++-- ui-ngx/src/app/shared/models/rule-node.models.ts | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeSwitchNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeSwitchNode.java index 40acee8ffa..036e09397b 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeSwitchNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeSwitchNode.java @@ -86,9 +86,9 @@ public class TbMsgTypeSwitchNode implements TbNode { } else if (msg.getType().equals(DataConstants.ALARM_CLEAR)) { relationType = "Alarm Cleared"; } else if (msg.getType().equals(DataConstants.ALARM_ASSIGN)) { - relationType = "Alarm Assigned"; + relationType = "Alarm Assign"; } else if (msg.getType().equals(DataConstants.ALARM_UNASSIGN)) { - relationType = "Alarm Unassigned"; + relationType = "Alarm Unassign"; } else if (msg.getType().equals(DataConstants.COMMENT_CREATED)) { relationType = "Comment Created"; } else if (msg.getType().equals(DataConstants.COMMENT_UPDATED)) { diff --git a/ui-ngx/src/app/shared/models/rule-node.models.ts b/ui-ngx/src/app/shared/models/rule-node.models.ts index 38394d2376..4b2f0e4c82 100644 --- a/ui-ngx/src/app/shared/models/rule-node.models.ts +++ b/ui-ngx/src/app/shared/models/rule-node.models.ts @@ -373,8 +373,8 @@ export enum MessageType { ATTRIBUTES_DELETED = 'ATTRIBUTES_DELETED', ALARM_ACKNOWLEDGED = 'ALARM_ACKNOWLEDGED', ALARM_CLEARED = 'ALARM_CLEARED', - ALARM_ASSIGNED = 'ALARM_ASSIGN', - ALARM_UNASSIGNED = 'ALARM_UNASSIGN', + ALARM_ASSIGN = 'ALARM_ASSIGN', + ALARM_UNASSIGN = 'ALARM_UNASSIGN', COMMENT_CREATED = 'COMMENT_CREATED', COMMENT_UPDATED = 'COMMENT_UPDATED', ENTITY_ASSIGNED_FROM_TENANT = 'ENTITY_ASSIGNED_FROM_TENANT', @@ -410,8 +410,8 @@ export const messageTypeNames = new Map( [MessageType.ATTRIBUTES_DELETED, 'Attributes Deleted'], [MessageType.ALARM_ACKNOWLEDGED, 'Alarm Acknowledged'], [MessageType.ALARM_CLEARED, 'Alarm Cleared'], - [MessageType.ALARM_ASSIGNED, 'Alarm Assigned'], - [MessageType.ALARM_UNASSIGNED, 'Alarm Unassigned'], + [MessageType.ALARM_ASSIGN, 'Alarm Assign'], + [MessageType.ALARM_UNASSIGN, 'Alarm Unassign'], [MessageType.COMMENT_CREATED, 'Comment Created'], [MessageType.COMMENT_UPDATED, 'Comment Updated'], [MessageType.ENTITY_ASSIGNED_FROM_TENANT, 'Entity Assigned From Tenant'],