From 872e80d4b7db34b73ab10f9ed04a0c3c01444ad9 Mon Sep 17 00:00:00 2001
From: apapachristou <apapachristou@cite.gr>
Date: Fri, 10 Jul 2020 17:07:03 +0300
Subject: [PATCH] Add search field on dataset descriptions tab and fixes
 language

---
 .../ui/dashboard/drafts/drafts.component.html |  2 +-
 .../recent-edited-activity.component.css      |  1 +
 .../recent-edited-activity.component.html     |  2 +-
 .../recent-edited-activity.component.ts       |  2 +-
 ...ent-edited-dataset-activity.component.html | 11 ++++--
 ...ent-edited-dataset-activity.component.scss | 18 ++++++++++
 ...ecent-edited-dataset-activity.component.ts | 35 ++++++++++++++-----
 dmp-frontend/src/assets/i18n/en.json          |  4 ++-
 dmp-frontend/src/assets/i18n/es.json          |  4 ++-
 dmp-frontend/src/assets/i18n/gr.json          |  4 ++-
 10 files changed, 66 insertions(+), 17 deletions(-)

diff --git a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html
index 04a539c84..7f646e612 100644
--- a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html
@@ -2,7 +2,7 @@
 	<!-- Search Filter-->
 	<mat-form-field appearance="outline" class="search-form ml-auto col-auto pr-0" floatLabel="never">
 		<mat-icon matSuffix>search</mat-icon>
-		<input matInput placeholder="{{'CRITERIA.DMP.LIKE'| translate}}" name="likeCriteria" [formControl]="formGroup.get('like')">
+		<input matInput placeholder="{{'CRITERIA.DATA-SETS.DRAFT-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>
 	<!-- End of Search Filter -->
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css
index cfef941ad..5efa85d74 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css
@@ -175,6 +175,7 @@ input[type="text"] {
 .pointer {
 	cursor: pointer;
 }
+
 .search-form {
 	text-align: left;
 	width: 20rem;
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
index f4d528ba4..8094f8733 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
@@ -2,7 +2,7 @@
 	<!-- Search Filter-->
 	<mat-form-field appearance="outline" class="search-form ml-auto col-auto pr-0" floatLabel="never">
 		<mat-icon matSuffix>search</mat-icon>
-		<input matInput placeholder="{{'CRITERIA.DMP.LIKE'| translate}}" name="likeCriteria" [formControl]="formGroup.get('like')">
+		<input matInput placeholder="{{'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>
 	<!-- End of Search Filter -->
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts
index 4d1a59ed9..a460e8abd 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts
@@ -384,7 +384,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
 	refresh(): void {
 		const fields: Array<string> = ["-modified"];
 		this.startIndex = 0;
-		const allDataTableRequest: DataTableRequest<RecentActivityCriteria> = new DataTableRequest(0, 5, { fields: fields });
+		const allDataTableRequest: DataTableRequest<RecentActivityCriteria> = new DataTableRequest(0, this.pageSize, { fields: fields });
 		allDataTableRequest.criteria = new RecentActivityCriteria();
 		allDataTableRequest.criteria.like = this.formGroup.get("like").value;
 		this.dashboardService
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html
index 89ab52de0..9cf42cbf8 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html
@@ -1,5 +1,11 @@
-
 <div *ngIf="datasetActivities != null">
+	<!-- Search Filter-->
+	<mat-form-field appearance="outline" class="search-form ml-auto col-auto pr-0" floatLabel="never">
+		<mat-icon matSuffix>search</mat-icon>
+		<input matInput placeholder="{{'CRITERIA.DATA-SETS.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>
+	<!-- End of Search Filter -->
 	<div *ngFor="let activity of datasetActivities">
 		<div class="dataset-card">
 			<div [routerLink]="['../datasets/overview/' + activity.id]" class="pointer">
@@ -60,8 +66,7 @@
 			</mat-menu>
 		</div>
 	</div>
-	<div *ngIf="datasetActivities && datasetActivities.length > 0" class="d-flex justify-content-center">
+	<div *ngIf="datasetActivities && datasetActivities.length > 0 && datasetActivities.length >= startIndex + pageSize" class="d-flex justify-content-center">
 		<button type="button" class="btn-load-more" (click)="loadMore()">{{'GENERAL.ACTIONS.LOAD-MORE' | translate}}</button>
 	</div>
 </div>
-
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.scss b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.scss
index 63a38eb0c..7e6c2cd3e 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.scss
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.scss
@@ -175,3 +175,21 @@ input[type="text"] {
 .pointer {
 	cursor: pointer;
 }
+
+.search-form {
+	text-align: left;
+	width: 20rem;
+}
+
+.search-form mat-icon {
+	color: #129d99;
+}
+
+::ng-deep .search-form .mat-form-field-wrapper {
+	background-color: white !important;
+	padding-bottom: 0 !important;
+}
+
+::ng-deep .mat-form-field-appearance-outline .mat-form-field-infix {
+	padding: 0.3rem 0rem 0.6rem 0rem !important;
+}
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.ts b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.ts
index 16c3c9cd9..2aa02ea42 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.ts
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.ts
@@ -8,7 +8,7 @@ import { BaseComponent } from '@common/base/base.component';
 import { Principal } from '@app/core/model/auth/principal';
 import { TranslateService } from '@ngx-translate/core';
 import { EnumUtils } from '@app/core/services/utilities/enum-utils.service';
-import { FormControl } from '@angular/forms';
+import { FormControl, FormBuilder } from '@angular/forms';
 import { DatasetCopyDialogueComponent } from '@app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component';
 import { MatDialog } from '@angular/material';
 import { takeUntil } from 'rxjs/operators';
@@ -33,8 +33,11 @@ export class RecentEditedDatasetActivityComponent extends BaseComponent implemen
 
 	datasetActivities: DatasetListingModel[];
 	totalCount: number;
-	startIndex: number = 4;
+	startIndex: number = 0;
 	pageSize: number = 5;
+	public formGroup = new FormBuilder().group({
+		like: new FormControl()
+	});
 	// publicMode = false;
 
 	constructor(
@@ -61,26 +64,42 @@ export class RecentEditedDatasetActivityComponent extends BaseComponent implemen
 				.subscribe(response => {
 					this.datasetActivities = response.data;
 					this.totalCount = response.totalCount;
-					this.totalCountDatasets.emit(this.pageSize);
-					// this.totalCountDatasets.emit(this.totalCount);
+					this.totalCountDatasets.emit(this.datasetActivities.length);
 				});
+			this.formGroup.get('like').valueChanges
+				.pipe(takeUntil(this._destroyed))
+				.subscribe(x => this.refresh());
 		}
 	}
 
+	refresh(): void {
+		const fields: Array<string> = ["-modified"];
+		this.startIndex = 0;
+		const datasetDataTableRequest: DataTableRequest<DatasetCriteria> = new DataTableRequest(0, this.pageSize, { fields: fields });
+		datasetDataTableRequest.criteria = new DatasetCriteria();
+		datasetDataTableRequest.criteria.like = this.formGroup.get("like").value;
+		this.datasetService
+			.getPaged(datasetDataTableRequest)
+			.subscribe(response => {
+				this.datasetActivities = response.data;
+				this.totalCount = response.totalCount;
+				this.totalCountDatasets.emit(this.datasetActivities.length);
+			});
+	}
+
 	public loadMore() {
+		this.startIndex = this.startIndex + this.pageSize;
 		const fields: Array<string> = ["-modified"];
 		const request = new DataTableRequest<DatasetCriteria>(this.startIndex, this.pageSize, { fields: fields });
 
 		request.criteria = new DatasetCriteria();
-		request.criteria.like = "";
+		request.criteria.like = this.formGroup.get("like").value ? this.formGroup.get("like").value : "";
 
 		this.datasetService.getPaged(request).pipe(takeUntil(this._destroyed)).subscribe(result => {
 			if (!result) { return []; }
 			this.datasetActivities = this.datasetActivities.concat(result.data);
+			this.totalCountDatasets.emit(this.datasetActivities.length);
 		});
-		this.startIndex = this.startIndex + this.pageSize;
-
-		this.totalCountDatasets.emit(this.startIndex + 1);
 	}
 
 	public isAuthenticated(): boolean {
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index a7ada16ae..9a2775a24 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -849,6 +849,7 @@
 			"TAGS": "Tags",
 			"SELECT-TAGS": "Select Tags",
 			"LIKE": "Search Dataset Descriptions",
+			"DRAFT-LIKE": "Search Draft Dataset Descriptions",
 			"SELECT-GRANTS": "Select Grants",
 			"ROLE": "Role",
 			"ORGANIZATION": "Organization",
@@ -876,7 +877,8 @@
 			"LABEL": "Search",
 			"ROLE": "Role"
 		},
-		"SELECT": "Select an option"
+		"SELECT": "Select an option",
+		"LIKE": "Search"
 	},
 	"DATASET-EDITOR": {
 		"TITLE": {
diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json
index a3d24bd4d..daa44f273 100644
--- a/dmp-frontend/src/assets/i18n/es.json
+++ b/dmp-frontend/src/assets/i18n/es.json
@@ -844,6 +844,7 @@
 			"TAGS": "Etiquetas",
 			"SELECT-TAGS": "Etiquetas seleccionadas",
 			"LIKE": "Busdar descripciones del Dataset",
+			"DRAFT-LIKE": "Search Draft Dataset Descriptions",
 			"SELECT-GRANTS": "Seleccionar subvención",
 			"ROLE": "Función",
 			"ORGANIZATION": "Organización",
@@ -871,7 +872,8 @@
 			"LABEL": "Búsqueda",
 			"ROLE": "Función"
 		},
-		"SELECT": "Seleccionar una opción"
+		"SELECT": "Seleccionar una opción",
+		"LIKE": "Search"
 	},
 	"DATASET-EDITOR": {
 		"TITLE": {
diff --git a/dmp-frontend/src/assets/i18n/gr.json b/dmp-frontend/src/assets/i18n/gr.json
index 47a99f294..11fa6209a 100644
--- a/dmp-frontend/src/assets/i18n/gr.json
+++ b/dmp-frontend/src/assets/i18n/gr.json
@@ -845,6 +845,7 @@
 			"TAGS": "Ετικέτες",
 			"SELECT-TAGS": "Επιλογή Ετικέτας",
 			"LIKE": "Αναζήτηση Περιγραφών Συνόλου Δεδομένων",
+			"DRAFT-LIKE": "Αναζήτηση Προσχέδιων Περιγραφών Συνόλου Δεδομένων",
 			"SELECT-GRANTS": "Επιλογή Επιχορηγήσεων",
 			"ROLE": "Ρόλος",
 			"ORGANIZATION": "Οργανισμός",
@@ -872,7 +873,8 @@
 			"LABEL": "Αναζήτηση",
 			"ROLE": "Ρόλος"
 		},
-		"SELECT": "Επιλογή"
+		"SELECT": "Επιλογή",
+		"LIKE": "Search"
 	},
 	"DATASET-EDITOR": {
 		"TITLE": {