From 3f83e26d078c24b80986333c9c218770bb4bb3f6 Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Tue, 16 Sep 2025 14:22:30 +0300
Subject: [PATCH] fix Entities Table widget column order

---
 .../widget-action-dialog.component.html       |  2 +-
 .../widget/widget-config.component.ts         | 21 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.html b/ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.html
index e5d006076e..48a1e17044 100644
--- a/ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.html
@@ -57,7 +57,7 @@
               <mat-option *ngFor="let column of configuredColumns; let $index = index"
                           [value]="$index"
                           [disabled]="usedCellClickColumns.includes($index)">
-                {{ getCellClickColumnInfo($index, column) }}
+                {{ getCellClickColumnInfo($index, column) | customTranslate }}
               </mat-option>
             </mat-select>
             <mat-icon matSuffix
diff --git a/ui-ngx/src/app/modules/home/components/widget/widget-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/widget-config.component.ts
index e34783f5b7..c23619f5c0 100644
--- a/ui-ngx/src/app/modules/home/components/widget/widget-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/widget-config.component.ts
@@ -926,7 +926,26 @@ export class WidgetConfigComponent extends PageComponent implements OnInit, OnDe
     if (this.modelValue) {
       const configuredColumns = new Array<CellClickColumnInfo>();
       if (this.modelValue.config?.datasources[0]?.dataKeys?.length) {
-        configuredColumns.push(...this.keysToCellClickColumns(this.modelValue.config.datasources[0].dataKeys));
+        const {
+          displayEntityLabel,
+          displayEntityName,
+          displayEntityType,
+          entityNameColumnTitle,
+          entityLabelColumnTitle
+        } = this.modelValue.config.settings;
+        const displayEntitiesArray = [];
+        if (isDefined(displayEntityName)) {
+          const displayName = entityNameColumnTitle ? entityNameColumnTitle : 'entityName';
+          displayEntitiesArray.push({name: displayName, label: displayName});
+        }
+        if (isDefined(displayEntityLabel)) {
+          const displayLabel = entityLabelColumnTitle ? entityLabelColumnTitle : 'entityLabel';
+          displayEntitiesArray.push({name: displayLabel, label: displayLabel});
+        }
+        if (isDefined(displayEntityType)) {
+          displayEntitiesArray.push({name: 'entityType', label: 'entityType'});
+        }
+        configuredColumns.push(...displayEntitiesArray, ...this.keysToCellClickColumns(this.modelValue.config.datasources[0].dataKeys));
       }
       if (this.modelValue.config?.alarmSource?.dataKeys?.length) {
         configuredColumns.push(...this.keysToCellClickColumns(this.modelValue.config.alarmSource.dataKeys));