From 9c961878ebb942b9e1c90d6b5afbcc0162a4d122 Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Tue, 3 Sep 2024 18:15:21 +0300
Subject: [PATCH] UI: Fixed process entity type in entity table widgets

---
 .../lib/entity/entities-table-widget.component.ts      | 10 ++++++----
 .../home/components/widget/lib/table-widget.models.ts  |  3 ++-
 .../en_US/widget/action/show_widget_action_cell_fn.md  |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-table-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-table-widget.component.ts
index c6c07fb1ad..ab25a96af1 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-table-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-table-widget.component.ts
@@ -49,7 +49,7 @@ import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
 import { BehaviorSubject, fromEvent, merge, Observable, Subject } from 'rxjs';
 import { emptyPageData, PageData } from '@shared/models/page/page-data';
 import { EntityId } from '@shared/models/id/entity-id';
-import { entityTypeTranslations } from '@shared/models/entity-type.models';
+import { EntityType, entityTypeTranslations } from '@shared/models/entity-type.models';
 import { debounceTime, distinctUntilChanged, map, takeUntil } from 'rxjs/operators';
 import { MatPaginator } from '@angular/material/paginator';
 import { MatSort, SortDirection } from '@angular/material/sort';
@@ -408,7 +408,9 @@ export class EntitiesTableWidgetComponent extends PageComponent implements OnIni
         } as EntityColumn
       );
       this.contentsInfo.entityType = {
-        useCellContentFunction: false
+        useCellContentFunction: true,
+        cellContentFunction: (entityType: EntityType) =>
+          entityType ? this.translate.instant(entityTypeTranslations.get(entityType).type) : ''
       };
       this.stylesInfo.entityType = {
         useCellStyleFunction: false
@@ -869,9 +871,9 @@ class EntityDatasource implements DataSource<EntityData> {
     }
     if (datasource.entityType) {
       entity.id.entityType = datasource.entityType;
-      entity.entityType = this.translate.instant(entityTypeTranslations.get(datasource.entityType).type);
+      entity.entityType = datasource.entityType;
     } else {
-      entity.entityType = '';
+      entity.entityType = null;
     }
     this.dataKeys.forEach((dataKey, index) => {
       const keyData = data[index].data;
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/table-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/table-widget.models.ts
index 33428e949d..dcb40cd85d 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/table-widget.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/table-widget.models.ts
@@ -25,6 +25,7 @@ import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
 import { WidgetContext } from '@home/models/widget-component.models';
 import { UtilsService } from '@core/services/utils.service';
 import { TranslateService } from '@ngx-translate/core';
+import { EntityType } from '@shared/models/entity-type.models';
 
 type ColumnVisibilityOptions = 'visible' | 'hidden' | 'hidden-mobile';
 
@@ -65,7 +66,7 @@ export interface EntityData {
   id: EntityId;
   entityName: string;
   entityLabel?: string;
-  entityType?: string;
+  entityType?: EntityType;
   actionCellButtons?: TableCellButtonActionDescriptor[];
   hasActions?: boolean;
   [key: string]: any;
diff --git a/ui-ngx/src/assets/help/en_US/widget/action/show_widget_action_cell_fn.md b/ui-ngx/src/assets/help/en_US/widget/action/show_widget_action_cell_fn.md
index 8708993103..459a71e8cc 100644
--- a/ui-ngx/src/assets/help/en_US/widget/action/show_widget_action_cell_fn.md
+++ b/ui-ngx/src/assets/help/en_US/widget/action/show_widget_action_cell_fn.md
@@ -36,7 +36,7 @@ return widgetContext.currentUser.authority === 'CUSTOMER_USER';
 * Display action only if the entity in the row is device and has type `thermostat`:
 
 ```javascript
-return data && data.entityType === 'Device' && data.Type === 'thermostat';
+return data && data.entityType === 'DEVICE' && data.Type === 'thermostat';
 {:copy-code}
 ```