From 095e8913ac5fff1de993486d88998d7b0c3dfd7a Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Mon, 14 Jun 2021 19:39:22 +0300
Subject: [PATCH] UI: Revert code onRowClick function in table

---
 .../widget/lib/alarms-table-widget.component.ts           | 8 ++++----
 .../widget/lib/entities-table-widget.component.ts         | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.ts
index 7c7b006159..da9608e88c 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.ts
@@ -720,12 +720,12 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
   }
 
   public onRowClick($event: Event, alarm: AlarmDataInfo) {
+    if ($event) {
+      $event.stopPropagation();
+    }
+    this.alarmsDatasource.toggleCurrentAlarm(alarm);
     const descriptors = this.ctx.actionsApi.getActionDescriptors('rowClick');
     if (descriptors.length) {
-      if ($event) {
-        $event.stopPropagation();
-      }
-      this.alarmsDatasource.toggleCurrentAlarm(alarm);
       let entityId;
       let entityName;
       if (alarm && alarm.originator) {
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/entities-table-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/entities-table-widget.component.ts
index 470697c615..f1e554bb2b 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/entities-table-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/entities-table-widget.component.ts
@@ -661,13 +661,13 @@ export class EntitiesTableWidgetComponent extends PageComponent implements OnIni
   }
 
   public onRowClick($event: Event, entity: EntityData, isDouble?: boolean) {
+    if ($event) {
+      $event.stopPropagation();
+    }
+    this.entityDatasource.toggleCurrentEntity(entity);
     const actionSourceId = isDouble ? 'rowDoubleClick' : 'rowClick';
     const descriptors = this.ctx.actionsApi.getActionDescriptors(actionSourceId);
     if (descriptors.length) {
-      if ($event) {
-        $event.stopPropagation();
-      }
-      this.entityDatasource.toggleCurrentEntity(entity);
       let entityId;
       let entityName;
       let entityLabel;