From 9823c780761ca4b0b14120d9526f84199278b183 Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Fri, 26 Dec 2025 17:04:37 +0200
Subject: [PATCH] UI: Fixed show label in select cf entity

---
 .../alarm-rules/alarm-rule-dialog.component.html       |  1 +
 .../components/alarm-rules/alarm-rules.component.html  |  1 +
 .../calculated-fields/calculated-field.component.html  |  1 +
 .../dialog/calculated-field-dialog.component.html      |  1 +
 .../components/entity/entity-select.component.html     |  1 +
 .../components/entity/entity-select.component.ts       |  3 +++
 .../components/entity/entity-type-select.component.ts  | 10 +++++++++-
 7 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rule-dialog.component.html b/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rule-dialog.component.html
index 1b116d0696..ed936cd60e 100644
--- a/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rule-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rule-dialog.component.html
@@ -61,6 +61,7 @@
           <tb-entity-select formControlName="entityId"
                             appearance="outline"
                             required
+                            entityTypeLabel="{{ 'entity.entity-type' | translate }}"
                             [filterAllowedEntityTypes]="false"
                             [allowedEntityTypes]="alarmRuleEntityTypeList"
                             [defaultEntityType]="EntityType.DEVICE_PROFILE"
diff --git a/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rules.component.html b/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rules.component.html
index 28695d9283..64f4ab652f 100644
--- a/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rules.component.html
+++ b/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rules.component.html
@@ -66,6 +66,7 @@
       <tb-entity-select formControlName="entityId"
                         appearance="outline"
                         required
+                        entityTypeLabel="{{ 'entity.entity-type' | translate }}"
                         [filterAllowedEntityTypes]="false"
                         [allowedEntityTypes]="calculatedFieldsEntityTypeList"
                         (entityChanged)="changeEntity($event)">
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-field.component.html b/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-field.component.html
index 7cea16c636..7d4b4b7920 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-field.component.html
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-field.component.html
@@ -66,6 +66,7 @@
       <tb-entity-select formControlName="entityId"
                         appearance="outline"
                         required
+                        entityTypeLabel="{{ 'entity.entity-type' | translate }}"
                         [filterAllowedEntityTypes]="false"
                         [allowedEntityTypes]="calculatedFieldsEntityTypeList"
                         (entityChanged)="changeEntity($event)">
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html b/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html
index 78df90701f..293dacdca6 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html
@@ -59,6 +59,7 @@
           <tb-entity-select formControlName="entityId"
                             appearance="outline"
                             required
+                            entityTypeLabel="{{ 'entity.entity-type' | translate }}"
                             [filterAllowedEntityTypes]="false"
                             [allowedEntityTypes]="calculatedFieldsEntityTypeList"
                             [defaultEntityType]="EntityType.DEVICE_PROFILE"
diff --git a/ui-ngx/src/app/shared/components/entity/entity-select.component.html b/ui-ngx/src/app/shared/components/entity/entity-select.component.html
index 49e853e722..6ece6c0301 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-select.component.html
+++ b/ui-ngx/src/app/shared/components/entity/entity-select.component.html
@@ -19,6 +19,7 @@
   <tb-entity-type-select
     *ngIf="displayEntityTypeSelect"
     class="flex-1"
+    [label]="entityTypeLabel ?? null"
     [appearance]="appearance"
     [showLabel]="true"
     [required]="required"
diff --git a/ui-ngx/src/app/shared/components/entity/entity-select.component.ts b/ui-ngx/src/app/shared/components/entity/entity-select.component.ts
index 57d2380705..f41a437ce4 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-select.component.ts
+++ b/ui-ngx/src/app/shared/components/entity/entity-select.component.ts
@@ -73,6 +73,9 @@ export class EntitySelectComponent implements ControlValueAccessor, OnInit {
   @Input()
   defaultEntityType: AliasEntityType | EntityType;
 
+  @Input()
+  entityTypeLabel: string;
+
   @Output()
   entityChanged = new EventEmitter<BaseData<EntityId>>();
 
diff --git a/ui-ngx/src/app/shared/components/entity/entity-type-select.component.ts b/ui-ngx/src/app/shared/components/entity/entity-type-select.component.ts
index fcfe158da0..dcabc49906 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-type-select.component.ts
+++ b/ui-ngx/src/app/shared/components/entity/entity-type-select.component.ts
@@ -52,8 +52,16 @@ export class EntityTypeSelectComponent implements ControlValueAccessor, OnInit,
   @coerceBoolean()
   showLabel: boolean;
 
+  private labelValue = this.translate.instant('entity.type');
+
+  get label(): string {
+    return this.labelValue;
+  }
+
   @Input()
-  label = this.translate.instant('entity.type');
+  set label(value: string) {
+    this.labelValue = value ?? this.translate.instant('entity.type');
+  }
 
   @Input()
   @coerceBoolean()