From 487d5f75bcb14fdd9bcafad2a2ea0608a3a9e028 Mon Sep 17 00:00:00 2001
From: Artem Dzhereleiko <Dgerik2015@gmail.com>
Date: Mon, 18 Sep 2023 17:28:24 +0300
Subject: [PATCH 1/3] UI: Add defalut label

---
 .../src/app/shared/components/entity/entity-list.component.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui-ngx/src/app/shared/components/entity/entity-list.component.ts b/ui-ngx/src/app/shared/components/entity/entity-list.component.ts
index 125d4d77d8..835d253816 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-list.component.ts
+++ b/ui-ngx/src/app/shared/components/entity/entity-list.component.ts
@@ -65,7 +65,7 @@ export class EntityListComponent implements ControlValueAccessor, OnInit, AfterV
   subType: string;
 
   @Input()
-  labelText: string;
+  labelText = this.translate.instant('entity.entity-list');
 
   @Input()
   placeholderText = this.translate.instant('entity.entity-list');

From 8064993c66fe981822085ec7a12fb43f1efc960a Mon Sep 17 00:00:00 2001
From: Artem Dzhereleiko <Dgerik2015@gmail.com>
Date: Tue, 19 Sep 2023 12:10:35 +0300
Subject: [PATCH 2/3] UI: Remove default placeholder

---
 .../src/app/shared/components/entity/entity-list.component.html | 2 +-
 .../src/app/shared/components/entity/entity-list.component.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui-ngx/src/app/shared/components/entity/entity-list.component.html b/ui-ngx/src/app/shared/components/entity/entity-list.component.html
index 80b051e75c..af03f0c690 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-list.component.html
+++ b/ui-ngx/src/app/shared/components/entity/entity-list.component.html
@@ -25,7 +25,7 @@
       {{entity.name}}
       <mat-icon matChipRemove *ngIf="!disabled">close</mat-icon>
     </mat-chip-row>
-    <input matInput type="text" placeholder="{{ !disabled ? placeholderText : '' }}"
+    <input matInput type="text" placeholder="{{ !disabled && placeholderText ? placeholderText : '' }}"
            #entityInput
            (focusin)="onFocus()"
            formControlName="entity"
diff --git a/ui-ngx/src/app/shared/components/entity/entity-list.component.ts b/ui-ngx/src/app/shared/components/entity/entity-list.component.ts
index 835d253816..67affc031f 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-list.component.ts
+++ b/ui-ngx/src/app/shared/components/entity/entity-list.component.ts
@@ -68,7 +68,7 @@ export class EntityListComponent implements ControlValueAccessor, OnInit, AfterV
   labelText = this.translate.instant('entity.entity-list');
 
   @Input()
-  placeholderText = this.translate.instant('entity.entity-list');
+  placeholderText: string;
 
   @Input()
   requiredText = this.translate.instant('entity.entity-list-empty');

From d1440a7c65bfc8ca3d95111db5419fd28f482a2d Mon Sep 17 00:00:00 2001
From: Artem Dzhereleiko <Dgerik2015@gmail.com>
Date: Tue, 19 Sep 2023 13:29:51 +0300
Subject: [PATCH 3/3] UI: Refactoring

---
 .../home/components/entity/entity-filter.component.html       | 1 +
 .../app/shared/components/entity/entity-list.component.html   | 2 +-
 .../src/app/shared/components/entity/entity-list.component.ts | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/entity/entity-filter.component.html b/ui-ngx/src/app/modules/home/components/entity/entity-filter.component.html
index 9cde6f4431..f0892ebb53 100644
--- a/ui-ngx/src/app/modules/home/components/entity/entity-filter.component.html
+++ b/ui-ngx/src/app/modules/home/components/entity/entity-filter.component.html
@@ -41,6 +41,7 @@
                              formControlName="entityType">
       </tb-entity-type-select>
       <tb-entity-list required
+                      labelText="{{'entity.entity-list' | translate}}"
                       [entityType]="filterFormGroup.get('entityType').value"
                       formControlName="entityList">
       </tb-entity-list>
diff --git a/ui-ngx/src/app/shared/components/entity/entity-list.component.html b/ui-ngx/src/app/shared/components/entity/entity-list.component.html
index af03f0c690..80b051e75c 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-list.component.html
+++ b/ui-ngx/src/app/shared/components/entity/entity-list.component.html
@@ -25,7 +25,7 @@
       {{entity.name}}
       <mat-icon matChipRemove *ngIf="!disabled">close</mat-icon>
     </mat-chip-row>
-    <input matInput type="text" placeholder="{{ !disabled && placeholderText ? placeholderText : '' }}"
+    <input matInput type="text" placeholder="{{ !disabled ? placeholderText : '' }}"
            #entityInput
            (focusin)="onFocus()"
            formControlName="entity"
diff --git a/ui-ngx/src/app/shared/components/entity/entity-list.component.ts b/ui-ngx/src/app/shared/components/entity/entity-list.component.ts
index 67affc031f..125d4d77d8 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-list.component.ts
+++ b/ui-ngx/src/app/shared/components/entity/entity-list.component.ts
@@ -65,10 +65,10 @@ export class EntityListComponent implements ControlValueAccessor, OnInit, AfterV
   subType: string;
 
   @Input()
-  labelText = this.translate.instant('entity.entity-list');
+  labelText: string;
 
   @Input()
-  placeholderText: string;
+  placeholderText = this.translate.instant('entity.entity-list');
 
   @Input()
   requiredText = this.translate.instant('entity.entity-list-empty');