From 7c869239d3263794f4128ae38596e9e7a739167a Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Wed, 15 Apr 2026 12:24:08 +0200
Subject: [PATCH 1/3] Adjusted size of entity type select to fit error message

---
 .../shared/components/entity/entity-list-select.component.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui-ngx/src/app/shared/components/entity/entity-list-select.component.html b/ui-ngx/src/app/shared/components/entity/entity-list-select.component.html
index e6a5067783..595b33ec1d 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-list-select.component.html
+++ b/ui-ngx/src/app/shared/components/entity/entity-list-select.component.html
@@ -19,7 +19,7 @@
   <tb-entity-type-select
     [inlineField]="inlineField"
     [class.flex-1]="inlineField && !modelValue.entityType"
-    style="min-width: 100px; padding-right: 8px;"
+    style="min-width: 175px; padding-right: 8px;"
     *ngIf="displayEntityTypeSelect"
     [showLabel]="true"
     [required]="required"

From a0fd36bc1e66eecb7102c9fd46a03141e70b76f8 Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Wed, 15 Apr 2026 17:20:19 +0200
Subject: [PATCH 2/3] Approach change

---
 .../components/entity/entity-list-select.component.html      | 3 ++-
 .../components/entity/entity-type-select.component.html      | 2 +-
 .../shared/components/entity/entity-type-select.component.ts | 5 ++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ui-ngx/src/app/shared/components/entity/entity-list-select.component.html b/ui-ngx/src/app/shared/components/entity/entity-list-select.component.html
index 595b33ec1d..ea9248f17a 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-list-select.component.html
+++ b/ui-ngx/src/app/shared/components/entity/entity-list-select.component.html
@@ -19,10 +19,11 @@
   <tb-entity-type-select
     [inlineField]="inlineField"
     [class.flex-1]="inlineField && !modelValue.entityType"
-    style="min-width: 175px; padding-right: 8px;"
+    style="min-width: 100px; padding-right: 8px;"
     *ngIf="displayEntityTypeSelect"
     [showLabel]="true"
     [required]="required"
+    subscriptSizing="dynamic"
     [useAliasEntityTypes]="useAliasEntityTypes"
     [allowedEntityTypes]="allowedEntityTypes"
     [filterAllowedEntityTypes]="filterAllowedEntityTypes"
diff --git a/ui-ngx/src/app/shared/components/entity/entity-type-select.component.html b/ui-ngx/src/app/shared/components/entity/entity-type-select.component.html
index e8df4b017c..65e3615887 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-type-select.component.html
+++ b/ui-ngx/src/app/shared/components/entity/entity-type-select.component.html
@@ -16,7 +16,7 @@
 
 -->
 <mat-form-field [formGroup]="entityTypeFormGroup"
-                [subscriptSizing]="inlineField ? 'dynamic' : 'fixed'"
+                [subscriptSizing]="inlineField ? 'dynamic' : subscriptSizing"
                 [appearance]="inlineField ? 'outline' : appearance">
   <mat-label *ngIf="showLabel && !inlineField">{{ label }}</mat-label>
   <mat-select [required]="required" formControlName="entityType">
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 4e6d6d4347..ea24c373d6 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
@@ -21,7 +21,7 @@ import { AliasEntityType, EntityType, entityTypeTranslations } from '@app/shared
 import { EntityService } from '@core/http/entity.service';
 import { coerceBoolean } from '@shared/decorators/coercion';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { MatFormFieldAppearance } from '@angular/material/form-field';
+import { MatFormFieldAppearance, SubscriptSizing } from '@angular/material/form-field';
 
 @Component({
     selector: 'tb-entity-type-select',
@@ -69,6 +69,9 @@ export class EntityTypeSelectComponent implements ControlValueAccessor, OnInit,
   @Input()
   appearance: MatFormFieldAppearance = 'fill';
 
+  @Input()
+  subscriptSizing: SubscriptSizing = 'fixed';
+
   @Input()
   @coerceBoolean()
   inlineField: boolean;

From e2260ff5577cf653a9729ae68f192ccca3f03651 Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Wed, 15 Apr 2026 17:27:04 +0200
Subject: [PATCH 3/3] Add hint to reserve space

---
 .../shared/components/entity/entity-type-select.component.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ui-ngx/src/app/shared/components/entity/entity-type-select.component.html b/ui-ngx/src/app/shared/components/entity/entity-type-select.component.html
index 65e3615887..b3f4fa5300 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-type-select.component.html
+++ b/ui-ngx/src/app/shared/components/entity/entity-type-select.component.html
@@ -24,6 +24,9 @@
       {{ displayEntityTypeFn(type) }}
     </mat-option>
   </mat-select>
+  @if (!inlineField && subscriptSizing === 'dynamic') {
+    <mat-hint></mat-hint>
+  }
   <mat-error *ngIf="!inlineField && entityTypeFormGroup.get('entityType').hasError('required')">
     {{ 'entity.type-required' | translate }}
   </mat-error>