From d15e4419bff4a59870d62238094eee3c3fad4fc5 Mon Sep 17 00:00:00 2001
From: Sofia Papacharalampous <spapacharalampous@cite.gr>
Date: Thu, 27 Jun 2024 12:07:00 +0300
Subject: [PATCH] 1. translations 2. filters count badge 3. html clean up

---
 .../src/app/core/query/reference.lookup.ts    |  1 +
 .../services/reference/reference.service.ts   |  1 -
 .../ui/dmp/listing/dmp-listing.component.html | 24 ++++++--------
 .../ui/dmp/listing/dmp-listing.component.ts   | 32 ++++++++++++++++---
 dmp-frontend/src/assets/i18n/baq.json         |  1 +
 dmp-frontend/src/assets/i18n/de.json          |  1 +
 dmp-frontend/src/assets/i18n/en.json          |  1 +
 dmp-frontend/src/assets/i18n/es.json          |  1 +
 dmp-frontend/src/assets/i18n/gr.json          |  1 +
 dmp-frontend/src/assets/i18n/hr.json          |  1 +
 dmp-frontend/src/assets/i18n/pl.json          |  1 +
 dmp-frontend/src/assets/i18n/pt.json          |  1 +
 dmp-frontend/src/assets/i18n/sk.json          |  1 +
 dmp-frontend/src/assets/i18n/sr.json          |  1 +
 dmp-frontend/src/assets/i18n/tr.json          |  1 +
 15 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/dmp-frontend/src/app/core/query/reference.lookup.ts b/dmp-frontend/src/app/core/query/reference.lookup.ts
index 397ec6993..ab78cf9e9 100644
--- a/dmp-frontend/src/app/core/query/reference.lookup.ts
+++ b/dmp-frontend/src/app/core/query/reference.lookup.ts
@@ -25,6 +25,7 @@ export class DescriptionReferenceLookup extends Lookup {
 		super();
 	}
 }
+
 export class DmpReferenceLookup extends Lookup {
 	referenceIds: Guid[];
 	excludedIds: Guid[];
diff --git a/dmp-frontend/src/app/core/services/reference/reference.service.ts b/dmp-frontend/src/app/core/services/reference/reference.service.ts
index 6178eef72..c2ce1bf99 100644
--- a/dmp-frontend/src/app/core/services/reference/reference.service.ts
+++ b/dmp-frontend/src/app/core/services/reference/reference.service.ts
@@ -195,5 +195,4 @@ export class ReferenceService {
 	getReferencesForTypesFirstSafe(dmpReferences: DmpReference[], referenceTypeIds?: Guid[]): DmpReference {
 		return this.getReferencesForTypes(dmpReferences, referenceTypeIds)?.find(Boolean);
 	}
-
 }
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 ca04088c9..4f517014a 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
@@ -1,7 +1,7 @@
 <div class="main-content listing-main-container h-100">
 	<div class="container-fluid">
 		<div class="row">
-			<div *ngIf="hasListingItems && listingItems && listingItems.length === 0 && !hasLikeFilters()" class="col-12 card mt-0">
+			<div *ngIf="!hasListingItems && !hasFilters" class="col-12 card mt-0">
 				<div class="card-content info-text mb-0">
 					<p>{{'DMP-LISTING.TEXT-INFO' | translate}}</p>
 					<p class="mt-4 pt-2">{{'DMP-LISTING.TEXT-INFO-QUESTION' | translate}} <a class="zenodo-link" href="https://zenodo.org/communities/liber-dmp-cat/?page=1&size=20" target="_blank">{{'DMP-LISTING.LINK-ZENODO' | translate}}</a> {{'DMP-LISTING.GET-IDEA' | translate}}</p>
@@ -11,25 +11,18 @@
 					</div>
 				</div>
 			</div>
-			<div *ngIf="listingItems && listingItems.length > 0 || this.lookup.like" class="col-12">
+			<div *ngIf="hasListingItems || hasFilters" class="col-12">
 				<app-navigation-breadcrumb />
 			</div>
-			<!-- TODO: implement filters -->
-			<!-- <div *ngIf="listingItems && listingItems.length > 0 || this.lookup.like" class="filter-btn" [style.right]="dialog.getDialogById('filters') ? '446px' : '0px'" [style.width]="listingItems.length > 2 ? '57px' : '37px'" (click)="openFiltersDialog()"> -->
-			<div 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">
+			<div *ngIf="hasListingItems || hasFilters" 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>
 			</div>
-			<!-- <div class="filter-btn" [style.right]="this.dialog.getDialogById('filters') ? '446px' : '0px'" [style.width]="scrollbar || this.dialog.getDialogById('filters') ? '57px' : '37px'" (click)="openFiltersDialog()">
-				<button mat-raised-button class="p-0">
-					<mat-icon class="mr-4">filter_alt</mat-icon>
-				</button>
-			</div> -->
 		</div>
 		<div>
 			<div class="listing row pb-2">
-				<div *ngIf="listingItems && listingItems.length > 0 || this.lookup.like" class="col-md-12">
+				<div *ngIf="hasListingItems || hasFilters" class="col-md-12">
 					<div class="row pt-4">
 						<!-- Sort by -->
 						<div class="col-auto d-flex align-items-center order-1">
@@ -71,13 +64,16 @@
 					<div *ngFor="let item of listingItems; let i = index">
 						<app-dmp-listing-item-component [showDivider]="i != (listingItems.length - 1)" [dmp]="item" [isPublic]="isPublic"></app-dmp-listing-item-component>
 					</div>
-					<div *ngIf="listingItems && listingItems.length > 0 && this.lookup?.page?.offset < this.totalCount - 1 && this.pageSize < this.totalCount - 1" class="d-flex justify-content-center">
+					<div *ngIf="hasListingItems && this.lookup?.page?.offset < this.totalCount - 1 && this.pageSize < this.totalCount - 1" class="d-flex justify-content-center">
 						<button type="button" class="btn-load-more" (click)="loadMore()">{{'GENERAL.ACTIONS.LOAD-MORE' | translate}}</button>
 					</div>
 				</div>
-				<div *ngIf="hasListingItems && listingItems && listingItems.length === 0 && this.lookup.like !== ''" class="col-md-12 d-flex justify-content-center pt-4 mt-4 mb-4 pb-4">
+				<div *ngIf="!hasListingItems && !hasFilters" class="col-md-12 d-flex justify-content-center pt-4 mt-4 mb-4 pb-4">
 					<span class="empty-list">{{'DMP-LISTING.EMPTY-LIST' | translate}}</span>
 				</div>
+				<div *ngIf="!hasListingItems && hasFilters" class="col-md-12 d-flex justify-content-center pt-4 mt-4 mb-4 pb-4">
+					<span class="empty-list">{{'DMP-LISTING.FILTERS.NO-ITEMS-FOUND' | translate}}</span>
+				</div>
 			</div>
 		</div>
 	</div>
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 73d7e3ae0..cc93b85fd 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
@@ -56,9 +56,9 @@ export class DmpListingComponent extends BaseListingComponent<BaseDmp, DmpLookup
 	totalCount: number;
 	listingItems: any[] = [];
 	isPublic: boolean = false;
-	hasListingItems = null;
 	protected ITEMS_PER_PAGE = 5;
 	pageSize: number = 5;
+	filtersCount: number;
 	referenceFilters: ReferencesWithType[];
 	public formGroup = new UntypedFormBuilder().group({
 		like: new UntypedFormControl(),
@@ -85,6 +85,16 @@ export class DmpListingComponent extends BaseListingComponent<BaseDmp, DmpLookup
 		return this.isAscending ? this.language.instant('DMP-LISTING.ACTIONS.TOGGLE-ΑSCENDING') : this.language.instant('DMP-LISTING.ACTIONS.TOGGLE-DESCENDING');
 	}
 
+	get hasListingItems(): boolean {
+		return this.listingItems != null && this.listingItems.length > 0;
+	}
+	
+	get hasFilters(): boolean {
+		return (this.lookup.like != null && this.lookup.like != '') || this.lookup.statuses  != null || 
+			this.lookup.dmpReferenceSubQuery  != null || this.lookup.dmpDescriptionTemplateSubQuery  != null || 
+			this.lookup.dmpBlueprintSubQuery  != null || this.lookup.dmpUserSubQuery  != null; 
+	}
+
 	constructor(
 		protected router: Router,
 		protected route: ActivatedRoute,
@@ -117,7 +127,10 @@ export class DmpListingComponent extends BaseListingComponent<BaseDmp, DmpLookup
 			.subscribe(async (params: Params) => {
 				const queryParams = this.route.snapshot.queryParams;
 
-				if (!this.lookup) this.lookup = queryParams['lookup'] ? this._parseLookupFromParams(queryParams) : this.initializeLookup();
+				if (!this.lookup && queryParams['lookup']) {
+					this.lookup = this._parseLookupFromParams(queryParams)
+					this.filtersCount = this._countFilters(this.lookup);
+				} else if (!this.lookup) this.lookup = this.initializeLookup();
 
 				if ((this.formGroup.get('order')?.value == null || (!this.isAscending && !this.isDescending)) && this.lookup.order.items && this.lookup.order.items.length > 0) {
 
@@ -172,7 +185,6 @@ export class DmpListingComponent extends BaseListingComponent<BaseDmp, DmpLookup
 					this.totalCount = result.count;
 					if (this.lookup?.page?.offset === 0) this.listingItems = [];
 					this.listingItems.push(...result.items);
-					this.hasListingItems = true;
 				}));
 		} else {
 			return this.dmpService.query(this.lookup).pipe(takeUntil(this._destroyed))
@@ -181,7 +193,6 @@ export class DmpListingComponent extends BaseListingComponent<BaseDmp, DmpLookup
 					this.totalCount = result.count;
 					if (this.lookup?.page?.offset === 0) this.listingItems = [];
 					this.listingItems.push(...result.items);
-					this.hasListingItems = true;
 				}));
 		}
 	}
@@ -272,6 +283,7 @@ export class DmpListingComponent extends BaseListingComponent<BaseDmp, DmpLookup
 	updateDataFn(filterForm: UntypedFormGroup): void {
 		this.referenceFilters = this._patchReferenceFiltersFromForm(filterForm);
 		this.lookup = this._patchLookupFromForm(this.lookup, filterForm);
+		this.filtersCount = this._countFilters(this.lookup);
 		this.filterChanged(this.lookup)
 	}
 
@@ -394,6 +406,18 @@ export class DmpListingComponent extends BaseListingComponent<BaseDmp, DmpLookup
 		});
 	}
 
+	private _countFilters(lookup: DmpLookup): number {
+		let count = 0;
+
+		if (lookup.statuses) count += lookup.statuses.length; 
+		if (lookup.dmpDescriptionTemplateSubQuery) count += lookup.dmpDescriptionTemplateSubQuery.descriptionTemplateGroupIds?.length;
+		if (lookup.dmpBlueprintSubQuery) count += lookup.dmpBlueprintSubQuery.ids?.length; 
+		if (lookup.dmpUserSubQuery) count += lookup.dmpUserSubQuery.userRoles?.length;
+		if (lookup.dmpReferenceSubQuery) count += lookup.dmpReferenceSubQuery.referenceIds?.length;
+		
+		return count;
+	}
+
 	private get _lookupFields(): string[] {
 		return [
 			nameof<Dmp>(x => x.id),
diff --git a/dmp-frontend/src/assets/i18n/baq.json b/dmp-frontend/src/assets/i18n/baq.json
index 0502f8b09..084d6155b 100644
--- a/dmp-frontend/src/assets/i18n/baq.json
+++ b/dmp-frontend/src/assets/i18n/baq.json
@@ -672,6 +672,7 @@
 		"FILTERS": {
 			"NAME": "Filters",
 			"APPLY-FILTERS": "Apply filters",
+			"NO-ITEMS-FOUND": "Your search didn't match any items.",
 			"STATUS": {
 				"NAME": "Status",
 				"TYPE": {
diff --git a/dmp-frontend/src/assets/i18n/de.json b/dmp-frontend/src/assets/i18n/de.json
index a4ee74610..b199a5352 100644
--- a/dmp-frontend/src/assets/i18n/de.json
+++ b/dmp-frontend/src/assets/i18n/de.json
@@ -672,6 +672,7 @@
 		"FILTERS": {
 			"NAME": "Filters",
 			"APPLY-FILTERS": "Apply filters",
+			"NO-ITEMS-FOUND": "Your search didn't match any items.",
 			"STATUS": {
 				"NAME": "Status",
 				"TYPE": {
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index ffad49872..4745d74ca 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -672,6 +672,7 @@
 		"FILTERS": {
 			"NAME": "Filters",
 			"APPLY-FILTERS": "Apply filters",
+			"NO-ITEMS-FOUND": "Your search didn't match any items.",
 			"STATUS": {
 				"NAME": "Status",
 				"TYPE": {
diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json
index b86457ebf..947abd73b 100644
--- a/dmp-frontend/src/assets/i18n/es.json
+++ b/dmp-frontend/src/assets/i18n/es.json
@@ -672,6 +672,7 @@
 		"FILTERS": {
 			"NAME": "Filters",
 			"APPLY-FILTERS": "Apply filters",
+			"NO-ITEMS-FOUND": "Your search didn't match any items.",
 			"STATUS": {
 				"NAME": "Status",
 				"TYPE": {
diff --git a/dmp-frontend/src/assets/i18n/gr.json b/dmp-frontend/src/assets/i18n/gr.json
index fe9c5c11d..fd100413e 100644
--- a/dmp-frontend/src/assets/i18n/gr.json
+++ b/dmp-frontend/src/assets/i18n/gr.json
@@ -672,6 +672,7 @@
 		"FILTERS": {
 			"NAME": "Filters",
 			"APPLY-FILTERS": "Apply filters",
+			"NO-ITEMS-FOUND": "Your search didn't match any items.",
 			"STATUS": {
 				"NAME": "Status",
 				"TYPE": {
diff --git a/dmp-frontend/src/assets/i18n/hr.json b/dmp-frontend/src/assets/i18n/hr.json
index 49600f02b..271600511 100644
--- a/dmp-frontend/src/assets/i18n/hr.json
+++ b/dmp-frontend/src/assets/i18n/hr.json
@@ -672,6 +672,7 @@
 		"FILTERS": {
 			"NAME": "Filters",
 			"APPLY-FILTERS": "Apply filters",
+			"NO-ITEMS-FOUND": "Your search didn't match any items.",
 			"STATUS": {
 				"NAME": "Status",
 				"TYPE": {
diff --git a/dmp-frontend/src/assets/i18n/pl.json b/dmp-frontend/src/assets/i18n/pl.json
index 573c99607..6123c7dd8 100644
--- a/dmp-frontend/src/assets/i18n/pl.json
+++ b/dmp-frontend/src/assets/i18n/pl.json
@@ -672,6 +672,7 @@
 		"FILTERS": {
 			"NAME": "Filters",
 			"APPLY-FILTERS": "Apply filters",
+			"NO-ITEMS-FOUND": "Your search didn't match any items.",
 			"STATUS": {
 				"NAME": "Status",
 				"TYPE": {
diff --git a/dmp-frontend/src/assets/i18n/pt.json b/dmp-frontend/src/assets/i18n/pt.json
index dbb81c1f2..719fff093 100644
--- a/dmp-frontend/src/assets/i18n/pt.json
+++ b/dmp-frontend/src/assets/i18n/pt.json
@@ -672,6 +672,7 @@
 		"FILTERS": {
 			"NAME": "Filters",
 			"APPLY-FILTERS": "Apply filters",
+			"NO-ITEMS-FOUND": "Your search didn't match any items.",
 			"STATUS": {
 				"NAME": "Status",
 				"TYPE": {
diff --git a/dmp-frontend/src/assets/i18n/sk.json b/dmp-frontend/src/assets/i18n/sk.json
index 4d4798b11..0182786cb 100644
--- a/dmp-frontend/src/assets/i18n/sk.json
+++ b/dmp-frontend/src/assets/i18n/sk.json
@@ -672,6 +672,7 @@
 		"FILTERS": {
 			"NAME": "Filters",
 			"APPLY-FILTERS": "Apply filters",
+			"NO-ITEMS-FOUND": "Your search didn't match any items.",
 			"STATUS": {
 				"NAME": "Status",
 				"TYPE": {
diff --git a/dmp-frontend/src/assets/i18n/sr.json b/dmp-frontend/src/assets/i18n/sr.json
index 804ec8290..15d98337a 100644
--- a/dmp-frontend/src/assets/i18n/sr.json
+++ b/dmp-frontend/src/assets/i18n/sr.json
@@ -672,6 +672,7 @@
 		"FILTERS": {
 			"NAME": "Filters",
 			"APPLY-FILTERS": "Apply filters",
+			"NO-ITEMS-FOUND": "Your search didn't match any items.",
 			"STATUS": {
 				"NAME": "Status",
 				"TYPE": {
diff --git a/dmp-frontend/src/assets/i18n/tr.json b/dmp-frontend/src/assets/i18n/tr.json
index 3fb7d1331..a19697185 100644
--- a/dmp-frontend/src/assets/i18n/tr.json
+++ b/dmp-frontend/src/assets/i18n/tr.json
@@ -672,6 +672,7 @@
 		"FILTERS": {
 			"NAME": "Filters",
 			"APPLY-FILTERS": "Apply filters",
+			"NO-ITEMS-FOUND": "Your search didn't match any items.",
 			"STATUS": {
 				"NAME": "Status",
 				"TYPE": {