Browse Source

renamed msg types

pull/8398/head
YevhenBondarenko 3 years ago
parent
commit
5b3be81886
  1. 4
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeSwitchNode.java
  2. 8
      ui-ngx/src/app/shared/models/rule-node.models.ts

4
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)) {

8
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, string>(
[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'],

Loading…
Cancel
Save