From f480ee6986ec44ba7440af02914659de597e96f2 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Mon, 16 Mar 2020 11:09:24 +0200
Subject: [PATCH] Prevent deleted datasets to be shown on th dataset List

---
 .../eudat/elastic/repository/DatasetRepository.java |  2 +-
 .../dataset-listing-item.component.html             |  2 +-
 .../listing-item/dataset-listing-item.component.ts  | 13 +++++++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DatasetRepository.java b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DatasetRepository.java
index 7013423ba..b02c07635 100644
--- a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DatasetRepository.java
+++ b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DatasetRepository.java
@@ -105,7 +105,7 @@ public class DatasetRepository extends ElasticRepository<Dataset, DatasetCriteri
             boolQuery = boolQuery.should(QueryBuilders.termsQuery("tags.name.keyword", criteria.getTags().stream().map(Tag::getName).collect(Collectors.toList())));
         }
 
-        if (boolQuery.should().isEmpty()) {
+        if (boolQuery.should().isEmpty() && boolQuery.mustNot().isEmpty()) {
             boolQuery.should(QueryBuilders.matchAllQuery());
         } else {
             boolQuery.minimumShouldMatch(boolQuery.should().size());
diff --git a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html
index 012bc584f..d8fc539e5 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html
+++ b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html
@@ -1,4 +1,4 @@
-<div class="listing-item">
+<div class="listing-item" *ngIf="!isDeleted">
 	<a [routerLink]="['/datasets/edit/' + dataset.id]">
 		<div class="col">
 			<div class="row">
diff --git a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.ts b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.ts
index 32e67f015..ad11cf98b 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.ts
+++ b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.ts
@@ -15,12 +15,21 @@ export class DatasetListingItemComponent implements OnInit {
 	@Output() onClick: EventEmitter<DatasetListingModel> = new EventEmitter();
 
 	isDraft: boolean;
+	isDeleted: boolean;
 
 	constructor(private router: Router) { }
 
 	ngOnInit() {
-		if (this.dataset.status == DatasetStatus.Draft) { this.isDraft = true }
-		else { this.isDraft = false }
+		if (this.dataset.status === DatasetStatus.Draft) {
+			this.isDraft = true;
+			this.isDeleted = false;
+		 } else if (this.dataset.status === DatasetStatus.Deleted) {
+			 this.isDeleted = true;
+		 }
+		else {
+			this.isDraft = false;
+			this.isDeleted = false;
+		 }
 	}