From 1515a761a531ae4b458c01758ef7331a80eb985d Mon Sep 17 00:00:00 2001
From: "CITE\\spapacharalampous" <Sofia Papacharalampous>
Date: Thu, 29 Aug 2024 12:20:32 +0300
Subject: [PATCH] plan filters fixes (in progress)

---
 frontend/src/app/ui/plan/listing/plan-listing.component.html | 2 +-
 frontend/src/app/ui/plan/listing/plan-listing.component.ts   | 3 ++-
 2 files changed, 3 insertions(+), 2 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 af6ed8851..75cd19a1b 100644
--- a/frontend/src/app/ui/plan/listing/plan-listing.component.html
+++ b/frontend/src/app/ui/plan/listing/plan-listing.component.html
@@ -15,7 +15,7 @@
 				<app-navigation-breadcrumb />
 			</div>
 			<div *ngIf="!versionsModeEnabled && hasLoadedListingItems && (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]="!hasFilters" matBadgePosition="before">
+				<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>
 			</div>
diff --git a/frontend/src/app/ui/plan/listing/plan-listing.component.ts b/frontend/src/app/ui/plan/listing/plan-listing.component.ts
index 0893eb105..2086daf78 100644
--- a/frontend/src/app/ui/plan/listing/plan-listing.component.ts
+++ b/frontend/src/app/ui/plan/listing/plan-listing.component.ts
@@ -224,7 +224,6 @@ export class PlanListingComponent extends BaseListingComponent<BasePlan, PlanLoo
 						this.breadcrumbService.addIdResolvedValue(this.groupId.toString(), latestVersionPlan.label);
 					}
 
-					this.hasLoadedListingItems = true;
 					if (!result) { return []; }
 					this.totalCount = result.count;
 					if (this.lookup?.page?.offset === 0) this.listingItems = [];
@@ -381,6 +380,7 @@ export class PlanListingComponent extends BaseListingComponent<BasePlan, PlanLoo
 		let lookup: PlanLookup = JSON.parse(params['lookup']);
 
 		if (!lookup) return this.initializeLookup();
+		lookup.like = lookup.like ?? null;
 
 		const queryOffset = 0;
 		const querySize = (lookup.page?.offset ?? 0) + this.pageSize;
@@ -467,6 +467,7 @@ export class PlanListingComponent extends BaseListingComponent<BasePlan, PlanLoo
 
 	private _buildFormFromLookup(lookup: PlanLookup): UntypedFormGroup {
 		return (new UntypedFormBuilder()).group({
+			like: lookup.like ?? null,
 			status: [lookup.statuses?.length > 0 ? lookup.statuses[0] : null],
 			viewOnlyTenant: [lookup.tenantSubQuery?.codes?.length > 0 ? true : false],
 			descriptionTemplates: lookup.planDescriptionTemplateSubQuery?.descriptionTemplateGroupIds ? [lookup.planDescriptionTemplateSubQuery?.descriptionTemplateGroupIds] : [],