From e2e337370b701c89c690f6f6d18fffd1a973a2c2 Mon Sep 17 00:00:00 2001
From: "CITE\\spapacharalampous" <Sofia Papacharalampous>
Date: Thu, 29 Aug 2024 14:54:05 +0300
Subject: [PATCH] minor ui fixes

---
 .../app/ui/plan/listing/plan-listing.component.html | 11 +++--------
 .../modules/text-filter/text-filter.component.html  |  7 ++++---
 .../modules/text-filter/text-filter.component.ts    | 13 ++++++++-----
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/frontend/src/app/ui/plan/listing/plan-listing.component.html b/frontend/src/app/ui/plan/listing/plan-listing.component.html
index 33007cb9f..8cc675b8f 100644
--- a/frontend/src/app/ui/plan/listing/plan-listing.component.html
+++ b/frontend/src/app/ui/plan/listing/plan-listing.component.html
@@ -14,7 +14,7 @@
 			<div class="col-12">
 				<app-navigation-breadcrumb />
 			</div>
-			<div *ngIf="!versionsModeEnabled && !isLoading && (hasListingItems || hasFilters) && !isPublic" class="filter-btn" [style.right]="dialog.getDialogById('filters') ? '446px' : '0px'" [style.width]="listingItems.length > 2 ? '57px' : '37px'" (click)="openFiltersDialog()">
+			<div *ngIf="!versionsModeEnabled && (isLoading || hasListingItems || hasFilters) && !isPublic" class="filter-btn" [style.right]="dialog.getDialogById('filters') ? '446px' : '0px'" [style.width]="listingItems.length > 2 ? '57px' : '37px'" (click)="openFiltersDialog()">
 				<button mat-raised-button class="p-0" [matBadge]="filtersCount" [matBadgeHidden]="filtersCount === 0" matBadgePosition="before">
 					<mat-icon class="mr-4 filter-icon">filter_alt</mat-icon>
 				</button>
@@ -47,15 +47,10 @@
 						<div class="col-12 col-xl-auto ml-auto order-4">
 							<div class="row">
 								<div class="col-12 col-xl-auto d-flex align-items-center">
-									<span *ngIf="!isPublic" class="center-content mb-1 mb-xl-4" (click)="restartTour()">{{ 'GENERAL.ACTIONS.TAKE-A-TOUR'| translate }}</span>
+									<span *ngIf="!isPublic" class="center-content" (click)="restartTour()">{{ 'GENERAL.ACTIONS.TAKE-A-TOUR'| translate }}</span>
 								</div>
 								<div class="col-12 col-xl-auto">
-                                    <app-text-filter [(value)]=lookup.like (valueChange)="controlModified()" />
-									<!-- <mat-form-field class="search-form w-100" floatLabel="never">
-										<mat-icon matSuffix>search</mat-icon>
-										<input matInput placeholder="{{'GENERAL.CRITERIA.LIKE'| translate}}" name="likeCriteria" [formControl]="formGroup.get('like')">
-										<mat-error *ngIf="formGroup.get('like').hasError('backendError')">{{formGroup.get('like').getError('backendError').message}}</mat-error>
-									</mat-form-field> -->
+                  <app-text-filter suffixIcon="search" floatLabel="never" placeholder="{{'GENERAL.CRITERIA.LIKE'| translate}}" [(value)]=lookup.like (valueChange)="controlModified()" />
 								</div>
 							</div>
 						</div>
diff --git a/frontend/src/common/modules/text-filter/text-filter.component.html b/frontend/src/common/modules/text-filter/text-filter.component.html
index 0e046fc20..90ffa639d 100644
--- a/frontend/src/common/modules/text-filter/text-filter.component.html
+++ b/frontend/src/common/modules/text-filter/text-filter.component.html
@@ -1,4 +1,5 @@
-<mat-form-field class="col-12" subscriptSizing="dynamic">
-	<mat-label>{{getPlaceholder()}}</mat-label>
-	<input autocomplete="nope" matInput class="search-box" [(ngModel)]="inputValue">
+<mat-form-field subscriptSizing="dynamic" [floatLabel]="floatLabel">
+	<mat-icon *ngIf="suffixIcon" matSuffix>{{suffixIcon}}</mat-icon>
+	<mat-label *ngIf="label">{{label}}</mat-label>
+	<input autocomplete="nope" matInput class="search-box" [placeholder]="textPlaceholder" [(ngModel)]="inputValue">
 </mat-form-field>
diff --git a/frontend/src/common/modules/text-filter/text-filter.component.ts b/frontend/src/common/modules/text-filter/text-filter.component.ts
index 52388ed5a..4a8a08bf0 100644
--- a/frontend/src/common/modules/text-filter/text-filter.component.ts
+++ b/frontend/src/common/modules/text-filter/text-filter.component.ts
@@ -14,12 +14,19 @@ import { debounceTime, takeUntil } from 'rxjs/operators';
 export class TextFilterComponent extends BaseComponent implements OnInit, OnChanges {
 	@Input() typeaheadMS = 700;
 	@Input() disableTransform = false;
-	@Input() placeholder: string;
+	@Input() floatLabel: string = "never";
+	@Input() label: string | null;
+	@Input() placeholder: string | null;
+	@Input() suffixIcon: string | null;
 	@Input() value: string;
 	@Output() valueChange = new EventEmitter<string>();
 
 	private valueSubject: Subject<string>;
 
+	get textPlaceholder(): string {
+		return this.placeholder ? this.language.instant(this.placeholder) : this.language.instant('GENERAL.CRITERIA.LIKE');
+	}
+
 	private _inputValue: string;
 	public get inputValue(): string { return this._inputValue; }
 	public set inputValue(value: string) {
@@ -53,8 +60,4 @@ export class TextFilterComponent extends BaseComponent implements OnInit, OnChan
 			this._inputValue = this.filterService.reverseLikeTransformation(this.value);
 		}
 	}
-
-	getPlaceholder(): string {
-		return this.placeholder ? this.language.instant(this.placeholder) : this.language.instant('COMMONS.TEXT-FILTER.LIKE');
-	}
 }