From f55b26fe9a166ad49380e0f6d3a9142eff3fedc8 Mon Sep 17 00:00:00 2001
From: Sofia Papacharalampous <spapacharalampous@cite.gr>
Date: Mon, 1 Jul 2024 17:15:00 +0300
Subject: [PATCH] ui fix

---
 .../ui/description/listing/description-listing.component.html | 4 ++--
 .../ui/description/listing/description-listing.component.ts   | 1 +
 .../src/app/ui/dmp/listing/dmp-listing.component.html         | 2 +-
 dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts  | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dmp-frontend/src/app/ui/description/listing/description-listing.component.html b/dmp-frontend/src/app/ui/description/listing/description-listing.component.html
index 0fb170d2c..e7ef630e9 100644
--- a/dmp-frontend/src/app/ui/description/listing/description-listing.component.html
+++ b/dmp-frontend/src/app/ui/description/listing/description-listing.component.html
@@ -14,13 +14,13 @@
 				</div>
 			</div>
 			<div class="col-auto">
-				<div *ngIf="hasLoadedListingItems" class="row">
+				<div *ngIf="hasLoadedListingItems && (hasListingItems || hasFilters)" class="row">
 					<div class="col-12">
 						<app-navigation-breadcrumb />
 					</div>
 				</div>
 			</div>
-			<div *ngIf="hasLoadedListingItems && !hasListingItems && !isPublic || hasFilters" class="ml-auto">
+			<div *ngIf="hasLoadedListingItems && !isPublic && (hasListingItems || hasFilters)" class="ml-auto">
 				<div class="col-auto">
 					<button mat-raised-button class="add-description align-self-center yellow-btn" (click)="addNewDescription()">
 						{{'DESCRIPTION-LISTING.ACTIONS.ADD-DESCRIPTION' | translate}}
diff --git a/dmp-frontend/src/app/ui/description/listing/description-listing.component.ts b/dmp-frontend/src/app/ui/description/listing/description-listing.component.ts
index 8ae4c8c41..66b2ee502 100644
--- a/dmp-frontend/src/app/ui/description/listing/description-listing.component.ts
+++ b/dmp-frontend/src/app/ui/description/listing/description-listing.component.ts
@@ -281,6 +281,7 @@ export class DescriptionListingComponent extends BaseListingComponent<BaseDescri
 		this.referenceFilters = this._patchReferenceFiltersFromForm(filterForm);
 		this.lookup = this._patchLookupFromForm(this.lookup, filterForm);
 		this.filtersCount = this._countFilters(this.lookup);
+		this.hasLoadedListingItems = false;
 		this.filterChanged(this.lookup)
 	}
 
diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html
index 4f4c85ce8..1aa8d38b8 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html
+++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html
@@ -11,7 +11,7 @@
 					</div>
 				</div>
 			</div>
-			<div *ngIf="hasLoadedListingItems" class="col-12">
+			<div *ngIf="hasLoadedListingItems && (hasListingItems || hasFilters)" class="col-12">
 				<app-navigation-breadcrumb />
 			</div>
 			<div *ngIf="hasLoadedListingItems && (hasListingItems || hasFilters)" class="filter-btn" [style.right]="dialog.getDialogById('filters') ? '446px' : '0px'" [style.width]="listingItems.length > 2 ? '57px' : '37px'" (click)="openFiltersDialog()">
diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
index eb9051701..68de3abd1 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
@@ -290,6 +290,7 @@ export class DmpListingComponent extends BaseListingComponent<BaseDmp, DmpLookup
 		this.referenceFilters = this._patchReferenceFiltersFromForm(filterForm);
 		this.lookup = this._patchLookupFromForm(this.lookup, filterForm);
 		this.filtersCount = this._countFilters(this.lookup);
+		this.hasLoadedListingItems = false;
 		this.filterChanged(this.lookup)
 	}