From 238099689695c2fc139c6935b7203c1172d74488 Mon Sep 17 00:00:00 2001
From: Kalutka Zhenya <ykalytka@thingsboard.io>
Date: Thu, 8 Sep 2022 15:59:05 +0300
Subject: [PATCH 1/2] Add msg types

---
 .../src/app/shared/models/rule-node.models.ts | 36 +++++++++++++------
 1 file changed, 26 insertions(+), 10 deletions(-)

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 d4273c9911..6ff3b707de 100644
--- a/ui-ngx/src/app/shared/models/rule-node.models.ts
+++ b/ui-ngx/src/app/shared/models/rule-node.models.ts
@@ -347,6 +347,14 @@ export enum MessageType {
   POST_TELEMETRY_REQUEST = 'POST_TELEMETRY_REQUEST',
   TO_SERVER_RPC_REQUEST = 'TO_SERVER_RPC_REQUEST',
   RPC_CALL_FROM_SERVER_TO_DEVICE = 'RPC_CALL_FROM_SERVER_TO_DEVICE',
+  RPC_QUEUED = 'RPC_QUEUED',
+  RPC_SENT = 'RPC_SENT',
+  RPC_DELIVERED = 'RPC_DELIVERED',
+  RPC_SUCCESSFUL = 'RPC_SUCCESSFUL',
+  RPC_TIMEOUT = 'RPC_TIMEOUT',
+  RPC_EXPIRED = 'RPC_EXPIRED',
+  RPC_FAILED = 'RPC_FAILED',
+  RPC_DELETED = 'RPC_DELETED',
   ACTIVITY_EVENT = 'ACTIVITY_EVENT',
   INACTIVITY_EVENT = 'INACTIVITY_EVENT',
   CONNECT_EVENT = 'CONNECT_EVENT',
@@ -358,13 +366,13 @@ export enum MessageType {
   ENTITY_UNASSIGNED = 'ENTITY_UNASSIGNED',
   ATTRIBUTES_UPDATED = 'ATTRIBUTES_UPDATED',
   ATTRIBUTES_DELETED = 'ATTRIBUTES_DELETED',
+  ALARM_ACKNOWLEDGED = 'ALARM_ACKNOWLEDGED',
+  ALARM_CLEARED = 'ALARM_CLEARED',
+  ENTITY_ASSIGNED_FROM_TENANT = 'ENTITY_ASSIGNED_FROM_TENANT',
+  ENTITY_ASSIGNED_TO_TENANT = 'ENTITY_ASSIGNED_TO_TENANT',
   TIMESERIES_UPDATED = 'TIMESERIES_UPDATED',
   TIMESERIES_DELETED = 'TIMESERIES_DELETED',
-  RPC_QUEUED = 'RPC_QUEUED',
-  RPC_DELIVERED = 'RPC_DELIVERED',
-  RPC_SUCCESSFUL = 'RPC_SUCCESSFUL',
-  RPC_TIMEOUT = 'RPC_TIMEOUT',
-  RPC_FAILED = 'RPC_FAILED'
+  FAILURE = 'FAILURE'
 }
 
 export const messageTypeNames = new Map<MessageType, string>(
@@ -373,6 +381,14 @@ export const messageTypeNames = new Map<MessageType, string>(
     [MessageType.POST_TELEMETRY_REQUEST, 'Post telemetry'],
     [MessageType.TO_SERVER_RPC_REQUEST, 'RPC Request from Device'],
     [MessageType.RPC_CALL_FROM_SERVER_TO_DEVICE, 'RPC Request to Device'],
+    [MessageType.RPC_QUEUED, 'RPC Queued'],
+    [MessageType.RPC_SENT, 'RPC Sent'],
+    [MessageType.RPC_DELIVERED, 'RPC Delivered'],
+    [MessageType.RPC_SUCCESSFUL, 'RPC Successful'],
+    [MessageType.RPC_TIMEOUT, 'RPC Timeout'],
+    [MessageType.RPC_EXPIRED, 'RPC Expired'],
+    [MessageType.RPC_FAILED, 'RPC Failed'],
+    [MessageType.RPC_DELETED, 'RPC Deleted'],
     [MessageType.ACTIVITY_EVENT, 'Activity Event'],
     [MessageType.INACTIVITY_EVENT, 'Inactivity Event'],
     [MessageType.CONNECT_EVENT, 'Connect Event'],
@@ -384,13 +400,13 @@ export const messageTypeNames = new Map<MessageType, string>(
     [MessageType.ENTITY_UNASSIGNED, 'Entity Unassigned'],
     [MessageType.ATTRIBUTES_UPDATED, 'Attributes Updated'],
     [MessageType.ATTRIBUTES_DELETED, 'Attributes Deleted'],
+    [MessageType.ALARM_ACKNOWLEDGED, 'Alarm Acknowledged'],
+    [MessageType.ALARM_CLEARED, 'Alarm Cleared'],
+    [MessageType.ENTITY_ASSIGNED_FROM_TENANT, 'Entity Assigned From Tenant'],
+    [MessageType.ENTITY_ASSIGNED_TO_TENANT, 'Entity Assigned To Tenant'],
     [MessageType.TIMESERIES_UPDATED, 'Timeseries Updated'],
     [MessageType.TIMESERIES_DELETED, 'Timeseries Deleted'],
-    [MessageType.RPC_QUEUED, 'RPC Queued'],
-    [MessageType.RPC_DELIVERED, 'RPC Delivered'],
-    [MessageType.RPC_SUCCESSFUL, 'RPC Successful'],
-    [MessageType.RPC_TIMEOUT, 'RPC Timeout'],
-    [MessageType.RPC_FAILED, 'RPC Failed']
+    [MessageType.FAILURE, 'Failure']
   ]
 );
 

From 5816923b85b703924fbc1b0c3de99f94e023166a Mon Sep 17 00:00:00 2001
From: Kalutka Zhenya <ykalytka@thingsboard.io>
Date: Fri, 16 Sep 2022 12:50:10 +0300
Subject: [PATCH 2/2] delete "failure" type

---
 ui-ngx/src/app/shared/models/rule-node.models.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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 6ff3b707de..c6549f5b39 100644
--- a/ui-ngx/src/app/shared/models/rule-node.models.ts
+++ b/ui-ngx/src/app/shared/models/rule-node.models.ts
@@ -371,8 +371,7 @@ export enum MessageType {
   ENTITY_ASSIGNED_FROM_TENANT = 'ENTITY_ASSIGNED_FROM_TENANT',
   ENTITY_ASSIGNED_TO_TENANT = 'ENTITY_ASSIGNED_TO_TENANT',
   TIMESERIES_UPDATED = 'TIMESERIES_UPDATED',
-  TIMESERIES_DELETED = 'TIMESERIES_DELETED',
-  FAILURE = 'FAILURE'
+  TIMESERIES_DELETED = 'TIMESERIES_DELETED'
 }
 
 export const messageTypeNames = new Map<MessageType, string>(
@@ -405,8 +404,7 @@ export const messageTypeNames = new Map<MessageType, string>(
     [MessageType.ENTITY_ASSIGNED_FROM_TENANT, 'Entity Assigned From Tenant'],
     [MessageType.ENTITY_ASSIGNED_TO_TENANT, 'Entity Assigned To Tenant'],
     [MessageType.TIMESERIES_UPDATED, 'Timeseries Updated'],
-    [MessageType.TIMESERIES_DELETED, 'Timeseries Deleted'],
-    [MessageType.FAILURE, 'Failure']
+    [MessageType.TIMESERIES_DELETED, 'Timeseries Deleted']
   ]
 );