From dcede0b1ebf1e62ec33a82b2205b43f52c8027af Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Wed, 1 Apr 2020 18:16:06 +0300
Subject: [PATCH 01/60] Add Dmp Index (ref #252), compacted Dmp Listing so now
 both the user and the public listing will use one component (ref #253) and
 refactor operation context

---
 .../criteria/DataManagementPlanCriteria.java  |  19 +-
 .../eudat/data/dao/entities/DMPDaoImpl.java   |  10 +
 .../eudat/elastic/criteria/DmpCriteria.java   |  97 ++++++
 .../elastic/entities/DatasetTempalate.java    |  44 +++
 .../java/eu/eudat/elastic/entities/Dmp.java   | 285 ++++++++++++++++++
 .../elastic/repository/DmpRepository.java     | 137 +++++++++
 .../main/java/eu/eudat/controllers/DMPs.java  |  25 +-
 .../logic/managers/DashBoardManager.java      |   4 +-
 .../managers/DataManagementPlanManager.java   | 137 ++++++---
 .../eudat/logic/managers/DatasetManager.java  |  48 ++-
 .../logic/managers/DatasetWizardManager.java  |   4 +-
 .../mapper/elastic/CollaboratorMapper.java    |  14 +
 .../logic/mapper/elastic/DatasetMapper.java   |  74 +++++
 .../mapper/elastic/DatasetTemplateMapper.java |  14 +
 .../eudat/logic/mapper/elastic/DmpMapper.java |  86 ++++++
 .../mapper/elastic/OrganizationMapper.java    |  14 +
 .../elastic/criteria/DmpCriteriaMapper.java   |  33 ++
 .../operations/ElasticRepository.java         |  11 +
 .../operations/ElasticRepositoryImpl.java     |  29 ++
 .../operations/OperationsContext.java         |   3 +-
 .../operations/OperationsContextImpl.java     |  25 +-
 .../datasetwizard/DatasetWizardModel.java     |  12 +-
 .../models/data/dmp/DataManagementPlan.java   |  13 +-
 dmp-frontend/src/app/app-routing.module.ts    |   3 +-
 .../src/app/core/query/dmp/dmp-criteria.ts    |   2 +
 .../src/app/core/services/dmp/dmp.service.ts  |   8 +
 .../index-managment.component.ts              |  22 ++
 .../dataset-listing-item.component.ts         |   2 +-
 dmp-frontend/src/app/ui/dmp/dmp.routing.ts    |   8 +
 .../datasets-tab/datasets-tab.component.ts    |   2 +-
 .../ui/dmp/editor/dmp-editor.component.html   |   8 +-
 .../app/ui/dmp/editor/dmp-editor.component.ts |  38 ++-
 .../criteria/dmp-criteria.component.html      |  23 +-
 .../criteria/dmp-criteria.component.ts        |  24 +-
 .../ui/dmp/listing/dmp-listing.component.html |  14 +-
 .../ui/dmp/listing/dmp-listing.component.scss |  24 +-
 .../ui/dmp/listing/dmp-listing.component.ts   |  18 +-
 .../dmp-listing-item.component.html           |  14 +-
 .../dmp-listing-item.component.ts             |   1 +
 39 files changed, 1205 insertions(+), 144 deletions(-)
 create mode 100644 dmp-backend/elastic/src/main/java/eu/eudat/elastic/criteria/DmpCriteria.java
 create mode 100644 dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/DatasetTempalate.java
 create mode 100644 dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java
 create mode 100644 dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DmpRepository.java
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/CollaboratorMapper.java
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DatasetMapper.java
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DatasetTemplateMapper.java
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DmpMapper.java
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/OrganizationMapper.java
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/criteria/DmpCriteriaMapper.java
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/ElasticRepository.java
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/ElasticRepositoryImpl.java

diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanCriteria.java
index 09376a3ab..4d7b82895 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanCriteria.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanCriteria.java
@@ -1,7 +1,6 @@
 package eu.eudat.data.dao.criteria;
 
 import eu.eudat.data.entities.DMP;
-
 import eu.eudat.data.entities.Grant;
 
 import java.util.Date;
@@ -20,6 +19,8 @@ public class DataManagementPlanCriteria extends Criteria<DMP> {
     private List<UUID> collaborators;
     private List<UUID> datasetTemplates;
     private boolean isPublic;
+    private boolean onlyPublic;
+    private Short grantStatus;
 
     public Date getPeriodStart() {
         return periodStart;
@@ -97,4 +98,20 @@ public class DataManagementPlanCriteria extends Criteria<DMP> {
     public void setIsPublic(boolean isPublic) {
         this.isPublic = isPublic;
     }
+
+    public boolean isOnlyPublic() {
+        return onlyPublic;
+    }
+
+    public void setOnlyPublic(boolean onlyPublic) {
+        this.onlyPublic = onlyPublic;
+    }
+
+    public Short getGrantStatus() {
+        return grantStatus;
+    }
+
+    public void setGrantStatus(Short grantStatus) {
+        this.grantStatus = grantStatus;
+    }
 }
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDaoImpl.java
index 7077d4db5..b6fb3c5d4 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDaoImpl.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDaoImpl.java
@@ -9,6 +9,7 @@ import eu.eudat.data.entities.UserInfo;
 import eu.eudat.queryable.QueryableList;
 import eu.eudat.queryable.types.FieldSelectionType;
 import eu.eudat.queryable.types.SelectionField;
+import eu.eudat.types.grant.GrantStateType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
@@ -16,6 +17,7 @@ import org.springframework.stereotype.Component;
 import javax.persistence.criteria.Join;
 import javax.persistence.criteria.JoinType;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
@@ -73,6 +75,14 @@ public class DMPDaoImpl extends DatabaseAccess<DMP> implements DMPDao {
 		if (criteria.getDatasetTemplates() != null && !criteria.getDatasetTemplates().isEmpty()) {
 			query.where((builder, root) -> root.join("associatedDmps", JoinType.LEFT).get("id").in(criteria.getDatasetTemplates()));
 		}
+		if (criteria.getGrantStatus() != null) {
+			if (criteria.getGrantStatus().equals(GrantStateType.FINISHED.getValue().shortValue()))
+				query.where((builder, root) -> builder.lessThan(root.get("grant").get("enddate"), new Date()));
+			if (criteria.getGrantStatus().equals(GrantStateType.ONGOING.getValue().shortValue()))
+				query.where((builder, root) ->
+						builder.or(builder.greaterThan(root.get("grant").get("enddate"), new Date())
+								, builder.isNull(root.get("grant").get("enddate"))));
+		}
 		query.where((builder, root) -> builder.notEqual(root.get("status"), DMP.DMPStatus.DELETED.getValue()));
 		return query;
 	}
diff --git a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/criteria/DmpCriteria.java b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/criteria/DmpCriteria.java
new file mode 100644
index 000000000..4f9a89962
--- /dev/null
+++ b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/criteria/DmpCriteria.java
@@ -0,0 +1,97 @@
+package eu.eudat.elastic.criteria;
+
+import java.util.List;
+import java.util.UUID;
+
+public class DmpCriteria extends Criteria {
+	private String like;
+	private Short status;
+	private List<UUID> templates;
+	private List<UUID> grants;
+	private List<UUID> collaborators;
+	private List<UUID> organizations;
+	private boolean isPublic;
+	private List<UUID> groupIds;
+	private boolean allowAllVersions;
+	private Short grantStatus;
+
+	public String getLike() {
+		return like;
+	}
+
+	public void setLike(String like) {
+		this.like = like;
+	}
+
+	public Short getStatus() {
+		return status;
+	}
+
+	public void setStatus(Short status) {
+		this.status = status;
+	}
+
+	public List<UUID> getTemplates() {
+		return templates;
+	}
+
+	public void setTemplates(List<UUID> templates) {
+		this.templates = templates;
+	}
+
+	public List<UUID> getGrants() {
+		return grants;
+	}
+
+	public void setGrants(List<UUID> grants) {
+		this.grants = grants;
+	}
+
+	public List<UUID> getCollaborators() {
+		return collaborators;
+	}
+
+	public void setCollaborators(List<UUID> collaborators) {
+		this.collaborators = collaborators;
+	}
+
+	public List<UUID> getOrganizations() {
+		return organizations;
+	}
+
+	public void setOrganizations(List<UUID> organizations) {
+		this.organizations = organizations;
+	}
+
+	public boolean isPublic() {
+		return isPublic;
+	}
+
+	public void setPublic(boolean aPublic) {
+		isPublic = aPublic;
+	}
+
+	public List<UUID> getGroupIds() {
+		return groupIds;
+	}
+
+	public void setGroupIds(List<UUID> groupIds) {
+		this.groupIds = groupIds;
+	}
+
+	public boolean isAllowAllVersions() {
+		return allowAllVersions;
+	}
+
+	public void setAllowAllVersions(boolean allowAllVersions) {
+		this.allowAllVersions = allowAllVersions;
+	}
+
+	public Short getGrantStatus() {
+		return grantStatus;
+	}
+
+	public void setGrantStatus(Short grantStatus) {
+		this.grantStatus = grantStatus;
+	}
+}
diff --git a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/DatasetTempalate.java b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/DatasetTempalate.java
new file mode 100644
index 000000000..c62c32986
--- /dev/null
+++ b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/DatasetTempalate.java
@@ -0,0 +1,44 @@
+package eu.eudat.elastic.entities;
+
+import org.elasticsearch.common.xcontent.XContentBuilder;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.UUID;
+
+public class DatasetTempalate implements ElasticEntity<DatasetTempalate> {
+	private UUID id;
+	private String name;
+
+	public UUID getId() {
+		return id;
+	}
+
+	public void setId(UUID id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	@Override
+	public XContentBuilder toElasticEntity(XContentBuilder builder) throws IOException {
+		builder.startObject();
+		builder.field("id", this.id.toString());
+		builder.field("name", this.name);
+		builder.endObject();
+		return builder;
+	}
+
+	@Override
+	public DatasetTempalate fromElasticEntity(Map<String, Object> fields) {
+		this.id = UUID.fromString((String) fields.get("id"));
+		this.name = (String) fields.get("name");
+		return this;
+	}
+}
diff --git a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java
new file mode 100644
index 000000000..7f51d36ae
--- /dev/null
+++ b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java
@@ -0,0 +1,285 @@
+package eu.eudat.elastic.entities;
+
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+public class Dmp implements ElasticEntity<Dmp> {
+	private static final Logger logger = LoggerFactory.getLogger(Dmp.class);
+
+	public enum DMPStatus {
+		ACTIVE((short) 0), FINALISED((short) 1),DELETED((short) 99);
+
+		private short value;
+
+		private DMPStatus(short value) {
+			this.value = value;
+		}
+
+		public short getValue() {
+			return value;
+		}
+
+		public static DMPStatus fromInteger(short value) {
+			switch (value) {
+				case 0:
+					return ACTIVE;
+				case 1:
+					return FINALISED;
+				case 99:
+					return DELETED;
+				default:
+					throw new RuntimeException("Unsupported DMP Status");
+			}
+		}
+	}
+
+	private UUID id;
+	private String label;
+	private String description;
+	private UUID groupId;
+	private Short status;
+	private List<DatasetTempalate> templates;
+	private List<Collaborator> collaborators;
+	private List<Organization> organizations;
+	private Boolean lastVersion;
+	private Boolean lastPublicVersion;
+	private Boolean isPublic;
+	private List<Dataset> datasets;
+	private UUID grant;
+	private Short grantStatus;
+
+	public UUID getId() {
+		return id;
+	}
+
+	public void setId(UUID id) {
+		this.id = id;
+	}
+
+	public String getLabel() {
+		return label;
+	}
+
+	public void setLabel(String label) {
+		this.label = label;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public UUID getGroupId() {
+		return groupId;
+	}
+
+	public void setGroupId(UUID groupId) {
+		this.groupId = groupId;
+	}
+
+	public Short getStatus() {
+		return status;
+	}
+
+	public void setStatus(Short status) {
+		this.status = status;
+	}
+
+	public List<DatasetTempalate> getTemplates() {
+		return templates;
+	}
+
+	public void setTemplates(List<DatasetTempalate> templates) {
+		this.templates = templates;
+	}
+
+	public List<Collaborator> getCollaborators() {
+		return collaborators;
+	}
+
+	public void setCollaborators(List<Collaborator> collaborators) {
+		this.collaborators = collaborators;
+	}
+
+	public List<Organization> getOrganizations() {
+		return organizations;
+	}
+
+	public void setOrganizations(List<Organization> organizations) {
+		this.organizations = organizations;
+	}
+
+	public Boolean getLastVersion() {
+		return lastVersion;
+	}
+
+	public void setLastVersion(Boolean lastVersion) {
+		this.lastVersion = lastVersion;
+	}
+
+	public Boolean getLastPublicVersion() {
+		return lastPublicVersion;
+	}
+
+	public void setLastPublicVersion(Boolean lastPublicVersion) {
+		this.lastPublicVersion = lastPublicVersion;
+	}
+
+	public Boolean getPublic() {
+		return isPublic;
+	}
+
+	public void setPublic(Boolean aPublic) {
+		isPublic = aPublic;
+	}
+
+	public List<Dataset> getDatasets() {
+		return datasets;
+	}
+
+	public void setDatasets(List<Dataset> datasets) {
+		this.datasets = datasets;
+	}
+
+	public UUID getGrant() {
+		return grant;
+	}
+
+	public void setGrant(UUID grant) {
+		this.grant = grant;
+	}
+
+	public Short getGrantStatus() {
+		return grantStatus;
+	}
+
+	public void setGrantStatus(Short grantStatus) {
+		this.grantStatus = grantStatus;
+	}
+
+	@Override
+	public XContentBuilder toElasticEntity(XContentBuilder builder) throws IOException {
+		builder.startObject();
+		builder.field(MapKey.ID.getName(), this.id.toString());
+		builder.field(MapKey.LABEL.getName(), this.label);
+		builder.field(MapKey.DESCRIPTION.getName(), this.description);
+		builder.field(MapKey.GROUPID.getName(), this.groupId.toString());
+		builder.field(MapKey.STATUS.getName(), this.status);
+		if (this.templates != null) {
+			builder.startArray(MapKey.TEMPLATES.getName());
+			this.templates.forEach(template -> {
+				try {
+					template.toElasticEntity(builder);
+				} catch (IOException e) {
+					logger.error(e.getMessage(), e);
+				}
+			});
+			builder.endArray();
+		}
+		if (this.collaborators != null) {
+			builder.startArray(MapKey.COLLABORATORS.getName());
+			this.collaborators.forEach(collaborator -> {
+				try {
+					collaborator.toElasticEntity(builder);
+				} catch (IOException e) {
+					logger.error(e.getMessage(), e);
+				}
+			});
+			builder.endArray();
+		}
+		if (this.organizations != null) {
+			builder.startArray(MapKey.ORGANIZATIONS.getName());
+			this.organizations.forEach(organization -> {
+				try {
+					organization.toElasticEntity(builder);
+				} catch (IOException e) {
+					logger.error(e.getMessage(), e);
+				}
+			});
+			builder.endArray();
+		}
+		builder.field(MapKey.LASTVERSION.getName(), this.lastVersion);
+		builder.field(MapKey.LASTPUBLICVERSION.getName(), this.lastPublicVersion);
+		builder.field(MapKey.ISPUBLIC.getName(), this.isPublic);
+		builder.startArray(MapKey.DATASETS.getName());
+		this.datasets.forEach(dataset -> {
+			try {
+				dataset.toElasticEntity(builder);
+			} catch (IOException e) {
+				logger.error(e.getMessage(), e);
+			}
+		});
+		builder.endArray();
+		builder.field(MapKey.GRANT.getName(), this.grant.toString());
+		builder.field(MapKey.GRANTSTATUS.getName(), this.grantStatus);
+		builder.endObject();
+		return builder;
+	}
+
+	@Override
+	public Dmp fromElasticEntity(Map<String, Object> fields) {
+		this.id = UUID.fromString((String) fields.get(MapKey.ID.getName()));
+		this.label = (String) fields.get(MapKey.LABEL.getName());
+		this.description = (String) fields.get(MapKey.DESCRIPTION.getName());
+		this.groupId = UUID.fromString((String) fields.get(MapKey.GROUPID.getName()));
+		this.status = Short.valueOf(fields.get(MapKey.STATUS.getName()).toString());
+		if (fields.get(MapKey.TEMPLATES.getName()) != null) {
+			this.templates = ((List<HashMap<String, Object>>) fields.get(MapKey.TEMPLATES.getName())).stream().map(hashMap -> new DatasetTempalate().fromElasticEntity(hashMap)).collect(Collectors.toList());
+		}
+		if (fields.get(MapKey.COLLABORATORS.getName()) != null) {
+			this.collaborators = ((List<HashMap<String, Object>>) fields.get(MapKey.COLLABORATORS.getName())).stream().map(map -> new Collaborator().fromElasticEntity(map)).collect(Collectors.toList());
+		}
+		if (fields.get(MapKey.ORGANIZATIONS.getName()) != null) {
+			this.organizations = ((List<HashMap<String, Object>>) fields.get(MapKey.ORGANIZATIONS.getName())).stream().map(map -> new Organization().fromElasticEntity(map)).collect(Collectors.toList());
+		}
+		this.lastVersion = (Boolean) fields.get(MapKey.LASTVERSION.getName());
+		this.lastPublicVersion = (Boolean) fields.get(MapKey.LASTPUBLICVERSION.getName());
+		this.isPublic = (Boolean) fields.get(MapKey.ISPUBLIC.getName());
+		if (fields.get(MapKey.DATASETS.getName()) != null) {
+			this.datasets = ((List<HashMap<String, Object>>) fields.get(MapKey.DATASETS.getName())).stream().map(map -> new Dataset().fromElasticEntity(map)).collect(Collectors.toList());
+		}
+		this.grant = UUID.fromString((String) fields.get(MapKey.GRANT.getName()));
+		if (fields.get(MapKey.GRANTSTATUS.getName()) != null) {
+			this.grantStatus = Short.valueOf(fields.get(MapKey.GRANTSTATUS.getName()).toString());
+		}
+		return this;
+	}
+
+	public enum MapKey {
+		ID ("id"),
+		LABEL ("label"),
+		DESCRIPTION ("description"),
+		GROUPID ("groupId"),
+		STATUS ("status"),
+		TEMPLATES ("templates"),
+		COLLABORATORS ("collaborators"),
+		ORGANIZATIONS ("organizations"),
+		LASTVERSION ("lastVersion"),
+		LASTPUBLICVERSION ("lastPublicVersion"),
+		ISPUBLIC ("isPublic"),
+		DATASETS ("datasets"),
+		GRANT ("grant"),
+		GRANTSTATUS ("grantStatus");
+
+		private final String name;
+
+		private MapKey(String name) {
+			this.name = name;
+		}
+
+		public String getName() {
+			return name;
+		}
+	}
+}
diff --git a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DmpRepository.java b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DmpRepository.java
new file mode 100644
index 000000000..8447c772c
--- /dev/null
+++ b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DmpRepository.java
@@ -0,0 +1,137 @@
+package eu.eudat.elastic.repository;
+
+import eu.eudat.elastic.criteria.DmpCriteria;
+import eu.eudat.elastic.entities.Dataset;
+import eu.eudat.elastic.entities.Dmp;
+import eu.eudat.elastic.entities.Tag;
+import org.elasticsearch.action.get.GetRequest;
+import org.elasticsearch.action.get.GetResponse;
+import org.elasticsearch.action.index.IndexRequest;
+import org.elasticsearch.action.index.IndexResponse;
+import org.elasticsearch.action.search.SearchRequest;
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.elasticsearch.client.core.CountRequest;
+import org.elasticsearch.client.core.CountResponse;
+import org.elasticsearch.client.indices.GetIndexRequest;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentFactory;
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.index.reindex.DeleteByQueryRequest;
+import org.elasticsearch.search.builder.SearchSourceBuilder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.util.*;
+import java.util.concurrent.ExecutionException;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+@Service("dmpRepository")
+public class DmpRepository extends ElasticRepository<Dmp, DmpCriteria> {
+
+	@Autowired
+	public DmpRepository(RestHighLevelClient client) {
+		super(client);
+	}
+
+	@Override
+	public Dmp createOrUpdate(Dmp entity) throws IOException {
+		XContentBuilder builder = XContentFactory.jsonBuilder();
+		IndexRequest request = new IndexRequest("dmps").id(entity.getId().toString()).source(entity.toElasticEntity(builder));
+		IndexResponse response = this.getClient().index(request, RequestOptions.DEFAULT);
+		return entity;
+	}
+
+	@Override
+	public Dmp findDocument(String id) throws IOException {
+		GetRequest request = new GetRequest("dmps",id);
+		GetResponse response = this.getClient().get(request, RequestOptions.DEFAULT);
+		return new Dmp().fromElasticEntity(response.getSourceAsMap());
+	}
+
+	@Override
+	public List<Dmp> query(DmpCriteria criteria) throws IOException {
+		SearchRequest searchRequest = new SearchRequest("dmps");
+		SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+
+		CountRequest countRequest = new CountRequest("dmps");
+		countRequest.query(QueryBuilders.boolQuery().mustNot(QueryBuilders.termsQuery(Dmp.MapKey.STATUS.getName(), Collections.singletonList(Dmp.DMPStatus.DELETED.getValue()))));
+		CountResponse countResponse = getClient().count(countRequest, RequestOptions.DEFAULT);
+		Long count = countResponse.getCount();
+
+		searchSourceBuilder.size(count.intValue());
+
+		BoolQueryBuilder boolQuery = QueryBuilders.boolQuery().mustNot(QueryBuilders.termsQuery(Dmp.MapKey.STATUS.getName(), Collections.singletonList(Dmp.DMPStatus.DELETED.getValue())));
+		if (criteria.isPublic()) {
+			boolQuery = boolQuery.should(QueryBuilders.termQuery(Dmp.MapKey.ISPUBLIC.getName(), true));
+			boolQuery = boolQuery.should(QueryBuilders.termQuery(Dmp.MapKey.STATUS.getName(), Dmp.DMPStatus.FINALISED.getValue()));
+		}
+		if (criteria.getLike() != null && !criteria.getLike().isEmpty()) {
+			boolQuery = boolQuery.should(QueryBuilders.queryStringQuery(criteria.getLike()).fields(Stream.of(new Object[][] {
+					{ Dmp.MapKey.LABEL.getName(), 1.0f },
+					{ Dmp.MapKey.DESCRIPTION.getName(), 1.0f }
+			}).collect(Collectors.toMap(data -> (String) data[0], data -> (Float) data[1]))));
+		}
+
+		if (criteria.getTemplates() != null && criteria.getTemplates().size() > 0) {
+			boolQuery = boolQuery.should(QueryBuilders.termsQuery(Dmp.MapKey.TEMPLATES.getName() + ".id.keyword", criteria.getTemplates().stream().map(UUID::toString).collect(Collectors.toList())));
+		}
+
+		if (criteria.getStatus() != null) {
+			boolQuery = boolQuery.should(QueryBuilders.termQuery(Dmp.MapKey.STATUS.getName(), criteria.getStatus().intValue()));
+		}
+
+		if (criteria.getGroupIds() != null && criteria.getGroupIds().size() > 0) {
+			boolQuery = boolQuery.should(QueryBuilders.termsQuery(Dmp.MapKey.GROUPID.getName(), criteria.getGroupIds().stream().map(UUID::toString).collect(Collectors.toList())));
+		}
+
+		if (criteria.getGrants() != null && criteria.getGrants().size() > 0) {
+			boolQuery = boolQuery.should(QueryBuilders.termsQuery(Dmp.MapKey.GRANT.getName() + ".keyword", criteria.getGrants().stream().map(UUID::toString).collect(Collectors.toList())));
+		}
+
+		if (criteria.getCollaborators() != null && criteria.getCollaborators().size() > 0) {
+			boolQuery = boolQuery.should(QueryBuilders.termsQuery(Dmp.MapKey.COLLABORATORS.getName() + ".keyword", criteria.getCollaborators().stream().map(UUID::toString).collect(Collectors.toList())));
+		}
+
+		if (!criteria.isAllowAllVersions()) {
+			boolQuery = boolQuery.should(QueryBuilders.termQuery(criteria.isPublic() ? Dmp.MapKey.LASTPUBLICVERSION.getName() : Dmp.MapKey.LASTVERSION.getName(), true));
+		}
+
+		if (criteria.getOrganizations() != null && criteria.getOrganizations().size() > 0) {
+			boolQuery = boolQuery.should(QueryBuilders.termsQuery(Dmp.MapKey.ORGANIZATIONS.getName() + ".id.keyword", criteria.getOrganizations().stream().map(UUID::toString).collect(Collectors.toList())));
+		}
+
+		if (criteria.getGrantStatus() != null) {
+			boolQuery = boolQuery.should(QueryBuilders.termQuery(Dmp.MapKey.GRANTSTATUS.getName(), criteria.getGrantStatus()));
+		}
+
+		if (boolQuery.should().isEmpty() && boolQuery.mustNot().isEmpty()) {
+			boolQuery = boolQuery.should(QueryBuilders.matchAllQuery());
+		} else {
+			boolQuery.minimumShouldMatch(boolQuery.should().size());
+		}
+		searchSourceBuilder.query(boolQuery);
+		searchRequest.source(searchSourceBuilder);
+		SearchResponse response = this.getClient().search(searchRequest, RequestOptions.DEFAULT);
+		return Arrays.stream(response.getHits().getHits()).map(x -> new Dmp().fromElasticEntity((Map<String, Object>)this.transformFromString(x.getSourceAsString(), Map.class))).collect(Collectors.toList());
+	}
+
+	@Override
+	public boolean exists() throws IOException {
+		GetIndexRequest request = new GetIndexRequest("dmps");
+		return this.getClient().indices().exists(request, RequestOptions.DEFAULT);
+	}
+
+	@Override
+	public void clear() throws IOException {
+		if (exists()) {
+			DeleteByQueryRequest delete = new DeleteByQueryRequest("dmps");
+			delete.setQuery(QueryBuilders.matchAllQuery());
+			this.getClient().deleteByQuery(delete, RequestOptions.DEFAULT);
+		}
+	}
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java
index 0e25b98f6..777537751 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java
@@ -6,6 +6,7 @@ import eu.eudat.criteria.DMPCriteria;
 import eu.eudat.data.dao.criteria.DynamicFieldsCriteria;
 import eu.eudat.data.dao.criteria.RequestItem;
 import eu.eudat.data.entities.DMP;
+import eu.eudat.data.entities.Dataset;
 import eu.eudat.data.query.items.table.datasetprofile.DatasetProfileTableRequestItem;
 import eu.eudat.data.query.items.table.dmp.DataManagementPlanTableRequest;
 import eu.eudat.data.query.items.table.dmp.DataManagmentPlanPublicTableRequest;
@@ -90,7 +91,9 @@ public class DMPs extends BaseController {
 
     @RequestMapping(method = RequestMethod.POST, value = {"/paged"}, consumes = "application/json", produces = "application/json")
     public @ResponseBody
-    ResponseEntity<ResponseItem<DataTableData<DataManagementPlanListingModel>>> getPaged(@Valid @RequestBody DataManagementPlanTableRequest dataManagementPlanTableRequest, @RequestParam String fieldsGroup, Principal principal) throws Exception {
+    ResponseEntity<ResponseItem<DataTableData<DataManagementPlanListingModel>>> getPaged(@Valid @RequestBody DataManagementPlanTableRequest dataManagementPlanTableRequest,
+                                                                                         @RequestParam String fieldsGroup,
+                                                                                         @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) throws Exception {
         DataTableData<DataManagementPlanListingModel> dataTable = this.dataManagementPlanManager.getPaged(dataManagementPlanTableRequest, principal, fieldsGroup);
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataTableData<DataManagementPlanListingModel>>().status(ApiMessageCode.NO_MESSAGE).payload(dataTable));
     }
@@ -122,7 +125,7 @@ public class DMPs extends BaseController {
 
     @RequestMapping(method = RequestMethod.GET, value = {"/overview/{id}"})
     public @ResponseBody
-    ResponseEntity getOverviewSingle(@PathVariable String id, Principal principal) {
+    ResponseEntity getOverviewSingle(@PathVariable String id,@ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) {
         try {
             DataManagementPlanOverviewModel dataManagementPlan = this.dataManagementPlanManager.getOverviewSingle(id, principal);
             return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataManagementPlanOverviewModel>().status(ApiMessageCode.NO_MESSAGE).payload(dataManagementPlan));
@@ -190,7 +193,7 @@ public class DMPs extends BaseController {
         try {
             this.dataManagementPlanManager.delete(id);
             return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DMP>().status(ApiMessageCode.SUCCESS_MESSAGE).message("Successfully Deleted Datamanagement Plan"));
-        } catch (DMPWithDatasetsDeleteException exception) {
+        } catch (DMPWithDatasetsDeleteException | IOException exception) {
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<DMP>().status(ApiMessageCode.ERROR_MESSAGE).message(exception.getMessage()));
         }
     }
@@ -292,4 +295,20 @@ public class DMPs extends BaseController {
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<String>().status(ApiMessageCode.ERROR_MESSAGE).message(e.getMessage()));
         }
     }
+
+    @javax.transaction.Transactional
+    @RequestMapping(method = RequestMethod.POST, value = {"/index"})
+    public @ResponseBody
+    ResponseEntity<ResponseItem<Dataset>> generateIndex(Principal principal) throws Exception {
+        this.dataManagementPlanManager.generateIndex(principal);
+        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<eu.eudat.data.entities.Dataset>().status(ApiMessageCode.SUCCESS_MESSAGE).message("Generated").payload(null));
+    }
+
+    @javax.transaction.Transactional
+    @RequestMapping(method = RequestMethod.DELETE, value = {"/index"})
+    public @ResponseBody
+    ResponseEntity<ResponseItem<Dataset>> clearIndex(Principal principal) throws Exception {
+        this.dataManagementPlanManager.clearIndex(principal);
+        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<eu.eudat.data.entities.Dataset>().status(ApiMessageCode.SUCCESS_MESSAGE).message("Cleared").payload(null));
+    }
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java
index 0d5b81e06..ec33379da 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java
@@ -89,12 +89,12 @@ public class DashBoardManager {
         UserInfo user = new UserInfo();
         user.setId(principal.getId());
         DatasetCriteria datasetCriteria = new DatasetCriteria();
-        if (apiContext.getOperationsContext().getDatasetRepository() != null) {
+        if (apiContext.getOperationsContext().getElasticRepository().getDatasetRepository() != null) {
             try {
                 eu.eudat.elastic.criteria.DatasetCriteria datasetElasticCriteria = new eu.eudat.elastic.criteria.DatasetCriteria();
                 datasetElasticCriteria.setAllowAllVersions(false);
                 datasetElasticCriteria.setPublic(false);
-                datasets = apiContext.getOperationsContext().getDatasetRepository().query(datasetElasticCriteria);
+                datasets = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().query(datasetElasticCriteria);
             }catch (Exception e) {
                 logger.warn(e.getMessage(), e);
                 datasets = null;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index 86842a3cf..7032411f4 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -18,12 +18,17 @@ import eu.eudat.data.query.items.item.dmp.DataManagementPlanCriteriaRequest;
 import eu.eudat.data.query.items.table.datasetprofile.DatasetProfileTableRequestItem;
 import eu.eudat.data.query.items.table.dmp.DataManagementPlanTableRequest;
 import eu.eudat.data.query.items.table.dmp.DataManagmentPlanPublicTableRequest;
+import eu.eudat.elastic.criteria.DmpCriteria;
 import eu.eudat.elastic.entities.Collaborator;
+import eu.eudat.elastic.entities.Dmp;
 import eu.eudat.elastic.entities.Organization;
+import eu.eudat.elastic.entities.Tag;
 import eu.eudat.exceptions.datamanagementplan.DMPNewVersionException;
 import eu.eudat.exceptions.datamanagementplan.DMPWithDatasetsDeleteException;
 import eu.eudat.exceptions.security.UnauthorisedException;
 import eu.eudat.logic.builders.entity.UserInfoBuilder;
+import eu.eudat.logic.mapper.elastic.DmpMapper;
+import eu.eudat.logic.mapper.elastic.criteria.DmpCriteriaMapper;
 import eu.eudat.logic.proxy.config.configloaders.ConfigLoader;
 import eu.eudat.logic.services.ApiContext;
 import eu.eudat.logic.services.forms.VisibilityRuleService;
@@ -51,11 +56,11 @@ import eu.eudat.models.data.listingmodels.DataManagementPlanOverviewModel;
 import eu.eudat.models.data.listingmodels.DatasetListingModel;
 import eu.eudat.models.data.listingmodels.UserInfoListingModel;
 import eu.eudat.models.data.project.ProjectDMPEditorModel;
-import eu.eudat.models.data.rda.RDAExportModel;
 import eu.eudat.models.data.security.Principal;
 import eu.eudat.models.data.user.composite.PagedDatasetProfile;
 import eu.eudat.models.data.userinfo.UserListingModel;
 import eu.eudat.queryable.QueryableList;
+import eu.eudat.types.Authorities;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.apache.poi.xwpf.usermodel.XWPFParagraph;
 import org.apache.poi.xwpf.usermodel.XWPFRun;
@@ -119,29 +124,58 @@ public class DataManagementPlanManager {
 
     public DataTableData<DataManagementPlanListingModel> getPaged(DataManagementPlanTableRequest dataManagementPlanTableRequest, Principal principal, String fieldsGroup) throws Exception {
         UUID principalID = principal.getId();
-        QueryableList<DMP> items = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().getWithCriteria(dataManagementPlanTableRequest.getCriteria());
+        List<Dmp> dmps = null;
+        QueryableList<DMP> items = null;
+        QueryableList<DMP> authItems = null;
+        if (apiContext.getOperationsContext().getElasticRepository().getDmpRepository() != null) {
+            DmpCriteria criteria = DmpCriteriaMapper.toElasticCriteria(dataManagementPlanTableRequest.getCriteria());
+            dmps = apiContext.getOperationsContext().getElasticRepository().getDmpRepository().query(criteria);
+            if (dmps != null && !dmps.isEmpty()) {
+                List<Dmp> finalDmps = dmps;
+                items = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().asQueryable().where((builder, root) -> root.get("id").in(finalDmps.stream().map(Dmp::getId).collect(Collectors.toList())));
+            }
+        }
+        if (items == null) {
+            items = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().getWithCriteria(dataManagementPlanTableRequest.getCriteria());
+        }
         List<Integer> roles = new LinkedList<>();
-        if (dataManagementPlanTableRequest.getCriteria().getRole() != null) roles.add(dataManagementPlanTableRequest.getCriteria().getRole());
-        QueryableList<DMP> authItems = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().getAuthenticated(items, principalID, roles);
+        if (!dataManagementPlanTableRequest.getCriteria().isOnlyPublic()) {
+            if (dataManagementPlanTableRequest.getCriteria().getRole() != null)
+                roles.add(dataManagementPlanTableRequest.getCriteria().getRole());
+           authItems = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().getAuthenticated(items, principalID, roles);
+        } else {
+            authItems = items;
+        }
         QueryableList<DMP> pagedItems = PaginationManager.applyPaging(authItems, dataManagementPlanTableRequest);
 
         DataTableData<DataManagementPlanListingModel> dataTable = new DataTableData<>();
 
         CompletableFuture itemsFuture;
         if (fieldsGroup.equals("listing")) {
-            itemsFuture = pagedItems.withHint(HintedModelFactory.getHint(DataManagementPlanListingModel.class))
-                    .selectAsync(item -> {
-                        item.setDataset(
-                                item.getDataset().stream()
-                                        .filter(dataset -> !dataset.getStatus().equals(Dataset.Status.DELETED.getValue()) && !dataset.getStatus().equals(Dataset.Status.CANCELED.getValue())).collect(Collectors.toList()).stream()
-                                        .filter(dataset -> dataset.getDmp().getUsers().stream().filter(userDMP -> userDMP.getRole().equals(UserDMP.UserDMPRoles.OWNER.getValue())).findFirst().get().getUser().getId().equals(principalID)
-                                                || dataset.getDmp().getUsers().stream()
-                                                .filter(x -> x.getUser().getId().equals(principalID))
-                                                .collect(Collectors.toList()).size() > 0)
-                                        .collect(Collectors.toSet()));
-                        return new DataManagementPlanListingModel().fromDataModelDatasets(item);
-                    })
-                    .whenComplete((resultList, throwable) -> dataTable.setData(resultList));
+            if (!dataManagementPlanTableRequest.getCriteria().isOnlyPublic()) {
+                itemsFuture = pagedItems.withHint(HintedModelFactory.getHint(DataManagementPlanListingModel.class))
+                                        .selectAsync(item -> {
+                                            item.setDataset(
+                                                    item.getDataset().stream()
+                                                        .filter(dataset -> !dataset.getStatus().equals(Dataset.Status.DELETED.getValue()) && !dataset.getStatus().equals(Dataset.Status.CANCELED.getValue())).collect(Collectors.toList()).stream()
+                                                        .filter(dataset -> dataset.getDmp().getUsers().stream().filter(userDMP -> userDMP.getRole().equals(UserDMP.UserDMPRoles.OWNER.getValue())).findFirst().get().getUser().getId().equals(principalID)
+                                                                || dataset.getDmp().getUsers().stream()
+                                                                          .filter(x -> x.getUser().getId().equals(principalID))
+                                                                          .collect(Collectors.toList()).size() > 0)
+                                                        .collect(Collectors.toSet()));
+                                            return new DataManagementPlanListingModel().fromDataModelDatasets(item);
+                                        })
+                                        .whenComplete((resultList, throwable) -> dataTable.setData(resultList));
+            } else {
+                itemsFuture = pagedItems.withHint(HintedModelFactory.getHint(DataManagementPlanListingModel.class))
+                                        .selectAsync(item -> {
+                                            item.setDataset(
+                                                    item.getDataset().stream()
+                                                        .filter(dataset -> dataset.getStatus().equals(Dataset.Status.FINALISED.getValue())).collect(Collectors.toSet()));
+                                            return new DataManagementPlanListingModel().fromDataModelDatasets(item);
+                                        })
+                                        .whenComplete((resultList, throwable) -> dataTable.setData(resultList));
+            }
         } else if (fieldsGroup.equals("autocomplete")) {
             itemsFuture = pagedItems
                     .selectAsync(item -> new DataManagementPlanListingModel().fromDataModelAutoComplete(item))
@@ -601,6 +635,8 @@ public class DataManagementPlanManager {
         if (dataManagementPlan.getAssociatedUsers().size() == 0)
             assignUser(newDmp, user);
 
+        this.updateIndex(newDmp);
+
         if (setNotification) {
             if (newDmp.getStatus() != DMP.DMPStatus.FINALISED.getValue()) {
                 this.sendNotification(newDmp, user, NotificationType.DMP_MODIFIED);
@@ -686,6 +722,8 @@ public class DataManagementPlanManager {
             assignUser(newDmp, user);
 
             copyDatasets(newDmp, databaseRepository.getDatasetDao());
+
+            this.updateIndex(newDmp);
         } else {
             throw new DMPNewVersionException("Version to update not the latest.");
         }
@@ -718,9 +756,11 @@ public class DataManagementPlanManager {
 
         assignUser(newDmp, user);
         copyDatasets(newDmp, databaseRepository.getDatasetDao());
+
+        this.updateIndex(newDmp);
     }
 
-    public void delete(UUID uuid) throws DMPWithDatasetsDeleteException {
+    public void delete(UUID uuid) throws DMPWithDatasetsDeleteException, IOException {
         DatasetCriteria criteria = new DatasetCriteria();
         List<UUID> dmpIds = Collections.singletonList(uuid);
         criteria.setDmpIds(dmpIds);
@@ -729,16 +769,15 @@ public class DataManagementPlanManager {
         DMP oldDmp = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().find(uuid);
         oldDmp.setStatus(DMP.DMPStatus.DELETED.getValue());
         apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().createOrUpdate(oldDmp);
+        this.updateIndex(oldDmp);
         DataManagementPlanCriteria criteria1 = new DataManagementPlanCriteria();
         criteria1.setAllVersions(true);
         criteria1.setGroupIds(Collections.singletonList(oldDmp.getGroupId()));
         apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().getWithCriteria(criteria1).toList().forEach(dmp -> {
             for (Dataset dataset: dmp.getDataset()) {
                 try {
-                    DatasetWizardModel datasetWizardModel = new DatasetWizardModel().fromDataModel(dataset);
-                    datasetWizardModel.setTags(apiContext.getOperationsContext().getDatasetRepository().findDocument(dataset.getId().toString()).getTags());
-                    datasetWizardModel.setDatasetProfileDefinition(this.datasetManager.getPagedProfile(datasetWizardModel, dataset));
-                    this.datasetManager.updateTags(apiContext.getOperationsContext().getDatasetRepository(), datasetWizardModel);
+                    List<Tag> tags = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString()).getTags();
+                    this.datasetManager.updateTags(dataset, tags);
                 } catch (Exception e) {
                     logger.error(e.getMessage(), e);
                 }
@@ -887,10 +926,8 @@ public class DataManagementPlanManager {
                     .thenApplyAsync(entityDataset -> {
                         Dataset newDataset = new Dataset();
                         try {
-                            DatasetWizardModel datasetWizardModel = new DatasetWizardModel().fromDataModel(entityDataset);
-                            datasetWizardModel.setTags(apiContext.getOperationsContext().getDatasetRepository().findDocument(dataset.getId().toString()).getTags());
-                            datasetWizardModel.setDatasetProfileDefinition(this.datasetManager.getPagedProfile(datasetWizardModel, entityDataset));
-                            this.datasetManager.updateTags(apiContext.getOperationsContext().getDatasetRepository(), datasetWizardModel);
+                            List<Tag> tags = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString()).getTags();
+                            this.datasetManager.updateTags(dataset, tags);
                         } catch (Exception e) {
                             logger.error(e.getMessage(), e);
                         }
@@ -976,12 +1013,9 @@ public class DataManagementPlanManager {
                     datasetElastic.setGrantStatus(dataset1.getDmp().getGrant().getStatus());
 
                     try {
-                        datasetElastic.setTags(apiContext.getOperationsContext().getDatasetRepository().findDocument(dataset.getId().toString()).getTags());
-                        DatasetWizardModel datasetWizardModel = new DatasetWizardModel();
-                        datasetWizardModel.setStatus(dataset1.getStatus());
-                        datasetWizardModel.setDatasetProfileDefinition(this.datasetManager.getPagedProfile(datasetWizardModel, dataset1));
-                        datasetElastic.setFormData(this.datasetManager.getWordDocumentText(datasetWizardModel));
-                        apiContext.getOperationsContext().getDatasetRepository().createOrUpdate(datasetElastic);
+                        datasetElastic.setTags(apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString()).getTags());
+                        datasetElastic.setFormData(this.datasetManager.getWordDocumentText(dataset1));
+                        apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().createOrUpdate(datasetElastic);
                     } catch (Exception e) {
                         logger.error(e.getMessage(), e);
                     }
@@ -1354,6 +1388,7 @@ public class DataManagementPlanManager {
             }
             databaseRepository.getDmpDao().createOrUpdate(dmp);
             assignUser(dmp, me);
+            this.updateIndex(dmp);
             dmp.getDataset().forEach(dataset -> {
                 dataset.setStatus(Dataset.Status.SAVED.getValue());
                 dataset.setCreated(new Date());
@@ -1372,9 +1407,8 @@ public class DataManagementPlanManager {
                 }
                 dmp.setUsers(new HashSet<>(apiContext.getOperationsContext().getDatabaseRepository().getUserDmpDao().asQueryable().where((builder, root) -> builder.equal(root.get("dmp").get("id"), dmp.getId())).toList()));
                 try {
-                    DatasetWizardModel model = new DatasetWizardModel().fromDataModel(dataset);
-                    model.setDatasetProfileDefinition(datasetManager.getPagedProfile(model, dataset));
-                    datasetManager.updateTags(apiContext.getOperationsContext().getDatasetRepository(), model);
+                    List<Tag> tags = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString()).getTags();
+                    datasetManager.updateTags(dataset, tags);
                 } catch (Exception e) {
                     logger.error(e.getMessage(), e);
                 }
@@ -1408,16 +1442,15 @@ public class DataManagementPlanManager {
             throw new Exception("DMP is not finalized");
         dmp.setPublic(true);
         apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().createOrUpdate(dmp);
+        this.updateIndex(dmp);
         DataManagementPlanCriteria criteria = new DataManagementPlanCriteria();
         criteria.setGroupIds(Collections.singletonList(dmp.getGroupId()));
         criteria.setAllVersions(true);
         apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().getWithCriteria(criteria).toList().stream().forEach(dmp1 -> {
             dmp1.getDataset().forEach(dataset -> {
                 try {
-                    DatasetWizardModel datasetWizardModel = new DatasetWizardModel().fromDataModel(dataset);
-                    datasetWizardModel.setTags(apiContext.getOperationsContext().getDatasetRepository().findDocument(dataset.getId().toString()).getTags());
-                    datasetWizardModel.setDatasetProfileDefinition(this.datasetManager.getPagedProfile(datasetWizardModel, dataset));
-                    this.datasetManager.updateTags(apiContext.getOperationsContext().getDatasetRepository(), datasetWizardModel);
+                    List<Tag> tags = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString()).getTags();
+                    this.datasetManager.updateTags(dataset, tags);
                 } catch (Exception e) {
                     logger.error(e.getMessage(), e);
                 }
@@ -1435,6 +1468,7 @@ public class DataManagementPlanManager {
             throw new Exception("DMP is already finalized");
         dmp.setStatus(DMP.DMPStatus.FINALISED.getValue());
         apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().createOrUpdate(dmp);
+        this.updateIndex(dmp);
         if (datasetsToBeFinalized != null && datasetsToBeFinalized.getUuids() != null && !datasetsToBeFinalized.getUuids().isEmpty()) {
             apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao()
                     .asQueryable().where((builder, root) -> root.get("id").in(datasetsToBeFinalized.getUuids()))
@@ -1587,4 +1621,29 @@ public class DataManagementPlanManager {
             throw new IOException(parsedException.get("message"), ex);
         }
     }
+
+    private void updateIndex(DMP dmp) throws IOException {
+        DmpMapper mapper = new DmpMapper(apiContext, datasetManager);
+        Dmp elastic = mapper.toElastic(dmp);
+        apiContext.getOperationsContext().getElasticRepository().getDmpRepository().createOrUpdate(elastic);
+    }
+
+    public void generateIndex(Principal principal) {
+        if (principal.getAuthorities().contains(Authorities.ADMIN.getValue())) {
+            List<DMP> dmps = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().asQueryable().toList();
+            dmps.forEach(dmp -> {
+                try {
+                    this.updateIndex(dmp);
+                } catch (IOException e) {
+                    logger.error(e.getMessage(), e);
+                }
+            });
+        }
+    }
+
+    public void clearIndex(Principal principal) throws IOException {
+        if (principal.getAuthorities().contains(Authorities.ADMIN.getValue())) {
+            apiContext.getOperationsContext().getElasticRepository().getDmpRepository().clear();
+        }
+    }
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java
index 5f22d702f..6883663a2 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java
@@ -13,13 +13,12 @@ import eu.eudat.data.query.items.table.dataset.DatasetPublicTableRequest;
 import eu.eudat.data.query.items.table.dataset.DatasetTableRequest;
 import eu.eudat.data.query.items.table.datasetprofile.DatasetProfileTableRequestItem;
 import eu.eudat.elastic.criteria.DatasetCriteria;
-import eu.eudat.elastic.entities.Collaborator;
-import eu.eudat.elastic.entities.Organization;
 import eu.eudat.elastic.entities.Tag;
 import eu.eudat.elastic.repository.DatasetRepository;
 import eu.eudat.exceptions.security.UnauthorisedException;
 import eu.eudat.logic.builders.BuilderFactory;
 import eu.eudat.logic.builders.entity.UserInfoBuilder;
+import eu.eudat.logic.mapper.elastic.DatasetMapper;
 import eu.eudat.logic.proxy.config.configloaders.ConfigLoader;
 import eu.eudat.logic.services.ApiContext;
 import eu.eudat.logic.services.forms.VisibilityRuleService;
@@ -28,7 +27,6 @@ import eu.eudat.logic.utilities.documents.helpers.FileEnvelope;
 import eu.eudat.logic.utilities.documents.types.ParagraphStyle;
 import eu.eudat.logic.utilities.documents.word.WordBuilder;
 import eu.eudat.logic.utilities.documents.xml.ExportXmlBuilder;
-import eu.eudat.logic.utilities.helpers.StreamDistinctBy;
 import eu.eudat.models.HintedModelFactory;
 import eu.eudat.models.data.datasetImport.DatasetImportField;
 import eu.eudat.models.data.datasetImport.DatasetImportPagedDatasetProfile;
@@ -104,7 +102,7 @@ public class DatasetManager {
     public DatasetManager(ApiContext apiContext, UserManager userManager, ConfigLoader configLoader, Environment environment) {
         this.apiContext = apiContext;
         this.databaseRepository = apiContext.getOperationsContext().getDatabaseRepository();
-        this.datasetRepository = apiContext.getOperationsContext().getDatasetRepository();
+        this.datasetRepository = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository();
         this.builderFactory = apiContext.getOperationsContext().getBuilderFactory();
         this.userManager = userManager;
         this.configLoader = configLoader;
@@ -463,8 +461,10 @@ public class DatasetManager {
           return exportFile;
     }
 
-    public String getWordDocumentText (DatasetWizardModel datasetEntity) throws Exception {
-        XWPFDocument document = getLightWordDocument(this.configLoader, datasetEntity, this.apiContext.getUtilitiesService().getVisibilityRuleService());
+    public String getWordDocumentText (Dataset datasetEntity) throws Exception {
+        DatasetWizardModel datasetWizardModel = new DatasetWizardModel().fromDataModel(datasetEntity);
+        datasetWizardModel.setDatasetProfileDefinition(this.getPagedProfile(datasetWizardModel, datasetEntity));
+        XWPFDocument document = getLightWordDocument(this.configLoader, datasetWizardModel, this.apiContext.getUtilitiesService().getVisibilityRuleService());
         XWPFWordExtractor extractor = new XWPFWordExtractor(document);
         return extractor.getText();/*.replaceAll("\n\\s*", " ");*/
     }
@@ -572,8 +572,8 @@ public class DatasetManager {
             datasetWizardModel.setDmp(new DataManagementPlan().fromDataModelNoDatasets(dataset1.getDmp()));
         }
         dataset1.setProfile(this.apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(datasetWizardModel.getProfile()));
-        datasetWizardModel.setDatasetProfileDefinition(getPagedProfile(datasetWizardModel, dataset1));
-        updateTags(apiContext.getOperationsContext().getDatasetRepository(), datasetWizardModel);
+//        datasetWizardModel.setDatasetProfileDefinition(getPagedProfile(datasetWizardModel, dataset1));
+        updateTags(dataset1, datasetWizardModel.getTags());
         if (sendNotification) {
             if (dataset1.getStatus() != Dataset.Status.FINALISED.getValue()) {
                 this.sendNotification(dataset1, dataset1.getDmp(), userInfo, NotificationType.DATASET_MODIFIED);
@@ -640,14 +640,14 @@ public class DatasetManager {
         return jobject.toString();
     }
 
-    public void updateTags(DatasetRepository datasetRepository, DatasetWizardModel datasetWizardModel) throws Exception {
+    public void updateTags(Dataset datasetEntity, List<Tag> tags) throws Exception {
        // if (datasetWizardModel.getTags() != null && !datasetWizardModel.getTags().isEmpty()) {
-        eu.eudat.elastic.entities.Dataset dataset = new eu.eudat.elastic.entities.Dataset();
+        /*eu.eudat.elastic.entities.Dataset dataset = new eu.eudat.elastic.entities.Dataset();
         dataset.setId(datasetWizardModel.getId().toString());
         if (datasetWizardModel.getTags() != null && !datasetWizardModel.getTags().isEmpty()) {
             DatasetCriteria criteria = new DatasetCriteria();
             criteria.setTags(datasetWizardModel.getTags());
-            List<Tag> tags = apiContext.getOperationsContext().getDatasetRepository().query(criteria).stream().map(eu.eudat.elastic.entities.Dataset::getTags).flatMap(Collection::stream)
+            List<Tag> tags = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().query(criteria).stream().map(eu.eudat.elastic.entities.Dataset::getTags).flatMap(Collection::stream)
                                        .filter(StreamDistinctBy.distinctByKey(Tag::getId)).filter(tag -> datasetWizardModel.getTags().stream().anyMatch(tag1 -> tag1.getName().equals(tag.getName()))).collect(Collectors.toList());
             if (tags.isEmpty()) {
                 datasetWizardModel.getTags().forEach(tag -> tag.setId(UUID.randomUUID().toString()));
@@ -694,8 +694,10 @@ public class DatasetManager {
         }
         dataset.setPublic(datasetWizardModel.getDmp().getPublic());
         dataset.setGrantStatus(datasetWizardModel.getDmp().getGrant().getStatus());
-        dataset.setFormData(this.getWordDocumentText(datasetWizardModel));
-        datasetRepository.createOrUpdate(dataset);
+        dataset.setFormData(this.getWordDocumentText(datasetWizardModel));*/
+        DatasetMapper mapper = new DatasetMapper(apiContext, this);
+        eu.eudat.elastic.entities.Dataset dataset = mapper.toElastic(datasetEntity, tags);
+        apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().createOrUpdate(dataset);
        // }
     }
 
@@ -862,7 +864,7 @@ public class DatasetManager {
         UserInfo userInfo = apiContext.getOperationsContext().getBuilderFactory().getBuilder(UserInfoBuilder.class).id(principal.getId()).build();
         entity.setCreator(userInfo);
 
-        updateTagsXmlImportDataset(apiContext.getOperationsContext().getDatasetRepository(), entity);
+        updateTagsXmlImportDataset(apiContext.getOperationsContext().getElasticRepository().getDatasetRepository(), entity);
         createRegistriesIfTheyDontExist(apiContext.getOperationsContext().getDatabaseRepository().getRegistryDao(), entity);
         createDataRepositoriesIfTheyDontExist(apiContext.getOperationsContext().getDatabaseRepository().getDataRepositoryDao(), entity);
         createServicesIfTheyDontExist(entity);
@@ -945,19 +947,11 @@ public class DatasetManager {
     public void generateIndex(Principal principal) {
         if (principal.getAuthorities().contains(Authorities.ADMIN.getValue())) {
             this.apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().asQueryable().toList();
-            List<DatasetWizardModel> datasetWizardModels = this.apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao().asQueryable().toList()
-                                                                          .stream().map(dataset -> {
-                       DatasetWizardModel datasetWizardModel = new DatasetWizardModel().fromDataModel(dataset);
-                       datasetWizardModel.setDatasetProfileDefinition(getPagedProfile(datasetWizardModel, dataset));
-                       return datasetWizardModel;
-                    }).collect(Collectors.toList());
-            datasetWizardModels.forEach(datasetWizardModel -> {
+            List<Dataset> datasetEntities = new ArrayList<>(this.apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao().asQueryable().toList());
+            datasetEntities.forEach(datasetEntity -> {
                 try {
-                    eu.eudat.elastic.entities.Dataset dataset = apiContext.getOperationsContext().getDatasetRepository().findDocument(datasetWizardModel.getId().toString());
-                    if (dataset != null) {
-                        datasetWizardModel.setTags(dataset.getTags());
-                    }
-                    updateTags(apiContext.getOperationsContext().getDatasetRepository(), datasetWizardModel);
+                    eu.eudat.elastic.entities.Dataset dataset = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(datasetEntity.getId().toString());
+                    updateTags(datasetEntity, dataset != null ? dataset.getTags() : null);
                 } catch (Exception e) {
                     logger.error(e.getMessage(), e);
                 }
@@ -968,7 +962,7 @@ public class DatasetManager {
     public void clearIndex(Principal principal) {
         if (principal.getAuthorities().contains(Authorities.ADMIN.getValue())) {
             try {
-                this.apiContext.getOperationsContext().getDatasetRepository().clear();
+                this.apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().clear();
             } catch (IOException e) {
                 logger.error(e.getMessage(), e);
             }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetWizardManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetWizardManager.java
index 3686cdf10..6094951ef 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetWizardManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetWizardManager.java
@@ -50,12 +50,12 @@ public class DatasetWizardManager {
 
     public void delete(ApiContext apiContext, UUID uuid) throws IOException {
         Dataset oldDataset = apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao().find(uuid);
-        eu.eudat.elastic.entities.Dataset oldDatasetElasitc = apiContext.getOperationsContext().getDatasetRepository().findDocument(uuid.toString());
+        eu.eudat.elastic.entities.Dataset oldDatasetElasitc = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(uuid.toString());
         oldDataset.setStatus(Dataset.Status.DELETED.getValue());
         oldDatasetElasitc.setStatus(oldDataset.getStatus());
         apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao().createOrUpdate(oldDataset);
         if (uuid != null && oldDatasetElasitc.getId()!= null) {
-            apiContext.getOperationsContext().getDatasetRepository().createOrUpdate(oldDatasetElasitc);
+            apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().createOrUpdate(oldDatasetElasitc);
         }
     }
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/CollaboratorMapper.java b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/CollaboratorMapper.java
new file mode 100644
index 000000000..a80260840
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/CollaboratorMapper.java
@@ -0,0 +1,14 @@
+package eu.eudat.logic.mapper.elastic;
+
+import eu.eudat.data.entities.UserInfo;
+import eu.eudat.elastic.entities.Collaborator;
+
+public class CollaboratorMapper {
+
+	public static Collaborator toElastic(UserInfo user) {
+		Collaborator elastic = new Collaborator();
+		elastic.setId(user.getId().toString());
+		elastic.setName(user.getName());
+		return elastic;
+	}
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DatasetMapper.java b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DatasetMapper.java
new file mode 100644
index 000000000..c9a3723f0
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DatasetMapper.java
@@ -0,0 +1,74 @@
+package eu.eudat.logic.mapper.elastic;
+
+import eu.eudat.data.dao.criteria.DataManagementPlanCriteria;
+import eu.eudat.data.entities.DMP;
+import eu.eudat.elastic.criteria.DatasetCriteria;
+import eu.eudat.elastic.entities.Collaborator;
+import eu.eudat.elastic.entities.Dataset;
+import eu.eudat.elastic.entities.Organization;
+import eu.eudat.elastic.entities.Tag;
+import eu.eudat.logic.managers.DatasetManager;
+import eu.eudat.logic.services.ApiContext;
+import eu.eudat.logic.utilities.helpers.StreamDistinctBy;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class DatasetMapper {
+
+	private final ApiContext apiContext;
+	private final DatasetManager datasetManager;
+
+	public DatasetMapper(ApiContext apiContext, DatasetManager datasetManager) {
+		this.apiContext = apiContext;
+		this.datasetManager = datasetManager;
+	}
+
+	public Dataset toElastic(eu.eudat.data.entities.Dataset dataset, List<Tag> tags) throws Exception {
+		Dataset elastic = new Dataset();
+		elastic.setId(dataset.getId().toString());
+		if (tags != null && !tags.isEmpty()) {
+			DatasetCriteria criteria = new DatasetCriteria();
+			criteria.setTags(tags);
+			List<Tag> tags1 = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().query(criteria).stream().map(eu.eudat.elastic.entities.Dataset::getTags).flatMap(Collection::stream)
+									   .filter(StreamDistinctBy.distinctByKey(Tag::getId)).filter(tag -> tags.stream().anyMatch(tag1 -> tag1.getName().equals(tag.getName()))).collect(Collectors.toList());
+			if (tags1.isEmpty()) {
+				tags.forEach(tag -> tag.setId(UUID.randomUUID().toString()));
+				elastic.setTags(tags);
+			} else {
+				elastic.setTags(tags1);
+			}
+		}
+		elastic.setLabel(dataset.getLabel());
+		elastic.setDescription(dataset.getDescription());
+		elastic.setTemplate(dataset.getProfile().getId());
+		elastic.setStatus(dataset.getStatus());
+		elastic.setDmp(dataset.getDmp().getId());
+		elastic.setGroup(dataset.getDmp().getGroupId());
+		elastic.setGrant(dataset.getDmp().getGrant().getId());
+		if (dataset.getDmp().getUsers() != null) {
+			elastic.setCollaborators(dataset.getDmp().getUsers().stream().map(user -> CollaboratorMapper.toElastic(user.getUser())).collect(Collectors.toList()));
+		}
+		DataManagementPlanCriteria dmpCriteria = new DataManagementPlanCriteria();
+		dmpCriteria.setAllVersions(true);
+		dmpCriteria.setGroupIds(Collections.singletonList(dataset.getDmp().getGroupId()));
+		apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().getWithCriteria(dmpCriteria).toList().stream()
+				  .max(Comparator.comparing(DMP::getVersion)).ifPresent(dmp -> elastic.setLastVersion(dmp.getId().equals(dataset.getDmp().getId())));
+		apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().getWithCriteria(dmpCriteria).toList().stream().filter(DMP::isPublic)
+				  .max(Comparator.comparing(DMP::getVersion)).ifPresent(dmp -> elastic.setLastPublicVersion(dmp.getId().equals(dataset.getDmp().getId())));
+		if (elastic.getLastVersion() == null) {
+			elastic.setLastVersion(true);
+		}
+		if (elastic.getLastPublicVersion() == null) {
+			elastic.setLastPublicVersion(false);
+		}
+		if (dataset.getDmp().getOrganisations() != null) {
+			elastic.setOrganizations(dataset.getDmp().getOrganisations().stream().map(OrganizationMapper::toElastic).collect(Collectors.toList()));
+		}
+		elastic.setPublic(dataset.getDmp().isPublic());
+		elastic.setGrantStatus(dataset.getDmp().getGrant().getStatus());
+		elastic.setFormData(datasetManager.getWordDocumentText(dataset));
+
+		return elastic;
+	}
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DatasetTemplateMapper.java b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DatasetTemplateMapper.java
new file mode 100644
index 000000000..6545bb32b
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DatasetTemplateMapper.java
@@ -0,0 +1,14 @@
+package eu.eudat.logic.mapper.elastic;
+
+import eu.eudat.data.entities.DatasetProfile;
+import eu.eudat.elastic.entities.DatasetTempalate;
+
+public class DatasetTemplateMapper {
+
+	public static DatasetTempalate toElastic(DatasetProfile profile) {
+		DatasetTempalate elastic = new DatasetTempalate();
+		elastic.setId(profile.getId());
+		elastic.setName(profile.getLabel());
+		return elastic;
+	}
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DmpMapper.java b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DmpMapper.java
new file mode 100644
index 000000000..5a25990f1
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DmpMapper.java
@@ -0,0 +1,86 @@
+package eu.eudat.logic.mapper.elastic;
+
+import eu.eudat.data.dao.criteria.DataManagementPlanCriteria;
+import eu.eudat.data.dao.entities.DMPDao;
+import eu.eudat.data.entities.DMP;
+import eu.eudat.elastic.entities.Collaborator;
+import eu.eudat.elastic.entities.Dataset;
+import eu.eudat.elastic.entities.Dmp;
+import eu.eudat.elastic.entities.Tag;
+import eu.eudat.logic.managers.DatasetManager;
+import eu.eudat.logic.services.ApiContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class DmpMapper {
+	private static final Logger logger = LoggerFactory.getLogger(DmpMapper.class);
+
+	private final ApiContext apiContext;
+	private final DatasetManager datasetManager;
+	private final DatasetMapper datasetMapper;
+
+	public DmpMapper(ApiContext apiContext, DatasetManager datasetManager) {
+		this.apiContext = apiContext;
+		this.datasetManager = datasetManager;
+		this.datasetMapper = new DatasetMapper(apiContext, datasetManager);
+	}
+
+	public Dmp toElastic(DMP dmp) {
+		Dmp elastic = new Dmp();
+		elastic.setId(dmp.getId());
+		elastic.setGroupId(dmp.getGroupId());
+		if (dmp.getUsers() != null) {
+			elastic.setCollaborators(dmp.getUsers().stream().map(user -> CollaboratorMapper.toElastic(user.getUser())).collect(Collectors.toList()));
+		}
+		elastic.setDescription(dmp.getDescription());
+		elastic.setGrant(dmp.getGrant().getId());
+		elastic.setLabel(dmp.getLabel());
+		elastic.setPublic(dmp.isPublic());
+		elastic.setStatus(dmp.getStatus());
+		DataManagementPlanCriteria dmpCriteria = new DataManagementPlanCriteria();
+		dmpCriteria.setAllVersions(true);
+		dmpCriteria.setGroupIds(Collections.singletonList(dmp.getGroupId()));
+		apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().getWithCriteria(dmpCriteria).toList().stream()
+				  .max(Comparator.comparing(DMP::getVersion)).ifPresent(dmp1 -> elastic.setLastVersion(dmp1.getId().equals(dmp.getId())));
+		apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().getWithCriteria(dmpCriteria).toList().stream().filter(DMP::isPublic)
+				  .max(Comparator.comparing(DMP::getVersion)).ifPresent(dmp1 -> elastic.setLastPublicVersion(dmp1.getId().equals(dmp.getId())));
+		if (elastic.getLastVersion() == null) {
+			elastic.setLastVersion(false);
+		}
+		if (elastic.getLastPublicVersion() == null) {
+			elastic.setLastPublicVersion(false);
+		}
+		if (dmp.getDataset() != null) {
+
+			elastic.setDatasets(dmp.getDataset().stream().map(dataset -> {
+				List<Tag> tags = null;
+				try {
+					Dataset dataset1 = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString());
+					if (dataset1 != null) {
+						tags = dataset1.getTags();
+					}
+					return datasetMapper.toElastic(dataset, tags);
+				} catch (Exception e) {
+					logger.error(e.getMessage(), e);
+				}
+				return null;
+			}).collect(Collectors.toList()));
+		}
+		if (dmp.getAssociatedDmps() != null) {
+			elastic.setTemplates(dmp.getAssociatedDmps().stream().map(DatasetTemplateMapper::toElastic).collect(Collectors.toList()));
+		}
+		if (dmp.getOrganisations() != null) {
+			elastic.setOrganizations(dmp.getOrganisations().stream().map(OrganizationMapper::toElastic).collect(Collectors.toList()));
+		}
+		if (dmp.getGrant() != null) {
+			elastic.setGrantStatus(dmp.getGrant().getStatus());
+		}
+		return elastic;
+	}
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/OrganizationMapper.java b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/OrganizationMapper.java
new file mode 100644
index 000000000..4eb5fb9d6
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/OrganizationMapper.java
@@ -0,0 +1,14 @@
+package eu.eudat.logic.mapper.elastic;
+
+import eu.eudat.data.entities.Organisation;
+import eu.eudat.elastic.entities.Organization;
+
+public class OrganizationMapper {
+
+	public static Organization toElastic(Organisation organisation) {
+		Organization elastic = new Organization();
+		elastic.setId(organisation.getId().toString());
+		elastic.setName(organisation.getLabel());
+		return elastic;
+	}
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/criteria/DmpCriteriaMapper.java b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/criteria/DmpCriteriaMapper.java
new file mode 100644
index 000000000..bb1b0cf7c
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/criteria/DmpCriteriaMapper.java
@@ -0,0 +1,33 @@
+package eu.eudat.logic.mapper.elastic.criteria;
+
+import eu.eudat.data.dao.criteria.DataManagementPlanCriteria;
+import eu.eudat.data.entities.Grant;
+import eu.eudat.elastic.criteria.DmpCriteria;
+
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+public class DmpCriteriaMapper {
+
+	public static DmpCriteria toElasticCriteria(DataManagementPlanCriteria criteria) {
+		DmpCriteria elastic = new DmpCriteria();
+
+		elastic.setAllowAllVersions(criteria.getAllVersions());
+		elastic.setCollaborators(criteria.getCollaborators());
+		if (criteria.getGrants() != null) {
+			elastic.setGrants(criteria.getGrants().stream().map(Grant::getId).collect(Collectors.toList()));
+		}
+		elastic.setGroupIds(criteria.getGroupIds());
+		elastic.setLike(criteria.getLike());
+		if (criteria.getOrganisations() != null) {
+			elastic.setOrganizations(criteria.getOrganisations().stream().map(UUID::fromString).collect(Collectors.toList()));
+		}
+		elastic.setPublic(criteria.getIsPublic());
+		if (criteria.getStatus() != null) {
+			elastic.setStatus(criteria.getStatus().shortValue());
+		}
+		elastic.setTemplates(criteria.getDatasetTemplates());
+		elastic.setGrantStatus(criteria.getGrantStatus());
+		return elastic;
+	}
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/ElasticRepository.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/ElasticRepository.java
new file mode 100644
index 000000000..2f0130757
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/ElasticRepository.java
@@ -0,0 +1,11 @@
+package eu.eudat.logic.services.operations;
+
+import eu.eudat.elastic.repository.DatasetRepository;
+import eu.eudat.elastic.repository.DmpRepository;
+
+public interface ElasticRepository {
+
+	DatasetRepository getDatasetRepository();
+
+	DmpRepository getDmpRepository();
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/ElasticRepositoryImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/ElasticRepositoryImpl.java
new file mode 100644
index 000000000..f4679d242
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/ElasticRepositoryImpl.java
@@ -0,0 +1,29 @@
+package eu.eudat.logic.services.operations;
+
+import eu.eudat.elastic.repository.DatasetRepository;
+import eu.eudat.elastic.repository.DmpRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service("elasticRepository")
+public class ElasticRepositoryImpl implements ElasticRepository {
+
+	private final DatasetRepository datasetRepository;
+	private final DmpRepository dmpRepository;
+
+	@Autowired
+	public ElasticRepositoryImpl(DatasetRepository datasetRepository, DmpRepository dmpRepository) {
+		this.datasetRepository = datasetRepository;
+		this.dmpRepository = dmpRepository;
+	}
+
+	@Override
+	public DatasetRepository getDatasetRepository() {
+		return datasetRepository;
+	}
+
+	@Override
+	public DmpRepository getDmpRepository() {
+		return dmpRepository;
+	}
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/OperationsContext.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/OperationsContext.java
index ccd6d914d..b44876006 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/OperationsContext.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/OperationsContext.java
@@ -1,6 +1,7 @@
 package eu.eudat.logic.services.operations;
 
 import eu.eudat.elastic.repository.DatasetRepository;
+import eu.eudat.elastic.repository.DmpRepository;
 import eu.eudat.logic.builders.BuilderFactory;
 import eu.eudat.logic.proxy.fetching.RemoteFetcher;
 import eu.eudat.logic.services.helpers.FileStorageService;
@@ -21,5 +22,5 @@ public interface OperationsContext {
 
     FileStorageService getFileStorageService();
 
-    DatasetRepository getDatasetRepository();
+    ElasticRepository getElasticRepository();
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/OperationsContextImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/OperationsContextImpl.java
index 47894d017..9f809aad3 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/OperationsContextImpl.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/OperationsContextImpl.java
@@ -1,6 +1,7 @@
 package eu.eudat.logic.services.operations;
 
 import eu.eudat.elastic.repository.DatasetRepository;
+import eu.eudat.elastic.repository.DmpRepository;
 import eu.eudat.logic.builders.BuilderFactory;
 import eu.eudat.logic.proxy.fetching.RemoteFetcher;
 import eu.eudat.logic.services.helpers.FileStorageService;
@@ -14,22 +15,22 @@ import org.springframework.stereotype.Service;
 @Service("operationsContext")
 public class OperationsContextImpl implements OperationsContext {
 
-    private DatabaseRepository databaseRepository;
-    private ApplicationContext applicationContext;
-    private RemoteFetcher remoteFetcher;
-    private BuilderFactory builderFactory;
-    private FileStorageService fileStorageService;
-    private DatasetRepository datasetRepository;
+    private final DatabaseRepository databaseRepository;
+    private final ApplicationContext applicationContext;
+    private final RemoteFetcher remoteFetcher;
+    private final BuilderFactory builderFactory;
+    private final FileStorageService fileStorageService;
+    private final ElasticRepository elasticRepository;
 
     @Autowired
     public OperationsContextImpl(DatabaseRepository databaseRepository, ApplicationContext applicationContext, RemoteFetcher remoteFetcher
-            , BuilderFactory builderFactory, FileStorageService fileStorageService, DatasetRepository datasetRepository) {
+            , BuilderFactory builderFactory, FileStorageService fileStorageService, ElasticRepository elasticRepository) {
         this.databaseRepository = databaseRepository;
         this.applicationContext = applicationContext;
         this.remoteFetcher = remoteFetcher;
         this.builderFactory = builderFactory;
         this.fileStorageService = fileStorageService;
-        this.datasetRepository = datasetRepository;
+        this.elasticRepository = elasticRepository;
     }
 
     @Override
@@ -58,11 +59,7 @@ public class OperationsContextImpl implements OperationsContext {
     }
 
     @Override
-    public DatasetRepository getDatasetRepository() {
-        return datasetRepository;
-    }
-
-    public void setDatasetRepository(DatasetRepository datasetRepository) {
-        this.datasetRepository = datasetRepository;
+    public ElasticRepository getElasticRepository() {
+        return elasticRepository;
     }
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetwizard/DatasetWizardModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetwizard/DatasetWizardModel.java
index 8e967a1cc..4f7e73451 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetwizard/DatasetWizardModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetwizard/DatasetWizardModel.java
@@ -164,8 +164,8 @@ public class DatasetWizardModel implements DataModel<Dataset, DatasetWizardModel
         this.description = entity.getDescription();
         this.profile = entity.getProfile().getId();
         this.uri = entity.getUri();
-        this.registries = entity.getRegistries().stream().map(item -> new Registry().fromDataModel(item)).collect(Collectors.toList());
-        this.dataRepositories = entity.getDatasetDataRepositories().stream().map(item -> {
+        this.registries = entity.getRegistries() != null ? entity.getRegistries().stream().map(item -> new Registry().fromDataModel(item)).collect(Collectors.toList()) : new ArrayList<>();
+        this.dataRepositories = entity.getDatasetDataRepositories() != null ? entity.getDatasetDataRepositories().stream().map(item -> {
             DataRepository dataRepository = new DataRepository().fromDataModel(item.getDataRepository());
             if (item.getData() != null) {
                 Map<String, Map<String, String>> data = (Map<String, Map<String, String>>) JSONValue.parse(item.getData());
@@ -173,11 +173,11 @@ public class DatasetWizardModel implements DataModel<Dataset, DatasetWizardModel
                 dataRepository.setInfo(values.get("info"));
             }
             return dataRepository;
-        }).collect(Collectors.toList());
-        this.services = entity.getServices().stream().map(item -> new Service().fromDataModel(item.getService())).collect(Collectors.toList());
+        }).collect(Collectors.toList()) : new ArrayList<>();
+        this.services = entity.getServices() != null ? entity.getServices().stream().map(item -> new Service().fromDataModel(item.getService())).collect(Collectors.toList()) : new ArrayList<>();
         this.created = entity.getCreated();
         this.dmp = new DataManagementPlan().fromDataModelNoDatasets(entity.getDmp());
-        this.externalDatasets = entity.getDatasetExternalDatasets().stream().map(item -> {
+        this.externalDatasets = entity.getDatasetExternalDatasets() != null ? entity.getDatasetExternalDatasets().stream().map(item -> {
             ExternalDatasetListingModel externalDatasetListingModel = new ExternalDatasetListingModel().fromDataModel(item.getExternalDataset());
             if (item.getData() != null) {
                 Map<String, Map<String, String>> data = (Map<String, Map<String, String>>) JSONValue.parse(item.getData());
@@ -186,7 +186,7 @@ public class DatasetWizardModel implements DataModel<Dataset, DatasetWizardModel
                 externalDatasetListingModel.setType(Integer.parseInt(values.get("type")));
             }
             return externalDatasetListingModel;
-        }).collect(Collectors.toList());
+        }).collect(Collectors.toList()) : new ArrayList<>();
         this.modified = entity.getModified();
         return this;
     }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlan.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlan.java
index 45d5c907d..a341fa409 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlan.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlan.java
@@ -327,16 +327,15 @@ public class DataManagementPlan implements DataModel<DMP, DataManagementPlan> {
     public DataManagementPlan fromDataModelNoDatasets(DMP entity) {
         this.id = entity.getId();
         this.profile = entity.getProfile() != null ? new Tuple<UUID, String>(entity.getProfile().getId(), entity.getProfile().getLabel()) : null;
-        this.organisations = entity.getOrganisations().stream().map(item -> new Organisation().fromDataModel(item)).collect(Collectors.toList());
-        this.researchers = entity.getResearchers().stream().map(item -> new Researcher().fromDataModel(item)).collect(Collectors.toList());
+        this.organisations = entity.getOrganisations() != null ? entity.getOrganisations().stream().map(item -> new Organisation().fromDataModel(item)).collect(Collectors.toList()) : new ArrayList<>();
+        this.researchers = entity.getResearchers() != null ? entity.getResearchers().stream().map(item -> new Researcher().fromDataModel(item)).collect(Collectors.toList()) : new ArrayList<>();
         this.version = entity.getVersion();
-        this.groupId = this.groupId == null ? null : this.groupId;
         this.label = entity.getLabel();
         this.grant = new Grant();
         this.properties = entity.getProperties() != null ? new org.json.JSONObject(entity.getProperties()).toMap() : null;
         this.creator = new eu.eudat.models.data.userinfo.UserInfo();
         this.groupId = entity.getGroupId();
-        this.lockable = entity.getDataset().stream().findAny().isPresent();
+        this.lockable = entity.getDataset() != null && entity.getDataset().stream().findAny().isPresent();
         this.definition = entity.getProfile() == null ? null : new DataManagementPlanProfile().fromXml(XmlBuilder.fromXml(entity.getProfile().getDefinition()).getDocumentElement());
         if (this.definition != null && this.definition.getFields() != null && !this.definition.getFields().isEmpty() && this.properties != null) {
             this.definition.getFields().forEach(item -> {
@@ -344,7 +343,7 @@ public class DataManagementPlan implements DataModel<DMP, DataManagementPlan> {
                 fieldOptional.ifPresent(stringObjectMap -> item.setValue(stringObjectMap.get("value")));
             });
         }
-        if (entity.getUsers().stream().anyMatch(userDMP -> userDMP.getRole().equals(UserDMP.UserDMPRoles.OWNER.getValue())))
+        if (entity.getUsers() != null && entity.getUsers().stream().anyMatch(userDMP -> userDMP.getRole().equals(UserDMP.UserDMPRoles.OWNER.getValue())))
             this.creator.fromDataModel(entity.getUsers().stream().filter(user -> user.getRole().equals(UserDMP.UserDMPRoles.OWNER.getValue())).findFirst().get().getUser());
 
         if (entity.getAssociatedDmps() != null && !entity.getAssociatedDmps().isEmpty()) {
@@ -358,8 +357,8 @@ public class DataManagementPlan implements DataModel<DMP, DataManagementPlan> {
         this.created = entity.getCreated();
         this.description = entity.getDescription();
         this.status = entity.getStatus();
-        this.associatedUsers = entity.getUsers().stream().map(item -> new UserListingModel().fromDataModel(item.getUser())).collect(Collectors.toList());
-        this.users = entity.getUsers().stream().map(item -> new UserInfoListingModel().fromDataModel(item)).collect(Collectors.toList());
+        this.associatedUsers = entity.getUsers() != null ? entity.getUsers().stream().map(item -> new UserListingModel().fromDataModel(item.getUser())).collect(Collectors.toList()) : new ArrayList<>();
+        this.users = entity.getUsers() != null ? entity.getUsers().stream().map(item -> new UserInfoListingModel().fromDataModel(item)).collect(Collectors.toList()) : new ArrayList<>();
         this.doi = entity.getDoi();
         this.grant.fromDataModel(entity.getGrant());
 
diff --git a/dmp-frontend/src/app/app-routing.module.ts b/dmp-frontend/src/app/app-routing.module.ts
index 8430742c1..5ac4279d8 100644
--- a/dmp-frontend/src/app/app-routing.module.ts
+++ b/dmp-frontend/src/app/app-routing.module.ts
@@ -32,7 +32,8 @@ const appRoutes: Routes = [
 	},
 	{
 		path: 'explore-plans',
-		loadChildren: () => import('./ui/explore-dmp/explore-dmp.module').then(m => m.ExploreDmpModule),
+		// loadChildren: () => import('./ui/explore-dmp/explore-dmp.module').then(m => m.ExploreDmpModule),
+		loadChildren: () => import('./ui/dmp/dmp.module').then(m => m.DmpModule),
 		data: {
 			breadcrumb: true,
 			title: 'GENERAL.TITLES.EXPLORE-PLANS'
diff --git a/dmp-frontend/src/app/core/query/dmp/dmp-criteria.ts b/dmp-frontend/src/app/core/query/dmp/dmp-criteria.ts
index 793c46815..5e024c1d3 100644
--- a/dmp-frontend/src/app/core/query/dmp/dmp-criteria.ts
+++ b/dmp-frontend/src/app/core/query/dmp/dmp-criteria.ts
@@ -12,4 +12,6 @@ export class DmpCriteria extends BaseCriteria {
 	public collaborators?: string[] = [];
 	public datasetTemplates?: string[] = [];
 	public isPublic?: boolean;
+	public onlyPublic?: boolean;
+	public grantStatus?: boolean;
 }
diff --git a/dmp-frontend/src/app/core/services/dmp/dmp.service.ts b/dmp-frontend/src/app/core/services/dmp/dmp.service.ts
index edafe2ba3..fff823d5d 100644
--- a/dmp-frontend/src/app/core/services/dmp/dmp.service.ts
+++ b/dmp-frontend/src/app/core/services/dmp/dmp.service.ts
@@ -142,4 +142,12 @@ export class DmpService {
 	getDatasetProfilesUsedPaged(dataTableRequest: DataTableRequest<DatasetProfileCriteria>) {
 		return this.http.post<DataTableData<DatasetListingModel>>(this.actionUrl + 'datasetProfilesUsedByDmps/paged', dataTableRequest);
 	}
+
+	generateIndex() {
+		return this.http.post(this.actionUrl + 'index', {});
+	}
+
+	clearIndex() {
+		return this.http.delete(this.actionUrl + 'index');
+	}
 }
diff --git a/dmp-frontend/src/app/ui/admin/index-managment/index-managment.component.ts b/dmp-frontend/src/app/ui/admin/index-managment/index-managment.component.ts
index 7b37c8ace..699dd0902 100644
--- a/dmp-frontend/src/app/ui/admin/index-managment/index-managment.component.ts
+++ b/dmp-frontend/src/app/ui/admin/index-managment/index-managment.component.ts
@@ -5,6 +5,7 @@ import { takeUntil } from 'rxjs/operators';
 import { UiNotificationService, SnackBarNotificationLevel } from '@app/core/services/notification/ui-notification-service';
 import { TranslateService } from '@ngx-translate/core';
 import { Router } from '@angular/router';
+import { DmpService } from '@app/core/services/dmp/dmp.service';
 
 @Component({
   selector: 'app-index-managment',
@@ -18,6 +19,7 @@ export class IndexManagmentComponent extends BaseComponent implements OnInit {
 	  private uiNotificationService: UiNotificationService,
 	  private translate: TranslateService,
 	  private router: Router,
+	  private dmpService: DmpService
 	)
    {
 	   super();
@@ -38,6 +40,16 @@ export class IndexManagmentComponent extends BaseComponent implements OnInit {
 			  this.onCallbackError(error);
 		  }
 	  );
+	  this.dmpService.generateIndex().pipe(takeUntil(this._destroyed)).subscribe(
+		response => {
+		  (ev.srcElement as HTMLButtonElement).disabled = false;
+			this.onCallbackSuccess();
+		},
+		error => {
+		  (ev.srcElement as HTMLButtonElement).disabled = false;
+			this.onCallbackError(error);
+		}
+	);
   }
 
   clearIndex(ev: Event) {
@@ -52,6 +64,16 @@ export class IndexManagmentComponent extends BaseComponent implements OnInit {
 			this.onCallbackError(error);
 		}
 	);
+	this.dmpService.clearIndex().pipe(takeUntil(this._destroyed)).subscribe(
+		response => {
+		  (ev.srcElement as HTMLButtonElement).disabled = false;
+			this.onCallbackSuccess();
+		},
+		error => {
+		  (ev.srcElement as HTMLButtonElement).disabled = false;
+			this.onCallbackError(error);
+		}
+	);
 }
 
   onCallbackSuccess(): void {
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 e39083138..9d8f8325e 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
@@ -38,7 +38,7 @@ export class DatasetListingItemComponent implements OnInit {
 	}
 
 	getDmpLink(): string[] {
-		return this.isPublic ? [`/explore-plans/overview/${this.dataset.dmpId}`] : [`/plans/edit/${this.dataset.dmpId}`];
+		return this.isPublic ? [`/explore-plans/publicOverview/${this.dataset.dmpId}`] : [`/plans/edit/${this.dataset.dmpId}`];
 	}
 
 
diff --git a/dmp-frontend/src/app/ui/dmp/dmp.routing.ts b/dmp-frontend/src/app/ui/dmp/dmp.routing.ts
index 0b53447d7..0665fe6a8 100644
--- a/dmp-frontend/src/app/ui/dmp/dmp.routing.ts
+++ b/dmp-frontend/src/app/ui/dmp/dmp.routing.ts
@@ -55,6 +55,14 @@ const routes: Routes = [
 			title: 'GENERAL.TITLES.DMP-OVERVIEW'
 		},
 	},
+	{
+		path: 'publicOverview/:publicId',
+		component: DmpOverviewComponent,
+		data: {
+			breadcrumb: true,
+			title: 'GENERAL.TITLES.DMP-OVERVIEW'
+		},
+	},
 	// ----------- UNCOMMENT TO ADD AGAIN GRANTS --------
 	// {
 	// 	path: 'new/grant/:grantId',
diff --git a/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.ts b/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.ts
index ce8048b05..ccb631948 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.ts
@@ -23,7 +23,7 @@ export class DatasetsTabComponent implements OnInit {
 	}
 
 	datasetClicked(datasetId: String) {
-		this.router.navigate(['/datasets/edit/' + datasetId]);
+		this.router.navigate(this.isPublic ? ['/datasets/publicEdit/' + datasetId] : ['/datasets/edit/' + datasetId]);
 	}
 
 	datasetsClicked(dmpId: String) {
diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html
index 52b24dbb7..7b32b32b4 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html
+++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html
@@ -110,19 +110,17 @@
 							</button>
 						</div>
 					</div>
-					<div *ngIf="!isFinalized && !isNew" class="d-flex justify-content-end pt-2 pb-4 pl-2">
-						<div *ngIf="!isNew">
+					<div *ngIf="!isNew" class="d-flex justify-content-end pt-2 pb-4 pl-2">
 							<button mat-raised-button color="primary" (click)="cancel(dmp.id)" type="button" class="text-uppercase mr-2">
 								{{'DMP-EDITOR.ACTIONS.CANCEL' | translate}}
 							</button>
-						</div>
 
 						<div *ngIf="formGroup.enabled && !lockStatus">
-							<button *ngIf="!isNew" mat-raised-button type="submit" class="text-uppercase dark-theme mr-2" color="primary">
+							<button *ngIf="!isFinalized" mat-raised-button type="submit" class="text-uppercase dark-theme mr-2" color="primary">
 								{{'DMP-EDITOR.ACTIONS.SAVE-CHANGES' | translate}}
 							</button>
 						</div>
-						<div *ngIf="formGroup.enabled && !isNew && !lockStatus">
+						<div *ngIf="formGroup.enabled && !isFinalized && !lockStatus">
 							<button type="button" mat-raised-button color="primary" class="text-uppercase mr-2" (click)="saveAndFinalize()">{{'DMP-EDITOR.ACTIONS.FINALISE' | translate}}
 							</button>
 						</div>
diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts
index b74092256..889b303b5 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts
@@ -109,9 +109,22 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
 				// 	displayFn: (item) => item['label'],
 				// 	titleFn: (item) => item['label']
 				// };
+				switch(tabToNav) {
+					case 'general':
+						this.selectedTab = 0;
+						break;
+					case 'grant':
+						this.selectedTab = 1;
+						break;
+					case 'datasetDescriptions':
+						this.selectedTab = 2;
+						break;
+					case 'peoples':
+						this.selectedTab = 3;
+						break;
+				}
 				if (itemId != null) {
 					this.isNew = false;
-					if (tabToNav == "datasetDescriptions") this.selectedTab = 2
 					this.dmpService.getSingle(itemId).pipe(map(data => data as DmpModel))
 						.pipe(takeUntil(this._destroyed))
 						.subscribe(async data => {
@@ -167,11 +180,12 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
 				} else if (publicId != null) {
 					this.isNew = false;
 					this.isPublic = true;
+					this.isFinalized = true;
 					this.dmpService.getSinglePublic(publicId).pipe(map(data => data as DmpModel))
 						.pipe(takeUntil(this._destroyed))
 						.subscribe(async data => {
-							this.lockService.checkLockStatus(data.id).pipe(takeUntil(this._destroyed)).subscribe(lockStatus => {
-							this.lockStatus = lockStatus;
+							// this.lockService.checkLockStatus(data.id).pipe(takeUntil(this._destroyed)).subscribe(lockStatus => {
+							// this.lockStatus = true;
 							this.dmp = new DmpEditorModel();
 							this.dmp.grant = new GrantTabModel();
 							this.dmp.project = new ProjectFormModel();
@@ -179,7 +193,7 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
 							this.dmp.fromModel(data);
 							this.formGroup = this.dmp.buildForm();
 							//this.registerFormEventsForDmpProfile(this.dmp.definition);
-							if (!this.editMode || this.dmp.status === DmpStatus.Finalized || lockStatus) { this.formGroup.disable(); }
+							this.formGroup.disable();
 							// if (!this.isAuthenticated) {
 							const breadcrumbs = [];
 							breadcrumbs.push({ parentComponentName: null, label: this.language.instant('NAV-BAR.PUBLIC-DMPS').toUpperCase(), url: '/plans' });
@@ -195,15 +209,15 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
 							// );
 							this.associatedUsers = data.associatedUsers;
 							// }
-							if (!lockStatus) {
-								this.lock = new LockModel(data.id, this.getUserFromDMP());
+							// if (!lockStatus) {
+							// 	this.lock = new LockModel(data.id, this.getUserFromDMP());
 
-								this.lockService.createOrUpdate(this.lock).pipe(takeUntil(this._destroyed)).subscribe(async result => {
-									this.lock.id = Guid.parse(result);
-									interval(this.configurationService.lockInterval).pipe(takeUntil(this._destroyed)).subscribe(() => this.pumpLock());
-								});
-							}
-							})
+							// 	this.lockService.createOrUpdate(this.lock).pipe(takeUntil(this._destroyed)).subscribe(async result => {
+							// 		this.lock.id = Guid.parse(result);
+							// 		interval(this.configurationService.lockInterval).pipe(takeUntil(this._destroyed)).subscribe(() => this.pumpLock());
+							// 	});
+							// }
+							// })
 						});
 				} else {
 					this.dmp = new DmpEditorModel();
diff --git a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.html b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.html
index 790f203e9..737b12ee5 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.html
+++ b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.html
@@ -13,7 +13,7 @@
 			<!-- End of Search Filter -->
 
 			<!-- Visibility Filter-->
-			<div *ngIf="showGrant" class="col-10 gray-container">
+			<div *ngIf="!isPublic" class="col-10 gray-container">
 				<h6 class="category-title">{{ 'TYPES.DMP-VISIBILITY.VISIBILITY' | translate }}</h6>
 				<mat-radio-group aria-label="Select an option" [formControl]="formGroup.get('status')">
 					<mat-list-item><mat-radio-button value="null" checked>{{ 'TYPES.DMP-VISIBILITY.ANY' | translate }}</mat-radio-button></mat-list-item>
@@ -24,6 +24,23 @@
 			</div>
 			<!-- End of Visibility Filter-->
 
+			<!-- Grant Status -->
+			<div class="col-10 gray-container" *ngIf="isPublic">
+				<h6 class="category-title">{{ 'FACET-SEARCH.GRANT-STATUS.TITLE' | translate }}</h6>
+				<mat-radio-group [formControl]="formGroup.get('grantStatus')">
+					<mat-list-item>
+						<mat-radio-button value="null" checked>{{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ANY' | translate }}</mat-radio-button>
+					</mat-list-item>
+					<mat-list-item>
+						<mat-radio-button value="0">{{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ACTIVE' | translate }}</mat-radio-button>
+					</mat-list-item>
+					<mat-list-item>
+						<mat-radio-button value="1">{{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.INACTIVE' | translate }}</mat-radio-button>
+					</mat-list-item>
+				</mat-radio-group>
+			</div>
+			<!-- End of Grant Status -->
+
 			<!-- Related Dataset Templates Filter -->
 			<div *ngIf="showGrant" class="col-10 gray-container">
 				<h6 class="category-title">{{ 'CRITERIA.DMP.RELATED-DATASET-TEMPLATES' | translate}}</h6>
@@ -49,7 +66,7 @@
 			<!-- End of Related Grants Filters -->
 
 			<!-- Collaborators Filter -->
-			<div *ngIf="showGrant" class="col-10 gray-container">
+			<div *ngIf="isAuthenticated()" class="col-10 gray-container">
 				<h6 class="category-title">{{ 'CRITERIA.DMP.RELATED-COLLABORATORS' | translate}}</h6>
 				<mat-form-field>
 					<app-multiple-auto-complete [formControl]="formGroup.get('collaborators')"
@@ -61,7 +78,7 @@
 			<!-- End of Collaborators Filter -->
 
 			<!-- Role Filter -->
-			<div *ngIf="showGrant" class="col-10 gray-container">
+			<div *ngIf="isAuthenticated()" class="col-10 gray-container">
 				<h6 class="category-title">{{ 'DATASET-PROFILE-LISTING.COLUMNS.ROLE' | translate }}</h6>
 				<mat-radio-group aria-label="Select an option" [formControl]="formGroup.get('role')">
 					<mat-list-item><mat-radio-button value="null" checked>{{ 'TYPES.DATASET-ROLE.ANY' | translate }}</mat-radio-button></mat-list-item>
diff --git a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts
index ecabe4243..1aaefee4b 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts
@@ -19,6 +19,9 @@ import { BaseCriteriaComponent } from '@app/ui/misc/criteria/base-criteria.compo
 import { ValidationErrorModel } from '@common/forms/validation/error-model/validation-error-model';
 import { TranslateService } from '@ngx-translate/core';
 import { map, takeUntil } from 'rxjs/operators';
+import { AuthService } from '@app/core/services/auth/auth.service';
+import { isNullOrUndefined } from 'util';
+import { DatasetService } from '@app/core/services/dataset/dataset.service';
 
 @Component({
 	selector: 'app-dmp-criteria-component',
@@ -28,6 +31,7 @@ import { map, takeUntil } from 'rxjs/operators';
 export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnInit {
 
 	@Input() showGrant: boolean;
+	@Input() isPublic: boolean;
 	filteringGrantsAsync = false;
 	sizeError = false;
 	maxFileSize: number = 1048576;
@@ -41,7 +45,8 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni
 		role: new FormControl,
 		organisations: new FormControl(),
 		collaborators: new FormControl(),
-		datasetTemplates: new FormControl()
+		datasetTemplates: new FormControl(),
+		grantStatus: new FormControl()
 	});
 
 	collaboratorsAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = {
@@ -81,7 +86,8 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni
 		private dialog: MatDialog,
 		private organisationService: OrganisationService,
 		private userService: UserService,
-		private datasetProfileService: DatasetProfileService
+		private datasetProfileService: DatasetService,
+		private authService: AuthService
 	) {
 		super(new ValidationErrorModel());
 	}
@@ -109,6 +115,9 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni
 		this.formGroup.get('datasetTemplates').valueChanges
 			.pipe(takeUntil(this._destroyed))
 			.subscribe(x => this.controlModified());
+		this.formGroup.get('grantStatus').valueChanges
+			.pipe(takeUntil(this._destroyed))
+			.subscribe(x => this.controlModified());
 		//if (this.criteria == null) { this.criteria = new DataManagementPlanCriteria(); }
 	}
 
@@ -119,6 +128,7 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni
 		this.formGroup.get('role').patchValue(criteria.role);
 		this.formGroup.get('collaborators').patchValue(criteria.collaborators);
 		this.formGroup.get('datasetTemplates').patchValue(criteria.datasetTemplates);
+		this.formGroup.get('grantStatus').patchValue(criteria.grantStatus);
 	}
 
 	onCallbackError(error: any) {
@@ -140,7 +150,7 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni
 		const grantRequestItem: DataTableRequest<GrantCriteria> = new DataTableRequest(0, null, { fields: fields });
 		grantRequestItem.criteria = new GrantCriteria();
 		grantRequestItem.criteria.like = query;
-		return this.grantService.getPaged(grantRequestItem, "autocomplete").pipe(map(x => x.data));
+		return this.isPublic ? this.grantService.getPublicPaged(grantRequestItem).pipe(map(x => x.data)) : this.grantService.getPaged(grantRequestItem, "autocomplete").pipe(map(x => x.data));
 	}
 
 	filterOrganisations(value: string) {
@@ -151,7 +161,7 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni
 		dataTableRequest.criteria = new OrganisationCriteria();
 		dataTableRequest.criteria.labelLike = value;
 
-		return this.organisationService.searchInternalOrganisations(dataTableRequest).pipe(map(x => x.data));
+		return this.isPublic ? this.organisationService.searchPublicOrganisations(dataTableRequest).pipe(map(x => x.data)) : this.organisationService.searchInternalOrganisations(dataTableRequest).pipe(map(x => x.data));
 	}
 
 	filterCollaborators(query: string) {
@@ -169,7 +179,11 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni
 		const datasetTemplateRequestItem: DataTableRequest<DatasetProfileCriteria> = new DataTableRequest(0, null, { fields: fields });
 		datasetTemplateRequestItem.criteria = new DatasetProfileCriteria();
 		datasetTemplateRequestItem.criteria.like = query;
-		return this.dmpService.getDatasetProfilesUsedPaged(datasetTemplateRequestItem).pipe(map(x => x.data));
+		return this.isPublic ? this.datasetProfileService.getDatasetProfiles(datasetTemplateRequestItem) : this.dmpService.getDatasetProfilesUsedPaged(datasetTemplateRequestItem).pipe(map(x => x.data));
+	}
+
+	isAuthenticated(): boolean {
+		return !isNullOrUndefined(this.authService.current());
 	}
 
 
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 45693bc03..d1180c790 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,4 +1,10 @@
-<div class="main-content">
+<div class="header-image" *ngIf="isPublic">
+	<div class="header-text-container">
+		<h3>{{ 'ABOUT.WELCOME' | translate }}</h3>
+		<h4>{{ 'ABOUT.WELCOME-MESSAGE' | translate }}</h4>
+	</div>
+</div>
+<div [ngClass]="isPublic ? 'explore-dmp-content' : 'main-content'">
 	<div class="container-fluid">
 		<div class="card">
 			<div class="row card-header card-header-plain d-flex">
@@ -14,7 +20,7 @@
 					</div>
 					<!-- <p class="card-category">{{'DMP-LISTING.SUBTITLE' | translate}}</p> -->
 				</div>
-				<div class="row ml-auto p-2">
+				<div class="row ml-auto p-2" *ngIf="!isPublic">
 					<!-- Import Button -->
 					<button mat-icon-button [matMenuTriggerFor]="actionsMenu" class="ml-auto more-icon" (click)="$event.stopImmediatePropagation();">
 						<mat-icon class="more-horiz">more_horiz</mat-icon>
@@ -36,12 +42,12 @@
 			<div class="card-body table-responsive">
 				<div class="listing row pb-2">
 					<div class="col-12 col-sm-12 col-md-3">
-						<app-dmp-criteria-component [showGrant]="showGrant" class="col-auto"></app-dmp-criteria-component>
+						<app-dmp-criteria-component [showGrant]="showGrant" [isPublic]="isPublic" class="col-auto"></app-dmp-criteria-component>
 					</div>
 					<div class="col-12 col-sm-12 col-md-9 pt-4">
 						<!-- <mat-paginator #paginator [length]="totalCount" [pageSizeOptions]="[10, 25, 100]" (page)="pageThisEvent($event)" class="top-paginator"></mat-paginator> -->
 						<div *ngFor="let item of listingItems; let i = index">
-							<app-dmp-listing-item-component [showDivider]="i != (listingItems.length - 1)" [dmp]="item"></app-dmp-listing-item-component>
+							<app-dmp-listing-item-component [showDivider]="i != (listingItems.length - 1)" [dmp]="item" [isPublic]="isPublic"></app-dmp-listing-item-component>
 						</div>
 					</div>
 				</div>
diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss
index fbb8cb36f..8cf41554a 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss
+++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss
@@ -68,11 +68,33 @@
 	font-size: 28px;
 	color: #aaaaaa;
   }
-  
+
   .more-icon :hover {
 	color: #00b29f;
   }
 
+  .header-image {
+	background: url("/assets/images/new-dashboard-bg.png") no-repeat;
+	background-size: cover;
+	margin-top: 70px;
+	min-height: 15em;
+	position: relative;
+  }
+
+  .header-text-container {
+	background: rgba(255, 255, 255, 0.7);
+	position: absolute;
+	bottom: 0px;
+	padding-left: 5em;
+	padding-right: 10em;
+	padding-top: 2em;
+	padding-bottom: 2em;
+  }
+  
+  .explore-dmp-content {
+	padding: 30px 15px;
+  }
+
 // .bot-paginator {
 // 	margin-top: auto;
 // }
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 ddc172e69..21f2eed19 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
@@ -21,6 +21,8 @@ import { takeUntil } from 'rxjs/operators';
 import { GrantService } from "@app/core/services/grant/grant.service";
 import { DmpUploadDialogue } from './upload-dialogue/dmp-upload-dialogue.component';
 import { UiNotificationService, SnackBarNotificationLevel } from '@app/core/services/notification/ui-notification-service';
+import { isNullOrUndefined } from 'util';
+import { AuthService } from '@app/core/services/auth/auth.service';
 
 
 @Component({
@@ -43,6 +45,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
 	listingItems: DmpListingModel[] = [];
 	allVersions: boolean = false;
 	groupLabel: string;
+	isPublic: boolean = false;
 
 	constructor(
 		private dmpService: DmpService,
@@ -52,12 +55,18 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
 		public enumUtils: EnumUtils,
 		private language: TranslateService,
 		private grantService: GrantService,
-		private uiNotificationService: UiNotificationService
+		private uiNotificationService: UiNotificationService,
+		private authService: AuthService
 	) {
 		super();
 	}
 
 	ngOnInit() {
+		console.log(this.router.url);
+		this.isPublic = this.router.url.startsWith('/explore-plans');
+		if (!this.isPublic && isNullOrUndefined(this.authService.current())) {
+			this.router.navigateByUrl("/explore-plans");
+		}
 		this.route.params
 			.pipe(takeUntil(this._destroyed))
 			.subscribe(async params => {
@@ -155,6 +164,10 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
 			request.criteria.status = value.status;
 			request.criteria.isPublic = false;
 		}
+		request.criteria.onlyPublic = this.isPublic;
+		if (this.isPublic) {
+			request.criteria.isPublic = true;
+		}
 		if (value.datasetTemplates)
 			request.criteria.datasetTemplates = value.datasetTemplates.map(x => x.id);
 		if (value.collaborators)
@@ -165,6 +178,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
 			request.criteria.groupIds = [this.itemId];
 			request.criteria.allVersions = true;
 		}
+		request.criteria.grantStatus = value.grantStatus;
 		this.dmpService.getPaged(request, "listing").pipe(takeUntil(this._destroyed)).subscribe(result => {
 			if (!result) { return []; }
 			if (this._paginator.pageIndex === 0) { this.totalCount = result.totalCount; }
@@ -236,7 +250,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
 
 	private onCallbackImportComplete() {
 		this.uiNotificationService.snackBarNotification(this.language.instant('DMP-UPLOAD.UPLOAD-SUCCESS'), SnackBarNotificationLevel.Success);
-		this.router.navigate(['/reload']).then(() => this.router.navigate(['/plans']));
+		this.router.navigate(['/reload']).then(() => this.isPublic ? this.router.navigate(['/explore-plans']) : this.router.navigate(['/plans']));
 	}
 
 	private onCallbackImportFail(error: string) {
diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html
index bb2d6c8eb..57b224cb9 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html
+++ b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html
@@ -1,5 +1,5 @@
 <div class="listing-item">
-	<a [routerLink]="['/plans/overview/' + dmp.id]">
+	<a [routerLink]="isPublic ? ['/explore-plans/publicOverview/' + dmp.id] : ['/plans/overview/' + dmp.id]">
 		<div class="col">
 			<div class="row">
 				<div class="col-12 gray-container container-header">
@@ -8,13 +8,13 @@
 						<mat-icon class="more-horiz">more_horiz</mat-icon>
 					</button>
 					<mat-menu #actionsMenu="matMenu">
-						<button mat-menu-item (click)="editClicked(dmp.id)" class="menu-item">
+						<button mat-menu-item (click)="editClicked(dmp.id)" class="menu-item" *ngIf="!isPublic">
 							<mat-icon>edit</mat-icon>{{ 'DMP-LISTING.ACTIONS.EDIT' | translate }}
 						</button>
-						<button mat-menu-item (click)="openShareDialog(dmp.id,dmp.label)">
+						<button mat-menu-item (click)="openShareDialog(dmp.id,dmp.label)" *ngIf="!isPublic">
 							<mat-icon>share</mat-icon>{{'DMP-LISTING.ACTIONS.INVITE' | translate}}
 						</button>
-						<button mat-menu-item (click)="addDataset(dmp.id)">
+						<button mat-menu-item (click)="addDataset(dmp.id)" *ngIf="!isPublic">
 							<mat-icon>add</mat-icon>{{'DMP-LISTING.ACTIONS.ADD-DATASET' | translate}}
 						</button>
 						<button mat-menu-item (click)="showDatasets(dmp.id, dmp.label)">
@@ -57,14 +57,14 @@
 						</div>
 					</div>
 					<div class="row">
-						<div class="col-auto about-item pl-0">
+						<div class="col-auto about-item pl-0" *ngIf="!isPublic">
 							<mat-icon class="gray-icon pt-2" matTooltip="{{'DMP-LISTING.TOOLTIP.LEVEL-OF-ACCESS' | translate}}">
 								settings
 							</mat-icon>
 							<h4 class="mt-1 ml-1 mr-3 p-1 role">{{roleDisplay(dmp.users).toUpperCase()}}</h4>
 						</div>
-						<div class="col-auto about-item">
-							<a class="datasets-counter" [routerLink]="['/plans/edit/' + dmp.id]" [queryParams]="{ tab: 'datasetDescriptions' }">
+						<div class="col-auto about-item" [ngClass]="isPublic ? 'pl-0' : ''">
+							<a class="datasets-counter" [routerLink]="isPublic ? ['/explore-plans/publicEdit/' + dmp.id] : ['/plans/edit/' + dmp.id]" [queryParams]="{ tab: 'datasetDescriptions' }">
 								<mat-icon class="gray-icon pt-2" matTooltip="{{'DMP-LISTING.TOOLTIP.INVOLVED-DATASETS' | translate}}">
 									storage
 								</mat-icon>
diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts
index e41f78acd..77f63bd4d 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts
@@ -18,6 +18,7 @@ export class DmpListingItemComponent implements OnInit {
 
 	@Input() dmp: DmpListingModel;
 	@Input() showDivider: boolean = true;
+	@Input() isPublic: boolean;
 	@Output() onClick: EventEmitter<DmpListingModel> = new EventEmitter();
 
 	isDraft: boolean;

From 88e34e1ec1d8ddf78b97c1adc84b78c1e41066ab Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Wed, 1 Apr 2020 18:17:17 +0300
Subject: [PATCH 02/60] Removed external Tags

---
 .../main/java/eu/eudat/controllers/TagController.java  |  8 ++++----
 .../java/eu/eudat/logic/managers/CommonsManager.java   |  4 ++--
 .../java/eu/eudat/logic/proxy/config/ExternalUrls.java |  6 +++---
 .../eu/eudat/logic/proxy/fetching/RemoteFetcher.java   |  4 ++--
 .../data/externalurl/ExternalSourcesConfiguration.java |  4 ++--
 .../src/main/resources/externalUrls/ExternalUrls.xml   | 10 +++++-----
 6 files changed, 18 insertions(+), 18 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 dd54267e9..029e1ba08 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
@@ -31,13 +31,13 @@ import java.util.stream.Collectors;
 @RequestMapping(value = {"/api"})
 public class TagController extends BaseController {
 
-    private Repository<Dataset, TagCriteria> datasetRepository;
+//    private Repository<Dataset, TagCriteria> datasetRepository;
     private Environment environment;
 
     @Autowired
-    public TagController(ApiContext apiContext, Repository tagRepository, Environment environment) {
+    public TagController(ApiContext apiContext, /*Repository tagRepository, */Environment environment) {
         super(apiContext);
-        this.datasetRepository = tagRepository;
+//        this.datasetRepository = tagRepository;
         this.environment = environment;
     }
 
@@ -48,7 +48,7 @@ public class TagController extends BaseController {
         //ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(query);
         /*List<Map<String, String>> remoteRepos = this.getApiContext().getOperationsContext().getRemoteFetcher().getTags(externalUrlCriteria, type);
         TagExternalSourcesModel researchersExternalSourcesModel = new TagExternalSourcesModel().fromExternalItem(remoteRepos);*/
-        List<Tag> tags = this.getApiContext().getOperationsContext().getDatasetRepository().query(new DatasetCriteria()).stream().map(Dataset::getTags).flatMap(Collection::stream).filter(StreamDistinctBy.distinctByKey(Tag::getId)).collect(Collectors.toList());
+        List<Tag> tags = this.getApiContext().getOperationsContext().getElasticRepository().getDatasetRepository().query(new DatasetCriteria()).stream().map(Dataset::getTags).flatMap(Collection::stream).filter(StreamDistinctBy.distinctByKey(Tag::getId)).collect(Collectors.toList());
 
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<List<Tag>>().payload(tags).status(ApiMessageCode.NO_MESSAGE));
     }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/CommonsManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/CommonsManager.java
index 94df54e41..3948216de 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/CommonsManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/CommonsManager.java
@@ -20,8 +20,8 @@ public class CommonsManager {
                 .map(item-> new ExternalSourcesConfiguration.ExternalSourcesUrlModel(item.getKey(),item.getLabel())).collect(Collectors.toList()));
         externalSourcesConfiguration.setServices(configLoader.getExternalUrls().getServices().getUrls().stream()
                 .map(item-> new ExternalSourcesConfiguration.ExternalSourcesUrlModel(item.getKey(),item.getLabel())).collect(Collectors.toList()));
-        externalSourcesConfiguration.setTags(configLoader.getExternalUrls().getTags().getUrls().stream()
-                .map(item-> new ExternalSourcesConfiguration.ExternalSourcesUrlModel(item.getKey(),item.getLabel())).collect(Collectors.toList()));
+        /*externalSourcesConfiguration.setTags(configLoader.getExternalUrls().getTags().getUrls().stream()
+                .map(item-> new ExternalSourcesConfiguration.ExternalSourcesUrlModel(item.getKey(),item.getLabel())).collect(Collectors.toList()));*/
         return externalSourcesConfiguration;
     }
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/ExternalUrls.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/ExternalUrls.java
index eb04c9a4a..f7e38ba20 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/ExternalUrls.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/ExternalUrls.java
@@ -22,7 +22,7 @@ public class ExternalUrls implements Serializable {
     ResearcherUrls researchers;
     OrganisationUrls organisations;
     DatasetUrls datasets;
-    TagUrls tags;
+    /*TagUrls tags;*/
     FunderUrls funders;
 
 
@@ -66,14 +66,14 @@ public class ExternalUrls implements Serializable {
     }
 
 
-    public TagUrls getTags() {
+    /*public TagUrls getTags() {
         return tags;
     }
 
     @XmlElement(name = "tags")
     public void setTags(TagUrls tags) {
         this.tags = tags;
-    }
+    }*/
 
 
     public OrganisationUrls getOrganisations() {
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java
index 19dd8192e..cd29be9e8 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java
@@ -108,14 +108,14 @@ public class RemoteFetcher {
         return getAll(urlConfigs, fetchStrategy, externalUrlCriteria);
     }
 
-    @Cacheable("tags")
+    /*@Cacheable("tags")
     public List<Map<String, String>> getTags(ExternalUrlCriteria externalUrlCriteria, String key) throws NoURLFound, HugeResultSet {
         List<UrlConfiguration> urlConfigs =
                 key != null && !key.isEmpty() ? configLoader.getExternalUrls().getTags().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList())
                         : configLoader.getExternalUrls().getTags().getUrls();
         FetchStrategy fetchStrategy = configLoader.getExternalUrls().getTags().getFetchMode();
         return getAll(urlConfigs, fetchStrategy, externalUrlCriteria);
-    }
+    }*/
 
     @Cacheable("externalDatasets")
     public List<Map<String, String>> getDatasets(ExternalUrlCriteria externalUrlCriteria, String key) throws NoURLFound, HugeResultSet {
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/externalurl/ExternalSourcesConfiguration.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/externalurl/ExternalSourcesConfiguration.java
index c9e8df87d..2f8778b0b 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/externalurl/ExternalSourcesConfiguration.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/externalurl/ExternalSourcesConfiguration.java
@@ -37,7 +37,7 @@ public class ExternalSourcesConfiguration {
     private List<ExternalSourcesUrlModel> dataRepositories;
     private List<ExternalSourcesUrlModel> services;
     private List<ExternalSourcesUrlModel> externalDatasets;
-    private List<ExternalSourcesUrlModel> tags;
+   /* private List<ExternalSourcesUrlModel> tags;
 
     public List<ExternalSourcesUrlModel> getTags() {
         return tags;
@@ -45,7 +45,7 @@ public class ExternalSourcesConfiguration {
 
     public void setTags(List<ExternalSourcesUrlModel> tags) {
         this.tags = tags;
-    }
+    }*/
 
     public List<ExternalSourcesUrlModel> getRegistries() {
         return registries;
diff --git a/dmp-backend/web/src/main/resources/externalUrls/ExternalUrls.xml b/dmp-backend/web/src/main/resources/externalUrls/ExternalUrls.xml
index de3d38152..2d731694f 100644
--- a/dmp-backend/web/src/main/resources/externalUrls/ExternalUrls.xml
+++ b/dmp-backend/web/src/main/resources/externalUrls/ExternalUrls.xml
@@ -65,7 +65,7 @@
         <fetchMode>FIRST</fetchMode>  <!-- EITHER 'FIRST' OR 'ALL' -->
     </registries>
 
-    <tags>
+    <!--<tags>
         <urls>
             <urlConfig>
                 <key>cristin</key>
@@ -86,7 +86,7 @@
                 </data>
                 <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
             </urlConfig>
-<!--            <urlConfig>
+&lt;!&ndash;            <urlConfig>
                 <key>openAire</key>
                 <label>OpenAIRE</label>
                 <ordinal>1</ordinal>
@@ -120,10 +120,10 @@
                     </fields>
                 </data>
                 <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
-            </urlConfig>-->
+            </urlConfig>&ndash;&gt;
         </urls>
-        <fetchMode>FIRST</fetchMode>  <!-- EITHER 'FIRST' OR 'ALL' -->
-    </tags>
+        <fetchMode>FIRST</fetchMode>  &lt;!&ndash; EITHER 'FIRST' OR 'ALL' &ndash;&gt;
+    </tags>-->
 
     <grants>
         <urls>

From 1c4b0ba87a168adfba5025219599a072c6c88d4f Mon Sep 17 00:00:00 2001
From: Diamantis Tziotzios <dtziotzios@cite.gr>
Date: Thu, 2 Apr 2020 13:32:14 +0300
Subject: [PATCH 03/60] fb login provider fix

---
 dmp-frontend/src/app/ui/auth/login/login.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dmp-frontend/src/app/ui/auth/login/login.component.ts b/dmp-frontend/src/app/ui/auth/login/login.component.ts
index d439a234f..f71c64bf9 100644
--- a/dmp-frontend/src/app/ui/auth/login/login.component.ts
+++ b/dmp-frontend/src/app/ui/auth/login/login.component.ts
@@ -188,7 +188,7 @@ export class LoginComponent extends BaseComponent implements OnInit, AfterViewIn
 						error => this.loginService.onLogInError(error)
 					);
 			}
-		}, { scope: 'user_friends,email' });
+		}, { scope: 'email' });
 	}
 
 	public hasConfigurableProviders(): boolean {

From 71ccd768967874ef546c1184326a49a34d497299 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Thu, 2 Apr 2020 17:22:41 +0300
Subject: [PATCH 04/60] Fixed and improved file export system

---
 .../main/java/eu/eudat/controllers/DMPs.java  | 15 +++---
 .../controllers/DatasetWizardController.java  | 26 +++++-----
 .../managers/DataManagementPlanManager.java   | 48 +++++++++++--------
 .../DataManagementProfileManager.java         |  7 ++-
 .../eudat/logic/managers/DatasetManager.java  | 28 ++++++-----
 .../logic/managers/DatasetProfileManager.java | 12 ++---
 .../ExportXmlBuilderDatasetProfile.java       |  5 +-
 .../dmpXml/ExportXmlBuilderDmpProfile.java    |  5 +-
 8 files changed, 83 insertions(+), 63 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java
index 777537751..109ff34c2 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java
@@ -19,6 +19,7 @@ import eu.eudat.logic.proxy.config.configloaders.ConfigLoader;
 import eu.eudat.logic.security.claims.ClaimedAuthorities;
 import eu.eudat.logic.services.ApiContext;
 import eu.eudat.logic.services.operations.DatabaseRepository;
+import eu.eudat.logic.utilities.documents.helpers.FileEnvelope;
 import eu.eudat.models.data.datasetprofile.DatasetProfileListingModel;
 import eu.eudat.models.data.datasetwizard.DatasetsToBeFinalized;
 import eu.eudat.models.data.dmp.DataManagementPlan;
@@ -209,22 +210,22 @@ public class DMPs extends BaseController {
     public @ResponseBody
     ResponseEntity<byte[]> getPDFDocument(@PathVariable String id, @RequestHeader("Content-Type") String contentType,
 										  @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) throws IllegalAccessException, IOException, InstantiationException, InterruptedException {
-        File file = this.dataManagementPlanManager.getWordDocument(id, principal, configLoader);
-        String name = file.getName().substring(0, file.getName().length() - 5);
-        File pdffile = datasetManager.convertToPDF(file, environment, name);
+        FileEnvelope file = this.dataManagementPlanManager.getWordDocument(id, principal, configLoader);
+        String name = file.getFilename().substring(0, file.getFilename().length() - 5);
+        File pdffile = datasetManager.convertToPDF(file, environment);
         InputStream resource = new FileInputStream(pdffile);
-        logger.info("Mime Type of " + file.getName() + " is " +
-                new MimetypesFileTypeMap().getContentType(file));
+        logger.info("Mime Type of " + name + " is " +
+                new MimetypesFileTypeMap().getContentType(file.getFile()));
         HttpHeaders responseHeaders = new HttpHeaders();
         responseHeaders.setContentLength(pdffile.length());
         responseHeaders.setContentType(MediaType.APPLICATION_OCTET_STREAM);
-        responseHeaders.set("Content-Disposition", "attachment;filename=" + pdffile.getName());
+        responseHeaders.set("Content-Disposition", "attachment;filename=" + name + ".pdf");
         responseHeaders.set("Access-Control-Expose-Headers", "Content-Disposition");
         responseHeaders.get("Access-Control-Expose-Headers").add("Content-Type");
 
         byte[] content = org.apache.poi.util.IOUtils.toByteArray(resource);
         resource.close();
-        Files.deleteIfExists(file.toPath());
+        Files.deleteIfExists(file.getFile().toPath());
         Files.deleteIfExists(pdffile.toPath());
         return new ResponseEntity<>(content, responseHeaders, HttpStatus.OK);
     }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetWizardController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetWizardController.java
index bed8c804a..c2b9abc43 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetWizardController.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetWizardController.java
@@ -12,6 +12,7 @@ import eu.eudat.logic.proxy.config.configloaders.ConfigLoader;
 import eu.eudat.logic.security.claims.ClaimedAuthorities;
 import eu.eudat.logic.services.ApiContext;
 import eu.eudat.logic.services.forms.VisibilityRuleService;
+import eu.eudat.logic.utilities.documents.helpers.FileEnvelope;
 import eu.eudat.models.data.datasetwizard.DataManagentPlanListingModel;
 import eu.eudat.models.data.datasetwizard.DatasetWizardModel;
 import eu.eudat.models.data.dmp.AssociatedProfile;
@@ -20,6 +21,7 @@ import eu.eudat.models.data.listingmodels.DataManagementPlanOverviewModel;
 import eu.eudat.models.data.security.Principal;
 import eu.eudat.models.data.user.composite.PagedDatasetProfile;
 import eu.eudat.types.ApiMessageCode;
+import eu.eudat.types.Authorities;
 import org.apache.poi.util.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -82,24 +84,24 @@ public class DatasetWizardController extends BaseController {
     @Transactional
     @RequestMapping(method = RequestMethod.GET, value = {"{id}"}, produces = "application/json")
     public @ResponseBody
-    ResponseEntity getSingle(@PathVariable String id, @RequestHeader("Content-Type") String contentType, Principal principal) throws IllegalAccessException, IOException, InstantiationException {
+    ResponseEntity getSingle(@PathVariable String id, @RequestHeader("Content-Type") String contentType, @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) throws IllegalAccessException, IOException, InstantiationException {
         try {
             if (contentType.equals("application/xml")) {
                 VisibilityRuleService visibilityRuleService = this.getApiContext().getUtilitiesService().getVisibilityRuleService();
                 return this.datasetManager.getDocument(id, visibilityRuleService, contentType, principal);
             } else if (contentType.equals("application/msword")) {
-                File file = datasetManager.getWordDocumentFile(this.configLoader, id, this.getApiContext().getUtilitiesService().getVisibilityRuleService(), principal);
-                InputStream resource = new FileInputStream(file);
+                FileEnvelope file = datasetManager.getWordDocumentFile(this.configLoader, id, this.getApiContext().getUtilitiesService().getVisibilityRuleService(), principal);
+                InputStream resource = new FileInputStream(file.getFile());
                 HttpHeaders responseHeaders = new HttpHeaders();
-                responseHeaders.setContentLength(file.length());
+                responseHeaders.setContentLength(file.getFile().length());
                 responseHeaders.setContentType(MediaType.APPLICATION_OCTET_STREAM);
-                responseHeaders.set("Content-Disposition", "attachment;filename=" + file.getName());
+                responseHeaders.set("Content-Disposition", "attachment;filename=" + file.getFilename());
                 responseHeaders.set("Access-Control-Expose-Headers", "Content-Disposition");
                 responseHeaders.get("Access-Control-Expose-Headers").add("Content-Type");
 
                 byte[] content = IOUtils.toByteArray(resource);
                 resource.close();
-                Files.deleteIfExists(file.toPath());
+                Files.deleteIfExists(file.getFile().toPath());
                 return new ResponseEntity<>(content,
                         responseHeaders,
                         HttpStatus.OK);
@@ -151,25 +153,25 @@ public class DatasetWizardController extends BaseController {
 
     @RequestMapping(method = RequestMethod.GET, value = {"/getPDF/{id}"})
     public @ResponseBody
-    ResponseEntity<byte[]> getPDFDocument(@PathVariable String id, Principal principal) throws IllegalAccessException, IOException, InstantiationException, InterruptedException {
-        File file = datasetManager.getWordDocumentFile(this.configLoader, id, this.getApiContext().getUtilitiesService().getVisibilityRuleService(), principal);
-        String fileName = file.getName();
+    ResponseEntity<byte[]> getPDFDocument(@PathVariable String id, @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) throws IllegalAccessException, IOException, InstantiationException, InterruptedException {
+        FileEnvelope file = datasetManager.getWordDocumentFile(this.configLoader, id, this.getApiContext().getUtilitiesService().getVisibilityRuleService(), principal);
+        String fileName = file.getFilename();
         if (fileName.endsWith(".docx")){
             fileName = fileName.substring(0, fileName.length() - 5);
         }
-        File pdffile = datasetManager.convertToPDF(file, environment, fileName);
+        File pdffile = datasetManager.convertToPDF(file, environment);
         InputStream resource = new FileInputStream(pdffile);
 
         HttpHeaders responseHeaders = new HttpHeaders();
         responseHeaders.setContentLength(pdffile.length());
         responseHeaders.setContentType(MediaType.APPLICATION_OCTET_STREAM);
-        responseHeaders.set("Content-Disposition", "attachment;filename=" + pdffile.getName());
+        responseHeaders.set("Content-Disposition", "attachment;filename=" + fileName + ".pdf");
         responseHeaders.set("Access-Control-Expose-Headers", "Content-Disposition");
         responseHeaders.get("Access-Control-Expose-Headers").add("Content-Type");
 
         byte[] content = IOUtils.toByteArray(resource);
         resource.close();
-        Files.deleteIfExists(file.toPath());
+        Files.deleteIfExists(file.getFile().toPath());
         Files.deleteIfExists(pdffile.toPath());
         return new ResponseEntity<>(content,
                 responseHeaders,
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index 7032411f4..af0f0d226 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -235,11 +235,11 @@ public class DataManagementPlanManager {
         return;
     }
 
-    public File getWordDocument(String id, Principal principal, ConfigLoader configLoader) throws IOException {
+    public FileEnvelope getWordDocument(String id, Principal principal, ConfigLoader configLoader) throws IOException {
         return this.getWordDocument(id, principal, configLoader, false);
     }
 
-    public File getWordDocument(String id, Principal principal, ConfigLoader configLoader, Boolean versioned) throws IOException {
+    public FileEnvelope getWordDocument(String id, Principal principal, ConfigLoader configLoader, Boolean versioned) throws IOException {
         WordBuilder wordBuilder = new WordBuilder();
         VisibilityRuleService visibilityRuleService = this.utilitiesService.getVisibilityRuleService();
         DatasetWizardModel dataset = new DatasetWizardModel();
@@ -392,12 +392,16 @@ public class DataManagementPlanManager {
             fileName = dmpEntity.getLabel();
         }
         fileName = fileName.replaceAll("[^a-zA-Z0-9+ ]", "");
-        File exportFile = new File(this.environment.getProperty("temp.temp") + fileName + ".docx");
+        FileEnvelope exportEnvelope = new FileEnvelope();
+        exportEnvelope.setFilename(fileName + ".docx");
+        String uuid = UUID.randomUUID().toString();
+        File exportFile = new File(this.environment.getProperty("temp.temp") + uuid + ".docx");
         FileOutputStream out = new FileOutputStream(exportFile);
         document.write(out);
         out.close();
+        exportEnvelope.setFile(exportFile);
 
-        return exportFile;
+        return exportEnvelope;
     }
 
     /*public File getPdfDocument(String id) throws InstantiationException, IllegalAccessException, InterruptedException, IOException {
@@ -1033,9 +1037,10 @@ public class DataManagementPlanManager {
 		if (!dmp.isPublic() && dmp.getUsers().stream().filter(userInfo -> userInfo.getUser().getId() == principal.getId()).collect(Collectors.toList()).size() == 0)
 			throw new UnauthorisedException();
         List<Dataset> datasets = dmp.getDataset().stream().collect(Collectors.toList());
-        String fileName = dmp.getLabel();
-        fileName = fileName.replaceAll("[^a-zA-Z0-9+ ]", "");
-        File xmlFile = new File(this.environment.getProperty("temp.temp") + fileName + ".xml");
+        /*String fileName = dmp.getLabel();
+        fileName = fileName.replaceAll("[^a-zA-Z0-9+ ]", "");*/
+        String uuid = UUID.randomUUID().toString();
+        File xmlFile = new File(this.environment.getProperty("temp.temp") + uuid + ".xml");
         BufferedWriter writer = new BufferedWriter(new FileWriter(xmlFile, true));
         Document xmlDoc = XmlBuilder.getDocument();
         Element dmpElement = xmlDoc.createElement("dmp");
@@ -1156,7 +1161,7 @@ public class DataManagementPlanManager {
         writer.close();
         FileEnvelope fileEnvelope = new FileEnvelope();
         fileEnvelope.setFile(xmlFile);
-        fileEnvelope.setFilename(dmp.getLabel());
+        fileEnvelope.setFilename(dmp.getLabel() + ".xml");
 
         return fileEnvelope;
     }
@@ -1172,7 +1177,8 @@ public class DataManagementPlanManager {
         mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
         String fileName = dmp.getLabel();
         fileName = fileName.replaceAll("[^a-zA-Z0-9+ ]", "");
-        File file = new File(this.environment.getProperty("temp.temp") + fileName + ".json");
+        String uuid = UUID.randomUUID().toString();
+        File file = new File(this.environment.getProperty("temp.temp") + uuid + ".json");
         OutputStream output = new FileOutputStream(file);
         try {
 //            mapper.writeValue(file, rdaExportModel);
@@ -1187,7 +1193,7 @@ public class DataManagementPlanManager {
         HttpHeaders responseHeaders = new HttpHeaders();
         responseHeaders.setContentLength(file.length());
         responseHeaders.setContentType(MediaType.APPLICATION_OCTET_STREAM);
-        responseHeaders.set("Content-Disposition", "attachment;filename=" + file.getName());
+        responseHeaders.set("Content-Disposition", "attachment;filename=" + fileName + ".json");
         responseHeaders.set("Access-Control-Expose-Headers", "Content-Disposition");
         responseHeaders.get("Access-Control-Expose-Headers").add("Content-Type");
 
@@ -1198,28 +1204,28 @@ public class DataManagementPlanManager {
     }
 
     public ResponseEntity<byte[]> getDocument(String id, String contentType, Principal principal, ConfigLoader configLoader) throws InstantiationException, IllegalAccessException, IOException {
-        File file;
+        FileEnvelope file;
         switch (contentType) {
             case "application/xml":
-                file = getXmlDocument(id, principal).getFile();
+                file = getXmlDocument(id, principal);
                 break;
             case "application/msword":
                 file = getWordDocument(id, principal, configLoader);
                 break;
             default:
-                file = getXmlDocument(id, principal).getFile();
+                file = getXmlDocument(id, principal);
         }
-        InputStream resource = new FileInputStream(file);
+        InputStream resource = new FileInputStream(file.getFile());
         HttpHeaders responseHeaders = new HttpHeaders();
-        responseHeaders.setContentLength(file.length());
+        responseHeaders.setContentLength(file.getFile().length());
         responseHeaders.setContentType(MediaType.APPLICATION_OCTET_STREAM);
-        responseHeaders.set("Content-Disposition", "attachment;filename=" + file.getName());
+        responseHeaders.set("Content-Disposition", "attachment;filename=" + file.getFilename());
         responseHeaders.set("Access-Control-Expose-Headers", "Content-Disposition");
         responseHeaders.get("Access-Control-Expose-Headers").add("Content-Type");
 
         byte[] content = org.apache.poi.util.IOUtils.toByteArray(resource);
         resource.close();
-        Files.deleteIfExists(file.toPath());
+        Files.deleteIfExists(file.getFile().toPath());
         return new ResponseEntity<>(content,
                 responseHeaders,
                 HttpStatus.OK);
@@ -1598,15 +1604,15 @@ public class DataManagementPlanManager {
         fileHeaders.setContentType(MediaType.MULTIPART_FORM_DATA);
         LinkedMultiValueMap<String, Object> addFileMap = new LinkedMultiValueMap<>();
 
-        File file = getWordDocument(id.toString(), principal, configLoader);
-        addFileMap.add("filename", file.getName());
-        FileSystemResource fileSystemResource = new FileSystemResource(file);
+        FileEnvelope file = getWordDocument(id.toString(), principal, configLoader);
+        addFileMap.add("filename", file.getFilename());
+        FileSystemResource fileSystemResource = new FileSystemResource(file.getFile());
         addFileMap.add("file", fileSystemResource);
         HttpEntity<MultiValueMap<String, Object>> addFileMapRequest = new HttpEntity<>(addFileMap, fileHeaders);
 
         String addFileUrl = links.get("files") + "?access_token=" + this.environment.getProperty("zenodo.access_token");
         ResponseEntity<String> addFileResponse = restTemplate.postForEntity(addFileUrl, addFileMapRequest, String.class);
-        Files.deleteIfExists(file.toPath());
+        Files.deleteIfExists(file.getFile().toPath());
 
         // Third post call to Zenodo to publish the entry and return the DOI.
         String publishUrl = links.get("publish") + "?access_token=" + this.environment.getProperty("zenodo.access_token");
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementProfileManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementProfileManager.java
index 983165034..d9ee45421 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementProfileManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementProfileManager.java
@@ -24,6 +24,7 @@ import eu.eudat.logic.services.ApiContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 
@@ -49,11 +50,13 @@ public class DataManagementProfileManager {
 
     private ApiContext apiContext;
     private DatabaseRepository databaseRepository;
+    private Environment environment;
 
     @Autowired
-    public DataManagementProfileManager(ApiContext apiContext) {
+    public DataManagementProfileManager(ApiContext apiContext, Environment environment) {
         this.apiContext = apiContext;
         this.databaseRepository = apiContext.getOperationsContext().getDatabaseRepository();
+        this.environment = environment;
     }
 
     public DataTableData<DataManagementPlanProfileListingModel> getPaged(DataManagementPlanProfileTableRequest dataManagementPlanProfileTableRequest, Principal principal) throws Exception {
@@ -114,7 +117,7 @@ public class DataManagementProfileManager {
 
     public FileEnvelope getXmlDocument(DataManagementPlanProfileListingModel dmpProfile, String label) throws InstantiationException, IllegalAccessException, IOException {
         ExportXmlBuilderDmpProfile xmlBuilder = new ExportXmlBuilderDmpProfile();
-        File file = xmlBuilder.build(dmpProfile);
+        File file = xmlBuilder.build(dmpProfile, environment);
         FileEnvelope fileEnvelope = new FileEnvelope();
         fileEnvelope.setFile(file);
         fileEnvelope.setFilename(label);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java
index 6883663a2..a30f89ab1 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java
@@ -402,7 +402,7 @@ public class DatasetManager {
         visibilityRuleService.buildVisibilityContext(pagedDatasetProfile.getRules());
         wordBuilder.build(document, pagedDatasetProfile, visibilityRuleService);
         String label = datasetEntity.getLabel().replaceAll("[^a-zA-Z0-9+ ]", "");
-        File exportFile = new File(label + ".docx");
+//        File exportFile = new File(label + ".docx");
 
         // Removes the top empty headings.
         for (int i = 0; i < 6; i++) {
@@ -446,19 +446,23 @@ public class DatasetManager {
         //  return exportFile;
     }
 
-    public File getWordDocumentFile(ConfigLoader configLoader, String id, VisibilityRuleService visibilityRuleService, Principal principal) throws IOException {
+    public FileEnvelope getWordDocumentFile(ConfigLoader configLoader, String id, VisibilityRuleService visibilityRuleService, Principal principal) throws IOException {
         eu.eudat.data.entities.Dataset datasetEntity = databaseRepository.getDatasetDao().find(UUID.fromString(id), HintedModelFactory.getHint(DatasetWizardModel.class));
         if (!datasetEntity.getDmp().isPublic() && datasetEntity.getDmp().getUsers()
                                                                .stream().filter(userInfo -> userInfo.getUser().getId() == principal.getId())
                                                                .collect(Collectors.toList()).size() == 0)
             throw new UnauthorisedException();
         String label = datasetEntity.getLabel().replaceAll("[^a-zA-Z0-9+ ]", "");
-        File exportFile = new File(this.environment.getProperty("temp.temp") + label + ".docx");
+        FileEnvelope exportEnvelope = new FileEnvelope();
+        exportEnvelope.setFilename(label + ".docx");
+        String uuid = UUID.randomUUID().toString();
+        File exportFile = new File(this.environment.getProperty("temp.temp") + uuid + ".docx");
         XWPFDocument document = getWordDocument(configLoader, datasetEntity, visibilityRuleService);
         FileOutputStream out = new FileOutputStream(exportFile);
          document.write(out);
          out.close();
-          return exportFile;
+         exportEnvelope.setFile(exportFile);
+          return exportEnvelope;
     }
 
     public String getWordDocumentText (Dataset datasetEntity) throws Exception {
@@ -488,17 +492,19 @@ public class DatasetManager {
         File file = xmlBuilder.build(pagedDatasetProfile, datasetEntity.getProfile().getId(), visibilityRuleService, environment);
         FileEnvelope fileEnvelope = new FileEnvelope();
         fileEnvelope.setFile(file);
-        fileEnvelope.setFilename(datasetEntity.getLabel());
+        String label = datasetEntity.getLabel().replaceAll("[^a-zA-Z0-9+ ]", "");
+        fileEnvelope.setFilename(label);
         return fileEnvelope;
     }
 
-    public File convertToPDF(File file, Environment environment, String label) throws IOException, InterruptedException {
+    public File convertToPDF(FileEnvelope file, Environment environment) throws IOException, InterruptedException {
         LinkedMultiValueMap<String, Object> map = new LinkedMultiValueMap<>();
-        map.add("files", new FileSystemResource(file));
-        map.add("filename", label + ".pdf");
+        String uuid = UUID.randomUUID().toString();
+        map.add("files", new FileSystemResource(file.getFile()));
+        map.add("filename", uuid + ".pdf");
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.MULTIPART_FORM_DATA);
-        headers.add("Content-disposition", "attachment; filename=" + label + ".pdf");
+        headers.add("Content-disposition", "attachment; filename=" + uuid + ".pdf");
         headers.add("Content-type", "application/pdf");
 
         HttpEntity<LinkedMultiValueMap<String, Object>> requestEntity = new HttpEntity<LinkedMultiValueMap<String, Object>>(
@@ -507,11 +513,11 @@ public class DatasetManager {
         byte[] queueResult = new RestTemplate().postForObject(environment.getProperty("pdf.converter.url") + "convert/office"
                 , requestEntity, byte[].class);
 
-        File resultPdf = new File(label + ".pdf");
+        File resultPdf = new File(environment.getProperty("temp.temp") + uuid + ".pdf");
         FileOutputStream output = new FileOutputStream(resultPdf);
         IOUtils.write(queueResult, output);
         output.close();
-        Files.deleteIfExists(file.toPath());
+        Files.deleteIfExists(file.getFile().toPath());
 
         return resultPdf;
     }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java
index 81693e917..9a171ade0 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java
@@ -21,10 +21,10 @@ import eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field;
 import eu.eudat.models.data.externaldataset.ExternalAutocompleteFieldModel;
 import eu.eudat.models.data.helpers.common.DataTableData;
 import eu.eudat.queryable.QueryableList;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
 import org.springframework.http.*;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
@@ -34,12 +34,10 @@ import org.w3c.dom.Element;
 
 import javax.activation.MimetypesFileTypeMap;
 import javax.xml.xpath.*;
-import java.io.IOException;
+import java.io.*;
 import java.nio.file.Files;
 import java.util.*;
 
-import java.io.*;
-
 
 @Component
 public class DatasetProfileManager {
@@ -47,11 +45,13 @@ public class DatasetProfileManager {
 
     private ApiContext apiContext;
     private DatabaseRepository databaseRepository;
+    private Environment environment;
 
     @Autowired
-    public DatasetProfileManager(ApiContext apiContext) {
+    public DatasetProfileManager(ApiContext apiContext, Environment environment) {
         this.apiContext = apiContext;
         this.databaseRepository = apiContext.getOperationsContext().getDatabaseRepository();
+        this.environment = environment;
     }
 
     public eu.eudat.models.data.admin.composite.DatasetProfile getDatasetProfile(String id) {
@@ -142,7 +142,7 @@ public class DatasetProfileManager {
 
     public FileEnvelope getXmlDocument(eu.eudat.models.data.user.composite.DatasetProfile datatasetProfile, String label) throws InstantiationException, IllegalAccessException, IOException {
         ExportXmlBuilderDatasetProfile xmlBuilder = new ExportXmlBuilderDatasetProfile();
-        File file = xmlBuilder.build(datatasetProfile);
+        File file = xmlBuilder.build(datatasetProfile, environment);
         FileEnvelope fileEnvelope = new FileEnvelope();
         fileEnvelope.setFile(file);
         fileEnvelope.setFilename(label);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/ExportXmlBuilderDatasetProfile.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/ExportXmlBuilderDatasetProfile.java
index 6a53063d5..28e7f911b 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/ExportXmlBuilderDatasetProfile.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/ExportXmlBuilderDatasetProfile.java
@@ -8,6 +8,7 @@ import eu.eudat.models.data.user.components.datasetprofile.FieldSet;
 import eu.eudat.models.data.user.components.datasetprofile.Section;
 import eu.eudat.logic.utilities.builders.XmlBuilder;
 
+import org.springframework.core.env.Environment;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -22,9 +23,9 @@ import java.util.UUID;
 public class ExportXmlBuilderDatasetProfile {
 
 
-    public File build(eu.eudat.models.data.user.composite.DatasetProfile datasetProfile) throws IOException {
+    public File build(eu.eudat.models.data.user.composite.DatasetProfile datasetProfile, Environment environment) throws IOException {
 
-        File xmlFile = new File(UUID.randomUUID() + ".xml");
+        File xmlFile = new File(environment.getProperty("temp.temp") + UUID.randomUUID() + ".xml");
         BufferedWriter writer = new BufferedWriter(new FileWriter(xmlFile, true));
         Document xmlDoc = XmlBuilder.getDocument();
 //        Element root = xmlDoc.createElement("root");
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/dmpXml/ExportXmlBuilderDmpProfile.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/dmpXml/ExportXmlBuilderDmpProfile.java
index 344d4924a..212facc14 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/dmpXml/ExportXmlBuilderDmpProfile.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/dmpXml/ExportXmlBuilderDmpProfile.java
@@ -4,6 +4,7 @@ import eu.eudat.logic.utilities.builders.XmlBuilder;
 
 import eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.DataManagementPlanProfile;
 import eu.eudat.models.data.listingmodels.DataManagementPlanProfileListingModel;
+import org.springframework.core.env.Environment;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -16,9 +17,9 @@ import java.util.UUID;
 public class ExportXmlBuilderDmpProfile {
 
 
-    public File build(DataManagementPlanProfileListingModel dmpProfile) throws IOException {
+    public File build(DataManagementPlanProfileListingModel dmpProfile, Environment environment) throws IOException {
 
-        File xmlFile = new File(UUID.randomUUID() + ".xml");
+        File xmlFile = new File(environment.getProperty("temp.temp") + UUID.randomUUID() + ".xml");
         BufferedWriter writer = new BufferedWriter(new FileWriter(xmlFile, true));
         Document xmlDoc = XmlBuilder.getDocument();
         Element root = xmlDoc.createElement("root");

From 194ae2ccf014ac60daa159fb8c3f3a5bf77765bf Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Fri, 3 Apr 2020 13:37:16 +0300
Subject: [PATCH 05/60] Fixed minor issues with dmp index and dmp compact
 listing

---
 .../java/eu/eudat/elastic/entities/Dmp.java   | 20 ++++++++++---------
 .../criteria/dmp-criteria.component.ts        |  4 +++-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java
index 7f51d36ae..6c98bab17 100644
--- a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java
+++ b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java
@@ -212,15 +212,17 @@ public class Dmp implements ElasticEntity<Dmp> {
 		builder.field(MapKey.LASTVERSION.getName(), this.lastVersion);
 		builder.field(MapKey.LASTPUBLICVERSION.getName(), this.lastPublicVersion);
 		builder.field(MapKey.ISPUBLIC.getName(), this.isPublic);
-		builder.startArray(MapKey.DATASETS.getName());
-		this.datasets.forEach(dataset -> {
-			try {
-				dataset.toElasticEntity(builder);
-			} catch (IOException e) {
-				logger.error(e.getMessage(), e);
-			}
-		});
-		builder.endArray();
+		if (datasets != null) {
+			builder.startArray(MapKey.DATASETS.getName());
+			this.datasets.forEach(dataset -> {
+				try {
+					dataset.toElasticEntity(builder);
+				} catch (IOException e) {
+					logger.error(e.getMessage(), e);
+				}
+			});
+			builder.endArray();
+		}
 		builder.field(MapKey.GRANT.getName(), this.grant.toString());
 		builder.field(MapKey.GRANTSTATUS.getName(), this.grantStatus);
 		builder.endObject();
diff --git a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts
index 1aaefee4b..a073e4ca8 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts
@@ -22,6 +22,8 @@ import { map, takeUntil } from 'rxjs/operators';
 import { AuthService } from '@app/core/services/auth/auth.service';
 import { isNullOrUndefined } from 'util';
 import { DatasetService } from '@app/core/services/dataset/dataset.service';
+import { DatasetProfileModel } from '@app/core/model/dataset/dataset-profile';
+import { Observable } from 'rxjs';
 
 @Component({
 	selector: 'app-dmp-criteria-component',
@@ -173,7 +175,7 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni
 		return this.userService.getCollaboratorsPaged(collaboratorsRequestItem).pipe(map(x => x.data));
 	}
 
-	filterDatasetTemplate(query: string) {
+	filterDatasetTemplate(query: string): Observable<any> {
 		const fields: Array<string> = new Array<string>();
 		fields.push('asc');
 		const datasetTemplateRequestItem: DataTableRequest<DatasetProfileCriteria> = new DataTableRequest(0, null, { fields: fields });

From 4d59821b6c2b1228fedbc72e5ed6b6ccf9a96b1d Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Fri, 3 Apr 2020 17:04:53 +0300
Subject: [PATCH 06/60] Allow twitter oauth to login without email (ask when
 logging in)

---
 .../twitter/TwitterTokenValidator.java         | 18 +++++++++++++-----
 .../twitter-login/twitter-login.component.ts   |  8 +++++++-
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/twitter/TwitterTokenValidator.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/twitter/TwitterTokenValidator.java
index 88aba641f..43f4d98df 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/twitter/TwitterTokenValidator.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/twitter/TwitterTokenValidator.java
@@ -39,7 +39,8 @@ public class TwitterTokenValidator implements TokenValidator {
 
     @Override
     public Principal validateToken(LoginInfo credentials) throws NonValidTokenException, IOException, GeneralSecurityException, NullEmailException {
-        String verifier = (String) credentials.getData();
+        String verifier = (String) ((Map)credentials.getData()).get("verifier");
+        String email = (String) ((Map) credentials.getData()).get("email");
         OAuthToken oAuthToken = new OAuthToken(credentials.getTicket(), verifier);
         AuthorizedRequestToken authorizedRequestToken = new AuthorizedRequestToken(oAuthToken, verifier);
         OAuthToken finalOauthToken = this.twitterServiceProvider.getOAuthOperations().exchangeForAccessToken(authorizedRequestToken, null);
@@ -48,11 +49,18 @@ public class TwitterTokenValidator implements TokenValidator {
         LoginProviderUser user = new LoginProviderUser();
 
         Map values = twitterTemplate.getRestTemplate().getForObject("https://api.twitter.com/1.1/account/verify_credentials.json?include_email=true", Map.class);
-        if (values.get("email") == null)
-            throw new UnauthorisedException("Cannot login user.Twitter account did not provide email");
-        user.setEmail((String) values.get("email"));
+        if (values.get("email") == null) {
+//            throw new UnauthorisedException("Cannot login user.Twitter account did not provide email");
+            user.setIsVerified(false); //TODO
+            if (email != null && !email.isEmpty()) {
+                user.setEmail(email);
+            }
+        }
+        else {
+            user.setEmail((String) values.get("email"));
+            user.setIsVerified(true); //TODO
+        }
         user.setAvatarUrl(profile.getProfileImageUrl());
-        user.setIsVerified(true); //TODO
         user.setId("" + profile.getId());
         user.setName(profile.getName());
         user.setProvider(TokenValidatorFactoryImpl.LoginProvider.TWITTER);
diff --git a/dmp-frontend/src/app/ui/auth/login/twitter-login/twitter-login.component.ts b/dmp-frontend/src/app/ui/auth/login/twitter-login/twitter-login.component.ts
index fdf7f7657..2fe80b094 100644
--- a/dmp-frontend/src/app/ui/auth/login/twitter-login/twitter-login.component.ts
+++ b/dmp-frontend/src/app/ui/auth/login/twitter-login/twitter-login.component.ts
@@ -9,6 +9,8 @@ import { BaseComponent } from '@common/base/base.component';
 import { environment } from 'environments/environment';
 import { takeUntil } from 'rxjs/operators';
 import { ConfigurationService } from '@app/core/services/configuration/configuration.service';
+import { FormControl } from '@angular/forms';
+import { stringify } from 'querystring';
 
 @Component({
 	selector: 'app-twitter-login',
@@ -17,6 +19,7 @@ import { ConfigurationService } from '@app/core/services/configuration/configura
 export class TwitterLoginComponent extends BaseComponent implements OnInit {
 
 	private returnUrl: string;
+	private emailFormControl = new FormControl('');
 
 	constructor(
 		private route: ActivatedRoute,
@@ -50,7 +53,10 @@ export class TwitterLoginComponent extends BaseComponent implements OnInit {
 	}
 
 	public twitterLogin(token: string, verifier: string) {
-		this.authService.login({ ticket: token, provider: AuthProvider.Twitter, data: verifier })
+		const data = {
+			email: this.emailFormControl.value, verifier: verifier
+		};
+		this.authService.login({ ticket: token, provider: AuthProvider.Twitter, data: data })
 			.pipe(takeUntil(this._destroyed))
 			.subscribe(
 				res => this.loginService.onLogInSuccess(res, this.returnUrl),

From 5b1c6971035102cdfd9470422da54515f94cad0d Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Fri, 3 Apr 2020 18:40:03 +0300
Subject: [PATCH 07/60] Add Zenodo Login and the ability to use it's access
 token for DOI creation

---
 .../main/java/eu/eudat/controllers/Login.java |  25 ++++--
 .../model/models/PrincipalBuilder.java        |  15 ++++
 .../managers/DataManagementPlanManager.java   |  15 ++--
 .../Zenodo/ZenodoCustomProvider.java          |   8 ++
 .../Zenodo/ZenodoCustomProviderImpl.java      |  72 +++++++++++++++
 .../customproviders/Zenodo/ZenodoUser.java    |  49 ++++++++++
 .../validators/TokenValidatorFactoryImpl.java |  14 ++-
 .../zenodo/ZenodoTokenValidator.java          |  57 ++++++++++++
 .../zenodo/helpers/ZenodoRequest.java         |  12 +++
 .../zenodo/helpers/ZenodoResponseToken.java   |  38 ++++++++
 .../AbstractAuthenticationService.java        |  13 ++-
 ...erifiedUserEmailAuthenticationService.java |  15 ++++
 .../VerifiedUserAuthenticationService.java    |  15 ++++
 .../data/loginprovider/LoginProviderUser.java |  18 ++++
 .../eudat/models/data/security/Principal.java |  19 ++++
 .../config/application-devel.properties       |   4 +
 .../src/app/core/common/enum/auth-provider.ts |   3 +-
 .../login-providers.model.ts                  |   6 ++
 .../core/model/zenodo/zenodo-token.model.ts   |   6 ++
 .../ui/auth/login/img/zenodo-white-200.png    | Bin 0 -> 2383 bytes
 .../app/ui/auth/login/login.component.html    |   6 ++
 .../app/ui/auth/login/login.component.scss    |  19 ++++
 .../src/app/ui/auth/login/login.component.ts  |   9 ++
 .../src/app/ui/auth/login/login.module.ts     |   4 +-
 .../src/app/ui/auth/login/login.routing.ts    |   4 +-
 .../zenodo-login/zenodo-login.component.html  |   0
 .../zenodo-login/zenodo-login.component.scss  |   0
 .../zenodo-login/zenodo-login.component.ts    |  85 ++++++++++++++++++
 dmp-frontend/src/assets/config/config.json    |   7 +-
 29 files changed, 518 insertions(+), 20 deletions(-)
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProvider.java
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProviderImpl.java
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoUser.java
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/ZenodoTokenValidator.java
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/helpers/ZenodoRequest.java
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/helpers/ZenodoResponseToken.java
 create mode 100644 dmp-frontend/src/app/core/model/zenodo/zenodo-token.model.ts
 create mode 100644 dmp-frontend/src/app/ui/auth/login/img/zenodo-white-200.png
 create mode 100644 dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.html
 create mode 100644 dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.scss
 create mode 100644 dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.ts

diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java
index 78304aa20..16af6f14f 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java
@@ -22,6 +22,9 @@ import eu.eudat.logic.security.validators.orcid.ORCIDTokenValidator;
 import eu.eudat.logic.security.validators.orcid.helpers.ORCIDRequest;
 import eu.eudat.logic.security.validators.orcid.helpers.ORCIDResponseToken;
 import eu.eudat.logic.security.validators.twitter.TwitterTokenValidator;
+import eu.eudat.logic.security.validators.zenodo.ZenodoTokenValidator;
+import eu.eudat.logic.security.validators.zenodo.helpers.ZenodoRequest;
+import eu.eudat.logic.security.validators.zenodo.helpers.ZenodoResponseToken;
 import eu.eudat.logic.services.operations.authentication.AuthenticationService;
 import eu.eudat.models.data.helpers.responses.ResponseItem;
 import eu.eudat.models.data.login.Credentials;
@@ -54,28 +57,34 @@ public class Login {
     private LinkedInTokenValidator linkedInTokenValidator;
     private OpenAIRETokenValidator openAIRETokenValidator;
     private ConfigurableProviderTokenValidator configurableProviderTokenValidator;
+    private ZenodoTokenValidator zenodoTokenValidator;
     private ConfigLoader configLoader;
 
 //    private Logger logger;
 
     private UserManager userManager;
+
     @Autowired
-    public Login(CustomAuthenticationProvider customAuthenticationProvider, AuthenticationService nonVerifiedUserAuthenticationService,
-                 TwitterTokenValidator twitterTokenValidator, LinkedInTokenValidator linkedInTokenValidator, B2AccessTokenValidator b2AccessTokenValidator,
-                 ORCIDTokenValidator orcidTokenValidator, OpenAIRETokenValidator openAIRETokenValidator, ConfigurableProviderTokenValidator configurableProviderTokenValidator, ConfigLoader configLoader, UserManager userManager/*, Logger logger*/) {
+    public Login(CustomAuthenticationProvider customAuthenticationProvider,
+                 AuthenticationService nonVerifiedUserAuthenticationService, TwitterTokenValidator twitterTokenValidator,
+                 B2AccessTokenValidator b2AccessTokenValidator, ORCIDTokenValidator orcidTokenValidator,
+                 LinkedInTokenValidator linkedInTokenValidator, OpenAIRETokenValidator openAIRETokenValidator,
+                 ConfigurableProviderTokenValidator configurableProviderTokenValidator, ZenodoTokenValidator zenodoTokenValidator,
+                 ConfigLoader configLoader, UserManager userManager) {
         this.customAuthenticationProvider = customAuthenticationProvider;
         this.nonVerifiedUserAuthenticationService = nonVerifiedUserAuthenticationService;
         this.twitterTokenValidator = twitterTokenValidator;
-        this.linkedInTokenValidator = linkedInTokenValidator;
         this.b2AccessTokenValidator = b2AccessTokenValidator;
         this.orcidTokenValidator = orcidTokenValidator;
+        this.linkedInTokenValidator = linkedInTokenValidator;
         this.openAIRETokenValidator = openAIRETokenValidator;
         this.configurableProviderTokenValidator = configurableProviderTokenValidator;
+        this.zenodoTokenValidator = zenodoTokenValidator;
         this.configLoader = configLoader;
-//        this.logger = logger;
         this.userManager = userManager;
     }
 
+
     @Transactional
     @RequestMapping(method = RequestMethod.POST, value = {"/externallogin"}, consumes = "application/json", produces = "application/json")
     public @ResponseBody
@@ -128,6 +137,12 @@ public class Login {
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<ConfigurableProviderResponseToken>().payload(this.configurableProviderTokenValidator.getAccessToken(configurableProviderRequest)).status(ApiMessageCode.NO_MESSAGE));
     }
 
+    @RequestMapping(method = RequestMethod.POST, value = {"/zenodoRequestToken"}, produces = "application/json", consumes = "application/json")
+    public @ResponseBody
+    ResponseEntity<ResponseItem<ZenodoResponseToken>> ZenodoRequestToken(@RequestBody ZenodoRequest zenodoRequest) {
+        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<ZenodoResponseToken>().payload(this.zenodoTokenValidator.getAccessToken(zenodoRequest)).status(ApiMessageCode.NO_MESSAGE));
+    }
+
     @RequestMapping(method = RequestMethod.POST, value = {"/me"}, consumes = "application/json", produces = "application/json")
     public @ResponseBody
     ResponseEntity<ResponseItem<Principal>> authMe(Principal principal) throws NullEmailException {
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/PrincipalBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/PrincipalBuilder.java
index 133d5e179..35ce34035 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/PrincipalBuilder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/PrincipalBuilder.java
@@ -4,6 +4,7 @@ import eu.eudat.logic.builders.Builder;
 import eu.eudat.models.data.security.Principal;
 import eu.eudat.types.Authorities;
 
+import java.time.Instant;
 import java.util.Date;
 import java.util.Set;
 import java.util.UUID;
@@ -22,6 +23,8 @@ public class PrincipalBuilder extends Builder<Principal> {
     private String culture;
     private String language;
     private String timezone;
+    private String zenodoToken;
+    private Instant zenodoDuration;
 
     public PrincipalBuilder id(UUID id) {
         this.id = id;
@@ -68,6 +71,16 @@ public class PrincipalBuilder extends Builder<Principal> {
         return this;
     }
 
+    public PrincipalBuilder zenodoToken(String zenodoToken) {
+        this.zenodoToken = zenodoToken;
+        return this;
+    }
+
+    public PrincipalBuilder zenodoDuration(Instant zenodoDuration) {
+        this.zenodoDuration = zenodoDuration;
+        return this;
+    }
+
     @Override
     public Principal build() {
         Principal principal = new Principal();
@@ -80,6 +93,8 @@ public class PrincipalBuilder extends Builder<Principal> {
         principal.setCulture(culture);
         principal.setLanguage(language);
         principal.setTimezone(timezone);
+        principal.setZenodoToken(zenodoToken);
+        principal.setZenodoDuration(zenodoDuration);
         return principal;
     }
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index af0f0d226..2eed39326 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -1538,6 +1538,7 @@ public class DataManagementPlanManager {
         if (dmp.getDoi() != null)
             throw new Exception("DMP already has a DOI");
 
+        String zenodoToken = principal.getZenodoToken() != null && !principal.getZenodoToken().isEmpty() ? principal.getZenodoToken() : this.environment.getProperty("zenodo.access_token");
         // First step, post call to Zenodo, to create the entry.
         RestTemplate restTemplate = new RestTemplate();
         HttpHeaders headers = new HttpHeaders();
@@ -1562,34 +1563,34 @@ public class DataManagementPlanManager {
         String previousDOI = this.getPreviousDOI(dmp.getGroupId(), dmp.getId());
         try {
         if (previousDOI == null) {
-            String createUrl = this.environment.getProperty("zenodo.url") + "deposit/depositions" + "?access_token=" + this.environment.getProperty("zenodo.access_token");
+            String createUrl = this.environment.getProperty("zenodo.url") + "deposit/depositions" + "?access_token=" + zenodoToken;
             createResponse = restTemplate.postForEntity(createUrl, request, Map.class).getBody();
             links = (LinkedHashMap<String, String>) createResponse.get("links");
         } else {
             //It requires more than one step to create a new version
             //First, get the deposit related to the concept DOI
-                String listUrl = this.environment.getProperty("zenodo.url") + "deposit/depositions" + "?q=conceptdoi:\"" + previousDOI + "\"&access_token=" + this.environment.getProperty("zenodo.access_token");
+                String listUrl = this.environment.getProperty("zenodo.url") + "deposit/depositions" + "?q=conceptdoi:\"" + previousDOI + "\"&access_token=" + zenodoToken;
                 ResponseEntity<Map[]> listResponses = restTemplate.getForEntity(listUrl, Map[].class);
                 createResponse = listResponses.getBody()[0];
                 links = (LinkedHashMap<String, String>) createResponse.get("links");
                 //Second, make the new version (not in the links?)
-                String newVersionUrl = links.get("self") + "/actions/newversion" + "?access_token=" + this.environment.getProperty("zenodo.access_token");
+                String newVersionUrl = links.get("self") + "/actions/newversion" + "?access_token=" + zenodoToken;
                 createResponse = restTemplate.postForObject(newVersionUrl, null, Map.class);
                 links = (LinkedHashMap<String, String>) createResponse.get("links");
                 //Third, get the new deposit
-                String latestDraftUrl = links.get("latest_draft") + "?access_token=" + this.environment.getProperty("zenodo.access_token");
+                String latestDraftUrl = links.get("latest_draft") + "?access_token=" + zenodoToken;
                 createResponse = restTemplate.getForObject(latestDraftUrl, Map.class);
                 links = (LinkedHashMap<String, String>) createResponse.get("links");
                 //At this point it might fail to perform the next requests so enclose them with try catch
                 try {
                     //Forth, update the new deposit's metadata
-                    String updateUrl = links.get("self") + "?access_token=" + this.environment.getProperty("zenodo.access_token");
+                    String updateUrl = links.get("self") + "?access_token=" + zenodoToken;
                     restTemplate.put(updateUrl, request);
                     //And finally remove pre-existing files from it
-                    String fileListUrl = links.get("self") + "/files" + "?access_token=" + this.environment.getProperty("zenodo.access_token");
+                    String fileListUrl = links.get("self") + "/files" + "?access_token=" + zenodoToken;
                     ResponseEntity<Map[]> fileListResponse = restTemplate.getForEntity(fileListUrl, Map[].class);
                     for (Map file : fileListResponse.getBody()) {
-                        String fileDeleteUrl = links.get("self") + "/files/" + file.get("id") + "?access_token=" + this.environment.getProperty("zenodo.access_token");
+                        String fileDeleteUrl = links.get("self") + "/files/" + file.get("id") + "?access_token=" + zenodoToken;
                         restTemplate.delete(fileDeleteUrl);
                     }
                 }catch (Exception e) {
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProvider.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProvider.java
new file mode 100644
index 000000000..b14c3a963
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProvider.java
@@ -0,0 +1,8 @@
+package eu.eudat.logic.security.customproviders.Zenodo;
+
+import eu.eudat.logic.security.validators.orcid.helpers.ORCIDResponseToken;
+import eu.eudat.logic.security.validators.zenodo.helpers.ZenodoResponseToken;
+
+public interface ZenodoCustomProvider {
+    ZenodoResponseToken getAccessToken(String code, String clientId, String clientSecret, String redirectUri);
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProviderImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProviderImpl.java
new file mode 100644
index 000000000..b527af2fe
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProviderImpl.java
@@ -0,0 +1,72 @@
+package eu.eudat.logic.security.customproviders.Zenodo;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import eu.eudat.logic.security.validators.orcid.helpers.ORCIDResponseToken;
+import eu.eudat.logic.security.validators.zenodo.helpers.ZenodoResponseToken;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.RestTemplate;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Map;
+
+@Component("ZenodoCustomProvider")
+public class ZenodoCustomProviderImpl implements ZenodoCustomProvider {
+    private static final Logger logger = LoggerFactory.getLogger(ZenodoCustomProviderImpl.class);
+
+    private Environment environment;
+
+    @Autowired
+    public ZenodoCustomProviderImpl(Environment environment) {
+        this.environment = environment;
+    }
+
+    @Override
+    public ZenodoResponseToken getAccessToken(String code, String clientId, String clientSecret, String redirectUri) {
+        RestTemplate restTemplate = new RestTemplate();
+        HttpHeaders headers = new HttpHeaders();
+        headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
+        headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+
+        MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
+        map.add("client_id", clientId);
+        map.add("client_secret", clientSecret);
+        map.add("grant_type", "authorization_code");
+        map.add("code", code);
+        map.add("redirect_uri", redirectUri);
+        HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<>(map, headers);
+
+        try {
+            Map<String, Object> values = restTemplate.postForObject(this.environment.getProperty("zenodo.login.access_token_url"), request, Map.class);
+            ZenodoResponseToken zenodoResponseToken = new ZenodoResponseToken();
+            Map<String, Object> user = (Map<String, Object>) values.get("user");
+            zenodoResponseToken.setUserId((String) user.get("id"));
+            zenodoResponseToken.setEmail((String) user.get("email"));
+            zenodoResponseToken.setExpiresIn((Integer) values.get("expires_in"));
+            zenodoResponseToken.setAccessToken((String) values.get("access_token"));
+
+            return zenodoResponseToken;
+        } catch (HttpClientErrorException ex) {
+            logger.error(ex.getResponseBodyAsString(), ex);
+        }
+
+        return null;
+    }
+
+    private HttpHeaders createBearerAuthHeaders(String accessToken) {
+        return new HttpHeaders() {{
+            String authHeader = "Bearer " + accessToken;
+            set("Authorization", authHeader);
+        }};
+    }
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoUser.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoUser.java
new file mode 100644
index 000000000..cbcb95928
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoUser.java
@@ -0,0 +1,49 @@
+package eu.eudat.logic.security.customproviders.Zenodo;
+
+import java.util.Map;
+
+public class ZenodoUser {
+    private String userId;
+    private String email;
+    private String accessToken;
+    private Integer expiresIn;
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getAccessToken() {
+        return accessToken;
+    }
+
+    public void setAccessToken(String accessToken) {
+        this.accessToken = accessToken;
+    }
+
+    public Integer getExpiresIn() {
+        return expiresIn;
+    }
+
+    public void setExpiresIn(Integer expiresIn) {
+        this.expiresIn = expiresIn;
+    }
+
+    public ZenodoUser getZenodoUser(Object data) {
+        this.userId = (String) ((Map) data).get("userId");
+        this.email = (String) ((Map) data).get("email");
+        this.accessToken = (String) ((Map) data).get("accessToken");
+        this.expiresIn = (Integer) ((Map) data).get("expiresIn");
+        return this;
+    }
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/TokenValidatorFactoryImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/TokenValidatorFactoryImpl.java
index 9b594c96e..c079d24a5 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/TokenValidatorFactoryImpl.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/TokenValidatorFactoryImpl.java
@@ -6,6 +6,7 @@ import eu.eudat.logic.security.customproviders.ConfigurableProvider.Configurable
 import eu.eudat.logic.security.customproviders.LinkedIn.LinkedInCustomProvider;
 import eu.eudat.logic.security.customproviders.ORCID.ORCIDCustomProvider;
 import eu.eudat.logic.security.customproviders.OpenAIRE.OpenAIRECustomProvider;
+import eu.eudat.logic.security.customproviders.Zenodo.ZenodoCustomProvider;
 import eu.eudat.logic.security.validators.b2access.B2AccessTokenValidator;
 import eu.eudat.logic.security.validators.configurableProvider.ConfigurableProviderTokenValidator;
 import eu.eudat.logic.security.validators.facebook.FacebookTokenValidator;
@@ -14,6 +15,7 @@ import eu.eudat.logic.security.validators.linkedin.LinkedInTokenValidator;
 import eu.eudat.logic.security.validators.openaire.OpenAIRETokenValidator;
 import eu.eudat.logic.security.validators.orcid.ORCIDTokenValidator;
 import eu.eudat.logic.security.validators.twitter.TwitterTokenValidator;
+import eu.eudat.logic.security.validators.zenodo.ZenodoTokenValidator;
 import eu.eudat.logic.services.operations.authentication.AuthenticationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
@@ -23,7 +25,7 @@ import org.springframework.stereotype.Service;
 @Service("tokenValidatorFactory")
 public class TokenValidatorFactoryImpl implements TokenValidatorFactory {
     public enum LoginProvider {
-        GOOGLE(1), FACEBOOK(2), TWITTER(3), LINKEDIN(4), NATIVELOGIN(5), B2_ACCESS(6), ORCID(7), OPENAIRE(8), CONFIGURABLE(9);
+        GOOGLE(1), FACEBOOK(2), TWITTER(3), LINKEDIN(4), NATIVELOGIN(5), B2_ACCESS(6), ORCID(7), OPENAIRE(8), CONFIGURABLE(9), ZENODO(10);
 
         private int value;
 
@@ -55,6 +57,8 @@ public class TokenValidatorFactoryImpl implements TokenValidatorFactory {
                     return OPENAIRE;
                 case 9:
                     return CONFIGURABLE;
+                case 10:
+                    return ZENODO;
                 default:
                     throw new RuntimeException("Unsupported LoginProvider");
             }
@@ -69,12 +73,15 @@ public class TokenValidatorFactoryImpl implements TokenValidatorFactory {
     private OpenAIRECustomProvider openAIRECustomProvider;
     private ConfigurableProviderCustomProvider configurableProviderCustomProvider;
     private ConfigLoader configLoader;
+    private ZenodoCustomProvider zenodoCustomProvider;
 
     @Autowired
     public TokenValidatorFactoryImpl(
             Environment environment,
             AuthenticationService nonVerifiedUserAuthenticationService, B2AccessCustomProvider b2AccessCustomProvider,
-            ORCIDCustomProvider orcidCustomProvider, LinkedInCustomProvider linkedInCustomProvider, OpenAIRECustomProvider openAIRECustomProvider, ConfigurableProviderCustomProvider configurableProviderCustomProvider, ConfigLoader configLoader) {
+            ORCIDCustomProvider orcidCustomProvider, LinkedInCustomProvider linkedInCustomProvider, OpenAIRECustomProvider openAIRECustomProvider,
+            ConfigurableProviderCustomProvider configurableProviderCustomProvider, ConfigLoader configLoader,
+            ZenodoCustomProvider zenodoCustomProvider) {
         this.environment = environment;
         this.nonVerifiedUserAuthenticationService = nonVerifiedUserAuthenticationService;
         this.b2AccessCustomProvider = b2AccessCustomProvider;
@@ -83,6 +90,7 @@ public class TokenValidatorFactoryImpl implements TokenValidatorFactory {
         this.openAIRECustomProvider = openAIRECustomProvider;
         this.configurableProviderCustomProvider = configurableProviderCustomProvider;
         this.configLoader = configLoader;
+        this.zenodoCustomProvider = zenodoCustomProvider;
     }
 
     public TokenValidator getProvider(LoginProvider provider) {
@@ -103,6 +111,8 @@ public class TokenValidatorFactoryImpl implements TokenValidatorFactory {
                 return new OpenAIRETokenValidator(this.environment, this.nonVerifiedUserAuthenticationService, this.openAIRECustomProvider);
             case CONFIGURABLE:
                 return new ConfigurableProviderTokenValidator(this.configurableProviderCustomProvider, this.nonVerifiedUserAuthenticationService, this.configLoader);
+            case ZENODO:
+                return new ZenodoTokenValidator(this.environment, this.nonVerifiedUserAuthenticationService, this.zenodoCustomProvider);
             default:
                 throw new RuntimeException("Login Provider Not Implemented");
         }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/ZenodoTokenValidator.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/ZenodoTokenValidator.java
new file mode 100644
index 000000000..2708a96b2
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/ZenodoTokenValidator.java
@@ -0,0 +1,57 @@
+package eu.eudat.logic.security.validators.zenodo;
+
+import eu.eudat.exceptions.security.NonValidTokenException;
+import eu.eudat.exceptions.security.NullEmailException;
+import eu.eudat.logic.security.customproviders.ORCID.ORCIDCustomProvider;
+import eu.eudat.logic.security.customproviders.ORCID.ORCIDUser;
+import eu.eudat.logic.security.customproviders.Zenodo.ZenodoCustomProvider;
+import eu.eudat.logic.security.customproviders.Zenodo.ZenodoUser;
+import eu.eudat.logic.security.validators.TokenValidator;
+import eu.eudat.logic.security.validators.zenodo.helpers.ZenodoRequest;
+import eu.eudat.logic.security.validators.zenodo.helpers.ZenodoResponseToken;
+import eu.eudat.logic.services.operations.authentication.AuthenticationService;
+import eu.eudat.models.data.login.LoginInfo;
+import eu.eudat.models.data.loginprovider.LoginProviderUser;
+import eu.eudat.models.data.security.Principal;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+
+@Component("zenodoTokenValidator")
+public class ZenodoTokenValidator implements TokenValidator {
+
+	private ZenodoCustomProvider zenodoCustomProvider;
+	private Environment environment;
+	private AuthenticationService nonVerifiedUserAuthenticationService;
+
+	@Autowired
+	public ZenodoTokenValidator(Environment environment, AuthenticationService nonVerifiedUserAuthenticationService, ZenodoCustomProvider zenodoCustomProvider) {
+		this.environment = environment;
+		this.nonVerifiedUserAuthenticationService = nonVerifiedUserAuthenticationService;
+		this.zenodoCustomProvider = zenodoCustomProvider;
+	}
+
+	@Override
+	public Principal validateToken(LoginInfo credentials) throws NonValidTokenException, IOException, GeneralSecurityException, NullEmailException {
+		ZenodoUser zenodoUser = new ZenodoUser().getZenodoUser(credentials.getData());
+		LoginProviderUser user = new LoginProviderUser();
+		user.setId(zenodoUser.getUserId());
+		user.setName(zenodoUser.getEmail());
+		user.setEmail(zenodoUser.getEmail());
+		user.setZenodoId(zenodoUser.getAccessToken());
+		user.setZenodoExpire(zenodoUser.getExpiresIn());
+		user.setProvider(credentials.getProvider());
+		user.setSecret(credentials.getTicket());
+		return this.nonVerifiedUserAuthenticationService.Touch(user);
+	}
+
+	public ZenodoResponseToken getAccessToken(ZenodoRequest zenodoRequest) {
+		return this.zenodoCustomProvider.getAccessToken(zenodoRequest.getCode()
+				, this.environment.getProperty("zenodo.login.client_id")
+				, this.environment.getProperty("zenodo.login.client_secret")
+				, this.environment.getProperty("zenodo.login.redirect_uri"));
+	}
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/helpers/ZenodoRequest.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/helpers/ZenodoRequest.java
new file mode 100644
index 000000000..c1f4ea32a
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/helpers/ZenodoRequest.java
@@ -0,0 +1,12 @@
+package eu.eudat.logic.security.validators.zenodo.helpers;
+
+public class ZenodoRequest {
+    private String code;
+
+    public String getCode() {
+        return code;
+    }
+    public void setCode(String code) {
+        this.code = code;
+    }
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/helpers/ZenodoResponseToken.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/helpers/ZenodoResponseToken.java
new file mode 100644
index 000000000..5b437cdfb
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/helpers/ZenodoResponseToken.java
@@ -0,0 +1,38 @@
+package eu.eudat.logic.security.validators.zenodo.helpers;
+
+public class ZenodoResponseToken {
+    private String userId;
+    private String email;
+    private Integer expiresIn;
+    private String accessToken;
+
+    public String getUserId() {
+        return userId;
+    }
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public Integer getExpiresIn() {
+        return expiresIn;
+    }
+
+    public void setExpiresIn(Integer expiresIn) {
+        this.expiresIn = expiresIn;
+    }
+
+    public String getAccessToken() {
+        return accessToken;
+    }
+    public void setAccessToken(String accessToken) {
+        this.accessToken = accessToken;
+    }
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java
index cb7506ab6..fc09056fa 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java
@@ -20,6 +20,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.core.env.Environment;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.Instant;
 import java.util.*;
 
 public abstract class AbstractAuthenticationService implements AuthenticationService {
@@ -132,7 +133,7 @@ public abstract class AbstractAuthenticationService implements AuthenticationSer
 			userInfo = this.apiContext.getOperationsContext().getBuilderFactory().getBuilder(UserInfoBuilder.class)
 					.name(profile.getName()).verified_email(profile.getIsVerified())
 					.email(profile.getEmail()).created(new Date()).lastloggedin(new Date())
-					.additionalinfo("{\"data\":{\"avatar\":{\"url\":\"" + profile.getAvatarUrl() + "\"}}}")
+					.additionalinfo("{\"data\":{\"avatar\":{\"url\":\"" + profile.getAvatarUrl() + "\"}},{\"zenodoToken\":\"" + profile.getZenodoId() + "\", \"expirationDate\": \"" + Instant.now().plusSeconds(profile.getZenodoExpire()).toEpochMilli() + "\"}")
 					.authorization_level((short) 1).usertype((short) 1)
 					.build();
 
@@ -149,7 +150,15 @@ public abstract class AbstractAuthenticationService implements AuthenticationSer
 		} else {
 			Map<String, Object> additionalInfo = userInfo.getAdditionalinfo() != null ?
 					new JSONObject(userInfo.getAdditionalinfo()).toMap() : new HashMap<>();
-			additionalInfo.put("avatarUrl", profile.getAvatarUrl());
+			if (profile.getAvatarUrl() != null && !profile.getAvatarUrl().isEmpty() && !profile.getAvatarUrl().equals("null")) {
+				additionalInfo.put("avatarUrl", profile.getAvatarUrl());
+			}
+			if (profile.getZenodoId() != null && !profile.getZenodoId().isEmpty() && !profile.getZenodoId().equals("null")) {
+				additionalInfo.put("zenodoToken", profile.getZenodoId());
+			}
+			if (profile.getZenodoExpire() != null) {
+				additionalInfo.put("expirationDate", Instant.now().plusSeconds(profile.getZenodoExpire()).toEpochMilli());
+			}
 			userInfo.setLastloggedin(new Date());
 			userInfo.setAdditionalinfo(new JSONObject(additionalInfo).toString());
 			Set<Credential> credentials = userInfo.getCredentials();
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/NonVerifiedUserEmailAuthenticationService.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/NonVerifiedUserEmailAuthenticationService.java
index 62c5f60ae..159bbb235 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/NonVerifiedUserEmailAuthenticationService.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/NonVerifiedUserEmailAuthenticationService.java
@@ -11,6 +11,7 @@ import eu.eudat.types.Authorities;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 
+import java.time.Instant;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
@@ -33,6 +34,18 @@ public class NonVerifiedUserEmailAuthenticationService extends AbstractAuthentic
 		} catch (Exception e) {
 			avatarUrl = "";
 		}
+		String zenodoToken;
+		try {
+			zenodoToken = user.getAdditionalinfo() != null ? new ObjectMapper().readTree(user.getAdditionalinfo()).get("zenodoToken").asText() : "";
+		} catch (Exception e) {
+			zenodoToken = "";
+		}
+		Instant zenodoDuration;
+		try {
+			zenodoDuration = user.getAdditionalinfo() != null ? Instant.ofEpochMilli(new ObjectMapper().readTree(user.getAdditionalinfo()).get("expirationDate").asLong()) : Instant.now();
+		} catch (Exception e) {
+			zenodoDuration = Instant.now();
+		}
 		String culture;
 		try {
 			culture = user.getAdditionalinfo() != null ? new ObjectMapper().readTree(user.getAdditionalinfo()).get("culture").get("name").asText() : "";
@@ -58,6 +71,8 @@ public class NonVerifiedUserEmailAuthenticationService extends AbstractAuthentic
 				.culture(culture)
 				.language(language)
 				.timezone(timezone)
+				.zenodoToken(zenodoToken)
+				.zenodoDuration(zenodoDuration)
 				.build();
 
 		List<UserRole> userRoles = apiContext.getOperationsContext().getDatabaseRepository().getUserRoleDao().getUserRoles(user);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/VerifiedUserAuthenticationService.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/VerifiedUserAuthenticationService.java
index acbb3dc86..c03e81934 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/VerifiedUserAuthenticationService.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/VerifiedUserAuthenticationService.java
@@ -20,6 +20,7 @@ import org.json.JSONObject;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 
+import java.time.Instant;
 import java.util.*;
 
 
@@ -42,6 +43,18 @@ public class VerifiedUserAuthenticationService extends AbstractAuthenticationSer
 		} catch (Exception e) {
 			avatarUrl = "";
 		}
+		String zenodoToken;
+		try {
+			zenodoToken = user.getAdditionalinfo() != null ? new ObjectMapper().readTree(user.getAdditionalinfo()).get("zenodoToken").asText() : "";
+		} catch (Exception e) {
+			zenodoToken = "";
+		}
+		Instant zenodoDuration;
+		try {
+			zenodoDuration = user.getAdditionalinfo() != null ? Instant.ofEpochMilli(new ObjectMapper().readTree(user.getAdditionalinfo()).get("expirationDate").asLong()) : Instant.now();
+		} catch (Exception e) {
+			zenodoDuration = Instant.now();
+		}
 		String culture;
 		try {
 			culture = user.getAdditionalinfo() != null ? new ObjectMapper().readTree(user.getAdditionalinfo()).get("culture").get("name").asText() : "";
@@ -67,6 +80,8 @@ public class VerifiedUserAuthenticationService extends AbstractAuthenticationSer
 				.culture(culture)
 				.language(language)
 				.timezone(timezone)
+				.zenodoToken(zenodoToken)
+				.zenodoDuration(zenodoDuration)
 				.build();
 
 		List<UserRole> userRoles = apiContext.getOperationsContext().getDatabaseRepository().getUserRoleDao().getUserRoles(user);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/loginprovider/LoginProviderUser.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/loginprovider/LoginProviderUser.java
index e1b0a6d41..13f5b9371 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/loginprovider/LoginProviderUser.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/loginprovider/LoginProviderUser.java
@@ -11,6 +11,8 @@ public class LoginProviderUser {
     private String avatarUrl;
     private boolean isVerified;
     private TokenValidatorFactoryImpl.LoginProvider provider;
+    private String zenodoId;
+    private Integer zenodoExpire;
 
     public String getId() {
         return id;
@@ -67,4 +69,20 @@ public class LoginProviderUser {
     public void setAvatarUrl(String avatarUrl) {
         this.avatarUrl = avatarUrl;
     }
+
+    public String getZenodoId() {
+        return zenodoId;
+    }
+
+    public void setZenodoId(String zenodoId) {
+        this.zenodoId = zenodoId;
+    }
+
+    public Integer getZenodoExpire() {
+        return zenodoExpire;
+    }
+
+    public void setZenodoExpire(Integer zenodoExpire) {
+        this.zenodoExpire = zenodoExpire;
+    }
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/security/Principal.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/security/Principal.java
index 5399b5466..f0e017e84 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/security/Principal.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/security/Principal.java
@@ -3,6 +3,7 @@ package eu.eudat.models.data.security;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import eu.eudat.types.Authorities;
 
+import java.time.Instant;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -17,6 +18,8 @@ public class Principal {
     private String culture;
     private String language;
     private String timezone;
+    private String zenodoToken;
+    private Instant zenodoDuration;
 
     public UUID getId() {
         return id;
@@ -86,6 +89,22 @@ public class Principal {
         this.timezone = timezone;
     }
 
+    public String getZenodoToken() {
+        return zenodoToken;
+    }
+
+    public void setZenodoToken(String zenodoToken) {
+        this.zenodoToken = zenodoToken;
+    }
+
+    public Instant getZenodoDuration() {
+        return zenodoDuration;
+    }
+
+    public void setZenodoDuration(Instant zenodoDuration) {
+        this.zenodoDuration = zenodoDuration;
+    }
+
     @JsonIgnore
     public Set<Authorities> getAuthz() {
         return this.authorities;
diff --git a/dmp-backend/web/src/main/resources/config/application-devel.properties b/dmp-backend/web/src/main/resources/config/application-devel.properties
index 59d292b11..7051f6667 100644
--- a/dmp-backend/web/src/main/resources/config/application-devel.properties
+++ b/dmp-backend/web/src/main/resources/config/application-devel.properties
@@ -69,6 +69,10 @@ conf_email.subject=OpenDMP email confirmation
 #############ZENODO CONFIGURATIONS#########
 zenodo.url=https://sandbox.zenodo.org/api/
 zenodo.access_token=
+zenodo.login.access_token_url=https://sandbox.zenodo.org/oauth/token
+zenodo.login.client_id=
+zenodo.login.client_secret=
+zenodo.login.redirect_uri=http://localhost:4200/login/external/zenodo
 
 #############CONTACT EMAIL CONFIGURATIONS#########
 contact_email.mail=
diff --git a/dmp-frontend/src/app/core/common/enum/auth-provider.ts b/dmp-frontend/src/app/core/common/enum/auth-provider.ts
index b8b70efd8..11c36b2a9 100644
--- a/dmp-frontend/src/app/core/common/enum/auth-provider.ts
+++ b/dmp-frontend/src/app/core/common/enum/auth-provider.ts
@@ -7,5 +7,6 @@ export enum AuthProvider {
 	B2Access = 6,
 	ORCID = 7,
 	OpenAire = 8,
-	Configurable = 9
+	Configurable = 9,
+	Zenodo = 10
 }
diff --git a/dmp-frontend/src/app/core/model/configuration-models/login-providers.model.ts b/dmp-frontend/src/app/core/model/configuration-models/login-providers.model.ts
index 8c7751e2c..15474bdce 100644
--- a/dmp-frontend/src/app/core/model/configuration-models/login-providers.model.ts
+++ b/dmp-frontend/src/app/core/model/configuration-models/login-providers.model.ts
@@ -42,6 +42,11 @@ export class LoginProviders {
 		return this._openAireConfiguration;
 	}
 
+	private _zenodoConfiguration: LoginConfiguration;
+	get zenodoConfiguration(): LoginConfiguration {
+		return this._zenodoConfiguration;
+	}
+
 	public static parseValue(value: any): LoginProviders {
 		const obj: LoginProviders = new LoginProviders();
 		obj._enabled = value.enabled;
@@ -52,6 +57,7 @@ export class LoginProviders {
 		obj._b2accessConfiguration = value.b2accessConfiguration;
 		obj._orcidConfiguration = value.orcidConfiguration;
 		obj._openAireConfiguration = value.openAireConfiguration;
+		obj._zenodoConfiguration = value.zenodoConfiguration;
 		return obj;
 	}
 }
diff --git a/dmp-frontend/src/app/core/model/zenodo/zenodo-token.model.ts b/dmp-frontend/src/app/core/model/zenodo/zenodo-token.model.ts
new file mode 100644
index 000000000..0ddb251d6
--- /dev/null
+++ b/dmp-frontend/src/app/core/model/zenodo/zenodo-token.model.ts
@@ -0,0 +1,6 @@
+export class ZenodoToken {
+	userId: string;
+	expiresIn: number;
+	accessToken:string;
+	email: string;
+}
diff --git a/dmp-frontend/src/app/ui/auth/login/img/zenodo-white-200.png b/dmp-frontend/src/app/ui/auth/login/img/zenodo-white-200.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fb49be6e056112979c675e44fe46bd7e908390d
GIT binary patch
literal 2383
zcmb7`c{tRI8pnq$!$CF2zBgjx$S%7qBW6fuqB@kNED2d_j3sNvB};>d;>_uXW-Nm#
zTTH1OoGCP7Dl{hhG6rW#V@$4l?tSk4`~LAR&-1>|`+c7GpYP`%UY@SflFE`G5J(!~
z21oDL!Ts<8i|yx&QPwT{MJd7MLc-bT&;(3STnNZ9IQnvkCL$^*ECd}A6pW1>3b6%&
zz?%rTqj%z`wTBXSWL;!)A~2T>93328`sK)FAUs&i1@%r7C$5fysvm>GrSs0e0HbE_
z=8Ch7P_iR8d^UuQ)AOL2LU5E(;*3P6yH|#f)pSUTq2NwQJLwsz9yVdLSH7FUZvIi<
zT_3=B=VPvY-{X`Jh+Fyv0!jx7frNxX!Xh9MFbI4IbVw7V=>T#_|9kMi?(dbvVHU6n
zROK%N+b_3e^t;LvB*JZ$UFi}1F?8(;BT@a%GH&2iKXD0J?^cI*@p++s$xj?X;18sa
z-xP#J($l9aqm=elTx9;Mh8`GDxGe|h=zfpU+Ok1sg$76v@$U;0(sz3^yxn*7a3hf(
z)_Dnsh)t47Ngv|vmT{^nenU6HVbrMxF6C;f43%FZBhPmK<Uu;pq!sms<@o0!)Bi`5
z=g#RA2L6PcclJiUQ<0fgiNPx3VcTvMejPggTJ=@9uhksifi6prK1>ZLxqh_F^7}bF
z$!!vva=zFgwrAK55q(!#s=6oj1hE{bd5joyo=vt7kA?eV@cvqAiyu?NN)45CwF(C3
zaPwPAjMq~yf_@w=XdUEd0ZHP_n&a1(;^_H>i(UBllhEQYo1M7y;rEdzjcFavE`}*s
zdVM>U{()$<TxKf@E(cTMEN`_R8Mz42r}bgl`Z}Dp9+b9<G0!4w&^^s|{o5<5wkPn`
zJF1%Y1^vnnNwl%bV~eY6qwQpb>*A74nHhAIa{}NXj>mC(Z*$!ynA2{wvpwoxfjBuS
z|3=Tg2K4ZxO^Qn6VAdBgL{@7bt1~K&@XSi}ullL)Cx@6g{BT~U73^^uE@|Y*S5u&&
zOrTQxbG8cmfYz3AHuu5qo*(^iPQny+Bf~7Q>aO+O9r$;3Lr0XsK*jLtSvrI+Pqzn#
zfw9ZY(~5Ms+?_RZ;~MVmgkw*1zCxnaR?Em&o=MiW1{1E~eiwK;YxQU^7v|1Z78e??
zO(K<b*~FG;aXJ7F@HCxj;lSvDudFaSb{eRsX67yTwE?01H@I=&bLBSnb*|osWW^Li
zXp@QR_MuOjyfL;+pYe;AWHNyzP+z|C_M0^wB~Nvh!X{-r@uUcB&=Ef|#igjKYfmfL
z`TFFDGQxCVQm#ka#+)xLEN6DxF&!YQ@1J<thiS=*#)vZ|WT<j7)W43~S(JQ>+Yp!}
z?2@+}z?9KG%KanJj3W+opR>G|kr&Eeq!Dj(^j$~dmYoW(Jb1)m-D9xyT$#=HsLj17
zi*Vb{V5_0}<i=54r3Z{%|FOBMVZ%!}t?J5pJa?|=blVy$E+aWZ{sLFAm$k&lE;V%*
zmH~!psWlUkvxT^yjpct)J9Vww|9+U$r3ZU0$NIwF1Er@J@v@9p-;#xySoxY~Rv8>u
zWBwv+V+v|_i$yrobXc=%Y-~ez0XFADf2tIkoH^3Ed~MkEB+ql;`g+=9T5KA9w!L;~
zQc(!6vRisT>H~(ln+&i7aC>C&QAUgYy1?6s+1Xb=FG0p)t5a?;f;yrt{0N&Qg5oW`
zUt(6w`Gz`8t({gB_aXz)n^8#FV=JJp!i45fz9fCzc)WUG<3^TUSKbY&Wt4MjswNfb
zwI*aT&>}#}d29&%cJ)9ufBoQCWLhQ{LL&ZF@q8*MM^E-lklOmpD-NiW(~J6(H<>pH
z7TQXS%`Jsk?^q{oy7&90%m<z!T|S<B71J1NOTH({?G5&BQz-sw%vXUd)Y}gT40xL>
z)!Z%-*0yr@kh5*q(nk>m`|$A<Gr2cA5%S%Kk@GqWsn3Cwbwogq`EW_}l%8pbL~2!?
zVx)_lrUEf=(5*tFmYeI`A?t~elOn}ugeg%qN*3B}McjVs!rru2XK01)wL;+G{BOvZ
z!nc5=nt|17O84Q^#><<ht)^SZMIqzP9qr?6i7k`Q(9`zktQIZ4oVQe`SS)8&m^DGB
z-q=RgLv^H!3gRD{BzM=%vBYQeMBL2k?h+WJz~Odjcc}obs0?rEaVBqbPvKxg;5&1_
z^^QiT>D7v&@O#TTmOCr{J8|WLN$?@lv!%CwJ5uyKPD$@&yrR5PN@0s-wL(F~tmD`1
z)3hfF`0GZtkv~Sg%Oe;6xN~ktV+1>1j9WdPT2or-q*#4`LL;w3(n6!ZTD<Z0D;*_Y
zlt+Up`3e57V+C%{6}Q^_DC|)Ytje4b`zG<t${2403V9?wz%DkUK;^R|qBo*kE0tUE
zkMO*$I_z>3^jx0Ve3-#RzlmuDx08Tubx@vej&O;+QWRiR*^R-9eO?8MY8ed;k~uVt
z2~b1K42ey`wZ{umny!2nBkmP~W|VGT0!$qToODstyO8zZAr3W%>)cOqa@o5#<3XHg
zEW7!dsHe!g2zfUepxv8XCnL2kl6ap>keskxV4AKOn)GQs=}0`!+CGZrjC_9!!;geu
z^&S5hY;z9xQrqdFp|{kOwt8XO%nWLC@{GI6>qV?oL+yaeP>E3i1{9J5i@!7xrd{ic
zoQot$Mae28wssB?qGn6^4|a{p-E|kVYt^T-d65q`6=EVXXA>*jI~u9jOQ~i<-k<Lf
ze18W%(NSF^1af&b)m@s;Td;Q~T{YN6TI0CsL3<a7Cf&n?JrB`_ljn46HXmEsz|M?6
zk_Othl<G^WOLCHAO@np!V$^ZB>8ITjo5hQ%2eCfa=+fG~DkTi%UoD%n=EKU7uWp6h
z;asCnquG?r>6!$M@B)|mSC5^3_5HKsDfZc5ej~b!e;KTe)_d!<cWEdq?L#fu4C&|Q
zt6oNnA7%RV9pu1$BrI!oXU%_(AJnjDb|ucdJz??TJRF#Zu_g4rw`$xv@YWE<!(B}j
zVs`;*5`V?iNlwt_T_{z#BRb*PBQ(~Om|K{*;m~_G<gfnLxeQ7FMoBPp-?{fK{Xcl{
mZ*KU12;yImA=<|jmI8gbc0Hf;5u~<HNFaoZC%oAyF!P^sUU|p>

literal 0
HcmV?d00001

diff --git a/dmp-frontend/src/app/ui/auth/login/login.component.html b/dmp-frontend/src/app/ui/auth/login/login.component.html
index d8be9c88b..dd1c8fc9e 100644
--- a/dmp-frontend/src/app/ui/auth/login/login.component.html
+++ b/dmp-frontend/src/app/ui/auth/login/login.component.html
@@ -54,6 +54,12 @@
 					</button>
 				</div>
 			</div>
+			<div *ngIf="hasZenodoOauth()" class="col-auto zenodo-logo">
+				<button class="zenodo-button" mat-icon-button (click)="zenodoLogin()" class="login-social-button">
+					<span class="zenodoIcon"></span>
+					<!-- <span></span> -->
+				</button>
+			</div>
 		</div>
 		<div class="card-footer">
 			<h4 class="text-uppercase">
diff --git a/dmp-frontend/src/app/ui/auth/login/login.component.scss b/dmp-frontend/src/app/ui/auth/login/login.component.scss
index 6a4c37731..5d5f9402c 100644
--- a/dmp-frontend/src/app/ui/auth/login/login.component.scss
+++ b/dmp-frontend/src/app/ui/auth/login/login.component.scss
@@ -156,6 +156,12 @@
 	height: 90px;
 }
 
+.accesss-methods .zenodo-logo {
+	height: 75px;
+	padding-top: 8px;
+	margin-top: 13px;
+  }
+
 .tip {
   margin-top: -20px;
 }
@@ -231,6 +237,14 @@ span.configurableIcon {
 	height: 56px;
 }
 
+span.zenodoIcon {
+	background: url(img/zenodo-white-200.png) no-repeat 100px 56px;
+	background-position: center;
+	float: right;
+	width: 150px;
+	height: 56px;
+  }
+
 .b2access-button {
   margin-top: 10px;
   width: fit-content;
@@ -251,6 +265,11 @@ span.configurableIcon {
 	width: fit-content;
 }
 
+.zenodo-button {
+	margin-top: 10px;
+	width: fit-content;
+  }
+
 .login-logo {
   background: url(img/open-dmp.png) no-repeat;
   width: 273px;
diff --git a/dmp-frontend/src/app/ui/auth/login/login.component.ts b/dmp-frontend/src/app/ui/auth/login/login.component.ts
index f71c64bf9..e475fd881 100644
--- a/dmp-frontend/src/app/ui/auth/login/login.component.ts
+++ b/dmp-frontend/src/app/ui/auth/login/login.component.ts
@@ -78,6 +78,10 @@ export class LoginComponent extends BaseComponent implements OnInit, AfterViewIn
 		this.router.navigate(['/login/configurable/' + provider.configurableLoginId])
 	}
 
+	public zenodoLogin() {
+		this.router.navigate(['/login/external/zenodo']);
+	}
+
 	public hasFacebookOauth(): boolean {
 		return this.hasProvider(AuthProvider.Facebook);
 	}
@@ -106,6 +110,10 @@ export class LoginComponent extends BaseComponent implements OnInit, AfterViewIn
 		return this.hasProvider(AuthProvider.OpenAire);
 	}
 
+	public hasZenodoOauth(): boolean {
+		return this.hasProvider(AuthProvider.Zenodo);
+	}
+
 	public initProviders() {
 		if (this.hasProvider(AuthProvider.Google)) { this.initializeGoogleOauth(); }
 		if (this.hasProvider(AuthProvider.Facebook)) { this.initializeFacebookOauth(); }
@@ -127,6 +135,7 @@ export class LoginComponent extends BaseComponent implements OnInit, AfterViewIn
 			case AuthProvider.B2Access: return this.hasAllRequiredFieldsConfigured(this.configurationService.loginProviders.b2accessConfiguration);
 			case AuthProvider.ORCID: return this.hasAllRequiredFieldsConfigured(this.configurationService.loginProviders.orcidConfiguration);
 			case AuthProvider.OpenAire: return this.hasAllRequiredFieldsConfigured(this.configurationService.loginProviders.openAireConfiguration);
+			case AuthProvider.Zenodo: return this.hasAllRequiredFieldsConfigured(this.configurationService.loginProviders.zenodoConfiguration);
 			default: throw new Error('Unsupported Provider Type');
 		}
 	}
diff --git a/dmp-frontend/src/app/ui/auth/login/login.module.ts b/dmp-frontend/src/app/ui/auth/login/login.module.ts
index cfa773be0..64f9b0a4a 100644
--- a/dmp-frontend/src/app/ui/auth/login/login.module.ts
+++ b/dmp-frontend/src/app/ui/auth/login/login.module.ts
@@ -12,6 +12,7 @@ import { ConfigurableProvidersService } from '@app/ui/auth/login/utilities/confi
 import { LoginService } from '@app/ui/auth/login/utilities/login.service';
 import { CommonFormsModule } from '@common/forms/common-forms.module';
 import { CommonUiModule } from '@common/ui/common-ui.module';
+import { ZenodoLoginComponent } from './zenodo-login/zenodo-login.component';
 
 @NgModule({
 	imports: [
@@ -27,7 +28,8 @@ import { CommonUiModule } from '@common/ui/common-ui.module';
 		OrcidLoginComponent,
 		EmailConfirmation,
 		OpenAireLoginComponent,
-		ConfigurableLoginComponent
+		ConfigurableLoginComponent,
+		ZenodoLoginComponent
 	],
 	providers: [LoginService, ConfigurableProvidersService]
 })
diff --git a/dmp-frontend/src/app/ui/auth/login/login.routing.ts b/dmp-frontend/src/app/ui/auth/login/login.routing.ts
index 0a2e7049f..9509fa48e 100644
--- a/dmp-frontend/src/app/ui/auth/login/login.routing.ts
+++ b/dmp-frontend/src/app/ui/auth/login/login.routing.ts
@@ -8,6 +8,7 @@ import { OrcidLoginComponent } from './orcid-login/orcid-login.component';
 import { TwitterLoginComponent } from './twitter-login/twitter-login.component';
 import { OpenAireLoginComponent } from "./openaire-login/openaire-login.component";
 import { ConfigurableLoginComponent } from "./configurable-login/configurable-login.component";
+import { ZenodoLoginComponent } from './zenodo-login/zenodo-login.component';
 
 const routes: Routes = [
 	{ path: '', component: LoginComponent },
@@ -18,7 +19,8 @@ const routes: Routes = [
 	{ path: 'confirmation/:token', component: EmailConfirmation },
 	{ path: 'confirmation', component: EmailConfirmation },
 	{ path: 'openaire', component: OpenAireLoginComponent},
-	{ path: 'configurable/:id', component: ConfigurableLoginComponent}
+	{ path: 'configurable/:id', component: ConfigurableLoginComponent},
+	{ path: 'external/zenodo', component: ZenodoLoginComponent }
 ];
 
 @NgModule({
diff --git a/dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.html b/dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.html
new file mode 100644
index 000000000..e69de29bb
diff --git a/dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.scss b/dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.ts b/dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.ts
new file mode 100644
index 000000000..36decce42
--- /dev/null
+++ b/dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.ts
@@ -0,0 +1,85 @@
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { Component, OnInit } from '@angular/core';
+import { FormControl } from '@angular/forms';
+import { ActivatedRoute, Params } from '@angular/router';
+import { AuthProvider } from '@app/core/common/enum/auth-provider';
+import { OrcidUser } from '@app/core/model/orcid/orcidUser';
+import { AuthService } from '@app/core/services/auth/auth.service';
+import { LoginService } from '@app/ui/auth/login/utilities/login.service';
+import { BaseComponent } from '@common/base/base.component';
+import { environment } from 'environments/environment';
+import { takeUntil } from 'rxjs/operators';
+import { ConfigurationService } from '@app/core/services/configuration/configuration.service';
+import { ZenodoToken } from '@app/core/model/zenodo/zenodo-token.model';
+
+@Component({
+	selector: 'app-zenodo-login',
+	templateUrl: './zenodo-login.component.html',
+	styleUrls: ['./zenodo-login.component.scss']
+})
+export class ZenodoLoginComponent extends BaseComponent implements OnInit {
+
+	private returnUrl: string;
+	private zenodoToken: ZenodoToken
+	private accessToken: string;
+	private emailFormControl = new FormControl('');
+
+	constructor(
+		private route: ActivatedRoute,
+		private authService: AuthService,
+		private loginService: LoginService,
+		private httpClient: HttpClient,
+		private configurationService: ConfigurationService
+	) {
+		super();
+		this.zenodoToken = new ZenodoToken;
+	}
+
+	ngOnInit(): void {
+		this.route.queryParams
+			.pipe(takeUntil(this._destroyed))
+			.subscribe((params: Params) => {
+				const returnUrl = params['returnUrl'];
+				if (returnUrl) { this.returnUrl = returnUrl; }
+				if (!params['code']) { this.zenodoAccessGetAuthCode(); } else { this.zenodoLogin(params['code']); }
+			});
+	}
+
+	public zenodoAccessGetAuthCode() {
+		window.location.href = this.configurationService.loginProviders.zenodoConfiguration.oauthUrl
+			+ '?client_id='
+			+ this.configurationService.loginProviders.zenodoConfiguration.clientId
+			+ '&response_type=code&scope=deposit:write+deposit:actions+user:email&state=astate&redirect_uri='
+			+ this.configurationService.loginProviders.zenodoConfiguration.redirectUri;
+	}
+
+	public zenodoLogin(code: string) {
+		let headers = new HttpHeaders();
+		headers = headers.set('Content-Type', 'application/json');
+		headers = headers.set('Accept', 'application/json');
+		this.httpClient.post(this.configurationService.server + 'auth/zenodoRequestToken', { code: code }, { headers: headers })
+			.pipe(takeUntil(this._destroyed))
+			.subscribe((responseData: any) => {
+				this.zenodoToken.userId = responseData.payload.userId;
+				this.zenodoToken.expiresIn = responseData.payload.expiresIn;
+				this.accessToken = this.zenodoToken.accessToken = responseData.payload.accessToken;
+				this.zenodoToken.email = responseData.payload.email;
+				this.authService.login({ ticket: this.accessToken, provider: AuthProvider.Zenodo, data: this.zenodoToken })
+					.pipe(takeUntil(this._destroyed))
+					.subscribe(
+						res => this.loginService.onLogInSuccess(res, this.returnUrl),
+						error => this.loginService.onLogInError(error)
+					);
+			});
+	}
+
+	public login() {
+		this.zenodoToken.email = this.emailFormControl.value;
+		this.authService.login({ ticket: this.accessToken, provider: AuthProvider.Zenodo, data: this.zenodoToken })
+			.pipe(takeUntil(this._destroyed))
+			.subscribe(
+				res => this.loginService.onLogInSuccess(res, this.returnUrl),
+				error => this.loginService.onLogInError(error)
+			);
+	}
+}
diff --git a/dmp-frontend/src/assets/config/config.json b/dmp-frontend/src/assets/config/config.json
index 7298e06b8..1aac1c5cd 100644
--- a/dmp-frontend/src/assets/config/config.json
+++ b/dmp-frontend/src/assets/config/config.json
@@ -8,7 +8,7 @@
 	},
 	"defaultCulture": "en-US",
 	"loginProviders": {
-		"enabled": [1, 2, 3, 4, 5, 6, 7, 8],
+		"enabled": [1, 2, 3, 4, 5, 6, 7, 8, 10],
 		"facebookConfiguration": { "clientId": "" },
 		"googleConfiguration": { "clientId": "" },
 		"linkedInConfiguration": {
@@ -37,6 +37,11 @@
 			"oauthUrl": "",
 			"redirectUri": "",
 			"state": "987654321"
+		},
+		"zenodoConfiguration": {
+			"clientId": "",
+			"oauthUrl": "https://sandbox.zenodo.org/oauth/authorize",
+			"redirectUri": "http://localhost:4200/login/external/zenodo"
 		}
 	},
 	"logging": {

From 7b5588bcbe1dd700833c04f660f245ff6b602f7d Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Mon, 6 Apr 2020 18:16:05 +0300
Subject: [PATCH 08/60] Add zenodo DOI access token expiration check up and
 show proper pop up when the user has either no or expired token

---
 .../main/java/eu/eudat/controllers/Login.java | 13 ++++++
 .../security/ExpiredTokenException.java       |  8 ++++
 .../eu/eudat/logic/managers/UserManager.java  | 15 +++++++
 .../app/core/services/auth/auth.service.ts    |  9 ++++
 dmp-frontend/src/app/ui/dmp/dmp.module.ts     |  4 +-
 .../ui/dmp/overview/dmp-overview.component.ts | 32 ++++++++++++++
 dmp-frontend/src/assets/i18n/en.json          |  4 ++
 .../multiple-choice-dialog.component.html     | 30 +++++++++++++
 .../multiple-choice-dialog.component.scss     | 44 +++++++++++++++++++
 .../multiple-choice-dialog.component.ts       | 25 +++++++++++
 .../multiple-choice-dialog.module.ts          | 15 +++++++
 11 files changed, 198 insertions(+), 1 deletion(-)
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/exceptions/security/ExpiredTokenException.java
 create mode 100644 dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.html
 create mode 100644 dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.scss
 create mode 100644 dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.ts
 create mode 100644 dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.module.ts

diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java
index 16af6f14f..45636e7bb 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java
@@ -1,6 +1,8 @@
 package eu.eudat.controllers;
 
 
+import eu.eudat.exceptions.security.ExpiredTokenException;
+import eu.eudat.exceptions.security.NonValidTokenException;
 import eu.eudat.exceptions.security.NullEmailException;
 import eu.eudat.logic.managers.UserManager;
 import eu.eudat.logic.proxy.config.configloaders.ConfigLoader;
@@ -40,6 +42,7 @@ import org.springframework.social.oauth1.OAuthToken;
 import org.springframework.web.bind.annotation.*;
 
 import javax.transaction.Transactional;
+import java.io.IOException;
 import java.security.GeneralSecurityException;
 
 
@@ -150,6 +153,16 @@ public class Login {
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<Principal>().payload(this.nonVerifiedUserAuthenticationService.Touch(principal.getToken())).status(ApiMessageCode.NO_MESSAGE));
     }
 
+    @RequestMapping(method = RequestMethod.GET, value = {"/hasDOIToken"}, consumes = "application/json", produces = "application/json")
+    public @ResponseBody
+    ResponseEntity<ResponseItem<Boolean>> hasDOIToken(Principal principal) throws NullEmailException {
+        try {
+            return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<Boolean>().payload(this.userManager.isDOITokenValid(principal)).status(ApiMessageCode.NO_MESSAGE));
+        } catch (NonValidTokenException | ExpiredTokenException | IOException e) {
+            return ResponseEntity.status(460).body(new ResponseItem<Boolean>().payload(false).status(ApiMessageCode.ERROR_MESSAGE).message(e.getMessage()));
+        }
+    }
+
     @Transactional
     @RequestMapping(method = RequestMethod.POST, value = {"/logout"}, consumes = "application/json", produces = "application/json")
     public @ResponseBody
diff --git a/dmp-backend/web/src/main/java/eu/eudat/exceptions/security/ExpiredTokenException.java b/dmp-backend/web/src/main/java/eu/eudat/exceptions/security/ExpiredTokenException.java
new file mode 100644
index 000000000..dd1de35ea
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/exceptions/security/ExpiredTokenException.java
@@ -0,0 +1,8 @@
+package eu.eudat.exceptions.security;
+
+public class ExpiredTokenException extends Exception {
+
+	public ExpiredTokenException(String message) {
+		super(message);
+	}
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java
index 084648523..d2388eec4 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java
@@ -7,6 +7,8 @@ import eu.eudat.data.entities.DMP;
 import eu.eudat.data.entities.UserInfo;
 import eu.eudat.data.entities.UserRole;
 import eu.eudat.data.query.items.table.userinfo.UserInfoTableRequestItem;
+import eu.eudat.exceptions.security.ExpiredTokenException;
+import eu.eudat.exceptions.security.NonValidTokenException;
 import eu.eudat.exceptions.security.NullEmailException;
 import eu.eudat.exceptions.security.UnauthorisedException;
 import eu.eudat.logic.builders.entity.UserRoleBuilder;
@@ -29,6 +31,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 import java.io.IOException;
+import java.time.Instant;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -112,4 +115,16 @@ public class UserManager {
 		dataTableData.setTotalCount((long) colaborators.size());
 		return dataTableData;
 	}
+
+	public Boolean isDOITokenValid(Principal principal) throws NonValidTokenException, ExpiredTokenException, IOException {
+		if (principal.getZenodoToken() != null && !principal.getZenodoToken().isEmpty()) {
+			if (Instant.now().isBefore(principal.getZenodoDuration())) {
+				return true;
+			}
+			Map<String, Object> settings = Collections.singletonMap("zenodoToken", "");
+			this.updateSettings(settings, principal);
+			throw new ExpiredTokenException("Zenodo Token is expired");
+		}
+		throw new NonValidTokenException("This account has no Zenodo Token");
+	}
 }
diff --git a/dmp-frontend/src/app/core/services/auth/auth.service.ts b/dmp-frontend/src/app/core/services/auth/auth.service.ts
index a50261ba0..2b9fce248 100644
--- a/dmp-frontend/src/app/core/services/auth/auth.service.ts
+++ b/dmp-frontend/src/app/core/services/auth/auth.service.ts
@@ -159,4 +159,13 @@ export class AuthService extends BaseService {
 			})
 		);
 	}
+
+	public hasDOIToken(): Observable<any> {
+		this.actionUrl = this.configurationService.server + 'auth/';
+		const url = this.actionUrl + '/hasDOIToken';
+		const principal = this.current();
+		let headers = this.headers;
+		headers = headers.set('AuthToken', principal.token);
+		return this.http.get(url, { headers: headers });
+	}
 }
diff --git a/dmp-frontend/src/app/ui/dmp/dmp.module.ts b/dmp-frontend/src/app/ui/dmp/dmp.module.ts
index c4732a882..0f72ed78f 100644
--- a/dmp-frontend/src/app/ui/dmp/dmp.module.ts
+++ b/dmp-frontend/src/app/ui/dmp/dmp.module.ts
@@ -30,6 +30,7 @@ import { DmpWizardDatasetListingComponent } from '@app/ui/dmp/wizard/listing/dmp
 import { CommonFormsModule } from '@common/forms/common-forms.module';
 import { FormValidationErrorsDialogModule } from '@common/forms/form-validation-errors-dialog/form-validation-errors-dialog.module';
 import { CommonUiModule } from '@common/ui/common-ui.module';
+import { MultipleChoiceDialogModule } from '@common/modules/multiple-choice-dialog/multiple-choice-dialog.module';
 
 @NgModule({
 	imports: [
@@ -42,7 +43,8 @@ import { CommonUiModule } from '@common/ui/common-ui.module';
 		AutoCompleteModule,
 		DmpRoutingModule,
 		DmpOverviewModule,
-		FormValidationErrorsDialogModule
+		FormValidationErrorsDialogModule,
+		MultipleChoiceDialogModule
 	],
 	declarations: [
 		DmpListingComponent,
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
index 98c25aac9..fe787bbe0 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
@@ -22,6 +22,8 @@ import { Observable, of as observableOf } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { Role } from "@app/core/common/enum/role";
 import { DmpInvitationDialogComponent } from '../invitation/dmp-invitation.component';
+import { MultipleChoiceDialogModule } from '@common/modules/multiple-choice-dialog/multiple-choice-dialog.module';
+import { MultipleChoiceDialogComponent } from '@common/modules/multiple-choice-dialog/multiple-choice-dialog.component';
 
 @Component({
 	selector: 'app-dmp-overview',
@@ -322,6 +324,14 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 	}
 
 	getDoi(dmp: DmpOverviewModel) {
+		this.authentication.hasDOIToken().subscribe(response => {
+			this.showConfirmationDOIDialog(dmp);
+		}, error => {
+			this.showErrorConfirmationDOIDialog(error.error.message, dmp);
+		});
+	}
+
+	showConfirmationDOIDialog(dmp: DmpOverviewModel) {
 		const dialogRef = this.dialog.open(ConfirmationDialogComponent, {
 			maxWidth: '600px',
 			restoreFocus: false,
@@ -346,6 +356,28 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 		});
 	}
 
+	showErrorConfirmationDOIDialog(message: string, dmp: DmpOverviewModel) {
+		const dialogRef = this.dialog.open(MultipleChoiceDialogComponent, {
+			maxWidth: '600px',
+			restoreFocus: false,
+			data: {
+				message: message,
+				titles: [ this.language.instant('DMP-OVERVIEW.MULTIPLE-DIALOG.ZENODO-LOGIN'), this.language.instant('DMP-OVERVIEW.MULTIPLE-DIALOG.USE-DEFAULT')]
+			}
+		});
+		dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => {
+			switch (result) {
+				case 0:
+					this.authentication.logout();
+					this.router.navigate(['/login/external/zenodo']);
+					break;
+				case 1:
+					this.showConfirmationDOIDialog(dmp);
+					break;
+			}
+		});
+	}
+
 	onDOICallbackSuccess(): void {
 		this.uiNotificationService.snackBarNotification(this.language.instant('DMP-EDITOR.SNACK-BAR.SUCCESSFUL-DOI'), SnackBarNotificationLevel.Success);
 	}
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index d1db35ce5..8d01e4426 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -525,6 +525,10 @@
 		"ERROR": {
 			"DELETED-DMP": "The requested DMP is deleted",
 			"FORBIDEN-DMP": "You are not allowed to access this DMP"
+		},
+		"MULTIPLE-DIALOG": {
+			"ZENODO-LOGIN": "Login with Zenodo",
+			"USE-DEFAULT": "Use Default Token"
 		}
 	},
 	"DATASET-LISTING": {
diff --git a/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.html b/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.html
new file mode 100644
index 000000000..87029a992
--- /dev/null
+++ b/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.html
@@ -0,0 +1,30 @@
+<div class="confirmation-dialog">
+	<div *ngIf="data.icon" class="row d-flex flex-row">
+		<div class="col-auto close-btn justify-content-start">
+			<mat-icon color="warn">{{ data.icon }}</mat-icon>
+		</div>
+		<div *ngIf="data.warning" class="col justify-content-center warn-text">{{ data.warning }}</div>
+		<div class="col-auto close-btn justify-content-end" (click)="close()">
+			<mat-icon>close</mat-icon>
+		</div>
+	</div>
+	<div class="row d-flex flex-row">
+		<div class="col message pb-4 pl-3">{{ data.message }}</div>
+		<div *ngIf="!data.icon" class="col-auto close-btn justify-content-end" (click)="close()">
+			<mat-icon>close</mat-icon>
+		</div>
+	</div>
+	<div *ngIf="data.privacyPolicyNames" class="row d-flex flex-col">
+		<div class="col-12 privacy-policy-names">{{ data.privacyPolicyNames }}</div>
+		<mat-checkbox [(ngModel)]="agreePrivacyPolicyNames" required class="checkbox-privacy">
+			{{'GENERAL.CONFIRMATION-DIALOG.ACTIONS.POLICY-AGREE' | translate}}
+		</mat-checkbox>
+		<div *ngIf="!agreePrivacyPolicyNames" class="required-policy">{{'GENERAL.CONFIRMATION-DIALOG.ACTIONS.REQUIRED' | translate}}</div>
+	</div>
+	<div class="row">
+		<div class="col"></div>
+		<span *ngFor="let title of data.titles; let i = index">
+		<div class="col-auto"><button mat-raised-button type="button" (click)="apply(i)" class="confirm">{{ title }}</button></div>
+		</span>
+	</div>
+</div>
diff --git a/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.scss b/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.scss
new file mode 100644
index 000000000..1e529f1f5
--- /dev/null
+++ b/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.scss
@@ -0,0 +1,44 @@
+.confirmation-dialog {
+	.confirmation {
+	  padding-bottom: 20px;
+	}
+
+	.privacy-policy-names {
+	  font-weight: 700;
+	  padding: 1em;
+	}
+
+	.close-btn {
+	  margin-left: auto;
+	  cursor: pointer;
+	}
+
+	.warn-text {
+	  color: #f44336;
+	}
+
+	.cancel {
+	  background-color: #aaaaaa;
+	  color: #ffffff;
+	}
+
+	.confirm {
+	  background-color: #2cba6c;
+	  color: #ffffff;
+	}
+
+	.delete {
+	  background-color: #ba2c2c;
+	  color: #ffffff;
+	}
+
+	.checkbox-privacy {
+	  padding: 0em 1em;
+	}
+
+	.required-policy {
+	  padding: 0em 1.2em 1em;
+	  font-size: smaller;
+	  color: #f44336;
+	}
+  }
diff --git a/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.ts b/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.ts
new file mode 100644
index 000000000..8abce91d7
--- /dev/null
+++ b/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.ts
@@ -0,0 +1,25 @@
+import { Component, Inject } from '@angular/core';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
+
+@Component({
+  selector: 'app-multiple-choice-dialog',
+  templateUrl: './multiple-choice-dialog.component.html',
+  styleUrls: ['./multiple-choice-dialog.component.scss']
+})
+export class MultipleChoiceDialogComponent {
+	agreePrivacyPolicyNames = false;
+
+	constructor(
+		public dialogRef: MatDialogRef<MultipleChoiceDialogComponent>,
+		@Inject(MAT_DIALOG_DATA) public data: any
+	) {
+	}
+
+	close() {
+		this.dialogRef.close(false);
+	}
+
+	apply(i: number) {
+		this.dialogRef.close(i);
+	}
+}
diff --git a/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.module.ts b/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.module.ts
new file mode 100644
index 000000000..5f435c90b
--- /dev/null
+++ b/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.module.ts
@@ -0,0 +1,15 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { MultipleChoiceDialogComponent } from './multiple-choice-dialog.component';
+import { CommonUiModule } from '@common/ui/common-ui.module';
+import { FormsModule } from '@angular/forms';
+
+
+
+@NgModule({
+	imports: [CommonUiModule, FormsModule],
+	declarations: [MultipleChoiceDialogComponent],
+	exports: [MultipleChoiceDialogComponent],
+	entryComponents: [MultipleChoiceDialogComponent]
+})
+export class MultipleChoiceDialogModule { }

From 06df52334c5152c597c3ab616d87b24b8657c143 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Mon, 6 Apr 2020 18:31:12 +0300
Subject: [PATCH 09/60] Additional checkup

---
 .../managers/DataManagementPlanManager.java    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index 2eed39326..bcbf12e10 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -25,6 +25,7 @@ import eu.eudat.elastic.entities.Organization;
 import eu.eudat.elastic.entities.Tag;
 import eu.eudat.exceptions.datamanagementplan.DMPNewVersionException;
 import eu.eudat.exceptions.datamanagementplan.DMPWithDatasetsDeleteException;
+import eu.eudat.exceptions.security.NonValidTokenException;
 import eu.eudat.exceptions.security.UnauthorisedException;
 import eu.eudat.logic.builders.entity.UserInfoBuilder;
 import eu.eudat.logic.mapper.elastic.DmpMapper;
@@ -111,15 +112,17 @@ public class DataManagementPlanManager {
     private DatabaseRepository databaseRepository;
     private Environment environment;
     private RDAManager rdaManager;
+    private UserManager userManager;
 
     @Autowired
-    public DataManagementPlanManager(ApiContext apiContext, DatasetManager datasetManager, Environment environment, RDAManager rdaManager) {
+    public DataManagementPlanManager(ApiContext apiContext, DatasetManager datasetManager, Environment environment, RDAManager rdaManager, UserManager userManager) {
         this.apiContext = apiContext;
         this.datasetManager = datasetManager;
         this.utilitiesService = apiContext.getUtilitiesService();
         this.databaseRepository = apiContext.getOperationsContext().getDatabaseRepository();
         this.environment = environment;
         this.rdaManager = rdaManager;
+        this.userManager = userManager;
     }
 
     public DataTableData<DataManagementPlanListingModel> getPaged(DataManagementPlanTableRequest dataManagementPlanTableRequest, Principal principal, String fieldsGroup) throws Exception {
@@ -1538,7 +1541,14 @@ public class DataManagementPlanManager {
         if (dmp.getDoi() != null)
             throw new Exception("DMP already has a DOI");
 
-        String zenodoToken = principal.getZenodoToken() != null && !principal.getZenodoToken().isEmpty() ? principal.getZenodoToken() : this.environment.getProperty("zenodo.access_token");
+        String zenodoToken = "";
+        try {
+            if (this.userManager.isDOITokenValid(principal)) {
+                zenodoToken = principal.getZenodoToken();
+            }
+        } catch (NonValidTokenException e) {
+            zenodoToken = this.environment.getProperty("zenodo.access_token");
+        }
         // First step, post call to Zenodo, to create the entry.
         RestTemplate restTemplate = new RestTemplate();
         HttpHeaders headers = new HttpHeaders();
@@ -1587,10 +1597,10 @@ public class DataManagementPlanManager {
                     String updateUrl = links.get("self") + "?access_token=" + zenodoToken;
                     restTemplate.put(updateUrl, request);
                     //And finally remove pre-existing files from it
-                    String fileListUrl = links.get("self") + "/files" + "?access_token=" + zenodoToken;
+                    String fileListUrl = links.get("self") + "/files" + "?access_token=" + this.environment.getProperty("zenodo.access_token");
                     ResponseEntity<Map[]> fileListResponse = restTemplate.getForEntity(fileListUrl, Map[].class);
                     for (Map file : fileListResponse.getBody()) {
-                        String fileDeleteUrl = links.get("self") + "/files/" + file.get("id") + "?access_token=" + zenodoToken;
+                        String fileDeleteUrl = links.get("self") + "/files/" + file.get("id") + "?access_token=" + this.environment.getProperty("zenodo.access_token");
                         restTemplate.delete(fileDeleteUrl);
                     }
                 }catch (Exception e) {

From d664d19207441f13f5b083646994cc04c0f4c648 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Mon, 6 Apr 2020 18:34:25 +0300
Subject: [PATCH 10/60] Improvements and bugixes over elastic

---
 .../elastic/repository/DatasetRepository.java | 164 ++++++++++--------
 .../elastic/repository/DmpRepository.java     | 148 ++++++++--------
 .../elastic/repository/ElasticRepository.java |  10 +-
 .../managers/DataManagementPlanManager.java   |  35 +++-
 .../logic/managers/DatasetWizardManager.java  |   4 +-
 .../logic/mapper/elastic/DatasetMapper.java   |  37 ++--
 6 files changed, 227 insertions(+), 171 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 6e862df5f..f34c2ec8a 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
@@ -39,103 +39,115 @@ public class DatasetRepository extends ElasticRepository<Dataset, DatasetCriteri
 
     @Override
     public Dataset createOrUpdate(Dataset entity) throws IOException {
-        XContentBuilder builder = XContentFactory.jsonBuilder();
-        IndexRequest request = new IndexRequest("datasets").id(entity.getId()).source(entity.toElasticEntity(builder));//new IndexRequest("datasets", "doc", entity.getId()).source(entity.toElasticEntity(builder));
-        this.getClient().index(request, RequestOptions.DEFAULT);
-        return entity;
+        if (this.getClient() != null) {
+            XContentBuilder builder = XContentFactory.jsonBuilder();
+            IndexRequest request = new IndexRequest("datasets").id(entity.getId()).source(entity.toElasticEntity(builder));//new IndexRequest("datasets", "doc", entity.getId()).source(entity.toElasticEntity(builder));
+            this.getClient().index(request, RequestOptions.DEFAULT);
+            return entity;
+        }
+        return null;
     }
 
     @Override
     public Dataset findDocument(String id) throws IOException {
-        GetRequest request = new GetRequest("datasets",id);
-        GetResponse response = this.getClient().get(request, RequestOptions.DEFAULT);
-        return new Dataset().fromElasticEntity(response.getSourceAsMap());
+        if (this.getClient() != null) {
+            GetRequest request = new GetRequest("datasets", id);
+            GetResponse response = this.getClient().get(request, RequestOptions.DEFAULT);
+            return new Dataset().fromElasticEntity(response.getSourceAsMap());
+        }
+        return null;
     }
 
     @Override
     public List<Dataset> query(DatasetCriteria criteria) throws IOException {
-        SearchRequest searchRequest = new SearchRequest("datasets");
-        SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+        if (this.getClient() != null) {
+            SearchRequest searchRequest = new SearchRequest("datasets");
+            SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
 
-        CountRequest countRequest = new CountRequest("datasets");
-        countRequest.query(QueryBuilders.boolQuery().mustNot(QueryBuilders.termsQuery("status.keyword", Stream.of(Dataset.Status.DELETED.getValue(), Dataset.Status.CANCELED.getValue()).collect(Collectors.toList()))));
-        CountResponse countResponse = getClient().count(countRequest, RequestOptions.DEFAULT);
-        Long count = countResponse.getCount();
+            CountRequest countRequest = new CountRequest("datasets");
+            countRequest.query(QueryBuilders.boolQuery().mustNot(QueryBuilders.termsQuery("status.keyword", Stream.of(Dataset.Status.DELETED.getValue(), Dataset.Status.CANCELED.getValue()).collect(Collectors.toList()))));
+            CountResponse countResponse = getClient().count(countRequest, RequestOptions.DEFAULT);
+            Long count = countResponse.getCount();
 
-        searchSourceBuilder.size(count.intValue());
+            searchSourceBuilder.size(count.intValue());
 
-        BoolQueryBuilder boolQuery = QueryBuilders.boolQuery().mustNot(QueryBuilders.termsQuery("status.keyword", Stream.of(Dataset.Status.DELETED.getValue(), Dataset.Status.CANCELED.getValue()).collect(Collectors.toList())));
-        if (criteria.isPublic()) {
-            boolQuery = boolQuery.should(QueryBuilders.termQuery("public.keyword", "true"));
-            boolQuery = boolQuery.should(QueryBuilders.termQuery("status.keyword", Dataset.Status.FINALISED.getValue()));
-            boolQuery = boolQuery.should(QueryBuilders.termQuery("lastPublicVersion.keyword", "true"));
-        }
-        if (criteria.getLike() != null && !criteria.getLike().isEmpty()) {
-            boolQuery = boolQuery.should(QueryBuilders.queryStringQuery(criteria.getLike()).fields(Stream.of(new Object[][] {
-                    { "label", 1.0f },
-                    { "description", 1.0f },
-                    { "formData", 1.0f }
-            }).collect(Collectors.toMap(data -> (String) data[0], data -> (Float) data[1]))));
-        }
-
-        if (criteria.getDatasetTemplates() != null && criteria.getDatasetTemplates().size() > 0) {
-            boolQuery = boolQuery.should(QueryBuilders.termsQuery("template.keyword", criteria.getDatasetTemplates().stream().map(UUID::toString).collect(Collectors.toList())));
-        }
-
-        if (criteria.getStatus() != null) {
-            boolQuery = boolQuery.should(QueryBuilders.termQuery("status.keyword", criteria.getStatus().toString()));
-        }
-
-        if (criteria.getDmps() != null && criteria.getDmps().size() > 0) {
-            boolQuery = boolQuery.should(QueryBuilders.termsQuery("dmp.keyword", criteria.getDmps().stream().map(UUID::toString).collect(Collectors.toList())));
-        }
-
-        if (criteria.getGroupIds() != null && criteria.getGroupIds().size() > 0) {
-            boolQuery = boolQuery.should(QueryBuilders.termsQuery("group.keyword", criteria.getGroupIds().stream().map(UUID::toString).collect(Collectors.toList())));
-        }
-
-        if (criteria.getGrants() != null && criteria.getGrants().size() > 0) {
-            boolQuery = boolQuery.should(QueryBuilders.termsQuery("grant.keyword", criteria.getGrants().stream().map(UUID::toString).collect(Collectors.toList())));
-        }
-
-        if (criteria.getGrantStatus() != null) {
-            boolQuery = boolQuery.should(QueryBuilders.termQuery("grantStatus.keyword", criteria.getGrantStatus().toString()));
-        }
-
-        if (criteria.getCollaborators() != null && criteria.getCollaborators().size() > 0) {
-            boolQuery = boolQuery.should(QueryBuilders.termsQuery("collaborators.id.keyword", criteria.getCollaborators().stream().map(UUID::toString).collect(Collectors.toList())));
-        }
-
-        if (!criteria.isPublic()) {
-            if (criteria.getAllowAllVersions() != null && !criteria.getAllowAllVersions()) {
-                boolQuery = boolQuery.should(QueryBuilders.termQuery("lastVersion.keyword", "true"));
+            BoolQueryBuilder boolQuery = QueryBuilders.boolQuery().mustNot(QueryBuilders.termsQuery("status.keyword", Stream.of(Dataset.Status.DELETED.getValue(), Dataset.Status.CANCELED.getValue()).collect(Collectors.toList())));
+            if (criteria.isPublic()) {
+                boolQuery = boolQuery.should(QueryBuilders.termQuery("public.keyword", "true"));
+                boolQuery = boolQuery.should(QueryBuilders.termQuery("status.keyword", Dataset.Status.FINALISED.getValue()));
+                boolQuery = boolQuery.should(QueryBuilders.termQuery("lastPublicVersion.keyword", "true"));
+            }
+            if (criteria.getLike() != null && !criteria.getLike().isEmpty()) {
+                boolQuery = boolQuery.should(QueryBuilders.queryStringQuery(criteria.getLike()).fields(Stream.of(new Object[][]{
+                        {"label", 1.0f},
+                        {"description", 1.0f},
+                        {"formData", 1.0f}
+                }).collect(Collectors.toMap(data -> (String) data[0], data -> (Float) data[1]))));
             }
-        }
 
-        if (criteria.getOrganiztions() != null && criteria.getOrganiztions().size() > 0) {
-            boolQuery = boolQuery.should(QueryBuilders.termsQuery("organizations.id.keyword", criteria.getOrganiztions()));
-        }
+            if (criteria.getDatasetTemplates() != null && criteria.getDatasetTemplates().size() > 0) {
+                boolQuery = boolQuery.should(QueryBuilders.termsQuery("template.keyword", criteria.getDatasetTemplates().stream().map(UUID::toString).collect(Collectors.toList())));
+            }
 
-        if (criteria.getTags() != null && criteria.getTags().size() > 0) {
-            boolQuery = boolQuery.should(QueryBuilders.termsQuery("tags.name.keyword", criteria.getTags().stream().map(Tag::getName).collect(Collectors.toList())));
-        }
+            if (criteria.getStatus() != null) {
+                boolQuery = boolQuery.should(QueryBuilders.termQuery("status.keyword", criteria.getStatus().toString()));
+            }
 
-        if (boolQuery.should().isEmpty() && boolQuery.mustNot().isEmpty()) {
-            boolQuery.should(QueryBuilders.matchAllQuery());
-        } else {
-            boolQuery.minimumShouldMatch(boolQuery.should().size());
+            if (criteria.getDmps() != null && criteria.getDmps().size() > 0) {
+                boolQuery = boolQuery.should(QueryBuilders.termsQuery("dmp.keyword", criteria.getDmps().stream().map(UUID::toString).collect(Collectors.toList())));
+            }
+
+            if (criteria.getGroupIds() != null && criteria.getGroupIds().size() > 0) {
+                boolQuery = boolQuery.should(QueryBuilders.termsQuery("group.keyword", criteria.getGroupIds().stream().map(UUID::toString).collect(Collectors.toList())));
+            }
+
+            if (criteria.getGrants() != null && criteria.getGrants().size() > 0) {
+                boolQuery = boolQuery.should(QueryBuilders.termsQuery("grant.keyword", criteria.getGrants().stream().map(UUID::toString).collect(Collectors.toList())));
+            }
+
+            if (criteria.getGrantStatus() != null) {
+                boolQuery = boolQuery.should(QueryBuilders.termQuery("grantStatus.keyword", criteria.getGrantStatus().toString()));
+            }
+
+            if (criteria.getCollaborators() != null && criteria.getCollaborators().size() > 0) {
+                boolQuery = boolQuery.should(QueryBuilders.termsQuery("collaborators.id.keyword", criteria.getCollaborators().stream().map(UUID::toString).collect(Collectors.toList())));
+            }
+
+            if (!criteria.isPublic()) {
+                if (criteria.getAllowAllVersions() != null && !criteria.getAllowAllVersions()) {
+                    boolQuery = boolQuery.should(QueryBuilders.termQuery("lastVersion.keyword", "true"));
+                }
+            }
+
+            if (criteria.getOrganiztions() != null && criteria.getOrganiztions().size() > 0) {
+                boolQuery = boolQuery.should(QueryBuilders.termsQuery("organizations.id.keyword", criteria.getOrganiztions()));
+            }
+
+            if (criteria.getTags() != null && criteria.getTags().size() > 0) {
+                boolQuery = boolQuery.should(QueryBuilders.termsQuery("tags.name.keyword", criteria.getTags().stream().map(Tag::getName).collect(Collectors.toList())));
+            }
+
+            if (boolQuery.should().isEmpty() && boolQuery.mustNot().isEmpty()) {
+                boolQuery.should(QueryBuilders.matchAllQuery());
+            } else {
+                boolQuery.minimumShouldMatch(boolQuery.should().size());
+            }
+            searchSourceBuilder.query(boolQuery);
+            searchRequest.source(searchSourceBuilder);
+            SearchResponse response = this.getClient().search(searchRequest, RequestOptions.DEFAULT);
+            return Arrays.stream(response.getHits().getHits()).map(x -> this.transformFromString(x.getSourceAsString(), Dataset.class)).collect(Collectors.toList());
         }
-        searchSourceBuilder.query(boolQuery);
-        searchRequest.source(searchSourceBuilder);
-        SearchResponse response = this.getClient().search(searchRequest, RequestOptions.DEFAULT);
-        return Arrays.stream(response.getHits().getHits()).map(x -> this.transformFromString(x.getSourceAsString(), Dataset.class)).collect(Collectors.toList());
+        return null;
     }
 
     @Override
     public boolean exists() throws IOException {
-        GetIndexRequest request = new GetIndexRequest("datasets");
+        if (this.getClient() != null) {
+            GetIndexRequest request = new GetIndexRequest("datasets");
 //        request.indices("datasets");
-        return this.getClient().indices().exists(request, RequestOptions.DEFAULT);
+            return this.getClient().indices().exists(request, RequestOptions.DEFAULT);
+        }
+        return false;
     }
 
     @Override
diff --git a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DmpRepository.java b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DmpRepository.java
index 8447c772c..754fd1966 100644
--- a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DmpRepository.java
+++ b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DmpRepository.java
@@ -40,90 +40,102 @@ public class DmpRepository extends ElasticRepository<Dmp, DmpCriteria> {
 
 	@Override
 	public Dmp createOrUpdate(Dmp entity) throws IOException {
-		XContentBuilder builder = XContentFactory.jsonBuilder();
-		IndexRequest request = new IndexRequest("dmps").id(entity.getId().toString()).source(entity.toElasticEntity(builder));
-		IndexResponse response = this.getClient().index(request, RequestOptions.DEFAULT);
-		return entity;
+		if (this.getClient() != null) {
+			XContentBuilder builder = XContentFactory.jsonBuilder();
+			IndexRequest request = new IndexRequest("dmps").id(entity.getId().toString()).source(entity.toElasticEntity(builder));
+			IndexResponse response = this.getClient().index(request, RequestOptions.DEFAULT);
+			return entity;
+		}
+		return null;
 	}
 
 	@Override
 	public Dmp findDocument(String id) throws IOException {
-		GetRequest request = new GetRequest("dmps",id);
-		GetResponse response = this.getClient().get(request, RequestOptions.DEFAULT);
-		return new Dmp().fromElasticEntity(response.getSourceAsMap());
+		if (this.getClient() != null) {
+			GetRequest request = new GetRequest("dmps", id);
+			GetResponse response = this.getClient().get(request, RequestOptions.DEFAULT);
+			return new Dmp().fromElasticEntity(response.getSourceAsMap());
+		}
+		return null;
 	}
 
 	@Override
 	public List<Dmp> query(DmpCriteria criteria) throws IOException {
-		SearchRequest searchRequest = new SearchRequest("dmps");
-		SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+		if (this.getClient() != null) {
+			SearchRequest searchRequest = new SearchRequest("dmps");
+			SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
 
-		CountRequest countRequest = new CountRequest("dmps");
-		countRequest.query(QueryBuilders.boolQuery().mustNot(QueryBuilders.termsQuery(Dmp.MapKey.STATUS.getName(), Collections.singletonList(Dmp.DMPStatus.DELETED.getValue()))));
-		CountResponse countResponse = getClient().count(countRequest, RequestOptions.DEFAULT);
-		Long count = countResponse.getCount();
+			CountRequest countRequest = new CountRequest("dmps");
+			countRequest.query(QueryBuilders.boolQuery().mustNot(QueryBuilders.termsQuery(Dmp.MapKey.STATUS.getName(), Collections.singletonList(Dmp.DMPStatus.DELETED.getValue()))));
+			CountResponse countResponse = getClient().count(countRequest, RequestOptions.DEFAULT);
+			Long count = countResponse.getCount();
 
-		searchSourceBuilder.size(count.intValue());
+			searchSourceBuilder.size(count.intValue());
 
-		BoolQueryBuilder boolQuery = QueryBuilders.boolQuery().mustNot(QueryBuilders.termsQuery(Dmp.MapKey.STATUS.getName(), Collections.singletonList(Dmp.DMPStatus.DELETED.getValue())));
-		if (criteria.isPublic()) {
-			boolQuery = boolQuery.should(QueryBuilders.termQuery(Dmp.MapKey.ISPUBLIC.getName(), true));
-			boolQuery = boolQuery.should(QueryBuilders.termQuery(Dmp.MapKey.STATUS.getName(), Dmp.DMPStatus.FINALISED.getValue()));
+			BoolQueryBuilder boolQuery = QueryBuilders.boolQuery().mustNot(QueryBuilders.termsQuery(Dmp.MapKey.STATUS.getName(), Collections.singletonList(Dmp.DMPStatus.DELETED.getValue())));
+			if (criteria.isPublic()) {
+				boolQuery = boolQuery.should(QueryBuilders.termQuery(Dmp.MapKey.ISPUBLIC.getName(), true));
+				boolQuery = boolQuery.should(QueryBuilders.termQuery(Dmp.MapKey.STATUS.getName(), Dmp.DMPStatus.FINALISED.getValue()));
+			}
+			if (criteria.getLike() != null && !criteria.getLike().isEmpty()) {
+				boolQuery = boolQuery.should(QueryBuilders.queryStringQuery(criteria.getLike()).fields(Stream.of(new Object[][]{
+						{Dmp.MapKey.LABEL.getName(), 1.0f},
+						{Dmp.MapKey.DESCRIPTION.getName(), 1.0f}
+				}).collect(Collectors.toMap(data -> (String) data[0], data -> (Float) data[1]))));
+			}
+
+			if (criteria.getTemplates() != null && criteria.getTemplates().size() > 0) {
+				boolQuery = boolQuery.should(QueryBuilders.termsQuery(Dmp.MapKey.TEMPLATES.getName() + ".id.keyword", criteria.getTemplates().stream().map(UUID::toString).collect(Collectors.toList())));
+			}
+
+			if (criteria.getStatus() != null) {
+				boolQuery = boolQuery.should(QueryBuilders.termQuery(Dmp.MapKey.STATUS.getName(), criteria.getStatus().intValue()));
+			}
+
+			if (criteria.getGroupIds() != null && criteria.getGroupIds().size() > 0) {
+				boolQuery = boolQuery.should(QueryBuilders.termsQuery(Dmp.MapKey.GROUPID.getName(), criteria.getGroupIds().stream().map(UUID::toString).collect(Collectors.toList())));
+			}
+
+			if (criteria.getGrants() != null && criteria.getGrants().size() > 0) {
+				boolQuery = boolQuery.should(QueryBuilders.termsQuery(Dmp.MapKey.GRANT.getName() + ".keyword", criteria.getGrants().stream().map(UUID::toString).collect(Collectors.toList())));
+			}
+
+			if (criteria.getCollaborators() != null && criteria.getCollaborators().size() > 0) {
+				boolQuery = boolQuery.should(QueryBuilders.termsQuery(Dmp.MapKey.COLLABORATORS.getName() + ".keyword", criteria.getCollaborators().stream().map(UUID::toString).collect(Collectors.toList())));
+			}
+
+			if (!criteria.isAllowAllVersions()) {
+				boolQuery = boolQuery.should(QueryBuilders.termQuery(criteria.isPublic() ? Dmp.MapKey.LASTPUBLICVERSION.getName() : Dmp.MapKey.LASTVERSION.getName(), true));
+			}
+
+			if (criteria.getOrganizations() != null && criteria.getOrganizations().size() > 0) {
+				boolQuery = boolQuery.should(QueryBuilders.termsQuery(Dmp.MapKey.ORGANIZATIONS.getName() + ".id.keyword", criteria.getOrganizations().stream().map(UUID::toString).collect(Collectors.toList())));
+			}
+
+			if (criteria.getGrantStatus() != null) {
+				boolQuery = boolQuery.should(QueryBuilders.termQuery(Dmp.MapKey.GRANTSTATUS.getName(), criteria.getGrantStatus()));
+			}
+
+			if (boolQuery.should().isEmpty() && boolQuery.mustNot().isEmpty()) {
+				boolQuery = boolQuery.should(QueryBuilders.matchAllQuery());
+			} else {
+				boolQuery.minimumShouldMatch(boolQuery.should().size());
+			}
+			searchSourceBuilder.query(boolQuery);
+			searchRequest.source(searchSourceBuilder);
+			SearchResponse response = this.getClient().search(searchRequest, RequestOptions.DEFAULT);
+			return Arrays.stream(response.getHits().getHits()).map(x -> new Dmp().fromElasticEntity((Map<String, Object>) this.transformFromString(x.getSourceAsString(), Map.class))).collect(Collectors.toList());
 		}
-		if (criteria.getLike() != null && !criteria.getLike().isEmpty()) {
-			boolQuery = boolQuery.should(QueryBuilders.queryStringQuery(criteria.getLike()).fields(Stream.of(new Object[][] {
-					{ Dmp.MapKey.LABEL.getName(), 1.0f },
-					{ Dmp.MapKey.DESCRIPTION.getName(), 1.0f }
-			}).collect(Collectors.toMap(data -> (String) data[0], data -> (Float) data[1]))));
-		}
-
-		if (criteria.getTemplates() != null && criteria.getTemplates().size() > 0) {
-			boolQuery = boolQuery.should(QueryBuilders.termsQuery(Dmp.MapKey.TEMPLATES.getName() + ".id.keyword", criteria.getTemplates().stream().map(UUID::toString).collect(Collectors.toList())));
-		}
-
-		if (criteria.getStatus() != null) {
-			boolQuery = boolQuery.should(QueryBuilders.termQuery(Dmp.MapKey.STATUS.getName(), criteria.getStatus().intValue()));
-		}
-
-		if (criteria.getGroupIds() != null && criteria.getGroupIds().size() > 0) {
-			boolQuery = boolQuery.should(QueryBuilders.termsQuery(Dmp.MapKey.GROUPID.getName(), criteria.getGroupIds().stream().map(UUID::toString).collect(Collectors.toList())));
-		}
-
-		if (criteria.getGrants() != null && criteria.getGrants().size() > 0) {
-			boolQuery = boolQuery.should(QueryBuilders.termsQuery(Dmp.MapKey.GRANT.getName() + ".keyword", criteria.getGrants().stream().map(UUID::toString).collect(Collectors.toList())));
-		}
-
-		if (criteria.getCollaborators() != null && criteria.getCollaborators().size() > 0) {
-			boolQuery = boolQuery.should(QueryBuilders.termsQuery(Dmp.MapKey.COLLABORATORS.getName() + ".keyword", criteria.getCollaborators().stream().map(UUID::toString).collect(Collectors.toList())));
-		}
-
-		if (!criteria.isAllowAllVersions()) {
-			boolQuery = boolQuery.should(QueryBuilders.termQuery(criteria.isPublic() ? Dmp.MapKey.LASTPUBLICVERSION.getName() : Dmp.MapKey.LASTVERSION.getName(), true));
-		}
-
-		if (criteria.getOrganizations() != null && criteria.getOrganizations().size() > 0) {
-			boolQuery = boolQuery.should(QueryBuilders.termsQuery(Dmp.MapKey.ORGANIZATIONS.getName() + ".id.keyword", criteria.getOrganizations().stream().map(UUID::toString).collect(Collectors.toList())));
-		}
-
-		if (criteria.getGrantStatus() != null) {
-			boolQuery = boolQuery.should(QueryBuilders.termQuery(Dmp.MapKey.GRANTSTATUS.getName(), criteria.getGrantStatus()));
-		}
-
-		if (boolQuery.should().isEmpty() && boolQuery.mustNot().isEmpty()) {
-			boolQuery = boolQuery.should(QueryBuilders.matchAllQuery());
-		} else {
-			boolQuery.minimumShouldMatch(boolQuery.should().size());
-		}
-		searchSourceBuilder.query(boolQuery);
-		searchRequest.source(searchSourceBuilder);
-		SearchResponse response = this.getClient().search(searchRequest, RequestOptions.DEFAULT);
-		return Arrays.stream(response.getHits().getHits()).map(x -> new Dmp().fromElasticEntity((Map<String, Object>)this.transformFromString(x.getSourceAsString(), Map.class))).collect(Collectors.toList());
+		return null;
 	}
 
 	@Override
 	public boolean exists() throws IOException {
-		GetIndexRequest request = new GetIndexRequest("dmps");
-		return this.getClient().indices().exists(request, RequestOptions.DEFAULT);
+		if (this.getClient() != null) {
+			GetIndexRequest request = new GetIndexRequest("dmps");
+			return this.getClient().indices().exists(request, RequestOptions.DEFAULT);
+		}
+		return false;
 	}
 
 	@Override
diff --git a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/ElasticRepository.java b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/ElasticRepository.java
index aca4d8dea..11c7d1bca 100644
--- a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/ElasticRepository.java
+++ b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/ElasticRepository.java
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import eu.eudat.elastic.criteria.Criteria;
 import eu.eudat.elastic.entities.ElasticEntity;
 import org.elasticsearch.client.Client;
+import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestClient;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.slf4j.Logger;
@@ -23,7 +24,14 @@ public abstract class ElasticRepository<T extends ElasticEntity,C extends Criter
     }
 
     public ElasticRepository(RestHighLevelClient client) {
-        this.client = client;
+        try {
+            if (client.ping(RequestOptions.DEFAULT)) {
+                this.client = client;
+            }
+        } catch (IOException e) {
+            logger.warn("Unable to connect to Elastic Services");
+            this.client = null;
+        }
     }
 
     public  <T> T transformFromString(String value, Class<T> tClass) {
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index af0f0d226..c8bc4928d 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -720,13 +720,17 @@ public class DataManagementPlanManager {
             assignFunderUserIfInternal(newDmp, user);
             assignProjectUserIfInternal(newDmp, user);
             databaseRepository.getGrantDao().createOrUpdate(newDmp.getGrant());
-            newDmp = databaseRepository.getDmpDao().createOrUpdate(newDmp);
+            DMP tempDmp = databaseRepository.getDmpDao().createOrUpdate(newDmp);
+            newDmp.setId(tempDmp.getId());
 
             // Assign creator.
             assignUser(newDmp, user);
 
             copyDatasets(newDmp, databaseRepository.getDatasetDao());
 
+            newDmp.getUsers().clear();
+            newDmp.setUsers(new HashSet<>(databaseRepository.getUserDmpDao().asQueryable().where((builder, root) -> builder.equal(root.get("dmp").get("id"), newDmp.getId())).toList()));
+
             this.updateIndex(newDmp);
         } else {
             throw new DMPNewVersionException("Version to update not the latest.");
@@ -780,7 +784,11 @@ public class DataManagementPlanManager {
         apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().getWithCriteria(criteria1).toList().forEach(dmp -> {
             for (Dataset dataset: dmp.getDataset()) {
                 try {
-                    List<Tag> tags = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString()).getTags();
+                    List<Tag> tags = new ArrayList<>();
+                    eu.eudat.elastic.entities.Dataset elastic = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString());
+                    if (elastic != null) {
+                        tags = elastic.getTags();
+                    }
                     this.datasetManager.updateTags(dataset, tags);
                 } catch (Exception e) {
                     logger.error(e.getMessage(), e);
@@ -930,7 +938,11 @@ public class DataManagementPlanManager {
                     .thenApplyAsync(entityDataset -> {
                         Dataset newDataset = new Dataset();
                         try {
-                            List<Tag> tags = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString()).getTags();
+                            List<Tag> tags = new ArrayList<>();
+                            eu.eudat.elastic.entities.Dataset elastic = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString());
+                            if (elastic != null) {
+                                tags = elastic.getTags();
+                            }
                             this.datasetManager.updateTags(dataset, tags);
                         } catch (Exception e) {
                             logger.error(e.getMessage(), e);
@@ -1017,7 +1029,10 @@ public class DataManagementPlanManager {
                     datasetElastic.setGrantStatus(dataset1.getDmp().getGrant().getStatus());
 
                     try {
-                        datasetElastic.setTags(apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString()).getTags());
+                        eu.eudat.elastic.entities.Dataset oldDatasetElastic = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString());
+                        if (oldDatasetElastic != null) {
+                            datasetElastic.setTags(oldDatasetElastic.getTags());
+                        }
                         datasetElastic.setFormData(this.datasetManager.getWordDocumentText(dataset1));
                         apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().createOrUpdate(datasetElastic);
                     } catch (Exception e) {
@@ -1413,7 +1428,11 @@ public class DataManagementPlanManager {
                 }
                 dmp.setUsers(new HashSet<>(apiContext.getOperationsContext().getDatabaseRepository().getUserDmpDao().asQueryable().where((builder, root) -> builder.equal(root.get("dmp").get("id"), dmp.getId())).toList()));
                 try {
-                    List<Tag> tags = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString()).getTags();
+                    List<Tag> tags = new ArrayList<>();
+                    eu.eudat.elastic.entities.Dataset elastic = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString());
+                    if (elastic != null) {
+                        tags = elastic.getTags();
+                    }
                     datasetManager.updateTags(dataset, tags);
                 } catch (Exception e) {
                     logger.error(e.getMessage(), e);
@@ -1455,7 +1474,11 @@ public class DataManagementPlanManager {
         apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().getWithCriteria(criteria).toList().stream().forEach(dmp1 -> {
             dmp1.getDataset().forEach(dataset -> {
                 try {
-                    List<Tag> tags = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString()).getTags();
+                    List<Tag> tags = new ArrayList<>();
+                    eu.eudat.elastic.entities.Dataset elastic = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString());
+                    if (elastic != null) {
+                        tags = elastic.getTags();
+                    }
                     this.datasetManager.updateTags(dataset, tags);
                 } catch (Exception e) {
                     logger.error(e.getMessage(), e);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetWizardManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetWizardManager.java
index 6094951ef..b989d0153 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetWizardManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetWizardManager.java
@@ -52,9 +52,9 @@ public class DatasetWizardManager {
         Dataset oldDataset = apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao().find(uuid);
         eu.eudat.elastic.entities.Dataset oldDatasetElasitc = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(uuid.toString());
         oldDataset.setStatus(Dataset.Status.DELETED.getValue());
-        oldDatasetElasitc.setStatus(oldDataset.getStatus());
         apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao().createOrUpdate(oldDataset);
-        if (uuid != null && oldDatasetElasitc.getId()!= null) {
+        if (oldDatasetElasitc != null && uuid != null && oldDatasetElasitc.getId()!= null) {
+            oldDatasetElasitc.setStatus(oldDataset.getStatus());
             apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().createOrUpdate(oldDatasetElasitc);
         }
     }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DatasetMapper.java b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DatasetMapper.java
index c9a3723f0..c15de6329 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DatasetMapper.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DatasetMapper.java
@@ -26,7 +26,8 @@ public class DatasetMapper {
 
 	public Dataset toElastic(eu.eudat.data.entities.Dataset dataset, List<Tag> tags) throws Exception {
 		Dataset elastic = new Dataset();
-		elastic.setId(dataset.getId().toString());
+		eu.eudat.data.entities.Dataset tempDataset = apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao().find(dataset.getId());
+		elastic.setId(tempDataset.getId().toString());
 		if (tags != null && !tags.isEmpty()) {
 			DatasetCriteria criteria = new DatasetCriteria();
 			criteria.setTags(tags);
@@ -39,35 +40,35 @@ public class DatasetMapper {
 				elastic.setTags(tags1);
 			}
 		}
-		elastic.setLabel(dataset.getLabel());
-		elastic.setDescription(dataset.getDescription());
-		elastic.setTemplate(dataset.getProfile().getId());
-		elastic.setStatus(dataset.getStatus());
-		elastic.setDmp(dataset.getDmp().getId());
-		elastic.setGroup(dataset.getDmp().getGroupId());
-		elastic.setGrant(dataset.getDmp().getGrant().getId());
-		if (dataset.getDmp().getUsers() != null) {
-			elastic.setCollaborators(dataset.getDmp().getUsers().stream().map(user -> CollaboratorMapper.toElastic(user.getUser())).collect(Collectors.toList()));
+		elastic.setLabel(tempDataset.getLabel());
+		elastic.setDescription(tempDataset.getDescription());
+		elastic.setTemplate(tempDataset.getProfile().getId());
+		elastic.setStatus(tempDataset.getStatus());
+		elastic.setDmp(tempDataset.getDmp().getId());
+		elastic.setGroup(tempDataset.getDmp().getGroupId());
+		elastic.setGrant(tempDataset.getDmp().getGrant().getId());
+		if (tempDataset.getDmp().getUsers() != null) {
+			elastic.setCollaborators(tempDataset.getDmp().getUsers().stream().map(user -> CollaboratorMapper.toElastic(user.getUser())).collect(Collectors.toList()));
 		}
 		DataManagementPlanCriteria dmpCriteria = new DataManagementPlanCriteria();
 		dmpCriteria.setAllVersions(true);
-		dmpCriteria.setGroupIds(Collections.singletonList(dataset.getDmp().getGroupId()));
+		dmpCriteria.setGroupIds(Collections.singletonList(tempDataset.getDmp().getGroupId()));
 		apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().getWithCriteria(dmpCriteria).toList().stream()
-				  .max(Comparator.comparing(DMP::getVersion)).ifPresent(dmp -> elastic.setLastVersion(dmp.getId().equals(dataset.getDmp().getId())));
+				  .max(Comparator.comparing(DMP::getVersion)).ifPresent(dmp -> elastic.setLastVersion(dmp.getId().equals(tempDataset.getDmp().getId())));
 		apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().getWithCriteria(dmpCriteria).toList().stream().filter(DMP::isPublic)
-				  .max(Comparator.comparing(DMP::getVersion)).ifPresent(dmp -> elastic.setLastPublicVersion(dmp.getId().equals(dataset.getDmp().getId())));
+				  .max(Comparator.comparing(DMP::getVersion)).ifPresent(dmp -> elastic.setLastPublicVersion(dmp.getId().equals(tempDataset.getDmp().getId())));
 		if (elastic.getLastVersion() == null) {
 			elastic.setLastVersion(true);
 		}
 		if (elastic.getLastPublicVersion() == null) {
 			elastic.setLastPublicVersion(false);
 		}
-		if (dataset.getDmp().getOrganisations() != null) {
-			elastic.setOrganizations(dataset.getDmp().getOrganisations().stream().map(OrganizationMapper::toElastic).collect(Collectors.toList()));
+		if (tempDataset.getDmp().getOrganisations() != null) {
+			elastic.setOrganizations(tempDataset.getDmp().getOrganisations().stream().map(OrganizationMapper::toElastic).collect(Collectors.toList()));
 		}
-		elastic.setPublic(dataset.getDmp().isPublic());
-		elastic.setGrantStatus(dataset.getDmp().getGrant().getStatus());
-		elastic.setFormData(datasetManager.getWordDocumentText(dataset));
+		elastic.setPublic(tempDataset.getDmp().isPublic());
+		elastic.setGrantStatus(tempDataset.getDmp().getGrant().getStatus());
+		elastic.setFormData(datasetManager.getWordDocumentText(tempDataset));
 
 		return elastic;
 	}

From 07da2278cbd939dcd9e00ddcc90013e2a8285c7b Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Fri, 3 Apr 2020 18:40:03 +0300
Subject: [PATCH 11/60] Add Zenodo Login and the ability to use it's access
 token for DOI creation

---
 .../main/java/eu/eudat/controllers/Login.java |  25 ++++--
 .../model/models/PrincipalBuilder.java        |  15 ++++
 .../managers/DataManagementPlanManager.java   |  15 ++--
 .../Zenodo/ZenodoCustomProvider.java          |   8 ++
 .../Zenodo/ZenodoCustomProviderImpl.java      |  72 +++++++++++++++
 .../customproviders/Zenodo/ZenodoUser.java    |  49 ++++++++++
 .../validators/TokenValidatorFactoryImpl.java |  14 ++-
 .../zenodo/ZenodoTokenValidator.java          |  57 ++++++++++++
 .../zenodo/helpers/ZenodoRequest.java         |  12 +++
 .../zenodo/helpers/ZenodoResponseToken.java   |  38 ++++++++
 .../AbstractAuthenticationService.java        |  13 ++-
 ...erifiedUserEmailAuthenticationService.java |  15 ++++
 .../VerifiedUserAuthenticationService.java    |  15 ++++
 .../data/loginprovider/LoginProviderUser.java |  18 ++++
 .../eudat/models/data/security/Principal.java |  19 ++++
 .../config/application-devel.properties       |   4 +
 .../src/app/core/common/enum/auth-provider.ts |   3 +-
 .../login-providers.model.ts                  |   6 ++
 .../core/model/zenodo/zenodo-token.model.ts   |   6 ++
 .../ui/auth/login/img/zenodo-white-200.png    | Bin 0 -> 2383 bytes
 .../app/ui/auth/login/login.component.html    |   6 ++
 .../app/ui/auth/login/login.component.scss    |  19 ++++
 .../src/app/ui/auth/login/login.component.ts  |   9 ++
 .../src/app/ui/auth/login/login.module.ts     |   4 +-
 .../src/app/ui/auth/login/login.routing.ts    |   4 +-
 .../zenodo-login/zenodo-login.component.html  |   0
 .../zenodo-login/zenodo-login.component.scss  |   0
 .../zenodo-login/zenodo-login.component.ts    |  85 ++++++++++++++++++
 dmp-frontend/src/assets/config/config.json    |   7 +-
 29 files changed, 518 insertions(+), 20 deletions(-)
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProvider.java
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProviderImpl.java
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoUser.java
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/ZenodoTokenValidator.java
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/helpers/ZenodoRequest.java
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/helpers/ZenodoResponseToken.java
 create mode 100644 dmp-frontend/src/app/core/model/zenodo/zenodo-token.model.ts
 create mode 100644 dmp-frontend/src/app/ui/auth/login/img/zenodo-white-200.png
 create mode 100644 dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.html
 create mode 100644 dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.scss
 create mode 100644 dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.ts

diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java
index 78304aa20..16af6f14f 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java
@@ -22,6 +22,9 @@ import eu.eudat.logic.security.validators.orcid.ORCIDTokenValidator;
 import eu.eudat.logic.security.validators.orcid.helpers.ORCIDRequest;
 import eu.eudat.logic.security.validators.orcid.helpers.ORCIDResponseToken;
 import eu.eudat.logic.security.validators.twitter.TwitterTokenValidator;
+import eu.eudat.logic.security.validators.zenodo.ZenodoTokenValidator;
+import eu.eudat.logic.security.validators.zenodo.helpers.ZenodoRequest;
+import eu.eudat.logic.security.validators.zenodo.helpers.ZenodoResponseToken;
 import eu.eudat.logic.services.operations.authentication.AuthenticationService;
 import eu.eudat.models.data.helpers.responses.ResponseItem;
 import eu.eudat.models.data.login.Credentials;
@@ -54,28 +57,34 @@ public class Login {
     private LinkedInTokenValidator linkedInTokenValidator;
     private OpenAIRETokenValidator openAIRETokenValidator;
     private ConfigurableProviderTokenValidator configurableProviderTokenValidator;
+    private ZenodoTokenValidator zenodoTokenValidator;
     private ConfigLoader configLoader;
 
 //    private Logger logger;
 
     private UserManager userManager;
+
     @Autowired
-    public Login(CustomAuthenticationProvider customAuthenticationProvider, AuthenticationService nonVerifiedUserAuthenticationService,
-                 TwitterTokenValidator twitterTokenValidator, LinkedInTokenValidator linkedInTokenValidator, B2AccessTokenValidator b2AccessTokenValidator,
-                 ORCIDTokenValidator orcidTokenValidator, OpenAIRETokenValidator openAIRETokenValidator, ConfigurableProviderTokenValidator configurableProviderTokenValidator, ConfigLoader configLoader, UserManager userManager/*, Logger logger*/) {
+    public Login(CustomAuthenticationProvider customAuthenticationProvider,
+                 AuthenticationService nonVerifiedUserAuthenticationService, TwitterTokenValidator twitterTokenValidator,
+                 B2AccessTokenValidator b2AccessTokenValidator, ORCIDTokenValidator orcidTokenValidator,
+                 LinkedInTokenValidator linkedInTokenValidator, OpenAIRETokenValidator openAIRETokenValidator,
+                 ConfigurableProviderTokenValidator configurableProviderTokenValidator, ZenodoTokenValidator zenodoTokenValidator,
+                 ConfigLoader configLoader, UserManager userManager) {
         this.customAuthenticationProvider = customAuthenticationProvider;
         this.nonVerifiedUserAuthenticationService = nonVerifiedUserAuthenticationService;
         this.twitterTokenValidator = twitterTokenValidator;
-        this.linkedInTokenValidator = linkedInTokenValidator;
         this.b2AccessTokenValidator = b2AccessTokenValidator;
         this.orcidTokenValidator = orcidTokenValidator;
+        this.linkedInTokenValidator = linkedInTokenValidator;
         this.openAIRETokenValidator = openAIRETokenValidator;
         this.configurableProviderTokenValidator = configurableProviderTokenValidator;
+        this.zenodoTokenValidator = zenodoTokenValidator;
         this.configLoader = configLoader;
-//        this.logger = logger;
         this.userManager = userManager;
     }
 
+
     @Transactional
     @RequestMapping(method = RequestMethod.POST, value = {"/externallogin"}, consumes = "application/json", produces = "application/json")
     public @ResponseBody
@@ -128,6 +137,12 @@ public class Login {
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<ConfigurableProviderResponseToken>().payload(this.configurableProviderTokenValidator.getAccessToken(configurableProviderRequest)).status(ApiMessageCode.NO_MESSAGE));
     }
 
+    @RequestMapping(method = RequestMethod.POST, value = {"/zenodoRequestToken"}, produces = "application/json", consumes = "application/json")
+    public @ResponseBody
+    ResponseEntity<ResponseItem<ZenodoResponseToken>> ZenodoRequestToken(@RequestBody ZenodoRequest zenodoRequest) {
+        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<ZenodoResponseToken>().payload(this.zenodoTokenValidator.getAccessToken(zenodoRequest)).status(ApiMessageCode.NO_MESSAGE));
+    }
+
     @RequestMapping(method = RequestMethod.POST, value = {"/me"}, consumes = "application/json", produces = "application/json")
     public @ResponseBody
     ResponseEntity<ResponseItem<Principal>> authMe(Principal principal) throws NullEmailException {
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/PrincipalBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/PrincipalBuilder.java
index 133d5e179..35ce34035 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/PrincipalBuilder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/PrincipalBuilder.java
@@ -4,6 +4,7 @@ import eu.eudat.logic.builders.Builder;
 import eu.eudat.models.data.security.Principal;
 import eu.eudat.types.Authorities;
 
+import java.time.Instant;
 import java.util.Date;
 import java.util.Set;
 import java.util.UUID;
@@ -22,6 +23,8 @@ public class PrincipalBuilder extends Builder<Principal> {
     private String culture;
     private String language;
     private String timezone;
+    private String zenodoToken;
+    private Instant zenodoDuration;
 
     public PrincipalBuilder id(UUID id) {
         this.id = id;
@@ -68,6 +71,16 @@ public class PrincipalBuilder extends Builder<Principal> {
         return this;
     }
 
+    public PrincipalBuilder zenodoToken(String zenodoToken) {
+        this.zenodoToken = zenodoToken;
+        return this;
+    }
+
+    public PrincipalBuilder zenodoDuration(Instant zenodoDuration) {
+        this.zenodoDuration = zenodoDuration;
+        return this;
+    }
+
     @Override
     public Principal build() {
         Principal principal = new Principal();
@@ -80,6 +93,8 @@ public class PrincipalBuilder extends Builder<Principal> {
         principal.setCulture(culture);
         principal.setLanguage(language);
         principal.setTimezone(timezone);
+        principal.setZenodoToken(zenodoToken);
+        principal.setZenodoDuration(zenodoDuration);
         return principal;
     }
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index c8bc4928d..3883eb865 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -1561,6 +1561,7 @@ public class DataManagementPlanManager {
         if (dmp.getDoi() != null)
             throw new Exception("DMP already has a DOI");
 
+        String zenodoToken = principal.getZenodoToken() != null && !principal.getZenodoToken().isEmpty() ? principal.getZenodoToken() : this.environment.getProperty("zenodo.access_token");
         // First step, post call to Zenodo, to create the entry.
         RestTemplate restTemplate = new RestTemplate();
         HttpHeaders headers = new HttpHeaders();
@@ -1585,34 +1586,34 @@ public class DataManagementPlanManager {
         String previousDOI = this.getPreviousDOI(dmp.getGroupId(), dmp.getId());
         try {
         if (previousDOI == null) {
-            String createUrl = this.environment.getProperty("zenodo.url") + "deposit/depositions" + "?access_token=" + this.environment.getProperty("zenodo.access_token");
+            String createUrl = this.environment.getProperty("zenodo.url") + "deposit/depositions" + "?access_token=" + zenodoToken;
             createResponse = restTemplate.postForEntity(createUrl, request, Map.class).getBody();
             links = (LinkedHashMap<String, String>) createResponse.get("links");
         } else {
             //It requires more than one step to create a new version
             //First, get the deposit related to the concept DOI
-                String listUrl = this.environment.getProperty("zenodo.url") + "deposit/depositions" + "?q=conceptdoi:\"" + previousDOI + "\"&access_token=" + this.environment.getProperty("zenodo.access_token");
+                String listUrl = this.environment.getProperty("zenodo.url") + "deposit/depositions" + "?q=conceptdoi:\"" + previousDOI + "\"&access_token=" + zenodoToken;
                 ResponseEntity<Map[]> listResponses = restTemplate.getForEntity(listUrl, Map[].class);
                 createResponse = listResponses.getBody()[0];
                 links = (LinkedHashMap<String, String>) createResponse.get("links");
                 //Second, make the new version (not in the links?)
-                String newVersionUrl = links.get("self") + "/actions/newversion" + "?access_token=" + this.environment.getProperty("zenodo.access_token");
+                String newVersionUrl = links.get("self") + "/actions/newversion" + "?access_token=" + zenodoToken;
                 createResponse = restTemplate.postForObject(newVersionUrl, null, Map.class);
                 links = (LinkedHashMap<String, String>) createResponse.get("links");
                 //Third, get the new deposit
-                String latestDraftUrl = links.get("latest_draft") + "?access_token=" + this.environment.getProperty("zenodo.access_token");
+                String latestDraftUrl = links.get("latest_draft") + "?access_token=" + zenodoToken;
                 createResponse = restTemplate.getForObject(latestDraftUrl, Map.class);
                 links = (LinkedHashMap<String, String>) createResponse.get("links");
                 //At this point it might fail to perform the next requests so enclose them with try catch
                 try {
                     //Forth, update the new deposit's metadata
-                    String updateUrl = links.get("self") + "?access_token=" + this.environment.getProperty("zenodo.access_token");
+                    String updateUrl = links.get("self") + "?access_token=" + zenodoToken;
                     restTemplate.put(updateUrl, request);
                     //And finally remove pre-existing files from it
-                    String fileListUrl = links.get("self") + "/files" + "?access_token=" + this.environment.getProperty("zenodo.access_token");
+                    String fileListUrl = links.get("self") + "/files" + "?access_token=" + zenodoToken;
                     ResponseEntity<Map[]> fileListResponse = restTemplate.getForEntity(fileListUrl, Map[].class);
                     for (Map file : fileListResponse.getBody()) {
-                        String fileDeleteUrl = links.get("self") + "/files/" + file.get("id") + "?access_token=" + this.environment.getProperty("zenodo.access_token");
+                        String fileDeleteUrl = links.get("self") + "/files/" + file.get("id") + "?access_token=" + zenodoToken;
                         restTemplate.delete(fileDeleteUrl);
                     }
                 }catch (Exception e) {
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProvider.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProvider.java
new file mode 100644
index 000000000..b14c3a963
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProvider.java
@@ -0,0 +1,8 @@
+package eu.eudat.logic.security.customproviders.Zenodo;
+
+import eu.eudat.logic.security.validators.orcid.helpers.ORCIDResponseToken;
+import eu.eudat.logic.security.validators.zenodo.helpers.ZenodoResponseToken;
+
+public interface ZenodoCustomProvider {
+    ZenodoResponseToken getAccessToken(String code, String clientId, String clientSecret, String redirectUri);
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProviderImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProviderImpl.java
new file mode 100644
index 000000000..b527af2fe
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProviderImpl.java
@@ -0,0 +1,72 @@
+package eu.eudat.logic.security.customproviders.Zenodo;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import eu.eudat.logic.security.validators.orcid.helpers.ORCIDResponseToken;
+import eu.eudat.logic.security.validators.zenodo.helpers.ZenodoResponseToken;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.RestTemplate;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Map;
+
+@Component("ZenodoCustomProvider")
+public class ZenodoCustomProviderImpl implements ZenodoCustomProvider {
+    private static final Logger logger = LoggerFactory.getLogger(ZenodoCustomProviderImpl.class);
+
+    private Environment environment;
+
+    @Autowired
+    public ZenodoCustomProviderImpl(Environment environment) {
+        this.environment = environment;
+    }
+
+    @Override
+    public ZenodoResponseToken getAccessToken(String code, String clientId, String clientSecret, String redirectUri) {
+        RestTemplate restTemplate = new RestTemplate();
+        HttpHeaders headers = new HttpHeaders();
+        headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
+        headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+
+        MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
+        map.add("client_id", clientId);
+        map.add("client_secret", clientSecret);
+        map.add("grant_type", "authorization_code");
+        map.add("code", code);
+        map.add("redirect_uri", redirectUri);
+        HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<>(map, headers);
+
+        try {
+            Map<String, Object> values = restTemplate.postForObject(this.environment.getProperty("zenodo.login.access_token_url"), request, Map.class);
+            ZenodoResponseToken zenodoResponseToken = new ZenodoResponseToken();
+            Map<String, Object> user = (Map<String, Object>) values.get("user");
+            zenodoResponseToken.setUserId((String) user.get("id"));
+            zenodoResponseToken.setEmail((String) user.get("email"));
+            zenodoResponseToken.setExpiresIn((Integer) values.get("expires_in"));
+            zenodoResponseToken.setAccessToken((String) values.get("access_token"));
+
+            return zenodoResponseToken;
+        } catch (HttpClientErrorException ex) {
+            logger.error(ex.getResponseBodyAsString(), ex);
+        }
+
+        return null;
+    }
+
+    private HttpHeaders createBearerAuthHeaders(String accessToken) {
+        return new HttpHeaders() {{
+            String authHeader = "Bearer " + accessToken;
+            set("Authorization", authHeader);
+        }};
+    }
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoUser.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoUser.java
new file mode 100644
index 000000000..cbcb95928
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoUser.java
@@ -0,0 +1,49 @@
+package eu.eudat.logic.security.customproviders.Zenodo;
+
+import java.util.Map;
+
+public class ZenodoUser {
+    private String userId;
+    private String email;
+    private String accessToken;
+    private Integer expiresIn;
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getAccessToken() {
+        return accessToken;
+    }
+
+    public void setAccessToken(String accessToken) {
+        this.accessToken = accessToken;
+    }
+
+    public Integer getExpiresIn() {
+        return expiresIn;
+    }
+
+    public void setExpiresIn(Integer expiresIn) {
+        this.expiresIn = expiresIn;
+    }
+
+    public ZenodoUser getZenodoUser(Object data) {
+        this.userId = (String) ((Map) data).get("userId");
+        this.email = (String) ((Map) data).get("email");
+        this.accessToken = (String) ((Map) data).get("accessToken");
+        this.expiresIn = (Integer) ((Map) data).get("expiresIn");
+        return this;
+    }
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/TokenValidatorFactoryImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/TokenValidatorFactoryImpl.java
index 9b594c96e..c079d24a5 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/TokenValidatorFactoryImpl.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/TokenValidatorFactoryImpl.java
@@ -6,6 +6,7 @@ import eu.eudat.logic.security.customproviders.ConfigurableProvider.Configurable
 import eu.eudat.logic.security.customproviders.LinkedIn.LinkedInCustomProvider;
 import eu.eudat.logic.security.customproviders.ORCID.ORCIDCustomProvider;
 import eu.eudat.logic.security.customproviders.OpenAIRE.OpenAIRECustomProvider;
+import eu.eudat.logic.security.customproviders.Zenodo.ZenodoCustomProvider;
 import eu.eudat.logic.security.validators.b2access.B2AccessTokenValidator;
 import eu.eudat.logic.security.validators.configurableProvider.ConfigurableProviderTokenValidator;
 import eu.eudat.logic.security.validators.facebook.FacebookTokenValidator;
@@ -14,6 +15,7 @@ import eu.eudat.logic.security.validators.linkedin.LinkedInTokenValidator;
 import eu.eudat.logic.security.validators.openaire.OpenAIRETokenValidator;
 import eu.eudat.logic.security.validators.orcid.ORCIDTokenValidator;
 import eu.eudat.logic.security.validators.twitter.TwitterTokenValidator;
+import eu.eudat.logic.security.validators.zenodo.ZenodoTokenValidator;
 import eu.eudat.logic.services.operations.authentication.AuthenticationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
@@ -23,7 +25,7 @@ import org.springframework.stereotype.Service;
 @Service("tokenValidatorFactory")
 public class TokenValidatorFactoryImpl implements TokenValidatorFactory {
     public enum LoginProvider {
-        GOOGLE(1), FACEBOOK(2), TWITTER(3), LINKEDIN(4), NATIVELOGIN(5), B2_ACCESS(6), ORCID(7), OPENAIRE(8), CONFIGURABLE(9);
+        GOOGLE(1), FACEBOOK(2), TWITTER(3), LINKEDIN(4), NATIVELOGIN(5), B2_ACCESS(6), ORCID(7), OPENAIRE(8), CONFIGURABLE(9), ZENODO(10);
 
         private int value;
 
@@ -55,6 +57,8 @@ public class TokenValidatorFactoryImpl implements TokenValidatorFactory {
                     return OPENAIRE;
                 case 9:
                     return CONFIGURABLE;
+                case 10:
+                    return ZENODO;
                 default:
                     throw new RuntimeException("Unsupported LoginProvider");
             }
@@ -69,12 +73,15 @@ public class TokenValidatorFactoryImpl implements TokenValidatorFactory {
     private OpenAIRECustomProvider openAIRECustomProvider;
     private ConfigurableProviderCustomProvider configurableProviderCustomProvider;
     private ConfigLoader configLoader;
+    private ZenodoCustomProvider zenodoCustomProvider;
 
     @Autowired
     public TokenValidatorFactoryImpl(
             Environment environment,
             AuthenticationService nonVerifiedUserAuthenticationService, B2AccessCustomProvider b2AccessCustomProvider,
-            ORCIDCustomProvider orcidCustomProvider, LinkedInCustomProvider linkedInCustomProvider, OpenAIRECustomProvider openAIRECustomProvider, ConfigurableProviderCustomProvider configurableProviderCustomProvider, ConfigLoader configLoader) {
+            ORCIDCustomProvider orcidCustomProvider, LinkedInCustomProvider linkedInCustomProvider, OpenAIRECustomProvider openAIRECustomProvider,
+            ConfigurableProviderCustomProvider configurableProviderCustomProvider, ConfigLoader configLoader,
+            ZenodoCustomProvider zenodoCustomProvider) {
         this.environment = environment;
         this.nonVerifiedUserAuthenticationService = nonVerifiedUserAuthenticationService;
         this.b2AccessCustomProvider = b2AccessCustomProvider;
@@ -83,6 +90,7 @@ public class TokenValidatorFactoryImpl implements TokenValidatorFactory {
         this.openAIRECustomProvider = openAIRECustomProvider;
         this.configurableProviderCustomProvider = configurableProviderCustomProvider;
         this.configLoader = configLoader;
+        this.zenodoCustomProvider = zenodoCustomProvider;
     }
 
     public TokenValidator getProvider(LoginProvider provider) {
@@ -103,6 +111,8 @@ public class TokenValidatorFactoryImpl implements TokenValidatorFactory {
                 return new OpenAIRETokenValidator(this.environment, this.nonVerifiedUserAuthenticationService, this.openAIRECustomProvider);
             case CONFIGURABLE:
                 return new ConfigurableProviderTokenValidator(this.configurableProviderCustomProvider, this.nonVerifiedUserAuthenticationService, this.configLoader);
+            case ZENODO:
+                return new ZenodoTokenValidator(this.environment, this.nonVerifiedUserAuthenticationService, this.zenodoCustomProvider);
             default:
                 throw new RuntimeException("Login Provider Not Implemented");
         }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/ZenodoTokenValidator.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/ZenodoTokenValidator.java
new file mode 100644
index 000000000..2708a96b2
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/ZenodoTokenValidator.java
@@ -0,0 +1,57 @@
+package eu.eudat.logic.security.validators.zenodo;
+
+import eu.eudat.exceptions.security.NonValidTokenException;
+import eu.eudat.exceptions.security.NullEmailException;
+import eu.eudat.logic.security.customproviders.ORCID.ORCIDCustomProvider;
+import eu.eudat.logic.security.customproviders.ORCID.ORCIDUser;
+import eu.eudat.logic.security.customproviders.Zenodo.ZenodoCustomProvider;
+import eu.eudat.logic.security.customproviders.Zenodo.ZenodoUser;
+import eu.eudat.logic.security.validators.TokenValidator;
+import eu.eudat.logic.security.validators.zenodo.helpers.ZenodoRequest;
+import eu.eudat.logic.security.validators.zenodo.helpers.ZenodoResponseToken;
+import eu.eudat.logic.services.operations.authentication.AuthenticationService;
+import eu.eudat.models.data.login.LoginInfo;
+import eu.eudat.models.data.loginprovider.LoginProviderUser;
+import eu.eudat.models.data.security.Principal;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+
+@Component("zenodoTokenValidator")
+public class ZenodoTokenValidator implements TokenValidator {
+
+	private ZenodoCustomProvider zenodoCustomProvider;
+	private Environment environment;
+	private AuthenticationService nonVerifiedUserAuthenticationService;
+
+	@Autowired
+	public ZenodoTokenValidator(Environment environment, AuthenticationService nonVerifiedUserAuthenticationService, ZenodoCustomProvider zenodoCustomProvider) {
+		this.environment = environment;
+		this.nonVerifiedUserAuthenticationService = nonVerifiedUserAuthenticationService;
+		this.zenodoCustomProvider = zenodoCustomProvider;
+	}
+
+	@Override
+	public Principal validateToken(LoginInfo credentials) throws NonValidTokenException, IOException, GeneralSecurityException, NullEmailException {
+		ZenodoUser zenodoUser = new ZenodoUser().getZenodoUser(credentials.getData());
+		LoginProviderUser user = new LoginProviderUser();
+		user.setId(zenodoUser.getUserId());
+		user.setName(zenodoUser.getEmail());
+		user.setEmail(zenodoUser.getEmail());
+		user.setZenodoId(zenodoUser.getAccessToken());
+		user.setZenodoExpire(zenodoUser.getExpiresIn());
+		user.setProvider(credentials.getProvider());
+		user.setSecret(credentials.getTicket());
+		return this.nonVerifiedUserAuthenticationService.Touch(user);
+	}
+
+	public ZenodoResponseToken getAccessToken(ZenodoRequest zenodoRequest) {
+		return this.zenodoCustomProvider.getAccessToken(zenodoRequest.getCode()
+				, this.environment.getProperty("zenodo.login.client_id")
+				, this.environment.getProperty("zenodo.login.client_secret")
+				, this.environment.getProperty("zenodo.login.redirect_uri"));
+	}
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/helpers/ZenodoRequest.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/helpers/ZenodoRequest.java
new file mode 100644
index 000000000..c1f4ea32a
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/helpers/ZenodoRequest.java
@@ -0,0 +1,12 @@
+package eu.eudat.logic.security.validators.zenodo.helpers;
+
+public class ZenodoRequest {
+    private String code;
+
+    public String getCode() {
+        return code;
+    }
+    public void setCode(String code) {
+        this.code = code;
+    }
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/helpers/ZenodoResponseToken.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/helpers/ZenodoResponseToken.java
new file mode 100644
index 000000000..5b437cdfb
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/helpers/ZenodoResponseToken.java
@@ -0,0 +1,38 @@
+package eu.eudat.logic.security.validators.zenodo.helpers;
+
+public class ZenodoResponseToken {
+    private String userId;
+    private String email;
+    private Integer expiresIn;
+    private String accessToken;
+
+    public String getUserId() {
+        return userId;
+    }
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public Integer getExpiresIn() {
+        return expiresIn;
+    }
+
+    public void setExpiresIn(Integer expiresIn) {
+        this.expiresIn = expiresIn;
+    }
+
+    public String getAccessToken() {
+        return accessToken;
+    }
+    public void setAccessToken(String accessToken) {
+        this.accessToken = accessToken;
+    }
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java
index cb7506ab6..fc09056fa 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java
@@ -20,6 +20,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.core.env.Environment;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.Instant;
 import java.util.*;
 
 public abstract class AbstractAuthenticationService implements AuthenticationService {
@@ -132,7 +133,7 @@ public abstract class AbstractAuthenticationService implements AuthenticationSer
 			userInfo = this.apiContext.getOperationsContext().getBuilderFactory().getBuilder(UserInfoBuilder.class)
 					.name(profile.getName()).verified_email(profile.getIsVerified())
 					.email(profile.getEmail()).created(new Date()).lastloggedin(new Date())
-					.additionalinfo("{\"data\":{\"avatar\":{\"url\":\"" + profile.getAvatarUrl() + "\"}}}")
+					.additionalinfo("{\"data\":{\"avatar\":{\"url\":\"" + profile.getAvatarUrl() + "\"}},{\"zenodoToken\":\"" + profile.getZenodoId() + "\", \"expirationDate\": \"" + Instant.now().plusSeconds(profile.getZenodoExpire()).toEpochMilli() + "\"}")
 					.authorization_level((short) 1).usertype((short) 1)
 					.build();
 
@@ -149,7 +150,15 @@ public abstract class AbstractAuthenticationService implements AuthenticationSer
 		} else {
 			Map<String, Object> additionalInfo = userInfo.getAdditionalinfo() != null ?
 					new JSONObject(userInfo.getAdditionalinfo()).toMap() : new HashMap<>();
-			additionalInfo.put("avatarUrl", profile.getAvatarUrl());
+			if (profile.getAvatarUrl() != null && !profile.getAvatarUrl().isEmpty() && !profile.getAvatarUrl().equals("null")) {
+				additionalInfo.put("avatarUrl", profile.getAvatarUrl());
+			}
+			if (profile.getZenodoId() != null && !profile.getZenodoId().isEmpty() && !profile.getZenodoId().equals("null")) {
+				additionalInfo.put("zenodoToken", profile.getZenodoId());
+			}
+			if (profile.getZenodoExpire() != null) {
+				additionalInfo.put("expirationDate", Instant.now().plusSeconds(profile.getZenodoExpire()).toEpochMilli());
+			}
 			userInfo.setLastloggedin(new Date());
 			userInfo.setAdditionalinfo(new JSONObject(additionalInfo).toString());
 			Set<Credential> credentials = userInfo.getCredentials();
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/NonVerifiedUserEmailAuthenticationService.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/NonVerifiedUserEmailAuthenticationService.java
index 62c5f60ae..159bbb235 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/NonVerifiedUserEmailAuthenticationService.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/NonVerifiedUserEmailAuthenticationService.java
@@ -11,6 +11,7 @@ import eu.eudat.types.Authorities;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 
+import java.time.Instant;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
@@ -33,6 +34,18 @@ public class NonVerifiedUserEmailAuthenticationService extends AbstractAuthentic
 		} catch (Exception e) {
 			avatarUrl = "";
 		}
+		String zenodoToken;
+		try {
+			zenodoToken = user.getAdditionalinfo() != null ? new ObjectMapper().readTree(user.getAdditionalinfo()).get("zenodoToken").asText() : "";
+		} catch (Exception e) {
+			zenodoToken = "";
+		}
+		Instant zenodoDuration;
+		try {
+			zenodoDuration = user.getAdditionalinfo() != null ? Instant.ofEpochMilli(new ObjectMapper().readTree(user.getAdditionalinfo()).get("expirationDate").asLong()) : Instant.now();
+		} catch (Exception e) {
+			zenodoDuration = Instant.now();
+		}
 		String culture;
 		try {
 			culture = user.getAdditionalinfo() != null ? new ObjectMapper().readTree(user.getAdditionalinfo()).get("culture").get("name").asText() : "";
@@ -58,6 +71,8 @@ public class NonVerifiedUserEmailAuthenticationService extends AbstractAuthentic
 				.culture(culture)
 				.language(language)
 				.timezone(timezone)
+				.zenodoToken(zenodoToken)
+				.zenodoDuration(zenodoDuration)
 				.build();
 
 		List<UserRole> userRoles = apiContext.getOperationsContext().getDatabaseRepository().getUserRoleDao().getUserRoles(user);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/VerifiedUserAuthenticationService.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/VerifiedUserAuthenticationService.java
index acbb3dc86..c03e81934 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/VerifiedUserAuthenticationService.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/VerifiedUserAuthenticationService.java
@@ -20,6 +20,7 @@ import org.json.JSONObject;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 
+import java.time.Instant;
 import java.util.*;
 
 
@@ -42,6 +43,18 @@ public class VerifiedUserAuthenticationService extends AbstractAuthenticationSer
 		} catch (Exception e) {
 			avatarUrl = "";
 		}
+		String zenodoToken;
+		try {
+			zenodoToken = user.getAdditionalinfo() != null ? new ObjectMapper().readTree(user.getAdditionalinfo()).get("zenodoToken").asText() : "";
+		} catch (Exception e) {
+			zenodoToken = "";
+		}
+		Instant zenodoDuration;
+		try {
+			zenodoDuration = user.getAdditionalinfo() != null ? Instant.ofEpochMilli(new ObjectMapper().readTree(user.getAdditionalinfo()).get("expirationDate").asLong()) : Instant.now();
+		} catch (Exception e) {
+			zenodoDuration = Instant.now();
+		}
 		String culture;
 		try {
 			culture = user.getAdditionalinfo() != null ? new ObjectMapper().readTree(user.getAdditionalinfo()).get("culture").get("name").asText() : "";
@@ -67,6 +80,8 @@ public class VerifiedUserAuthenticationService extends AbstractAuthenticationSer
 				.culture(culture)
 				.language(language)
 				.timezone(timezone)
+				.zenodoToken(zenodoToken)
+				.zenodoDuration(zenodoDuration)
 				.build();
 
 		List<UserRole> userRoles = apiContext.getOperationsContext().getDatabaseRepository().getUserRoleDao().getUserRoles(user);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/loginprovider/LoginProviderUser.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/loginprovider/LoginProviderUser.java
index e1b0a6d41..13f5b9371 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/loginprovider/LoginProviderUser.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/loginprovider/LoginProviderUser.java
@@ -11,6 +11,8 @@ public class LoginProviderUser {
     private String avatarUrl;
     private boolean isVerified;
     private TokenValidatorFactoryImpl.LoginProvider provider;
+    private String zenodoId;
+    private Integer zenodoExpire;
 
     public String getId() {
         return id;
@@ -67,4 +69,20 @@ public class LoginProviderUser {
     public void setAvatarUrl(String avatarUrl) {
         this.avatarUrl = avatarUrl;
     }
+
+    public String getZenodoId() {
+        return zenodoId;
+    }
+
+    public void setZenodoId(String zenodoId) {
+        this.zenodoId = zenodoId;
+    }
+
+    public Integer getZenodoExpire() {
+        return zenodoExpire;
+    }
+
+    public void setZenodoExpire(Integer zenodoExpire) {
+        this.zenodoExpire = zenodoExpire;
+    }
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/security/Principal.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/security/Principal.java
index 5399b5466..f0e017e84 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/security/Principal.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/security/Principal.java
@@ -3,6 +3,7 @@ package eu.eudat.models.data.security;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import eu.eudat.types.Authorities;
 
+import java.time.Instant;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -17,6 +18,8 @@ public class Principal {
     private String culture;
     private String language;
     private String timezone;
+    private String zenodoToken;
+    private Instant zenodoDuration;
 
     public UUID getId() {
         return id;
@@ -86,6 +89,22 @@ public class Principal {
         this.timezone = timezone;
     }
 
+    public String getZenodoToken() {
+        return zenodoToken;
+    }
+
+    public void setZenodoToken(String zenodoToken) {
+        this.zenodoToken = zenodoToken;
+    }
+
+    public Instant getZenodoDuration() {
+        return zenodoDuration;
+    }
+
+    public void setZenodoDuration(Instant zenodoDuration) {
+        this.zenodoDuration = zenodoDuration;
+    }
+
     @JsonIgnore
     public Set<Authorities> getAuthz() {
         return this.authorities;
diff --git a/dmp-backend/web/src/main/resources/config/application-devel.properties b/dmp-backend/web/src/main/resources/config/application-devel.properties
index 59d292b11..7051f6667 100644
--- a/dmp-backend/web/src/main/resources/config/application-devel.properties
+++ b/dmp-backend/web/src/main/resources/config/application-devel.properties
@@ -69,6 +69,10 @@ conf_email.subject=OpenDMP email confirmation
 #############ZENODO CONFIGURATIONS#########
 zenodo.url=https://sandbox.zenodo.org/api/
 zenodo.access_token=
+zenodo.login.access_token_url=https://sandbox.zenodo.org/oauth/token
+zenodo.login.client_id=
+zenodo.login.client_secret=
+zenodo.login.redirect_uri=http://localhost:4200/login/external/zenodo
 
 #############CONTACT EMAIL CONFIGURATIONS#########
 contact_email.mail=
diff --git a/dmp-frontend/src/app/core/common/enum/auth-provider.ts b/dmp-frontend/src/app/core/common/enum/auth-provider.ts
index b8b70efd8..11c36b2a9 100644
--- a/dmp-frontend/src/app/core/common/enum/auth-provider.ts
+++ b/dmp-frontend/src/app/core/common/enum/auth-provider.ts
@@ -7,5 +7,6 @@ export enum AuthProvider {
 	B2Access = 6,
 	ORCID = 7,
 	OpenAire = 8,
-	Configurable = 9
+	Configurable = 9,
+	Zenodo = 10
 }
diff --git a/dmp-frontend/src/app/core/model/configuration-models/login-providers.model.ts b/dmp-frontend/src/app/core/model/configuration-models/login-providers.model.ts
index 8c7751e2c..15474bdce 100644
--- a/dmp-frontend/src/app/core/model/configuration-models/login-providers.model.ts
+++ b/dmp-frontend/src/app/core/model/configuration-models/login-providers.model.ts
@@ -42,6 +42,11 @@ export class LoginProviders {
 		return this._openAireConfiguration;
 	}
 
+	private _zenodoConfiguration: LoginConfiguration;
+	get zenodoConfiguration(): LoginConfiguration {
+		return this._zenodoConfiguration;
+	}
+
 	public static parseValue(value: any): LoginProviders {
 		const obj: LoginProviders = new LoginProviders();
 		obj._enabled = value.enabled;
@@ -52,6 +57,7 @@ export class LoginProviders {
 		obj._b2accessConfiguration = value.b2accessConfiguration;
 		obj._orcidConfiguration = value.orcidConfiguration;
 		obj._openAireConfiguration = value.openAireConfiguration;
+		obj._zenodoConfiguration = value.zenodoConfiguration;
 		return obj;
 	}
 }
diff --git a/dmp-frontend/src/app/core/model/zenodo/zenodo-token.model.ts b/dmp-frontend/src/app/core/model/zenodo/zenodo-token.model.ts
new file mode 100644
index 000000000..0ddb251d6
--- /dev/null
+++ b/dmp-frontend/src/app/core/model/zenodo/zenodo-token.model.ts
@@ -0,0 +1,6 @@
+export class ZenodoToken {
+	userId: string;
+	expiresIn: number;
+	accessToken:string;
+	email: string;
+}
diff --git a/dmp-frontend/src/app/ui/auth/login/img/zenodo-white-200.png b/dmp-frontend/src/app/ui/auth/login/img/zenodo-white-200.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fb49be6e056112979c675e44fe46bd7e908390d
GIT binary patch
literal 2383
zcmb7`c{tRI8pnq$!$CF2zBgjx$S%7qBW6fuqB@kNED2d_j3sNvB};>d;>_uXW-Nm#
zTTH1OoGCP7Dl{hhG6rW#V@$4l?tSk4`~LAR&-1>|`+c7GpYP`%UY@SflFE`G5J(!~
z21oDL!Ts<8i|yx&QPwT{MJd7MLc-bT&;(3STnNZ9IQnvkCL$^*ECd}A6pW1>3b6%&
zz?%rTqj%z`wTBXSWL;!)A~2T>93328`sK)FAUs&i1@%r7C$5fysvm>GrSs0e0HbE_
z=8Ch7P_iR8d^UuQ)AOL2LU5E(;*3P6yH|#f)pSUTq2NwQJLwsz9yVdLSH7FUZvIi<
zT_3=B=VPvY-{X`Jh+Fyv0!jx7frNxX!Xh9MFbI4IbVw7V=>T#_|9kMi?(dbvVHU6n
zROK%N+b_3e^t;LvB*JZ$UFi}1F?8(;BT@a%GH&2iKXD0J?^cI*@p++s$xj?X;18sa
z-xP#J($l9aqm=elTx9;Mh8`GDxGe|h=zfpU+Ok1sg$76v@$U;0(sz3^yxn*7a3hf(
z)_Dnsh)t47Ngv|vmT{^nenU6HVbrMxF6C;f43%FZBhPmK<Uu;pq!sms<@o0!)Bi`5
z=g#RA2L6PcclJiUQ<0fgiNPx3VcTvMejPggTJ=@9uhksifi6prK1>ZLxqh_F^7}bF
z$!!vva=zFgwrAK55q(!#s=6oj1hE{bd5joyo=vt7kA?eV@cvqAiyu?NN)45CwF(C3
zaPwPAjMq~yf_@w=XdUEd0ZHP_n&a1(;^_H>i(UBllhEQYo1M7y;rEdzjcFavE`}*s
zdVM>U{()$<TxKf@E(cTMEN`_R8Mz42r}bgl`Z}Dp9+b9<G0!4w&^^s|{o5<5wkPn`
zJF1%Y1^vnnNwl%bV~eY6qwQpb>*A74nHhAIa{}NXj>mC(Z*$!ynA2{wvpwoxfjBuS
z|3=Tg2K4ZxO^Qn6VAdBgL{@7bt1~K&@XSi}ullL)Cx@6g{BT~U73^^uE@|Y*S5u&&
zOrTQxbG8cmfYz3AHuu5qo*(^iPQny+Bf~7Q>aO+O9r$;3Lr0XsK*jLtSvrI+Pqzn#
zfw9ZY(~5Ms+?_RZ;~MVmgkw*1zCxnaR?Em&o=MiW1{1E~eiwK;YxQU^7v|1Z78e??
zO(K<b*~FG;aXJ7F@HCxj;lSvDudFaSb{eRsX67yTwE?01H@I=&bLBSnb*|osWW^Li
zXp@QR_MuOjyfL;+pYe;AWHNyzP+z|C_M0^wB~Nvh!X{-r@uUcB&=Ef|#igjKYfmfL
z`TFFDGQxCVQm#ka#+)xLEN6DxF&!YQ@1J<thiS=*#)vZ|WT<j7)W43~S(JQ>+Yp!}
z?2@+}z?9KG%KanJj3W+opR>G|kr&Eeq!Dj(^j$~dmYoW(Jb1)m-D9xyT$#=HsLj17
zi*Vb{V5_0}<i=54r3Z{%|FOBMVZ%!}t?J5pJa?|=blVy$E+aWZ{sLFAm$k&lE;V%*
zmH~!psWlUkvxT^yjpct)J9Vww|9+U$r3ZU0$NIwF1Er@J@v@9p-;#xySoxY~Rv8>u
zWBwv+V+v|_i$yrobXc=%Y-~ez0XFADf2tIkoH^3Ed~MkEB+ql;`g+=9T5KA9w!L;~
zQc(!6vRisT>H~(ln+&i7aC>C&QAUgYy1?6s+1Xb=FG0p)t5a?;f;yrt{0N&Qg5oW`
zUt(6w`Gz`8t({gB_aXz)n^8#FV=JJp!i45fz9fCzc)WUG<3^TUSKbY&Wt4MjswNfb
zwI*aT&>}#}d29&%cJ)9ufBoQCWLhQ{LL&ZF@q8*MM^E-lklOmpD-NiW(~J6(H<>pH
z7TQXS%`Jsk?^q{oy7&90%m<z!T|S<B71J1NOTH({?G5&BQz-sw%vXUd)Y}gT40xL>
z)!Z%-*0yr@kh5*q(nk>m`|$A<Gr2cA5%S%Kk@GqWsn3Cwbwogq`EW_}l%8pbL~2!?
zVx)_lrUEf=(5*tFmYeI`A?t~elOn}ugeg%qN*3B}McjVs!rru2XK01)wL;+G{BOvZ
z!nc5=nt|17O84Q^#><<ht)^SZMIqzP9qr?6i7k`Q(9`zktQIZ4oVQe`SS)8&m^DGB
z-q=RgLv^H!3gRD{BzM=%vBYQeMBL2k?h+WJz~Odjcc}obs0?rEaVBqbPvKxg;5&1_
z^^QiT>D7v&@O#TTmOCr{J8|WLN$?@lv!%CwJ5uyKPD$@&yrR5PN@0s-wL(F~tmD`1
z)3hfF`0GZtkv~Sg%Oe;6xN~ktV+1>1j9WdPT2or-q*#4`LL;w3(n6!ZTD<Z0D;*_Y
zlt+Up`3e57V+C%{6}Q^_DC|)Ytje4b`zG<t${2403V9?wz%DkUK;^R|qBo*kE0tUE
zkMO*$I_z>3^jx0Ve3-#RzlmuDx08Tubx@vej&O;+QWRiR*^R-9eO?8MY8ed;k~uVt
z2~b1K42ey`wZ{umny!2nBkmP~W|VGT0!$qToODstyO8zZAr3W%>)cOqa@o5#<3XHg
zEW7!dsHe!g2zfUepxv8XCnL2kl6ap>keskxV4AKOn)GQs=}0`!+CGZrjC_9!!;geu
z^&S5hY;z9xQrqdFp|{kOwt8XO%nWLC@{GI6>qV?oL+yaeP>E3i1{9J5i@!7xrd{ic
zoQot$Mae28wssB?qGn6^4|a{p-E|kVYt^T-d65q`6=EVXXA>*jI~u9jOQ~i<-k<Lf
ze18W%(NSF^1af&b)m@s;Td;Q~T{YN6TI0CsL3<a7Cf&n?JrB`_ljn46HXmEsz|M?6
zk_Othl<G^WOLCHAO@np!V$^ZB>8ITjo5hQ%2eCfa=+fG~DkTi%UoD%n=EKU7uWp6h
z;asCnquG?r>6!$M@B)|mSC5^3_5HKsDfZc5ej~b!e;KTe)_d!<cWEdq?L#fu4C&|Q
zt6oNnA7%RV9pu1$BrI!oXU%_(AJnjDb|ucdJz??TJRF#Zu_g4rw`$xv@YWE<!(B}j
zVs`;*5`V?iNlwt_T_{z#BRb*PBQ(~Om|K{*;m~_G<gfnLxeQ7FMoBPp-?{fK{Xcl{
mZ*KU12;yImA=<|jmI8gbc0Hf;5u~<HNFaoZC%oAyF!P^sUU|p>

literal 0
HcmV?d00001

diff --git a/dmp-frontend/src/app/ui/auth/login/login.component.html b/dmp-frontend/src/app/ui/auth/login/login.component.html
index d8be9c88b..dd1c8fc9e 100644
--- a/dmp-frontend/src/app/ui/auth/login/login.component.html
+++ b/dmp-frontend/src/app/ui/auth/login/login.component.html
@@ -54,6 +54,12 @@
 					</button>
 				</div>
 			</div>
+			<div *ngIf="hasZenodoOauth()" class="col-auto zenodo-logo">
+				<button class="zenodo-button" mat-icon-button (click)="zenodoLogin()" class="login-social-button">
+					<span class="zenodoIcon"></span>
+					<!-- <span></span> -->
+				</button>
+			</div>
 		</div>
 		<div class="card-footer">
 			<h4 class="text-uppercase">
diff --git a/dmp-frontend/src/app/ui/auth/login/login.component.scss b/dmp-frontend/src/app/ui/auth/login/login.component.scss
index 6a4c37731..5d5f9402c 100644
--- a/dmp-frontend/src/app/ui/auth/login/login.component.scss
+++ b/dmp-frontend/src/app/ui/auth/login/login.component.scss
@@ -156,6 +156,12 @@
 	height: 90px;
 }
 
+.accesss-methods .zenodo-logo {
+	height: 75px;
+	padding-top: 8px;
+	margin-top: 13px;
+  }
+
 .tip {
   margin-top: -20px;
 }
@@ -231,6 +237,14 @@ span.configurableIcon {
 	height: 56px;
 }
 
+span.zenodoIcon {
+	background: url(img/zenodo-white-200.png) no-repeat 100px 56px;
+	background-position: center;
+	float: right;
+	width: 150px;
+	height: 56px;
+  }
+
 .b2access-button {
   margin-top: 10px;
   width: fit-content;
@@ -251,6 +265,11 @@ span.configurableIcon {
 	width: fit-content;
 }
 
+.zenodo-button {
+	margin-top: 10px;
+	width: fit-content;
+  }
+
 .login-logo {
   background: url(img/open-dmp.png) no-repeat;
   width: 273px;
diff --git a/dmp-frontend/src/app/ui/auth/login/login.component.ts b/dmp-frontend/src/app/ui/auth/login/login.component.ts
index f71c64bf9..e475fd881 100644
--- a/dmp-frontend/src/app/ui/auth/login/login.component.ts
+++ b/dmp-frontend/src/app/ui/auth/login/login.component.ts
@@ -78,6 +78,10 @@ export class LoginComponent extends BaseComponent implements OnInit, AfterViewIn
 		this.router.navigate(['/login/configurable/' + provider.configurableLoginId])
 	}
 
+	public zenodoLogin() {
+		this.router.navigate(['/login/external/zenodo']);
+	}
+
 	public hasFacebookOauth(): boolean {
 		return this.hasProvider(AuthProvider.Facebook);
 	}
@@ -106,6 +110,10 @@ export class LoginComponent extends BaseComponent implements OnInit, AfterViewIn
 		return this.hasProvider(AuthProvider.OpenAire);
 	}
 
+	public hasZenodoOauth(): boolean {
+		return this.hasProvider(AuthProvider.Zenodo);
+	}
+
 	public initProviders() {
 		if (this.hasProvider(AuthProvider.Google)) { this.initializeGoogleOauth(); }
 		if (this.hasProvider(AuthProvider.Facebook)) { this.initializeFacebookOauth(); }
@@ -127,6 +135,7 @@ export class LoginComponent extends BaseComponent implements OnInit, AfterViewIn
 			case AuthProvider.B2Access: return this.hasAllRequiredFieldsConfigured(this.configurationService.loginProviders.b2accessConfiguration);
 			case AuthProvider.ORCID: return this.hasAllRequiredFieldsConfigured(this.configurationService.loginProviders.orcidConfiguration);
 			case AuthProvider.OpenAire: return this.hasAllRequiredFieldsConfigured(this.configurationService.loginProviders.openAireConfiguration);
+			case AuthProvider.Zenodo: return this.hasAllRequiredFieldsConfigured(this.configurationService.loginProviders.zenodoConfiguration);
 			default: throw new Error('Unsupported Provider Type');
 		}
 	}
diff --git a/dmp-frontend/src/app/ui/auth/login/login.module.ts b/dmp-frontend/src/app/ui/auth/login/login.module.ts
index cfa773be0..64f9b0a4a 100644
--- a/dmp-frontend/src/app/ui/auth/login/login.module.ts
+++ b/dmp-frontend/src/app/ui/auth/login/login.module.ts
@@ -12,6 +12,7 @@ import { ConfigurableProvidersService } from '@app/ui/auth/login/utilities/confi
 import { LoginService } from '@app/ui/auth/login/utilities/login.service';
 import { CommonFormsModule } from '@common/forms/common-forms.module';
 import { CommonUiModule } from '@common/ui/common-ui.module';
+import { ZenodoLoginComponent } from './zenodo-login/zenodo-login.component';
 
 @NgModule({
 	imports: [
@@ -27,7 +28,8 @@ import { CommonUiModule } from '@common/ui/common-ui.module';
 		OrcidLoginComponent,
 		EmailConfirmation,
 		OpenAireLoginComponent,
-		ConfigurableLoginComponent
+		ConfigurableLoginComponent,
+		ZenodoLoginComponent
 	],
 	providers: [LoginService, ConfigurableProvidersService]
 })
diff --git a/dmp-frontend/src/app/ui/auth/login/login.routing.ts b/dmp-frontend/src/app/ui/auth/login/login.routing.ts
index 0a2e7049f..9509fa48e 100644
--- a/dmp-frontend/src/app/ui/auth/login/login.routing.ts
+++ b/dmp-frontend/src/app/ui/auth/login/login.routing.ts
@@ -8,6 +8,7 @@ import { OrcidLoginComponent } from './orcid-login/orcid-login.component';
 import { TwitterLoginComponent } from './twitter-login/twitter-login.component';
 import { OpenAireLoginComponent } from "./openaire-login/openaire-login.component";
 import { ConfigurableLoginComponent } from "./configurable-login/configurable-login.component";
+import { ZenodoLoginComponent } from './zenodo-login/zenodo-login.component';
 
 const routes: Routes = [
 	{ path: '', component: LoginComponent },
@@ -18,7 +19,8 @@ const routes: Routes = [
 	{ path: 'confirmation/:token', component: EmailConfirmation },
 	{ path: 'confirmation', component: EmailConfirmation },
 	{ path: 'openaire', component: OpenAireLoginComponent},
-	{ path: 'configurable/:id', component: ConfigurableLoginComponent}
+	{ path: 'configurable/:id', component: ConfigurableLoginComponent},
+	{ path: 'external/zenodo', component: ZenodoLoginComponent }
 ];
 
 @NgModule({
diff --git a/dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.html b/dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.html
new file mode 100644
index 000000000..e69de29bb
diff --git a/dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.scss b/dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.ts b/dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.ts
new file mode 100644
index 000000000..36decce42
--- /dev/null
+++ b/dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.ts
@@ -0,0 +1,85 @@
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { Component, OnInit } from '@angular/core';
+import { FormControl } from '@angular/forms';
+import { ActivatedRoute, Params } from '@angular/router';
+import { AuthProvider } from '@app/core/common/enum/auth-provider';
+import { OrcidUser } from '@app/core/model/orcid/orcidUser';
+import { AuthService } from '@app/core/services/auth/auth.service';
+import { LoginService } from '@app/ui/auth/login/utilities/login.service';
+import { BaseComponent } from '@common/base/base.component';
+import { environment } from 'environments/environment';
+import { takeUntil } from 'rxjs/operators';
+import { ConfigurationService } from '@app/core/services/configuration/configuration.service';
+import { ZenodoToken } from '@app/core/model/zenodo/zenodo-token.model';
+
+@Component({
+	selector: 'app-zenodo-login',
+	templateUrl: './zenodo-login.component.html',
+	styleUrls: ['./zenodo-login.component.scss']
+})
+export class ZenodoLoginComponent extends BaseComponent implements OnInit {
+
+	private returnUrl: string;
+	private zenodoToken: ZenodoToken
+	private accessToken: string;
+	private emailFormControl = new FormControl('');
+
+	constructor(
+		private route: ActivatedRoute,
+		private authService: AuthService,
+		private loginService: LoginService,
+		private httpClient: HttpClient,
+		private configurationService: ConfigurationService
+	) {
+		super();
+		this.zenodoToken = new ZenodoToken;
+	}
+
+	ngOnInit(): void {
+		this.route.queryParams
+			.pipe(takeUntil(this._destroyed))
+			.subscribe((params: Params) => {
+				const returnUrl = params['returnUrl'];
+				if (returnUrl) { this.returnUrl = returnUrl; }
+				if (!params['code']) { this.zenodoAccessGetAuthCode(); } else { this.zenodoLogin(params['code']); }
+			});
+	}
+
+	public zenodoAccessGetAuthCode() {
+		window.location.href = this.configurationService.loginProviders.zenodoConfiguration.oauthUrl
+			+ '?client_id='
+			+ this.configurationService.loginProviders.zenodoConfiguration.clientId
+			+ '&response_type=code&scope=deposit:write+deposit:actions+user:email&state=astate&redirect_uri='
+			+ this.configurationService.loginProviders.zenodoConfiguration.redirectUri;
+	}
+
+	public zenodoLogin(code: string) {
+		let headers = new HttpHeaders();
+		headers = headers.set('Content-Type', 'application/json');
+		headers = headers.set('Accept', 'application/json');
+		this.httpClient.post(this.configurationService.server + 'auth/zenodoRequestToken', { code: code }, { headers: headers })
+			.pipe(takeUntil(this._destroyed))
+			.subscribe((responseData: any) => {
+				this.zenodoToken.userId = responseData.payload.userId;
+				this.zenodoToken.expiresIn = responseData.payload.expiresIn;
+				this.accessToken = this.zenodoToken.accessToken = responseData.payload.accessToken;
+				this.zenodoToken.email = responseData.payload.email;
+				this.authService.login({ ticket: this.accessToken, provider: AuthProvider.Zenodo, data: this.zenodoToken })
+					.pipe(takeUntil(this._destroyed))
+					.subscribe(
+						res => this.loginService.onLogInSuccess(res, this.returnUrl),
+						error => this.loginService.onLogInError(error)
+					);
+			});
+	}
+
+	public login() {
+		this.zenodoToken.email = this.emailFormControl.value;
+		this.authService.login({ ticket: this.accessToken, provider: AuthProvider.Zenodo, data: this.zenodoToken })
+			.pipe(takeUntil(this._destroyed))
+			.subscribe(
+				res => this.loginService.onLogInSuccess(res, this.returnUrl),
+				error => this.loginService.onLogInError(error)
+			);
+	}
+}
diff --git a/dmp-frontend/src/assets/config/config.json b/dmp-frontend/src/assets/config/config.json
index 7298e06b8..1aac1c5cd 100644
--- a/dmp-frontend/src/assets/config/config.json
+++ b/dmp-frontend/src/assets/config/config.json
@@ -8,7 +8,7 @@
 	},
 	"defaultCulture": "en-US",
 	"loginProviders": {
-		"enabled": [1, 2, 3, 4, 5, 6, 7, 8],
+		"enabled": [1, 2, 3, 4, 5, 6, 7, 8, 10],
 		"facebookConfiguration": { "clientId": "" },
 		"googleConfiguration": { "clientId": "" },
 		"linkedInConfiguration": {
@@ -37,6 +37,11 @@
 			"oauthUrl": "",
 			"redirectUri": "",
 			"state": "987654321"
+		},
+		"zenodoConfiguration": {
+			"clientId": "",
+			"oauthUrl": "https://sandbox.zenodo.org/oauth/authorize",
+			"redirectUri": "http://localhost:4200/login/external/zenodo"
 		}
 	},
 	"logging": {

From bdcbc5553bacf169d3eb2492a86980e7b7d4cf2f Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Mon, 6 Apr 2020 18:16:05 +0300
Subject: [PATCH 12/60] Add zenodo DOI access token expiration check up and
 show proper pop up when the user has either no or expired token

---
 .../main/java/eu/eudat/controllers/Login.java | 13 ++++++
 .../security/ExpiredTokenException.java       |  8 ++++
 .../eu/eudat/logic/managers/UserManager.java  | 15 +++++++
 .../app/core/services/auth/auth.service.ts    |  9 ++++
 dmp-frontend/src/app/ui/dmp/dmp.module.ts     |  4 +-
 .../ui/dmp/overview/dmp-overview.component.ts | 32 ++++++++++++++
 dmp-frontend/src/assets/i18n/en.json          |  4 ++
 .../multiple-choice-dialog.component.html     | 30 +++++++++++++
 .../multiple-choice-dialog.component.scss     | 44 +++++++++++++++++++
 .../multiple-choice-dialog.component.ts       | 25 +++++++++++
 .../multiple-choice-dialog.module.ts          | 15 +++++++
 11 files changed, 198 insertions(+), 1 deletion(-)
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/exceptions/security/ExpiredTokenException.java
 create mode 100644 dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.html
 create mode 100644 dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.scss
 create mode 100644 dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.ts
 create mode 100644 dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.module.ts

diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java
index 16af6f14f..45636e7bb 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java
@@ -1,6 +1,8 @@
 package eu.eudat.controllers;
 
 
+import eu.eudat.exceptions.security.ExpiredTokenException;
+import eu.eudat.exceptions.security.NonValidTokenException;
 import eu.eudat.exceptions.security.NullEmailException;
 import eu.eudat.logic.managers.UserManager;
 import eu.eudat.logic.proxy.config.configloaders.ConfigLoader;
@@ -40,6 +42,7 @@ import org.springframework.social.oauth1.OAuthToken;
 import org.springframework.web.bind.annotation.*;
 
 import javax.transaction.Transactional;
+import java.io.IOException;
 import java.security.GeneralSecurityException;
 
 
@@ -150,6 +153,16 @@ public class Login {
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<Principal>().payload(this.nonVerifiedUserAuthenticationService.Touch(principal.getToken())).status(ApiMessageCode.NO_MESSAGE));
     }
 
+    @RequestMapping(method = RequestMethod.GET, value = {"/hasDOIToken"}, consumes = "application/json", produces = "application/json")
+    public @ResponseBody
+    ResponseEntity<ResponseItem<Boolean>> hasDOIToken(Principal principal) throws NullEmailException {
+        try {
+            return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<Boolean>().payload(this.userManager.isDOITokenValid(principal)).status(ApiMessageCode.NO_MESSAGE));
+        } catch (NonValidTokenException | ExpiredTokenException | IOException e) {
+            return ResponseEntity.status(460).body(new ResponseItem<Boolean>().payload(false).status(ApiMessageCode.ERROR_MESSAGE).message(e.getMessage()));
+        }
+    }
+
     @Transactional
     @RequestMapping(method = RequestMethod.POST, value = {"/logout"}, consumes = "application/json", produces = "application/json")
     public @ResponseBody
diff --git a/dmp-backend/web/src/main/java/eu/eudat/exceptions/security/ExpiredTokenException.java b/dmp-backend/web/src/main/java/eu/eudat/exceptions/security/ExpiredTokenException.java
new file mode 100644
index 000000000..dd1de35ea
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/exceptions/security/ExpiredTokenException.java
@@ -0,0 +1,8 @@
+package eu.eudat.exceptions.security;
+
+public class ExpiredTokenException extends Exception {
+
+	public ExpiredTokenException(String message) {
+		super(message);
+	}
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java
index 084648523..d2388eec4 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java
@@ -7,6 +7,8 @@ import eu.eudat.data.entities.DMP;
 import eu.eudat.data.entities.UserInfo;
 import eu.eudat.data.entities.UserRole;
 import eu.eudat.data.query.items.table.userinfo.UserInfoTableRequestItem;
+import eu.eudat.exceptions.security.ExpiredTokenException;
+import eu.eudat.exceptions.security.NonValidTokenException;
 import eu.eudat.exceptions.security.NullEmailException;
 import eu.eudat.exceptions.security.UnauthorisedException;
 import eu.eudat.logic.builders.entity.UserRoleBuilder;
@@ -29,6 +31,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 import java.io.IOException;
+import java.time.Instant;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -112,4 +115,16 @@ public class UserManager {
 		dataTableData.setTotalCount((long) colaborators.size());
 		return dataTableData;
 	}
+
+	public Boolean isDOITokenValid(Principal principal) throws NonValidTokenException, ExpiredTokenException, IOException {
+		if (principal.getZenodoToken() != null && !principal.getZenodoToken().isEmpty()) {
+			if (Instant.now().isBefore(principal.getZenodoDuration())) {
+				return true;
+			}
+			Map<String, Object> settings = Collections.singletonMap("zenodoToken", "");
+			this.updateSettings(settings, principal);
+			throw new ExpiredTokenException("Zenodo Token is expired");
+		}
+		throw new NonValidTokenException("This account has no Zenodo Token");
+	}
 }
diff --git a/dmp-frontend/src/app/core/services/auth/auth.service.ts b/dmp-frontend/src/app/core/services/auth/auth.service.ts
index a50261ba0..2b9fce248 100644
--- a/dmp-frontend/src/app/core/services/auth/auth.service.ts
+++ b/dmp-frontend/src/app/core/services/auth/auth.service.ts
@@ -159,4 +159,13 @@ export class AuthService extends BaseService {
 			})
 		);
 	}
+
+	public hasDOIToken(): Observable<any> {
+		this.actionUrl = this.configurationService.server + 'auth/';
+		const url = this.actionUrl + '/hasDOIToken';
+		const principal = this.current();
+		let headers = this.headers;
+		headers = headers.set('AuthToken', principal.token);
+		return this.http.get(url, { headers: headers });
+	}
 }
diff --git a/dmp-frontend/src/app/ui/dmp/dmp.module.ts b/dmp-frontend/src/app/ui/dmp/dmp.module.ts
index c4732a882..0f72ed78f 100644
--- a/dmp-frontend/src/app/ui/dmp/dmp.module.ts
+++ b/dmp-frontend/src/app/ui/dmp/dmp.module.ts
@@ -30,6 +30,7 @@ import { DmpWizardDatasetListingComponent } from '@app/ui/dmp/wizard/listing/dmp
 import { CommonFormsModule } from '@common/forms/common-forms.module';
 import { FormValidationErrorsDialogModule } from '@common/forms/form-validation-errors-dialog/form-validation-errors-dialog.module';
 import { CommonUiModule } from '@common/ui/common-ui.module';
+import { MultipleChoiceDialogModule } from '@common/modules/multiple-choice-dialog/multiple-choice-dialog.module';
 
 @NgModule({
 	imports: [
@@ -42,7 +43,8 @@ import { CommonUiModule } from '@common/ui/common-ui.module';
 		AutoCompleteModule,
 		DmpRoutingModule,
 		DmpOverviewModule,
-		FormValidationErrorsDialogModule
+		FormValidationErrorsDialogModule,
+		MultipleChoiceDialogModule
 	],
 	declarations: [
 		DmpListingComponent,
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
index 98c25aac9..fe787bbe0 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
@@ -22,6 +22,8 @@ import { Observable, of as observableOf } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { Role } from "@app/core/common/enum/role";
 import { DmpInvitationDialogComponent } from '../invitation/dmp-invitation.component';
+import { MultipleChoiceDialogModule } from '@common/modules/multiple-choice-dialog/multiple-choice-dialog.module';
+import { MultipleChoiceDialogComponent } from '@common/modules/multiple-choice-dialog/multiple-choice-dialog.component';
 
 @Component({
 	selector: 'app-dmp-overview',
@@ -322,6 +324,14 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 	}
 
 	getDoi(dmp: DmpOverviewModel) {
+		this.authentication.hasDOIToken().subscribe(response => {
+			this.showConfirmationDOIDialog(dmp);
+		}, error => {
+			this.showErrorConfirmationDOIDialog(error.error.message, dmp);
+		});
+	}
+
+	showConfirmationDOIDialog(dmp: DmpOverviewModel) {
 		const dialogRef = this.dialog.open(ConfirmationDialogComponent, {
 			maxWidth: '600px',
 			restoreFocus: false,
@@ -346,6 +356,28 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 		});
 	}
 
+	showErrorConfirmationDOIDialog(message: string, dmp: DmpOverviewModel) {
+		const dialogRef = this.dialog.open(MultipleChoiceDialogComponent, {
+			maxWidth: '600px',
+			restoreFocus: false,
+			data: {
+				message: message,
+				titles: [ this.language.instant('DMP-OVERVIEW.MULTIPLE-DIALOG.ZENODO-LOGIN'), this.language.instant('DMP-OVERVIEW.MULTIPLE-DIALOG.USE-DEFAULT')]
+			}
+		});
+		dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => {
+			switch (result) {
+				case 0:
+					this.authentication.logout();
+					this.router.navigate(['/login/external/zenodo']);
+					break;
+				case 1:
+					this.showConfirmationDOIDialog(dmp);
+					break;
+			}
+		});
+	}
+
 	onDOICallbackSuccess(): void {
 		this.uiNotificationService.snackBarNotification(this.language.instant('DMP-EDITOR.SNACK-BAR.SUCCESSFUL-DOI'), SnackBarNotificationLevel.Success);
 	}
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index d1db35ce5..8d01e4426 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -525,6 +525,10 @@
 		"ERROR": {
 			"DELETED-DMP": "The requested DMP is deleted",
 			"FORBIDEN-DMP": "You are not allowed to access this DMP"
+		},
+		"MULTIPLE-DIALOG": {
+			"ZENODO-LOGIN": "Login with Zenodo",
+			"USE-DEFAULT": "Use Default Token"
 		}
 	},
 	"DATASET-LISTING": {
diff --git a/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.html b/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.html
new file mode 100644
index 000000000..87029a992
--- /dev/null
+++ b/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.html
@@ -0,0 +1,30 @@
+<div class="confirmation-dialog">
+	<div *ngIf="data.icon" class="row d-flex flex-row">
+		<div class="col-auto close-btn justify-content-start">
+			<mat-icon color="warn">{{ data.icon }}</mat-icon>
+		</div>
+		<div *ngIf="data.warning" class="col justify-content-center warn-text">{{ data.warning }}</div>
+		<div class="col-auto close-btn justify-content-end" (click)="close()">
+			<mat-icon>close</mat-icon>
+		</div>
+	</div>
+	<div class="row d-flex flex-row">
+		<div class="col message pb-4 pl-3">{{ data.message }}</div>
+		<div *ngIf="!data.icon" class="col-auto close-btn justify-content-end" (click)="close()">
+			<mat-icon>close</mat-icon>
+		</div>
+	</div>
+	<div *ngIf="data.privacyPolicyNames" class="row d-flex flex-col">
+		<div class="col-12 privacy-policy-names">{{ data.privacyPolicyNames }}</div>
+		<mat-checkbox [(ngModel)]="agreePrivacyPolicyNames" required class="checkbox-privacy">
+			{{'GENERAL.CONFIRMATION-DIALOG.ACTIONS.POLICY-AGREE' | translate}}
+		</mat-checkbox>
+		<div *ngIf="!agreePrivacyPolicyNames" class="required-policy">{{'GENERAL.CONFIRMATION-DIALOG.ACTIONS.REQUIRED' | translate}}</div>
+	</div>
+	<div class="row">
+		<div class="col"></div>
+		<span *ngFor="let title of data.titles; let i = index">
+		<div class="col-auto"><button mat-raised-button type="button" (click)="apply(i)" class="confirm">{{ title }}</button></div>
+		</span>
+	</div>
+</div>
diff --git a/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.scss b/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.scss
new file mode 100644
index 000000000..1e529f1f5
--- /dev/null
+++ b/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.scss
@@ -0,0 +1,44 @@
+.confirmation-dialog {
+	.confirmation {
+	  padding-bottom: 20px;
+	}
+
+	.privacy-policy-names {
+	  font-weight: 700;
+	  padding: 1em;
+	}
+
+	.close-btn {
+	  margin-left: auto;
+	  cursor: pointer;
+	}
+
+	.warn-text {
+	  color: #f44336;
+	}
+
+	.cancel {
+	  background-color: #aaaaaa;
+	  color: #ffffff;
+	}
+
+	.confirm {
+	  background-color: #2cba6c;
+	  color: #ffffff;
+	}
+
+	.delete {
+	  background-color: #ba2c2c;
+	  color: #ffffff;
+	}
+
+	.checkbox-privacy {
+	  padding: 0em 1em;
+	}
+
+	.required-policy {
+	  padding: 0em 1.2em 1em;
+	  font-size: smaller;
+	  color: #f44336;
+	}
+  }
diff --git a/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.ts b/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.ts
new file mode 100644
index 000000000..8abce91d7
--- /dev/null
+++ b/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.ts
@@ -0,0 +1,25 @@
+import { Component, Inject } from '@angular/core';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
+
+@Component({
+  selector: 'app-multiple-choice-dialog',
+  templateUrl: './multiple-choice-dialog.component.html',
+  styleUrls: ['./multiple-choice-dialog.component.scss']
+})
+export class MultipleChoiceDialogComponent {
+	agreePrivacyPolicyNames = false;
+
+	constructor(
+		public dialogRef: MatDialogRef<MultipleChoiceDialogComponent>,
+		@Inject(MAT_DIALOG_DATA) public data: any
+	) {
+	}
+
+	close() {
+		this.dialogRef.close(false);
+	}
+
+	apply(i: number) {
+		this.dialogRef.close(i);
+	}
+}
diff --git a/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.module.ts b/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.module.ts
new file mode 100644
index 000000000..5f435c90b
--- /dev/null
+++ b/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.module.ts
@@ -0,0 +1,15 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { MultipleChoiceDialogComponent } from './multiple-choice-dialog.component';
+import { CommonUiModule } from '@common/ui/common-ui.module';
+import { FormsModule } from '@angular/forms';
+
+
+
+@NgModule({
+	imports: [CommonUiModule, FormsModule],
+	declarations: [MultipleChoiceDialogComponent],
+	exports: [MultipleChoiceDialogComponent],
+	entryComponents: [MultipleChoiceDialogComponent]
+})
+export class MultipleChoiceDialogModule { }

From 429eb4a04d50b90490f1454cb67d81c60d904816 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Mon, 6 Apr 2020 18:31:12 +0300
Subject: [PATCH 13/60] Additional checkup

---
 .../managers/DataManagementPlanManager.java    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index 3883eb865..d9bd173ae 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -25,6 +25,7 @@ import eu.eudat.elastic.entities.Organization;
 import eu.eudat.elastic.entities.Tag;
 import eu.eudat.exceptions.datamanagementplan.DMPNewVersionException;
 import eu.eudat.exceptions.datamanagementplan.DMPWithDatasetsDeleteException;
+import eu.eudat.exceptions.security.NonValidTokenException;
 import eu.eudat.exceptions.security.UnauthorisedException;
 import eu.eudat.logic.builders.entity.UserInfoBuilder;
 import eu.eudat.logic.mapper.elastic.DmpMapper;
@@ -111,15 +112,17 @@ public class DataManagementPlanManager {
     private DatabaseRepository databaseRepository;
     private Environment environment;
     private RDAManager rdaManager;
+    private UserManager userManager;
 
     @Autowired
-    public DataManagementPlanManager(ApiContext apiContext, DatasetManager datasetManager, Environment environment, RDAManager rdaManager) {
+    public DataManagementPlanManager(ApiContext apiContext, DatasetManager datasetManager, Environment environment, RDAManager rdaManager, UserManager userManager) {
         this.apiContext = apiContext;
         this.datasetManager = datasetManager;
         this.utilitiesService = apiContext.getUtilitiesService();
         this.databaseRepository = apiContext.getOperationsContext().getDatabaseRepository();
         this.environment = environment;
         this.rdaManager = rdaManager;
+        this.userManager = userManager;
     }
 
     public DataTableData<DataManagementPlanListingModel> getPaged(DataManagementPlanTableRequest dataManagementPlanTableRequest, Principal principal, String fieldsGroup) throws Exception {
@@ -1561,7 +1564,14 @@ public class DataManagementPlanManager {
         if (dmp.getDoi() != null)
             throw new Exception("DMP already has a DOI");
 
-        String zenodoToken = principal.getZenodoToken() != null && !principal.getZenodoToken().isEmpty() ? principal.getZenodoToken() : this.environment.getProperty("zenodo.access_token");
+        String zenodoToken = "";
+        try {
+            if (this.userManager.isDOITokenValid(principal)) {
+                zenodoToken = principal.getZenodoToken();
+            }
+        } catch (NonValidTokenException e) {
+            zenodoToken = this.environment.getProperty("zenodo.access_token");
+        }
         // First step, post call to Zenodo, to create the entry.
         RestTemplate restTemplate = new RestTemplate();
         HttpHeaders headers = new HttpHeaders();
@@ -1610,10 +1620,10 @@ public class DataManagementPlanManager {
                     String updateUrl = links.get("self") + "?access_token=" + zenodoToken;
                     restTemplate.put(updateUrl, request);
                     //And finally remove pre-existing files from it
-                    String fileListUrl = links.get("self") + "/files" + "?access_token=" + zenodoToken;
+                    String fileListUrl = links.get("self") + "/files" + "?access_token=" + this.environment.getProperty("zenodo.access_token");
                     ResponseEntity<Map[]> fileListResponse = restTemplate.getForEntity(fileListUrl, Map[].class);
                     for (Map file : fileListResponse.getBody()) {
-                        String fileDeleteUrl = links.get("self") + "/files/" + file.get("id") + "?access_token=" + zenodoToken;
+                        String fileDeleteUrl = links.get("self") + "/files/" + file.get("id") + "?access_token=" + this.environment.getProperty("zenodo.access_token");
                         restTemplate.delete(fileDeleteUrl);
                     }
                 }catch (Exception e) {

From be6227a81dc199adc091cc5e26fbfda303684c4e Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Tue, 7 Apr 2020 18:41:25 +0300
Subject: [PATCH 14/60] Fixed issue with dmp index when creating a new version,
 and some othe minor dmp index issues

---
 .../java/eu/eudat/elastic/entities/Dmp.java   | 26 +++++---
 .../logic/managers/DashBoardManager.java      | 18 +++++-
 .../managers/DataManagementPlanManager.java   | 64 +++++++++++++++----
 .../logic/mapper/elastic/DatasetMapper.java   | 37 ++++++-----
 4 files changed, 102 insertions(+), 43 deletions(-)

diff --git a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java
index 6c98bab17..7f4933cc2 100644
--- a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java
+++ b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java
@@ -171,12 +171,16 @@ public class Dmp implements ElasticEntity<Dmp> {
 	@Override
 	public XContentBuilder toElasticEntity(XContentBuilder builder) throws IOException {
 		builder.startObject();
-		builder.field(MapKey.ID.getName(), this.id.toString());
+		if (this.id != null) {
+			builder.field(MapKey.ID.getName(), this.id.toString());
+		}
 		builder.field(MapKey.LABEL.getName(), this.label);
 		builder.field(MapKey.DESCRIPTION.getName(), this.description);
-		builder.field(MapKey.GROUPID.getName(), this.groupId.toString());
+		if (this.groupId != null) {
+			builder.field(MapKey.GROUPID.getName(), this.groupId.toString());
+		}
 		builder.field(MapKey.STATUS.getName(), this.status);
-		if (this.templates != null) {
+		if (this.templates != null && !this.templates.isEmpty()) {
 			builder.startArray(MapKey.TEMPLATES.getName());
 			this.templates.forEach(template -> {
 				try {
@@ -187,7 +191,7 @@ public class Dmp implements ElasticEntity<Dmp> {
 			});
 			builder.endArray();
 		}
-		if (this.collaborators != null) {
+		if (this.collaborators != null && !this.collaborators.isEmpty()) {
 			builder.startArray(MapKey.COLLABORATORS.getName());
 			this.collaborators.forEach(collaborator -> {
 				try {
@@ -198,7 +202,7 @@ public class Dmp implements ElasticEntity<Dmp> {
 			});
 			builder.endArray();
 		}
-		if (this.organizations != null) {
+		if (this.organizations != null && !this.organizations.isEmpty()) {
 			builder.startArray(MapKey.ORGANIZATIONS.getName());
 			this.organizations.forEach(organization -> {
 				try {
@@ -212,18 +216,22 @@ public class Dmp implements ElasticEntity<Dmp> {
 		builder.field(MapKey.LASTVERSION.getName(), this.lastVersion);
 		builder.field(MapKey.LASTPUBLICVERSION.getName(), this.lastPublicVersion);
 		builder.field(MapKey.ISPUBLIC.getName(), this.isPublic);
-		if (datasets != null) {
+		if (datasets != null && !this.datasets.isEmpty()) {
 			builder.startArray(MapKey.DATASETS.getName());
 			this.datasets.forEach(dataset -> {
 				try {
-					dataset.toElasticEntity(builder);
-				} catch (IOException e) {
+					if (dataset != null) {
+						dataset.toElasticEntity(builder);
+					}
+				} catch (Exception e) {
 					logger.error(e.getMessage(), e);
 				}
 			});
 			builder.endArray();
 		}
-		builder.field(MapKey.GRANT.getName(), this.grant.toString());
+		if (this.grant != null) {
+			builder.field(MapKey.GRANT.getName(), this.grant.toString());
+		}
 		builder.field(MapKey.GRANTSTATUS.getName(), this.grantStatus);
 		builder.endObject();
 		return builder;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java
index ec33379da..50e45f103 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java
@@ -7,6 +7,7 @@ import eu.eudat.data.dao.entities.OrganisationDao;
 import eu.eudat.data.dao.entities.GrantDao;
 import eu.eudat.data.entities.*;
 import eu.eudat.data.query.items.table.dmp.DataManagmentPlanPublicTableRequest;
+import eu.eudat.elastic.entities.Dmp;
 import eu.eudat.logic.builders.model.models.RecentActivityDataBuilder;
 import eu.eudat.logic.services.ApiContext;
 import eu.eudat.logic.services.operations.DatabaseRepository;
@@ -81,6 +82,7 @@ public class DashBoardManager {
 
     public DashBoardStatistics getMeStatistics(Principal principal) throws IOException {
         List<eu.eudat.elastic.entities.Dataset> datasets = null;
+        List<eu.eudat.elastic.entities.Dmp> dmps = null;
         DashBoardStatistics statistics = new DashBoardStatistics();
         DMPDao dataManagementPlanRepository = databaseRepository.getDmpDao();
         DatasetDao datasetRepository = databaseRepository.getDatasetDao();
@@ -103,12 +105,24 @@ public class DashBoardManager {
         datasetCriteria.setAllVersions(false);
         datasetCriteria.setIsPublic(false);
         DataManagementPlanCriteria dataManagementPlanCriteria = new DataManagementPlanCriteria();
+        if (apiContext.getOperationsContext().getElasticRepository().getDmpRepository() != null) {
+            try {
+                eu.eudat.elastic.criteria.DmpCriteria dmpElasticCriteria = new eu.eudat.elastic.criteria.DmpCriteria();
+                dmpElasticCriteria.setAllowAllVersions(false);
+                dmpElasticCriteria.setPublic(false);
+                dmps = apiContext.getOperationsContext().getElasticRepository().getDmpRepository().query(dmpElasticCriteria);
+            }catch (Exception e) {
+                logger.warn(e.getMessage(), e);
+                dmps = null;
+            }
+        }
         dataManagementPlanCriteria.setAllVersions(false);
         GrantCriteria grantCriteria = new GrantCriteria();
 
         List<Integer> roles = new LinkedList<>();
-        CompletableFuture dmpFuture = dataManagementPlanRepository.getAuthenticated(dataManagementPlanRepository.getWithCriteria(dataManagementPlanCriteria), principal.getId(), roles).countAsync()
-                .whenComplete((dmpsStats, throwable) -> statistics.setTotalDataManagementPlanCount(dmpsStats));
+        List<Dmp> finalDmps = dmps;
+        CompletableFuture dmpFuture = dataManagementPlanRepository.getAuthenticated(dmps != null ? dataManagementPlanRepository.asQueryable().where((builder, root) -> root.get("id").in(finalDmps.stream().map(Dmp::getId).collect(Collectors.toList()))) : dataManagementPlanRepository.getWithCriteria(dataManagementPlanCriteria), principal.getId(), roles).countAsync()
+                                                                  .whenComplete((dmpsStats, throwable) -> statistics.setTotalDataManagementPlanCount(dmpsStats));
         List<eu.eudat.elastic.entities.Dataset> finalDatasets = datasets;
         CompletableFuture datasetFuture = datasetRepository.getAuthenticated(datasets != null ? datasetRepository.asQueryable().where((builder, root) -> root.get("id").in(finalDatasets.stream().map(x -> UUID.fromString(x.getId())).collect(Collectors.toList()))) : datasetRepository.getWithCriteria(datasetCriteria), user, roles).countAsync()
                                                            .whenComplete((datasetsStats, throwable) -> statistics.setTotalDataSetCount(datasetsStats));
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index c8bc4928d..af7035943 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -685,6 +685,23 @@ public class DataManagementPlanManager {
         databaseRepository.getUserDmpDao().createOrUpdate(userDMP);
     }
 
+    private void updateGroupIndex(UUID groupId) {
+        DataManagementPlanCriteria criteria = new DataManagementPlanCriteria();
+        criteria.setGroupIds(Collections.singletonList(groupId));
+        criteria.setAllVersions(true);
+        List<DMP> dmps = databaseRepository.getDmpDao().getWithCriteria(criteria).toList();
+        for (DMP dmp: dmps) {
+            try {
+                if (dmp.getUsers() != null) {
+                    logger.info(dmp.getUsers().toString());
+                }
+                this.updateIndex(dmp);
+            } catch (IOException e) {
+                logger.error(e.getMessage(), e);
+            }
+        }
+    }
+
     public void newVersion(UUID uuid, DataManagementPlanNewVersionModel dataManagementPlan, Principal principal) throws Exception {
         DMP oldDmp = databaseRepository.getDmpDao().find(uuid);
         if (!isUserOwnerOfDmp(oldDmp, principal)) {
@@ -728,10 +745,14 @@ public class DataManagementPlanManager {
 
             copyDatasets(newDmp, databaseRepository.getDatasetDao());
 
-            newDmp.getUsers().clear();
             newDmp.setUsers(new HashSet<>(databaseRepository.getUserDmpDao().asQueryable().where((builder, root) -> builder.equal(root.get("dmp").get("id"), newDmp.getId())).toList()));
 
-            this.updateIndex(newDmp);
+            DatasetCriteria criteria1 = new DatasetCriteria();
+            criteria1.setDmpIds(Collections.singletonList(newDmp.getId()));
+            newDmp.setDataset(new HashSet<>(databaseRepository.getDatasetDao().getWithCriteria(criteria1).toList()));
+
+            this.updateGroupIndex(newDmp.getGroupId());
+
         } else {
             throw new DMPNewVersionException("Version to update not the latest.");
         }
@@ -760,11 +781,18 @@ public class DataManagementPlanManager {
         assignFunderUserIfInternal(newDmp, user);
         assignProjectUserIfInternal(newDmp, user);
         databaseRepository.getGrantDao().createOrUpdate(newDmp.getGrant());
-        newDmp = databaseRepository.getDmpDao().createOrUpdate(newDmp);
+        DMP tempDmp = databaseRepository.getDmpDao().createOrUpdate(newDmp);
+        newDmp.setId(tempDmp.getId());
 
         assignUser(newDmp, user);
         copyDatasets(newDmp, databaseRepository.getDatasetDao());
 
+        newDmp.setUsers(new HashSet<>(databaseRepository.getUserDmpDao().asQueryable().where((builder, root) -> builder.equal(root.get("dmp").get("id"), newDmp.getId())).toList()));
+
+        DatasetCriteria criteria1 = new DatasetCriteria();
+        criteria1.setDmpIds(Collections.singletonList(newDmp.getId()));
+        newDmp.setDataset(new HashSet<>(databaseRepository.getDatasetDao().getWithCriteria(criteria1).toList()));
+
         this.updateIndex(newDmp);
     }
 
@@ -782,6 +810,11 @@ public class DataManagementPlanManager {
         criteria1.setAllVersions(true);
         criteria1.setGroupIds(Collections.singletonList(oldDmp.getGroupId()));
         apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().getWithCriteria(criteria1).toList().forEach(dmp -> {
+            try {
+                this.updateIndex(dmp);
+            } catch (IOException e) {
+                logger.error(e.getMessage(), e);
+            }
             for (Dataset dataset: dmp.getDataset()) {
                 try {
                     List<Tag> tags = new ArrayList<>();
@@ -934,19 +967,24 @@ public class DataManagementPlanManager {
     private void copyDatasets(DMP newDmp, DatasetDao datasetDao) {
         List<CompletableFuture<Dataset>> futures = new LinkedList<>();
         for (Dataset dataset : newDmp.getDataset()) {
+            Dataset tempDataset = datasetDao.find(dataset.getId());
+            if (tempDataset.getProfile() != null) {
+                logger.info(tempDataset.getProfile().toString());
+            }
+            try {
+                List<Tag> tags = new ArrayList<>();
+                eu.eudat.elastic.entities.Dataset elastic = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString());
+                if (elastic != null) {
+                    tags = elastic.getTags();
+                }
+
+                this.datasetManager.updateTags(tempDataset, tags);
+            } catch (Exception e) {
+                logger.error(e.getMessage(), e);
+            }
             datasetDao.asQueryable().withHint(HintedModelFactory.getHint(DatasetListingModel.class)).where((builder, root) -> builder.equal(root.get("id"), dataset.getId())).getSingleAsync()
                     .thenApplyAsync(entityDataset -> {
                         Dataset newDataset = new Dataset();
-                        try {
-                            List<Tag> tags = new ArrayList<>();
-                            eu.eudat.elastic.entities.Dataset elastic = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString());
-                            if (elastic != null) {
-                                tags = elastic.getTags();
-                            }
-                            this.datasetManager.updateTags(dataset, tags);
-                        } catch (Exception e) {
-                            logger.error(e.getMessage(), e);
-                        }
                         newDataset.update(entityDataset);
                         newDataset.setDmp(newDmp);
                         newDataset.setStatus(Dataset.Status.SAVED.getValue());
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DatasetMapper.java b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DatasetMapper.java
index c15de6329..c9a3723f0 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DatasetMapper.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DatasetMapper.java
@@ -26,8 +26,7 @@ public class DatasetMapper {
 
 	public Dataset toElastic(eu.eudat.data.entities.Dataset dataset, List<Tag> tags) throws Exception {
 		Dataset elastic = new Dataset();
-		eu.eudat.data.entities.Dataset tempDataset = apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao().find(dataset.getId());
-		elastic.setId(tempDataset.getId().toString());
+		elastic.setId(dataset.getId().toString());
 		if (tags != null && !tags.isEmpty()) {
 			DatasetCriteria criteria = new DatasetCriteria();
 			criteria.setTags(tags);
@@ -40,35 +39,35 @@ public class DatasetMapper {
 				elastic.setTags(tags1);
 			}
 		}
-		elastic.setLabel(tempDataset.getLabel());
-		elastic.setDescription(tempDataset.getDescription());
-		elastic.setTemplate(tempDataset.getProfile().getId());
-		elastic.setStatus(tempDataset.getStatus());
-		elastic.setDmp(tempDataset.getDmp().getId());
-		elastic.setGroup(tempDataset.getDmp().getGroupId());
-		elastic.setGrant(tempDataset.getDmp().getGrant().getId());
-		if (tempDataset.getDmp().getUsers() != null) {
-			elastic.setCollaborators(tempDataset.getDmp().getUsers().stream().map(user -> CollaboratorMapper.toElastic(user.getUser())).collect(Collectors.toList()));
+		elastic.setLabel(dataset.getLabel());
+		elastic.setDescription(dataset.getDescription());
+		elastic.setTemplate(dataset.getProfile().getId());
+		elastic.setStatus(dataset.getStatus());
+		elastic.setDmp(dataset.getDmp().getId());
+		elastic.setGroup(dataset.getDmp().getGroupId());
+		elastic.setGrant(dataset.getDmp().getGrant().getId());
+		if (dataset.getDmp().getUsers() != null) {
+			elastic.setCollaborators(dataset.getDmp().getUsers().stream().map(user -> CollaboratorMapper.toElastic(user.getUser())).collect(Collectors.toList()));
 		}
 		DataManagementPlanCriteria dmpCriteria = new DataManagementPlanCriteria();
 		dmpCriteria.setAllVersions(true);
-		dmpCriteria.setGroupIds(Collections.singletonList(tempDataset.getDmp().getGroupId()));
+		dmpCriteria.setGroupIds(Collections.singletonList(dataset.getDmp().getGroupId()));
 		apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().getWithCriteria(dmpCriteria).toList().stream()
-				  .max(Comparator.comparing(DMP::getVersion)).ifPresent(dmp -> elastic.setLastVersion(dmp.getId().equals(tempDataset.getDmp().getId())));
+				  .max(Comparator.comparing(DMP::getVersion)).ifPresent(dmp -> elastic.setLastVersion(dmp.getId().equals(dataset.getDmp().getId())));
 		apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().getWithCriteria(dmpCriteria).toList().stream().filter(DMP::isPublic)
-				  .max(Comparator.comparing(DMP::getVersion)).ifPresent(dmp -> elastic.setLastPublicVersion(dmp.getId().equals(tempDataset.getDmp().getId())));
+				  .max(Comparator.comparing(DMP::getVersion)).ifPresent(dmp -> elastic.setLastPublicVersion(dmp.getId().equals(dataset.getDmp().getId())));
 		if (elastic.getLastVersion() == null) {
 			elastic.setLastVersion(true);
 		}
 		if (elastic.getLastPublicVersion() == null) {
 			elastic.setLastPublicVersion(false);
 		}
-		if (tempDataset.getDmp().getOrganisations() != null) {
-			elastic.setOrganizations(tempDataset.getDmp().getOrganisations().stream().map(OrganizationMapper::toElastic).collect(Collectors.toList()));
+		if (dataset.getDmp().getOrganisations() != null) {
+			elastic.setOrganizations(dataset.getDmp().getOrganisations().stream().map(OrganizationMapper::toElastic).collect(Collectors.toList()));
 		}
-		elastic.setPublic(tempDataset.getDmp().isPublic());
-		elastic.setGrantStatus(tempDataset.getDmp().getGrant().getStatus());
-		elastic.setFormData(datasetManager.getWordDocumentText(tempDataset));
+		elastic.setPublic(dataset.getDmp().isPublic());
+		elastic.setGrantStatus(dataset.getDmp().getGrant().getStatus());
+		elastic.setFormData(datasetManager.getWordDocumentText(dataset));
 
 		return elastic;
 	}

From f39c113b7bd5be148246ec465e28df7f172f5b0d Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Fri, 3 Apr 2020 18:40:03 +0300
Subject: [PATCH 15/60] Add Zenodo Login and the ability to use it's access
 token for DOI creation

---
 .../main/java/eu/eudat/controllers/Login.java |  25 ++++--
 .../model/models/PrincipalBuilder.java        |  15 ++++
 .../managers/DataManagementPlanManager.java   |  15 ++--
 .../Zenodo/ZenodoCustomProvider.java          |   8 ++
 .../Zenodo/ZenodoCustomProviderImpl.java      |  72 +++++++++++++++
 .../customproviders/Zenodo/ZenodoUser.java    |  49 ++++++++++
 .../validators/TokenValidatorFactoryImpl.java |  14 ++-
 .../zenodo/ZenodoTokenValidator.java          |  57 ++++++++++++
 .../zenodo/helpers/ZenodoRequest.java         |  12 +++
 .../zenodo/helpers/ZenodoResponseToken.java   |  38 ++++++++
 .../AbstractAuthenticationService.java        |  13 ++-
 ...erifiedUserEmailAuthenticationService.java |  15 ++++
 .../VerifiedUserAuthenticationService.java    |  15 ++++
 .../data/loginprovider/LoginProviderUser.java |  18 ++++
 .../eudat/models/data/security/Principal.java |  19 ++++
 .../config/application-devel.properties       |   4 +
 .../src/app/core/common/enum/auth-provider.ts |   3 +-
 .../login-providers.model.ts                  |   6 ++
 .../core/model/zenodo/zenodo-token.model.ts   |   6 ++
 .../ui/auth/login/img/zenodo-white-200.png    | Bin 0 -> 2383 bytes
 .../app/ui/auth/login/login.component.html    |   6 ++
 .../app/ui/auth/login/login.component.scss    |  19 ++++
 .../src/app/ui/auth/login/login.component.ts  |   9 ++
 .../src/app/ui/auth/login/login.module.ts     |   4 +-
 .../src/app/ui/auth/login/login.routing.ts    |   4 +-
 .../zenodo-login/zenodo-login.component.html  |   0
 .../zenodo-login/zenodo-login.component.scss  |   0
 .../zenodo-login/zenodo-login.component.ts    |  85 ++++++++++++++++++
 dmp-frontend/src/assets/config/config.json    |   7 +-
 29 files changed, 518 insertions(+), 20 deletions(-)
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProvider.java
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProviderImpl.java
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoUser.java
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/ZenodoTokenValidator.java
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/helpers/ZenodoRequest.java
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/helpers/ZenodoResponseToken.java
 create mode 100644 dmp-frontend/src/app/core/model/zenodo/zenodo-token.model.ts
 create mode 100644 dmp-frontend/src/app/ui/auth/login/img/zenodo-white-200.png
 create mode 100644 dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.html
 create mode 100644 dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.scss
 create mode 100644 dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.ts

diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java
index 78304aa20..16af6f14f 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java
@@ -22,6 +22,9 @@ import eu.eudat.logic.security.validators.orcid.ORCIDTokenValidator;
 import eu.eudat.logic.security.validators.orcid.helpers.ORCIDRequest;
 import eu.eudat.logic.security.validators.orcid.helpers.ORCIDResponseToken;
 import eu.eudat.logic.security.validators.twitter.TwitterTokenValidator;
+import eu.eudat.logic.security.validators.zenodo.ZenodoTokenValidator;
+import eu.eudat.logic.security.validators.zenodo.helpers.ZenodoRequest;
+import eu.eudat.logic.security.validators.zenodo.helpers.ZenodoResponseToken;
 import eu.eudat.logic.services.operations.authentication.AuthenticationService;
 import eu.eudat.models.data.helpers.responses.ResponseItem;
 import eu.eudat.models.data.login.Credentials;
@@ -54,28 +57,34 @@ public class Login {
     private LinkedInTokenValidator linkedInTokenValidator;
     private OpenAIRETokenValidator openAIRETokenValidator;
     private ConfigurableProviderTokenValidator configurableProviderTokenValidator;
+    private ZenodoTokenValidator zenodoTokenValidator;
     private ConfigLoader configLoader;
 
 //    private Logger logger;
 
     private UserManager userManager;
+
     @Autowired
-    public Login(CustomAuthenticationProvider customAuthenticationProvider, AuthenticationService nonVerifiedUserAuthenticationService,
-                 TwitterTokenValidator twitterTokenValidator, LinkedInTokenValidator linkedInTokenValidator, B2AccessTokenValidator b2AccessTokenValidator,
-                 ORCIDTokenValidator orcidTokenValidator, OpenAIRETokenValidator openAIRETokenValidator, ConfigurableProviderTokenValidator configurableProviderTokenValidator, ConfigLoader configLoader, UserManager userManager/*, Logger logger*/) {
+    public Login(CustomAuthenticationProvider customAuthenticationProvider,
+                 AuthenticationService nonVerifiedUserAuthenticationService, TwitterTokenValidator twitterTokenValidator,
+                 B2AccessTokenValidator b2AccessTokenValidator, ORCIDTokenValidator orcidTokenValidator,
+                 LinkedInTokenValidator linkedInTokenValidator, OpenAIRETokenValidator openAIRETokenValidator,
+                 ConfigurableProviderTokenValidator configurableProviderTokenValidator, ZenodoTokenValidator zenodoTokenValidator,
+                 ConfigLoader configLoader, UserManager userManager) {
         this.customAuthenticationProvider = customAuthenticationProvider;
         this.nonVerifiedUserAuthenticationService = nonVerifiedUserAuthenticationService;
         this.twitterTokenValidator = twitterTokenValidator;
-        this.linkedInTokenValidator = linkedInTokenValidator;
         this.b2AccessTokenValidator = b2AccessTokenValidator;
         this.orcidTokenValidator = orcidTokenValidator;
+        this.linkedInTokenValidator = linkedInTokenValidator;
         this.openAIRETokenValidator = openAIRETokenValidator;
         this.configurableProviderTokenValidator = configurableProviderTokenValidator;
+        this.zenodoTokenValidator = zenodoTokenValidator;
         this.configLoader = configLoader;
-//        this.logger = logger;
         this.userManager = userManager;
     }
 
+
     @Transactional
     @RequestMapping(method = RequestMethod.POST, value = {"/externallogin"}, consumes = "application/json", produces = "application/json")
     public @ResponseBody
@@ -128,6 +137,12 @@ public class Login {
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<ConfigurableProviderResponseToken>().payload(this.configurableProviderTokenValidator.getAccessToken(configurableProviderRequest)).status(ApiMessageCode.NO_MESSAGE));
     }
 
+    @RequestMapping(method = RequestMethod.POST, value = {"/zenodoRequestToken"}, produces = "application/json", consumes = "application/json")
+    public @ResponseBody
+    ResponseEntity<ResponseItem<ZenodoResponseToken>> ZenodoRequestToken(@RequestBody ZenodoRequest zenodoRequest) {
+        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<ZenodoResponseToken>().payload(this.zenodoTokenValidator.getAccessToken(zenodoRequest)).status(ApiMessageCode.NO_MESSAGE));
+    }
+
     @RequestMapping(method = RequestMethod.POST, value = {"/me"}, consumes = "application/json", produces = "application/json")
     public @ResponseBody
     ResponseEntity<ResponseItem<Principal>> authMe(Principal principal) throws NullEmailException {
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/PrincipalBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/PrincipalBuilder.java
index 133d5e179..35ce34035 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/PrincipalBuilder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/PrincipalBuilder.java
@@ -4,6 +4,7 @@ import eu.eudat.logic.builders.Builder;
 import eu.eudat.models.data.security.Principal;
 import eu.eudat.types.Authorities;
 
+import java.time.Instant;
 import java.util.Date;
 import java.util.Set;
 import java.util.UUID;
@@ -22,6 +23,8 @@ public class PrincipalBuilder extends Builder<Principal> {
     private String culture;
     private String language;
     private String timezone;
+    private String zenodoToken;
+    private Instant zenodoDuration;
 
     public PrincipalBuilder id(UUID id) {
         this.id = id;
@@ -68,6 +71,16 @@ public class PrincipalBuilder extends Builder<Principal> {
         return this;
     }
 
+    public PrincipalBuilder zenodoToken(String zenodoToken) {
+        this.zenodoToken = zenodoToken;
+        return this;
+    }
+
+    public PrincipalBuilder zenodoDuration(Instant zenodoDuration) {
+        this.zenodoDuration = zenodoDuration;
+        return this;
+    }
+
     @Override
     public Principal build() {
         Principal principal = new Principal();
@@ -80,6 +93,8 @@ public class PrincipalBuilder extends Builder<Principal> {
         principal.setCulture(culture);
         principal.setLanguage(language);
         principal.setTimezone(timezone);
+        principal.setZenodoToken(zenodoToken);
+        principal.setZenodoDuration(zenodoDuration);
         return principal;
     }
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index af7035943..2d533b4f4 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -1599,6 +1599,7 @@ public class DataManagementPlanManager {
         if (dmp.getDoi() != null)
             throw new Exception("DMP already has a DOI");
 
+        String zenodoToken = principal.getZenodoToken() != null && !principal.getZenodoToken().isEmpty() ? principal.getZenodoToken() : this.environment.getProperty("zenodo.access_token");
         // First step, post call to Zenodo, to create the entry.
         RestTemplate restTemplate = new RestTemplate();
         HttpHeaders headers = new HttpHeaders();
@@ -1623,34 +1624,34 @@ public class DataManagementPlanManager {
         String previousDOI = this.getPreviousDOI(dmp.getGroupId(), dmp.getId());
         try {
         if (previousDOI == null) {
-            String createUrl = this.environment.getProperty("zenodo.url") + "deposit/depositions" + "?access_token=" + this.environment.getProperty("zenodo.access_token");
+            String createUrl = this.environment.getProperty("zenodo.url") + "deposit/depositions" + "?access_token=" + zenodoToken;
             createResponse = restTemplate.postForEntity(createUrl, request, Map.class).getBody();
             links = (LinkedHashMap<String, String>) createResponse.get("links");
         } else {
             //It requires more than one step to create a new version
             //First, get the deposit related to the concept DOI
-                String listUrl = this.environment.getProperty("zenodo.url") + "deposit/depositions" + "?q=conceptdoi:\"" + previousDOI + "\"&access_token=" + this.environment.getProperty("zenodo.access_token");
+                String listUrl = this.environment.getProperty("zenodo.url") + "deposit/depositions" + "?q=conceptdoi:\"" + previousDOI + "\"&access_token=" + zenodoToken;
                 ResponseEntity<Map[]> listResponses = restTemplate.getForEntity(listUrl, Map[].class);
                 createResponse = listResponses.getBody()[0];
                 links = (LinkedHashMap<String, String>) createResponse.get("links");
                 //Second, make the new version (not in the links?)
-                String newVersionUrl = links.get("self") + "/actions/newversion" + "?access_token=" + this.environment.getProperty("zenodo.access_token");
+                String newVersionUrl = links.get("self") + "/actions/newversion" + "?access_token=" + zenodoToken;
                 createResponse = restTemplate.postForObject(newVersionUrl, null, Map.class);
                 links = (LinkedHashMap<String, String>) createResponse.get("links");
                 //Third, get the new deposit
-                String latestDraftUrl = links.get("latest_draft") + "?access_token=" + this.environment.getProperty("zenodo.access_token");
+                String latestDraftUrl = links.get("latest_draft") + "?access_token=" + zenodoToken;
                 createResponse = restTemplate.getForObject(latestDraftUrl, Map.class);
                 links = (LinkedHashMap<String, String>) createResponse.get("links");
                 //At this point it might fail to perform the next requests so enclose them with try catch
                 try {
                     //Forth, update the new deposit's metadata
-                    String updateUrl = links.get("self") + "?access_token=" + this.environment.getProperty("zenodo.access_token");
+                    String updateUrl = links.get("self") + "?access_token=" + zenodoToken;
                     restTemplate.put(updateUrl, request);
                     //And finally remove pre-existing files from it
-                    String fileListUrl = links.get("self") + "/files" + "?access_token=" + this.environment.getProperty("zenodo.access_token");
+                    String fileListUrl = links.get("self") + "/files" + "?access_token=" + zenodoToken;
                     ResponseEntity<Map[]> fileListResponse = restTemplate.getForEntity(fileListUrl, Map[].class);
                     for (Map file : fileListResponse.getBody()) {
-                        String fileDeleteUrl = links.get("self") + "/files/" + file.get("id") + "?access_token=" + this.environment.getProperty("zenodo.access_token");
+                        String fileDeleteUrl = links.get("self") + "/files/" + file.get("id") + "?access_token=" + zenodoToken;
                         restTemplate.delete(fileDeleteUrl);
                     }
                 }catch (Exception e) {
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProvider.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProvider.java
new file mode 100644
index 000000000..b14c3a963
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProvider.java
@@ -0,0 +1,8 @@
+package eu.eudat.logic.security.customproviders.Zenodo;
+
+import eu.eudat.logic.security.validators.orcid.helpers.ORCIDResponseToken;
+import eu.eudat.logic.security.validators.zenodo.helpers.ZenodoResponseToken;
+
+public interface ZenodoCustomProvider {
+    ZenodoResponseToken getAccessToken(String code, String clientId, String clientSecret, String redirectUri);
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProviderImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProviderImpl.java
new file mode 100644
index 000000000..b527af2fe
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProviderImpl.java
@@ -0,0 +1,72 @@
+package eu.eudat.logic.security.customproviders.Zenodo;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import eu.eudat.logic.security.validators.orcid.helpers.ORCIDResponseToken;
+import eu.eudat.logic.security.validators.zenodo.helpers.ZenodoResponseToken;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.RestTemplate;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Map;
+
+@Component("ZenodoCustomProvider")
+public class ZenodoCustomProviderImpl implements ZenodoCustomProvider {
+    private static final Logger logger = LoggerFactory.getLogger(ZenodoCustomProviderImpl.class);
+
+    private Environment environment;
+
+    @Autowired
+    public ZenodoCustomProviderImpl(Environment environment) {
+        this.environment = environment;
+    }
+
+    @Override
+    public ZenodoResponseToken getAccessToken(String code, String clientId, String clientSecret, String redirectUri) {
+        RestTemplate restTemplate = new RestTemplate();
+        HttpHeaders headers = new HttpHeaders();
+        headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
+        headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+
+        MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
+        map.add("client_id", clientId);
+        map.add("client_secret", clientSecret);
+        map.add("grant_type", "authorization_code");
+        map.add("code", code);
+        map.add("redirect_uri", redirectUri);
+        HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<>(map, headers);
+
+        try {
+            Map<String, Object> values = restTemplate.postForObject(this.environment.getProperty("zenodo.login.access_token_url"), request, Map.class);
+            ZenodoResponseToken zenodoResponseToken = new ZenodoResponseToken();
+            Map<String, Object> user = (Map<String, Object>) values.get("user");
+            zenodoResponseToken.setUserId((String) user.get("id"));
+            zenodoResponseToken.setEmail((String) user.get("email"));
+            zenodoResponseToken.setExpiresIn((Integer) values.get("expires_in"));
+            zenodoResponseToken.setAccessToken((String) values.get("access_token"));
+
+            return zenodoResponseToken;
+        } catch (HttpClientErrorException ex) {
+            logger.error(ex.getResponseBodyAsString(), ex);
+        }
+
+        return null;
+    }
+
+    private HttpHeaders createBearerAuthHeaders(String accessToken) {
+        return new HttpHeaders() {{
+            String authHeader = "Bearer " + accessToken;
+            set("Authorization", authHeader);
+        }};
+    }
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoUser.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoUser.java
new file mode 100644
index 000000000..cbcb95928
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoUser.java
@@ -0,0 +1,49 @@
+package eu.eudat.logic.security.customproviders.Zenodo;
+
+import java.util.Map;
+
+public class ZenodoUser {
+    private String userId;
+    private String email;
+    private String accessToken;
+    private Integer expiresIn;
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getAccessToken() {
+        return accessToken;
+    }
+
+    public void setAccessToken(String accessToken) {
+        this.accessToken = accessToken;
+    }
+
+    public Integer getExpiresIn() {
+        return expiresIn;
+    }
+
+    public void setExpiresIn(Integer expiresIn) {
+        this.expiresIn = expiresIn;
+    }
+
+    public ZenodoUser getZenodoUser(Object data) {
+        this.userId = (String) ((Map) data).get("userId");
+        this.email = (String) ((Map) data).get("email");
+        this.accessToken = (String) ((Map) data).get("accessToken");
+        this.expiresIn = (Integer) ((Map) data).get("expiresIn");
+        return this;
+    }
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/TokenValidatorFactoryImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/TokenValidatorFactoryImpl.java
index 9b594c96e..c079d24a5 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/TokenValidatorFactoryImpl.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/TokenValidatorFactoryImpl.java
@@ -6,6 +6,7 @@ import eu.eudat.logic.security.customproviders.ConfigurableProvider.Configurable
 import eu.eudat.logic.security.customproviders.LinkedIn.LinkedInCustomProvider;
 import eu.eudat.logic.security.customproviders.ORCID.ORCIDCustomProvider;
 import eu.eudat.logic.security.customproviders.OpenAIRE.OpenAIRECustomProvider;
+import eu.eudat.logic.security.customproviders.Zenodo.ZenodoCustomProvider;
 import eu.eudat.logic.security.validators.b2access.B2AccessTokenValidator;
 import eu.eudat.logic.security.validators.configurableProvider.ConfigurableProviderTokenValidator;
 import eu.eudat.logic.security.validators.facebook.FacebookTokenValidator;
@@ -14,6 +15,7 @@ import eu.eudat.logic.security.validators.linkedin.LinkedInTokenValidator;
 import eu.eudat.logic.security.validators.openaire.OpenAIRETokenValidator;
 import eu.eudat.logic.security.validators.orcid.ORCIDTokenValidator;
 import eu.eudat.logic.security.validators.twitter.TwitterTokenValidator;
+import eu.eudat.logic.security.validators.zenodo.ZenodoTokenValidator;
 import eu.eudat.logic.services.operations.authentication.AuthenticationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
@@ -23,7 +25,7 @@ import org.springframework.stereotype.Service;
 @Service("tokenValidatorFactory")
 public class TokenValidatorFactoryImpl implements TokenValidatorFactory {
     public enum LoginProvider {
-        GOOGLE(1), FACEBOOK(2), TWITTER(3), LINKEDIN(4), NATIVELOGIN(5), B2_ACCESS(6), ORCID(7), OPENAIRE(8), CONFIGURABLE(9);
+        GOOGLE(1), FACEBOOK(2), TWITTER(3), LINKEDIN(4), NATIVELOGIN(5), B2_ACCESS(6), ORCID(7), OPENAIRE(8), CONFIGURABLE(9), ZENODO(10);
 
         private int value;
 
@@ -55,6 +57,8 @@ public class TokenValidatorFactoryImpl implements TokenValidatorFactory {
                     return OPENAIRE;
                 case 9:
                     return CONFIGURABLE;
+                case 10:
+                    return ZENODO;
                 default:
                     throw new RuntimeException("Unsupported LoginProvider");
             }
@@ -69,12 +73,15 @@ public class TokenValidatorFactoryImpl implements TokenValidatorFactory {
     private OpenAIRECustomProvider openAIRECustomProvider;
     private ConfigurableProviderCustomProvider configurableProviderCustomProvider;
     private ConfigLoader configLoader;
+    private ZenodoCustomProvider zenodoCustomProvider;
 
     @Autowired
     public TokenValidatorFactoryImpl(
             Environment environment,
             AuthenticationService nonVerifiedUserAuthenticationService, B2AccessCustomProvider b2AccessCustomProvider,
-            ORCIDCustomProvider orcidCustomProvider, LinkedInCustomProvider linkedInCustomProvider, OpenAIRECustomProvider openAIRECustomProvider, ConfigurableProviderCustomProvider configurableProviderCustomProvider, ConfigLoader configLoader) {
+            ORCIDCustomProvider orcidCustomProvider, LinkedInCustomProvider linkedInCustomProvider, OpenAIRECustomProvider openAIRECustomProvider,
+            ConfigurableProviderCustomProvider configurableProviderCustomProvider, ConfigLoader configLoader,
+            ZenodoCustomProvider zenodoCustomProvider) {
         this.environment = environment;
         this.nonVerifiedUserAuthenticationService = nonVerifiedUserAuthenticationService;
         this.b2AccessCustomProvider = b2AccessCustomProvider;
@@ -83,6 +90,7 @@ public class TokenValidatorFactoryImpl implements TokenValidatorFactory {
         this.openAIRECustomProvider = openAIRECustomProvider;
         this.configurableProviderCustomProvider = configurableProviderCustomProvider;
         this.configLoader = configLoader;
+        this.zenodoCustomProvider = zenodoCustomProvider;
     }
 
     public TokenValidator getProvider(LoginProvider provider) {
@@ -103,6 +111,8 @@ public class TokenValidatorFactoryImpl implements TokenValidatorFactory {
                 return new OpenAIRETokenValidator(this.environment, this.nonVerifiedUserAuthenticationService, this.openAIRECustomProvider);
             case CONFIGURABLE:
                 return new ConfigurableProviderTokenValidator(this.configurableProviderCustomProvider, this.nonVerifiedUserAuthenticationService, this.configLoader);
+            case ZENODO:
+                return new ZenodoTokenValidator(this.environment, this.nonVerifiedUserAuthenticationService, this.zenodoCustomProvider);
             default:
                 throw new RuntimeException("Login Provider Not Implemented");
         }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/ZenodoTokenValidator.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/ZenodoTokenValidator.java
new file mode 100644
index 000000000..2708a96b2
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/ZenodoTokenValidator.java
@@ -0,0 +1,57 @@
+package eu.eudat.logic.security.validators.zenodo;
+
+import eu.eudat.exceptions.security.NonValidTokenException;
+import eu.eudat.exceptions.security.NullEmailException;
+import eu.eudat.logic.security.customproviders.ORCID.ORCIDCustomProvider;
+import eu.eudat.logic.security.customproviders.ORCID.ORCIDUser;
+import eu.eudat.logic.security.customproviders.Zenodo.ZenodoCustomProvider;
+import eu.eudat.logic.security.customproviders.Zenodo.ZenodoUser;
+import eu.eudat.logic.security.validators.TokenValidator;
+import eu.eudat.logic.security.validators.zenodo.helpers.ZenodoRequest;
+import eu.eudat.logic.security.validators.zenodo.helpers.ZenodoResponseToken;
+import eu.eudat.logic.services.operations.authentication.AuthenticationService;
+import eu.eudat.models.data.login.LoginInfo;
+import eu.eudat.models.data.loginprovider.LoginProviderUser;
+import eu.eudat.models.data.security.Principal;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+
+@Component("zenodoTokenValidator")
+public class ZenodoTokenValidator implements TokenValidator {
+
+	private ZenodoCustomProvider zenodoCustomProvider;
+	private Environment environment;
+	private AuthenticationService nonVerifiedUserAuthenticationService;
+
+	@Autowired
+	public ZenodoTokenValidator(Environment environment, AuthenticationService nonVerifiedUserAuthenticationService, ZenodoCustomProvider zenodoCustomProvider) {
+		this.environment = environment;
+		this.nonVerifiedUserAuthenticationService = nonVerifiedUserAuthenticationService;
+		this.zenodoCustomProvider = zenodoCustomProvider;
+	}
+
+	@Override
+	public Principal validateToken(LoginInfo credentials) throws NonValidTokenException, IOException, GeneralSecurityException, NullEmailException {
+		ZenodoUser zenodoUser = new ZenodoUser().getZenodoUser(credentials.getData());
+		LoginProviderUser user = new LoginProviderUser();
+		user.setId(zenodoUser.getUserId());
+		user.setName(zenodoUser.getEmail());
+		user.setEmail(zenodoUser.getEmail());
+		user.setZenodoId(zenodoUser.getAccessToken());
+		user.setZenodoExpire(zenodoUser.getExpiresIn());
+		user.setProvider(credentials.getProvider());
+		user.setSecret(credentials.getTicket());
+		return this.nonVerifiedUserAuthenticationService.Touch(user);
+	}
+
+	public ZenodoResponseToken getAccessToken(ZenodoRequest zenodoRequest) {
+		return this.zenodoCustomProvider.getAccessToken(zenodoRequest.getCode()
+				, this.environment.getProperty("zenodo.login.client_id")
+				, this.environment.getProperty("zenodo.login.client_secret")
+				, this.environment.getProperty("zenodo.login.redirect_uri"));
+	}
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/helpers/ZenodoRequest.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/helpers/ZenodoRequest.java
new file mode 100644
index 000000000..c1f4ea32a
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/helpers/ZenodoRequest.java
@@ -0,0 +1,12 @@
+package eu.eudat.logic.security.validators.zenodo.helpers;
+
+public class ZenodoRequest {
+    private String code;
+
+    public String getCode() {
+        return code;
+    }
+    public void setCode(String code) {
+        this.code = code;
+    }
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/helpers/ZenodoResponseToken.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/helpers/ZenodoResponseToken.java
new file mode 100644
index 000000000..5b437cdfb
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/helpers/ZenodoResponseToken.java
@@ -0,0 +1,38 @@
+package eu.eudat.logic.security.validators.zenodo.helpers;
+
+public class ZenodoResponseToken {
+    private String userId;
+    private String email;
+    private Integer expiresIn;
+    private String accessToken;
+
+    public String getUserId() {
+        return userId;
+    }
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public Integer getExpiresIn() {
+        return expiresIn;
+    }
+
+    public void setExpiresIn(Integer expiresIn) {
+        this.expiresIn = expiresIn;
+    }
+
+    public String getAccessToken() {
+        return accessToken;
+    }
+    public void setAccessToken(String accessToken) {
+        this.accessToken = accessToken;
+    }
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java
index cb7506ab6..fc09056fa 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java
@@ -20,6 +20,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.core.env.Environment;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.Instant;
 import java.util.*;
 
 public abstract class AbstractAuthenticationService implements AuthenticationService {
@@ -132,7 +133,7 @@ public abstract class AbstractAuthenticationService implements AuthenticationSer
 			userInfo = this.apiContext.getOperationsContext().getBuilderFactory().getBuilder(UserInfoBuilder.class)
 					.name(profile.getName()).verified_email(profile.getIsVerified())
 					.email(profile.getEmail()).created(new Date()).lastloggedin(new Date())
-					.additionalinfo("{\"data\":{\"avatar\":{\"url\":\"" + profile.getAvatarUrl() + "\"}}}")
+					.additionalinfo("{\"data\":{\"avatar\":{\"url\":\"" + profile.getAvatarUrl() + "\"}},{\"zenodoToken\":\"" + profile.getZenodoId() + "\", \"expirationDate\": \"" + Instant.now().plusSeconds(profile.getZenodoExpire()).toEpochMilli() + "\"}")
 					.authorization_level((short) 1).usertype((short) 1)
 					.build();
 
@@ -149,7 +150,15 @@ public abstract class AbstractAuthenticationService implements AuthenticationSer
 		} else {
 			Map<String, Object> additionalInfo = userInfo.getAdditionalinfo() != null ?
 					new JSONObject(userInfo.getAdditionalinfo()).toMap() : new HashMap<>();
-			additionalInfo.put("avatarUrl", profile.getAvatarUrl());
+			if (profile.getAvatarUrl() != null && !profile.getAvatarUrl().isEmpty() && !profile.getAvatarUrl().equals("null")) {
+				additionalInfo.put("avatarUrl", profile.getAvatarUrl());
+			}
+			if (profile.getZenodoId() != null && !profile.getZenodoId().isEmpty() && !profile.getZenodoId().equals("null")) {
+				additionalInfo.put("zenodoToken", profile.getZenodoId());
+			}
+			if (profile.getZenodoExpire() != null) {
+				additionalInfo.put("expirationDate", Instant.now().plusSeconds(profile.getZenodoExpire()).toEpochMilli());
+			}
 			userInfo.setLastloggedin(new Date());
 			userInfo.setAdditionalinfo(new JSONObject(additionalInfo).toString());
 			Set<Credential> credentials = userInfo.getCredentials();
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/NonVerifiedUserEmailAuthenticationService.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/NonVerifiedUserEmailAuthenticationService.java
index 62c5f60ae..159bbb235 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/NonVerifiedUserEmailAuthenticationService.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/NonVerifiedUserEmailAuthenticationService.java
@@ -11,6 +11,7 @@ import eu.eudat.types.Authorities;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 
+import java.time.Instant;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
@@ -33,6 +34,18 @@ public class NonVerifiedUserEmailAuthenticationService extends AbstractAuthentic
 		} catch (Exception e) {
 			avatarUrl = "";
 		}
+		String zenodoToken;
+		try {
+			zenodoToken = user.getAdditionalinfo() != null ? new ObjectMapper().readTree(user.getAdditionalinfo()).get("zenodoToken").asText() : "";
+		} catch (Exception e) {
+			zenodoToken = "";
+		}
+		Instant zenodoDuration;
+		try {
+			zenodoDuration = user.getAdditionalinfo() != null ? Instant.ofEpochMilli(new ObjectMapper().readTree(user.getAdditionalinfo()).get("expirationDate").asLong()) : Instant.now();
+		} catch (Exception e) {
+			zenodoDuration = Instant.now();
+		}
 		String culture;
 		try {
 			culture = user.getAdditionalinfo() != null ? new ObjectMapper().readTree(user.getAdditionalinfo()).get("culture").get("name").asText() : "";
@@ -58,6 +71,8 @@ public class NonVerifiedUserEmailAuthenticationService extends AbstractAuthentic
 				.culture(culture)
 				.language(language)
 				.timezone(timezone)
+				.zenodoToken(zenodoToken)
+				.zenodoDuration(zenodoDuration)
 				.build();
 
 		List<UserRole> userRoles = apiContext.getOperationsContext().getDatabaseRepository().getUserRoleDao().getUserRoles(user);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/VerifiedUserAuthenticationService.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/VerifiedUserAuthenticationService.java
index acbb3dc86..c03e81934 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/VerifiedUserAuthenticationService.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/VerifiedUserAuthenticationService.java
@@ -20,6 +20,7 @@ import org.json.JSONObject;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 
+import java.time.Instant;
 import java.util.*;
 
 
@@ -42,6 +43,18 @@ public class VerifiedUserAuthenticationService extends AbstractAuthenticationSer
 		} catch (Exception e) {
 			avatarUrl = "";
 		}
+		String zenodoToken;
+		try {
+			zenodoToken = user.getAdditionalinfo() != null ? new ObjectMapper().readTree(user.getAdditionalinfo()).get("zenodoToken").asText() : "";
+		} catch (Exception e) {
+			zenodoToken = "";
+		}
+		Instant zenodoDuration;
+		try {
+			zenodoDuration = user.getAdditionalinfo() != null ? Instant.ofEpochMilli(new ObjectMapper().readTree(user.getAdditionalinfo()).get("expirationDate").asLong()) : Instant.now();
+		} catch (Exception e) {
+			zenodoDuration = Instant.now();
+		}
 		String culture;
 		try {
 			culture = user.getAdditionalinfo() != null ? new ObjectMapper().readTree(user.getAdditionalinfo()).get("culture").get("name").asText() : "";
@@ -67,6 +80,8 @@ public class VerifiedUserAuthenticationService extends AbstractAuthenticationSer
 				.culture(culture)
 				.language(language)
 				.timezone(timezone)
+				.zenodoToken(zenodoToken)
+				.zenodoDuration(zenodoDuration)
 				.build();
 
 		List<UserRole> userRoles = apiContext.getOperationsContext().getDatabaseRepository().getUserRoleDao().getUserRoles(user);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/loginprovider/LoginProviderUser.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/loginprovider/LoginProviderUser.java
index e1b0a6d41..13f5b9371 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/loginprovider/LoginProviderUser.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/loginprovider/LoginProviderUser.java
@@ -11,6 +11,8 @@ public class LoginProviderUser {
     private String avatarUrl;
     private boolean isVerified;
     private TokenValidatorFactoryImpl.LoginProvider provider;
+    private String zenodoId;
+    private Integer zenodoExpire;
 
     public String getId() {
         return id;
@@ -67,4 +69,20 @@ public class LoginProviderUser {
     public void setAvatarUrl(String avatarUrl) {
         this.avatarUrl = avatarUrl;
     }
+
+    public String getZenodoId() {
+        return zenodoId;
+    }
+
+    public void setZenodoId(String zenodoId) {
+        this.zenodoId = zenodoId;
+    }
+
+    public Integer getZenodoExpire() {
+        return zenodoExpire;
+    }
+
+    public void setZenodoExpire(Integer zenodoExpire) {
+        this.zenodoExpire = zenodoExpire;
+    }
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/security/Principal.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/security/Principal.java
index 5399b5466..f0e017e84 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/security/Principal.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/security/Principal.java
@@ -3,6 +3,7 @@ package eu.eudat.models.data.security;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import eu.eudat.types.Authorities;
 
+import java.time.Instant;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -17,6 +18,8 @@ public class Principal {
     private String culture;
     private String language;
     private String timezone;
+    private String zenodoToken;
+    private Instant zenodoDuration;
 
     public UUID getId() {
         return id;
@@ -86,6 +89,22 @@ public class Principal {
         this.timezone = timezone;
     }
 
+    public String getZenodoToken() {
+        return zenodoToken;
+    }
+
+    public void setZenodoToken(String zenodoToken) {
+        this.zenodoToken = zenodoToken;
+    }
+
+    public Instant getZenodoDuration() {
+        return zenodoDuration;
+    }
+
+    public void setZenodoDuration(Instant zenodoDuration) {
+        this.zenodoDuration = zenodoDuration;
+    }
+
     @JsonIgnore
     public Set<Authorities> getAuthz() {
         return this.authorities;
diff --git a/dmp-backend/web/src/main/resources/config/application-devel.properties b/dmp-backend/web/src/main/resources/config/application-devel.properties
index 59d292b11..7051f6667 100644
--- a/dmp-backend/web/src/main/resources/config/application-devel.properties
+++ b/dmp-backend/web/src/main/resources/config/application-devel.properties
@@ -69,6 +69,10 @@ conf_email.subject=OpenDMP email confirmation
 #############ZENODO CONFIGURATIONS#########
 zenodo.url=https://sandbox.zenodo.org/api/
 zenodo.access_token=
+zenodo.login.access_token_url=https://sandbox.zenodo.org/oauth/token
+zenodo.login.client_id=
+zenodo.login.client_secret=
+zenodo.login.redirect_uri=http://localhost:4200/login/external/zenodo
 
 #############CONTACT EMAIL CONFIGURATIONS#########
 contact_email.mail=
diff --git a/dmp-frontend/src/app/core/common/enum/auth-provider.ts b/dmp-frontend/src/app/core/common/enum/auth-provider.ts
index b8b70efd8..11c36b2a9 100644
--- a/dmp-frontend/src/app/core/common/enum/auth-provider.ts
+++ b/dmp-frontend/src/app/core/common/enum/auth-provider.ts
@@ -7,5 +7,6 @@ export enum AuthProvider {
 	B2Access = 6,
 	ORCID = 7,
 	OpenAire = 8,
-	Configurable = 9
+	Configurable = 9,
+	Zenodo = 10
 }
diff --git a/dmp-frontend/src/app/core/model/configuration-models/login-providers.model.ts b/dmp-frontend/src/app/core/model/configuration-models/login-providers.model.ts
index 8c7751e2c..15474bdce 100644
--- a/dmp-frontend/src/app/core/model/configuration-models/login-providers.model.ts
+++ b/dmp-frontend/src/app/core/model/configuration-models/login-providers.model.ts
@@ -42,6 +42,11 @@ export class LoginProviders {
 		return this._openAireConfiguration;
 	}
 
+	private _zenodoConfiguration: LoginConfiguration;
+	get zenodoConfiguration(): LoginConfiguration {
+		return this._zenodoConfiguration;
+	}
+
 	public static parseValue(value: any): LoginProviders {
 		const obj: LoginProviders = new LoginProviders();
 		obj._enabled = value.enabled;
@@ -52,6 +57,7 @@ export class LoginProviders {
 		obj._b2accessConfiguration = value.b2accessConfiguration;
 		obj._orcidConfiguration = value.orcidConfiguration;
 		obj._openAireConfiguration = value.openAireConfiguration;
+		obj._zenodoConfiguration = value.zenodoConfiguration;
 		return obj;
 	}
 }
diff --git a/dmp-frontend/src/app/core/model/zenodo/zenodo-token.model.ts b/dmp-frontend/src/app/core/model/zenodo/zenodo-token.model.ts
new file mode 100644
index 000000000..0ddb251d6
--- /dev/null
+++ b/dmp-frontend/src/app/core/model/zenodo/zenodo-token.model.ts
@@ -0,0 +1,6 @@
+export class ZenodoToken {
+	userId: string;
+	expiresIn: number;
+	accessToken:string;
+	email: string;
+}
diff --git a/dmp-frontend/src/app/ui/auth/login/img/zenodo-white-200.png b/dmp-frontend/src/app/ui/auth/login/img/zenodo-white-200.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fb49be6e056112979c675e44fe46bd7e908390d
GIT binary patch
literal 2383
zcmb7`c{tRI8pnq$!$CF2zBgjx$S%7qBW6fuqB@kNED2d_j3sNvB};>d;>_uXW-Nm#
zTTH1OoGCP7Dl{hhG6rW#V@$4l?tSk4`~LAR&-1>|`+c7GpYP`%UY@SflFE`G5J(!~
z21oDL!Ts<8i|yx&QPwT{MJd7MLc-bT&;(3STnNZ9IQnvkCL$^*ECd}A6pW1>3b6%&
zz?%rTqj%z`wTBXSWL;!)A~2T>93328`sK)FAUs&i1@%r7C$5fysvm>GrSs0e0HbE_
z=8Ch7P_iR8d^UuQ)AOL2LU5E(;*3P6yH|#f)pSUTq2NwQJLwsz9yVdLSH7FUZvIi<
zT_3=B=VPvY-{X`Jh+Fyv0!jx7frNxX!Xh9MFbI4IbVw7V=>T#_|9kMi?(dbvVHU6n
zROK%N+b_3e^t;LvB*JZ$UFi}1F?8(;BT@a%GH&2iKXD0J?^cI*@p++s$xj?X;18sa
z-xP#J($l9aqm=elTx9;Mh8`GDxGe|h=zfpU+Ok1sg$76v@$U;0(sz3^yxn*7a3hf(
z)_Dnsh)t47Ngv|vmT{^nenU6HVbrMxF6C;f43%FZBhPmK<Uu;pq!sms<@o0!)Bi`5
z=g#RA2L6PcclJiUQ<0fgiNPx3VcTvMejPggTJ=@9uhksifi6prK1>ZLxqh_F^7}bF
z$!!vva=zFgwrAK55q(!#s=6oj1hE{bd5joyo=vt7kA?eV@cvqAiyu?NN)45CwF(C3
zaPwPAjMq~yf_@w=XdUEd0ZHP_n&a1(;^_H>i(UBllhEQYo1M7y;rEdzjcFavE`}*s
zdVM>U{()$<TxKf@E(cTMEN`_R8Mz42r}bgl`Z}Dp9+b9<G0!4w&^^s|{o5<5wkPn`
zJF1%Y1^vnnNwl%bV~eY6qwQpb>*A74nHhAIa{}NXj>mC(Z*$!ynA2{wvpwoxfjBuS
z|3=Tg2K4ZxO^Qn6VAdBgL{@7bt1~K&@XSi}ullL)Cx@6g{BT~U73^^uE@|Y*S5u&&
zOrTQxbG8cmfYz3AHuu5qo*(^iPQny+Bf~7Q>aO+O9r$;3Lr0XsK*jLtSvrI+Pqzn#
zfw9ZY(~5Ms+?_RZ;~MVmgkw*1zCxnaR?Em&o=MiW1{1E~eiwK;YxQU^7v|1Z78e??
zO(K<b*~FG;aXJ7F@HCxj;lSvDudFaSb{eRsX67yTwE?01H@I=&bLBSnb*|osWW^Li
zXp@QR_MuOjyfL;+pYe;AWHNyzP+z|C_M0^wB~Nvh!X{-r@uUcB&=Ef|#igjKYfmfL
z`TFFDGQxCVQm#ka#+)xLEN6DxF&!YQ@1J<thiS=*#)vZ|WT<j7)W43~S(JQ>+Yp!}
z?2@+}z?9KG%KanJj3W+opR>G|kr&Eeq!Dj(^j$~dmYoW(Jb1)m-D9xyT$#=HsLj17
zi*Vb{V5_0}<i=54r3Z{%|FOBMVZ%!}t?J5pJa?|=blVy$E+aWZ{sLFAm$k&lE;V%*
zmH~!psWlUkvxT^yjpct)J9Vww|9+U$r3ZU0$NIwF1Er@J@v@9p-;#xySoxY~Rv8>u
zWBwv+V+v|_i$yrobXc=%Y-~ez0XFADf2tIkoH^3Ed~MkEB+ql;`g+=9T5KA9w!L;~
zQc(!6vRisT>H~(ln+&i7aC>C&QAUgYy1?6s+1Xb=FG0p)t5a?;f;yrt{0N&Qg5oW`
zUt(6w`Gz`8t({gB_aXz)n^8#FV=JJp!i45fz9fCzc)WUG<3^TUSKbY&Wt4MjswNfb
zwI*aT&>}#}d29&%cJ)9ufBoQCWLhQ{LL&ZF@q8*MM^E-lklOmpD-NiW(~J6(H<>pH
z7TQXS%`Jsk?^q{oy7&90%m<z!T|S<B71J1NOTH({?G5&BQz-sw%vXUd)Y}gT40xL>
z)!Z%-*0yr@kh5*q(nk>m`|$A<Gr2cA5%S%Kk@GqWsn3Cwbwogq`EW_}l%8pbL~2!?
zVx)_lrUEf=(5*tFmYeI`A?t~elOn}ugeg%qN*3B}McjVs!rru2XK01)wL;+G{BOvZ
z!nc5=nt|17O84Q^#><<ht)^SZMIqzP9qr?6i7k`Q(9`zktQIZ4oVQe`SS)8&m^DGB
z-q=RgLv^H!3gRD{BzM=%vBYQeMBL2k?h+WJz~Odjcc}obs0?rEaVBqbPvKxg;5&1_
z^^QiT>D7v&@O#TTmOCr{J8|WLN$?@lv!%CwJ5uyKPD$@&yrR5PN@0s-wL(F~tmD`1
z)3hfF`0GZtkv~Sg%Oe;6xN~ktV+1>1j9WdPT2or-q*#4`LL;w3(n6!ZTD<Z0D;*_Y
zlt+Up`3e57V+C%{6}Q^_DC|)Ytje4b`zG<t${2403V9?wz%DkUK;^R|qBo*kE0tUE
zkMO*$I_z>3^jx0Ve3-#RzlmuDx08Tubx@vej&O;+QWRiR*^R-9eO?8MY8ed;k~uVt
z2~b1K42ey`wZ{umny!2nBkmP~W|VGT0!$qToODstyO8zZAr3W%>)cOqa@o5#<3XHg
zEW7!dsHe!g2zfUepxv8XCnL2kl6ap>keskxV4AKOn)GQs=}0`!+CGZrjC_9!!;geu
z^&S5hY;z9xQrqdFp|{kOwt8XO%nWLC@{GI6>qV?oL+yaeP>E3i1{9J5i@!7xrd{ic
zoQot$Mae28wssB?qGn6^4|a{p-E|kVYt^T-d65q`6=EVXXA>*jI~u9jOQ~i<-k<Lf
ze18W%(NSF^1af&b)m@s;Td;Q~T{YN6TI0CsL3<a7Cf&n?JrB`_ljn46HXmEsz|M?6
zk_Othl<G^WOLCHAO@np!V$^ZB>8ITjo5hQ%2eCfa=+fG~DkTi%UoD%n=EKU7uWp6h
z;asCnquG?r>6!$M@B)|mSC5^3_5HKsDfZc5ej~b!e;KTe)_d!<cWEdq?L#fu4C&|Q
zt6oNnA7%RV9pu1$BrI!oXU%_(AJnjDb|ucdJz??TJRF#Zu_g4rw`$xv@YWE<!(B}j
zVs`;*5`V?iNlwt_T_{z#BRb*PBQ(~Om|K{*;m~_G<gfnLxeQ7FMoBPp-?{fK{Xcl{
mZ*KU12;yImA=<|jmI8gbc0Hf;5u~<HNFaoZC%oAyF!P^sUU|p>

literal 0
HcmV?d00001

diff --git a/dmp-frontend/src/app/ui/auth/login/login.component.html b/dmp-frontend/src/app/ui/auth/login/login.component.html
index d8be9c88b..dd1c8fc9e 100644
--- a/dmp-frontend/src/app/ui/auth/login/login.component.html
+++ b/dmp-frontend/src/app/ui/auth/login/login.component.html
@@ -54,6 +54,12 @@
 					</button>
 				</div>
 			</div>
+			<div *ngIf="hasZenodoOauth()" class="col-auto zenodo-logo">
+				<button class="zenodo-button" mat-icon-button (click)="zenodoLogin()" class="login-social-button">
+					<span class="zenodoIcon"></span>
+					<!-- <span></span> -->
+				</button>
+			</div>
 		</div>
 		<div class="card-footer">
 			<h4 class="text-uppercase">
diff --git a/dmp-frontend/src/app/ui/auth/login/login.component.scss b/dmp-frontend/src/app/ui/auth/login/login.component.scss
index 6a4c37731..5d5f9402c 100644
--- a/dmp-frontend/src/app/ui/auth/login/login.component.scss
+++ b/dmp-frontend/src/app/ui/auth/login/login.component.scss
@@ -156,6 +156,12 @@
 	height: 90px;
 }
 
+.accesss-methods .zenodo-logo {
+	height: 75px;
+	padding-top: 8px;
+	margin-top: 13px;
+  }
+
 .tip {
   margin-top: -20px;
 }
@@ -231,6 +237,14 @@ span.configurableIcon {
 	height: 56px;
 }
 
+span.zenodoIcon {
+	background: url(img/zenodo-white-200.png) no-repeat 100px 56px;
+	background-position: center;
+	float: right;
+	width: 150px;
+	height: 56px;
+  }
+
 .b2access-button {
   margin-top: 10px;
   width: fit-content;
@@ -251,6 +265,11 @@ span.configurableIcon {
 	width: fit-content;
 }
 
+.zenodo-button {
+	margin-top: 10px;
+	width: fit-content;
+  }
+
 .login-logo {
   background: url(img/open-dmp.png) no-repeat;
   width: 273px;
diff --git a/dmp-frontend/src/app/ui/auth/login/login.component.ts b/dmp-frontend/src/app/ui/auth/login/login.component.ts
index f71c64bf9..e475fd881 100644
--- a/dmp-frontend/src/app/ui/auth/login/login.component.ts
+++ b/dmp-frontend/src/app/ui/auth/login/login.component.ts
@@ -78,6 +78,10 @@ export class LoginComponent extends BaseComponent implements OnInit, AfterViewIn
 		this.router.navigate(['/login/configurable/' + provider.configurableLoginId])
 	}
 
+	public zenodoLogin() {
+		this.router.navigate(['/login/external/zenodo']);
+	}
+
 	public hasFacebookOauth(): boolean {
 		return this.hasProvider(AuthProvider.Facebook);
 	}
@@ -106,6 +110,10 @@ export class LoginComponent extends BaseComponent implements OnInit, AfterViewIn
 		return this.hasProvider(AuthProvider.OpenAire);
 	}
 
+	public hasZenodoOauth(): boolean {
+		return this.hasProvider(AuthProvider.Zenodo);
+	}
+
 	public initProviders() {
 		if (this.hasProvider(AuthProvider.Google)) { this.initializeGoogleOauth(); }
 		if (this.hasProvider(AuthProvider.Facebook)) { this.initializeFacebookOauth(); }
@@ -127,6 +135,7 @@ export class LoginComponent extends BaseComponent implements OnInit, AfterViewIn
 			case AuthProvider.B2Access: return this.hasAllRequiredFieldsConfigured(this.configurationService.loginProviders.b2accessConfiguration);
 			case AuthProvider.ORCID: return this.hasAllRequiredFieldsConfigured(this.configurationService.loginProviders.orcidConfiguration);
 			case AuthProvider.OpenAire: return this.hasAllRequiredFieldsConfigured(this.configurationService.loginProviders.openAireConfiguration);
+			case AuthProvider.Zenodo: return this.hasAllRequiredFieldsConfigured(this.configurationService.loginProviders.zenodoConfiguration);
 			default: throw new Error('Unsupported Provider Type');
 		}
 	}
diff --git a/dmp-frontend/src/app/ui/auth/login/login.module.ts b/dmp-frontend/src/app/ui/auth/login/login.module.ts
index cfa773be0..64f9b0a4a 100644
--- a/dmp-frontend/src/app/ui/auth/login/login.module.ts
+++ b/dmp-frontend/src/app/ui/auth/login/login.module.ts
@@ -12,6 +12,7 @@ import { ConfigurableProvidersService } from '@app/ui/auth/login/utilities/confi
 import { LoginService } from '@app/ui/auth/login/utilities/login.service';
 import { CommonFormsModule } from '@common/forms/common-forms.module';
 import { CommonUiModule } from '@common/ui/common-ui.module';
+import { ZenodoLoginComponent } from './zenodo-login/zenodo-login.component';
 
 @NgModule({
 	imports: [
@@ -27,7 +28,8 @@ import { CommonUiModule } from '@common/ui/common-ui.module';
 		OrcidLoginComponent,
 		EmailConfirmation,
 		OpenAireLoginComponent,
-		ConfigurableLoginComponent
+		ConfigurableLoginComponent,
+		ZenodoLoginComponent
 	],
 	providers: [LoginService, ConfigurableProvidersService]
 })
diff --git a/dmp-frontend/src/app/ui/auth/login/login.routing.ts b/dmp-frontend/src/app/ui/auth/login/login.routing.ts
index 0a2e7049f..9509fa48e 100644
--- a/dmp-frontend/src/app/ui/auth/login/login.routing.ts
+++ b/dmp-frontend/src/app/ui/auth/login/login.routing.ts
@@ -8,6 +8,7 @@ import { OrcidLoginComponent } from './orcid-login/orcid-login.component';
 import { TwitterLoginComponent } from './twitter-login/twitter-login.component';
 import { OpenAireLoginComponent } from "./openaire-login/openaire-login.component";
 import { ConfigurableLoginComponent } from "./configurable-login/configurable-login.component";
+import { ZenodoLoginComponent } from './zenodo-login/zenodo-login.component';
 
 const routes: Routes = [
 	{ path: '', component: LoginComponent },
@@ -18,7 +19,8 @@ const routes: Routes = [
 	{ path: 'confirmation/:token', component: EmailConfirmation },
 	{ path: 'confirmation', component: EmailConfirmation },
 	{ path: 'openaire', component: OpenAireLoginComponent},
-	{ path: 'configurable/:id', component: ConfigurableLoginComponent}
+	{ path: 'configurable/:id', component: ConfigurableLoginComponent},
+	{ path: 'external/zenodo', component: ZenodoLoginComponent }
 ];
 
 @NgModule({
diff --git a/dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.html b/dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.html
new file mode 100644
index 000000000..e69de29bb
diff --git a/dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.scss b/dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.ts b/dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.ts
new file mode 100644
index 000000000..36decce42
--- /dev/null
+++ b/dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.ts
@@ -0,0 +1,85 @@
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { Component, OnInit } from '@angular/core';
+import { FormControl } from '@angular/forms';
+import { ActivatedRoute, Params } from '@angular/router';
+import { AuthProvider } from '@app/core/common/enum/auth-provider';
+import { OrcidUser } from '@app/core/model/orcid/orcidUser';
+import { AuthService } from '@app/core/services/auth/auth.service';
+import { LoginService } from '@app/ui/auth/login/utilities/login.service';
+import { BaseComponent } from '@common/base/base.component';
+import { environment } from 'environments/environment';
+import { takeUntil } from 'rxjs/operators';
+import { ConfigurationService } from '@app/core/services/configuration/configuration.service';
+import { ZenodoToken } from '@app/core/model/zenodo/zenodo-token.model';
+
+@Component({
+	selector: 'app-zenodo-login',
+	templateUrl: './zenodo-login.component.html',
+	styleUrls: ['./zenodo-login.component.scss']
+})
+export class ZenodoLoginComponent extends BaseComponent implements OnInit {
+
+	private returnUrl: string;
+	private zenodoToken: ZenodoToken
+	private accessToken: string;
+	private emailFormControl = new FormControl('');
+
+	constructor(
+		private route: ActivatedRoute,
+		private authService: AuthService,
+		private loginService: LoginService,
+		private httpClient: HttpClient,
+		private configurationService: ConfigurationService
+	) {
+		super();
+		this.zenodoToken = new ZenodoToken;
+	}
+
+	ngOnInit(): void {
+		this.route.queryParams
+			.pipe(takeUntil(this._destroyed))
+			.subscribe((params: Params) => {
+				const returnUrl = params['returnUrl'];
+				if (returnUrl) { this.returnUrl = returnUrl; }
+				if (!params['code']) { this.zenodoAccessGetAuthCode(); } else { this.zenodoLogin(params['code']); }
+			});
+	}
+
+	public zenodoAccessGetAuthCode() {
+		window.location.href = this.configurationService.loginProviders.zenodoConfiguration.oauthUrl
+			+ '?client_id='
+			+ this.configurationService.loginProviders.zenodoConfiguration.clientId
+			+ '&response_type=code&scope=deposit:write+deposit:actions+user:email&state=astate&redirect_uri='
+			+ this.configurationService.loginProviders.zenodoConfiguration.redirectUri;
+	}
+
+	public zenodoLogin(code: string) {
+		let headers = new HttpHeaders();
+		headers = headers.set('Content-Type', 'application/json');
+		headers = headers.set('Accept', 'application/json');
+		this.httpClient.post(this.configurationService.server + 'auth/zenodoRequestToken', { code: code }, { headers: headers })
+			.pipe(takeUntil(this._destroyed))
+			.subscribe((responseData: any) => {
+				this.zenodoToken.userId = responseData.payload.userId;
+				this.zenodoToken.expiresIn = responseData.payload.expiresIn;
+				this.accessToken = this.zenodoToken.accessToken = responseData.payload.accessToken;
+				this.zenodoToken.email = responseData.payload.email;
+				this.authService.login({ ticket: this.accessToken, provider: AuthProvider.Zenodo, data: this.zenodoToken })
+					.pipe(takeUntil(this._destroyed))
+					.subscribe(
+						res => this.loginService.onLogInSuccess(res, this.returnUrl),
+						error => this.loginService.onLogInError(error)
+					);
+			});
+	}
+
+	public login() {
+		this.zenodoToken.email = this.emailFormControl.value;
+		this.authService.login({ ticket: this.accessToken, provider: AuthProvider.Zenodo, data: this.zenodoToken })
+			.pipe(takeUntil(this._destroyed))
+			.subscribe(
+				res => this.loginService.onLogInSuccess(res, this.returnUrl),
+				error => this.loginService.onLogInError(error)
+			);
+	}
+}
diff --git a/dmp-frontend/src/assets/config/config.json b/dmp-frontend/src/assets/config/config.json
index 7298e06b8..1aac1c5cd 100644
--- a/dmp-frontend/src/assets/config/config.json
+++ b/dmp-frontend/src/assets/config/config.json
@@ -8,7 +8,7 @@
 	},
 	"defaultCulture": "en-US",
 	"loginProviders": {
-		"enabled": [1, 2, 3, 4, 5, 6, 7, 8],
+		"enabled": [1, 2, 3, 4, 5, 6, 7, 8, 10],
 		"facebookConfiguration": { "clientId": "" },
 		"googleConfiguration": { "clientId": "" },
 		"linkedInConfiguration": {
@@ -37,6 +37,11 @@
 			"oauthUrl": "",
 			"redirectUri": "",
 			"state": "987654321"
+		},
+		"zenodoConfiguration": {
+			"clientId": "",
+			"oauthUrl": "https://sandbox.zenodo.org/oauth/authorize",
+			"redirectUri": "http://localhost:4200/login/external/zenodo"
 		}
 	},
 	"logging": {

From b97f08d0f4f4b9a123849da0786acbf559d4a49c Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Mon, 6 Apr 2020 18:16:05 +0300
Subject: [PATCH 16/60] Add zenodo DOI access token expiration check up and
 show proper pop up when the user has either no or expired token

---
 .../main/java/eu/eudat/controllers/Login.java | 13 ++++++
 .../security/ExpiredTokenException.java       |  8 ++++
 .../eu/eudat/logic/managers/UserManager.java  | 15 +++++++
 .../app/core/services/auth/auth.service.ts    |  9 ++++
 dmp-frontend/src/app/ui/dmp/dmp.module.ts     |  4 +-
 .../ui/dmp/overview/dmp-overview.component.ts | 32 ++++++++++++++
 dmp-frontend/src/assets/i18n/en.json          |  4 ++
 .../multiple-choice-dialog.component.html     | 30 +++++++++++++
 .../multiple-choice-dialog.component.scss     | 44 +++++++++++++++++++
 .../multiple-choice-dialog.component.ts       | 25 +++++++++++
 .../multiple-choice-dialog.module.ts          | 15 +++++++
 11 files changed, 198 insertions(+), 1 deletion(-)
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/exceptions/security/ExpiredTokenException.java
 create mode 100644 dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.html
 create mode 100644 dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.scss
 create mode 100644 dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.ts
 create mode 100644 dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.module.ts

diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java
index 16af6f14f..45636e7bb 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java
@@ -1,6 +1,8 @@
 package eu.eudat.controllers;
 
 
+import eu.eudat.exceptions.security.ExpiredTokenException;
+import eu.eudat.exceptions.security.NonValidTokenException;
 import eu.eudat.exceptions.security.NullEmailException;
 import eu.eudat.logic.managers.UserManager;
 import eu.eudat.logic.proxy.config.configloaders.ConfigLoader;
@@ -40,6 +42,7 @@ import org.springframework.social.oauth1.OAuthToken;
 import org.springframework.web.bind.annotation.*;
 
 import javax.transaction.Transactional;
+import java.io.IOException;
 import java.security.GeneralSecurityException;
 
 
@@ -150,6 +153,16 @@ public class Login {
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<Principal>().payload(this.nonVerifiedUserAuthenticationService.Touch(principal.getToken())).status(ApiMessageCode.NO_MESSAGE));
     }
 
+    @RequestMapping(method = RequestMethod.GET, value = {"/hasDOIToken"}, consumes = "application/json", produces = "application/json")
+    public @ResponseBody
+    ResponseEntity<ResponseItem<Boolean>> hasDOIToken(Principal principal) throws NullEmailException {
+        try {
+            return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<Boolean>().payload(this.userManager.isDOITokenValid(principal)).status(ApiMessageCode.NO_MESSAGE));
+        } catch (NonValidTokenException | ExpiredTokenException | IOException e) {
+            return ResponseEntity.status(460).body(new ResponseItem<Boolean>().payload(false).status(ApiMessageCode.ERROR_MESSAGE).message(e.getMessage()));
+        }
+    }
+
     @Transactional
     @RequestMapping(method = RequestMethod.POST, value = {"/logout"}, consumes = "application/json", produces = "application/json")
     public @ResponseBody
diff --git a/dmp-backend/web/src/main/java/eu/eudat/exceptions/security/ExpiredTokenException.java b/dmp-backend/web/src/main/java/eu/eudat/exceptions/security/ExpiredTokenException.java
new file mode 100644
index 000000000..dd1de35ea
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/exceptions/security/ExpiredTokenException.java
@@ -0,0 +1,8 @@
+package eu.eudat.exceptions.security;
+
+public class ExpiredTokenException extends Exception {
+
+	public ExpiredTokenException(String message) {
+		super(message);
+	}
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java
index 084648523..d2388eec4 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java
@@ -7,6 +7,8 @@ import eu.eudat.data.entities.DMP;
 import eu.eudat.data.entities.UserInfo;
 import eu.eudat.data.entities.UserRole;
 import eu.eudat.data.query.items.table.userinfo.UserInfoTableRequestItem;
+import eu.eudat.exceptions.security.ExpiredTokenException;
+import eu.eudat.exceptions.security.NonValidTokenException;
 import eu.eudat.exceptions.security.NullEmailException;
 import eu.eudat.exceptions.security.UnauthorisedException;
 import eu.eudat.logic.builders.entity.UserRoleBuilder;
@@ -29,6 +31,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 import java.io.IOException;
+import java.time.Instant;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -112,4 +115,16 @@ public class UserManager {
 		dataTableData.setTotalCount((long) colaborators.size());
 		return dataTableData;
 	}
+
+	public Boolean isDOITokenValid(Principal principal) throws NonValidTokenException, ExpiredTokenException, IOException {
+		if (principal.getZenodoToken() != null && !principal.getZenodoToken().isEmpty()) {
+			if (Instant.now().isBefore(principal.getZenodoDuration())) {
+				return true;
+			}
+			Map<String, Object> settings = Collections.singletonMap("zenodoToken", "");
+			this.updateSettings(settings, principal);
+			throw new ExpiredTokenException("Zenodo Token is expired");
+		}
+		throw new NonValidTokenException("This account has no Zenodo Token");
+	}
 }
diff --git a/dmp-frontend/src/app/core/services/auth/auth.service.ts b/dmp-frontend/src/app/core/services/auth/auth.service.ts
index a50261ba0..2b9fce248 100644
--- a/dmp-frontend/src/app/core/services/auth/auth.service.ts
+++ b/dmp-frontend/src/app/core/services/auth/auth.service.ts
@@ -159,4 +159,13 @@ export class AuthService extends BaseService {
 			})
 		);
 	}
+
+	public hasDOIToken(): Observable<any> {
+		this.actionUrl = this.configurationService.server + 'auth/';
+		const url = this.actionUrl + '/hasDOIToken';
+		const principal = this.current();
+		let headers = this.headers;
+		headers = headers.set('AuthToken', principal.token);
+		return this.http.get(url, { headers: headers });
+	}
 }
diff --git a/dmp-frontend/src/app/ui/dmp/dmp.module.ts b/dmp-frontend/src/app/ui/dmp/dmp.module.ts
index c4732a882..0f72ed78f 100644
--- a/dmp-frontend/src/app/ui/dmp/dmp.module.ts
+++ b/dmp-frontend/src/app/ui/dmp/dmp.module.ts
@@ -30,6 +30,7 @@ import { DmpWizardDatasetListingComponent } from '@app/ui/dmp/wizard/listing/dmp
 import { CommonFormsModule } from '@common/forms/common-forms.module';
 import { FormValidationErrorsDialogModule } from '@common/forms/form-validation-errors-dialog/form-validation-errors-dialog.module';
 import { CommonUiModule } from '@common/ui/common-ui.module';
+import { MultipleChoiceDialogModule } from '@common/modules/multiple-choice-dialog/multiple-choice-dialog.module';
 
 @NgModule({
 	imports: [
@@ -42,7 +43,8 @@ import { CommonUiModule } from '@common/ui/common-ui.module';
 		AutoCompleteModule,
 		DmpRoutingModule,
 		DmpOverviewModule,
-		FormValidationErrorsDialogModule
+		FormValidationErrorsDialogModule,
+		MultipleChoiceDialogModule
 	],
 	declarations: [
 		DmpListingComponent,
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
index 98c25aac9..fe787bbe0 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
@@ -22,6 +22,8 @@ import { Observable, of as observableOf } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { Role } from "@app/core/common/enum/role";
 import { DmpInvitationDialogComponent } from '../invitation/dmp-invitation.component';
+import { MultipleChoiceDialogModule } from '@common/modules/multiple-choice-dialog/multiple-choice-dialog.module';
+import { MultipleChoiceDialogComponent } from '@common/modules/multiple-choice-dialog/multiple-choice-dialog.component';
 
 @Component({
 	selector: 'app-dmp-overview',
@@ -322,6 +324,14 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 	}
 
 	getDoi(dmp: DmpOverviewModel) {
+		this.authentication.hasDOIToken().subscribe(response => {
+			this.showConfirmationDOIDialog(dmp);
+		}, error => {
+			this.showErrorConfirmationDOIDialog(error.error.message, dmp);
+		});
+	}
+
+	showConfirmationDOIDialog(dmp: DmpOverviewModel) {
 		const dialogRef = this.dialog.open(ConfirmationDialogComponent, {
 			maxWidth: '600px',
 			restoreFocus: false,
@@ -346,6 +356,28 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 		});
 	}
 
+	showErrorConfirmationDOIDialog(message: string, dmp: DmpOverviewModel) {
+		const dialogRef = this.dialog.open(MultipleChoiceDialogComponent, {
+			maxWidth: '600px',
+			restoreFocus: false,
+			data: {
+				message: message,
+				titles: [ this.language.instant('DMP-OVERVIEW.MULTIPLE-DIALOG.ZENODO-LOGIN'), this.language.instant('DMP-OVERVIEW.MULTIPLE-DIALOG.USE-DEFAULT')]
+			}
+		});
+		dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => {
+			switch (result) {
+				case 0:
+					this.authentication.logout();
+					this.router.navigate(['/login/external/zenodo']);
+					break;
+				case 1:
+					this.showConfirmationDOIDialog(dmp);
+					break;
+			}
+		});
+	}
+
 	onDOICallbackSuccess(): void {
 		this.uiNotificationService.snackBarNotification(this.language.instant('DMP-EDITOR.SNACK-BAR.SUCCESSFUL-DOI'), SnackBarNotificationLevel.Success);
 	}
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index d1db35ce5..8d01e4426 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -525,6 +525,10 @@
 		"ERROR": {
 			"DELETED-DMP": "The requested DMP is deleted",
 			"FORBIDEN-DMP": "You are not allowed to access this DMP"
+		},
+		"MULTIPLE-DIALOG": {
+			"ZENODO-LOGIN": "Login with Zenodo",
+			"USE-DEFAULT": "Use Default Token"
 		}
 	},
 	"DATASET-LISTING": {
diff --git a/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.html b/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.html
new file mode 100644
index 000000000..87029a992
--- /dev/null
+++ b/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.html
@@ -0,0 +1,30 @@
+<div class="confirmation-dialog">
+	<div *ngIf="data.icon" class="row d-flex flex-row">
+		<div class="col-auto close-btn justify-content-start">
+			<mat-icon color="warn">{{ data.icon }}</mat-icon>
+		</div>
+		<div *ngIf="data.warning" class="col justify-content-center warn-text">{{ data.warning }}</div>
+		<div class="col-auto close-btn justify-content-end" (click)="close()">
+			<mat-icon>close</mat-icon>
+		</div>
+	</div>
+	<div class="row d-flex flex-row">
+		<div class="col message pb-4 pl-3">{{ data.message }}</div>
+		<div *ngIf="!data.icon" class="col-auto close-btn justify-content-end" (click)="close()">
+			<mat-icon>close</mat-icon>
+		</div>
+	</div>
+	<div *ngIf="data.privacyPolicyNames" class="row d-flex flex-col">
+		<div class="col-12 privacy-policy-names">{{ data.privacyPolicyNames }}</div>
+		<mat-checkbox [(ngModel)]="agreePrivacyPolicyNames" required class="checkbox-privacy">
+			{{'GENERAL.CONFIRMATION-DIALOG.ACTIONS.POLICY-AGREE' | translate}}
+		</mat-checkbox>
+		<div *ngIf="!agreePrivacyPolicyNames" class="required-policy">{{'GENERAL.CONFIRMATION-DIALOG.ACTIONS.REQUIRED' | translate}}</div>
+	</div>
+	<div class="row">
+		<div class="col"></div>
+		<span *ngFor="let title of data.titles; let i = index">
+		<div class="col-auto"><button mat-raised-button type="button" (click)="apply(i)" class="confirm">{{ title }}</button></div>
+		</span>
+	</div>
+</div>
diff --git a/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.scss b/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.scss
new file mode 100644
index 000000000..1e529f1f5
--- /dev/null
+++ b/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.scss
@@ -0,0 +1,44 @@
+.confirmation-dialog {
+	.confirmation {
+	  padding-bottom: 20px;
+	}
+
+	.privacy-policy-names {
+	  font-weight: 700;
+	  padding: 1em;
+	}
+
+	.close-btn {
+	  margin-left: auto;
+	  cursor: pointer;
+	}
+
+	.warn-text {
+	  color: #f44336;
+	}
+
+	.cancel {
+	  background-color: #aaaaaa;
+	  color: #ffffff;
+	}
+
+	.confirm {
+	  background-color: #2cba6c;
+	  color: #ffffff;
+	}
+
+	.delete {
+	  background-color: #ba2c2c;
+	  color: #ffffff;
+	}
+
+	.checkbox-privacy {
+	  padding: 0em 1em;
+	}
+
+	.required-policy {
+	  padding: 0em 1.2em 1em;
+	  font-size: smaller;
+	  color: #f44336;
+	}
+  }
diff --git a/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.ts b/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.ts
new file mode 100644
index 000000000..8abce91d7
--- /dev/null
+++ b/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.ts
@@ -0,0 +1,25 @@
+import { Component, Inject } from '@angular/core';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
+
+@Component({
+  selector: 'app-multiple-choice-dialog',
+  templateUrl: './multiple-choice-dialog.component.html',
+  styleUrls: ['./multiple-choice-dialog.component.scss']
+})
+export class MultipleChoiceDialogComponent {
+	agreePrivacyPolicyNames = false;
+
+	constructor(
+		public dialogRef: MatDialogRef<MultipleChoiceDialogComponent>,
+		@Inject(MAT_DIALOG_DATA) public data: any
+	) {
+	}
+
+	close() {
+		this.dialogRef.close(false);
+	}
+
+	apply(i: number) {
+		this.dialogRef.close(i);
+	}
+}
diff --git a/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.module.ts b/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.module.ts
new file mode 100644
index 000000000..5f435c90b
--- /dev/null
+++ b/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.module.ts
@@ -0,0 +1,15 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { MultipleChoiceDialogComponent } from './multiple-choice-dialog.component';
+import { CommonUiModule } from '@common/ui/common-ui.module';
+import { FormsModule } from '@angular/forms';
+
+
+
+@NgModule({
+	imports: [CommonUiModule, FormsModule],
+	declarations: [MultipleChoiceDialogComponent],
+	exports: [MultipleChoiceDialogComponent],
+	entryComponents: [MultipleChoiceDialogComponent]
+})
+export class MultipleChoiceDialogModule { }

From 330ead8f39c31c80b3ec896ab649c0cafc255962 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Mon, 6 Apr 2020 18:31:12 +0300
Subject: [PATCH 17/60] Additional checkup

---
 .../managers/DataManagementPlanManager.java    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index 2d533b4f4..871384d37 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -25,6 +25,7 @@ import eu.eudat.elastic.entities.Organization;
 import eu.eudat.elastic.entities.Tag;
 import eu.eudat.exceptions.datamanagementplan.DMPNewVersionException;
 import eu.eudat.exceptions.datamanagementplan.DMPWithDatasetsDeleteException;
+import eu.eudat.exceptions.security.NonValidTokenException;
 import eu.eudat.exceptions.security.UnauthorisedException;
 import eu.eudat.logic.builders.entity.UserInfoBuilder;
 import eu.eudat.logic.mapper.elastic.DmpMapper;
@@ -111,15 +112,17 @@ public class DataManagementPlanManager {
     private DatabaseRepository databaseRepository;
     private Environment environment;
     private RDAManager rdaManager;
+    private UserManager userManager;
 
     @Autowired
-    public DataManagementPlanManager(ApiContext apiContext, DatasetManager datasetManager, Environment environment, RDAManager rdaManager) {
+    public DataManagementPlanManager(ApiContext apiContext, DatasetManager datasetManager, Environment environment, RDAManager rdaManager, UserManager userManager) {
         this.apiContext = apiContext;
         this.datasetManager = datasetManager;
         this.utilitiesService = apiContext.getUtilitiesService();
         this.databaseRepository = apiContext.getOperationsContext().getDatabaseRepository();
         this.environment = environment;
         this.rdaManager = rdaManager;
+        this.userManager = userManager;
     }
 
     public DataTableData<DataManagementPlanListingModel> getPaged(DataManagementPlanTableRequest dataManagementPlanTableRequest, Principal principal, String fieldsGroup) throws Exception {
@@ -1599,7 +1602,14 @@ public class DataManagementPlanManager {
         if (dmp.getDoi() != null)
             throw new Exception("DMP already has a DOI");
 
-        String zenodoToken = principal.getZenodoToken() != null && !principal.getZenodoToken().isEmpty() ? principal.getZenodoToken() : this.environment.getProperty("zenodo.access_token");
+        String zenodoToken = "";
+        try {
+            if (this.userManager.isDOITokenValid(principal)) {
+                zenodoToken = principal.getZenodoToken();
+            }
+        } catch (NonValidTokenException e) {
+            zenodoToken = this.environment.getProperty("zenodo.access_token");
+        }
         // First step, post call to Zenodo, to create the entry.
         RestTemplate restTemplate = new RestTemplate();
         HttpHeaders headers = new HttpHeaders();
@@ -1648,10 +1658,10 @@ public class DataManagementPlanManager {
                     String updateUrl = links.get("self") + "?access_token=" + zenodoToken;
                     restTemplate.put(updateUrl, request);
                     //And finally remove pre-existing files from it
-                    String fileListUrl = links.get("self") + "/files" + "?access_token=" + zenodoToken;
+                    String fileListUrl = links.get("self") + "/files" + "?access_token=" + this.environment.getProperty("zenodo.access_token");
                     ResponseEntity<Map[]> fileListResponse = restTemplate.getForEntity(fileListUrl, Map[].class);
                     for (Map file : fileListResponse.getBody()) {
-                        String fileDeleteUrl = links.get("self") + "/files/" + file.get("id") + "?access_token=" + zenodoToken;
+                        String fileDeleteUrl = links.get("self") + "/files/" + file.get("id") + "?access_token=" + this.environment.getProperty("zenodo.access_token");
                         restTemplate.delete(fileDeleteUrl);
                     }
                 }catch (Exception e) {

From a63ae3045e2210bbe0b07cce9a23eb2b428fb37b Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Wed, 8 Apr 2020 16:36:06 +0300
Subject: [PATCH 18/60] When selecting "login with zenodo" it will prompt and
 login with zenodo, and the access token will be registered to the current
 user instead of re-login you in with the zenodo account. Also disable Zenodo
 user login

---
 .../main/java/eu/eudat/controllers/Login.java | 10 -----
 .../main/java/eu/eudat/controllers/Users.java | 22 ++++++++++
 .../eu/eudat/logic/managers/UserManager.java  | 21 +++++++++-
 .../eu/eudat/models/data/doi/DOIRequest.java  | 25 +++++++++++
 dmp-frontend/src/app/app-routing.module.ts    |  5 ++-
 dmp-frontend/src/app/app.module.ts            |  4 +-
 .../app/core/services/auth/auth.service.ts    |  9 ----
 .../app/core/services/user/user.service.ts    | 10 +++++
 .../ui/dmp/overview/dmp-overview.component.ts | 38 +++++++++++++++--
 .../oauth2-dialog.component.html              |  1 +
 .../oauth2-dialog.component.scss              |  0
 .../oauth2-dialog/oauth2-dialog.component.ts  | 41 +++++++++++++++++++
 .../oauth2-dialog/oauth2-dialog.module.ts     | 17 ++++++++
 .../service/oauth2-dialog.service.ts          | 34 +++++++++++++++
 dmp-frontend/src/assets/config/config.json    |  2 +-
 15 files changed, 212 insertions(+), 27 deletions(-)
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/models/data/doi/DOIRequest.java
 create mode 100644 dmp-frontend/src/app/ui/misc/oauth2-dialog/oauth2-dialog.component.html
 create mode 100644 dmp-frontend/src/app/ui/misc/oauth2-dialog/oauth2-dialog.component.scss
 create mode 100644 dmp-frontend/src/app/ui/misc/oauth2-dialog/oauth2-dialog.component.ts
 create mode 100644 dmp-frontend/src/app/ui/misc/oauth2-dialog/oauth2-dialog.module.ts
 create mode 100644 dmp-frontend/src/app/ui/misc/oauth2-dialog/service/oauth2-dialog.service.ts

diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java
index 45636e7bb..d0591ded6 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java
@@ -153,16 +153,6 @@ public class Login {
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<Principal>().payload(this.nonVerifiedUserAuthenticationService.Touch(principal.getToken())).status(ApiMessageCode.NO_MESSAGE));
     }
 
-    @RequestMapping(method = RequestMethod.GET, value = {"/hasDOIToken"}, consumes = "application/json", produces = "application/json")
-    public @ResponseBody
-    ResponseEntity<ResponseItem<Boolean>> hasDOIToken(Principal principal) throws NullEmailException {
-        try {
-            return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<Boolean>().payload(this.userManager.isDOITokenValid(principal)).status(ApiMessageCode.NO_MESSAGE));
-        } catch (NonValidTokenException | ExpiredTokenException | IOException e) {
-            return ResponseEntity.status(460).body(new ResponseItem<Boolean>().payload(false).status(ApiMessageCode.ERROR_MESSAGE).message(e.getMessage()));
-        }
-    }
-
     @Transactional
     @RequestMapping(method = RequestMethod.POST, value = {"/logout"}, consumes = "application/json", produces = "application/json")
     public @ResponseBody
diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Users.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Users.java
index 5d7f48319..6f2205075 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Users.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Users.java
@@ -1,9 +1,13 @@
 package eu.eudat.controllers;
 
 import eu.eudat.data.query.items.table.userinfo.UserInfoTableRequestItem;
+import eu.eudat.exceptions.security.ExpiredTokenException;
+import eu.eudat.exceptions.security.NonValidTokenException;
+import eu.eudat.exceptions.security.NullEmailException;
 import eu.eudat.logic.managers.UserManager;
 import eu.eudat.logic.security.claims.ClaimedAuthorities;
 import eu.eudat.logic.services.ApiContext;
+import eu.eudat.models.data.doi.DOIRequest;
 import eu.eudat.models.data.helpers.common.DataTableData;
 import eu.eudat.models.data.helpers.responses.ResponseItem;
 import eu.eudat.models.data.security.Principal;
@@ -73,6 +77,24 @@ public class Users extends BaseController {
         DataTableData<UserListingModel> dataTable = userManager.getCollaboratorsPaged(userInfoTableRequestItem, principal);
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataTableData<UserListingModel>>().payload(dataTable).status(ApiMessageCode.NO_MESSAGE));
     }
+
+    @RequestMapping(method = RequestMethod.GET, value = {"/hasDOIToken"}, consumes = "application/json", produces = "application/json")
+    public @ResponseBody
+    ResponseEntity<ResponseItem<Boolean>> hasDOIToken(Principal principal) throws NullEmailException {
+        try {
+            return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<Boolean>().payload(this.userManager.isDOITokenValid(principal)).status(ApiMessageCode.NO_MESSAGE));
+        } catch (NonValidTokenException | ExpiredTokenException | IOException e) {
+            return ResponseEntity.status(460).body(new ResponseItem<Boolean>().payload(false).status(ApiMessageCode.ERROR_MESSAGE).message(e.getMessage()));
+        }
+    }
+
+    @Transactional
+    @RequestMapping(method = RequestMethod.POST, value = {"/registerDOIToken"}, consumes = "application/json", produces = "application/json")
+    public @ResponseBody
+    ResponseEntity<ResponseItem<UserProfile>> registerDOIToken(@RequestBody DOIRequest doiRequest, Principal principal) throws NullEmailException, IOException {
+        userManager.registerDOIToken(doiRequest, principal);
+        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<UserProfile>().status(ApiMessageCode.NO_MESSAGE));
+    }
 }
 
 	
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java
index d2388eec4..064580a7b 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java
@@ -13,11 +13,14 @@ import eu.eudat.exceptions.security.NullEmailException;
 import eu.eudat.exceptions.security.UnauthorisedException;
 import eu.eudat.logic.builders.entity.UserRoleBuilder;
 import eu.eudat.logic.builders.model.models.DataTableDataBuilder;
+import eu.eudat.logic.security.customproviders.Zenodo.ZenodoCustomProvider;
+import eu.eudat.logic.security.validators.zenodo.helpers.ZenodoResponseToken;
 import eu.eudat.logic.services.ApiContext;
 import eu.eudat.logic.services.operations.authentication.AuthenticationService;
 import eu.eudat.logic.utilities.builders.XmlBuilder;
 import eu.eudat.models.HintedModelFactory;
 import eu.eudat.models.data.dmp.DataManagementPlan;
+import eu.eudat.models.data.doi.DOIRequest;
 import eu.eudat.models.data.helpers.common.DataTableData;
 import eu.eudat.models.data.login.Credentials;
 import eu.eudat.models.data.security.Principal;
@@ -26,6 +29,7 @@ import eu.eudat.models.data.userinfo.UserProfile;
 import eu.eudat.queryable.QueryableList;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -39,10 +43,14 @@ import java.util.stream.Collectors;
 public class UserManager {
 
 	private ApiContext apiContext;
+	private ZenodoCustomProvider zenodoCustomProvider;
+	private Environment environment;
 
 	@Autowired
-	public UserManager(ApiContext apiContext) {
+	public UserManager(ApiContext apiContext, ZenodoCustomProvider zenodoCustomProvider, Environment environment) {
 		this.apiContext = apiContext;
+		this.zenodoCustomProvider = zenodoCustomProvider;
+		this.environment = environment;
 	}
 
 	public eu.eudat.models.data.user.composite.DatasetProfile generateDatasetProfileModel(eu.eudat.data.entities.DatasetProfile profile) {
@@ -127,4 +135,15 @@ public class UserManager {
 		}
 		throw new NonValidTokenException("This account has no Zenodo Token");
 	}
+
+	public void registerDOIToken(DOIRequest doiRequest, Principal principal) throws IOException {
+		ZenodoResponseToken responseToken = this.zenodoCustomProvider.getAccessToken(doiRequest.getZenodoRequest().getCode()
+				, this.environment.getProperty("zenodo.login.client_id")
+				, this.environment.getProperty("zenodo.login.client_secret")
+				, doiRequest.getRedirectUri());
+		Map<String, Object> settings = new HashMap<>();
+		settings.put("zenodoToken", responseToken.getAccessToken());
+		settings.put("expirationDate",  Instant.now().plusSeconds(responseToken.getExpiresIn()).toEpochMilli());
+		this.updateSettings(settings, principal);
+	}
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/doi/DOIRequest.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/doi/DOIRequest.java
new file mode 100644
index 000000000..8338a75ac
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/doi/DOIRequest.java
@@ -0,0 +1,25 @@
+package eu.eudat.models.data.doi;
+
+import eu.eudat.logic.security.validators.zenodo.helpers.ZenodoRequest;
+
+public class DOIRequest {
+
+	private ZenodoRequest zenodoRequest;
+	private String redirectUri;
+
+	public ZenodoRequest getZenodoRequest() {
+		return zenodoRequest;
+	}
+
+	public void setZenodoRequest(ZenodoRequest zenodoRequest) {
+		this.zenodoRequest = zenodoRequest;
+	}
+
+	public String getRedirectUri() {
+		return redirectUri;
+	}
+
+	public void setRedirectUri(String redirectUri) {
+		this.redirectUri = redirectUri;
+	}
+}
diff --git a/dmp-frontend/src/app/app-routing.module.ts b/dmp-frontend/src/app/app-routing.module.ts
index 5ac4279d8..3b1758d58 100644
--- a/dmp-frontend/src/app/app-routing.module.ts
+++ b/dmp-frontend/src/app/app-routing.module.ts
@@ -2,6 +2,8 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { ReloadHelperComponent } from '@app/ui/misc/reload-helper/reload-helper.component';
 import { B2AccessLoginComponent } from './ui/auth/login/b2access/b2access-login.component';
+import { Oauth2DialogModule } from './ui/misc/oauth2-dialog/oauth2-dialog.module';
+import { Oauth2DialogComponent } from './ui/misc/oauth2-dialog/oauth2-dialog.component';
 
 const appRoutes: Routes = [
 	{
@@ -219,7 +221,8 @@ const appRoutes: Routes = [
 		data: {
 		},
 	},
-	{ path: 'reload', component: ReloadHelperComponent }
+	{ path: 'reload', component: ReloadHelperComponent },
+	{ path: 'oauth2', component: Oauth2DialogComponent }
 ];
 
 @NgModule({
diff --git a/dmp-frontend/src/app/app.module.ts b/dmp-frontend/src/app/app.module.ts
index fdb790e30..556d685a1 100644
--- a/dmp-frontend/src/app/app.module.ts
+++ b/dmp-frontend/src/app/app.module.ts
@@ -30,6 +30,7 @@ import { NgcCookieConsentConfig, NgcCookieConsentModule } from 'ngx-cookieconsen
 import { TranslateServerLoader } from './core/services/language/server.loader';
 import { BaseHttpService } from './core/services/http/base-http.service';
 import { ConfigurationService } from './core/services/configuration/configuration.service';
+import { Oauth2DialogModule } from './ui/misc/oauth2-dialog/oauth2-dialog.module';
 
 // AoT requires an exported function for factories
 export function HttpLoaderFactory(http: HttpClient, appConfig: ConfigurationService) {
@@ -97,7 +98,8 @@ const cookieConfig: NgcCookieConsentConfig = {
 		DatasetCreateWizardModule,
 		NavbarModule,
 		SidebarModule,
-		NgcCookieConsentModule.forRoot(cookieConfig)
+		NgcCookieConsentModule.forRoot(cookieConfig),
+		Oauth2DialogModule
 	],
 	declarations: [
 		AppComponent,
diff --git a/dmp-frontend/src/app/core/services/auth/auth.service.ts b/dmp-frontend/src/app/core/services/auth/auth.service.ts
index 2b9fce248..a50261ba0 100644
--- a/dmp-frontend/src/app/core/services/auth/auth.service.ts
+++ b/dmp-frontend/src/app/core/services/auth/auth.service.ts
@@ -159,13 +159,4 @@ export class AuthService extends BaseService {
 			})
 		);
 	}
-
-	public hasDOIToken(): Observable<any> {
-		this.actionUrl = this.configurationService.server + 'auth/';
-		const url = this.actionUrl + '/hasDOIToken';
-		const principal = this.current();
-		let headers = this.headers;
-		headers = headers.set('AuthToken', principal.token);
-		return this.http.get(url, { headers: headers });
-	}
 }
diff --git a/dmp-frontend/src/app/core/services/user/user.service.ts b/dmp-frontend/src/app/core/services/user/user.service.ts
index 21f6381b2..d3ea3f9cc 100644
--- a/dmp-frontend/src/app/core/services/user/user.service.ts
+++ b/dmp-frontend/src/app/core/services/user/user.service.ts
@@ -47,4 +47,14 @@ export class UserService {
 	getCollaboratorsPaged(dataTableRequest: DataTableRequest<UserCriteria>): Observable<DataTableData<UserListingModel>> {
 		return this.http.post<DataTableData<UserListingModel>>(this.actionUrl + 'getCollaboratorsPaged', JSON.stringify(dataTableRequest), { headers: this.headers });
 	}
+
+	public hasDOIToken(): Observable<any> {
+		const url = this.actionUrl + 'hasDOIToken';
+		return this.http.get(url, { headers: this.headers });
+	}
+
+	public registerDOIToken(code: string, redirectUri: string): Observable<any> {
+		const url = this.actionUrl + 'registerDOIToken';
+		return this.http.post(url, {zenodoRequest: {code: code}, redirectUri: redirectUri}, { headers: this.headers });
+	}
 }
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
index fe787bbe0..625f5994a 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
@@ -24,6 +24,11 @@ import { Role } from "@app/core/common/enum/role";
 import { DmpInvitationDialogComponent } from '../invitation/dmp-invitation.component';
 import { MultipleChoiceDialogModule } from '@common/modules/multiple-choice-dialog/multiple-choice-dialog.module';
 import { MultipleChoiceDialogComponent } from '@common/modules/multiple-choice-dialog/multiple-choice-dialog.component';
+import { ConfigurationService } from '@app/core/services/configuration/configuration.service';
+import { Oauth2DialogComponent } from '@app/ui/misc/oauth2-dialog/oauth2-dialog.component';
+import { Oauth2DialogService } from '@app/ui/misc/oauth2-dialog/service/oauth2-dialog.service';
+import { isNullOrUndefined } from 'util';
+import { UserService } from '@app/core/services/user/user.service';
 
 @Component({
 	selector: 'app-dmp-overview',
@@ -49,7 +54,10 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 		private authentication: AuthService,
 		private dialog: MatDialog,
 		private language: TranslateService,
-		private uiNotificationService: UiNotificationService
+		private uiNotificationService: UiNotificationService,
+		private configurationService: ConfigurationService,
+		private oauth2DialogService: Oauth2DialogService,
+		private userService: UserService
 	) {
 		super();
 	}
@@ -323,8 +331,17 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 		return dmp.doi == null ? true : false;
 	}
 
+	getAccessUrl(): string {
+		const redirectUri = this.configurationService.app + 'oauth2';
+		const url = this.configurationService.loginProviders.zenodoConfiguration.oauthUrl
+		+ '?client_id=' + this.configurationService.loginProviders.zenodoConfiguration.clientId
+		+ '&response_type=code&scope=deposit:write+deposit:actions&state=astate&redirect_uri='
+		+ redirectUri;
+		return url;
+	}
+
 	getDoi(dmp: DmpOverviewModel) {
-		this.authentication.hasDOIToken().subscribe(response => {
+		this.userService.hasDOIToken().subscribe(response => {
 			this.showConfirmationDOIDialog(dmp);
 		}, error => {
 			this.showErrorConfirmationDOIDialog(error.error.message, dmp);
@@ -368,8 +385,9 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 		dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => {
 			switch (result) {
 				case 0:
-					this.authentication.logout();
-					this.router.navigate(['/login/external/zenodo']);
+					// this.authentication.logout();
+					// this.router.navigate(['/login/external/zenodo']);
+					this.showOauth2Dialog(this.getAccessUrl(), dmp);
 					break;
 				case 1:
 					this.showConfirmationDOIDialog(dmp);
@@ -378,6 +396,18 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 		});
 	}
 
+	showOauth2Dialog(url: string, dmp: DmpOverviewModel) {
+		this.oauth2DialogService.login(url)
+		.pipe(takeUntil(this._destroyed))
+		.subscribe(code => {
+			if (!isNullOrUndefined(code)) {
+				this.userService.registerDOIToken(code, this.configurationService.app + 'oauth2')
+				.pipe(takeUntil(this._destroyed))
+				.subscribe(() => this.showConfirmationDOIDialog(dmp));
+			}
+		});
+	}
+
 	onDOICallbackSuccess(): void {
 		this.uiNotificationService.snackBarNotification(this.language.instant('DMP-EDITOR.SNACK-BAR.SUCCESSFUL-DOI'), SnackBarNotificationLevel.Success);
 	}
diff --git a/dmp-frontend/src/app/ui/misc/oauth2-dialog/oauth2-dialog.component.html b/dmp-frontend/src/app/ui/misc/oauth2-dialog/oauth2-dialog.component.html
new file mode 100644
index 000000000..a9478084f
--- /dev/null
+++ b/dmp-frontend/src/app/ui/misc/oauth2-dialog/oauth2-dialog.component.html
@@ -0,0 +1 @@
+<p>oauth2-dialog works!</p>
diff --git a/dmp-frontend/src/app/ui/misc/oauth2-dialog/oauth2-dialog.component.scss b/dmp-frontend/src/app/ui/misc/oauth2-dialog/oauth2-dialog.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/dmp-frontend/src/app/ui/misc/oauth2-dialog/oauth2-dialog.component.ts b/dmp-frontend/src/app/ui/misc/oauth2-dialog/oauth2-dialog.component.ts
new file mode 100644
index 000000000..7d9c2f6aa
--- /dev/null
+++ b/dmp-frontend/src/app/ui/misc/oauth2-dialog/oauth2-dialog.component.ts
@@ -0,0 +1,41 @@
+import { Component, OnInit, Inject } from '@angular/core';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
+import { ActivatedRoute, Params } from '@angular/router';
+import { BaseComponent } from '@common/base/base.component';
+import { takeUntil } from 'rxjs/operators';
+import { Oauth2DialogService } from './service/oauth2-dialog.service';
+
+@Component({
+  selector: 'app-oauth2-dialog',
+  templateUrl: './oauth2-dialog.component.html',
+  styleUrls: ['./oauth2-dialog.component.scss']
+})
+export class Oauth2DialogComponent extends BaseComponent implements OnInit{
+
+	constructor(
+		private route: ActivatedRoute,
+		private oauth2dialogService: Oauth2DialogService
+	) {
+		super();
+	}
+
+
+	ngOnInit(): void {
+		this.route.queryParams.pipe(takeUntil(this._destroyed))
+		.subscribe((params: Params) => {
+			const url = params['url'];
+			if (!params['code']) { this.loadUrl(url) } else { this.sendCode(params['code']); }
+		});
+	}
+
+	private loadUrl(url: string ) {
+		console.log(url);
+		window.location.href = url;
+	}
+
+	private sendCode(code: string) {
+		localStorage.setItem('oauthCode', code);
+		window.close();
+	}
+
+}
diff --git a/dmp-frontend/src/app/ui/misc/oauth2-dialog/oauth2-dialog.module.ts b/dmp-frontend/src/app/ui/misc/oauth2-dialog/oauth2-dialog.module.ts
new file mode 100644
index 000000000..5bdefcec4
--- /dev/null
+++ b/dmp-frontend/src/app/ui/misc/oauth2-dialog/oauth2-dialog.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+
+import { Oauth2DialogComponent } from './oauth2-dialog.component';
+import { CommonUiModule } from '@common/ui/common-ui.module';
+import { Oauth2DialogService } from './service/oauth2-dialog.service';
+
+
+@NgModule({
+  declarations: [Oauth2DialogComponent],
+  imports: [
+    CommonUiModule
+  ],
+  providers: [
+	  Oauth2DialogService
+  ]
+})
+export class Oauth2DialogModule { }
diff --git a/dmp-frontend/src/app/ui/misc/oauth2-dialog/service/oauth2-dialog.service.ts b/dmp-frontend/src/app/ui/misc/oauth2-dialog/service/oauth2-dialog.service.ts
new file mode 100644
index 000000000..5fb27e334
--- /dev/null
+++ b/dmp-frontend/src/app/ui/misc/oauth2-dialog/service/oauth2-dialog.service.ts
@@ -0,0 +1,34 @@
+import { Injectable, Inject } from '@angular/core';
+import { BaseService } from '@common/base/base.service';
+import { BehaviorSubject, Observable, interval } from 'rxjs';
+import { ConfigurationService } from '@app/core/services/configuration/configuration.service';
+import { isNullOrUndefined } from 'util';
+import { takeUntil } from 'rxjs/operators';
+
+@Injectable()
+export class Oauth2DialogService extends BaseService{
+
+	private code: BehaviorSubject<string> = new BehaviorSubject(undefined);
+
+	constructor(private configurationService: ConfigurationService) {
+		super();
+	}
+
+	public registerCode(code: string) {
+		this.code.next(code);
+	}
+
+	public login(url: string): Observable<string> {
+		const windows = window.open(this.configurationService.app + 'oauth2?url=' + encodeURIComponent(url) ,'', 'height=500px,width=500px');
+		const sub = interval(300).pipe(takeUntil(this._destroyed)).subscribe(() => {
+			if (windows.closed) {
+				const oauthCode = localStorage.getItem('oauthCode');
+				localStorage.removeItem('oauthCode');
+				this.code.next(oauthCode);
+				sub.unsubscribe();
+			}
+		});
+		return this.code.asObservable();
+	}
+
+}
diff --git a/dmp-frontend/src/assets/config/config.json b/dmp-frontend/src/assets/config/config.json
index 1aac1c5cd..1c32e5676 100644
--- a/dmp-frontend/src/assets/config/config.json
+++ b/dmp-frontend/src/assets/config/config.json
@@ -8,7 +8,7 @@
 	},
 	"defaultCulture": "en-US",
 	"loginProviders": {
-		"enabled": [1, 2, 3, 4, 5, 6, 7, 8, 10],
+		"enabled": [1, 2, 3, 4, 5, 6, 7, 8],
 		"facebookConfiguration": { "clientId": "" },
 		"googleConfiguration": { "clientId": "" },
 		"linkedInConfiguration": {

From 4ffc82373b2b99262ddab5baabbf36a8d48ef33f Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Thu, 9 Apr 2020 12:39:34 +0300
Subject: [PATCH 19/60] Add H2020 with RDA template

---
 .../Horizon2020_V2_with_RDA.xml               | 1878 +++++++++++++++++
 1 file changed, 1878 insertions(+)
 create mode 100644 dmp-dataset-templates/Horizon2020_V2_with_RDA.xml

diff --git a/dmp-dataset-templates/Horizon2020_V2_with_RDA.xml b/dmp-dataset-templates/Horizon2020_V2_with_RDA.xml
new file mode 100644
index 000000000..1a3d4ef62
--- /dev/null
+++ b/dmp-dataset-templates/Horizon2020_V2_with_RDA.xml
@@ -0,0 +1,1878 @@
+<root>
+  <pages>
+    <page id="page_0" ordinal="0" title="Data Summary"/>
+    <page id="page_1" ordinal="1" title="FAIR Data"/>
+    <page id="page_2" ordinal="2" title="Data Security"/>
+    <page id="page_3" ordinal="3" title="Other"/>
+  </pages>
+  <sections>
+    <section defaultVisibility="true" id="datasum" ordinal="1" page="page_0">
+      <sections/>
+      <fieldSets>
+        <fieldSet id="6bb1034a-11f3-985e-9101-563a4643827e" ordinal="1">
+          <numbering>1.1</numbering>
+          <commentField commentFieldValue="" hasCommentField="false"/>
+          <fields>
+            <field id="what-is-the-purpose" ordinal="0">
+              <rdaCommonStandard>dataset.distribution.access_url</rdaCommonStandard>
+              <numbering>1.1.1</numbering>
+              <validations/>
+              <defaultValue type="" value=""/>
+              <visible style=""/>
+              <viewStyle cssClass="" renderstyle="textarea"/>
+              <data label=""/>
+            </field>
+          </fields>
+          <multiplicity max="0" min="0"/>
+          <title>What is the purpose of the data collection/generation and its relation to the objectives of the project?</title>
+          <description/>
+          <extendedDescription/>
+          <additionalInformation/>
+        </fieldSet>
+        <fieldSet id="9d1510e9-4eb3-472f-bf75-d2296a8793c0" ordinal="2">
+          <numbering>1.2</numbering>
+          <commentField commentFieldValue="" hasCommentField="false"/>
+          <fields>
+            <field id="what-types-and-formats" ordinal="0">
+              <rdaCommonStandard>dataset.metadata.metadata_id</rdaCommonStandard>
+              <numbering>1.2.1</numbering>
+              <validations/>
+              <defaultValue type="" value=""/>
+              <visible style=""/>
+              <viewStyle cssClass="" renderstyle="textarea"/>
+              <data label=""/>
+            </field>
+          </fields>
+          <multiplicity max="0" min="0"/>
+          <title>What types and formats of data will the project generate/collect?</title>
+          <description/>
+          <extendedDescription/>
+          <additionalInformation/>
+        </fieldSet>
+        <fieldSet id="4de701d9-3f0d-1c8a-bdf2-93243e70e64f" ordinal="3">
+          <numbering>1.3</numbering>
+          <commentField commentFieldValue="" hasCommentField="false"/>
+          <fields>
+            <field id="will-you-re-use-any" ordinal="0">
+              <rdaCommonStandard>dataset.data_quality_assurance</rdaCommonStandard>
+              <numbering>1.3.1</numbering>
+              <validations/>
+              <defaultValue type="" value=""/>
+              <visible style=""/>
+              <viewStyle cssClass="" renderstyle="textarea"/>
+              <data label=""/>
+            </field>
+          </fields>
+          <multiplicity max="0" min="0"/>
+          <title>Will you re-use any existing data and how?</title>
+          <description/>
+          <extendedDescription/>
+          <additionalInformation/>
+        </fieldSet>
+        <fieldSet id="ce86afc6-e714-2eed-a609-b3ce1f5b36ce" ordinal="4">
+          <numbering>1.4</numbering>
+          <commentField commentFieldValue="" hasCommentField="false"/>
+          <fields>
+            <field id="what-is-the-origin" ordinal="0">
+              <rdaCommonStandard/>
+              <numbering>1.4.1</numbering>
+              <validations/>
+              <defaultValue type="" value=""/>
+              <visible style=""/>
+              <viewStyle cssClass="" renderstyle="textarea"/>
+              <data label=""/>
+            </field>
+          </fields>
+          <multiplicity max="0" min="0"/>
+          <title>What is the origin of the data?</title>
+          <description/>
+          <extendedDescription/>
+          <additionalInformation/>
+        </fieldSet>
+        <fieldSet id="8f9132fc-5b4a-65f6-9d63-6b049ab03faf" ordinal="5">
+          <numbering>1.5</numbering>
+          <commentField commentFieldValue="" hasCommentField="false"/>
+          <fields>
+            <field id="what-is-the-expected" ordinal="0">
+              <rdaCommonStandard/>
+              <numbering>1.5.1</numbering>
+              <validations/>
+              <defaultValue type="" value=""/>
+              <visible style=""/>
+              <viewStyle cssClass="" renderstyle="textarea"/>
+              <data label=""/>
+            </field>
+          </fields>
+          <multiplicity max="0" min="0"/>
+          <title>What is the expected size of the data?</title>
+          <description/>
+          <extendedDescription/>
+          <additionalInformation/>
+        </fieldSet>
+        <fieldSet id="8e65d7ea-9598-6040-ba3a-0abd17fbf44e" ordinal="6">
+          <numbering>1.6</numbering>
+          <commentField commentFieldValue="" hasCommentField="false"/>
+          <fields>
+            <field id="to-whom-might-it" ordinal="0">
+              <rdaCommonStandard/>
+              <numbering>1.6.1</numbering>
+              <validations/>
+              <defaultValue type="" value=""/>
+              <visible style=""/>
+              <viewStyle cssClass="" renderstyle="textarea"/>
+              <data label=""/>
+            </field>
+          </fields>
+          <multiplicity max="0" min="0"/>
+          <title>To whom might it be useful ('data utility')?</title>
+          <description/>
+          <extendedDescription/>
+          <additionalInformation/>
+        </fieldSet>
+      </fieldSets>
+      <numbering>1</numbering>
+      <title>Data Summary</title>
+      <extendedDescription/>
+      <description>Answer the following questions to provide a summary of the types and characteristics of data collected, generated, shared and re-used during your research activities. Highlight why it is of relevance to the project and useful to other researchers.</description>
+    </section>
+    <section defaultVisibility="true" id="fairdata" ordinal="2" page="page_1">
+      <sections>
+        <section defaultVisibility="true" id="datafindablesection" ordinal="1" page="page_1">
+          <sections/>
+          <fieldSets>
+            <fieldSet id="fieldSet-TrNSu" ordinal="0">
+              <numbering>2.1.1</numbering>
+              <commentField commentFieldValue="" hasCommentField="true"/>
+              <fields>
+                <field id="metadata" ordinal="1">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.1.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style="">
+                    <rule ruleStyle="" target="metadataA211" type="">
+                      <value type="">true</value>
+                    </rule>
+                    <rule ruleStyle="" target="metadataAvailableFreeofcharge" type="field value">
+                      <value type="">true</value>
+                    </rule>
+                    <rule ruleStyle="" target="harvestable211a" type="field value">
+                      <value type="">true</value>
+                    </rule>
+                    <rule ruleStyle="" target="other211" type="field value">
+                      <value type="">true</value>
+                    </rule>
+                  </visible>
+                  <viewStyle cssClass="" renderstyle="booleanDecision"/>
+                  <data label=""/>
+                </field>
+                <field id="metadataA211" ordinal="2">
+                  <rdaCommonStandard>dataset.metadata.metadata_standard_id</rdaCommonStandard>
+                  <numbering>2.1.1.2</numbering>
+                  <validations/>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="combobox"/>
+                  <data label="Select a metadata standard from the list" multiAutoComplete="true" optionsRoot="$['data'][*]['attributes']" type="autocomplete" url="https://eestore.paas2.uninett.no/api/metadataschema/">
+                    <option label="name" source="source" value="pid"/>
+                  </data>
+                </field>
+                <field id="other211" ordinal="3">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.1.3</numbering>
+                  <validations/>
+                  <defaultValue type="" value="false"/>
+                  <visible style="">
+                    <rule ruleStyle="" target="urllocation211" type="">
+                      <value type="">true</value>
+                    </rule>
+                  </visible>
+                  <viewStyle cssClass="" renderstyle="checkBox"/>
+                  <data label="other"/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title> Will you use metadata to describe the data?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="urllocation211" ordinal="1">
+              <numbering>2.1.2</numbering>
+              <commentField commentFieldValue="" hasCommentField="false"/>
+              <fields>
+                <field id="url211" ordinal="1">
+                  <rdaCommonStandard>dataset.metadata.metadata_standard_id.identifier</rdaCommonStandard>
+                  <numbering>2.1.2.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="freetext"/>
+                  <data label="URL where metadata can be found"/>
+                </field>
+                <field id="location211" ordinal="2">
+                  <rdaCommonStandard>dataset.metadata.description</rdaCommonStandard>
+                  <numbering>2.1.2.2</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="freetext"/>
+                  <data label="Name of repository, database, platform that holds the data"/>
+                </field>
+              </fields>
+              <multiplicity max="10" min="1"/>
+              <title>URL/Location</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-kRXnf" ordinal="2">
+              <numbering>2.1.3</numbering>
+              <commentField commentFieldValue="" hasCommentField="true"/>
+              <fields>
+                <field id="boolean-will-metadata-use" ordinal="1">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.3.1</numbering>
+                  <validations/>
+                  <defaultValue type="" value=""/>
+                  <visible style="">
+                    <rule ruleStyle="" target="standardisedVoc211a" type="">
+                      <value type="">true</value>
+                    </rule>
+                    <rule ruleStyle="" target="notlistedA211a" type="">
+                      <value type="">true</value>
+                    </rule>
+                  </visible>
+                  <viewStyle cssClass="" renderstyle="booleanDecision"/>
+                  <data label=""/>
+                </field>
+                <field id="standardisedVoc211a" ordinal="2">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.3.2</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="combobox"/>
+                  <data label="Select a vocabulary from the list" multiAutoComplete="false" optionsRoot="$['data'][*]['attributes']" type="autocomplete" url="https://eestore.paas2.uninett.no/api/taxonomy/">
+                    <option label="name" source="source" value="pid"/>
+                  </data>
+                </field>
+                <field id="notlistedA211a" ordinal="3">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.3.3</numbering>
+                  <validations/>
+                  <defaultValue type="" value="false"/>
+                  <visible style="">
+                    <rule ruleStyle="" target="urlDesc211a" type="">
+                      <value type="">true</value>
+                    </rule>
+                  </visible>
+                  <viewStyle cssClass="" renderstyle="checkBox"/>
+                  <data label="not listed"/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>Will your metadata use standardised vocabularies?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="urlDesc211a" ordinal="3">
+              <numbering>2.1.4</numbering>
+              <commentField commentFieldValue="" hasCommentField="false"/>
+              <fields>
+                <field id="url211a" ordinal="1">
+                  <rdaCommonStandard>dataset.metadata.metadata_standard_id.identifier</rdaCommonStandard>
+                  <numbering>2.1.4.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="freetext"/>
+                  <data label=" URL where the vocabularies of the data can be found"/>
+                </field>
+                <field id="desc211a" ordinal="2">
+                  <rdaCommonStandard>dataset.metadata.description</rdaCommonStandard>
+                  <numbering>2.1.4.2</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="freetext"/>
+                  <data label="Briefly describe selected vocabularies application for your needs"/>
+                </field>
+              </fields>
+              <multiplicity max="6" min="1"/>
+              <title>URL/Description</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-cf1P1" ordinal="4">
+              <numbering>2.1.5</numbering>
+              <commentField commentFieldValue="" hasCommentField="true"/>
+              <fields>
+                <field id="metadataAvailableFreeofcharge" ordinal="8">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.5.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="booleanDecision"/>
+                  <data label=""/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title> Will you make the metadata available free-of-charge?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-rQ8uG" ordinal="5">
+              <numbering>2.1.6</numbering>
+              <commentField commentFieldValue="" hasCommentField="true"/>
+              <fields>
+                <field id="harvestable211a" ordinal="9">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.6.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="booleanDecision"/>
+                  <data label=""/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>Will your metadata be harvestable?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-CYLm3" ordinal="6">
+              <numbering>2.1.7</numbering>
+              <commentField commentFieldValue="" hasCommentField="true"/>
+              <fields>
+                <field id="field-UmI2l" ordinal="10">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.7.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style="">
+                    <rule ruleStyle="" target="urlName212" type="field value">
+                      <value type="">true</value>
+                    </rule>
+                  </visible>
+                  <viewStyle cssClass="" renderstyle="booleanDecision"/>
+                  <data label=""/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>Will you use naming conventions for your data?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="urlName212" ordinal="7">
+              <numbering>2.1.8</numbering>
+              <commentField commentFieldValue="" hasCommentField="false"/>
+              <fields>
+                <field id="url212" ordinal="1">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.8.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="freetext"/>
+                  <data label="URL where this information can be found"/>
+                </field>
+                <field id="name212" ordinal="2">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.8.2</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="freetext"/>
+                  <data label="Name of the conventions used for the data"/>
+                </field>
+              </fields>
+              <multiplicity max="7" min="1"/>
+              <title>URL/Name</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-1JwVO" ordinal="8">
+              <numbering>2.1.9</numbering>
+              <commentField commentFieldValue="" hasCommentField="true"/>
+              <fields>
+                <field id="clearVersionNumbers" ordinal="12">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.9.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="booleanDecision"/>
+                  <data label=""/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>Will you provide clear version numbers for your data?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-457zT" ordinal="9">
+              <numbering>2.1.10</numbering>
+              <commentField commentFieldValue="" hasCommentField="true"/>
+              <fields>
+                <field id="persistentIdentifiersQ214" ordinal="13">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.10.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style="">
+                    <rule ruleStyle="" target="persistentIdentifiersA214" type="field value">
+                      <value type="">true</value>
+                    </rule>
+                  </visible>
+                  <viewStyle cssClass="" renderstyle="booleanDecision"/>
+                  <data label=""/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>Will you provide persistent identifiers for your data?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-NwAwY" ordinal="10">
+              <numbering>2.1.11</numbering>
+              <commentField commentFieldValue="" hasCommentField="false"/>
+              <fields>
+                <field id="persistentIdentifiersA214" ordinal="14">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.11.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="combobox"/>
+                  <data label="Select" type="wordlist">
+                    <options>
+                      <option label="DOI" source="" uri="" value="DOI"/>
+                      <option label="Persistent Unique Identifier" source="" uri="" value="Persistent Unique Identifier"/>
+                    </options>
+                  </data>
+                </field>
+              </fields>
+              <multiplicity max="10" min="0"/>
+              <title>Persistent identifiers</title>
+              <description>Select a persistent identifier (PID) from the list. You may select multiple PIDs according to the types of research outputs, needs and the area of your research.</description>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-KW6q4" ordinal="11">
+              <numbering>2.1.12</numbering>
+              <commentField commentFieldValue="" hasCommentField="true"/>
+              <fields>
+                <field id="searchablemetadataQ215" ordinal="15">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.12.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style="">
+                    <rule ruleStyle="" target="fieldSet-TGBIK" type="field value">
+                      <value type="">true</value>
+                    </rule>
+                  </visible>
+                  <viewStyle cssClass="" renderstyle="booleanDecision"/>
+                  <data label=""/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title> Will you provide searchable metadata for your data?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-TGBIK" ordinal="12">
+              <numbering>2.1.13</numbering>
+              <commentField commentFieldValue="" hasCommentField="false"/>
+              <fields>
+                <field id="searchablemetadataServices215a" ordinal="16">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.13.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="combobox"/>
+                  <data label="Metadata Services" multiAutoComplete="false" optionsRoot="$['data'][*]['attributes']" type="autocomplete" url="https://eestore.paas2.uninett.no/api/datasetmdrepo/">
+                    <option label="name" source="" value="pid"/>
+                  </data>
+                </field>
+                <field id="notlisted215a" ordinal="17">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.13.2</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style="">
+                    <rule ruleStyle="" target="urlname215a" type="">
+                      <value type="">true</value>
+                    </rule>
+                  </visible>
+                  <viewStyle cssClass="" renderstyle="checkBox"/>
+                  <data label="not listed"/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>What services will you use to provide searchable metadata?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="urlname215a" ordinal="13">
+              <numbering>2.1.14</numbering>
+              <commentField commentFieldValue="" hasCommentField="false"/>
+              <fields>
+                <field id="url215a" ordinal="1">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.14.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="freetext"/>
+                  <data label="URL of the services providing searchable metadata"/>
+                </field>
+                <field id="name215a" ordinal="2">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.14.2</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="freetext"/>
+                  <data label="Name of the services used for providing data with searchable metadata"/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>URL/Name</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-9L9Nk" ordinal="14">
+              <numbering>2.1.15</numbering>
+              <commentField commentFieldValue="" hasCommentField="true"/>
+              <fields>
+                <field id="standardisedformatsQ216" ordinal="19">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.15.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style="">
+                    <rule ruleStyle="" target="fieldSet-5T9Hn" type="field value">
+                      <value type="">true</value>
+                    </rule>
+                    <rule ruleStyle="" target="formatstoplan216b" type="">
+                      <value type="">false</value>
+                    </rule>
+                  </visible>
+                  <viewStyle cssClass="" renderstyle="booleanDecision"/>
+                  <data label=""/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>Will you use standardised formats for some or all of your data?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-5T9Hn" ordinal="15">
+              <numbering>2.1.16</numbering>
+              <commentField commentFieldValue="" hasCommentField="true"/>
+              <fields>
+                <field id="standardiseddataformatsQ216a" ordinal="20">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.16.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="combobox"/>
+                  <data label="Select formats from the list" multiAutoComplete="false" optionsRoot="$['data'][*]['attributes']" type="autocomplete" url="https://eestore.paas2.uninett.no/api/fileformat/">
+                    <option label="name" source="" value="pid"/>
+                  </data>
+                </field>
+                <field id="other216a" ordinal="21">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.16.2</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style="">
+                    <rule ruleStyle="" target="urlname216a" type="">
+                      <value type="">true</value>
+                    </rule>
+                  </visible>
+                  <viewStyle cssClass="" renderstyle="checkBox"/>
+                  <data label="Other"/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>Which standardised data formats do you plan on using?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="urlname216a" ordinal="16">
+              <numbering>2.1.17</numbering>
+              <commentField commentFieldValue="" hasCommentField="false"/>
+              <fields>
+                <field id="url261a" ordinal="1">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.17.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="freetext"/>
+                  <data label="URL where this information can be found"/>
+                </field>
+                <field id="name213a" ordinal="2">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.17.2</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="freetext"/>
+                  <data label="Name of the file format"/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>Standardised formats</title>
+              <description>Is the structure of the file(s) provided in a standardised format?</description>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="formatstoplan216b" ordinal="17">
+              <numbering>2.1.18</numbering>
+              <commentField commentFieldValue="" hasCommentField="true"/>
+              <fields>
+                <field id="url216b" ordinal="1">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.18.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="freetext"/>
+                  <data label="Url"/>
+                </field>
+                <field id="name216b" ordinal="2">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.18.2</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="freetext"/>
+                  <data label="Name"/>
+                </field>
+                <field id="commonlyusedformat216b" ordinal="3">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.18.3</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="checkBox"/>
+                  <data label="Commonly used format"/>
+                </field>
+              </fields>
+              <multiplicity max="8" min="17"/>
+              <title>Please describe the formats you plan to store your data in, including any URLs to documentation.</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-WIQGN" ordinal="18">
+              <numbering>2.1.19</numbering>
+              <commentField commentFieldValue="" hasCommentField="true"/>
+              <fields>
+                <field id="field-NpLT2" ordinal="24">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.19.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style="">
+                    <rule ruleStyle="" target="notOpenDataWhySome" type="field value">
+                      <value type="">some</value>
+                    </rule>
+                    <rule ruleStyle="" target="notOpenDataWhyNone" type="field value">
+                      <value type="">none</value>
+                    </rule>
+                  </visible>
+                  <viewStyle cssClass="" renderstyle="combobox"/>
+                  <data label="Select" type="wordlist">
+                    <options>
+                      <option label="All" source="" uri="" value="all"/>
+                      <option label="Some" source="" uri="" value="some"/>
+                      <option label="None" source="" uri="" value="none"/>
+                    </options>
+                  </data>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>Are the file formats you will use open?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-vZquP" ordinal="19">
+              <numbering>2.1.20</numbering>
+              <commentField commentFieldValue="" hasCommentField="false"/>
+              <fields>
+                <field id="notOpenDataWhySome" ordinal="25">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.20.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="textarea"/>
+                  <data label=""/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>Please describe which data are not in an open format and why?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-Tb3bL" ordinal="20">
+              <numbering>2.1.21</numbering>
+              <commentField commentFieldValue="" hasCommentField="false"/>
+              <fields>
+                <field id="notOpenDataWhyNone" ordinal="26">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.21.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="textarea"/>
+                  <data label=""/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>Please describe which data are not in an open format and why?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-0dbUy" ordinal="21">
+              <numbering>2.1.22</numbering>
+              <commentField commentFieldValue="" hasCommentField="true"/>
+              <fields>
+                <field id="opensourcetools218" ordinal="27">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.22.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style="">
+                    <rule ruleStyle="" target="proprietarytools218aforsomedata" type="field value">
+                      <value type="">forsomedata</value>
+                    </rule>
+                    <rule ruleStyle="" target="proprietarytools218afornodata" type="field value">
+                      <value type="">fornodata</value>
+                    </rule>
+                  </visible>
+                  <viewStyle cssClass="" renderstyle="combobox"/>
+                  <data label="Select" type="wordlist">
+                    <options>
+                      <option label="for all data" source="" uri="" value="foralldata"/>
+                      <option label="for some data" source="" uri="" value="forsomedata"/>
+                      <option label="for no data" source="" uri="" value="fornodata"/>
+                    </options>
+                  </data>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title> Do supported open-source tools exist for accessing the data?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-J3Fl7" ordinal="22">
+              <numbering>2.1.23</numbering>
+              <commentField commentFieldValue="" hasCommentField="false"/>
+              <fields>
+                <field id="proprietarytools218aforsomedata" ordinal="28">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.23.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="textarea"/>
+                  <data label=""/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title> Please describe which data require proprietary tools to access the data?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-soVgC" ordinal="22">
+              <numbering>2.1.24</numbering>
+              <commentField commentFieldValue="" hasCommentField="false"/>
+              <fields>
+                <field id="proprietarytools218afornodata" ordinal="29">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.24.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="textarea"/>
+                  <data label=""/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title> Please describe which data require proprietary tools to access the data?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-02SRZ" ordinal="23">
+              <numbering>2.1.25</numbering>
+              <commentField commentFieldValue="" hasCommentField="true"/>
+              <fields>
+                <field id="qualitydataQ219" ordinal="30">
+                  <rdaCommonStandard/>
+                  <numbering>2.1.25.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="booleanDecision"/>
+                  <data label=""/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>Will you provide metadata describing the quality of the data?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+          </fieldSets>
+          <numbering>2.1</numbering>
+          <title>Making data findable, including provisions for metadata</title>
+          <extendedDescription/>
+          <description>Data are findable when described with metadata and vocabularies in a standardized way, assigned a Persistent Identifiers (PIDs) and are registered or indexed in a searchable resource</description>
+        </section>
+        <section defaultVisibility="true" id="DataaccessibleSection" ordinal="2" page="page_1">
+          <sections/>
+          <fieldSets>
+            <fieldSet id="fieldSet-dr427" ordinal="0">
+              <numbering>2.2.1</numbering>
+              <commentField commentFieldValue="" hasCommentField="true"/>
+              <fields>
+                <field id="ethicallegalissuesQ221" ordinal="1">
+                  <rdaCommonStandard/>
+                  <numbering>2.2.1.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style="">
+                    <rule ruleStyle="" target="reason221a" type="field value">
+                      <value type="">true</value>
+                    </rule>
+                  </visible>
+                  <viewStyle cssClass="" renderstyle="booleanDecision"/>
+                  <data label=""/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>Are there ethical or legal issues that can impact sharing the data?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-dZ1WB" ordinal="2">
+              <numbering>2.2.2</numbering>
+              <commentField commentFieldValue="" hasCommentField="false"/>
+              <fields>
+                <field id="openlyaccessibleQ222" ordinal="3">
+                  <rdaCommonStandard/>
+                  <numbering>2.2.2.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style="">
+                    <rule ruleStyle="" target="typeReasonUrl222a" type="field value">
+                      <value type="">some</value>
+                    </rule>
+                    <rule ruleStyle="" target="723e8f0d-a826-8eef-abca-f5df7d5edf50" type="">
+                      <value type="">none</value>
+                    </rule>
+                  </visible>
+                  <viewStyle cssClass="" renderstyle="combobox"/>
+                  <data label="Select from the list" type="wordlist">
+                    <options>
+                      <option label="all" source="" uri="" value="all"/>
+                      <option label="some" source="" uri="" value="some"/>
+                      <option label="none" source="" uri="" value="none"/>
+                    </options>
+                  </data>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>Will all your data be openly accessible?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="typeReasonUrl222a" ordinal="3">
+              <numbering>2.2.3</numbering>
+              <commentField commentFieldValue="" hasCommentField="false"/>
+              <fields>
+                <field id="type22a" ordinal="1">
+                  <rdaCommonStandard/>
+                  <numbering>2.2.3.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="freetext"/>
+                  <data label="Data type"/>
+                </field>
+                <field id="Reason22a" ordinal="2">
+                  <rdaCommonStandard/>
+                  <numbering>2.2.3.2</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="freetext"/>
+                  <data label="Please specify"/>
+                </field>
+                <field id="url222a" ordinal="3">
+                  <rdaCommonStandard/>
+                  <numbering>2.2.3.3</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="freetext"/>
+                  <data label="URL"/>
+                </field>
+              </fields>
+              <multiplicity max="3" min="1"/>
+              <title>Data type/ Reason/ URL</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="723e8f0d-a826-8eef-abca-f5df7d5edf50" ordinal="3">
+              <numbering>2.2.4</numbering>
+              <commentField commentFieldValue="" hasCommentField="false"/>
+              <fields>
+                <field id="datatype22b" ordinal="1">
+                  <rdaCommonStandard/>
+                  <numbering>2.2.4.1</numbering>
+                  <validations/>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="freetext"/>
+                  <data label="Data type"/>
+                </field>
+                <field id="reason22b" ordinal="2">
+                  <rdaCommonStandard/>
+                  <numbering>2.2.4.2</numbering>
+                  <validations/>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="freetext"/>
+                  <data label="Please specify"/>
+                </field>
+                <field id="url22b" ordinal="3">
+                  <rdaCommonStandard/>
+                  <numbering>2.2.4.3</numbering>
+                  <validations/>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="freetext"/>
+                  <data label="URL"/>
+                </field>
+              </fields>
+              <multiplicity max="3" min="1"/>
+              <title>Data type/ Reason/ URL</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-eaupM" ordinal="4">
+              <numbering>2.2.5</numbering>
+              <commentField commentFieldValue="" hasCommentField="true"/>
+              <fields>
+                <field id="repositories223" ordinal="1">
+                  <rdaCommonStandard/>
+                  <numbering>2.2.5.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="combobox"/>
+                  <data label="Select the repository where your data will be uploaded" multiAutoComplete="true" optionsRoot="$['data'][*]['attributes']" type="autocomplete" url="https://eestore.paas2.uninett.no/api/datarepo/">
+                    <option label="name" source="" value="pid"/>
+                  </data>
+                </field>
+                <field id="notlisted223" ordinal="2">
+                  <rdaCommonStandard/>
+                  <numbering>2.2.5.2</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value="false"/>
+                  <visible style="">
+                    <rule ruleStyle="" target="urlname223" type="">
+                      <value type="">true</value>
+                    </rule>
+                  </visible>
+                  <viewStyle cssClass="" renderstyle="checkBox"/>
+                  <data label="Not Listed"/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>How will the data be made available?</title>
+              <description>Select the repository where your data will be uploaded.</description>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="urlname223" ordinal="5">
+              <numbering>2.2.6</numbering>
+              <commentField commentFieldValue="" hasCommentField="false"/>
+              <fields>
+                <field id="url223" ordinal="1">
+                  <rdaCommonStandard/>
+                  <numbering>2.2.6.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="freetext"/>
+                  <data label="URL where the data are stored"/>
+                </field>
+                <field id="name223" ordinal="2">
+                  <rdaCommonStandard/>
+                  <numbering>2.2.6.2</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="freetext"/>
+                  <data label="Name of the repository that the data are stored"/>
+                </field>
+              </fields>
+              <multiplicity max="6" min="1"/>
+              <title>URL/Name</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-HVgAY" ordinal="6">
+              <numbering>2.2.7</numbering>
+              <commentField commentFieldValue="" hasCommentField="true"/>
+              <fields>
+                <field id="backup224" ordinal="8">
+                  <rdaCommonStandard/>
+                  <numbering>2.2.7.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="combobox"/>
+                  <data label="Select" type="wordlist">
+                    <options>
+                      <option label="secure with backup and recovery" source="" uri="" value="securewithbackupandrecovery"/>
+                      <option label="secure with no backup and recovery" source="" uri="" value="securewithnobackupandrecovery"/>
+                      <option label="insecure with backup and recovery" source="" uri="" value="insecurewithbackupandrecovery"/>
+                      <option label="insecure with no backup or recovery" source="" uri="" value="insecurewithnobackuporrecovery"/>
+                    </options>
+                  </data>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title> Is the storage sufficiently secure for the data and does the storage provide backup and recovery procedures?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-WV6yW" ordinal="9">
+              <numbering>2.2.8</numbering>
+              <commentField commentFieldValue="" hasCommentField="true"/>
+              <fields>
+                <field id="toolsaccess225" ordinal="11">
+                  <rdaCommonStandard/>
+                  <numbering>2.2.8.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style="">
+                    <rule ruleStyle="" target="links255a" type="field value">
+                      <value type="">true</value>
+                    </rule>
+                    <rule ruleStyle="" target="toolsurls225b" type="field value">
+                      <value type="">true</value>
+                    </rule>
+                  </visible>
+                  <viewStyle cssClass="" renderstyle="booleanDecision"/>
+                  <data label=""/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title> Are there any methods or tools required to access the data?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="links255a" ordinal="10">
+              <numbering>2.2.9</numbering>
+              <commentField commentFieldValue="" hasCommentField="false"/>
+              <fields>
+                <field id="method225a" ordinal="1">
+                  <rdaCommonStandard/>
+                  <numbering>2.2.9.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="freetext"/>
+                  <data label="Briefly explain the method need to be applied for data access"/>
+                </field>
+                <field id="url225a" ordinal="2">
+                  <rdaCommonStandard/>
+                  <numbering>2.2.9.2</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="freetext"/>
+                  <data label="URL where the method can be found"/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>Please provide links describing the methods for accessing the data.</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="toolsurls225b" ordinal="11">
+              <numbering>2.2.10</numbering>
+              <commentField commentFieldValue="" hasCommentField="false"/>
+              <fields>
+                <field id="tool225b" ordinal="1">
+                  <rdaCommonStandard/>
+                  <numbering>2.2.10.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="freetext"/>
+                  <data label="Briefly describe the tool needed to be used for data access"/>
+                </field>
+                <field id="url225" ordinal="2">
+                  <rdaCommonStandard/>
+                  <numbering>2.2.10.2</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="freetext"/>
+                  <data label="URL where the tool can be found"/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>Please provide links describing the tools for accessing the data.</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-a2A0t" ordinal="12">
+              <numbering>2.2.11</numbering>
+              <commentField commentFieldValue="" hasCommentField="true"/>
+              <fields>
+                <field id="auxiliarydata226" ordinal="14">
+                  <rdaCommonStandard/>
+                  <numbering>2.2.11.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="combobox"/>
+                  <data label="Select your answer from the list" type="wordlist">
+                    <options>
+                      <option label="no auxiliary data" source="" uri="" value="auxiliary"/>
+                      <option label="after publication" source="" uri="" value="publication"/>
+                      <option label="at end of project" source="" uri="" value="end"/>
+                      <option label="never" source="" uri="" value="never"/>
+                    </options>
+                  </data>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>Will you also make auxiliary data that may be of interest to researchers available?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+          </fieldSets>
+          <numbering>2.2</numbering>
+          <title>Making data openly accessible</title>
+          <extendedDescription/>
+          <description>Not all data can be made publicly open, hence data can be FAIR but not open, or open but not FAIR or both FAIR and open. Data are accessible when uploaded in a data repository and retrieved by their PIDs. When data can not be shared openly, metadata should be provided (even when the data are no longer available). In the case of sensitive or personal data, anonymization or pseudonymization and specific access rights can be applied. Where accessing data requires the use of complementary methods or tools, such procedures should be documented.</description>
+        </section>
+        <section defaultVisibility="true" id="datainteroperableSec3" ordinal="3" page="page_1">
+          <sections/>
+          <fieldSets>
+            <fieldSet id="fieldSet-Ybwru" ordinal="0">
+              <numbering>2.3.1</numbering>
+              <commentField commentFieldValue="" hasCommentField="true"/>
+              <fields>
+                <field id="voc231" ordinal="1">
+                  <rdaCommonStandard>dataset.metadata.language</rdaCommonStandard>
+                  <numbering>2.3.1.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style="">
+                    <rule ruleStyle="" target="ontologies231asome" type="">
+                      <value type="">some</value>
+                    </rule>
+                    <rule ruleStyle="" target="ontologies231anone" type="">
+                      <value type="">none</value>
+                    </rule>
+                  </visible>
+                  <viewStyle cssClass="" renderstyle="combobox"/>
+                  <data label="Select from the list of answers" type="wordlist">
+                    <options>
+                      <option label="all data types" source="" uri="" value="all"/>
+                      <option label="some data types" source="" uri="" value="some"/>
+                      <option label="none" source="" uri="" value="none"/>
+                    </options>
+                  </data>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>Will you use a standard vocabulary for your data types?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-a4BYx" ordinal="0">
+              <numbering>2.3.2</numbering>
+              <commentField commentFieldValue="" hasCommentField="true"/>
+              <fields>
+                <field id="ontologies231asome" ordinal="2">
+                  <rdaCommonStandard/>
+                  <numbering>2.3.2.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="booleanDecision"/>
+                  <data label=""/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>Will you provide a mapping to more commonly used ontologies? </title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-pMq2n" ordinal="1">
+              <numbering>2.3.3</numbering>
+              <commentField commentFieldValue="" hasCommentField="true"/>
+              <fields>
+                <field id="ontologies231anone" ordinal="3">
+                  <rdaCommonStandard/>
+                  <numbering>2.3.3.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="booleanDecision"/>
+                  <data label=""/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>Will you provide a mapping to more commonly used ontologies? </title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+          </fieldSets>
+          <numbering>2.3</numbering>
+          <title>Making data interoperable</title>
+          <extendedDescription/>
+          <description>Data are interoperable, meaning they can be easily understood and shared with other platforms and systems, when they are created using standard vocabularies and include references to other data and metadata.</description>
+        </section>
+        <section defaultVisibility="true" id="datareusesec4" ordinal="4" page="page_1">
+          <sections/>
+          <fieldSets>
+            <fieldSet id="fieldSet-AxJ3l" ordinal="1">
+              <numbering>2.4.1</numbering>
+              <commentField commentFieldValue="" hasCommentField="false"/>
+              <fields>
+                <field id="field-HVLNZ" ordinal="1">
+                  <rdaCommonStandard/>
+                  <numbering>2.4.1.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style="">
+                    <rule ruleStyle="" target="howlong242a" type="field value">
+                      <value type="">later</value>
+                    </rule>
+                    <rule ruleStyle="" target="reason242a" type="field value">
+                      <value type="">never</value>
+                    </rule>
+                  </visible>
+                  <viewStyle cssClass="" renderstyle="combobox"/>
+                  <data label="Select from the list of answers" type="wordlist">
+                    <options>
+                      <option label="immediately" source="" uri="" value="immediately"/>
+                      <option label="after article publication" source="" uri="" value="after "/>
+                      <option label="end of project" source="" uri="" value="end"/>
+                      <option label="later than end of project" source="" uri="" value="later"/>
+                      <option label="never" source="" uri="" value="never"/>
+                    </options>
+                  </data>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>When do you plan to make your data available for reuse?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-8REkP" ordinal="2">
+              <numbering>2.4.2</numbering>
+              <commentField commentFieldValue="" hasCommentField="false"/>
+              <fields>
+                <field id="howlong242a" ordinal="2">
+                  <rdaCommonStandard/>
+                  <numbering>2.4.2.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="freetext"/>
+                  <data label="Time Period"/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>Please specify how long after the project has ended the data will be made available?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-N6h4v" ordinal="3">
+              <numbering>2.4.3</numbering>
+              <commentField commentFieldValue="" hasCommentField="false"/>
+              <fields>
+                <field id="reason242a" ordinal="3">
+                  <rdaCommonStandard/>
+                  <numbering>2.4.3.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="textarea"/>
+                  <data label="Provide additional information or justification about your selection"/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>Please describe the reason the data will not be made available.</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-kkQMj" ordinal="4">
+              <numbering>2.4.4</numbering>
+              <commentField commentFieldValue="" hasCommentField="false"/>
+              <fields>
+                <field id="licences241" ordinal="0">
+                  <rdaCommonStandard/>
+                  <numbering>2.4.4.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="combobox"/>
+                  <data label="Licences" multiAutoComplete="true" optionsRoot="$['data'][*]['attributes']" type="autocomplete" url="https://eestore.paas2.uninett.no/api/license/">
+                    <option label="name" source="" value="id"/>
+                  </data>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>What internationally recognised licence will you use for your data?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-jYyLG" ordinal="5">
+              <numbering>2.4.5</numbering>
+              <commentField commentFieldValue="" hasCommentField="true"/>
+              <fields>
+                <field id="documentedProcedures243" ordinal="1">
+                  <rdaCommonStandard/>
+                  <numbering>2.4.5.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style="">
+                    <rule ruleStyle="" target="url245bb" type="">
+                      <value type="">true</value>
+                    </rule>
+                  </visible>
+                  <viewStyle cssClass="" renderstyle="booleanDecision"/>
+                  <data label=""/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>Do you have documented procedures for quality assurance of your data?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="52787860-6577-8ffb-b434-e9de4a3cd248" ordinal="5">
+              <numbering>2.4.6</numbering>
+              <commentField commentFieldValue="" hasCommentField="false"/>
+              <fields>
+                <field id="url245bb" ordinal="0">
+                  <rdaCommonStandard/>
+                  <numbering>2.4.6.1</numbering>
+                  <validations/>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="freetext"/>
+                  <data label="URL where this information can be found"/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title/>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-83SiE" ordinal="6">
+              <numbering>2.4.7</numbering>
+              <commentField commentFieldValue="" hasCommentField="false"/>
+              <fields>
+                <field id="supportForDataReuse" ordinal="0">
+                  <rdaCommonStandard/>
+                  <numbering>2.4.7.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style="">
+                    <rule ruleStyle="" target="supportForDataReuseTimeSpan" type="">
+                      <value type="">true</value>
+                    </rule>
+                    <rule ruleStyle="" target="unsupportedforreusewhy" type="">
+                      <value type="">false</value>
+                    </rule>
+                  </visible>
+                  <viewStyle cssClass="" renderstyle="booleanDecision"/>
+                  <data label=""/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>Will you provide any support for data reuse?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-58fJv" ordinal="7">
+              <numbering>2.4.8</numbering>
+              <commentField commentFieldValue="" hasCommentField="false"/>
+              <fields>
+                <field id="supportForDataReuseTimeSpan" ordinal="0">
+                  <rdaCommonStandard/>
+                  <numbering>2.4.8.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="combobox"/>
+                  <data label=" Select from the list of answers" type="wordlist">
+                    <options>
+                      <option label="Less than 2 years" source="" uri="" value="lessthantwoyears"/>
+                      <option label="Up to 5 years" source="" uri="" value="uptofiveyears"/>
+                      <option label="More than 10 years" source="" uri="" value="morethantenyears"/>
+                    </options>
+                  </data>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>How long do you intend to support data reuse?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-iKo7z" ordinal="8">
+              <numbering>2.4.9</numbering>
+              <commentField commentFieldValue="" hasCommentField="false"/>
+              <fields>
+                <field id="unsupportedforreusewhy" ordinal="0">
+                  <rdaCommonStandard/>
+                  <numbering>2.4.9.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="textarea"/>
+                  <data label="Provide additional information or justification about your selection"/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>Please specify why the data will be unsupported for reuse.</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+          </fieldSets>
+          <numbering>2.4</numbering>
+          <title>Increase data reuse</title>
+          <extendedDescription/>
+          <description>Data can be reused when the conditions about how others can make use of the data are well-described following community-standards and are communicated as specified by the owners. Such information can be found in licenses attributed to data and in references about the data provenance.</description>
+        </section>
+        <section defaultVisibility="true" id="allocationofresourcessection" ordinal="5" page="page_1">
+          <sections/>
+          <fieldSets>
+            <fieldSet id="fieldSet-h7om3" ordinal="1">
+              <numbering>2.5.1</numbering>
+              <commentField commentFieldValue="" hasCommentField="true"/>
+              <fields>
+                <field id="allocationofresourcessectionfield1" ordinal="0">
+                  <rdaCommonStandard/>
+                  <numbering>2.5.1.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="combobox"/>
+                  <data label="Select from the list of answers" type="wordlist">
+                    <options>
+                      <option label="Use of national infrastructure" source="" uri="" value="useofnationalinfrastructure"/>
+                      <option label="Use of institution infrastructure" source="" uri="" value="useofinstitutioninfrastructure"/>
+                      <option label="Infrastructure Grant" source="" uri="" value="infrastructuregrant"/>
+                      <option label="Other" source="" uri="" value="other"/>
+                    </options>
+                  </data>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>How will the cost of making your data findable, accessible, interoperable and reusable be covered?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-p7IFk" ordinal="2">
+              <numbering>2.5.2</numbering>
+              <commentField commentFieldValue="" hasCommentField="true"/>
+              <fields>
+                <field id="allocationofresourcessectionfield2" ordinal="0">
+                  <rdaCommonStandard/>
+                  <numbering>2.5.2.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style="">
+                    <rule ruleStyle="" target="allocationofresourcessectionfield3" type="field value">
+                      <value type="">false</value>
+                    </rule>
+                  </visible>
+                  <viewStyle cssClass="" renderstyle="booleanDecision"/>
+                  <data label=""/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>Will you identify a data manager to manage your data, if not who will be responsible for the management of your data?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-5yZeo" ordinal="3">
+              <numbering>2.5.3</numbering>
+              <commentField commentFieldValue="" hasCommentField="false"/>
+              <fields>
+                <field id="allocationofresourcessectionfield3" ordinal="0">
+                  <rdaCommonStandard/>
+                  <numbering>2.5.3.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style=""/>
+                  <viewStyle cssClass="" renderstyle="textarea"/>
+                  <data label=""/>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>Identify the people or roles that will be responsible for the management of the project data</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+            <fieldSet id="fieldSet-ON7iq" ordinal="4">
+              <numbering>2.5.4</numbering>
+              <commentField commentFieldValue="" hasCommentField="true"/>
+              <fields>
+                <field id="allocationofresourcessectionfield4" ordinal="0">
+                  <rdaCommonStandard/>
+                  <numbering>2.5.4.1</numbering>
+                  <validations>
+                    <validation type="0"/>
+                  </validations>
+                  <defaultValue type="" value=""/>
+                  <visible style="">
+                    <rule ruleStyle="" target="fieldSet-LY6uk" type="field value">
+                      <value type="">other</value>
+                    </rule>
+                  </visible>
+                  <viewStyle cssClass="" renderstyle="combobox"/>
+                  <data label="Select from the list of answers" type="wordlist">
+                    <options>
+                      <option label="Institutional archive" source="" uri="" value="institutionalarchive"/>
+                      <option label="National archive" source="" uri="" value="nationalarchive"/>
+                      <option label="Other" source="" uri="" value="other"/>
+                    </options>
+                  </data>
+                </field>
+              </fields>
+              <multiplicity max="0" min="0"/>
+              <title>How do you intend to ensure data reuse after your project finishes?</title>
+              <description/>
+              <extendedDescription/>
+              <additionalInformation/>
+            </fieldSet>
+          </fieldSets>
+          <numbering>2.5</numbering>
+          <title>Allocation of resources</title>
+          <extendedDescription/>
+          <description>Data management can be costly, especially when its planning hasn't been sufficient from the very beginning of the research process. Costing of data management includes for example potential use of proprietary services and tools or extra effort needed to perform specific tasks or even to develop tools from scratch.</description>
+        </section>
+      </sections>
+      <fieldSets/>
+      <numbering>2</numbering>
+      <title>FAIR Data</title>
+      <extendedDescription/>
+      <description> In general terms, your research data should be 'FAIR', that is findable, accessible, interoperable and re-usable. These principles precede implementation choices and do not necessarily suggest any specific technology, standard, or implementation-solution. This template is not intended as a strict technical implementation of the FAIR principles, it is rather inspired by FAIR as a general concept.</description>
+    </section>
+    <section defaultVisibility="true" id="DatasetSecuritySection" ordinal="3" page="page_2">
+      <sections/>
+      <fieldSets>
+        <fieldSet id="fieldSet-dgxTD" ordinal="0">
+          <numbering>3.1</numbering>
+          <commentField commentFieldValue="" hasCommentField="true"/>
+          <fields>
+            <field id="DatasetSecuritySectionField1" ordinal="0">
+              <rdaCommonStandard/>
+              <numbering>3.1.1</numbering>
+              <validations>
+                <validation type="0"/>
+              </validations>
+              <defaultValue type="" value=""/>
+              <visible style="">
+                <rule ruleStyle="" target="DatasetSecuritySectionField2" type="field value">
+                  <value type="">keptoninsecure</value>
+                </rule>
+              </visible>
+              <viewStyle cssClass="" renderstyle="combobox"/>
+              <data label="Select from the list of answers" type="wordlist">
+                <options>
+                  <option label="Kept on secure, managed storage for limited time" source="" uri="" value="keptonsecure"/>
+                  <option label="Kept on insecure, unmanaged storage for limited time" source="" uri="" value="keptoninsecure"/>
+                  <option label="Delete at end of project" source="" uri="" value="deleteatend"/>
+                </options>
+              </data>
+            </field>
+          </fields>
+          <multiplicity max="0" min="0"/>
+          <title>What do you plan to do with research data of limited use</title>
+          <description/>
+          <extendedDescription/>
+          <additionalInformation/>
+        </fieldSet>
+        <fieldSet id="fieldSet-eCpL3" ordinal="0">
+          <numbering>3.2</numbering>
+          <commentField commentFieldValue="" hasCommentField="false"/>
+          <fields>
+            <field id="DatasetSecuritySectionField2" ordinal="0">
+              <rdaCommonStandard/>
+              <numbering>3.2.1</numbering>
+              <validations>
+                <validation type="0"/>
+              </validations>
+              <defaultValue type="" value=""/>
+              <visible style=""/>
+              <viewStyle cssClass="" renderstyle="textarea"/>
+              <data label="Provide additional information or justification about your selection"/>
+            </field>
+          </fields>
+          <multiplicity max="0" min="0"/>
+          <title>Please describe why the data will be kept on insecure, unmanaged storage</title>
+          <description/>
+          <extendedDescription/>
+          <additionalInformation/>
+        </fieldSet>
+      </fieldSets>
+      <numbering>3</numbering>
+      <title>Data Security</title>
+      <extendedDescription/>
+      <description/>
+    </section>
+    <section defaultVisibility="true" id="othersection" ordinal="4" page="page_3">
+      <sections/>
+      <fieldSets>
+        <fieldSet id="fieldSet-MKJLW" ordinal="1">
+          <numbering>4.1</numbering>
+          <commentField commentFieldValue="" hasCommentField="true"/>
+          <fields>
+            <field id="otherField1" ordinal="1">
+              <rdaCommonStandard>cost</rdaCommonStandard>
+              <numbering>4.1.1</numbering>
+              <validations>
+                <validation type="0"/>
+              </validations>
+              <defaultValue type="" value=""/>
+              <visible style="">
+                <rule ruleStyle="" target="otherField2" type="">
+                  <value type="">true</value>
+                </rule>
+              </visible>
+              <viewStyle cssClass="" renderstyle="booleanDecision"/>
+              <data label=""/>
+            </field>
+          </fields>
+          <multiplicity max="0" min="0"/>
+          <title>Do you make use of other procedures for data management?</title>
+          <description/>
+          <extendedDescription/>
+          <additionalInformation/>
+        </fieldSet>
+        <fieldSet id="fieldSet-zuTL0" ordinal="2">
+          <numbering>4.2</numbering>
+          <commentField commentFieldValue="" hasCommentField="false"/>
+          <fields>
+            <field id="otherField2" ordinal="2">
+              <rdaCommonStandard/>
+              <numbering>4.2.1</numbering>
+              <validations>
+                <validation type="0"/>
+              </validations>
+              <defaultValue type="" value=""/>
+              <visible style=""/>
+              <viewStyle cssClass="" renderstyle="textarea"/>
+              <data label="Provide additional information or justification about your selection"/>
+            </field>
+          </fields>
+          <multiplicity max="0" min="0"/>
+          <title>Please provide links to documentation on these other procedures.</title>
+          <description/>
+          <extendedDescription/>
+          <additionalInformation/>
+        </fieldSet>
+      </fieldSets>
+      <numbering>4</numbering>
+      <title>Other</title>
+      <extendedDescription/>
+      <description/>
+    </section>
+  </sections>
+</root>

From f402837403c28b4a342ed5428535a97334fad536 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Thu, 9 Apr 2020 15:55:56 +0300
Subject: [PATCH 20/60] Updated AOF and FWF templates

---
 dmp-dataset-templates/AcademyOfFinland.xml |  10 ++
 dmp-dataset-templates/FWF.xml              | 112 ++++++++++++++++-----
 2 files changed, 98 insertions(+), 24 deletions(-)

diff --git a/dmp-dataset-templates/AcademyOfFinland.xml b/dmp-dataset-templates/AcademyOfFinland.xml
index e9ce27510..5c4e41324 100644
--- a/dmp-dataset-templates/AcademyOfFinland.xml
+++ b/dmp-dataset-templates/AcademyOfFinland.xml
@@ -16,6 +16,7 @@
 					<commentField commentFieldValue="" hasCommentField="false"/>
 					<fields>
 						<field id="what-kinds-data-collected-produced-reused-formats" ordinal="0">
+							<rdaCommonStandard>dataset.type</rdaCommonStandard>
 							<numbering>1.1.1</numbering>
 							<validations/>
 							<defaultValue type="" value=""/>
@@ -35,6 +36,7 @@
 					<commentField commentFieldValue="" hasCommentField="false"/>
 					<fields>
 						<field id="consistency-and-quality-data-controlled" ordinal="0">
+							<rdaCommonStandard>dataset.data_quality_assurance</rdaCommonStandard>
 							<numbering>1.2.1</numbering>
 							<validations/>
 							<defaultValue type="" value=""/>
@@ -63,6 +65,7 @@
 					<commentField commentFieldValue="" hasCommentField="false"/>
 					<fields>
 						<field id="ethical-issues-sensitive-data-gaining" ordinal="0">
+							<rdaCommonStandard>dataset.sensitive_data</rdaCommonStandard>
 							<numbering>2.1.1</numbering>
 							<validations/>
 							<defaultValue type="" value=""/>
@@ -82,6 +85,7 @@
 					<commentField commentFieldValue="" hasCommentField="false"/>
 					<fields>
 						<field id="data-ownership-copyright-ipr-issues" ordinal="0">
+							<rdaCommonStandard>dataset.distribution.license.license_ref</rdaCommonStandard>
 							<numbering>2.2.1</numbering>
 							<validations/>
 							<defaultValue type="" value=""/>
@@ -110,6 +114,7 @@
 					<commentField commentFieldValue="" hasCommentField="false"/>
 					<fields>
 						<field id="document-data-fair" ordinal="0">
+							<rdaCommonStandard>dataset.metadata.metadata_standard_id</rdaCommonStandard>
 							<numbering>3.1.1</numbering>
 							<validations/>
 							<defaultValue type="" value=""/>
@@ -138,6 +143,7 @@
 					<commentField commentFieldValue="" hasCommentField="false"/>
 					<fields>
 						<field id="where-will-data-stored-how-will-backed" ordinal="0">
+							<rdaCommonStandard>dataset.distribution.host.url</rdaCommonStandard>
 							<numbering>4.1.1</numbering>
 							<validations/>
 							<defaultValue type="" value=""/>
@@ -157,6 +163,7 @@
 					<commentField commentFieldValue="" hasCommentField="false"/>
 					<fields>
 						<field id="who-will-be-responsible-how-will-secure" ordinal="0">
+							<rdaCommonStandard>dataset.security_and_privacy.title</rdaCommonStandard>
 							<numbering>4.2.1</numbering>
 							<validations/>
 							<defaultValue type="" value=""/>
@@ -185,6 +192,7 @@
 					<commentField commentFieldValue="" hasCommentField="false"/>
 					<fields>
 						<field id="data-openly-published-where-when" ordinal="0">
+							<rdaCommonStandard>dataset.distribution.data_access</rdaCommonStandard>
 							<numbering>5.1.1</numbering>
 							<validations/>
 							<defaultValue type="" value=""/>
@@ -204,6 +212,7 @@
 					<commentField commentFieldValue="" hasCommentField="false"/>
 					<fields>
 						<field id="will-data-long-term-value-archived" ordinal="0">
+							<rdaCommonStandard>dataset.preservation_statement</rdaCommonStandard>
 							<numbering>5.2.1</numbering>
 							<validations/>
 							<defaultValue type="" value=""/>
@@ -232,6 +241,7 @@
 					<commentField commentFieldValue="" hasCommentField="false"/>
 					<fields>
 						<field id="who-will-responsible-specific-tasks" ordinal="0">
+							<rdaCommonStandard>dataset.technical_resource.technical_resource.name</rdaCommonStandard>
 							<numbering>6.1.1</numbering>
 							<validations/>
 							<defaultValue type="" value=""/>
diff --git a/dmp-dataset-templates/FWF.xml b/dmp-dataset-templates/FWF.xml
index 84c5a7986..59d003dde 100644
--- a/dmp-dataset-templates/FWF.xml
+++ b/dmp-dataset-templates/FWF.xml
@@ -14,6 +14,7 @@
 					<commentField commentFieldValue="" hasCommentField="false"/>
 					<fields>
 						<field id="what-kinds-of-data-source-code" ordinal="0">
+							<rdaCommonStandard>dataset.type</rdaCommonStandard>
 							<numbering>1.1.1</numbering>
 							<validations/>
 							<defaultValue type="" value=""/>
@@ -33,6 +34,7 @@
 					<commentField commentFieldValue="" hasCommentField="false"/>
 					<fields>
 						<field id="how-will-the-research-data-be-generated" ordinal="0">
+							<rdaCommonStandard/>
 							<numbering>1.2.1</numbering>
 							<validations/>
 							<defaultValue type="" value=""/>
@@ -52,6 +54,7 @@
 					<commentField commentFieldValue="" hasCommentField="false"/>
 					<fields>
 						<field id="how-will-you-structure-the-data" ordinal="0">
+							<rdaCommonStandard>dataset.distribution.host.supports_versioning</rdaCommonStandard>
 							<numbering>1.3.1</numbering>
 							<validations/>
 							<defaultValue type="" value=""/>
@@ -71,6 +74,7 @@
 					<commentField commentFieldValue="" hasCommentField="false"/>
 					<fields>
 						<field id="who-is-the-target" ordinal="0">
+							<rdaCommonStandard/>
 							<numbering>1.4.1</numbering>
 							<validations/>
 							<defaultValue type="" value=""/>
@@ -101,6 +105,7 @@
 							<commentField commentFieldValue="" hasCommentField="true"/>
 							<fields>
 								<field id="will-use-metadata-question" ordinal="1">
+									<rdaCommonStandard/>
 									<numbering>2.1.1.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -116,6 +121,7 @@
 									<data label=""/>
 								</field>
 								<field id="metadata-selector" ordinal="2">
+									<rdaCommonStandard>dataset.metadata.metadata_standard_id</rdaCommonStandard>
 									<numbering>2.1.1.2</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -126,6 +132,7 @@
 									</data>
 								</field>
 								<field id="other-checkbox-metadata" ordinal="3">
+									<rdaCommonStandard/>
 									<numbering>2.1.1.3</numbering>
 									<validations/>
 									<defaultValue type="" value="false"/>
@@ -149,6 +156,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="url-metadata" ordinal="1">
+									<rdaCommonStandard>dataset.metadata.metadata_standard_id.identifier</rdaCommonStandard>
 									<numbering>2.1.2.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -157,6 +165,7 @@
 									<data label="URL where metadata can be found"/>
 								</field>
 								<field id="location-metadata" ordinal="2">
+									<rdaCommonStandard>dataset.metadata.description</rdaCommonStandard>
 									<numbering>2.1.2.2</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -176,6 +185,7 @@
 							<commentField commentFieldValue="" hasCommentField="true"/>
 							<fields>
 								<field id="boolean-metadata-standardized-vocabularies" ordinal="1">
+									<rdaCommonStandard/>
 									<numbering>2.1.3.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -191,6 +201,7 @@
 									<data label=""/>
 								</field>
 								<field id="standardized-vocabularies-autocomplete" ordinal="2">
+									<rdaCommonStandard/>
 									<numbering>2.1.3.2</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -201,6 +212,7 @@
 									</data>
 								</field>
 								<field id="other-not-listed-items" ordinal="3">
+									<rdaCommonStandard/>
 									<numbering>2.1.3.3</numbering>
 									<validations/>
 									<defaultValue type="" value="false"/>
@@ -224,6 +236,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="url-other-vocabularies" ordinal="1">
+									<rdaCommonStandard/>
 									<numbering>2.1.4.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -232,6 +245,7 @@
 									<data label=" URL where the vocabularies of the data can be found"/>
 								</field>
 								<field id="desc-other-vocabularies" ordinal="2">
+									<rdaCommonStandard/>
 									<numbering>2.1.4.2</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -262,6 +276,7 @@
 									<commentField commentFieldValue="" hasCommentField="false"/>
 									<fields>
 										<field id="openly-accessible-field" ordinal="0">
+											<rdaCommonStandard>dataset.distribution.data_access</rdaCommonStandard>
 											<numbering>2.2.1.1.1</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -276,9 +291,9 @@
 											<viewStyle cssClass="" renderstyle="combobox"/>
 											<data label="Select from the list" type="wordlist">
 												<options>
-													<option label="all" source="" value="all"/>
-													<option label="some" source="" value="some"/>
-													<option label="none" source="" value="none"/>
+													<option label="all" source="" uri="" value="all"/>
+													<option label="some" source="" uri="" value="some"/>
+													<option label="none" source="" uri="" value="none"/>
 												</options>
 											</data>
 										</field>
@@ -294,6 +309,7 @@
 									<commentField commentFieldValue="" hasCommentField="false"/>
 									<fields>
 										<field id="data-type-openly-accessible" ordinal="1">
+											<rdaCommonStandard>dataset.distribution.format</rdaCommonStandard>
 											<numbering>2.2.1.2.1</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -302,6 +318,7 @@
 											<data label="Data type"/>
 										</field>
 										<field id="reason-openly-accessible" ordinal="2">
+											<rdaCommonStandard>dataset.distribution.description</rdaCommonStandard>
 											<numbering>2.2.1.2.2</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -310,6 +327,7 @@
 											<data label="Please specify"/>
 										</field>
 										<field id="url-openly-accessible" ordinal="3">
+											<rdaCommonStandard>dataset.distribution.access_url</rdaCommonStandard>
 											<numbering>2.2.1.2.3</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -329,6 +347,7 @@
 									<commentField commentFieldValue="" hasCommentField="false"/>
 									<fields>
 										<field id="data-type-openly-accessible2" ordinal="1">
+											<rdaCommonStandard>dataset.distribution.format</rdaCommonStandard>
 											<numbering>2.2.1.3.1</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -337,6 +356,7 @@
 											<data label="Data Type"/>
 										</field>
 										<field id="reason-openly-accessible2" ordinal="2">
+											<rdaCommonStandard>dataset.distribution.description</rdaCommonStandard>
 											<numbering>2.2.1.3.2</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -345,6 +365,7 @@
 											<data label="Please specify"/>
 										</field>
 										<field id="url-openly-accessible2" ordinal="3">
+											<rdaCommonStandard>dataset.distribution.access_url</rdaCommonStandard>
 											<numbering>2.2.1.3.3</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -364,6 +385,7 @@
 									<commentField commentFieldValue="" hasCommentField="true"/>
 									<fields>
 										<field id="repositories223" ordinal="1">
+											<rdaCommonStandard>dataset.distribution.host.title</rdaCommonStandard>
 											<numbering>2.2.1.4.1</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -374,6 +396,7 @@
 											</data>
 										</field>
 										<field id="not-listed-available" ordinal="2">
+											<rdaCommonStandard/>
 											<numbering>2.2.1.4.2</numbering>
 											<validations/>
 											<defaultValue type="" value="false"/>
@@ -397,6 +420,7 @@
 									<commentField commentFieldValue="" hasCommentField="false"/>
 									<fields>
 										<field id="url223" ordinal="1">
+											<rdaCommonStandard>dataset.distribution.host.url</rdaCommonStandard>
 											<numbering>2.2.1.5.1</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -405,6 +429,7 @@
 											<data label="URL where the data are stored"/>
 										</field>
 										<field id="name223" ordinal="2">
+											<rdaCommonStandard>dataset.distribution.host.title</rdaCommonStandard>
 											<numbering>2.2.1.5.2</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -433,6 +458,7 @@
 									<commentField commentFieldValue="" hasCommentField="false"/>
 									<fields>
 										<field id="provide-persistent-identifiers" ordinal="0">
+											<rdaCommonStandard/>
 											<numbering>2.2.2.1.1</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -456,6 +482,7 @@
 									<commentField commentFieldValue="" hasCommentField="false"/>
 									<fields>
 										<field id="persistent-identifiers" ordinal="0">
+											<rdaCommonStandard/>
 											<numbering>2.2.2.2.1</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -463,8 +490,8 @@
 											<viewStyle cssClass="" renderstyle="combobox"/>
 											<data label="Select" type="wordlist">
 												<options>
-													<option label="DOI" source="" value="DOI"/>
-													<option label="Persistent Unique Identifier" source="" value="Persistent Unique Identifier"/>
+													<option label="DOI" source="" uri="" value="DOI"/>
+													<option label="Persistent Unique Identifier" source="" uri="" value="Persistent Unique Identifier"/>
 												</options>
 											</data>
 										</field>
@@ -480,6 +507,7 @@
 									<commentField commentFieldValue="" hasCommentField="true"/>
 									<fields>
 										<field id="provide-searchable-metadata-for-your" ordinal="0">
+											<rdaCommonStandard/>
 											<numbering>2.2.2.3.1</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -503,6 +531,7 @@
 									<commentField commentFieldValue="" hasCommentField="false"/>
 									<fields>
 										<field id="search-services-provide-metadata" ordinal="1">
+											<rdaCommonStandard/>
 											<numbering>2.2.2.4.1</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -513,6 +542,7 @@
 											</data>
 										</field>
 										<field id="not-listed-services-provide-metadata" ordinal="2">
+											<rdaCommonStandard/>
 											<numbering>2.2.2.4.2</numbering>
 											<validations/>
 											<defaultValue type="" value="false"/>
@@ -536,6 +566,7 @@
 									<commentField commentFieldValue="" hasCommentField="false"/>
 									<fields>
 										<field id="url-not-listed-searchable-metadata" ordinal="1">
+											<rdaCommonStandard/>
 											<numbering>2.2.2.5.1</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -544,6 +575,7 @@
 											<data label="URL of the services providing searchable metadata"/>
 										</field>
 										<field id="name-not-listed-searchable-metadata" ordinal="2">
+											<rdaCommonStandard/>
 											<numbering>2.2.2.5.2</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -572,6 +604,7 @@
 									<commentField commentFieldValue="" hasCommentField="false"/>
 									<fields>
 										<field id="how-you-planning-document-information-field" ordinal="0">
+											<rdaCommonStandard/>
 											<numbering>2.2.3.1.1</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -607,6 +640,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="quality-assurance-processes-will-you-adopt" ordinal="0">
+									<rdaCommonStandard>dataset.data_quality_assurance</rdaCommonStandard>
 									<numbering>2.3.1.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -626,6 +660,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="consistency-and-quality-of-data-collection" ordinal="0">
+									<rdaCommonStandard/>
 									<numbering>2.3.2.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -663,6 +698,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="what-persistent-identifier-will-used" ordinal="0">
+									<rdaCommonStandard>dataset.type</rdaCommonStandard>
 									<numbering>3.1.1.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -691,6 +727,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="will-data-be-preserved-long-term" ordinal="0">
+									<rdaCommonStandard>dataset.preservation_statement</rdaCommonStandard>
 									<numbering>3.2.1.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -714,6 +751,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="data-will-not-be-stored" ordinal="0">
+									<rdaCommonStandard>dataset.sensitive_data</rdaCommonStandard>
 									<numbering>3.2.2.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -733,6 +771,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="data-that-will-be-preserved-long-term" ordinal="0">
+									<rdaCommonStandard/>
 									<numbering>3.2.3.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -759,6 +798,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="data-items-preserved-long-term" ordinal="0">
+									<rdaCommonStandard/>
 									<numbering>3.2.4.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -778,6 +818,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="use-standardized-formats-some-data" ordinal="0">
+									<rdaCommonStandard/>
 									<numbering>3.2.5.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -804,6 +845,7 @@
 							<commentField commentFieldValue="" hasCommentField="true"/>
 							<fields>
 								<field id="standardiseddataformats" ordinal="1">
+									<rdaCommonStandard/>
 									<numbering>3.2.6.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -814,6 +856,7 @@
 									</data>
 								</field>
 								<field id="other-standardized-format" ordinal="2">
+									<rdaCommonStandard/>
 									<numbering>3.2.6.2</numbering>
 									<validations/>
 									<defaultValue type="" value="false"/>
@@ -837,6 +880,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="url-of-other-standardized-formats" ordinal="1">
+									<rdaCommonStandard/>
 									<numbering>3.2.7.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -845,6 +889,7 @@
 									<data label="URL where this information can be found"/>
 								</field>
 								<field id="name-of-other-standardized-formats" ordinal="2">
+									<rdaCommonStandard/>
 									<numbering>3.2.7.2</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -864,6 +909,7 @@
 							<commentField commentFieldValue="" hasCommentField="true"/>
 							<fields>
 								<field id="url-formats-to-plan-to-store" ordinal="1">
+									<rdaCommonStandard/>
 									<numbering>3.2.8.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -872,6 +918,7 @@
 									<data label=""/>
 								</field>
 								<field id="name-formats-to-plan-to-store" ordinal="2">
+									<rdaCommonStandard/>
 									<numbering>3.2.8.2</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -880,6 +927,7 @@
 									<data label=""/>
 								</field>
 								<field id="checkbox-formats-to-plan-to-store" ordinal="3">
+									<rdaCommonStandard/>
 									<numbering>3.2.8.3</numbering>
 									<validations/>
 									<defaultValue type="" value="false"/>
@@ -899,6 +947,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="how-data-stored-sufficiently-secure" ordinal="0">
+									<rdaCommonStandard>dataset.distribution.host.storage_type</rdaCommonStandard>
 									<numbering>3.2.9.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -918,6 +967,7 @@
 							<commentField commentFieldValue="" hasCommentField="true"/>
 							<fields>
 								<field id="where-data-stored-sufficiently-secure" ordinal="0">
+									<rdaCommonStandard/>
 									<numbering>3.2.10.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -925,10 +975,10 @@
 									<viewStyle cssClass="" renderstyle="combobox"/>
 									<data label="Select" type="wordlist">
 										<options>
-											<option label="secure with backup and recovery" source="" value="securewithbackupandrecovery"/>
-											<option label="secure with no backup and recovery" source="" value="securewithnobackupandrecovery"/>
-											<option label="insecure with backup and recovery" source="" value="insecurewithbackupandrecovery"/>
-											<option label="insecure with no backup or recovery" source="" value="insecurewithnobackuporrecovery"/>
+											<option label="secure with backup and recovery" source="" uri="" value="securewithbackupandrecovery"/>
+											<option label="secure with no backup and recovery" source="" uri="" value="securewithnobackupandrecovery"/>
+											<option label="insecure with backup and recovery" source="" uri="" value="insecurewithbackupandrecovery"/>
+											<option label="insecure with no backup or recovery" source="" uri="" value="insecurewithnobackuporrecovery"/>
 										</options>
 									</data>
 								</field>
@@ -944,6 +994,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="for-how-long-data-be-stored-3" ordinal="0">
+									<rdaCommonStandard>dataset.distribution.available_till</rdaCommonStandard>
 									<numbering>3.2.11.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -951,9 +1002,9 @@
 									<viewStyle cssClass="" renderstyle="combobox"/>
 									<data label="Select from the list of answers" type="wordlist">
 										<options>
-											<option label="Less than 2 years" source="" value="lessthantwoyears"/>
-											<option label="Up to 5 years" source="" value="uptofiveyears"/>
-											<option label="More than 10 years" source="" value="morethantenyears"/>
+											<option label="Less than 2 years" source="" uri="" value="lessthantwoyears"/>
+											<option label="Up to 5 years" source="" uri="" value="uptofiveyears"/>
+											<option label="More than 10 years" source="" uri="" value="morethantenyears"/>
 										</options>
 									</data>
 								</field>
@@ -969,6 +1020,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="costs-that-need-coverage" ordinal="0">
+									<rdaCommonStandard/>
 									<numbering>3.2.12.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -988,6 +1040,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="point-during-after-data-stored" ordinal="0">
+									<rdaCommonStandard/>
 									<numbering>3.2.13.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -1012,6 +1065,7 @@
 							<commentField commentFieldValue="" hasCommentField="true"/>
 							<fields>
 								<field id="technical-barriers-making-research-data-accessible" ordinal="0">
+									<rdaCommonStandard>dataset.technical_resource.description</rdaCommonStandard>
 									<numbering>3.2.14.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -1049,6 +1103,7 @@
 							<commentField commentFieldValue="" hasCommentField="true"/>
 							<fields>
 								<field id="are-there-any-legal-barriers-to-making" ordinal="0">
+									<rdaCommonStandard/>
 									<numbering>4.1.1.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -1068,6 +1123,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="who-owns-the-data" ordinal="0">
+									<rdaCommonStandard/>
 									<numbering>4.1.2.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -1087,6 +1143,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="what-licence-for-reuse-are-you-planning" ordinal="0">
+									<rdaCommonStandard>dataset.distribution.license.license_ref</rdaCommonStandard>
 									<numbering>4.1.3.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -1108,6 +1165,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="are-there-any-restrinctions-on-the" ordinal="0">
+									<rdaCommonStandard/>
 									<numbering>4.1.4.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -1134,6 +1192,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="how-long-do-you-intend-to-support-data-reuse" ordinal="0">
+									<rdaCommonStandard/>
 									<numbering>4.1.5.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -1141,9 +1200,9 @@
 									<viewStyle cssClass="" renderstyle="combobox"/>
 									<data label="Select from the list of answers" type="wordlist">
 										<options>
-											<option label="Less than 2 years" source="" value="Less than 2 years"/>
-											<option label="Up to 5 years" source="" value="Up to 5 years"/>
-											<option label="More than 10 years" source="" value="More than 10 years"/>
+											<option label="Less than 2 years" source="" uri="" value="Less than 2 years"/>
+											<option label="Up to 5 years" source="" uri="" value="Up to 5 years"/>
+											<option label="More than 10 years" source="" uri="" value="More than 10 years"/>
 										</options>
 									</data>
 								</field>
@@ -1159,6 +1218,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="when-do-you-plan-to-make-your-data-available" ordinal="1">
+									<rdaCommonStandard/>
 									<numbering>4.1.6.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -1170,16 +1230,17 @@
 									<viewStyle cssClass="" renderstyle="combobox"/>
 									<data label="Select from the list of answers" type="wordlist">
 										<options>
-											<option label="immediately" source="" value="immediately"/>
-											<option label="after article publication" source="" value="after article publication"/>
-											<option label="end of project" source="" value="end of project"/>
-											<option label="later than end of project" source="" value="later than end of project"/>
-											<option label="never" source="" value="never"/>
-											<option label="other" source="" value="other"/>
+											<option label="immediately" source="" uri="" value="immediately"/>
+											<option label="after article publication" source="" uri="" value="after article publication"/>
+											<option label="end of project" source="" uri="" value="end of project"/>
+											<option label="later than end of project" source="" uri="" value="later than end of project"/>
+											<option label="never" source="" uri="" value="never"/>
+											<option label="other" source="" uri="" value="other"/>
 										</options>
 									</data>
 								</field>
 								<field id="other-selection-on-data-available-reuse" ordinal="2">
+									<rdaCommonStandard/>
 									<numbering>4.1.6.2</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -1208,6 +1269,7 @@
 							<commentField commentFieldValue="" hasCommentField="true"/>
 							<fields>
 								<field id="are-there-any-ethical-barriers-to-making-the-research" ordinal="0">
+									<rdaCommonStandard/>
 									<numbering>4.2.1.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -1227,6 +1289,7 @@
 							<commentField commentFieldValue="" hasCommentField="true"/>
 							<fields>
 								<field id="if-applicable-how-deal-with-sensitive-data" ordinal="0">
+									<rdaCommonStandard>dataset.sensitive_data</rdaCommonStandard>
 									<numbering>4.2.2.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -1238,9 +1301,9 @@
 									<viewStyle cssClass="" renderstyle="combobox"/>
 									<data label="Select from the list of answers" type="wordlist">
 										<options>
-											<option label="Kept on secure, managed storage for limited time" source="" value="keptonsecure"/>
-											<option label="Kept on insecure, unmanaged storage for limited time" source="" value="keptoninsecure"/>
-											<option label="Delete at end of project" source="" value="deleteatend"/>
+											<option label="Kept on secure, managed storage for limited time" source="" uri="" value="keptonsecure"/>
+											<option label="Kept on insecure, unmanaged storage for limited time" source="" uri="" value="keptoninsecure"/>
+											<option label="Delete at end of project" source="" uri="" value="deleteatend"/>
 										</options>
 									</data>
 								</field>
@@ -1256,6 +1319,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="DatasetSecuritySectionField2" ordinal="0">
+									<rdaCommonStandard/>
 									<numbering>4.2.3.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>

From 417ee0208737012bd6b2ed428d8eb47950f333bb Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Thu, 9 Apr 2020 16:53:26 +0300
Subject: [PATCH 21/60] Fixed minor issue

---
 dmp-frontend/src/app/core/services/culture/culture-service.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dmp-frontend/src/app/core/services/culture/culture-service.ts b/dmp-frontend/src/app/core/services/culture/culture-service.ts
index 32294c806..2dc07752b 100644
--- a/dmp-frontend/src/app/core/services/culture/culture-service.ts
+++ b/dmp-frontend/src/app/core/services/culture/culture-service.ts
@@ -68,7 +68,9 @@ export class CultureService {
 				import(`@angular/common/locales/${locale}.js`).catch(reason => {
 					this.logger.error('Could not load locale: ' + locale);
 				}).then(selectedDefaultLocale => {
-					registerLocaleData(selectedDefaultLocale.default);
+					if (selectedDefaultLocale !== undefined) {
+						registerLocaleData(selectedDefaultLocale.default);
+					}
 				});
 			}
 		});

From 982aea0cbfa44b8bc9c936f7c7f51eb4b717b9e2 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Fri, 10 Apr 2020 17:16:37 +0300
Subject: [PATCH 22/60] Improved Zenodo Account Integration

---
 .../main/java/eu/eudat/controllers/Users.java |  8 +++
 .../model/models/PrincipalBuilder.java        | 14 +++++
 .../eu/eudat/logic/managers/UserManager.java  | 28 ++++++++--
 .../Zenodo/ZenodoAccessType.java              | 22 ++++++++
 .../Zenodo/ZenodoCustomProvider.java          |  2 +-
 .../Zenodo/ZenodoCustomProviderImpl.java      |  7 +--
 .../customproviders/Zenodo/ZenodoUser.java    | 10 ++++
 .../zenodo/ZenodoTokenValidator.java          |  4 +-
 .../zenodo/helpers/ZenodoResponseToken.java   |  9 ++++
 .../AbstractAuthenticationService.java        | 12 ++++-
 ...erifiedUserEmailAuthenticationService.java | 14 +++++
 .../VerifiedUserAuthenticationService.java    | 14 +++++
 .../data/loginprovider/LoginProviderUser.java |  9 ++++
 .../eudat/models/data/security/Principal.java | 18 +++++++
 .../src/app/core/model/auth/principal.ts      |  1 +
 .../src/app/core/model/user/user-listing.ts   |  3 ++
 .../core/model/zenodo/zenodo-token.model.ts   |  1 +
 .../app/core/services/user/user.service.ts    |  5 ++
 .../zenodo-login/zenodo-login.component.ts    |  1 +
 .../ui/dmp/overview/dmp-overview.component.ts | 41 ++++++++------
 .../user-profile/user-profile.component.html  | 25 ++++++++-
 .../user-profile/user-profile.component.scss  |  4 ++
 .../ui/user-profile/user-profile.component.ts | 54 +++++++++++++++++--
 dmp-frontend/src/assets/i18n/en.json          | 12 +++--
 24 files changed, 281 insertions(+), 37 deletions(-)
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoAccessType.java

diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Users.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Users.java
index 6f2205075..1cfbc4651 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Users.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Users.java
@@ -95,6 +95,14 @@ public class Users extends BaseController {
         userManager.registerDOIToken(doiRequest, principal);
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<UserProfile>().status(ApiMessageCode.NO_MESSAGE));
     }
+
+    @Transactional
+    @RequestMapping(method = RequestMethod.DELETE, value = {"/deleteDOIToken"}, consumes = "application/json", produces = "application/json")
+    public @ResponseBody
+    ResponseEntity<ResponseItem<UserProfile>> deleteDOIToken(Principal principal) throws NullEmailException, IOException {
+        userManager.deleteDOIToken(principal);
+        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<UserProfile>().status(ApiMessageCode.NO_MESSAGE));
+    }
 }
 
 	
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/PrincipalBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/PrincipalBuilder.java
index 35ce34035..74ca6607b 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/PrincipalBuilder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/PrincipalBuilder.java
@@ -25,6 +25,8 @@ public class PrincipalBuilder extends Builder<Principal> {
     private String timezone;
     private String zenodoToken;
     private Instant zenodoDuration;
+    private String zenodoEmail;
+    private String zenodoRefresh;
 
     public PrincipalBuilder id(UUID id) {
         this.id = id;
@@ -81,6 +83,16 @@ public class PrincipalBuilder extends Builder<Principal> {
         return this;
     }
 
+    public PrincipalBuilder zenodoEmail(String zenodoEmail) {
+        this.zenodoEmail = zenodoEmail;
+        return this;
+    }
+
+    public PrincipalBuilder zenodoRefresh(String zenodoRefresh) {
+        this.zenodoRefresh = zenodoRefresh;
+        return this;
+    }
+
     @Override
     public Principal build() {
         Principal principal = new Principal();
@@ -95,6 +107,8 @@ public class PrincipalBuilder extends Builder<Principal> {
         principal.setTimezone(timezone);
         principal.setZenodoToken(zenodoToken);
         principal.setZenodoDuration(zenodoDuration);
+        principal.setZenodoEmail(zenodoEmail);
+        principal.setZenodoRefresh(zenodoRefresh);
         return principal;
     }
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java
index 064580a7b..5573898a2 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java
@@ -13,6 +13,7 @@ import eu.eudat.exceptions.security.NullEmailException;
 import eu.eudat.exceptions.security.UnauthorisedException;
 import eu.eudat.logic.builders.entity.UserRoleBuilder;
 import eu.eudat.logic.builders.model.models.DataTableDataBuilder;
+import eu.eudat.logic.security.customproviders.Zenodo.ZenodoAccessType;
 import eu.eudat.logic.security.customproviders.Zenodo.ZenodoCustomProvider;
 import eu.eudat.logic.security.validators.zenodo.helpers.ZenodoResponseToken;
 import eu.eudat.logic.services.ApiContext;
@@ -129,21 +130,38 @@ public class UserManager {
 			if (Instant.now().isBefore(principal.getZenodoDuration())) {
 				return true;
 			}
-			Map<String, Object> settings = Collections.singletonMap("zenodoToken", "");
-			this.updateSettings(settings, principal);
-			throw new ExpiredTokenException("Zenodo Token is expired");
+			try {
+				this.updateDOIToken(ZenodoAccessType.REFRESH_TOKEN, principal.getZenodoRefresh(), this.environment.getProperty("zenodo.login.redirect_uri"), principal);
+			}catch (IOException e) {
+				throw new ExpiredTokenException("Zenodo Token is expired.");
+			}
 		}
 		throw new NonValidTokenException("This account has no Zenodo Token");
 	}
 
 	public void registerDOIToken(DOIRequest doiRequest, Principal principal) throws IOException {
-		ZenodoResponseToken responseToken = this.zenodoCustomProvider.getAccessToken(doiRequest.getZenodoRequest().getCode()
+		this.updateDOIToken(ZenodoAccessType.AUTHORIZATION_CODE, doiRequest.getZenodoRequest().getCode(), doiRequest.getRedirectUri(), principal);
+	}
+
+	private void updateDOIToken(ZenodoAccessType accessType, String code, String redirectUri, Principal principal) throws IOException {
+		ZenodoResponseToken responseToken = this.zenodoCustomProvider.getAccessToken(accessType, code
 				, this.environment.getProperty("zenodo.login.client_id")
 				, this.environment.getProperty("zenodo.login.client_secret")
-				, doiRequest.getRedirectUri());
+				, redirectUri);
 		Map<String, Object> settings = new HashMap<>();
+		settings.put("zenodoEmail", responseToken.getEmail());
+		settings.put("zenodoRefresh", responseToken.getRefreshToken());
 		settings.put("zenodoToken", responseToken.getAccessToken());
 		settings.put("expirationDate",  Instant.now().plusSeconds(responseToken.getExpiresIn()).toEpochMilli());
 		this.updateSettings(settings, principal);
 	}
+
+	public void deleteDOIToken(Principal principal) throws IOException {
+		Map<String, Object> settings = new HashMap<>();
+		settings.put("zenodoEmail", "");
+		settings.put("zenodoRefresh", "");
+		settings.put("zenodoToken", "");
+		settings.put("expirationDate",  0);
+		this.updateSettings(settings, principal);
+	}
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoAccessType.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoAccessType.java
new file mode 100644
index 000000000..79b077853
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoAccessType.java
@@ -0,0 +1,22 @@
+package eu.eudat.logic.security.customproviders.Zenodo;
+
+public enum ZenodoAccessType {
+	AUTHORIZATION_CODE("authorization_code", "code"),
+	REFRESH_TOKEN("refresh_token", "refresh_token");
+
+	private final String grantType;
+	private final String property;
+
+	ZenodoAccessType(String grantType, String property) {
+		this.grantType = grantType;
+		this.property = property;
+	}
+
+	public String getGrantType() {
+		return grantType;
+	}
+
+	public String getProperty() {
+		return property;
+	}
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProvider.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProvider.java
index b14c3a963..9ca463034 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProvider.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProvider.java
@@ -4,5 +4,5 @@ import eu.eudat.logic.security.validators.orcid.helpers.ORCIDResponseToken;
 import eu.eudat.logic.security.validators.zenodo.helpers.ZenodoResponseToken;
 
 public interface ZenodoCustomProvider {
-    ZenodoResponseToken getAccessToken(String code, String clientId, String clientSecret, String redirectUri);
+    ZenodoResponseToken getAccessToken(ZenodoAccessType accessType, String code, String clientId, String clientSecret, String redirectUri);
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProviderImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProviderImpl.java
index b527af2fe..35572dac4 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProviderImpl.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoCustomProviderImpl.java
@@ -32,7 +32,7 @@ public class ZenodoCustomProviderImpl implements ZenodoCustomProvider {
     }
 
     @Override
-    public ZenodoResponseToken getAccessToken(String code, String clientId, String clientSecret, String redirectUri) {
+    public ZenodoResponseToken getAccessToken(ZenodoAccessType accessType, String code, String clientId, String clientSecret, String redirectUri) {
         RestTemplate restTemplate = new RestTemplate();
         HttpHeaders headers = new HttpHeaders();
         headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
@@ -41,8 +41,8 @@ public class ZenodoCustomProviderImpl implements ZenodoCustomProvider {
         MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
         map.add("client_id", clientId);
         map.add("client_secret", clientSecret);
-        map.add("grant_type", "authorization_code");
-        map.add("code", code);
+        map.add("grant_type", accessType.getGrantType());
+        map.add(accessType.getProperty(), code);
         map.add("redirect_uri", redirectUri);
         HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<>(map, headers);
 
@@ -54,6 +54,7 @@ public class ZenodoCustomProviderImpl implements ZenodoCustomProvider {
             zenodoResponseToken.setEmail((String) user.get("email"));
             zenodoResponseToken.setExpiresIn((Integer) values.get("expires_in"));
             zenodoResponseToken.setAccessToken((String) values.get("access_token"));
+            zenodoResponseToken.setRefreshToken((String) values.get("refresh_token"));
 
             return zenodoResponseToken;
         } catch (HttpClientErrorException ex) {
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoUser.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoUser.java
index cbcb95928..92480c202 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoUser.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/Zenodo/ZenodoUser.java
@@ -7,6 +7,7 @@ public class ZenodoUser {
     private String email;
     private String accessToken;
     private Integer expiresIn;
+    private String refreshToken;
 
     public String getUserId() {
         return userId;
@@ -39,11 +40,20 @@ public class ZenodoUser {
         this.expiresIn = expiresIn;
     }
 
+    public String getRefreshToken() {
+        return refreshToken;
+    }
+
+    public void setRefreshToken(String refreshToken) {
+        this.refreshToken = refreshToken;
+    }
+
     public ZenodoUser getZenodoUser(Object data) {
         this.userId = (String) ((Map) data).get("userId");
         this.email = (String) ((Map) data).get("email");
         this.accessToken = (String) ((Map) data).get("accessToken");
         this.expiresIn = (Integer) ((Map) data).get("expiresIn");
+        this.refreshToken = (String) ((Map) data).get("refreshToken");
         return this;
     }
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/ZenodoTokenValidator.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/ZenodoTokenValidator.java
index 2708a96b2..b3c7cbf3e 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/ZenodoTokenValidator.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/ZenodoTokenValidator.java
@@ -4,6 +4,7 @@ import eu.eudat.exceptions.security.NonValidTokenException;
 import eu.eudat.exceptions.security.NullEmailException;
 import eu.eudat.logic.security.customproviders.ORCID.ORCIDCustomProvider;
 import eu.eudat.logic.security.customproviders.ORCID.ORCIDUser;
+import eu.eudat.logic.security.customproviders.Zenodo.ZenodoAccessType;
 import eu.eudat.logic.security.customproviders.Zenodo.ZenodoCustomProvider;
 import eu.eudat.logic.security.customproviders.Zenodo.ZenodoUser;
 import eu.eudat.logic.security.validators.TokenValidator;
@@ -43,13 +44,14 @@ public class ZenodoTokenValidator implements TokenValidator {
 		user.setEmail(zenodoUser.getEmail());
 		user.setZenodoId(zenodoUser.getAccessToken());
 		user.setZenodoExpire(zenodoUser.getExpiresIn());
+		user.setZenodoRefresh(zenodoUser.getRefreshToken());
 		user.setProvider(credentials.getProvider());
 		user.setSecret(credentials.getTicket());
 		return this.nonVerifiedUserAuthenticationService.Touch(user);
 	}
 
 	public ZenodoResponseToken getAccessToken(ZenodoRequest zenodoRequest) {
-		return this.zenodoCustomProvider.getAccessToken(zenodoRequest.getCode()
+		return this.zenodoCustomProvider.getAccessToken(ZenodoAccessType.AUTHORIZATION_CODE, zenodoRequest.getCode()
 				, this.environment.getProperty("zenodo.login.client_id")
 				, this.environment.getProperty("zenodo.login.client_secret")
 				, this.environment.getProperty("zenodo.login.redirect_uri"));
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/helpers/ZenodoResponseToken.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/helpers/ZenodoResponseToken.java
index 5b437cdfb..6c8783acf 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/helpers/ZenodoResponseToken.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/zenodo/helpers/ZenodoResponseToken.java
@@ -5,6 +5,7 @@ public class ZenodoResponseToken {
     private String email;
     private Integer expiresIn;
     private String accessToken;
+    private String refreshToken;
 
     public String getUserId() {
         return userId;
@@ -35,4 +36,12 @@ public class ZenodoResponseToken {
     public void setAccessToken(String accessToken) {
         this.accessToken = accessToken;
     }
+
+    public String getRefreshToken() {
+        return refreshToken;
+    }
+
+    public void setRefreshToken(String refreshToken) {
+        this.refreshToken = refreshToken;
+    }
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java
index fc09056fa..78c6a9830 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java
@@ -133,7 +133,11 @@ public abstract class AbstractAuthenticationService implements AuthenticationSer
 			userInfo = this.apiContext.getOperationsContext().getBuilderFactory().getBuilder(UserInfoBuilder.class)
 					.name(profile.getName()).verified_email(profile.getIsVerified())
 					.email(profile.getEmail()).created(new Date()).lastloggedin(new Date())
-					.additionalinfo("{\"data\":{\"avatar\":{\"url\":\"" + profile.getAvatarUrl() + "\"}},{\"zenodoToken\":\"" + profile.getZenodoId() + "\", \"expirationDate\": \"" + Instant.now().plusSeconds(profile.getZenodoExpire()).toEpochMilli() + "\"}")
+					.additionalinfo("{\"data\":{\"avatar\":{\"url\":\"" + profile.getAvatarUrl()
+							+ "\"}},{\"zenodoToken\":\"" + profile.getZenodoId()
+							+ "\", \"expirationDate\": \"" + Instant.now().plusSeconds(profile.getZenodoExpire()).toEpochMilli()
+							+ "\", \"zenodoRefresh\": \"" + profile.getZenodoRefresh()
+							+ (profile.getProvider() == TokenValidatorFactoryImpl.LoginProvider.ZENODO ? "\", \"zenodoEmail\": \"" + profile.getEmail() : "") +"\"}")
 					.authorization_level((short) 1).usertype((short) 1)
 					.build();
 
@@ -159,6 +163,12 @@ public abstract class AbstractAuthenticationService implements AuthenticationSer
 			if (profile.getZenodoExpire() != null) {
 				additionalInfo.put("expirationDate", Instant.now().plusSeconds(profile.getZenodoExpire()).toEpochMilli());
 			}
+			if (profile.getZenodoRefresh() != null) {
+				additionalInfo.put("zenodoRefresh", profile.getZenodoRefresh());
+			}
+			if (profile.getProvider() == TokenValidatorFactoryImpl.LoginProvider.ZENODO) {
+				additionalInfo.put("zenodoEmail", profile.getEmail());
+			}
 			userInfo.setLastloggedin(new Date());
 			userInfo.setAdditionalinfo(new JSONObject(additionalInfo).toString());
 			Set<Credential> credentials = userInfo.getCredentials();
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/NonVerifiedUserEmailAuthenticationService.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/NonVerifiedUserEmailAuthenticationService.java
index 159bbb235..4d849a51c 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/NonVerifiedUserEmailAuthenticationService.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/NonVerifiedUserEmailAuthenticationService.java
@@ -46,6 +46,18 @@ public class NonVerifiedUserEmailAuthenticationService extends AbstractAuthentic
 		} catch (Exception e) {
 			zenodoDuration = Instant.now();
 		}
+		String zenodoEmail;
+		try {
+			zenodoEmail = user.getAdditionalinfo() != null ? new ObjectMapper().readTree(user.getAdditionalinfo()).get("zenodoEmail").asText() : "";
+		} catch (Exception e) {
+			zenodoEmail = "";
+		}
+		String zenodoRefresh;
+		try {
+			zenodoRefresh = user.getAdditionalinfo() != null ? new ObjectMapper().readTree(user.getAdditionalinfo()).get("zenodoRefresh").asText() : "";
+		} catch (Exception e) {
+			zenodoRefresh = "";
+		}
 		String culture;
 		try {
 			culture = user.getAdditionalinfo() != null ? new ObjectMapper().readTree(user.getAdditionalinfo()).get("culture").get("name").asText() : "";
@@ -73,6 +85,8 @@ public class NonVerifiedUserEmailAuthenticationService extends AbstractAuthentic
 				.timezone(timezone)
 				.zenodoToken(zenodoToken)
 				.zenodoDuration(zenodoDuration)
+				.zenodoEmail(zenodoEmail)
+				.zenodoRefresh(zenodoRefresh)
 				.build();
 
 		List<UserRole> userRoles = apiContext.getOperationsContext().getDatabaseRepository().getUserRoleDao().getUserRoles(user);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/VerifiedUserAuthenticationService.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/VerifiedUserAuthenticationService.java
index c03e81934..d613b2b47 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/VerifiedUserAuthenticationService.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/VerifiedUserAuthenticationService.java
@@ -55,6 +55,18 @@ public class VerifiedUserAuthenticationService extends AbstractAuthenticationSer
 		} catch (Exception e) {
 			zenodoDuration = Instant.now();
 		}
+		String zenodoEmail;
+		try {
+			zenodoEmail = user.getAdditionalinfo() != null ? new ObjectMapper().readTree(user.getAdditionalinfo()).get("zenodoEmail").asText() : "";
+		} catch (Exception e) {
+			zenodoEmail = "";
+		}
+		String zenodoRefresh;
+		try {
+			zenodoRefresh = user.getAdditionalinfo() != null ? new ObjectMapper().readTree(user.getAdditionalinfo()).get("zenodoRefresh").asText() : "";
+		} catch (Exception e) {
+			zenodoRefresh = "";
+		}
 		String culture;
 		try {
 			culture = user.getAdditionalinfo() != null ? new ObjectMapper().readTree(user.getAdditionalinfo()).get("culture").get("name").asText() : "";
@@ -82,6 +94,8 @@ public class VerifiedUserAuthenticationService extends AbstractAuthenticationSer
 				.timezone(timezone)
 				.zenodoToken(zenodoToken)
 				.zenodoDuration(zenodoDuration)
+				.zenodoEmail(zenodoEmail)
+				.zenodoRefresh(zenodoRefresh)
 				.build();
 
 		List<UserRole> userRoles = apiContext.getOperationsContext().getDatabaseRepository().getUserRoleDao().getUserRoles(user);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/loginprovider/LoginProviderUser.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/loginprovider/LoginProviderUser.java
index 13f5b9371..6d1d9b02e 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/loginprovider/LoginProviderUser.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/loginprovider/LoginProviderUser.java
@@ -13,6 +13,7 @@ public class LoginProviderUser {
     private TokenValidatorFactoryImpl.LoginProvider provider;
     private String zenodoId;
     private Integer zenodoExpire;
+    private String zenodoRefresh;
 
     public String getId() {
         return id;
@@ -85,4 +86,12 @@ public class LoginProviderUser {
     public void setZenodoExpire(Integer zenodoExpire) {
         this.zenodoExpire = zenodoExpire;
     }
+
+    public String getZenodoRefresh() {
+        return zenodoRefresh;
+    }
+
+    public void setZenodoRefresh(String zenodoRefresh) {
+        this.zenodoRefresh = zenodoRefresh;
+    }
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/security/Principal.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/security/Principal.java
index f0e017e84..7f2992194 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/security/Principal.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/security/Principal.java
@@ -20,6 +20,8 @@ public class Principal {
     private String timezone;
     private String zenodoToken;
     private Instant zenodoDuration;
+    private String zenodoRefresh;
+    private String zenodoEmail;
 
     public UUID getId() {
         return id;
@@ -105,6 +107,22 @@ public class Principal {
         this.zenodoDuration = zenodoDuration;
     }
 
+    public String getZenodoRefresh() {
+        return zenodoRefresh;
+    }
+
+    public void setZenodoRefresh(String zenodoRefresh) {
+        this.zenodoRefresh = zenodoRefresh;
+    }
+
+    public String getZenodoEmail() {
+        return zenodoEmail;
+    }
+
+    public void setZenodoEmail(String zenodoEmail) {
+        this.zenodoEmail = zenodoEmail;
+    }
+
     @JsonIgnore
     public Set<Authorities> getAuthz() {
         return this.authorities;
diff --git a/dmp-frontend/src/app/core/model/auth/principal.ts b/dmp-frontend/src/app/core/model/auth/principal.ts
index 15937a98c..e5131a436 100644
--- a/dmp-frontend/src/app/core/model/auth/principal.ts
+++ b/dmp-frontend/src/app/core/model/auth/principal.ts
@@ -10,4 +10,5 @@ export interface Principal {
 	timezone: string;
 	language: string;
 	culture: string;
+	zenodoEmail: string;
 }
diff --git a/dmp-frontend/src/app/core/model/user/user-listing.ts b/dmp-frontend/src/app/core/model/user/user-listing.ts
index 2ba60a45d..1abc5383b 100644
--- a/dmp-frontend/src/app/core/model/user/user-listing.ts
+++ b/dmp-frontend/src/app/core/model/user/user-listing.ts
@@ -3,5 +3,8 @@ import { AppRole } from "../../common/enum/app-role";
 export interface UserListingModel {
 	id: String;
 	name: String;
+	email: string;
 	appRoles: AppRole[];
+	additionalinfo: any;
+	associatedDmps: any[];
 }
diff --git a/dmp-frontend/src/app/core/model/zenodo/zenodo-token.model.ts b/dmp-frontend/src/app/core/model/zenodo/zenodo-token.model.ts
index 0ddb251d6..a1428496f 100644
--- a/dmp-frontend/src/app/core/model/zenodo/zenodo-token.model.ts
+++ b/dmp-frontend/src/app/core/model/zenodo/zenodo-token.model.ts
@@ -3,4 +3,5 @@ export class ZenodoToken {
 	expiresIn: number;
 	accessToken:string;
 	email: string;
+	refreshToken: string;
 }
diff --git a/dmp-frontend/src/app/core/services/user/user.service.ts b/dmp-frontend/src/app/core/services/user/user.service.ts
index d3ea3f9cc..27165ca96 100644
--- a/dmp-frontend/src/app/core/services/user/user.service.ts
+++ b/dmp-frontend/src/app/core/services/user/user.service.ts
@@ -57,4 +57,9 @@ export class UserService {
 		const url = this.actionUrl + 'registerDOIToken';
 		return this.http.post(url, {zenodoRequest: {code: code}, redirectUri: redirectUri}, { headers: this.headers });
 	}
+
+	public deleteDOIToken(): Observable<any> {
+		const url = this.actionUrl + 'deleteDOIToken';
+		return this.http.delete(url, { headers: this.headers });
+	}
 }
diff --git a/dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.ts b/dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.ts
index 36decce42..b58a77974 100644
--- a/dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.ts
+++ b/dmp-frontend/src/app/ui/auth/login/zenodo-login/zenodo-login.component.ts
@@ -64,6 +64,7 @@ export class ZenodoLoginComponent extends BaseComponent implements OnInit {
 				this.zenodoToken.expiresIn = responseData.payload.expiresIn;
 				this.accessToken = this.zenodoToken.accessToken = responseData.payload.accessToken;
 				this.zenodoToken.email = responseData.payload.email;
+				this.zenodoToken.refreshToken = responseData.payload.refreshToken;
 				this.authService.login({ ticket: this.accessToken, provider: AuthProvider.Zenodo, data: this.zenodoToken })
 					.pipe(takeUntil(this._destroyed))
 					.subscribe(
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
index 625f5994a..1bbe67bae 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
@@ -45,6 +45,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 	breadCrumbs: Observable<BreadcrumbItem[]> = observableOf();
 	isUserOwner: boolean;
 	expand = false;
+	hasDOIToken = false;
 
 	constructor(
 		private route: ActivatedRoute,
@@ -149,14 +150,14 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 		this.expand = !this.expand;
 	}
 
-	checkOverflow (element) {
+	checkOverflow(element) {
 		if (this.expand || (element.offsetHeight < element.scrollHeight ||
 			element.offsetWidth < element.scrollWidth)) {
-		  return true;
+			return true;
 		} else {
-		  return false;
+			return false;
 		}
-	  }
+	}
 
 	datasetClicked(datasetId: String) {
 		if (this.isPublicView) {
@@ -334,26 +335,29 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 	getAccessUrl(): string {
 		const redirectUri = this.configurationService.app + 'oauth2';
 		const url = this.configurationService.loginProviders.zenodoConfiguration.oauthUrl
-		+ '?client_id=' + this.configurationService.loginProviders.zenodoConfiguration.clientId
-		+ '&response_type=code&scope=deposit:write+deposit:actions&state=astate&redirect_uri='
-		+ redirectUri;
+			+ '?client_id=' + this.configurationService.loginProviders.zenodoConfiguration.clientId
+			+ '&response_type=code&scope=deposit:write+deposit:actions+user:email&state=astate&redirect_uri='
+			+ redirectUri;
 		return url;
 	}
 
 	getDoi(dmp: DmpOverviewModel) {
 		this.userService.hasDOIToken().subscribe(response => {
+			this.hasDOIToken = true;
 			this.showConfirmationDOIDialog(dmp);
 		}, error => {
+			this.hasDOIToken = false;
 			this.showErrorConfirmationDOIDialog(error.error.message, dmp);
 		});
 	}
 
+
 	showConfirmationDOIDialog(dmp: DmpOverviewModel) {
 		const dialogRef = this.dialog.open(ConfirmationDialogComponent, {
 			maxWidth: '600px',
 			restoreFocus: false,
 			data: {
-				message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ZENODO-DOI'),
+				message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ZENODO-DOI', { 'username': this.hasDOIToken ? this.authentication.current().zenodoEmail : 'default'}),
 				confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CONFIRM'),
 				cancelButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CANCEL'),
 			}
@@ -379,7 +383,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 			restoreFocus: false,
 			data: {
 				message: message,
-				titles: [ this.language.instant('DMP-OVERVIEW.MULTIPLE-DIALOG.ZENODO-LOGIN'), this.language.instant('DMP-OVERVIEW.MULTIPLE-DIALOG.USE-DEFAULT')]
+				titles: [this.language.instant('DMP-OVERVIEW.MULTIPLE-DIALOG.ZENODO-LOGIN'), this.language.instant('DMP-OVERVIEW.MULTIPLE-DIALOG.USE-DEFAULT')]
 			}
 		});
 		dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => {
@@ -398,14 +402,17 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 
 	showOauth2Dialog(url: string, dmp: DmpOverviewModel) {
 		this.oauth2DialogService.login(url)
-		.pipe(takeUntil(this._destroyed))
-		.subscribe(code => {
-			if (!isNullOrUndefined(code)) {
-				this.userService.registerDOIToken(code, this.configurationService.app + 'oauth2')
-				.pipe(takeUntil(this._destroyed))
-				.subscribe(() => this.showConfirmationDOIDialog(dmp));
-			}
-		});
+			.pipe(takeUntil(this._destroyed))
+			.subscribe(code => {
+				if (!isNullOrUndefined(code)) {
+					this.userService.registerDOIToken(code, this.configurationService.app + 'oauth2')
+						.pipe(takeUntil(this._destroyed))
+						.subscribe(() => {
+							this.hasDOIToken = true;
+							this.showConfirmationDOIDialog(dmp);
+						});
+				}
+			});
 	}
 
 	onDOICallbackSuccess(): void {
diff --git a/dmp-frontend/src/app/ui/user-profile/user-profile.component.html b/dmp-frontend/src/app/ui/user-profile/user-profile.component.html
index f3661a928..3e8c2eddf 100644
--- a/dmp-frontend/src/app/ui/user-profile/user-profile.component.html
+++ b/dmp-frontend/src/app/ui/user-profile/user-profile.component.html
@@ -63,7 +63,7 @@
 						</div>
 					</mat-card-title>
 				</mat-card-header>
-				<mat-card-content>
+				<mat-card-content disabled="false">
 					<div class="container">
 						<div class="row" [formGroup]="formGroup">
 							<mat-form-field class="col-md-4">
@@ -98,6 +98,29 @@
 					</div>
 				</mat-card-content>
 			</mat-card>
+			<mat-card class="col-12 profile-card">
+				<mat-card-header>
+					<mat-card-title>
+						<div class="row">
+							<h4 class="settings col-auto">{{ 'USER-PROFILE.ZENODO.TITLE' | translate}}</h4>
+						</div>
+					</mat-card-title>
+				</mat-card-header>
+				<mat-card-content>
+					<div class="container">
+						<div class="row">
+							<div class="col-md-4" *ngIf="!hasZenodo()">
+								<button mat-raised-button type="button" (click)="loginToZenodo()" class="confirm">{{'USER-PROFILE.ZENODO.LOGIN' | translate}}</button>
+							</div>
+							<div class="col-md-4" *ngIf="hasZenodo()">
+								<div><label class="zenodo-email">{{ 'USER-PROFILE.ZENODO.DESCRIPTION' | translate}}</label></div>
+								<label class="zenodo-email">{{zenodoEmail}}</label>
+								<div><button mat-raised-button type="button" (click)="RemoveZenodo()" class="confirm">{{'USER-PROFILE.ZENODO.LOGOUT' | translate}}</button></div>
+							</div>
+						</div>
+					</div>
+				</mat-card-content>
+			</mat-card>
 		</div>
 		<ng-template #loading>
 		</ng-template>
diff --git a/dmp-frontend/src/app/ui/user-profile/user-profile.component.scss b/dmp-frontend/src/app/ui/user-profile/user-profile.component.scss
index 36426b892..fe59534bc 100644
--- a/dmp-frontend/src/app/ui/user-profile/user-profile.component.scss
+++ b/dmp-frontend/src/app/ui/user-profile/user-profile.component.scss
@@ -25,3 +25,7 @@
 .settings {
   line-height: 2.4em !important;
 }
+
+.zenodo-email {
+	color: black;
+}
diff --git a/dmp-frontend/src/app/ui/user-profile/user-profile.component.ts b/dmp-frontend/src/app/ui/user-profile/user-profile.component.ts
index dcef445ee..2f8b08b95 100644
--- a/dmp-frontend/src/app/ui/user-profile/user-profile.component.ts
+++ b/dmp-frontend/src/app/ui/user-profile/user-profile.component.ts
@@ -13,6 +13,9 @@ import * as moment from 'moment-timezone';
 import { Observable, of } from 'rxjs';
 import { map, takeUntil } from 'rxjs/operators';
 import { LanguageService } from '@app/core/services/language/language.service';
+import { isNullOrUndefined } from 'util';
+import { Oauth2DialogService } from '../misc/oauth2-dialog/service/oauth2-dialog.service';
+import { ConfigurationService } from '@app/core/services/configuration/configuration.service';
 
 const availableLanguages: any[] = require('../../../assets/resources/language.json');
 
@@ -29,6 +32,8 @@ export class UserProfileComponent extends BaseComponent implements OnInit, OnDes
 	timezones: Observable<any[]>;
 	editMode = false;
 	languages = availableLanguages;
+	zenodoToken: string;
+	zenodoEmail: string;
 
 	formGroup: FormGroup;
 	constructor(
@@ -39,7 +44,9 @@ export class UserProfileComponent extends BaseComponent implements OnInit, OnDes
 		private language: TranslateService,
 		private cultureService: CultureService,
 		private authentication: AuthService,
-		private languageService: LanguageService
+		private languageService: LanguageService,
+		private configurationService: ConfigurationService,
+		private oauth2DialogService: Oauth2DialogService
 	) { super(); }
 
 	ngOnInit() {
@@ -50,6 +57,8 @@ export class UserProfileComponent extends BaseComponent implements OnInit, OnDes
 				const userId = !params['id'] ? 'me' : params['id'];
 				this.user = this.userService.getUser(userId).pipe(map(result => {
 					result['additionalinfo'] = JSON.parse(result['additionalinfo']);
+					this.zenodoToken = result['additionalinfo']['zenodoToken'];
+					this.zenodoEmail = result['additionalinfo']['zenodoEmail'];
 					this.formGroup = new FormBuilder().group({
 						language: new FormControl(result['additionalinfo']['language'] ? availableLanguages.filter(x => x.value === result['additionalinfo']['language']['value']).pop() : '', [Validators.required]),
 						timezone: new FormControl(result['additionalinfo']['timezone'], [Validators.required]),
@@ -78,10 +87,10 @@ export class UserProfileComponent extends BaseComponent implements OnInit, OnDes
 
 	getUserRole(dmp: DmpModel) {
 		if (dmp.creator.id === this.currentUserId) {
-			 return this.language.instant('USER-PROFILE.DMPS.CREATOR');
-			} else if (dmp.associatedUsers.map(x => x.id).indexOf(this.currentUserId) !== -1) {
-				 return this.language.instant('USER-PROFILE.DMPS.MEMBER');
-				}
+			return this.language.instant('USER-PROFILE.DMPS.CREATOR');
+		} else if (dmp.associatedUsers.map(x => x.id).indexOf(this.currentUserId) !== -1) {
+			return this.language.instant('USER-PROFILE.DMPS.MEMBER');
+		}
 	}
 
 	showAllDmps() {
@@ -147,4 +156,39 @@ export class UserProfileComponent extends BaseComponent implements OnInit, OnDes
 		(ev.target as HTMLImageElement).src = 'assets/images/profile-placeholder.png';
 	}
 
+	public hasZenodo(): boolean {
+		return !isNullOrUndefined(this.zenodoToken) && this.zenodoToken !== "";
+	}
+
+	public loginToZenodo() {
+		this.showOauth2Dialog(this.getAccessUrl());
+	}
+
+	getAccessUrl(): string {
+		const redirectUri = this.configurationService.app + 'oauth2';
+		const url = this.configurationService.loginProviders.zenodoConfiguration.oauthUrl
+			+ '?client_id=' + this.configurationService.loginProviders.zenodoConfiguration.clientId
+			+ '&response_type=code&scope=deposit:write+deposit:actions+user:email&state=astate&redirect_uri='
+			+ redirectUri;
+		return url;
+	}
+
+	showOauth2Dialog(url: string) {
+		this.oauth2DialogService.login(url)
+			.pipe(takeUntil(this._destroyed))
+			.subscribe(code => {
+				if (!isNullOrUndefined(code)) {
+					this.userService.registerDOIToken(code, this.configurationService.app + 'oauth2')
+						.pipe(takeUntil(this._destroyed))
+						.subscribe(() => this.router.navigate(['/reload']).then(() => this.router.navigate(['/profile'])));
+				}
+			});
+	}
+
+	public RemoveZenodo() {
+		this.userService.deleteDOIToken()
+		.pipe(takeUntil(this._destroyed))
+		.subscribe(() => this.router.navigate(['/reload']).then(() => this.router.navigate(['/profile'])));
+	}
+
 }
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index 8d01e4426..d11e07c5b 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -52,7 +52,7 @@
 			"FINALIZE-ITEM": "Finalize this item?",
 			"PUBLISH-ITEM": "Publish this item?",
 			"ADD-DATASET": "Do you want to continue by adding a Dataset Description to your DMP? You can always add more Dataset Descriptions using \"Add Dataset Description (Wizard)\" menu.",
-			"ZENODO-DOI": "Would you like to create digital object identifier (DOI) for the DMP?",
+			"ZENODO-DOI": "Would you like to create digital object identifier (DOI) with {{username}} account for the DMP?",
 			"LEAVE-PAGE": "If you leave, your changes will be lost.",
 			"LEAVE-WARNING": "You have unsaved changes!",
 			"PRIVACY-POLICY-NAMES": "The names of all people involved into this DMP will be publicly visible. Do you agree with that?",
@@ -218,7 +218,7 @@
 		"DATASET-TEMPLATES": "Dataset Description Templates",
 		"DMP-TEMPLATES": "DMP Templates",
 		"USERS": "Users",
-		"LANGUAGE-EDITOR":"Language Editor",
+		"LANGUAGE-EDITOR": "Language Editor",
 		"GUIDE-EDITOR": "User Guide Editor"
 	},
 	"DATASET-PROFILE-EDITOR": {
@@ -431,7 +431,7 @@
 		"TITLE": "Published Data Management Plans",
 		"OWNER": "Owner",
 		"MEMBER": "Member",
-		"CREATOR":"Creator",
+		"CREATOR": "Creator",
 		"VIEW-ONLY": "View Only",
 		"TOOLTIP": {
 			"PUBLISHED": "Public access - Closed DMP",
@@ -1090,6 +1090,12 @@
 			"SHOW-ALL": "Show All",
 			"CREATOR": "Creator",
 			"MEMBER": "Member"
+		},
+		"ZENODO": {
+			"LOGIN": "Login to Zenodo",
+			"LOGOUT": "Remove Zenodo",
+			"TITLE": "Zenodo Account",
+			"DESCRIPTION": "Linked Zenodo Account:"
 		}
 	},
 	"DATASET-REFERENCED-MODELS": {

From 3ce7fe7595f496dfa4977b02e8bb533343d87f9f Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Fri, 10 Apr 2020 18:52:14 +0300
Subject: [PATCH 23/60] Allow to edit user created Data Repositories

---
 .../eudat/data/entities/DataRepository.java   |  3 +++
 ...-external-references-editor.component.html | 20 +++++++++++++++++
 ...et-external-references-editor.component.ts | 22 ++++++++++++++++---
 3 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DataRepository.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/DataRepository.java
index 0d9d7a893..075326ac7 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DataRepository.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/entities/DataRepository.java
@@ -132,6 +132,9 @@ public class DataRepository implements Serializable, DataEntity<DataRepository,
 
 	@Override
 	public void update(DataRepository entity) {
+		this.label = entity.getLabel();
+		this.abbreviation = entity.getAbbreviation();
+		this.uri = entity.getUri();
 
 	}
 
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.html
index 0b5733dd8..9905ea9b4 100644
--- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.html
+++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.html
@@ -18,11 +18,31 @@
 				<span class="col">
 					{{i+1}}) {{suggestion.get('name').value}}
 				</span>
+				<div class="col-auto" *ngIf="isInternal(suggestion)">
+					<mat-form-field>
+						<input matInput placeholder="{{'DATASET-REFERENCED-MODELS.DATA-REPOSITORY.LABEL' | translate}}" type="text" name="name" [formControl]="suggestion.get('name')">
+					</mat-form-field>
+				</div>
+				<div class="col-auto" *ngIf="isInternal(suggestion)">
+					<mat-form-field>
+						<input matInput placeholder="{{'DATASET-REFERENCED-MODELS.DATA-REPOSITORY.ABBREVIATION' | translate}}" type="text" name="abbreviation" [formControl]="suggestion.get('abbreviation')">
+					</mat-form-field>
+				</div>
+				<div class="col-auto" *ngIf="isInternal(suggestion)">
+					<mat-form-field>
+						<input matInput placeholder="{{'DATASET-REFERENCED-MODELS.DATA-REPOSITORY.URI' | translate}}" type="text" name="uri" [formControl]="suggestion.get('uri')">
+					</mat-form-field>
+				</div>
 				<div class="col-auto">
 					<mat-form-field>
 						<input matInput placeholder="{{'DATASET-EDITOR.FIELDS.DATAREPOSITORIES-INFO' | translate}}" type="text" name="info" [formControl]="suggestion.get('info')">
 					</mat-form-field>
 				</div>
+				<div class="col-auto" *ngIf='!viewOnly && isInternal(suggestion)'>
+					<button mat-raised-button (click)="updateDataRepository(suggestion)">
+						Update
+					</button>
+				</div>
 				<div class="col-auto" *ngIf='!viewOnly'>
 					<button mat-icon-button (click)="callback(i)">
 						<mat-icon>close</mat-icon>
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts
index 7cb9c36c2..5859d6d2b 100644
--- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts
+++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts
@@ -25,6 +25,7 @@ import { takeUntil } from 'rxjs/operators';
 import { ENTER, COMMA } from '@angular/cdk/keycodes';
 import { MatChipInputEvent } from '@angular/material/chips';
 import { isNullOrUndefined } from 'util';
+import { ExternalDataRepositoryService } from '@app/core/services/external-sources/data-repository/extternal-data-repository.service';
 
 @Component({
 	selector: 'app-dataset-external-references-editor-component',
@@ -87,7 +88,8 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl
 		private router: Router,
 		private language: TranslateService,
 		private externalSourcesService: ExternalSourcesService,
-		private externalSourcesConfigurationService: ExternalSourcesConfigurationService
+		private externalSourcesConfigurationService: ExternalSourcesConfigurationService,
+		private externalDataRepositoryService: ExternalDataRepositoryService
 	) { super(); }
 
 	ngOnInit() {
@@ -242,8 +244,22 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl
 	addTag(ev: MatChipInputEvent) {
 		console.log((<FormArray>this.formGroup.get('tags')).value);
 		if (ev.value !== '' && isNullOrUndefined(((<FormArray>this.formGroup.get('tags')).value as ExternalTagEditorModel[]).find(tag => tag.name === ev.value))) {
-			(<FormArray>this.formGroup.get('tags')).push(new ExternalTagEditorModel('',ev.value).buildForm());
+			(<FormArray>this.formGroup.get('tags')).push(new ExternalTagEditorModel('', ev.value).buildForm());
 		}
-		ev.input.value='';
+		ev.input.value = '';
+	}
+
+	isInternal(element: any): boolean {
+		return element.get('source').value === 'Internal';
+	}
+
+	updateDataRepository(dataRepository: FormGroup) {
+		this.externalDataRepositoryService.create(dataRepository.value)
+			.pipe(takeUntil(this._destroyed))
+			.subscribe(
+				(result) => {
+					dataRepository.setValue(result);
+				}
+			);
 	}
 }

From d2192f2be0279d70c4ee400879fa7d7b6646f934 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Mon, 13 Apr 2020 16:31:09 +0300
Subject: [PATCH 24/60] Improve external's dataset styling

---
 .../dataset-external-references-editor.component.html         | 4 ++--
 .../dataset-external-references-editor.component.ts           | 4 ++++
 dmp-frontend/src/assets/i18n/en.json                          | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.html
index 9905ea9b4..24da860a1 100644
--- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.html
+++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.html
@@ -39,8 +39,8 @@
 					</mat-form-field>
 				</div>
 				<div class="col-auto" *ngIf='!viewOnly && isInternal(suggestion)'>
-					<button mat-raised-button (click)="updateDataRepository(suggestion)">
-						Update
+					<button mat-raised-button (click)="updateDataRepository(suggestion)" type="button" color="primary">
+						{{ 'DATASET-EDITOR.ACTIONS.UPDATE' | translate }}
 					</button>
 				</div>
 				<div class="col-auto" *ngIf='!viewOnly'>
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts
index 5859d6d2b..50c4af5f2 100644
--- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts
+++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts
@@ -102,7 +102,11 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl
 				this.externalSourcesConfiguration.externalDatasets.push({ key: '', label: 'All' });
 				this.externalSourcesConfiguration.registries.push({ key: '', label: 'All' });
 				this.externalSourcesConfiguration.services.push({ key: '', label: 'All' });
+				if (!isNullOrUndefined(this.externalSourcesConfiguration.tags)) {
 				this.externalSourcesConfiguration.tags.push({ key: '', label: 'All' });
+				} else {
+					this.externalSourcesConfiguration.tags = [{ key: '', label: 'All' }];
+				}
 			});
 	}
 
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index d11e07c5b..d357a19b0 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -829,7 +829,8 @@
 		"ACTIONS": {
 			"SAVE": "Save",
 			"CANCEL": "Cancel",
-			"DELETE": "Delete"
+			"DELETE": "Delete",
+			"UPDATE": "Update"
 		},
 		"VERSION-DIALOG": {
 			"ABOUT": "Versioning is automated.",

From 20466bf69308b11d231ac90be154b4909447997d Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Mon, 13 Apr 2020 16:33:45 +0300
Subject: [PATCH 25/60] Improve and fixed zenodo account association

---
 .../src/main/java/eu/eudat/logic/managers/UserManager.java   | 2 ++
 .../ui/misc/oauth2-dialog/service/oauth2-dialog.service.ts   | 2 +-
 .../src/app/ui/user-profile/user-profile.component.html      | 4 ++--
 .../src/app/ui/user-profile/user-profile.component.scss      | 5 +++++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java
index 5573898a2..dd47937b0 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java
@@ -132,7 +132,9 @@ public class UserManager {
 			}
 			try {
 				this.updateDOIToken(ZenodoAccessType.REFRESH_TOKEN, principal.getZenodoRefresh(), this.environment.getProperty("zenodo.login.redirect_uri"), principal);
+				return true;
 			}catch (IOException e) {
+				this.deleteDOIToken(principal);
 				throw new ExpiredTokenException("Zenodo Token is expired.");
 			}
 		}
diff --git a/dmp-frontend/src/app/ui/misc/oauth2-dialog/service/oauth2-dialog.service.ts b/dmp-frontend/src/app/ui/misc/oauth2-dialog/service/oauth2-dialog.service.ts
index 5fb27e334..14491196b 100644
--- a/dmp-frontend/src/app/ui/misc/oauth2-dialog/service/oauth2-dialog.service.ts
+++ b/dmp-frontend/src/app/ui/misc/oauth2-dialog/service/oauth2-dialog.service.ts
@@ -19,7 +19,7 @@ export class Oauth2DialogService extends BaseService{
 	}
 
 	public login(url: string): Observable<string> {
-		const windows = window.open(this.configurationService.app + 'oauth2?url=' + encodeURIComponent(url) ,'', 'height=500px,width=500px');
+		const windows = window.open(this.configurationService.app + 'oauth2?url=' + encodeURIComponent(url) ,'', `height=500px,width=500px,top=${(window.screen.height / 2) - 200}px,left=${(window.screen.width / 2) - 200}px`);
 		const sub = interval(300).pipe(takeUntil(this._destroyed)).subscribe(() => {
 			if (windows.closed) {
 				const oauthCode = localStorage.getItem('oauthCode');
diff --git a/dmp-frontend/src/app/ui/user-profile/user-profile.component.html b/dmp-frontend/src/app/ui/user-profile/user-profile.component.html
index 3e8c2eddf..0dd345413 100644
--- a/dmp-frontend/src/app/ui/user-profile/user-profile.component.html
+++ b/dmp-frontend/src/app/ui/user-profile/user-profile.component.html
@@ -110,12 +110,12 @@
 					<div class="container">
 						<div class="row">
 							<div class="col-md-4" *ngIf="!hasZenodo()">
-								<button mat-raised-button type="button" (click)="loginToZenodo()" class="confirm">{{'USER-PROFILE.ZENODO.LOGIN' | translate}}</button>
+								<button mat-raised-button type="button" (click)="loginToZenodo()" class="confirm" color="primary">{{'USER-PROFILE.ZENODO.LOGIN' | translate}}</button>
 							</div>
 							<div class="col-md-4" *ngIf="hasZenodo()">
 								<div><label class="zenodo-email">{{ 'USER-PROFILE.ZENODO.DESCRIPTION' | translate}}</label></div>
 								<label class="zenodo-email">{{zenodoEmail}}</label>
-								<div><button mat-raised-button type="button" (click)="RemoveZenodo()" class="confirm">{{'USER-PROFILE.ZENODO.LOGOUT' | translate}}</button></div>
+								<div><button mat-raised-button type="button" (click)="RemoveZenodo()" class="confirm unlinkBtn" >{{'USER-PROFILE.ZENODO.LOGOUT' | translate}}</button></div>
 							</div>
 						</div>
 					</div>
diff --git a/dmp-frontend/src/app/ui/user-profile/user-profile.component.scss b/dmp-frontend/src/app/ui/user-profile/user-profile.component.scss
index fe59534bc..b96e9d794 100644
--- a/dmp-frontend/src/app/ui/user-profile/user-profile.component.scss
+++ b/dmp-frontend/src/app/ui/user-profile/user-profile.component.scss
@@ -29,3 +29,8 @@
 .zenodo-email {
 	color: black;
 }
+
+.unlinkBtn {
+	background-color: FireBrick;
+	color: white;
+}

From 80a11b2cb334ab6c8e4ace6203416892311ae58e Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Mon, 13 Apr 2020 16:35:32 +0300
Subject: [PATCH 26/60] Fixed dataset indexing when finalizing DMPs

---
 .../managers/DataManagementPlanManager.java   | 42 ++++++++++++++++---
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index 871384d37..e15b43edb 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -1530,6 +1530,23 @@ public class DataManagementPlanManager {
         sendNotification(dmp, user, NotificationType.DMP_PUBLISH);
     }
 
+    private void updateDatasetsIndex(List<Dataset> datasets) {
+        datasets.forEach(dataset -> {
+            List<Tag> tags = new ArrayList<>();
+            eu.eudat.elastic.entities.Dataset elastic = null;
+            try {
+                elastic = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString());
+                if (elastic != null) {
+                    tags = elastic.getTags();
+                }
+                this.datasetManager.updateTags(dataset, tags);
+            } catch (Exception e) {
+                logger.error(e.getMessage(), e);
+            }
+
+        });
+    }
+
     public void makeFinalize(UUID id, Principal principal, DatasetsToBeFinalized datasetsToBeFinalized) throws Exception {
         DMP dmp = this.apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().find(id);
         if (!isUserOwnerOfDmp(dmp, principal))
@@ -1539,20 +1556,28 @@ public class DataManagementPlanManager {
         dmp.setStatus(DMP.DMPStatus.FINALISED.getValue());
         apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().createOrUpdate(dmp);
         this.updateIndex(dmp);
+        List<Dataset> indexDatasets = new ArrayList<>();
         if (datasetsToBeFinalized != null && datasetsToBeFinalized.getUuids() != null && !datasetsToBeFinalized.getUuids().isEmpty()) {
             apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao()
                     .asQueryable().where((builder, root) -> root.get("id").in(datasetsToBeFinalized.getUuids()))
                     .update(root -> root.<Integer>get("status"), Dataset.Status.FINALISED.getValue());
+            List<Dataset> finalizedDatasets = dmp.getDataset().stream().filter(dataset -> datasetsToBeFinalized.getUuids().contains(dataset.getId())).collect(Collectors.toList());
+            finalizedDatasets.forEach(dataset -> dataset.setStatus(Dataset.Status.FINALISED.getValue()));
+            indexDatasets.addAll(finalizedDatasets);
             List<UUID> datasetsToBeCanceled = new LinkedList<>();
             for (Dataset dataset : dmp.getDataset()) {
                 if (!dataset.getStatus().equals(Dataset.Status.FINALISED.getValue()) && !datasetsToBeFinalized.getUuids().contains(dataset.getId())) {
                     datasetsToBeCanceled.add(dataset.getId());
                 }
             }
-            if (!datasetsToBeCanceled.isEmpty())
+            if (!datasetsToBeCanceled.isEmpty()) {
                 apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao()
-                        .asQueryable().where((builder, root) -> root.get("id").in(datasetsToBeCanceled))
-                        .update(root -> root.<Integer>get("status"), Dataset.Status.CANCELED.getValue());
+                          .asQueryable().where((builder, root) -> root.get("id").in(datasetsToBeCanceled))
+                          .update(root -> root.<Integer>get("status"), Dataset.Status.CANCELED.getValue());
+                List<Dataset> cancelledDatasets = dmp.getDataset().stream().filter(dataset -> datasetsToBeCanceled.contains(dataset.getId())).collect(Collectors.toList());
+                cancelledDatasets.forEach(dataset -> dataset.setStatus(Dataset.Status.CANCELED.getValue()));
+                indexDatasets.addAll(cancelledDatasets);
+            }
         } else {
             List<UUID> datasetsToBeCanceled = new LinkedList<>();
             for (Dataset dataset : dmp.getDataset()) {
@@ -1560,14 +1585,19 @@ public class DataManagementPlanManager {
                     datasetsToBeCanceled.add(dataset.getId());
                 }
             }
-            if (!datasetsToBeCanceled.isEmpty())
+            if (!datasetsToBeCanceled.isEmpty()) {
                 apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao()
-                        .asQueryable().where((builder, root) -> root.get("id").in(datasetsToBeCanceled))
-                        .update(root -> root.<Integer>get("status"), Dataset.Status.CANCELED.getValue());
+                          .asQueryable().where((builder, root) -> root.get("id").in(datasetsToBeCanceled))
+                          .update(root -> root.<Integer>get("status"), Dataset.Status.CANCELED.getValue());
+                List<Dataset> cancelledDatasets = dmp.getDataset().stream().filter(dataset -> datasetsToBeCanceled.contains(dataset.getId())).collect(Collectors.toList());
+                cancelledDatasets.forEach(dataset -> dataset.setStatus(Dataset.Status.CANCELED.getValue()));
+                indexDatasets.addAll(cancelledDatasets);
+            }
 
             UserInfo user = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(principal.getId());
             sendNotification(dmp, user, NotificationType.DMP_FINALISED);
         }
+        this.updateDatasetsIndex(indexDatasets);
     }
 
     private boolean isUserOwnerOfDmp(DMP dmp, Principal principal) {

From 2ba3f116874e48efb0177c5f8c0f74cce556c067 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Tue, 14 Apr 2020 16:43:09 +0300
Subject: [PATCH 27/60] Add additional editors for the remaining external
 references

---
 .../java/eu/eudat/data/entities/Registry.java |  4 +-
 .../java/eu/eudat/data/entities/Service.java  |  4 +-
 .../src/app/core/model/service/service.ts     |  1 +
 .../dataset-wizard-editor.model.ts            |  8 ++-
 ...-external-references-editor.component.html | 55 +++++++++++++++++++
 ...et-external-references-editor.component.ts | 43 ++++++++++++++-
 6 files changed, 109 insertions(+), 6 deletions(-)

diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Registry.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Registry.java
index 6a40378cd..f1295d6ef 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Registry.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Registry.java
@@ -139,7 +139,9 @@ public class Registry implements DataEntity<Registry, UUID> {
 
 	@Override
 	public void update(Registry entity) {
-
+		this.label = entity.getLabel();
+		this.abbreviation = entity.getAbbreviation();
+		this.uri = entity.getUri();
 	}
 
 	@Override
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Service.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Service.java
index c71977292..b3d43fba8 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Service.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Service.java
@@ -134,7 +134,9 @@ public class Service implements DataEntity<Service, UUID> {
 
 	@Override
 	public void update(Service entity) {
-
+		this.label = entity.getLabel();
+		this.abbreviation = entity.getAbbreviation();
+		this.uri = entity.getUri();
 	}
 
 	@Override
diff --git a/dmp-frontend/src/app/core/model/service/service.ts b/dmp-frontend/src/app/core/model/service/service.ts
index 20c8dacd4..699a1c613 100644
--- a/dmp-frontend/src/app/core/model/service/service.ts
+++ b/dmp-frontend/src/app/core/model/service/service.ts
@@ -5,5 +5,6 @@ export interface ServiceModel {
 	uri: String;
 	label: String;
 	reference: String;
+	source: String;
 }
 
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard-editor.model.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard-editor.model.ts
index ae6064621..334dec486 100644
--- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard-editor.model.ts
+++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard-editor.model.ts
@@ -184,14 +184,16 @@ export class ExternalServiceEditorModel {
 	public uri: String;
 	public label: String;
 	public reference: String;
+	public source: String;
 
-	constructor(abbreviation?: String, definition?: String, id?: String, label?: String, reference?: String, uri?: String) {
+	constructor(abbreviation?: String, definition?: String, id?: String, label?: String, reference?: String, uri?: String, source?: String) {
 		this.id = id;
 		this.abbreviation = abbreviation;
 		this.definition = definition;
 		this.uri = uri;
 		this.label = label;
 		this.reference = reference;
+		this.source = source;
 	}
 
 	fromModel(item: ServiceModel): ExternalServiceEditorModel {
@@ -201,6 +203,7 @@ export class ExternalServiceEditorModel {
 		this.uri = item.uri;
 		this.label = item.label;
 		this.reference = item.reference;
+		this.source = item.source;
 		return this;
 	}
 
@@ -211,7 +214,8 @@ export class ExternalServiceEditorModel {
 			label: [this.label, Validators.required],
 			reference: [this.reference],
 			uri: [this.uri, Validators.required],
-			definition: [this.definition]
+			definition: [this.definition],
+			source: [this.source]
 		});
 	}
 }
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.html
index 24da860a1..1d019c707 100644
--- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.html
+++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.html
@@ -75,6 +75,16 @@
 						{{i+1}}) {{suggestion.get('name').value}}
 					</p>
 				</div>
+				<div class="col-auto" *ngIf="isInternal(suggestion)">
+					<mat-form-field>
+						<input matInput placeholder="{{'DATASET-REFERENCED-MODELS.EXTERNAL-DATASET.LABEL' | translate}}" type="text" name="name" [formControl]="suggestion.get('name')">
+					</mat-form-field>
+				</div>
+				<div class="col-auto" *ngIf="isInternal(suggestion)">
+					<mat-form-field>
+						<input matInput placeholder="{{'DATASET-REFERENCED-MODELS.EXTERNAL-DATASET.ABBREVIATION' | translate}}" type="text" name="abbreviation" [formControl]="suggestion.get('abbreviation')">
+					</mat-form-field>
+				</div>
 				<div class="col-auto">
 					<mat-form-field>
 						<input matInput placeholder="{{'DATASET-EDITOR.FIELDS.EXTERNAL-DATASET-INFO' | translate}}" type="text" name="info" [formControl]="suggestion.get('info')">
@@ -90,6 +100,11 @@
 						<mat-error *ngIf="suggestion.get('type').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 					</mat-form-field>
 				</div>
+				<div class="col-auto" *ngIf='!viewOnly && isInternal(suggestion)'>
+					<button mat-raised-button (click)="updateExternalDataset(suggestion)" type="button" color="primary">
+						{{ 'DATASET-EDITOR.ACTIONS.UPDATE' | translate }}
+					</button>
+				</div>
 				<div class="col-auto">
 					<button mat-icon-button (click)="callback(i)" *ngIf='!viewOnly'>
 						<mat-icon>close</mat-icon>
@@ -120,6 +135,26 @@
 						{{i+1}}) {{suggestion.get('label').value}}
 					</p>
 				</div>
+				<div class="col-auto" *ngIf="isInternal(suggestion)">
+					<mat-form-field>
+						<input matInput placeholder="{{'DATASET-REFERENCED-MODELS.REGISTRY.LABEL' | translate}}" type="text" name="label" [formControl]="suggestion.get('label')">
+					</mat-form-field>
+				</div>
+				<div class="col-auto" *ngIf="isInternal(suggestion)">
+					<mat-form-field>
+						<input matInput placeholder="{{'DATASET-REFERENCED-MODELS.REGISTRY.ABBREVIATION' | translate}}" type="text" name="abbreviation" [formControl]="suggestion.get('abbreviation')">
+					</mat-form-field>
+				</div>
+				<div class="col-auto" *ngIf="isInternal(suggestion)">
+					<mat-form-field>
+						<input matInput placeholder="{{'DATASET-REFERENCED-MODELS.REGISTRY.URI' | translate}}" type="text" name="uri" [formControl]="suggestion.get('uri')">
+					</mat-form-field>
+				</div>
+				<div class="col-auto" *ngIf='!viewOnly && isInternal(suggestion)'>
+					<button mat-raised-button (click)="updateRegistry(suggestion)" type="button" color="primary">
+						{{ 'DATASET-EDITOR.ACTIONS.UPDATE' | translate }}
+					</button>
+				</div>
 				<div class="col-auto">
 					<button mat-icon-button (click)="callback(i)" *ngIf='!viewOnly'>
 						<mat-icon>close</mat-icon>
@@ -151,6 +186,26 @@
 						{{i+1}}) {{suggestion.get('label').value}}
 					</p>
 				</div>
+				<div class="col-auto" *ngIf="isInternal(suggestion)">
+					<mat-form-field>
+						<input matInput placeholder="{{'DATASET-REFERENCED-MODELS.SERVICES.LABEL' | translate}}" type="text" name="label" [formControl]="suggestion.get('label')">
+					</mat-form-field>
+				</div>
+				<div class="col-auto" *ngIf="isInternal(suggestion)">
+					<mat-form-field>
+						<input matInput placeholder="{{'DATASET-REFERENCED-MODELS.SERVICES.ABBREVIATION' | translate}}" type="text" name="abbreviation" [formControl]="suggestion.get('abbreviation')">
+					</mat-form-field>
+				</div>
+				<div class="col-auto" *ngIf="isInternal(suggestion)">
+					<mat-form-field>
+						<input matInput placeholder="{{'DATASET-REFERENCED-MODELS.SERVICES.URI' | translate}}" type="text" name="uri" [formControl]="suggestion.get('uri')">
+					</mat-form-field>
+				</div>
+				<div class="col-auto" *ngIf='!viewOnly && isInternal(suggestion)'>
+					<button mat-raised-button (click)="updateRegistry(suggestion)" type="button" color="primary">
+						{{ 'DATASET-EDITOR.ACTIONS.UPDATE' | translate }}
+					</button>
+				</div>
 				<div class="col-auto">
 					<button mat-icon-button (click)="callback(i)" *ngIf='!viewOnly'>
 						<mat-icon>close</mat-icon>
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts
index 50c4af5f2..42438f216 100644
--- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts
+++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts
@@ -26,6 +26,9 @@ import { ENTER, COMMA } from '@angular/cdk/keycodes';
 import { MatChipInputEvent } from '@angular/material/chips';
 import { isNullOrUndefined } from 'util';
 import { ExternalDataRepositoryService } from '@app/core/services/external-sources/data-repository/extternal-data-repository.service';
+import { ExternalDatasetService } from '@app/core/services/external-sources/dataset/external-dataset.service';
+import { ExternalRegistryService } from '@app/core/services/external-sources/registry/external-registry.service';
+import { ExternalServiceService } from '@app/core/services/external-sources/service/external-service.service';
 
 @Component({
 	selector: 'app-dataset-external-references-editor-component',
@@ -89,7 +92,10 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl
 		private language: TranslateService,
 		private externalSourcesService: ExternalSourcesService,
 		private externalSourcesConfigurationService: ExternalSourcesConfigurationService,
-		private externalDataRepositoryService: ExternalDataRepositoryService
+		private externalDataRepositoryService: ExternalDataRepositoryService,
+		private externalDatasetService: ExternalDatasetService,
+		private externalRegistryService: ExternalRegistryService,
+		private externalServiceService: ExternalServiceService,
 	) { super(); }
 
 	ngOnInit() {
@@ -195,7 +201,7 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl
 			.pipe(takeUntil(this._destroyed))
 			.subscribe(result => {
 				if (!result) { return; }
-				const serviceModel = new ExternalServiceEditorModel(result.abbreviation, result.definition, result.id, result.label, result.reference, result.uri);
+				const serviceModel = new ExternalServiceEditorModel(result.abbreviation, result.definition, result.id, result.label, result.reference, result.uri, result.source);
 				(<FormArray>this.formGroup.get('services')).push(serviceModel.buildForm());
 			});
 	}
@@ -254,6 +260,9 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl
 	}
 
 	isInternal(element: any): boolean {
+		if (element.get('source') == null) {
+			console.log(element);
+		}
 		return element.get('source').value === 'Internal';
 	}
 
@@ -266,4 +275,34 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl
 				}
 			);
 	}
+
+	updateExternalDataset(externalDataset: FormGroup) {
+		this.externalDatasetService.create(externalDataset.value)
+			.pipe(takeUntil(this._destroyed))
+			.subscribe(
+				(result) => {
+					externalDataset.setValue(result);
+				}
+			);
+	}
+
+	updateRegistry(registry: FormGroup) {
+		this.externalRegistryService.create(registry.value)
+			.pipe(takeUntil(this._destroyed))
+			.subscribe(
+				(result) => {
+					registry.setValue(result);
+				}
+			);
+	}
+
+	updateService(service: FormGroup) {
+		this.externalServiceService.create(service.value)
+			.pipe(takeUntil(this._destroyed))
+			.subscribe(
+				(result) => {
+					service.setValue(result);
+				}
+			);
+	}
 }

From 91fc1bc5b10d8d1b869e7a0de27693e978c709f9 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Thu, 16 Apr 2020 18:32:47 +0300
Subject: [PATCH 28/60] Made elastic dmp mapping more safe

---
 .../elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java
index 7f4933cc2..b10147413 100644
--- a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java
+++ b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java
@@ -242,7 +242,9 @@ public class Dmp implements ElasticEntity<Dmp> {
 		this.id = UUID.fromString((String) fields.get(MapKey.ID.getName()));
 		this.label = (String) fields.get(MapKey.LABEL.getName());
 		this.description = (String) fields.get(MapKey.DESCRIPTION.getName());
-		this.groupId = UUID.fromString((String) fields.get(MapKey.GROUPID.getName()));
+		if (fields.get(MapKey.GROUPID.getName()) != null) {
+			this.groupId = UUID.fromString((String) fields.get(MapKey.GROUPID.getName()));
+		}
 		this.status = Short.valueOf(fields.get(MapKey.STATUS.getName()).toString());
 		if (fields.get(MapKey.TEMPLATES.getName()) != null) {
 			this.templates = ((List<HashMap<String, Object>>) fields.get(MapKey.TEMPLATES.getName())).stream().map(hashMap -> new DatasetTempalate().fromElasticEntity(hashMap)).collect(Collectors.toList());

From 00e4dd5d368b27446a7adba90b6f43bd91fe8b5b Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Thu, 16 Apr 2020 18:34:32 +0300
Subject: [PATCH 29/60] Minor cleanup to logstash

---
 .../config-elk/logstash/pipeline/open_dmp_send_to_elastic.conf  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ELK.Docker/shared/config-elk/logstash/pipeline/open_dmp_send_to_elastic.conf b/ELK.Docker/shared/config-elk/logstash/pipeline/open_dmp_send_to_elastic.conf
index 458ca82b1..8b0f9fe02 100644
--- a/ELK.Docker/shared/config-elk/logstash/pipeline/open_dmp_send_to_elastic.conf
+++ b/ELK.Docker/shared/config-elk/logstash/pipeline/open_dmp_send_to_elastic.conf
@@ -12,7 +12,7 @@ output {
 		password =>
 		index =>"opendmp.logs"
 		#manage_template => true
-		#template => "/usr/share/logstash/templates/audit/cite_elas_openDMP.json"
+		#template => "/usr/share/logstash/templates/audit/openDMP.json"
 		#template_name => "cite.elas.openDMP-audit*" 
 		#template_overwrite => true
 	}

From e0211a019cef61af8368955cf6ec1b939dd04959 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Thu, 16 Apr 2020 18:36:17 +0300
Subject: [PATCH 30/60] Fixed issues with public dashboard

---
 .../app/ui/dashboard/dashboard.component.ts   | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts b/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts
index 8649de976..ae07f228a 100644
--- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts
+++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts
@@ -25,6 +25,8 @@ import { Observable, of as observableOf } from 'rxjs';
 import { mergeMap, takeUntil } from 'rxjs/operators';
 import { BreadcrumbItem } from '../misc/breadcrumb/definition/breadcrumb-item';
 import { IBreadCrumbComponent } from '../misc/breadcrumb/definition/IBreadCrumbComponent';
+import { DmpCriteria } from '@app/core/query/dmp/dmp-criteria';
+import { DatasetCriteria } from '@app/core/query/dataset/dataset-criteria';
 
 
 @Component({
@@ -145,26 +147,31 @@ export class DashboardComponent extends BaseComponent implements OnInit, IBreadC
 	}
 
 	getPublicDmps() {
-		const dmpCriteria = new ExploreDmpCriteriaModel();
+		const dmpCriteria = new DmpCriteria();
+		dmpCriteria.allVersions = false;
+		dmpCriteria.isPublic = true;
+		dmpCriteria.onlyPublic = true;
 		const fields: Array<string> = new Array<string>();
 		fields.push('-finalizedAt');
-		const dataTableRequest: DataTableRequest<ExploreDmpCriteriaModel> = new DataTableRequest(0, 2, { fields: fields });
+		const dataTableRequest: DataTableRequest<DmpCriteria> = new DataTableRequest(0, 2, { fields: fields });
 		dataTableRequest.criteria = dmpCriteria;
-		return this.dmpService.getPublicPaged(dataTableRequest, "listing").pipe(takeUntil(this._destroyed)).subscribe(result => { this.dmpListingItems = result.data; });
+		return this.dmpService.getPaged(dataTableRequest, "listing").pipe(takeUntil(this._destroyed)).subscribe(result => { this.dmpListingItems = result.data; });
 	}
 
 	getPublicDatasets() {
-		const dmpCriteria = new ExploreDatasetCriteriaModel();
+		const dmpCriteria = new DatasetCriteria();
+		dmpCriteria.allVersions = false;
+		dmpCriteria.isPublic = true;
 		const fields: Array<string> = new Array<string>();
 		fields.push('-modified');
-		const dataTableRequest: DataTableRequest<ExploreDatasetCriteriaModel> = new DataTableRequest(0, 4, { fields: fields });
+		const dataTableRequest: DataTableRequest<DatasetCriteria> = new DataTableRequest(0, 4, { fields: fields });
 		dataTableRequest.criteria = dmpCriteria;
-		return this.datasetService.getPublicPaged(dataTableRequest).pipe(takeUntil(this._destroyed)).subscribe(result => { this.datasetListingItems = result.data; });
+		return this.datasetService.getPaged(dataTableRequest).pipe(takeUntil(this._destroyed)).subscribe(result => { this.datasetListingItems = result.data; });
 	}
 
 	dmpClicked(dmp: DmpListingModel) {
 		if (!this.isAuthenticated()) {
-			this.router.navigate(['../explore-plans/overview', dmp.id], { relativeTo: this.route });
+			this.router.navigate(['../explore-plans/publicOverview', dmp.id], { relativeTo: this.route });
 		} else {
 			this.router.navigate(['/plans/publicEdit/' + dmp.id]);
 		}

From 96576b16a837a0f112518a8b3fa5843c90cb8f7d Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Fri, 17 Apr 2020 13:01:26 +0300
Subject: [PATCH 31/60] Merge Dataset Index to the Dmp Index (ref #252)

---
 .../elastic/repository/DatasetRepository.java | 130 ++++++++++++------
 .../elastic/repository/DmpRepository.java     |  42 +++++-
 .../managers/DataManagementPlanManager.java   |  18 +--
 .../eudat/logic/managers/DatasetManager.java  |   2 +-
 .../index-managment.component.ts              |  40 +++---
 5 files changed, 158 insertions(+), 74 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 f34c2ec8a..34a314bb1 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
@@ -2,46 +2,64 @@ package eu.eudat.elastic.repository;
 
 import eu.eudat.elastic.criteria.DatasetCriteria;
 import eu.eudat.elastic.entities.Dataset;
+import eu.eudat.elastic.entities.Dmp;
 import eu.eudat.elastic.entities.Tag;
-import org.elasticsearch.action.get.GetRequest;
-import org.elasticsearch.action.get.GetResponse;
+import org.apache.lucene.search.join.ScoreMode;
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
-import org.elasticsearch.client.core.CountRequest;
-import org.elasticsearch.client.core.CountResponse;
 import org.elasticsearch.client.indices.GetIndexRequest;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.InnerHitBuilder;
+import org.elasticsearch.index.query.NestedQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.reindex.DeleteByQueryRequest;
+import org.elasticsearch.search.SearchHits;
+import org.elasticsearch.search.aggregations.AggregationBuilders;
+import org.elasticsearch.search.aggregations.bucket.filter.FiltersAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.filter.ParsedFilters;
+import org.elasticsearch.search.aggregations.bucket.nested.NestedAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.nested.ParsedNested;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Service("datasetRepository")
 public class DatasetRepository extends ElasticRepository<Dataset, DatasetCriteria> {
 
-    @Autowired
-    public DatasetRepository(RestHighLevelClient client) {
+    private final DmpRepository dmpRepository;
+
+    public DatasetRepository(RestHighLevelClient client, DmpRepository dmpRepository) {
         super(client);
+        this.dmpRepository = dmpRepository;
     }
 
     @Override
     public Dataset createOrUpdate(Dataset entity) throws IOException {
         if (this.getClient() != null) {
             XContentBuilder builder = XContentFactory.jsonBuilder();
-            IndexRequest request = new IndexRequest("datasets").id(entity.getId()).source(entity.toElasticEntity(builder));//new IndexRequest("datasets", "doc", entity.getId()).source(entity.toElasticEntity(builder));
+            Dmp dmp = this.dmpRepository.findDocument(entity.getDmp().toString());
+            boolean found = false;
+            for(int i = 0; i < dmp.getDatasets().size(); i++) {
+                if (dmp.getDatasets().get(i).getId().equals(entity.getId())) {
+                    dmp.getDatasets().set(i, entity);
+                    found = true;
+                    break;
+                }
+            }
+            if (!found) {
+                dmp.getDatasets().add(entity);
+            }
+            IndexRequest request = new IndexRequest("dmps").id(dmp.getId().toString()).source(dmp.toElasticEntity(builder));//new IndexRequest("datasets", "doc", entity.getId()).source(entity.toElasticEntity(builder));
             this.getClient().index(request, RequestOptions.DEFAULT);
             return entity;
         }
@@ -51,9 +69,20 @@ public class DatasetRepository extends ElasticRepository<Dataset, DatasetCriteri
     @Override
     public Dataset findDocument(String id) throws IOException {
         if (this.getClient() != null) {
-            GetRequest request = new GetRequest("datasets", id);
-            GetResponse response = this.getClient().get(request, RequestOptions.DEFAULT);
-            return new Dataset().fromElasticEntity(response.getSourceAsMap());
+            SearchRequest searchRequest = new SearchRequest("dmps");
+            SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+            BoolQueryBuilder boolQuery = QueryBuilders.boolQuery().should(QueryBuilders.termQuery("datasets.id.keyword", id));
+            NestedQueryBuilder nestedQueryBuilder = QueryBuilders.nestedQuery( "datasets", boolQuery, ScoreMode.Avg).innerHit(new InnerHitBuilder());
+            searchSourceBuilder.query(nestedQueryBuilder);
+            searchRequest.source(searchSourceBuilder);
+            SearchResponse response = this.getClient().search(searchRequest, RequestOptions.DEFAULT);
+            return ((Stream<Dataset>)Arrays.stream(response.getHits().getHits())
+                                           .map(hit -> hit.getInnerHits().values()).flatMap(Collection::stream)
+                                           .map(SearchHits::getHits).flatMap(Arrays::stream)
+                                           .map(x -> new Dataset().fromElasticEntity(this.transformFromString(x.getSourceAsString(), Map.class)))).findFirst().orElse(null);
+//            GetRequest request = new GetRequest("datasets", id);
+//            GetResponse response = this.getClient().get(request, RequestOptions.DEFAULT);
+//            return new Dataset().fromElasticEntity(response.getSourceAsMap());
         }
         return null;
     }
@@ -61,70 +90,81 @@ public class DatasetRepository extends ElasticRepository<Dataset, DatasetCriteri
     @Override
     public List<Dataset> query(DatasetCriteria criteria) throws IOException {
         if (this.getClient() != null) {
-            SearchRequest searchRequest = new SearchRequest("datasets");
+            SearchRequest searchRequest = new SearchRequest("dmps");
             SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
 
-            CountRequest countRequest = new CountRequest("datasets");
-            countRequest.query(QueryBuilders.boolQuery().mustNot(QueryBuilders.termsQuery("status.keyword", Stream.of(Dataset.Status.DELETED.getValue(), Dataset.Status.CANCELED.getValue()).collect(Collectors.toList()))));
+            /*CountRequest countRequest = new CountRequest("dmps").routing("datasets").routing("id");
+            countRequest.query(QueryBuilders.boolQuery().mustNot(QueryBuilders.termsQuery("datasets.status.keyword", Stream.of(Dataset.Status.DELETED.getValue(), Dataset.Status.CANCELED.getValue()).collect(Collectors.toList()))));
             CountResponse countResponse = getClient().count(countRequest, RequestOptions.DEFAULT);
-            Long count = countResponse.getCount();
+            Long count = countResponse.getCount();*/
+
+            SearchRequest countRequest = new SearchRequest("dmps");
+            NestedAggregationBuilder nestedAggregationBuilder = AggregationBuilders.nested("by_dataset", "datasets");
+            FiltersAggregationBuilder filtersAggregationBuilder = AggregationBuilders.filters("dataset_query", QueryBuilders.boolQuery().mustNot(QueryBuilders.termsQuery("datasets.status.keyword", Stream.of(Dataset.Status.DELETED.getValue(), Dataset.Status.CANCELED.getValue()).collect(Collectors.toList()))));
+            nestedAggregationBuilder.subAggregation(filtersAggregationBuilder);
+            SearchSourceBuilder countSourceBuilder = new SearchSourceBuilder();
+            countSourceBuilder.aggregation(nestedAggregationBuilder);
+            countRequest.source(countSourceBuilder);
+            SearchResponse countResponse = getClient().search(countRequest, RequestOptions.DEFAULT);
+            Long count = ((ParsedFilters)((ParsedNested)countResponse.getAggregations().asMap().get("by_dataset")).getAggregations().get("dataset_query")).getBuckets().get(0).getDocCount();
+
 
             searchSourceBuilder.size(count.intValue());
 
-            BoolQueryBuilder boolQuery = QueryBuilders.boolQuery().mustNot(QueryBuilders.termsQuery("status.keyword", Stream.of(Dataset.Status.DELETED.getValue(), Dataset.Status.CANCELED.getValue()).collect(Collectors.toList())));
+            BoolQueryBuilder boolQuery = QueryBuilders.boolQuery().mustNot(QueryBuilders.termsQuery("datasets.status", Stream.of(Dataset.Status.DELETED.getValue(), Dataset.Status.CANCELED.getValue()).collect(Collectors.toList())));
             if (criteria.isPublic()) {
-                boolQuery = boolQuery.should(QueryBuilders.termQuery("public.keyword", "true"));
-                boolQuery = boolQuery.should(QueryBuilders.termQuery("status.keyword", Dataset.Status.FINALISED.getValue()));
-                boolQuery = boolQuery.should(QueryBuilders.termQuery("lastPublicVersion.keyword", "true"));
+                boolQuery = boolQuery.should(QueryBuilders.termQuery("datasets.public", "true"));
+                boolQuery = boolQuery.should(QueryBuilders.termQuery("datasets.status", Dataset.Status.FINALISED.getValue()));
+                boolQuery = boolQuery.should(QueryBuilders.termQuery("datasets.lastPublicVersion", "true"));
             }
             if (criteria.getLike() != null && !criteria.getLike().isEmpty()) {
-                boolQuery = boolQuery.should(QueryBuilders.queryStringQuery(criteria.getLike()).fields(Stream.of(new Object[][]{
-                        {"label", 1.0f},
-                        {"description", 1.0f},
-                        {"formData", 1.0f}
+                boolQuery = boolQuery.should(QueryBuilders.queryStringQuery(criteria.getLike()).allowLeadingWildcard(true).fields(Stream.of(new Object[][]{
+                        {"datasets.label", 1.0f},
+                        {"datasets.description", 1.0f},
+                        {"datasets.formData", 1.0f}
                 }).collect(Collectors.toMap(data -> (String) data[0], data -> (Float) data[1]))));
             }
 
             if (criteria.getDatasetTemplates() != null && criteria.getDatasetTemplates().size() > 0) {
-                boolQuery = boolQuery.should(QueryBuilders.termsQuery("template.keyword", criteria.getDatasetTemplates().stream().map(UUID::toString).collect(Collectors.toList())));
+                boolQuery = boolQuery.should(QueryBuilders.termsQuery("datasets.template", criteria.getDatasetTemplates().stream().map(UUID::toString).collect(Collectors.toList())));
             }
 
             if (criteria.getStatus() != null) {
-                boolQuery = boolQuery.should(QueryBuilders.termQuery("status.keyword", criteria.getStatus().toString()));
+                boolQuery = boolQuery.should(QueryBuilders.termQuery("datasets.status", criteria.getStatus().toString()));
             }
 
             if (criteria.getDmps() != null && criteria.getDmps().size() > 0) {
-                boolQuery = boolQuery.should(QueryBuilders.termsQuery("dmp.keyword", criteria.getDmps().stream().map(UUID::toString).collect(Collectors.toList())));
+                boolQuery = boolQuery.should(QueryBuilders.termsQuery("datasets.dmp", criteria.getDmps().stream().map(UUID::toString).collect(Collectors.toList())));
             }
 
             if (criteria.getGroupIds() != null && criteria.getGroupIds().size() > 0) {
-                boolQuery = boolQuery.should(QueryBuilders.termsQuery("group.keyword", criteria.getGroupIds().stream().map(UUID::toString).collect(Collectors.toList())));
+                boolQuery = boolQuery.should(QueryBuilders.termsQuery("datasets.group", criteria.getGroupIds().stream().map(UUID::toString).collect(Collectors.toList())));
             }
 
             if (criteria.getGrants() != null && criteria.getGrants().size() > 0) {
-                boolQuery = boolQuery.should(QueryBuilders.termsQuery("grant.keyword", criteria.getGrants().stream().map(UUID::toString).collect(Collectors.toList())));
+                boolQuery = boolQuery.should(QueryBuilders.termsQuery("datasets.grant", criteria.getGrants().stream().map(UUID::toString).collect(Collectors.toList())));
             }
 
             if (criteria.getGrantStatus() != null) {
-                boolQuery = boolQuery.should(QueryBuilders.termQuery("grantStatus.keyword", criteria.getGrantStatus().toString()));
+                boolQuery = boolQuery.should(QueryBuilders.termQuery("datasets.grantStatus", criteria.getGrantStatus().toString()));
             }
 
             if (criteria.getCollaborators() != null && criteria.getCollaborators().size() > 0) {
-                boolQuery = boolQuery.should(QueryBuilders.termsQuery("collaborators.id.keyword", criteria.getCollaborators().stream().map(UUID::toString).collect(Collectors.toList())));
+                boolQuery = boolQuery.should(QueryBuilders.termsQuery("datasets.collaborators.id", criteria.getCollaborators().stream().map(UUID::toString).collect(Collectors.toList())));
             }
 
             if (!criteria.isPublic()) {
                 if (criteria.getAllowAllVersions() != null && !criteria.getAllowAllVersions()) {
-                    boolQuery = boolQuery.should(QueryBuilders.termQuery("lastVersion.keyword", "true"));
+                    boolQuery = boolQuery.should(QueryBuilders.termQuery("datasets.lastVersion", "true"));
                 }
             }
 
             if (criteria.getOrganiztions() != null && criteria.getOrganiztions().size() > 0) {
-                boolQuery = boolQuery.should(QueryBuilders.termsQuery("organizations.id.keyword", criteria.getOrganiztions()));
+                boolQuery = boolQuery.should(QueryBuilders.termsQuery("datasets.organizations.id", criteria.getOrganiztions()));
             }
 
             if (criteria.getTags() != null && criteria.getTags().size() > 0) {
-                boolQuery = boolQuery.should(QueryBuilders.termsQuery("tags.name.keyword", criteria.getTags().stream().map(Tag::getName).collect(Collectors.toList())));
+                boolQuery = boolQuery.should(QueryBuilders.termsQuery("datasets.tags.name", criteria.getTags().stream().map(Tag::getName).collect(Collectors.toList())));
             }
 
             if (boolQuery.should().isEmpty() && boolQuery.mustNot().isEmpty()) {
@@ -132,10 +172,15 @@ public class DatasetRepository extends ElasticRepository<Dataset, DatasetCriteri
             } else {
                 boolQuery.minimumShouldMatch(boolQuery.should().size());
             }
-            searchSourceBuilder.query(boolQuery);
+
+            NestedQueryBuilder nestedQueryBuilder = QueryBuilders.nestedQuery("datasets", boolQuery, ScoreMode.Avg).innerHit(new InnerHitBuilder());
+            searchSourceBuilder.query(nestedQueryBuilder);
             searchRequest.source(searchSourceBuilder);
             SearchResponse response = this.getClient().search(searchRequest, RequestOptions.DEFAULT);
-            return Arrays.stream(response.getHits().getHits()).map(x -> this.transformFromString(x.getSourceAsString(), Dataset.class)).collect(Collectors.toList());
+            return ((Stream<Dataset>)Arrays.stream(response.getHits().getHits())
+                                           .map(hit -> hit.getInnerHits().values()).flatMap(Collection::stream)
+                                           .map(SearchHits::getHits).flatMap(Arrays::stream)
+                                           .map(x -> new Dataset().fromElasticEntity(this.transformFromString(x.getSourceAsString(), Map.class)))).collect(Collectors.toList());
         }
         return null;
     }
@@ -143,7 +188,7 @@ public class DatasetRepository extends ElasticRepository<Dataset, DatasetCriteri
     @Override
     public boolean exists() throws IOException {
         if (this.getClient() != null) {
-            GetIndexRequest request = new GetIndexRequest("datasets");
+            GetIndexRequest request = new GetIndexRequest("dmps");
 //        request.indices("datasets");
             return this.getClient().indices().exists(request, RequestOptions.DEFAULT);
         }
@@ -152,10 +197,11 @@ public class DatasetRepository extends ElasticRepository<Dataset, DatasetCriteri
 
     @Override
     public void clear() throws IOException {
-        if (exists()) {
+        //DON'T
+       /* if (exists()) {
             DeleteByQueryRequest delete = new DeleteByQueryRequest("datasets");
             delete.setQuery(QueryBuilders.matchAllQuery());
             this.getClient().deleteByQuery(delete, RequestOptions.DEFAULT);
-        }
+        }*/
     }
 }
diff --git a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DmpRepository.java b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DmpRepository.java
index 754fd1966..21a5b1bac 100644
--- a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DmpRepository.java
+++ b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DmpRepository.java
@@ -1,43 +1,63 @@
 package eu.eudat.elastic.repository;
 
 import eu.eudat.elastic.criteria.DmpCriteria;
-import eu.eudat.elastic.entities.Dataset;
 import eu.eudat.elastic.entities.Dmp;
-import eu.eudat.elastic.entities.Tag;
+import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
 import org.elasticsearch.action.get.GetRequest;
 import org.elasticsearch.action.get.GetResponse;
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.index.IndexResponse;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.action.support.master.AcknowledgedResponse;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.client.core.CountRequest;
 import org.elasticsearch.client.core.CountResponse;
+import org.elasticsearch.client.indices.CreateIndexRequest;
 import org.elasticsearch.client.indices.GetIndexRequest;
+import org.elasticsearch.client.indices.PutMappingRequest;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.reindex.DeleteByQueryRequest;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
 import java.util.*;
-import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Service("dmpRepository")
 public class DmpRepository extends ElasticRepository<Dmp, DmpCriteria> {
+	private static final Logger logger = LoggerFactory.getLogger(DmpRepository.class);
 
 	@Autowired
 	public DmpRepository(RestHighLevelClient client) {
 		super(client);
 	}
 
+	private void generateMapping() throws IOException {
+		if (this.getClient() != null) {
+			XContentBuilder builder = XContentFactory.jsonBuilder();
+			builder.startObject();
+			builder.startObject("properties");
+			builder.startObject("datasets");
+			builder.field("type", "nested");
+			builder.endObject();
+			builder.endObject();
+			builder.endObject();
+			PutMappingRequest putMappingRequest = new PutMappingRequest("dmps");
+			putMappingRequest.source(builder);
+			this.getClient().indices().putMapping(putMappingRequest, RequestOptions.DEFAULT);
+		}
+	}
+
 	@Override
 	public Dmp createOrUpdate(Dmp entity) throws IOException {
 		if (this.getClient() != null) {
@@ -129,6 +149,20 @@ public class DmpRepository extends ElasticRepository<Dmp, DmpCriteria> {
 		return null;
 	}
 
+	public boolean createIndex() {
+		try {
+			if (!this.exists()) {
+				CreateIndexRequest createIndexRequest = new CreateIndexRequest("dmps");
+				this.getClient().indices().create(createIndexRequest, RequestOptions.DEFAULT);
+				this.generateMapping();
+			}
+			return true;
+		} catch (Exception e) {
+			logger.error(e.getMessage(), e);
+			return false;
+		}
+	}
+
 	@Override
 	public boolean exists() throws IOException {
 		if (this.getClient() != null) {
@@ -144,6 +178,8 @@ public class DmpRepository extends ElasticRepository<Dmp, DmpCriteria> {
 			DeleteByQueryRequest delete = new DeleteByQueryRequest("dmps");
 			delete.setQuery(QueryBuilders.matchAllQuery());
 			this.getClient().deleteByQuery(delete, RequestOptions.DEFAULT);
+			DeleteIndexRequest deleteIndexRequest = new DeleteIndexRequest("dmps");
+			this.getClient().indices().delete(deleteIndexRequest, RequestOptions.DEFAULT);
 		}
 	}
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index e15b43edb..ede74e290 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -1738,14 +1738,16 @@ public class DataManagementPlanManager {
 
     public void generateIndex(Principal principal) {
         if (principal.getAuthorities().contains(Authorities.ADMIN.getValue())) {
-            List<DMP> dmps = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().asQueryable().toList();
-            dmps.forEach(dmp -> {
-                try {
-                    this.updateIndex(dmp);
-                } catch (IOException e) {
-                    logger.error(e.getMessage(), e);
-                }
-            });
+            if (apiContext.getOperationsContext().getElasticRepository().getDmpRepository().createIndex()) {
+                List<DMP> dmps = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().asQueryable().toList();
+                dmps.forEach(dmp -> {
+                    try {
+                        this.updateIndex(dmp);
+                    } catch (IOException e) {
+                        logger.error(e.getMessage(), e);
+                    }
+                });
+            }
         }
     }
 
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java
index a30f89ab1..e82bc1801 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java
@@ -134,7 +134,7 @@ public class DatasetManager {
             datasets = datasetRepository.exists() ?
                     datasetRepository.query(datasetCriteria) : null;
         } catch (Exception ex) {
-            logger.warn(ex.getMessage());
+            logger.warn(ex.getMessage(), ex);
             datasets = null;
         }
 
diff --git a/dmp-frontend/src/app/ui/admin/index-managment/index-managment.component.ts b/dmp-frontend/src/app/ui/admin/index-managment/index-managment.component.ts
index 699dd0902..51865c403 100644
--- a/dmp-frontend/src/app/ui/admin/index-managment/index-managment.component.ts
+++ b/dmp-frontend/src/app/ui/admin/index-managment/index-managment.component.ts
@@ -30,16 +30,16 @@ export class IndexManagmentComponent extends BaseComponent implements OnInit {
 
   generateIndex(ev: Event) {
 	  (ev.srcElement as HTMLButtonElement).disabled = true;
-	  this.datasetService.generateIndex().pipe(takeUntil(this._destroyed)).subscribe(
-		  response => {
-			(ev.srcElement as HTMLButtonElement).disabled = false;
-			  this.onCallbackSuccess();
-		  },
-		  error => {
-			(ev.srcElement as HTMLButtonElement).disabled = false;
-			  this.onCallbackError(error);
-		  }
-	  );
+	//   this.datasetService.generateIndex().pipe(takeUntil(this._destroyed)).subscribe(
+	// 	  response => {
+	// 		(ev.srcElement as HTMLButtonElement).disabled = false;
+	// 		  this.onCallbackSuccess();
+	// 	  },
+	// 	  error => {
+	// 		(ev.srcElement as HTMLButtonElement).disabled = false;
+	// 		  this.onCallbackError(error);
+	// 	  }
+	//   );
 	  this.dmpService.generateIndex().pipe(takeUntil(this._destroyed)).subscribe(
 		response => {
 		  (ev.srcElement as HTMLButtonElement).disabled = false;
@@ -54,16 +54,16 @@ export class IndexManagmentComponent extends BaseComponent implements OnInit {
 
   clearIndex(ev: Event) {
 	(ev.srcElement as HTMLButtonElement).disabled = true;
-	this.datasetService.clearIndex().pipe(takeUntil(this._destroyed)).subscribe(
-		response => {
-		  (ev.srcElement as HTMLButtonElement).disabled = false;
-			this.onCallbackSuccess();
-		},
-		error => {
-		  (ev.srcElement as HTMLButtonElement).disabled = false;
-			this.onCallbackError(error);
-		}
-	);
+	// this.datasetService.clearIndex().pipe(takeUntil(this._destroyed)).subscribe(
+	// 	response => {
+	// 	  (ev.srcElement as HTMLButtonElement).disabled = false;
+	// 		this.onCallbackSuccess();
+	// 	},
+	// 	error => {
+	// 	  (ev.srcElement as HTMLButtonElement).disabled = false;
+	// 		this.onCallbackError(error);
+	// 	}
+	// );
 	this.dmpService.clearIndex().pipe(takeUntil(this._destroyed)).subscribe(
 		response => {
 		  (ev.srcElement as HTMLButtonElement).disabled = false;

From d0cb186ab2a3db34761e4b916b00251bc26dcb11 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Tue, 21 Apr 2020 12:40:50 +0300
Subject: [PATCH 32/60] Fixed issue with Zenodo DOI generation with user token

---
 .../managers/DataManagementPlanManager.java   | 75 ++++++++++++++-----
 1 file changed, 56 insertions(+), 19 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index ede74e290..5473eb0e8 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -1623,6 +1623,32 @@ public class DataManagementPlanManager {
         return doi;
     }
 
+    private String getUnpublishedDOI(String DOI, String token, Integer version) {
+        try {
+            RestTemplate restTemplate = new RestTemplate();
+            HttpHeaders headers = new HttpHeaders();
+            headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
+            headers.setContentType(MediaType.APPLICATION_JSON);
+            Map createResponse = null;
+            LinkedHashMap<String, String> links = null;
+            LinkedHashMap<String, String> metadata = null;
+            String listUrl = this.environment.getProperty("zenodo.url") + "deposit/depositions" + "?q=conceptdoi:\"" + DOI + "\"&access_token=" + token;
+            ResponseEntity<Map[]> listResponses = restTemplate.getForEntity(listUrl, Map[].class);
+            createResponse = listResponses.getBody()[0];
+            metadata = (LinkedHashMap<String, String>) createResponse.get("metadata");
+            links = (LinkedHashMap<String, String>) createResponse.get("links");
+
+            if (metadata.get("version").equals(version.toString())) {
+                return links.get("publish");
+            } else {
+                return null;
+            }
+        }catch (Exception e) {
+            logger.warn(e.getMessage(), e);
+            return null;
+        }
+    }
+
     public String createZenodoDoi(UUID id, Principal principal, ConfigLoader configLoader) throws Exception {
         DMP dmp = this.apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().find(id);
         if (!isUserOwnerOfDmp(dmp, principal))
@@ -1662,14 +1688,19 @@ public class DataManagementPlanManager {
         Map createResponse = null;
         LinkedHashMap<String, String> links = null;
         String previousDOI = this.getPreviousDOI(dmp.getGroupId(), dmp.getId());
+        String unpublishedUrl = null;
+        String publishUrl = null;
         try {
+
         if (previousDOI == null) {
             String createUrl = this.environment.getProperty("zenodo.url") + "deposit/depositions" + "?access_token=" + zenodoToken;
             createResponse = restTemplate.postForEntity(createUrl, request, Map.class).getBody();
             links = (LinkedHashMap<String, String>) createResponse.get("links");
         } else {
-            //It requires more than one step to create a new version
-            //First, get the deposit related to the concept DOI
+            unpublishedUrl = this.getUnpublishedDOI(previousDOI, zenodoToken, dmp.getVersion());
+            if (unpublishedUrl == null) {
+                //It requires more than one step to create a new version
+                //First, get the deposit related to the concept DOI
                 String listUrl = this.environment.getProperty("zenodo.url") + "deposit/depositions" + "?q=conceptdoi:\"" + previousDOI + "\"&access_token=" + zenodoToken;
                 ResponseEntity<Map[]> listResponses = restTemplate.getForEntity(listUrl, Map[].class);
                 createResponse = listResponses.getBody()[0];
@@ -1688,36 +1719,42 @@ public class DataManagementPlanManager {
                     String updateUrl = links.get("self") + "?access_token=" + zenodoToken;
                     restTemplate.put(updateUrl, request);
                     //And finally remove pre-existing files from it
-                    String fileListUrl = links.get("self") + "/files" + "?access_token=" + this.environment.getProperty("zenodo.access_token");
+                    String fileListUrl = links.get("self") + "/files" + "?access_token=" + zenodoToken;
                     ResponseEntity<Map[]> fileListResponse = restTemplate.getForEntity(fileListUrl, Map[].class);
                     for (Map file : fileListResponse.getBody()) {
-                        String fileDeleteUrl = links.get("self") + "/files/" + file.get("id") + "?access_token=" + this.environment.getProperty("zenodo.access_token");
+                        String fileDeleteUrl = links.get("self") + "/files/" + file.get("id") + "?access_token=" + zenodoToken;
                         restTemplate.delete(fileDeleteUrl);
                     }
-                }catch (Exception e) {
+                } catch (Exception e) {
                     //In case the last two steps fail delete the latest Deposit it in order to create a new one (only one at a time is allowed)
                     restTemplate.delete(latestDraftUrl);
                     throw e;
                 }
+            }
         }
 
-        // Second step, add the file to the entry.
-        HttpHeaders fileHeaders = new HttpHeaders();
-        fileHeaders.setContentType(MediaType.MULTIPART_FORM_DATA);
-        LinkedMultiValueMap<String, Object> addFileMap = new LinkedMultiValueMap<>();
+        if (unpublishedUrl == null) {
+            // Second step, add the file to the entry.
+            HttpHeaders fileHeaders = new HttpHeaders();
+            fileHeaders.setContentType(MediaType.MULTIPART_FORM_DATA);
+            LinkedMultiValueMap<String, Object> addFileMap = new LinkedMultiValueMap<>();
 
-        FileEnvelope file = getWordDocument(id.toString(), principal, configLoader);
-        addFileMap.add("filename", file.getFilename());
-        FileSystemResource fileSystemResource = new FileSystemResource(file.getFile());
-        addFileMap.add("file", fileSystemResource);
-        HttpEntity<MultiValueMap<String, Object>> addFileMapRequest = new HttpEntity<>(addFileMap, fileHeaders);
+            FileEnvelope file = getWordDocument(id.toString(), principal, configLoader);
+            addFileMap.add("filename", file.getFilename());
+            FileSystemResource fileSystemResource = new FileSystemResource(file.getFile());
+            addFileMap.add("file", fileSystemResource);
+            HttpEntity<MultiValueMap<String, Object>> addFileMapRequest = new HttpEntity<>(addFileMap, fileHeaders);
 
-        String addFileUrl = links.get("files") + "?access_token=" + this.environment.getProperty("zenodo.access_token");
-        ResponseEntity<String> addFileResponse = restTemplate.postForEntity(addFileUrl, addFileMapRequest, String.class);
-        Files.deleteIfExists(file.getFile().toPath());
+            String addFileUrl = links.get("files") + "?access_token=" + zenodoToken;
+            ResponseEntity<String> addFileResponse = restTemplate.postForEntity(addFileUrl, addFileMapRequest, String.class);
+            Files.deleteIfExists(file.getFile().toPath());
 
-        // Third post call to Zenodo to publish the entry and return the DOI.
-        String publishUrl = links.get("publish") + "?access_token=" + this.environment.getProperty("zenodo.access_token");
+
+            // Third post call to Zenodo to publish the entry and return the DOI.
+            publishUrl = links.get("publish") + "?access_token=" + zenodoToken;
+        } else {
+            publishUrl = unpublishedUrl + "?access_token=" + zenodoToken;
+        }
         Map<String, Object> publishResponce = restTemplate.postForObject(publishUrl, "", Map.class);
 
         dmp.setDoi((String) publishResponce.get("conceptdoi"));

From 744acd7abf4231a2db9711038a86807b6812dd7e Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Tue, 21 Apr 2020 12:41:37 +0300
Subject: [PATCH 33/60] Fixed issue when creating new Datasets

---
 .../elastic/repository/DatasetRepository.java     | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 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 34a314bb1..ebf02c512 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
@@ -49,14 +49,19 @@ public class DatasetRepository extends ElasticRepository<Dataset, DatasetCriteri
             XContentBuilder builder = XContentFactory.jsonBuilder();
             Dmp dmp = this.dmpRepository.findDocument(entity.getDmp().toString());
             boolean found = false;
-            for(int i = 0; i < dmp.getDatasets().size(); i++) {
-                if (dmp.getDatasets().get(i).getId().equals(entity.getId())) {
-                    dmp.getDatasets().set(i, entity);
-                    found = true;
-                    break;
+            if (dmp.getDatasets() != null && !dmp.getDatasets().isEmpty()) {
+                for (int i = 0; i < dmp.getDatasets().size(); i++) {
+                    if (dmp.getDatasets().get(i).getId().equals(entity.getId())) {
+                        dmp.getDatasets().set(i, entity);
+                        found = true;
+                        break;
+                    }
                 }
             }
             if (!found) {
+                if (dmp.getDatasets() == null) {
+                    dmp.setDatasets(new ArrayList<>());
+                }
                 dmp.getDatasets().add(entity);
             }
             IndexRequest request = new IndexRequest("dmps").id(dmp.getId().toString()).source(dmp.toElasticEntity(builder));//new IndexRequest("datasets", "doc", entity.getId()).source(entity.toElasticEntity(builder));

From ef40c5568fd2d42b558a395402238bf123f08639 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Tue, 21 Apr 2020 17:54:00 +0300
Subject: [PATCH 34/60] Removed unnecessary condition when retrieving DMPs

---
 .../eu/eudat/logic/managers/DataManagementPlanManager.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index 5473eb0e8..93dfc5691 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -161,8 +161,7 @@ public class DataManagementPlanManager {
                                             item.setDataset(
                                                     item.getDataset().stream()
                                                         .filter(dataset -> !dataset.getStatus().equals(Dataset.Status.DELETED.getValue()) && !dataset.getStatus().equals(Dataset.Status.CANCELED.getValue())).collect(Collectors.toList()).stream()
-                                                        .filter(dataset -> dataset.getDmp().getUsers().stream().filter(userDMP -> userDMP.getRole().equals(UserDMP.UserDMPRoles.OWNER.getValue())).findFirst().get().getUser().getId().equals(principalID)
-                                                                || dataset.getDmp().getUsers().stream()
+                                                        .filter(dataset ->  dataset.getDmp().getUsers().stream()
                                                                           .filter(x -> x.getUser().getId().equals(principalID))
                                                                           .collect(Collectors.toList()).size() > 0)
                                                         .collect(Collectors.toSet()));

From 4e686660894a5b5cd3dc9b2dea52d76ee384349f Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Wed, 22 Apr 2020 18:40:43 +0300
Subject: [PATCH 35/60] Re organize DMP controller and manager functions and
 added the ability to add custom organization (not configurable yet) (ref
 #255)

---
 .../main/java/eu/eudat/controllers/DMPs.java  |  195 +--
 .../security/ForbiddenException.java          |   19 +
 .../managers/DataManagementPlanManager.java   | 1311 +++++++++--------
 .../eudat/models/data/dmp/Organisation.java   |   16 +-
 dmp-frontend/src/app/ui/dmp/dmp.module.ts     |    7 +-
 .../add-organization.component.html           |   19 +
 .../add-organization.component.ts             |   43 +
 .../add-organization.model.ts                 |   33 +
 .../general-tab/general-tab.component.html    |    3 +
 .../general-tab/general-tab.component.ts      |   32 +
 .../ui/dmp/overview/dmp-overview.component.ts |    4 +-
 dmp-frontend/src/assets/i18n/en.json          |    8 +
 dmp-frontend/src/assets/i18n/es.json          |   21 +-
 13 files changed, 988 insertions(+), 723 deletions(-)
 create mode 100644 dmp-backend/web/src/main/java/eu/eudat/exceptions/security/ForbiddenException.java
 create mode 100644 dmp-frontend/src/app/ui/dmp/editor/add-organization/add-organization.component.html
 create mode 100644 dmp-frontend/src/app/ui/dmp/editor/add-organization/add-organization.component.ts
 create mode 100644 dmp-frontend/src/app/ui/dmp/editor/add-organization/add-organization.model.ts

diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java
index 109ff34c2..62ff0fe59 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java
@@ -82,13 +82,9 @@ public class DMPs extends BaseController {
         this.configLoader = configLoader;
     }
 
-    /*@Transactional
-    @RequestMapping(method = RequestMethod.GET, value = {"{id}/unlock"}, produces = "application/json")
-    public @ResponseBody
-    ResponseEntity<ResponseItem<DMP>> unlock(@PathVariable(value = "id") UUID id, Principal principal) throws Exception {
-        this.dataManagementPlanManager.unlock(id);
-        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DMP>().status(ApiMessageCode.SUCCESS_MESSAGE).message("Unlocked"));
-    }*/
+    /*
+    * Data Retrieval
+    * */
 
     @RequestMapping(method = RequestMethod.POST, value = {"/paged"}, consumes = "application/json", produces = "application/json")
     public @ResponseBody
@@ -102,11 +98,11 @@ public class DMPs extends BaseController {
     @RequestMapping(method = RequestMethod.GET, value = {"{id}"})
     public @ResponseBody
     ResponseEntity getSingle(@PathVariable String id, @RequestHeader("Content-Type") String contentType,
-							 @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) throws IllegalAccessException, InstantiationException, IOException {
+							 @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) throws Exception {
         if (contentType.equals("application/xml") || contentType.equals("application/msword")) {
             return this.dataManagementPlanManager.getDocument(id, contentType, principal, this.configLoader);
         } else {
-            eu.eudat.models.data.dmp.DataManagementPlan dataManagementPlan = this.dataManagementPlanManager.getSingle(id, principal);
+            eu.eudat.models.data.dmp.DataManagementPlan dataManagementPlan = this.dataManagementPlanManager.getSingle(id, principal, false);
             return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataManagementPlan>().status(ApiMessageCode.NO_MESSAGE).payload(dataManagementPlan));
         }
     }
@@ -118,17 +114,11 @@ public class DMPs extends BaseController {
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataTableData<DatasetProfileListingModel>>().status(ApiMessageCode.NO_MESSAGE).payload(datasetProfileTableData));
     }
 
-    @RequestMapping(method = RequestMethod.GET, value = {"rda/{id}"})
-    public @ResponseBody
-    ResponseEntity getRDAJsonDocument(@PathVariable String id, @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) throws IOException {
-        return this.dataManagementPlanManager.getRDAJsonDocument(id, datasetManager, principal);
-    }
-
     @RequestMapping(method = RequestMethod.GET, value = {"/overview/{id}"})
     public @ResponseBody
     ResponseEntity getOverviewSingle(@PathVariable String id,@ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) {
         try {
-            DataManagementPlanOverviewModel dataManagementPlan = this.dataManagementPlanManager.getOverviewSingle(id, principal);
+            DataManagementPlanOverviewModel dataManagementPlan = this.dataManagementPlanManager.getOverviewSingle(id, principal, false);
             return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataManagementPlanOverviewModel>().status(ApiMessageCode.NO_MESSAGE).payload(dataManagementPlan));
         } catch (Exception e) {
             if (e instanceof UnauthorisedException) {
@@ -141,26 +131,71 @@ public class DMPs extends BaseController {
 
     @RequestMapping(method = RequestMethod.GET, value = {"/public/{id}"})
     public @ResponseBody
-    ResponseEntity getSinglePublic(@PathVariable String id) {
-        try {
-            eu.eudat.models.data.dmp.DataManagementPlan dataManagementPlan = this.dataManagementPlanManager.getSinglePublic(id, this.dynamicGrantConfiguration);
-            return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataManagementPlan>().status(ApiMessageCode.NO_MESSAGE).payload(dataManagementPlan));
-        } catch (Exception ex) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<DataManagementPlan>().status(ApiMessageCode.NO_MESSAGE).message(ex.getMessage()));
-        }
+    ResponseEntity getSinglePublic(@PathVariable String id, @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) throws Exception {
+//        try {
+        eu.eudat.models.data.dmp.DataManagementPlan dataManagementPlan = this.dataManagementPlanManager.getSingle(id, principal, true);
+        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataManagementPlan>().status(ApiMessageCode.NO_MESSAGE).payload(dataManagementPlan));
+//        } catch (Exception ex) {
+//            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<DataManagementPlan>().status(ApiMessageCode.NO_MESSAGE).message(ex.getMessage()));
+//        }
     }
 
     @RequestMapping(method = RequestMethod.GET, value = {"/publicOverview/{id}"})
     public @ResponseBody
-    ResponseEntity getOverviewSinglePublic(@PathVariable String id) {
-        try {
-            DataManagementPlanOverviewModel dataManagementPlan = this.dataManagementPlanManager.getOverviewSinglePublic(id);
-            return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataManagementPlanOverviewModel>().status(ApiMessageCode.NO_MESSAGE).payload(dataManagementPlan));
-        } catch (Exception ex) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<DataManagementPlanOverviewModel>().status(ApiMessageCode.NO_MESSAGE).message(ex.getMessage()));
-        }
+    ResponseEntity getOverviewSinglePublic(@PathVariable String id, @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) throws Exception {
+//        try {
+        DataManagementPlanOverviewModel dataManagementPlan = this.dataManagementPlanManager.getOverviewSingle(id, principal, true);
+        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataManagementPlanOverviewModel>().status(ApiMessageCode.NO_MESSAGE).payload(dataManagementPlan));
+//        } catch (Exception ex) {
+//            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<DataManagementPlanOverviewModel>().status(ApiMessageCode.NO_MESSAGE).message(ex.getMessage()));
+//        }
     }
 
+    @RequestMapping(method = RequestMethod.POST, value = {"/dynamic"}, consumes = "application/json", produces = "application/json")
+    public @ResponseBody
+    ResponseEntity<ResponseItem<List<Tuple<String, String>>>> getWithCriteria(@RequestBody RequestItem<DynamicFieldsCriteria> criteriaRequestItem, Principal principal) throws InstantiationException, IllegalAccessException {
+        List<Tuple<String, String>> dataTable = this.dataManagementPlanManager.getDynamicFields(criteriaRequestItem.getCriteria().getId(), this.dynamicGrantConfiguration, criteriaRequestItem.getCriteria());
+        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<List<Tuple<String, String>>>().status(ApiMessageCode.NO_MESSAGE).payload(dataTable));
+    }
+
+    /*
+    * Data Export
+    * */
+
+    @RequestMapping(method = RequestMethod.GET, value = {"rda/{id}"})
+    public @ResponseBody
+    ResponseEntity getRDAJsonDocument(@PathVariable String id, @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) throws IOException {
+        return this.dataManagementPlanManager.getRDAJsonDocument(id, datasetManager, principal);
+    }
+
+    @RequestMapping(method = RequestMethod.GET, value = {"/getPDF/{id}"})
+    public @ResponseBody
+    ResponseEntity<byte[]> getPDFDocument(@PathVariable String id, @RequestHeader("Content-Type") String contentType,
+                                          @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) throws IllegalAccessException, IOException, InstantiationException, InterruptedException {
+        FileEnvelope file = this.dataManagementPlanManager.getWordDocument(id, principal, configLoader);
+        String name = file.getFilename().substring(0, file.getFilename().length() - 5);
+        File pdffile = datasetManager.convertToPDF(file, environment);
+        InputStream resource = new FileInputStream(pdffile);
+        logger.info("Mime Type of " + name + " is " +
+                new MimetypesFileTypeMap().getContentType(file.getFile()));
+        HttpHeaders responseHeaders = new HttpHeaders();
+        responseHeaders.setContentLength(pdffile.length());
+        responseHeaders.setContentType(MediaType.APPLICATION_OCTET_STREAM);
+        responseHeaders.set("Content-Disposition", "attachment;filename=" + name + ".pdf");
+        responseHeaders.set("Access-Control-Expose-Headers", "Content-Disposition");
+        responseHeaders.get("Access-Control-Expose-Headers").add("Content-Type");
+
+        byte[] content = org.apache.poi.util.IOUtils.toByteArray(resource);
+        resource.close();
+        Files.deleteIfExists(file.getFile().toPath());
+        Files.deleteIfExists(pdffile.toPath());
+        return new ResponseEntity<>(content, responseHeaders, HttpStatus.OK);
+    }
+
+    /*
+    * Data Management
+    * */
+
     @Transactional
     @RequestMapping(method = RequestMethod.POST, consumes = "application/json", produces = "application/json")
     public @ResponseBody
@@ -199,37 +234,6 @@ public class DMPs extends BaseController {
         }
     }
 
-    @RequestMapping(method = RequestMethod.POST, value = {"/dynamic"}, consumes = "application/json", produces = "application/json")
-    public @ResponseBody
-    ResponseEntity<ResponseItem<List<Tuple<String, String>>>> getWithCriteria(@RequestBody RequestItem<DynamicFieldsCriteria> criteriaRequestItem, Principal principal) throws InstantiationException, IllegalAccessException {
-        List<Tuple<String, String>> dataTable = this.dataManagementPlanManager.getDynamicFields(criteriaRequestItem.getCriteria().getId(), this.dynamicGrantConfiguration, criteriaRequestItem.getCriteria());
-        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<List<Tuple<String, String>>>().status(ApiMessageCode.NO_MESSAGE).payload(dataTable));
-    }
-
-    @RequestMapping(method = RequestMethod.GET, value = {"/getPDF/{id}"})
-    public @ResponseBody
-    ResponseEntity<byte[]> getPDFDocument(@PathVariable String id, @RequestHeader("Content-Type") String contentType,
-										  @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) throws IllegalAccessException, IOException, InstantiationException, InterruptedException {
-        FileEnvelope file = this.dataManagementPlanManager.getWordDocument(id, principal, configLoader);
-        String name = file.getFilename().substring(0, file.getFilename().length() - 5);
-        File pdffile = datasetManager.convertToPDF(file, environment);
-        InputStream resource = new FileInputStream(pdffile);
-        logger.info("Mime Type of " + name + " is " +
-                new MimetypesFileTypeMap().getContentType(file.getFile()));
-        HttpHeaders responseHeaders = new HttpHeaders();
-        responseHeaders.setContentLength(pdffile.length());
-        responseHeaders.setContentType(MediaType.APPLICATION_OCTET_STREAM);
-        responseHeaders.set("Content-Disposition", "attachment;filename=" + name + ".pdf");
-        responseHeaders.set("Access-Control-Expose-Headers", "Content-Disposition");
-        responseHeaders.get("Access-Control-Expose-Headers").add("Content-Type");
-
-        byte[] content = org.apache.poi.util.IOUtils.toByteArray(resource);
-        resource.close();
-        Files.deleteIfExists(file.getFile().toPath());
-        Files.deleteIfExists(pdffile.toPath());
-        return new ResponseEntity<>(content, responseHeaders, HttpStatus.OK);
-    }
-
     @RequestMapping(method = RequestMethod.POST, value = {"/upload"})
     public ResponseEntity<ResponseItem> dmpUpload(@RequestParam("file") MultipartFile[] files, Principal principal) throws Exception {
         if (files[0].getContentType().equals(APPLICATION_JSON.toString())) {
@@ -241,29 +245,6 @@ public class DMPs extends BaseController {
                 .status(ApiMessageCode.SUCCESS_MESSAGE));
     }
 
-    @RequestMapping(method = RequestMethod.POST, value = {"/public/paged"}, consumes = "application/json", produces = "application/json")
-    public @ResponseBody
-    ResponseEntity<ResponseItem<DataTableData<DataManagementPlanListingModel>>> getPublicPaged(@RequestBody DataManagmentPlanPublicTableRequest dmpTableRequest,
-                                                                                               @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal,
-                                                                                               @RequestParam String fieldsGroup) throws Exception {
-        DataTableData<DataManagementPlanListingModel> dmp = this.dataManagementPlanManager.getPublicPaged(dmpTableRequest, fieldsGroup, principal);
-        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataTableData<DataManagementPlanListingModel>>().status(ApiMessageCode.NO_MESSAGE).payload(dmp));
-    }
-
-    @RequestMapping(method = RequestMethod.POST, value = {"/test"}, consumes = "application/json", produces = "application/json")
-    public @ResponseBody
-    ResponseEntity<ResponseItem<DataTableData<Map>>> test(@RequestBody DMPCriteria criteria, @ClaimedAuthorities(claims = {Authorities.ANONYMOUS}) Principal principal) throws Exception {
-        DatabaseRepository dbRepo = this.getApiContext().getOperationsContext().getDatabaseRepository();
-
-        DMPQuery query = criteria.buildQuery(dbRepo);
-
-        List<Map> models = query.getQuery().toListWithFields();
-        DataTableData<Map> dmp = new DataTableData<>();
-        dmp.setData(models);
-        dmp.setTotalCount(query.getQuery().count());
-        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataTableData<Map>>().status(ApiMessageCode.NO_MESSAGE).payload(dmp));
-    }
-
     @RequestMapping(method = RequestMethod.GET, value = {"/makepublic/{id}"})
     public ResponseEntity<ResponseItem<DMP>> makePublic(@PathVariable String id, Principal principal) {
         try {
@@ -285,6 +266,10 @@ public class DMPs extends BaseController {
         }
     }
 
+    /*
+    * DOI Generation
+    * */
+
     @Transactional
     @RequestMapping(method = RequestMethod.POST, value = {"/createZenodoDoi/{id}"})
     public ResponseEntity<ResponseItem<String>> createZenodoDoi(@PathVariable String id, Principal principal) {
@@ -297,7 +282,11 @@ public class DMPs extends BaseController {
         }
     }
 
-    @javax.transaction.Transactional
+    /*
+    * Data Index
+    * */
+
+    @Transactional
     @RequestMapping(method = RequestMethod.POST, value = {"/index"})
     public @ResponseBody
     ResponseEntity<ResponseItem<Dataset>> generateIndex(Principal principal) throws Exception {
@@ -305,11 +294,45 @@ public class DMPs extends BaseController {
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<eu.eudat.data.entities.Dataset>().status(ApiMessageCode.SUCCESS_MESSAGE).message("Generated").payload(null));
     }
 
-    @javax.transaction.Transactional
+    @Transactional
     @RequestMapping(method = RequestMethod.DELETE, value = {"/index"})
     public @ResponseBody
     ResponseEntity<ResponseItem<Dataset>> clearIndex(Principal principal) throws Exception {
         this.dataManagementPlanManager.clearIndex(principal);
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<eu.eudat.data.entities.Dataset>().status(ApiMessageCode.SUCCESS_MESSAGE).message("Cleared").payload(null));
     }
+
+    /*
+    * Misc
+    * */
+
+    @RequestMapping(method = RequestMethod.POST, value = {"/test"}, consumes = "application/json", produces = "application/json")
+    public @ResponseBody
+    ResponseEntity<ResponseItem<DataTableData<Map>>> test(@RequestBody DMPCriteria criteria, @ClaimedAuthorities(claims = {Authorities.ANONYMOUS}) Principal principal) throws Exception {
+        DatabaseRepository dbRepo = this.getApiContext().getOperationsContext().getDatabaseRepository();
+
+        DMPQuery query = criteria.buildQuery(dbRepo);
+
+        List<Map> models = query.getQuery().toListWithFields();
+        DataTableData<Map> dmp = new DataTableData<>();
+        dmp.setData(models);
+        dmp.setTotalCount(query.getQuery().count());
+        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataTableData<Map>>().status(ApiMessageCode.NO_MESSAGE).payload(dmp));
+    }
+
+    /*@RequestMapping(method = RequestMethod.POST, value = {"/public/paged"}, consumes = "application/json", produces = "application/json")
+    public @ResponseBody
+    ResponseEntity<ResponseItem<DataTableData<DataManagementPlanListingModel>>> getPublicPaged(@RequestBody DataManagmentPlanPublicTableRequest dmpTableRequest,
+                                                                                               @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal,
+                                                                                               @RequestParam String fieldsGroup) throws Exception {
+        DataTableData<DataManagementPlanListingModel> dmp = this.dataManagementPlanManager.getPublicPaged(dmpTableRequest, fieldsGroup, principal);
+        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataTableData<DataManagementPlanListingModel>>().status(ApiMessageCode.NO_MESSAGE).payload(dmp));
+    }*/
+    /*@Transactional
+    @RequestMapping(method = RequestMethod.GET, value = {"{id}/unlock"}, produces = "application/json")
+    public @ResponseBody
+    ResponseEntity<ResponseItem<DMP>> unlock(@PathVariable(value = "id") UUID id, Principal principal) throws Exception {
+        this.dataManagementPlanManager.unlock(id);
+        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DMP>().status(ApiMessageCode.SUCCESS_MESSAGE).message("Unlocked"));
+    }*/
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/exceptions/security/ForbiddenException.java b/dmp-backend/web/src/main/java/eu/eudat/exceptions/security/ForbiddenException.java
new file mode 100644
index 000000000..dfd623dae
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/exceptions/security/ForbiddenException.java
@@ -0,0 +1,19 @@
+package eu.eudat.exceptions.security;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(value = HttpStatus.FORBIDDEN)
+public class ForbiddenException extends RuntimeException {
+	public ForbiddenException() {
+		super();
+	}
+
+	public ForbiddenException(String message) {
+		super(message);
+	}
+
+	public ForbiddenException(String message, Throwable cause) {
+		super(message, cause);
+	}
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index 93dfc5691..28f76210b 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -25,6 +25,7 @@ import eu.eudat.elastic.entities.Organization;
 import eu.eudat.elastic.entities.Tag;
 import eu.eudat.exceptions.datamanagementplan.DMPNewVersionException;
 import eu.eudat.exceptions.datamanagementplan.DMPWithDatasetsDeleteException;
+import eu.eudat.exceptions.security.ForbiddenException;
 import eu.eudat.exceptions.security.NonValidTokenException;
 import eu.eudat.exceptions.security.UnauthorisedException;
 import eu.eudat.logic.builders.entity.UserInfoBuilder;
@@ -125,6 +126,10 @@ public class DataManagementPlanManager {
         this.userManager = userManager;
     }
 
+    /*
+    * Data Retrieval
+    * */
+
     public DataTableData<DataManagementPlanListingModel> getPaged(DataManagementPlanTableRequest dataManagementPlanTableRequest, Principal principal, String fieldsGroup) throws Exception {
         UUID principalID = principal.getId();
         List<Dmp> dmps = null;
@@ -193,237 +198,22 @@ public class DataManagementPlanManager {
         return dataTable;
     }
 
-    public DataTableData<DataManagementPlanListingModel> getPublicPaged(DataManagmentPlanPublicTableRequest dataManagementPlanPublicTableRequest, String fieldsGroup, Principal principal) throws Exception {
-        dataManagementPlanPublicTableRequest.setQuery(databaseRepository.getDmpDao().asQueryable().withHint(HintedModelFactory.getHint(DataManagementPlanListingModel.class)));
-        QueryableList<DMP> items = dataManagementPlanPublicTableRequest.applyCriteria();
-
-        if (principal.getId() != null && dataManagementPlanPublicTableRequest.getCriteria().getRole() != null) {
-            items.where((builder, root) -> {
-                Join userJoin = root.join("users", JoinType.LEFT);
-                return builder.and(builder.equal(userJoin.join("user", JoinType.LEFT).get("id"), principal.getId()), builder.equal(userJoin.get("role"), dataManagementPlanPublicTableRequest.getCriteria().getRole()));
-            });
-        }
-        QueryableList<DMP> pagedItems = PaginationManager.applyPaging(items, dataManagementPlanPublicTableRequest);
-
-        DataTableData<DataManagementPlanListingModel> dataTable = new DataTableData<>();
-
-        CompletableFuture itemsFuture;
-        if (fieldsGroup.equals("listing")) {
-            itemsFuture = pagedItems.withHint(HintedModelFactory.getHint(DataManagementPlanListingModel.class))
-                    .selectAsync(item -> {
-                        item.setDataset(
-                                item.getDataset().stream()
-                                        .filter(dataset -> dataset.getStatus().equals(Dataset.Status.FINALISED.getValue())).collect(Collectors.toSet()));
-                        return new DataManagementPlanListingModel().fromDataModelDatasets(item);
-                    })
-                    .whenComplete((resultList, throwable) -> dataTable.setData(resultList));
-        } else {
-            itemsFuture = pagedItems
-                    .selectAsync(item -> new DataManagementPlanListingModel().fromDataModel(item))
-                    .whenComplete((resultList, throwable) -> dataTable.setData(resultList));
-        }
-
-        CompletableFuture countFuture = items.countAsync().whenComplete((count, throwable) -> {
-            dataTable.setTotalCount(count);
-        });
-        CompletableFuture.allOf(itemsFuture, countFuture).join();
-        return dataTable;
-    }
-
-    public void unlock(UUID uuid) throws Exception {
-        apiContext.getOperationsContext().getDatabaseRepository().getDmpDao()
-                .asQueryable().where((builder, root) -> builder.equal(root.get("id"), uuid))
-                .update(root -> root.get("status"), DMP.DMPStatus.ACTIVE.getValue());
-        return;
-    }
-
-    public FileEnvelope getWordDocument(String id, Principal principal, ConfigLoader configLoader) throws IOException {
-        return this.getWordDocument(id, principal, configLoader, false);
-    }
-
-    public FileEnvelope getWordDocument(String id, Principal principal, ConfigLoader configLoader, Boolean versioned) throws IOException {
-        WordBuilder wordBuilder = new WordBuilder();
-        VisibilityRuleService visibilityRuleService = this.utilitiesService.getVisibilityRuleService();
-        DatasetWizardModel dataset = new DatasetWizardModel();
-        XWPFDocument document = configLoader.getDocument();
-
-        eu.eudat.data.entities.DMP dmpEntity = databaseRepository.getDmpDao().find(UUID.fromString(id));
-		if (!dmpEntity.isPublic() && dmpEntity.getUsers().stream().filter(userInfo -> userInfo.getUser().getId() == principal.getId()).collect(Collectors.toList()).size() == 0)
-			throw new UnauthorisedException();
-
-		// DMP info on top of the document.
-        wordBuilder.addParagraphContent("Data Management Plan Information", document, ParagraphStyle.HEADER1, BigInteger.ZERO);
-        // DMP title custom style.
-        wordBuilder.addParagraphContent(dmpEntity.getLabel(), document, ParagraphStyle.HEADER2, BigInteger.ZERO);
-        wordBuilder.addParagraphContent(dmpEntity.getDescription(), document, ParagraphStyle.TEXT, BigInteger.ZERO);
-
-        wordBuilder.addParagraphContent("Funder", document, ParagraphStyle.HEADER3, BigInteger.ZERO);
-        if (dmpEntity.getGrant().getFunder() != null)
-            wordBuilder.addParagraphContent(dmpEntity.getGrant().getFunder().getLabel(), document, ParagraphStyle.TEXT, BigInteger.ZERO);
-
-        wordBuilder.addParagraphContent("Grant", document, ParagraphStyle.HEADER3, BigInteger.ZERO);
-        wordBuilder.addParagraphContent(dmpEntity.getGrant().getLabel(), document, ParagraphStyle.TEXT, BigInteger.ZERO);
-
-        wordBuilder.addParagraphContent("Organisations", document, ParagraphStyle.HEADER3, BigInteger.ZERO);
-        if (dmpEntity.getOrganisations().size() > 0) {
-            wordBuilder.addParagraphContent(dmpEntity.getOrganisations().stream().map(Organisation::getLabel).collect(Collectors.joining(", "))
-                    , document, ParagraphStyle.TEXT, BigInteger.ZERO);
-        }
-
-        wordBuilder.addParagraphContent("Researchers", document, ParagraphStyle.HEADER3, BigInteger.ZERO);
-        if (dmpEntity.getResearchers().size() > 0) {
-            wordBuilder.addParagraphContent(dmpEntity.getResearchers().stream().map(Researcher::getLabel).collect(Collectors.joining(", "))
-                    , document, ParagraphStyle.TEXT, BigInteger.ZERO);
-        }
-
-        /*wordBuilder.addParagraphContent("DMP Profile", document, ParagraphStyle.HEADER2, BigInteger.ZERO);
-        if (dmpEntity.getProfile() != null){
-            wordBuilder.addParagraphContent(dmpEntity.getProfile().getLabel(), document, ParagraphStyle.TEXT, BigInteger.ZERO);
-        }*/
-
-        // Page break at the end of the DMP title.
-        XWPFParagraph parBreakDMP = document.createParagraph();
-        parBreakDMP.setPageBreak(true);
-
-        wordBuilder.addParagraphContent("Datasets", document, ParagraphStyle.HEADER1, BigInteger.ZERO);
-        // Space below Datasets.
-        XWPFParagraph parBreakDatasets = document.createParagraph();
-        dmpEntity.getDataset().stream()
-                .filter(item -> item.getStatus() != Dataset.Status.CANCELED.getValue())
-                .filter(item -> item.getStatus() != Dataset.Status.DELETED.getValue())
-                .forEach(datasetEntity -> {
-                    Map<String, Object> properties = new HashMap<>();
-                    if (datasetEntity.getProperties() != null) {
-                        JSONObject jObject = new JSONObject(datasetEntity.getProperties());
-                        properties = jObject.toMap();
-                    }
-
-                    // Custom style for the Dataset title.
-                    //wordBuilder.addParagraphContent("Title: " + datasetEntity.getLabel(), document, ParagraphStyle.HEADER1, BigInteger.ZERO);
-                    XWPFParagraph datasetLabelParagraph = document.createParagraph();
-                    datasetLabelParagraph.setStyle("Heading2");
-                    XWPFRun runDatasetTitle1 = datasetLabelParagraph.createRun();
-                    runDatasetTitle1.setText("Title: ");
-                    runDatasetTitle1.setBold(true);
-                    runDatasetTitle1.setFontSize(12);
-                    XWPFRun runDatasetTitle = datasetLabelParagraph.createRun();
-                    runDatasetTitle.setText(datasetEntity.getLabel());
-                    runDatasetTitle.setColor("2E75B6");
-                    runDatasetTitle.setBold(true);
-                    runDatasetTitle.setFontSize(12);
-
-                    XWPFParagraph datasetTemplateParagraph = document.createParagraph();
-                    datasetTemplateParagraph.setStyle("Heading3");
-                    XWPFRun runDatasetTemplate1 = datasetTemplateParagraph.createRun();
-                    runDatasetTemplate1.setText("Template: ");
-                    runDatasetTemplate1.setBold(true);
-                    runDatasetTemplate1.setFontSize(12);
-                    XWPFRun runDatasetTemplate = datasetTemplateParagraph.createRun();
-                    runDatasetTemplate.setText(datasetEntity.getProfile().getLabel());
-                    runDatasetTemplate.setColor("2E75B6");
-                    runDatasetTemplate.setBold(true);
-                    runDatasetTemplate.setFontSize(12);
-
-                    XWPFParagraph externalReferencesParagraph = document.createParagraph();
-                    externalReferencesParagraph.setStyle("Heading3");
-                    XWPFRun externalReferencesRun = externalReferencesParagraph.createRun();
-                    externalReferencesRun.setText("External References");
-                    externalReferencesRun.setColor("2E75B6");
-                    externalReferencesRun.setBold(true);
-                    externalReferencesRun.setFontSize(12);
-
-                    wordBuilder.addParagraphContent("Data Repositories", document, ParagraphStyle.HEADER4, BigInteger.ZERO);
-                    if (datasetEntity.getDatasetDataRepositories().size() > 0) {
-                        wordBuilder.addParagraphContent(datasetEntity.getDatasetDataRepositories().stream().map(DatasetDataRepository::getDataRepository).map(DataRepository::getLabel).collect(Collectors.joining(", "))
-                                , document, ParagraphStyle.TEXT, BigInteger.ZERO);
-                    }
-                    wordBuilder.addParagraphContent("External Datasets", document, ParagraphStyle.HEADER4, BigInteger.ZERO);
-                    if (datasetEntity.getDatasetExternalDatasets().size() > 0) {
-                        wordBuilder.addParagraphContent(datasetEntity.getDatasetExternalDatasets().stream().map(DatasetExternalDataset::getExternalDataset).map(ExternalDataset::getLabel).collect(Collectors.joining(", "))
-                                , document, ParagraphStyle.TEXT, BigInteger.ZERO);
-                    }
-                    wordBuilder.addParagraphContent("Registries", document, ParagraphStyle.HEADER4, BigInteger.ZERO);
-                    if (datasetEntity.getRegistries().size() > 0) {
-                        wordBuilder.addParagraphContent(datasetEntity.getRegistries().stream().map(Registry::getLabel).collect(Collectors.joining(", "))
-                                , document, ParagraphStyle.TEXT, BigInteger.ZERO);
-                    }
-                    wordBuilder.addParagraphContent("Services", document, ParagraphStyle.HEADER4, BigInteger.ZERO);
-                    if (datasetEntity.getServices().size() > 0) {
-                        wordBuilder.addParagraphContent(datasetEntity.getServices().stream().map(DatasetService::getService).map(Service::getLabel).collect(Collectors.joining(", "))
-                                , document, ParagraphStyle.TEXT, BigInteger.ZERO);
-                    }
-                    /*wordBuilder.addParagraphContent("Tags", document, ParagraphStyle.HEADER3, BigInteger.ZERO);
-                    if (datasetEntity.().size() > 0) {
-                        wordBuilder.addParagraphContent(datasetEntity.getServices().stream().map(DatasetService::getService).map(Service::getLabel).collect(Collectors.joining(", "))
-                                , document, ParagraphStyle.HEADER4, BigInteger.ZERO);
-                    }*/
-
-
-                    wordBuilder.addParagraphContent(datasetEntity.getDescription(), document, ParagraphStyle.TEXT, BigInteger.ZERO);
-
-                    // Dataset Description custom style.
-                    XWPFParagraph datasetDescriptionParagraph = document.createParagraph();
-                    datasetDescriptionParagraph.setStyle("Heading3");
-                    XWPFRun datasetDescriptionRun = datasetDescriptionParagraph.createRun();
-                    datasetDescriptionRun.setText("Dataset Description");
-                    datasetDescriptionRun.setColor("2E75B6");
-                    datasetDescriptionRun.setBold(true);
-                    datasetDescriptionRun.setFontSize(12);
-
-                    PagedDatasetProfile pagedDatasetProfile = datasetManager.getPagedProfile(dataset, datasetEntity);
-                    visibilityRuleService.setProperties(properties);
-                    visibilityRuleService.buildVisibilityContext(pagedDatasetProfile.getRules());
-                    try {
-                        wordBuilder.build(document, pagedDatasetProfile, visibilityRuleService);
-                    } catch (IOException e) {
-                        logger.error(e.getMessage(), e);
-                    }
-                    // Page break at the end of the Dataset.
-                    XWPFParagraph parBreakDataset = document.createParagraph();
-                });
-
-        // Removes the top empty headings.
-        for (int i = 0; i < 6; i++) {
-            document.removeBodyElement(0);
-        }
-
-        String fileName = "";
-        if (versioned) {
-            fileName = dmpEntity.getLabel() + " v" + dmpEntity.getVersion();
-        } else {
-            fileName = dmpEntity.getLabel();
-        }
-        fileName = fileName.replaceAll("[^a-zA-Z0-9+ ]", "");
-        FileEnvelope exportEnvelope = new FileEnvelope();
-        exportEnvelope.setFilename(fileName + ".docx");
-        String uuid = UUID.randomUUID().toString();
-        File exportFile = new File(this.environment.getProperty("temp.temp") + uuid + ".docx");
-        FileOutputStream out = new FileOutputStream(exportFile);
-        document.write(out);
-        out.close();
-        exportEnvelope.setFile(exportFile);
-
-        return exportEnvelope;
-    }
-
-    /*public File getPdfDocument(String id) throws InstantiationException, IllegalAccessException, InterruptedException, IOException {
-        File file = this.getWordDocument(id);
-        String fileName = file.getName();
-        if (fileName.endsWith(".docx")){
-            fileName = fileName.substring(0, fileName.length() - 5);
-        }
-        return this.datasetManager.convertToPDF(file, environment, fileName);
-    }*/
-
-    public eu.eudat.models.data.dmp.DataManagementPlan getSingle(String id, Principal principal) {
+    public eu.eudat.models.data.dmp.DataManagementPlan getSingle(String id, Principal principal, boolean isPublic) throws Exception {
+        eu.eudat.models.data.dmp.DataManagementPlan dataManagementPlan = new eu.eudat.models.data.dmp.DataManagementPlan();
         DMP dataManagementPlanEntity = databaseRepository.getDmpDao().find(UUID.fromString(id));
-        if (dataManagementPlanEntity.getUsers().stream().noneMatch(userInfo -> userInfo.getUser().getId() == principal.getId())) {
+        if (!isPublic && principal == null) {
+            throw new UnauthorisedException();
+        } else if (!isPublic && (dataManagementPlanEntity.getUsers().stream().noneMatch(userInfo -> userInfo.getUser().getId() == principal.getId()))) {
             if (!dataManagementPlanEntity.isPublic()) {
                 throw new UnauthorisedException();
             }
+        } else if (isPublic && !dataManagementPlanEntity.isPublic()) {
+            throw new ForbiddenException("Selected DMP is not public");
         }
-        eu.eudat.models.data.dmp.DataManagementPlan dataManagementPlan = new eu.eudat.models.data.dmp.DataManagementPlan();
         dataManagementPlan.fromDataModel(dataManagementPlanEntity);
+        if (isPublic) {
+            dataManagementPlan.setDatasets(dataManagementPlan.getDatasets().stream().filter(dataset -> dataset.getStatus() == Dataset.Status.FINALISED.getValue()).collect(Collectors.toList()));
+        }
         Map dmpProperties = dataManagementPlanEntity.getDmpProperties() != null ? new org.json.JSONObject(dataManagementPlanEntity.getDmpProperties()).toMap() : null;
 
         if (dmpProperties != null && dataManagementPlan.getDynamicFields() != null)
@@ -435,72 +225,29 @@ public class DataManagementPlanManager {
         return dataManagementPlan;
     }
 
-    public DataManagementPlanOverviewModel getOverviewSingle(String id, Principal principal) throws Exception {
+    public DataManagementPlanOverviewModel getOverviewSingle(String id, Principal principal, boolean isPublic) throws Exception {
         DMP dataManagementPlanEntity = databaseRepository.getDmpDao().find(UUID.fromString(id));
         if (dataManagementPlanEntity.getStatus() == DMP.DMPStatus.DELETED.getValue()) {
             throw new Exception("DMP is deleted.");
         }
-        if (dataManagementPlanEntity.getUsers()
-                .stream().filter(userInfo -> userInfo.getUser().getId() == principal.getId())
-                .collect(Collectors.toList()).size() == 0)
+        if (!isPublic && principal == null) {
             throw new UnauthorisedException();
+        } else
+        if (!isPublic && dataManagementPlanEntity.getUsers()
+                                    .stream().noneMatch(userInfo -> userInfo.getUser().getId() == principal.getId())) {
+            throw new UnauthorisedException();
+        } else if (isPublic && !dataManagementPlanEntity.isPublic()) {
+            throw new ForbiddenException("Selected DMP is not public");
+        }
         DataManagementPlanOverviewModel datamanagementPlan = new DataManagementPlanOverviewModel();
         datamanagementPlan.fromDataModelDatasets(dataManagementPlanEntity);
+        if (isPublic) {
+            datamanagementPlan.setDatasets(datamanagementPlan.getDatasets().stream().filter(dataset -> dataset.getStatus() == Dataset.Status.FINALISED.getValue()).collect(Collectors.toList()));
+        }
 
         return datamanagementPlan;
     }
 
-    public eu.eudat.models.data.dmp.DataManagementPlan getSinglePublic(String id, DynamicGrantConfiguration dynamicGrantConfiguration) throws Exception {
-        DMP dataManagementPlanEntity = databaseRepository.getDmpDao().find(UUID.fromString(id));
-
-        if (dataManagementPlanEntity != null && dataManagementPlanEntity.getStatus() == 1) {
-            eu.eudat.models.data.dmp.DataManagementPlan datamanagementPlan = new eu.eudat.models.data.dmp.DataManagementPlan();
-            datamanagementPlan.fromDataModel(dataManagementPlanEntity);
-            datamanagementPlan.setDatasets(datamanagementPlan.getDatasets().stream().filter(dataset -> dataset.getStatus() == Dataset.Status.FINALISED.getValue()).collect(Collectors.toList()));
-            Map dmpProperties = dataManagementPlanEntity.getDmpProperties() != null ? new org.json.JSONObject(dataManagementPlanEntity.getDmpProperties()).toMap() : null;
-//            datamanagementPlan.setDynamicFields(dynamicGrantConfiguration.getFields().stream().map(item -> {
-//                DynamicFieldWithValue fieldWithValue = new DynamicFieldWithValue();
-//                fieldWithValue.setId(item.getId());
-//                fieldWithValue.setDependencies(item.getDependencies());
-//                fieldWithValue.setName(item.getName());
-//                fieldWithValue.setQueryProperty(item.getQueryProperty());
-//                fieldWithValue.setRequired(item.getRequired());
-//                return fieldWithValue;
-//            }).collect(Collectors.toList()));
-
-            if (dmpProperties != null && datamanagementPlan.getDynamicFields() != null)
-                datamanagementPlan.getDynamicFields().forEach(item -> {
-                    Map<String, String> properties = (Map<String, String>) dmpProperties.get(item.getId());
-                    if (properties != null)
-                        item.setValue(new Tuple<>(properties.get("id"), properties.get("label")));
-                });
-            return datamanagementPlan;
-        } else {
-            throw new Exception("Selected DMP is not public");
-        }
-    }
-
-    public DataManagementPlanOverviewModel getOverviewSinglePublic(String id) throws Exception {
-        DMP dataManagementPlanEntity = databaseRepository.getDmpDao().find(UUID.fromString(id));
-        if (dataManagementPlanEntity != null && dataManagementPlanEntity.getStatus() == 1) {
-            DataManagementPlanOverviewModel datamanagementPlan = new DataManagementPlanOverviewModel();
-            datamanagementPlan.fromDataModelDatasets(dataManagementPlanEntity);
-            datamanagementPlan.setDatasets(datamanagementPlan.getDatasets().stream().filter(dataset -> dataset.getStatus() == Dataset.Status.FINALISED.getValue()).collect(Collectors.toList()));
-            return datamanagementPlan;
-        } else {
-            throw new Exception("Selected DMP is not public");
-        }
-    }
-
-    public List<DataManagementPlan> getWithCriteria(DMPDao dmpsRepository, DataManagementPlanCriteriaRequest dataManagementPlanCriteria, Principal principal) throws IllegalAccessException, InstantiationException {
-        UUID principalID = principal.getId();
-        QueryableList<DMP> items = dmpsRepository.getWithCriteria(dataManagementPlanCriteria.getCriteria()).withHint(HintedModelFactory.getHint(DataManagementPlan.class));
-        List<Integer> roles = new LinkedList<>();
-        QueryableList<DMP> authenticatedItems = dmpsRepository.getAuthenticated(items, principalID, roles);
-        List<eu.eudat.models.data.dmp.DataManagementPlan> datamanagementPlans = authenticatedItems.select(item -> new DataManagementPlan().fromDataModel(item));
-        return datamanagementPlans;
-    }
-
     public List<Tuple<String, String>> getDynamicFields(String id, DynamicGrantConfiguration dynamicGrantConfiguration, DynamicFieldsCriteria criteria) throws IllegalAccessException, InstantiationException {
         List<Tuple<String, String>> result = new LinkedList<>();
         RestTemplate restTemplate = new RestTemplate();
@@ -510,13 +257,13 @@ public class DataManagementPlanManager {
         HttpEntity<String> entity = new HttpEntity<>("parameters", headers);
 
         Property property = dynamicGrantConfiguration.getConfiguration().getConfigurationProperties().stream()
-                .filter(item -> item.getId().equals(id)).findFirst().orElse(null);
+                                                     .filter(item -> item.getId().equals(id)).findFirst().orElse(null);
         StringBuilder stringBuilder = new StringBuilder();
         if (criteria.getLike() != null) stringBuilder.append("?search=" + criteria.getLike());
         if (property.getDependencies() != null && !property.getDependencies().isEmpty() && criteria.getDynamicFields() != null && !criteria.getDynamicFields().isEmpty()) {
             property.getDependencies().stream().forEach(item -> {
                 DynamicFieldsCriteria.DynamicFieldDependencyCriteria dependencyCriteria = criteria.getDynamicFields().stream().filter(dfield -> dfield.getProperty().equals(item.getId()))
-                        .findFirst().orElse(null);
+                                                                                                  .findFirst().orElse(null);
                 if (dependencyCriteria != null) {
                     if (criteria.getLike() != null || property.getDependencies().indexOf(item) > 0)
                         stringBuilder.append("&");
@@ -544,6 +291,24 @@ public class DataManagementPlanManager {
         return result;
     }
 
+    public DataTableData<DatasetProfileListingModel> getDatasetProfilesUsedByDMP(DatasetProfileTableRequestItem datasetProfileTableRequestItem, Principal principal) {
+        datasetProfileTableRequestItem.getCriteria().setFilter(DatasetProfileCriteria.DatasetProfileFilter.DMPs.getValue());
+        datasetProfileTableRequestItem.getCriteria().setUserId(principal.getId());
+
+        QueryableList<DatasetProfile> items = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().getWithCriteria(datasetProfileTableRequestItem.getCriteria());
+        List<DatasetProfileListingModel> listingModels = items.select(item -> new DatasetProfileListingModel().fromDataModel(item));
+
+        DataTableData<DatasetProfileListingModel> data = new DataTableData<>();
+        data.setData(listingModels);
+        data.setTotalCount((long) listingModels.size());
+
+        return data;
+    }
+
+    /*
+    * Data Management
+    * */
+
     public DMP createOrUpdate(ApiContext apiContext, DataManagementPlanEditorModel dataManagementPlan, Principal principal) throws Exception {
         boolean setNotification = false;
         if (dataManagementPlan.getId() != null) {
@@ -557,8 +322,8 @@ public class DataManagementPlanManager {
             }
             List<Dataset> datasetList = new ArrayList<>(dmp1.getDataset());
             for (Dataset dataset : datasetList) {
-            	if (dataManagementPlan.getProfiles().stream().filter(associatedProfile -> dataset.getProfile().getId().equals(associatedProfile.getId())).findAny().orElse(null) == null)
-            		throw new Exception("Dataset Template for Dataset Description is missing from the DMP.");
+                if (dataManagementPlan.getProfiles().stream().filter(associatedProfile -> dataset.getProfile().getId().equals(associatedProfile.getId())).findAny().orElse(null) == null)
+                    throw new Exception("Dataset Template for Dataset Description is missing from the DMP.");
             }
             if (dataManagementPlan.getStatus() == (int) DMP.DMPStatus.FINALISED.getValue() && dmp1.getStatus().equals(DMP.DMPStatus.FINALISED.getValue()))
                 throw new Exception("DMP is finalized, therefore cannot be edited.");
@@ -588,7 +353,7 @@ public class DataManagementPlanManager {
 
         newDmp.setCreated(dmp.getCreated() == null ? new Date() : dmp.getCreated());
         if (newDmp.getUsers()!= null && newDmp.getUsers().stream().filter(userInfo -> userInfo.getUser().getId() == principal.getId())
-                .collect(Collectors.toList()).size() == 0) {
+                                              .collect(Collectors.toList()).size() == 0) {
             List<UserDMP> userDMPList = new ArrayList<>(newDmp.getUsers());
             for (UserInfoListingModel userInfoListingModel : dataManagementPlan.getUsers()) {
                 for (UserDMP userDMP : userDMPList) {
@@ -611,8 +376,8 @@ public class DataManagementPlanManager {
         if (dataManagementPlan.getStatus() == DMP.DMPStatus.FINALISED.getValue()) {
             if (dataManagementPlan.getDatasetsToBeFinalized() != null && !dataManagementPlan.getDatasetsToBeFinalized().isEmpty()) {
                 apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao()
-                        .asQueryable().where((builder, root) -> root.get("id").in(dataManagementPlan.getDatasetsToBeFinalized()))
-                        .update(root -> root.<Integer>get("status"), Dataset.Status.FINALISED.getValue());
+                          .asQueryable().where((builder, root) -> root.get("id").in(dataManagementPlan.getDatasetsToBeFinalized()))
+                          .update(root -> root.<Integer>get("status"), Dataset.Status.FINALISED.getValue());
 
                 List<UUID> datasetsToBeCanceled = new LinkedList<>();
                 for (DatasetListingModel dataset : dataManagementPlan.getDatasets()) {
@@ -622,8 +387,8 @@ public class DataManagementPlanManager {
                 }
                 if (!datasetsToBeCanceled.isEmpty())
                     apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao()
-                            .asQueryable().where((builder, root) -> root.get("id").in(datasetsToBeCanceled))
-                            .update(root -> root.<Integer>get("status"), Dataset.Status.CANCELED.getValue());
+                              .asQueryable().where((builder, root) -> root.get("id").in(datasetsToBeCanceled))
+                              .update(root -> root.<Integer>get("status"), Dataset.Status.CANCELED.getValue());
             } else {
                 List<UUID> datasetsToBeCanceled = new LinkedList<>();
                 for (DatasetListingModel dataset : dataManagementPlan.getDatasets()) {
@@ -633,8 +398,8 @@ public class DataManagementPlanManager {
                 }
                 if (!datasetsToBeCanceled.isEmpty())
                     apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao()
-                            .asQueryable().where((builder, root) -> root.get("id").in(datasetsToBeCanceled))
-                            .update(root -> root.<Integer>get("status"), Dataset.Status.CANCELED.getValue());
+                              .asQueryable().where((builder, root) -> root.get("id").in(datasetsToBeCanceled))
+                              .update(root -> root.<Integer>get("status"), Dataset.Status.CANCELED.getValue());
             }
         }
 
@@ -654,56 +419,6 @@ public class DataManagementPlanManager {
         return newDmp;
     }
 
-    private void sendNotification(DMP dmp, UserInfo user, NotificationType notificationType) {
-        List<UserDMP> userDMPS = databaseRepository.getUserDmpDao().asQueryable().where(((builder, root) -> builder.equal(root.get("dmp").get("id"), dmp.getId()))).toList();
-        for (UserDMP userDMP : userDMPS) {
-            if (!userDMP.getUser().getId().equals(user.getId())) {
-                Notification notification = new Notification();
-                notification.setUserId(user);
-                notification.setType(notificationType);
-                notification.setNotifyState(NotifyState.PENDING);
-                notification.setIsActive(ActiveStatus.ACTIVE);
-                notification.setData("{" +
-                                "\"userId\": \"" + userDMP.getUser().getId() + "\"" +
-                        ", \"id\": \"" + userDMP.getDmp().getId() + "\"" +
-                        ", \"name\": \"" + userDMP.getDmp().getLabel() + "\"" +
-                        ", \"path\": \"" + notificationPaths.get(notificationType) +"\"" +
-                        "}");
-                notification.setCreatedAt(new Date());
-                notification.setUpdatedAt(notification.getCreatedAt());
-                notification.setContactTypeHint(ContactType.EMAIL);
-                notification.setContactHint(userDMP.getUser().getEmail());
-                databaseRepository.getNotificationDao().createOrUpdate(notification);
-            }
-        }
-
-    }
-
-    private void assignUser(DMP dmp, UserInfo userInfo) {
-        UserDMP userDMP = new UserDMP();
-        userDMP.setDmp(dmp);
-        userDMP.setUser(userInfo);
-        userDMP.setRole(UserDMP.UserDMPRoles.OWNER.getValue());
-        databaseRepository.getUserDmpDao().createOrUpdate(userDMP);
-    }
-
-    private void updateGroupIndex(UUID groupId) {
-        DataManagementPlanCriteria criteria = new DataManagementPlanCriteria();
-        criteria.setGroupIds(Collections.singletonList(groupId));
-        criteria.setAllVersions(true);
-        List<DMP> dmps = databaseRepository.getDmpDao().getWithCriteria(criteria).toList();
-        for (DMP dmp: dmps) {
-            try {
-                if (dmp.getUsers() != null) {
-                    logger.info(dmp.getUsers().toString());
-                }
-                this.updateIndex(dmp);
-            } catch (IOException e) {
-                logger.error(e.getMessage(), e);
-            }
-        }
-    }
-
     public void newVersion(UUID uuid, DataManagementPlanNewVersionModel dataManagementPlan, Principal principal) throws Exception {
         DMP oldDmp = databaseRepository.getDmpDao().find(uuid);
         if (!isUserOwnerOfDmp(oldDmp, principal)) {
@@ -850,11 +565,21 @@ public class DataManagementPlanManager {
     private void createOrganisationsIfTheyDontExist(DMP newDmp, OrganisationDao organisationRepository) {
         if (newDmp.getOrganisations() != null && !newDmp.getOrganisations().isEmpty()) {
             for (eu.eudat.data.entities.Organisation organisation : newDmp.getOrganisations()) {
-                OrganisationCriteria criteria = new OrganisationCriteria();
-                criteria.setLike(organisation.getReference());
-                List<eu.eudat.data.entities.Organisation> entries = organisationRepository.getWithCriteria(criteria).toList();
-                if (entries != null && !entries.isEmpty()) organisation.setId(entries.get(0).getId());
-                else organisationRepository.createOrUpdate(organisation);
+                boolean createNew = false;
+                if (organisation.getReference() != null) {
+                    OrganisationCriteria criteria = new OrganisationCriteria();
+                    criteria.setLike(organisation.getReference());
+                    List<eu.eudat.data.entities.Organisation> entries = organisationRepository.getWithCriteria(criteria).toList();
+                    if (entries != null && !entries.isEmpty()) organisation.setId(entries.get(0).getId());
+                    else createNew = true;
+                } else {
+                    createNew = true;
+                }
+
+                if (createNew) {
+                    organisation.setReference("Internal:" + UUID.randomUUID().toString());
+                    organisationRepository.createOrUpdate(organisation);
+                }
             }
         }
     }
@@ -921,51 +646,6 @@ public class DataManagementPlanManager {
         }
     }
 
-    private void checkIfUserCanEditGrant(DMP dmp, UserInfo user) throws Exception{
-        if (dmp.getGrant().getId() != null) {
-            Grant grant = apiContext.getOperationsContext().getDatabaseRepository().getGrantDao().find(dmp.getGrant().getId());
-            if (grant.getFunder() != null && dmp.getGrant().getFunder() != null
-                    && !grant.getFunder().getId().equals(dmp.getGrant().getFunder().getId())) {
-                if (grant.getCreationUser() == null) {
-                    throw new Exception("Grant has no user, therefore, cannot be edited.");
-                }
-                if (!grant.getCreationUser().getId().equals(user.getId())) {
-                    throw new Exception("User is not the owner of the Grant, therefore, cannot edit it.");
-                }
-            }
-        }
-    }
-
-    private void checkDmpValidationRules(DMP dmp) throws Exception {
-        if (dmp.getLabel() == null || dmp.getLabel().trim().isEmpty()) {
-            throw new Exception("DMP has no label.");
-        }
-        if (dmp.getAssociatedDmps().size() == 0) {
-            throw new Exception("DMP does not contain Dataset Templates.");
-        }
-        if (dmp.getGrant() == null) {
-            throw new Exception("DMP has no Grant assigned.");
-        }
-    }
-
-    private void assignGrandUserIfInternal(DMP dmp, UserInfo user) {
-        if (dmp.getGrant().getCreationUser() == null && (dmp.getGrant().getReference() != null && dmp.getGrant().getReference().startsWith("dmp:"))) {
-            dmp.getGrant().setCreationUser(user);
-        }
-    }
-
-    private void assignFunderUserIfInternal(DMP dmp, UserInfo user) {
-        if (dmp.getGrant().getFunder().getCreationUser() == null && ( dmp.getGrant().getFunder().getReference() != null && dmp.getGrant().getFunder().getReference().startsWith("dmp:"))) {
-            dmp.getGrant().getFunder().setCreationUser(user);
-        }
-    }
-
-    private void assignProjectUserIfInternal(DMP dmp, UserInfo user) {
-        if (dmp.getProject().getCreationUser() == null && (dmp.getProject().getReference() != null && dmp.getProject().getReference().startsWith("dmp:"))) {
-            dmp.getProject().setCreationUser(user);
-        }
-    }
-
     private void copyDatasets(DMP newDmp, DatasetDao datasetDao) {
         List<CompletableFuture<Dataset>> futures = new LinkedList<>();
         for (Dataset dataset : newDmp.getDataset()) {
@@ -985,58 +665,58 @@ public class DataManagementPlanManager {
                 logger.error(e.getMessage(), e);
             }
             datasetDao.asQueryable().withHint(HintedModelFactory.getHint(DatasetListingModel.class)).where((builder, root) -> builder.equal(root.get("id"), dataset.getId())).getSingleAsync()
-                    .thenApplyAsync(entityDataset -> {
-                        Dataset newDataset = new Dataset();
-                        newDataset.update(entityDataset);
-                        newDataset.setDmp(newDmp);
-                        newDataset.setStatus(Dataset.Status.SAVED.getValue());
-                        if (newDataset.getDatasetDataRepositories() != null) {
-                            newDataset.setDatasetDataRepositories(newDataset.getDatasetDataRepositories().stream().map(item -> {
-                                DataRepository dataRepository = new DataRepository();
-                                dataRepository.setId(item.getDataRepository().getId());
+                      .thenApplyAsync(entityDataset -> {
+                          Dataset newDataset = new Dataset();
+                          newDataset.update(entityDataset);
+                          newDataset.setDmp(newDmp);
+                          newDataset.setStatus(Dataset.Status.SAVED.getValue());
+                          if (newDataset.getDatasetDataRepositories() != null) {
+                              newDataset.setDatasetDataRepositories(newDataset.getDatasetDataRepositories().stream().map(item -> {
+                                  DataRepository dataRepository = new DataRepository();
+                                  dataRepository.setId(item.getDataRepository().getId());
 
-                                DatasetDataRepository datasetDataRepository = new DatasetDataRepository();
-                                datasetDataRepository.setDataRepository(dataRepository);
-                                datasetDataRepository.setDataset(newDataset);
-                                datasetDataRepository.setData(item.getData());
-                                return datasetDataRepository;
-                            }).collect(Collectors.toSet()));
-                        }
+                                  DatasetDataRepository datasetDataRepository = new DatasetDataRepository();
+                                  datasetDataRepository.setDataRepository(dataRepository);
+                                  datasetDataRepository.setDataset(newDataset);
+                                  datasetDataRepository.setData(item.getData());
+                                  return datasetDataRepository;
+                              }).collect(Collectors.toSet()));
+                          }
 
-                        if (newDataset.getDatasetExternalDatasets() != null) {
-                            newDataset.setDatasetExternalDatasets(newDataset.getDatasetExternalDatasets().stream().map(item -> {
-                                ExternalDataset externalDataset = new ExternalDataset();
-                                externalDataset.setId(item.getExternalDataset().getId());
-                                DatasetExternalDataset datasetExternalDataset = new DatasetExternalDataset();
-                                datasetExternalDataset.setExternalDataset(externalDataset);
-                                datasetExternalDataset.setDataset(newDataset);
-                                datasetExternalDataset.setData(item.getData());
-                                return datasetExternalDataset;
-                            }).collect(Collectors.toSet()));
-                        }
+                          if (newDataset.getDatasetExternalDatasets() != null) {
+                              newDataset.setDatasetExternalDatasets(newDataset.getDatasetExternalDatasets().stream().map(item -> {
+                                  ExternalDataset externalDataset = new ExternalDataset();
+                                  externalDataset.setId(item.getExternalDataset().getId());
+                                  DatasetExternalDataset datasetExternalDataset = new DatasetExternalDataset();
+                                  datasetExternalDataset.setExternalDataset(externalDataset);
+                                  datasetExternalDataset.setDataset(newDataset);
+                                  datasetExternalDataset.setData(item.getData());
+                                  return datasetExternalDataset;
+                              }).collect(Collectors.toSet()));
+                          }
 
-                        if (newDataset.getRegistries() != null) {
-                            newDataset.setRegistries(newDataset.getRegistries().stream().map(item -> {
-                                Registry registry = new Registry();
-                                registry.setId(item.getId());
-                                return registry;
-                            }).collect(Collectors.toSet()));
-                        }
+                          if (newDataset.getRegistries() != null) {
+                              newDataset.setRegistries(newDataset.getRegistries().stream().map(item -> {
+                                  Registry registry = new Registry();
+                                  registry.setId(item.getId());
+                                  return registry;
+                              }).collect(Collectors.toSet()));
+                          }
 
-                        if (newDataset.getServices() != null) {
-                            newDataset.setServices(newDataset.getServices().stream().map(item -> {
-                                Service service = new Service();
-                                service.setId(item.getId());
-                                DatasetService datasetService = new DatasetService();
-                                datasetService.setService(service);
-                                datasetService.setDataset(newDataset);
-                                datasetService.setData(item.getData());
-                                return datasetService;
-                            }).collect(Collectors.toSet()));
-                        }
-                        newDataset.setCreated(new Date());
-                        return newDataset;
-                    }).thenApplyAsync(item -> {
+                          if (newDataset.getServices() != null) {
+                              newDataset.setServices(newDataset.getServices().stream().map(item -> {
+                                  Service service = new Service();
+                                  service.setId(item.getId());
+                                  DatasetService datasetService = new DatasetService();
+                                  datasetService.setService(service);
+                                  datasetService.setDataset(newDataset);
+                                  datasetService.setData(item.getData());
+                                  return datasetService;
+                              }).collect(Collectors.toSet()));
+                          }
+                          newDataset.setCreated(new Date());
+                          return newDataset;
+                      }).thenApplyAsync(item -> {
                 futures.add(datasetDao.createOrUpdateAsync(item).whenComplete(((dataset1, throwable) -> {
                     eu.eudat.elastic.entities.Dataset datasetElastic = new eu.eudat.elastic.entities.Dataset();
                     datasetElastic.setId(dataset1.getId().toString());
@@ -1051,7 +731,7 @@ public class DataManagementPlanManager {
                         datasetElastic.setCollaborators(dataset1.getDmp().getUsers().stream().map(user -> {
                             Collaborator collaborator = new Collaborator();
                             collaborator.setId(user.getId().toString());
-                          //  collaborator.setName(user.getUser().getName());
+                            //  collaborator.setName(user.getUser().getName());
                             return collaborator;
                         }).collect(Collectors.toList()));
                     }
@@ -1085,12 +765,269 @@ public class DataManagementPlanManager {
         }
     }
 
+    public void makePublic(UUID id, Principal principal) throws Exception {
+        DMP dmp = this.apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().find(id);
+        // Check if dmp is finalized and if user is owner.
+        if (!isUserOwnerOfDmp(dmp, principal))
+            throw new Exception("User does not have the privilege to do this action.");
+        if (!dmp.getStatus().equals(DMP.DMPStatus.FINALISED.getValue()))
+            throw new Exception("DMP is not finalized");
+        dmp.setPublic(true);
+        apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().createOrUpdate(dmp);
+        this.updateIndex(dmp);
+        DataManagementPlanCriteria criteria = new DataManagementPlanCriteria();
+        criteria.setGroupIds(Collections.singletonList(dmp.getGroupId()));
+        criteria.setAllVersions(true);
+        apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().getWithCriteria(criteria).toList().stream().forEach(dmp1 -> {
+            dmp1.getDataset().forEach(dataset -> {
+                try {
+                    List<Tag> tags = new ArrayList<>();
+                    eu.eudat.elastic.entities.Dataset elastic = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString());
+                    if (elastic != null) {
+                        tags = elastic.getTags();
+                    }
+                    this.datasetManager.updateTags(dataset, tags);
+                } catch (Exception e) {
+                    logger.error(e.getMessage(), e);
+                }
+            });
+        });
+        UserInfo user = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(principal.getId());
+        sendNotification(dmp, user, NotificationType.DMP_PUBLISH);
+    }
+
+    public void makeFinalize(UUID id, Principal principal, DatasetsToBeFinalized datasetsToBeFinalized) throws Exception {
+        DMP dmp = this.apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().find(id);
+        if (!isUserOwnerOfDmp(dmp, principal))
+            throw new Exception("User does not have the privilege to do this action.");
+        if (dmp.getStatus().equals(DMP.DMPStatus.FINALISED.getValue()))
+            throw new Exception("DMP is already finalized");
+        dmp.setStatus(DMP.DMPStatus.FINALISED.getValue());
+        apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().createOrUpdate(dmp);
+        this.updateIndex(dmp);
+        List<Dataset> indexDatasets = new ArrayList<>();
+        if (datasetsToBeFinalized != null && datasetsToBeFinalized.getUuids() != null && !datasetsToBeFinalized.getUuids().isEmpty()) {
+            apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao()
+                      .asQueryable().where((builder, root) -> root.get("id").in(datasetsToBeFinalized.getUuids()))
+                      .update(root -> root.<Integer>get("status"), Dataset.Status.FINALISED.getValue());
+            List<Dataset> finalizedDatasets = dmp.getDataset().stream().filter(dataset -> datasetsToBeFinalized.getUuids().contains(dataset.getId())).collect(Collectors.toList());
+            finalizedDatasets.forEach(dataset -> dataset.setStatus(Dataset.Status.FINALISED.getValue()));
+            indexDatasets.addAll(finalizedDatasets);
+            List<UUID> datasetsToBeCanceled = new LinkedList<>();
+            for (Dataset dataset : dmp.getDataset()) {
+                if (!dataset.getStatus().equals(Dataset.Status.FINALISED.getValue()) && !datasetsToBeFinalized.getUuids().contains(dataset.getId())) {
+                    datasetsToBeCanceled.add(dataset.getId());
+                }
+            }
+            if (!datasetsToBeCanceled.isEmpty()) {
+                apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao()
+                          .asQueryable().where((builder, root) -> root.get("id").in(datasetsToBeCanceled))
+                          .update(root -> root.<Integer>get("status"), Dataset.Status.CANCELED.getValue());
+                List<Dataset> cancelledDatasets = dmp.getDataset().stream().filter(dataset -> datasetsToBeCanceled.contains(dataset.getId())).collect(Collectors.toList());
+                cancelledDatasets.forEach(dataset -> dataset.setStatus(Dataset.Status.CANCELED.getValue()));
+                indexDatasets.addAll(cancelledDatasets);
+            }
+        } else {
+            List<UUID> datasetsToBeCanceled = new LinkedList<>();
+            for (Dataset dataset : dmp.getDataset()) {
+                if (!dataset.getStatus().equals(Dataset.Status.FINALISED.getValue())) {
+                    datasetsToBeCanceled.add(dataset.getId());
+                }
+            }
+            if (!datasetsToBeCanceled.isEmpty()) {
+                apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao()
+                          .asQueryable().where((builder, root) -> root.get("id").in(datasetsToBeCanceled))
+                          .update(root -> root.<Integer>get("status"), Dataset.Status.CANCELED.getValue());
+                List<Dataset> cancelledDatasets = dmp.getDataset().stream().filter(dataset -> datasetsToBeCanceled.contains(dataset.getId())).collect(Collectors.toList());
+                cancelledDatasets.forEach(dataset -> dataset.setStatus(Dataset.Status.CANCELED.getValue()));
+                indexDatasets.addAll(cancelledDatasets);
+            }
+
+            UserInfo user = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(principal.getId());
+            sendNotification(dmp, user, NotificationType.DMP_FINALISED);
+        }
+        this.updateDatasetsIndex(indexDatasets);
+    }
+
+    /*
+    * Export Data
+    * */
+
+    public FileEnvelope getWordDocument(String id, Principal principal, ConfigLoader configLoader) throws IOException {
+        return this.getWordDocument(id, principal, configLoader, false);
+    }
+
+    public FileEnvelope getWordDocument(String id, Principal principal, ConfigLoader configLoader, Boolean versioned) throws IOException {
+        WordBuilder wordBuilder = new WordBuilder();
+        VisibilityRuleService visibilityRuleService = this.utilitiesService.getVisibilityRuleService();
+        DatasetWizardModel dataset = new DatasetWizardModel();
+        XWPFDocument document = configLoader.getDocument();
+
+        eu.eudat.data.entities.DMP dmpEntity = databaseRepository.getDmpDao().find(UUID.fromString(id));
+        if (!dmpEntity.isPublic() && dmpEntity.getUsers().stream().filter(userInfo -> userInfo.getUser().getId() == principal.getId()).collect(Collectors.toList()).size() == 0)
+            throw new UnauthorisedException();
+
+        // DMP info on top of the document.
+        wordBuilder.addParagraphContent("Data Management Plan Information", document, ParagraphStyle.HEADER1, BigInteger.ZERO);
+        // DMP title custom style.
+        wordBuilder.addParagraphContent(dmpEntity.getLabel(), document, ParagraphStyle.HEADER2, BigInteger.ZERO);
+        wordBuilder.addParagraphContent(dmpEntity.getDescription(), document, ParagraphStyle.TEXT, BigInteger.ZERO);
+
+        wordBuilder.addParagraphContent("Funder", document, ParagraphStyle.HEADER3, BigInteger.ZERO);
+        if (dmpEntity.getGrant().getFunder() != null)
+            wordBuilder.addParagraphContent(dmpEntity.getGrant().getFunder().getLabel(), document, ParagraphStyle.TEXT, BigInteger.ZERO);
+
+        wordBuilder.addParagraphContent("Grant", document, ParagraphStyle.HEADER3, BigInteger.ZERO);
+        wordBuilder.addParagraphContent(dmpEntity.getGrant().getLabel(), document, ParagraphStyle.TEXT, BigInteger.ZERO);
+
+        wordBuilder.addParagraphContent("Organisations", document, ParagraphStyle.HEADER3, BigInteger.ZERO);
+        if (dmpEntity.getOrganisations().size() > 0) {
+            wordBuilder.addParagraphContent(dmpEntity.getOrganisations().stream().map(Organisation::getLabel).collect(Collectors.joining(", "))
+                    , document, ParagraphStyle.TEXT, BigInteger.ZERO);
+        }
+
+        wordBuilder.addParagraphContent("Researchers", document, ParagraphStyle.HEADER3, BigInteger.ZERO);
+        if (dmpEntity.getResearchers().size() > 0) {
+            wordBuilder.addParagraphContent(dmpEntity.getResearchers().stream().map(Researcher::getLabel).collect(Collectors.joining(", "))
+                    , document, ParagraphStyle.TEXT, BigInteger.ZERO);
+        }
+
+        /*wordBuilder.addParagraphContent("DMP Profile", document, ParagraphStyle.HEADER2, BigInteger.ZERO);
+        if (dmpEntity.getProfile() != null){
+            wordBuilder.addParagraphContent(dmpEntity.getProfile().getLabel(), document, ParagraphStyle.TEXT, BigInteger.ZERO);
+        }*/
+
+        // Page break at the end of the DMP title.
+        XWPFParagraph parBreakDMP = document.createParagraph();
+        parBreakDMP.setPageBreak(true);
+
+        wordBuilder.addParagraphContent("Datasets", document, ParagraphStyle.HEADER1, BigInteger.ZERO);
+        // Space below Datasets.
+        XWPFParagraph parBreakDatasets = document.createParagraph();
+        dmpEntity.getDataset().stream()
+                 .filter(item -> item.getStatus() != Dataset.Status.CANCELED.getValue())
+                 .filter(item -> item.getStatus() != Dataset.Status.DELETED.getValue())
+                 .forEach(datasetEntity -> {
+                     Map<String, Object> properties = new HashMap<>();
+                     if (datasetEntity.getProperties() != null) {
+                         JSONObject jObject = new JSONObject(datasetEntity.getProperties());
+                         properties = jObject.toMap();
+                     }
+
+                     // Custom style for the Dataset title.
+                     //wordBuilder.addParagraphContent("Title: " + datasetEntity.getLabel(), document, ParagraphStyle.HEADER1, BigInteger.ZERO);
+                     XWPFParagraph datasetLabelParagraph = document.createParagraph();
+                     datasetLabelParagraph.setStyle("Heading2");
+                     XWPFRun runDatasetTitle1 = datasetLabelParagraph.createRun();
+                     runDatasetTitle1.setText("Title: ");
+                     runDatasetTitle1.setBold(true);
+                     runDatasetTitle1.setFontSize(12);
+                     XWPFRun runDatasetTitle = datasetLabelParagraph.createRun();
+                     runDatasetTitle.setText(datasetEntity.getLabel());
+                     runDatasetTitle.setColor("2E75B6");
+                     runDatasetTitle.setBold(true);
+                     runDatasetTitle.setFontSize(12);
+
+                     XWPFParagraph datasetTemplateParagraph = document.createParagraph();
+                     datasetTemplateParagraph.setStyle("Heading3");
+                     XWPFRun runDatasetTemplate1 = datasetTemplateParagraph.createRun();
+                     runDatasetTemplate1.setText("Template: ");
+                     runDatasetTemplate1.setBold(true);
+                     runDatasetTemplate1.setFontSize(12);
+                     XWPFRun runDatasetTemplate = datasetTemplateParagraph.createRun();
+                     runDatasetTemplate.setText(datasetEntity.getProfile().getLabel());
+                     runDatasetTemplate.setColor("2E75B6");
+                     runDatasetTemplate.setBold(true);
+                     runDatasetTemplate.setFontSize(12);
+
+                     XWPFParagraph externalReferencesParagraph = document.createParagraph();
+                     externalReferencesParagraph.setStyle("Heading3");
+                     XWPFRun externalReferencesRun = externalReferencesParagraph.createRun();
+                     externalReferencesRun.setText("External References");
+                     externalReferencesRun.setColor("2E75B6");
+                     externalReferencesRun.setBold(true);
+                     externalReferencesRun.setFontSize(12);
+
+                     wordBuilder.addParagraphContent("Data Repositories", document, ParagraphStyle.HEADER4, BigInteger.ZERO);
+                     if (datasetEntity.getDatasetDataRepositories().size() > 0) {
+                         wordBuilder.addParagraphContent(datasetEntity.getDatasetDataRepositories().stream().map(DatasetDataRepository::getDataRepository).map(DataRepository::getLabel).collect(Collectors.joining(", "))
+                                 , document, ParagraphStyle.TEXT, BigInteger.ZERO);
+                     }
+                     wordBuilder.addParagraphContent("External Datasets", document, ParagraphStyle.HEADER4, BigInteger.ZERO);
+                     if (datasetEntity.getDatasetExternalDatasets().size() > 0) {
+                         wordBuilder.addParagraphContent(datasetEntity.getDatasetExternalDatasets().stream().map(DatasetExternalDataset::getExternalDataset).map(ExternalDataset::getLabel).collect(Collectors.joining(", "))
+                                 , document, ParagraphStyle.TEXT, BigInteger.ZERO);
+                     }
+                     wordBuilder.addParagraphContent("Registries", document, ParagraphStyle.HEADER4, BigInteger.ZERO);
+                     if (datasetEntity.getRegistries().size() > 0) {
+                         wordBuilder.addParagraphContent(datasetEntity.getRegistries().stream().map(Registry::getLabel).collect(Collectors.joining(", "))
+                                 , document, ParagraphStyle.TEXT, BigInteger.ZERO);
+                     }
+                     wordBuilder.addParagraphContent("Services", document, ParagraphStyle.HEADER4, BigInteger.ZERO);
+                     if (datasetEntity.getServices().size() > 0) {
+                         wordBuilder.addParagraphContent(datasetEntity.getServices().stream().map(DatasetService::getService).map(Service::getLabel).collect(Collectors.joining(", "))
+                                 , document, ParagraphStyle.TEXT, BigInteger.ZERO);
+                     }
+                    /*wordBuilder.addParagraphContent("Tags", document, ParagraphStyle.HEADER3, BigInteger.ZERO);
+                    if (datasetEntity.().size() > 0) {
+                        wordBuilder.addParagraphContent(datasetEntity.getServices().stream().map(DatasetService::getService).map(Service::getLabel).collect(Collectors.joining(", "))
+                                , document, ParagraphStyle.HEADER4, BigInteger.ZERO);
+                    }*/
+
+
+                     wordBuilder.addParagraphContent(datasetEntity.getDescription(), document, ParagraphStyle.TEXT, BigInteger.ZERO);
+
+                     // Dataset Description custom style.
+                     XWPFParagraph datasetDescriptionParagraph = document.createParagraph();
+                     datasetDescriptionParagraph.setStyle("Heading3");
+                     XWPFRun datasetDescriptionRun = datasetDescriptionParagraph.createRun();
+                     datasetDescriptionRun.setText("Dataset Description");
+                     datasetDescriptionRun.setColor("2E75B6");
+                     datasetDescriptionRun.setBold(true);
+                     datasetDescriptionRun.setFontSize(12);
+
+                     PagedDatasetProfile pagedDatasetProfile = datasetManager.getPagedProfile(dataset, datasetEntity);
+                     visibilityRuleService.setProperties(properties);
+                     visibilityRuleService.buildVisibilityContext(pagedDatasetProfile.getRules());
+                     try {
+                         wordBuilder.build(document, pagedDatasetProfile, visibilityRuleService);
+                     } catch (IOException e) {
+                         logger.error(e.getMessage(), e);
+                     }
+                     // Page break at the end of the Dataset.
+                     XWPFParagraph parBreakDataset = document.createParagraph();
+                 });
+
+        // Removes the top empty headings.
+        for (int i = 0; i < 6; i++) {
+            document.removeBodyElement(0);
+        }
+
+        String fileName = "";
+        if (versioned) {
+            fileName = dmpEntity.getLabel() + " v" + dmpEntity.getVersion();
+        } else {
+            fileName = dmpEntity.getLabel();
+        }
+        fileName = fileName.replaceAll("[^a-zA-Z0-9+ ]", "");
+        FileEnvelope exportEnvelope = new FileEnvelope();
+        exportEnvelope.setFilename(fileName + ".docx");
+        String uuid = UUID.randomUUID().toString();
+        File exportFile = new File(this.environment.getProperty("temp.temp") + uuid + ".docx");
+        FileOutputStream out = new FileOutputStream(exportFile);
+        document.write(out);
+        out.close();
+        exportEnvelope.setFile(exportFile);
+
+        return exportEnvelope;
+    }
+
     private FileEnvelope getXmlDocument(String id, Principal principal) throws InstantiationException, IllegalAccessException, IOException {
         ExportXmlBuilder xmlBuilder = new ExportXmlBuilder();
         VisibilityRuleService visibilityRuleService = utilitiesService.getVisibilityRuleService();
         eu.eudat.data.entities.DMP dmp = databaseRepository.getDmpDao().find(UUID.fromString(id));
-		if (!dmp.isPublic() && dmp.getUsers().stream().filter(userInfo -> userInfo.getUser().getId() == principal.getId()).collect(Collectors.toList()).size() == 0)
-			throw new UnauthorisedException();
+        if (!dmp.isPublic() && dmp.getUsers().stream().filter(userInfo -> userInfo.getUser().getId() == principal.getId()).collect(Collectors.toList()).size() == 0)
+            throw new UnauthorisedException();
         List<Dataset> datasets = dmp.getDataset().stream().collect(Collectors.toList());
         /*String fileName = dmp.getLabel();
         fileName = fileName.replaceAll("[^a-zA-Z0-9+ ]", "");*/
@@ -1223,13 +1160,13 @@ public class DataManagementPlanManager {
 
     public ResponseEntity<byte[]> getRDAJsonDocument(String id, DatasetManager datasetManager, Principal principal) throws IOException {
         eu.eudat.data.entities.DMP dmp = databaseRepository.getDmpDao().find(UUID.fromString(id));
-		if (!dmp.isPublic() && dmp.getUsers().stream().noneMatch(userInfo -> userInfo.getUser().getId() == principal.getId()))
-			throw new UnauthorisedException();
+        if (!dmp.isPublic() && dmp.getUsers().stream().noneMatch(userInfo -> userInfo.getUser().getId() == principal.getId()))
+            throw new UnauthorisedException();
 //        RDAExportModel rdaExportModel = new RDAExportModel().fromDataModel(dmp, datasetManager, principal);
         String result = rdaManager.convertToRDA(dmp);
 
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+        /*ObjectMapper mapper = new ObjectMapper();
+        mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);*/
         String fileName = dmp.getLabel();
         fileName = fileName.replaceAll("[^a-zA-Z0-9+ ]", "");
         String uuid = UUID.randomUUID().toString();
@@ -1286,6 +1223,10 @@ public class DataManagementPlanManager {
                 HttpStatus.OK);
     }
 
+    /*
+    * Data Import
+    * */
+
     public List<DmpImportModel> createDmpFromXml(ApiContext apiContext, MultipartFile[] files, Principal principal) throws IOException, JAXBException, Exception {
         List<DmpImportModel> dataManagementPlans = new ArrayList<>();
         // Jaxb approach.
@@ -1382,22 +1323,22 @@ public class DataManagementPlanManager {
             dm.setDefinition(dmpProfile);
 
             //createOrUpdate(apiContext, dm, principal);
-           DMP dmp = this.createOrUpdate(apiContext, dm, principal);
-           if (dmp.getOrganisations() == null) {
-               dmp.setOrganisations(new HashSet<>());
-           }
-           if (dmp.getResearchers() == null) {
-               dmp.setResearchers(new HashSet<>());
-           }
-           if (dmp.getDataset() == null) {
-               dmp.setDataset(new HashSet<>());
-           }
-           if (dmp.getUsers() == null) {
-               dmp.setUsers(new HashSet<>());
-           }
-           if (dmp.getAssociatedDmps() == null) {
-               dmp.setAssociatedDmps(new HashSet<>());
-           }
+            DMP dmp = this.createOrUpdate(apiContext, dm, principal);
+            if (dmp.getOrganisations() == null) {
+                dmp.setOrganisations(new HashSet<>());
+            }
+            if (dmp.getResearchers() == null) {
+                dmp.setResearchers(new HashSet<>());
+            }
+            if (dmp.getDataset() == null) {
+                dmp.setDataset(new HashSet<>());
+            }
+            if (dmp.getUsers() == null) {
+                dmp.setUsers(new HashSet<>());
+            }
+            if (dmp.getAssociatedDmps() == null) {
+                dmp.setAssociatedDmps(new HashSet<>());
+            }
 
             List<DatasetListingModel> datasets = new LinkedList<>();
             for (DatasetImportModels das: dataManagementPlans.get(0).getDatasetImportModels()) {
@@ -1415,7 +1356,7 @@ public class DataManagementPlanManager {
                 datasetWizard.setDatasetProfileDefinition(this.datasetManager.getPagedProfile(datasetWizard, dataset));
                 datasetWizard.fromDataModel(dataset);
                 this.datasetManager.createOrUpdate(datasetWizard, principal);
-               // datasets.add(new DatasetListingModel().fromDataModel(dataset));
+                // datasets.add(new DatasetListingModel().fromDataModel(dataset));
             }
 
             logger.info(dm.toString());
@@ -1484,49 +1425,55 @@ public class DataManagementPlanManager {
         return result;
     }
 
-    public DataTableData<DatasetProfileListingModel> getDatasetProfilesUsedByDMP(DatasetProfileTableRequestItem datasetProfileTableRequestItem, Principal principal) {
-        datasetProfileTableRequestItem.getCriteria().setFilter(DatasetProfileCriteria.DatasetProfileFilter.DMPs.getValue());
-        datasetProfileTableRequestItem.getCriteria().setUserId(principal.getId());
+    /*
+    * Data assignments
+    * */
 
-        QueryableList<DatasetProfile> items = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().getWithCriteria(datasetProfileTableRequestItem.getCriteria());
-        List<DatasetProfileListingModel> listingModels = items.select(item -> new DatasetProfileListingModel().fromDataModel(item));
-
-        DataTableData<DatasetProfileListingModel> data = new DataTableData<>();
-        data.setData(listingModels);
-        data.setTotalCount((long) listingModels.size());
-
-        return data;
+    private void assignUser(DMP dmp, UserInfo userInfo) {
+        UserDMP userDMP = new UserDMP();
+        userDMP.setDmp(dmp);
+        userDMP.setUser(userInfo);
+        userDMP.setRole(UserDMP.UserDMPRoles.OWNER.getValue());
+        databaseRepository.getUserDmpDao().createOrUpdate(userDMP);
     }
 
-    public void makePublic(UUID id, Principal principal) throws Exception {
-        DMP dmp = this.apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().find(id);
-        // Check if dmp is finalized and if user is owner.
-        if (!isUserOwnerOfDmp(dmp, principal))
-            throw new Exception("User does not have the privilege to do this action.");
-        if (!dmp.getStatus().equals(DMP.DMPStatus.FINALISED.getValue()))
-            throw new Exception("DMP is not finalized");
-        dmp.setPublic(true);
-        apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().createOrUpdate(dmp);
-        this.updateIndex(dmp);
+    private void assignGrandUserIfInternal(DMP dmp, UserInfo user) {
+        if (dmp.getGrant().getCreationUser() == null && (dmp.getGrant().getReference() != null && dmp.getGrant().getReference().startsWith("dmp:"))) {
+            dmp.getGrant().setCreationUser(user);
+        }
+    }
+
+    private void assignFunderUserIfInternal(DMP dmp, UserInfo user) {
+        if (dmp.getGrant().getFunder().getCreationUser() == null && ( dmp.getGrant().getFunder().getReference() != null && dmp.getGrant().getFunder().getReference().startsWith("dmp:"))) {
+            dmp.getGrant().getFunder().setCreationUser(user);
+        }
+    }
+
+    private void assignProjectUserIfInternal(DMP dmp, UserInfo user) {
+        if (dmp.getProject().getCreationUser() == null && (dmp.getProject().getReference() != null && dmp.getProject().getReference().startsWith("dmp:"))) {
+            dmp.getProject().setCreationUser(user);
+        }
+    }
+
+    /*
+    * Data Index
+    * */
+
+    private void updateGroupIndex(UUID groupId) {
         DataManagementPlanCriteria criteria = new DataManagementPlanCriteria();
-        criteria.setGroupIds(Collections.singletonList(dmp.getGroupId()));
+        criteria.setGroupIds(Collections.singletonList(groupId));
         criteria.setAllVersions(true);
-        apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().getWithCriteria(criteria).toList().stream().forEach(dmp1 -> {
-            dmp1.getDataset().forEach(dataset -> {
-                try {
-                    List<Tag> tags = new ArrayList<>();
-                    eu.eudat.elastic.entities.Dataset elastic = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString());
-                    if (elastic != null) {
-                        tags = elastic.getTags();
-                    }
-                    this.datasetManager.updateTags(dataset, tags);
-                } catch (Exception e) {
-                    logger.error(e.getMessage(), e);
+        List<DMP> dmps = databaseRepository.getDmpDao().getWithCriteria(criteria).toList();
+        for (DMP dmp: dmps) {
+            try {
+                if (dmp.getUsers() != null) {
+                    logger.info(dmp.getUsers().toString());
                 }
-            });
-        });
-        UserInfo user = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(principal.getId());
-        sendNotification(dmp, user, NotificationType.DMP_PUBLISH);
+                this.updateIndex(dmp);
+            } catch (IOException e) {
+                logger.error(e.getMessage(), e);
+            }
+        }
     }
 
     private void updateDatasetsIndex(List<Dataset> datasets) {
@@ -1546,63 +1493,72 @@ public class DataManagementPlanManager {
         });
     }
 
-    public void makeFinalize(UUID id, Principal principal, DatasetsToBeFinalized datasetsToBeFinalized) throws Exception {
-        DMP dmp = this.apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().find(id);
-        if (!isUserOwnerOfDmp(dmp, principal))
-            throw new Exception("User does not have the privilege to do this action.");
-        if (dmp.getStatus().equals(DMP.DMPStatus.FINALISED.getValue()))
-            throw new Exception("DMP is already finalized");
-        dmp.setStatus(DMP.DMPStatus.FINALISED.getValue());
-        apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().createOrUpdate(dmp);
-        this.updateIndex(dmp);
-        List<Dataset> indexDatasets = new ArrayList<>();
-        if (datasetsToBeFinalized != null && datasetsToBeFinalized.getUuids() != null && !datasetsToBeFinalized.getUuids().isEmpty()) {
-            apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao()
-                    .asQueryable().where((builder, root) -> root.get("id").in(datasetsToBeFinalized.getUuids()))
-                    .update(root -> root.<Integer>get("status"), Dataset.Status.FINALISED.getValue());
-            List<Dataset> finalizedDatasets = dmp.getDataset().stream().filter(dataset -> datasetsToBeFinalized.getUuids().contains(dataset.getId())).collect(Collectors.toList());
-            finalizedDatasets.forEach(dataset -> dataset.setStatus(Dataset.Status.FINALISED.getValue()));
-            indexDatasets.addAll(finalizedDatasets);
-            List<UUID> datasetsToBeCanceled = new LinkedList<>();
-            for (Dataset dataset : dmp.getDataset()) {
-                if (!dataset.getStatus().equals(Dataset.Status.FINALISED.getValue()) && !datasetsToBeFinalized.getUuids().contains(dataset.getId())) {
-                    datasetsToBeCanceled.add(dataset.getId());
-                }
-            }
-            if (!datasetsToBeCanceled.isEmpty()) {
-                apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao()
-                          .asQueryable().where((builder, root) -> root.get("id").in(datasetsToBeCanceled))
-                          .update(root -> root.<Integer>get("status"), Dataset.Status.CANCELED.getValue());
-                List<Dataset> cancelledDatasets = dmp.getDataset().stream().filter(dataset -> datasetsToBeCanceled.contains(dataset.getId())).collect(Collectors.toList());
-                cancelledDatasets.forEach(dataset -> dataset.setStatus(Dataset.Status.CANCELED.getValue()));
-                indexDatasets.addAll(cancelledDatasets);
-            }
-        } else {
-            List<UUID> datasetsToBeCanceled = new LinkedList<>();
-            for (Dataset dataset : dmp.getDataset()) {
-                if (!dataset.getStatus().equals(Dataset.Status.FINALISED.getValue())) {
-                    datasetsToBeCanceled.add(dataset.getId());
-                }
-            }
-            if (!datasetsToBeCanceled.isEmpty()) {
-                apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao()
-                          .asQueryable().where((builder, root) -> root.get("id").in(datasetsToBeCanceled))
-                          .update(root -> root.<Integer>get("status"), Dataset.Status.CANCELED.getValue());
-                List<Dataset> cancelledDatasets = dmp.getDataset().stream().filter(dataset -> datasetsToBeCanceled.contains(dataset.getId())).collect(Collectors.toList());
-                cancelledDatasets.forEach(dataset -> dataset.setStatus(Dataset.Status.CANCELED.getValue()));
-                indexDatasets.addAll(cancelledDatasets);
-            }
+    private void updateIndex(DMP dmp) throws IOException {
+        DmpMapper mapper = new DmpMapper(apiContext, datasetManager);
+        Dmp elastic = mapper.toElastic(dmp);
+        apiContext.getOperationsContext().getElasticRepository().getDmpRepository().createOrUpdate(elastic);
+    }
 
-            UserInfo user = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(principal.getId());
-            sendNotification(dmp, user, NotificationType.DMP_FINALISED);
+    public void generateIndex(Principal principal) {
+        if (principal.getAuthorities().contains(Authorities.ADMIN.getValue())) {
+            if (apiContext.getOperationsContext().getElasticRepository().getDmpRepository().createIndex()) {
+                List<DMP> dmps = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().asQueryable().toList();
+                dmps.forEach(dmp -> {
+                    try {
+                        this.updateIndex(dmp);
+                    } catch (IOException e) {
+                        logger.error(e.getMessage(), e);
+                    }
+                });
+            }
+        }
+    }
+
+    public void clearIndex(Principal principal) throws IOException {
+        if (principal.getAuthorities().contains(Authorities.ADMIN.getValue())) {
+            apiContext.getOperationsContext().getElasticRepository().getDmpRepository().clear();
+        }
+    }
+
+    /*
+    * Data Checkup
+    * */
+
+    private void checkIfUserCanEditGrant(DMP dmp, UserInfo user) throws Exception{
+        if (dmp.getGrant().getId() != null) {
+            Grant grant = apiContext.getOperationsContext().getDatabaseRepository().getGrantDao().find(dmp.getGrant().getId());
+            if (grant.getFunder() != null && dmp.getGrant().getFunder() != null
+                    && !grant.getFunder().getId().equals(dmp.getGrant().getFunder().getId())) {
+                if (grant.getCreationUser() == null) {
+                    throw new Exception("Grant has no user, therefore, cannot be edited.");
+                }
+                if (!grant.getCreationUser().getId().equals(user.getId())) {
+                    throw new Exception("User is not the owner of the Grant, therefore, cannot edit it.");
+                }
+            }
+        }
+    }
+
+    private void checkDmpValidationRules(DMP dmp) throws Exception {
+        if (dmp.getLabel() == null || dmp.getLabel().trim().isEmpty()) {
+            throw new Exception("DMP has no label.");
+        }
+        if (dmp.getAssociatedDmps().size() == 0) {
+            throw new Exception("DMP does not contain Dataset Templates.");
+        }
+        if (dmp.getGrant() == null) {
+            throw new Exception("DMP has no Grant assigned.");
         }
-        this.updateDatasetsIndex(indexDatasets);
     }
 
     private boolean isUserOwnerOfDmp(DMP dmp, Principal principal) {
         return (dmp.getUsers().stream().filter(userDMP -> userDMP.getRole().equals(UserDMP.UserDMPRoles.OWNER.getValue())).findFirst().get().getUser().getId()).equals(principal.getId());
     }
 
+    /*
+    * DOI Generation
+    * */
+
     private String getPreviousDOI(UUID groupId, UUID selfId) {
         DataManagementPlanCriteria criteria = new DataManagementPlanCriteria();
         List<UUID> groupIds = new ArrayList<>();
@@ -1691,74 +1647,74 @@ public class DataManagementPlanManager {
         String publishUrl = null;
         try {
 
-        if (previousDOI == null) {
-            String createUrl = this.environment.getProperty("zenodo.url") + "deposit/depositions" + "?access_token=" + zenodoToken;
-            createResponse = restTemplate.postForEntity(createUrl, request, Map.class).getBody();
-            links = (LinkedHashMap<String, String>) createResponse.get("links");
-        } else {
-            unpublishedUrl = this.getUnpublishedDOI(previousDOI, zenodoToken, dmp.getVersion());
-            if (unpublishedUrl == null) {
-                //It requires more than one step to create a new version
-                //First, get the deposit related to the concept DOI
-                String listUrl = this.environment.getProperty("zenodo.url") + "deposit/depositions" + "?q=conceptdoi:\"" + previousDOI + "\"&access_token=" + zenodoToken;
-                ResponseEntity<Map[]> listResponses = restTemplate.getForEntity(listUrl, Map[].class);
-                createResponse = listResponses.getBody()[0];
+            if (previousDOI == null) {
+                String createUrl = this.environment.getProperty("zenodo.url") + "deposit/depositions" + "?access_token=" + zenodoToken;
+                createResponse = restTemplate.postForEntity(createUrl, request, Map.class).getBody();
                 links = (LinkedHashMap<String, String>) createResponse.get("links");
-                //Second, make the new version (not in the links?)
-                String newVersionUrl = links.get("self") + "/actions/newversion" + "?access_token=" + zenodoToken;
-                createResponse = restTemplate.postForObject(newVersionUrl, null, Map.class);
-                links = (LinkedHashMap<String, String>) createResponse.get("links");
-                //Third, get the new deposit
-                String latestDraftUrl = links.get("latest_draft") + "?access_token=" + zenodoToken;
-                createResponse = restTemplate.getForObject(latestDraftUrl, Map.class);
-                links = (LinkedHashMap<String, String>) createResponse.get("links");
-                //At this point it might fail to perform the next requests so enclose them with try catch
-                try {
-                    //Forth, update the new deposit's metadata
-                    String updateUrl = links.get("self") + "?access_token=" + zenodoToken;
-                    restTemplate.put(updateUrl, request);
-                    //And finally remove pre-existing files from it
-                    String fileListUrl = links.get("self") + "/files" + "?access_token=" + zenodoToken;
-                    ResponseEntity<Map[]> fileListResponse = restTemplate.getForEntity(fileListUrl, Map[].class);
-                    for (Map file : fileListResponse.getBody()) {
-                        String fileDeleteUrl = links.get("self") + "/files/" + file.get("id") + "?access_token=" + zenodoToken;
-                        restTemplate.delete(fileDeleteUrl);
+            } else {
+                unpublishedUrl = this.getUnpublishedDOI(previousDOI, zenodoToken, dmp.getVersion());
+                if (unpublishedUrl == null) {
+                    //It requires more than one step to create a new version
+                    //First, get the deposit related to the concept DOI
+                    String listUrl = this.environment.getProperty("zenodo.url") + "deposit/depositions" + "?q=conceptdoi:\"" + previousDOI + "\"&access_token=" + zenodoToken;
+                    ResponseEntity<Map[]> listResponses = restTemplate.getForEntity(listUrl, Map[].class);
+                    createResponse = listResponses.getBody()[0];
+                    links = (LinkedHashMap<String, String>) createResponse.get("links");
+                    //Second, make the new version (not in the links?)
+                    String newVersionUrl = links.get("self") + "/actions/newversion" + "?access_token=" + zenodoToken;
+                    createResponse = restTemplate.postForObject(newVersionUrl, null, Map.class);
+                    links = (LinkedHashMap<String, String>) createResponse.get("links");
+                    //Third, get the new deposit
+                    String latestDraftUrl = links.get("latest_draft") + "?access_token=" + zenodoToken;
+                    createResponse = restTemplate.getForObject(latestDraftUrl, Map.class);
+                    links = (LinkedHashMap<String, String>) createResponse.get("links");
+                    //At this point it might fail to perform the next requests so enclose them with try catch
+                    try {
+                        //Forth, update the new deposit's metadata
+                        String updateUrl = links.get("self") + "?access_token=" + zenodoToken;
+                        restTemplate.put(updateUrl, request);
+                        //And finally remove pre-existing files from it
+                        String fileListUrl = links.get("self") + "/files" + "?access_token=" + zenodoToken;
+                        ResponseEntity<Map[]> fileListResponse = restTemplate.getForEntity(fileListUrl, Map[].class);
+                        for (Map file : fileListResponse.getBody()) {
+                            String fileDeleteUrl = links.get("self") + "/files/" + file.get("id") + "?access_token=" + zenodoToken;
+                            restTemplate.delete(fileDeleteUrl);
+                        }
+                    } catch (Exception e) {
+                        //In case the last two steps fail delete the latest Deposit it in order to create a new one (only one at a time is allowed)
+                        restTemplate.delete(latestDraftUrl);
+                        throw e;
                     }
-                } catch (Exception e) {
-                    //In case the last two steps fail delete the latest Deposit it in order to create a new one (only one at a time is allowed)
-                    restTemplate.delete(latestDraftUrl);
-                    throw e;
                 }
             }
-        }
 
-        if (unpublishedUrl == null) {
-            // Second step, add the file to the entry.
-            HttpHeaders fileHeaders = new HttpHeaders();
-            fileHeaders.setContentType(MediaType.MULTIPART_FORM_DATA);
-            LinkedMultiValueMap<String, Object> addFileMap = new LinkedMultiValueMap<>();
+            if (unpublishedUrl == null) {
+                // Second step, add the file to the entry.
+                HttpHeaders fileHeaders = new HttpHeaders();
+                fileHeaders.setContentType(MediaType.MULTIPART_FORM_DATA);
+                LinkedMultiValueMap<String, Object> addFileMap = new LinkedMultiValueMap<>();
 
-            FileEnvelope file = getWordDocument(id.toString(), principal, configLoader);
-            addFileMap.add("filename", file.getFilename());
-            FileSystemResource fileSystemResource = new FileSystemResource(file.getFile());
-            addFileMap.add("file", fileSystemResource);
-            HttpEntity<MultiValueMap<String, Object>> addFileMapRequest = new HttpEntity<>(addFileMap, fileHeaders);
+                FileEnvelope file = getWordDocument(id.toString(), principal, configLoader);
+                addFileMap.add("filename", file.getFilename());
+                FileSystemResource fileSystemResource = new FileSystemResource(file.getFile());
+                addFileMap.add("file", fileSystemResource);
+                HttpEntity<MultiValueMap<String, Object>> addFileMapRequest = new HttpEntity<>(addFileMap, fileHeaders);
 
-            String addFileUrl = links.get("files") + "?access_token=" + zenodoToken;
-            ResponseEntity<String> addFileResponse = restTemplate.postForEntity(addFileUrl, addFileMapRequest, String.class);
-            Files.deleteIfExists(file.getFile().toPath());
+                String addFileUrl = links.get("files") + "?access_token=" + zenodoToken;
+                ResponseEntity<String> addFileResponse = restTemplate.postForEntity(addFileUrl, addFileMapRequest, String.class);
+                Files.deleteIfExists(file.getFile().toPath());
 
 
-            // Third post call to Zenodo to publish the entry and return the DOI.
-            publishUrl = links.get("publish") + "?access_token=" + zenodoToken;
-        } else {
-            publishUrl = unpublishedUrl + "?access_token=" + zenodoToken;
-        }
-        Map<String, Object> publishResponce = restTemplate.postForObject(publishUrl, "", Map.class);
+                // Third post call to Zenodo to publish the entry and return the DOI.
+                publishUrl = links.get("publish") + "?access_token=" + zenodoToken;
+            } else {
+                publishUrl = unpublishedUrl + "?access_token=" + zenodoToken;
+            }
+            Map<String, Object> publishResponce = restTemplate.postForObject(publishUrl, "", Map.class);
 
-        dmp.setDoi((String) publishResponce.get("conceptdoi"));
-        apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().createOrUpdate(dmp);
-        return (String) publishResponce.get("conceptdoi");
+            dmp.setDoi((String) publishResponce.get("conceptdoi"));
+            apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().createOrUpdate(dmp);
+            return (String) publishResponce.get("conceptdoi");
         } catch (HttpClientErrorException | HttpServerErrorException ex) {
             ObjectMapper ob = new ObjectMapper();
             Map<String, String> parsedException = ob.readValue(ex.getResponseBodyAsString(), HashMap.class);
@@ -1766,30 +1722,133 @@ public class DataManagementPlanManager {
         }
     }
 
-    private void updateIndex(DMP dmp) throws IOException {
-        DmpMapper mapper = new DmpMapper(apiContext, datasetManager);
-        Dmp elastic = mapper.toElastic(dmp);
-        apiContext.getOperationsContext().getElasticRepository().getDmpRepository().createOrUpdate(elastic);
-    }
+    /*
+    * Misc
+    * */
 
-    public void generateIndex(Principal principal) {
-        if (principal.getAuthorities().contains(Authorities.ADMIN.getValue())) {
-            if (apiContext.getOperationsContext().getElasticRepository().getDmpRepository().createIndex()) {
-                List<DMP> dmps = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().asQueryable().toList();
-                dmps.forEach(dmp -> {
-                    try {
-                        this.updateIndex(dmp);
-                    } catch (IOException e) {
-                        logger.error(e.getMessage(), e);
-                    }
-                });
+    private void sendNotification(DMP dmp, UserInfo user, NotificationType notificationType) {
+        List<UserDMP> userDMPS = databaseRepository.getUserDmpDao().asQueryable().where(((builder, root) -> builder.equal(root.get("dmp").get("id"), dmp.getId()))).toList();
+        for (UserDMP userDMP : userDMPS) {
+            if (!userDMP.getUser().getId().equals(user.getId())) {
+                Notification notification = new Notification();
+                notification.setUserId(user);
+                notification.setType(notificationType);
+                notification.setNotifyState(NotifyState.PENDING);
+                notification.setIsActive(ActiveStatus.ACTIVE);
+                notification.setData("{" +
+                        "\"userId\": \"" + userDMP.getUser().getId() + "\"" +
+                        ", \"id\": \"" + userDMP.getDmp().getId() + "\"" +
+                        ", \"name\": \"" + userDMP.getDmp().getLabel() + "\"" +
+                        ", \"path\": \"" + notificationPaths.get(notificationType) +"\"" +
+                        "}");
+                notification.setCreatedAt(new Date());
+                notification.setUpdatedAt(notification.getCreatedAt());
+                notification.setContactTypeHint(ContactType.EMAIL);
+                notification.setContactHint(userDMP.getUser().getEmail());
+                databaseRepository.getNotificationDao().createOrUpdate(notification);
             }
         }
+
     }
 
-    public void clearIndex(Principal principal) throws IOException {
-        if (principal.getAuthorities().contains(Authorities.ADMIN.getValue())) {
-            apiContext.getOperationsContext().getElasticRepository().getDmpRepository().clear();
+    /*public DataTableData<DataManagementPlanListingModel> getPublicPaged(DataManagmentPlanPublicTableRequest dataManagementPlanPublicTableRequest, String fieldsGroup, Principal principal) throws Exception {
+        dataManagementPlanPublicTableRequest.setQuery(databaseRepository.getDmpDao().asQueryable().withHint(HintedModelFactory.getHint(DataManagementPlanListingModel.class)));
+        QueryableList<DMP> items = dataManagementPlanPublicTableRequest.applyCriteria();
+
+        if (principal.getId() != null && dataManagementPlanPublicTableRequest.getCriteria().getRole() != null) {
+            items.where((builder, root) -> {
+                Join userJoin = root.join("users", JoinType.LEFT);
+                return builder.and(builder.equal(userJoin.join("user", JoinType.LEFT).get("id"), principal.getId()), builder.equal(userJoin.get("role"), dataManagementPlanPublicTableRequest.getCriteria().getRole()));
+            });
+        }
+        QueryableList<DMP> pagedItems = PaginationManager.applyPaging(items, dataManagementPlanPublicTableRequest);
+
+        DataTableData<DataManagementPlanListingModel> dataTable = new DataTableData<>();
+
+        CompletableFuture itemsFuture;
+        if (fieldsGroup.equals("listing")) {
+            itemsFuture = pagedItems.withHint(HintedModelFactory.getHint(DataManagementPlanListingModel.class))
+                    .selectAsync(item -> {
+                        item.setDataset(
+                                item.getDataset().stream()
+                                        .filter(dataset -> dataset.getStatus().equals(Dataset.Status.FINALISED.getValue())).collect(Collectors.toSet()));
+                        return new DataManagementPlanListingModel().fromDataModelDatasets(item);
+                    })
+                    .whenComplete((resultList, throwable) -> dataTable.setData(resultList));
+        } else {
+            itemsFuture = pagedItems
+                    .selectAsync(item -> new DataManagementPlanListingModel().fromDataModel(item))
+                    .whenComplete((resultList, throwable) -> dataTable.setData(resultList));
+        }
+
+        CompletableFuture countFuture = items.countAsync().whenComplete((count, throwable) -> {
+            dataTable.setTotalCount(count);
+        });
+        CompletableFuture.allOf(itemsFuture, countFuture).join();
+        return dataTable;
+    }
+*/
+    /*public void unlock(UUID uuid) throws Exception {
+        apiContext.getOperationsContext().getDatabaseRepository().getDmpDao()
+                .asQueryable().where((builder, root) -> builder.equal(root.get("id"), uuid))
+                .update(root -> root.get("status"), DMP.DMPStatus.ACTIVE.getValue());
+        return;
+    }*/
+    /*public File getPdfDocument(String id) throws InstantiationException, IllegalAccessException, InterruptedException, IOException {
+        File file = this.getWordDocument(id);
+        String fileName = file.getName();
+        if (fileName.endsWith(".docx")){
+            fileName = fileName.substring(0, fileName.length() - 5);
+        }
+        return this.datasetManager.convertToPDF(file, environment, fileName);
+    }*/
+    /*public eu.eudat.models.data.dmp.DataManagementPlan getSinglePublic(String id, DynamicGrantConfiguration dynamicGrantConfiguration) throws Exception {
+        DMP dataManagementPlanEntity = databaseRepository.getDmpDao().find(UUID.fromString(id));
+
+        if (dataManagementPlanEntity != null && dataManagementPlanEntity.getStatus() == 1) {
+            eu.eudat.models.data.dmp.DataManagementPlan datamanagementPlan = new eu.eudat.models.data.dmp.DataManagementPlan();
+            datamanagementPlan.fromDataModel(dataManagementPlanEntity);
+            datamanagementPlan.setDatasets(datamanagementPlan.getDatasets().stream().filter(dataset -> dataset.getStatus() == Dataset.Status.FINALISED.getValue()).collect(Collectors.toList()));
+            Map dmpProperties = dataManagementPlanEntity.getDmpProperties() != null ? new org.json.JSONObject(dataManagementPlanEntity.getDmpProperties()).toMap() : null;
+//            datamanagementPlan.setDynamicFields(dynamicGrantConfiguration.getFields().stream().map(item -> {
+//                DynamicFieldWithValue fieldWithValue = new DynamicFieldWithValue();
+//                fieldWithValue.setId(item.getId());
+//                fieldWithValue.setDependencies(item.getDependencies());
+//                fieldWithValue.setName(item.getName());
+//                fieldWithValue.setQueryProperty(item.getQueryProperty());
+//                fieldWithValue.setRequired(item.getRequired());
+//                return fieldWithValue;
+//            }).collect(Collectors.toList()));
+
+            if (dmpProperties != null && datamanagementPlan.getDynamicFields() != null)
+                datamanagementPlan.getDynamicFields().forEach(item -> {
+                    Map<String, String> properties = (Map<String, String>) dmpProperties.get(item.getId());
+                    if (properties != null)
+                        item.setValue(new Tuple<>(properties.get("id"), properties.get("label")));
+                });
+            return datamanagementPlan;
+        } else {
+            throw new Exception("Selected DMP is not public");
         }
     }
+
+    public DataManagementPlanOverviewModel getOverviewSinglePublic(String id) throws Exception {
+        DMP dataManagementPlanEntity = databaseRepository.getDmpDao().find(UUID.fromString(id));
+        if (dataManagementPlanEntity != null && dataManagementPlanEntity.getStatus() == 1) {
+            DataManagementPlanOverviewModel datamanagementPlan = new DataManagementPlanOverviewModel();
+            datamanagementPlan.fromDataModelDatasets(dataManagementPlanEntity);
+            datamanagementPlan.setDatasets(datamanagementPlan.getDatasets().stream().filter(dataset -> dataset.getStatus() == Dataset.Status.FINALISED.getValue()).collect(Collectors.toList()));
+            return datamanagementPlan;
+        } else {
+            throw new Exception("Selected DMP is not public");
+        }
+    }*/
+    /*public List<DataManagementPlan> getWithCriteria(DMPDao dmpsRepository, DataManagementPlanCriteriaRequest dataManagementPlanCriteria, Principal principal) throws IllegalAccessException, InstantiationException {
+        UUID principalID = principal.getId();
+        QueryableList<DMP> items = dmpsRepository.getWithCriteria(dataManagementPlanCriteria.getCriteria()).withHint(HintedModelFactory.getHint(DataManagementPlan.class));
+        List<Integer> roles = new LinkedList<>();
+        QueryableList<DMP> authenticatedItems = dmpsRepository.getAuthenticated(items, principalID, roles);
+        List<eu.eudat.models.data.dmp.DataManagementPlan> datamanagementPlans = authenticatedItems.select(item -> new DataManagementPlan().fromDataModel(item));
+        return datamanagementPlans;
+    }*/
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/Organisation.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/Organisation.java
index 0cb2b1296..5c87d7ebd 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/Organisation.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/Organisation.java
@@ -68,18 +68,22 @@ public class Organisation implements DataModel<eu.eudat.data.entities.Organisati
         this.id = entity.getId().toString();
         this.name = entity.getLabel();
         this.label = entity.getUri();
-        this.reference = entity.getReference();
-        this.key = entity.getReference().substring(0, entity.getReference().indexOf(":"));
+        if (entity.getReference() != null) {
+            this.reference = entity.getReference();
+            this.key = entity.getReference().substring(0, entity.getReference().indexOf(":"));
+        }
         return this;
     }
 
     @Override
     public eu.eudat.data.entities.Organisation toDataModel() {
         eu.eudat.data.entities.Organisation organisationEntity = new eu.eudat.data.entities.Organisation();
-        if ((this.key + ":").equals(this.reference.substring(0, this.key.length() + 1))) {
-            organisationEntity.setReference(this.reference);
-        } else {
-            organisationEntity.setReference(this.key + ":" + this.reference);
+        if (this.key != null && this.reference != null) {
+            if ((this.key + ":").equals(this.reference.substring(0, this.key.length() + 1))) {
+                organisationEntity.setReference(this.reference);
+            } else {
+                organisationEntity.setReference(this.key + ":" + this.reference);
+            }
         }
         organisationEntity.setLabel(this.name);
         organisationEntity.setUri(this.label);
diff --git a/dmp-frontend/src/app/ui/dmp/dmp.module.ts b/dmp-frontend/src/app/ui/dmp/dmp.module.ts
index 0f72ed78f..d331894da 100644
--- a/dmp-frontend/src/app/ui/dmp/dmp.module.ts
+++ b/dmp-frontend/src/app/ui/dmp/dmp.module.ts
@@ -31,6 +31,7 @@ import { CommonFormsModule } from '@common/forms/common-forms.module';
 import { FormValidationErrorsDialogModule } from '@common/forms/form-validation-errors-dialog/form-validation-errors-dialog.module';
 import { CommonUiModule } from '@common/ui/common-ui.module';
 import { MultipleChoiceDialogModule } from '@common/modules/multiple-choice-dialog/multiple-choice-dialog.module';
+import { AddOrganizationComponent } from './editor/add-organization/add-organization.component';
 
 @NgModule({
 	imports: [
@@ -67,14 +68,16 @@ import { MultipleChoiceDialogModule } from '@common/modules/multiple-choice-dial
 		PeopleTabComponent,
 		GrantTabComponent,
 		DatasetsTabComponent,
-		DmpCloneComponent
+		DmpCloneComponent,
+		AddOrganizationComponent
 	],
 	entryComponents: [
 		DmpInvitationDialogComponent,
 		AddResearcherComponent,
 		AvailableProfilesComponent,
 		DmpFinalizeDialogComponent,
-		DmpUploadDialogue
+		DmpUploadDialogue,
+		AddOrganizationComponent
 	]
 })
 export class DmpModule { }
diff --git a/dmp-frontend/src/app/ui/dmp/editor/add-organization/add-organization.component.html b/dmp-frontend/src/app/ui/dmp/editor/add-organization/add-organization.component.html
new file mode 100644
index 000000000..382d9d04d
--- /dev/null
+++ b/dmp-frontend/src/app/ui/dmp/editor/add-organization/add-organization.component.html
@@ -0,0 +1,19 @@
+<form *ngIf="formGroup" [formGroup]="formGroup">
+	<h1 mat-dialog-title>{{'ADDORGANIZATION-EDITOR.TITLE' | translate}}</h1>
+	<div mat-dialog-content class="row">
+		<mat-form-field class="col-12">
+			<input matInput formControlName="name" placeholder="{{'ADDORGANIZATION-EDITOR.NAME' | translate}}" required>
+			<mat-error *ngIf="formGroup.get('name').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+		</mat-form-field>
+		<!-- <mat-form-field class="col-12">
+			<input matInput formControlName="lastName" placeholder="{{'ADDORGANIZATION-EDITOR.LAST_NAME' | translate}}" required>
+			<mat-error *ngIf="formGroup.get('lastName').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+		</mat-form-field> -->
+		<div class="col-12">
+			<div class="row">
+				<div class="ml-auto col-auto"><button mat-raised-button mat-dialog-close type="button">{{'ADDORGANIZATION-EDITOR.ACTIONS.CANCEL' | translate}}</button></div>
+				<div class="col-auto"><button mat-raised-button [disabled]="!isFormValid()" color="primary" (click)="addOrganization()" type="button">{{'ADDORGANIZATION-EDITOR.ACTIONS.SAVE' | translate}}</button></div>
+			</div>
+		</div>
+	</div>
+</form>
diff --git a/dmp-frontend/src/app/ui/dmp/editor/add-organization/add-organization.component.ts b/dmp-frontend/src/app/ui/dmp/editor/add-organization/add-organization.component.ts
new file mode 100644
index 000000000..517cb2158
--- /dev/null
+++ b/dmp-frontend/src/app/ui/dmp/editor/add-organization/add-organization.component.ts
@@ -0,0 +1,43 @@
+import { Component, Inject, OnInit } from '@angular/core';
+import { FormGroup } from '@angular/forms';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { ExternalResearcherService } from '@app/core/services/external-sources/researcher/external-researcher.service';
+import { BaseComponent } from '@common/base/base.component';
+import { takeUntil } from 'rxjs/operators';
+import { OrganizationEditorModel } from './add-organization.model';
+
+@Component({
+	selector: 'app-add-organization-component',
+	templateUrl: 'add-organization.component.html',
+})
+export class AddOrganizationComponent extends BaseComponent implements OnInit {
+
+	public formGroup: FormGroup;
+
+	constructor(
+		private externalResearcherService: ExternalResearcherService,
+		public dialogRef: MatDialogRef<AddOrganizationComponent>,
+		@Inject(MAT_DIALOG_DATA) public data: any
+	) { super(); }
+
+	ngOnInit(): void {
+		const researcher = new OrganizationEditorModel();
+		this.formGroup = researcher.buildForm();
+	}
+
+	send(value: any) {
+		this.externalResearcherService.createResearcher(this.formGroup.value)
+			.pipe(takeUntil(this._destroyed))
+			.subscribe(
+				null, null, () => this.dialogRef.close()
+			);
+	}
+
+	addOrganization() {
+		this.dialogRef.close(this.formGroup.value);
+	}
+
+	isFormValid() {
+		return this.formGroup.valid;
+	}
+}
diff --git a/dmp-frontend/src/app/ui/dmp/editor/add-organization/add-organization.model.ts b/dmp-frontend/src/app/ui/dmp/editor/add-organization/add-organization.model.ts
new file mode 100644
index 000000000..444b3ae7c
--- /dev/null
+++ b/dmp-frontend/src/app/ui/dmp/editor/add-organization/add-organization.model.ts
@@ -0,0 +1,33 @@
+import { FormBuilder, FormGroup } from '@angular/forms';
+import { ResearcherModel } from '@app/core/model/researcher/researcher';
+import { BackendErrorValidator } from '@common/forms/validation/custom-validator';
+import { ValidationErrorModel } from '@common/forms/validation/error-model/validation-error-model';
+import { ValidationContext } from '@common/forms/validation/validation-context';
+import { OrganizationModel } from '@app/core/model/organisation/organization';
+
+export class OrganizationEditorModel {
+	public id: String;
+	public name: String;
+	public validationErrorModel: ValidationErrorModel = new ValidationErrorModel();
+
+	fromModel(item: OrganizationModel): OrganizationEditorModel {
+		this.id = item.id;
+		this.name = item.name;
+		return this;
+	}
+
+	buildForm(context: ValidationContext = null, disabled: boolean = false): FormGroup {
+		if (context == null) { context = this.createValidationContext(); }
+		const formGroup = new FormBuilder().group({
+			name: [{ value: this.name, disabled: disabled }, context.getValidation('name').validators]
+		});
+
+		return formGroup;
+	}
+
+	createValidationContext(): ValidationContext {
+		const baseContext: ValidationContext = new ValidationContext();
+		baseContext.validation.push({ key: 'name', validators: [BackendErrorValidator(this.validationErrorModel, 'name')] });
+		return baseContext;
+	}
+}
diff --git a/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.html b/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.html
index a1090650e..50d7d2fef 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.html
+++ b/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.html
@@ -46,6 +46,9 @@
 					<mat-error *ngIf="formGroup.get('organisations').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' |
 												translate}}</mat-error>
 					<mat-hint>{{'DMP-EDITOR.FIELDS.ORGANISATIONS-HINT' | translate}}</mat-hint>
+					<button matSuffix class="input-btn" [disabled]="canAddOrganizations()" type="button" (click)="addOrganization($event)">
+						<mat-icon class="icon-btn">add_circle</mat-icon>
+					</button>
 				</mat-form-field>
 			</div>
 			<div class="row pt-3">
diff --git a/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.ts b/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.ts
index 4330d7332..f21ddfed9 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.ts
@@ -20,6 +20,8 @@ import { BaseComponent } from '@common/base/base.component';
 import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
 import { map, takeUntil } from 'rxjs/operators';
+import { AddOrganizationComponent } from '../add-organization/add-organization.component';
+import { isNullOrUndefined } from 'util';
 
 @Component({
 	selector: 'app-general-tab',
@@ -170,6 +172,36 @@ export class GeneralTabComponent extends BaseComponent implements OnInit {
 		});
 	}
 
+	addOrganization(event: MouseEvent) {
+		event.stopPropagation();
+		const dialogRef = this.dialog.open(AddOrganizationComponent, {
+			data: this.formGroup.get('organisations')
+		});
+		dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => {
+			if (result) {
+				const fullName = result.name;
+				const newItem = {
+					label: null,
+					name: fullName,
+					id: null,
+					status: 0,
+					key: "Internal",
+				};
+				const organizationsArray = this.formGroup.get('organisations').value || [];
+				organizationsArray.push(newItem);
+				this.formGroup.get('organisations').setValue(organizationsArray);
+			}
+		});
+	}
+
+	canAddOrganizations(): boolean {
+		if (!isNullOrUndefined(this.formGroup.get('organizations'))) {
+			return this.formGroup.get('organiztions').disabled;
+		} else {
+			return false;
+		}
+	}
+
 	availableProfiles(event: MouseEvent) {
 		event.stopPropagation();
 		const dialogRef = this.dialog.open(AvailableProfilesComponent, {
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
index 1bbe67bae..ca3ded5cc 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
@@ -106,10 +106,10 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 							this.breadCrumbs = observableOf(breadCrumbs);
 						}, (error: any) => {
 							if (error.status === 404) {
-								return this.onFetchingDeletedCallbackError('/plans/');
+								return this.onFetchingDeletedCallbackError('/explore-plans');
 							}
 							if (error.status === 403) {
-								return this.onFetchingForbiddenCallbackError('/plans/');
+								return this.onFetchingForbiddenCallbackError('/explore-plans');
 							}
 						});
 				}
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index d357a19b0..3fb895575 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -953,6 +953,14 @@
 			"CANCEL": "Cancel"
 		}
 	},
+	"ADDORGANIZATION-EDITOR": {
+		"TITLE": "Add an Organization",
+		"NAME": "Name",
+		"ACTIONS": {
+			"SAVE": "Save",
+			"CANCEL": "Cancel"
+		}
+	},
 	"DMP-WIZARD": {
 		"FIRST-STEP": {
 			"DMP": "DMP Editor",
diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json
index 5716873cb..a9bef23eb 100644
--- a/dmp-frontend/src/assets/i18n/es.json
+++ b/dmp-frontend/src/assets/i18n/es.json
@@ -525,6 +525,10 @@
 		"ERROR": {
 			"DELETED-DMP": "El PGD solicitado está borrado",
 			"FORBIDEN-DMP": "You are not allowed to access this DMP"
+		},
+		"MULTIPLE-DIALOG": {
+			"ZENODO-LOGIN": "Login with Zenodo",
+			"USE-DEFAULT": "Use Default Token"
 		}
 	},
 	"DATASET-LISTING": {
@@ -825,7 +829,8 @@
 		"ACTIONS": {
 			"SAVE": "Grabar",
 			"CANCEL": "Cancelar",
-			"DELETE": "Borrar"
+			"DELETE": "Borrar",
+			"UPDATE": "Update"
 		},
 		"VERSION-DIALOG": {
 			"ABOUT": "Versionado es automático.",
@@ -948,6 +953,14 @@
 			"CANCEL": "Cancelar"
 		}
 	},
+	"ADDORGANIZATION-EDITOR": {
+		"TITLE": "Add an Organization",
+		"NAME": "Name",
+		"ACTIONS": {
+			"SAVE": "Save",
+			"CANCEL": "Cancel"
+		}
+	},
 	"DMP-WIZARD": {
 		"FIRST-STEP": {
 			"DMP": "Editor PGD",
@@ -1086,6 +1099,12 @@
 			"SHOW-ALL": "Mostrar todo",
 			"CREATOR": "Creador",
 			"MEMBER": "Miembro"
+		},
+		"ZENODO": {
+			"LOGIN": "Login to Zenodo",
+			"LOGOUT": "Remove Zenodo",
+			"TITLE": "Zenodo Account",
+			"DESCRIPTION": "Linked Zenodo Account:"
 		}
 	},
 	"DATASET-REFERENCED-MODELS": {

From 0c443dfeba3b4b07db1e160371880a67137aa06c Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Wed, 22 Apr 2020 18:41:54 +0300
Subject: [PATCH 36/60] Renamed JSON Export to RDA JSON

---
 dmp-frontend/src/assets/i18n/en.json | 2 +-
 dmp-frontend/src/assets/i18n/es.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index 3fb895575..63fd0f3d6 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -128,7 +128,7 @@
 		"FILE-TYPES": {
 			"PDF": "PDF",
 			"XML": "XML",
-			"JSON": "JSON",
+			"JSON": "RDA JSON",
 			"DOC": "Document"
 		},
 		"LANGUAGES": {
diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json
index a9bef23eb..7db704b15 100644
--- a/dmp-frontend/src/assets/i18n/es.json
+++ b/dmp-frontend/src/assets/i18n/es.json
@@ -128,7 +128,7 @@
 		"FILE-TYPES": {
 			"PDF": "PDF",
 			"XML": "XML",
-			"JSON": "JSON",
+			"JSON": "RDA JSON",
 			"DOC": "Documento"
 		},
 		"LANGUAGES": {

From 05e2374f97e13cf98cc13b9b3068d7ba18d3f5e8 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Wed, 22 Apr 2020 18:43:19 +0300
Subject: [PATCH 37/60] When exporting to JSON export it with pretty text

---
 .../web/src/main/java/eu/eudat/logic/managers/RDAManager.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/RDAManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/RDAManager.java
index ff194455e..f7c9efde8 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/RDAManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/RDAManager.java
@@ -32,7 +32,7 @@ public class RDAManager {
 		ObjectMapper mapper = new ObjectMapper();
 		mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss Z"));
 
-		result = mapper.writeValueAsString(rdaDmp);
+		result = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(rdaDmp);
 
 		return result;
 	}

From 8ae58c9ef38de5776d5795dcde21ea1fc2cd7c5d Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Thu, 23 Apr 2020 10:48:14 +0300
Subject: [PATCH 38/60] Allow Organization Creator to be visible by
 configuration (ref #255)

---
 .../core/services/configuration/configuration.service.ts  | 6 ++++++
 .../ui/dmp/editor/general-tab/general-tab.component.html  | 2 +-
 .../ui/dmp/editor/general-tab/general-tab.component.ts    | 8 +++++++-
 dmp-frontend/src/assets/config/config.json                | 3 ++-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/dmp-frontend/src/app/core/services/configuration/configuration.service.ts b/dmp-frontend/src/app/core/services/configuration/configuration.service.ts
index e95d87773..e6d544816 100644
--- a/dmp-frontend/src/app/core/services/configuration/configuration.service.ts
+++ b/dmp-frontend/src/app/core/services/configuration/configuration.service.ts
@@ -57,6 +57,11 @@ export class ConfigurationService extends BaseComponent {
 		return this._guideAssets;
 	}
 
+	private _allowOrganizationCreator: boolean;
+	get allowOrganizationCreator():boolean {
+		return this._allowOrganizationCreator;
+	}
+
 
 	public loadConfiguration(): Promise<any> {
 		return new Promise((r, e) => {
@@ -92,6 +97,7 @@ export class ConfigurationService extends BaseComponent {
 		this._logging = Logging.parseValue(config.logging);
 		this._lockInterval = config.lockInterval;
 		this._guideAssets = config.guideAssets;
+		this._allowOrganizationCreator = config.allowOrganizationCreator;
 	}
 
 }
diff --git a/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.html b/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.html
index 50d7d2fef..620a27cb4 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.html
+++ b/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.html
@@ -46,7 +46,7 @@
 					<mat-error *ngIf="formGroup.get('organisations').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' |
 												translate}}</mat-error>
 					<mat-hint>{{'DMP-EDITOR.FIELDS.ORGANISATIONS-HINT' | translate}}</mat-hint>
-					<button matSuffix class="input-btn" [disabled]="canAddOrganizations()" type="button" (click)="addOrganization($event)">
+					<button *ngIf="showOrganizationCreator()" matSuffix class="input-btn" [disabled]="canAddOrganizations()" type="button" (click)="addOrganization($event)">
 						<mat-icon class="icon-btn">add_circle</mat-icon>
 					</button>
 				</mat-form-field>
diff --git a/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.ts b/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.ts
index f21ddfed9..1435dfaef 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.ts
@@ -22,6 +22,7 @@ import { Observable } from 'rxjs';
 import { map, takeUntil } from 'rxjs/operators';
 import { AddOrganizationComponent } from '../add-organization/add-organization.component';
 import { isNullOrUndefined } from 'util';
+import { ConfigurationService } from '@app/core/services/configuration/configuration.service';
 
 @Component({
 	selector: 'app-general-tab',
@@ -71,7 +72,8 @@ export class GeneralTabComponent extends BaseComponent implements OnInit {
 		private externalSourcesService: ExternalSourcesService,
 		private _service: DmpService,
 		private dialog: MatDialog,
-		private language: TranslateService
+		private language: TranslateService,
+		private configurationService: ConfigurationService
 	) {
 		super();
 	}
@@ -194,6 +196,10 @@ export class GeneralTabComponent extends BaseComponent implements OnInit {
 		});
 	}
 
+	showOrganizationCreator(): boolean {
+		return this.configurationService.allowOrganizationCreator;
+	}
+
 	canAddOrganizations(): boolean {
 		if (!isNullOrUndefined(this.formGroup.get('organizations'))) {
 			return this.formGroup.get('organiztions').disabled;
diff --git a/dmp-frontend/src/assets/config/config.json b/dmp-frontend/src/assets/config/config.json
index 1c32e5676..7674363b7 100644
--- a/dmp-frontend/src/assets/config/config.json
+++ b/dmp-frontend/src/assets/config/config.json
@@ -49,5 +49,6 @@
 		"logLevels": ["debug", "info", "warning", "error"]
 	},
 	"lockInterval": 60000,
-	"guideAssets": "assets/images/guide"
+	"guideAssets": "assets/images/guide",
+	"allowOrganizationCreator": true
 }

From d67e68d0d95156d98949a850b2447b7376df2f88 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Mon, 27 Apr 2020 16:21:03 +0300
Subject: [PATCH 39/60] Improve self deployment

---
 dmp-backend/Docker/dmp-backend.env            |   1 +
 dmp-backend/Dockerfile                        |  34 ++-
 .../config/application-devel.properties       |   5 +-
 .../resources/config/application.properties   |   6 +-
 .../resources/logging/logback-production.xml  |   4 +-
 .../resources/logging/logback-staging.xml     |   4 +-
 dmp-frontend/Dockerfile                       |  45 ++--
 dmp-frontend/mime.types                       |  48 ++++
 dmp-frontend/nginx.conf                       |  35 +++
 dmp-frontend/src/app/core/model/dmp/dmp.ts    |   2 +-
 .../src/app/core/model/funder/funder.ts       |   2 +-
 .../src/app/core/model/grant/grant-listing.ts |   2 +-
 .../core/model/organisation/organization.ts   |   2 +-
 .../src/app/core/model/project/project.ts     |   2 +-
 .../app/core/services/auth/auth.service.ts    |   2 +-
 .../app/core/services/lock/lock.service.ts    |   8 +-
 .../recent-edited-activity.component.ts       |   4 +-
 .../app/ui/dmp/editor/dmp-editor.component.ts |  88 +++----
 .../dmp/editor/grant-tab/funder-form-model.ts |   2 +-
 .../dmp/editor/grant-tab/grant-tab-model.ts   |   2 +-
 .../editor/grant-tab/project-form-model.ts    |   2 +-
 .../editor/people-tab/people-tab.component.ts |   2 +-
 .../dmp-listing-item.component.ts             |   2 +-
 .../ui/dmp/overview/dmp-overview.component.ts |   4 +-
 .../ui/dmp/wizard/dmp-wizard-editor.model.ts  |   2 +-
 .../explore-dmp-listing-item.component.ts     |   4 +-
 .../app/ui/grant/editor/grant-editor.model.ts |   2 +-
 .../user-dialog/user-dialog.component.ts      |   2 +-
 .../dmp-editor/dmp-editor-wizard-model.ts     |   2 +-
 .../grant-editor/grant-editor-wizard-model.ts |   2 +-
 .../src/app/ui/sidebar/sidebar.component.ts   |   6 +-
 dmp-frontend/src/assets/config/config.json    |   2 +-
 docker-compose.yml                            | 239 +++---------------
 openDMP/dmp-backend/opendmp-logs/.gitkeep     |   0
 openDMP/dmp-backend/tmp/.gitkeep              |   0
 openDMP/dmp-frontend/static-files/.gitkeep    |   0
 openDMP/dmp-frontend/webapp/.gitkeep          |   0
 {guide => user-guide}/UserGuideDRAFT.html     |   0
 38 files changed, 256 insertions(+), 313 deletions(-)
 create mode 100644 dmp-backend/Docker/dmp-backend.env
 create mode 100644 dmp-frontend/mime.types
 create mode 100644 dmp-frontend/nginx.conf
 create mode 100644 openDMP/dmp-backend/opendmp-logs/.gitkeep
 create mode 100644 openDMP/dmp-backend/tmp/.gitkeep
 create mode 100644 openDMP/dmp-frontend/static-files/.gitkeep
 create mode 100644 openDMP/dmp-frontend/webapp/.gitkeep
 rename {guide => user-guide}/UserGuideDRAFT.html (100%)

diff --git a/dmp-backend/Docker/dmp-backend.env b/dmp-backend/Docker/dmp-backend.env
new file mode 100644
index 000000000..eada87b0c
--- /dev/null
+++ b/dmp-backend/Docker/dmp-backend.env
@@ -0,0 +1 @@
+PROFILE=staging
\ No newline at end of file
diff --git a/dmp-backend/Dockerfile b/dmp-backend/Dockerfile
index 8701a23a0..4b9954a9e 100644
--- a/dmp-backend/Dockerfile
+++ b/dmp-backend/Dockerfile
@@ -1,11 +1,23 @@
-FROM openjdk:8-jdk-alpine
-RUN apk add --update \
-        curl \
-        && rm -rf /var/cache/apk/*
-VOLUME /tmp
-ARG PROFILE=production
-ENV PROF $PROFILE
-ADD web/src/main/resources/ProjectConfiguration.xml /tmp/ProjectConfiguration.xml
-ADD web/src/main/resources/ExternalUrls.xml /tmp/ExternalUrls.xml
-ADD web/target/web-1.0-SNAPSHOT.jar app.jar
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom" ,"-Dspring.profiles.active=${PROF}","-jar","/app.jar"]
\ No newline at end of file
+FROM maven:3-jdk-8-alpine AS MAVEN_BUILD
+
+ 
+
+COPY pom.xml /build/
+COPY data /build/data/
+COPY elastic /build/elastic/
+COPY logging /build/logging/
+COPY queryable /build/queryable/
+COPY web /build/web/
+
+ 
+
+WORKDIR /build/
+RUN mvn package
+
+ 
+
+FROM openjdk:8-jre-alpine
+WORKDIR /app
+
+COPY --from=MAVEN_BUILD /build/web/target/web-1.0-SNAPSHOT.jar /app/app.jar
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom" ,"-Dspring.profiles.active=${PROFILE}","-jar","/app/app.jar"]
\ No newline at end of file
diff --git a/dmp-backend/web/src/main/resources/config/application-devel.properties b/dmp-backend/web/src/main/resources/config/application-devel.properties
index 7051f6667..c7cb9d05e 100644
--- a/dmp-backend/web/src/main/resources/config/application-devel.properties
+++ b/dmp-backend/web/src/main/resources/config/application-devel.properties
@@ -77,4 +77,7 @@ zenodo.login.redirect_uri=http://localhost:4200/login/external/zenodo
 #############CONTACT EMAIL CONFIGURATIONS#########
 contact_email.mail=
 
-language.path=tempLang/i18n/
\ No newline at end of file
+language.path=i18n/
+
+#############LOGGING#########
+logging.config=classpath:logging/logback-${spring.profiles.active}.xml
\ No newline at end of file
diff --git a/dmp-backend/web/src/main/resources/config/application.properties b/dmp-backend/web/src/main/resources/config/application.properties
index 610c84be8..229e7ed48 100644
--- a/dmp-backend/web/src/main/resources/config/application.properties
+++ b/dmp-backend/web/src/main/resources/config/application.properties
@@ -1,4 +1,4 @@
-server.port=8080
+server.port=8081
 server.tomcat.max-threads = 20
 server.tomcat.max-connections = 10000
 logging.file=/logs/spring-boot-logging.log
@@ -79,7 +79,7 @@ database.lock-fail-interval=120000
 
 ##########################MISC##########################################
 #############USER GUIDE#########
-userguide.path=guide/
+userguide.path=user-guide/
 
 #############NOTIFICATION#########
 notification.rateInterval=30000
@@ -90,7 +90,7 @@ notification.finalised.subject=[OpenDMP] The {name} has been finalised
 notification.modifiedFinalised.subject=[OpenDMP] The {name} has been modified and finalised
 
 #############LOGGING#########
-logging.config=classpath:logging/logback-${spring.profiles.active}.xml
+logging.config=file:/app/logging/logback-${spring.profiles.active}.xml
 
 #############TEMP#########
 temp.temp=tmp/
\ No newline at end of file
diff --git a/dmp-backend/web/src/main/resources/logging/logback-production.xml b/dmp-backend/web/src/main/resources/logging/logback-production.xml
index 9b27c97dc..f62bc4664 100644
--- a/dmp-backend/web/src/main/resources/logging/logback-production.xml
+++ b/dmp-backend/web/src/main/resources/logging/logback-production.xml
@@ -7,9 +7,9 @@
     </appender>
 
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>/files/logs/openDMP.log</file>
+        <file>/app/logs/openDMP.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>/files/logs/openDMP-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <fileNamePattern>/app/logs/openDMP-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
             <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <maxFileSize>100MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
diff --git a/dmp-backend/web/src/main/resources/logging/logback-staging.xml b/dmp-backend/web/src/main/resources/logging/logback-staging.xml
index f1e40e210..143e8a18f 100644
--- a/dmp-backend/web/src/main/resources/logging/logback-staging.xml
+++ b/dmp-backend/web/src/main/resources/logging/logback-staging.xml
@@ -7,9 +7,9 @@
     </appender>
 
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>/files/logs/openDMP.log</file>
+        <file>/app/logs/openDMP.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>/files/logs/openDMP-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <fileNamePattern>/app/logs/openDMP-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
             <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <maxFileSize>100MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
diff --git a/dmp-frontend/Dockerfile b/dmp-frontend/Dockerfile
index a1aaa80d3..5e6fe52b2 100644
--- a/dmp-frontend/Dockerfile
+++ b/dmp-frontend/Dockerfile
@@ -1,17 +1,32 @@
-FROM johnpapa/angular-cli as angular
-WORKDIR /app
-COPY package.json /app/
-RUN npm cache clear --force && npm install
+# stage1 as builder
+FROM node:12-alpine as builder
 
-COPY ./ /app/
-ARG env=dev
-ARG aot=--no-aot
-RUN echo $env 
-RUN echo $aot
-RUN  if [ "$env" = "prod" ]; then ng build --$env --$aot; else ng build --$aot; fi
+WORKDIR /page
 
-# Stage 1, based on Nginx, to have only the compiled app, ready for production with Nginx
-FROM nginx:1.13
-COPY --from=angular /app/dist/ /usr/share/nginx/html
-COPY --from=angular /app/static/ /usr/share/nginx/static
-COPY ./nginx-custom.conf /etc/nginx/conf.d/default.conf
+# copy the package.json to install dependencies
+COPY package.json /page
+
+# Install the dependencies and make the folder
+RUN npm install
+
+COPY . /page
+
+# Build the project and copy the files
+RUN npm run ng build -- --deploy-url=/ --prod
+
+FROM nginx:alpine
+
+#!/bin/sh
+
+COPY nginx.conf /etc/nginx
+COPY mime.types /etc/nginx
+
+## Remove default nginx index page
+RUN rm -rf /usr/share/nginx/html/*
+
+# Copy from the stahg 1
+COPY --from=builder /page/dist /usr/share/nginx/html
+
+EXPOSE 4200
+
+ENTRYPOINT ["nginx", "-g", "daemon off;", "-p", "/usr/share/nginx"]
diff --git a/dmp-frontend/mime.types b/dmp-frontend/mime.types
new file mode 100644
index 000000000..62bd4b668
--- /dev/null
+++ b/dmp-frontend/mime.types
@@ -0,0 +1,48 @@
+types {
+  text/html                             html htm shtml;
+  text/css                              css;
+  text/xml                              xml rss;
+  image/gif                             gif;
+  image/jpeg                            jpeg jpg;
+  application/x-javascript              js;
+  text/plain                            txt;
+  text/x-component                      htc;
+  text/mathml                           mml;
+  image/png                             png;
+  image/x-icon                          ico;
+  image/x-jng                           jng;
+  image/vnd.wap.wbmp                    wbmp;
+  application/java-archive              jar war ear;
+  application/mac-binhex40              hqx;
+  application/pdf                       pdf;
+  application/x-cocoa                   cco;
+  application/x-java-archive-diff       jardiff;
+  application/x-java-jnlp-file          jnlp;
+  application/x-makeself                run;
+  application/x-perl                    pl pm;
+  application/x-pilot                   prc pdb;
+  application/x-rar-compressed          rar;
+  application/x-redhat-package-manager  rpm;
+  application/x-sea                     sea;
+  application/x-shockwave-flash         swf;
+  application/x-stuffit                 sit;
+  application/x-tcl                     tcl tk;
+  application/x-x509-ca-cert            der pem crt;
+  application/x-xpinstall               xpi;
+  application/zip                       zip;
+  application/octet-stream              deb;
+  application/octet-stream              bin exe dll;
+  application/octet-stream              dmg;
+  application/octet-stream              eot;
+  application/octet-stream              iso img;
+  application/octet-stream              msi msp msm;
+  audio/mpeg                            mp3;
+  audio/x-realaudio                     ra;
+  video/mpeg                            mpeg mpg;
+  video/quicktime                       mov;
+  video/x-flv                           flv;
+  video/x-msvideo                       avi;
+  video/x-ms-wmv                        wmv;
+  video/x-ms-asf                        asx asf;
+  video/x-mng                           mng;
+}
\ No newline at end of file
diff --git a/dmp-frontend/nginx.conf b/dmp-frontend/nginx.conf
new file mode 100644
index 000000000..7b29b4cb8
--- /dev/null
+++ b/dmp-frontend/nginx.conf
@@ -0,0 +1,35 @@
+
+events {
+  worker_connections  4096;  ## Default: 1024
+}
+
+http {
+	include    ./mime.types;
+	server {
+
+	listen 4200;
+
+	sendfile on;
+
+	gzip on;
+	gzip_http_version 1.1;
+	gzip_disable      "MSIE [1-6]\.";
+	gzip_min_length   1100;
+	gzip_vary         on;
+	gzip_proxied      expired no-cache no-store private auth;
+	gzip_types        text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript;
+	gzip_comp_level   9;
+
+
+
+
+
+	location / {
+		root /usr/share/nginx/html;
+		try_files $uri $uri/ /index.html =404;
+		add_header Cache-Control "no-store, no-cache, must-revalidate";
+	}
+
+	}
+
+}
diff --git a/dmp-frontend/src/app/core/model/dmp/dmp.ts b/dmp-frontend/src/app/core/model/dmp/dmp.ts
index 721c42608..15f226b0a 100644
--- a/dmp-frontend/src/app/core/model/dmp/dmp.ts
+++ b/dmp-frontend/src/app/core/model/dmp/dmp.ts
@@ -1,4 +1,4 @@
-import { Status } from "../../common/enum/Status";
+import { Status } from "../../common/enum/status";
 import { DmpProfile, DmpProfileDefinition } from "../dmp-profile/dmp-profile";
 import { OrganizationModel } from "../organisation/organization";
 import { GrantListingModel } from "../grant/grant-listing";
diff --git a/dmp-frontend/src/app/core/model/funder/funder.ts b/dmp-frontend/src/app/core/model/funder/funder.ts
index 8a0046dfb..a266d90ea 100644
--- a/dmp-frontend/src/app/core/model/funder/funder.ts
+++ b/dmp-frontend/src/app/core/model/funder/funder.ts
@@ -1,4 +1,4 @@
-import { Status } from "../../common/enum/Status";
+import { Status } from "../../common/enum/status";
 
 export class FunderModel {
 	id: string;
diff --git a/dmp-frontend/src/app/core/model/grant/grant-listing.ts b/dmp-frontend/src/app/core/model/grant/grant-listing.ts
index 9573ae4b6..d6d2fba85 100644
--- a/dmp-frontend/src/app/core/model/grant/grant-listing.ts
+++ b/dmp-frontend/src/app/core/model/grant/grant-listing.ts
@@ -1,6 +1,6 @@
 import { UrlListingItem } from "../../../library/url-listing/url-listing-item";
 import { GrantType } from '../../common/enum/grant-type';
-import { Status } from '../../common/enum/Status';
+import { Status } from '../../common/enum/status';
 
 export interface GrantListingModel {
 	id?: string;
diff --git a/dmp-frontend/src/app/core/model/organisation/organization.ts b/dmp-frontend/src/app/core/model/organisation/organization.ts
index 5fd54c7ab..9cdc13e05 100644
--- a/dmp-frontend/src/app/core/model/organisation/organization.ts
+++ b/dmp-frontend/src/app/core/model/organisation/organization.ts
@@ -1,4 +1,4 @@
-import { Status } from "../../common/enum/Status";
+import { Status } from "../../common/enum/status";
 
 export interface OrganizationModel {
 	id: string;
diff --git a/dmp-frontend/src/app/core/model/project/project.ts b/dmp-frontend/src/app/core/model/project/project.ts
index 6f401f312..bd467a575 100644
--- a/dmp-frontend/src/app/core/model/project/project.ts
+++ b/dmp-frontend/src/app/core/model/project/project.ts
@@ -1,4 +1,4 @@
-import { Status } from "../../common/enum/Status";
+import { Status } from "../../common/enum/status";
 import { UrlListingItem } from "../../../library/url-listing/url-listing-item";
 import { ProjectType } from "../../common/enum/project-type";
 
diff --git a/dmp-frontend/src/app/core/services/auth/auth.service.ts b/dmp-frontend/src/app/core/services/auth/auth.service.ts
index a50261ba0..9b61514c4 100644
--- a/dmp-frontend/src/app/core/services/auth/auth.service.ts
+++ b/dmp-frontend/src/app/core/services/auth/auth.service.ts
@@ -5,7 +5,7 @@ import { MatSnackBar } from '@angular/material/snack-bar';
 import { Router } from '@angular/router';
 import { Credential } from '@app/core/model/auth/credential';
 import { LoginInfo } from '@app/core/model/auth/login-info';
-import { Principal } from '@app/core/model/auth/Principal';
+import { Principal } from '@app/core/model/auth/principal';
 import { ConfigurableProvider } from '@app/core/model/configurable-provider/configurableProvider';
 import { SnackBarNotificationLevel, UiNotificationService } from '@app/core/services/notification/ui-notification-service';
 import { BaseService } from '@common/base/base.service';
diff --git a/dmp-frontend/src/app/core/services/lock/lock.service.ts b/dmp-frontend/src/app/core/services/lock/lock.service.ts
index a816163e5..3404f1cc0 100644
--- a/dmp-frontend/src/app/core/services/lock/lock.service.ts
+++ b/dmp-frontend/src/app/core/services/lock/lock.service.ts
@@ -17,18 +17,18 @@ export class LockService {
 	}
 
 	checkLockStatus(id: string): Observable<boolean> {
-		return this.http.get(`${this.actionUrl}target/status/${id}`, {headers: this.headers});
+		return this.http.get(`${this.actionUrl}target/status/${id}`, { headers: this.headers });
 	}
 
 	unlockTarget(id: string): Observable<any> {
-		return this.http.delete(`${this.actionUrl}target/unlock/${id}`, {headers: this.headers});
+		return this.http.delete(`${this.actionUrl}target/unlock/${id}`, { headers: this.headers });
 	}
 
 	getSingle(id: string): Observable<LockModel> {
-		return this.http.get(`${this.actionUrl}target/${id}`, {headers: this.headers});
+		return this.http.get(`${this.actionUrl}target/${id}`, { headers: this.headers });
 	}
 
 	createOrUpdate(lock: LockModel): Observable<string> {
-		return this.http.post(`${this.actionUrl}`, lock, {headers: this.headers});
+		return this.http.post(`${this.actionUrl}`, lock, { headers: this.headers });
 	}
 }
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 6e9b89b8b..bff497006 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
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material';
 import { Router } from '@angular/router';
 import { RecentActivityType } from '@app/core/common/enum/recent-activity-type';
-import { Principal } from '@app/core/model/auth/Principal';
+import { Principal } from '@app/core/model/auth/principal';
 import { DataTableRequest } from '@app/core/model/data-table/data-table-request';
 import { DmpListingModel } from '@app/core/model/dmp/dmp-listing';
 import { DmpCriteria } from '@app/core/query/dmp/dmp-criteria';
@@ -10,7 +10,7 @@ import { AuthService } from '@app/core/services/auth/auth.service';
 import { DmpService } from '@app/core/services/dmp/dmp.service';
 import { SnackBarNotificationLevel, UiNotificationService } from '@app/core/services/notification/ui-notification-service';
 import { EnumUtils } from '@app/core/services/utilities/enum-utils.service';
-import { ConfirmationDialogComponent  } from '@common/modules/confirmation-dialog/confirmation-dialog.component';
+import { ConfirmationDialogComponent } from '@common/modules/confirmation-dialog/confirmation-dialog.component';
 import { BaseComponent } from '@common/base/base.component';
 import { TranslateService } from '@ngx-translate/core';
 import * as FileSaver from 'file-saver';
diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts
index 889b303b5..1a03c4a27 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts
@@ -34,7 +34,7 @@ import { TranslateService } from '@ngx-translate/core';
 import * as FileSaver from 'file-saver';
 import { Observable, of as observableOf, interval } from 'rxjs';
 import { map, takeUntil } from 'rxjs/operators';
-import { Principal } from "@app/core/model/auth/Principal";
+import { Principal } from "@app/core/model/auth/principal";
 import { Role } from "@app/core/common/enum/role";
 import { LockService } from '@app/core/services/lock/lock.service';
 import { Location } from '@angular/common';
@@ -109,7 +109,7 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
 				// 	displayFn: (item) => item['label'],
 				// 	titleFn: (item) => item['label']
 				// };
-				switch(tabToNav) {
+				switch (tabToNav) {
 					case 'general':
 						this.selectedTab = 0;
 						break;
@@ -130,52 +130,52 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
 						.subscribe(async data => {
 							this.lockService.checkLockStatus(data.id).pipe(takeUntil(this._destroyed)).subscribe(lockStatus => {
 								this.lockStatus = lockStatus;
-							this.dmp = new DmpEditorModel();
-							this.dmp.grant = new GrantTabModel();
-							this.dmp.project = new ProjectFormModel();
-							this.dmp.funder = new FunderFormModel();
-							this.dmp.fromModel(data);
-							this.formGroup = this.dmp.buildForm();
-							this.setIsUserOwner();
-							if (!this.isUserOwner) {
-								this.isFinalized = true;
-								this.formGroup.disable();
-							}
+								this.dmp = new DmpEditorModel();
+								this.dmp.grant = new GrantTabModel();
+								this.dmp.project = new ProjectFormModel();
+								this.dmp.funder = new FunderFormModel();
+								this.dmp.fromModel(data);
+								this.formGroup = this.dmp.buildForm();
+								this.setIsUserOwner();
+								if (!this.isUserOwner) {
+									this.isFinalized = true;
+									this.formGroup.disable();
+								}
 
-							//this.registerFormEventsForDmpProfile(this.dmp.definition);
-							if (!this.editMode || this.dmp.status === DmpStatus.Finalized || lockStatus) {
-								this.isFinalized = true;
-								this.formGroup.disable();
-							}
+								//this.registerFormEventsForDmpProfile(this.dmp.definition);
+								if (!this.editMode || this.dmp.status === DmpStatus.Finalized || lockStatus) {
+									this.isFinalized = true;
+									this.formGroup.disable();
+								}
 
-							if (this.isAuthenticated) {
-								if (!lockStatus) {
-									this.lock = new LockModel(data.id, this.getUserFromDMP());
+								if (this.isAuthenticated) {
+									if (!lockStatus) {
+										this.lock = new LockModel(data.id, this.getUserFromDMP());
 
-									this.lockService.createOrUpdate(this.lock).pipe(takeUntil(this._destroyed)).subscribe(async result => {
-										this.lock.id = Guid.parse(result);
-										interval(this.configurationService.lockInterval).pipe(takeUntil(this._destroyed)).subscribe(() => this.pumpLock());
+										this.lockService.createOrUpdate(this.lock).pipe(takeUntil(this._destroyed)).subscribe(async result => {
+											this.lock.id = Guid.parse(result);
+											interval(this.configurationService.lockInterval).pipe(takeUntil(this._destroyed)).subscribe(() => this.pumpLock());
+										});
+									}
+									// if (!this.isAuthenticated) {
+									const breadCrumbs = [];
+									breadCrumbs.push({
+										parentComponentName: null,
+										label: this.language.instant('NAV-BAR.MY-DMPS'),
+										url: "/plans"
 									});
+									breadCrumbs.push({
+										parentComponentName: 'DmpListingComponent',
+										label: this.dmp.label,
+										url: '/plans/edit/' + this.dmp.id,
+										// notFoundResolver: [await this.grantService.getSingle(this.dmp.grant.id).map(x => ({ label: x.label, url: '/grants/edit/' + x.id }) as BreadcrumbItem).toPromise()]
+									}
+									);
+									this.breadCrumbs = observableOf(breadCrumbs);
 								}
-								// if (!this.isAuthenticated) {
-								const breadCrumbs = [];
-								breadCrumbs.push({
-									parentComponentName: null,
-									label: this.language.instant('NAV-BAR.MY-DMPS'),
-									url: "/plans"
-								});
-								breadCrumbs.push({
-									parentComponentName: 'DmpListingComponent',
-									label: this.dmp.label,
-									url: '/plans/edit/' + this.dmp.id,
-									// notFoundResolver: [await this.grantService.getSingle(this.dmp.grant.id).map(x => ({ label: x.label, url: '/grants/edit/' + x.id }) as BreadcrumbItem).toPromise()]
-								}
-								);
-								this.breadCrumbs = observableOf(breadCrumbs);
-							}
-							this.associatedUsers = data.associatedUsers;
-							this.people = data.users;
-						})
+								this.associatedUsers = data.associatedUsers;
+								this.people = data.users;
+							})
 						});
 				} else if (publicId != null) {
 					this.isNew = false;
@@ -567,7 +567,7 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
 
 	private pumpLock() {
 		this.lock.touchedAt = new Date();
-		this.lockService.createOrUpdate(this.lock).pipe(takeUntil(this._destroyed)).subscribe( async result => this.lock.id = Guid.parse(result));
+		this.lockService.createOrUpdate(this.lock).pipe(takeUntil(this._destroyed)).subscribe(async result => this.lock.id = Guid.parse(result));
 	}
 
 	// advancedClicked() {
diff --git a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/funder-form-model.ts b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/funder-form-model.ts
index 76adf4e24..4ad0c6e7d 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/funder-form-model.ts
+++ b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/funder-form-model.ts
@@ -1,5 +1,5 @@
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { Status } from '@app/core/common/enum/Status';
+import { Status } from '@app/core/common/enum/status';
 import { FunderModel } from '@app/core/model/funder/funder';
 import { BackendErrorValidator } from '@common/forms/validation/custom-validator';
 import { ValidationErrorModel } from '@common/forms/validation/error-model/validation-error-model';
diff --git a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab-model.ts b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab-model.ts
index afba9fce2..4c01cfbfc 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab-model.ts
+++ b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab-model.ts
@@ -1,5 +1,5 @@
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { Status } from '@app/core/common/enum/Status';
+import { Status } from '@app/core/common/enum/status';
 import { GrantListingModel } from '@app/core/model/grant/grant-listing';
 import { ValidJsonValidator } from '@app/library/auto-complete/auto-complete-custom-validator';
 import { BackendErrorValidator } from '@common/forms/validation/custom-validator';
diff --git a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/project-form-model.ts b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/project-form-model.ts
index 797dfee69..826221b30 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/project-form-model.ts
+++ b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/project-form-model.ts
@@ -1,5 +1,5 @@
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { Status } from '@app/core/common/enum/Status';
+import { Status } from '@app/core/common/enum/status';
 import { ProjectModel } from '@app/core/model/project/project';
 import { BackendErrorValidator } from '@common/forms/validation/custom-validator';
 import { ValidationErrorModel } from '@common/forms/validation/error-model/validation-error-model';
diff --git a/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.ts b/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.ts
index 1c303c446..e5f6b992c 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.ts
@@ -3,7 +3,7 @@ import { FormGroup } from '@angular/forms';
 import { MatDialog } from '@angular/material/dialog';
 import { ConfirmationDialogComponent } from '@common/modules/confirmation-dialog/confirmation-dialog.component';
 import { TranslateService } from '@ngx-translate/core';
-import { Principal } from '../../../../core/model/auth/Principal';
+import { Principal } from '../../../../core/model/auth/principal';
 import { UserInfoListingModel } from '../../../../core/model/user/user-info-listing';
 import { AuthService } from '../../../../core/services/auth/auth.service';
 import { DmpService } from '../../../../core/services/dmp/dmp.service';
diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts
index 77f63bd4d..0f20ccc2d 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts
@@ -5,7 +5,7 @@ import { DmpInvitationDialogComponent } from '../../invitation/dmp-invitation.co
 import { Router, ActivatedRoute } from '@angular/router';
 import { DatasetService } from '../../../../core/services/dataset/dataset.service';
 import { AuthService } from '../../../../core/services/auth/auth.service';
-import { Principal } from '../../../../core/model/auth/Principal';
+import { Principal } from '../../../../core/model/auth/principal';
 import { TranslateService } from '@ngx-translate/core';
 import { DmpStatus } from '../../../../core/common/enum/dmp-status';
 
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
index ca3ded5cc..ea0064270 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
@@ -4,7 +4,7 @@ import { MatDialog } from '@angular/material/dialog';
 import { ActivatedRoute, Params, Router } from '@angular/router';
 import { DatasetStatus } from '@app/core/common/enum/dataset-status';
 import { DmpStatus } from '@app/core/common/enum/dmp-status';
-import { Principal } from '@app/core/model/auth/Principal';
+import { Principal } from '@app/core/model/auth/principal';
 import { DatasetOverviewModel } from '@app/core/model/dataset/dataset-overview';
 import { DatasetsToBeFinalized } from '@app/core/model/dataset/datasets-toBeFinalized';
 import { DmpOverviewModel } from '@app/core/model/dmp/dmp-overview';
@@ -357,7 +357,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 			maxWidth: '600px',
 			restoreFocus: false,
 			data: {
-				message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ZENODO-DOI', { 'username': this.hasDOIToken ? this.authentication.current().zenodoEmail : 'default'}),
+				message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ZENODO-DOI', { 'username': this.hasDOIToken ? this.authentication.current().zenodoEmail : 'default' }),
 				confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CONFIRM'),
 				cancelButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CANCEL'),
 			}
diff --git a/dmp-frontend/src/app/ui/dmp/wizard/dmp-wizard-editor.model.ts b/dmp-frontend/src/app/ui/dmp/wizard/dmp-wizard-editor.model.ts
index 4582e91e8..7edeacf8d 100644
--- a/dmp-frontend/src/app/ui/dmp/wizard/dmp-wizard-editor.model.ts
+++ b/dmp-frontend/src/app/ui/dmp/wizard/dmp-wizard-editor.model.ts
@@ -1,5 +1,5 @@
 import { FormBuilder, FormGroup, Validators } from "@angular/forms";
-import { Status } from '@app/core/common/enum/Status';
+import { Status } from '@app/core/common/enum/status';
 import { DmpProfile, DmpProfileDefinition } from '@app/core/model/dmp-profile/dmp-profile';
 import { DmpModel } from '@app/core/model/dmp/dmp';
 import { DmpDynamicField } from '@app/core/model/dmp/dmp-dynamic-field';
diff --git a/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.ts b/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.ts
index 468b239d6..327bc33be 100644
--- a/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.ts
+++ b/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.ts
@@ -1,6 +1,6 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DmpListingModel } from '../../../core/model/dmp/dmp-listing';
-import { Principal } from '../../../core/model/auth/Principal';
+import { Principal } from '../../../core/model/auth/principal';
 import { AuthService } from '../../../core/services/auth/auth.service';
 import { TranslateService } from '@ngx-translate/core';
 import { Router, ActivatedRoute } from '@angular/router';
@@ -21,7 +21,7 @@ export class ExploreDmpListingItemComponent implements OnInit {
 		private translate: TranslateService,
 		private router: Router,
 		private route: ActivatedRoute
-	) {	}
+	) { }
 
 	ngOnInit() {
 	}
diff --git a/dmp-frontend/src/app/ui/grant/editor/grant-editor.model.ts b/dmp-frontend/src/app/ui/grant/editor/grant-editor.model.ts
index 8b783111c..28769e4a8 100644
--- a/dmp-frontend/src/app/ui/grant/editor/grant-editor.model.ts
+++ b/dmp-frontend/src/app/ui/grant/editor/grant-editor.model.ts
@@ -3,7 +3,7 @@ import { BackendErrorValidator } from '@common/forms/validation/custom-validator
 import { ValidationErrorModel } from '@common/forms/validation/error-model/validation-error-model';
 import { ValidationContext } from '@common/forms/validation/validation-context';
 import { GrantType } from '../../../core/common/enum/grant-type';
-import { Status } from '../../../core/common/enum/Status';
+import { Status } from '../../../core/common/enum/status';
 import { ContentFile, GrantListingModel } from '../../../core/model/grant/grant-listing';
 
 export class GrantEditorModel {
diff --git a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.ts b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.ts
index 326dd5280..21d7e79bc 100644
--- a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.ts
+++ b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.ts
@@ -2,7 +2,7 @@ import { Component, Inject, OnInit } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { Router } from '@angular/router';
-import { Principal } from '../../../../core/model/auth/Principal';
+import { Principal } from '../../../../core/model/auth/principal';
 import { AuthService } from '../../../../core/services/auth/auth.service';
 
 @Component({
diff --git a/dmp-frontend/src/app/ui/quick-wizard/dmp-editor/dmp-editor-wizard-model.ts b/dmp-frontend/src/app/ui/quick-wizard/dmp-editor/dmp-editor-wizard-model.ts
index fa213f870..3ec776427 100644
--- a/dmp-frontend/src/app/ui/quick-wizard/dmp-editor/dmp-editor-wizard-model.ts
+++ b/dmp-frontend/src/app/ui/quick-wizard/dmp-editor/dmp-editor-wizard-model.ts
@@ -1,5 +1,5 @@
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { Status } from '@app/core/common/enum/Status';
+import { Status } from '@app/core/common/enum/status';
 import { DatasetProfileModel } from '@app/core/model/dataset/dataset-profile';
 import { DmpProfileDefinition } from '@app/core/model/dmp-profile/dmp-profile';
 import { DmpModel } from '@app/core/model/dmp/dmp';
diff --git a/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard-model.ts b/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard-model.ts
index b8f30cc6e..90cbdd8ae 100644
--- a/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard-model.ts
+++ b/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard-model.ts
@@ -1,5 +1,5 @@
 import { FormBuilder, FormGroup, Validators } from "@angular/forms";
-import { Status } from '@app/core/common/enum/Status';
+import { Status } from '@app/core/common/enum/status';
 import { GrantListingModel } from '@app/core/model/grant/grant-listing';
 import { ValidJsonValidator } from '@app/library/auto-complete/auto-complete-custom-validator';
 import { BackendErrorValidator } from '@common/forms/validation/custom-validator';
diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts b/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts
index 9321cb07c..39335f81d 100644
--- a/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts
+++ b/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts
@@ -3,7 +3,7 @@ import { MatDialog } from '@angular/material/dialog';
 import { TranslateService } from '@ngx-translate/core';
 import { AuthService } from '../../core/services/auth/auth.service';
 import { UserDialogComponent } from '../misc/navigation/user-dialog/user-dialog.component';
-import { Principal } from '../../core/model/auth/Principal';
+import { Principal } from '../../core/model/auth/principal';
 import { AppRole } from '../../core/common/enum/app-role';
 import { Router } from '@angular/router';
 import { Location } from '@angular/common';
@@ -51,8 +51,8 @@ export const ADMIN_ROUTES: RouteInfo[] = [
 	{ path: '/dmp-profiles', title: 'SIDE-BAR.DMP-TEMPLATES', icon: 'library_books' },
 	{ path: '/dataset-profiles', title: 'SIDE-BAR.DATASET-TEMPLATES', icon: 'library_books' },
 	{ path: '/users', title: 'SIDE-BAR.USERS', icon: 'people' },
-	{ path: '/language-editor', title: 'SIDE-BAR.LANGUAGE-EDITOR', icon: 'language'},
-	{ path: '/user-guide-editor', title: 'SIDE-BAR.GUIDE-EDITOR', icon: 'import_contacts'}
+	{ path: '/language-editor', title: 'SIDE-BAR.LANGUAGE-EDITOR', icon: 'language' },
+	{ path: '/user-guide-editor', title: 'SIDE-BAR.GUIDE-EDITOR', icon: 'import_contacts' }
 ];
 // export const HISTORY_ROUTES: RouteInfo[] = [
 //   { path: '/typography', title: 'SIDE-BAR.HISTORY-VISITED',  icon: 'visibility'},
diff --git a/dmp-frontend/src/assets/config/config.json b/dmp-frontend/src/assets/config/config.json
index 7674363b7..5f916f361 100644
--- a/dmp-frontend/src/assets/config/config.json
+++ b/dmp-frontend/src/assets/config/config.json
@@ -1,6 +1,6 @@
 {
 	"production": false,
-	"Server": "http://localhost:8080/api/",
+	"Server": "http://localhost:8081/api/",
 	"App": "http://localhost:4200/",
 	"HelpService": {
 		"Enabled": false,
diff --git a/docker-compose.yml b/docker-compose.yml
index 1b94552b3..ac90b8444 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,212 +1,41 @@
----
-version: '3'
-services:
-  # The environment variable "TAG" is used throughout this file to
-  # specify the version of the images to run. The default is set in the
-  # '.env' file in this folder. It can be overridden with any normal
-  # technique for setting environment variables, for example:
-  #
-  #   TAG=6.0.0-beta1 docker-compose up
-  #
-  # REF: https://docs.docker.com/compose/compose-file/#variable-substitution
-  #
-  # Also be sure to set the ELASTIC_VERSION variable. For released versions,
-  # ${TAG} and ${ELASTIC_VERSION} will be identical, but for pre-release
-  # versions, ${TAG} might contain an extra build identifier, like
-  # "6.0.0-beta1-3eab5b40", so a full invocation might look like:
-  #
-  #   ELASTIC_VERSION=6.0.0-beta1 TAG=6.0.0-beta1-3eab5b40 docker-compose up
-  #
- 
-##########################DMP######################################################################
+version: '2.2'
 
+services:
   dmp-backend:
-    build:
-       context: ./dmp-backend
-       args:
-            PROFILE: ${PROFILE}
-    container_name: dmp-backend
-    ports: ['0.0.0.0:8080:8080']
-    links:
-       # - logstash:logstash
-       - elasticsearch-dmp:elasticsearch-dmp
-    networks: ['stack','elasticsearch-dmp']
+    build: 
+      context: ./dmp-backend
+    container_name: opendmp-backend
+    env_file: ./dmp-backend/Docker/dmp-backend.env
+    restart: unless-stopped
+    mem_limit: 2048m
+    ports:
+      - "8081:8081"
+    networks:
+      - opendmp-backend-network
+    volumes:
+      - ./openDMP/dmp-backend/config:/app/config
+      - ./openDMP/dmp-backend/user-guide:/app/user-guide
+      - ./openDMP/dmp-backend/i18n:/app/i18n
+      - ./openDMP/dmp-backend/externalUrls:/app/externalUrls
+      - ./openDMP/dmp-backend/templates:/app/templates
+      - ./openDMP/dmp-backend/opendmp-logs:/app/logs
+      - ./openDMP/dmp-backend/tmp:/app/tmp
+      - ./openDMP/dmp-backend/logging:/app/logging
 
   dmp-frontend:
     build:
-       context: ./dmp-frontend
-       args:
-            env: ${ENV}
-            aot: ${AOT}
-    container_name: dmp-frontend
+      context: ./dmp-frontend
+    container_name: opendmp-frontend
+    mem_limit: 2048m
+    restart: unless-stopped
+    ports:
+      - "8080:4200"
     volumes:
-        - ./static:/usr/share/nginx/static
-        - /srv/docker/wwwcert:/usr/share/nginx/wwwcert
-    ports: ['0.0.0.0:80:80']
-    networks: ['stack']
-
-##########################ELASTIC######################################################################
-  elasticsearch-dmp:
-    image: docker.elastic.co/elasticsearch/elasticsearch:${TAG}
-    container_name: elasticsearch-dmp
-    volumes:
-          - ./elastic-config/elasticsearch-custom.yml:/usr/share/elasticsearch/config/elasticsearch.yml
-    environment: ['http.host=0.0.0.0','transport.host=0.0.0.0','discovery.type=single-node']
-    ports: ['0.0.0.0:9201:9200','0.0.0.0:9301:9300']
-    networks: ['elasticsearch-dmp']
-    volumes:
-      - esdata-dmp:/usr/share/elasticsearch/data
-
-##########################ELK-STACK######################################################################
-
-  elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:${TAG}
-    container_name: elasticsearch
-    environment: ['http.host=0.0.0.0', 'transport.host=127.0.0.1', 'ELASTIC_PASSWORD=${ELASTIC_PASSWORD}','discovery.type=single-node']
-    ports: ['0.0.0.0:9200:9200']
-    networks: ['stack']
-    volumes:
-      - esdata:/usr/share/elasticsearch/data
-
-  kibana:
-    image: docker.elastic.co/kibana/kibana:${TAG}
-    container_name: kibana
-    ports: ['0.0.0.0:5601:5601']
-    networks: ['stack']
-    depends_on: ['elasticsearch']
-
-  logstash:
-    image: docker.elastic.co/logstash/logstash:${TAG}
-    container_name: logstash
-    volumes:
-      - ./ELK.Docker/config/logstash.conf:/usr/share/logstash/pipeline/logstash.conf
-    ports: ['0.0.0.0:31311:31311']
-
-    networks: ['stack']
-    depends_on: ['elasticsearch', 'setup_logstash']
-
-  #filebeat:
-  #  image: docker.elastic.co/beats/filebeat:${TAG}
-  #  container_name: filebeat
-  #  command: -e -E 'output.elasticsearch.password=${ELASTIC_PASSWORD}'
-  #  networks: ['stack']
-  #  depends_on: ['elasticsearch', 'setup_filebeat']
-
-  #heartbeat:
-  #  image: docker.elastic.co/beats/heartbeat:${TAG}
-  #  container_name: heartbeat
-  #  command: -e -E 'output.elasticsearch.password=${ELASTIC_PASSWORD}'
-  #  networks: ['stack']
-  #  depends_on: ['elasticsearch', 'setup_heartbeat']
-
-  # Run a short-lived container to set up Logstash.
-  setup_logstash:
-    image: centos:7
-    container_name: setup_logstash
-    volumes: ['./ELK.Docker/scripts/setup-logstash.sh:/usr/local/bin/setup-logstash.sh:ro']
-    command: ['/bin/bash', '-c', 'cat /usr/local/bin/setup-logstash.sh | tr -d "\r" | bash']
-    environment: ['ELASTIC_PASSWORD=${ELASTIC_PASSWORD}']
-    networks: ['stack']
-    depends_on: ['elasticsearch']
-
-  setup_kibana:
-    image: centos:7
-    container_name: setup_kibana
-    volumes: ['./ELK.Docker/scripts/setup-kibana.sh:/usr/local/bin/setup-kibana.sh:ro']
-    command: ['/bin/bash', '-c', 'cat /usr/local/bin/setup-kibana.sh | tr -d "\r" | bash']
-    environment: ['ELASTIC_PASSWORD=${ELASTIC_PASSWORD}']
-    networks: ['stack']
-    depends_on: ['elasticsearch']
-
-  #setup_filebeat:
-  #  image: docker.elastic.co/beats/filebeat:${TAG}
-  #  container_name: setup_filebeat
-  #  volumes: ['./ELK.Docker/scripts/setup-beat.sh:/usr/local/bin/setup-beat.sh:ro']
-  #  command: ['/bin/bash', '-c', 'cat /usr/local/bin/setup-beat.sh | tr -d "\r" | bash -s filebeat']
-  #  environment: ['ELASTIC_PASSWORD=${ELASTIC_PASSWORD}']
-  #  networks: ['stack']
-  #  depends_on: ['kibana']
-
-  #setup_heartbeat:
-  #  image: docker.elastic.co/beats/heartbeat:${TAG}
-  #  container_name: setup_heartbeat
-  #  volumes: ['./ELK.Docker/scripts/setup-beat.sh:/usr/local/bin/setup-beat.sh:ro']
-  #  command: ['/bin/bash', '-c', 'cat /usr/local/bin/setup-beat.sh | tr -d "\r" | bash -s heartbeat']
-  #  environment: ['ELASTIC_PASSWORD=${ELASTIC_PASSWORD}']
-  #  networks: ['stack']
-  #  depends_on: ['kibana']
-
-##########################DOCSBOX######################################################################
-  # web:
-    # restart: always
-    # build: ./docsbox-master/docsbox
-    # expose:
-      # - "8000"
-    # links:
-      # - redis:redis
-    # volumes:
-      # - docsbox:/home/docsbox
-      # - media:/home/docsbox/media
-    # command: gunicorn -b :8000 docsbox:app
-    # networks: ['stack']
-
-  # rqworker:
-    # restart: always
-    # build: ./docsbox-master/docsbox
-    # links:
-      # - redis:redis
-    # volumes:
-      # - web
-    # command: rq worker -c docsbox.settings
-    # networks: ['stack']
-
-  # rqscheduler:
-    # restart: always
-    # build: ./docsbox-master/docsbox
-    # links:
-      # - redis:redis
-    # volumes:
-      # - web
-    # command: rqscheduler -H redis -p 6379 -d 0
-    # networks: ['stack']
-
-  # nginx:
-    # restart: always
-    # build: ./docsbox-master/nginx/
-    # ports:
-      # - "81:80"
-    # volumes:
-      # - web
-    # links:
-      # - web:web
-    # networks: ['stack']
-
-  # redis:
-    # restart: always
-    # image: redis:latest
-    # expose:
-      # - "6379"
-    # volumes:
-      # - redisdata:/data
-    # networks: ['stack']
-
-
-##########################SETTINGS######################################################################
-
-volumes:
-  esdata:
-    driver: local
-  esdata-dmp:
-    driver: local
-  #redisdata:
-  #  driver: local
-  # docsbox:
-    # driver: local
-  # media:
-    # driver: local
-networks: 
-    stack: {}
-    elasticsearch-dmp: {}
-
-
+      - ./openDMP/dmp-frontend/static-files:/usr/share/nginx/static
+      - ./openDMP/dmp-frontend/webapp/config:/usr/share/nginx/html/assets/config
+    networks:
+      - opendmp-frontend-network
 
+networks:
+  opendmp-frontend-network:
+  opendmp-backend-network:
\ No newline at end of file
diff --git a/openDMP/dmp-backend/opendmp-logs/.gitkeep b/openDMP/dmp-backend/opendmp-logs/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/openDMP/dmp-backend/tmp/.gitkeep b/openDMP/dmp-backend/tmp/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/openDMP/dmp-frontend/static-files/.gitkeep b/openDMP/dmp-frontend/static-files/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/openDMP/dmp-frontend/webapp/.gitkeep b/openDMP/dmp-frontend/webapp/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/guide/UserGuideDRAFT.html b/user-guide/UserGuideDRAFT.html
similarity index 100%
rename from guide/UserGuideDRAFT.html
rename to user-guide/UserGuideDRAFT.html

From 411de18e9f080de71819073a12859aeebcb00ac8 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Tue, 28 Apr 2020 18:27:31 +0300
Subject: [PATCH 40/60] Fixed issue when creating DMP from the creation Wizard

---
 .../src/main/java/eu/eudat/models/data/project/Project.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/project/Project.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/project/Project.java
index 430eb6017..c69e8617f 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/project/Project.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/project/Project.java
@@ -164,7 +164,9 @@ public class Project implements DataModel<eu.eudat.data.entities.Project, Projec
 		this.abbreviation = entity.getAbbreviation();
 		this.reference = entity.getReference();
 		this.uri = entity.getUri();
-		this.type = entity.getType();
+		if (entity.getType() != null) {
+			this.type = entity.getType();
+		}
 		this.definition = entity.getDefinition();
 		this.startDate = entity.getStartdate();
 		this.endDate = entity.getEnddate();

From 75fc4003491a18a6c6c9021dc6d888c25224f839 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Wed, 29 Apr 2020 14:03:19 +0300
Subject: [PATCH 41/60] Added postgres on docker compose

---
 .../resources/config/application.properties   |  2 +-
 dmp-db-scema/Docker/dmp-db.env                |  5 +++
 dmp-db-scema/initdb.sh                        |  7 ++++
 .../{ => main}/DataManagementPlanDB.sql       |  6 ++--
 ...er_DMPDatasetprofile_DMPFinalizedDate.sql} | 35 ++++++++++---------
 .../{DMPisPublic.sql => 03_DMPisPublic.sql}   |  2 +-
 ...=> 04_RenameDatasetColumnFinalizedDat.sql} |  0
 ...ublishedDat.sql => 05_DMPPublishedDat.sql} |  4 +--
 ...ameDMPColumnsFinalizedDatPublishedDat.sql} |  0
 .../{DMPCreateDOI.sql => 07_DMPCreateDOI.sql} |  2 +-
 dmp-db-scema/updates/01/08_Create_content.sql | 15 ++++++++
 .../updates/01/Removes DatasetIsPublic.sql    |  2 --
 ...ql => 01_CreateLoginConfirmationEmail.sql} |  3 +-
 ...ll.sql => 02_UserInfo_email_drop_null.sql} |  0
 ...file_Description_value_set_empty_text.sql} |  0
 ...ile_adds_null_constraints_description.sql} |  0
 ...nt.sql => 03_Renames-Project-to-Grant.sql} |  0
 ...Funder-create.sql => 04_Funder-create.sql} |  0
 ...der.sql => 05_Grant-add-column-Funder.sql} |  0
 .../03/06_Renames-Grant-fk-Constraint.sql     |  9 +++++
 ...7_Renames-Grant-fk-creator-Constraint.sql} |  0
 .../03/08. Renames-Grant-fk-Constraint.sql    |  2 --
 ...l => 08_Renames-Grant-pKey-Constraint.sql} |  0
 ...ql => 09_Rename-Dmps-Project-to_Grant.sql} |  0
 ...oject-create.sql => 10_Project-create.sql} |  0
 ...ject.sql => 11_DMP-add-column-project.sql} |  0
 .../updates/03/12_Remove_xml_types.sql        | 18 ++++++++++
 .../04/01_Funder_add_column_CreationUser.sql  |  2 ++
 ... 02_Funder_update_CreationUser_values.sql} |  2 +-
 .../04/03_Create_External_Datasets.sql        | 15 ++++++++
 ...itory_ExternalDataset_Registry_Service.sql | 11 ++++++
 .../05_Researcher_add_column_CreationUser.sql |  2 ++
 ...itory_ExternalDataset_Registry_Service.sql | 11 ------
 .../04/Funder_add_column_CreationUser.sql     |  2 --
 .../04/Researcher_add_column_CreationUser.sql |  2 --
 ...al_References_Reference_Prefix_Update.sql} |  0
 ...under_Project_Reference_Prefix_Update.sql} |  0
 ...First_Character_To_Lower_Where_Capital.sql |  6 ----
 .../updates/08/02_Add_missing_columns.sql     | 17 +++++++++
 .../updates/08/03_Create_Credentials.sql      | 25 +++++++++++++
 .../updates/08/04_Create_UserToken.sql        | 16 +++++++++
 .../updates/08/05_Create_UserRole.sql         | 18 ++++++++++
 .../updates/08/06_Remove_UserAuth.sql         |  1 +
 docker-compose.yml                            | 26 ++++++++++++--
 44 files changed, 213 insertions(+), 55 deletions(-)
 create mode 100644 dmp-db-scema/Docker/dmp-db.env
 create mode 100644 dmp-db-scema/initdb.sh
 rename dmp-db-scema/{ => main}/DataManagementPlanDB.sql (99%)
 rename dmp-db-scema/updates/01/{DMPUser DMPDatasetprofile DMPFinalizedDate .sql => 01_DMPUser_DMPDatasetprofile_DMPFinalizedDate.sql} (56%)
 rename dmp-db-scema/updates/01/{DMPisPublic.sql => 03_DMPisPublic.sql} (84%)
 rename dmp-db-scema/updates/01/{RenameDatasetColumnFinalizedDat.sql => 04_RenameDatasetColumnFinalizedDat.sql} (100%)
 rename dmp-db-scema/updates/01/{DMPPublishedDat.sql => 05_DMPPublishedDat.sql} (53%)
 rename dmp-db-scema/updates/01/{RenameDMPColumnsFinalizedDatPublishedDat.sql => 06_RenameDMPColumnsFinalizedDatPublishedDat.sql} (100%)
 rename dmp-db-scema/updates/01/{DMPCreateDOI.sql => 07_DMPCreateDOI.sql} (53%)
 create mode 100644 dmp-db-scema/updates/01/08_Create_content.sql
 delete mode 100644 dmp-db-scema/updates/01/Removes DatasetIsPublic.sql
 rename dmp-db-scema/updates/02/{CreateLoginConfirmationEmail.sql => 01_CreateLoginConfirmationEmail.sql} (90%)
 rename dmp-db-scema/updates/02/{UserInfo email drop null.sql => 02_UserInfo_email_drop_null.sql} (100%)
 rename dmp-db-scema/updates/03/{01. DatasetProfile_Description_value_set_empty_text.sql => 01_DatasetProfile_Description_value_set_empty_text.sql} (100%)
 rename dmp-db-scema/updates/03/{02. DatasetProfile_adds_null_constraints_description.sql => 02_DatasetProfile_adds_null_constraints_description.sql} (100%)
 rename dmp-db-scema/updates/03/{05. Renames-Project-to-Grant.sql => 03_Renames-Project-to-Grant.sql} (100%)
 rename dmp-db-scema/updates/03/{03. Funder-create.sql => 04_Funder-create.sql} (100%)
 rename dmp-db-scema/updates/03/{04. Grant-add-column-Funder.sql => 05_Grant-add-column-Funder.sql} (100%)
 create mode 100644 dmp-db-scema/updates/03/06_Renames-Grant-fk-Constraint.sql
 rename dmp-db-scema/updates/03/{07. Renames-Grant-fk-creator-Constraint.sql => 07_Renames-Grant-fk-creator-Constraint.sql} (100%)
 delete mode 100644 dmp-db-scema/updates/03/08. Renames-Grant-fk-Constraint.sql
 rename dmp-db-scema/updates/03/{06. Renames-Grant-pKey-Constraint.sql => 08_Renames-Grant-pKey-Constraint.sql} (100%)
 rename dmp-db-scema/updates/03/{09. Rename-Dmps-Project-to_Grant.sql => 09_Rename-Dmps-Project-to_Grant.sql} (100%)
 rename dmp-db-scema/updates/03/{10. Project-create.sql => 10_Project-create.sql} (100%)
 rename dmp-db-scema/updates/03/{11. DMP-add-column-project.sql => 11_DMP-add-column-project.sql} (100%)
 create mode 100644 dmp-db-scema/updates/03/12_Remove_xml_types.sql
 create mode 100644 dmp-db-scema/updates/04/01_Funder_add_column_CreationUser.sql
 rename dmp-db-scema/updates/04/{Funder_update_CreationUser_values.sql => 02_Funder_update_CreationUser_values.sql} (71%)
 create mode 100644 dmp-db-scema/updates/04/03_Create_External_Datasets.sql
 create mode 100644 dmp-db-scema/updates/04/04_Add_creationUser_on_DataRepository_ExternalDataset_Registry_Service.sql
 create mode 100644 dmp-db-scema/updates/04/05_Researcher_add_column_CreationUser.sql
 delete mode 100644 dmp-db-scema/updates/04/Add_creationUser_on_DataRepository_ExternalDataset_Registry_Service.sql
 delete mode 100644 dmp-db-scema/updates/04/Funder_add_column_CreationUser.sql
 delete mode 100644 dmp-db-scema/updates/04/Researcher_add_column_CreationUser.sql
 rename dmp-db-scema/updates/05/{External_References_Reference_Prefix_Update.sql => 01_External_References_Reference_Prefix_Update.sql} (100%)
 rename dmp-db-scema/updates/05/{Grant_Funder_Project_Reference_Prefix_Update.sql => 02_Grant_Funder_Project_Reference_Prefix_Update.sql} (100%)
 delete mode 100644 dmp-db-scema/updates/06/04_Update_Researcher_Reference_First_Character_To_Lower_Where_Capital.sql
 create mode 100644 dmp-db-scema/updates/08/02_Add_missing_columns.sql
 create mode 100644 dmp-db-scema/updates/08/03_Create_Credentials.sql
 create mode 100644 dmp-db-scema/updates/08/04_Create_UserToken.sql
 create mode 100644 dmp-db-scema/updates/08/05_Create_UserRole.sql
 create mode 100644 dmp-db-scema/updates/08/06_Remove_UserAuth.sql

diff --git a/dmp-backend/web/src/main/resources/config/application.properties b/dmp-backend/web/src/main/resources/config/application.properties
index 229e7ed48..84ae244b3 100644
--- a/dmp-backend/web/src/main/resources/config/application.properties
+++ b/dmp-backend/web/src/main/resources/config/application.properties
@@ -2,7 +2,7 @@ server.port=8081
 server.tomcat.max-threads = 20
 server.tomcat.max-connections = 10000
 logging.file=/logs/spring-boot-logging.log
-spring.profiles.active=devel
+spring.profiles.active=staging
 eu.eudat.logic.proxy.allowed.host=https://eestore.paas2.uninett.no
 
 ####################INVITATION MAIL CONFIGURATIONS##############
diff --git a/dmp-db-scema/Docker/dmp-db.env b/dmp-db-scema/Docker/dmp-db.env
new file mode 100644
index 000000000..d79f408eb
--- /dev/null
+++ b/dmp-db-scema/Docker/dmp-db.env
@@ -0,0 +1,5 @@
+ADMIN_USERNAME=admin
+ADMIN_PASSWORD=CHANGEME
+POSTGRES_DB=dmptool
+POSTGRES_USER=dmptool
+POSTGRES_PASSWORD=CHANGEME
\ No newline at end of file
diff --git a/dmp-db-scema/initdb.sh b/dmp-db-scema/initdb.sh
new file mode 100644
index 000000000..5ea5aa8be
--- /dev/null
+++ b/dmp-db-scema/initdb.sh
@@ -0,0 +1,7 @@
+psql -d dmptool -U dmptool -f main/DataManagementPlanDB.sql; 
+for j in $(ls updates); do
+	for i in $(ls updates/$j/*.sql); do
+		echo $i
+		psql --set=ADMIN_USERNAME="$ADMIN_USERNAME" --set=ADMIN_PASSWORD="$ADMIN_PASSWORD" -d dmptool -U dmptool -f $i; 
+	done
+done
\ No newline at end of file
diff --git a/dmp-db-scema/DataManagementPlanDB.sql b/dmp-db-scema/main/DataManagementPlanDB.sql
similarity index 99%
rename from dmp-db-scema/DataManagementPlanDB.sql
rename to dmp-db-scema/main/DataManagementPlanDB.sql
index 7c49dfbb8..9cad64fc8 100644
--- a/dmp-db-scema/DataManagementPlanDB.sql
+++ b/dmp-db-scema/main/DataManagementPlanDB.sql
@@ -34,7 +34,7 @@ DROP table if exists "UserAuth" cascade;
 -- CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
 
 
--- CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
+CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
 
 SET search_path = public, pg_catalog;
 
@@ -550,8 +550,8 @@ ALTER TABLE "UserDMP" OWNER TO dmptool;
 
 
 REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM postgres;
-GRANT ALL ON SCHEMA public TO postgres;
+-- REVOKE ALL ON SCHEMA public FROM postgres;
+-- GRANT ALL ON SCHEMA public TO postgres;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
diff --git a/dmp-db-scema/updates/01/DMPUser DMPDatasetprofile DMPFinalizedDate .sql b/dmp-db-scema/updates/01/01_DMPUser_DMPDatasetprofile_DMPFinalizedDate.sql
similarity index 56%
rename from dmp-db-scema/updates/01/DMPUser DMPDatasetprofile DMPFinalizedDate .sql
rename to dmp-db-scema/updates/01/01_DMPUser_DMPDatasetprofile_DMPFinalizedDate.sql
index 06d569813..8ed97954d 100644
--- a/dmp-db-scema/updates/01/DMPUser DMPDatasetprofile DMPFinalizedDate .sql	
+++ b/dmp-db-scema/updates/01/01_DMPUser_DMPDatasetprofile_DMPFinalizedDate.sql
@@ -1,12 +1,12 @@
 INSERT INTO public."UserDMP"(
 	usr, dmp, role)
 	SELECT "Creator", "ID", 0
-    FROM public."DMP"
+   FROM public."DMP";
 	
 DELETE 
 FROM public."UserDMP" as us1
 using public."UserDMP" as us2
-where us1."id" < us2."id" AND us1."dmp" = us2."dmp"
+where us1."id" < us2."id" AND us1."dmp" = us2."dmp";
 
 
 
@@ -31,30 +31,31 @@ WITH (
 TABLESPACE pg_default;
 
 ALTER TABLE public."DMPDatasetProfile"
-    OWNER to dmtadm;
-	
+--    OWNER to dmtadm;
+    OWNER to dmptool;
 
 	
 ALTER TABLE public."UserDMP"
-    OWNER to dmtadm;
+--    OWNER to dmtadm;
+    OWNER to dmptool;
 	
 	
-INSERT INTO public."DMPDatasetProfile"(
-	dmp, datasetprofile)
-	SELECT "ID", unnest(xpath('/profiles/profile/@profileId', dmpp."AssociatedDmps"::xml)::text[]::UUID[])
-	FROM public."DMP" as dmpp
+--INSERT INTO public."DMPDatasetProfile"(
+--	dmp, datasetprofile)
+--	SELECT "ID", unnest(xpath('/profiles/profile/@profileId', dmpp."AssociatedDmps"::xml)::text[]::UUID[])
+--	FROM public."DMP" as dmpp;
 
 
 
-Alter table public."DMP"
-add "FinalizedDat" timestamp(6) with time zone
+ALTER TABLE public."DMP"
+ADD "FinalizedDat" timestamp(6) WITH time zone;
 
-update public."DMP" SET "FinalizedDat" = "Modified"
-where "Status" = 1
+UPDATE public."DMP" SET "FinalizedDat" = "Modified"
+WHERE "Status" = 1;
 
 	
-Alter table public."Dataset" 
-add "FinalizedDat" timestamp(6) with time zone
+ALTER TABLE public."Dataset" 
+ADD "FinalizedDat" timestamp(6) WITH time zone;
 
-update public."Dataset" SET "FinalizedDat" = "Modified"
-where "Status" = 1
+UPDATE public."Dataset" SET "FinalizedDat" = "Modified"
+WHERE "Status" = 1;
diff --git a/dmp-db-scema/updates/01/DMPisPublic.sql b/dmp-db-scema/updates/01/03_DMPisPublic.sql
similarity index 84%
rename from dmp-db-scema/updates/01/DMPisPublic.sql
rename to dmp-db-scema/updates/01/03_DMPisPublic.sql
index aef4dca4d..dab69e4d9 100644
--- a/dmp-db-scema/updates/01/DMPisPublic.sql
+++ b/dmp-db-scema/updates/01/03_DMPisPublic.sql
@@ -3,5 +3,5 @@ Add "isPublic" boolean NOT NULL Default False;
 
 UPDATE public."DMP" 
 	SET "isPublic" = True
-	WHERE "Status" = 1
+	WHERE "Status" = 1;
 	
\ No newline at end of file
diff --git a/dmp-db-scema/updates/01/RenameDatasetColumnFinalizedDat.sql b/dmp-db-scema/updates/01/04_RenameDatasetColumnFinalizedDat.sql
similarity index 100%
rename from dmp-db-scema/updates/01/RenameDatasetColumnFinalizedDat.sql
rename to dmp-db-scema/updates/01/04_RenameDatasetColumnFinalizedDat.sql
diff --git a/dmp-db-scema/updates/01/DMPPublishedDat.sql b/dmp-db-scema/updates/01/05_DMPPublishedDat.sql
similarity index 53%
rename from dmp-db-scema/updates/01/DMPPublishedDat.sql
rename to dmp-db-scema/updates/01/05_DMPPublishedDat.sql
index 541efc62f..d823b5134 100644
--- a/dmp-db-scema/updates/01/DMPPublishedDat.sql
+++ b/dmp-db-scema/updates/01/05_DMPPublishedDat.sql
@@ -1,6 +1,6 @@
 ALTER TABLE public."DMP"
-ADD "PublishedAt" timestamp(6) with time zone
+ADD "PublishedAt" timestamp(6) WITH time zone;
 
 UPDATE public."DMP"
 SET "PublishedAt" = "FinalizedDat"
-where "isPublic" = True
\ No newline at end of file
+where "isPublic" = True;
\ No newline at end of file
diff --git a/dmp-db-scema/updates/01/RenameDMPColumnsFinalizedDatPublishedDat.sql b/dmp-db-scema/updates/01/06_RenameDMPColumnsFinalizedDatPublishedDat.sql
similarity index 100%
rename from dmp-db-scema/updates/01/RenameDMPColumnsFinalizedDatPublishedDat.sql
rename to dmp-db-scema/updates/01/06_RenameDMPColumnsFinalizedDatPublishedDat.sql
diff --git a/dmp-db-scema/updates/01/DMPCreateDOI.sql b/dmp-db-scema/updates/01/07_DMPCreateDOI.sql
similarity index 53%
rename from dmp-db-scema/updates/01/DMPCreateDOI.sql
rename to dmp-db-scema/updates/01/07_DMPCreateDOI.sql
index 470304b4c..5e97960c0 100644
--- a/dmp-db-scema/updates/01/DMPCreateDOI.sql
+++ b/dmp-db-scema/updates/01/07_DMPCreateDOI.sql
@@ -1,2 +1,2 @@
 ALTER TABLE public."DMP"
-ADD COLUMN "DOI" text
\ No newline at end of file
+ADD COLUMN "DOI" text;
\ No newline at end of file
diff --git a/dmp-db-scema/updates/01/08_Create_content.sql b/dmp-db-scema/updates/01/08_Create_content.sql
new file mode 100644
index 000000000..89c6190b9
--- /dev/null
+++ b/dmp-db-scema/updates/01/08_Create_content.sql
@@ -0,0 +1,15 @@
+CREATE TABLE public."Content" (
+    "Id" uuid NOT NULL,
+    "Filename" character varying NOT NULL,
+    "Extension" character varying NOT NULL,
+    "ParentType" numeric NOT NULL,
+    "Uri" character varying NOT NULL,
+    "LocationType" numeric NOT NULL
+);
+
+
+ALTER TABLE public."Content" OWNER TO dmptool;
+
+ALTER TABLE ONLY public."Content"
+    ADD CONSTRAINT "Content_pkey" PRIMARY KEY ("Id");
+
diff --git a/dmp-db-scema/updates/01/Removes DatasetIsPublic.sql b/dmp-db-scema/updates/01/Removes DatasetIsPublic.sql
deleted file mode 100644
index 3734d4198..000000000
--- a/dmp-db-scema/updates/01/Removes DatasetIsPublic.sql	
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE public."Dataset"
-DROP COLUMN "IsPublic"
\ No newline at end of file
diff --git a/dmp-db-scema/updates/02/CreateLoginConfirmationEmail.sql b/dmp-db-scema/updates/02/01_CreateLoginConfirmationEmail.sql
similarity index 90%
rename from dmp-db-scema/updates/02/CreateLoginConfirmationEmail.sql
rename to dmp-db-scema/updates/02/01_CreateLoginConfirmationEmail.sql
index 458b1b572..cf3807730 100644
--- a/dmp-db-scema/updates/02/CreateLoginConfirmationEmail.sql
+++ b/dmp-db-scema/updates/02/01_CreateLoginConfirmationEmail.sql
@@ -14,4 +14,5 @@ WITH (
 TABLESPACE pg_default;
 
 ALTER TABLE public."LoginConfirmationEmail"
-    OWNER to dmtadm;
\ No newline at end of file
+--    OWNER to dmtadm;
+    OWNER to dmptool;
\ No newline at end of file
diff --git a/dmp-db-scema/updates/02/UserInfo email drop null.sql b/dmp-db-scema/updates/02/02_UserInfo_email_drop_null.sql
similarity index 100%
rename from dmp-db-scema/updates/02/UserInfo email drop null.sql
rename to dmp-db-scema/updates/02/02_UserInfo_email_drop_null.sql
diff --git a/dmp-db-scema/updates/03/01. DatasetProfile_Description_value_set_empty_text.sql b/dmp-db-scema/updates/03/01_DatasetProfile_Description_value_set_empty_text.sql
similarity index 100%
rename from dmp-db-scema/updates/03/01. DatasetProfile_Description_value_set_empty_text.sql
rename to dmp-db-scema/updates/03/01_DatasetProfile_Description_value_set_empty_text.sql
diff --git a/dmp-db-scema/updates/03/02. DatasetProfile_adds_null_constraints_description.sql b/dmp-db-scema/updates/03/02_DatasetProfile_adds_null_constraints_description.sql
similarity index 100%
rename from dmp-db-scema/updates/03/02. DatasetProfile_adds_null_constraints_description.sql
rename to dmp-db-scema/updates/03/02_DatasetProfile_adds_null_constraints_description.sql
diff --git a/dmp-db-scema/updates/03/05. Renames-Project-to-Grant.sql b/dmp-db-scema/updates/03/03_Renames-Project-to-Grant.sql
similarity index 100%
rename from dmp-db-scema/updates/03/05. Renames-Project-to-Grant.sql
rename to dmp-db-scema/updates/03/03_Renames-Project-to-Grant.sql
diff --git a/dmp-db-scema/updates/03/03. Funder-create.sql b/dmp-db-scema/updates/03/04_Funder-create.sql
similarity index 100%
rename from dmp-db-scema/updates/03/03. Funder-create.sql
rename to dmp-db-scema/updates/03/04_Funder-create.sql
diff --git a/dmp-db-scema/updates/03/04. Grant-add-column-Funder.sql b/dmp-db-scema/updates/03/05_Grant-add-column-Funder.sql
similarity index 100%
rename from dmp-db-scema/updates/03/04. Grant-add-column-Funder.sql
rename to dmp-db-scema/updates/03/05_Grant-add-column-Funder.sql
diff --git a/dmp-db-scema/updates/03/06_Renames-Grant-fk-Constraint.sql b/dmp-db-scema/updates/03/06_Renames-Grant-fk-Constraint.sql
new file mode 100644
index 000000000..9c4dd0602
--- /dev/null
+++ b/dmp-db-scema/updates/03/06_Renames-Grant-fk-Constraint.sql
@@ -0,0 +1,9 @@
+ALTER TABLE public."Grant"
+ADD COLUMN "Content" uuid;
+
+
+ALTER TABLE public."Grant"
+ADD CONSTRAINT fk_grant_content FOREIGN KEY ("Content")
+        REFERENCES public."Content" ("Id") MATCH SIMPLE
+        ON UPDATE NO ACTION
+        ON DELETE NO ACTION;
\ No newline at end of file
diff --git a/dmp-db-scema/updates/03/07. Renames-Grant-fk-creator-Constraint.sql b/dmp-db-scema/updates/03/07_Renames-Grant-fk-creator-Constraint.sql
similarity index 100%
rename from dmp-db-scema/updates/03/07. Renames-Grant-fk-creator-Constraint.sql
rename to dmp-db-scema/updates/03/07_Renames-Grant-fk-creator-Constraint.sql
diff --git a/dmp-db-scema/updates/03/08. Renames-Grant-fk-Constraint.sql b/dmp-db-scema/updates/03/08. Renames-Grant-fk-Constraint.sql
deleted file mode 100644
index 493d9af69..000000000
--- a/dmp-db-scema/updates/03/08. Renames-Grant-fk-Constraint.sql	
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE public."Grant"
-RENAME CONSTRAINT "fk_project_content" TO "fk_grant_content";
\ No newline at end of file
diff --git a/dmp-db-scema/updates/03/06. Renames-Grant-pKey-Constraint.sql b/dmp-db-scema/updates/03/08_Renames-Grant-pKey-Constraint.sql
similarity index 100%
rename from dmp-db-scema/updates/03/06. Renames-Grant-pKey-Constraint.sql
rename to dmp-db-scema/updates/03/08_Renames-Grant-pKey-Constraint.sql
diff --git a/dmp-db-scema/updates/03/09. Rename-Dmps-Project-to_Grant.sql b/dmp-db-scema/updates/03/09_Rename-Dmps-Project-to_Grant.sql
similarity index 100%
rename from dmp-db-scema/updates/03/09. Rename-Dmps-Project-to_Grant.sql
rename to dmp-db-scema/updates/03/09_Rename-Dmps-Project-to_Grant.sql
diff --git a/dmp-db-scema/updates/03/10. Project-create.sql b/dmp-db-scema/updates/03/10_Project-create.sql
similarity index 100%
rename from dmp-db-scema/updates/03/10. Project-create.sql
rename to dmp-db-scema/updates/03/10_Project-create.sql
diff --git a/dmp-db-scema/updates/03/11. DMP-add-column-project.sql b/dmp-db-scema/updates/03/11_DMP-add-column-project.sql
similarity index 100%
rename from dmp-db-scema/updates/03/11. DMP-add-column-project.sql
rename to dmp-db-scema/updates/03/11_DMP-add-column-project.sql
diff --git a/dmp-db-scema/updates/03/12_Remove_xml_types.sql b/dmp-db-scema/updates/03/12_Remove_xml_types.sql
new file mode 100644
index 000000000..5bfb2a5f8
--- /dev/null
+++ b/dmp-db-scema/updates/03/12_Remove_xml_types.sql
@@ -0,0 +1,18 @@
+ALTER TABLE public."Grant"
+ALTER COLUMN "Reference" TYPE character varying(255);
+
+ALTER TABLE public."Grant"
+ALTER COLUMN "Definition" TYPE character varying;
+
+ALTER TABLE public."Registry"
+ALTER COLUMN "Reference" TYPE character varying;
+
+ALTER TABLE public."Service"
+ALTER COLUMN "Reference" TYPE character varying;
+
+ALTER TABLE public."Researcher"
+ALTER COLUMN "Reference" TYPE character varying;
+
+ALTER TABLE public."DataRepository"
+ALTER COLUMN "Reference" TYPE character varying;
+
diff --git a/dmp-db-scema/updates/04/01_Funder_add_column_CreationUser.sql b/dmp-db-scema/updates/04/01_Funder_add_column_CreationUser.sql
new file mode 100644
index 000000000..04aa6f4d3
--- /dev/null
+++ b/dmp-db-scema/updates/04/01_Funder_add_column_CreationUser.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "Funder"
+ADD COLUMN "CreationUser" uuid;
\ No newline at end of file
diff --git a/dmp-db-scema/updates/04/Funder_update_CreationUser_values.sql b/dmp-db-scema/updates/04/02_Funder_update_CreationUser_values.sql
similarity index 71%
rename from dmp-db-scema/updates/04/Funder_update_CreationUser_values.sql
rename to dmp-db-scema/updates/04/02_Funder_update_CreationUser_values.sql
index 130130ab9..2d7085f3e 100644
--- a/dmp-db-scema/updates/04/Funder_update_CreationUser_values.sql
+++ b/dmp-db-scema/updates/04/02_Funder_update_CreationUser_values.sql
@@ -1,4 +1,4 @@
 Update "Funder" as funder
 	set "CreationUser" = grant1."CreationUser"
 	from "Grant" as grant1
-	where funder."ID" = grant1."Funder" 
\ No newline at end of file
+	where funder."ID" = grant1."Funder" ;
\ No newline at end of file
diff --git a/dmp-db-scema/updates/04/03_Create_External_Datasets.sql b/dmp-db-scema/updates/04/03_Create_External_Datasets.sql
new file mode 100644
index 000000000..5c55bcb70
--- /dev/null
+++ b/dmp-db-scema/updates/04/03_Create_External_Datasets.sql
@@ -0,0 +1,15 @@
+CREATE TABLE public."ExternalDataset" (
+    "Id" uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    "Label" character varying NOT NULL,
+    "Abbreviation" character varying,
+    "Reference" character varying NOT NULL,
+    "Created" timestamp(4) with time zone NOT NULL,
+    "Modified" timestamp(4) with time zone NOT NULL
+);
+
+
+ALTER TABLE public."ExternalDataset" OWNER TO dmptool;
+
+ALTER TABLE ONLY public."ExternalDataset"
+    ADD CONSTRAINT "ExternalDataset_pkey" PRIMARY KEY ("Id");
+
diff --git a/dmp-db-scema/updates/04/04_Add_creationUser_on_DataRepository_ExternalDataset_Registry_Service.sql b/dmp-db-scema/updates/04/04_Add_creationUser_on_DataRepository_ExternalDataset_Registry_Service.sql
new file mode 100644
index 000000000..fd8dc380d
--- /dev/null
+++ b/dmp-db-scema/updates/04/04_Add_creationUser_on_DataRepository_ExternalDataset_Registry_Service.sql
@@ -0,0 +1,11 @@
+ALTER TABLE "DataRepository"
+ADD COLUMN "CreationUser" uuid;
+
+ALTER TABLE "ExternalDataset"
+ADD COLUMN "CreationUser" uuid;
+
+ALTER TABLE "Registry"
+ADD COLUMN "CreationUser" uuid;
+
+ALTER TABLE "Service"
+ADD COLUMN "CreationUser" uuid;
\ No newline at end of file
diff --git a/dmp-db-scema/updates/04/05_Researcher_add_column_CreationUser.sql b/dmp-db-scema/updates/04/05_Researcher_add_column_CreationUser.sql
new file mode 100644
index 000000000..d9627e5bf
--- /dev/null
+++ b/dmp-db-scema/updates/04/05_Researcher_add_column_CreationUser.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "Researcher"
+ADD COLUMN "CreationUser" uuid;
\ No newline at end of file
diff --git a/dmp-db-scema/updates/04/Add_creationUser_on_DataRepository_ExternalDataset_Registry_Service.sql b/dmp-db-scema/updates/04/Add_creationUser_on_DataRepository_ExternalDataset_Registry_Service.sql
deleted file mode 100644
index 4cc036bdb..000000000
--- a/dmp-db-scema/updates/04/Add_creationUser_on_DataRepository_ExternalDataset_Registry_Service.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-ALTER TABLE "DataRepository"
-ADD COLUMN "CreationUser" uuid
-
-ALTER TABLE "ExternalDataset"
-ADD COLUMN "CreationUser" uuid
-
-ALTER TABLE "Registry"
-ADD COLUMN "CreationUser" uuid
-
-ALTER TABLE "Service"
-ADD COLUMN "CreationUser" uuid
\ No newline at end of file
diff --git a/dmp-db-scema/updates/04/Funder_add_column_CreationUser.sql b/dmp-db-scema/updates/04/Funder_add_column_CreationUser.sql
deleted file mode 100644
index 7c84eb69f..000000000
--- a/dmp-db-scema/updates/04/Funder_add_column_CreationUser.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE "Funder"
-ADD COLUMN "CreationUser" uuid
\ No newline at end of file
diff --git a/dmp-db-scema/updates/04/Researcher_add_column_CreationUser.sql b/dmp-db-scema/updates/04/Researcher_add_column_CreationUser.sql
deleted file mode 100644
index 55b7a4542..000000000
--- a/dmp-db-scema/updates/04/Researcher_add_column_CreationUser.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE "Researcher"
-ADD COLUMN "CreationUser" uuid
\ No newline at end of file
diff --git a/dmp-db-scema/updates/05/External_References_Reference_Prefix_Update.sql b/dmp-db-scema/updates/05/01_External_References_Reference_Prefix_Update.sql
similarity index 100%
rename from dmp-db-scema/updates/05/External_References_Reference_Prefix_Update.sql
rename to dmp-db-scema/updates/05/01_External_References_Reference_Prefix_Update.sql
diff --git a/dmp-db-scema/updates/05/Grant_Funder_Project_Reference_Prefix_Update.sql b/dmp-db-scema/updates/05/02_Grant_Funder_Project_Reference_Prefix_Update.sql
similarity index 100%
rename from dmp-db-scema/updates/05/Grant_Funder_Project_Reference_Prefix_Update.sql
rename to dmp-db-scema/updates/05/02_Grant_Funder_Project_Reference_Prefix_Update.sql
diff --git a/dmp-db-scema/updates/06/04_Update_Researcher_Reference_First_Character_To_Lower_Where_Capital.sql b/dmp-db-scema/updates/06/04_Update_Researcher_Reference_First_Character_To_Lower_Where_Capital.sql
deleted file mode 100644
index 8c3bcc984..000000000
--- a/dmp-db-scema/updates/06/04_Update_Researcher_Reference_First_Character_To_Lower_Where_Capital.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-UPDATE "Researcher"
-SET "Reference" = CONCAT(LOWER(LEFT("Reference", 1)), SUBSTRING("Reference", 2))
-WHERE "ID" in (
-	SELECT "ID" FROM "Researcher" 
-	WHERE ASCII(LEFT("Reference", 1)) BETWEEN ASCII('A') AND ASCII('Z')
-)
\ No newline at end of file
diff --git a/dmp-db-scema/updates/08/02_Add_missing_columns.sql b/dmp-db-scema/updates/08/02_Add_missing_columns.sql
new file mode 100644
index 000000000..4036dcdc7
--- /dev/null
+++ b/dmp-db-scema/updates/08/02_Add_missing_columns.sql
@@ -0,0 +1,17 @@
+ALTER TABLE public."DMP"
+ADD COLUMN "DmpProperties" text;
+
+ALTER TABLE public."DMP"
+ADD COLUMN "GroupId" uuid;
+
+ALTER TABLE public."DMP"
+ADD COLUMN "Properties" text;
+
+ALTER TABLE public."DatasetProfile"
+ADD COLUMN "GroupId" uuid;
+
+ALTER TABLE public."DatasetProfile"
+ADD COLUMN "Version" integer;
+
+ALTER TABLE public."Grant"
+ADD COLUMN "Type" numeric NOT NULL;
\ No newline at end of file
diff --git a/dmp-db-scema/updates/08/03_Create_Credentials.sql b/dmp-db-scema/updates/08/03_Create_Credentials.sql
new file mode 100644
index 000000000..0ffbf0f46
--- /dev/null
+++ b/dmp-db-scema/updates/08/03_Create_Credentials.sql
@@ -0,0 +1,25 @@
+CREATE TABLE public."Credential" (
+    "Id" uuid NOT NULL,
+    "Status" numeric NOT NULL,
+    "Provider" numeric NOT NULL,
+    "Public" character varying NOT NULL,
+    "Secret" character varying NOT NULL,
+    "CreationTime" timestamp(4) with time zone NOT NULL,
+    "LastUpdateTime" timestamp(4) with time zone NOT NULL,
+    "UserId" uuid NOT NULL,
+    "ExternalId" character varying NOT NULL
+);
+
+
+ALTER TABLE public."Credential" OWNER TO dmptool;
+
+ALTER TABLE ONLY public."Credential"
+    ADD CONSTRAINT "Credential_pkey" PRIMARY KEY ("Id");
+
+ALTER TABLE ONLY public."Credential"
+    ADD CONSTRAINT fkey_credential_user FOREIGN KEY ("UserId") REFERENCES public."UserInfo"(id);
+
+INSERT INTO public."UserInfo"(email, authorization_level, usertype, name, created, additionalinfo) VALUES ('fake@email.org', 1, 1, :'ADMIN_USERNAME', now(), '{}');
+
+INSERT INTO public."Credential" VALUES (uuid_generate_v4(), 0, 5, :'ADMIN_USERNAME', :'ADMIN_PASSWORD', now(), now(), (SELECT public."UserInfo"."id" FROM public."UserInfo" WHERE name = 'admin'), 'dmp');
+
diff --git a/dmp-db-scema/updates/08/04_Create_UserToken.sql b/dmp-db-scema/updates/08/04_Create_UserToken.sql
new file mode 100644
index 000000000..85ff8103a
--- /dev/null
+++ b/dmp-db-scema/updates/08/04_Create_UserToken.sql
@@ -0,0 +1,16 @@
+CREATE TABLE public."UserToken" (
+    "Token" uuid NOT NULL,
+    "UserId" uuid NOT NULL,
+    "IssuedAt" timestamp(4) with time zone NOT NULL,
+    "ExpiresAt" timestamp(4) with time zone NOT NULL
+);
+
+
+ALTER TABLE public."UserToken" OWNER TO dmptool;
+
+ALTER TABLE ONLY public."UserToken"
+    ADD CONSTRAINT "UserToken_pkey" PRIMARY KEY ("Token");
+
+ALTER TABLE ONLY public."UserToken"
+    ADD CONSTRAINT fkey_usetoken_user FOREIGN KEY ("UserId") REFERENCES public."UserInfo"(id);
+
diff --git a/dmp-db-scema/updates/08/05_Create_UserRole.sql b/dmp-db-scema/updates/08/05_Create_UserRole.sql
new file mode 100644
index 000000000..0db9f39d0
--- /dev/null
+++ b/dmp-db-scema/updates/08/05_Create_UserRole.sql
@@ -0,0 +1,18 @@
+CREATE TABLE public."UserRole" (
+    "Id" uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    "Role" numeric DEFAULT 0 NOT NULL,
+    "UserId" uuid NOT NULL
+);
+
+
+ALTER TABLE public."UserRole" OWNER TO dmptool;
+
+ALTER TABLE ONLY public."UserRole"
+    ADD CONSTRAINT "UserRole_pkey" PRIMARY KEY ("Id");
+
+ALTER TABLE ONLY public."UserRole"
+    ADD CONSTRAINT "UserRole_userId_fkey" FOREIGN KEY ("UserId") REFERENCES public."UserInfo"(id);
+	
+
+INSERT INTO public."UserRole"("Role", "UserId") VALUES (2, (SELECT public."UserInfo"."id" FROM public."UserInfo" WHERE name = 'admin'));
+
diff --git a/dmp-db-scema/updates/08/06_Remove_UserAuth.sql b/dmp-db-scema/updates/08/06_Remove_UserAuth.sql
new file mode 100644
index 000000000..5ed59655c
--- /dev/null
+++ b/dmp-db-scema/updates/08/06_Remove_UserAuth.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS "UserAuth" CASCADE;
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index ac90b8444..f5a46f45d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,25 @@
-version: '2.2'
+version: "2.4"
 
 services:
+  dmp-db:
+    image: postgres
+    container_name: opendmp-db
+    restart: unless-stopped
+    ports:
+      - "5001:5432"
+    expose:
+      - "5432"
+    volumes:
+      - dmpdata:/var/lib/postgresql/data
+      - ./dmp-db-scema:/docker-entrypoint-initdb.d/
+      - ./dmp-db-scema/main:/main
+      - ./dmp-db-scema/updates:/updates
+    env_file: ./dmp-db-scema/Docker/dmp-db.env
+    networks: 
+      - opendmp-backend-network
+
   dmp-backend:
-    build: 
+    build:
       context: ./dmp-backend
     container_name: opendmp-backend
     env_file: ./dmp-backend/Docker/dmp-backend.env
@@ -38,4 +55,7 @@ services:
 
 networks:
   opendmp-frontend-network:
-  opendmp-backend-network:
\ No newline at end of file
+  opendmp-backend-network:
+volumes: 
+  dmpdata:
+    external: true

From 391a88a23640755553177f44aef32f34f25e413b Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Mon, 4 May 2020 15:47:30 +0300
Subject: [PATCH 42/60] The invite pop up will show only user collaborating
 with DMP that the current user also is collaborating (ref #258)

---
 .../data/dao/entities/UserAssociationDao.java | 15 ++++
 .../dao/entities/UserAssociationDaoImpl.java  | 73 +++++++++++++++++++
 .../eudat/data/entities/UserAssociation.java  | 66 +++++++++++++++++
 .../controllers/UserInvitationController.java |  4 +-
 .../logic/managers/InvitationsManager.java    | 25 ++++++-
 .../operations/DatabaseRepository.java        |  2 +
 .../operations/DatabaseRepositoryImpl.java    | 11 +++
 .../updates/09/01_create_user_association.sql | 21 ++++++
 8 files changed, 212 insertions(+), 5 deletions(-)
 create mode 100644 dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserAssociationDao.java
 create mode 100644 dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserAssociationDaoImpl.java
 create mode 100644 dmp-backend/data/src/main/java/eu/eudat/data/entities/UserAssociation.java
 create mode 100644 dmp-db-scema/updates/09/01_create_user_association.sql

diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserAssociationDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserAssociationDao.java
new file mode 100644
index 000000000..bd80fa49b
--- /dev/null
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserAssociationDao.java
@@ -0,0 +1,15 @@
+package eu.eudat.data.dao.entities;
+
+import eu.eudat.data.dao.DatabaseAccessLayer;
+import eu.eudat.data.entities.UserAssociation;
+import eu.eudat.data.entities.UserInfo;
+
+import java.util.List;
+import java.util.UUID;
+
+public interface UserAssociationDao extends DatabaseAccessLayer<UserAssociation, UUID> {
+
+	public List<UserAssociation> getAssociated(UserInfo userId);
+
+	public Boolean areAssociated(UserInfo firstUser, UserInfo secondUser);
+}
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserAssociationDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserAssociationDaoImpl.java
new file mode 100644
index 000000000..b8ecc0668
--- /dev/null
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserAssociationDaoImpl.java
@@ -0,0 +1,73 @@
+package eu.eudat.data.dao.entities;
+
+import eu.eudat.data.dao.DatabaseAccess;
+import eu.eudat.data.dao.databaselayer.service.DatabaseService;
+import eu.eudat.data.entities.UserAssociation;
+import eu.eudat.data.entities.UserInfo;
+import eu.eudat.queryable.QueryableList;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+
+@Component("UserAssociationDao")
+public class UserAssociationDaoImpl extends DatabaseAccess<UserAssociation> implements UserAssociationDao {
+
+	@Autowired
+	public UserAssociationDaoImpl(DatabaseService<UserAssociation> databaseService) {
+		super(databaseService);
+	}
+
+	@Override
+	public UserAssociation createOrUpdate(UserAssociation item) {
+		return this.getDatabaseService().createOrUpdate(item, UserAssociation.class);
+	}
+
+	@Override
+	public CompletableFuture<UserAssociation> createOrUpdateAsync(UserAssociation item) {
+		return CompletableFuture.supplyAsync(() -> this.createOrUpdate(item));
+	}
+
+	@Override
+	public UserAssociation find(UUID id) {
+		return this.getDatabaseService().getQueryable(UserAssociation.class).where(((builder, root) -> builder.equal(root.get("id"), id))).getSingle();
+	}
+
+	@Override
+	public UserAssociation find(UUID id, String hint) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void delete(UserAssociation item) {
+		this.getDatabaseService().delete(item);
+	}
+
+	@Override
+	public QueryableList<UserAssociation> asQueryable() {
+		return this.getDatabaseService().getQueryable(UserAssociation.class);
+	}
+
+	@Override
+	public List<UserAssociation> getAssociated(UserInfo userId) {
+		return this.getDatabaseService().getQueryable(UserAssociation.class).where(((builder, root) ->
+			builder.or(builder.equal(root.get("firstUser"), userId), builder.equal(root.get("secondUser"), userId)))).toList();
+	}
+
+	@Override
+	public Boolean areAssociated(UserInfo firstUser, UserInfo secondUser) {
+		return this.getDatabaseService().getQueryable(UserAssociation.class).where(((builder, root) ->
+				builder.or(
+						builder.and(
+								builder.equal(root.get("firstUser"), firstUser),
+								builder.equal(root.get("secondUser"), secondUser)
+						),
+						builder.and(
+								builder.equal(root.get("secondUser"), firstUser),
+								builder.equal(root.get("firstUser"), secondUser)
+						)
+				))).count() > 0;
+	}
+}
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/UserAssociation.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/UserAssociation.java
new file mode 100644
index 000000000..898bbd8a6
--- /dev/null
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/entities/UserAssociation.java
@@ -0,0 +1,66 @@
+package eu.eudat.data.entities;
+
+import eu.eudat.queryable.queryableentity.DataEntity;
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.*;
+import java.util.List;
+import java.util.UUID;
+
+@Entity
+@Table(name = "\"UserAssociation\"")
+public class UserAssociation implements DataEntity<UserAssociation, UUID> {
+
+	@Id
+	@GeneratedValue
+	@GenericGenerator(name = "uuid2", strategy = "uuid2")
+	@Column(name = "id", updatable = false, nullable = false, columnDefinition = "BINARY(16)")
+	private UUID id;
+
+	@OneToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "\"firstUser\"")
+	private UserInfo firstUser;
+
+	@OneToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "\"secondUser\"")
+	private UserInfo secondUser;
+
+	public UUID getId() {
+		return id;
+	}
+
+	public void setId(UUID id) {
+		this.id = id;
+	}
+
+	public UserInfo getFirstUser() {
+		return firstUser;
+	}
+
+	public void setFirstUser(UserInfo firstUser) {
+		this.firstUser = firstUser;
+	}
+
+	public UserInfo getSecondUser() {
+		return secondUser;
+	}
+
+	public void setSecondUser(UserInfo secondUser) {
+		this.secondUser = secondUser;
+	}
+
+	@Override
+	public void update(UserAssociation entity) {
+
+	}
+
+	@Override
+	public UUID getKeys() {
+		return null;
+	}
+
+	@Override
+	public UserAssociation buildFromTuple(List<Tuple> tuple, List<String> fields, String base) {
+		return null;
+	}
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/UserInvitationController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/UserInvitationController.java
index 3e09dd43b..b6d045a67 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/controllers/UserInvitationController.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/UserInvitationController.java
@@ -48,8 +48,8 @@ public class UserInvitationController extends BaseController {
 
     @RequestMapping(method = RequestMethod.POST, value = {"/getUsers"}, consumes = "application/json", produces = "application/json")
     public @ResponseBody
-    ResponseEntity<ResponseItem<List<UserInfoInvitationModel>>> getUsers(@RequestBody UserInfoRequestItem userInfoRequestItem) throws IllegalAccessException, InstantiationException {
-        List<UserInfoInvitationModel> users = invitationsManager.getUsers(userInfoRequestItem);
+    ResponseEntity<ResponseItem<List<UserInfoInvitationModel>>> getUsers(Principal principal) throws IllegalAccessException, InstantiationException {
+        List<UserInfoInvitationModel> users = invitationsManager.getUsers(principal);
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<List<UserInfoInvitationModel>>().status(ApiMessageCode.SUCCESS_MESSAGE).payload(users));
     }
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/InvitationsManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/InvitationsManager.java
index eea0d1c41..2625fdfd3 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/InvitationsManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/InvitationsManager.java
@@ -1,6 +1,7 @@
 package eu.eudat.logic.managers;
 
 import eu.eudat.data.entities.DMP;
+import eu.eudat.data.entities.UserAssociation;
 import eu.eudat.data.entities.UserDMP;
 import eu.eudat.data.entities.UserInfo;
 import eu.eudat.exceptions.security.UnauthorisedException;
@@ -38,15 +39,27 @@ public class InvitationsManager {
             UserDMP userDMP = new UserDMP();
             userDMP.setUser(userInfo);
             userInfoToUserDmp.add(userDMP);
+            if (!apiContext.getOperationsContext().getDatabaseRepository().getUserAssociationDao().areAssociated(principalUser, userInfo)) {
+                UserAssociation userAssociation = new UserAssociation();
+                userAssociation.setFirstUser(principalUser);
+                userAssociation.setSecondUser(userInfo);
+            }
         }
         DMP dataManagementPlan = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().find(invitation.getDataManagementPlan());
         apiContext.getUtilitiesService().getInvitationService().createInvitations(apiContext.getOperationsContext().getDatabaseRepository().getInvitationDao(), apiContext.getUtilitiesService().getMailService(), invitation.getUsers().stream().map(item -> item.toDataModel()).collect(Collectors.toList()), dataManagementPlan, principalUser);
         apiContext.getUtilitiesService().getInvitationService().assignToDmp(apiContext.getOperationsContext().getDatabaseRepository().getDmpDao(), userInfoToUserDmp, dataManagementPlan);
     }
 
-    public List<UserInfoInvitationModel> getUsers(UserInfoRequestItem userInfoRequestItem) throws InstantiationException, IllegalAccessException {
-        QueryableList<UserInfo> users = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().getWithCriteria(userInfoRequestItem.getCriteria());
-        List<UserInfoInvitationModel> userModels = users.select(item -> new UserInfoInvitationModel().fromDataModel(item));
+    public List<UserInfoInvitationModel> getUsers(Principal principal) throws InstantiationException, IllegalAccessException {
+        UserInfo principalUser = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(principal.getId());
+        List<UserInfo> users = apiContext.getOperationsContext().getDatabaseRepository().getUserAssociationDao().getAssociated(principalUser).stream().map(userAssociation -> {
+            if (userAssociation.getFirstUser().getId().equals(principal.getId())) {
+                return userAssociation.getSecondUser();
+            } else {
+                return userAssociation.getFirstUser();
+            }
+        }).collect(Collectors.toList());
+        List<UserInfoInvitationModel> userModels = users.stream().map(userInfo -> new UserInfoInvitationModel().fromDataModel(userInfo)).collect(Collectors.toList());
         return userModels;
     }
 
@@ -60,6 +73,12 @@ public class InvitationsManager {
         userDMP.setUser(invitedUser);
         userDMP.setDmp(invitation.getDmp());
         userDMP.setRole(UserDMP.UserDMPRoles.USER.getValue());
+        if (!apiContext.getOperationsContext().getDatabaseRepository().getUserAssociationDao().areAssociated(invitedUser, invitation.getUser())) {
+            UserAssociation userAssociation = new UserAssociation();
+            userAssociation.setFirstUser(invitedUser);
+            userAssociation.setSecondUser(invitation.getUser());
+            apiContext.getOperationsContext().getDatabaseRepository().getUserAssociationDao().createOrUpdate(userAssociation);
+        }
         DMP datamanagementPlan = invitation.getDmp();
         apiContext.getOperationsContext().getDatabaseRepository().getUserDmpDao().createOrUpdate(userDMP);
         apiContext.getUtilitiesService().getInvitationService().assignToDmp(apiContext.getOperationsContext().getDatabaseRepository().getDmpDao(), userDMP, datamanagementPlan);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/DatabaseRepository.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/DatabaseRepository.java
index 539e417a6..516f7e949 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/DatabaseRepository.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/DatabaseRepository.java
@@ -56,5 +56,7 @@ public interface DatabaseRepository {
 
     NotificationDao getNotificationDao();
 
+    UserAssociationDao getUserAssociationDao();
+
     <T> void detachEntity(T entity);
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/DatabaseRepositoryImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/DatabaseRepositoryImpl.java
index a87ba7734..ff5f6506e 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/DatabaseRepositoryImpl.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/DatabaseRepositoryImpl.java
@@ -37,6 +37,7 @@ public class DatabaseRepositoryImpl implements DatabaseRepository {
     private FunderDao funderDao;
     private LockDao lockDao;
     private NotificationDao notificationDao;
+    private UserAssociationDao userAssociationDao;
 
     private EntityManager entityManager;
 
@@ -290,6 +291,16 @@ public class DatabaseRepositoryImpl implements DatabaseRepository {
         return notificationDao;
     }
 
+    @Override
+    public UserAssociationDao getUserAssociationDao() {
+        return userAssociationDao;
+    }
+
+    @Autowired
+    public void setUserAssociationDao(UserAssociationDao userAssociationDao) {
+        this.userAssociationDao = userAssociationDao;
+    }
+
     @Autowired
     public void setNotificationDao(NotificationDao notificationDao) {
         this.notificationDao = notificationDao;
diff --git a/dmp-db-scema/updates/09/01_create_user_association.sql b/dmp-db-scema/updates/09/01_create_user_association.sql
new file mode 100644
index 000000000..c569ca2fe
--- /dev/null
+++ b/dmp-db-scema/updates/09/01_create_user_association.sql
@@ -0,0 +1,21 @@
+CREATE TABLE public."UserAssociation" (
+    id uuid NOT NULL,
+    "firstUser" uuid NOT NULL,
+    "secondUser" uuid NOT NULL
+);
+
+
+ALTER TABLE public."UserAssociation" OWNER TO dmptool;
+
+ALTER TABLE ONLY public."UserAssociation"
+    ADD CONSTRAINT pk_user_association PRIMARY KEY (id);
+
+ALTER TABLE ONLY public."UserAssociation"
+    ADD CONSTRAINT fk_userinfo_user_association_1 FOREIGN KEY ("firstUser") REFERENCES public."UserInfo"(id);
+
+ALTER TABLE ONLY public."UserAssociation"
+    ADD CONSTRAINT fk_userinfo_user_association_2 FOREIGN KEY ("secondUser") REFERENCES public."UserInfo"(id);
+
+INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.00.002', '2020-05-04 13:42:00.000000+03', now(), 'Add User Association');
+
+

From 08737cbbf01034eea56cd1958304187ef954910c Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Mon, 4 May 2020 16:00:23 +0300
Subject: [PATCH 43/60] Minor bugfix

---
 .../main/java/eu/eudat/logic/managers/InvitationsManager.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/InvitationsManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/InvitationsManager.java
index 2625fdfd3..2191298a2 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/InvitationsManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/InvitationsManager.java
@@ -43,6 +43,7 @@ public class InvitationsManager {
                 UserAssociation userAssociation = new UserAssociation();
                 userAssociation.setFirstUser(principalUser);
                 userAssociation.setSecondUser(userInfo);
+                apiContext.getOperationsContext().getDatabaseRepository().getUserAssociationDao().createOrUpdate(userAssociation);
             }
         }
         DMP dataManagementPlan = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().find(invitation.getDataManagementPlan());

From 5d6fbd3e3713836b669df8521e1a39561930541a Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Mon, 4 May 2020 17:15:52 +0300
Subject: [PATCH 44/60] Improve self deployment

---
 .../config/application-staging.properties     | 16 +++++++------
 .../08/07_Remove_no_null_requirement.sql      |  2 ++
 .../08/08_create_datasetexternaldataset.sql   | 19 +++++++++++++++
 .../updates/08/09_Create_Invitation.sql       | 23 +++++++++++++++++++
 .../updates/08/10_Create_User_preference.sql  | 16 +++++++++++++
 docker-compose.yml                            |  1 +
 6 files changed, 70 insertions(+), 7 deletions(-)
 create mode 100644 dmp-db-scema/updates/08/07_Remove_no_null_requirement.sql
 create mode 100644 dmp-db-scema/updates/08/08_create_datasetexternaldataset.sql
 create mode 100644 dmp-db-scema/updates/08/09_Create_Invitation.sql
 create mode 100644 dmp-db-scema/updates/08/10_Create_User_preference.sql

diff --git a/dmp-backend/web/src/main/resources/config/application-staging.properties b/dmp-backend/web/src/main/resources/config/application-staging.properties
index 93e304d2f..4b92d0245 100644
--- a/dmp-backend/web/src/main/resources/config/application-staging.properties
+++ b/dmp-backend/web/src/main/resources/config/application-staging.properties
@@ -1,9 +1,9 @@
 dmp.domain = https://devel.opendmp.eu
 
 ####################PERSISTENCE OVERRIDES CONFIGURATIONS##########
-database.url=
-database.username=
-database.password=
+database.url=jdbc:postgresql://dmp-db:5432/dmptool
+database.username=dmptool
+database.password=CHANGEME
 
 ####################ELASTIIC SEARCH TAGS OVERRIDES CONFIGURATIONS##########
 elasticsearch.host = tags-elastic-search
@@ -18,10 +18,10 @@ http-logger.server-address = http://logstash:31311
 pdf.converter.url=http://docsbox-web/
 
 ####################CONFIGURATION FILES OVERRIDES CONFIGURATIONS##########
-configuration.externalUrls=/tmp/ExternalUrls.xml
+configuration.externalUrls=externalUrls/ExternalUrls.xml
 configuration.rda=/tmp/RDACommonStandards.txt
-configuration.h2020template=tmp/h2020.docx
-configuration.configurable_login_providers=
+configuration.h2020template=documents/h2020.docx
+configuration.configurable_login_providers=/tmp/ConfigurableLoginProviders.json
 
 ####################INVITATION MAIL CONFIGURATIONS##############
 ####################GENERIC MAIL CONFIGURATIONS#################
@@ -86,4 +86,6 @@ zenodo.url=https://sandbox.zenodo.org/api/
 zenodo.access_token=
 
 #############CONTACT EMAIL CONFIGURATIONS#########
-contact_email.mail=
\ No newline at end of file
+contact_email.mail=
+
+language.path=i18n/
\ No newline at end of file
diff --git a/dmp-db-scema/updates/08/07_Remove_no_null_requirement.sql b/dmp-db-scema/updates/08/07_Remove_no_null_requirement.sql
new file mode 100644
index 000000000..8cda5cf9c
--- /dev/null
+++ b/dmp-db-scema/updates/08/07_Remove_no_null_requirement.sql
@@ -0,0 +1,2 @@
+AlTER TABLE "DMP"
+ALTER COLUMN "Creator" DROP NOT NULL;
\ No newline at end of file
diff --git a/dmp-db-scema/updates/08/08_create_datasetexternaldataset.sql b/dmp-db-scema/updates/08/08_create_datasetexternaldataset.sql
new file mode 100644
index 000000000..76e84fe22
--- /dev/null
+++ b/dmp-db-scema/updates/08/08_create_datasetexternaldataset.sql
@@ -0,0 +1,19 @@
+CREATE TABLE public."DatasetExternalDataset" (
+    "Id" uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    "Dataset" uuid NOT NULL,
+    "ExternalDataset" uuid NOT NULL,
+    "Role" numeric,
+    "Data" character varying
+);
+
+ALTER TABLE public."DatasetExternalDataset" OWNER TO dmptool;
+
+ALTER TABLE ONLY public."DatasetExternalDataset"
+    ADD CONSTRAINT "DatasetExternalDataset_pkey" PRIMARY KEY ("Id");
+
+ALTER TABLE ONLY public."DatasetExternalDataset"
+    ADD CONSTRAINT fkey_datasetexternaldataset_dataset FOREIGN KEY ("Dataset") REFERENCES public."Dataset"("ID");
+
+ALTER TABLE ONLY public."DatasetExternalDataset"
+    ADD CONSTRAINT fkey_datasetexternaldataset_externaldataset FOREIGN KEY ("ExternalDataset") REFERENCES public."ExternalDataset"("Id");
+
diff --git a/dmp-db-scema/updates/08/09_Create_Invitation.sql b/dmp-db-scema/updates/08/09_Create_Invitation.sql
new file mode 100644
index 000000000..c820248b1
--- /dev/null
+++ b/dmp-db-scema/updates/08/09_Create_Invitation.sql
@@ -0,0 +1,23 @@
+CREATE TABLE public."Invitation" (
+    "Id" uuid NOT NULL,
+    "InvitationEmail" character varying NOT NULL,
+    "Token" uuid NOT NULL,
+    "CreationUser" uuid NOT NULL,
+    "Dmp" uuid NOT NULL,
+    "Properties" xml,
+    "AcceptedInvitation" boolean
+);
+
+
+ALTER TABLE public."Invitation" OWNER TO dmptool;
+
+ALTER TABLE ONLY public."Invitation"
+    ADD CONSTRAINT "Invitation_pkey" PRIMARY KEY ("Id");
+
+
+ALTER TABLE ONLY public."Invitation"
+    ADD CONSTRAINT fk_invitation_creator FOREIGN KEY ("CreationUser") REFERENCES public."UserInfo"(id);
+
+
+ALTER TABLE ONLY public."Invitation"
+    ADD CONSTRAINT fk_invitation_dmp FOREIGN KEY ("Dmp") REFERENCES public."DMP"("ID");
\ No newline at end of file
diff --git a/dmp-db-scema/updates/08/10_Create_User_preference.sql b/dmp-db-scema/updates/08/10_Create_User_preference.sql
new file mode 100644
index 000000000..edae5bb93
--- /dev/null
+++ b/dmp-db-scema/updates/08/10_Create_User_preference.sql
@@ -0,0 +1,16 @@
+CREATE TABLE public."UserPreference" (
+    "Id" uuid NOT NULL,
+    "UserId" uuid NOT NULL,
+    "Data" json NOT NULL,
+    "PreferenceType" smallint NOT NULL
+);
+
+
+ALTER TABLE public."UserPreference" OWNER TO dmptool;
+
+ALTER TABLE ONLY public."UserPreference"
+    ADD CONSTRAINT "UserPreference_pkey" PRIMARY KEY ("Id");
+
+
+ALTER TABLE ONLY public."UserPreference"
+    ADD CONSTRAINT userpreference_user_fk FOREIGN KEY ("UserId") REFERENCES public."UserInfo"(id);
diff --git a/docker-compose.yml b/docker-compose.yml
index f5a46f45d..18412a920 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -38,6 +38,7 @@ services:
       - ./openDMP/dmp-backend/opendmp-logs:/app/logs
       - ./openDMP/dmp-backend/tmp:/app/tmp
       - ./openDMP/dmp-backend/logging:/app/logging
+      - ./openDMP/dmp-backend/documents:/app/documents
 
   dmp-frontend:
     build:

From f397ce6c7202571acc278aab02b296a49de358c1 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Mon, 4 May 2020 17:19:23 +0300
Subject: [PATCH 45/60] Fixed issue when creating new users

---
 .../authentication/AbstractAuthenticationService.java     | 6 +++---
 dmp-db-scema/updates/08/02_Add_missing_columns.sql        | 8 +++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java
index 78c6a9830..6d08acb0c 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java
@@ -134,10 +134,10 @@ public abstract class AbstractAuthenticationService implements AuthenticationSer
 					.name(profile.getName()).verified_email(profile.getIsVerified())
 					.email(profile.getEmail()).created(new Date()).lastloggedin(new Date())
 					.additionalinfo("{\"data\":{\"avatar\":{\"url\":\"" + profile.getAvatarUrl()
-							+ "\"}},{\"zenodoToken\":\"" + profile.getZenodoId()
-							+ "\", \"expirationDate\": \"" + Instant.now().plusSeconds(profile.getZenodoExpire()).toEpochMilli()
+							+ "\"},\"zenodoToken\":\"" + profile.getZenodoId()
+							+ "\", \"expirationDate\": \"" + Instant.now().plusSeconds((profile.getZenodoExpire() != null ? profile.getZenodoExpire(): 0)).toEpochMilli()
 							+ "\", \"zenodoRefresh\": \"" + profile.getZenodoRefresh()
-							+ (profile.getProvider() == TokenValidatorFactoryImpl.LoginProvider.ZENODO ? "\", \"zenodoEmail\": \"" + profile.getEmail() : "") +"\"}")
+							+ (profile.getProvider() == TokenValidatorFactoryImpl.LoginProvider.ZENODO ? "\", \"zenodoEmail\": \"" + profile.getEmail() : "") +"\"}}")
 					.authorization_level((short) 1).usertype((short) 1)
 					.build();
 
diff --git a/dmp-db-scema/updates/08/02_Add_missing_columns.sql b/dmp-db-scema/updates/08/02_Add_missing_columns.sql
index 4036dcdc7..2cecd31cb 100644
--- a/dmp-db-scema/updates/08/02_Add_missing_columns.sql
+++ b/dmp-db-scema/updates/08/02_Add_missing_columns.sql
@@ -14,4 +14,10 @@ ALTER TABLE public."DatasetProfile"
 ADD COLUMN "Version" integer;
 
 ALTER TABLE public."Grant"
-ADD COLUMN "Type" numeric NOT NULL;
\ No newline at end of file
+ADD COLUMN "Type" numeric NOT NULL;
+
+ALTER TABLE public."DatasetDataRepository"
+ADD COLUMN "Data" character varying;
+
+ALTER TABLE public."DatasetService"
+ADD COLUMN "Data" character varying;
\ No newline at end of file

From 7784547bea54b31ceedeab57a9566a3c8dbdce78 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Tue, 5 May 2020 18:31:32 +0300
Subject: [PATCH 46/60] When generating DOI it will remain unpublished until
 the DMP got published, add reference identifier to the DMP (public overview)
 and add collaborators (associated users and researchers) to DOI generation
 (ref #257)

---
 .../managers/DataManagementPlanManager.java   | 78 ++++++++++++++-----
 1 file changed, 60 insertions(+), 18 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index 28f76210b..1d1c9bec8 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -794,6 +794,7 @@ public class DataManagementPlanManager {
         });
         UserInfo user = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(principal.getId());
         sendNotification(dmp, user, NotificationType.DMP_PUBLISH);
+        this.createZenodoDoi(dmp.getId(), principal, null);
     }
 
     public void makeFinalize(UUID id, Principal principal, DatasetsToBeFinalized datasetsToBeFinalized) throws Exception {
@@ -1610,8 +1611,8 @@ public class DataManagementPlanManager {
             throw new Exception("User is not authorized to invoke this action");
         if (!dmp.getStatus().equals(DMP.DMPStatus.FINALISED.getValue()))
             throw new Exception("DMP is not finalized");
-        if (dmp.getDoi() != null)
-            throw new Exception("DMP already has a DOI");
+        /*if (dmp.getDoi() != null)
+            throw new Exception("DMP already has a DOI");*/
 
         String zenodoToken = "";
         try {
@@ -1626,18 +1627,51 @@ public class DataManagementPlanManager {
         HttpHeaders headers = new HttpHeaders();
         headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
         headers.setContentType(MediaType.APPLICATION_JSON);
-        String createData = "{\n" +
-                "    \"metadata\": {\n" +
-                "        \"title\": \"" + dmp.getLabel() + "\",\n" +
-                "        \"upload_type\": \"publication\",\n" +
-                "        \"publication_type\": \"datamanagementplan\",\n" +
-                "        \"description\": \"" + (dmp.getDescription() != null && !dmp.getDescription().isEmpty() ? dmp.getDescription() : "<p></p>") + "\",\n" +
-                "        \"version\": \"" + dmp.getVersion() + "\",\n" +
-                "        \"creators\": [{\n" +
-                "        \t\t\"name\": \"" + dmp.getUsers().stream().filter(userDMP -> userDMP.getRole().equals(UserDMP.UserDMPRoles.OWNER.getValue())).findFirst().get().getUser().getName() + "\",\n" +
-                "        \t\t\"affiliation\": \"OpenDMP\"}]\n" +
-                "    }\n" +
-                "}";
+        String createData = null;
+        StringBuilder dataBuilder = new StringBuilder();
+        dataBuilder.append("{\n    \"metadata\": {\n");
+        dataBuilder.append( "        \"title\": \"").append(dmp.getLabel()).append("\",\n");
+        dataBuilder.append("        \"upload_type\": \"publication\",\n");
+        dataBuilder.append("        \"publication_type\": \"datamanagementplan\",\n");
+        dataBuilder.append("        \"description\": \"").append((dmp.getDescription() != null && !dmp.getDescription().isEmpty() ? dmp.getDescription() : "<p></p>")).append("\",\n");
+        dataBuilder.append("        \"version\": \"").append(dmp.getVersion()).append("\",\n");
+        dataBuilder.append("        \"related_identifiers\": [{\n");
+        dataBuilder.append("        \t\t\"identifier\": \"").append((this.environment.getProperty("dmp.domain") + "/explore-plans/publicOverview/" + id.toString())).append("\",\n");
+        dataBuilder.append("        \t\t\"relation\": \"isIdenticalTo\"}],\n");
+        dataBuilder.append("        \"contributors\": [");
+        int i = 0;
+        for(UserDMP userDMP: dmp.getUsers()) {
+            if (i > 0) {
+                dataBuilder.append(",\n");
+            }
+            dataBuilder.append("{\n");
+            dataBuilder.append("        \t\t\"name\": \"").append(userDMP.getUser().getName()).append("\",\n");
+            dataBuilder.append("        \t\t\"type\": \"").append("ProjectMember").append("\",\n");
+            dataBuilder.append("        \t\t\"affiliation\": \"OpenDMP\"\n}");
+            i++;
+        }
+        for(Researcher researcher: dmp.getResearchers()) {
+            if (i > 0) {
+                dataBuilder.append(",\n");
+            }
+            dataBuilder.append("{\n");
+            dataBuilder.append("        \t\t\"name\": \"").append(researcher.getLabel()).append("\",\n");
+            dataBuilder.append("        \t\t\"type\": \"").append("Researcher").append("\",\n");
+            String referenceHead = researcher.getReference().split(":")[0];
+            String referenceTail = researcher.getReference().replace(referenceHead + ":", "");
+            dataBuilder.append("        \t\t\"affiliation\": \"" + referenceHead + "\"");
+            if (referenceHead.toUpperCase().equals("ORCID")) {
+                dataBuilder.append(",\n        \t\t\"orcid\": \"" + referenceTail + "\"");
+            }
+            dataBuilder.append("\n}");
+            i++;
+        }
+        dataBuilder.append("],\n");
+        dataBuilder.append("        \"creators\": [{\n");
+        dataBuilder.append("        \t\t\"name\": \"").append(dmp.getUsers().stream().filter(userDMP -> userDMP.getRole().equals(UserDMP.UserDMPRoles.OWNER.getValue())).findFirst().get().getUser().getName()).append("\",\n");
+        dataBuilder.append("        \t\t\"affiliation\": \"OpenDMP\"}]\n");
+        dataBuilder.append("    }\n").append("}");
+        createData = dataBuilder.toString();
         JsonNode createDataJSON = new ObjectMapper().readTree(createData);
         HttpEntity<JsonNode> request = new HttpEntity<>(createDataJSON, headers);
         Map createResponse = null;
@@ -1645,12 +1679,14 @@ public class DataManagementPlanManager {
         String previousDOI = this.getPreviousDOI(dmp.getGroupId(), dmp.getId());
         String unpublishedUrl = null;
         String publishUrl = null;
+        String finalDoi = null;
         try {
 
             if (previousDOI == null) {
                 String createUrl = this.environment.getProperty("zenodo.url") + "deposit/depositions" + "?access_token=" + zenodoToken;
                 createResponse = restTemplate.postForEntity(createUrl, request, Map.class).getBody();
                 links = (LinkedHashMap<String, String>) createResponse.get("links");
+                finalDoi = (String) createResponse.get("conceptdoi");
             } else {
                 unpublishedUrl = this.getUnpublishedDOI(previousDOI, zenodoToken, dmp.getVersion());
                 if (unpublishedUrl == null) {
@@ -1668,6 +1704,7 @@ public class DataManagementPlanManager {
                     String latestDraftUrl = links.get("latest_draft") + "?access_token=" + zenodoToken;
                     createResponse = restTemplate.getForObject(latestDraftUrl, Map.class);
                     links = (LinkedHashMap<String, String>) createResponse.get("links");
+                    finalDoi = (String) createResponse.get("conceptdoi");
                     //At this point it might fail to perform the next requests so enclose them with try catch
                     try {
                         //Forth, update the new deposit's metadata
@@ -1710,11 +1747,16 @@ public class DataManagementPlanManager {
             } else {
                 publishUrl = unpublishedUrl + "?access_token=" + zenodoToken;
             }
-            Map<String, Object> publishResponce = restTemplate.postForObject(publishUrl, "", Map.class);
+            if (dmp.isPublic()) {
+                Map<String, Object> publishResponce = restTemplate.postForObject(publishUrl, "", Map.class);
+                finalDoi = (String) publishResponce.get("conceptdoi");
+            }
 
-            dmp.setDoi((String) publishResponce.get("conceptdoi"));
-            apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().createOrUpdate(dmp);
-            return (String) publishResponce.get("conceptdoi");
+            if (finalDoi != null) {
+                dmp.setDoi(finalDoi);
+                apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().createOrUpdate(dmp);
+            }
+            return finalDoi;
         } catch (HttpClientErrorException | HttpServerErrorException ex) {
             ObjectMapper ob = new ObjectMapper();
             Map<String, String> parsedException = ob.readValue(ex.getResponseBodyAsString(), HashMap.class);

From 42b2ff67f6f5b95fffa82bd0da99b544e80a7cd6 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Wed, 6 May 2020 18:02:19 +0300
Subject: [PATCH 47/60] Fixed issue when retrieving grants using funderId

---
 .../java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java
index cd29be9e8..05f966bac 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java
@@ -169,9 +169,13 @@ public class RemoteFetcher {
             completedPath = completedPath.replace("{like}", "");
         }
         if (externalUrlCriteria.getFunderId() != null) {
-            String funderId = externalUrlCriteria.getFunderId();
+            String funderPrefix = externalUrlCriteria.getFunderId().split(":")[0];
+            String funderId = externalUrlCriteria.getFunderId().replace(funderPrefix + ":", "");
+            if (funderId.toCharArray()[0] == ':') {
+                funderId = externalUrlCriteria.getFunderId();
+            }
             try {
-                funderId = URLEncoder.encode(externalUrlCriteria.getFunderId(), "UTF-8");
+                funderId = URLEncoder.encode(funderId, "UTF-8");
             } catch (UnsupportedEncodingException e) {
                 logger.error(e.getMessage(), e);
             }

From 0eb0707fd5ccfb852c4c56d74f542b6a2de3955b Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Wed, 6 May 2020 18:11:33 +0300
Subject: [PATCH 48/60] Add openaire grant on DOI creation (ref #257)

---
 .../eudat/data/dao/entities/DoiFunderDao.java | 11 ++++
 .../data/dao/entities/DoiFunderDaoImpl.java   | 55 +++++++++++++++++
 .../eu/eudat/data/entities/DoiFunder.java     | 61 +++++++++++++++++++
 .../managers/DataManagementPlanManager.java   |  8 +++
 .../operations/DatabaseRepository.java        |  2 +
 .../operations/DatabaseRepositoryImpl.java    | 11 ++++
 dmp-db-scema/updates/09/02_doifunder.sql      | 24 ++++++++
 7 files changed, 172 insertions(+)
 create mode 100644 dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DoiFunderDao.java
 create mode 100644 dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DoiFunderDaoImpl.java
 create mode 100644 dmp-backend/data/src/main/java/eu/eudat/data/entities/DoiFunder.java
 create mode 100644 dmp-db-scema/updates/09/02_doifunder.sql

diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DoiFunderDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DoiFunderDao.java
new file mode 100644
index 000000000..038b4b4b2
--- /dev/null
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DoiFunderDao.java
@@ -0,0 +1,11 @@
+package eu.eudat.data.dao.entities;
+
+import eu.eudat.data.dao.DatabaseAccessLayer;
+import eu.eudat.data.entities.DoiFunder;
+
+import java.util.UUID;
+
+public interface DoiFunderDao extends DatabaseAccessLayer<DoiFunder, UUID> {
+
+	DoiFunder findFunderByName(String name);
+}
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DoiFunderDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DoiFunderDaoImpl.java
new file mode 100644
index 000000000..3e775b952
--- /dev/null
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DoiFunderDaoImpl.java
@@ -0,0 +1,55 @@
+package eu.eudat.data.dao.entities;
+
+import eu.eudat.data.dao.DatabaseAccess;
+import eu.eudat.data.dao.databaselayer.service.DatabaseService;
+import eu.eudat.data.entities.DoiFunder;
+import eu.eudat.queryable.QueryableList;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+
+@Component("DoiFunderDao")
+public class DoiFunderDaoImpl extends DatabaseAccess<DoiFunder> implements DoiFunderDao {
+
+	@Autowired
+	public DoiFunderDaoImpl(DatabaseService<DoiFunder> databaseService) {
+		super(databaseService);
+	}
+
+	@Override
+	public DoiFunder findFunderByName(String name) {
+		return this.asQueryable().toList().stream().filter(doiFunder -> name.contains(doiFunder.getName()) || doiFunder.getName().contains(name)).findFirst().orElse(null);
+	}
+
+	@Override
+	public DoiFunder createOrUpdate(DoiFunder item) {
+		return this.getDatabaseService().createOrUpdate(item, DoiFunder.class);
+	}
+
+	@Override
+	public CompletableFuture<DoiFunder> createOrUpdateAsync(DoiFunder item) {
+		return CompletableFuture.supplyAsync(() -> this.createOrUpdate(item));
+	}
+
+	@Override
+	public DoiFunder find(UUID id) {
+		return this.getDatabaseService().getQueryable(DoiFunder.class).where(((builder, root) -> builder.equal(root.get("id"), id))).getSingle();
+	}
+
+	@Override
+	public DoiFunder find(UUID id, String hint) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void delete(DoiFunder item) {
+		this.getDatabaseService().delete(item);
+	}
+
+	@Override
+	public QueryableList<DoiFunder> asQueryable() {
+		return this.getDatabaseService().getQueryable(DoiFunder.class);
+	}
+}
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DoiFunder.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/DoiFunder.java
new file mode 100644
index 000000000..6ee816210
--- /dev/null
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/entities/DoiFunder.java
@@ -0,0 +1,61 @@
+package eu.eudat.data.entities;
+
+import eu.eudat.queryable.queryableentity.DataEntity;
+
+import javax.persistence.*;
+import java.util.List;
+import java.util.UUID;
+
+@Entity
+@Table(name = "\"DoiFunder\"")
+public class DoiFunder implements DataEntity<DoiFunder, UUID> {
+
+	@Id
+	private UUID id;
+
+	@Column(name = "name")
+	private String name;
+
+	@Column(name = "doi")
+	private String doi;
+
+	public UUID getId() {
+		return id;
+	}
+
+	public void setId(UUID id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getDoi() {
+		return doi;
+	}
+
+	public void setDoi(String doi) {
+		this.doi = doi;
+	}
+
+	@Override
+	public void update(DoiFunder entity) {
+		this.name = entity.name;
+		this.doi = entity.doi;
+	}
+
+	@Override
+	public UUID getKeys() {
+		return id;
+	}
+
+	@Override
+	public DoiFunder buildFromTuple(List<Tuple> tuple, List<String> fields, String base) {
+		return null;
+	}
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index 1d1c9bec8..a2815c328 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -1667,6 +1667,14 @@ public class DataManagementPlanManager {
             i++;
         }
         dataBuilder.append("],\n");
+        String grantReferenceHead = dmp.getGrant().getReference().split(":")[0];
+        if (grantReferenceHead.equals("openaire")) {
+            String grantReferenceTail = dmp.getGrant().getReference().split(":")[3];
+            DoiFunder doiFunder = this.apiContext.getOperationsContext().getDatabaseRepository().getDoiFunderDao().findFunderByName(dmp.getGrant().getFunder().getLabel());
+            String finalId = doiFunder.getDoi() + "::" + grantReferenceTail;
+            dataBuilder.append("        \"grants\": [{\n");
+            dataBuilder.append("        \t\t\"id\": \"").append(finalId).append("\"\n}],\n");
+        }
         dataBuilder.append("        \"creators\": [{\n");
         dataBuilder.append("        \t\t\"name\": \"").append(dmp.getUsers().stream().filter(userDMP -> userDMP.getRole().equals(UserDMP.UserDMPRoles.OWNER.getValue())).findFirst().get().getUser().getName()).append("\",\n");
         dataBuilder.append("        \t\t\"affiliation\": \"OpenDMP\"}]\n");
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/DatabaseRepository.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/DatabaseRepository.java
index 516f7e949..ff6518354 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/DatabaseRepository.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/DatabaseRepository.java
@@ -58,5 +58,7 @@ public interface DatabaseRepository {
 
     UserAssociationDao getUserAssociationDao();
 
+    DoiFunderDao getDoiFunderDao();
+
     <T> void detachEntity(T entity);
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/DatabaseRepositoryImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/DatabaseRepositoryImpl.java
index ff5f6506e..01aa5093a 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/DatabaseRepositoryImpl.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/DatabaseRepositoryImpl.java
@@ -38,6 +38,7 @@ public class DatabaseRepositoryImpl implements DatabaseRepository {
     private LockDao lockDao;
     private NotificationDao notificationDao;
     private UserAssociationDao userAssociationDao;
+    private DoiFunderDao doiFunderDao;
 
     private EntityManager entityManager;
 
@@ -296,6 +297,16 @@ public class DatabaseRepositoryImpl implements DatabaseRepository {
         return userAssociationDao;
     }
 
+    @Override
+    public DoiFunderDao getDoiFunderDao() {
+        return doiFunderDao;
+    }
+
+    @Autowired
+    public void setDoiFunderDao(DoiFunderDao doiFunderDao) {
+        this.doiFunderDao = doiFunderDao;
+    }
+
     @Autowired
     public void setUserAssociationDao(UserAssociationDao userAssociationDao) {
         this.userAssociationDao = userAssociationDao;
diff --git a/dmp-db-scema/updates/09/02_doifunder.sql b/dmp-db-scema/updates/09/02_doifunder.sql
new file mode 100644
index 000000000..228c6b4a5
--- /dev/null
+++ b/dmp-db-scema/updates/09/02_doifunder.sql
@@ -0,0 +1,24 @@
+CREATE TABLE public."DoiFunder" (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    name character varying,
+    doi character varying
+);
+
+
+ALTER TABLE public."DoiFunder" OWNER TO dmptool;
+
+COPY public."DoiFunder" (id, name, doi) FROM stdin;
+ad9bad58-52a9-4c0c-85e1-ca8d0bf72c5f	Australian Research Council	10.13039/501100000923
+a778e6fe-17d1-4e5b-978f-2a290f096530	European Commission	10.13039/501100000780
+ef314bc9-b72c-4c88-9ca8-e23d4f564136	Fundação para a Ciência e a Tecnologia	10.13039/501100001871
+19a21b03-9313-4497-b69c-91c8396aeda8	Ministarstvo Prosvete, Nauke i Tehnološkog Razvoja	10.13039/501100004564
+d6430393-daac-403a-bb76-36100662b4d6	Ministarstvo Znanosti, Obrazovanja i Sporta	10.13039/501100006588
+4b06a13f-8392-4aa4-ae28-6b6ab68fc266	National Health and Medical Research Council	10.13039/501100000925
+cbcac800-69cb-42fe-95af-5de1594987e2	National Science Foundation	10.13039/100000001
+3c8b88c6-710c-4a9c-bf39-bc35259cc7bf	Nederlandse Organisatie voor Wetenschappelijk Onderzoek	10.13039/501100003246
+1816a401-cf74-4ff9-939d-faf1aad21b60	Wellcome Trust	10.13039/100004440
+\.
+
+ALTER TABLE ONLY public."DoiFunder"
+    ADD CONSTRAINT "DoiFunder_pkey" PRIMARY KEY (id);
+

From b539544075039d3f02a95482de911537f84a3d8c Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Thu, 7 May 2020 10:57:20 +0300
Subject: [PATCH 49/60] Add link to relevant zenodo entity on DOI overview with
 root link configurable (ref #264)

---
 .../core/services/configuration/configuration.service.ts    | 6 ++++++
 .../src/app/ui/dmp/overview/dmp-overview.component.html     | 2 +-
 .../src/app/ui/dmp/overview/dmp-overview.component.ts       | 6 ++++++
 dmp-frontend/src/assets/config/config.json                  | 3 ++-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/dmp-frontend/src/app/core/services/configuration/configuration.service.ts b/dmp-frontend/src/app/core/services/configuration/configuration.service.ts
index e6d544816..8ede16604 100644
--- a/dmp-frontend/src/app/core/services/configuration/configuration.service.ts
+++ b/dmp-frontend/src/app/core/services/configuration/configuration.service.ts
@@ -62,6 +62,11 @@ export class ConfigurationService extends BaseComponent {
 		return this._allowOrganizationCreator;
 	}
 
+	private _doiLink: string;
+	get doiLink(): string {
+		return this._doiLink;
+	}
+
 
 	public loadConfiguration(): Promise<any> {
 		return new Promise((r, e) => {
@@ -98,6 +103,7 @@ export class ConfigurationService extends BaseComponent {
 		this._lockInterval = config.lockInterval;
 		this._guideAssets = config.guideAssets;
 		this._allowOrganizationCreator = config.allowOrganizationCreator;
+		this._doiLink = config.doiLink;
 	}
 
 }
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
index cb45ad27f..5151ecd9b 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
@@ -71,7 +71,7 @@
 					</div>
 					<div class="row">
 						<mat-card-subtitle class="col" *ngIf="!hasDoi(dmp)">
-							{{ 'DMP-EDITOR.TITLE.SUBTITLE' | translate }}: {{ dmp.doi }}
+							{{ 'DMP-EDITOR.TITLE.SUBTITLE' | translate }}: <a [href]="createDoiLink(dmp.doi)">{{ dmp.doi }}</a>
 						</mat-card-subtitle>
 					</div>
 				</div>
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
index ea0064270..c363c8595 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
@@ -522,6 +522,12 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 		this.router.navigate(['/datasets/new/' + rowId]);
 	}
 
+	createDoiLink(doi: string): string {
+		const doiarr = doi.split('.');
+		const id = doiarr[doiarr.length - 1];
+		return this.configurationService.doiLink + id;
+	}
+
 	// advancedClicked() {
 	// 	const dialogRef = this.dialog.open(ExportMethodDialogComponent, {
 	// 		maxWidth: '500px',
diff --git a/dmp-frontend/src/assets/config/config.json b/dmp-frontend/src/assets/config/config.json
index 5f916f361..09730c8b9 100644
--- a/dmp-frontend/src/assets/config/config.json
+++ b/dmp-frontend/src/assets/config/config.json
@@ -50,5 +50,6 @@
 	},
 	"lockInterval": 60000,
 	"guideAssets": "assets/images/guide",
-	"allowOrganizationCreator": true
+	"allowOrganizationCreator": true,
+	"doiLink": "https://sandbox.zenodo.org/record/"
 }

From 50c45b72713255c1c1b26f0b422e6d7e4e718d3c Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Fri, 8 May 2020 18:27:16 +0300
Subject: [PATCH 50/60] Show status on dataset profile listing and filter them
 based on status (ref #265)

---
 .../dao/criteria/DatasetProfileCriteria.java     |  9 +++++++++
 .../data/dao/entities/DatasetProfileDaoImpl.java |  3 +++
 .../dataset-profile/dataset-profile.module.ts    |  4 +++-
 .../criteria/dataset-profile.component.html      |  7 +++++++
 .../dataset-profile-listing.component.html       |  7 +++++++
 .../listing/dataset-profile-listing.component.ts |  2 +-
 .../listing/pipe/parse-status.pipe.ts            | 16 ++++++++++++++++
 dmp-frontend/src/assets/i18n/en.json             |  8 +++++++-
 8 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 dmp-frontend/src/app/ui/admin/dataset-profile/listing/pipe/parse-status.pipe.ts

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 b8e2c35c4..cc556701d 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
@@ -33,6 +33,7 @@ public class DatasetProfileCriteria extends Criteria<DatasetProfile> {
     private Short filter;
     private UUID userId;
     private boolean finalized;
+    private Integer status;
 
     public boolean getAllVersions() { return allVersions; }
     public void setAllVersions(boolean allVersions) { this.allVersions = allVersions; }
@@ -60,4 +61,12 @@ public class DatasetProfileCriteria extends Criteria<DatasetProfile> {
     public void setFinalized(boolean finalized) {
         this.finalized = finalized;
     }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
 }
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 b06d5d8fd..36fcc5433 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,6 +52,9 @@ public class DatasetProfileDaoImpl extends DatabaseAccess<DatasetProfile> implem
                                 builder.notEqual(root.get("id"), criteria.getUserId())));
             }
         }
+        if (criteria.getStatus() != null) {
+            query.where(((builder, root) -> builder.equal(root.get("status"), criteria.getStatus())));
+        }
         if (criteria.getFinalized()) {
             query.where(((builder, root) -> builder.equal(root.get("status"), DatasetProfile.Status.FINALIZED.getValue())));
         } else {
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/dataset-profile.module.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/dataset-profile.module.ts
index 1e7c9eb19..af103eebc 100644
--- a/dmp-frontend/src/app/ui/admin/dataset-profile/dataset-profile.module.ts
+++ b/dmp-frontend/src/app/ui/admin/dataset-profile/dataset-profile.module.ts
@@ -27,6 +27,7 @@ import { DialodConfirmationUploadDatasetProfiles } from '@app/ui/admin/dataset-p
 import { DatasetProfileListingComponent } from '@app/ui/admin/dataset-profile/listing/dataset-profile-listing.component';
 import { CommonFormsModule } from '@common/forms/common-forms.module';
 import { CommonUiModule } from '@common/ui/common-ui.module';
+import { ParseStatus } from './listing/pipe/parse-status.pipe';
 
 @NgModule({
 	imports: [
@@ -59,7 +60,8 @@ import { CommonUiModule } from '@common/ui/common-ui.module';
 		DatasetProfileEditorInternalDmpEntitiesFieldComponent,
 		DatasetProfileEditorResearchersAutoCompleteFieldComponent,
 		DatasetProfileEditorDatasetsAutoCompleteFieldComponent,
-		DatasetProfileEditorDmpsAutoCompleteFieldComponent
+		DatasetProfileEditorDmpsAutoCompleteFieldComponent,
+		ParseStatus
 	],
 	entryComponents: [
 		DialodConfirmationUploadDatasetProfiles
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.html
index 8026e4251..c303267ef 100644
--- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.html
+++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.html
@@ -5,6 +5,13 @@
 				<input matInput placeholder=" {{'CRITERIA.DATASET-PROFILE.LIKE'| translate}}" name="datasetProfileLike"
 					[(ngModel)]="criteria.like" (ngModelChange)="controlModified()">
 			</mat-form-field>
+			<mat-form-field class="col-md-6">
+				<mat-select [(ngModel)]="criteria.status" (ngModelChange)="controlModified()" placeholder=" {{'CRITERIA.DATASET-PROFILE.STATUS' | translate}}">
+					<mat-option [value]="null">{{'DATASET-PROFILE-STATUS.NONE' | translate}}</mat-option>
+					<mat-option [value]="0">{{'DATASET-PROFILE-STATUS.DRAFT' | translate}}</mat-option>
+					<mat-option [value]="1">{{'DATASET-PROFILE-STATUS.FINALIZED' | translate}}</mat-option>
+				</mat-select>
+			</mat-form-field>
 			<div class="col"></div>
 			<div class="col-auto">
 				<!--  imgFileInput.click() && -->
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.html
index 44a5c5adf..b0e01d2c1 100644
--- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.html
+++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.html
@@ -27,6 +27,13 @@
 					<mat-cell *matCellDef="let row">{{row.created | date:'shortDate'}}</mat-cell>
 				</ng-container>
 
+				<!-- Column Definition: Status -->
+				<ng-container cdkColumnDef="status">
+					<mat-header-cell *matHeaderCellDef mat-sort-header="status">{{'DATASET-PROFILE-LISTING.COLUMNS.STATUS' |
+						translate}}</mat-header-cell>
+					<mat-cell *matCellDef="let row">{{ (row.status | parseStatus) | translate}}</mat-cell>
+				</ng-container>
+
 				<!-- Column Definition: Submission Time -->
 				<ng-container cdkColumnDef="actions">
 					<mat-header-cell *matHeaderCellDef>{{'DATASET-PROFILE-LISTING.COLUMNS.ACTIONS' | translate}}
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 8f903dedd..230ebf16f 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
@@ -30,7 +30,7 @@ export class DatasetProfileListingComponent extends BaseComponent implements OnI
 
 	breadCrumbs: Observable<BreadcrumbItem[]>;
 	dataSource: DatasetDataSource | null;
-	displayedColumns: String[] = ['label', 'description', 'created', 'actions'];
+	displayedColumns: String[] = ['label', 'description', 'created', 'status', 'actions'];
 	pageEvent: PageEvent;
 	titlePrefix: String;
 	dmpId: String;
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/pipe/parse-status.pipe.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/pipe/parse-status.pipe.ts
new file mode 100644
index 000000000..33cbd4b8c
--- /dev/null
+++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/pipe/parse-status.pipe.ts
@@ -0,0 +1,16 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+	name: 'parseStatus',
+	pure: true
+})
+export class ParseStatus implements PipeTransform {
+	transform(value: any, ...args: any[]) {
+		return this.parseStatus(value);
+	}
+
+
+	parseStatus(status: number): string {
+		return status != 0 ? 'DATASET-PROFILE-STATUS.FINALIZED' : 'DATASET-PROFILE-STATUS.DRAFT';
+	}
+}
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index 63fd0f3d6..64210103d 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -765,7 +765,8 @@
 			}
 		},
 		"DATASET-PROFILE": {
-			"LIKE": "Search"
+			"LIKE": "Search",
+			"STATUS": "Status"
 		},
 		"DATA-SETS": {
 			"PERIOD-FROM": "Start",
@@ -1261,5 +1262,10 @@
 			}
 		},
 		"HINT": "(Suggested Default Name)"
+	},
+	"DATASET-PROFILE-STATUS": {
+		"NONE": "None",
+		"DRAFT": "Draft",
+		"FINALIZED": "Finalized"
 	}
 }

From 19b8a493700b6293ff0bbee73915ada95a2e0db9 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Mon, 11 May 2020 11:46:16 +0300
Subject: [PATCH 51/60] Fixed issue with doiFunder sql

---
 dmp-db-scema/updates/09/02_doifunder.sql | 28 ++++++++++++------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/dmp-db-scema/updates/09/02_doifunder.sql b/dmp-db-scema/updates/09/02_doifunder.sql
index 228c6b4a5..cb6742516 100644
--- a/dmp-db-scema/updates/09/02_doifunder.sql
+++ b/dmp-db-scema/updates/09/02_doifunder.sql
@@ -5,20 +5,20 @@ CREATE TABLE public."DoiFunder" (
 );
 
 
-ALTER TABLE public."DoiFunder" OWNER TO dmptool;
-
-COPY public."DoiFunder" (id, name, doi) FROM stdin;
-ad9bad58-52a9-4c0c-85e1-ca8d0bf72c5f	Australian Research Council	10.13039/501100000923
-a778e6fe-17d1-4e5b-978f-2a290f096530	European Commission	10.13039/501100000780
-ef314bc9-b72c-4c88-9ca8-e23d4f564136	Fundação para a Ciência e a Tecnologia	10.13039/501100001871
-19a21b03-9313-4497-b69c-91c8396aeda8	Ministarstvo Prosvete, Nauke i Tehnološkog Razvoja	10.13039/501100004564
-d6430393-daac-403a-bb76-36100662b4d6	Ministarstvo Znanosti, Obrazovanja i Sporta	10.13039/501100006588
-4b06a13f-8392-4aa4-ae28-6b6ab68fc266	National Health and Medical Research Council	10.13039/501100000925
-cbcac800-69cb-42fe-95af-5de1594987e2	National Science Foundation	10.13039/100000001
-3c8b88c6-710c-4a9c-bf39-bc35259cc7bf	Nederlandse Organisatie voor Wetenschappelijk Onderzoek	10.13039/501100003246
-1816a401-cf74-4ff9-939d-faf1aad21b60	Wellcome Trust	10.13039/100004440
-\.
-
 ALTER TABLE ONLY public."DoiFunder"
     ADD CONSTRAINT "DoiFunder_pkey" PRIMARY KEY (id);
 
+ALTER TABLE public."DoiFunder" OWNER TO dmptool;
+
+INSERT INTO public."DoiFunder"(name, doi) VALUES ('Australian Research Council',	'10.13039/501100000923');
+INSERT INTO public."DoiFunder"(name, doi) VALUES ('European Commission', '10.13039/501100000780');
+INSERT INTO public."DoiFunder"(name, doi) VALUES ('Fundação para a Ciência e a Tecnologia', '10.13039/501100001871');
+INSERT INTO public."DoiFunder"(name, doi) VALUES ('Ministarstvo Prosvete, Nauke i Tehnološkog Razvoja', '10.13039/501100004564');
+INSERT INTO public."DoiFunder"(name, doi) VALUES ('Ministarstvo Znanosti, Obrazovanja i Sporta',	'10.13039/501100006588');
+INSERT INTO public."DoiFunder"(name, doi) VALUES ('National Health and Medical Research Council', '10.13039/501100000925');
+INSERT INTO public."DoiFunder"(name, doi) VALUES ('National Science Foundation','10.13039/100000001');
+INSERT INTO public."DoiFunder"(name, doi) VALUES ('Nederlandse Organisatie voor Wetenschappelijk Onderzoek',	'10.13039/501100003246');
+INSERT INTO public."DoiFunder"(name, doi) VALUES ('Wellcome Trust', '10.13039/100004440');
+
+
+

From 9d00e7cbf5aec8964e7349d857a3c6f6bdbd1902 Mon Sep 17 00:00:00 2001
From: Georgios Kakaletris <gkakas@di.uoa.gr>
Date: Sat, 9 May 2020 00:03:50 +0200
Subject: [PATCH 52/60] Update LICENSE

(cherry picked from commit d3915e26e704f2fb61c4b3bfaaf30ee7aea994db)
---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index 5064504f7..47b2a434c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 dmp
+Copyright (c) 2019-2020 OpenAIRE AMKE
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From f51973cfc0a48c711b31acda6e64b7beda204be4 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Mon, 11 May 2020 14:01:40 +0300
Subject: [PATCH 53/60] Update dataset profile criteria

---
 .../app/core/query/dataset-profile/dataset-profile-criteria.ts   | 1 +
 1 file changed, 1 insertion(+)

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 5d73e7c9c..b9bbd9b5e 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
@@ -5,4 +5,5 @@ export class DatasetProfileCriteria extends BaseCriteria {
 	public groupIds: string[];
 	public allVersions: boolean;
 	public finalized: boolean = true;
+	public status: number;
 }

From e2b15f1b82ec0831c4d868ec2d7eceaa19fdae51 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Mon, 11 May 2020 18:34:42 +0300
Subject: [PATCH 54/60] Add self deploy scripts for the database (without
 docker)

---
 dmp-db-scema/createDB/createdb.bat                | 8 ++++++++
 dmp-db-scema/createDB/createdb.sh                 | 5 +++++
 dmp-db-scema/main/createDatabase.sql              | 2 ++
 dmp-db-scema/updates/08/03_Create_Credentials.sql | 2 +-
 4 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 dmp-db-scema/createDB/createdb.bat
 create mode 100644 dmp-db-scema/createDB/createdb.sh
 create mode 100644 dmp-db-scema/main/createDatabase.sql

diff --git a/dmp-db-scema/createDB/createdb.bat b/dmp-db-scema/createDB/createdb.bat
new file mode 100644
index 000000000..0214648e5
--- /dev/null
+++ b/dmp-db-scema/createDB/createdb.bat
@@ -0,0 +1,8 @@
+@echo off
+setlocal
+cd ..
+for /F "tokens=*" %%p in ('type Docker\dmp-db.env') do SET %%p
+psql -d postgres -U postgres -w --set=POSTGRES_USER=%POSTGRES_USER% --set=POSTGRES_PASSWORD=%POSTGRES_PASSWORD% --set=POSTGRES_DB=%POSTGRES_DB% -f main/createDatabase.sql
+psql -d dmptool -U dmptool -w -f main/DataManagementPlanDB.sql
+for /R "updates" %%f in (*.sql) do psql --set=ADMIN_USERNAME=%ADMIN_USERNAME% --set=ADMIN_PASSWORD=%ADMIN_PASSWORD% -d dmptool -U dmptool -w -f %%f
+endlocal
\ No newline at end of file
diff --git a/dmp-db-scema/createDB/createdb.sh b/dmp-db-scema/createDB/createdb.sh
new file mode 100644
index 000000000..fced0c832
--- /dev/null
+++ b/dmp-db-scema/createDB/createdb.sh
@@ -0,0 +1,5 @@
+cd ..
+source Docker/dmp-db.env
+export $(cut -d= -f1 Docker/dmp-db.env)
+psql -d postgres -U postgres -w --set=POSTGRES_USER="$POSTGRES_USER" --set=POSTGRES_PASSWORD="$POSTGRES_PASSWORD" --set=POSTGRES_DB="$POSTGRES_DB" -f main/createDatabase.sql
+./initdb.sh
\ No newline at end of file
diff --git a/dmp-db-scema/main/createDatabase.sql b/dmp-db-scema/main/createDatabase.sql
new file mode 100644
index 000000000..0229c7107
--- /dev/null
+++ b/dmp-db-scema/main/createDatabase.sql
@@ -0,0 +1,2 @@
+CREATE USER :POSTGRES_USER with PASSWORD :'POSTGRES_PASSWORD' SUPERUSER;
+CREATE DATABASE :POSTGRES_DB;
\ No newline at end of file
diff --git a/dmp-db-scema/updates/08/03_Create_Credentials.sql b/dmp-db-scema/updates/08/03_Create_Credentials.sql
index 0ffbf0f46..6ca13e4fc 100644
--- a/dmp-db-scema/updates/08/03_Create_Credentials.sql
+++ b/dmp-db-scema/updates/08/03_Create_Credentials.sql
@@ -21,5 +21,5 @@ ALTER TABLE ONLY public."Credential"
 
 INSERT INTO public."UserInfo"(email, authorization_level, usertype, name, created, additionalinfo) VALUES ('fake@email.org', 1, 1, :'ADMIN_USERNAME', now(), '{}');
 
-INSERT INTO public."Credential" VALUES (uuid_generate_v4(), 0, 5, :'ADMIN_USERNAME', :'ADMIN_PASSWORD', now(), now(), (SELECT public."UserInfo"."id" FROM public."UserInfo" WHERE name = 'admin'), 'dmp');
+INSERT INTO public."Credential" VALUES (uuid_generate_v4(), 0, 5, :'ADMIN_USERNAME', :'ADMIN_PASSWORD', now(), now(), (SELECT public."UserInfo"."id" FROM public."UserInfo" WHERE name = :'ADMIN_USERNAME'), 'dmp');
 

From af62e192ae1df67e284008c0358ddcc2590b7d26 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Tue, 12 May 2020 13:10:23 +0300
Subject: [PATCH 55/60] Improved deployment

---
 dmp-backend/Dockerfile                        |  4 +-
 .../resources/config/application.properties   |  2 +-
 dmp-db-scema/createDB/createdb.bat            |  4 +-
 dmp-db-scema/initdb.sh                        |  4 +-
 dmp-db-scema/main/DataManagementPlanDB.sql    | 40 +++++++++----------
 ...ser_DMPDatasetprofile_DMPFinalizedDate.sql |  4 +-
 dmp-db-scema/updates/01/08_Create_content.sql |  2 +-
 .../02/01_CreateLoginConfirmationEmail.sql    |  2 +-
 .../04/03_Create_External_Datasets.sql        |  2 +-
 .../updates/08/03_Create_Credentials.sql      |  2 +-
 .../updates/08/04_Create_UserToken.sql        |  2 +-
 .../updates/08/05_Create_UserRole.sql         |  2 +-
 .../08/08_create_datasetexternaldataset.sql   |  2 +-
 .../updates/08/09_Create_Invitation.sql       |  2 +-
 .../updates/08/10_Create_User_preference.sql  |  2 +-
 .../updates/09/01_create_user_association.sql |  2 +-
 dmp-db-scema/updates/09/02_doifunder.sql      |  2 +-
 17 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/dmp-backend/Dockerfile b/dmp-backend/Dockerfile
index 4b9954a9e..b79a77070 100644
--- a/dmp-backend/Dockerfile
+++ b/dmp-backend/Dockerfile
@@ -19,5 +19,5 @@ RUN mvn package
 FROM openjdk:8-jre-alpine
 WORKDIR /app
 
-COPY --from=MAVEN_BUILD /build/web/target/web-1.0-SNAPSHOT.jar /app/app.jar
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom" ,"-Dspring.profiles.active=${PROFILE}","-jar","/app/app.jar"]
\ No newline at end of file
+COPY --from=MAVEN_BUILD /build/web/target/web-1.0-SNAPSHOT.jar /app.jar
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom" ,"-Dspring.profiles.active=${PROFILE}","-jar","/app.jar"]
\ No newline at end of file
diff --git a/dmp-backend/web/src/main/resources/config/application.properties b/dmp-backend/web/src/main/resources/config/application.properties
index 84ae244b3..0f0a78ef4 100644
--- a/dmp-backend/web/src/main/resources/config/application.properties
+++ b/dmp-backend/web/src/main/resources/config/application.properties
@@ -90,7 +90,7 @@ notification.finalised.subject=[OpenDMP] The {name} has been finalised
 notification.modifiedFinalised.subject=[OpenDMP] The {name} has been modified and finalised
 
 #############LOGGING#########
-logging.config=file:/app/logging/logback-${spring.profiles.active}.xml
+logging.config=file:logging/logback-${spring.profiles.active}.xml
 
 #############TEMP#########
 temp.temp=tmp/
\ No newline at end of file
diff --git a/dmp-db-scema/createDB/createdb.bat b/dmp-db-scema/createDB/createdb.bat
index 0214648e5..f67be1781 100644
--- a/dmp-db-scema/createDB/createdb.bat
+++ b/dmp-db-scema/createDB/createdb.bat
@@ -3,6 +3,6 @@ setlocal
 cd ..
 for /F "tokens=*" %%p in ('type Docker\dmp-db.env') do SET %%p
 psql -d postgres -U postgres -w --set=POSTGRES_USER=%POSTGRES_USER% --set=POSTGRES_PASSWORD=%POSTGRES_PASSWORD% --set=POSTGRES_DB=%POSTGRES_DB% -f main/createDatabase.sql
-psql -d dmptool -U dmptool -w -f main/DataManagementPlanDB.sql
-for /R "updates" %%f in (*.sql) do psql --set=ADMIN_USERNAME=%ADMIN_USERNAME% --set=ADMIN_PASSWORD=%ADMIN_PASSWORD% -d dmptool -U dmptool -w -f %%f
+psql -d %POSTGRES_DB% -U %POSTGRES_USER% --set=POSTGRES_USER=%POSTGRES_USER% -w -f main/DataManagementPlanDB.sql
+for /R "updates" %%f in (*.sql) do psql --set=ADMIN_USERNAME=%ADMIN_USERNAME% --set=ADMIN_PASSWORD=%ADMIN_PASSWORD% --set=POSTGRES_USER=%POSTGRES_USER% -d %POSTGRES_DB% -U %POSTGRES_USER% -w -f %%f
 endlocal
\ No newline at end of file
diff --git a/dmp-db-scema/initdb.sh b/dmp-db-scema/initdb.sh
index 5ea5aa8be..ad7d9dd8a 100644
--- a/dmp-db-scema/initdb.sh
+++ b/dmp-db-scema/initdb.sh
@@ -1,7 +1,7 @@
-psql -d dmptool -U dmptool -f main/DataManagementPlanDB.sql; 
+psql -d $POSTGRES_DB -U $POSTGRES_USER --set=POSTGRES_USER="$POSTGRES_USER" -f main/DataManagementPlanDB.sql; 
 for j in $(ls updates); do
 	for i in $(ls updates/$j/*.sql); do
 		echo $i
-		psql --set=ADMIN_USERNAME="$ADMIN_USERNAME" --set=ADMIN_PASSWORD="$ADMIN_PASSWORD" -d dmptool -U dmptool -f $i; 
+		psql --set=ADMIN_USERNAME="$ADMIN_USERNAME" --set=ADMIN_PASSWORD="$ADMIN_PASSWORD" --set=POSTGRES_USER="$POSTGRES_USER" -d $POSTGRES_DB -U $POSTGRES_USER -f $i; 
 	done
 done
\ No newline at end of file
diff --git a/dmp-db-scema/main/DataManagementPlanDB.sql b/dmp-db-scema/main/DataManagementPlanDB.sql
index 9cad64fc8..94b8f2b75 100644
--- a/dmp-db-scema/main/DataManagementPlanDB.sql
+++ b/dmp-db-scema/main/DataManagementPlanDB.sql
@@ -59,7 +59,7 @@ CREATE TABLE "DMP" (
 );
 
 
-ALTER TABLE "DMP" OWNER TO dmptool;
+ALTER TABLE "DMP" OWNER TO :POSTGRES_USER;
 
 
 COMMENT ON COLUMN "DMP"."ProfileData" IS 'More data about the DMP as defined by the profile';
@@ -73,7 +73,7 @@ CREATE TABLE "DMPOrganisation" (
 );
 
 
-ALTER TABLE "DMPOrganisation" OWNER TO dmptool;
+ALTER TABLE "DMPOrganisation" OWNER TO :POSTGRES_USER;
 
 
 COMMENT ON TABLE "DMPOrganisation" IS 'Linking of DMPs to Organisations';
@@ -92,7 +92,7 @@ CREATE TABLE "DMPProfile" (
 );
 
 
-ALTER TABLE "DMPProfile" OWNER TO dmptool;
+ALTER TABLE "DMPProfile" OWNER TO :POSTGRES_USER;
 
 
 CREATE TABLE "DMPResearcher" (
@@ -103,7 +103,7 @@ CREATE TABLE "DMPResearcher" (
 );
 
 
-ALTER TABLE "DMPResearcher" OWNER TO dmptool;
+ALTER TABLE "DMPResearcher" OWNER TO :POSTGRES_USER;
 
 COMMENT ON TABLE "DMPResearcher" IS 'Linking of DMPs to researchers';
 
@@ -126,7 +126,7 @@ CREATE TABLE "Dataset" (
 );
 
 
-ALTER TABLE "Dataset" OWNER TO dmptool;
+ALTER TABLE "Dataset" OWNER TO :POSTGRES_USER;
 
 
 COMMENT ON COLUMN "Dataset"."Uri" IS 'URI of item';
@@ -151,7 +151,7 @@ CREATE TABLE "DatasetProfile" (
 ALTER TABLE "DatasetProfile" ADD CONSTRAINT datasetprofile_unique_ruleset UNIQUE ("Ruleset");
 ALTER TABLE "DatasetProfile" ADD CONSTRAINT datasetprofile_unique_viewstyle UNIQUE ("Viewstyle");
 
-ALTER TABLE "DatasetProfile" OWNER TO dmptool;
+ALTER TABLE "DatasetProfile" OWNER TO :POSTGRES_USER;
 
 
 COMMENT ON TABLE "DatasetProfile" IS 'Profiles for dmp datasets';
@@ -163,7 +163,7 @@ CREATE TABLE "DatasetProfileRuleset" (
     "Definition" xml NOT NULL
 );
 
-ALTER TABLE "DatasetProfileRuleset" OWNER TO dmptool;
+ALTER TABLE "DatasetProfileRuleset" OWNER TO :POSTGRES_USER;
 
 COMMENT ON TABLE "DatasetProfileRuleset" IS 'Sets of Rules for dmp dataset profiles';
 
@@ -174,7 +174,7 @@ CREATE TABLE "DatasetProfileViewstyle" (
     "Definition" xml NOT NULL
 );
 
-ALTER TABLE "DatasetProfileViewstyle" OWNER TO dmptool;
+ALTER TABLE "DatasetProfileViewstyle" OWNER TO :POSTGRES_USER;
 
 COMMENT ON TABLE "DatasetProfileViewstyle" IS 'Style sets for dmp dataset profiles';
 
@@ -192,7 +192,7 @@ CREATE TABLE "Organisation" (
 );
 
 
-ALTER TABLE "Organisation" OWNER TO dmptool;
+ALTER TABLE "Organisation" OWNER TO :POSTGRES_USER;
 
 COMMENT ON TABLE "Organisation" IS 'Table of organizations utilized in the project';
 
@@ -227,7 +227,7 @@ CREATE TABLE "Project" (
 );
 
 
-ALTER TABLE "Project" OWNER TO dmptool;
+ALTER TABLE "Project" OWNER TO :POSTGRES_USER;
 
 
 COMMENT ON TABLE "Project" IS 'Table of project managed in the system';
@@ -268,7 +268,7 @@ CREATE TABLE "Researcher" (
 );
 
 
-ALTER TABLE "Researcher" OWNER TO dmptool;
+ALTER TABLE "Researcher" OWNER TO :POSTGRES_USER;
 
 
 
@@ -391,7 +391,7 @@ CREATE TABLE "Service" (
     "Definition" xml
 );
 
-ALTER TABLE "Service" OWNER TO dmptool;
+ALTER TABLE "Service" OWNER TO :POSTGRES_USER;
 
 ALTER TABLE ONLY "Service"
     ADD CONSTRAINT "PKey_Service" PRIMARY KEY ("ID");
@@ -409,7 +409,7 @@ CREATE TABLE "DataRepository" (
     "Definition" xml
 );
 
-ALTER TABLE "DataRepository" OWNER TO dmptool;
+ALTER TABLE "DataRepository" OWNER TO :POSTGRES_USER;
 
 ALTER TABLE ONLY "DataRepository"
     ADD CONSTRAINT "PKey_DataRepository" PRIMARY KEY ("ID");
@@ -428,7 +428,7 @@ CREATE TABLE "Registry" (
     "Definition" xml
 );
 
-ALTER TABLE "Registry" OWNER TO dmptool;
+ALTER TABLE "Registry" OWNER TO :POSTGRES_USER;
 
 ALTER TABLE ONLY "Registry"
     ADD CONSTRAINT "PKey_Registry" PRIMARY KEY ("ID");
@@ -442,7 +442,7 @@ CREATE TABLE "DatasetService" (
     "ID" uuid DEFAULT uuid_generate_v4() NOT NULL
 );
 
-ALTER TABLE "DatasetService" OWNER TO dmptool;
+ALTER TABLE "DatasetService" OWNER TO :POSTGRES_USER;
 
 COMMENT ON TABLE "DatasetService" IS 'Linking Dataset to Service';
 
@@ -454,7 +454,7 @@ CREATE TABLE "DatasetRegistry" (
     "ID" uuid DEFAULT uuid_generate_v4() NOT NULL
 );
 
-ALTER TABLE "DatasetRegistry" OWNER TO dmptool;
+ALTER TABLE "DatasetRegistry" OWNER TO :POSTGRES_USER;
 
 COMMENT ON TABLE "DatasetRegistry" IS 'Linking Dataset to Registry';
 
@@ -467,7 +467,7 @@ CREATE TABLE "DatasetDataRepository" (
 );
 
 
-ALTER TABLE "DatasetDataRepository" OWNER TO dmptool;
+ALTER TABLE "DatasetDataRepository" OWNER TO :POSTGRES_USER;
 
 COMMENT ON TABLE "DatasetDataRepository" IS 'Linking Dataset to DataRepository';
 
@@ -543,9 +543,9 @@ ALTER TABLE "Project" ADD CONSTRAINT fk_project_creator FOREIGN KEY ("CreationUs
 
 
 
-ALTER TABLE "UserInfo" OWNER TO dmptool;
-ALTER TABLE "UserAuth" OWNER TO dmptool;
-ALTER TABLE "UserDMP" OWNER TO dmptool;
+ALTER TABLE "UserInfo" OWNER TO :POSTGRES_USER;
+ALTER TABLE "UserAuth" OWNER TO :POSTGRES_USER;
+ALTER TABLE "UserDMP" OWNER TO :POSTGRES_USER;
 
 
 
diff --git a/dmp-db-scema/updates/01/01_DMPUser_DMPDatasetprofile_DMPFinalizedDate.sql b/dmp-db-scema/updates/01/01_DMPUser_DMPDatasetprofile_DMPFinalizedDate.sql
index 8ed97954d..cbb256489 100644
--- a/dmp-db-scema/updates/01/01_DMPUser_DMPDatasetprofile_DMPFinalizedDate.sql
+++ b/dmp-db-scema/updates/01/01_DMPUser_DMPDatasetprofile_DMPFinalizedDate.sql
@@ -32,12 +32,12 @@ TABLESPACE pg_default;
 
 ALTER TABLE public."DMPDatasetProfile"
 --    OWNER to dmtadm;
-    OWNER to dmptool;
+    OWNER to :POSTGRES_USER;
 
 	
 ALTER TABLE public."UserDMP"
 --    OWNER to dmtadm;
-    OWNER to dmptool;
+    OWNER to :POSTGRES_USER;
 	
 	
 --INSERT INTO public."DMPDatasetProfile"(
diff --git a/dmp-db-scema/updates/01/08_Create_content.sql b/dmp-db-scema/updates/01/08_Create_content.sql
index 89c6190b9..f88ef3351 100644
--- a/dmp-db-scema/updates/01/08_Create_content.sql
+++ b/dmp-db-scema/updates/01/08_Create_content.sql
@@ -8,7 +8,7 @@ CREATE TABLE public."Content" (
 );
 
 
-ALTER TABLE public."Content" OWNER TO dmptool;
+ALTER TABLE public."Content" OWNER TO :POSTGRES_USER;
 
 ALTER TABLE ONLY public."Content"
     ADD CONSTRAINT "Content_pkey" PRIMARY KEY ("Id");
diff --git a/dmp-db-scema/updates/02/01_CreateLoginConfirmationEmail.sql b/dmp-db-scema/updates/02/01_CreateLoginConfirmationEmail.sql
index cf3807730..a21039942 100644
--- a/dmp-db-scema/updates/02/01_CreateLoginConfirmationEmail.sql
+++ b/dmp-db-scema/updates/02/01_CreateLoginConfirmationEmail.sql
@@ -15,4 +15,4 @@ TABLESPACE pg_default;
 
 ALTER TABLE public."LoginConfirmationEmail"
 --    OWNER to dmtadm;
-    OWNER to dmptool;
\ No newline at end of file
+    OWNER to :POSTGRES_USER;
\ No newline at end of file
diff --git a/dmp-db-scema/updates/04/03_Create_External_Datasets.sql b/dmp-db-scema/updates/04/03_Create_External_Datasets.sql
index 5c55bcb70..015df00e0 100644
--- a/dmp-db-scema/updates/04/03_Create_External_Datasets.sql
+++ b/dmp-db-scema/updates/04/03_Create_External_Datasets.sql
@@ -8,7 +8,7 @@ CREATE TABLE public."ExternalDataset" (
 );
 
 
-ALTER TABLE public."ExternalDataset" OWNER TO dmptool;
+ALTER TABLE public."ExternalDataset" OWNER TO :POSTGRES_USER;
 
 ALTER TABLE ONLY public."ExternalDataset"
     ADD CONSTRAINT "ExternalDataset_pkey" PRIMARY KEY ("Id");
diff --git a/dmp-db-scema/updates/08/03_Create_Credentials.sql b/dmp-db-scema/updates/08/03_Create_Credentials.sql
index 6ca13e4fc..a2105b72c 100644
--- a/dmp-db-scema/updates/08/03_Create_Credentials.sql
+++ b/dmp-db-scema/updates/08/03_Create_Credentials.sql
@@ -11,7 +11,7 @@ CREATE TABLE public."Credential" (
 );
 
 
-ALTER TABLE public."Credential" OWNER TO dmptool;
+ALTER TABLE public."Credential" OWNER TO :POSTGRES_USER;
 
 ALTER TABLE ONLY public."Credential"
     ADD CONSTRAINT "Credential_pkey" PRIMARY KEY ("Id");
diff --git a/dmp-db-scema/updates/08/04_Create_UserToken.sql b/dmp-db-scema/updates/08/04_Create_UserToken.sql
index 85ff8103a..1e129b9d2 100644
--- a/dmp-db-scema/updates/08/04_Create_UserToken.sql
+++ b/dmp-db-scema/updates/08/04_Create_UserToken.sql
@@ -6,7 +6,7 @@ CREATE TABLE public."UserToken" (
 );
 
 
-ALTER TABLE public."UserToken" OWNER TO dmptool;
+ALTER TABLE public."UserToken" OWNER TO :POSTGRES_USER;
 
 ALTER TABLE ONLY public."UserToken"
     ADD CONSTRAINT "UserToken_pkey" PRIMARY KEY ("Token");
diff --git a/dmp-db-scema/updates/08/05_Create_UserRole.sql b/dmp-db-scema/updates/08/05_Create_UserRole.sql
index 0db9f39d0..84229bab6 100644
--- a/dmp-db-scema/updates/08/05_Create_UserRole.sql
+++ b/dmp-db-scema/updates/08/05_Create_UserRole.sql
@@ -5,7 +5,7 @@ CREATE TABLE public."UserRole" (
 );
 
 
-ALTER TABLE public."UserRole" OWNER TO dmptool;
+ALTER TABLE public."UserRole" OWNER TO :POSTGRES_USER;
 
 ALTER TABLE ONLY public."UserRole"
     ADD CONSTRAINT "UserRole_pkey" PRIMARY KEY ("Id");
diff --git a/dmp-db-scema/updates/08/08_create_datasetexternaldataset.sql b/dmp-db-scema/updates/08/08_create_datasetexternaldataset.sql
index 76e84fe22..d662b0e80 100644
--- a/dmp-db-scema/updates/08/08_create_datasetexternaldataset.sql
+++ b/dmp-db-scema/updates/08/08_create_datasetexternaldataset.sql
@@ -6,7 +6,7 @@ CREATE TABLE public."DatasetExternalDataset" (
     "Data" character varying
 );
 
-ALTER TABLE public."DatasetExternalDataset" OWNER TO dmptool;
+ALTER TABLE public."DatasetExternalDataset" OWNER TO :POSTGRES_USER;
 
 ALTER TABLE ONLY public."DatasetExternalDataset"
     ADD CONSTRAINT "DatasetExternalDataset_pkey" PRIMARY KEY ("Id");
diff --git a/dmp-db-scema/updates/08/09_Create_Invitation.sql b/dmp-db-scema/updates/08/09_Create_Invitation.sql
index c820248b1..e61e17f03 100644
--- a/dmp-db-scema/updates/08/09_Create_Invitation.sql
+++ b/dmp-db-scema/updates/08/09_Create_Invitation.sql
@@ -9,7 +9,7 @@ CREATE TABLE public."Invitation" (
 );
 
 
-ALTER TABLE public."Invitation" OWNER TO dmptool;
+ALTER TABLE public."Invitation" OWNER TO :POSTGRES_USER;
 
 ALTER TABLE ONLY public."Invitation"
     ADD CONSTRAINT "Invitation_pkey" PRIMARY KEY ("Id");
diff --git a/dmp-db-scema/updates/08/10_Create_User_preference.sql b/dmp-db-scema/updates/08/10_Create_User_preference.sql
index edae5bb93..cc5053684 100644
--- a/dmp-db-scema/updates/08/10_Create_User_preference.sql
+++ b/dmp-db-scema/updates/08/10_Create_User_preference.sql
@@ -6,7 +6,7 @@ CREATE TABLE public."UserPreference" (
 );
 
 
-ALTER TABLE public."UserPreference" OWNER TO dmptool;
+ALTER TABLE public."UserPreference" OWNER TO :POSTGRES_USER;
 
 ALTER TABLE ONLY public."UserPreference"
     ADD CONSTRAINT "UserPreference_pkey" PRIMARY KEY ("Id");
diff --git a/dmp-db-scema/updates/09/01_create_user_association.sql b/dmp-db-scema/updates/09/01_create_user_association.sql
index c569ca2fe..1189128fb 100644
--- a/dmp-db-scema/updates/09/01_create_user_association.sql
+++ b/dmp-db-scema/updates/09/01_create_user_association.sql
@@ -5,7 +5,7 @@ CREATE TABLE public."UserAssociation" (
 );
 
 
-ALTER TABLE public."UserAssociation" OWNER TO dmptool;
+ALTER TABLE public."UserAssociation" OWNER TO :POSTGRES_USER;
 
 ALTER TABLE ONLY public."UserAssociation"
     ADD CONSTRAINT pk_user_association PRIMARY KEY (id);
diff --git a/dmp-db-scema/updates/09/02_doifunder.sql b/dmp-db-scema/updates/09/02_doifunder.sql
index cb6742516..53894a997 100644
--- a/dmp-db-scema/updates/09/02_doifunder.sql
+++ b/dmp-db-scema/updates/09/02_doifunder.sql
@@ -8,7 +8,7 @@ CREATE TABLE public."DoiFunder" (
 ALTER TABLE ONLY public."DoiFunder"
     ADD CONSTRAINT "DoiFunder_pkey" PRIMARY KEY (id);
 
-ALTER TABLE public."DoiFunder" OWNER TO dmptool;
+ALTER TABLE public."DoiFunder" OWNER TO :POSTGRES_USER;
 
 INSERT INTO public."DoiFunder"(name, doi) VALUES ('Australian Research Council',	'10.13039/501100000923');
 INSERT INTO public."DoiFunder"(name, doi) VALUES ('European Commission', '10.13039/501100000780');

From ee5f74f25f130d7a2a9a3e4c079a73e739ed1156 Mon Sep 17 00:00:00 2001
From: Diamantis Tziotzios <dtziotzios@cite.gr>
Date: Tue, 12 May 2020 17:41:44 +0300
Subject: [PATCH 56/60] gr lang update

---
 dmp-frontend/src/assets/i18n/gr.json | 1272 +++++++++++++++++++++++++-
 1 file changed, 1247 insertions(+), 25 deletions(-)

diff --git a/dmp-frontend/src/assets/i18n/gr.json b/dmp-frontend/src/assets/i18n/gr.json
index 8004fbc3d..12975f50d 100644
--- a/dmp-frontend/src/assets/i18n/gr.json
+++ b/dmp-frontend/src/assets/i18n/gr.json
@@ -1,29 +1,1251 @@
 {
-  "GENERAL": {
-    "VALIDATION": {
-      "REQUIRED": "Required"
+	"GENERAL": {
+		"VALIDATION": {
+			"REQUIRED": "Προαπαιτούμενο",
+			"GRANT-START-AFTER-END": "Η ημερομηνία έναρξης της επιχορήγησης δεν μπορεί να είναι μεταγενέστερη της ημερομηνίας λήξης",
+			"PATTERN-_": "Ο χαρακτήρας \"_\" δεν υποστηρίζεται"
+		},
+		"DELETE-CONFIRMATION": {
+			"TITLE": "Προσοχή",
+			"MESSAGE": "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το στοιχείο",
+			"POSITIVE": "Ναι",
+			"NEGATIVE": "Ακύρωση"
+		},
+		"SNACK-BAR": {
+			"SUCCESSFUL-CREATION": "Δημιουργήθηκε με επιτυχία",
+			"SUCCESSFUL-UPDATE": "Ενημερώθηκε με επιτυχία",
+			"SUCCESSFUL-LOGIN": "Επιτυχής σύνδεση",
+			"SUCCESSFUL-LOGOUT": "Επιτυχής αποσύνδεση",
+			"SUCCESSFUL-EMAIL-SEND": "Το email στάλθηκε επιτυχώς",
+			"UNSUCCESSFUL-LOGOUT": "Αποτυχημένη αποσύνδεση",
+			"UNSUCCESSFUL-LOGIN": "Αποτυχημένη σύνδεση",
+			"SUCCESSFUL-DATASET-PROFILE-DELETE": "Επιτυχής διαγραφή",
+			"UNSUCCESSFUL-DATASET-PROFILE-DELETE": "Το template δεν μπορεί να διαγραφεί, επειδή οι περιγραφές των συνόλων δεδομένων σχετίζονται με αυτό",
+			"UNSUCCESSFUL-DELETE": "Αποτυχημένη διαγραφή",
+			"UNSUCCESSFUL-EMAIL-SEND": "Αποτυχία αποστολής email"
+		},
+		"ERRORS": {
+			"HTTP-REQUEST-ERROR": "Παρουσιάστηκε μη αναμενόμενο σφάλμα"
+		},
+		"NAMES": {
+			"DATASET": "Περιγραφή Συνόλου Δεδομένων"
+		},
+		"STATUSES": {
+			"EDIT": "Σε επεξεργασία",
+			"FINALISED": "Οριστικοποιημένο"
+		},
+		"FORM-VALIDATION-DISPLAY-DIALOG": {
+			"WARNING": "Προσοχή!",
+			"THIS-FIELD": "Πεδίο",
+			"HAS-ERROR": "Παρουσιάστηκε σφάλμα",
+			"REQUIRED": "Απαιτείται",
+			"EMAIL": "Μη έγκυρο e-mail",
+			"MIN-VALUE": "Η ελάχιστη τιμή πρέπει να είναι {{min}}",
+			"MAX-VALUE": "Η μέγιστη τιμή πρέπει να είναι {{max}}",
+			"ACTIONS": {
+				"CANCEL": "Κλείσιμο"
+			}
+		},
+		"CONFIRMATION-DIALOG": {
+			"DELETE-ITEM": "Διαγραφή αυτού του στοιχείου;",
+			"DELETE-USER": "Αφαίρεση αυτού του συνεργάτη;",
+			"FINALIZE-ITEM": "Ολοκλήρωση αυτού του στοιχείου;",
+			"PUBLISH-ITEM": "Δημοσίευση αυτού του στοιχείου;",
+			"ADD-DATASET": "Θέλετε να συνεχίσετε προσθέτοντας μια Περιγραφή Συνόλου Δεδομένων στο Σχέδιο Διαχείρισης Δεδομένων σας; Μπορείτε πάντα να προσθέσετε περισσότερες Περιγραφές Συνόλων Δεδομένων χρησιμοποιώντας \"Add Dataset Description (Wizard)\" menu.",
+			"ZENODO-DOI": "Θέλετε να δημιουργήσετε μονοσήμαντο αναγνωριστικό ψηφιακού αντικειμένου (DOI) για το Σχέδιο Διαχείρισης Δεδομένων σας;",
+			"LEAVE-PAGE": "Εάν φύγετε από τη σελίδα αυτή, οι αλλαγές σας θα χαθούν.",
+			"LEAVE-WARNING": "Έχετε μη αποθηκευμένες αλλαγές!",
+			"PRIVACY-POLICY-NAMES": "Τα ονόματα όλων των ατόμων που συμμετέχουν ως συνεργάτες σε αυτό το Σχέδιο Διαχείρισης Δεδομένων θα γίνουν δημόσια ορατά. Είστε σύμφωνοι με αυτό;",
+			"ACTIONS": {
+				"CONFIRM": "Ναι",
+				"NO": "Όχι",
+				"DELETE": "Διαγραφή",
+				"REMOVE": "Αφαίρεση",
+				"CANCEL": "Ακύρωση",
+				"LEAVE": "Αναχώρηση",
+				"POLICY-AGREE": "Κάντε τα ονόματα ορατά στο κοινό.",
+				"REQUIRED": "Απαιτείται να κάνετε κλικ στο πλαίσιο ελέγχου."
+			}
+		},
+		"NOTIFICATION-DIALOG": {
+			"POPUP": {
+				"TITLE": "Απουσία Συνόλου Δεδομένων",
+				"MESSAGE": "Πρέπει να δημιουργηθεί τουλάχιστον ένα σύνολο δεδομένων για να συνεχίσετε με την αποθήκευση του Σχεδίου Διαχείρισης Δεδομένων.",
+				"CLOSE": "Κλείσιμο"
+			}
+		},
+		"ACTIONS": {
+			"VIEW-ALL": "Προβολή όλων",
+			"SHOW-MORE": "Δείτε περισσότερα",
+			"SHOW-LESS": "Δείτε λιγότερα",
+			"LOG-IN": "Σύνδεση"
+		},
+		"PREPOSITIONS": {
+			"OF": "of"
+		},
+		"TITLES": {
+			"PREFIX": "Ανοίξτε το Σχέδιο Διαχείρισης Δεδομένων - ",
+			"GENERAL": "Δημιουργός Σχεδίου Διαχείρισης Δεδομένων",
+			"ABOUT": "Σχετικά",
+			"PRIVACY": "Πολιτική Απορρήτου και Προστασίας Προσωπικών Δεδομένων",
+			"TERMS": "Όροι χρήσης",
+			"PLANS": "Τα Σχέδια Διαχείρισης Δεδομένων Μου",
+			"EXPLORE-PLANS": "Δημοσιευμένα Σχέδια Διαχείρισης Δεδομένων",
+			"QUICK-WIZARD": "Νέο Σχέδιο Διαχείρισης Δεδομένων (Wizard)",
+			"PLANS-NEW": "Νέο Σχέδιο Διαχείρισης Δεδομένων (Expert)",
+			"DATASETS": "Οι Περιγραφές Συνόλων Δεδομένων Μου",
+			"EXPLORE": "Δημοσιευμένες Περιγραφές Συνόλων Δεδομένων",
+			"DATASETCREATEWIZARD": "Προσθήκη Περιγραφής Συνόλου Δεδομένων (Wizard)",
+			"GRANTS": "Οι επιχορηγήσεις Μου",
+			"DMP-PROFILES": "Templates Σχεδίων Διαχείρισης Δεδομένων",
+			"DATASET-PROFILES": "Templates Περιγραφών Συνόλων Δεδομένων",
+			"USERS": "Χρήστες",
+			"PROFILE": "Το προφίλ μου",
+			"LOGIN": "Σύνδεση",
+			"DMP-OVERVIEW": "Επισκόπηση Σχεδίου Διαχείρισης Δεδομένων",
+			"DMP-EDIT": "Επεξεργασία Σχεδίου Διαχείρισης Δεδομένων",
+			"DATASET-EDIT": "Προβολή / Επεξεργασία Συνόλου Δεδομένων",
+			"DMP-NEW-VERSION": "Νέα έκδοση Σχεδίου Διαχείρισης Δεδομένων",
+			"DMP-CLONE": "Κλωνοποίηση Σχεδίου Διαχείρισης Δεδομένων",
+			"DATASET-NEW": "Νέα Περιγραφή Συνόλου Δεδομένων",
+			"GRANT-NEW": "Νέα Επιχορήγηση",
+			"GRANT-EDIT": "Προβολή / Επεξεργασία Επιχορήγησης",
+			"DMP-PROFILE-NEW": "Νέο template Σχεδίου Διαχείρισης Δεδομένων",
+			"DMP-PROFILE-EDIT": "Επεξεργασία template Σχεδίου Διαχείρισης Δεδομένων",
+			"DATASET-PROFILES-NEW": "Νέο template Περιγραφής Συνόλου Δεδομένων",
+			"DATASET-PROFILES-EDIT": "Επεξεργασία template Περιγραφής Συνόλου Δεδομένων",
+			"EXPLORE-PLANS-OVERVIEW": "Επισκόπηση Δημοσιευμένου Σχεδίου Διαχείρισης Δεδομένων",
+			"DATASET-PUBLIC-EDIT": "Προβολή Δημοσιευμένης Περιγραφής Συνόλου Δεδομένων",
+			"DMP-PUBLIC-EDIT": "Προβολή Δημοσιευμένου Σχεδίου Διαχείρισης Δεδομένων",
+			"DATASET-COPY": "Αντιγραφή Περιγραφής Συνόλου Δεδομένων",
+			"DATASET-UPDATE": "Ενημέρωση Περιγραφής Συνόλου Δεδομένων",
+			"DATASET-PROFILES-NEW-VERSION": "Νέα έκδοση του template Περιγραφής Συνόλου Δεδομένων",
+			"DATASET-PROFILES-CLONE": "Νέα Κλωνοποίηση του template Περιγραφής Συνόλου Δεδομένων",
+			"LANGUAGE-EDITOR": "Επεξεργασία γλώσσας",
+			"GUIDE-EDITOR": "Επεξεργασία Οδηγού Χρήσης",
+			"LANGUAGE": "Γλώσσα"
+		},
+		"FILE-TYPES": {
+			"PDF": "PDF",
+			"XML": "XML",
+			"JSON": "JSON",
+			"DOC": "Document"
+		},
+		"LANGUAGES": {
+			"ENGLISH": "Αγγλικά",
+			"GREEK": "Ελληνικά",
+			"SPANISH": "Ισπανικά"
+		}
 	},
-	"ACTIONS": {
-		"LOG-IN": "Είσοδος"
+	"COOKIE": {
+		"MESSAGE": "Αυτός ο ιστότοπος χρησιμοποιεί cookies για να βελτιώσει την εμπειρία του χρήστη.",
+		"DISMISS": "Αποδοχή",
+		"DENY": "Απόρριψη των cookies",
+		"LINK": "Μάθετε περισσότερα",
+		"POLICY": "Πολιτική για τα Cookies"
 	},
-	"LANGUAGES": {
-		"ENGLISH": "Αγγλικά",
-		"GREEK": "Ελληνικά",
-		"SPANISH": "Ισπανικά"
+	"EMAIL-CONFIRMATION": {
+		"EXPIRED-EMAIL": "Η πρόσκληση email έληξε",
+		"CARD-TITLE": "E-mail",
+		"REQUEST-EMAIL-HEADER": "Σχεδόν τελειώσαμε! Παρακαλώ συμπληρώστε το e-mail.",
+		"REQUEST-EMAIL-TEXT": "Θα πρέπει να επιβεβαιώσετε τη συναίνεσή σας για να χρησιμοποιήσετε την εφαρμογή.",
+		"SUBMIT": "Υποβολή",
+		"SENT-EMAIL-HEADER": "Το email στάλθηκε!",
+		"EMAIL-FOUND": "Το email είναι ήδη επιβεβαιωμένο."
+	},
+	"HOME": {
+		"DMPS": "Σχέδια Διαχείρισης Δεδομένων",
+		"DATASETS": "Περιγραφές Συνόλων Δεδομένων",
+		"LOGIN": {
+			"TITLE": "Σύνδεση",
+			"TEXT": "Δεν χρειάζεται να έχετε καταχωρημένο λογαριασμό στο ARGOS"
+		}
+	},
+	"NAV-BAR": {
+		"BREADCRUMB-ROOT": "Dashboard",
+		"TITLE": "ARGOS",
+		"GRANTS": "Επιχορηγήσεις",
+		"GRANT": "Επιχορήγηση",
+		"DMP": "Σχέδιo Διαχείρισης Δεδομένων",
+		"DMPS": "Σχέδια Διαχείρισης Δεδομένων",
+		"MY-DMPS": "Τα Σχέδια Διαχείρισης Δεδομένων Μου",
+		"DATASETS": "Περιγραφές Συνόλων Δεδομένων",
+		"DATASET": "Σύνολο Δεδομένων",
+		"PUBLIC-DATASETS": "Εξερευνήστε το ARGOS",
+		"USERS": "Χρήστες",
+		"DATASETS-ADMIN": "Templates Συνόλων Δεδομένων",
+		"DMP-PROFILES": "Templates Σχεδίων Διαχείρισης Δεδομένων",
+		"ABOUT": "Σχετικά",
+		"MY-DATASET-DESCRIPTIONS": "ΤΑ ΣΧΕΔΙΑ ΔΙΑΧΕΙΡΙΣΗΣ ΔΕΔΟΜΕΝΩΝ ΜΟΥ",
+		"DATASET-DESCRIPTION-WIZARD": "Wizard Περιγραφών Συνόλων Δεδομένων",
+		"PUBLIC DATASETS": "ΔΗΜΟΣΙΕΥΜΕΝΕΣ ΠΕΡΙΓΡΑΦΕΣ ΣΥΝΟΛΩΝ ΔΕΔΟΜΕΝΩΝ",
+		"PUBLIC-DMPS": "ΔΗΜΟΣΙΕΥΜΕΝΑ ΣΧΕΔΙΑ ΔΙΑΧΕΙΡΙΣΗΣ ΔΕΔΟΜΕΝΩΝ",
+		"HOME": "ΑΡΧΙΚΗ",
+		"DMP-WIZARD": "Wizard Σχεδίων Διαχείρισης Δεδομένων",
+		"DATASET-TEMPLATES": "TEMPLATES ΣΥΝΟΛΩΝ ΔΕΔΟΜΕΝΩΝ",
+		"TEMPLATE": "TEMPLATE",
+		"DMP-TEMPLATES": "TEMPLATES ΣΧΕΔΙΩΝ ΔΙΑΧΕΙΡΙΣΗΣ ΔΕΔΟΜΕΝΩΝ",
+		"USERS-BREADCRUMB": "ΧΡΗΣΤΕΣ",
+		"SEARCH": {
+			"DATASET": "Περιγραφή Συνόλου Δεδομένων",
+			"DMP": "Σχέδιο Διαχείρισης Δεδομένων",
+			"GRANT": "Επιχορήγηση",
+			"PUBLISHED": "Δημοσιευμένο"
+		}
+	},
+	"SIDE-BAR": {
+		"GENERAL": "ΓΕΝΙΚΑ",
+		"ABOUT": "Σχετικά",
+		"DASHBOARD": "Αρχική",
+		"DMP": "ΣΧΕΔΙΑ ΔΙΑΧΕΙΡΙΣΗΣ ΔΕΔΟΜΕΝΩΝ",
+		"MY-DMPS": "Τα δικά μου Σχέδια Διαχείρισης Δεδομένων",
+		"DATASETS": "ΠΕΡΙΓΡΑΦΕΣ ΣΥΝΟΛΟΥ ΔΕΔΟΜΕΝΩΝ",
+		"GRANTS": "ΕΠΙΧΟΡΗΓΗΣΗ",
+		"NEW DATASET": "Νέα Περιγραφή Συνόλου Δεδομένων",
+		"QUICK-WIZARD": "Νέο Σχέδιο Διαχείρισης Δεδομένων (Wizard)",
+		"QUICK-WIZARD-DATASET": "Προσθήκη Περιγραφής Συνόλου Δεδομένων (Wizard)",
+		"ADD-EXPERT": "Νέο Σχέδιο Διαχείρισης Δεδομένων(Expert)",
+		"MY-DATASET-DESC": "Οι δικές μου Περιγραφές Συνόλου Δεδομένων",
+		"MY-GRANTS": "Οι επιχορηγήσεις μου",
+		"HISTORY": "ΙΣΤΟΡΙΚΟ",
+		"HISTORY-VISITED": "ΤΕΛΕΥΤΑΙΑ ΕΠΙΣΚΕΨΗ",
+		"HISTORY-EDITED": "ΤΕΛΕΥΤΑΙΑ ΕΠΕΞΕΡΓΑΣΙΑ",
+		"PUBLIC": "ΔΗΜΟΣΙΕΥΜΕΝΑ",
+		"PUBLIC-DMPS": "Δημοσιευμένα Σχέδια Διαχείρισης Δεδομένων",
+		"PUBLIC-DESC": "Δημοσιευμένες Περιγραφές Συνόλου Δεδομένων",
+		"ACCOUNT": "ΛΟΓΑΡΙΑΣΜΟΣ",
+		"ADMIN": "ΔΙΑΧΕΙΡΙΣΤΗΣ",
+		"DATASET-TEMPLATES": "Templates Περιγραφών Συνόλου Δεδομένων",
+		"DMP-TEMPLATES": "Templates Σχεδίων Διαχείρισης Δεδομένων",
+		"USERS": "Users",
+		"LANGUAGE-EDITOR": "Επεξεργαστής Γλώσσας",
+		"GUIDE-EDITOR": "Οδηγός Χρήστη"
+	},
+	"DATASET-PROFILE-EDITOR": {
+		"TITLE": {
+			"NEW": "Νέο API",
+			"NEW-PROFILE": "Νέο Template Περιγραφής Συνόλου Δεδομένων",
+			"NEW-PROFILE-VERSION": "Νέα Έκδοση",
+			"NEW-PROFILE-CLONE": "Νέος Κλώνος"
+		},
+		"FIELDS": {
+			"DATASET-TITLE": "Template Περιγραφής Συνόλου Δεδομένων",
+			"DATASET-DESCRIPTION": "Περιγραφή",
+			"ROLES": "Ρόλοι"
+		},
+		"STEPS": {
+			"PAGES": {
+				"TITLE": "Περιγραφή Σελίδας",
+				"PAGE-PREFIX": "Σελίδα",
+				"PAGE-INPUT-TITLE": "Τίτλος Σελίδας",
+				"DATASET-DETAILS": "Λεπτομέρειες Περιγραφής Συνόλου Δεδομένων",
+				"EXTERNAL-REFERENCES": "Εξωτερικές Πηγές",
+				"DESCRIPTION": "Περιγραφή"
+			},
+			"FORM": {
+				"TITLE": "Φόρμα Περιγραφής",
+				"SECTION": {
+					"TITLE": "Πληροφορίες Ενότητας",
+					"FIELDS": {
+						"ID": "Ενότητα Μοναδικού Αναγνωριστικού",
+						"TITLE": "Ενότητα Ονομασίας",
+						"PAGE": "Αναμένεται εμφάνιση σελίδας",
+						"ORDER": "Εντολή",
+						"DESCRIPTION": "Περιγραφή",
+						"FIELDS-TITLE": "Πεδία",
+						"SUB-SECTIONS-TITLE": "Υπο-ενότητες"
+					},
+					"ACTIONS": {
+						"ADD-SUB-SECTION": "Προσθήκη Υπο-ενότητας +",
+						"ADD-FIELD": "Προσθήκη Πεδίου +"
+					}
+				},
+				"COMPOSITE-FIELD": {
+					"TITLE": "Σύνθετες Πληροφορίες Πεδίου",
+					"SIMPLE-FIELD-TITLE": "Πληροφορίες Πεδίου",
+					"SUB-FIELDS-TITLE": "Πεδία Υπο-ομάδων",
+					"FIELDS": {
+						"COMPOSITE-CHECKBOX": "Σύνθετα Πεδία",
+						"MULTIPLICITY-CHECKBOX": "Πολλαπλότητα",
+						"COMMENT-CHECKBOX": "Προσθήκη Σχολίου στο Πεδίο",
+						"COMPOSITE-TITLE": "Ονομασία Σύνθετου Πεδίου",
+						"FIELD-TITLE": "Ονομασία Πεδίου",
+						"DESCRIPTION": "Περιγραφή",
+						"EXTENDED-DESCRIPTION": "Εκτενής Περιγραφή",
+						"ADDITIONAL-INFORMATION": "Επιπλέον Πληροφορίες",
+						"MULTIPLICITY-MIN": "Ελάχιστη τιμή Min",
+						"MULTIPLICITY-MAX": "Μέγιστη τιμή Max",
+						"MULTIPLICITY-ADD-ONE-FIELD": "Προσθήκη ακόμα ενός πεδίου",
+						"ORDER": "Εντολή",
+						"COMMENT-PLACEHOLDER": "Παρακαλώ προσδιορίστε",
+						"COMMENT-HINT": "Προσθέστε επιπλέον πληροφορίες ή αιτιολόγηση σχετικά με την επιλογή σας",
+						"RDA-COMMON-STANDARDS": "RDA Common Standards"
+					},
+					"ACTIONS": {
+						"ADD-CHILD-FIELD": "Προσθήκη Πεδίου Υπο-ομάδας +"
+					}
+				},
+				"FIELD": {
+					"FIELDS": {
+						"RULES-TITLE": "Κανονισμοί Ορατότητας",
+						"FIELD-RULES-VALUE": "Τιμή",
+						"ID": "Ενότητα Μοναδικού Αναγνωριστικού",
+						"VIEW-STYLE": "Τύπος",
+						"MULTIPLICITY-MIN": "Ελάχιστη Τιμή Max",
+						"MULTIPLICITY-MAX": "Μέγιστη Τιμή Min",
+						"ORDER": "Εντολή",
+						"DEFAULT-VALUE": "Εξορισμού Τιμή",
+						"VALIDATION": "Επιβεβαίωση",
+						"MULTIPLICITY-CHECKBOX": "Πολλαπλότητα",
+						"FIELD-TEXT-AREA-TITLE": "Περιοχή Κειμένου Δεδομένων",
+						"FIELD-TEXT-AREA-PLACEHOLDER": "Τοποθέτηση placeholder",
+						"FIELD-BOOLEAN-DECISION-TITLE": "Boolean Δεδομένα",
+						"FIELD-BOOLEAN-DECISION-PLACEHOLDER": "Τοποθέτηση placeholder",
+						"FIELD-CHECKBOX-TITLE": "Πλαίσιο Ελέγχου Δεδομένων",
+						"FIELD-CHECKBOX-PLACEHOLDER": "Τοποθέτηση placeholder",
+						"FIELD-FREE-TEXT-TITLE": "Ελεύθερο Κείμενο Δεδομένων",
+						"FIELD-FREE-TEXT-PLACEHOLDER": "Τοποθέτηση placeholder",
+						"FIELD-COMBO-BOX-TYPE": "Τύπος Σύνθετου Πλασίου",
+						"FIELD-WORD-LIST-TITLE": "Λίστα Λέξεων Δεδομένων",
+						"FIELD-WORD-LIST-PLACEHOLDER": "Τοποθέτηση placeholder",
+						"FIELD-WORD-LIST-LABEL": "Ετικέτα",
+						"FIELD-WORD-LIST-VALUE": "Τιμή",
+						"FIELD-INTERNAL-DMP-ENTITIES-TYPE": "Τύπος εσωτερικής οντότητας Σχεδίου Διαχείρισης Δεδομένων",
+						"FIELD-RESEARCHERS-TITLE": "Αυτόματη Συμπλήρωση Ερευνητών",
+						"FIELD-RESEARCHERS-PLACEHOLDER": "Τοποθέτηση placeholder",
+						"FIELD-DATASETS-PLACEHOLDER": "Τοποθέτηση placeholder",
+						"FIELD-DMPS-PLACEHOLDER": "Τοποθέτηση placeholder",
+						"FIELD-RADIO-BOX-TITLE": "Πλαίσιο Επιλογής Δεδομένων",
+						"FIELD-RADIO-BOX-PLACEHOLDER": "Τοποθέτηση placeholder",
+						"FIELD-RADIO-BOX-LABEL": "Ετικέτα",
+						"FIELD-RADIO-BOX-VALUE": "Τιμή",
+						"FIELD-AUTOCOMPLETE-TITLE": "Αυτόματη Συμπλήρωση Δεδομένων",
+						"FIELD-AUTOCOMPLETE-PLACEHOLDER": "Τοποθέτηση placeholder",
+						"FIELD-AUTOCOMPLETE-LABEL": "Ετικέτα",
+						"FIELD-AUTOCOMPLETE-VALUE": "Τιμή",
+						"FIELD-AUTOCOMPLETE-SOURCE": "Πηγή",
+						"FIELD-AUTOCOMPLETE-URL": "Url",
+						"FIELD-AUTOCOMPLETE-OPTIONS-ROOT": "Βάση Επιλογών",
+						"FIELD-DATE-PICKER-TITLE": "Επιλογή Ημερομηνίας",
+						"FIELD-DATE-PICKER-PLACEHOLDER": "Τοποθέτηση placeholder",
+						"FIELD-DATE-PICKER-LABEL": "Ετικέτα",
+						"FIELD-DATE-PICKER-VALUE": "Τιμή",
+						"FIELD-MULTIPLE-AUTOCOMPLETE": "Πολλαπλή Αυτόματη Συμπλήρωση"
+					},
+					"DEFAULT-VALUES": {
+						"NONE": "Κανένα",
+						"BOOLEAN-DECISION": {
+							"YES": "Ναι",
+							"NO": "Όχι"
+						},
+						"CHECK-BOX": {
+							"CHECKED": "Επιλεγμένα",
+							"UNCHECKED": "Μη-επιλεγμένα"
+						}
+					},
+					"ACTIONS": {
+						"ADD-RULE": "Προσθήκη Κανονισμού Ορατότητας +"
+					}
+				},
+				"RULE": {
+					"FIELDS": {
+						"RULE-TYPE": "Τύπος Κανονισμού",
+						"TARGET": "Ταυτοποίηση στοχοθετημένου πεδίου",
+						"VALUE": "Απαιτούμενη τιμή",
+						"RULE-IF": "Εάν η τιμή είναι",
+						"RULE-THEN": "τότε δείξε το Πεδίο με ταυτοποίηση"
+					}
+				}
+			}
+		},
+		"ACTIONS": {
+			"SAVE": "Αποθήκευση",
+			"FINALIZE": "Οριστικοποίηση",
+			"UPDATE": "Ενημέρωση",
+			"CANCEL": "Ακύρωση",
+			"DELETE": "Διαγραφή",
+			"ADD-PAGE": "Προσθήκη Σελίδας +",
+			"ADD-SECTION": "Προσθήκη Ενότητας +"
+		}
+	},
+	"GRANT-LISTING": {
+		"TITLE": "Επιχορηγήσεις",
+		"SUBTITLE": "Υπότιτλος Επιχορήγησης",
+		"ACTIONS": {
+			"NEW": "Νέα Επιχορήγηση"
+		}
+	},
+	"DMP-LISTING": {
+		"TITLE": "Σχέδια Διαχείρισης Δεδομένων",
+		"OWNER": "Κάτοχος",
+		"MEMBER": "Μέλος",
+		"CREATOR": "Συντάκτης",
+		"COLUMNS": {
+			"NAME": "Τίτλος",
+			"GRANT": "Επιχορήγηση",
+			"PROFILE": "Template",
+			"CREATION-TIME": "Χρονική Περίοδος Δημιουργίας",
+			"ORGANISATIONS": "Οργανισμοί",
+			"LATEST_VERSION": "Τελευταία Έκδοση",
+			"ACTIONS": "Δράσεις",
+			"DATASETS": "Περιγραφές Δεδομένων",
+			"STATUS": "Κατάσταση",
+			"PEOPLE": "ʼνθρωποι",
+			"VERSION": "Έκδοση"
+		},
+		"ACTIONS": {
+			"NEW": "Νέο Σχέδιο Διαχείρισης Δεδομένων",
+			"NEW-WITH-WIZARD": "Νέο Σχέδιο Διαχείρισης Δεδομένων χρησιμοποιώντας τον wizard",
+			"EDIT": "Επεξεργασία",
+			"INVITE": "Πρόσκληση Συνεργατών",
+			"ADD-DATASET": "Προσθήκη Περιγραφής Συνόλου Δεδομένων στο Σχέδιο Διαχείρισης Δεδομένων",
+			"DATASETS": "Κατάλογος όλων των Περιγραφών Συνόλου Δεδομένων",
+			"NEW-VERSION": "Νέα Έκδοση",
+			"VIEW-VERSION": "Όλες οι Εκδόσεις Σχεδίων Διαχείρισης Δεδομένων",
+			"CLONE": "Κλώνος",
+			"DELETE": "Διαγραφή",
+			"EXPORT": "Εξαγωγή",
+			"PUBLISH": "Δημοσίευση",
+			"FINALIZE": "Οριστικοποίηση",
+			"ADV-EXP": "Προχωρημένη Εξαγωγή",
+			"EXP-AS": "Εξαγωγή ως",
+			"DOWNLOAD-XML": "Λήψη XML",
+			"DOWNLOAD-DOCX": "Λήψη Document",
+			"DOWNLOAD-PDF": "Λήψη PDF",
+			"SETTINGS": "Ρυθμίσεις",
+			"GETDOI": "Λήψη μονοσήμαντου αναγνωριστικού ψηφιακού αντικειμένου (DOI)"
+		},
+		"TOOLTIP": {
+			"DMP-STATUS": {
+				"DRAFT": "Ιδιωτική Πρόσβαση - Επεξεργάσιμο Σχέδιο Διαχείρισης Δεδομένων",
+				"FINALIZED": "Ιδιωτική Πρόσβαση - Κλειστό Σχέδιο Διαχείρισης Δεδομένων",
+				"PUBLISHED": "Δημόσια Πρόσβαση - Κλειστό Σχέδιο Διαχείρισης Δεδομένων"
+			},
+			"LEVEL-OF-ACCESS": "Επίπεδο Πρόσβασης",
+			"INVOLVED-DATASETS": "Εμπλεκόμενες Περιγραφές Συνόλων Δεδομένων",
+			"TEMPLATES-INVOLVED": "Εμπλεκόμενα Templates Περιγραφών Συνόλων Δεδομένων"
+		},
+		"VIEW-ALL-VERSIONS": "Όλες οι εκδόσεις"
+	},
+	"DMP-PUBLIC-LISTING": {
+		"TITLE": "Δημοσιευμένα Σχέδια Διαχείρισης Δεδομένων",
+		"OWNER": "Κάτοχος",
+		"MEMBER": "Μέλος",
+		"CREATOR": "Συντάκτης",
+		"VIEW-ONLY": "Μόνο Προβολή",
+		"TOOLTIP": {
+			"PUBLISHED": "Δημόσια Πρόσβαση - Κλειστό Σχέδιο Διαχείρισης Δεδομένων",
+			"INVOLVED-DATASETS": "Εμπλεκόμενες Περιγραφές Συνόλων Δεδομένων",
+			"TEMPLATES-INVOLVED": "Εμπλεκόμενα Templates Περιγραφών Συνόλων Δεδομένων"
+		}
+	},
+	"DMP-UPLOAD": {
+		"TITLE": "Εισαγωγή Σχεδίου Διαχείρισης Δεδομένων",
+		"UPLOAD-BUTTON": "Μεταφόρτωση",
+		"UPLOAD-SUCCESS": "Επιτυχής Εισαγωγή",
+		"ACTIONS": {
+			"IMPORT": "Εισαγωγή",
+			"CANCEL": "Ακυρωση"
+		},
+		"PLACEHOLDER": "Τίτλος Σχεδίου Διαχείρισης Δεδομένων"
+	},
+	"DATASET-WIZARD": {
+		"TITLE": {
+			"NEW": "Νεα Περιγραφή Συνόλου Δεδομένων"
+		},
+		"EDITOR": {
+			"FIELDS": {
+				"EXTERNAL-DATASET-TYPE": "Τύπος",
+				"EXTERNAL-AUTOCOMPLETE-SUBTITLE": "Πηγή: ",
+				"EXTERNAL-AUTOCOMPLETE-NO-SOURCE": "Μη διαθέσιμη πηγή"
+			}
+		},
+		"FIRST-STEP": {
+			"TITLE": "Πληροφορίες Περιγραφής Συνόλου Δεδομένων",
+			"DMP": "Σχέδιο Διαχείρισης Δεδομένων",
+			"PROFILE": "Template Περιγραφής Συνόλου Δεδομένων",
+			"SUB-TITLE": "Δημιουργήθηκε για: "
+		},
+		"SECOND-STEP": {
+			"TITLE": "Εξωτερικές Πηγές",
+			"EXTERNAL-HINT": "Κατάλογος τιμών που παρέχονται από εξωτερικές πηγές"
+		},
+		"THIRD-STEP": {
+			"TITLE": "Περιγραφή"
+		},
+		"ACTIONS": {
+			"NEXT": "Επόμενο",
+			"BACK": "Πίσω",
+			"DELETE": "Διαγραφή",
+			"GO-TO-GRANT": "Μετάβαση σε Περιγραφή Συνόλου Δεδομένων της Επιχορήγησης",
+			"GO-TO-DMP": "Μετάβαση σε Περιγραφή Συνόλου Δεδομένων του Σχεδίου Διαχείρισης Δεδομένων",
+			"SAVE": "Save",
+			"SAVE-AND-FINALISE": "Αποθήκευση και Οριστικοποίηση",
+			"FINALIZE": "Οριστικοποίηση",
+			"REVERSE": "Αναίρεση Οριστικοποίησης",
+			"INFO": "Σύνολα Δεδομένων των οριστικοποιημένων Σχεδίων Διαχείρισης Δεδομένων δεν μπορούν να επανεπεξεργασθούν στην ίδια έκδοση",
+			"LOCK": "Το Σύνολο Δεδομένων είναι κλειδωμένο",
+			"DOWNLOAD-PDF": "Λήψη PDF",
+			"DOWNLOAD-XML": "Λήψη XML",
+			"DOWNLOAD-DOCX": "Ληψη DOCX",
+			"COPY-DATASET": "Αντιφραφή Περιγραφής Συνόλου Δεδομένων",
+			"UPDATE-DATASET-PROFILE": "Ενημέρωση Template"
+		},
+		"MESSAGES": {
+			"DATASET-NOT-FOUND": "Η Περιγραφή Συνόλου Δεδομένων δεν υπάρχει",
+			"DATASET-NOT-ALLOWED": "Δεν έχετε πρόσβαση σε αυτή την Περιγραφή Συνόλου Δεδομένων",
+			"SUCCESS-UPDATE-DATASET-PROFILE": "Επιτυχία ενημέρωσης της Περιγραφής Συνόλου Δεδομένων"
+		},
+		"UPLOAD": {
+			"UPLOAD-XML": "Εισαγωγή",
+			"UPLOAD-XML-FILE-TITLE": "Εισαγωγή Template Περιγραφής Συνόλου Δεδομένων",
+			"UPLOAD-XML-NAME": "Τίτλος Template Περιγραφής Συνόλου Δεδομένων",
+			"UPLOAD-XML-IMPORT": "Αρχείο",
+			"UPLOAD-XML-FILE-CANCEL": "Ακύρωση"
+		},
+		"DIALOGUE": {
+			"TITLE": "Αντιγραφή Περιγραφής Συνόλου Δεδομένων στο Σχέδιο Διαχείρισης Δεδομένων",
+			"DMP-SEARCH": {
+				"PLACEHOLDER": "Αναζήτηση Σχεδίου Διαχείρισης Δεδομένων"
+			},
+			"COPY": "Αντιγραφή",
+			"CANCEL": "Ακύρωση",
+			"ERROR-MESSAGE": "Αυτο το Template Περιγραφής Συνόλου Δεδομένων δεν περιέχεται"
+		}
+	},
+	"DMP-OVERVIEW": {
+		"GRANT": "Επιχορήγηση",
+		"RESEARCHERS": "Ερευνητές",
+		"COLLABORATORS": "Συνεργάτες",
+		"TOOLTIP": {
+			"LEVEL-OF-ACCESS": "Επίπεδο Πρόσβασης",
+			"INVOLVED-DATASETS": "Εμπλεκόμενες Περιγραφές Συνόλου Δεδομένων",
+			"TEMPLATES-INVOLVED": "Εμπλεκόμενα Templates Περιγραφής Συνόλου Δεδομένων"
+		},
+		"ERROR": {
+			"DELETED-DMP": "Το επιλεγμένο Σχέδιο Διαχείρισης Δεδομένων θα διαγραφεί",
+			"FORBIDEN-DMP": "Δεν επιτρέπεται η πρόσβαση σε αυτό το Σχέδιο Διαχείρισης Δεδομένων"
+		}
+	},
+	"DATASET-LISTING": {
+		"TITLE": "Περιγραφές Συνόλων Δεδομένων",
+		"SELECT-DATASETS-TO-CLONE": "Επιλογή των συνόλων δεδομένων που θα συμπεριληφθούν στο νέο Σχέδιο Διαχείρισης Δεδομένων. Τα επιλεγμένα σύνολα δεδομένα θα είναι επεξεργάσιμα.",
+		"SELECT-DATASETS-NONE": "Μη διαθέσιμες Περιγραφές Συνόλου Δεδομένων για αυτό το Σχέδιο Διαχείρισης Δεδομένων",
+		"COLUMNS": {
+			"NAME": "Τίτλος",
+			"REFERNCE": "Αναφορά",
+			"GRANT": "Επιχορήγηση",
+			"URI": "Uri",
+			"STATUS": "Κατάσταση",
+			"DESCRIPTION": "Περιγραφή",
+			"CREATED": "Δημιουργημένα",
+			"PUBLISHED": "Δημοσιευμένα",
+			"FINALIZED": "Οριστικοποιημένα",
+			"LAST-EDITED": "Τελευταία Επεξεργασία",
+			"ACTIONS": "Δράσεις",
+			"DMP": "Σχέδιο Διαχείρισης Δεδομένων",
+			"PROFILE": "Template",
+			"DATAREPOSITORIES": "Αποθετήρια Δεδομένων",
+			"REGISTRIES": "Κατάλογος",
+			"SERVICES": "Υπηρεσίες"
+		},
+		"ACTIONS": {
+			"EDIT": "Επεξεργασία",
+			"MAKE-IT-PUBLIC": "Δημοσιοποιήστε",
+			"VIEW": "Προβολή",
+			"NEW": "Νέα Περιγραφή Συνόλου Δεδομένων",
+			"CREATE-NEW": "Δημιουργία νέας Περιγραφής Συνόλου Δεδομένων"
+		},
+		"TOOLTIP": {
+			"DATASET-STATUS": {
+				"DRAFT": "Ιδιωτική πρόσβαση - Επεξεργάσιμη Περιγραφή Συνόλου Δεδομένων",
+				"FINALIZED": "Ιδιωτική πρόσβαση - Κλειστή Περιγραφή Συνόλου Δεδομένων"
+			},
+			"DMP": "Σχέδιο Διαχείρισης Δεδομένων",
+			"GRANT": "Επιχορήγηση",
+			"TEMPLATES-INVOLVED": "Template Περιγραφής Συνόλου Δεδομένων",
+			"VERSION": "Έκδοση Σχεδίου Διαχείρισης Δεδομένων"
+		}
+	},
+	"DATASET-PUBLIC-LISTING": {
+		"TITLE": "Δημοσιευμένες Περιγραφές Συνόλων Δεδομένων",
+		"TOOLTIP": {
+			"FINALIZED": "Ιδιωτική πρόσβαση - Κλειστή Περιγραφή Συνόλου Δεδομένων",
+			"DMP": "Σχέδιο Διαχείρισης Δεδομένων",
+			"GRANT": "Επιχορήγηση",
+			"TEMPLATES-INVOLVED": "Template Περιγραφής Συνόλου Δεδομένων"
+		}
+	},
+	"DATASET-PROFILE-LISTING": {
+		"TITLE": "Templates Περιγραφής Συνόλου Δεδομένων",
+		"COLUMNS": {
+			"NAME": "Τίτλος",
+			"REFERNCE": "Αναφορά",
+			"GRANT": "Επιχορήγηση",
+			"URI": "Uri",
+			"ROLE": "Ρόλος",
+			"TEMPLATE": "Template",
+			"ORGANIZATION": "Οργανισμός",
+			"STATUS": "Κατάσταση",
+			"VISITED": "Επισκεψιμότητα",
+			"EDITED": "Επεξεργασμένα",
+			"DESCRIPTION": "Περιγραφή",
+			"CREATED": "Δημιουργημένα",
+			"ACTIONS": "Δράσεις",
+			"DMP": "Σχέδιο Διαχείρισης Δεδομένων",
+			"PROFILE": "Template",
+			"DATAREPOSITORIES": "Αποθετήρια Δεδομένων",
+			"REGISTRIES": "Κατάλογοι",
+			"SERVICES": "Υπηρεσίες"
+		},
+		"ACTIONS": {
+			"EDIT": "Επεξεργασία",
+			"MAKE-IT-PUBLIC": "Δημοσιοποιήστε",
+			"VIEW": "Προβολή",
+			"CLONE": "Κλώνος",
+			"NEW-VERSION": "Νέα Έκδοση",
+			"VIEW-VERSIONS": "Όλες οι εκδόσεις των Templates Περιγραφής Συνόλου Δεδομένων"
+		}
+	},
+	"DATASET-UPLOAD": {
+		"TITLE": "Εισαγωγή Περιγραφής Συνόλου Δεδομένων",
+		"UPLOAD-BUTTON": "Μεταφόρτωση",
+		"ACTIONS": {
+			"IMPORT": "Εισαγωγή",
+			"CANCEL": "Ακύρωση"
+		},
+		"PLACEHOLDER": "Τίτλος Περιγραφής Συνόλου Δεδομένων",
+		"DATASET-PROFILE": {
+			"SELECT": "Επιλογή Template Περιγραφής Συνόλου Δεδομένων"
+		},
+		"SNACK-BAR": {
+			"SUCCESSFUL-CREATION": "Επιτυχία Εισαγωγής",
+			"UNSUCCESSFUL": "Κάτι πήγε στραβά"
+		}
+	},
+	"DMP-PROFILE-EDITOR": {
+		"TITLE": {
+			"NEW": "Νέο Template Σχεδίου Διαχείρισης Δεδομένων",
+			"EDIT": "Επεξεργασία"
+		},
+		"FIELDS": {
+			"TITLE": "Πεδία",
+			"LABEL": "Τίτλος",
+			"TYPE": "Τύπος",
+			"DATATYPE": "Τύπος Δεδομένων",
+			"REQUIRED": "Υποχρεωτικά",
+			"EXTERNAL-AUTOCOMPLETE": {
+				"TITLE": "Αυτόματη Συμπλήρωση Δεδομένων",
+				"MULTIPLE-AUTOCOMPLETE": "Πολλαπλή Αυτόματη Συμπλήρωση",
+				"PLACEHOLDER": "Τοποθέτηση placeholder",
+				"URL": "Url",
+				"OPTIONS-ROOT": "Βάση Επιλογών",
+				"LABEL": "Ετικέτα",
+				"VALUE": "Τιμή"
+			}
+		},
+		"ACTIONS": {
+			"SAVE": "Αποθήκευση",
+			"CANCEL": "Ακύρωση",
+			"DELETE": "Διαγραφή",
+			"FINALIZE": "Οριστικοποίηση",
+			"DOWNLOAD-XML": "Ληψη XML"
+		}
+	},
+	"GRANT-EDITOR": {
+		"TITLE": {
+			"NEW": "Νέα Επιχορήγηση",
+			"EDIT": "Επεξεργασία"
+		},
+		"FIELDS": {
+			"LABEL": "Τίτλος",
+			"ABBREVIATION": "Συντόμευση",
+			"URI": "URL",
+			"START": "Έναρξη",
+			"END": "Λήξη",
+			"DESCRIPTION": "Περιγραφή",
+			"LOGO": "Λογότυπο Επιχορήγησης"
+		},
+		"ACTIONS": {
+			"SAVE": "Αποθήκευση",
+			"CANCEL": "Ακύρωση",
+			"DELETE": "Διαγραφή",
+			"GO-TO-DMPS": "Μεταβείτε στα Σχέδια Διαχείρισης Δεδομένων",
+			"VISIT-WEBSITE": "Επίσκεψη Ιστοσελίδας"
+		}
+	},
+	"DMP-EDITOR": {
+		"TITLE": {
+			"NEW": "Νέα Σχέδιο Διαχείρισης Δεδομένων",
+			"EDIT": "Επεξεργασία",
+			"SUBTITLE": "Μονοσήμαντο Αναγνωριστικό Ψηφιακού Αντικειμένου (DOI)"
+		},
+		"FIELDS": {
+			"NAME": "Τίτλος",
+			"RELATED-GRANT": "Σχετική Επιχορήγηση",
+			"DESCRIPTION": "Περιγραφή",
+			"ORGANISATIONS": "Οργανισμοί",
+			"ORGANISATIONS-HINT": "Προσθήκη ονομάτων των οργανισμών που συνεισφέρουν στη δημιουργία και αναθεώρηση των Σχεδίων Διαχείρισης Δεδομένων",
+			"RESEARCHERS": "Ερευνητές",
+			"TEMPLATES": "Templates",
+			"TEMPLATE": "Template Σχεδίου Διαχείρισης Δεδομένων",
+			"DATASET-TEMPLATES": "Σχετικά Templates Περιγραφής Συνόλου Δεδομένων",
+			"PROFILE": "Template Σχεδίου Διαχείρισης Δεδομένων",
+			"PROJECT": "Έργο",
+			"GRANT": "Επιχορήγηση",
+			"FUNDER": "Χορηγός",
+			"STATUS": "Κατάσταση Σχεδίου Διαχείρισης Δεδομένων",
+			"EXTERNAL-SOURCE-HINT": "Κατάλογος των τιμών που παρέχονται από εξωτερικές πηγές",
+			"COLLABORATORS": "Συνεργάτες"
+		},
+		"ACTIONS": {
+			"GO-TO-GRANT": "Μεταβείτε στην Επιχορήγηση Σχεδίου Διαχείρισης Δεδομένων",
+			"GO-TO-DATASETS": "Μεταβείτε στις Περιγραφές Συνόλου Δεδομένων",
+			"SAVE-CHANGES": "Αποθήκευση Αλλαγών",
+			"SAVE": "Αποθήκευση",
+			"CANCEL": "Ακύρωση",
+			"DELETE": "Διαγραφή",
+			"FINALISE": "Οριστικοποίηση",
+			"LOCK": "Κλειδωμένο Σχέδιο Διαχείρισης Δεδομένων",
+			"PERMISSION": "Δεν έχετε άδεια να επεξεργαστείτε αυτό το Σχέδιο Διαχείρισης Δεδομένων"
+		},
+		"SNACK-BAR": {
+			"UNSUCCESSFUL-DOI": "Αποτυχία δημιουργίας Μονοσήμαντων Αναγνωριστικών Ψηφιακών Αντικειμένων (DOI)",
+			"SUCCESSFUL-DOI": "Επιτυχία δημιουργίας Μονοσήμαντων Αναγνωριστικών Ψηφιακών Αντικειμένων (DOI)",
+			"UNSUCCESSFUL-FINALIZE": "Αποτυχία οριστικοποιήσης Σχεδίου Διαχείρισης Δεδομένων"
+		},
+		"DATASET-TEMPLATE-LIST": {
+			"TITLE": "Διαθέσιμα Templates Συνόλου Δεδομένων",
+			"TEXT": "Επιλογή Χαρακτηριστικών Συνόλου Δεδομένων:",
+			"OK": "OK"
+		}
+	},
+	"DMP-PROFILE-LISTING": {
+		"TITLE": "Templates Σχεδίων Διαχείρισης Δεδομένων",
+		"COLUMNS": {
+			"NAME": "Τίτλος",
+			"STATUS": "Κατάσταση",
+			"CREATED": "Δημιουργημένα",
+			"PUBLISHED": "Δημοσιευμένα",
+			"LAST-EDITED": "Τελευταία Επεξεργασία"
+		},
+		"UPLOAD": {
+			"UPLOAD-XML": "Εισαγωγή",
+			"UPLOAD-XML-FILE-TITLE": "Εισαγωγή Template Σχεδίου Διαχείρισης Δεδομένων",
+			"UPLOAD-XML-NAME": "Τίτλος Template Σχεδίου Διαχείρισης Δεδομένων",
+			"UPLOAD-XML-IMPORT": "Αρχείο",
+			"UPLOAD-XML-FILE-CANCEL": "Ακύρωση"
+		}
+	},
+	"DYNAMIC-FORM": {
+		"FIELDS": {
+			"LABEL": "Ετικέτα"
+		},
+		"ACTIONS": {
+			"PREVIEW": "Προεπισκόπηση",
+			"ADD-PAGE": "Προσθήκη Σελίδας +",
+			"ADD-SECTION": "Προσθήκη Ενότητας +"
+		}
+	},
+	"CRITERIA": {
+		"FILTERS": "Φίλτρα",
+		"GRANTS": {
+			"LIKE": "Αναζήτηση",
+			"PERIOD-FROM": "Έναρξη Επιχορήγησης",
+			"PERIOD-TO": "Λήξη Επιχορήγησης",
+			"GRANT-STATE-TYPE": "Κατάσταση Επιχορήγησης",
+			"TYPES": {
+				"NONE": "-",
+				"ON-GOING": "Σε εξέλιξη",
+				"FINISHED": "Ολοκληρωμένο"
+			}
+		},
+		"DATASET-PROFILE": {
+			"LIKE": "Αναζήτηση"
+		},
+		"DATA-SETS": {
+			"PERIOD-FROM": "Έναρξη",
+			"PERIOD-TO": "Λήξη",
+			"STATUS": "Κατάσταση",
+			"NONE": "-",
+			"TAGS": "Ετικέτες",
+			"SELECT-TAGS": "Επιλογή Ετικέτας",
+			"LIKE": "Αναζήτηση Περιγραφών Συνόλου Δεδομένων",
+			"SELECT-GRANTS": "Επιλογή Επιχορηγήσεων",
+			"ROLE": "Ρόλος",
+			"ORGANIZATION": "Οργανισμός",
+			"SELECT-ORGANIZATIONS": "Επιλογή Οργανισμών",
+			"SELECT-SPEC": "Επιλογή Προδιαγραφών Περιγραφής Συνόλου Δεδομένων",
+			"RELATED-GRANT": "Σχετική Επιχορήγηση",
+			"SELECT-DMP": "Επιλογή Σχεδίου Διαχείρισης Δεδομένων",
+			"RELATED-DMP": "Σχετικά Σχέδια Διαχείρισης Δεδομένων",
+			"SELECT-COLLABORATORS": "Επιλογή Συνεργατών",
+			"RELATED-COLLABORATORS": "Σχετικοί Συνεργάτες",
+			"SELECT-DATASET-TEMPLATES": "Επιλογή Templates Περιγραφής Συνόλου Δεδομένων",
+			"RELATED-DATASET-TEMPLATES": "Σχετικά Templates Περιγραφής Συνόλων Δεδομένων",
+			"ALL-VERSIONS": "Από όλες τις Εκδόσεις"
+		},
+		"DMP": {
+			"LIKE": "Αναζήτηση Σχεδίων Διαχείρισης Δεδομένων",
+			"GRANTS": "Επιχορηγήσεις",
+			"SELECT-GRANTS": "Επιλογή Επιχορηγήσεων",
+			"SELECT-COLLABORATORS": "Επιλογή Συνεργατών",
+			"RELATED-COLLABORATORS": "Σχετικοί Συνεργάτες",
+			"SELECT-DATASET-TEMPLATES": "Επιλογή Templates Περιγραφής Συνόλου Δεδομένων",
+			"RELATED-DATASET-TEMPLATES": "Σχετικά Templates Περιγραφής Συνόλων Δεδομένων"
+		},
+		"USERS": {
+			"LABEL": "Αναζήτηση",
+			"ROLE": "Ρόλος"
+		},
+		"SELECT": "Επιλογή"
+	},
+	"DATASET-EDITOR": {
+		"TITLE": {
+			"NEW": "Νέο Σχέδιο Διαχείρισης Δεδομένων",
+			"EDIT": "Επεξεργασία"
+		},
+		"FIELDS": {
+			"NAME": "Τίτλος Περιγραφής Συνόλου Δεδομένων",
+			"DESCRIPTION": "Περιγραφή",
+			"PROFILE": "Template",
+			"URI": "Uri",
+			"DMP": "Σχέδιο Διαχείρισης Δεδομένων",
+			"DATAREPOSITORIES": "Αποθετήρια Δεδομένων",
+			"REGISTRIES": "Κατάλογοι",
+			"SERVICES": "Υπηρεσίες",
+			"EXTERNAL-DATASETS": "Εξωτερικά Σύνολα Δεδομένων",
+			"EXTERNAL-DATASETS-DESCRIPTION": "Τα Σύνολα Δεδομένων που σχετίζονται με αυτά που περιγράφονται στο Σχέδιο Διαχείρισης Δεδομένων, είτε χρησιμοποιούνται για την παραγωγή του είτε είναι παράγωγα ή υποπροϊόν της χρήσης του.",
+			"EXTERNAL-DATASET-TYPE": "Τύπος Εξωτερικού Συνόλου Δεδομένων",
+			"EXTERNAL-DATASET-INFO": "Πληροφορίες για το Εξωτερικό Σύνολο Δεδομένων",
+			"DATAREPOSITORIES-INFO": "Πληροφορίες για τα Αποθετήρια Δεδομένων",
+			"TAGS": "Ετικέτες",
+			"CREATE": "Δημιουργία νέου"
+		},
+		"ACTIONS": {
+			"SAVE": "Αποθήκευση",
+			"CANCEL": "Ακύρωση",
+			"DELETE": "Διαγραφή"
+		},
+		"VERSION-DIALOG": {
+			"ABOUT": "Η δημιουργία νέας έκδοσης συμβαίνει αυτόματα",
+			"QUESTION": "Το Template το Συνόλου Δεδομένων που επιλέξατε χρειάζεται επικαιροποίηση. Θα θέλατε να το ενημερώσετε στην πιο πρόσφατη έκδοσή του;"
+		}
+	},
+	"DATASET-CREATE-WIZARD": {
+		"ACTIONS": {
+			"NEXT": "Επόμενο",
+			"BACK": "Πίσω",
+			"SAVE": "Αποθήκευση"
+		},
+		"FIRST-STEP": {
+			"TITLE": "Σχέδιο Διαχείρισης Δεδομένων",
+			"PLACEHOLDER": "Επιλέξτε ένα Σχέδιο Διαχείρισης Δεδομένων από τη συλλογή σας"
+		}
+	},
+	"INVITATION-EDITOR": {
+		"TITLE": "Αποστολή Προσκλήσεων για",
+		"AUTOCOMPLETE-USER": "Χρήστης",
+		"AUTOCOMPLETE-EMAIL": "Email",
+		"ACTIONS": {
+			"SEND-INVITATION": "Αποστολή Προσκλήσεων",
+			"CANCEL": "Ακύρωση"
+		}
+	},
+	"USERS": {
+		"LISTING": {
+			"TITLE": "Χρήστες",
+			"EMAIL": "Email",
+			"LAST-LOGGED-IN": "Τελευταία Σύνδεση",
+			"LABEL": "Ετικέτα",
+			"ROLES": "Ρόλος",
+			"NAME": "Όνομα",
+			"PERMISSIONS": "ʼδειες"
+		}
+	},
+	"TYPES": {
+		"APP-ROLE": {
+			"ADMIN": "Διαχειριστής",
+			"USER": "Χρήστης",
+			"MANAGER": "Υπεύθυνος"
+		},
+		"DMP-PROFILE-FIELD": {
+			"DATA-TYPE": {
+				"DATE": "Ημερομηνία",
+				"NUMBER": "Αριθμός",
+				"TEXT": "Κείμενο",
+				"EXTERNAL-AUTOCOMPLETE": "Εξωτερική Αυτόματη Συμπλήρωση"
+			},
+			"TYPE": {
+				"INPUT": "Εισαγωγή"
+			}
+		},
+		"DATASET-STATUS": {
+			"DRAFT": "Προσχέδιο",
+			"FINALISED": "Οριστικοποίηση",
+			"ANY": "Οποιοδήποτε",
+			"DRAFT-DESC": "Προσχέδιες Καταγραφές"
+		},
+		"DATASET-ROLE": {
+			"OWNER": "Κάτοχος",
+			"MEMBER": "Μέλος",
+			"ANY": "Οποιοδήποτε"
+		},
+		"EXTERNAL-DATASET-TYPE": {
+			"SOURCE": "Πηγή",
+			"SOURCES": "Πηγές",
+			"SOURCE:": "Πηγή: ",
+			"NO-SOURCE": "Δε συνδέεται με την πηγή",
+			"OUTPUT": "Αποτελέσμα"
+		},
+		"DMP": {
+			"FINALISED": "Οριστικοποιημένο",
+			"DRAFT": "Προσχέδιο"
+		},
+		"DMP-VISIBILITY": {
+			"VISIBILITY": "Ορατότητα",
+			"PUBLIC": "Δημοσιευμένο",
+			"FINALIZED": "Οριστικοποιημένο",
+			"DRAFT": "Προσχέδιο",
+			"ANY": "Οποιοδήποτε"
+		},
+		"DATASET-PROFILE-FIELD-VALIDATION-TYPE": {
+			"NONE": "Κανένα",
+			"REQUIRED": "Υποχρεωτικό"
+		},
+		"DATASET-PROFILE-FIELD-VIEW-STYLE": {
+			"BOOLEAN-DECISION": "Απόφαση Boolean",
+			"CHECKBOX": "Πλαίσιο Ελέγχου",
+			"COMBO-BOX": "Σύνθετο Πλαίσιο",
+			"INTERNAL-DMP-ENTITIES": "Εσωτερικές οντότητες Σχεδίου Διαχείρισης Δεδομένων",
+			"FREE-TEXT": "Ελεύθερο Κείμενο",
+			"RADIO-BOX": "Πλαίσιο Επιλογής",
+			"TEXT-AREA": "Περιοχή Κειμένου",
+			"DATE-PICKER": "Επιλογή Ημερομηνίας"
+		},
+		"DATASET-PROFILE-COMBO-BOX-TYPE": {
+			"WORD-LIST": "Λίστα Λέξεων",
+			"AUTOCOMPLETE": "Αυτόματη Συμπλήρωση",
+			"EXTERNAL-SOURCE-HINT": "Κατάλογος τιμών που παρέχονται από εξωτερικές πηγές",
+			"ACTIONS": {
+				"YES": "Ναι",
+				"NO": "Όχι"
+			}
+		},
+		"DATASET-PROFILE-INTERNAL-DMP-ENTITIES-TYPE": {
+			"RESEARCHERS": "Ερευνητές",
+			"DMPS": "Σχέδια Διαχείρισης Δεδομένων",
+			"DATASETS": "Περιγραφές Συνόλων Δεδομένων",
+			"EXTERNAL-SOURCE-HINT": "Κατάλογος τιμών που παρέχονται από εξωτερικές πηγές"
+		}
+	},
+	"ADDRESEARCHERS-EDITOR": {
+		"TITLE": "Προσθήκη Ερευνητή",
+		"FIRST_NAME": "Όνομα",
+		"LAST_NAME": "Επώνυμο",
+		"ACTIONS": {
+			"SAVE": "Αποθήκευση",
+			"CANCEL": "Ακύρωση"
+		}
+	},
+	"DMP-WIZARD": {
+		"FIRST-STEP": {
+			"DMP": "Συντάκτης του Σχεδίου Διαχείρισης Δεδομένων",
+			"DATASETS": "Περιγραφές Συνόλων Δεδομένων"
+		},
+		"ACTIONS": {
+			"NEXT": "Επόμενο",
+			"BACK": "Πίσω",
+			"SAVE": "Αποθήκευση"
+		}
+	},
+	"DMP-RELATED-GRANT": {
+		"RELATED-GRANT": "Σχετική Επιχορήγηση"
+	},
+	"DMP-RELATED-COLLABORATOR": {
+		"RELATED-COLLABORATOR": "Σχετικοί Συνεργάτες",
+		"SELECT-COLLABORATORS": "Επιλέξτε Συνεργάτες"
+	},
+	"DMP-RELATED-ORGANIZATION": {
+		"RELATED-ORGANIZATION": "Οργανισμός",
+		"SELECT-ORGANIZATIONS": "Επιλέξτε Οργανισμούς"
+	},
+	"DATASET-PROFILE": {
+		"PREVIEW": "Προεπισκόπηση",
+		"FORM-DESCRIPTION": "Φόρμα Περιγραφής",
+		"PAGES-DESCRIPTION": "Σελίδες Περιγραφής"
+	},
+	"RECENT-ACTIVITY": {
+		"MY-TITLE-GRANT": "Οι Πρόσφατες Επιχορηγήσεις μου",
+		"MY-TITLE-DMP": "Τα Πρόσφατα Σχέδια Διαχείρισης Δεδομένων μου",
+		"MY-TITLE-DATASET": "Οι Πρόσφατες Περιγραφές Συνόλων Δεδομένων μου",
+		"LAST-VISITED-DMP": "Τελευταία Επίσκεψη σε Σχέδια Διαχείρισης Δεδομένων",
+		"LAST-EDITED-DMP": "Τελευταία Επεξεργασία σε Σχέδια Διαχείρισης Δεδομένων",
+		"LICENSE": "Τα παρακάτω Σχέδια Διαχείρισης Δεδομένων διατίθενται δημόσια"
+	},
+	"FILE-UPLOADER": {
+		"DEFAULT": "Επιλογή Αρχείου",
+		"GRANT": "",
+		"UPLOAD": "Μεταφόρτωση"
+	},
+	"URL-LISTING-COMPONENT": {
+		"SHOW-MORE": "Περισσότερα"
+	},
+	"HOMEPAGE": {
+		"OPEN-DMPS": {
+			"STATS": "ARGOS Dashboard"
+		},
+		"MY-DMPS": {
+			"STATS": "Το δικό μου Dashboard"
+		}
+	},
+	"ABOUT": {
+		"TITLE": "-Σχετικά-",
+		"MAIN-CONTENT": "Στόχος μας είναι να κάνουμε τα ερευνητικά σας δεδομένα FAIR, που σημαίνει να είναι ανιχνεύσιμα, προσβάσιμα, διαλειτουργικά και επαναχρησιποιήσιμα. Αυτές οι αρχές προηγούνται της εφαρμογής και δεν υποδηλώνουν απαραίτητα κάποια συγκεκριμένη τεχνολογία, πρότυπο ή λύση εφαρμογής.",
+		"CONTRIBUTORS": "Συνεργάτες",
+		"WELCOME": "Καλωσήρθατε στο ARGOS",
+		"WELCOME-MESSAGE": "Δημιουργήστε, Διασυνδέστε, Διαμοιραστείτε Σχέδια Διαχείρισης Δεδομένων"
+	},
+	"FOOTER": {
+		"CONTACT-SUPPORT": "Επικοινωνία",
+		"FAQ": "Συχνές Ερωτήσεις",
+		"GUIDE": "Οδηγός Χρήστη",
+		"GLOSSARY": "Γλωσσάριο",
+		"TERMS-OF-SERVICE": "Όροι Χρήσης",
+		"PRIVACY-POLICY": "Πολιτική Απορρήτου"
+	},
+	"GLOSSARY": {
+		"TITLE": "Γλωσσάριο",
+		"TITLE-DASHED": "-Γλωσσάριο-",
+		"CLOSE": "Κλείσιμο"
+	},
+	"FAQ": {
+		"TITLE": "Συχνές Ερωτήσεις",
+		"TITLE-DASHED": "-Συχνές Ερωτήσεις-",
+		"CLOSE": "Κλείσιμο"
+	},
+	"GUIDE": {
+		"TITLE": "Οδηγός Χρήστη",
+		"TITLE-DASHED": "-Οδηγός Χρήστη-",
+		"CLOSE": "Κλείσιμο"
+	},
+	"PRIVACY-POLICY": {
+		"TITLE": "-Πολιτική Απορρήτου-",
+		"MAIN-CONTENT": ""
+	},
+	"TERMS-OF-SERVICE": {
+		"TITLE": "-Όροι Χρήσης-",
+		"MAIN-CONTENT": ""
+	},
+	"CONTACT": {
+		"SUPPORT": {
+			"TITLE": "Επικοινωνία",
+			"SUBTITLE": "Πώς μπορούμε να σας βοηθήσουμε;",
+			"SUBJECT": "Θέμα",
+			"DESCRIPTION": "Περιγραφή",
+			"CANCEL": "Ακύρωση",
+			"SEND": "Αποστολή"
+		},
+		"TITLE-DASHED": "-Επικοινωνία-",
+		"GUIDE": "Οδηγός",
+		"HELP": "Βοήθεια",
+		"GLOSSARY": "Γλωσσάριο"
+	},
+	"LANGUAGE": {
+		"TITLE": "Γλώσσα",
+		"TITLE-DASHED": "-Γλώσσα-",
+		"CLOSE": "Κλείσιμο"
+	},
+	"DASHBOARD": {
+		"MY-GRANTS": "Οι Επιχορηγήσεις μου",
+		"GRANTS": "Επιχορηγήσεις",
+		"MY-DMPS": "Τα Σχέδια Διαχείρισης Δεδομένων μου",
+		"TITLE": "Τi είναι το ARGOS?",
+		"INFO-TEXT": "Το ARGOS είναι μια ανοικτή επεκτάσιμη υπηρεσία που απλοποιεί τη διαχείριση, την επικύρωση, την παρακολούθηση και τη συντήρηση των Σχεδίων Διαχείρισης Δεδομένων. Επιτρέπει στους φορείς (ερευνητές, υπεύθυνους έρευνας, διευθυντές κλπ.) να δημιουργούν ζωντανά Σχέδια Διαχείρισης Δεδομένων που μπορούν να ανταλλάσσονται ελεύθερα μεταξύ των υποδομών για τη διεξαγωγή συγκεκριμένων πτυχών της διαδικασίας διαχείρισης Δεδομένων, σύμφωνα με τις προθέσεις και τη δέσμευση των κατόχων Δεδομένων.",
+		"ORGANIZATIONS": "Σχετικοί Οργανισμοί",
+		"DMPS": "Σχέδια Διαχείρισης Δεδομένων",
+		"MY-DATASETS": "Οι Περιγραφές Συνόλων Δεδομένων μου",
+		"DATASETS": "Περιγραφές Συνόλων Δεδομένων",
+		"SEARCH": "ΑΝΑΖΗΤΗΣΗ...",
+		"DATA-MANAGEMENT-PLANS": "ΣΧΕΔΙΑ ΔΙΑΧΕΙΡΙΣΗΣ ΔΕΔΟΜΕΝΩΝ"
+	},
+	"USER-DIALOG": {
+		"USER-PROFILE": "Το Προφίλ μου",
+		"EXIT": "Έξοδος ",
+		"LOG-OUT": "Αποσύνδεση"
+	},
+	"USER-PROFILE": {
+		"SETTINGS": {
+			"TITLE": "Ρυθμίσεις",
+			"TIMEZONE": "Ζώνη Ώρας",
+			"CULTURE": "Κουλτούρα",
+			"LANGUAGE": "Γλώσσα"
+		},
+		"ASSOCIATED-DMPS": "Συσχετιζόμενα Σχέδια Διαχείρισης Δεδομένων",
+		"DMPS": {
+			"SHOW-ALL": "Προβολή Όλων",
+			"CREATOR": "Συντάκτης",
+			"MEMBER": "Μέλος"
+		}
+	},
+	"DATASET-REFERENCED-MODELS": {
+		"SERVICES": {
+			"TITLE": "Προσθήκη Νέας Υπηρεσίας",
+			"LABEL": "Ετικέτα",
+			"ABBREVIATION": "Συντόμευση",
+			"URI": "Uri"
+		},
+		"DATA-REPOSITORY": {
+			"TITLE": "Προσθήκη Νέου Αποθετηρίου Δεδομένων",
+			"LABEL": "Ετικέτα",
+			"ABBREVIATION": "Συντόμευση",
+			"URI": "Διεύθυνση Uri"
+		},
+		"EXTERNAL-DATASET": {
+			"TITLE": "Προσθήκη Νέας Εξωτερικής Περιγραφής Συνόλου Δεδομένων",
+			"LABEL": "Ετικέτα",
+			"ABBREVIATION": "Συντόμευση"
+		},
+		"REGISTRY": {
+			"TITLE": "Προσθήκη Νέου Καταλόγου",
+			"LABEL": "Ετικέτα",
+			"ABBREVIATION": "Συντόμευση",
+			"URI": "Uri"
+		}
+	},
+	"FACET-SEARCH": {
+		"FILTER": "Φίλτρα",
+		"GRANT-STATUS": {
+			"TITLE": "Κατάσταση Επιχορήγησης",
+			"OPTIONS": {
+				"ANY": "Οποιοδήποτε",
+				"ACTIVE": "Ενεργή",
+				"INACTIVE": "Μη-ενεργή"
+			}
+		},
+		"GRANT": {
+			"TITLE": "Σχετική Επιχορήγηση",
+			"FILTER": "Φίλτρα Επιχορήγησης"
+		},
+		"PROFILES": {
+			"TITLE": "Προδιαγραφές Περιγραφών Συνόλου Δεδομένων"
+		},
+		"ROLE": {
+			"TITLE": "Ρόλου",
+			"ANY": "Οποιοσδήποτε",
+			"OWNER": "Κάτοχος",
+			"MEMBER": "Μέλος"
+		},
+		"DMP-ORGANISATIONS": {
+			"TITLE": "Οργανισμός",
+			"FILTER": "Φίλτρα Οργανισμών"
+		}
+	},
+	"DMP-FINALISE-DIALOG": {
+		"DMP": "Σχέδια Διαχείρισης Δεδομένων",
+		"DATASETS": "Περιγραφές Συνόλου Δεδομένων",
+		"EMPTY": "Δεν υπάρχει καμία Διαθέσιμη Περιγραφή Συνόλου Δεδομένων μέχρι τώρα για αυτό το Σχέδιο Διαχείρισης Δεδομένων",
+		"SUBMIT": "Υποβολή",
+		"FINALISE-TITLE": "Θέλετε να οριστικοποιήσετε κάποια από τις ακόλουθες Περιγραφές Συνόλων Δεδομένων;",
+		"ALREADY-FINALISED-DATASETS": "Ήδη Οριστικοποιημένες Περιγραφές Συνόλων Δεδομένων",
+		"NONE": "Καμία",
+		"VALIDATION": {
+			"AT-LEAST-ONE-DATASET-FINALISED": "Πρέπει να έχετε οριστικοποιήσει τουλάχιστον μία Περιγραφή Συνόλου Δεδομένων."
+		},
+		"IMPACT": "Αυτή η επιλογή θα οριστικοποιήσει το Σχέδιο Διαχείρισης Δεδομένων σας και δε θα μπορείτε να το επεξεργαστείτε ξανά σε αυτήν την έκδοση.",
+		"AFTER-FINALIZATION": "Μετά την οριστικοποίηση του Σχεδίου Διαχείρισης Δεδομένων σας, μπορείτε να το δημοσιεύσετε και να το διαθέσετε δημόσια στο εργαλείο ARGOS."
+	},
+	"DRAFTS": {
+		"FOR-DMP": "Για Σχέδιο Διαχείρισης Δεδομένων:",
+		"FOR-GRANT": "Για Επιχορήγηση:"
+	},
+	"QUICKWIZARD": {
+		"CREATE-ADD": {
+			"CREATE": {
+				"TITLE": "Δημιουργία Νέου Σχεδίου Διαχείρισης Δεδομένων",
+				"SUBTITLE": "Δημιουργήστε ένα νέο Σχέδιο Διαχείρισης Δεδομένων και περιγράψτε τα Σύνολα Δεδομένων σας σύμφωνα με τα βήματα που υπάρχουν στον wizard για γρήγορα και εύκολη συμπλήρωση των πιο βασικών στοιχείων του Σχεδίου Διαχείρισης Δεδομένων.",
+				"QUICKWIZARD_CREATE": {
+					"TITLE": "Wizard Σχεδίου Διαχείρισης Δεδομένων",
+					"POST-SELECTION-INFO": "Αυτός ο wizard σας επιτρέπει να δημιουργήσετε ένα νέο Σχέδιο Διαχείρισης Δεδομένων παρέχοντας τις πιο βασικές και αναγκαίες πληροφορίες, στις οποίες μπορείτε να προσθέστε στη συνέχεια μία ή περισσότερες Περιγραφές Συνόλου Δεδομένων που αφορούν αυτό το Σχέδιο Διαχείρισης Δεδομένων. Αφού ολοκληρώσετε με τον wizard, θα είστε σε θέση να επεξεργαστείτε περαιτέρω το Σχέδιο Διαχείρισης Δεδομένων έχοντας πρόσβαση στις προχωρημένες ιδιότητες μέσω του πλήρους επεξεργαστή Σχεδίου Διαχείρισης Δεδομένων, ώστε να προσθέσετε ακόμα περισσότερες Περιγραφές Συνόλου Δεδομένων ή να επεξεργαστείτε προηγούμενες.",
+					"ACTIONS": {
+						"DELETE": "Διαγραφή",
+						"SAVE": "Αποθήκευση",
+						"SAVE-AND-FINALIZE": "Αποθήκευση και Οριστικοποίηση",
+						"NEXT": "Επόμενο",
+						"BACK": "Πίσω",
+						"CREATE-NEW-GRANT": "Προσθήκη Επιχορήγησης",
+						"EXIST-GRANT": "Επιλογή Επιχορήγησης",
+						"CREATE-NEW-FUNDER": "Προσθήκη Χρηματοδότη",
+						"EXIST-FUNDER": "Επιλογή Χρηματοδότη",
+						"CREATE-NEW-PROJECT": "Προσθήκη Έργου",
+						"EXIST-PROJECT": "Επιλογή Έργου"
+					},
+					"FIRST-STEP": {
+						"TITLE": "Επιχορήγηση",
+						"ABOUT-GRANT": "Βρείτε την επιχορήγηση με την οποία συσχετίζεται το Σχέδιο Διαχείρισης Δεδομένων σας και συνδέστε τη με τις πληροφορίες του χρηματοδότη. Εάν η επιχορήγηση δε βρίσκεται στον κατάλογο ή δημιουργείτε Σχέδιο Διαχείρισης Δεδομένων για μία αίτηση υποβολής πρότασης ή για άλλους σκοπούς, χρησιμοποιήστε την επιλογή “Προσθήκη Επιχορήγησης”.",
+						"ABOUT-NEW-GRANT": "Εάν δημιουργείτε Σχέδιο Διαχείρισης Δεδομένων για αίτηση υποβολής πρότασης,ιδρυματική ή ερευνητική χρήση ή για εκπαιδευτικούς σκοπούς, προσθέστε πληροφορίες παρακάτω δημιουργώντας μία νέα επιχορήγηση.",
+						"ABOUT-FUNDER": "Βρείτε τον χρηματοδότη με τον οποίο θα θέλατε να συσχετίσετε το Σχέδιο Διαχείριση Δεδομένων που δημιουργείτε και στη συνέχεια επιλέξτε μια επιχορήγηση με την οποία συνδέεται ο χρηματοδότης. Εάν ο χρηματοδότης δε βρίσκεται στον κατάλογο, χρησιμοποιήστε την επιλογή \"Προσθήκη Χρηματοδότη\"",
+						"ABOUT-NEW-FUNDER": "Εάν δημιουργείτε Σχέδιο Διαχείρισης Δεδομένων για αίτηση υποβολής πρότασης,ιδρυματική ή ερευνητική χρήση ή για εκπαιδευτικούς σκοπούς, προσθέστε πληροφορίες παρακάτω δημιουργώντας ένα νέο χρηματοδότη",
+						"ABOUT-PROJECT": "Βρείτε το έργο με το οποίο συσχετίζεται το Σχέδιο Διαχείρισης Δεδομένων σας. Εάν το έργο δε βρίσκεται στον κατάλογο, χρησιμοποιήστε την επιλογή \"Προσθήκη Έργου\"",
+						"ABOUT-NEW-PROJECT": "",
+						"OR": "or",
+						"FIELDS": {
+							"SELECT-GRANT": "Επιλέξτε την επιχορήγηση με την οποία συσχετίζεται το Σχέδιο Διαχείρισης Δεδομένων",
+							"SELECT-FUNDER": "Επιλέξτε τον χρηματοδότη της επιχορήγησης με τον οποίο συσχετίζεται το Σχέδιο Διαχείρισης Δεδομένων",
+							"SELECT-PROJECT": "Επιλέξτε το έργο με το οποίο συσχετίζεται το Σχέδιο Διαχείρισης Δεδομένων",
+							"GRANT-LABEL": "Τίτλος Επιχορήγησης",
+							"FUNDER-LABEL": "Τίτλος Χρηματοδότη",
+							"PROJECT-LABEL": "Τίτλος Έργου",
+							"LABEL-HINT": "Προσθήκη του τίτλου της επιχορήγησης όπως εμφανίζεται στην πρόσκληση υποβολής πρότασης",
+							"DESCRIPTION": "Περιγραφή",
+							"DESCRIPTION-HINT": "Περιγράψτε σύντομα τον σκοπό και τους στόχους της επιχορήγησης"
+						}
+					},
+					"SECOND-STEP": {
+						"TITLE": "Προφίλ Σχεδίου Διαχείρισης Δεδομένων",
+						"ABOUT": "Ένα Σχέδιο Διαχείρισης Δεδομένων αποτελείται από ένα σύνολο ερωτήσεων που πρέπει να απαντήσετε ανάλογα με το κατάλληλο επίπεδο λεπτομέρειας που απαιτεί η επιχορήγηση ή ανάλογα με το σκοπό δημιουργίας του Σχεδίου Διαχείρισης Δεδομένων. Τα περιεχόμενα του κάθε Σχεδίου Διαχείρισης Δεδομένων ποικίλουν ανάλογα με τα επιλεγμένα templates που περιγράφονται τα σύνολα δεδομένων (Templates Περιγραφών Συνόλων Δεδομένων), τα οποία περιέχουν ένα σύνολο προσαρμοσμένων ερωτήσεων σύμφωνα με τις απαιτήσεις της πολιτικής των χρηματοδοτών, των ιδρυμάτων και των ερευνητικών κοινοτήτων.",
+						"NEW-TITLE": "",
+						"DMP-NAME": "Σχέδιο Διαχείρισης Δεδομένων για Επιχορήγηση:",
+						"FIELDS": {
+							"NAME": "Τίτλος Σχεδίου Διαχείρισης Δεδομένων",
+							"DESCRIPTION": "Σύνοψη",
+							"DESCRIPTION-HINT": "Περιγράψτε σύντομα το περιεχόμενο και τον σκοπό του Σχεδίου Διαχείρισης Δεδομένων",
+							"PROFILE": "Template Περιγραφής Συνόλου Δεδομένων",
+							"PROFILE-HINT": "Επιλέξτε ένα Template για να σχολιάσετε τις Περιγραφές Συνόλου Δεδομένων. Εάν θέλετε να επιλέξετε πολλαπλά Templates χρησιμοποιήστε την επιλογή \"Νέο Σχέδιο Διαχείρισης Δεδομένων (Expert)\". Μπορείτε, επίσης, να προσθέσετε νέες Περιγραφές Συνόλου Δεδομένων οποιαδήποτε στιγμή μετά τη δημιουργία του Σχεδίου Διαχείρισης Δεδομένων.",
+							"HELP": "Έάν δεν βρίσκετε template ή θέλετε να δημιουργήσετε ένα εξατομικευμένο template για το ίδρυμά σας, την ερευνητική σας κοινότητα ή για εκπαιδευτικές ανάγκες, παρακαλώ επικοινωνήστε μαζί μας."
+						}
+					},
+					"THIRD-STEP": {
+						"TITLE": "Περιγραφή Συνόλου Δεδομένων",
+						"NEW-TITLE": "",
+						"DATASET-LABEL": "Τίτλος Περιγραφής Συνόλου Δεδομένων",
+						"DATASET-NAME": "Περιγραφή Συνόλου Δεδομένων: ",
+						"DATASET-NAME-FOR": " Για το Σχέδιο Διαχείρισης Δεδομένων: ",
+						"LIST-BUTTON-TOOLTIP": "Κατάλογος Περιγραφών Συνόλου Δεδομένων",
+						"ADD-BUTTON-TOOLTIP": "Προσθήκη Περιγραφής Συνόλου Δεδομένων"
+					}
+				}
+			},
+			"ADD": {
+				"TITLE": "Προσθήκη Περιγραφής Συνόλου Δεδομένων σε ένα Σχέδιο Διαχείρισης Δεδομένων της συλλογής σας",
+				"DATASET-WIZARD": "Wizard Περιγραφής Συνόλου Δεδομένων",
+				"POST-SELECTION-INFO": "Αυτός ο wizard απλοποιεί τη διαδικασία προσθήκης νέων Περιγραφών Συνόλου Δεδομένων σε Σχέδια Διαχείρισης Δεδομένων που έχετε στη συλλογή σας κάνοντας υποχρεωτικά μόνο τα στοιχεία ή τις πληροφορίες που είναι απαραίτητες για την ολοκλήρωση της εργασίας. Πλήρης πρόσβαση στα χαρακτηριστικά της Περιγραφής Συνόλου Δεδομένων μπορεί να αποκτηθεί στη συνέχεια και μέσω των επιλογών πρόσβασης Περιγραφής Συνόλου Δεδομένων του συστήματος.",
+				"SUBTITLE": "Αυτός ο wizard σας επιτρέπει να σχολιάσετε επιπλέον Περιγραφές Συνόλων Δεδομένων που διαχειρίζονται στο πλαίσιο ενός Σχεδίου Διαχείρισης Δεδομένων παρέχοντας μόνο τις απαραίτητες πληροφορίες για την περιγραφή.",
+				"CREATED": "Δημιουργήθηκε "
+			}
+		},
+		"SAVE-DIALOG": {
+			"TITLE": "Θα θέλατε να προσθέσετε άλλη Περιγραφή Συνόλου Δεδομένων;",
+			"ACTIONS": {
+				"AFFIRMATIVE": "Ναι",
+				"NEGATIVE": "Όχι"
+			}
+		},
+		"HINT": "(Προτεινόμενος Προεπιλεγμένος Τίτλος)"
+	},
+	"DATASET-PROFILE-STATUS": {
+		"NONE": "Όλα",
+		"DRAFT": "Πρόχειρα",
+		"FINALIZED": "Οριστικοποιημένα"
 	}
-  },
-  "USER-PROFILE": {
-    "SETTINGS": {
-      "TITLE": "Ρυθμίσεις",
-      "TIMEZONE": "Ζώνη Ώρας",
-      "CULTURE": "Κουλτούρα",
-      "LANGUAGE": "Γλώσσα"
-    },
-    "ASSOCIATED-DMPS": "Συσχετιζόμενα DMPs",
-    "DMPS": {
-      "SHOW-ALL": "Όλα",
-      "CREATOR": "Δημιουργός",
-      "MEMBER": "Μέλος"
-    }
-  }
-}
+}
\ No newline at end of file

From 0a4cad8292774684a0eca1aaeffac684a0e8b56a Mon Sep 17 00:00:00 2001
From: Diamantis Tziotzios <dtziotzios@cite.gr>
Date: Tue, 12 May 2020 19:54:52 +0300
Subject: [PATCH 57/60] bug fix

---
 .../eudat/logic/managers/QuickWizardManager.java  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/QuickWizardManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/QuickWizardManager.java
index d75c07603..0f3dd9b45 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/QuickWizardManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/QuickWizardManager.java
@@ -4,6 +4,8 @@ import eu.eudat.data.dao.criteria.FunderCriteria;
 import eu.eudat.data.dao.criteria.GrantCriteria;
 import eu.eudat.data.dao.criteria.ProjectCriteria;
 import eu.eudat.data.entities.*;
+import eu.eudat.elastic.entities.Dmp;
+import eu.eudat.logic.mapper.elastic.DmpMapper;
 import eu.eudat.logic.services.ApiContext;
 import eu.eudat.logic.services.operations.DatabaseRepository;
 import eu.eudat.models.data.dmp.DataManagementPlan;
@@ -20,11 +22,13 @@ public class QuickWizardManager {
 
     private ApiContext apiContext;
     private DatabaseRepository databaseRepository;
+    private DatasetManager datasetManager;
 
     @Autowired
-    public QuickWizardManager(ApiContext apiContext) {
+    public QuickWizardManager(ApiContext apiContext, DatasetManager datasetManager) {
         this.apiContext = apiContext;
         this.databaseRepository = apiContext.getOperationsContext().getDatabaseRepository();
+        this.datasetManager = datasetManager;
     }
 
     public Funder createOrUpdate(eu.eudat.models.data.funder.Funder funder, Principal principal) {
@@ -63,9 +67,18 @@ public class QuickWizardManager {
         DMP dmpret = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().createOrUpdate(newDmp);
         if (dataManagementPlan.getAssociatedUsers().size() == 0)
             assignUser(newDmp, user, apiContext);
+
+        this.updateIndex(dmpret);
+
         return dmpret;
     }
 
+    private void updateIndex(DMP dmp) throws IOException {
+        DmpMapper mapper = new DmpMapper(apiContext, datasetManager);
+        Dmp elastic = mapper.toElastic(dmp);
+        apiContext.getOperationsContext().getElasticRepository().getDmpRepository().createOrUpdate(elastic);
+    }
+
     private void assignUser(DMP dmp, UserInfo userInfo, ApiContext apiContext) {
         UserDMP userDMP = new UserDMP();
         userDMP.setDmp(dmp);

From 08bf30b79b1da6bb0058e6b5f1c574bd2c5cb1cd Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Wed, 13 May 2020 10:56:02 +0300
Subject: [PATCH 58/60] Simplified database deployment scripts

---
 dmp-db-scema/createDB/createdb.bat         |    4 +-
 dmp-db-scema/initdb.sh                     |    9 +-
 dmp-db-scema/main/DataManagementPlanDB.sql |  557 -------
 dmp-db-scema/main/data-dump.sql            |   17 +
 dmp-db-scema/main/dmp-dump.sql             | 1657 ++++++++++++++++++++
 5 files changed, 1678 insertions(+), 566 deletions(-)
 delete mode 100644 dmp-db-scema/main/DataManagementPlanDB.sql
 create mode 100644 dmp-db-scema/main/data-dump.sql
 create mode 100644 dmp-db-scema/main/dmp-dump.sql

diff --git a/dmp-db-scema/createDB/createdb.bat b/dmp-db-scema/createDB/createdb.bat
index f67be1781..e5ceb836a 100644
--- a/dmp-db-scema/createDB/createdb.bat
+++ b/dmp-db-scema/createDB/createdb.bat
@@ -3,6 +3,6 @@ setlocal
 cd ..
 for /F "tokens=*" %%p in ('type Docker\dmp-db.env') do SET %%p
 psql -d postgres -U postgres -w --set=POSTGRES_USER=%POSTGRES_USER% --set=POSTGRES_PASSWORD=%POSTGRES_PASSWORD% --set=POSTGRES_DB=%POSTGRES_DB% -f main/createDatabase.sql
-psql -d %POSTGRES_DB% -U %POSTGRES_USER% --set=POSTGRES_USER=%POSTGRES_USER% -w -f main/DataManagementPlanDB.sql
-for /R "updates" %%f in (*.sql) do psql --set=ADMIN_USERNAME=%ADMIN_USERNAME% --set=ADMIN_PASSWORD=%ADMIN_PASSWORD% --set=POSTGRES_USER=%POSTGRES_USER% -d %POSTGRES_DB% -U %POSTGRES_USER% -w -f %%f
+psql -d %POSTGRES_DB% -U %POSTGRES_USER% --set=POSTGRES_USER=%POSTGRES_USER% -w -f main/dmp-dump.sql
+psql --set=ADMIN_USERNAME=%ADMIN_USERNAME% --set=ADMIN_PASSWORD=%ADMIN_PASSWORD% --set=POSTGRES_USER=%POSTGRES_USER% -d %POSTGRES_DB% -U %POSTGRES_USER% -w -f main/data-dump.sql
 endlocal
\ No newline at end of file
diff --git a/dmp-db-scema/initdb.sh b/dmp-db-scema/initdb.sh
index ad7d9dd8a..b7578ed63 100644
--- a/dmp-db-scema/initdb.sh
+++ b/dmp-db-scema/initdb.sh
@@ -1,7 +1,2 @@
-psql -d $POSTGRES_DB -U $POSTGRES_USER --set=POSTGRES_USER="$POSTGRES_USER" -f main/DataManagementPlanDB.sql; 
-for j in $(ls updates); do
-	for i in $(ls updates/$j/*.sql); do
-		echo $i
-		psql --set=ADMIN_USERNAME="$ADMIN_USERNAME" --set=ADMIN_PASSWORD="$ADMIN_PASSWORD" --set=POSTGRES_USER="$POSTGRES_USER" -d $POSTGRES_DB -U $POSTGRES_USER -f $i; 
-	done
-done
\ No newline at end of file
+psql -d $POSTGRES_DB -U $POSTGRES_USER --set=POSTGRES_USER="$POSTGRES_USER" -f main/dmp-dump.sql; 
+psql --set=ADMIN_USERNAME="$ADMIN_USERNAME" --set=ADMIN_PASSWORD="$ADMIN_PASSWORD" -d $POSTGRES_DB -U $POSTGRES_USER -f main/data-dump.sql; 
diff --git a/dmp-db-scema/main/DataManagementPlanDB.sql b/dmp-db-scema/main/DataManagementPlanDB.sql
deleted file mode 100644
index 94b8f2b75..000000000
--- a/dmp-db-scema/main/DataManagementPlanDB.sql
+++ /dev/null
@@ -1,557 +0,0 @@
-SET statement_timeout = 0;
-SET lock_timeout = 0;
-SET idle_in_transaction_session_timeout = 0;
-SET client_encoding = 'UTF8';
-SET standard_conforming_strings = on;
-SET check_function_bodies = false;
-SET client_min_messages = warning;
-SET row_security = off;
-
-
-drop table if exists "DMP" cascade;
-drop table if exists "DMPOrganisation" cascade;
-drop table if exists "DMPProfile" cascade;
-drop table if exists "DMPResearcher" cascade;
-drop table if exists "Dataset" cascade;
-drop table if exists "DatasetProfile" cascade;
-drop table if exists "DatasetProfileRuleset" cascade;
-drop table if exists "DatasetProfileViewstyle" cascade;
-drop table if exists "Organisation" cascade;
-drop table if exists "Project" cascade;
-drop table if exists "Researcher" cascade;
-drop table if exists "Service" cascade;
-drop table if exists "DataRepository" cascade;
-drop table if exists "Registry" cascade;
-drop table if exists "DatasetService" cascade;
-drop table if exists "DatasetRegistry" cascade;
-drop table if exists "DatasetDataRepository" cascade;
-DROP table if exists "UserDMP" cascade;
-DROP table if exists "UserInfo" cascade;
-DROP table if exists "UserAuth" cascade;
-
-
-
--- CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
-
-
-CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
-
-SET search_path = public, pg_catalog;
-
-SET default_tablespace = '';
-
-SET default_with_oids = false;
-
-
-CREATE TABLE "DMP" (
-    "ID" uuid DEFAULT uuid_generate_v4() NOT NULL,
-    "Previous" uuid,
-    "Label" character varying(250) NOT NULL,
-    "Version" integer NOT NULL,
-    "Project" uuid NOT NULL,
-    "ProfileData" xml,
-    "Creator" uuid not null,
-    "Status" smallint not null default 0,
-    "Created" timestamp not null default NOW(),
-    "Modified" timestamp not null default NOW(),
-    "Description" text,
-    "Profile" uuid
-);
-
-
-ALTER TABLE "DMP" OWNER TO :POSTGRES_USER;
-
-
-COMMENT ON COLUMN "DMP"."ProfileData" IS 'More data about the DMP as defined by the profile';
-
-
-CREATE TABLE "DMPOrganisation" (
-    "DMP" uuid NOT NULL,
-    "Organisation" uuid NOT NULL,
-    "Role" integer,
-    "ID" uuid DEFAULT uuid_generate_v4() NOT NULL
-);
-
-
-ALTER TABLE "DMPOrganisation" OWNER TO :POSTGRES_USER;
-
-
-COMMENT ON TABLE "DMPOrganisation" IS 'Linking of DMPs to Organisations';
-
-
-COMMENT ON COLUMN "DMPOrganisation"."Role" IS 'Enumerator of roles';
-
-
-CREATE TABLE "DMPProfile" (
-    "ID" uuid  DEFAULT uuid_generate_v4() NOT NULL,
-    "Label" character varying(250) NOT NULL,
-    "Status" smallint not null default 0,
-    "Created" timestamp not null default NOW(),
-    "Modified" timestamp not null default NOW(),
-    "Definition" xml
-);
-
-
-ALTER TABLE "DMPProfile" OWNER TO :POSTGRES_USER;
-
-
-CREATE TABLE "DMPResearcher" (
-    "DMP" uuid NOT NULL,
-    "Researcher" uuid NOT NULL,
-    "Role" integer,
-    "ID" uuid DEFAULT uuid_generate_v4() NOT NULL
-);
-
-
-ALTER TABLE "DMPResearcher" OWNER TO :POSTGRES_USER;
-
-COMMENT ON TABLE "DMPResearcher" IS 'Linking of DMPs to researchers';
-
-COMMENT ON COLUMN "DMPResearcher"."Role" IS 'Enumerator of roles';
-
-
-CREATE TABLE "Dataset" (
-    "ID" uuid  DEFAULT uuid_generate_v4() NOT NULL,
-    "Label" character varying(250) NOT NULL,
-    "DMP" uuid,
-    "Uri" character varying(250),
-    "Properties" xml,
-    "Reference" xml,
-    "Creator" uuid not null,
-    "Status" smallint not null default 0,
-    "Created" timestamp not null default NOW(),
-    "Modified" timestamp not null default NOW(),
-    "Description" text,
-    "Profile" uuid
-);
-
-
-ALTER TABLE "Dataset" OWNER TO :POSTGRES_USER;
-
-
-COMMENT ON COLUMN "Dataset"."Uri" IS 'URI of item';
-
-
-COMMENT ON COLUMN "Dataset"."Properties" IS 'More data about the dataset such as Uri, data types etc as defined by the profile';
-
-
-CREATE TABLE "DatasetProfile" (
-    "ID" uuid  DEFAULT uuid_generate_v4() NOT NULL,
-    "Label" character varying(250) NOT NULL,
-	"Ruleset" uuid,
-	"Viewstyle" uuid,
-	"Status" smallint not null default 0,
-    "Created" timestamp not null default NOW(),
-    "Modified" timestamp not null default NOW(),
-    "Description" text,
-    "Definition" xml NOT NULL
-);
-
--- SHould also force the 1-1 relation between the datasetprofile <-> ruleset and datasetprofile <-> viewstyle
-ALTER TABLE "DatasetProfile" ADD CONSTRAINT datasetprofile_unique_ruleset UNIQUE ("Ruleset");
-ALTER TABLE "DatasetProfile" ADD CONSTRAINT datasetprofile_unique_viewstyle UNIQUE ("Viewstyle");
-
-ALTER TABLE "DatasetProfile" OWNER TO :POSTGRES_USER;
-
-
-COMMENT ON TABLE "DatasetProfile" IS 'Profiles for dmp datasets';
-
-
-CREATE TABLE "DatasetProfileRuleset" (
-    "ID" uuid  DEFAULT uuid_generate_v4() NOT NULL,
-    "Label" character varying(250) NOT NULL,
-    "Definition" xml NOT NULL
-);
-
-ALTER TABLE "DatasetProfileRuleset" OWNER TO :POSTGRES_USER;
-
-COMMENT ON TABLE "DatasetProfileRuleset" IS 'Sets of Rules for dmp dataset profiles';
-
-
-CREATE TABLE "DatasetProfileViewstyle" (
-    "ID" uuid  DEFAULT uuid_generate_v4() NOT NULL,
-    "Label" character varying(250) NOT NULL,
-    "Definition" xml NOT NULL
-);
-
-ALTER TABLE "DatasetProfileViewstyle" OWNER TO :POSTGRES_USER;
-
-COMMENT ON TABLE "DatasetProfileViewstyle" IS 'Style sets for dmp dataset profiles';
-
-
-CREATE TABLE "Organisation" (
-    "ID" uuid  DEFAULT uuid_generate_v4() NOT NULL,
-    "Label" character varying(250) NOT NULL,
-    "Abbreviation" character varying(50),
-    "Reference" xml,
-    "Uri" character varying(250),
-    "Status" smallint not null default 0,
-    "Created" timestamp not null default NOW(),
-    "Modified" timestamp not null default NOW(),
-    "Definition" xml
-);
-
-
-ALTER TABLE "Organisation" OWNER TO :POSTGRES_USER;
-
-COMMENT ON TABLE "Organisation" IS 'Table of organizations utilized in the project';
-
-COMMENT ON COLUMN "Organisation"."ID" IS 'Unique identifier and primary key of item';
-
-COMMENT ON COLUMN "Organisation"."Label" IS 'A human readable long label of the item';
-
-COMMENT ON COLUMN "Organisation"."Abbreviation" IS 'A human readable abbreviation of the item';
-
-COMMENT ON COLUMN "Organisation"."Reference" IS 'Reference to the URI of the item along with information to allow how the item reached the system (e.g. via an external vocabulary)';
-
-COMMENT ON COLUMN "Organisation"."Uri" IS 'URI of item';
-
-COMMENT ON COLUMN "Organisation"."Definition" IS 'More data about the Organisation such as web site, type etc';
-
-
-
-CREATE TABLE "Project" (
-    "ID" uuid  DEFAULT uuid_generate_v4() NOT NULL,
-    "Label" character varying(250) NOT NULL,
-    "Abbreviation" character varying(50),
-    "Reference" xml,
-    "Uri" character varying(250),
-    "CreationUser" uuid not null,
-    "Status" smallint not null default 0,
-    "Created" timestamp not null default NOW(),
-    "Modified" timestamp not null default NOW(),
-    "StartDate" timestamp,
-    "EndDate" timestamp,
-    "Description" text,
-    "Definition" xml
-);
-
-
-ALTER TABLE "Project" OWNER TO :POSTGRES_USER;
-
-
-COMMENT ON TABLE "Project" IS 'Table of project managed in the system';
-
-
-COMMENT ON COLUMN "Project"."ID" IS 'Unique identifier and primary key of item';
-
-
-COMMENT ON COLUMN "Project"."Label" IS 'A human readable long label of the item';
-
-
-
-COMMENT ON COLUMN "Project"."Abbreviation" IS 'A human readable abbreviation of the item';
-
-
-COMMENT ON COLUMN "Project"."Reference" IS 'Additional reference data for the item along with information to allow how the item reached the system (e.g. via an external vocabulary)';
-
-
-
-COMMENT ON COLUMN "Project"."Uri" IS 'URI of item';
-
-
-
-COMMENT ON COLUMN "Project"."Definition" IS 'More data about the project such as web site, start/stop, etc';
-
-
-
-CREATE TABLE "Researcher" (
-    "ID" uuid  DEFAULT uuid_generate_v4() NOT NULL,
-    "Label" character varying(250) NOT NULL,
-    "Uri" character varying(250),
-    "PrimaryEmail" character varying(250),
-    "Definition" xml,
-    "Status" smallint not null default 0,
-    "Created" timestamp not null default NOW(),
-    "Modified" timestamp not null default NOW(),
-    "Reference" xml
-);
-
-
-ALTER TABLE "Researcher" OWNER TO :POSTGRES_USER;
-
-
-
-COMMENT ON TABLE "Researcher" IS 'Table of Researcher managed in the system';
-
-
-
-COMMENT ON COLUMN "Researcher"."ID" IS 'Unique identifier and primary key of item';
-
-
-
-COMMENT ON COLUMN "Researcher"."Label" IS 'Full name of the researcher (as presented by the system, and composed automatically by data or provided by the reference service)';
-
-
-
-COMMENT ON COLUMN "Researcher"."Uri" IS 'URI of item';
-
-
-
-COMMENT ON COLUMN "Researcher"."Definition" IS 'More data about the researcher such as: email addresses, affiliations etc';
-
-
-COMMENT ON COLUMN "Researcher"."Reference" IS 'Additional reference data for the item along with information to allow how the item reached the system (e.g. via an external vocabulary)';
-
-
-ALTER TABLE ONLY "DMPProfile"
-    ADD CONSTRAINT "DMPPRofile_pkey" PRIMARY KEY ("ID");
-
-
-ALTER TABLE ONLY "DMP"
-    ADD CONSTRAINT "DMP_pkey" PRIMARY KEY ("ID");
-
-
-ALTER TABLE ONLY "DatasetProfile"
-    ADD CONSTRAINT "DatasetProfile_pkey" PRIMARY KEY ("ID");
-
-
-ALTER TABLE ONLY "DatasetProfileRuleset"
-    ADD CONSTRAINT "DatasetProfileRuleset_pkey" PRIMARY KEY ("ID");
-
-
-ALTER TABLE ONLY "DatasetProfileViewstyle"
-    ADD CONSTRAINT "DatasetProfileViewstyle_pkey" PRIMARY KEY ("ID");
-
-
-ALTER TABLE ONLY "Dataset"
-    ADD CONSTRAINT "Dataset_pkey" PRIMARY KEY ("ID");
-
-
-ALTER TABLE ONLY "Organisation"
-    ADD CONSTRAINT "Organisation_pkey" PRIMARY KEY ("ID");
-
-ALTER TABLE ONLY "DMPOrganisation"
-    ADD CONSTRAINT "PKey_DMPOrganisation" PRIMARY KEY ("ID");
-
-ALTER TABLE ONLY "DMPResearcher"
-    ADD CONSTRAINT "PKey_DMPResearcher" PRIMARY KEY ("ID");
-
-
-ALTER TABLE ONLY "Project"
-    ADD CONSTRAINT "Project_pkey" PRIMARY KEY ("ID");
-
-
-ALTER TABLE ONLY "Researcher"
-    ADD CONSTRAINT "Researcher_pkey" PRIMARY KEY ("ID");
-
-
-CREATE INDEX "fki_DMPDMPProfileReference" ON "DMP" USING btree ("Profile");
-
-CREATE INDEX "fki_DatasetDatasetProfileReference" ON "Dataset" USING btree ("Profile");
-
-
-ALTER TABLE ONLY "DMP"
-    ADD CONSTRAINT "DMPDMPProfileReference" FOREIGN KEY ("Profile") REFERENCES "DMPProfile"("ID");
-
-
-ALTER TABLE ONLY "DMPOrganisation"
-    ADD CONSTRAINT "DMPOrganisationDMPReference" FOREIGN KEY ("Organisation") REFERENCES "Organisation"("ID");
-
-
-ALTER TABLE ONLY "DMPOrganisation"
-    ADD CONSTRAINT "DMPOrganisationOrganisationReference" FOREIGN KEY ("DMP") REFERENCES "DMP"("ID");
-
-
-ALTER TABLE ONLY "DMP"
-    ADD CONSTRAINT "DMPProjectReference" FOREIGN KEY ("Project") REFERENCES "Project"("ID");
-
-ALTER TABLE ONLY "DMPResearcher"
-    ADD CONSTRAINT "DMPResearcherDMPReference" FOREIGN KEY ("Researcher") REFERENCES "Researcher"("ID");
-
-
-ALTER TABLE ONLY "DMPResearcher"
-    ADD CONSTRAINT "DMPResearcherResearcherReference" FOREIGN KEY ("DMP") REFERENCES "DMP"("ID");
-
-
-ALTER TABLE ONLY "Dataset"
-    ADD CONSTRAINT "DatasetDatasetProfileReference" FOREIGN KEY ("Profile") REFERENCES "DatasetProfile"("ID");
-
-
-ALTER TABLE ONLY "Dataset"
-    ADD CONSTRAINT "DatasetDMPReference" FOREIGN KEY ("DMP") REFERENCES "DMP"("ID");
-
-
-ALTER TABLE ONLY "DatasetProfile"
-    ADD CONSTRAINT "DatasetProfileDatasetProfileRulesetReference" FOREIGN KEY ("Ruleset") REFERENCES "DatasetProfileRuleset"("ID");
-
-ALTER TABLE ONLY "DatasetProfile"
-    ADD CONSTRAINT "DatasetProfileDatasetProfileViewstyleReference" FOREIGN KEY ("Viewstyle") REFERENCES "DatasetProfileViewstyle"("ID");
-
-
-CREATE TABLE "Service" (
-    "ID" uuid  DEFAULT uuid_generate_v4() NOT NULL,
-    "Label" character varying(250),
-    "Abbreviation" character varying(50),
-    "Reference" xml,
-    "Uri" character varying(250),
-    "Status" smallint not null default 0,
-    "Created" timestamp not null default NOW(),
-    "Modified" timestamp not null default NOW(),
-    "Definition" xml
-);
-
-ALTER TABLE "Service" OWNER TO :POSTGRES_USER;
-
-ALTER TABLE ONLY "Service"
-    ADD CONSTRAINT "PKey_Service" PRIMARY KEY ("ID");
-
-
-CREATE TABLE "DataRepository" (
-    "ID" uuid  DEFAULT uuid_generate_v4() NOT NULL,
-    "Label" character varying(250),
-    "Abbreviation" character varying(50),
-    "Reference" xml,
-    "Uri" character varying(250),
-    "Status" smallint not null default 0,
-    "Created" timestamp not null default NOW(),
-    "Modified" timestamp not null default NOW(),
-    "Definition" xml
-);
-
-ALTER TABLE "DataRepository" OWNER TO :POSTGRES_USER;
-
-ALTER TABLE ONLY "DataRepository"
-    ADD CONSTRAINT "PKey_DataRepository" PRIMARY KEY ("ID");
-
-
-
-CREATE TABLE "Registry" (
-    "ID" uuid  DEFAULT uuid_generate_v4() NOT NULL,
-    "Label" character varying(250),
-    "Abbreviation" character varying(50),
-    "Reference" xml,
-    "Uri" character varying(250),
-    "Status" smallint not null default 0,
-    "Created" timestamp not null default NOW(),
-    "Modified" timestamp not null default NOW(),
-    "Definition" xml
-);
-
-ALTER TABLE "Registry" OWNER TO :POSTGRES_USER;
-
-ALTER TABLE ONLY "Registry"
-    ADD CONSTRAINT "PKey_Registry" PRIMARY KEY ("ID");
-
-
-
-CREATE TABLE "DatasetService" (
-    "Dataset" uuid NOT NULL,
-    "Service" uuid NOT NULL,
-    "Role" integer,
-    "ID" uuid DEFAULT uuid_generate_v4() NOT NULL
-);
-
-ALTER TABLE "DatasetService" OWNER TO :POSTGRES_USER;
-
-COMMENT ON TABLE "DatasetService" IS 'Linking Dataset to Service';
-
-
-CREATE TABLE "DatasetRegistry" (
-    "Dataset" uuid NOT NULL,
-    "Registry" uuid NOT NULL,
-    "Role" integer,
-    "ID" uuid DEFAULT uuid_generate_v4() NOT NULL
-);
-
-ALTER TABLE "DatasetRegistry" OWNER TO :POSTGRES_USER;
-
-COMMENT ON TABLE "DatasetRegistry" IS 'Linking Dataset to Registry';
-
-
-CREATE TABLE "DatasetDataRepository" (
-    "Dataset" uuid NOT NULL,
-    "DataRepository" uuid NOT NULL,
-    "Role" integer,
-    "ID" uuid DEFAULT uuid_generate_v4() NOT NULL
-);
-
-
-ALTER TABLE "DatasetDataRepository" OWNER TO :POSTGRES_USER;
-
-COMMENT ON TABLE "DatasetDataRepository" IS 'Linking Dataset to DataRepository';
-
-
-ALTER TABLE ONLY "DatasetDataRepository"
-    ADD CONSTRAINT "DatasetDataRepositoryDatasetReference" FOREIGN KEY ("Dataset") REFERENCES "Dataset"("ID");
-
-ALTER TABLE ONLY "DatasetDataRepository"
-    ADD CONSTRAINT "DatasetDataRepositoryDataRepositoryReference" FOREIGN KEY ("DataRepository") REFERENCES "DataRepository"("ID");
-
-
-ALTER TABLE ONLY "DatasetRegistry"
-    ADD CONSTRAINT "DatasetRegistryDatasetReference" FOREIGN KEY ("Dataset") REFERENCES "Dataset"("ID");
-
-ALTER TABLE ONLY "DatasetRegistry"
-    ADD CONSTRAINT "DatasetRegistryRegistryReference" FOREIGN KEY ("Registry") REFERENCES "Registry"("ID");
-
-
-ALTER TABLE ONLY "DatasetService"
-    ADD CONSTRAINT "DatasetServiceDatasetReference" FOREIGN KEY ("Dataset") REFERENCES "Dataset"("ID");
-
-ALTER TABLE ONLY "DatasetService"
-    ADD CONSTRAINT "DatasetServiceServiceReference" FOREIGN KEY ("Service") REFERENCES "Service"("ID");
-
-
-
-CREATE TABLE "UserInfo" (
-    "id" uuid  DEFAULT uuid_generate_v4() UNIQUE NOT NULL,
-    "email" character varying(250) UNIQUE NOT NULL,
-    "authorization_level" smallint NOT NULL,
-    "usertype" smallint NOT NULL,
-    "authentication" uuid,
-    "verified_email" boolean,
-    "name" character varying(250),
-    "created" timestamp not null,
-    "lastloggedin" timestamp,
-    "additionalinfo" xml,
-    PRIMARY KEY (id)
-);
-
-COMMENT ON COLUMN "UserInfo"."authorization_level" IS 'This stores the authorization level of the user: 0 admin, 1 user, being able to be extended furthermore';
-COMMENT ON COLUMN "UserInfo"."usertype" IS 'This stores the type of user: 0 -> internal, 1 external';
-
-
-CREATE TABLE "UserAuth" (
-    "id" uuid  DEFAULT uuid_generate_v4() NOT NULL UNIQUE,
-    "username" character varying(200) NOT NULL,
-    "password" character varying(250) NOT NULL,
-     PRIMARY KEY (username)
-);
-
-CREATE INDEX idx_userauth_username ON "UserAuth"(username);
-
-ALTER TABLE "UserInfo" ADD CONSTRAINT fkey_userinfo_userauth FOREIGN KEY ("authentication") REFERENCES "UserAuth"(id);
-
-COMMENT ON COLUMN "UserAuth"."password" IS 'This field stores a password hash';
-
-
-create table "UserDMP" (
-   "id" uuid  DEFAULT uuid_generate_v4() NOT NULL,
-   "usr" uuid NOT NULL,
-   "dmp" uuid NOT NUll,
-   "role" integer
-);
-
-ALTER TABLE "UserDMP" ADD CONSTRAINT fkey_userdmp_user FOREIGN KEY (usr) REFERENCES "UserInfo"("id");
-ALTER TABLE "UserDMP" ADD CONSTRAINT fkey_userdmp_dmp FOREIGN KEY (dmp) REFERENCES "DMP"("ID");
-
-
-ALTER TABLE "DMP" ADD CONSTRAINT fk_dmp_creator FOREIGN KEY ("Creator") REFERENCES "UserInfo"(id);
-ALTER TABLE "Dataset" ADD CONSTRAINT fk_dataset_creator FOREIGN KEY ("Creator") REFERENCES "UserInfo"(id);
-ALTER TABLE "Project" ADD CONSTRAINT fk_project_creator FOREIGN KEY ("CreationUser") REFERENCES "UserInfo"(id);
-
-
-
-ALTER TABLE "UserInfo" OWNER TO :POSTGRES_USER;
-ALTER TABLE "UserAuth" OWNER TO :POSTGRES_USER;
-ALTER TABLE "UserDMP" OWNER TO :POSTGRES_USER;
-
-
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
--- REVOKE ALL ON SCHEMA public FROM postgres;
--- GRANT ALL ON SCHEMA public TO postgres;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
diff --git a/dmp-db-scema/main/data-dump.sql b/dmp-db-scema/main/data-dump.sql
new file mode 100644
index 000000000..297407a37
--- /dev/null
+++ b/dmp-db-scema/main/data-dump.sql
@@ -0,0 +1,17 @@
+INSERT INTO public."UserInfo"(email, authorization_level, usertype, name, created, additionalinfo) VALUES ('fake@email.org', 1, 1, :'ADMIN_USERNAME', now(), '{}');
+
+INSERT INTO public."Credential" VALUES (uuid_generate_v4(), 0, 5, :'ADMIN_USERNAME', :'ADMIN_PASSWORD', now(), now(), (SELECT public."UserInfo"."id" FROM public."UserInfo" WHERE name = :'ADMIN_USERNAME'), 'dmp');
+
+INSERT INTO public."UserRole"("Role", "UserId") VALUES (2, (SELECT public."UserInfo"."id" FROM public."UserInfo" WHERE name = :'ADMIN_USERNAME'));
+
+INSERT INTO public."DoiFunder"(name, doi) VALUES ('Australian Research Council',	'10.13039/501100000923');
+INSERT INTO public."DoiFunder"(name, doi) VALUES ('European Commission', '10.13039/501100000780');
+INSERT INTO public."DoiFunder"(name, doi) VALUES ('Fundação para a Ciência e a Tecnologia', '10.13039/501100001871');
+INSERT INTO public."DoiFunder"(name, doi) VALUES ('Ministarstvo Prosvete, Nauke i Tehnološkog Razvoja', '10.13039/501100004564');
+INSERT INTO public."DoiFunder"(name, doi) VALUES ('Ministarstvo Znanosti, Obrazovanja i Sporta',	'10.13039/501100006588');
+INSERT INTO public."DoiFunder"(name, doi) VALUES ('National Health and Medical Research Council', '10.13039/501100000925');
+INSERT INTO public."DoiFunder"(name, doi) VALUES ('National Science Foundation','10.13039/100000001');
+INSERT INTO public."DoiFunder"(name, doi) VALUES ('Nederlandse Organisatie voor Wetenschappelijk Onderzoek',	'10.13039/501100003246');
+INSERT INTO public."DoiFunder"(name, doi) VALUES ('Wellcome Trust', '10.13039/100004440');
+
+INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.00.002', '2020-05-06 18:11:00.000000+03', now(), 'Add Doi Funder');
\ No newline at end of file
diff --git a/dmp-db-scema/main/dmp-dump.sql b/dmp-db-scema/main/dmp-dump.sql
new file mode 100644
index 000000000..494e71730
--- /dev/null
+++ b/dmp-db-scema/main/dmp-dump.sql
@@ -0,0 +1,1657 @@
+--
+-- PostgreSQL database dump
+--
+
+-- Dumped from database version 9.6.10
+-- Dumped by pg_dump version 11.2
+
+-- Started on 2020-05-12 17:07:27
+
+SET statement_timeout = 0;
+SET lock_timeout = 0;
+SET idle_in_transaction_session_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = on;
+SELECT pg_catalog.set_config('search_path', '', false);
+SET check_function_bodies = false;
+SET client_min_messages = warning;
+SET row_security = off;
+
+--
+-- TOC entry 2 (class 3079 OID 18451)
+-- Name: uuid-ossp; Type: EXTENSION; Schema: -; Owner: 
+--
+
+CREATE EXTENSION IF NOT EXISTS "uuid-ossp" WITH SCHEMA public;
+
+
+--
+-- TOC entry 2477 (class 0 OID 0)
+-- Dependencies: 2
+-- Name: EXTENSION "uuid-ossp"; Type: COMMENT; Schema: -; Owner: 
+--
+
+COMMENT ON EXTENSION "uuid-ossp" IS 'generate universally unique identifiers (UUIDs)';
+
+
+SET default_tablespace = '';
+
+SET default_with_oids = false;
+
+--
+-- TOC entry 186 (class 1259 OID 37851)
+-- Name: Content; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."Content" (
+    "Id" uuid NOT NULL,
+    "Filename" character varying NOT NULL,
+    "Extension" character varying NOT NULL,
+    "ParentType" numeric NOT NULL,
+    "Uri" character varying NOT NULL,
+    "LocationType" numeric NOT NULL
+);
+
+
+ALTER TABLE public."Content" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 187 (class 1259 OID 37857)
+-- Name: Credential; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."Credential" (
+    "Id" uuid NOT NULL,
+    "Status" numeric NOT NULL,
+    "Provider" numeric NOT NULL,
+    "Public" character varying NOT NULL,
+    "Secret" character varying NOT NULL,
+    "CreationTime" date NOT NULL,
+    "LastUpdateTime" date NOT NULL,
+    "UserId" uuid NOT NULL,
+    "ExternalId" character varying NOT NULL
+);
+
+
+ALTER TABLE public."Credential" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 218 (class 1259 OID 46438)
+-- Name: DBVersion; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."DBVersion" (
+    key character varying NOT NULL,
+    version character varying NOT NULL,
+    "releasedAt" timestamp with time zone NOT NULL,
+    "deployedAt" timestamp with time zone,
+    description text
+);
+
+
+ALTER TABLE public."DBVersion" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 188 (class 1259 OID 37863)
+-- Name: DMP; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."DMP" (
+    "ID" uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    "GroupId" uuid,
+    "Label" character varying(250) NOT NULL,
+    "Version" integer NOT NULL,
+    "Grant" uuid NOT NULL,
+    "AssociatedDmps" xml,
+    "Profile" uuid,
+    "Status" smallint DEFAULT 0 NOT NULL,
+    "Created" timestamp without time zone DEFAULT now() NOT NULL,
+    "Modified" timestamp without time zone DEFAULT now() NOT NULL,
+    "Description" text,
+    "Creator" uuid,
+    "Properties" text,
+    "DmpProperties" text,
+    "FinalizedAt" timestamp(6) with time zone,
+    "isPublic" boolean DEFAULT false NOT NULL,
+    "PublishedAt" timestamp(6) with time zone,
+    "DOI" text,
+    "Project" uuid
+);
+
+
+ALTER TABLE public."DMP" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 2478 (class 0 OID 0)
+-- Dependencies: 188
+-- Name: COLUMN "DMP"."AssociatedDmps"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON COLUMN public."DMP"."AssociatedDmps" IS 'More data about the DMP as defined by the profile';
+
+
+--
+-- TOC entry 212 (class 1259 OID 38303)
+-- Name: DMPDatasetProfile; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."DMPDatasetProfile" (
+    "ID" uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    dmp uuid NOT NULL,
+    datasetprofile uuid NOT NULL
+);
+
+
+ALTER TABLE public."DMPDatasetProfile" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 189 (class 1259 OID 37873)
+-- Name: DMPOrganisation; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."DMPOrganisation" (
+    "DMP" uuid NOT NULL,
+    "Organisation" uuid NOT NULL,
+    "Role" integer,
+    "ID" uuid DEFAULT public.uuid_generate_v4() NOT NULL
+);
+
+
+ALTER TABLE public."DMPOrganisation" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 2479 (class 0 OID 0)
+-- Dependencies: 189
+-- Name: TABLE "DMPOrganisation"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON TABLE public."DMPOrganisation" IS 'Linking of DMPs to Organisations';
+
+
+--
+-- TOC entry 2480 (class 0 OID 0)
+-- Dependencies: 189
+-- Name: COLUMN "DMPOrganisation"."Role"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON COLUMN public."DMPOrganisation"."Role" IS 'Enumerator of roles';
+
+
+--
+-- TOC entry 190 (class 1259 OID 37877)
+-- Name: DMPProfile; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."DMPProfile" (
+    "ID" uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    "Label" character varying(250) NOT NULL,
+    "Definition" xml,
+    "Status" smallint DEFAULT 0 NOT NULL,
+    "Created" timestamp without time zone DEFAULT now() NOT NULL,
+    "Modified" timestamp without time zone DEFAULT now() NOT NULL
+);
+
+
+ALTER TABLE public."DMPProfile" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 191 (class 1259 OID 37887)
+-- Name: DMPResearcher; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."DMPResearcher" (
+    "DMP" uuid NOT NULL,
+    "Researcher" uuid NOT NULL,
+    "Role" integer,
+    "ID" uuid DEFAULT public.uuid_generate_v4() NOT NULL
+);
+
+
+ALTER TABLE public."DMPResearcher" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 2481 (class 0 OID 0)
+-- Dependencies: 191
+-- Name: TABLE "DMPResearcher"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON TABLE public."DMPResearcher" IS 'Linking of DMPs to researchers';
+
+
+--
+-- TOC entry 2482 (class 0 OID 0)
+-- Dependencies: 191
+-- Name: COLUMN "DMPResearcher"."Role"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON COLUMN public."DMPResearcher"."Role" IS 'Enumerator of roles';
+
+
+--
+-- TOC entry 192 (class 1259 OID 37891)
+-- Name: DataRepository; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."DataRepository" (
+    "ID" uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    "Label" character varying(250),
+    "Abbreviation" character varying(50),
+    "Reference" character varying,
+    "Uri" character varying(250),
+    "Definition" xml,
+    "Status" smallint DEFAULT 0 NOT NULL,
+    "Created" timestamp without time zone DEFAULT now() NOT NULL,
+    "Modified" timestamp without time zone DEFAULT now() NOT NULL,
+    "CreationUser" uuid
+);
+
+
+ALTER TABLE public."DataRepository" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 193 (class 1259 OID 37901)
+-- Name: Dataset; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."Dataset" (
+    "ID" uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    "Label" character varying(250) NOT NULL,
+    "DMP" uuid,
+    "Uri" character varying(250),
+    "Properties" text,
+    "Profile" uuid,
+    "Reference" text,
+    "Status" smallint DEFAULT 0 NOT NULL,
+    "Created" timestamp without time zone DEFAULT now() NOT NULL,
+    "Modified" timestamp without time zone DEFAULT now() NOT NULL,
+    "Description" text,
+    "Creator" uuid,
+    "FinalizedAt" timestamp(6) with time zone
+);
+
+
+ALTER TABLE public."Dataset" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 2483 (class 0 OID 0)
+-- Dependencies: 193
+-- Name: COLUMN "Dataset"."Uri"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON COLUMN public."Dataset"."Uri" IS 'URI of item';
+
+
+--
+-- TOC entry 2484 (class 0 OID 0)
+-- Dependencies: 193
+-- Name: COLUMN "Dataset"."Properties"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON COLUMN public."Dataset"."Properties" IS 'More data about the dataset such as Uri, data types etc as defined by the profile';
+
+
+--
+-- TOC entry 194 (class 1259 OID 37912)
+-- Name: DatasetDataRepository; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."DatasetDataRepository" (
+    "Dataset" uuid NOT NULL,
+    "DataRepository" uuid NOT NULL,
+    "Role" integer,
+    "ID" uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    "Data" character varying
+);
+
+
+ALTER TABLE public."DatasetDataRepository" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 2485 (class 0 OID 0)
+-- Dependencies: 194
+-- Name: TABLE "DatasetDataRepository"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON TABLE public."DatasetDataRepository" IS 'Linking Dataset to DataRepository';
+
+
+--
+-- TOC entry 195 (class 1259 OID 37916)
+-- Name: DatasetExternalDataset; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."DatasetExternalDataset" (
+    "Id" uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    "Dataset" uuid NOT NULL,
+    "ExternalDataset" uuid NOT NULL,
+    "Role" numeric,
+    "Data" character varying
+);
+
+
+ALTER TABLE public."DatasetExternalDataset" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 196 (class 1259 OID 37923)
+-- Name: DatasetProfile; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."DatasetProfile" (
+    "ID" uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    "Label" character varying(250) NOT NULL,
+    "Definition" xml NOT NULL,
+    "Status" smallint DEFAULT 0 NOT NULL,
+    "Created" timestamp without time zone DEFAULT now() NOT NULL,
+    "Modified" timestamp without time zone DEFAULT now() NOT NULL,
+    "Description" text NOT NULL,
+    "GroupId" uuid DEFAULT public.uuid_generate_v1() NOT NULL,
+    "Version" integer DEFAULT 0 NOT NULL
+);
+
+
+ALTER TABLE public."DatasetProfile" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 2486 (class 0 OID 0)
+-- Dependencies: 196
+-- Name: TABLE "DatasetProfile"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON TABLE public."DatasetProfile" IS 'Profiles for dmp datasets';
+
+
+--
+-- TOC entry 197 (class 1259 OID 37933)
+-- Name: DatasetProfileRuleset; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."DatasetProfileRuleset" (
+    "ID" uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    "Label" character varying(250) NOT NULL,
+    "Definition" xml NOT NULL
+);
+
+
+ALTER TABLE public."DatasetProfileRuleset" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 2487 (class 0 OID 0)
+-- Dependencies: 197
+-- Name: TABLE "DatasetProfileRuleset"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON TABLE public."DatasetProfileRuleset" IS 'Sets of Rules for dmp dataset profiles';
+
+
+--
+-- TOC entry 198 (class 1259 OID 37940)
+-- Name: DatasetProfileViewstyle; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."DatasetProfileViewstyle" (
+    "ID" uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    "Label" character varying(250) NOT NULL,
+    "Definition" xml NOT NULL
+);
+
+
+ALTER TABLE public."DatasetProfileViewstyle" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 2488 (class 0 OID 0)
+-- Dependencies: 198
+-- Name: TABLE "DatasetProfileViewstyle"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON TABLE public."DatasetProfileViewstyle" IS 'Style sets for dmp dataset profiles';
+
+
+--
+-- TOC entry 199 (class 1259 OID 37947)
+-- Name: DatasetRegistry; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."DatasetRegistry" (
+    "Dataset" uuid NOT NULL,
+    "Registry" uuid NOT NULL,
+    "Role" integer,
+    "ID" uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    "Data" character varying
+);
+
+
+ALTER TABLE public."DatasetRegistry" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 2489 (class 0 OID 0)
+-- Dependencies: 199
+-- Name: TABLE "DatasetRegistry"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON TABLE public."DatasetRegistry" IS 'Linking Dataset to Registry';
+
+
+--
+-- TOC entry 200 (class 1259 OID 37951)
+-- Name: DatasetService; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."DatasetService" (
+    "Dataset" uuid NOT NULL,
+    "Service" uuid NOT NULL,
+    "Role" integer,
+    "ID" uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    "Data" character varying
+);
+
+
+ALTER TABLE public."DatasetService" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 2490 (class 0 OID 0)
+-- Dependencies: 200
+-- Name: TABLE "DatasetService"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON TABLE public."DatasetService" IS 'Linking Dataset to Service';
+
+
+--
+-- TOC entry 220 (class 1259 OID 46459)
+-- Name: DoiFunder; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."DoiFunder" (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    name character varying,
+    doi character varying
+);
+
+
+ALTER TABLE public."DoiFunder" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 201 (class 1259 OID 37955)
+-- Name: ExternalDataset; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."ExternalDataset" (
+    "Id" uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    "Label" character varying NOT NULL,
+    "Abbreviation" character varying,
+    "Reference" character varying NOT NULL,
+    "Created" date NOT NULL,
+    "Modified" date NOT NULL,
+    "CreationUser" uuid
+);
+
+
+ALTER TABLE public."ExternalDataset" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 214 (class 1259 OID 38352)
+-- Name: Funder; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."Funder" (
+    "ID" uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    "Label" character varying(250) NOT NULL,
+    "Reference" character varying,
+    "Definition" character varying,
+    "Status" smallint DEFAULT 0 NOT NULL,
+    "Created" timestamp(4) with time zone DEFAULT now() NOT NULL,
+    "Modified" timestamp(4) with time zone DEFAULT now() NOT NULL,
+    "Type" numeric DEFAULT 0 NOT NULL,
+    "CreationUser" uuid
+);
+
+
+ALTER TABLE public."Funder" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 204 (class 1259 OID 37978)
+-- Name: Grant; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."Grant" (
+    "ID" uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    "Label" character varying(250) NOT NULL,
+    "Abbreviation" character varying(50),
+    "Reference" character varying,
+    "Uri" character varying(250),
+    "Definition" character varying,
+    "Status" smallint DEFAULT 0 NOT NULL,
+    "Created" timestamp without time zone DEFAULT now() NOT NULL,
+    "Modified" timestamp without time zone DEFAULT now() NOT NULL,
+    "StartDate" timestamp without time zone,
+    "EndDate" timestamp without time zone,
+    "Description" text,
+    "CreationUser" uuid DEFAULT '332ffc36-bd51-4d4e-bf9a-ffb01fdee05a'::uuid,
+    "Type" numeric DEFAULT 0 NOT NULL,
+    "Content" uuid,
+    "Funder" uuid
+);
+
+
+ALTER TABLE public."Grant" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 2491 (class 0 OID 0)
+-- Dependencies: 204
+-- Name: TABLE "Grant"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON TABLE public."Grant" IS 'Table of project managed in the system';
+
+
+--
+-- TOC entry 2492 (class 0 OID 0)
+-- Dependencies: 204
+-- Name: COLUMN "Grant"."ID"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON COLUMN public."Grant"."ID" IS 'Unique identifier and primary key of item';
+
+
+--
+-- TOC entry 2493 (class 0 OID 0)
+-- Dependencies: 204
+-- Name: COLUMN "Grant"."Label"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON COLUMN public."Grant"."Label" IS 'A human readable long label of the item';
+
+
+--
+-- TOC entry 2494 (class 0 OID 0)
+-- Dependencies: 204
+-- Name: COLUMN "Grant"."Abbreviation"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON COLUMN public."Grant"."Abbreviation" IS 'A human readable abbreviation of the item';
+
+
+--
+-- TOC entry 2495 (class 0 OID 0)
+-- Dependencies: 204
+-- Name: COLUMN "Grant"."Reference"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON COLUMN public."Grant"."Reference" IS 'Additional reference data for the item along with information to allow how the item reached the system (e.g. via an external vocabulary)';
+
+
+--
+-- TOC entry 2496 (class 0 OID 0)
+-- Dependencies: 204
+-- Name: COLUMN "Grant"."Uri"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON COLUMN public."Grant"."Uri" IS 'URI of item';
+
+
+--
+-- TOC entry 2497 (class 0 OID 0)
+-- Dependencies: 204
+-- Name: COLUMN "Grant"."Definition"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON COLUMN public."Grant"."Definition" IS 'More data about the project such as web site, start/stop, etc';
+
+
+--
+-- TOC entry 202 (class 1259 OID 37962)
+-- Name: Invitation; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."Invitation" (
+    "Id" uuid NOT NULL,
+    "InvitationEmail" character varying NOT NULL,
+    "Token" uuid NOT NULL,
+    "CreationUser" uuid NOT NULL,
+    "Dmp" uuid NOT NULL,
+    "Properties" xml,
+    "AcceptedInvitation" boolean
+);
+
+
+ALTER TABLE public."Invitation" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 216 (class 1259 OID 38423)
+-- Name: Lock; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."Lock" (
+    id uuid NOT NULL,
+    "Target" uuid NOT NULL,
+    "LockedBy" uuid NOT NULL,
+    "LockedAt" timestamp without time zone NOT NULL,
+    "TouchedAt" timestamp without time zone
+);
+
+
+ALTER TABLE public."Lock" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 213 (class 1259 OID 38343)
+-- Name: LoginConfirmationEmail; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."LoginConfirmationEmail" (
+    "ID" uuid NOT NULL,
+    email character varying NOT NULL,
+    "isConfirmed" boolean NOT NULL,
+    token uuid NOT NULL,
+    "userId" uuid NOT NULL,
+    "expiresAt" timestamp(4) with time zone NOT NULL
+);
+
+
+ALTER TABLE public."LoginConfirmationEmail" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 217 (class 1259 OID 38433)
+-- Name: Notification; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."Notification" (
+    id uuid NOT NULL,
+    "UserId" uuid,
+    "IsActive" integer NOT NULL,
+    "Type" integer NOT NULL,
+    "ContactTypeHint" integer,
+    "ContactHint" character varying,
+    "Data" character varying,
+    "NotifyState" integer NOT NULL,
+    "NotifiedAt" timestamp without time zone,
+    "RetryCount" integer,
+    "CreatedAt" timestamp without time zone,
+    "UpdatedAt" timestamp without time zone
+);
+
+
+ALTER TABLE public."Notification" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 203 (class 1259 OID 37968)
+-- Name: Organisation; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."Organisation" (
+    "ID" uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    "Label" character varying(250) NOT NULL,
+    "Abbreviation" character varying(50),
+    "Reference" character varying,
+    "Uri" character varying(250),
+    "Definition" xml,
+    "Status" smallint DEFAULT 0 NOT NULL,
+    "Created" timestamp without time zone DEFAULT now() NOT NULL,
+    "Modified" timestamp without time zone DEFAULT now() NOT NULL
+);
+
+
+ALTER TABLE public."Organisation" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 2498 (class 0 OID 0)
+-- Dependencies: 203
+-- Name: TABLE "Organisation"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON TABLE public."Organisation" IS 'Table of organizations utilized in the project';
+
+
+--
+-- TOC entry 2499 (class 0 OID 0)
+-- Dependencies: 203
+-- Name: COLUMN "Organisation"."ID"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON COLUMN public."Organisation"."ID" IS 'Unique identifier and primary key of item';
+
+
+--
+-- TOC entry 2500 (class 0 OID 0)
+-- Dependencies: 203
+-- Name: COLUMN "Organisation"."Label"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON COLUMN public."Organisation"."Label" IS 'A human readable long label of the item';
+
+
+--
+-- TOC entry 2501 (class 0 OID 0)
+-- Dependencies: 203
+-- Name: COLUMN "Organisation"."Abbreviation"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON COLUMN public."Organisation"."Abbreviation" IS 'A human readable abbreviation of the item';
+
+
+--
+-- TOC entry 2502 (class 0 OID 0)
+-- Dependencies: 203
+-- Name: COLUMN "Organisation"."Reference"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON COLUMN public."Organisation"."Reference" IS 'Reference to the URI of the item along with information to allow how the item reached the system (e.g. via an external vocabulary)';
+
+
+--
+-- TOC entry 2503 (class 0 OID 0)
+-- Dependencies: 203
+-- Name: COLUMN "Organisation"."Uri"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON COLUMN public."Organisation"."Uri" IS 'URI of item';
+
+
+--
+-- TOC entry 2504 (class 0 OID 0)
+-- Dependencies: 203
+-- Name: COLUMN "Organisation"."Definition"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON COLUMN public."Organisation"."Definition" IS 'More data about the Organisation such as web site, type etc';
+
+
+--
+-- TOC entry 215 (class 1259 OID 38365)
+-- Name: Project; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."Project" (
+    "ID" uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    "Label" character varying(250) NOT NULL,
+    "Abbreviation" character varying(50),
+    "Reference" character varying,
+    "Uri" character varying(250),
+    "Definition" character varying,
+    "Status" smallint DEFAULT 0 NOT NULL,
+    "Created" timestamp(4) with time zone DEFAULT now() NOT NULL,
+    "Modified" timestamp(4) with time zone DEFAULT now() NOT NULL,
+    "StartDate" timestamp(4) with time zone,
+    "EndDate" timestamp(4) with time zone,
+    "Description" text,
+    "CreationUser" uuid,
+    "Type" numeric DEFAULT 0 NOT NULL,
+    "Content" uuid
+);
+
+
+ALTER TABLE public."Project" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 205 (class 1259 OID 37990)
+-- Name: Registry; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."Registry" (
+    "ID" uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    "Label" character varying(250),
+    "Abbreviation" character varying(50),
+    "Reference" character varying,
+    "Uri" character varying(250),
+    "Definition" xml,
+    "Status" smallint DEFAULT 0 NOT NULL,
+    "Created" timestamp without time zone DEFAULT now() NOT NULL,
+    "Modified" timestamp without time zone DEFAULT now() NOT NULL,
+    "CreationUser" uuid
+);
+
+
+ALTER TABLE public."Registry" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 206 (class 1259 OID 38000)
+-- Name: Researcher; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."Researcher" (
+    "ID" uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    "Label" character varying(250) NOT NULL,
+    "Uri" character varying(250),
+    "PrimaryEmail" character varying(250),
+    "Definition" xml,
+    "Reference" character varying,
+    "Status" smallint DEFAULT 0 NOT NULL,
+    "Created" timestamp without time zone DEFAULT now() NOT NULL,
+    "Modified" timestamp without time zone DEFAULT now() NOT NULL,
+    "CreationUser" uuid
+);
+
+
+ALTER TABLE public."Researcher" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 2505 (class 0 OID 0)
+-- Dependencies: 206
+-- Name: TABLE "Researcher"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON TABLE public."Researcher" IS 'Table of Researcher managed in the system';
+
+
+--
+-- TOC entry 2506 (class 0 OID 0)
+-- Dependencies: 206
+-- Name: COLUMN "Researcher"."ID"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON COLUMN public."Researcher"."ID" IS 'Unique identifier and primary key of item';
+
+
+--
+-- TOC entry 2507 (class 0 OID 0)
+-- Dependencies: 206
+-- Name: COLUMN "Researcher"."Label"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON COLUMN public."Researcher"."Label" IS 'Full name of the researcher (as presented by the system, and composed automatically by data or provided by the reference service)';
+
+
+--
+-- TOC entry 2508 (class 0 OID 0)
+-- Dependencies: 206
+-- Name: COLUMN "Researcher"."Uri"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON COLUMN public."Researcher"."Uri" IS 'URI of item';
+
+
+--
+-- TOC entry 2509 (class 0 OID 0)
+-- Dependencies: 206
+-- Name: COLUMN "Researcher"."Definition"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON COLUMN public."Researcher"."Definition" IS 'More data about the researcher such as: email addresses, affiliations etc';
+
+
+--
+-- TOC entry 2510 (class 0 OID 0)
+-- Dependencies: 206
+-- Name: COLUMN "Researcher"."Reference"; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON COLUMN public."Researcher"."Reference" IS 'Additional reference data for the item along with information to allow how the item reached the system (e.g. via an external vocabulary)';
+
+
+--
+-- TOC entry 207 (class 1259 OID 38010)
+-- Name: Service; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."Service" (
+    "ID" uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    "Label" character varying(250),
+    "Abbreviation" character varying(50),
+    "Reference" character varying,
+    "Uri" character varying(250),
+    "Definition" xml,
+    "Status" smallint DEFAULT 0 NOT NULL,
+    "Created" timestamp without time zone DEFAULT now() NOT NULL,
+    "Modified" timestamp without time zone DEFAULT now() NOT NULL,
+    "CreationUser" uuid
+);
+
+
+ALTER TABLE public."Service" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 219 (class 1259 OID 46444)
+-- Name: UserAssociation; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."UserAssociation" (
+    id uuid NOT NULL,
+    "firstUser" uuid NOT NULL,
+    "secondUser" uuid NOT NULL
+);
+
+
+ALTER TABLE public."UserAssociation" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 208 (class 1259 OID 38020)
+-- Name: UserDMP; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."UserDMP" (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    usr uuid NOT NULL,
+    dmp uuid NOT NULL,
+    role integer
+);
+
+
+ALTER TABLE public."UserDMP" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 209 (class 1259 OID 38024)
+-- Name: UserInfo; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."UserInfo" (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    email character varying(250),
+    authorization_level smallint NOT NULL,
+    usertype smallint NOT NULL,
+    verified_email boolean,
+    name character varying(250),
+    created timestamp without time zone,
+    lastloggedin timestamp without time zone,
+    additionalinfo json
+);
+
+
+ALTER TABLE public."UserInfo" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 2511 (class 0 OID 0)
+-- Dependencies: 209
+-- Name: COLUMN "UserInfo".authorization_level; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON COLUMN public."UserInfo".authorization_level IS 'This stores the authorization level of the user: 0 admin, 1 user, being able to be extended furthermore';
+
+
+--
+-- TOC entry 2512 (class 0 OID 0)
+-- Dependencies: 209
+-- Name: COLUMN "UserInfo".usertype; Type: COMMENT; Schema: public; Owner: :POSTGRES_USER
+--
+
+COMMENT ON COLUMN public."UserInfo".usertype IS 'This stores the type of user: 0 -> internal, 1 external';
+
+
+--
+-- TOC entry 210 (class 1259 OID 38031)
+-- Name: UserRole; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."UserRole" (
+    "Id" uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    "Role" numeric DEFAULT 0 NOT NULL,
+    "UserId" uuid NOT NULL
+);
+
+
+ALTER TABLE public."UserRole" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 211 (class 1259 OID 38039)
+-- Name: UserToken; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE TABLE public."UserToken" (
+    "Token" uuid NOT NULL,
+    "UserId" uuid NOT NULL,
+    "IssuedAt" date NOT NULL,
+    "ExpiresAt" date NOT NULL
+);
+
+
+ALTER TABLE public."UserToken" OWNER TO :POSTGRES_USER;
+
+--
+-- TOC entry 2251 (class 2606 OID 38044)
+-- Name: Content Content_pkey; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."Content"
+    ADD CONSTRAINT "Content_pkey" PRIMARY KEY ("Id");
+
+
+--
+-- TOC entry 2253 (class 2606 OID 38046)
+-- Name: Credential Credential_pkey; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."Credential"
+    ADD CONSTRAINT "Credential_pkey" PRIMARY KEY ("Id");
+
+
+--
+-- TOC entry 2305 (class 2606 OID 38308)
+-- Name: DMPDatasetProfile DMPDatasetProfile_pkey; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DMPDatasetProfile"
+    ADD CONSTRAINT "DMPDatasetProfile_pkey" PRIMARY KEY ("ID");
+
+
+--
+-- TOC entry 2260 (class 2606 OID 38048)
+-- Name: DMPProfile DMPPRofile_pkey; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DMPProfile"
+    ADD CONSTRAINT "DMPPRofile_pkey" PRIMARY KEY ("ID");
+
+
+--
+-- TOC entry 2255 (class 2606 OID 38050)
+-- Name: DMP DMP_pkey; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DMP"
+    ADD CONSTRAINT "DMP_pkey" PRIMARY KEY ("ID");
+
+
+--
+-- TOC entry 2269 (class 2606 OID 38246)
+-- Name: DatasetDataRepository DatasetDataRepository_pkey; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DatasetDataRepository"
+    ADD CONSTRAINT "DatasetDataRepository_pkey" PRIMARY KEY ("ID");
+
+
+--
+-- TOC entry 2271 (class 2606 OID 38052)
+-- Name: DatasetExternalDataset DatasetExternalDataset_pkey; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DatasetExternalDataset"
+    ADD CONSTRAINT "DatasetExternalDataset_pkey" PRIMARY KEY ("Id");
+
+
+--
+-- TOC entry 2275 (class 2606 OID 38054)
+-- Name: DatasetProfileRuleset DatasetProfileRuleset_pkey; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DatasetProfileRuleset"
+    ADD CONSTRAINT "DatasetProfileRuleset_pkey" PRIMARY KEY ("ID");
+
+
+--
+-- TOC entry 2277 (class 2606 OID 38056)
+-- Name: DatasetProfileViewstyle DatasetProfileViewstyle_pkey; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DatasetProfileViewstyle"
+    ADD CONSTRAINT "DatasetProfileViewstyle_pkey" PRIMARY KEY ("ID");
+
+
+--
+-- TOC entry 2273 (class 2606 OID 38058)
+-- Name: DatasetProfile DatasetProfile_pkey; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DatasetProfile"
+    ADD CONSTRAINT "DatasetProfile_pkey" PRIMARY KEY ("ID");
+
+
+--
+-- TOC entry 2279 (class 2606 OID 38249)
+-- Name: DatasetRegistry DatasetRegistry_pkey; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DatasetRegistry"
+    ADD CONSTRAINT "DatasetRegistry_pkey" PRIMARY KEY ("ID");
+
+
+--
+-- TOC entry 2281 (class 2606 OID 38252)
+-- Name: DatasetService DatasetService_pkey; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DatasetService"
+    ADD CONSTRAINT "DatasetService_pkey" PRIMARY KEY ("ID");
+
+
+--
+-- TOC entry 2266 (class 2606 OID 38060)
+-- Name: Dataset Dataset_pkey; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."Dataset"
+    ADD CONSTRAINT "Dataset_pkey" PRIMARY KEY ("ID");
+
+
+--
+-- TOC entry 2319 (class 2606 OID 46467)
+-- Name: DoiFunder DoiFunder_pkey; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DoiFunder"
+    ADD CONSTRAINT "DoiFunder_pkey" PRIMARY KEY (id);
+
+
+--
+-- TOC entry 2283 (class 2606 OID 38062)
+-- Name: ExternalDataset ExternalDataset_pkey; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."ExternalDataset"
+    ADD CONSTRAINT "ExternalDataset_pkey" PRIMARY KEY ("Id");
+
+
+--
+-- TOC entry 2309 (class 2606 OID 38364)
+-- Name: Funder Funder_pkey; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."Funder"
+    ADD CONSTRAINT "Funder_pkey" PRIMARY KEY ("ID");
+
+
+--
+-- TOC entry 2289 (class 2606 OID 38078)
+-- Name: Grant Grant_pkey; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."Grant"
+    ADD CONSTRAINT "Grant_pkey" PRIMARY KEY ("ID");
+
+
+--
+-- TOC entry 2285 (class 2606 OID 38064)
+-- Name: Invitation Invitation_pkey; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."Invitation"
+    ADD CONSTRAINT "Invitation_pkey" PRIMARY KEY ("Id");
+
+
+--
+-- TOC entry 2313 (class 2606 OID 38427)
+-- Name: Lock Lock_pkey; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."Lock"
+    ADD CONSTRAINT "Lock_pkey" PRIMARY KEY (id);
+
+
+--
+-- TOC entry 2307 (class 2606 OID 38350)
+-- Name: LoginConfirmationEmail LoginConfirmationEmail_pkey; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."LoginConfirmationEmail"
+    ADD CONSTRAINT "LoginConfirmationEmail_pkey" PRIMARY KEY ("ID");
+
+
+--
+-- TOC entry 2315 (class 2606 OID 38440)
+-- Name: Notification Notification_pkey; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."Notification"
+    ADD CONSTRAINT "Notification_pkey" PRIMARY KEY (id);
+
+
+--
+-- TOC entry 2287 (class 2606 OID 38066)
+-- Name: Organisation Organisation_pkey; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."Organisation"
+    ADD CONSTRAINT "Organisation_pkey" PRIMARY KEY ("ID");
+
+
+--
+-- TOC entry 2258 (class 2606 OID 38068)
+-- Name: DMPOrganisation PKey_DMPOrganisation; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DMPOrganisation"
+    ADD CONSTRAINT "PKey_DMPOrganisation" PRIMARY KEY ("ID");
+
+
+--
+-- TOC entry 2262 (class 2606 OID 38070)
+-- Name: DMPResearcher PKey_DMPResearcher; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DMPResearcher"
+    ADD CONSTRAINT "PKey_DMPResearcher" PRIMARY KEY ("ID");
+
+
+--
+-- TOC entry 2264 (class 2606 OID 38072)
+-- Name: DataRepository PKey_DataRepository; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DataRepository"
+    ADD CONSTRAINT "PKey_DataRepository" PRIMARY KEY ("ID");
+
+
+--
+-- TOC entry 2291 (class 2606 OID 38074)
+-- Name: Registry PKey_Registry; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."Registry"
+    ADD CONSTRAINT "PKey_Registry" PRIMARY KEY ("ID");
+
+
+--
+-- TOC entry 2295 (class 2606 OID 38076)
+-- Name: Service PKey_Service; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."Service"
+    ADD CONSTRAINT "PKey_Service" PRIMARY KEY ("ID");
+
+
+--
+-- TOC entry 2311 (class 2606 OID 38377)
+-- Name: Project Project_pkey; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."Project"
+    ADD CONSTRAINT "Project_pkey" PRIMARY KEY ("ID");
+
+
+--
+-- TOC entry 2293 (class 2606 OID 38080)
+-- Name: Researcher Researcher_pkey; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."Researcher"
+    ADD CONSTRAINT "Researcher_pkey" PRIMARY KEY ("ID");
+
+
+--
+-- TOC entry 2297 (class 2606 OID 38082)
+-- Name: UserInfo UserInfo_email_key; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."UserInfo"
+    ADD CONSTRAINT "UserInfo_email_key" UNIQUE (email);
+
+
+--
+-- TOC entry 2299 (class 2606 OID 38084)
+-- Name: UserInfo UserInfo_pkey; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."UserInfo"
+    ADD CONSTRAINT "UserInfo_pkey" PRIMARY KEY (id);
+
+
+--
+-- TOC entry 2301 (class 2606 OID 38086)
+-- Name: UserRole UserRole_pkey; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."UserRole"
+    ADD CONSTRAINT "UserRole_pkey" PRIMARY KEY ("Id");
+
+
+--
+-- TOC entry 2303 (class 2606 OID 38088)
+-- Name: UserToken UserToken_pkey; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."UserToken"
+    ADD CONSTRAINT "UserToken_pkey" PRIMARY KEY ("Token");
+
+
+--
+-- TOC entry 2317 (class 2606 OID 46448)
+-- Name: UserAssociation pk_user_association; Type: CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."UserAssociation"
+    ADD CONSTRAINT pk_user_association PRIMARY KEY (id);
+
+
+--
+-- TOC entry 2256 (class 1259 OID 38089)
+-- Name: fki_DMPDMPProfileReference; Type: INDEX; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE INDEX "fki_DMPDMPProfileReference" ON public."DMP" USING btree ("Profile");
+
+
+--
+-- TOC entry 2267 (class 1259 OID 38090)
+-- Name: fki_DatasetDatasetProfileReference; Type: INDEX; Schema: public; Owner: :POSTGRES_USER
+--
+
+CREATE INDEX "fki_DatasetDatasetProfileReference" ON public."Dataset" USING btree ("Profile");
+
+
+--
+-- TOC entry 2321 (class 2606 OID 38091)
+-- Name: DMP DMPDMPProfileReference; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DMP"
+    ADD CONSTRAINT "DMPDMPProfileReference" FOREIGN KEY ("Profile") REFERENCES public."DMPProfile"("ID");
+
+
+--
+-- TOC entry 2347 (class 2606 OID 38309)
+-- Name: DMPDatasetProfile DMPDatasetProfile_datasetprofile_fkey; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DMPDatasetProfile"
+    ADD CONSTRAINT "DMPDatasetProfile_datasetprofile_fkey" FOREIGN KEY (datasetprofile) REFERENCES public."DatasetProfile"("ID");
+
+
+--
+-- TOC entry 2348 (class 2606 OID 38314)
+-- Name: DMPDatasetProfile DMPDatasetProfile_dmp_fkey; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DMPDatasetProfile"
+    ADD CONSTRAINT "DMPDatasetProfile_dmp_fkey" FOREIGN KEY (dmp) REFERENCES public."DMP"("ID");
+
+
+--
+-- TOC entry 2324 (class 2606 OID 38096)
+-- Name: DMPOrganisation DMPOrganisationDMPReference; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DMPOrganisation"
+    ADD CONSTRAINT "DMPOrganisationDMPReference" FOREIGN KEY ("Organisation") REFERENCES public."Organisation"("ID");
+
+
+--
+-- TOC entry 2325 (class 2606 OID 38101)
+-- Name: DMPOrganisation DMPOrganisationOrganisationReference; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DMPOrganisation"
+    ADD CONSTRAINT "DMPOrganisationOrganisationReference" FOREIGN KEY ("DMP") REFERENCES public."DMP"("ID");
+
+
+--
+-- TOC entry 2322 (class 2606 OID 38106)
+-- Name: DMP DMPProjectReference; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DMP"
+    ADD CONSTRAINT "DMPProjectReference" FOREIGN KEY ("Grant") REFERENCES public."Grant"("ID");
+
+
+--
+-- TOC entry 2326 (class 2606 OID 38111)
+-- Name: DMPResearcher DMPResearcherDMPReference; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DMPResearcher"
+    ADD CONSTRAINT "DMPResearcherDMPReference" FOREIGN KEY ("Researcher") REFERENCES public."Researcher"("ID");
+
+
+--
+-- TOC entry 2327 (class 2606 OID 38116)
+-- Name: DMPResearcher DMPResearcherResearcherReference; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DMPResearcher"
+    ADD CONSTRAINT "DMPResearcherResearcherReference" FOREIGN KEY ("DMP") REFERENCES public."DMP"("ID");
+
+
+--
+-- TOC entry 2328 (class 2606 OID 38121)
+-- Name: Dataset DatasetDMPReference; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."Dataset"
+    ADD CONSTRAINT "DatasetDMPReference" FOREIGN KEY ("DMP") REFERENCES public."DMP"("ID");
+
+
+--
+-- TOC entry 2331 (class 2606 OID 38126)
+-- Name: DatasetDataRepository DatasetDataRepositoryDataRepositoryReference; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DatasetDataRepository"
+    ADD CONSTRAINT "DatasetDataRepositoryDataRepositoryReference" FOREIGN KEY ("DataRepository") REFERENCES public."DataRepository"("ID");
+
+
+--
+-- TOC entry 2332 (class 2606 OID 38131)
+-- Name: DatasetDataRepository DatasetDataRepositoryDatasetReference; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DatasetDataRepository"
+    ADD CONSTRAINT "DatasetDataRepositoryDatasetReference" FOREIGN KEY ("Dataset") REFERENCES public."Dataset"("ID");
+
+
+--
+-- TOC entry 2329 (class 2606 OID 38136)
+-- Name: Dataset DatasetDatasetProfileReference; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."Dataset"
+    ADD CONSTRAINT "DatasetDatasetProfileReference" FOREIGN KEY ("Profile") REFERENCES public."DatasetProfile"("ID");
+
+
+--
+-- TOC entry 2335 (class 2606 OID 38141)
+-- Name: DatasetRegistry DatasetRegistryDatasetReference; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DatasetRegistry"
+    ADD CONSTRAINT "DatasetRegistryDatasetReference" FOREIGN KEY ("Dataset") REFERENCES public."Dataset"("ID");
+
+
+--
+-- TOC entry 2336 (class 2606 OID 38146)
+-- Name: DatasetRegistry DatasetRegistryRegistryReference; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DatasetRegistry"
+    ADD CONSTRAINT "DatasetRegistryRegistryReference" FOREIGN KEY ("Registry") REFERENCES public."Registry"("ID");
+
+
+--
+-- TOC entry 2337 (class 2606 OID 38151)
+-- Name: DatasetService DatasetServiceDatasetReference; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DatasetService"
+    ADD CONSTRAINT "DatasetServiceDatasetReference" FOREIGN KEY ("Dataset") REFERENCES public."Dataset"("ID");
+
+
+--
+-- TOC entry 2338 (class 2606 OID 38156)
+-- Name: DatasetService DatasetServiceServiceReference; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DatasetService"
+    ADD CONSTRAINT "DatasetServiceServiceReference" FOREIGN KEY ("Service") REFERENCES public."Service"("ID");
+
+
+--
+-- TOC entry 2351 (class 2606 OID 38428)
+-- Name: Lock LockUserReference; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."Lock"
+    ADD CONSTRAINT "LockUserReference" FOREIGN KEY ("LockedBy") REFERENCES public."UserInfo"(id);
+
+
+--
+-- TOC entry 2352 (class 2606 OID 38441)
+-- Name: Notification NotificationUserReference; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."Notification"
+    ADD CONSTRAINT "NotificationUserReference" FOREIGN KEY ("UserId") REFERENCES public."UserInfo"(id);
+
+
+--
+-- TOC entry 2343 (class 2606 OID 38161)
+-- Name: UserDMP UserDMP_dmp_fkey; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."UserDMP"
+    ADD CONSTRAINT "UserDMP_dmp_fkey" FOREIGN KEY (dmp) REFERENCES public."DMP"("ID");
+
+
+--
+-- TOC entry 2344 (class 2606 OID 38166)
+-- Name: UserDMP UserDMP_usr_fkey; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."UserDMP"
+    ADD CONSTRAINT "UserDMP_usr_fkey" FOREIGN KEY (usr) REFERENCES public."UserInfo"(id);
+
+
+--
+-- TOC entry 2345 (class 2606 OID 38171)
+-- Name: UserRole UserRole_userId_fkey; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."UserRole"
+    ADD CONSTRAINT "UserRole_userId_fkey" FOREIGN KEY ("UserId") REFERENCES public."UserInfo"(id);
+
+
+--
+-- TOC entry 2330 (class 2606 OID 38176)
+-- Name: Dataset fk_dataset_creator; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."Dataset"
+    ADD CONSTRAINT fk_dataset_creator FOREIGN KEY ("Creator") REFERENCES public."UserInfo"(id);
+
+
+--
+-- TOC entry 2323 (class 2606 OID 38181)
+-- Name: DMP fk_dmp_creator; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DMP"
+    ADD CONSTRAINT fk_dmp_creator FOREIGN KEY ("Creator") REFERENCES public."UserInfo"(id);
+
+
+--
+-- TOC entry 2342 (class 2606 OID 38196)
+-- Name: Grant fk_grant_content; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."Grant"
+    ADD CONSTRAINT fk_grant_content FOREIGN KEY ("Content") REFERENCES public."Content"("Id");
+
+
+--
+-- TOC entry 2341 (class 2606 OID 38201)
+-- Name: Grant fk_grant_creator; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."Grant"
+    ADD CONSTRAINT fk_grant_creator FOREIGN KEY ("CreationUser") REFERENCES public."UserInfo"(id);
+
+
+--
+-- TOC entry 2339 (class 2606 OID 38186)
+-- Name: Invitation fk_invitation_creator; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."Invitation"
+    ADD CONSTRAINT fk_invitation_creator FOREIGN KEY ("CreationUser") REFERENCES public."UserInfo"(id);
+
+
+--
+-- TOC entry 2340 (class 2606 OID 38191)
+-- Name: Invitation fk_invitation_dmp; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."Invitation"
+    ADD CONSTRAINT fk_invitation_dmp FOREIGN KEY ("Dmp") REFERENCES public."DMP"("ID");
+
+
+--
+-- TOC entry 2349 (class 2606 OID 38378)
+-- Name: Project fk_project_content; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."Project"
+    ADD CONSTRAINT fk_project_content FOREIGN KEY ("Content") REFERENCES public."Content"("Id");
+
+
+--
+-- TOC entry 2350 (class 2606 OID 38383)
+-- Name: Project fk_project_creator; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."Project"
+    ADD CONSTRAINT fk_project_creator FOREIGN KEY ("CreationUser") REFERENCES public."UserInfo"(id);
+
+
+--
+-- TOC entry 2353 (class 2606 OID 46449)
+-- Name: UserAssociation fk_userinfo_user_association_1; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."UserAssociation"
+    ADD CONSTRAINT fk_userinfo_user_association_1 FOREIGN KEY ("firstUser") REFERENCES public."UserInfo"(id);
+
+
+--
+-- TOC entry 2354 (class 2606 OID 46454)
+-- Name: UserAssociation fk_userinfo_user_association_2; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."UserAssociation"
+    ADD CONSTRAINT fk_userinfo_user_association_2 FOREIGN KEY ("secondUser") REFERENCES public."UserInfo"(id);
+
+
+--
+-- TOC entry 2320 (class 2606 OID 38206)
+-- Name: Credential fkey_credential_user; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."Credential"
+    ADD CONSTRAINT fkey_credential_user FOREIGN KEY ("UserId") REFERENCES public."UserInfo"(id);
+
+
+--
+-- TOC entry 2333 (class 2606 OID 38211)
+-- Name: DatasetExternalDataset fkey_datasetexternaldataset_dataset; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DatasetExternalDataset"
+    ADD CONSTRAINT fkey_datasetexternaldataset_dataset FOREIGN KEY ("Dataset") REFERENCES public."Dataset"("ID");
+
+
+--
+-- TOC entry 2334 (class 2606 OID 38216)
+-- Name: DatasetExternalDataset fkey_datasetexternaldataset_externaldataset; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."DatasetExternalDataset"
+    ADD CONSTRAINT fkey_datasetexternaldataset_externaldataset FOREIGN KEY ("ExternalDataset") REFERENCES public."ExternalDataset"("Id");
+
+
+--
+-- TOC entry 2346 (class 2606 OID 38221)
+-- Name: UserToken fkey_usetoken_user; Type: FK CONSTRAINT; Schema: public; Owner: :POSTGRES_USER
+--
+
+ALTER TABLE ONLY public."UserToken"
+    ADD CONSTRAINT fkey_usetoken_user FOREIGN KEY ("UserId") REFERENCES public."UserInfo"(id);
+
+
+--
+-- TOC entry 1827 (class 826 OID 16387)
+-- Name: DEFAULT PRIVILEGES FOR TYPES; Type: DEFAULT ACL; Schema: -; Owner: :POSTGRES_USER
+--
+
+ALTER DEFAULT PRIVILEGES FOR ROLE :POSTGRES_USER REVOKE ALL ON TYPES  FROM :POSTGRES_USER;
+ALTER DEFAULT PRIVILEGES FOR ROLE :POSTGRES_USER GRANT ALL ON TYPES  TO :POSTGRES_USER WITH GRANT OPTION;
+
+
+--
+-- TOC entry 1826 (class 826 OID 16386)
+-- Name: DEFAULT PRIVILEGES FOR FUNCTIONS; Type: DEFAULT ACL; Schema: -; Owner: :POSTGRES_USER
+--
+
+ALTER DEFAULT PRIVILEGES FOR ROLE :POSTGRES_USER REVOKE ALL ON FUNCTIONS  FROM :POSTGRES_USER;
+ALTER DEFAULT PRIVILEGES FOR ROLE :POSTGRES_USER GRANT ALL ON FUNCTIONS  TO :POSTGRES_USER WITH GRANT OPTION;
+
+
+-- Completed on 2020-05-12 17:07:43
+
+--
+-- PostgreSQL database dump complete
+--
+

From 9651be1b7880b757a86808d275589dcd30b2171a Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Wed, 13 May 2020 12:49:14 +0300
Subject: [PATCH 59/60] Removed old database updates (redundant)

---
 dmp-db-scema/main/data-dump.sql               |  2 +-
 ... => 00.00.002_create_user_association.sql} |  0
 ..._doifunder.sql => 00.00.003_doifunder.sql} |  2 +
 ...ser_DMPDatasetprofile_DMPFinalizedDate.sql | 61 -------------------
 dmp-db-scema/updates/01/03_DMPisPublic.sql    |  7 ---
 .../01/04_RenameDatasetColumnFinalizedDat.sql |  2 -
 .../updates/01/05_DMPPublishedDat.sql         |  6 --
 ...nameDMPColumnsFinalizedDatPublishedDat.sql |  2 -
 dmp-db-scema/updates/01/07_DMPCreateDOI.sql   |  2 -
 dmp-db-scema/updates/01/08_Create_content.sql | 15 -----
 .../02/01_CreateLoginConfirmationEmail.sql    | 18 ------
 .../02/02_UserInfo_email_drop_null.sql        |  3 -
 ...ofile_Description_value_set_empty_text.sql |  2 -
 ...file_adds_null_constraints_description.sql |  3 -
 .../03/03_Renames-Project-to-Grant.sql        |  2 -
 dmp-db-scema/updates/03/04_Funder-create.sql  | 12 ----
 .../updates/03/05_Grant-add-column-Funder.sql |  2 -
 .../03/06_Renames-Grant-fk-Constraint.sql     |  9 ---
 ...07_Renames-Grant-fk-creator-Constraint.sql |  2 -
 .../03/08_Renames-Grant-pKey-Constraint.sql   |  2 -
 .../03/09_Rename-Dmps-Project-to_Grant.sql    |  2 -
 dmp-db-scema/updates/03/10_Project-create.sql | 27 --------
 .../updates/03/11_DMP-add-column-project.sql  |  2 -
 .../updates/03/12_Remove_xml_types.sql        | 18 ------
 .../04/01_Funder_add_column_CreationUser.sql  |  2 -
 .../02_Funder_update_CreationUser_values.sql  |  4 --
 .../04/03_Create_External_Datasets.sql        | 15 -----
 ...itory_ExternalDataset_Registry_Service.sql | 11 ----
 .../05_Researcher_add_column_CreationUser.sql |  2 -
 ...nal_References_Reference_Prefix_Update.sql | 31 ----------
 ...Funder_Project_Reference_Prefix_Update.sql | 26 --------
 ...set_Statuses_To_Canceled_For_Old_Cases.sql |  8 ---
 ..._Project_References_For_Internal_Items.sql | 11 ----
 ...Researcher_Internal_Entities_Reference.sql |  6 --
 ...d_Lock_Table_To_Prevent_Parallel_Edits.sql | 14 -----
 .../updates/07/02_Add_Notification_Table.sql  | 20 ------
 .../updates/08/01_Add_database_versioning.sql | 10 ---
 .../updates/08/02_Add_missing_columns.sql     | 23 -------
 .../updates/08/03_Create_Credentials.sql      | 25 --------
 .../updates/08/04_Create_UserToken.sql        | 16 -----
 .../updates/08/05_Create_UserRole.sql         | 18 ------
 .../updates/08/06_Remove_UserAuth.sql         |  1 -
 .../08/07_Remove_no_null_requirement.sql      |  2 -
 .../08/08_create_datasetexternaldataset.sql   | 19 ------
 .../updates/08/09_Create_Invitation.sql       | 23 -------
 .../updates/08/10_Create_User_preference.sql  | 16 -----
 46 files changed, 3 insertions(+), 503 deletions(-)
 rename dmp-db-scema/updates/{09/01_create_user_association.sql => 00.00.002_create_user_association.sql} (100%)
 rename dmp-db-scema/updates/{09/02_doifunder.sql => 00.00.003_doifunder.sql} (91%)
 delete mode 100644 dmp-db-scema/updates/01/01_DMPUser_DMPDatasetprofile_DMPFinalizedDate.sql
 delete mode 100644 dmp-db-scema/updates/01/03_DMPisPublic.sql
 delete mode 100644 dmp-db-scema/updates/01/04_RenameDatasetColumnFinalizedDat.sql
 delete mode 100644 dmp-db-scema/updates/01/05_DMPPublishedDat.sql
 delete mode 100644 dmp-db-scema/updates/01/06_RenameDMPColumnsFinalizedDatPublishedDat.sql
 delete mode 100644 dmp-db-scema/updates/01/07_DMPCreateDOI.sql
 delete mode 100644 dmp-db-scema/updates/01/08_Create_content.sql
 delete mode 100644 dmp-db-scema/updates/02/01_CreateLoginConfirmationEmail.sql
 delete mode 100644 dmp-db-scema/updates/02/02_UserInfo_email_drop_null.sql
 delete mode 100644 dmp-db-scema/updates/03/01_DatasetProfile_Description_value_set_empty_text.sql
 delete mode 100644 dmp-db-scema/updates/03/02_DatasetProfile_adds_null_constraints_description.sql
 delete mode 100644 dmp-db-scema/updates/03/03_Renames-Project-to-Grant.sql
 delete mode 100644 dmp-db-scema/updates/03/04_Funder-create.sql
 delete mode 100644 dmp-db-scema/updates/03/05_Grant-add-column-Funder.sql
 delete mode 100644 dmp-db-scema/updates/03/06_Renames-Grant-fk-Constraint.sql
 delete mode 100644 dmp-db-scema/updates/03/07_Renames-Grant-fk-creator-Constraint.sql
 delete mode 100644 dmp-db-scema/updates/03/08_Renames-Grant-pKey-Constraint.sql
 delete mode 100644 dmp-db-scema/updates/03/09_Rename-Dmps-Project-to_Grant.sql
 delete mode 100644 dmp-db-scema/updates/03/10_Project-create.sql
 delete mode 100644 dmp-db-scema/updates/03/11_DMP-add-column-project.sql
 delete mode 100644 dmp-db-scema/updates/03/12_Remove_xml_types.sql
 delete mode 100644 dmp-db-scema/updates/04/01_Funder_add_column_CreationUser.sql
 delete mode 100644 dmp-db-scema/updates/04/02_Funder_update_CreationUser_values.sql
 delete mode 100644 dmp-db-scema/updates/04/03_Create_External_Datasets.sql
 delete mode 100644 dmp-db-scema/updates/04/04_Add_creationUser_on_DataRepository_ExternalDataset_Registry_Service.sql
 delete mode 100644 dmp-db-scema/updates/04/05_Researcher_add_column_CreationUser.sql
 delete mode 100644 dmp-db-scema/updates/05/01_External_References_Reference_Prefix_Update.sql
 delete mode 100644 dmp-db-scema/updates/05/02_Grant_Funder_Project_Reference_Prefix_Update.sql
 delete mode 100644 dmp-db-scema/updates/06/01_Update_Dataset_Statuses_To_Canceled_For_Old_Cases.sql
 delete mode 100644 dmp-db-scema/updates/06/02_Update_Funder_Grant_Project_References_For_Internal_Items.sql
 delete mode 100644 dmp-db-scema/updates/06/03_Update_Researcher_Internal_Entities_Reference.sql
 delete mode 100644 dmp-db-scema/updates/07/01_Add_Lock_Table_To_Prevent_Parallel_Edits.sql
 delete mode 100644 dmp-db-scema/updates/07/02_Add_Notification_Table.sql
 delete mode 100644 dmp-db-scema/updates/08/01_Add_database_versioning.sql
 delete mode 100644 dmp-db-scema/updates/08/02_Add_missing_columns.sql
 delete mode 100644 dmp-db-scema/updates/08/03_Create_Credentials.sql
 delete mode 100644 dmp-db-scema/updates/08/04_Create_UserToken.sql
 delete mode 100644 dmp-db-scema/updates/08/05_Create_UserRole.sql
 delete mode 100644 dmp-db-scema/updates/08/06_Remove_UserAuth.sql
 delete mode 100644 dmp-db-scema/updates/08/07_Remove_no_null_requirement.sql
 delete mode 100644 dmp-db-scema/updates/08/08_create_datasetexternaldataset.sql
 delete mode 100644 dmp-db-scema/updates/08/09_Create_Invitation.sql
 delete mode 100644 dmp-db-scema/updates/08/10_Create_User_preference.sql

diff --git a/dmp-db-scema/main/data-dump.sql b/dmp-db-scema/main/data-dump.sql
index 297407a37..cdb27f077 100644
--- a/dmp-db-scema/main/data-dump.sql
+++ b/dmp-db-scema/main/data-dump.sql
@@ -14,4 +14,4 @@ INSERT INTO public."DoiFunder"(name, doi) VALUES ('National Science Foundation',
 INSERT INTO public."DoiFunder"(name, doi) VALUES ('Nederlandse Organisatie voor Wetenschappelijk Onderzoek',	'10.13039/501100003246');
 INSERT INTO public."DoiFunder"(name, doi) VALUES ('Wellcome Trust', '10.13039/100004440');
 
-INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.00.002', '2020-05-06 18:11:00.000000+03', now(), 'Add Doi Funder');
\ No newline at end of file
+INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.00.003', '2020-05-06 18:11:00.000000+03', now(), 'Add Doi Funder');
\ No newline at end of file
diff --git a/dmp-db-scema/updates/09/01_create_user_association.sql b/dmp-db-scema/updates/00.00.002_create_user_association.sql
similarity index 100%
rename from dmp-db-scema/updates/09/01_create_user_association.sql
rename to dmp-db-scema/updates/00.00.002_create_user_association.sql
diff --git a/dmp-db-scema/updates/09/02_doifunder.sql b/dmp-db-scema/updates/00.00.003_doifunder.sql
similarity index 91%
rename from dmp-db-scema/updates/09/02_doifunder.sql
rename to dmp-db-scema/updates/00.00.003_doifunder.sql
index 53894a997..7d01346ad 100644
--- a/dmp-db-scema/updates/09/02_doifunder.sql
+++ b/dmp-db-scema/updates/00.00.003_doifunder.sql
@@ -20,5 +20,7 @@ INSERT INTO public."DoiFunder"(name, doi) VALUES ('National Science Foundation',
 INSERT INTO public."DoiFunder"(name, doi) VALUES ('Nederlandse Organisatie voor Wetenschappelijk Onderzoek',	'10.13039/501100003246');
 INSERT INTO public."DoiFunder"(name, doi) VALUES ('Wellcome Trust', '10.13039/100004440');
 
+INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.00.003', '2020-05-06 18:11:00.000000+03', now(), 'Add Doi Funder');
+
 
 
diff --git a/dmp-db-scema/updates/01/01_DMPUser_DMPDatasetprofile_DMPFinalizedDate.sql b/dmp-db-scema/updates/01/01_DMPUser_DMPDatasetprofile_DMPFinalizedDate.sql
deleted file mode 100644
index cbb256489..000000000
--- a/dmp-db-scema/updates/01/01_DMPUser_DMPDatasetprofile_DMPFinalizedDate.sql
+++ /dev/null
@@ -1,61 +0,0 @@
-INSERT INTO public."UserDMP"(
-	usr, dmp, role)
-	SELECT "Creator", "ID", 0
-   FROM public."DMP";
-	
-DELETE 
-FROM public."UserDMP" as us1
-using public."UserDMP" as us2
-where us1."id" < us2."id" AND us1."dmp" = us2."dmp";
-
-
-
-CREATE TABLE public."DMPDatasetProfile"
-(
-    "ID" uuid NOT NULL DEFAULT uuid_generate_v4(),
-    dmp uuid NOT NULL,
-    datasetprofile uuid NOT NULL,
-    CONSTRAINT "DMPDatasetProfile_pkey" PRIMARY KEY ("ID"),
-    CONSTRAINT "DMPDatasetProfile_datasetprofile_fkey" FOREIGN KEY (datasetprofile)
-        REFERENCES public."DatasetProfile" ("ID") MATCH SIMPLE
-        ON UPDATE NO ACTION
-        ON DELETE NO ACTION,
-    CONSTRAINT "DMPDatasetProfile_dmp_fkey" FOREIGN KEY (dmp)
-        REFERENCES public."DMP" ("ID") MATCH SIMPLE
-        ON UPDATE NO ACTION
-        ON DELETE NO ACTION
-)
-WITH (
-    OIDS = FALSE
-)
-TABLESPACE pg_default;
-
-ALTER TABLE public."DMPDatasetProfile"
---    OWNER to dmtadm;
-    OWNER to :POSTGRES_USER;
-
-	
-ALTER TABLE public."UserDMP"
---    OWNER to dmtadm;
-    OWNER to :POSTGRES_USER;
-	
-	
---INSERT INTO public."DMPDatasetProfile"(
---	dmp, datasetprofile)
---	SELECT "ID", unnest(xpath('/profiles/profile/@profileId', dmpp."AssociatedDmps"::xml)::text[]::UUID[])
---	FROM public."DMP" as dmpp;
-
-
-
-ALTER TABLE public."DMP"
-ADD "FinalizedDat" timestamp(6) WITH time zone;
-
-UPDATE public."DMP" SET "FinalizedDat" = "Modified"
-WHERE "Status" = 1;
-
-	
-ALTER TABLE public."Dataset" 
-ADD "FinalizedDat" timestamp(6) WITH time zone;
-
-UPDATE public."Dataset" SET "FinalizedDat" = "Modified"
-WHERE "Status" = 1;
diff --git a/dmp-db-scema/updates/01/03_DMPisPublic.sql b/dmp-db-scema/updates/01/03_DMPisPublic.sql
deleted file mode 100644
index dab69e4d9..000000000
--- a/dmp-db-scema/updates/01/03_DMPisPublic.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-alter table public."DMP" 
-Add "isPublic" boolean NOT NULL Default False;
-
-UPDATE public."DMP" 
-	SET "isPublic" = True
-	WHERE "Status" = 1;
-	
\ No newline at end of file
diff --git a/dmp-db-scema/updates/01/04_RenameDatasetColumnFinalizedDat.sql b/dmp-db-scema/updates/01/04_RenameDatasetColumnFinalizedDat.sql
deleted file mode 100644
index e983e21dd..000000000
--- a/dmp-db-scema/updates/01/04_RenameDatasetColumnFinalizedDat.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE public."Dataset"
-  RENAME COLUMN "FinalizedDat" TO "FinalizedAt";
\ No newline at end of file
diff --git a/dmp-db-scema/updates/01/05_DMPPublishedDat.sql b/dmp-db-scema/updates/01/05_DMPPublishedDat.sql
deleted file mode 100644
index d823b5134..000000000
--- a/dmp-db-scema/updates/01/05_DMPPublishedDat.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-ALTER TABLE public."DMP"
-ADD "PublishedAt" timestamp(6) WITH time zone;
-
-UPDATE public."DMP"
-SET "PublishedAt" = "FinalizedDat"
-where "isPublic" = True;
\ No newline at end of file
diff --git a/dmp-db-scema/updates/01/06_RenameDMPColumnsFinalizedDatPublishedDat.sql b/dmp-db-scema/updates/01/06_RenameDMPColumnsFinalizedDatPublishedDat.sql
deleted file mode 100644
index 557f625b7..000000000
--- a/dmp-db-scema/updates/01/06_RenameDMPColumnsFinalizedDatPublishedDat.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE public."DMP"
-  RENAME COLUMN "FinalizedDat" TO "FinalizedAt";
\ No newline at end of file
diff --git a/dmp-db-scema/updates/01/07_DMPCreateDOI.sql b/dmp-db-scema/updates/01/07_DMPCreateDOI.sql
deleted file mode 100644
index 5e97960c0..000000000
--- a/dmp-db-scema/updates/01/07_DMPCreateDOI.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE public."DMP"
-ADD COLUMN "DOI" text;
\ No newline at end of file
diff --git a/dmp-db-scema/updates/01/08_Create_content.sql b/dmp-db-scema/updates/01/08_Create_content.sql
deleted file mode 100644
index f88ef3351..000000000
--- a/dmp-db-scema/updates/01/08_Create_content.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-CREATE TABLE public."Content" (
-    "Id" uuid NOT NULL,
-    "Filename" character varying NOT NULL,
-    "Extension" character varying NOT NULL,
-    "ParentType" numeric NOT NULL,
-    "Uri" character varying NOT NULL,
-    "LocationType" numeric NOT NULL
-);
-
-
-ALTER TABLE public."Content" OWNER TO :POSTGRES_USER;
-
-ALTER TABLE ONLY public."Content"
-    ADD CONSTRAINT "Content_pkey" PRIMARY KEY ("Id");
-
diff --git a/dmp-db-scema/updates/02/01_CreateLoginConfirmationEmail.sql b/dmp-db-scema/updates/02/01_CreateLoginConfirmationEmail.sql
deleted file mode 100644
index a21039942..000000000
--- a/dmp-db-scema/updates/02/01_CreateLoginConfirmationEmail.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-CREATE TABLE public."LoginConfirmationEmail"
-(
-    "ID" uuid NOT NULL,
-    email character varying COLLATE pg_catalog."default" NOT NULL,
-    "isConfirmed" boolean NOT NULL,
-    token uuid NOT NULL,
-    userId uuid NOT NULL,
-    "expiresAt" timestamp(4) with time zone NOT NULL,
-    CONSTRAINT "LoginConfirmationEmail_pkey" PRIMARY KEY ("ID")
-)
-WITH (
-    OIDS = FALSE
-)
-TABLESPACE pg_default;
-
-ALTER TABLE public."LoginConfirmationEmail"
---    OWNER to dmtadm;
-    OWNER to :POSTGRES_USER;
\ No newline at end of file
diff --git a/dmp-db-scema/updates/02/02_UserInfo_email_drop_null.sql b/dmp-db-scema/updates/02/02_UserInfo_email_drop_null.sql
deleted file mode 100644
index 4516a079d..000000000
--- a/dmp-db-scema/updates/02/02_UserInfo_email_drop_null.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE public."UserInfo"
-ALTER COLUMN "email"
-DROP NOT NULL
\ No newline at end of file
diff --git a/dmp-db-scema/updates/03/01_DatasetProfile_Description_value_set_empty_text.sql b/dmp-db-scema/updates/03/01_DatasetProfile_Description_value_set_empty_text.sql
deleted file mode 100644
index ebace6011..000000000
--- a/dmp-db-scema/updates/03/01_DatasetProfile_Description_value_set_empty_text.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-UPDATE public."DatasetProfile"
-SET "Description" = ''
\ No newline at end of file
diff --git a/dmp-db-scema/updates/03/02_DatasetProfile_adds_null_constraints_description.sql b/dmp-db-scema/updates/03/02_DatasetProfile_adds_null_constraints_description.sql
deleted file mode 100644
index 569b443a9..000000000
--- a/dmp-db-scema/updates/03/02_DatasetProfile_adds_null_constraints_description.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE public."DatasetProfile"
-ALTER COLUMN "Description" 
-SET NOT NULL
\ No newline at end of file
diff --git a/dmp-db-scema/updates/03/03_Renames-Project-to-Grant.sql b/dmp-db-scema/updates/03/03_Renames-Project-to-Grant.sql
deleted file mode 100644
index dd2ca5c2b..000000000
--- a/dmp-db-scema/updates/03/03_Renames-Project-to-Grant.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE "Project"
-RENAME TO "Grant";
\ No newline at end of file
diff --git a/dmp-db-scema/updates/03/04_Funder-create.sql b/dmp-db-scema/updates/03/04_Funder-create.sql
deleted file mode 100644
index b6766b7f7..000000000
--- a/dmp-db-scema/updates/03/04_Funder-create.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-CREATE TABLE public."Funder"
-(
-    "ID" uuid NOT NULL DEFAULT uuid_generate_v4(),
-    "Label" character varying(250) COLLATE pg_catalog."default" NOT NULL,
-    "Reference" character varying COLLATE pg_catalog."default",
-    "Definition" character varying COLLATE pg_catalog."default",
-    "Status" smallint NOT NULL DEFAULT 0,
-    "Created" timestamp(4) with time zone NOT NULL DEFAULT now(),
-    "Modified" timestamp(4) with time zone NOT NULL DEFAULT now(),
-    "Type" numeric NOT NULL DEFAULT 0,
-    CONSTRAINT "Funder_pkey" PRIMARY KEY ("ID")
-)
\ No newline at end of file
diff --git a/dmp-db-scema/updates/03/05_Grant-add-column-Funder.sql b/dmp-db-scema/updates/03/05_Grant-add-column-Funder.sql
deleted file mode 100644
index d3a4d93d2..000000000
--- a/dmp-db-scema/updates/03/05_Grant-add-column-Funder.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE "Grant"
-ADD COLUMN "Funder" uuid
\ No newline at end of file
diff --git a/dmp-db-scema/updates/03/06_Renames-Grant-fk-Constraint.sql b/dmp-db-scema/updates/03/06_Renames-Grant-fk-Constraint.sql
deleted file mode 100644
index 9c4dd0602..000000000
--- a/dmp-db-scema/updates/03/06_Renames-Grant-fk-Constraint.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-ALTER TABLE public."Grant"
-ADD COLUMN "Content" uuid;
-
-
-ALTER TABLE public."Grant"
-ADD CONSTRAINT fk_grant_content FOREIGN KEY ("Content")
-        REFERENCES public."Content" ("Id") MATCH SIMPLE
-        ON UPDATE NO ACTION
-        ON DELETE NO ACTION;
\ No newline at end of file
diff --git a/dmp-db-scema/updates/03/07_Renames-Grant-fk-creator-Constraint.sql b/dmp-db-scema/updates/03/07_Renames-Grant-fk-creator-Constraint.sql
deleted file mode 100644
index 6e0a8ff3a..000000000
--- a/dmp-db-scema/updates/03/07_Renames-Grant-fk-creator-Constraint.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE public."Grant"
-RENAME CONSTRAINT "fk_project_creator" TO "fk_grant_creator";
\ No newline at end of file
diff --git a/dmp-db-scema/updates/03/08_Renames-Grant-pKey-Constraint.sql b/dmp-db-scema/updates/03/08_Renames-Grant-pKey-Constraint.sql
deleted file mode 100644
index c0ffc4b23..000000000
--- a/dmp-db-scema/updates/03/08_Renames-Grant-pKey-Constraint.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE public."Grant"
-RENAME CONSTRAINT "Project_pkey" TO "Grant_pkey";
\ No newline at end of file
diff --git a/dmp-db-scema/updates/03/09_Rename-Dmps-Project-to_Grant.sql b/dmp-db-scema/updates/03/09_Rename-Dmps-Project-to_Grant.sql
deleted file mode 100644
index 23d5b198f..000000000
--- a/dmp-db-scema/updates/03/09_Rename-Dmps-Project-to_Grant.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE public."DMP"
-RENAME COLUMN "Project" to "Grant"
\ No newline at end of file
diff --git a/dmp-db-scema/updates/03/10_Project-create.sql b/dmp-db-scema/updates/03/10_Project-create.sql
deleted file mode 100644
index 7f1f6b62e..000000000
--- a/dmp-db-scema/updates/03/10_Project-create.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-CREATE TABLE public."Project"
-(
-    "ID" uuid NOT NULL DEFAULT uuid_generate_v4(),
-    "Label" character varying(250) COLLATE pg_catalog."default" NOT NULL,
-    "Abbreviation" character varying(50) COLLATE pg_catalog."default",
-    "Reference" character varying COLLATE pg_catalog."default",
-    "Uri" character varying(250) COLLATE pg_catalog."default",
-    "Definition" character varying COLLATE pg_catalog."default",
-    "Status" smallint NOT NULL DEFAULT 0,
-    "Created" timestamp(4) with time zone NOT NULL DEFAULT now(),
-    "Modified" timestamp(4) with time zone NOT NULL DEFAULT now(),
-    "StartDate" timestamp(4) with time zone,
-    "EndDate" timestamp(4) with time zone,
-    "Description" text COLLATE pg_catalog."default",
-    "CreationUser" uuid,
-    "Type" numeric NOT NULL DEFAULT 0,
-    "Content" uuid,
-    CONSTRAINT "Project_pkey" PRIMARY KEY ("ID"),
-    CONSTRAINT fk_project_content FOREIGN KEY ("Content")
-        REFERENCES public."Content" ("Id") MATCH SIMPLE
-        ON UPDATE NO ACTION
-        ON DELETE NO ACTION,
-    CONSTRAINT fk_project_creator FOREIGN KEY ("CreationUser")
-        REFERENCES public."UserInfo" (id) MATCH SIMPLE
-        ON UPDATE NO ACTION
-        ON DELETE NO ACTION
-)
\ No newline at end of file
diff --git a/dmp-db-scema/updates/03/11_DMP-add-column-project.sql b/dmp-db-scema/updates/03/11_DMP-add-column-project.sql
deleted file mode 100644
index e72d6afe7..000000000
--- a/dmp-db-scema/updates/03/11_DMP-add-column-project.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE public."DMP"
-ADD COLUMN "Project" uuid
\ No newline at end of file
diff --git a/dmp-db-scema/updates/03/12_Remove_xml_types.sql b/dmp-db-scema/updates/03/12_Remove_xml_types.sql
deleted file mode 100644
index 5bfb2a5f8..000000000
--- a/dmp-db-scema/updates/03/12_Remove_xml_types.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-ALTER TABLE public."Grant"
-ALTER COLUMN "Reference" TYPE character varying(255);
-
-ALTER TABLE public."Grant"
-ALTER COLUMN "Definition" TYPE character varying;
-
-ALTER TABLE public."Registry"
-ALTER COLUMN "Reference" TYPE character varying;
-
-ALTER TABLE public."Service"
-ALTER COLUMN "Reference" TYPE character varying;
-
-ALTER TABLE public."Researcher"
-ALTER COLUMN "Reference" TYPE character varying;
-
-ALTER TABLE public."DataRepository"
-ALTER COLUMN "Reference" TYPE character varying;
-
diff --git a/dmp-db-scema/updates/04/01_Funder_add_column_CreationUser.sql b/dmp-db-scema/updates/04/01_Funder_add_column_CreationUser.sql
deleted file mode 100644
index 04aa6f4d3..000000000
--- a/dmp-db-scema/updates/04/01_Funder_add_column_CreationUser.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE "Funder"
-ADD COLUMN "CreationUser" uuid;
\ No newline at end of file
diff --git a/dmp-db-scema/updates/04/02_Funder_update_CreationUser_values.sql b/dmp-db-scema/updates/04/02_Funder_update_CreationUser_values.sql
deleted file mode 100644
index 2d7085f3e..000000000
--- a/dmp-db-scema/updates/04/02_Funder_update_CreationUser_values.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-Update "Funder" as funder
-	set "CreationUser" = grant1."CreationUser"
-	from "Grant" as grant1
-	where funder."ID" = grant1."Funder" ;
\ No newline at end of file
diff --git a/dmp-db-scema/updates/04/03_Create_External_Datasets.sql b/dmp-db-scema/updates/04/03_Create_External_Datasets.sql
deleted file mode 100644
index 015df00e0..000000000
--- a/dmp-db-scema/updates/04/03_Create_External_Datasets.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-CREATE TABLE public."ExternalDataset" (
-    "Id" uuid DEFAULT public.uuid_generate_v4() NOT NULL,
-    "Label" character varying NOT NULL,
-    "Abbreviation" character varying,
-    "Reference" character varying NOT NULL,
-    "Created" timestamp(4) with time zone NOT NULL,
-    "Modified" timestamp(4) with time zone NOT NULL
-);
-
-
-ALTER TABLE public."ExternalDataset" OWNER TO :POSTGRES_USER;
-
-ALTER TABLE ONLY public."ExternalDataset"
-    ADD CONSTRAINT "ExternalDataset_pkey" PRIMARY KEY ("Id");
-
diff --git a/dmp-db-scema/updates/04/04_Add_creationUser_on_DataRepository_ExternalDataset_Registry_Service.sql b/dmp-db-scema/updates/04/04_Add_creationUser_on_DataRepository_ExternalDataset_Registry_Service.sql
deleted file mode 100644
index fd8dc380d..000000000
--- a/dmp-db-scema/updates/04/04_Add_creationUser_on_DataRepository_ExternalDataset_Registry_Service.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-ALTER TABLE "DataRepository"
-ADD COLUMN "CreationUser" uuid;
-
-ALTER TABLE "ExternalDataset"
-ADD COLUMN "CreationUser" uuid;
-
-ALTER TABLE "Registry"
-ADD COLUMN "CreationUser" uuid;
-
-ALTER TABLE "Service"
-ADD COLUMN "CreationUser" uuid;
\ No newline at end of file
diff --git a/dmp-db-scema/updates/04/05_Researcher_add_column_CreationUser.sql b/dmp-db-scema/updates/04/05_Researcher_add_column_CreationUser.sql
deleted file mode 100644
index d9627e5bf..000000000
--- a/dmp-db-scema/updates/04/05_Researcher_add_column_CreationUser.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE "Researcher"
-ADD COLUMN "CreationUser" uuid;
\ No newline at end of file
diff --git a/dmp-db-scema/updates/05/01_External_References_Reference_Prefix_Update.sql b/dmp-db-scema/updates/05/01_External_References_Reference_Prefix_Update.sql
deleted file mode 100644
index 615ebb4c9..000000000
--- a/dmp-db-scema/updates/05/01_External_References_Reference_Prefix_Update.sql
+++ /dev/null
@@ -1,31 +0,0 @@
--- Registry Update Script
-UPDATE public."Registry"
-SET "Reference" = REPLACE("Reference", 'dmpdata/', 'dmp:')
-WHERE "Reference" LIKE 'dmpdata/%';
-
--- Service Update Script
-UPDATE public."Service"
-SET "Reference" = REPLACE("Reference", 'dmpdata/', 'dmp:')
-WHERE "Reference" LIKE 'dmpdata/%';
-UPDATE public."Service"
-SET "Reference" = REPLACE("Reference", 'innerdata/', 'dmp:')
-WHERE "Reference" LIKE 'innerdata/%';
-
--- DataRepository
-UPDATE public."DataRepository"
-SET "Reference" = REPLACE("Reference", 'dmpdata/', 'dmp:')
-where "Reference" like 'dmpdata/%';
-UPDATE public."DataRepository"
-SET "Reference" = CONCAT('re3data:', "Reference")
-where "Reference" LIKE '%:re3data%';
-UPDATE public."DataRepository"
-SET "Reference" = CONCAT('dmp:', "Reference")
-where "Reference" LIKE '%:internal%';
-UPDATE public."DataRepository"
-SET "Reference" = CONCAT('eestore:', "Reference")
-where "Reference" LIKE '%:eestore%';
-
--- ExternalDataset
-UPDATE public."ExternalDataset"
-SET "Reference" = REPLACE("Reference", 'dmpdata/', 'dmp:')
-WHERE "Reference" LIKE 'dmpdata/%';
\ No newline at end of file
diff --git a/dmp-db-scema/updates/05/02_Grant_Funder_Project_Reference_Prefix_Update.sql b/dmp-db-scema/updates/05/02_Grant_Funder_Project_Reference_Prefix_Update.sql
deleted file mode 100644
index bb1e529fe..000000000
--- a/dmp-db-scema/updates/05/02_Grant_Funder_Project_Reference_Prefix_Update.sql
+++ /dev/null
@@ -1,26 +0,0 @@
--- Grant
-UPDATE public."Grant"
-SET "Reference" = CONCAT('cristin:', "Reference")
-WHERE "Reference" LIKE '%cristin/%';
-UPDATE public."Grant"
-SET "Reference" = CONCAT('OpenAIRE:', "Reference")
-where "Reference" like '%_________::%' and
-"Reference" not like 'OpenAIRE:%';
-
--- Funder
-UPDATE public."Funder"
-SET "Reference" = CONCAT('cristin:', "Reference")
-WHERE "Reference" LIKE '%cristin/%';
-UPDATE public."Funder"
-SET "Reference" = CONCAT('openaire:', "Reference")
-WHERE "Reference" LIKE '%_________::%' and
-upper("Reference") NOT LIKE upper('openAIRE:%');
-
--- Project
-UPDATE public."Project"
-SET "Reference" = CONCAT('cristin:', "Reference")
-WHERE "Reference" LIKE '%cristin/%';
-UPDATE public."Project"
-SET "Reference" = CONCAT('openaire:', "Reference")
-WHERE "Reference" LIKE '%_________::%' and
-upper("Reference") NOT LIKE upper('openAIRE:%');
\ No newline at end of file
diff --git a/dmp-db-scema/updates/06/01_Update_Dataset_Statuses_To_Canceled_For_Old_Cases.sql b/dmp-db-scema/updates/06/01_Update_Dataset_Statuses_To_Canceled_For_Old_Cases.sql
deleted file mode 100644
index 9809fbbdb..000000000
--- a/dmp-db-scema/updates/06/01_Update_Dataset_Statuses_To_Canceled_For_Old_Cases.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-UPDATE "Dataset" AS dataset
-SET "Status" = 2
-WHERE dataset."ID" in (
-	SELECT dataset1."ID"
-	FROM "Dataset" AS dataset1
-	INNER JOIN "DMP" AS dmp ON dmp."ID" = dataset1."DMP"
-	WHERE dmp."isPublic" = true AND dataset1."Status" = 0
-)
\ No newline at end of file
diff --git a/dmp-db-scema/updates/06/02_Update_Funder_Grant_Project_References_For_Internal_Items.sql b/dmp-db-scema/updates/06/02_Update_Funder_Grant_Project_References_For_Internal_Items.sql
deleted file mode 100644
index 6fe80768b..000000000
--- a/dmp-db-scema/updates/06/02_Update_Funder_Grant_Project_References_For_Internal_Items.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-UPDATE "Funder"
-SET "Reference" = CONCAT('dmp:', "ID")
-WHERE "Reference" LIKE 'dmp:%';
-
-UPDATE "Grant"
-SET "Reference" = CONCAT('dmp:', "ID")
-WHERE "Reference" LIKE 'dmp:%';
-
-UPDATE "Project"
-SET "Reference" = CONCAT('dmp:', "ID")
-WHERE "Reference" LIKE 'dmp:%';
\ No newline at end of file
diff --git a/dmp-db-scema/updates/06/03_Update_Researcher_Internal_Entities_Reference.sql b/dmp-db-scema/updates/06/03_Update_Researcher_Internal_Entities_Reference.sql
deleted file mode 100644
index 080cf05d7..000000000
--- a/dmp-db-scema/updates/06/03_Update_Researcher_Internal_Entities_Reference.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-UPDATE "Researcher"
-SET "Reference" = CONCAT('dmp:', "ID")
-WHERE "ID" IN (
-	SELECT "ID" FROM "Researcher"
-	WHERE "Reference" LIKE 'dmp:%'
-)
\ No newline at end of file
diff --git a/dmp-db-scema/updates/07/01_Add_Lock_Table_To_Prevent_Parallel_Edits.sql b/dmp-db-scema/updates/07/01_Add_Lock_Table_To_Prevent_Parallel_Edits.sql
deleted file mode 100644
index 3d69172b3..000000000
--- a/dmp-db-scema/updates/07/01_Add_Lock_Table_To_Prevent_Parallel_Edits.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-CREATE TABLE public."Lock" (
-    id uuid NOT NULL,
-    "Target" uuid NOT NULL,
-    "LockedBy" uuid NOT NULL,
-    "LockedAt" timestamp NOT NULL,
-    "TouchedAt" timestamp
-);
-
-ALTER TABLE ONLY public."Lock"
-    ADD CONSTRAINT "Lock_pkey" PRIMARY KEY (id);
-
-ALTER TABLE ONLY public."Lock"
-    ADD CONSTRAINT "LockUserReference" FOREIGN KEY ("LockedBy") REFERENCES public."UserInfo"(id);
-
diff --git a/dmp-db-scema/updates/07/02_Add_Notification_Table.sql b/dmp-db-scema/updates/07/02_Add_Notification_Table.sql
deleted file mode 100644
index e5d125455..000000000
--- a/dmp-db-scema/updates/07/02_Add_Notification_Table.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-CREATE TABLE public."Notification" (
-    id uuid NOT NULL,
-    "UserId" uuid,
-    "IsActive" integer NOT NULL,
-    "Type" integer NOT NULL,
-    "ContactTypeHint" integer,
-    "ContactHint" character varying,
-    "Data" character varying,
-    "NotifyState" integer NOT NULL,
-    "NotifiedAt" timestamp without time zone,
-    "RetryCount" integer,
-    "CreatedAt" timestamp without time zone,
-    "UpdatedAt" timestamp without time zone
-);
-
-ALTER TABLE ONLY public."Notification"
-    ADD CONSTRAINT "Notification_pkey" PRIMARY KEY (id);
-
-ALTER TABLE ONLY public."Notification"
-    ADD CONSTRAINT "NotificationUserReference" FOREIGN KEY ("UserId") REFERENCES public."UserInfo"(id);
diff --git a/dmp-db-scema/updates/08/01_Add_database_versioning.sql b/dmp-db-scema/updates/08/01_Add_database_versioning.sql
deleted file mode 100644
index 47e855bed..000000000
--- a/dmp-db-scema/updates/08/01_Add_database_versioning.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-CREATE TABLE public."DBVersion" (
-    key character varying NOT NULL,
-    version character varying NOT NULL,
-    "releasedAt" timestamp with time zone NOT NULL,
-    "deployedAt" timestamp with time zone,
-    description text
-);
-
-INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.00.001', '2020-03-31 11:34:54.236152+03', now(), 'Add Database Versioning');
-
diff --git a/dmp-db-scema/updates/08/02_Add_missing_columns.sql b/dmp-db-scema/updates/08/02_Add_missing_columns.sql
deleted file mode 100644
index 2cecd31cb..000000000
--- a/dmp-db-scema/updates/08/02_Add_missing_columns.sql
+++ /dev/null
@@ -1,23 +0,0 @@
-ALTER TABLE public."DMP"
-ADD COLUMN "DmpProperties" text;
-
-ALTER TABLE public."DMP"
-ADD COLUMN "GroupId" uuid;
-
-ALTER TABLE public."DMP"
-ADD COLUMN "Properties" text;
-
-ALTER TABLE public."DatasetProfile"
-ADD COLUMN "GroupId" uuid;
-
-ALTER TABLE public."DatasetProfile"
-ADD COLUMN "Version" integer;
-
-ALTER TABLE public."Grant"
-ADD COLUMN "Type" numeric NOT NULL;
-
-ALTER TABLE public."DatasetDataRepository"
-ADD COLUMN "Data" character varying;
-
-ALTER TABLE public."DatasetService"
-ADD COLUMN "Data" character varying;
\ No newline at end of file
diff --git a/dmp-db-scema/updates/08/03_Create_Credentials.sql b/dmp-db-scema/updates/08/03_Create_Credentials.sql
deleted file mode 100644
index a2105b72c..000000000
--- a/dmp-db-scema/updates/08/03_Create_Credentials.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-CREATE TABLE public."Credential" (
-    "Id" uuid NOT NULL,
-    "Status" numeric NOT NULL,
-    "Provider" numeric NOT NULL,
-    "Public" character varying NOT NULL,
-    "Secret" character varying NOT NULL,
-    "CreationTime" timestamp(4) with time zone NOT NULL,
-    "LastUpdateTime" timestamp(4) with time zone NOT NULL,
-    "UserId" uuid NOT NULL,
-    "ExternalId" character varying NOT NULL
-);
-
-
-ALTER TABLE public."Credential" OWNER TO :POSTGRES_USER;
-
-ALTER TABLE ONLY public."Credential"
-    ADD CONSTRAINT "Credential_pkey" PRIMARY KEY ("Id");
-
-ALTER TABLE ONLY public."Credential"
-    ADD CONSTRAINT fkey_credential_user FOREIGN KEY ("UserId") REFERENCES public."UserInfo"(id);
-
-INSERT INTO public."UserInfo"(email, authorization_level, usertype, name, created, additionalinfo) VALUES ('fake@email.org', 1, 1, :'ADMIN_USERNAME', now(), '{}');
-
-INSERT INTO public."Credential" VALUES (uuid_generate_v4(), 0, 5, :'ADMIN_USERNAME', :'ADMIN_PASSWORD', now(), now(), (SELECT public."UserInfo"."id" FROM public."UserInfo" WHERE name = :'ADMIN_USERNAME'), 'dmp');
-
diff --git a/dmp-db-scema/updates/08/04_Create_UserToken.sql b/dmp-db-scema/updates/08/04_Create_UserToken.sql
deleted file mode 100644
index 1e129b9d2..000000000
--- a/dmp-db-scema/updates/08/04_Create_UserToken.sql
+++ /dev/null
@@ -1,16 +0,0 @@
-CREATE TABLE public."UserToken" (
-    "Token" uuid NOT NULL,
-    "UserId" uuid NOT NULL,
-    "IssuedAt" timestamp(4) with time zone NOT NULL,
-    "ExpiresAt" timestamp(4) with time zone NOT NULL
-);
-
-
-ALTER TABLE public."UserToken" OWNER TO :POSTGRES_USER;
-
-ALTER TABLE ONLY public."UserToken"
-    ADD CONSTRAINT "UserToken_pkey" PRIMARY KEY ("Token");
-
-ALTER TABLE ONLY public."UserToken"
-    ADD CONSTRAINT fkey_usetoken_user FOREIGN KEY ("UserId") REFERENCES public."UserInfo"(id);
-
diff --git a/dmp-db-scema/updates/08/05_Create_UserRole.sql b/dmp-db-scema/updates/08/05_Create_UserRole.sql
deleted file mode 100644
index 84229bab6..000000000
--- a/dmp-db-scema/updates/08/05_Create_UserRole.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-CREATE TABLE public."UserRole" (
-    "Id" uuid DEFAULT public.uuid_generate_v4() NOT NULL,
-    "Role" numeric DEFAULT 0 NOT NULL,
-    "UserId" uuid NOT NULL
-);
-
-
-ALTER TABLE public."UserRole" OWNER TO :POSTGRES_USER;
-
-ALTER TABLE ONLY public."UserRole"
-    ADD CONSTRAINT "UserRole_pkey" PRIMARY KEY ("Id");
-
-ALTER TABLE ONLY public."UserRole"
-    ADD CONSTRAINT "UserRole_userId_fkey" FOREIGN KEY ("UserId") REFERENCES public."UserInfo"(id);
-	
-
-INSERT INTO public."UserRole"("Role", "UserId") VALUES (2, (SELECT public."UserInfo"."id" FROM public."UserInfo" WHERE name = 'admin'));
-
diff --git a/dmp-db-scema/updates/08/06_Remove_UserAuth.sql b/dmp-db-scema/updates/08/06_Remove_UserAuth.sql
deleted file mode 100644
index 5ed59655c..000000000
--- a/dmp-db-scema/updates/08/06_Remove_UserAuth.sql
+++ /dev/null
@@ -1 +0,0 @@
-DROP TABLE IF EXISTS "UserAuth" CASCADE;
\ No newline at end of file
diff --git a/dmp-db-scema/updates/08/07_Remove_no_null_requirement.sql b/dmp-db-scema/updates/08/07_Remove_no_null_requirement.sql
deleted file mode 100644
index 8cda5cf9c..000000000
--- a/dmp-db-scema/updates/08/07_Remove_no_null_requirement.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-AlTER TABLE "DMP"
-ALTER COLUMN "Creator" DROP NOT NULL;
\ No newline at end of file
diff --git a/dmp-db-scema/updates/08/08_create_datasetexternaldataset.sql b/dmp-db-scema/updates/08/08_create_datasetexternaldataset.sql
deleted file mode 100644
index d662b0e80..000000000
--- a/dmp-db-scema/updates/08/08_create_datasetexternaldataset.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-CREATE TABLE public."DatasetExternalDataset" (
-    "Id" uuid DEFAULT public.uuid_generate_v4() NOT NULL,
-    "Dataset" uuid NOT NULL,
-    "ExternalDataset" uuid NOT NULL,
-    "Role" numeric,
-    "Data" character varying
-);
-
-ALTER TABLE public."DatasetExternalDataset" OWNER TO :POSTGRES_USER;
-
-ALTER TABLE ONLY public."DatasetExternalDataset"
-    ADD CONSTRAINT "DatasetExternalDataset_pkey" PRIMARY KEY ("Id");
-
-ALTER TABLE ONLY public."DatasetExternalDataset"
-    ADD CONSTRAINT fkey_datasetexternaldataset_dataset FOREIGN KEY ("Dataset") REFERENCES public."Dataset"("ID");
-
-ALTER TABLE ONLY public."DatasetExternalDataset"
-    ADD CONSTRAINT fkey_datasetexternaldataset_externaldataset FOREIGN KEY ("ExternalDataset") REFERENCES public."ExternalDataset"("Id");
-
diff --git a/dmp-db-scema/updates/08/09_Create_Invitation.sql b/dmp-db-scema/updates/08/09_Create_Invitation.sql
deleted file mode 100644
index e61e17f03..000000000
--- a/dmp-db-scema/updates/08/09_Create_Invitation.sql
+++ /dev/null
@@ -1,23 +0,0 @@
-CREATE TABLE public."Invitation" (
-    "Id" uuid NOT NULL,
-    "InvitationEmail" character varying NOT NULL,
-    "Token" uuid NOT NULL,
-    "CreationUser" uuid NOT NULL,
-    "Dmp" uuid NOT NULL,
-    "Properties" xml,
-    "AcceptedInvitation" boolean
-);
-
-
-ALTER TABLE public."Invitation" OWNER TO :POSTGRES_USER;
-
-ALTER TABLE ONLY public."Invitation"
-    ADD CONSTRAINT "Invitation_pkey" PRIMARY KEY ("Id");
-
-
-ALTER TABLE ONLY public."Invitation"
-    ADD CONSTRAINT fk_invitation_creator FOREIGN KEY ("CreationUser") REFERENCES public."UserInfo"(id);
-
-
-ALTER TABLE ONLY public."Invitation"
-    ADD CONSTRAINT fk_invitation_dmp FOREIGN KEY ("Dmp") REFERENCES public."DMP"("ID");
\ No newline at end of file
diff --git a/dmp-db-scema/updates/08/10_Create_User_preference.sql b/dmp-db-scema/updates/08/10_Create_User_preference.sql
deleted file mode 100644
index cc5053684..000000000
--- a/dmp-db-scema/updates/08/10_Create_User_preference.sql
+++ /dev/null
@@ -1,16 +0,0 @@
-CREATE TABLE public."UserPreference" (
-    "Id" uuid NOT NULL,
-    "UserId" uuid NOT NULL,
-    "Data" json NOT NULL,
-    "PreferenceType" smallint NOT NULL
-);
-
-
-ALTER TABLE public."UserPreference" OWNER TO :POSTGRES_USER;
-
-ALTER TABLE ONLY public."UserPreference"
-    ADD CONSTRAINT "UserPreference_pkey" PRIMARY KEY ("Id");
-
-
-ALTER TABLE ONLY public."UserPreference"
-    ADD CONSTRAINT userpreference_user_fk FOREIGN KEY ("UserId") REFERENCES public."UserInfo"(id);

From cebf3935f3596b7c52c8c041992a5cb35b9e1e04 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Wed, 13 May 2020 16:32:01 +0300
Subject: [PATCH 60/60] Bug fix

---
 dmp-frontend/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dmp-frontend/Dockerfile b/dmp-frontend/Dockerfile
index 5e6fe52b2..7a8d188c9 100644
--- a/dmp-frontend/Dockerfile
+++ b/dmp-frontend/Dockerfile
@@ -1,5 +1,5 @@
 # stage1 as builder
-FROM node:12-alpine as builder
+FROM node:12-alpine AS BUILDER
 
 WORKDIR /page
 
@@ -25,7 +25,7 @@ COPY mime.types /etc/nginx
 RUN rm -rf /usr/share/nginx/html/*
 
 # Copy from the stahg 1
-COPY --from=builder /page/dist /usr/share/nginx/html
+COPY --from=BUILDER /page/dist /usr/share/nginx/html
 
 EXPOSE 4200