From cd1d81c3dd612b5f831822f94766890659d80bed Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Mon, 20 Jan 2020 18:11:35 +0200
Subject: [PATCH] Only Dataset Description Templates listing will show
 non-finalized templates (ref #227)

---
 .../eudat/data/dao/criteria/DatasetProfileCriteria.java   | 8 ++++++++
 .../eu/eudat/data/dao/entities/DatasetProfileDaoImpl.java | 6 +++++-
 .../query/dataset-profile/dataset-profile-criteria.ts     | 1 +
 .../listing/dataset-profile-listing.component.ts          | 1 +
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileCriteria.java
index 0bf07564c..b8e2c35c4 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileCriteria.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileCriteria.java
@@ -32,6 +32,7 @@ public class DatasetProfileCriteria extends Criteria<DatasetProfile> {
     private List<UUID> groupIds;
     private Short filter;
     private UUID userId;
+    private boolean finalized;
 
     public boolean getAllVersions() { return allVersions; }
     public void setAllVersions(boolean allVersions) { this.allVersions = allVersions; }
@@ -52,4 +53,11 @@ public class DatasetProfileCriteria extends Criteria<DatasetProfile> {
     public void setUserId(UUID userId) {
         this.userId = userId;
     }
+
+    public boolean getFinalized() {
+        return finalized;
+    }
+    public void setFinalized(boolean finalized) {
+        this.finalized = finalized;
+    }
 }
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetProfileDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetProfileDaoImpl.java
index 42a7f8082..b06d5d8fd 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetProfileDaoImpl.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetProfileDaoImpl.java
@@ -52,7 +52,11 @@ public class DatasetProfileDaoImpl extends DatabaseAccess<DatasetProfile> implem
                                 builder.notEqual(root.get("id"), criteria.getUserId())));
             }
         }
-        query.where(((builder, root) -> builder.notEqual(root.get("status"), DatasetProfile.Status.DELETED.getValue())));
+        if (criteria.getFinalized()) {
+            query.where(((builder, root) -> builder.equal(root.get("status"), DatasetProfile.Status.FINALIZED.getValue())));
+        } else {
+            query.where(((builder, root) -> builder.notEqual(root.get("status"), DatasetProfile.Status.DELETED.getValue())));
+        }
         return query;
     }
 
diff --git a/dmp-frontend/src/app/core/query/dataset-profile/dataset-profile-criteria.ts b/dmp-frontend/src/app/core/query/dataset-profile/dataset-profile-criteria.ts
index 313bfb5da..5d73e7c9c 100644
--- a/dmp-frontend/src/app/core/query/dataset-profile/dataset-profile-criteria.ts
+++ b/dmp-frontend/src/app/core/query/dataset-profile/dataset-profile-criteria.ts
@@ -4,4 +4,5 @@ export class DatasetProfileCriteria extends BaseCriteria {
 	public id: String;
 	public groupIds: string[];
 	public allVersions: boolean;
+	public finalized: boolean = true;
 }
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.ts
index 8582c490d..8f903dedd 100644
--- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.ts
+++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.ts
@@ -148,6 +148,7 @@ export class DatasetDataSource extends DataSource<DatasetListingModel> {
 				if (this._sort.active) { fields = this._sort.direction === 'asc' ? ['+' + this._sort.active] : ['-' + this._sort.active]; }
 				const request = new DataTableRequest<DatasetProfileCriteria>(startIndex, this._paginator.pageSize, { fields: fields });
 				request.criteria = this._criteria.criteria;
+				request.criteria.finalized = false;
 				if (this.itemId) {
 					request.criteria.groupIds = [this.itemId];
 					request.criteria.allVersions = true;