From f71d02613a84bf8084731db342be556c50af57fd Mon Sep 17 00:00:00 2001
From: gkolokythas <gkolokythas@cite.gr>
Date: Thu, 16 May 2019 13:54:29 +0300
Subject: [PATCH] Adds Tags functionality on Dataset listing with mockup data.
 (Ticket #76)

---
 .../eu/eudat/controllers/TagController.java   | 25 +++++++++++++++++--
 .../external-sources.service.ts               | 22 ++++++++--------
 .../criteria/dataset-criteria.component.html  | 13 ++++++++++
 .../criteria/dataset-criteria.component.ts    |  1 +
 .../listing/dataset-listing.component.ts      |  5 +++-
 dmp-frontend/src/assets/i18n/en.json          |  1 +
 6 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/TagController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/TagController.java
index c2e040d45..152b9c2d6 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/controllers/TagController.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/TagController.java
@@ -16,6 +16,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -39,8 +41,27 @@ public class TagController extends BaseController {
     public @ResponseBody
     ResponseEntity<ResponseItem<TagExternalSourcesModel>> listExternalTagModel(
             @RequestParam(value = "query", required = false) String query, @RequestParam(value = "type", required = false) String type) throws HugeResultSet, NoURLFound {
-        List<Map<String, String>> remoteRepos = this.getApiContext().getOperationsContext().getRemoteFetcher().getTags(query, type);
-        TagExternalSourcesModel researchersExternalSourcesModel = new TagExternalSourcesModel().fromExternalItem(remoteRepos);
+        /*List<Map<String, String>> remoteRepos = this.getApiContext().getOperationsContext().getRemoteFetcher().getTags(query, type);
+        TagExternalSourcesModel researchersExternalSourcesModel = new TagExternalSourcesModel().fromExternalItem(remoteRepos);*/
+
+        List<Map<String, String>> myListOfMaps = new ArrayList<>();
+        Map<String, String> map1 = new HashMap<>();
+        map1.put("pid", "1");
+        map1.put("name", "Tag1");
+        map1.put("label", "");
+        myListOfMaps.add(map1);
+        Map<String, String> map2 = new HashMap<>();
+        map2.put("pid", "2");
+        map2.put("name", "Tag2");
+        map2.put("label", "");
+        myListOfMaps.add(map2);
+        Map<String, String> map3 = new HashMap<>();
+        map3.put("pid", "3");
+        map3.put("name", "Tag3");
+        map3.put("label", "");
+        myListOfMaps.add(map3);
+        TagExternalSourcesModel researchersExternalSourcesModel = new TagExternalSourcesModel().fromExternalItem(myListOfMaps);
+
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<TagExternalSourcesModel>().payload(researchersExternalSourcesModel).status(ApiMessageCode.NO_MESSAGE));
     }
 }
diff --git a/dmp-frontend/src/app/core/services/external-sources/external-sources.service.ts b/dmp-frontend/src/app/core/services/external-sources/external-sources.service.ts
index 1d801b2da..d8b5b76a4 100644
--- a/dmp-frontend/src/app/core/services/external-sources/external-sources.service.ts
+++ b/dmp-frontend/src/app/core/services/external-sources/external-sources.service.ts
@@ -40,17 +40,17 @@ export class ExternalSourcesService {
 	}
 
 	public searchDatasetTags(requestItem: RequestItem<TagCriteria>): Observable<ExternalSourceItemModel[]> {
-		return Observable.of([
-			{ id: '1', name: 'Tag 1', description: '' },
-			{ id: '2', name: 'Tag 2', description: '' },
-			{ id: '3', name: 'Tag 3', description: '' },
-			{ id: '4', name: 'Tag 4', description: '' },
-			{ id: '5', name: 'Tag 5', description: '' },
-			{ id: '6', name: 'Tag 6', description: '' },
-			{ id: '7', name: 'Tag 7', description: '' },
-			{ id: '8', name: 'Tag 8', description: '' },
-		]);
-		//return this.http.get<ExternalSourceItemModel[]>(this.actionUrl + "tags" + "?query=" + requestItem.criteria.like + "&type=" + requestItem.criteria.type, { headers: this.headers });
+		// return Observable.of([
+		// 	{ id: '1', name: 'Tag 1', description: '' },
+		// 	{ id: '2', name: 'Tag 2', description: '' },
+		// 	{ id: '3', name: 'Tag 3', description: '' },
+		// 	{ id: '4', name: 'Tag 4', description: '' },
+		// 	{ id: '5', name: 'Tag 5', description: '' },
+		// 	{ id: '6', name: 'Tag 6', description: '' },
+		// 	{ id: '7', name: 'Tag 7', description: '' },
+		// 	{ id: '8', name: 'Tag 8', description: '' },
+		// ]);
+		return this.http.get<ExternalSourceItemModel[]>(this.actionUrl + "tags" + "?query=" + requestItem.criteria.like + "&type=" + requestItem.criteria.type, { headers: this.headers });
 	}
 
 	public searchDatasetSExternalDatasetservice(requestItem: RequestItem<ExternalDatasetCriteria>): Observable<ExternalSourceItemModel[]> {
diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html
index 97fe399b5..46f12eaf2 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html
+++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html
@@ -92,6 +92,19 @@
 			</div>
 			<!-- End of Related Organization Filter -->
 
+			<!-- Tags Filter -->
+			<div class="col-10 gray-container">
+				<h6 class="category-title">{{'CRITERIA.DATA-SETS.TAGS' | translate }}</h6>
+				<mat-form-field>
+					<app-multiple-auto-complete [formControl]="formGroup.get('tags')"
+						placeholder="{{'CRITERIA.DATA-SETS.SELECT-TAGS' | translate}}"
+						[configuration]="tagsAutoCompleteConfiguration">
+					</app-multiple-auto-complete>
+					<mat-icon matSuffix class="style-icon">arrow_drop_down</mat-icon>
+				</mat-form-field>
+			</div>
+			<!-- End of Tags Filter -->
+
 			<!-- Import Button -->
 			<!-- <div class="col-10 import">
 				<button class="importButton" mat-raised-button color="primary" (click)="fileSave($event)"
diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts
index 3781bad54..50c1b6abd 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts
+++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts
@@ -56,6 +56,7 @@ export class DatasetCriteriaComponent extends BaseCriteriaComponent implements O
 		role: new FormControl(),
 		organisations: new FormControl(),
 		collaborators: new FormControl(),
+		tags: new FormControl()
 	});
 
 	tagsAutoCompleteConfiguration = {
diff --git a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts
index f050c4196..e4afaf0c2 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts
+++ b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts
@@ -85,8 +85,11 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB
 			allVersions: value.allVersions,
 			role: value.role
 		}
+		if (value.tags) {
+			request.criteria.tags = value.tags.map(x => x.id);
+		}
 		if (value.collaborators) {
-			request.criteria.collaborators = value.collaborators.map(x => x.id)
+			request.criteria.collaborators = value.collaborators.map(x => x.id);
 		}
 		if (value.dmpIds) {
 			request.criteria.dmpIds = value.dmpIds.map(x => x.id);
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index 7dbf871f3..455acac50 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -485,6 +485,7 @@
 			"STATUS": "Status",
 			"NONE": "-",
 			"TAGS": "Tags",
+			"SELECT-TAGS": "Select Tags",
 			"LIKE": "Search Datasets",
 			"SELECT-PROJECTS": "Select Projects",
 			"ROLE": "Role",