From d8341ebdf7ef69e3ee2e1fa9c4fc16ae43548992 Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Tue, 26 Jul 2022 17:38:22 +0300
Subject: [PATCH] UI: Changed event table for new "debug rule chain event" data
 model

---
 .../components/event/event-table-config.ts    | 33 +++++++++++++++++--
 ui-ngx/src/app/shared/models/event.models.ts  |  7 +++-
 .../assets/locale/locale.constant-en_US.json  |  1 +
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/event/event-table-config.ts b/ui-ngx/src/app/modules/home/components/event/event-table-config.ts
index 4d6e43a34a..0cb93b582e 100644
--- a/ui-ngx/src/app/modules/home/components/event/event-table-config.ts
+++ b/ui-ngx/src/app/modules/home/components/event/event-table-config.ts
@@ -225,7 +225,6 @@ export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> {
         );
         break;
       case DebugEventType.DEBUG_RULE_NODE:
-      case DebugEventType.DEBUG_RULE_CHAIN:
         this.columns[0].width = '100px';
         this.columns.push(
           new EntityTableColumn<Event>('type', 'event.type', '40px',
@@ -289,6 +288,29 @@ export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> {
             '40px')
         );
         break;
+      case DebugEventType.DEBUG_RULE_CHAIN:
+        this.columns[0].width = '100px';
+        this.columns.push(
+          new EntityActionTableColumn<Event>('message', 'event.message',
+            {
+              name: this.translate.instant('action.view'),
+              icon: 'more_horiz',
+              isEnabled: (entity) => entity.body.message ? entity.body.message.length > 0 : false,
+              onAction: ($event, entity) => this.showContent($event, entity.body.message,
+                'event.message')
+            },
+            '40px'),
+          new EntityActionTableColumn<Event>('error', 'event.error',
+            {
+              name: this.translate.instant('action.view'),
+              icon: 'more_horiz',
+              isEnabled: (entity) => entity.body.error && entity.body.error.length > 0,
+              onAction: ($event, entity) => this.showContent($event, entity.body.error,
+                'event.error')
+            },
+            '40px')
+        );
+        break;
     }
     if (updateTableColumns) {
       this.getTable().columnsUpdated(true);
@@ -339,11 +361,10 @@ export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> {
         );
         break;
       case DebugEventType.DEBUG_RULE_NODE:
-      case DebugEventType.DEBUG_RULE_CHAIN:
         this.filterColumns.push(
           {key: 'msgDirectionType', title: 'event.type'},
           {key: 'entityId', title: 'event.entity-id'},
-          {key: 'entityName', title: 'event.entity-type'},
+          {key: 'entityType', title: 'event.entity-type'},
           {key: 'msgType', title: 'event.message-type'},
           {key: 'relationType', title: 'event.relation-type'},
           {key: 'dataSearch', title: 'event.data'},
@@ -352,6 +373,12 @@ export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> {
           {key: 'errorStr', title: 'event.error'}
         );
         break;
+      case DebugEventType.DEBUG_RULE_CHAIN:
+        this.filterColumns.push(
+          {key: 'isError', title: 'event.error'},
+          {key: 'errorStr', title: 'event.error'}
+        );
+        break;
     }
   }
 
diff --git a/ui-ngx/src/app/shared/models/event.models.ts b/ui-ngx/src/app/shared/models/event.models.ts
index 7ed4203dce..89e93d4fa1 100644
--- a/ui-ngx/src/app/shared/models/event.models.ts
+++ b/ui-ngx/src/app/shared/models/event.models.ts
@@ -75,7 +75,12 @@ export interface DebugRuleNodeEventBody extends BaseEventBody {
   error: string;
 }
 
-export type EventBody = ErrorEventBody & LcEventEventBody & StatsEventBody & DebugRuleNodeEventBody;
+export interface DebugRuleChainEventBody extends BaseEventBody {
+  message: string;
+  error?: string;
+}
+
+export type EventBody = ErrorEventBody & LcEventEventBody & StatsEventBody & DebugRuleNodeEventBody & DebugRuleChainEventBody;
 
 export interface Event extends BaseData<EventId> {
   tenantId: TenantId;
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index fd1bc2d688..0ea7d08742 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -2012,6 +2012,7 @@
         "body": "Body",
         "method": "Method",
         "type": "Type",
+        "message": "Message",
         "message-id": "Message Id",
         "message-type": "Message Type",
         "data-type": "Data Type",