From 7d3a3591307e7c48dd6f4e55834ac91ec31d6975 Mon Sep 17 00:00:00 2001
From: "CITE\\spapacharalampous" <Sofia Papacharalampous>
Date: Wed, 28 Aug 2024 17:29:57 +0300
Subject: [PATCH 1/2] minor ui fix

---
 .../src/app/ui/plan/listing/plan-listing.component.html    | 2 +-
 frontend/src/app/ui/plan/listing/plan-listing.component.ts | 7 +++++--
 2 files changed, 6 insertions(+), 3 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 c38dd6887..af6ed8851 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 *ngIf="hasLoadedListingItems && (hasListingItems || hasFilters)" class="col-12">
 				<app-navigation-breadcrumb />
 			</div>
-			<div *ngIf="hasLoadedListingItems && (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 && 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">
 					<mat-icon class="mr-4 filter-icon">filter_alt</mat-icon>
 				</button>
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 4b862081b..831da5bf9 100644
--- a/frontend/src/app/ui/plan/listing/plan-listing.component.ts
+++ b/frontend/src/app/ui/plan/listing/plan-listing.component.ts
@@ -102,6 +102,9 @@ export class PlanListingComponent extends BaseListingComponent<BasePlan, PlanLoo
 			this.lookup.planBlueprintSubQuery  != null || this.lookup.planUserSubQuery  != null ||
 			this.lookup.tenantSubQuery != null;
 	}
+	get versionsModeEnabled(): boolean {
+		return this.groupId != null;
+	}
 
 	constructor(
 		protected router: Router,
@@ -203,7 +206,7 @@ export class PlanListingComponent extends BaseListingComponent<BasePlan, PlanLoo
 		if (this.isPublic) {
 			return this.planService.publicQuery(this.lookup).pipe(takeUntil(this._destroyed))
 				.pipe(tap(result => {
-					if (this.groupId != null) {
+					if (this.versionsModeEnabled) {
 						const latestVersionPlan: BasePlan = this._getLatestVersion(result.items);
 						this.breadcrumbService.addIdResolvedValue(this.groupId.toString(), latestVersionPlan.label);
 					}
@@ -217,7 +220,7 @@ export class PlanListingComponent extends BaseListingComponent<BasePlan, PlanLoo
 		} else {
 			return this.planService.query(this.lookup).pipe(takeUntil(this._destroyed))
 				.pipe(tap(result => {
-					if (this.groupId != null) {
+					if (this.versionsModeEnabled) {
 						const latestVersionPlan: BasePlan = this._getLatestVersion(result.items);
 						this.breadcrumbService.addIdResolvedValue(this.groupId.toString(), latestVersionPlan.label);
 					}

From 492dbc4ab50f5808052c696b063618e5f4de6ae7 Mon Sep 17 00:00:00 2001
From: "CITE\\spapacharalampous" <Sofia Papacharalampous>
Date: Wed, 28 Aug 2024 17:32:46 +0300
Subject: [PATCH 2/2] clean up

---
 frontend/src/app/ui/plan/listing/plan-listing.component.ts | 1 -
 1 file changed, 1 deletion(-)

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 831da5bf9..0893eb105 100644
--- a/frontend/src/app/ui/plan/listing/plan-listing.component.ts
+++ b/frontend/src/app/ui/plan/listing/plan-listing.component.ts
@@ -55,7 +55,6 @@ export class PlanListingComponent extends BaseListingComponent<BasePlan, PlanLoo
 	@ViewChild(MatPaginator, { static: true }) _paginator: MatPaginator;
 	@ViewChild(MatSort) sort: MatSort;
 	lookup: PlanLookup;
-	// groupId: string;
 	totalCount: number;
 	listingItems: any[] = [];
 	isPublic: boolean = false;