diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanPublicCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanPublicCriteria.java index bd3d049bf..edc1ffa9f 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanPublicCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanPublicCriteria.java @@ -11,6 +11,7 @@ public class DataManagementPlanPublicCriteria extends Criteria { private List grants; public List datasetProfile; private List dmpOrganisations; + private Integer role; public GrantStateType getGrantStatus() { return grantStatus; @@ -39,4 +40,11 @@ public class DataManagementPlanPublicCriteria extends Criteria { public void setDmpOrganisations(List dmpOrganisations) { this.dmpOrganisations = dmpOrganisations; } + + public Integer getRole() { + return role; + } + public void setRole(Integer role) { + this.role = role; + } } diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataRepositoryCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataRepositoryCriteria.java index f66eb8b3e..ecd577308 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataRepositoryCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataRepositoryCriteria.java @@ -2,6 +2,16 @@ package eu.eudat.data.dao.criteria; import eu.eudat.data.entities.DataRepository; +import java.util.UUID; + public class DataRepositoryCriteria extends Criteria { + private UUID creationUserId; + + public UUID getCreationUserId() { + return creationUserId; + } + public void setCreationUserId(UUID creationUserId) { + this.creationUserId = creationUserId; + } } diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetPublicCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetPublicCriteria.java index fd4934d7a..9554ed5b4 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetPublicCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetPublicCriteria.java @@ -17,6 +17,7 @@ public class DatasetPublicCriteria extends Criteria{ private List dmpOrganisations; private List tags; private List dmpIds; + private Integer role; public GrantStateType getGrantStatus() { return grantStatus; @@ -59,4 +60,11 @@ public class DatasetPublicCriteria extends Criteria{ public void setDmpIds(List dmpIds) { this.dmpIds = dmpIds; } + + public Integer getRole() { + return role; + } + public void setRole(Integer role) { + this.role = role; + } } diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ExternalDatasetCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ExternalDatasetCriteria.java index f2e775366..a5a6275e8 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ExternalDatasetCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ExternalDatasetCriteria.java @@ -1,7 +1,15 @@ package eu.eudat.data.dao.criteria; - import eu.eudat.data.entities.ExternalDataset; +import java.util.UUID; public class ExternalDatasetCriteria extends Criteria { + private UUID creationUserId; + + public UUID getCreationUserId() { + return creationUserId; + } + public void setCreationUserId(UUID creationUserId) { + this.creationUserId = creationUserId; + } } diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/RegistryCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/RegistryCriteria.java index 44b890887..186f5e281 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/RegistryCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/RegistryCriteria.java @@ -2,6 +2,16 @@ package eu.eudat.data.dao.criteria; import eu.eudat.data.entities.Registry; +import java.util.UUID; + public class RegistryCriteria extends Criteria { + private UUID creationUserId; + + public UUID getCreationUserId() { + return creationUserId; + } + public void setCreationUserId(UUID creationUserId) { + this.creationUserId = creationUserId; + } } diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ServiceCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ServiceCriteria.java index d7aeccac4..715511fb3 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ServiceCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ServiceCriteria.java @@ -2,6 +2,16 @@ package eu.eudat.data.dao.criteria; import eu.eudat.data.entities.Service; +import java.util.UUID; + public class ServiceCriteria extends Criteria { + private UUID creationUserId; + + public UUID getCreationUserId() { + return creationUserId; + } + public void setCreationUserId(UUID creationUserId) { + this.creationUserId = creationUserId; + } } diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDao.java index 03cf68d74..3073e1857 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDao.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDao.java @@ -8,6 +8,7 @@ import eu.eudat.data.entities.UserDMP; import eu.eudat.data.entities.UserInfo; import eu.eudat.queryable.QueryableList; +import java.util.List; import java.util.UUID; public interface DMPDao extends DatabaseAccessLayer { @@ -16,6 +17,6 @@ public interface DMPDao extends DatabaseAccessLayer { QueryableList getUserDmps(DatasetWizardUserDmpCriteria datasetWizardAutocompleteRequest, UserInfo userInfo); - QueryableList getAuthenticated(QueryableList query, UUID principalId); + QueryableList getAuthenticated(QueryableList query, UUID principalId, List roles); } \ No newline at end of file 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 9684373a5..e1c92d6d8 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 @@ -5,7 +5,6 @@ import eu.eudat.data.dao.criteria.DataManagementPlanCriteria; import eu.eudat.data.dao.criteria.DatasetWizardUserDmpCriteria; import eu.eudat.data.dao.databaselayer.service.DatabaseService; import eu.eudat.data.entities.DMP; -import eu.eudat.data.entities.UserDMP; import eu.eudat.data.entities.UserInfo; import eu.eudat.queryable.QueryableList; import eu.eudat.queryable.types.FieldSelectionType; @@ -14,110 +13,119 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; +import javax.persistence.criteria.Join; import javax.persistence.criteria.JoinType; import java.util.Arrays; +import java.util.List; import java.util.UUID; import java.util.concurrent.CompletableFuture; @Component("dMPDao") public class DMPDaoImpl extends DatabaseAccess implements DMPDao { + @Autowired + public DMPDaoImpl(DatabaseService databaseService) { + super(databaseService); + } - @Autowired - public DMPDaoImpl(DatabaseService databaseService) { - super(databaseService); - } - - @Override - public QueryableList getWithCriteria(DataManagementPlanCriteria criteria) { - QueryableList query = getDatabaseService().getQueryable(DMP.getHints(), DMP.class); - if (criteria.getLike() != null && !criteria.getLike().isEmpty()) - query.where((builder, root) -> builder.or( - builder.like(builder.upper(root.get("label")), "%" + criteria.getLike().toUpperCase() + "%"), - builder.like(builder.upper(root.get("description")), "%" + criteria.getLike().toUpperCase() + "%"))); - if (criteria.getPeriodEnd() != null) - query.where((builder, root) -> builder.lessThan(root.get("created"), criteria.getPeriodEnd())); - if (criteria.getPeriodStart() != null) - query.where((builder, root) -> builder.greaterThan(root.get("created"), criteria.getPeriodStart())); - if (criteria.getGrants() != null && !criteria.getGrants().isEmpty()) - query.where(((builder, root) -> root.get("grant").in(criteria.getGrants()))); - if (!criteria.getAllVersions()) - query.initSubQuery(String.class).where((builder, root) -> builder.equal(root.get("version"), - query.subQueryMax((builder1, externalRoot, nestedRoot) -> builder1.equal(externalRoot.get("groupId"), - nestedRoot.get("groupId")), Arrays.asList(new SelectionField(FieldSelectionType.FIELD, "version")), String.class))); - if (criteria.getGroupIds() != null && !criteria.getGroupIds().isEmpty()) - query.where((builder, root) -> root.get("groupId").in(criteria.getGroupIds())); - if (criteria.getStatus() != null) { - if (criteria.getStatus() == DMP.DMPStatus.FINALISED.getValue()) { - query.where((builder, root) -> builder.and(builder.equal(root.get("status"), DMP.DMPStatus.FINALISED.getValue()), builder.notEqual(root.get("isPublic"), true))); - } else if (criteria.getStatus() == DMP.DMPStatus.ACTIVE.getValue()) { - query.where((builder, root) -> builder.equal(root.get("status"), DMP.DMPStatus.ACTIVE.getValue())); - } - } - if (criteria.getIsPublic()) - query.where(((builder, root) -> builder.equal(root.get("isPublic"), true))); - if (criteria.getRole() != null) { + @Override + public QueryableList getWithCriteria(DataManagementPlanCriteria criteria) { + QueryableList query = getDatabaseService().getQueryable(DMP.getHints(), DMP.class); + if (criteria.getLike() != null && !criteria.getLike().isEmpty()) + query.where((builder, root) -> builder.or( + builder.like(builder.upper(root.get("label")), "%" + criteria.getLike().toUpperCase() + "%"), + builder.like(builder.upper(root.get("description")), "%" + criteria.getLike().toUpperCase() + "%"))); + if (criteria.getPeriodEnd() != null) + query.where((builder, root) -> builder.lessThan(root.get("created"), criteria.getPeriodEnd())); + if (criteria.getPeriodStart() != null) + query.where((builder, root) -> builder.greaterThan(root.get("created"), criteria.getPeriodStart())); + if (criteria.getGrants() != null && !criteria.getGrants().isEmpty()) + query.where(((builder, root) -> root.get("grant").in(criteria.getGrants()))); + if (!criteria.getAllVersions()) + query.initSubQuery(String.class).where((builder, root) -> builder.equal(root.get("version"), + query.subQueryMax((builder1, externalRoot, nestedRoot) -> builder1.equal(externalRoot.get("groupId"), + nestedRoot.get("groupId")), Arrays.asList(new SelectionField(FieldSelectionType.FIELD, "version")), String.class))); + if (criteria.getGroupIds() != null && !criteria.getGroupIds().isEmpty()) + query.where((builder, root) -> root.get("groupId").in(criteria.getGroupIds())); + if (criteria.getStatus() != null) { + if (criteria.getStatus() == DMP.DMPStatus.FINALISED.getValue()) { + query.where((builder, root) -> builder.and(builder.equal(root.get("status"), DMP.DMPStatus.FINALISED.getValue()), builder.notEqual(root.get("isPublic"), true))); + } else if (criteria.getStatus() == DMP.DMPStatus.ACTIVE.getValue()) { + query.where((builder, root) -> builder.equal(root.get("status"), DMP.DMPStatus.ACTIVE.getValue())); + } + } + if (criteria.getIsPublic()) + query.where(((builder, root) -> builder.equal(root.get("isPublic"), true))); + /*if (criteria.getRole() != null) { if (criteria.getRole().equals(UserDMP.UserDMPRoles.OWNER.getValue())) { query.where((builder, root) -> builder.equal(root.join("users", JoinType.LEFT).get("role"), UserDMP.UserDMPRoles.OWNER.getValue())); } else if (criteria.getRole().equals(UserDMP.UserDMPRoles.USER.getValue())) { query.where((builder, root) -> builder.equal(root.join("users", JoinType.LEFT).get("role"), UserDMP.UserDMPRoles.USER.getValue())); } - } - if (criteria.getOrganisations() != null && !criteria.getOrganisations().isEmpty()) { - query.where((builder, root) -> root.join("organisations").get("reference").in(criteria.getOrganisations())); - } - if (criteria.getCollaborators() != null && !criteria.getCollaborators().isEmpty()) { - query.where((builder, root) -> root.join("users", JoinType.LEFT).join("user", JoinType.LEFT).get("id").in(criteria.getCollaborators())); - } - if (criteria.getDatasetTemplates() != null && !criteria.getDatasetTemplates().isEmpty()) { - query.where(((builder, root) -> root.join("associatedDmps", JoinType.LEFT).get("id").in(criteria.getDatasetTemplates()))); - } - query.where((builder, root) -> builder.notEqual(root.get("status"), DMP.DMPStatus.DELETED.getValue())); - return query; - } + }*/ + if (criteria.getOrganisations() != null && !criteria.getOrganisations().isEmpty()) { + query.where((builder, root) -> root.join("organisations").get("reference").in(criteria.getOrganisations())); + } + if (criteria.getCollaborators() != null && !criteria.getCollaborators().isEmpty()) { + query.where((builder, root) -> root.join("users", JoinType.LEFT).join("user", JoinType.LEFT).get("id").in(criteria.getCollaborators())); + } + if (criteria.getDatasetTemplates() != null && !criteria.getDatasetTemplates().isEmpty()) { + query.where((builder, root) -> root.join("associatedDmps", JoinType.LEFT).get("id").in(criteria.getDatasetTemplates())); + } + query.where((builder, root) -> builder.notEqual(root.get("status"), DMP.DMPStatus.DELETED.getValue())); + return query; + } - public QueryableList getAuthenticated(QueryableList query, UUID principal) { - query.where((builder, root) -> builder.equal(root.join("users", JoinType.LEFT).join("user").get("id"), principal)); - return query; - } + public QueryableList getAuthenticated(QueryableList query, UUID principal, List roles) { + if (roles != null && !roles.isEmpty()) { + query.where((builder, root) -> { + Join userJoin = root.join("users", JoinType.LEFT); + return builder.and(builder.equal(userJoin.join("user", JoinType.LEFT).get("id"), principal), userJoin.get("role").in(roles)); + }); + } else { + query.where((builder, root) -> builder.equal(root.join("users", JoinType.LEFT).join("user", JoinType.LEFT).get("id"), principal)); + } - @Override - public DMP createOrUpdate(DMP item) { - return this.getDatabaseService().createOrUpdate(item, DMP.class); - } + return query; + } - @Override - public DMP find(UUID id) { - return getDatabaseService().getQueryable(DMP.class).where((builder, root) -> builder.equal((root.get("id")), id)).getSingle(); - } + @Override + public DMP createOrUpdate(DMP item) { + return this.getDatabaseService().createOrUpdate(item, DMP.class); + } - @Override - public QueryableList getUserDmps(DatasetWizardUserDmpCriteria datasetWizardUserDmpCriteria, UserInfo userInfo) { - QueryableList query = getDatabaseService().getQueryable(DMP.class).where((builder, root) -> builder.or(builder.equal(root.get("creator"), userInfo), builder.isMember(userInfo, root.get("users")))); - if (datasetWizardUserDmpCriteria.getLike() != null && !datasetWizardUserDmpCriteria.getLike().isEmpty()) { - query.where((builder, root) -> builder.like(root.get("label"), "%" + datasetWizardUserDmpCriteria.getLike() + "%")); - } - return query; - } + @Override + public DMP find(UUID id) { + return getDatabaseService().getQueryable(DMP.class).where((builder, root) -> builder.equal((root.get("id")), id)).getSingle(); + } - @Override - public void delete(DMP item) { - this.getDatabaseService().delete(item); - } + @Override + public QueryableList getUserDmps(DatasetWizardUserDmpCriteria datasetWizardUserDmpCriteria, UserInfo userInfo) { + QueryableList query = getDatabaseService().getQueryable(DMP.class).where((builder, root) -> builder.or(builder.equal(root.get("creator"), userInfo), builder.isMember(userInfo, root.get("users")))); + if (datasetWizardUserDmpCriteria.getLike() != null && !datasetWizardUserDmpCriteria.getLike().isEmpty()) { + query.where((builder, root) -> builder.like(root.get("label"), "%" + datasetWizardUserDmpCriteria.getLike() + "%")); + } + return query; + } - @Override - public QueryableList asQueryable() { - return this.getDatabaseService().getQueryable(DMP.class); - } + @Override + public void delete(DMP item) { + this.getDatabaseService().delete(item); + } - @Async - @Override - public CompletableFuture createOrUpdateAsync(DMP item) { - return CompletableFuture.supplyAsync(() -> this.createOrUpdate(item)); - } + @Override + public QueryableList asQueryable() { + return this.getDatabaseService().getQueryable(DMP.class); + } - @Override - public DMP find(UUID id, String hint) { - throw new UnsupportedOperationException(); - } + @Async + @Override + public CompletableFuture createOrUpdateAsync(DMP item) { + return CompletableFuture.supplyAsync(() -> this.createOrUpdate(item)); + } + + @Override + public DMP find(UUID id, String hint) { + throw new UnsupportedOperationException(); + } } diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DataRepositoryDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DataRepositoryDaoImpl.java index c74a997d6..4658b44f6 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DataRepositoryDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DataRepositoryDaoImpl.java @@ -24,7 +24,11 @@ public class DataRepositoryDaoImpl extends DatabaseAccess implem public QueryableList getWithCriteria(DataRepositoryCriteria criteria) { QueryableList query = this.getDatabaseService().getQueryable(DataRepository.class); if (criteria.getLike() != null) - query.where((builder, root) -> builder.equal(root.get("reference"), criteria.getLike())); + query.where((builder, root) -> builder.or( + builder.like(builder.upper(root.get("reference")), "%" + criteria.getLike().toUpperCase() + "%"), + builder.equal(builder.upper(root.get("label")), criteria.getLike().toUpperCase()))); + if (criteria.getCreationUserId() != null) + query.where((builder, root) -> builder.equal(root.get("creationUser").get("id"), criteria.getCreationUserId())); return query; } diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDaoImpl.java index fec0ab7cb..1a68dcead 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDaoImpl.java @@ -3,8 +3,8 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccess; import eu.eudat.data.dao.criteria.DatasetCriteria; import eu.eudat.data.dao.databaselayer.service.DatabaseService; -import eu.eudat.data.entities.DMP; import eu.eudat.data.entities.Dataset; +import eu.eudat.data.entities.UserDMP; import eu.eudat.data.entities.UserInfo; import eu.eudat.queryable.QueryableList; import eu.eudat.queryable.types.FieldSelectionType; @@ -43,8 +43,11 @@ public class DatasetDaoImpl extends DatabaseAccess implements DatasetDa query.initSubQuery(String.class).where((builder, root) -> builder.equal(root.get("dmp").get("version"), query.subQueryMax((builder1, externalRoot, nestedRoot) -> builder1.equal(externalRoot.get("dmp").get("groupId"), nestedRoot.get("dmp").get("groupId")), Arrays.asList(new SelectionField(FieldSelectionType.COMPOSITE_FIELD, "dmp:version")), String.class))); if (criteria.getDmpIds() != null && !criteria.getDmpIds().isEmpty()) query.where((builder, root) -> root.get("dmp").get("id").in(criteria.getDmpIds())); - if (criteria.getRole() != null) + if (criteria.getRole() != null) { query.where((builder, root) -> builder.equal(root.join("dmp").join("users").get("role"), criteria.getRole())); + } else { + query.where((builder, root) -> root.join("dmp").join("users").get("role").in(UserDMP.UserDMPRoles.getAllValues())); + } if (criteria.getOrganisations() != null && !criteria.getOrganisations().isEmpty()) query.where((builder, root) -> root.join("dmp").join("organisations").get("reference").in(criteria.getOrganisations())); if (criteria.getGrants() != null && !criteria.getGrants().isEmpty()) @@ -52,9 +55,9 @@ public class DatasetDaoImpl extends DatabaseAccess implements DatasetDa if (criteria.getCollaborators() != null && !criteria.getCollaborators().isEmpty()) query.where((builder, root) -> root.join("dmp", JoinType.LEFT).join("users", JoinType.LEFT).join("user", JoinType.LEFT).get("id").in(criteria.getCollaborators())); if (criteria.getDatasetTemplates() != null && !criteria.getDatasetTemplates().isEmpty()) - query.where(((builder, root) -> root.get("profile").get("id").in(criteria.getDatasetTemplates()))); - query.where(((builder, root) -> builder.notEqual(root.get("status"), Dataset.Status.DELETED.getValue()))); - query.where(((builder, root) -> builder.notEqual(root.get("status"), Dataset.Status.CANCELED.getValue()))); + query.where((builder, root) -> root.get("profile").get("id").in(criteria.getDatasetTemplates())); + query.where((builder, root) -> builder.notEqual(root.get("status"), Dataset.Status.DELETED.getValue())); + query.where((builder, root) -> builder.notEqual(root.get("status"), Dataset.Status.CANCELED.getValue())); return query; } @@ -87,7 +90,7 @@ public class DatasetDaoImpl extends DatabaseAccess implements DatasetDa public QueryableList getAuthenticated(QueryableList query, UserInfo principal) { if (principal.getId() == null) query.where((builder, root) -> builder.equal(root.get("isPublic"), true)); else { - query.where((builder, root) -> builder.or(builder.equal(root.get("dmp").get("creator"), principal), builder.equal(root.join("dmp", JoinType.LEFT).join("users", JoinType.LEFT).join("user", JoinType.LEFT).get("id"), principal.getId()))); + query.where((builder, root) -> builder.equal(root.join("dmp", JoinType.LEFT).join("users", JoinType.LEFT).join("user", JoinType.LEFT).get("id"), principal.getId())); } return query; } diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ExternalDatasetDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ExternalDatasetDaoImpl.java index 76b1ec4f7..163eed579 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ExternalDatasetDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ExternalDatasetDaoImpl.java @@ -25,7 +25,11 @@ public class ExternalDatasetDaoImpl extends DatabaseAccess impl public QueryableList getWithCriteria(ExternalDatasetCriteria criteria) { QueryableList query = this.getDatabaseService().getQueryable(ExternalDataset.class); if (criteria.getLike() != null && !criteria.getLike().isEmpty()) - query.where((builder, root) -> builder.like(builder.upper(root.get("label")), "%" + criteria.getLike().toUpperCase() + "%")); + query.where((builder, root) -> builder.or( + builder.like(builder.upper(root.get("reference")), "%" + criteria.getLike().toUpperCase() + "%"), + builder.equal(builder.upper(root.get("label")), criteria.getLike().toUpperCase()))); + if (criteria.getCreationUserId() != null) + query.where((builder, root) -> builder.equal(root.join("creationUser").get("id"), criteria.getCreationUserId())); return query; } diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/FunderDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/FunderDaoImpl.java index 8335f71e5..40262d743 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/FunderDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/FunderDaoImpl.java @@ -28,14 +28,15 @@ public class FunderDaoImpl extends DatabaseAccess implements FunderDao { builder.or(builder.like(builder.upper(root.get("label")), "%" + criteria.getLike().toUpperCase() + "%"), builder.or(builder.like(builder.upper(root.get("definition")), "%" + criteria.getLike().toUpperCase() + "%")))); if (criteria.getReference() != null) - query.where((builder, root) -> builder.like(root.get("reference"), "%" + criteria.getReference() + "%")); + query.where((builder, root) -> builder.like(builder.upper(root.get("reference")), "%" + criteria.getReference().toUpperCase() + "%")); query.where((builder, root) -> builder.notEqual(root.get("status"), Funder.Status.DELETED.getValue())); return query; } @Override public QueryableList getAuthenticated(QueryableList query, UserInfo principal) { - return null; + query.where((builder, root) -> builder.equal(root.get("creationUser"), principal)); + return query; } @Override diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/GrantDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/GrantDaoImpl.java index 47d22c064..bb91b39ad 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/GrantDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/GrantDaoImpl.java @@ -11,6 +11,7 @@ import eu.eudat.types.grant.GrantStateType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; +import schemasMicrosoftComOfficeOffice.LeftDocument; import javax.persistence.criteria.JoinType; import java.util.Date; @@ -51,6 +52,8 @@ public class GrantDaoImpl extends DatabaseAccess implements GrantDao { } if (criteria.getFunderId() != null && !criteria.getFunderId().trim().isEmpty()) query.where((builder, root) -> builder.equal(root.get("funder").get("id"), UUID.fromString(criteria.getFunderId()))); + if (criteria.getFunderReference() != null && !criteria.getFunderReference().isEmpty()) + query.where((builder, root) -> builder.equal(root.join("funder", JoinType.LEFT).get("reference"), criteria.getFunderReference())); query.where((builder, root) -> builder.notEqual(root.get("status"), Grant.Status.DELETED.getValue())); return query; } diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/RegistryDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/RegistryDaoImpl.java index c7ed94b75..c02fee715 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/RegistryDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/RegistryDaoImpl.java @@ -24,7 +24,12 @@ public class RegistryDaoImpl extends DatabaseAccess implements Registr public QueryableList getWithCriteria(RegistryCriteria criteria) { QueryableList query = this.getDatabaseService().getQueryable(Registry.class); if (criteria.getLike() != null) - query.where((builder, root) -> builder.equal(root.get("reference"), criteria.getLike())); + if (criteria.getLike() != null) + query.where((builder, root) -> builder.or( + builder.like(builder.upper(root.get("reference")), "%" + criteria.getLike().toUpperCase() + "%"), + builder.equal(builder.upper(root.get("label")), criteria.getLike().toUpperCase()))); + if (criteria.getCreationUserId() != null) + query.where((builder, root) -> builder.equal(root.get("creationUser").get("id"), criteria.getCreationUserId())); return query; } diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ServiceDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ServiceDaoImpl.java index 00406ab91..1843a4510 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ServiceDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ServiceDaoImpl.java @@ -24,7 +24,11 @@ public class ServiceDaoImpl extends DatabaseAccess implements ServiceDa public QueryableList getWithCriteria(ServiceCriteria criteria) { QueryableList query = this.getDatabaseService().getQueryable(Service.class); if (criteria.getLike() != null) - query.where((builder, root) -> builder.equal(root.get("reference"), criteria.getLike())); + query.where((builder, root) -> builder.or( + builder.like(builder.upper(root.get("reference")), "%" + criteria.getLike().toUpperCase() + "%"), + builder.equal(builder.upper(root.get("label")), criteria.getLike().toUpperCase()))); + if (criteria.getCreationUserId() != null) + query.where((builder, root) -> builder.equal(root.get("creationUser").get("id"), criteria.getCreationUserId())); return query; } 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 a65eda92f..0d9d7a893 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 @@ -3,7 +3,6 @@ package eu.eudat.data.entities; import eu.eudat.data.entities.helpers.EntityBinder; import eu.eudat.queryable.queryableentity.DataEntity; -import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; import javax.persistence.*; @@ -18,8 +17,6 @@ import java.util.UUID; public class DataRepository implements Serializable, DataEntity { @Id - @GeneratedValue - @GenericGenerator(name = "uuid2", strategy = "uuid2") @Column(name = "\"ID\"", updatable = false, nullable = false, columnDefinition = "BINARY(16)") private UUID id; @@ -39,11 +36,9 @@ public class DataRepository implements Serializable, DataEntity datasetDataRepositories; - @Column(name = "\"Status\"", nullable = false) private Short status; @@ -53,41 +48,35 @@ public class DataRepository implements Serializable, DataEntity getDatasetDataRepositories() { return datasetDataRepositories; } - public void setDatasetDataRepositories(Set datasetDataRepositories) { this.datasetDataRepositories = datasetDataRepositories; } + public UserInfo getCreationUser() { + return creationUser; + } + public void setCreationUser(UserInfo creationUser) { + this.creationUser = creationUser; + } + @Override public void update(DataRepository entity) { diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Dataset.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Dataset.java index 3763b6de6..fe38a22cb 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Dataset.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Dataset.java @@ -276,32 +276,25 @@ public class Dataset implements DataEntity { @Override public void update(Dataset entity) { - this.setRegistries(entity.getRegistries()); - if (this.getDatasetDataRepositories() == null) this.setDatasetDataRepositories(new HashSet<>()); - if (!this.getDatasetDataRepositories().containsAll(entity.getDatasetDataRepositories())) { - this.getDatasetDataRepositories().removeAll(this.getDatasetDataRepositories()); - this.getDatasetDataRepositories().addAll(entity.getDatasetDataRepositories().stream().map(item -> { - item.setDataset(this); - return item; - }).collect(Collectors.toList())); - } this.setUri(entity.getUri()); this.setDescription(entity.getDescription()); this.setLabel(entity.getLabel()); this.setProperties(entity.getProperties()); - if (this.getDatasetExternalDatasets() == null) this.setDatasetExternalDatasets(new HashSet<>()); - if (!this.getDatasetExternalDatasets().containsAll(entity.getDatasetExternalDatasets())) { - this.getDatasetExternalDatasets().removeAll(this.getDatasetExternalDatasets()); - this.getDatasetExternalDatasets().addAll(entity.getDatasetExternalDatasets().stream().map(item -> { - item.setDataset(this); - return item; - }).collect(Collectors.toList())); - } - if (this.getServices() == null) this.setServices(new HashSet<>()); - if(!this.getServices().containsAll(entity.getServices())) { - this.getServices().removeAll(this.getServices()); + + this.getDatasetDataRepositories().removeAll(this.getDatasetDataRepositories()); + if (entity.getDatasetDataRepositories() != null) + this.getDatasetDataRepositories().addAll(entity.getDatasetDataRepositories()); + + this.getDatasetExternalDatasets().removeAll(this.getDatasetExternalDatasets()); + if (entity.getDatasetExternalDatasets() != null) + this.getDatasetExternalDatasets().addAll(entity.getDatasetExternalDatasets()); + + this.setRegistries(entity.getRegistries()); + + this.getServices().removeAll(this.getServices()); + if (entity.getServices() != null) this.getServices().addAll(entity.getServices()); - } + this.setDmp(entity.getDmp()); this.setStatus(entity.getStatus()); this.setProfile(entity.getProfile()); diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/ExternalDataset.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/ExternalDataset.java index 51d5e474e..199bacff3 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/ExternalDataset.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/entities/ExternalDataset.java @@ -40,10 +40,14 @@ public class ExternalDataset implements DataEntity { @OneToMany(mappedBy = "externalDataset", cascade = CascadeType.ALL, orphanRemoval = true) private Set datasets; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "\"CreationUser\"", nullable = true) + private UserInfo creationUser; + + public UUID getId() { return id; } - public void setId(UUID id) { this.id = id; } @@ -51,7 +55,6 @@ public class ExternalDataset implements DataEntity { public String getLabel() { return label; } - public void setLabel(String label) { this.label = label; } @@ -59,7 +62,6 @@ public class ExternalDataset implements DataEntity { public String getAbbreviation() { return abbreviation; } - public void setAbbreviation(String abbreviation) { this.abbreviation = abbreviation; } @@ -67,7 +69,6 @@ public class ExternalDataset implements DataEntity { public String getReference() { return reference; } - public void setReference(String reference) { this.reference = reference; } @@ -75,7 +76,6 @@ public class ExternalDataset implements DataEntity { public Date getCreated() { return created; } - public void setCreated(Date created) { this.created = created; } @@ -83,7 +83,6 @@ public class ExternalDataset implements DataEntity { public Date getModified() { return modified; } - public void setModified(Date modified) { this.modified = modified; } @@ -91,16 +90,23 @@ public class ExternalDataset implements DataEntity { public Set getDatasets() { return datasets; } - public void setDatasets(Set datasets) { this.datasets = datasets; } + public UserInfo getCreationUser() { + return creationUser; + } + public void setCreationUser(UserInfo creationUser) { + this.creationUser = creationUser; + } + @Override public void update(ExternalDataset entity) { this.label = entity.getLabel(); this.abbreviation = entity.getAbbreviation(); this.modified = new Date(); + this.creationUser = entity.getCreationUser(); } @Override diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Funder.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Funder.java index 2b6bce8b1..c1a3bb087 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Funder.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Funder.java @@ -94,6 +94,10 @@ public class Funder implements DataEntity { @Column(name = "\"Type\"") private Integer type; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "\"CreationUser\"", nullable = true) + private UserInfo creationUser; + public UUID getId() { return id; @@ -151,6 +155,13 @@ public class Funder implements DataEntity { this.type = type; } + public UserInfo getCreationUser() { + return creationUser; + } + public void setCreationUser(UserInfo creationUser) { + this.creationUser = creationUser; + } + @Override public void update(Funder entity) { this.label = entity.getLabel(); @@ -160,6 +171,7 @@ public class Funder implements DataEntity { this.created = entity.getCreated(); this.modified = new Date(); this.type = entity.getType(); + this.creationUser = entity.getCreationUser(); } @Override 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 dafef8ad0..6a40378cd 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 @@ -17,7 +17,6 @@ import java.util.UUID; @Table(name = "\"Registry\"") public class Registry implements DataEntity { - @Id @Column(name = "\"ID\"", updatable = false, nullable = false, columnDefinition = "BINARY(16)") private UUID id; @@ -38,7 +37,6 @@ public class Registry implements DataEntity { @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = true) private String definition; - @OneToMany(fetch = FetchType.LAZY) @JoinTable(name = "\"DatasetRegistry\"", joinColumns = {@JoinColumn(name = "\"Registry\"", referencedColumnName = "\"ID\"")}, @@ -46,11 +44,9 @@ public class Registry implements DataEntity { ) private Set datasets; - @Column(name = "\"Status\"", nullable = false) private Short status; - @Column(name = "\"Created\"") @Convert(converter = DateToUTCConverter.class) private Date created = null; @@ -59,32 +55,28 @@ public class Registry implements DataEntity { @Convert(converter = DateToUTCConverter.class) private Date modified = new Date(); + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "\"CreationUser\"", nullable = true) + private UserInfo creationUser; + public Short getStatus() { return status; } - - public void setStatus(Short status) { this.status = status; } - public Date getCreated() { return created; } - - public void setCreated(Date created) { this.created = created; } - public Date getModified() { return modified; } - - public void setModified(Date modified) { this.modified = modified; } @@ -92,7 +84,6 @@ public class Registry implements DataEntity { public UUID getId() { return id; } - public void setId(UUID id) { this.id = id; } @@ -100,7 +91,6 @@ public class Registry implements DataEntity { public String getLabel() { return label; } - public void setLabel(String label) { this.label = label; } @@ -108,7 +98,6 @@ public class Registry implements DataEntity { public String getAbbreviation() { return abbreviation; } - public void setAbbreviation(String abbreviation) { this.abbreviation = abbreviation; } @@ -116,7 +105,6 @@ public class Registry implements DataEntity { public String getReference() { return reference; } - public void setReference(String reference) { this.reference = reference; } @@ -124,7 +112,6 @@ public class Registry implements DataEntity { public String getUri() { return uri; } - public void setUri(String uri) { this.uri = uri; } @@ -132,7 +119,6 @@ public class Registry implements DataEntity { public String getDefinition() { return definition; } - public void setDefinition(String definition) { this.definition = definition; } @@ -140,11 +126,16 @@ public class Registry implements DataEntity { public Set getDatasets() { return datasets; } - public void setDatasets(Set datasets) { this.datasets = datasets; } + public UserInfo getCreationUser() { + return creationUser; + } + public void setCreationUser(UserInfo creationUser) { + this.creationUser = creationUser; + } @Override public void update(Registry entity) { diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Researcher.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Researcher.java index 3066d914a..1ede09a23 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Researcher.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Researcher.java @@ -62,41 +62,34 @@ public class Researcher implements DataEntity { @Convert(converter = DateToUTCConverter.class) private Date modified = new Date(); + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "\"CreationUser\"", nullable = true) + private UserInfo creationUser; public Short getStatus() { return status; } - - public void setStatus(Short status) { this.status = status; } - public Date getCreated() { return created; } - - public void setCreated(Date created) { this.created = created; } - public Date getModified() { return modified; } - - public void setModified(Date modified) { this.modified = modified; } - public UUID getId() { return id; } - public void setId(UUID id) { this.id = id; } @@ -104,7 +97,6 @@ public class Researcher implements DataEntity { public String getLabel() { return label; } - public void setLabel(String label) { this.label = label; } @@ -112,7 +104,6 @@ public class Researcher implements DataEntity { public String getPrimaryEmail() { return primaryEmail; } - public void setPrimaryEmail(String primaryEmail) { this.primaryEmail = primaryEmail; } @@ -120,7 +111,6 @@ public class Researcher implements DataEntity { public String getReference() { return reference; } - public void setReference(String reference) { this.reference = reference; } @@ -128,7 +118,6 @@ public class Researcher implements DataEntity { public String getUri() { return uri; } - public void setUri(String uri) { this.uri = uri; } @@ -136,7 +125,6 @@ public class Researcher implements DataEntity { public String getDefinition() { return definition; } - public void setDefinition(String definition) { this.definition = definition; } @@ -144,11 +132,16 @@ public class Researcher implements DataEntity { public Set getdMPs() { return dMPs; } - public void setdMPs(Set dMPs) { this.dMPs = dMPs; } + public UserInfo getCreationUser() { + return creationUser; + } + public void setCreationUser(UserInfo creationUser) { + this.creationUser = creationUser; + } @Override public void update(Researcher entity) { 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 14ca76f60..c71977292 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 @@ -20,7 +20,6 @@ public class Service implements DataEntity { @Column(name = "\"ID\"", updatable = false, nullable = false, columnDefinition = "BINARY(16)") private UUID id; - @Column(name = "\"Label\"") private String label; @@ -37,15 +36,12 @@ public class Service implements DataEntity { @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = false) private String definition; - @OneToMany(mappedBy = "service", cascade = CascadeType.ALL, orphanRemoval = true) private Set services; - @Column(name = "\"Status\"", nullable = false) private Short status; - @Column(name = "\"Created\"") @Convert(converter = DateToUTCConverter.class) private Date created = null; @@ -54,41 +50,35 @@ public class Service implements DataEntity { @Convert(converter = DateToUTCConverter.class) private Date modified = new Date(); + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "\"CreationUser\"", nullable = true) + private UserInfo creationUser; + public Short getStatus() { return status; } - - public void setStatus(Short status) { this.status = status; } - public Date getCreated() { return created; } - - public void setCreated(Date created) { this.created = created; } - public Date getModified() { return modified; } - - public void setModified(Date modified) { this.modified = modified; } - public UUID getId() { return id; } - public void setId(UUID id) { this.id = id; } @@ -96,7 +86,6 @@ public class Service implements DataEntity { public String getLabel() { return label; } - public void setLabel(String label) { this.label = label; } @@ -104,7 +93,6 @@ public class Service implements DataEntity { public String getAbbreviation() { return abbreviation; } - public void setAbbreviation(String abbreviation) { this.abbreviation = abbreviation; } @@ -112,7 +100,6 @@ public class Service implements DataEntity { public String getReference() { return reference; } - public void setReference(String reference) { this.reference = reference; } @@ -120,7 +107,6 @@ public class Service implements DataEntity { public String getUri() { return uri; } - public void setUri(String uri) { this.uri = uri; } @@ -128,7 +114,6 @@ public class Service implements DataEntity { public String getDefinition() { return definition; } - public void setDefinition(String definition) { this.definition = definition; } @@ -136,11 +121,17 @@ public class Service implements DataEntity { public Set getServices() { return services; } - public void setServices(Set services) { this.services = services; } + public UserInfo getCreationUser() { + return creationUser; + } + public void setCreationUser(UserInfo creationUser) { + this.creationUser = creationUser; + } + @Override public void update(Service entity) { diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/UserDMP.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/UserDMP.java index 6e000136d..217b81821 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/UserDMP.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/entities/UserDMP.java @@ -5,6 +5,7 @@ import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; import javax.persistence.*; +import java.util.LinkedList; import java.util.List; import java.util.UUID; @@ -25,6 +26,14 @@ public class UserDMP implements DataEntity { return value; } + public static List getAllValues() { + List list = new LinkedList<>(); + for (Enum en : UserDMP.UserDMPRoles.values()) { + list.add(((UserDMPRoles) en).value); + } + return list; + } + public static UserDMPRoles fromInteger(Integer value) { switch (value) { case 0: diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dataset/DatasetPublicTableRequest.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dataset/DatasetPublicTableRequest.java index ccaef9eaf..6aa363095 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dataset/DatasetPublicTableRequest.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dataset/DatasetPublicTableRequest.java @@ -45,6 +45,7 @@ public class DatasetPublicTableRequest extends TableQuery root.get("profile").get("id").in(this.getCriteria().getDatasetProfile()))); if (this.getCriteria().getDmpOrganisations() != null && !this.getCriteria().getDmpOrganisations().isEmpty()) query .where(((builder, root) -> root.join("dmp").join("organisations").get("reference").in(this.getCriteria().getDmpOrganisations()))); + query.where((builder, root) -> builder.notEqual(root.get("status"), Dataset.Status.DELETED.getValue())); return query; } diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dmp/DataManagmentPlanPublicTableRequest.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dmp/DataManagmentPlanPublicTableRequest.java index bb2d08333..78d9dfeb3 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dmp/DataManagmentPlanPublicTableRequest.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dmp/DataManagmentPlanPublicTableRequest.java @@ -29,10 +29,10 @@ public class DataManagmentPlanPublicTableRequest extends TableQuery root.get("profile").get("id").in(this.getCriteria().datasetProfile))); - if (this.getCriteria().getDmpOrganisations() != null && !this.getCriteria().getDmpOrganisations().isEmpty()) query - .where(((builder, root) -> root.join("organisations").get("reference").in(this.getCriteria().getDmpOrganisations()))); + if (this.getCriteria().datasetProfile != null && !this.getCriteria().datasetProfile.isEmpty()) + query.where((builder, root) -> root.join("associatedDmps").get("id").in(this.getCriteria().datasetProfile)); + if (this.getCriteria().getDmpOrganisations() != null && !this.getCriteria().getDmpOrganisations().isEmpty()) + query.where(((builder, root) -> root.join("organisations").get("reference").in(this.getCriteria().getDmpOrganisations()))); return query; } diff --git a/dmp-backend/web/src/main/java/eu/eudat/cache/ResponsesCache.java b/dmp-backend/web/src/main/java/eu/eudat/cache/ResponsesCache.java index 0e0bcc339..fc1dba6ae 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/cache/ResponsesCache.java +++ b/dmp-backend/web/src/main/java/eu/eudat/cache/ResponsesCache.java @@ -36,6 +36,7 @@ public class ResponsesCache { caches.add(new GuavaCache("services", CacheBuilder.newBuilder().expireAfterAccess(HOW_MANY, TIME_UNIT).build())); caches.add(new GuavaCache("tags", CacheBuilder.newBuilder().expireAfterAccess(HOW_MANY, TIME_UNIT).build())); caches.add(new GuavaCache("researchers", CacheBuilder.newBuilder().expireAfterAccess(HOW_MANY, TIME_UNIT).build())); + caches.add(new GuavaCache("externalDatasets", CacheBuilder.newBuilder().expireAfterAccess(HOW_MANY, TIME_UNIT).build())); simpleCacheManager.setCaches(caches); System.out.println("OK"); return simpleCacheManager; diff --git a/dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicfunder/DynamicFunderConfigurationDevelImpl.java b/dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicfunder/DynamicFunderConfigurationDevelImpl.java index ffe8fbafa..a1839073d 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicfunder/DynamicFunderConfigurationDevelImpl.java +++ b/dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicfunder/DynamicFunderConfigurationDevelImpl.java @@ -40,7 +40,7 @@ public class DynamicFunderConfigurationDevelImpl implements DynamicFunderConfigu JAXBContext jaxbContext = JAXBContext.newInstance(Configuration.class); Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller(); - is = new URL("file:///"+current + "/web/src/main/resources/FunderConfiguration.xml").openStream(); + is = new URL("file:///"+ current + "/web/src/main/resources/FunderConfiguration.xml").openStream(); this.configuration = (Configuration) jaxbUnmarshaller.unmarshal(is); } catch (Exception ex) { ex.printStackTrace(); diff --git a/dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicfunder/DynamicFunderConfigurationProdImpl.java b/dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicfunder/DynamicFunderConfigurationProdImpl.java index f5e0686ee..699ff9580 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicfunder/DynamicFunderConfigurationProdImpl.java +++ b/dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicfunder/DynamicFunderConfigurationProdImpl.java @@ -41,7 +41,7 @@ public class DynamicFunderConfigurationProdImpl implements DynamicFunderConfigur JAXBContext jaxbContext = JAXBContext.newInstance(Configuration.class); Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller(); - is = new URL("file:///" + this.environment.getProperty("configuration.resources.path") + "FunderConfiguration.xml").openStream(); + is = new URL(Paths.get(fileUrl).toUri().toURL().toString()).openStream(); this.configuration = (Configuration) jaxbUnmarshaller.unmarshal(is); } catch (Exception ex) { ex.printStackTrace(); diff --git a/dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicgrant/DynamicGrantConfigurationDevelImpl.java b/dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicgrant/DynamicGrantConfigurationDevelImpl.java index a3b950d70..92acd774a 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicgrant/DynamicGrantConfigurationDevelImpl.java +++ b/dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicgrant/DynamicGrantConfigurationDevelImpl.java @@ -48,7 +48,7 @@ public class DynamicGrantConfigurationDevelImpl implements DynamicGrantConfigura JAXBContext jaxbContext = JAXBContext.newInstance(Configuration.class); Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller(); - is = new URL("file:///"+current + "/web/src/main/resources/GrantConfiguration.xml").openStream(); + is = new URL("file:///"+ current + "/web/src/main/resources/GrantConfiguration.xml").openStream(); this.configuration = (Configuration) jaxbUnmarshaller.unmarshal(is); } catch (Exception ex) { ex.printStackTrace(); diff --git a/dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicgrant/DynamicGrantConfigurationProdImpl.java b/dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicgrant/DynamicGrantConfigurationProdImpl.java index 7d7e29348..9fc72b985 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicgrant/DynamicGrantConfigurationProdImpl.java +++ b/dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicgrant/DynamicGrantConfigurationProdImpl.java @@ -48,7 +48,7 @@ public class DynamicGrantConfigurationProdImpl implements DynamicGrantConfigurat JAXBContext jaxbContext = JAXBContext.newInstance(Configuration.class); Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller(); - is = new URL("file:///" + this.environment.getProperty("configuration.resources.path") + "GrantConfiguration.xml").openStream(); + is = new URL(Paths.get(fileUrl).toUri().toURL().toString()).openStream(); this.configuration = (Configuration) jaxbUnmarshaller.unmarshal(is); } catch (Exception ex) { ex.printStackTrace(); diff --git a/dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicproject/DynamicProjectConfigurationDevelImpl.java b/dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicproject/DynamicProjectConfigurationDevelImpl.java index 50622a8f2..757990db1 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicproject/DynamicProjectConfigurationDevelImpl.java +++ b/dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicproject/DynamicProjectConfigurationDevelImpl.java @@ -42,7 +42,7 @@ public class DynamicProjectConfigurationDevelImpl implements DynamicProjectConfi JAXBContext jaxbContext = JAXBContext.newInstance(Configuration.class); Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller(); - is = new URL("file:///"+current + "/web/src/main/resources/ProjectConfiguration.xml").openStream(); + is = new URL("file:///"+ current + "/web/src/main/resources/ProjectConfiguration.xml").openStream(); this.configuration = (Configuration) jaxbUnmarshaller.unmarshal(is); } catch (Exception ex) { ex.printStackTrace(); diff --git a/dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicproject/DynamicProjectConfigurationProdImpl.java b/dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicproject/DynamicProjectConfigurationProdImpl.java index 79654de69..a6627c6d1 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicproject/DynamicProjectConfigurationProdImpl.java +++ b/dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicproject/DynamicProjectConfigurationProdImpl.java @@ -45,7 +45,7 @@ public class DynamicProjectConfigurationProdImpl implements DynamicProjectConfig JAXBContext jaxbContext = JAXBContext.newInstance(Configuration.class); Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller(); - is = new URL("file:///" + this.environment.getProperty("configuration.resources.path") + "ProjectConfiguration.xml").openStream(); + is = new URL(Paths.get(fileUrl).toUri().toURL().toString()).openStream(); this.configuration = (Configuration) jaxbUnmarshaller.unmarshal(is); } catch (Exception ex) { ex.printStackTrace(); diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java index 12cab1917..11760957b 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java @@ -7,12 +7,14 @@ import eu.eudat.exceptions.datasetprofile.DatasetProfileWithDatasetsExeption; import eu.eudat.logic.managers.AdminManager; import eu.eudat.logic.managers.DatasetProfileManager; import eu.eudat.logic.managers.UserManager; +import eu.eudat.logic.proxy.config.configloaders.ConfigLoader; import eu.eudat.logic.security.claims.ClaimedAuthorities; import eu.eudat.logic.services.ApiContext; import eu.eudat.models.data.admin.composite.DatasetProfile; import eu.eudat.models.data.datasetprofile.DatasetProfileListingModel; import eu.eudat.models.data.helpers.common.DataTableData; import eu.eudat.models.data.helpers.responses.ResponseItem; +import org.springframework.core.env.Environment; import eu.eudat.models.data.security.Principal; import eu.eudat.models.data.user.composite.PagedDatasetProfile; import eu.eudat.types.ApiMessageCode; @@ -37,12 +39,14 @@ public class Admin extends BaseController { private DatasetProfileManager datasetProfileManager; private UserManager userManager; + private ConfigLoader configLoader; @Autowired - public Admin(ApiContext apiContext, DatasetProfileManager datasetProfileManager, UserManager userManager, Logger logger) { + public Admin(ApiContext apiContext, DatasetProfileManager datasetProfileManager, UserManager userManager, Logger logger, ConfigLoader configLoader) { super(apiContext); this.datasetProfileManager = datasetProfileManager; this.userManager = userManager; + this.configLoader = configLoader; } @Transactional @@ -90,7 +94,7 @@ public class Admin extends BaseController { @RequestMapping(method = RequestMethod.POST, value = {"/datasetprofiles/getPaged"}, produces = "application/json") public @ResponseBody - ResponseEntity>> getPaged(@RequestBody DatasetProfileTableRequestItem datasetProfileTableRequestItem, Principal principal) throws Exception { + ResponseEntity>> getPaged(@RequestBody DatasetProfileTableRequestItem datasetProfileTableRequestItem, @ClaimedAuthorities(claims = {ADMIN}) Principal principal) throws Exception { DataTableData datasetProfileTableData = this.datasetProfileManager.getPaged(datasetProfileTableRequestItem); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(ApiMessageCode.NO_MESSAGE).payload(datasetProfileTableData)); } @@ -116,7 +120,7 @@ public class Admin extends BaseController { @Transactional @RequestMapping(method = RequestMethod.DELETE, value = {"{id}"}, consumes = "application/json", produces = "application/json") public @ResponseBody - ResponseEntity> inactivate(@PathVariable String id, Principal principal) { + ResponseEntity> inactivate(@PathVariable String id, @ClaimedAuthorities(claims = {ADMIN}) Principal principal) { try { eu.eudat.data.entities.DatasetProfile ret = AdminManager.inactivate(this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao(), this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetDao(), id); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE)); @@ -149,4 +153,8 @@ public class Admin extends BaseController { .status(ApiMessageCode.SUCCESS_MESSAGE).message("")); } + @RequestMapping(method = RequestMethod.GET, value = {"/getRDACommonStandards"}, produces = "application/json") + public ResponseEntity getRDACommonStandards(@ClaimedAuthorities(claims = {ADMIN}) Principal principal) { + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(ApiMessageCode.SUCCESS_MESSAGE).payload(configLoader.getRdaProperties())); + } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPProfileController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPProfileController.java index a53653305..1a54587fa 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPProfileController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPProfileController.java @@ -46,7 +46,7 @@ public class DMPProfileController extends BaseController { @Transactional @RequestMapping(method = RequestMethod.POST, consumes = "application/json", produces = "application/json") public @ResponseBody - ResponseEntity> createOrUpdate(@RequestBody DataManagementPlanProfileListingModel dataManagementPlan, Principal principal) throws Exception { + ResponseEntity> createOrUpdate(@RequestBody DataManagementPlanProfileListingModel dataManagementPlan, @ClaimedAuthorities(claims = {ADMIN}) Principal principal) throws Exception { this.dataManagementProfileManager.createOrUpdate(dataManagementPlan, principal); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Created")); } 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 f7323b650..5208e5d43 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 @@ -13,6 +13,7 @@ import eu.eudat.exceptions.datamanagementplan.DMPNewVersionException; import eu.eudat.exceptions.datamanagementplan.DMPWithDatasetsDeleteException; import eu.eudat.logic.managers.DataManagementPlanManager; import eu.eudat.logic.managers.DatasetManager; +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; @@ -59,24 +60,26 @@ public class DMPs extends BaseController { private Environment environment; private DataManagementPlanManager dataManagementPlanManager; private DatasetManager datasetManager; + private ConfigLoader configLoader; @Autowired public DMPs(ApiContext apiContext, DynamicGrantConfiguration dynamicGrantConfiguration, Environment environment, - DataManagementPlanManager dataManagementPlanManager, DatasetManager datasetManager) { + DataManagementPlanManager dataManagementPlanManager, DatasetManager datasetManager, ConfigLoader configLoader) { super(apiContext); this.dynamicGrantConfiguration = dynamicGrantConfiguration; this.environment = environment; this.dataManagementPlanManager = dataManagementPlanManager; this.datasetManager = datasetManager; + this.configLoader = configLoader; } - @Transactional + /*@Transactional @RequestMapping(method = RequestMethod.GET, value = {"{id}/unlock"}, produces = "application/json") public @ResponseBody ResponseEntity> unlock(@PathVariable(value = "id") UUID id, Principal principal) throws Exception { this.dataManagementPlanManager.unlock(id); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Unlocked")); - } + }*/ @RequestMapping(method = RequestMethod.POST, value = {"/paged"}, consumes = "application/json", produces = "application/json") public @ResponseBody @@ -87,10 +90,10 @@ public class DMPs extends BaseController { @RequestMapping(method = RequestMethod.GET, value = {"{id}"}) public @ResponseBody - ResponseEntity getSingle(@PathVariable String id, @RequestHeader("Content-Type") String contentType, Principal principal) throws IllegalAccessException, InstantiationException, IOException { - if (contentType.equals("application/xml") || contentType.equals("application/msword")) { //|| contentType.equals("application/pdf") - ResponseEntity document = this.dataManagementPlanManager.getDocument(id, contentType); - return document; + 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 { + 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, this.dynamicGrantConfiguration); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.NO_MESSAGE).payload(dataManagementPlan)); @@ -106,8 +109,8 @@ public class DMPs extends BaseController { @RequestMapping(method = RequestMethod.GET, value = {"rda/{id}"}) public @ResponseBody - ResponseEntity getRDAJsonDocument(@PathVariable String id, Principal principal) throws IOException { - return this.dataManagementPlanManager.getRDAJsonDocument(id); + ResponseEntity getRDAJsonDocument(@PathVariable String id, @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) throws IOException { + return this.dataManagementPlanManager.getRDAJsonDocument(id, principal); } @RequestMapping(method = RequestMethod.GET, value = {"/overview/{id}"}) @@ -186,8 +189,9 @@ public class DMPs extends BaseController { @RequestMapping(method = RequestMethod.GET, value = {"/getPDF/{id}"}) public @ResponseBody - ResponseEntity getPDFDocument(@PathVariable String id, @RequestHeader("Content-Type") String contentType) throws IllegalAccessException, IOException, InstantiationException, InterruptedException { - File file = this.dataManagementPlanManager.getWordDocument(id); + ResponseEntity 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); InputStream resource = new FileInputStream(pdffile); @@ -204,9 +208,7 @@ public class DMPs extends BaseController { resource.close(); Files.deleteIfExists(file.toPath()); Files.deleteIfExists(pdffile.toPath()); - return new ResponseEntity<>(content, - responseHeaders, - HttpStatus.OK); + return new ResponseEntity<>(content, responseHeaders, HttpStatus.OK); } @RequestMapping(method = RequestMethod.POST, value = {"/upload"}) @@ -218,8 +220,10 @@ public class DMPs extends BaseController { @RequestMapping(method = RequestMethod.POST, value = {"/public/paged"}, consumes = "application/json", produces = "application/json") public @ResponseBody - ResponseEntity>> getPublicPaged(@RequestBody DataManagmentPlanPublicTableRequest dmpTableRequest, @RequestParam String fieldsGroup) throws Exception { - DataTableData dmp = this.dataManagementPlanManager.getPaged(dmpTableRequest, fieldsGroup); + ResponseEntity>> getPublicPaged(@RequestBody DataManagmentPlanPublicTableRequest dmpTableRequest, + @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal, + @RequestParam String fieldsGroup) throws Exception { + DataTableData dmp = this.dataManagementPlanManager.getPublicPaged(dmpTableRequest, fieldsGroup, principal); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(ApiMessageCode.NO_MESSAGE).payload(dmp)); } @@ -262,7 +266,7 @@ public class DMPs extends BaseController { @RequestMapping(method = RequestMethod.POST, value = {"/createZenodoDoi/{id}"}) public ResponseEntity> createZenodoDoi(@PathVariable String id, Principal principal) { try { - String zenodoDOI = this.dataManagementPlanManager.createZenodoDoi(UUID.fromString(id), principal); + String zenodoDOI = this.dataManagementPlanManager.createZenodoDoi(UUID.fromString(id), principal, configLoader); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Successfully created DOI for Data Datamanagement Plan in question.").payload(zenodoDOI)); } catch (Exception e) { e.printStackTrace(); diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/DataRepositories.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DataRepositories.java index 68e0d87f6..cd9589615 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/DataRepositories.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/DataRepositories.java @@ -2,12 +2,10 @@ package eu.eudat.controllers; import eu.eudat.data.entities.DataRepository; import eu.eudat.logic.managers.DataRepositoryManager; -import eu.eudat.logic.managers.ResearcherManager; import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; import eu.eudat.logic.proxy.config.exceptions.NoURLFound; import eu.eudat.logic.services.ApiContext; import eu.eudat.models.data.datarepository.DataRepositoryModel; -import eu.eudat.models.data.dmp.Researcher; import eu.eudat.models.data.helpers.responses.ResponseItem; import eu.eudat.models.data.security.Principal; import eu.eudat.types.ApiMessageCode; @@ -18,7 +16,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Map; @RestController @@ -36,18 +33,18 @@ public class DataRepositories extends BaseController { @RequestMapping(method = RequestMethod.GET, produces = "application/json") public @ResponseBody - ResponseEntity>>> listExternalDataRepositories( - @RequestParam(value = "query", required = false) String query, @RequestParam(value = "type", required = false) String type + ResponseEntity>> listExternalDataRepositories( + @RequestParam(value = "query", required = false) String query, @RequestParam(value = "type", required = false) String type, Principal principal ) throws HugeResultSet, NoURLFound { - List> remoteRepos = this.getApiContext().getOperationsContext().getRemoteFetcher().getRepositories(query, type); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>>().status(ApiMessageCode.NO_MESSAGE).payload(remoteRepos)); + List dataRepositoryModels = this.dataRepositoryManager.getDataRepositories(query, type, principal); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(ApiMessageCode.NO_MESSAGE).payload(dataRepositoryModels)); } @Transactional @RequestMapping(method = RequestMethod.POST, consumes = "application/json", produces = "application/json") public @ResponseBody ResponseEntity> create(@RequestBody eu.eudat.models.data.datarepository.DataRepositoryModel dataRepositoryModel, Principal principal) throws Exception { - DataRepository dataRepository = this.dataRepositoryManager.create(dataRepositoryModel); + DataRepository dataRepository = this.dataRepositoryManager.create(dataRepositoryModel, principal); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(dataRepository).status(ApiMessageCode.SUCCESS_MESSAGE)); } diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfileController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfileController.java index 1202c31ac..5f16cb390 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfileController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfileController.java @@ -39,18 +39,18 @@ public class DatasetProfileController extends BaseController { this.datasetProfileManager = datasetProfileManager; } - @Transactional +/* @Transactional @RequestMapping(method = RequestMethod.POST, value = {"/datasetprofile/save/{id}"}, consumes = "application/json", produces = "application/json") public ResponseEntity updateDataset(@PathVariable String id, @RequestBody PropertiesModel properties) { eu.eudat.data.entities.Dataset dataset = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetDao().find(UUID.fromString(id)); - Map values = new HashMap(); + Map values = new HashMap<>(); properties.toMap(values); JSONObject jobject = new JSONObject(values); dataset.setProperties(jobject.toString()); dataset.setStatus((short) properties.getStatus()); this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetDao().createOrUpdate(dataset); //TODO return ResponseEntity.status(HttpStatus.OK).body(properties); - } + }*/ @Transactional @RequestMapping(method = RequestMethod.POST, value = {"/datasetprofile/clone/{id}"}, consumes = "application/json", produces = "application/json") diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfiles.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfiles.java index 35375e148..372ad6b1d 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfiles.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfiles.java @@ -1,25 +1,19 @@ package eu.eudat.controllers; -import eu.eudat.data.entities.DMP; import eu.eudat.data.query.items.item.datasetprofile.DatasetProfileAutocompleteRequest; import eu.eudat.data.query.items.table.datasetprofile.DatasetProfileTableRequestItem; -import eu.eudat.exceptions.datamanagementplan.DMPWithDatasetsDeleteException; import eu.eudat.logic.managers.DatasetProfileManager; import eu.eudat.logic.services.ApiContext; import eu.eudat.models.data.datasetprofile.DatasetProfileAutocompleteItem; import eu.eudat.models.data.datasetprofile.DatasetProfileListingModel; -import eu.eudat.models.data.helpers.common.DataTableData; import eu.eudat.models.data.helpers.responses.ResponseItem; -import eu.eudat.models.data.security.Principal; import eu.eudat.types.ApiMessageCode; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.UUID; @RestController @@ -42,10 +36,10 @@ public class DatasetProfiles extends BaseController { return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(ApiMessageCode.NO_MESSAGE).payload(datasetProfileAutocompleteItems)); } - @RequestMapping(method = RequestMethod.GET, value = {"/datasetprofiles/getAll"}, produces = "application/json") + @RequestMapping(method = RequestMethod.POST, value = {"/datasetprofiles/getAll"}, produces = "application/json") public @ResponseBody - ResponseEntity>> getAll() throws InstantiationException, IllegalAccessException { - List datasetProfileTableData = this.datasetProfileManager.getAll(); + ResponseEntity>> getAll(@RequestBody DatasetProfileTableRequestItem tableRequestItem) throws InstantiationException, IllegalAccessException { + List datasetProfileTableData = this.datasetProfileManager.getAll(tableRequestItem); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(ApiMessageCode.NO_MESSAGE).payload(datasetProfileTableData)); } } 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 d07bcd1e0..f25beabdd 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 @@ -1,6 +1,5 @@ package eu.eudat.controllers; -import eu.eudat.data.dao.entities.DatasetDao; import eu.eudat.data.entities.Dataset; import eu.eudat.data.query.items.item.dataset.DatasetWizardAutocompleteRequest; import eu.eudat.data.query.items.item.datasetprofile.DatasetProfileWizardAutocompleteRequest; @@ -8,6 +7,7 @@ import eu.eudat.exceptions.datasetwizard.DatasetWizardCannotUnlockException; import eu.eudat.logic.managers.DatasetManager; import eu.eudat.logic.managers.DatasetWizardManager; import eu.eudat.logic.managers.UserManager; +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; @@ -48,13 +48,15 @@ public class DatasetWizardController extends BaseController { private Environment environment; private DatasetManager datasetManager; private UserManager userManager; + private ConfigLoader configLoader; @Autowired - public DatasetWizardController(ApiContext apiContext, Environment environment, DatasetManager datasetManager, UserManager userManager) { + public DatasetWizardController(ApiContext apiContext, Environment environment, DatasetManager datasetManager, UserManager userManager, ConfigLoader configLoader) { super(apiContext); this.environment = environment; this.datasetManager = datasetManager; this.userManager = userManager; + this.configLoader = configLoader; } @RequestMapping(method = RequestMethod.POST, value = {"/userDmps"}, produces = "application/json") @@ -79,8 +81,8 @@ public class DatasetWizardController extends BaseController { VisibilityRuleService visibilityRuleService = this.getApiContext().getUtilitiesService().getVisibilityRuleService(); return this.datasetManager.getDocument(id, visibilityRuleService, contentType); } - else if (contentType.equals("application/msword")){ - File file = datasetManager.getWordDocument(this.environment, id, this.getApiContext().getUtilitiesService().getVisibilityRuleService()); + else if (contentType.equals("application/msword")) { + File file = datasetManager.getWordDocument(this.configLoader, id, this.getApiContext().getUtilitiesService().getVisibilityRuleService()); InputStream resource = new FileInputStream(file); HttpHeaders responseHeaders = new HttpHeaders(); responseHeaders.setContentLength(file.length()); @@ -133,7 +135,7 @@ public class DatasetWizardController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = {"/getPDF/{id}"}) public @ResponseBody ResponseEntity getPDFDocument(@PathVariable String id) throws IllegalAccessException, IOException, InstantiationException, InterruptedException { - File file = datasetManager.getWordDocument(this.environment, id, this.getApiContext().getUtilitiesService().getVisibilityRuleService()); + File file = datasetManager.getWordDocument(this.configLoader, id, this.getApiContext().getUtilitiesService().getVisibilityRuleService()); String fileName = file.getName(); if (fileName.endsWith(".docx")){ fileName = fileName.substring(0, fileName.length() - 5); diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Datasets.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Datasets.java index 02d56eca6..067cee359 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Datasets.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Datasets.java @@ -46,7 +46,8 @@ public class Datasets extends BaseController { @RequestMapping(method = RequestMethod.POST, value = {"/public/paged"}, consumes = "application/json", produces = "application/json") public @ResponseBody - ResponseEntity>> getPublicPaged(@RequestBody DatasetPublicTableRequest datasetTableRequest, @ClaimedAuthorities(claims = {Authorities.ANONYMOUS}) Principal principal) throws Exception { + ResponseEntity>> getPublicPaged(@RequestBody DatasetPublicTableRequest datasetTableRequest, + @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) throws Exception { DataTableData dataTable = this.datasetManager.getPaged(datasetTableRequest, principal); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(ApiMessageCode.NO_MESSAGE).payload(dataTable)); } diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/ExternalDatasets.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/ExternalDatasets.java index c118de055..532cacdac 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/ExternalDatasets.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/ExternalDatasets.java @@ -48,7 +48,7 @@ public class ExternalDatasets extends BaseController { ResponseEntity>> getWithExternal( @RequestParam(value = "query", required = false) String query, @RequestParam(value = "type", required = false) String type, Principal principal ) throws NoURLFound, InstantiationException, HugeResultSet, IllegalAccessException { - List dataTable = externalDatasetManager.getWithExternal(query); + List dataTable = externalDatasetManager.getWithExternal(query, type, principal); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().payload(dataTable).status(ApiMessageCode.NO_MESSAGE)); } @@ -63,7 +63,7 @@ public class ExternalDatasets extends BaseController { @RequestMapping(method = RequestMethod.POST, value = {"/externaldatasets"}, consumes = "application/json", produces = "application/json") public @ResponseBody ResponseEntity> create(@RequestBody eu.eudat.models.data.externaldataset.ExternalDatasetModel externalDatasetModel, Principal principal) throws Exception { - ExternalDataset externalDataset = this.externalDatasetManager.create(externalDatasetModel); + ExternalDataset externalDataset = this.externalDatasetManager.create(externalDatasetModel, principal); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(externalDataset).status(ApiMessageCode.SUCCESS_MESSAGE)); } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Grants.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Grants.java index 0ba69119f..8e8bbb56e 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Grants.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Grants.java @@ -60,21 +60,21 @@ public class Grants extends BaseController { return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(grant).status(ApiMessageCode.NO_MESSAGE)); } - @Transactional + /*@Transactional @RequestMapping(method = RequestMethod.POST, consumes = "application/json", produces = "application/json") public @ResponseBody ResponseEntity> addGrant(@Valid @RequestBody eu.eudat.models.data.grant.Grant grant, Principal principal) throws IOException, ParseException { this.grantManager.createOrUpdate(grant, principal); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Created")); - } + }*/ - @Transactional + /*@Transactional @RequestMapping(method = RequestMethod.DELETE, value = {"{id}"}, consumes = "application/json", produces = "application/json") public @ResponseBody ResponseEntity> inactivate(@PathVariable String id, Principal principal) throws IllegalAccessException, InstantiationException { this.grantManager.inactivate(id); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE)); - } + }*/ @RequestMapping(method = RequestMethod.POST, value = {"/external"}, consumes = "application/json", produces = "application/json") public @ResponseBody 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 a6315f15a..954ab00e2 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 @@ -3,10 +3,21 @@ package eu.eudat.controllers; import eu.eudat.core.logger.Logger; import eu.eudat.exceptions.security.NullEmailException; import eu.eudat.logic.managers.UserManager; +import eu.eudat.logic.proxy.config.configloaders.ConfigLoader; import eu.eudat.logic.security.CustomAuthenticationProvider; +import eu.eudat.logic.security.customproviders.ConfigurableProvider.models.ConfigurableProvidersModel; import eu.eudat.logic.security.validators.b2access.B2AccessTokenValidator; import eu.eudat.logic.security.validators.b2access.helpers.B2AccessRequest; import eu.eudat.logic.security.validators.b2access.helpers.B2AccessResponseToken; +import eu.eudat.logic.security.validators.configurableProvider.ConfigurableProviderTokenValidator; +import eu.eudat.logic.security.validators.configurableProvider.helpers.ConfigurableProviderRequest; +import eu.eudat.logic.security.validators.configurableProvider.helpers.ConfigurableProviderResponseToken; +import eu.eudat.logic.security.validators.linkedin.LinkedInTokenValidator; +import eu.eudat.logic.security.validators.linkedin.helpers.LinkedInRequest; +import eu.eudat.logic.security.validators.linkedin.helpers.LinkedInResponseToken; +import eu.eudat.logic.security.validators.openaire.OpenAIRETokenValidator; +import eu.eudat.logic.security.validators.openaire.helpers.OpenAIRERequest; +import eu.eudat.logic.security.validators.openaire.helpers.OpenAIREResponseToken; 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; @@ -37,19 +48,27 @@ public class Login { private TwitterTokenValidator twitterTokenValidator; private B2AccessTokenValidator b2AccessTokenValidator; private ORCIDTokenValidator orcidTokenValidator; + private LinkedInTokenValidator linkedInTokenValidator; + private OpenAIRETokenValidator openAIRETokenValidator; + private ConfigurableProviderTokenValidator configurableProviderTokenValidator; + private ConfigLoader configLoader; private Logger logger; private UserManager userManager; @Autowired public Login(CustomAuthenticationProvider customAuthenticationProvider, AuthenticationService nonVerifiedUserAuthenticationService, - TwitterTokenValidator twitterTokenValidator, B2AccessTokenValidator b2AccessTokenValidator, ORCIDTokenValidator orcidTokenValidator, - UserManager userManager ,Logger logger) { + TwitterTokenValidator twitterTokenValidator, LinkedInTokenValidator linkedInTokenValidator, B2AccessTokenValidator b2AccessTokenValidator, + ORCIDTokenValidator orcidTokenValidator, OpenAIRETokenValidator openAIRETokenValidator, ConfigurableProviderTokenValidator configurableProviderTokenValidator, ConfigLoader configLoader, UserManager userManager, Logger logger) { this.customAuthenticationProvider = customAuthenticationProvider; this.nonVerifiedUserAuthenticationService = nonVerifiedUserAuthenticationService; this.twitterTokenValidator = twitterTokenValidator; + this.linkedInTokenValidator = linkedInTokenValidator; this.b2AccessTokenValidator = b2AccessTokenValidator; this.orcidTokenValidator = orcidTokenValidator; + this.openAIRETokenValidator = openAIRETokenValidator; + this.configurableProviderTokenValidator = configurableProviderTokenValidator; + this.configLoader = configLoader; this.logger = logger; this.userManager = userManager; } @@ -76,6 +95,12 @@ public class Login { return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(this.twitterTokenValidator.getRequestToken()).status(ApiMessageCode.NO_MESSAGE)); } + @RequestMapping(method = RequestMethod.POST, value = {"/linkedInRequestToken"}, produces = "application/json", consumes = "application/json") + public @ResponseBody + ResponseEntity> linkedInRequestToken(@RequestBody LinkedInRequest linkedInRequest) { + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(this.linkedInTokenValidator.getAccessToken(linkedInRequest)).status(ApiMessageCode.NO_MESSAGE)); + } + @RequestMapping(method = RequestMethod.POST, value = {"/b2AccessRequestToken"}, produces = "application/json", consumes = "application/json") public @ResponseBody ResponseEntity> b2AccessRequestToken(@RequestBody B2AccessRequest b2AccessRequest) { @@ -88,6 +113,18 @@ public class Login { return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(this.orcidTokenValidator.getAccessToken(orcidRequest)).status(ApiMessageCode.NO_MESSAGE)); } + @RequestMapping(method = RequestMethod.POST, value = {"/openAireRequestToken"}, produces = "application/json", consumes = "application/json") + public @ResponseBody + ResponseEntity> openAIRERequestToken(@RequestBody OpenAIRERequest openAIRERequest) { + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(this.openAIRETokenValidator.getAccessToken(openAIRERequest)).status(ApiMessageCode.NO_MESSAGE)); + } + + @RequestMapping(method = RequestMethod.POST, value = {"/configurableProviderRequestToken"}, produces = "application/json", consumes = "application/json") + public @ResponseBody + ResponseEntity> configurableProviderRequestToken(@RequestBody ConfigurableProviderRequest configurableProviderRequest) { + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(this.configurableProviderTokenValidator.getAccessToken(configurableProviderRequest)).status(ApiMessageCode.NO_MESSAGE)); + } + @RequestMapping(method = RequestMethod.POST, value = {"/me"}, consumes = "application/json", produces = "application/json") public @ResponseBody ResponseEntity> authMe(Principal principal) throws NullEmailException { @@ -103,4 +140,10 @@ public class Login { this.logger.info(principal, "Logged Out"); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.NO_MESSAGE)); } + + @RequestMapping(method = RequestMethod.GET, value = {"/configurableLogin"}, consumes = "application/json", produces = "application/json") + public @ResponseBody + ResponseEntity> getConfigurableProviders() { + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(new ConfigurableProvidersModel().fromDataModel(configLoader.getConfigurableProviders())).status(ApiMessageCode.NO_MESSAGE)); + } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Organisations.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Organisations.java index 8ba8d4ac2..76b5557f3 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Organisations.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Organisations.java @@ -2,6 +2,7 @@ package eu.eudat.controllers; import eu.eudat.data.query.items.table.organisations.OrganisationsTableRequest; import eu.eudat.logic.managers.OrganisationsManager; +import eu.eudat.logic.proxy.config.ExternalUrlCriteria; import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; import eu.eudat.logic.proxy.config.exceptions.NoURLFound; import eu.eudat.logic.services.ApiContext; @@ -38,7 +39,8 @@ public class Organisations extends BaseController { ResponseEntity> listExternalOrganisations( @RequestParam(value = "query", required = false) String query, @RequestParam(value = "type", required = false) String type ) throws HugeResultSet, NoURLFound { - List> remoteRepos = this.getApiContext().getOperationsContext().getRemoteFetcher().getOrganisations(query, type); + ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(query); + List> remoteRepos = this.getApiContext().getOperationsContext().getRemoteFetcher().getOrganisations(externalUrlCriteria, type); OrganisationsExternalSourcesModel organisationsExternalSourcesModel = new OrganisationsExternalSourcesModel().fromExternalItem(remoteRepos); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(organisationsExternalSourcesModel).status(ApiMessageCode.NO_MESSAGE)); } diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/QuickWizardController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/QuickWizardController.java index 044700940..adedfcb4f 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/QuickWizardController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/QuickWizardController.java @@ -44,10 +44,12 @@ public class QuickWizardController extends BaseController { Funder funderEntity; //Create Funder - if (quickWizard.getFunder().getExistFunder() == null - && quickWizard.getFunder().getLabel() == null) { - funderEntity = null; - } else if (quickWizard.getFunder().getExistFunder() == null && quickWizard.getFunder().getLabel() != null){ + if (quickWizard.getFunder() == null) { + throw new Exception("Funder is a mandatory entity"); + } else if (quickWizard.getFunder().getExistFunder() == null && quickWizard.getFunder().getLabel() == null) { + // funderEntity = null; + throw new Exception("Funder is a mandatory entity"); + } else if (quickWizard.getFunder().getExistFunder() == null && quickWizard.getFunder().getLabel() != null) { funderEntity = this.quickWizardManager.createOrUpdate(quickWizard.getFunder().toDataFunder(), principal); } else { funderEntity = quickWizard.getFunder().getExistFunder().toDataModel(); @@ -90,8 +92,6 @@ public class QuickWizardController extends BaseController { return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Created")); } - - @RequestMapping(method = RequestMethod.POST, value = {"/datasetcreate"}, consumes = "application/json", produces = "application/json") public @ResponseBody ResponseEntity> addDatasetWizard(@RequestBody DatasetCreateWizardModel datasetCreateWizardModel, Principal principal) throws Exception{ @@ -101,5 +101,4 @@ public class QuickWizardController extends BaseController { return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Dataset added!")); } - } diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Registries.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Registries.java index 1134d4317..6289d4f0f 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Registries.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Registries.java @@ -9,7 +9,6 @@ import eu.eudat.models.data.helpers.responses.ResponseItem; import eu.eudat.models.data.registries.RegistryModel; import eu.eudat.models.data.security.Principal; import eu.eudat.types.ApiMessageCode; -import org.apache.regexp.RE; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -17,7 +16,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Map; @RestController @@ -35,17 +33,17 @@ public class Registries extends BaseController { @RequestMapping(method = RequestMethod.GET, value = {"/external/registries"}, produces = "application/json") public @ResponseBody - ResponseEntity>>> listExternalRegistries(@RequestParam(value = "query", required = false) String query - , @RequestParam(value = "type", required = false) String type) throws HugeResultSet, NoURLFound { - List> remoteRepos = this.getApiContext().getOperationsContext().getRemoteFetcher().getRegistries(query, type); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>>().payload(remoteRepos).status(ApiMessageCode.NO_MESSAGE)); + ResponseEntity>> listExternalRegistries(@RequestParam(value = "query", required = false) String query + , @RequestParam(value = "type", required = false) String type, Principal principal) throws HugeResultSet, NoURLFound { + List registryModels = this.registryManager.getRegistries(query, type, principal); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().payload(registryModels).status(ApiMessageCode.NO_MESSAGE)); } @Transactional @RequestMapping(method = RequestMethod.POST, value = {"/registries"}, consumes = "application/json", produces = "application/json") public @ResponseBody ResponseEntity> create(@RequestBody RegistryModel registryModel, Principal principal) throws Exception { - Registry registry = this.registryManager.create(registryModel); + Registry registry = this.registryManager.create(registryModel, principal); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(registry).status(ApiMessageCode.SUCCESS_MESSAGE)); } diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Researchers.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Researchers.java index 8a73d28f3..b6f7b8da3 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Researchers.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Researchers.java @@ -36,7 +36,7 @@ public class Researchers extends BaseController { @RequestMapping(method = RequestMethod.POST, value = {"/getWithExternal"}, consumes = "application/json", produces = "application/json") public @ResponseBody ResponseEntity>> getWithExternal(@RequestBody ResearcherCriteriaRequest researcherCriteriaRequest, Principal principal) throws HugeResultSet, NoURLFound { - List dataTable = this.researcherManager.getCriteriaWithExternal(researcherCriteriaRequest); + List dataTable = this.researcherManager.getCriteriaWithExternal(researcherCriteriaRequest, principal); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().payload(dataTable).status(ApiMessageCode.NO_MESSAGE)); } @@ -44,7 +44,7 @@ public class Researchers extends BaseController { @RequestMapping(method = RequestMethod.POST, consumes = "application/json", produces = "application/json") public @ResponseBody ResponseEntity> create(@RequestBody eu.eudat.models.data.researcher.Researcher researcher, Principal principal) throws Exception { - this.researcherManager.create(researcher); + this.researcherManager.create(researcher, principal); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE)); } diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Services.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Services.java index 36b2703cb..02bfd279e 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Services.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Services.java @@ -16,7 +16,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Map; @RestController @@ -34,18 +33,18 @@ public class Services extends BaseController { @RequestMapping(method = RequestMethod.GET, value = {"/external/services"}, produces = "application/json") public @ResponseBody - ResponseEntity>>> listExternalServices( - @RequestParam(value = "query", required = false) String query, @RequestParam(value = "type", required = false) String type + ResponseEntity>> listExternalServices( + @RequestParam(value = "query", required = false) String query, @RequestParam(value = "type", required = false) String type, Principal principal ) throws HugeResultSet, NoURLFound { - List> remoteRepos = this.getApiContext().getOperationsContext().getRemoteFetcher().getServices(query, type); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>>().payload(remoteRepos).status(ApiMessageCode.NO_MESSAGE)); + List serviceModels = this.serviceManager.getServices(query, type, principal); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().payload(serviceModels).status(ApiMessageCode.NO_MESSAGE)); } @Transactional @RequestMapping(method = RequestMethod.POST, value = {"/services"}, consumes = "application/json", produces = "application/json") public @ResponseBody ResponseEntity> create(@RequestBody ServiceModel serviceModel, Principal principal) throws Exception { - Service service = serviceManager.create(serviceModel); + Service service = serviceManager.create(serviceModel, principal); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(service).status(ApiMessageCode.SUCCESS_MESSAGE)); } } 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 02bcb3186..4f1bad5cf 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 @@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import eu.eudat.elastic.criteria.TagCriteria; import eu.eudat.elastic.entities.Dataset; import eu.eudat.elastic.repository.Repository; +import eu.eudat.logic.proxy.config.ExternalUrlCriteria; import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; import eu.eudat.logic.proxy.config.exceptions.NoURLFound; import eu.eudat.logic.services.ApiContext; @@ -47,14 +48,10 @@ public class TagController extends BaseController { public @ResponseBody ResponseEntity> listExternalTagModel( @RequestParam(value = "query", required = false) String query, @RequestParam(value = "type", required = false) String type) throws HugeResultSet, NoURLFound, IOException { - List> remoteRepos = this.getApiContext().getOperationsContext().getRemoteFetcher().getTags(query, type); + ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(query); + List> remoteRepos = this.getApiContext().getOperationsContext().getRemoteFetcher().getTags(externalUrlCriteria, type); TagExternalSourcesModel researchersExternalSourcesModel = new TagExternalSourcesModel().fromExternalItem(remoteRepos); -// ObjectMapper mapper = new ObjectMapper(); -// String fileUrl = this.environment.getProperty("configuration.resources.path") + this.environment.getProperty("dataset.tags.mock"); -// List> data = mapper.readValue(new File(fileUrl), new TypeReference>>(){}); -// TagExternalSourcesModel researchersExternalSourcesModel = new TagExternalSourcesModel().fromExternalItem(data); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(researchersExternalSourcesModel).status(ApiMessageCode.NO_MESSAGE)); } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/handlers/PrincipalArgumentResolver.java b/dmp-backend/web/src/main/java/eu/eudat/logic/handlers/PrincipalArgumentResolver.java index 7e304042f..ebc287b72 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/handlers/PrincipalArgumentResolver.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/handlers/PrincipalArgumentResolver.java @@ -37,13 +37,17 @@ public final class PrincipalArgumentResolver implements HandlerMethodArgumentRes public Object resolveArgument(MethodParameter methodParameter, ModelAndViewContainer modelAndViewContainer, NativeWebRequest nativeWebRequest, WebDataBinderFactory webDataBinderFactory) throws Exception { String token = nativeWebRequest.getHeader("AuthToken"); - Boolean checkMailNull = ((ServletWebRequest) nativeWebRequest).getRequest().getRequestURI().startsWith("/api/emailConfirmation"); + boolean checkMailNull = ((ServletWebRequest) nativeWebRequest).getRequest().getRequestURI().startsWith("/api/emailConfirmation"); AuthenticationService authenticationService = checkMailNull ? this.nonVerifiedUserAuthenticationService : this.verifiedUserAuthenticationService; Optional claimsAnnotation = Arrays.stream(methodParameter.getParameterAnnotations()).filter(annotation -> annotation.annotationType().equals(ClaimedAuthorities.class)).findAny(); List claimList = claimsAnnotation.map(annotation -> Arrays.asList(((ClaimedAuthorities) annotation).claims())).orElse(Authorities.all()); - if (claimList.size() == 1 && claimList.get(0).equals(Authorities.ANONYMOUS)) + if (claimList.size() == 1 && claimList.get(0).equals(Authorities.ANONYMOUS)) { return new Principal(); + } else if (claimList.contains(Authorities.ANONYMOUS) && token == null) { + return new Principal(); + } + if (token == null) throw new UnauthorisedException("Authentication Information Is Missing"); UUID authToken; try { 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 c1f7ac711..d351e492b 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 @@ -8,7 +8,7 @@ import eu.eudat.data.dao.entities.DMPDao; import eu.eudat.data.dao.entities.DatasetDao; import eu.eudat.data.dao.entities.OrganisationDao; import eu.eudat.data.dao.entities.GrantDao; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.entities.*; import eu.eudat.logic.builders.model.models.RecentActivityDataBuilder; import eu.eudat.logic.services.ApiContext; import eu.eudat.logic.services.operations.DatabaseRepository; @@ -40,23 +40,26 @@ public class DashBoardManager { public DashBoardStatistics getStatistics() { DashBoardStatistics statistics = new DashBoardStatistics(); - DatasetCriteria datasetCriteria = new DatasetCriteria(); DataManagementPlanCriteria dataManagementPlanCriteria = new DataManagementPlanCriteria(); OrganisationCriteria organisationCriteria = new OrganisationCriteria(); - datasetCriteria.setAllVersions(false); dataManagementPlanCriteria.setAllVersions(false); - organisationCriteria.setPublic(false); + dataManagementPlanCriteria.setIsPublic(true); + organisationCriteria.setPublic(true); - CompletableFuture dmpFuture = databaseRepository.getDmpDao().getWithCriteria(dataManagementPlanCriteria).countAsync() - .whenComplete((dmpsStats, throwable) -> statistics.setTotalDataManagementPlanCount(dmpsStats)); - CompletableFuture datasetFuture = databaseRepository.getDatasetDao().getWithCriteria(datasetCriteria).countAsync() - .whenComplete((datasetsStats, throwable) -> statistics.setTotalDataSetCount(datasetsStats)); - CompletableFuture grantFuture = databaseRepository.getGrantDao().asQueryable().countAsync() - .whenComplete((grantsStats, throwable) -> statistics.setTotalGrantCount(grantsStats)); - CompletableFuture organisationFuture = databaseRepository.getOrganisationDao().getWithCriteria(organisationCriteria).countAsync() - .whenComplete((organisationStats, throwable) -> statistics.setTotalOrganisationCount(organisationStats)); + List dmps = databaseRepository.getDmpDao().getWithCriteria(dataManagementPlanCriteria).toList(); + long numberOfDatasets = 0; + LinkedList grants = new LinkedList<>(); + for (DMP dmp : dmps) { + numberOfDatasets = numberOfDatasets + dmp.getDataset().stream() + .filter(item -> item.getStatus() == Dataset.Status.FINALISED.getValue()).count(); + grants.add(dmp.getGrant()); + } + + statistics.setTotalDataManagementPlanCount((long) dmps.size()); + statistics.setTotalDataSetCount(numberOfDatasets); + statistics.setTotalGrantCount(grants.stream().distinct().count()); + statistics.setTotalOrganisationCount(databaseRepository.getOrganisationDao().getWithCriteria(organisationCriteria).count()); - CompletableFuture.allOf(dmpFuture, datasetFuture, grantFuture, organisationFuture).join(); return statistics; } @@ -73,9 +76,9 @@ public class DashBoardManager { DataManagementPlanCriteria dataManagementPlanCriteria = new DataManagementPlanCriteria(); dataManagementPlanCriteria.setAllVersions(false); GrantCriteria grantCriteria = new GrantCriteria(); - OrganisationCriteria organisationCriteria = new OrganisationCriteria(); - CompletableFuture dmpFuture = dataManagementPlanRepository.getAuthenticated(dataManagementPlanRepository.getWithCriteria(dataManagementPlanCriteria), principal.getId()).countAsync() + List roles = new LinkedList<>(); + CompletableFuture dmpFuture = dataManagementPlanRepository.getAuthenticated(dataManagementPlanRepository.getWithCriteria(dataManagementPlanCriteria), principal.getId(), roles).countAsync() .whenComplete((dmpsStats, throwable) -> statistics.setTotalDataManagementPlanCount(dmpsStats)); CompletableFuture datasetFuture = datasetRepository.getAuthenticated(datasetRepository.getWithCriteria(datasetCriteria), user).countAsync() .whenComplete((datasetsStats, throwable) -> statistics.setTotalDataSetCount(datasetsStats)); @@ -102,7 +105,8 @@ public class DashBoardManager { GrantCriteria grantCriteria = new GrantCriteria(); RecentActivityDataBuilder recentActivityDataBuilder = apiContext.getOperationsContext().getBuilderFactory().getBuilder(RecentActivityDataBuilder.class); - CompletableFuture> dmps = dataManagementPlanRepository.getAuthenticated(dataManagementPlanRepository.getWithCriteria(dataManagementPlanCriteria), principal.getId()) + List roles = new LinkedList<>(); + CompletableFuture> dmps = dataManagementPlanRepository.getAuthenticated(dataManagementPlanRepository.getWithCriteria(dataManagementPlanCriteria), principal.getId(), roles) .withHint("dmpRecentActivity") .orderBy((builder, root) -> builder.desc(root.get("modified"))) .take(numberofactivities) @@ -135,8 +139,9 @@ public class DashBoardManager { DatasetDao datasetRepository = databaseRepository.getDatasetDao(); GrantDao grantRepository = databaseRepository.getGrantDao(); + List roles = new LinkedList<>(); List searchBarItems = new LinkedList<>(); - CompletableFuture> dmps = dataManagementPlanRepository.getAuthenticated(dataManagementPlanRepository.asQueryable(), principal.getId()) + CompletableFuture> dmps = dataManagementPlanRepository.getAuthenticated(dataManagementPlanRepository.asQueryable(), principal.getId(), roles) .withHint("dmpRecentActivity") .where((builder, root) -> builder.like(builder.upper(root.get("label")), "%" + like.toUpperCase() + "%")) .orderBy((builder, root) -> builder.desc(root.get("modified"))) 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 094169e14..8dde96a2d 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 @@ -16,6 +16,7 @@ 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.proxy.config.configloaders.ConfigLoader; import eu.eudat.logic.services.ApiContext; import eu.eudat.logic.services.forms.VisibilityRuleService; import eu.eudat.logic.services.operations.DatabaseRepository; @@ -39,6 +40,7 @@ import eu.eudat.models.data.listingmodels.DataManagementPlanListingModel; 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.rda.RDAExportModel; import eu.eudat.models.data.security.Principal; import eu.eudat.models.data.user.composite.PagedDatasetProfile; import eu.eudat.models.data.userinfo.UserListingModel; @@ -59,6 +61,8 @@ import org.springframework.web.multipart.MultipartFile; import org.w3c.dom.Document; import org.w3c.dom.Element; +import javax.persistence.criteria.Join; +import javax.persistence.criteria.JoinType; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; @@ -92,7 +96,9 @@ public class DataManagementPlanManager { public DataTableData getPaged(DataManagementPlanTableRequest dataManagementPlanTableRequest, Principal principal, String fieldsGroup) throws Exception { UUID principalID = principal.getId(); QueryableList items = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().getWithCriteria(dataManagementPlanTableRequest.getCriteria()); - QueryableList authItems = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().getAuthenticated(items, principalID); + List roles = new LinkedList<>(); + if (dataManagementPlanTableRequest.getCriteria().getRole() != null) roles.add(dataManagementPlanTableRequest.getCriteria().getRole()); + QueryableList authItems = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().getAuthenticated(items, principalID, roles); QueryableList pagedItems = PaginationManager.applyPaging(authItems, dataManagementPlanTableRequest); DataTableData dataTable = new DataTableData<>(); @@ -115,20 +121,27 @@ public class DataManagementPlanManager { .whenComplete((resultList, throwable) -> dataTable.setData(resultList)); } else { itemsFuture = pagedItems - .selectAsync(item -> new DataManagementPlanListingModel().fromDataModel(item)) + .selectAsync(item -> new DataManagementPlanListingModel().fromDataModelAssociatedProfiles(item)) .whenComplete((resultList, throwable) -> dataTable.setData(resultList)); } - CompletableFuture countFuture = authItems.countAsync().whenComplete((count, throwable) -> { - dataTable.setTotalCount(count); - }); + CompletableFuture countFuture = authItems.countAsync().whenComplete((count, throwable) -> + dataTable.setTotalCount(count) + ); CompletableFuture.allOf(itemsFuture, countFuture).join(); return dataTable; } - public DataTableData getPaged(DataManagmentPlanPublicTableRequest dataManagementPlanPublicTableRequest, String fieldsGroup) throws Exception { + public DataTableData getPublicPaged(DataManagmentPlanPublicTableRequest dataManagementPlanPublicTableRequest, String fieldsGroup, Principal principal) throws Exception { dataManagementPlanPublicTableRequest.setQuery(databaseRepository.getDmpDao().asQueryable().withHint(HintedModelFactory.getHint(DataManagementPlanListingModel.class))); QueryableList 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 pagedItems = PaginationManager.applyPaging(items, dataManagementPlanPublicTableRequest); DataTableData dataTable = new DataTableData<>(); @@ -163,44 +176,38 @@ public class DataManagementPlanManager { return; } - public File getWordDocument(String id) throws InstantiationException, IllegalAccessException, IOException { + public File getWordDocument(String id, Principal principal, ConfigLoader configLoader) throws IOException { WordBuilder wordBuilder = new WordBuilder(); VisibilityRuleService visibilityRuleService = this.utilitiesService.getVisibilityRuleService(); DatasetWizardModel dataset = new DatasetWizardModel(); - String fileUrl = environment.getProperty("configuration.h2020template"); - InputStream is = new URL(Paths.get(fileUrl).toUri().toURL().toString()).openStream(); - XWPFDocument document = new XWPFDocument(is); + 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(); - // Space above DMP title. - XWPFParagraph parAboveDmpTitle = document.createParagraph(); - XWPFParagraph parAboveDmpTitle1 = document.createParagraph(); - XWPFParagraph parAboveDmpTitle2 = document.createParagraph(); - XWPFParagraph parAboveDmpTitle3 = document.createParagraph(); - + // 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.TITLE, BigInteger.ZERO); - XWPFParagraph dmpLabelParagraph = document.createParagraph(); - XWPFRun run = dmpLabelParagraph.createRun(); - run.setText(dmpEntity.getLabel()); - run.setBold(true); - run.setFontSize(20); - - // Space below DMP title. - XWPFParagraph parBelowDmpTitle = document.createParagraph(); - + wordBuilder.addParagraphContent(dmpEntity.getLabel(), document, ParagraphStyle.HEADER2, BigInteger.ZERO); wordBuilder.addParagraphContent(dmpEntity.getDescription(), document, ParagraphStyle.TEXT, BigInteger.ZERO); - wordBuilder.addParagraphContent("Organisations", document, ParagraphStyle.HEADER2, 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(x -> x.getLabel()).collect(Collectors.joining(", ")) + wordBuilder.addParagraphContent(dmpEntity.getOrganisations().stream().map(Organisation::getLabel).collect(Collectors.joining(", ")) , document, ParagraphStyle.TEXT, BigInteger.ZERO); } - wordBuilder.addParagraphContent("Researchers", document, ParagraphStyle.HEADER2, BigInteger.ZERO); + wordBuilder.addParagraphContent("Researchers", document, ParagraphStyle.HEADER3, BigInteger.ZERO); if (dmpEntity.getResearchers().size() > 0) { - wordBuilder.addParagraphContent(dmpEntity.getResearchers().stream().map(x -> x.getLabel()).collect(Collectors.joining(", ")) + wordBuilder.addParagraphContent(dmpEntity.getResearchers().stream().map(Researcher::getLabel).collect(Collectors.joining(", ")) , document, ParagraphStyle.TEXT, BigInteger.ZERO); } @@ -213,51 +220,108 @@ public class DataManagementPlanManager { XWPFParagraph parBreakDMP = document.createParagraph(); parBreakDMP.setPageBreak(true); - wordBuilder.addParagraphContent("Datasets", document, ParagraphStyle.TITLE, BigInteger.ZERO); - dmpEntity.getDataset().stream().forEach(datasetEntity -> { - Map properties = new HashMap<>(); - if (datasetEntity.getProperties() != null) { - JSONObject jobject = new JSONObject(datasetEntity.getProperties()); - properties = jobject.toMap(); - } + 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 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(); - 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); + // 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(); - 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 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) { + e.printStackTrace(); + } + // 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); + } - wordBuilder.addParagraphContent(datasetEntity.getDescription(), document, ParagraphStyle.TEXT, BigInteger.ZERO); - wordBuilder.addParagraphContent("Dataset Description", document, ParagraphStyle.HEADER1, BigInteger.ZERO); - PagedDatasetProfile pagedDatasetProfile = datasetManager.getPagedProfile(dataset, datasetEntity); - visibilityRuleService.setProperties(properties); - visibilityRuleService.buildVisibilityContext(pagedDatasetProfile.getRules()); - try { - wordBuilder.build(document, pagedDatasetProfile, visibilityRuleService); - } catch (IOException e) { - e.printStackTrace(); - } - // Page break at the end of the Dataset. - XWPFParagraph parBreakDataset = document.createParagraph(); - }); String fileName = dmpEntity.getLabel(); fileName = fileName.replaceAll("[^a-zA-Z0-9+ ]", ""); File exportFile = new File(fileName + ".docx"); @@ -360,7 +424,8 @@ public class DataManagementPlanManager { public List getWithCriteria(DMPDao dmpsRepository, DataManagementPlanCriteriaRequest dataManagementPlanCriteria, Principal principal) throws IllegalAccessException, InstantiationException { UUID principalID = principal.getId(); QueryableList items = dmpsRepository.getWithCriteria(dataManagementPlanCriteria.getCriteria()).withHint(HintedModelFactory.getHint(DataManagementPlan.class)); - QueryableList authenticatedItems = dmpsRepository.getAuthenticated(items, principalID); + List roles = new LinkedList<>(); + QueryableList authenticatedItems = dmpsRepository.getAuthenticated(items, principalID, roles); List datamanagementPlans = authenticatedItems.select(item -> new DataManagementPlan().fromDataModel(item)); return datamanagementPlans; } @@ -429,7 +494,7 @@ public class DataManagementPlanManager { UserInfo user = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(principal.getId()); createOrganisationsIfTheyDontExist(newDmp, apiContext.getOperationsContext().getDatabaseRepository().getOrganisationDao()); - createResearchersIfTheyDontExist(newDmp, apiContext.getOperationsContext().getDatabaseRepository().getResearcherDao()); + createResearchersIfTheyDontExist(newDmp, apiContext.getOperationsContext().getDatabaseRepository().getResearcherDao(), user); createFunderIfItDoesntExist(newDmp, apiContext.getOperationsContext().getDatabaseRepository().getFunderDao()); createGrantIfItDoesntExist(newDmp, apiContext.getOperationsContext().getDatabaseRepository().getGrantDao()); if (newDmp.getProject().getLabel() == null || newDmp.getProject().getLabel().trim().isEmpty()) { @@ -445,7 +510,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) { - List userDMPList = newDmp.getUsers().stream().collect(Collectors.toList()); + List userDMPList = new ArrayList<>(newDmp.getUsers()); for (UserInfoListingModel userInfoListingModel : dataManagementPlan.getUsers()) { for (UserDMP userDMP : userDMPList) { if (!(userDMP.getUser().getId().equals(userInfoListingModel.getId()))) { @@ -456,7 +521,9 @@ public class DataManagementPlanManager { } checkIfUserCanEditGrant(newDmp, user); - checkIfGrandHasCreationUser(newDmp, user); + assignGrandUserIfInternal(newDmp, user); + assignFunderUserIfInternal(newDmp, user); + assignProjectUserIfInternal(newDmp, user); apiContext.getOperationsContext().getDatabaseRepository().getGrantDao().createOrUpdate(newDmp.getGrant()); newDmp = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().createOrUpdate(newDmp); @@ -521,9 +588,9 @@ public class DataManagementPlanManager { if (latestVersionDMP.get(0).getVersion().equals(oldDmp.getVersion())) { DMP newDmp = dataManagementPlan.toDataModel(); - createOrganisationsIfTheyDontExist(newDmp, databaseRepository.getOrganisationDao()); - createResearchersIfTheyDontExist(newDmp, databaseRepository.getResearcherDao()); UserInfo user = apiContext.getOperationsContext().getBuilderFactory().getBuilder(UserInfoBuilder.class).id(principal.getId()).build(); + createOrganisationsIfTheyDontExist(newDmp, databaseRepository.getOrganisationDao()); + createResearchersIfTheyDontExist(newDmp, databaseRepository.getResearcherDao(), user); createFunderIfItDoesntExist(newDmp, databaseRepository.getFunderDao()); createGrantIfItDoesntExist(newDmp, databaseRepository.getGrantDao()); @@ -537,7 +604,9 @@ public class DataManagementPlanManager { newDmp.setId(null); checkIfUserCanEditGrant(newDmp, user); - checkIfGrandHasCreationUser(newDmp, user); + assignGrandUserIfInternal(newDmp, user); + assignFunderUserIfInternal(newDmp, user); + assignProjectUserIfInternal(newDmp, user); databaseRepository.getGrantDao().createOrUpdate(newDmp.getGrant()); newDmp = databaseRepository.getDmpDao().createOrUpdate(newDmp); @@ -552,9 +621,10 @@ public class DataManagementPlanManager { public void clone(DataManagementPlanNewVersionModel dataManagementPlan, Principal principal) throws Exception { DMP newDmp = dataManagementPlan.toDataModel(); - createOrganisationsIfTheyDontExist(newDmp, databaseRepository.getOrganisationDao()); - createResearchersIfTheyDontExist(newDmp, databaseRepository.getResearcherDao()); + UserInfo user = apiContext.getOperationsContext().getBuilderFactory().getBuilder(UserInfoBuilder.class).id(principal.getId()).build(); + createOrganisationsIfTheyDontExist(newDmp, databaseRepository.getOrganisationDao()); + createResearchersIfTheyDontExist(newDmp, databaseRepository.getResearcherDao(), user); createFunderIfItDoesntExist(newDmp, databaseRepository.getFunderDao()); createGrantIfItDoesntExist(newDmp, databaseRepository.getGrantDao()); @@ -568,7 +638,9 @@ public class DataManagementPlanManager { newDmp.setId(null); checkIfUserCanEditGrant(newDmp, user); - checkIfGrandHasCreationUser(newDmp, user); + assignGrandUserIfInternal(newDmp, user); + assignFunderUserIfInternal(newDmp, user); + assignProjectUserIfInternal(newDmp, user); databaseRepository.getGrantDao().createOrUpdate(newDmp.getGrant()); newDmp = databaseRepository.getDmpDao().createOrUpdate(newDmp); @@ -588,14 +660,17 @@ public class DataManagementPlanManager { apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().createOrUpdate(oldDmp); } - private void createResearchersIfTheyDontExist(DMP newDmp, ResearcherDao researcherRepository) { + private void createResearchersIfTheyDontExist(DMP newDmp, ResearcherDao researcherRepository, UserInfo user) { if (newDmp.getResearchers() != null && !newDmp.getResearchers().isEmpty()) { for (eu.eudat.data.entities.Researcher researcher : newDmp.getResearchers()) { ResearcherCriteria criteria = new ResearcherCriteria(); criteria.setLike(researcher.getReference()); List entries = researcherRepository.getWithCriteria(criteria).toList(); if (entries != null && !entries.isEmpty()) researcher.setId(entries.get(0).getId()); - else researcherRepository.createOrUpdate(researcher); + else { + researcher.setCreationUser(user); + researcherRepository.createOrUpdate(researcher); + } } } } @@ -634,7 +709,6 @@ public class DataManagementPlanManager { eu.eudat.data.entities.Funder funderEntity = funderDao.getWithCritetia(criteria).getSingleOrDefault(); if (funderEntity != null) funder.setId(funderEntity.getId()); else { - funder.setType(Funder.FunderType.EXTERNAL.getValue()); funderDao.createOrUpdate(funder); } } @@ -681,12 +755,24 @@ public class DataManagementPlanManager { } } - private void checkIfGrandHasCreationUser(DMP dmp, UserInfo user) { - if (dmp.getGrant().getCreationUser() == null) { + private void assignGrandUserIfInternal(DMP dmp, UserInfo user) { + if (dmp.getGrant().getCreationUser() == 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().startsWith("dmp:")) { + dmp.getGrant().getFunder().setCreationUser(user); + } + } + + private void assignProjectUserIfInternal(DMP dmp, UserInfo user) { + if (dmp.getProject().getCreationUser() == null && dmp.getProject().getReference().startsWith("dmp:")) { + dmp.getProject().setCreationUser(user); + } + } + private void copyDatasets(DMP newDmp, DatasetDao datasetDao) { List> futures = new LinkedList<>(); for (Dataset dataset : newDmp.getDataset()) { @@ -747,10 +833,12 @@ public class DataManagementPlanManager { } } - public FileEnvelope getXmlDocument(String id) throws InstantiationException, IllegalAccessException, IOException { + public 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(); List datasets = dmp.getDataset().stream().collect(Collectors.toList()); String fileName = dmp.getLabel(); fileName = fileName.replaceAll("[^a-zA-Z0-9+ ]", ""); @@ -856,11 +944,11 @@ public class DataManagementPlanManager { return fileEnvelope; } - public ResponseEntity getRDAJsonDocument(String id) throws IOException { + public ResponseEntity getRDAJsonDocument(String id, Principal principal) throws IOException { eu.eudat.data.entities.DMP dmp = databaseRepository.getDmpDao().find(UUID.fromString(id)); - DmpRDAExportModel dmpExport = new DmpRDAExportModel().fromDataModel(dmp); - RDAExportModel rdaExportModel = new RDAExportModel(); - rdaExportModel.setDmp(dmpExport); + if (!dmp.isPublic() && dmp.getUsers().stream().filter(userInfo -> userInfo.getUser().getId() == principal.getId()).collect(Collectors.toList()).size() == 0) + throw new UnauthorisedException(); + RDAExportModel rdaExportModel = new RDAExportModel().fromDataModel(dmp); ObjectMapper mapper = new ObjectMapper(); String fileName = dmp.getLabel(); @@ -886,20 +974,17 @@ public class DataManagementPlanManager { return new ResponseEntity<>(content, responseHeaders, HttpStatus.OK); } - public ResponseEntity getDocument(String id, String contentType) throws InstantiationException, IllegalAccessException, IOException { + public ResponseEntity getDocument(String id, String contentType, Principal principal, ConfigLoader configLoader) throws InstantiationException, IllegalAccessException, IOException { File file; switch (contentType) { case "application/xml": - file = getXmlDocument(id).getFile(); + file = getXmlDocument(id, principal).getFile(); break; case "application/msword": - file = getWordDocument(id); + file = getWordDocument(id, principal, configLoader); break; - /*case "application/pdf": - file = getPdfDocument(id); - break;*/ default: - file = getXmlDocument(id).getFile(); + file = getXmlDocument(id, principal).getFile(); } InputStream resource = new FileInputStream(file); HttpHeaders responseHeaders = new HttpHeaders(); @@ -932,8 +1017,8 @@ public class DataManagementPlanManager { } catch (IOException | JAXBException ex) { ex.printStackTrace(); } - // TODO Iterate through the list of dataManagmentPlans. - // Creates new dataManagmentPlan to fill it with the data model that was parsed from the xml. + // TODO Iterate through the list of dataManagementPlans. + // Creates new dataManagementPlan to fill it with the data model that was parsed from the xml. // Creates properties. DataManagementPlan dm = new DataManagementPlan(); DataManagementPlanProfile dmpProfile = new DataManagementPlanProfile(); @@ -1064,7 +1149,7 @@ public class DataManagementPlanManager { return (dmp.getUsers().stream().filter(userDMP -> userDMP.getRole().equals(UserDMP.UserDMPRoles.OWNER.getValue())).findFirst().get().getUser().getId()).equals(principal.getId()); } - public String createZenodoDoi(UUID id, Principal principal) throws Exception { + public String createZenodoDoi(UUID id, Principal principal, ConfigLoader configLoader) throws Exception { DMP dmp = this.apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().find(id); if (!isUserOwnerOfDmp(dmp, principal)) throw new Exception("User is not authorized to invoke this action"); @@ -1098,7 +1183,7 @@ public class DataManagementPlanManager { fileHeaders.setContentType(MediaType.MULTIPART_FORM_DATA); LinkedMultiValueMap addFileMap = new LinkedMultiValueMap<>(); - File file = getWordDocument(id.toString()); + File file = getWordDocument(id.toString(), principal, configLoader); addFileMap.add("filename", file.getName()); FileSystemResource fileSystemResource = new FileSystemResource(file); addFileMap.add("file", fileSystemResource); diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataRepositoryManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataRepositoryManager.java index 53d46bc1a..31634fe0c 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataRepositoryManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataRepositoryManager.java @@ -1,12 +1,23 @@ package eu.eudat.logic.managers; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import eu.eudat.data.dao.criteria.DataRepositoryCriteria; import eu.eudat.data.entities.DataRepository; -import eu.eudat.data.entities.Researcher; +import eu.eudat.logic.proxy.config.ExternalUrlCriteria; +import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; +import eu.eudat.logic.proxy.config.exceptions.NoURLFound; import eu.eudat.logic.services.ApiContext; import eu.eudat.models.data.datarepository.DataRepositoryModel; +import eu.eudat.models.data.security.Principal; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + /** * Created by ikalyvas on 9/3/2018. */ @@ -19,8 +30,29 @@ public class DataRepositoryManager { this.apiContext = apiContext; } - public DataRepository create(eu.eudat.models.data.datarepository.DataRepositoryModel dataRepositoryModel) throws Exception { + public DataRepository create(eu.eudat.models.data.datarepository.DataRepositoryModel dataRepositoryModel, Principal principal) throws Exception { DataRepository dataRepository = dataRepositoryModel.toDataModel(); + dataRepository.getCreationUser().setId(principal.getId()); return apiContext.getOperationsContext().getDatabaseRepository().getDataRepositoryDao().createOrUpdate(dataRepository); } + + public List getDataRepositories(String query, String type, Principal principal) throws HugeResultSet, NoURLFound { + ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(query); + List> remoteRepos = this.apiContext.getOperationsContext().getRemoteFetcher().getRepositories(externalUrlCriteria, type); + + DataRepositoryCriteria criteria = new DataRepositoryCriteria(); + if (!query.isEmpty()) criteria.setLike(query); + criteria.setCreationUserId(principal.getId()); + + List dataRepositoryModels = new LinkedList<>(); + if (type.equals("")) { + List dataRepositoryList = (this.apiContext.getOperationsContext().getDatabaseRepository().getDataRepositoryDao().getWithCriteria(criteria)).toList(); + dataRepositoryModels = dataRepositoryList.stream().map(item -> new DataRepositoryModel().fromDataModel(item)).collect(Collectors.toList()); + } + + ObjectMapper mapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + dataRepositoryModels.addAll(remoteRepos.stream().map(item -> mapper.convertValue(item, DataRepositoryModel.class)).collect(Collectors.toList())); + + return dataRepositoryModels; + } } 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 b361cb96a..5b04ef777 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 @@ -12,6 +12,7 @@ import eu.eudat.elastic.criteria.DatasetCriteria; import eu.eudat.elastic.repository.DatasetRepository; import eu.eudat.logic.builders.BuilderFactory; import eu.eudat.logic.builders.entity.UserInfoBuilder; +import eu.eudat.logic.proxy.config.configloaders.ConfigLoader; import eu.eudat.logic.services.ApiContext; import eu.eudat.logic.services.forms.VisibilityRuleService; import eu.eudat.logic.services.operations.DatabaseRepository; @@ -32,6 +33,8 @@ import eu.eudat.models.data.user.composite.PagedDatasetProfile; import eu.eudat.queryable.QueryableList; import org.apache.commons.io.IOUtils; import org.apache.poi.xwpf.usermodel.XWPFDocument; +import org.apache.poi.xwpf.usermodel.XWPFParagraph; +import org.apache.poi.xwpf.usermodel.XWPFRun; import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; @@ -46,6 +49,8 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import javax.activation.MimetypesFileTypeMap; +import javax.persistence.criteria.Join; +import javax.persistence.criteria.JoinType; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; @@ -141,6 +146,16 @@ public class DatasetManager { } else items.where((builder, root) -> root.get("id").in(new UUID[]{UUID.randomUUID()})); } + + if (principal.getId() != null && datasetTableRequest.getCriteria().getRole() != null) { + items.where((builder, root) -> { + Join userJoin = root.join("dmp", JoinType.LEFT).join("users", JoinType.LEFT); + return builder.and(builder.equal(userJoin.join("user", JoinType.LEFT).get("id"), principal.getId()), builder.equal(userJoin.get("role"), datasetTableRequest.getCriteria().getRole())); + }); + } + String[] strings = new String[1]; + strings[0] = "-dmp:publishedAt|join|"; + datasetTableRequest.getOrderings().setFields(strings); QueryableList pagedItems = PaginationManager.applyPaging(items, datasetTableRequest); DataTableData dataTable = new DataTableData<>(); @@ -223,8 +238,8 @@ public class DatasetManager { eu.eudat.models.data.user.composite.DatasetProfile datasetprofile = userManager.generateDatasetProfileModel(datasetEntity.getProfile()); datasetprofile.setStatus(dataset.getStatus()); if (datasetEntity.getProperties() != null) { - JSONObject jobject = new JSONObject(datasetEntity.getProperties()); - Map properties = jobject.toMap(); + JSONObject jObject = new JSONObject(datasetEntity.getProperties()); + Map properties = jObject.toMap(); datasetprofile.fromJsonObject(properties); } PagedDatasetProfile pagedDatasetProfile = new PagedDatasetProfile(); @@ -232,25 +247,81 @@ public class DatasetManager { return pagedDatasetProfile; } - public File getWordDocument(Environment environment, String id, VisibilityRuleService visibilityRuleService) throws InstantiationException, IllegalAccessException, IOException { + public File getWordDocument(ConfigLoader configLoader, String id, VisibilityRuleService visibilityRuleService) throws IOException { WordBuilder wordBuilder = new WordBuilder(); DatasetWizardModel dataset = new DatasetWizardModel(); - String fileUrl = environment.getProperty("configuration.h2020template"); - InputStream is = new URL(Paths.get(fileUrl).toUri().toURL().toString()).openStream(); - XWPFDocument document = new XWPFDocument(is); + XWPFDocument document = configLoader.getDocument(); eu.eudat.data.entities.Dataset datasetEntity = databaseRepository.getDatasetDao().find(UUID.fromString(id), HintedModelFactory.getHint(DatasetWizardModel.class)); - wordBuilder.addParagraphContent(datasetEntity.getLabel(), document, ParagraphStyle.TITLE, BigInteger.ZERO); + wordBuilder.addParagraphContent(datasetEntity.getLabel(), document, ParagraphStyle.HEADER1, BigInteger.ZERO); + + // Space below Dataset title. + XWPFParagraph parBreakDataset = document.createParagraph(); + + XWPFParagraph datasetTemplateParagraph = document.createParagraph(); + datasetTemplateParagraph.setStyle("Heading2"); + 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("Heading2"); + XWPFRun externalReferencesRun = externalReferencesParagraph.createRun(); + externalReferencesRun.setText("External References"); + externalReferencesRun.setColor("2E75B6"); + externalReferencesRun.setBold(true); + externalReferencesRun.setFontSize(12); + + wordBuilder.addParagraphContent("Data Repositories", document, ParagraphStyle.HEADER3, 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.HEADER3, 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.HEADER3, 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.HEADER3, 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); + }*/ + Map properties = new HashMap<>(); if (datasetEntity.getProperties() != null) { - JSONObject jobject = new JSONObject(datasetEntity.getProperties()); - properties = jobject.toMap(); + JSONObject jObject = new JSONObject(datasetEntity.getProperties()); + properties = jObject.toMap(); } + + wordBuilder.addParagraphContent("Dataset Description", document, ParagraphStyle.HEADER2, BigInteger.ZERO); PagedDatasetProfile pagedDatasetProfile = getPagedProfile(dataset, datasetEntity); visibilityRuleService.setProperties(properties); visibilityRuleService.buildVisibilityContext(pagedDatasetProfile.getRules()); wordBuilder.build(document, pagedDatasetProfile, visibilityRuleService); String label = datasetEntity.getLabel().replaceAll("[^a-zA-Z0-9+ ]", ""); File exportFile = new File(label + ".docx"); + + // Removes the top empty headings. + for (int i = 0; i < 6; i++) { + document.removeBodyElement(0); + } + FileOutputStream out = new FileOutputStream(exportFile); document.write(out); out.close(); @@ -335,10 +406,11 @@ public class DatasetManager { UserInfo userInfo = apiContext.getOperationsContext().getBuilderFactory().getBuilder(UserInfoBuilder.class).id(principal.getId()).build(); dataset.setCreator(userInfo); - createRegistriesIfTheyDontExist(apiContext.getOperationsContext().getDatabaseRepository().getRegistryDao(), dataset); createDataRepositoriesIfTheyDontExist(apiContext.getOperationsContext().getDatabaseRepository().getDataRepositoryDao(), dataset); - createServicesIfTheyDontExist(dataset); createExternalDatasetsIfTheyDontExist(dataset); + createRegistriesIfTheyDontExist(apiContext.getOperationsContext().getDatabaseRepository().getRegistryDao(), dataset); + createServicesIfTheyDontExist(dataset); + Dataset dataset1 = apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao().createOrUpdate(dataset); datasetWizardModel.setId(dataset1.getId()); updateTags(apiContext.getOperationsContext().getDatasetRepository(), datasetWizardModel); @@ -402,11 +474,8 @@ public class DatasetManager { } private void createDataRepositoriesIfTheyDontExist(DataRepositoryDao dataRepositoryDao, eu.eudat.data.entities.Dataset dataset) { - Set datasetDataRepositories = dataset.getDatasetDataRepositories(); - dataset.setDatasetDataRepositories(new HashSet<>()); - - if (datasetDataRepositories != null && !datasetDataRepositories.isEmpty()) { - for (eu.eudat.data.entities.DatasetDataRepository datasetDataRepository : datasetDataRepositories) { + if (dataset.getDatasetDataRepositories() != null && !dataset.getDatasetDataRepositories().isEmpty()) { + for (eu.eudat.data.entities.DatasetDataRepository datasetDataRepository : dataset.getDatasetDataRepositories()) { DataRepositoryCriteria criteria = new DataRepositoryCriteria(); criteria.setLike(datasetDataRepository.getDataRepository().getReference()); List entries = dataRepositoryDao.getWithCriteria(criteria).toList(); @@ -415,8 +484,9 @@ public class DatasetManager { datasetDataRepository.setDataset(dataset); dataset.getDatasetDataRepositories().add(datasetDataRepository); } else { - //datasetDataRepository.getDataRepository().setId(UUID.randomUUID()); + datasetDataRepository.getDataRepository().setId(UUID.randomUUID()); DataRepository dataRepository = dataRepositoryDao.createOrUpdate(datasetDataRepository.getDataRepository()); + datasetDataRepository.setDataset(dataset); datasetDataRepository.setDataRepository(dataRepository); dataset.getDatasetDataRepositories().add(datasetDataRepository); } @@ -425,41 +495,35 @@ public class DatasetManager { } private void createServicesIfTheyDontExist(eu.eudat.data.entities.Dataset dataset) { - Set services = dataset.getServices(); - dataset.setServices(new HashSet<>()); - if (services != null && !services.isEmpty()) { - for (eu.eudat.data.entities.DatasetService datasetService : services) { + if (dataset.getServices() != null && !dataset.getServices().isEmpty()) { + for (DatasetService service : dataset.getServices()) { ServiceCriteria criteria = new ServiceCriteria(); - criteria.setLike(datasetService.getService().getLabel()); + criteria.setLike(service.getService().getReference()); List entries = databaseRepository.getServiceDao().getWithCriteria(criteria).toList(); if (entries != null && !entries.isEmpty()) { - datasetService.getService().setId(entries.get(0).getId()); - datasetService.setDataset(dataset); - dataset.getServices().add(datasetService); - } else { - datasetService.getService().setCreated(new Date()); - Service service = databaseRepository.getServiceDao().createOrUpdate(datasetService.getService()); - datasetService.setService(service); - datasetService.setDataset(dataset); - dataset.getServices().add(datasetService); + service.setDataset(dataset); + service.getService().setCreated(new Date()); + service.setService(service.getService()); + this.databaseRepository.getServiceDao().createOrUpdate(service.getService()); + dataset.getServices().add(service); } } } } private void createExternalDatasetsIfTheyDontExist(eu.eudat.data.entities.Dataset dataset) { - Set externalDatasets = dataset.getDatasetExternalDatasets(); - dataset.setDatasetExternalDatasets(new HashSet<>()); - if (externalDatasets != null && !externalDatasets.isEmpty()) { - for (eu.eudat.data.entities.DatasetExternalDataset datasetExternalDataset : externalDatasets) { + if (dataset.getDatasetExternalDatasets() != null && !dataset.getDatasetExternalDatasets().isEmpty()) { + for (eu.eudat.data.entities.DatasetExternalDataset datasetExternalDataset : dataset.getDatasetExternalDatasets()) { ExternalDatasetCriteria criteria = new ExternalDatasetCriteria(); - criteria.setLike(datasetExternalDataset.getExternalDataset().getLabel()); + criteria.setLike(datasetExternalDataset.getExternalDataset().getReference()); List entries = databaseRepository.getExternalDatasetDao().getWithCriteria(criteria).toList(); if (entries != null && !entries.isEmpty()) { datasetExternalDataset.getExternalDataset().setId(entries.get(0).getId()); datasetExternalDataset.setDataset(dataset); dataset.getDatasetExternalDatasets().add(datasetExternalDataset); } else { + datasetExternalDataset.getExternalDataset().setId(UUID.randomUUID()); + datasetExternalDataset.setDataset(dataset); ExternalDataset externalDataset = databaseRepository.getExternalDatasetDao().createOrUpdate(datasetExternalDataset.getExternalDataset()); datasetExternalDataset.setExternalDataset(externalDataset); dataset.getDatasetExternalDatasets().add(datasetExternalDataset); 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 32888ab1e..7bff0808a 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 @@ -19,10 +19,9 @@ import eu.eudat.models.data.datasetprofile.DatasetProfileAutocompleteItem; import eu.eudat.models.data.datasetprofile.DatasetProfileListingModel; import eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field; import eu.eudat.models.data.externaldataset.ExternalAutocompleteFieldModel; -import eu.eudat.models.data.helpermodels.Tuple; import eu.eudat.models.data.helpers.common.DataTableData; -import eu.eudat.models.data.security.Principal; import eu.eudat.queryable.QueryableList; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.*; import org.springframework.stereotype.Component; @@ -45,6 +44,7 @@ public class DatasetProfileManager { private ApiContext apiContext; private DatabaseRepository databaseRepository; + @Autowired public DatasetProfileManager(ApiContext apiContext) { this.apiContext = apiContext; @@ -81,9 +81,8 @@ public class DatasetProfileManager { return apiContext.getOperationsContext().getBuilderFactory().getBuilder(DataTableDataBuilder.class).data(datasetProfiles).totalCount(items.count()).build(); } - public List getAll() throws IllegalAccessException, InstantiationException { - DatasetProfileCriteria criteria = new DatasetProfileCriteria(); - QueryableList items = databaseRepository.getDatasetProfileDao().getWithCriteria(criteria); + public List getAll(DatasetProfileTableRequestItem tableRequestItem) throws IllegalAccessException, InstantiationException { + QueryableList items = databaseRepository.getDatasetProfileDao().getWithCriteria(tableRequestItem.getCriteria()); List datasetProfiles = items.select(item -> new DatasetProfileListingModel().fromDataModel(item)); return datasetProfiles; } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DocumentManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DocumentManager.java index db7fcf3a9..1f7cfbee1 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DocumentManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DocumentManager.java @@ -1,6 +1,7 @@ package eu.eudat.logic.managers; import eu.eudat.data.dao.entities.DatasetDao; +import eu.eudat.logic.proxy.config.configloaders.ConfigLoader; import eu.eudat.logic.services.ApiContext; import eu.eudat.logic.services.forms.VisibilityRuleService; import eu.eudat.logic.utilities.documents.helpers.FileEnvelope; @@ -12,7 +13,6 @@ import eu.eudat.models.data.user.composite.PagedDatasetProfile; import org.apache.commons.io.IOUtils; import org.apache.poi.xwpf.usermodel.XWPFDocument; import org.json.JSONObject; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.core.io.FileSystemResource; import org.springframework.http.*; @@ -39,17 +39,18 @@ public class DocumentManager { private ApiContext context; private DatasetManager datasetManager; - public DocumentManager(ApiContext context, DatasetManager datasetManager) { + private ConfigLoader configLoader; + + public DocumentManager(ApiContext context, DatasetManager datasetManager, ConfigLoader configLoader) { this.context = context; this.datasetManager = datasetManager; + this.configLoader = configLoader; } - public File getWordDocument(Environment environment, DatasetDao datatasetRepository, String id, VisibilityRuleService visibilityRuleService) throws InstantiationException, IllegalAccessException, IOException { + public File getWordDocument(ConfigLoader configLoader, DatasetDao datatasetRepository, String id, VisibilityRuleService visibilityRuleService) throws InstantiationException, IllegalAccessException, IOException { WordBuilder wordBuilder = new WordBuilder(); DatasetWizardModel dataset = new DatasetWizardModel(); - String fileUrl = environment.getProperty("configuration.h2020template"); - InputStream is = new URL(Paths.get(fileUrl).toUri().toURL().toString()).openStream(); - XWPFDocument document = new XWPFDocument(is); + XWPFDocument document = configLoader.getDocument(); eu.eudat.data.entities.Dataset datasetEntity = datatasetRepository.find(UUID.fromString(id), HintedModelFactory.getHint(DatasetWizardModel.class)); Map properties = new HashMap<>(); if (datasetEntity.getProperties() != null) { diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/EmailConfirmationManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/EmailConfirmationManager.java index ed1b8e747..907ceac18 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/EmailConfirmationManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/EmailConfirmationManager.java @@ -1,50 +1,90 @@ package eu.eudat.logic.managers; +import eu.eudat.data.entities.Credential; import eu.eudat.data.entities.LoginConfirmationEmail; import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.entities.UserToken; import eu.eudat.exceptions.emailconfirmation.HasConfirmedEmailException; import eu.eudat.exceptions.emailconfirmation.TokenExpiredException; import eu.eudat.logic.services.ApiContext; +import eu.eudat.logic.services.operations.DatabaseRepository; import eu.eudat.models.data.security.Principal; +import eu.eudat.queryable.QueryableList; +import eu.eudat.queryable.jpa.predicates.OrderByPredicate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.Date; +import java.util.List; import java.util.UUID; @Component public class EmailConfirmationManager { private ApiContext apiContext; + private DatabaseRepository databaseRepository; @Autowired public EmailConfirmationManager(ApiContext apiContext) { this.apiContext = apiContext; + this.databaseRepository = apiContext.getOperationsContext().getDatabaseRepository(); } public void confirmEmail(String token) throws TokenExpiredException, HasConfirmedEmailException { LoginConfirmationEmail loginConfirmationEmail = apiContext.getOperationsContext() .getDatabaseRepository().getLoginConfirmationEmailDao().asQueryable() .where((builder, root) -> builder.equal(root.get("token"), UUID.fromString(token))).getSingle(); + if (loginConfirmationEmail.getExpiresAt().compareTo(new Date()) < 0) throw new TokenExpiredException("Token has expired."); - UserInfo user = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().asQueryable() + + UserInfo user = databaseRepository.getUserInfoDao().asQueryable() .where((builder, root) -> builder.equal(root.get("id"), loginConfirmationEmail.getUserId())).getSingle(); + if (user.getEmail() != null) throw new HasConfirmedEmailException("User already has confirmed his Email."); + loginConfirmationEmail.setIsConfirmed(true); + + // Checks if mail is used by another user. If it is, merges the new the old. + UserInfo oldUser = databaseRepository.getUserInfoDao().asQueryable().where((builder, root) -> builder.equal(root.get("email"), loginConfirmationEmail.getEmail())).getSingle(); + if (oldUser != null) { + mergeNewUserToOld(user, oldUser); + expireUserToken(user); + databaseRepository.getLoginConfirmationEmailDao().createOrUpdate(loginConfirmationEmail); + return; + } + user.setEmail(loginConfirmationEmail.getEmail()); - apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().createOrUpdate(user); - apiContext.getOperationsContext().getDatabaseRepository().getLoginConfirmationEmailDao().createOrUpdate(loginConfirmationEmail); + databaseRepository.getUserInfoDao().createOrUpdate(user); + databaseRepository.getLoginConfirmationEmailDao().createOrUpdate(loginConfirmationEmail); } public void sendConfirmationEmail(String email, Principal principal) throws HasConfirmedEmailException { UserInfo user = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(principal.getId()); if (user.getEmail() != null) throw new HasConfirmedEmailException("User already has confirmed his Email."); + apiContext.getUtilitiesService().getConfirmationEmailService().createConfirmationEmail( - apiContext.getOperationsContext().getDatabaseRepository().getLoginConfirmationEmailDao(), + databaseRepository.getLoginConfirmationEmailDao(), apiContext.getUtilitiesService().getMailService(), email, - principal.getId()); + principal.getId() + ); + } + + private void mergeNewUserToOld(UserInfo newUser, UserInfo oldUser) { + Credential credential = databaseRepository.getCredentialDao().asQueryable().where((builder, root) -> builder.equal(root.get("userInfo"), newUser)).getSingle(); + credential.setUserInfo(oldUser); + databaseRepository.getCredentialDao().createOrUpdate(credential); + } + + private void expireUserToken(UserInfo user) { + UserToken userToken = databaseRepository.getUserTokenDao().asQueryable() + .where((builder, root) -> builder.equal(root.get("user"), user)) + .orderBy((builder, root) -> builder.desc(root.get("issuedAt"))) + .take(1) + .getSingle(); + userToken.setExpiresAt(new Date()); + databaseRepository.getUserTokenDao().createOrUpdate(userToken); } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ExternalDatasetManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ExternalDatasetManager.java index cab3d39b4..f8f72ce31 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ExternalDatasetManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ExternalDatasetManager.java @@ -1,24 +1,33 @@ package eu.eudat.logic.managers; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; import eu.eudat.logic.builders.model.criteria.ExternalDatasetCriteriaBuilder; import eu.eudat.logic.builders.model.models.DataTableDataBuilder; -import eu.eudat.data.dao.entities.ExternalDatasetDao; import eu.eudat.data.entities.ExternalDataset; import eu.eudat.data.dao.criteria.ExternalDatasetCriteria; +import eu.eudat.logic.proxy.config.ExternalUrlCriteria; import eu.eudat.logic.services.operations.DatabaseRepository; +import eu.eudat.models.data.external.ExternalDatasetSourcesModel; +import eu.eudat.models.data.external.ExternalSourcesItemModel; import eu.eudat.models.data.externaldataset.ExternalDatasetListingModel; import eu.eudat.data.query.items.table.externaldataset.ExternalDatasetTableRequest; +import eu.eudat.models.data.externaldataset.ExternalDatasetModel; import eu.eudat.models.data.helpers.common.DataTableData; import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; import eu.eudat.logic.proxy.config.exceptions.NoURLFound; import eu.eudat.logic.proxy.fetching.RemoteFetcher; +import eu.eudat.models.data.security.Principal; import eu.eudat.queryable.QueryableList; import eu.eudat.logic.services.ApiContext; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.LinkedList; import java.util.List; +import java.util.Map; import java.util.UUID; +import java.util.stream.Collectors; @Component public class ExternalDatasetManager { @@ -40,10 +49,26 @@ public class ExternalDatasetManager { return apiContext.getOperationsContext().getBuilderFactory().getBuilder(DataTableDataBuilder.class).data(externalDatasetListingmodels).totalCount(items.count()).build(); } - public List getWithExternal(String query) throws HugeResultSet, NoURLFound, InstantiationException, IllegalAccessException { + public List getWithExternal(String query, String type, Principal principal) throws HugeResultSet, NoURLFound { + // Fetch the local saved external Datasets that belong to the user. ExternalDatasetCriteria criteria = apiContext.getOperationsContext().getBuilderFactory().getBuilder(ExternalDatasetCriteriaBuilder.class).like(query).build(); + criteria.setCreationUserId(principal.getId()); QueryableList items = apiContext.getOperationsContext().getDatabaseRepository().getExternalDatasetDao().getWithCriteria(criteria); + + // Fetch external Datasets from external sources. + ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(query); + List> remoteRepos = remoteFetcher.getDatasets(externalUrlCriteria, type); + + // Parse items from external sources to listing models. + ObjectMapper mapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + List externalDatasetModels = remoteRepos.stream() + .map(item -> mapper.convertValue(item, ExternalDatasetListingModel.class)) + .collect(Collectors.toCollection(LinkedList::new)); + + // Merge fetched and local. List externalDatasets = items.select(item -> new ExternalDatasetListingModel().fromDataModel(item)); + externalDatasets.addAll(externalDatasetModels); + return externalDatasets; } @@ -54,8 +79,9 @@ public class ExternalDatasetManager { return externalDatasetModel; } - public ExternalDataset create(eu.eudat.models.data.externaldataset.ExternalDatasetModel externalDatasetModel) throws Exception { + public ExternalDataset create(eu.eudat.models.data.externaldataset.ExternalDatasetModel externalDatasetModel, Principal principal) throws Exception { ExternalDataset externalDataset = externalDatasetModel.toDataModel(); + externalDataset.getCreationUser().setId(principal.getId()); return apiContext.getOperationsContext().getDatabaseRepository().getExternalDatasetDao().createOrUpdate(externalDataset); } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/FunderManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/FunderManager.java index 8c882953a..1db66f391 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/FunderManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/FunderManager.java @@ -2,10 +2,12 @@ package eu.eudat.logic.managers; import eu.eudat.data.query.items.item.funder.FunderCriteriaRequest; import eu.eudat.logic.builders.model.models.FunderBuilder; +import eu.eudat.logic.proxy.config.ExternalUrlCriteria; import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; import eu.eudat.logic.proxy.config.exceptions.NoURLFound; import eu.eudat.logic.proxy.fetching.RemoteFetcher; import eu.eudat.logic.services.ApiContext; +import eu.eudat.logic.utilities.helpers.ListHelper; import eu.eudat.models.data.external.ExternalSourcesItemModel; import eu.eudat.models.data.external.FundersExternalSourcesModel; import eu.eudat.models.data.funder.Funder; @@ -16,16 +18,19 @@ import org.springframework.stereotype.Component; import java.util.Comparator; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Component public class FunderManager { private ApiContext apiContext; private RemoteFetcher remoteFetcher; + private ListHelper listHelper; - public FunderManager(ApiContext apiContext, RemoteFetcher remoteFetcher) { + public FunderManager(ApiContext apiContext, RemoteFetcher remoteFetcher, ListHelper listHelper) { this.apiContext = apiContext; this.remoteFetcher = remoteFetcher; + this.listHelper = listHelper; } public List getCriteriaWithExternal(FunderCriteriaRequest funderCriteria, Principal principal) throws HugeResultSet, NoURLFound { @@ -33,20 +38,26 @@ public class FunderManager { userInfo.setId(principal.getId()); funderCriteria.getCriteria().setReference("dmp:"); QueryableList items = apiContext.getOperationsContext().getDatabaseRepository().getFunderDao().getWithCritetia(funderCriteria.getCriteria()); - //QueryableList authItems = apiContext.getOperationsContext().getDatabaseRepository().getFunderDao().getAuthenticated(items, userInfo); - List funders = items.select(item -> new eu.eudat.models.data.funder.Funder().fromDataModel(item)); - List> remoteRepos = remoteFetcher.getFunders(funderCriteria.getCriteria().getLike()); + QueryableList authItems = apiContext.getOperationsContext().getDatabaseRepository().getFunderDao().getAuthenticated(items, userInfo); + List funders = authItems.select(item -> new eu.eudat.models.data.funder.Funder().fromDataModel(item)); + ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(funderCriteria.getCriteria().getLike()); + List> remoteRepos = remoteFetcher.getFunders(externalUrlCriteria); FundersExternalSourcesModel fundersExternalSourcesModel = new FundersExternalSourcesModel().fromExternalItem(remoteRepos); for (ExternalSourcesItemModel externalListingItem : fundersExternalSourcesModel) { eu.eudat.models.data.funder.Funder funder = apiContext.getOperationsContext().getBuilderFactory().getBuilder(FunderBuilder.class) .reference(externalListingItem.getRemoteId()).label(externalListingItem.getName()) .status(eu.eudat.data.entities.Funder.Status.fromInteger(0)) - .source(externalListingItem.getTag()) .build(); + if (externalListingItem.getSource() != null) { + funder.setSource(externalListingItem.getSource()); + } else { + funder.setSource(externalListingItem.getTag()); + } funders.add(funder); } funders.sort(Comparator.comparing(Funder::getLabel)); + funders = funders.stream().filter(listHelper.distinctByKey(Funder::getLabel)).collect(Collectors.toList()); return funders; } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/GrantManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/GrantManager.java index 6e3e07d1d..03213aa87 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/GrantManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/GrantManager.java @@ -4,16 +4,14 @@ import eu.eudat.data.dao.criteria.FunderCriteria; import eu.eudat.data.entities.Funder; import eu.eudat.data.query.items.table.grant.GrantTableRequest; import eu.eudat.exceptions.grant.GrantWithDMPsDeleteException; -import eu.eudat.logic.builders.entity.ContentBuilder; import eu.eudat.logic.builders.model.models.GrantBuilder; import eu.eudat.data.dao.entities.GrantDao; -import eu.eudat.data.entities.Content; import eu.eudat.data.entities.DMP; -import eu.eudat.exceptions.files.TempFileNotFoundException; +import eu.eudat.logic.proxy.config.ExternalUrlCriteria; import eu.eudat.logic.services.operations.DatabaseRepository; +import eu.eudat.logic.utilities.helpers.ListHelper; import eu.eudat.models.data.external.ExternalSourcesItemModel; import eu.eudat.models.data.external.GrantsExternalSourcesModel; -import eu.eudat.models.data.files.ContentFile; import eu.eudat.models.data.grant.Grant; import eu.eudat.models.data.helpers.common.DataTableData; import eu.eudat.data.query.items.item.grant.GrantCriteriaRequest; @@ -27,13 +25,12 @@ import eu.eudat.logic.services.ApiContext; import eu.eudat.logic.services.helpers.FileStorageService; import org.springframework.stereotype.Component; -import java.io.IOException; -import java.text.ParseException; import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.UUID; import java.util.concurrent.CompletableFuture; +import java.util.stream.Collectors; @Component public class GrantManager { @@ -42,12 +39,14 @@ public class GrantManager { private DatabaseRepository databaseRepository; private FileStorageService fileStorageService; private RemoteFetcher remoteFetcher; + private ListHelper listHelper; - public GrantManager(ApiContext apiContext) { + public GrantManager(ApiContext apiContext, ListHelper listHelper) { this.apiContext = apiContext; this.databaseRepository = apiContext.getOperationsContext().getDatabaseRepository(); this.fileStorageService = apiContext.getOperationsContext().getFileStorageService(); this.remoteFetcher = apiContext.getOperationsContext().getRemoteFetcher(); + this.listHelper = listHelper; } public DataTableData getPaged(GrantTableRequest grantTableRequest, Principal principal, String fieldsGroup) throws Exception { @@ -99,15 +98,15 @@ public class GrantManager { return grant; } - public eu.eudat.data.entities.Grant inactivate(String id) throws InstantiationException, IllegalAccessException { + /*public eu.eudat.data.entities.Grant inactivate(String id) throws InstantiationException, IllegalAccessException { GrantDao grantRepository = databaseRepository.getGrantDao(); eu.eudat.data.entities.Grant grant = grantRepository.find(UUID.fromString(id)); grant.setStatus(eu.eudat.data.entities.Grant.Status.DELETED.getValue()); grant = grantRepository.createOrUpdate(grant); return grant; - } + }*/ - public List getCriteriaWithExternal(GrantCriteriaRequest grantCriteria, Principal principal) throws IllegalAccessException, InstantiationException, HugeResultSet, NoURLFound { + public List getCriteriaWithExternal(GrantCriteriaRequest grantCriteria, Principal principal) throws HugeResultSet, NoURLFound { eu.eudat.data.entities.UserInfo userInfo = new eu.eudat.data.entities.UserInfo(); userInfo.setId(principal.getId()); if (grantCriteria.getCriteria().getFunderReference() != null && !grantCriteria.getCriteria().getFunderReference().trim().isEmpty()) { @@ -122,7 +121,11 @@ public class GrantManager { QueryableList items = apiContext.getOperationsContext().getDatabaseRepository().getGrantDao().getWithCriteria(grantCriteria.getCriteria()); QueryableList authItems = apiContext.getOperationsContext().getDatabaseRepository().getGrantDao().getAuthenticated(items, userInfo); List grants = authItems.select(item -> new Grant().fromDataModel(item)); - List> remoteRepos = remoteFetcher.getGrants(grantCriteria.getCriteria().getLike()); + + ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(grantCriteria.getCriteria().getLike()); + if (grantCriteria.getCriteria().getFunderReference() != null) externalUrlCriteria.setFunderId(grantCriteria.getCriteria().getFunderReference()); + List> remoteRepos = remoteFetcher.getGrants(externalUrlCriteria); + GrantsExternalSourcesModel grantsExternalSourcesModel = new GrantsExternalSourcesModel().fromExternalItem(remoteRepos); for (ExternalSourcesItemModel externalListingItem : grantsExternalSourcesModel) { eu.eudat.models.data.grant.Grant grant = apiContext.getOperationsContext().getBuilderFactory().getBuilder(GrantBuilder.class) @@ -135,6 +138,7 @@ public class GrantManager { grants.add(grant); } grants.sort(Comparator.comparing(Grant::getLabel)); + grants = grants.stream().filter(listHelper.distinctByKey(Grant::getLabel)).collect(Collectors.toList()); return grants; } @@ -146,7 +150,7 @@ public class GrantManager { return grants; } - public void createOrUpdate(eu.eudat.models.data.grant.Grant grant, Principal principal) throws ParseException, IOException { + /*public void createOrUpdate(eu.eudat.models.data.grant.Grant grant, Principal principal) throws ParseException, IOException { eu.eudat.data.entities.Grant grantEntity = grant.toDataModel(); if (grant.getFiles() != null) { for (ContentFile file : grant.getFiles()) { @@ -167,7 +171,7 @@ public class GrantManager { grantEntity.setType(eu.eudat.data.entities.Grant.GrantType.INTERNAL.getValue()); grantEntity.setCreationUser(databaseRepository.getUserInfoDao().find(principal.getId())); databaseRepository.getGrantDao().createOrUpdate(grantEntity); - } + }*/ public void delete(UUID uuid) { eu.eudat.data.entities.Grant oldGrant = apiContext.getOperationsContext().getDatabaseRepository().getGrantDao().find(uuid); diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ProjectManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ProjectManager.java index 258e5ef2d..bd9b494b0 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ProjectManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ProjectManager.java @@ -1,5 +1,7 @@ package eu.eudat.logic.managers; +import eu.eudat.logic.proxy.config.ExternalUrlCriteria; +import eu.eudat.logic.utilities.helpers.ListHelper; import eu.eudat.models.data.external.ProjectsExternalSourcesModel; import eu.eudat.models.data.project.Project; import eu.eudat.data.query.items.item.project.ProjectCriteriaRequest; @@ -16,16 +18,19 @@ import org.springframework.stereotype.Component; import java.util.Comparator; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Component public class ProjectManager { private ApiContext apiContext; private RemoteFetcher remoteFetcher; + private ListHelper listHelper; - public ProjectManager(ApiContext apiContext) { + public ProjectManager(ApiContext apiContext, ListHelper listHelper) { this.apiContext = apiContext; this.remoteFetcher = apiContext.getOperationsContext().getRemoteFetcher(); + this.listHelper = listHelper; } public List getCriteriaWithExternal(ProjectCriteriaRequest projectCriteria, Principal principal) throws HugeResultSet, NoURLFound { @@ -35,7 +40,8 @@ public class ProjectManager { QueryableList items = apiContext.getOperationsContext().getDatabaseRepository().getProjectDao().getWithCritetia(projectCriteria.getCriteria()); QueryableList authItems = apiContext.getOperationsContext().getDatabaseRepository().getProjectDao().getAuthenticated(items, userInfo); List projects = authItems.select(item -> new Project().fromDataModel(item)); - List> remoteRepos = remoteFetcher.getProjects(projectCriteria.getCriteria().getLike()); + ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(projectCriteria.getCriteria().getLike()); + List> remoteRepos = remoteFetcher.getProjects(externalUrlCriteria); ProjectsExternalSourcesModel projectsExternalSourcesModel = new ProjectsExternalSourcesModel().fromExternalItem(remoteRepos); for (ExternalSourcesItemModel externalListingItem : projectsExternalSourcesModel) { eu.eudat.models.data.project.Project project = apiContext.getOperationsContext().getBuilderFactory().getBuilder(ProjectBuilder.class) @@ -48,6 +54,7 @@ public class ProjectManager { projects.add(project); } projects.sort(Comparator.comparing(Project::getLabel)); + projects = projects.stream().filter(listHelper.distinctByKey(Project::getLabel)).collect(Collectors.toList()); return projects; } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/RegistryManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/RegistryManager.java index 33016f094..9220d6221 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/RegistryManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/RegistryManager.java @@ -1,13 +1,23 @@ package eu.eudat.logic.managers; -import eu.eudat.data.entities.DataRepository; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import eu.eudat.data.dao.criteria.RegistryCriteria; import eu.eudat.data.entities.Registry; +import eu.eudat.logic.proxy.config.ExternalUrlCriteria; +import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; +import eu.eudat.logic.proxy.config.exceptions.NoURLFound; import eu.eudat.logic.services.ApiContext; -import eu.eudat.models.data.datarepository.DataRepositoryModel; import eu.eudat.models.data.registries.RegistryModel; +import eu.eudat.models.data.security.Principal; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + @Component public class RegistryManager { @@ -18,8 +28,30 @@ public class RegistryManager { this.apiContext = apiContext; } - public Registry create(RegistryModel registryModel) throws Exception { + public Registry create(RegistryModel registryModel, Principal principal) throws Exception { + if (registryModel.getLabel() == null || registryModel.getAbbreviation() == null || registryModel.getUri() == null) { + throw new Exception("Missing mandatory entity."); + } Registry registry = registryModel.toDataModel(); + registry.getCreationUser().setId(principal.getId()); return apiContext.getOperationsContext().getDatabaseRepository().getRegistryDao().createOrUpdate(registry); } + + public List getRegistries(String query, String type, Principal principal) throws HugeResultSet, NoURLFound { + ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(query); + List> remoteRepos = this.apiContext.getOperationsContext().getRemoteFetcher().getRegistries(externalUrlCriteria, type); + + RegistryCriteria criteria = new RegistryCriteria(); + if (!query.isEmpty()) criteria.setLike(query); + criteria.setCreationUserId(principal.getId()); + List registryModels = new LinkedList<>(); + if (type.equals("")) { + List registryList = (this.apiContext.getOperationsContext().getDatabaseRepository().getRegistryDao().getWithCriteria(criteria)).toList(); + registryModels = registryList.stream().map(item -> new RegistryModel().fromDataModel(item)).collect(Collectors.toList()); + } + ObjectMapper mapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + registryModels.addAll(remoteRepos.stream().map(item -> mapper.convertValue(item, RegistryModel.class)).collect(Collectors.toList())); + + return registryModels; + } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ResearcherManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ResearcherManager.java index 4c98de920..e09988e80 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ResearcherManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ResearcherManager.java @@ -2,12 +2,14 @@ package eu.eudat.logic.managers; import eu.eudat.logic.builders.model.models.ResearcherBuilder; import eu.eudat.data.entities.Researcher; +import eu.eudat.logic.proxy.config.ExternalUrlCriteria; import eu.eudat.models.data.external.ExternalSourcesItemModel; import eu.eudat.models.data.external.ResearchersExternalSourcesModel; import eu.eudat.data.query.items.item.researcher.ResearcherCriteriaRequest; import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; import eu.eudat.logic.proxy.config.exceptions.NoURLFound; import eu.eudat.logic.proxy.fetching.RemoteFetcher; +import eu.eudat.models.data.security.Principal; import eu.eudat.queryable.QueryableList; import eu.eudat.logic.services.ApiContext; import org.springframework.beans.factory.annotation.Autowired; @@ -15,6 +17,7 @@ import org.springframework.stereotype.Component; import java.util.List; import java.util.Map; +import java.util.UUID; import java.util.stream.Collectors; /** @@ -32,16 +35,19 @@ public class ResearcherManager { this.remoteFetcher = apiContext.getOperationsContext().getRemoteFetcher(); } - public Researcher create(eu.eudat.models.data.researcher.Researcher researcher) throws Exception { + public Researcher create(eu.eudat.models.data.researcher.Researcher researcher, Principal principal) throws Exception { Researcher researcherEntity = researcher.toDataModel(); + researcherEntity.setCreationUser(apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(principal.getId())); return apiContext.getOperationsContext().getDatabaseRepository().getResearcherDao().createOrUpdate(researcherEntity); } - public List getCriteriaWithExternal(ResearcherCriteriaRequest researcherCriteriaRequest) throws HugeResultSet, NoURLFound { + public List getCriteriaWithExternal(ResearcherCriteriaRequest researcherCriteriaRequest, Principal principal) throws HugeResultSet, NoURLFound { QueryableList items = apiContext.getOperationsContext().getDatabaseRepository().getResearcherDao().getWithCriteria(researcherCriteriaRequest.getCriteria()); + items.where((builder, root) -> builder.equal(root.get("creationUser").get("id"), principal.getId())); List researchers = items.select(item -> new eu.eudat.models.data.dmp.Researcher().fromDataModel(item)); - List> remoteRepos = remoteFetcher.getResearchers(researcherCriteriaRequest.getCriteria().getName(),null); + ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(researcherCriteriaRequest.getCriteria().getName()); + List> remoteRepos = remoteFetcher.getResearchers(externalUrlCriteria,null); ResearchersExternalSourcesModel researchersExternalSourcesModel = new ResearchersExternalSourcesModel().fromExternalItem(remoteRepos); for (ExternalSourcesItemModel externalListingItem : researchersExternalSourcesModel) { eu.eudat.models.data.dmp.Researcher researcher = apiContext.getOperationsContext().getBuilderFactory().getBuilder(ResearcherBuilder.class) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ServiceManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ServiceManager.java index 109c972a8..222aa3675 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ServiceManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ServiceManager.java @@ -1,16 +1,23 @@ package eu.eudat.logic.managers; -import eu.eudat.data.entities.Registry; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import eu.eudat.data.dao.criteria.ServiceCriteria; import eu.eudat.data.entities.Service; +import eu.eudat.logic.proxy.config.ExternalUrlCriteria; +import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; +import eu.eudat.logic.proxy.config.exceptions.NoURLFound; import eu.eudat.logic.services.ApiContext; -import eu.eudat.models.data.registries.RegistryModel; +import eu.eudat.models.data.security.Principal; import eu.eudat.models.data.services.ServiceModel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -/** - * Created by ikalyvas on 9/3/2018. - */ +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + @Component public class ServiceManager { @@ -21,8 +28,27 @@ public class ServiceManager { this.apiContext = apiContext; } - public Service create(ServiceModel serviceModel) throws Exception { + public Service create(ServiceModel serviceModel, Principal principal) throws Exception { Service service = serviceModel.toDataModel(); + service.getCreationUser().setId(principal.getId()); return apiContext.getOperationsContext().getDatabaseRepository().getServiceDao().createOrUpdate(service); } + + public List getServices(String query, String type, Principal principal) throws HugeResultSet, NoURLFound { + ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(query); + List> remoteRepos = this.apiContext.getOperationsContext().getRemoteFetcher().getServices(externalUrlCriteria, type); + + ServiceCriteria criteria = new ServiceCriteria(); + if (!query.isEmpty()) criteria.setLike(query); + criteria.setCreationUserId(principal.getId()); + List serviceModels = new LinkedList<>(); + if (type.equals("")) { + List serviceList = (this.apiContext.getOperationsContext().getDatabaseRepository().getServiceDao().getWithCriteria(criteria)).toList(); + serviceModels = serviceList.stream().map(item -> new ServiceModel().fromDataModel(item)).collect(Collectors.toList()); + } + ObjectMapper mapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + serviceModels.addAll(remoteRepos.stream().map(item -> mapper.convertValue(item, ServiceModel.class)).collect(Collectors.toList())); + + return serviceModels; + } } 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 364723317..bf6910247 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 @@ -28,10 +28,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import java.util.*; import java.util.stream.Collectors; @Component @@ -66,7 +63,8 @@ public class UserManager { public UserProfile getSingle(UUID userId) throws Exception { eu.eudat.data.entities.UserInfo user = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(userId); UserProfile profile = new UserProfile().fromDataModel(user); - List dmps = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().getAuthenticated(apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().asQueryable(), userId).take(5).toList(); + List roles = new LinkedList<>(); + List dmps = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().getAuthenticated(apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().asQueryable(), userId, roles).take(5).toList(); profile.setAssociatedDmps(dmps.stream().map(x -> new DataManagementPlan().fromDataModel(x)).collect(Collectors.toList())); return profile; } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/DataFieldsUrlConfiguration.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/DataFieldsUrlConfiguration.java index 829e75b88..0323e8011 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/DataFieldsUrlConfiguration.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/DataFieldsUrlConfiguration.java @@ -11,6 +11,7 @@ public class DataFieldsUrlConfiguration { private String uri; private String description; private String source; + private String count; public String getId() { return id; @@ -57,4 +58,13 @@ public class DataFieldsUrlConfiguration { public void setSource(String source) { this.source = source; } + + public String getCount() { + return count; + } + + @XmlElement(name = "count") + public void setCount(String count) { + this.count = count; + } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/DataSearchConfiguration.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/DataSearchConfiguration.java new file mode 100644 index 000000000..8ec232197 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/DataSearchConfiguration.java @@ -0,0 +1,24 @@ +package eu.eudat.logic.proxy.config; + +import javax.xml.bind.annotation.XmlElement; + +public class DataSearchConfiguration { + private String type; + private String queryParam; + + public String getType() { + return type; + } + @XmlElement(name = "type") + public void setType(String type) { + this.type = type; + } + + public String getQueryParam() { + return queryParam; + } + @XmlElement(name = "queryparam") + public void setQueryParam(String queryParam) { + this.queryParam = queryParam; + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/ExternalUrlCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/ExternalUrlCriteria.java new file mode 100644 index 000000000..fd0ea091c --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/ExternalUrlCriteria.java @@ -0,0 +1,43 @@ +package eu.eudat.logic.proxy.config; + +public class ExternalUrlCriteria { + private String like; + private String page; + private String pageSize; + private String funderId; + + public String getLike() { + return like; + } + public void setLike(String like) { + this.like = like; + } + + public String getPage() { + return page; + } + public void setPage(String page) { + this.page = page; + } + + public String getPageSize() { + return pageSize; + } + public void setPageSize(String pageSize) { + this.pageSize = pageSize; + } + + public String getFunderId() { + return funderId; + } + public void setFunderId(String funderId) { + this.funderId = funderId; + } + + public ExternalUrlCriteria(String like) { + this.like = like; + } + + public ExternalUrlCriteria() { + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/UrlConfiguration.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/UrlConfiguration.java index 9a9912c5a..762153ad4 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/UrlConfiguration.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/UrlConfiguration.java @@ -12,11 +12,13 @@ public class UrlConfiguration { private DataUrlConfiguration data; private String type; private String paginationPath; + private String contentType; + private String funderQuery; + private String firstpage; public String getKey() { return key; } - @XmlElement(name = "key") public void setKey(String key) { this.key = key; @@ -25,7 +27,6 @@ public class UrlConfiguration { public String getLabel() { return label; } - @XmlElement(name = "label") public void setLabel(String label) { this.label = label; @@ -34,7 +35,6 @@ public class UrlConfiguration { public String getUrl() { return url; } - @XmlElement(name = "url") public void setUrl(String url) { this.url = url; @@ -43,7 +43,6 @@ public class UrlConfiguration { public Integer getOrdinal() { return ordinal; } - @XmlElement(name = "ordinal") public void setOrdinal(Integer ordinal) { this.ordinal = ordinal; @@ -52,7 +51,6 @@ public class UrlConfiguration { public DataUrlConfiguration getData() { return data; } - @XmlElement(name = "data") public void setData(DataUrlConfiguration data) { this.data = data; @@ -61,7 +59,6 @@ public class UrlConfiguration { public String getPaginationPath() { return paginationPath; } - @XmlElement(name = "paginationpath") public void setPaginationPath(String paginationPath) { this.paginationPath = paginationPath; @@ -70,9 +67,32 @@ public class UrlConfiguration { public String getType() { return type; } - @XmlElement(name = "type") public void setType(String type) { this.type = type; } + + public String getContentType() { + return contentType; + } + @XmlElement(name = "contenttype") + public void setContentType(String contentType) { + this.contentType = contentType; + } + + public String getFunderQuery() { + return funderQuery; + } + @XmlElement(name = "funderQuery") + public void setFunderQuery(String funderQuery) { + this.funderQuery = funderQuery; + } + + public String getFirstpage() { + return firstpage; + } + @XmlElement(name = "firstPage") + public void setFirstpage(String firstpage) { + this.firstpage = firstpage; + } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/ConfigLoader.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/ConfigLoader.java index ebbc88576..8a935aa53 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/ConfigLoader.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/ConfigLoader.java @@ -1,10 +1,14 @@ package eu.eudat.logic.proxy.config.configloaders; import eu.eudat.logic.proxy.config.ExternalUrls; +import eu.eudat.logic.security.customproviders.ConfigurableProvider.entities.ConfigurableProviders; +import org.apache.poi.xwpf.usermodel.XWPFDocument; + +import java.util.List; -/** - * Created by ikalyvas on 2/9/2018. - */ public interface ConfigLoader { ExternalUrls getExternalUrls(); + List getRdaProperties(); + XWPFDocument getDocument(); + ConfigurableProviders getConfigurableProviders(); } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/DevelConfigLoader.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/DevelConfigLoader.java index 4af836fbd..934a472c4 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/DevelConfigLoader.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/DevelConfigLoader.java @@ -1,6 +1,10 @@ package eu.eudat.logic.proxy.config.configloaders; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; import eu.eudat.logic.proxy.config.ExternalUrls; +import eu.eudat.logic.security.customproviders.ConfigurableProvider.entities.ConfigurableProviders; +import org.apache.poi.xwpf.usermodel.XWPFDocument; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Profile; import org.springframework.core.env.Environment; @@ -8,15 +12,22 @@ import org.springframework.stereotype.Service; import javax.xml.bind.JAXBContext; import javax.xml.bind.Unmarshaller; +import java.io.BufferedReader; +import java.io.FileReader; import java.io.IOException; import java.io.InputStream; import java.net.URL; +import java.util.LinkedList; +import java.util.List; @Service("configLoader") @Profile("devel") public class DevelConfigLoader implements ConfigLoader { private ExternalUrls externalUrls; + private List rdaProperties; + private XWPFDocument document; + private ConfigurableProviders configurableProviders; @Autowired private Environment environment; @@ -31,9 +42,8 @@ public class DevelConfigLoader implements ConfigLoader { JAXBContext jaxbContext = JAXBContext.newInstance(ExternalUrls.class); Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller(); - is = new URL("file:///"+current+"/web/src/main/resources/ExternalUrls.xml").openStream(); + is = new URL("file:///" + current + fileUrl).openStream(); externalUrls = (ExternalUrls) jaxbUnmarshaller.unmarshal(is); - } catch (Exception ex) { ex.printStackTrace(); System.out.println("Cannot find in folder" + current); @@ -44,13 +54,85 @@ public class DevelConfigLoader implements ConfigLoader { System.out.println("Warning: Could not close a stream after reading from file: " + fileUrl); } } - } + private void setRdaProperties() { + String filePath = environment.getProperty("configuration.rda"); + String current = null; + BufferedReader reader; + List rdaList = new LinkedList<>(); + try { + current = new java.io.File(".").getCanonicalPath(); + reader = new BufferedReader(new FileReader(current + filePath)); + String line = reader.readLine(); + while (line != null) { + rdaList.add(line); + line = reader.readLine(); + } + reader.close(); + } catch (IOException e) { + e.printStackTrace(); + } + + rdaProperties = rdaList; + } + + private void setDocument() { + String filePath = environment.getProperty("configuration.h2020template"); + String current = null; + InputStream is = null; + try { + current = new java.io.File(".").getCanonicalPath(); + is = new URL("file:///" + current + filePath).openStream(); + this.document = new XWPFDocument(is); + } catch (IOException e) { + e.printStackTrace(); + } finally { + try { + if (is != null) is.close(); + } catch (IOException e) { + System.out.println("Warning: Could not close a stream after reading from file: " + filePath); + } + } + } + + public void setConfigurableProviders() { + String filePath = environment.getProperty("configuration.configurable_login_providers"); + String current = null; + InputStream is = null; + try { + current = new java.io.File(".").getCanonicalPath(); + is = new URL("file:///" + current + filePath).openStream(); + ObjectMapper mapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + this.configurableProviders = mapper.readValue(is, ConfigurableProviders.class); + } catch (IOException e) { + e.printStackTrace(); + } finally { + try { + if (is != null) is.close(); + } catch (IOException e) { + System.out.println("Warning: Could not close a stream after reading from file: " + filePath); + } + } + } public ExternalUrls getExternalUrls() { this.setExternalUrls(); return externalUrls; } + public List getRdaProperties() { + this.setRdaProperties(); + return rdaProperties; + } + + public XWPFDocument getDocument() { + this.setDocument(); + return document; + } + + public ConfigurableProviders getConfigurableProviders() { + this.setConfigurableProviders(); + return configurableProviders; + } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/ProductionConfigLoader.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/ProductionConfigLoader.java index 4acb43b97..57d16e2c0 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/ProductionConfigLoader.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/ProductionConfigLoader.java @@ -1,6 +1,9 @@ package eu.eudat.logic.proxy.config.configloaders; +import com.fasterxml.jackson.databind.ObjectMapper; import eu.eudat.logic.proxy.config.ExternalUrls; +import eu.eudat.logic.security.customproviders.ConfigurableProvider.entities.ConfigurableProviders; +import org.apache.poi.xwpf.usermodel.XWPFDocument; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Profile; import org.springframework.core.env.Environment; @@ -8,19 +11,23 @@ import org.springframework.stereotype.Service; import javax.xml.bind.JAXBContext; import javax.xml.bind.Unmarshaller; +import java.io.BufferedReader; +import java.io.FileReader; import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.nio.file.Paths; +import java.util.LinkedList; +import java.util.List; -/** - * Created by ikalyvas on 2/9/2018. - */ @Service("configLoader") @Profile({ "production", "staging" }) public class ProductionConfigLoader implements ConfigLoader { private ExternalUrls externalUrls; + private List rdaProperties; + private XWPFDocument document; + private ConfigurableProviders configurableProviders; @Autowired private Environment environment; @@ -48,13 +55,69 @@ public class ProductionConfigLoader implements ConfigLoader { System.out.println("Warning: Could not close a stream after reading from file: " + fileUrl); } } - } + private void setRdaProperties() { + String filePath = environment.getProperty("configuration.rda"); + BufferedReader reader; + List rdaList = new LinkedList<>(); + try { + reader = new BufferedReader(new FileReader(filePath)); + String line = reader.readLine(); + while (line != null) { + rdaList.add(line); + line = reader.readLine(); + } + reader.close(); + } catch (IOException e) { + e.printStackTrace(); + } + + rdaProperties = rdaList; + } + + private void setDocument() { + String filePath = environment.getProperty("configuration.h2020template"); + String current = null; + try { + current = new java.io.File(".").getCanonicalPath(); + InputStream is = new URL(Paths.get(filePath).toUri().toURL().toString()).openStream(); + this.document = new XWPFDocument(is); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public void setConfigurableProviders() { + String filePath = environment.getProperty("configuration.configurable_login_providers"); + String current = null; + try { + current = new java.io.File(".").getCanonicalPath(); + InputStream is = new URL(Paths.get(filePath).toUri().toURL().toString()).openStream(); + ObjectMapper objectMapper = new ObjectMapper(); + this.configurableProviders = objectMapper.readValue(is, ConfigurableProviders.class); + } catch (IOException e) { + e.printStackTrace(); + } + } public ExternalUrls getExternalUrls() { this.setExternalUrls(); return externalUrls; } + public List getRdaProperties() { + this.setRdaProperties(); + return rdaProperties; + } + + public XWPFDocument getDocument() { + this.setDocument(); + return document; + } + + public ConfigurableProviders getConfigurableProviders() { + this.setConfigurableProviders(); + return configurableProviders; + } } \ No newline at end of file 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 b627f8e74..efc0b1db4 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 @@ -4,22 +4,22 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.jayway.jsonpath.DocumentContext; import com.jayway.jsonpath.JsonPath; -import eu.eudat.logic.proxy.config.DataUrlConfiguration; -import eu.eudat.logic.proxy.config.FetchStrategy; -import eu.eudat.logic.proxy.config.UrlConfiguration; +import eu.eudat.logic.proxy.config.*; import eu.eudat.logic.proxy.config.configloaders.ConfigLoader; import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; import eu.eudat.logic.proxy.config.exceptions.NoURLFound; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import java.io.File; import java.io.IOException; +import java.io.UnsupportedEncodingException; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; +import java.net.URLEncoder; +import java.nio.file.Paths; import java.util.*; import java.util.stream.Collectors; @@ -28,165 +28,200 @@ public class RemoteFetcher { private ConfigLoader configLoader; - @Value("${configuration.resources.path}") - private String resourcesPath; - @Autowired public RemoteFetcher(ConfigLoader configLoader) { this.configLoader = configLoader; } @Cacheable("repositories") - public List> getRepositories(String query, String key) throws NoURLFound, HugeResultSet { + public List> getRepositories(ExternalUrlCriteria externalUrlCriteria, String key) throws NoURLFound, HugeResultSet { List urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getRepositories().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) : configLoader.getExternalUrls().getRepositories().getUrls(); FetchStrategy fetchStrategy = configLoader.getExternalUrls().getRepositories().getFetchMode(); - return getAll(urlConfigs, fetchStrategy, query); + return getAll(urlConfigs, fetchStrategy, externalUrlCriteria); } @Cacheable("grants") - public List> getGrants(String query) throws NoURLFound, HugeResultSet { + public List> getGrants(ExternalUrlCriteria externalUrlCriteria) throws NoURLFound, HugeResultSet { List urlConfigs = configLoader.getExternalUrls().getGrants().getUrls(); FetchStrategy fetchStrategy = configLoader.getExternalUrls().getGrants().getFetchMode(); - return getAll(urlConfigs, fetchStrategy, query); + return getAll(urlConfigs, fetchStrategy, externalUrlCriteria); } @Cacheable("projects") - public List> getProjects(String query) throws NoURLFound, HugeResultSet { + public List> getProjects(ExternalUrlCriteria externalUrlCriteria) throws NoURLFound, HugeResultSet { List urlConfigs = configLoader.getExternalUrls().getProjects().getUrls(); FetchStrategy fetchStrategy = configLoader.getExternalUrls().getProjects().getFetchMode(); - return getAll(urlConfigs, fetchStrategy, query); + return getAll(urlConfigs, fetchStrategy, externalUrlCriteria); } @Cacheable("funders") - public List> getFunders(String query) throws NoURLFound, HugeResultSet { + public List> getFunders(ExternalUrlCriteria externalUrlCriteria) throws NoURLFound, HugeResultSet { List urlConfigs = configLoader.getExternalUrls().getFunders().getUrls(); - FetchStrategy fetchStrategy = configLoader.getExternalUrls().getProjects().getFetchMode(); - return getAll(urlConfigs, fetchStrategy, query); + FetchStrategy fetchStrategy = configLoader.getExternalUrls().getFunders().getFetchMode(); + return getAll(urlConfigs, fetchStrategy, externalUrlCriteria); } @Cacheable("organisations") - public List> getOrganisations(String query, String key) throws NoURLFound, HugeResultSet { + public List> getOrganisations(ExternalUrlCriteria externalUrlCriteria, String key) throws NoURLFound, HugeResultSet { List urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getOrganisations().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) : configLoader.getExternalUrls().getOrganisations().getUrls(); FetchStrategy fetchStrategy = configLoader.getExternalUrls().getOrganisations().getFetchMode(); - return getAll(urlConfigs, fetchStrategy, query); + return getAll(urlConfigs, fetchStrategy, externalUrlCriteria); } @Cacheable("registries") - public List> getRegistries(String query, String key) throws NoURLFound, HugeResultSet { + public List> getRegistries(ExternalUrlCriteria externalUrlCriteria, String key) throws NoURLFound, HugeResultSet { List urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getRegistries().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) : configLoader.getExternalUrls().getRegistries().getUrls(); FetchStrategy fetchStrategy = configLoader.getExternalUrls().getRegistries().getFetchMode(); - return getAll(urlConfigs, fetchStrategy, query); + return getAll(urlConfigs, fetchStrategy, externalUrlCriteria); } @Cacheable("services") - public List> getServices(String query, String key) throws NoURLFound, HugeResultSet { + public List> getServices(ExternalUrlCriteria externalUrlCriteria, String key) throws NoURLFound, HugeResultSet { List urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getServices().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) : configLoader.getExternalUrls().getServices().getUrls(); FetchStrategy fetchStrategy = configLoader.getExternalUrls().getServices().getFetchMode(); - return getAll(urlConfigs, fetchStrategy, query); + return getAll(urlConfigs, fetchStrategy, externalUrlCriteria); } @Cacheable("researchers") - public List> getResearchers(String query, String key) throws NoURLFound, HugeResultSet { + public List> getResearchers(ExternalUrlCriteria externalUrlCriteria, String key) throws NoURLFound, HugeResultSet { List urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getResearchers().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) : configLoader.getExternalUrls().getResearchers().getUrls(); FetchStrategy fetchStrategy = configLoader.getExternalUrls().getResearchers().getFetchMode(); - return getAll(urlConfigs, fetchStrategy, query); + return getAll(urlConfigs, fetchStrategy, externalUrlCriteria); } @Cacheable("tags") - public List> getTags(String query, String key) throws NoURLFound, HugeResultSet { + public List> getTags(ExternalUrlCriteria externalUrlCriteria, String key) throws NoURLFound, HugeResultSet { List 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, query); + return getAll(urlConfigs, fetchStrategy, externalUrlCriteria); } - @Cacheable("datasets") - public List> getDatasets(String query, String key) throws NoURLFound, HugeResultSet { + @Cacheable("externalDatasets") + public List> getDatasets(ExternalUrlCriteria externalUrlCriteria, String key) throws NoURLFound, HugeResultSet { List urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getDatasets().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) : configLoader.getExternalUrls().getDatasets().getUrls(); FetchStrategy fetchStrategy = configLoader.getExternalUrls().getDatasets().getFetchMode(); - return getAll(urlConfigs, fetchStrategy, query); + return getAll(urlConfigs, fetchStrategy, externalUrlCriteria); } - private List> getAll(List urlConfigs, FetchStrategy fetchStrategy, String query) throws NoURLFound, HugeResultSet { + private List> getAll(List urlConfigs, FetchStrategy fetchStrategy, ExternalUrlCriteria externalUrlCriteria) throws NoURLFound, HugeResultSet { if (urlConfigs == null || urlConfigs.isEmpty()) throw new NoURLFound("No Repository urls found in configuration"); - Collections.sort(urlConfigs, Comparator.comparing(UrlConfiguration::getOrdinal)); + urlConfigs.sort(Comparator.comparing(UrlConfiguration::getOrdinal)); List> results = new LinkedList<>(); for (UrlConfiguration urlConfig : urlConfigs) { + ifFunderQueryExist(urlConfig, externalUrlCriteria); if (urlConfig.getType() == null || urlConfig.getType().equals("External")) { - results.addAll(getAllResultsFromUrl(urlConfig.getUrl(), fetchStrategy, urlConfig.getData(), urlConfig.getPaginationPath(), query, urlConfig.getLabel())); - } - else if (urlConfig.getType() != null && urlConfig.getType().equals("Internal")) { - results.addAll(getAllResultsFromMockUpJson(urlConfig.getUrl(), query)); + results.addAll(getAllResultsFromUrl(urlConfig.getUrl(), fetchStrategy, urlConfig.getData(), urlConfig.getPaginationPath(), externalUrlCriteria, urlConfig.getLabel(), urlConfig.getContentType(), urlConfig.getFirstpage())); + } else if (urlConfig.getType() != null && urlConfig.getType().equals("Internal")) { + results.addAll(getAllResultsFromMockUpJson(urlConfig.getUrl(), externalUrlCriteria.getLike())); } } return results; } + private void ifFunderQueryExist(UrlConfiguration urlConfiguration, ExternalUrlCriteria externalUrlCriteria) { + if (urlConfiguration.getFunderQuery() != null) { + if (externalUrlCriteria.getFunderId() != null && urlConfiguration.getFunderQuery().startsWith("dmp:")) { + urlConfiguration.setUrl(urlConfiguration.getUrl().replace("{funderQuery}", urlConfiguration.getFunderQuery())); + } + else { + urlConfiguration.setUrl(urlConfiguration.getUrl().replace("{funderQuery}", "")); + } + } + } - private List> getAllResultsFromUrl(String path, FetchStrategy fetchStrategy, final DataUrlConfiguration jsonDataPath, final String jsonPaginationPath, String query, String key) throws HugeResultSet { - Set pages = new HashSet(); + private String replaceCriteriaOnUrl(String path, ExternalUrlCriteria externalUrlCriteria, String firstPage) { + String completedPath = path; + if (externalUrlCriteria.getLike() != null) { + if (path.contains("openaire") && externalUrlCriteria.getLike().equals("")) + completedPath = completedPath.replaceAll("\\{like}", "*"); + else + completedPath = completedPath.replaceAll("\\{like}", externalUrlCriteria.getLike()); + } else { + completedPath = completedPath.replace("{like}", ""); + } + if (externalUrlCriteria.getFunderId() != null) { + String funderId = externalUrlCriteria.getFunderId(); + try { + funderId = URLEncoder.encode(externalUrlCriteria.getFunderId(), "UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + completedPath = completedPath.replace("{funderId}", funderId); + } + if (externalUrlCriteria.getPage() != null) { + completedPath = completedPath.replace("{page}", externalUrlCriteria.getPage()); + } else { + if (firstPage != null) { + completedPath = completedPath.replace("{page}", firstPage); + } else { + completedPath = completedPath.replace("{page}", "1"); + } + } + if (externalUrlCriteria.getPageSize() != null) { + completedPath = completedPath.replace("{pageSize}", externalUrlCriteria.getPageSize()); + } else { + completedPath = completedPath.replace("{pageSize}", "10"); + } + return completedPath; + } - final String searchQuery = (query != null) && !query.isEmpty() ? "&search=" + query : ""; + private List> getAllResultsFromUrl(String path, FetchStrategy fetchStrategy, final DataUrlConfiguration jsonDataPath, final String jsonPaginationPath, ExternalUrlCriteria externalUrlCriteria, String key, String contentType, String firstPage) throws HugeResultSet { + Set pages = new HashSet<>(); - Results results = getResultsFromUrl(path + "?page=1" + searchQuery, jsonDataPath, jsonPaginationPath); + String replacedPath = replaceCriteriaOnUrl(path, externalUrlCriteria, firstPage); + Results results = getResultsFromUrl(replacedPath, jsonDataPath, jsonPaginationPath, contentType); if (fetchStrategy == FetchStrategy.FIRST) - return results == null ? new LinkedList<>() : results.getResults().stream().map(x -> { - x.put("tag", key); - return x; - }).collect(Collectors.toList()); + return results == null ? new LinkedList<>() : results.getResults().stream().peek(x -> x.put("tag", key)).collect(Collectors.toList()); - if (results.getPagination() != null && results.getPagination().get("pages") != null) //if has more pages, add them to the pages set + if (results != null && results.getPagination() != null && results.getPagination().get("pages") != null) //if has more pages, add them to the pages set for (int i = 2; i <= results.getPagination().get("pages"); i++) pages.add(i); Long maxResults = configLoader.getExternalUrls().getMaxresults(); - if ((maxResults > 0) && (results.getPagination().get("count") > maxResults)) - throw new HugeResultSet("The submitted search query " + query + " is about to return " + results.getPagination().get("count") + " results... Please submit a more detailed search query"); + if ((maxResults > 0 && results != null) && (results.getPagination().get("count") > maxResults)) + throw new HugeResultSet("The submitted search query " + externalUrlCriteria.getLike() + " is about to return " + results.getPagination().get("count") + " results... Please submit a more detailed search query"); Optional optionalResults = pages.parallelStream() - .map(page -> getResultsFromUrl(path + "?page=" + page + searchQuery, jsonDataPath, jsonPaginationPath)) + .map(page -> getResultsFromUrl(path + "&page=" + page, jsonDataPath, jsonPaginationPath, contentType)) .reduce((result1, result2) -> { result1.getResults().addAll(result2.getResults()); return result1; }); - Results remainingResults = optionalResults.isPresent() ? optionalResults.get() : new Results(); - + Results remainingResults = optionalResults.orElseGet(Results::new); remainingResults.getResults().addAll(results.getResults()); - return remainingResults.getResults().stream().map(x -> { - x.put("tag", key); - return x; - }).collect(Collectors.toList()); + return remainingResults.getResults().stream().peek(x -> x.put("tag", key)).collect(Collectors.toList()); } - private Results getResultsFromUrl(String urlString, DataUrlConfiguration jsonDataPath, String jsonPaginationPath) { + private Results getResultsFromUrl(String urlString, DataUrlConfiguration jsonDataPath, String jsonPaginationPath, String contentType) { try { - URL url = new URL(urlString); + URL url = new URL(urlString.replace(" ", "%20")); HttpURLConnection con = (HttpURLConnection) url.openConnection(); con.setRequestMethod("GET"); - con.setRequestProperty("Accept", "application/vnd.api+json; charset=utf-8"); + con.setRequestProperty("Accept", contentType); int responseCode = con.getResponseCode(); if (responseCode == HttpURLConnection.HTTP_OK) { // success @@ -198,9 +233,13 @@ public class RemoteFetcher { + "[" + jsonDataPath.getFieldsUrlConfiguration().getName() + "," + jsonDataPath.getFieldsUrlConfiguration().getDescription() + "," + jsonDataPath.getFieldsUrlConfiguration().getUri() + "," + jsonDataPath.getFieldsUrlConfiguration().getId() + "," + jsonDataPath.getFieldsUrlConfiguration().getSource() + "]"), - jsonContext.read(jsonPaginationPath)); - } - else { + new HashMap<>(1, 1)); + } else if (jsonDataPath.getFieldsUrlConfiguration().getCount() != null) { // parsing services.openaire.eu + results = new Results(jsonContext.read(jsonDataPath.getPath() + + "[" + jsonDataPath.getFieldsUrlConfiguration().getName() + + "," + jsonDataPath.getFieldsUrlConfiguration().getId() + "]"), + new HashMap<>(1, 1)); + } else { results = new Results(jsonContext.read(jsonDataPath.getPath() + "[" + jsonDataPath.getFieldsUrlConfiguration().getName() + "," + jsonDataPath.getFieldsUrlConfiguration().getDescription() + "," + jsonDataPath.getFieldsUrlConfiguration().getUri() + "," + jsonDataPath.getFieldsUrlConfiguration().getId() + "]"), @@ -226,9 +265,9 @@ public class RemoteFetcher { } private List> getAllResultsFromMockUpJson(String path, String query) { - String filePath = this.resourcesPath + path; List> internalResults; try { + String filePath = Paths.get(path).toUri().toURL().toString(); ObjectMapper mapper = new ObjectMapper(); internalResults = mapper.readValue(new File(filePath), new TypeReference>>(){}); searchListMap(internalResults, query); @@ -254,11 +293,12 @@ public class RemoteFetcher { } private String transformKey(DataUrlConfiguration dataUrlConfiguration, String key) { - if (key.equals(dataUrlConfiguration.getFieldsUrlConfiguration().getId().replace("'",""))) return "pid"; - if (key.equals(dataUrlConfiguration.getFieldsUrlConfiguration().getDescription().replace("'",""))) return "description"; - if (key.equals(dataUrlConfiguration.getFieldsUrlConfiguration().getUri().replace("'",""))) return "uri"; - if (key.equals(dataUrlConfiguration.getFieldsUrlConfiguration().getName().replace("'",""))) return "name"; - if (key.equals(dataUrlConfiguration.getFieldsUrlConfiguration().getSource().replace("'",""))) return "source"; + if (dataUrlConfiguration.getFieldsUrlConfiguration().getId() != null && key.equals(dataUrlConfiguration.getFieldsUrlConfiguration().getId().replace("'",""))) return "pid"; + if (dataUrlConfiguration.getFieldsUrlConfiguration().getDescription() != null && key.equals(dataUrlConfiguration.getFieldsUrlConfiguration().getDescription().replace("'",""))) return "description"; + if (dataUrlConfiguration.getFieldsUrlConfiguration().getUri() != null && key.equals(dataUrlConfiguration.getFieldsUrlConfiguration().getUri().replace("'",""))) return "uri"; + if (dataUrlConfiguration.getFieldsUrlConfiguration().getName() != null && key.equals(dataUrlConfiguration.getFieldsUrlConfiguration().getName().replace("'",""))) return "name"; + if (dataUrlConfiguration.getFieldsUrlConfiguration().getSource() != null && key.equals(dataUrlConfiguration.getFieldsUrlConfiguration().getSource().replace("'",""))) return "source"; + if (dataUrlConfiguration.getFieldsUrlConfiguration().getCount() != null && key.equals(dataUrlConfiguration.getFieldsUrlConfiguration().getCount().replace("'",""))) return "count"; return null; } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/B2Access/B2AccessCustomProviderImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/B2Access/B2AccessCustomProviderImpl.java index 4a4066fb4..c986edb01 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/B2Access/B2AccessCustomProviderImpl.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/B2Access/B2AccessCustomProviderImpl.java @@ -16,9 +16,6 @@ import org.springframework.web.client.RestTemplate; import java.nio.charset.Charset; import java.util.Map; -/** - * Created by ikalyvas on 2/22/2018. - */ @Component("b2AccessCustomProvider") public class B2AccessCustomProviderImpl implements B2AccessCustomProvider { @@ -54,7 +51,6 @@ public class B2AccessCustomProviderImpl implements B2AccessCustomProvider { map.add("redirect_uri", redirectUri); HttpEntity> request = new HttpEntity>(map, headers); - Map values = template.postForObject(this.environment.getProperty("b2access.externallogin.access_token_url"), request, Map.class); B2AccessResponseToken b2AccessResponseToken = new B2AccessResponseToken(); b2AccessResponseToken.setAccessToken((String) values.get("access_token")); diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/ConfigurableProvider/ConfigurableProviderCustomProvider.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/ConfigurableProvider/ConfigurableProviderCustomProvider.java new file mode 100644 index 000000000..0f29de3fa --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/ConfigurableProvider/ConfigurableProviderCustomProvider.java @@ -0,0 +1,11 @@ +package eu.eudat.logic.security.customproviders.ConfigurableProvider; + +import eu.eudat.logic.security.customproviders.ConfigurableProvider.entities.ConfigurableProviderUserSettings; +import eu.eudat.logic.security.validators.configurableProvider.helpers.ConfigurableProviderResponseToken; + +public interface ConfigurableProviderCustomProvider { + + ConfigurableProviderResponseToken getAccessToken(String code, String redirectUri, String clientId, String clientSecret, String accessTokenUrl, String grantType, String access_token, String expires_in); + + ConfigurableProviderUser getUser(String accessToken, ConfigurableProviderUserSettings user); +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/ConfigurableProvider/ConfigurableProviderCustomProviderImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/ConfigurableProvider/ConfigurableProviderCustomProviderImpl.java new file mode 100644 index 000000000..1ebf8c336 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/ConfigurableProvider/ConfigurableProviderCustomProviderImpl.java @@ -0,0 +1,61 @@ +package eu.eudat.logic.security.customproviders.ConfigurableProvider; + +import eu.eudat.logic.security.customproviders.ConfigurableProvider.entities.ConfigurableProviderUserSettings; +import eu.eudat.logic.security.validators.configurableProvider.helpers.ConfigurableProviderResponseToken; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +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.RestTemplate; + +import java.util.Map; + +@Component("configurableProviderCustomProvider") +public class ConfigurableProviderCustomProviderImpl implements ConfigurableProviderCustomProvider { + + @Override + public ConfigurableProviderResponseToken getAccessToken(String code, String redirectUri, String clientId, String clientSecret, String accessTokenUrl, + String grantType, String access_token, String expires_in) { + RestTemplate template = new RestTemplate(); + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED); + + MultiValueMap map = new LinkedMultiValueMap(); + + map.add("grant_type", grantType); + map.add("code", code); + map.add("redirect_uri", redirectUri); + map.add("client_id", clientId); + map.add("client_secret", clientSecret); + HttpEntity> request = new HttpEntity<>(map, headers); + + Map values = template.postForObject(accessTokenUrl, request, Map.class); + ConfigurableProviderResponseToken responseToken = new ConfigurableProviderResponseToken(); + responseToken.setAccessToken((String) values.get(access_token)); + if (expires_in != null && !expires_in.isEmpty()) { + responseToken.setExpiresIn((Integer) values.get(expires_in)); + } + + return responseToken; + } + + @Override + public ConfigurableProviderUser getUser(String accessToken, ConfigurableProviderUserSettings user) { + RestTemplate restTemplate = new RestTemplate(); + HttpHeaders headers = this.createBearerAuthHeaders(accessToken); + HttpEntity entity = new HttpEntity<>(headers); + + Map values = restTemplate.exchange(user.getUser_info_url(), HttpMethod.GET, entity, Map.class).getBody(); + return new ConfigurableProviderUser().getConfigurableProviderUser(values, user); + } + + 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/ConfigurableProvider/ConfigurableProviderUser.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/ConfigurableProvider/ConfigurableProviderUser.java new file mode 100644 index 000000000..111abad14 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/ConfigurableProvider/ConfigurableProviderUser.java @@ -0,0 +1,42 @@ +package eu.eudat.logic.security.customproviders.ConfigurableProvider; + +import eu.eudat.logic.security.customproviders.ConfigurableProvider.entities.ConfigurableProviderUserSettings; + +import java.util.Map; + +public class ConfigurableProviderUser { + private String id; + private String name; + private String email; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + + public String getEmail() { + return email; + } + public void setEmail(String email) { + this.email = email; + } + + ConfigurableProviderUser getConfigurableProviderUser(Map data, ConfigurableProviderUserSettings user) { + if (user.getId() != null && !user.getId().isEmpty()) + this.id = (String) data.get(user.getId()); + if (user.getName() != null && !user.getName().isEmpty()) + this.name = (String) data.get(user.getName()); + if (user.getEmail() != null && !user.getEmail().isEmpty()) + this.email = (String) data.get(user.getEmail()); + return this; + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/ConfigurableProvider/entities/ConfigurableProvider.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/ConfigurableProvider/entities/ConfigurableProvider.java new file mode 100644 index 000000000..2e62f7007 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/ConfigurableProvider/entities/ConfigurableProvider.java @@ -0,0 +1,109 @@ +package eu.eudat.logic.security.customproviders.ConfigurableProvider.entities; + +public class ConfigurableProvider { + + private boolean enabled; + private String configurableLoginId; + private String name; + private String clientId; + private String clientSecret; + private String redirect_uri; + private String access_token_url; + private String grant_type; + private ConfigurableProviderToken token; + private ConfigurableProviderUserSettings user; + private String oauthUrl; + private String scope; + private String state; + + public boolean getEnabled() { + return enabled; + } + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + + public String getConfigurableLoginId() { + return configurableLoginId; + } + public void setConfigurableLoginId(String configurableLoginId) { + this.configurableLoginId = configurableLoginId; + } + + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + + public String getClientId() { + return clientId; + } + public void setClientId(String clientId) { + this.clientId = clientId; + } + + public String getClientSecret() { + return clientSecret; + } + public void setClientSecret(String clientSecret) { + this.clientSecret = clientSecret; + } + + public String getRedirect_uri() { + return redirect_uri; + } + public void setRedirect_uri(String redirect_uri) { + this.redirect_uri = redirect_uri; + } + + public String getAccess_token_url() { + return access_token_url; + } + public void setAccess_token_url(String access_token_url) { + this.access_token_url = access_token_url; + } + + public String getGrant_type() { + return grant_type; + } + public void setGrant_type(String grant_type) { + this.grant_type = grant_type; + } + + public ConfigurableProviderToken getToken() { + return token; + } + public void setToken(ConfigurableProviderToken token) { + this.token = token; + } + + public ConfigurableProviderUserSettings getUser() { + return user; + } + public void setUser(ConfigurableProviderUserSettings user) { + this.user = user; + } + + public String getOauthUrl() { + return oauthUrl; + } + public void setOauthUrl(String oauthUrl) { + this.oauthUrl = oauthUrl; + } + + public String getScope() { + return scope; + } + public void setScope(String scope) { + this.scope = scope; + } + + public String getState() { + return state; + } + public void setState(String state) { + this.state = state; + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/ConfigurableProvider/entities/ConfigurableProviderToken.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/ConfigurableProvider/entities/ConfigurableProviderToken.java new file mode 100644 index 000000000..ac2021a82 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/ConfigurableProvider/entities/ConfigurableProviderToken.java @@ -0,0 +1,20 @@ +package eu.eudat.logic.security.customproviders.ConfigurableProvider.entities; + +public class ConfigurableProviderToken { + private String access_token; + private String expires_in; + + public String getAccess_token() { + return access_token; + } + public void setAccess_token(String access_token) { + this.access_token = access_token; + } + + public String getExpires_in() { + return expires_in; + } + public void setExpires_in(String expires_in) { + this.expires_in = expires_in; + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/ConfigurableProvider/entities/ConfigurableProviderUserSettings.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/ConfigurableProvider/entities/ConfigurableProviderUserSettings.java new file mode 100644 index 000000000..693957ca3 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/ConfigurableProvider/entities/ConfigurableProviderUserSettings.java @@ -0,0 +1,36 @@ +package eu.eudat.logic.security.customproviders.ConfigurableProvider.entities; + +public class ConfigurableProviderUserSettings { + private String id; + private String name; + private String email; + private String user_info_url; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + + public String getEmail() { + return email; + } + public void setEmail(String email) { + this.email = email; + } + + public String getUser_info_url() { + return user_info_url; + } + public void setUser_info_url(String user_info_url) { + this.user_info_url = user_info_url; + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/ConfigurableProvider/entities/ConfigurableProviders.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/ConfigurableProvider/entities/ConfigurableProviders.java new file mode 100644 index 000000000..01967ce32 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/ConfigurableProvider/entities/ConfigurableProviders.java @@ -0,0 +1,15 @@ +package eu.eudat.logic.security.customproviders.ConfigurableProvider.entities; + +import java.util.ArrayList; +import java.util.List; + +public class ConfigurableProviders { + private List providers = new ArrayList<>(); + + public List getProviders() { + return providers; + } + public void setProviders(List providers) { + this.providers = providers; + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/ConfigurableProvider/models/ConfigurableProviderModel.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/ConfigurableProvider/models/ConfigurableProviderModel.java new file mode 100644 index 000000000..b09b002d2 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/ConfigurableProvider/models/ConfigurableProviderModel.java @@ -0,0 +1,76 @@ +package eu.eudat.logic.security.customproviders.ConfigurableProvider.models; + +import eu.eudat.logic.security.customproviders.ConfigurableProvider.entities.ConfigurableProvider; + +public class ConfigurableProviderModel { + + private String configurableLoginId; + private String name; + private String clientId; + private String redirect_uri; + private String oauthUrl; + private String scope; + private String state; + + public String getConfigurableLoginId() { + return configurableLoginId; + } + public void setConfigurableLoginId(String configurableLoginId) { + this.configurableLoginId = configurableLoginId; + } + + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + + public String getClientId() { + return clientId; + } + public void setClientId(String clientId) { + this.clientId = clientId; + } + + public String getRedirect_uri() { + return redirect_uri; + } + public void setRedirect_uri(String redirect_uri) { + this.redirect_uri = redirect_uri; + } + + public String getOauthUrl() { + return oauthUrl; + } + public void setOauthUrl(String oauthUrl) { + this.oauthUrl = oauthUrl; + } + + public String getScope() { + return scope; + } + public void setScope(String scope) { + this.scope = scope; + } + + public String getState() { + return state; + } + public void setState(String state) { + this.state = state; + } + + public ConfigurableProviderModel fromDataModel(ConfigurableProvider entity) { + ConfigurableProviderModel model = new ConfigurableProviderModel(); + model.setConfigurableLoginId(entity.getConfigurableLoginId()); + model.setName(entity.getName()); + model.setClientId(entity.getClientId()); + model.setRedirect_uri(entity.getRedirect_uri()); + model.setOauthUrl(entity.getOauthUrl()); + model.setScope(entity.getScope()); + model.setState(entity.getState()); + + return model; + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/ConfigurableProvider/models/ConfigurableProvidersModel.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/ConfigurableProvider/models/ConfigurableProvidersModel.java new file mode 100644 index 000000000..28514d6d4 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/ConfigurableProvider/models/ConfigurableProvidersModel.java @@ -0,0 +1,31 @@ +package eu.eudat.logic.security.customproviders.ConfigurableProvider.models; + +import eu.eudat.logic.security.customproviders.ConfigurableProvider.entities.ConfigurableProvider; +import eu.eudat.logic.security.customproviders.ConfigurableProvider.entities.ConfigurableProviders; + +import java.util.LinkedList; +import java.util.List; + +public class ConfigurableProvidersModel { + private List providers; + + public List getProviders() { + return providers; + } + public void setProviders(List providers) { + this.providers = providers; + } + + public ConfigurableProvidersModel fromDataModel(ConfigurableProviders entity) { + ConfigurableProvidersModel model = new ConfigurableProvidersModel(); + List providerModelList = new LinkedList<>(); + if (entity != null) { + for (ConfigurableProvider entityProvider : entity.getProviders()) { + if (entityProvider.getEnabled()) + providerModelList.add(new ConfigurableProviderModel().fromDataModel(entityProvider)); + } + } + model.setProviders(providerModelList); + return model; + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/LinkedIn/LinkedInCustomProvider.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/LinkedIn/LinkedInCustomProvider.java new file mode 100644 index 000000000..2d8c481ce --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/LinkedIn/LinkedInCustomProvider.java @@ -0,0 +1,10 @@ +package eu.eudat.logic.security.customproviders.LinkedIn; + +import eu.eudat.logic.security.validators.linkedin.helpers.LinkedInResponseToken; + +public interface LinkedInCustomProvider { + + LinkedInUser getUser(String accessToken); + + LinkedInResponseToken getAccessToken(String code, String redirectUri, String clientId, String clientSecret); +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/LinkedIn/LinkedInCustomProviderImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/LinkedIn/LinkedInCustomProviderImpl.java new file mode 100644 index 000000000..ed09ceee8 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/LinkedIn/LinkedInCustomProviderImpl.java @@ -0,0 +1,67 @@ +package eu.eudat.logic.security.customproviders.LinkedIn; + +import eu.eudat.logic.security.validators.linkedin.helpers.LinkedInResponseToken; +import org.springframework.core.env.Environment; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +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.RestTemplate; + +import java.util.Map; + +@Component("LinkedInCustomProvider") +public class LinkedInCustomProviderImpl implements LinkedInCustomProvider { + + private Environment environment; + + public LinkedInCustomProviderImpl(Environment environment) { + this.environment = environment; + } + + public LinkedInUser getUser(String accessToken) { + RestTemplate restTemplate = new RestTemplate(); + HttpHeaders headers = this.createBearerAuthHeaders(accessToken); + HttpEntity entity = new HttpEntity<>(headers); + + Map profileValues = restTemplate.exchange(this.environment.getProperty("linkedin.login.user_info_url"), HttpMethod.GET, entity, Map.class).getBody(); + Map emailValues = restTemplate.exchange(this.environment.getProperty("linkedin.login.user_email"), HttpMethod.GET, entity, Map.class).getBody(); + LinkedInUser linkedInUser = new LinkedInUser(); + linkedInUser.setEmail((String)emailValues.get("email")); + linkedInUser.setName((String)profileValues.get("localizedFirstName")); + linkedInUser.setId((String)profileValues.get("id")); + return linkedInUser; + } + + public LinkedInResponseToken getAccessToken(String code, String redirectUri, String clientId, String clientSecret) { + RestTemplate template = new RestTemplate(); + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED); + + MultiValueMap map = new LinkedMultiValueMap(); + + map.add("grant_type", "authorization_code"); + map.add("code", code); + map.add("redirect_uri", redirectUri); + map.add("client_id", clientId); + map.add("client_secret", clientSecret); + HttpEntity> request = new HttpEntity>(map, headers); + + Map values = template.postForObject(this.environment.getProperty("linkedin.login.access_token_url"), request, Map.class); + LinkedInResponseToken linkedInResponseToken = new LinkedInResponseToken(); + linkedInResponseToken.setAccessToken((String) values.get("access_token")); + linkedInResponseToken.setExpiresIn((Integer) values.get("expires_in")); + + return linkedInResponseToken; + } + + private HttpHeaders createBearerAuthHeaders(String accessToken) { + return new HttpHeaders() {{ + String authHeader = "Bearer " + new String(accessToken); + set("Authorization", authHeader); + }}; + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/LinkedIn/LinkedInUser.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/LinkedIn/LinkedInUser.java new file mode 100644 index 000000000..0cbe2d7df --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/LinkedIn/LinkedInUser.java @@ -0,0 +1,29 @@ +package eu.eudat.logic.security.customproviders.LinkedIn; + +public class LinkedInUser { + private String id; + private String name; + private String email; + + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + + public String getEmail() { + return email; + } + public void setEmail(String email) { + this.email = email; + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/OpenAIRE/OpenAIRECustomProvider.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/OpenAIRE/OpenAIRECustomProvider.java new file mode 100644 index 000000000..3b7855e08 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/OpenAIRE/OpenAIRECustomProvider.java @@ -0,0 +1,10 @@ +package eu.eudat.logic.security.customproviders.OpenAIRE; + +import eu.eudat.logic.security.validators.openaire.helpers.OpenAIREResponseToken; + +public interface OpenAIRECustomProvider { + + OpenAIREResponseToken getAccessToken(String code, String redirectUri, String clientId, String clientSecret); + + OpenAIREUser getUser(String accessToken); +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/OpenAIRE/OpenAIRECustomProviderImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/OpenAIRE/OpenAIRECustomProviderImpl.java new file mode 100644 index 000000000..cd465142f --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/OpenAIRE/OpenAIRECustomProviderImpl.java @@ -0,0 +1,62 @@ +package eu.eudat.logic.security.customproviders.OpenAIRE; + +import eu.eudat.logic.security.validators.openaire.helpers.OpenAIREResponseToken; +import org.springframework.core.env.Environment; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +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.RestTemplate; + +import java.util.Map; + +@Component("openAIRECustomProvider") +public class OpenAIRECustomProviderImpl implements OpenAIRECustomProvider { + + private Environment environment; + + public OpenAIRECustomProviderImpl(Environment environment) { + this.environment = environment; + } + + public OpenAIREUser getUser(String accessToken) { + RestTemplate restTemplate = new RestTemplate(); + HttpHeaders headers = this.createBearerAuthHeaders(accessToken); + HttpEntity entity = new HttpEntity<>(headers); + + Map values = restTemplate.exchange(this.environment.getProperty("openaire.login.user_info_url"), HttpMethod.GET, entity, Map.class).getBody(); + return new OpenAIREUser().getOpenAIREUser(values); + } + + public OpenAIREResponseToken getAccessToken(String code, String redirectUri, String clientId, String clientSecret) { + RestTemplate template = new RestTemplate(); + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED); + + MultiValueMap map = new LinkedMultiValueMap(); + + map.add("grant_type", "authorization_code"); + map.add("code", code); + map.add("redirect_uri", redirectUri); + map.add("client_id", clientId); + map.add("client_secret", clientSecret); + HttpEntity> request = new HttpEntity>(map, headers); + + Map values = template.postForObject(this.environment.getProperty("openaire.login.access_token_url"), request, Map.class); + OpenAIREResponseToken openAIREResponseToken = new OpenAIREResponseToken(); + openAIREResponseToken.setAccessToken((String) values.get("access_token")); + openAIREResponseToken.setExpiresIn((Integer) values.get("expires_in")); + + return openAIREResponseToken; + } + + 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/OpenAIRE/OpenAIREUser.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/OpenAIRE/OpenAIREUser.java new file mode 100644 index 000000000..e20b65132 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/OpenAIRE/OpenAIREUser.java @@ -0,0 +1,37 @@ +package eu.eudat.logic.security.customproviders.OpenAIRE; + +import java.util.Map; + +public class OpenAIREUser { + private String id; + private String name; + private String email; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + + public String getEmail() { + return email; + } + public void setEmail(String email) { + this.email = email; + } + + public OpenAIREUser getOpenAIREUser(Object data) { + this.id = (String) ((Map) data).get("sub"); + this.name = (String) ((Map) data).get("name"); + this.email = (String) ((Map) data).get("email"); + 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 404de9b55..9b594c96e 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 @@ -1,14 +1,19 @@ package eu.eudat.logic.security.validators; +import eu.eudat.logic.proxy.config.configloaders.ConfigLoader; import eu.eudat.logic.security.customproviders.B2Access.B2AccessCustomProvider; +import eu.eudat.logic.security.customproviders.ConfigurableProvider.ConfigurableProviderCustomProvider; +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.validators.b2access.B2AccessTokenValidator; +import eu.eudat.logic.security.validators.configurableProvider.ConfigurableProviderTokenValidator; import eu.eudat.logic.security.validators.facebook.FacebookTokenValidator; import eu.eudat.logic.security.validators.google.GoogleTokenValidator; 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.services.ApiContext; import eu.eudat.logic.services.operations.authentication.AuthenticationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; @@ -18,7 +23,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); + GOOGLE(1), FACEBOOK(2), TWITTER(3), LINKEDIN(4), NATIVELOGIN(5), B2_ACCESS(6), ORCID(7), OPENAIRE(8), CONFIGURABLE(9); private int value; @@ -46,41 +51,58 @@ public class TokenValidatorFactoryImpl implements TokenValidatorFactory { return B2_ACCESS; case 7: return ORCID; + case 8: + return OPENAIRE; + case 9: + return CONFIGURABLE; default: throw new RuntimeException("Unsupported LoginProvider"); } } } - private ApiContext apiContext; private Environment environment; private AuthenticationService nonVerifiedUserAuthenticationService; private B2AccessCustomProvider b2AccessCustomProvider; private ORCIDCustomProvider orcidCustomProvider; + private LinkedInCustomProvider linkedInCustomProvider; + private OpenAIRECustomProvider openAIRECustomProvider; + private ConfigurableProviderCustomProvider configurableProviderCustomProvider; + private ConfigLoader configLoader; @Autowired - public TokenValidatorFactoryImpl(ApiContext apiContext, Environment environment, AuthenticationService nonVerifiedUserAuthenticationService, B2AccessCustomProvider b2AccessCustomProvider, ORCIDCustomProvider orcidCustomProvider) { - this.apiContext = apiContext; + public TokenValidatorFactoryImpl( + Environment environment, + AuthenticationService nonVerifiedUserAuthenticationService, B2AccessCustomProvider b2AccessCustomProvider, + ORCIDCustomProvider orcidCustomProvider, LinkedInCustomProvider linkedInCustomProvider, OpenAIRECustomProvider openAIRECustomProvider, ConfigurableProviderCustomProvider configurableProviderCustomProvider, ConfigLoader configLoader) { this.environment = environment; this.nonVerifiedUserAuthenticationService = nonVerifiedUserAuthenticationService; this.b2AccessCustomProvider = b2AccessCustomProvider; this.orcidCustomProvider = orcidCustomProvider; + this.linkedInCustomProvider = linkedInCustomProvider; + this.openAIRECustomProvider = openAIRECustomProvider; + this.configurableProviderCustomProvider = configurableProviderCustomProvider; + this.configLoader = configLoader; } public TokenValidator getProvider(LoginProvider provider) { switch (provider) { case GOOGLE: - return new GoogleTokenValidator(this.apiContext, this.environment, this.nonVerifiedUserAuthenticationService); + return new GoogleTokenValidator(this.environment, this.nonVerifiedUserAuthenticationService); case FACEBOOK: - return new FacebookTokenValidator(this.apiContext, this.environment, this.nonVerifiedUserAuthenticationService); + return new FacebookTokenValidator(this.environment, this.nonVerifiedUserAuthenticationService); case LINKEDIN: - return new LinkedInTokenValidator(this.apiContext, this.environment, this.nonVerifiedUserAuthenticationService); + return new LinkedInTokenValidator(this.environment, this.nonVerifiedUserAuthenticationService, linkedInCustomProvider); case TWITTER: - return new TwitterTokenValidator(this.apiContext, this.environment, this.nonVerifiedUserAuthenticationService); + return new TwitterTokenValidator(this.environment, this.nonVerifiedUserAuthenticationService); case B2_ACCESS: return new B2AccessTokenValidator(this.environment, this.nonVerifiedUserAuthenticationService, this.b2AccessCustomProvider); case ORCID: - return new ORCIDTokenValidator(this.environment, this.nonVerifiedUserAuthenticationService, this.orcidCustomProvider, this.apiContext); + return new ORCIDTokenValidator(this.environment, this.nonVerifiedUserAuthenticationService, this.orcidCustomProvider); + case OPENAIRE: + return new OpenAIRETokenValidator(this.environment, this.nonVerifiedUserAuthenticationService, this.openAIRECustomProvider); + case CONFIGURABLE: + return new ConfigurableProviderTokenValidator(this.configurableProviderCustomProvider, this.nonVerifiedUserAuthenticationService, this.configLoader); default: throw new RuntimeException("Login Provider Not Implemented"); } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/b2access/B2AccessTokenValidator.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/b2access/B2AccessTokenValidator.java index a1057377b..a5adf52fa 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/b2access/B2AccessTokenValidator.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/b2access/B2AccessTokenValidator.java @@ -18,9 +18,6 @@ import org.springframework.stereotype.Component; import java.io.IOException; import java.security.GeneralSecurityException; -/** - * Created by ikalyvas on 2/22/2018. - */ @Component("b2AccessTokenValidator ") public class B2AccessTokenValidator implements TokenValidator { diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/configurableProvider/ConfigurableProviderTokenValidator.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/configurableProvider/ConfigurableProviderTokenValidator.java new file mode 100644 index 000000000..bf426f96e --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/configurableProvider/ConfigurableProviderTokenValidator.java @@ -0,0 +1,61 @@ +package eu.eudat.logic.security.validators.configurableProvider; + +import eu.eudat.exceptions.security.NullEmailException; +import eu.eudat.logic.proxy.config.configloaders.ConfigLoader; + +import eu.eudat.logic.security.customproviders.ConfigurableProvider.ConfigurableProviderCustomProvider; +import eu.eudat.logic.security.customproviders.ConfigurableProvider.ConfigurableProviderUser; +import eu.eudat.logic.security.customproviders.ConfigurableProvider.entities.ConfigurableProvider; +import eu.eudat.logic.security.validators.TokenValidator; +import eu.eudat.logic.security.validators.configurableProvider.helpers.ConfigurableProviderRequest; +import eu.eudat.logic.security.validators.configurableProvider.helpers.ConfigurableProviderResponseToken; +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.stereotype.Component; + +import java.util.Map; +import java.util.stream.Collectors; + +@Component("configurableProviderTokenValidator") +public class ConfigurableProviderTokenValidator implements TokenValidator { + + private ConfigurableProviderCustomProvider configurableProvider; + private AuthenticationService nonVerifiedUserAuthenticationService; + private ConfigLoader configLoader; + + public ConfigurableProviderTokenValidator(ConfigurableProviderCustomProvider configurableProvider, AuthenticationService nonVerifiedUserAuthenticationService, ConfigLoader configLoader) { + this.configurableProvider = configurableProvider; + this.nonVerifiedUserAuthenticationService = nonVerifiedUserAuthenticationService; + this.configLoader = configLoader; + } + + public ConfigurableProviderResponseToken getAccessToken(ConfigurableProviderRequest configurableProviderRequest) { + ConfigurableProvider provider = getConfigurableProviderFromId(configurableProviderRequest.getConfigurableLoginId()); + return this.configurableProvider.getAccessToken(configurableProviderRequest.getCode(), + provider.getRedirect_uri(), provider.getClientId(), provider.getClientSecret(), + provider.getAccess_token_url(), provider.getGrant_type(), provider.getToken().getAccess_token(), provider.getToken().getExpires_in()); + } + @Override + public Principal validateToken(LoginInfo credentials) throws NullEmailException { + String configurableLoginId = ((Map) credentials.getData()).get("configurableLoginId").toString(); + ConfigurableProvider configurableProvider = getConfigurableProviderFromId(configurableLoginId); + ConfigurableProviderUser configurableUser = this.configurableProvider.getUser(credentials.getTicket(), configurableProvider.getUser()); + LoginProviderUser user = new LoginProviderUser(); + user.setId(configurableUser.getId()); + user.setEmail(configurableUser.getEmail()); + user.setName(configurableUser.getName()); + user.setProvider(credentials.getProvider()); + user.setSecret(credentials.getTicket()); + + return this.nonVerifiedUserAuthenticationService.Touch(user); + } + + private ConfigurableProvider getConfigurableProviderFromId(String configurableId) { + return this.configLoader.getConfigurableProviders().getProviders().stream() + .filter(prov -> prov.getConfigurableLoginId().equals(configurableId)) + .collect(Collectors.toList()) + .get(0); + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/configurableProvider/helpers/ConfigurableProviderRequest.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/configurableProvider/helpers/ConfigurableProviderRequest.java new file mode 100644 index 000000000..7877c88c3 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/configurableProvider/helpers/ConfigurableProviderRequest.java @@ -0,0 +1,20 @@ +package eu.eudat.logic.security.validators.configurableProvider.helpers; + +public class ConfigurableProviderRequest { + private String code; + private String configurableLoginId; + + public String getCode() { + return code; + } + public void setCode(String code) { + this.code = code; + } + + public String getConfigurableLoginId() { + return configurableLoginId; + } + public void setConfigurableLoginId(String configurableLoginId) { + this.configurableLoginId = configurableLoginId; + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/configurableProvider/helpers/ConfigurableProviderResponseToken.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/configurableProvider/helpers/ConfigurableProviderResponseToken.java new file mode 100644 index 000000000..743dc376b --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/configurableProvider/helpers/ConfigurableProviderResponseToken.java @@ -0,0 +1,20 @@ +package eu.eudat.logic.security.validators.configurableProvider.helpers; + +public class ConfigurableProviderResponseToken { + private String accessToken; + private Integer expiresIn; + + 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; + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/facebook/FacebookTokenValidator.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/facebook/FacebookTokenValidator.java index 92715c5fb..ed87b867f 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/facebook/FacebookTokenValidator.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/facebook/FacebookTokenValidator.java @@ -3,7 +3,6 @@ package eu.eudat.logic.security.validators.facebook; import eu.eudat.exceptions.security.UnauthorisedException; import eu.eudat.logic.security.validators.TokenValidator; import eu.eudat.logic.security.validators.TokenValidatorFactoryImpl; -import eu.eudat.logic.services.ApiContext; import eu.eudat.logic.services.operations.authentication.AuthenticationService; import eu.eudat.models.data.login.LoginInfo; import eu.eudat.models.data.loginprovider.LoginProviderUser; @@ -22,17 +21,13 @@ import java.util.Map; @Component("facebookTokenValidator") public class FacebookTokenValidator implements TokenValidator { - private Environment environment; - private ApiContext apiContext; private AuthenticationService nonVerifiedUserAuthenticationService; private FacebookServiceProvider facebookServiceProvider; @Autowired - public FacebookTokenValidator(ApiContext apiContext, Environment environment, AuthenticationService nonVerifiedUserAuthenticationService) { - this.environment = environment; - this.apiContext = apiContext; + public FacebookTokenValidator(Environment environment, AuthenticationService nonVerifiedUserAuthenticationService) { this.nonVerifiedUserAuthenticationService = nonVerifiedUserAuthenticationService; - this.facebookServiceProvider = new FacebookServiceProvider(this.environment.getProperty("facebook.login.clientId"), this.environment.getProperty("facebook.login.clientSecret"), this.environment.getProperty("facebook.login.namespace")); + this.facebookServiceProvider = new FacebookServiceProvider(environment.getProperty("facebook.login.clientId"), environment.getProperty("facebook.login.clientSecret"), environment.getProperty("facebook.login.namespace")); } @Override @@ -56,8 +51,7 @@ public class FacebookTokenValidator implements TokenValidator { private User getFacebookUser(String accessToken) { String[] fields = {"id", "email", "first_name", "last_name", "name", "verified", "picture"}; - User profile = this.facebookServiceProvider.getApi(accessToken).fetchObject("me", User.class, fields); - return profile; + return this.facebookServiceProvider.getApi(accessToken).fetchObject("me", User.class, fields); } private Date addADay(Date date) { diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/google/GoogleTokenValidator.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/google/GoogleTokenValidator.java index 03e5166cb..add180486 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/google/GoogleTokenValidator.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/google/GoogleTokenValidator.java @@ -8,7 +8,6 @@ import com.google.api.client.http.javanet.NetHttpTransport; import com.google.api.client.json.jackson2.JacksonFactory; import eu.eudat.logic.security.validators.TokenValidator; import eu.eudat.logic.security.validators.TokenValidatorFactoryImpl; -import eu.eudat.logic.services.ApiContext; import eu.eudat.logic.services.operations.authentication.AuthenticationService; import eu.eudat.models.data.login.LoginInfo; import eu.eudat.models.data.loginprovider.LoginProviderUser; @@ -24,24 +23,19 @@ import java.util.Collections; public class GoogleTokenValidator implements TokenValidator { private static final HttpTransport transport = new NetHttpTransport(); - private ApiContext apiContext; private AuthenticationService nonVerifiedUserAuthenticationService; private GoogleIdTokenVerifier verifier; - private Environment environment; @Autowired - public GoogleTokenValidator(ApiContext apiContext, Environment environment, AuthenticationService nonVerifiedUserAuthenticationService) { - this.apiContext = apiContext; - this.environment = environment; + public GoogleTokenValidator(Environment environment, AuthenticationService nonVerifiedUserAuthenticationService) { this.nonVerifiedUserAuthenticationService = nonVerifiedUserAuthenticationService; verifier = new GoogleIdTokenVerifier.Builder(transport, JacksonFactory.getDefaultInstance()) - .setAudience(Collections.singletonList(this.environment.getProperty("google.login.clientId"))) + .setAudience(Collections.singletonList(environment.getProperty("google.login.clientId"))) .build(); } private GoogleIdToken verifyUserAndGetUser(String idTokenString) throws IOException, GeneralSecurityException { - GoogleIdToken idToken = verifier.verify(idTokenString); - return idToken; + return verifier.verify(idTokenString); } @Override @@ -58,5 +52,4 @@ public class GoogleTokenValidator implements TokenValidator { user.setIsVerified(payload.getEmailVerified()); return this.nonVerifiedUserAuthenticationService.Touch(user); } - } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/linkedin/LinkedInTokenValidator.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/linkedin/LinkedInTokenValidator.java index f89c82317..c49c628df 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/linkedin/LinkedInTokenValidator.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/linkedin/LinkedInTokenValidator.java @@ -1,19 +1,17 @@ package eu.eudat.logic.security.validators.linkedin; import eu.eudat.exceptions.security.UnauthorisedException; +import eu.eudat.logic.security.customproviders.LinkedIn.LinkedInCustomProvider; +import eu.eudat.logic.security.customproviders.LinkedIn.LinkedInUser; import eu.eudat.logic.security.validators.TokenValidator; -import eu.eudat.logic.security.validators.TokenValidatorFactoryImpl; -import eu.eudat.logic.services.ApiContext; +import eu.eudat.logic.security.validators.linkedin.helpers.LinkedInRequest; +import eu.eudat.logic.security.validators.linkedin.helpers.LinkedInResponseToken; 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.social.linkedin.api.LinkedIn; -import org.springframework.social.linkedin.api.LinkedInProfile; -import org.springframework.social.linkedin.connect.LinkedInServiceProvider; -import org.springframework.social.oauth2.AccessGrant; import org.springframework.stereotype.Component; @@ -21,21 +19,19 @@ import org.springframework.stereotype.Component; public class LinkedInTokenValidator implements TokenValidator { private Environment environment; - private ApiContext apiContext; private AuthenticationService nonVerifiedUserAuthenticationService; - private LinkedInServiceProvider linkedInServiceProvider; + private LinkedInCustomProvider linkedInCustomProvider; @Autowired - public LinkedInTokenValidator(ApiContext apiContext, Environment environment, AuthenticationService nonVerifiedUserAuthenticationService) { + public LinkedInTokenValidator(Environment environment, AuthenticationService nonVerifiedUserAuthenticationService, LinkedInCustomProvider linkedInCustomProvider) { this.environment = environment; - this.apiContext = apiContext; this.nonVerifiedUserAuthenticationService = nonVerifiedUserAuthenticationService; - this.linkedInServiceProvider = new LinkedInServiceProvider(this.environment.getProperty("linkedin.login.clientId"), this.environment.getProperty("linkedin.login.clientSecret")); + this.linkedInCustomProvider = linkedInCustomProvider; } @Override public Principal validateToken(LoginInfo credentials) { - AccessGrant accessGrant = this.linkedInServiceProvider.getOAuthOperations().exchangeForAccess(credentials.getTicket(), this.environment.getProperty("linkedin.login.redirect_uri"), null); + /*AccessGrant accessGrant = this.linkedInServiceProvider.getOAuthOperations().exchangeForAccess(credentials.getTicket(), this.environment.getProperty("linkedin.login.redirect_uri"), null); LinkedIn linkedInService = this.linkedInServiceProvider.getApi(accessGrant.getAccessToken()); LinkedInProfile linkedInProfile = linkedInService.profileOperations().getUserProfile(); LoginProviderUser user = new LoginProviderUser(); @@ -48,7 +44,24 @@ public class LinkedInTokenValidator implements TokenValidator { user.setAvatarUrl(linkedInProfile.getProfilePictureUrl()); user.setName(linkedInProfile.getFirstName() + " " + linkedInProfile.getLastName()); user.setProvider(TokenValidatorFactoryImpl.LoginProvider.LINKEDIN); - user.setSecret(accessGrant.getAccessToken()); + user.setSecret(accessGrant.getAccessToken());*/ + + LinkedInUser linkedInUser = this.linkedInCustomProvider.getUser(credentials.getTicket()); + if (linkedInUser.getEmail() == null) + throw new UnauthorisedException("Cannot login user.LinkedIn account did not provide email"); + LoginProviderUser user = new LoginProviderUser(); + user.setId(linkedInUser.getId()); + user.setName(linkedInUser.getName()); + user.setEmail(linkedInUser.getEmail()); + user.setProvider(credentials.getProvider()); + user.setSecret(credentials.getTicket()); + return this.nonVerifiedUserAuthenticationService.Touch(user); } + + public LinkedInResponseToken getAccessToken(LinkedInRequest linkedInRequest) { + return this.linkedInCustomProvider.getAccessToken( + linkedInRequest.getCode(), this.environment.getProperty("linkedin.login.redirect_uri"), + this.environment.getProperty("linkedin.login.clientId"), this.environment.getProperty("linkedin.login.clientSecret")); + } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/linkedin/helpers/LinkedInRequest.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/linkedin/helpers/LinkedInRequest.java new file mode 100644 index 000000000..a03bb9fe1 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/linkedin/helpers/LinkedInRequest.java @@ -0,0 +1,12 @@ +package eu.eudat.logic.security.validators.linkedin.helpers; + +public class LinkedInRequest { + 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/linkedin/helpers/LinkedInResponseToken.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/linkedin/helpers/LinkedInResponseToken.java new file mode 100644 index 000000000..f39776e48 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/linkedin/helpers/LinkedInResponseToken.java @@ -0,0 +1,21 @@ +package eu.eudat.logic.security.validators.linkedin.helpers; + +public class LinkedInResponseToken { + + private String accessToken; + private Integer expiresIn; + + 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; + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/openaire/OpenAIRETokenValidator.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/openaire/OpenAIRETokenValidator.java new file mode 100644 index 000000000..74981af98 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/openaire/OpenAIRETokenValidator.java @@ -0,0 +1,52 @@ +package eu.eudat.logic.security.validators.openaire; + +import eu.eudat.exceptions.security.NonValidTokenException; +import eu.eudat.exceptions.security.NullEmailException; +import eu.eudat.logic.security.customproviders.OpenAIRE.OpenAIRECustomProvider; +import eu.eudat.logic.security.customproviders.OpenAIRE.OpenAIREUser; +import eu.eudat.logic.security.validators.TokenValidator; +import eu.eudat.logic.security.validators.openaire.helpers.OpenAIRERequest; +import eu.eudat.logic.security.validators.openaire.helpers.OpenAIREResponseToken; +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.core.env.Environment; +import org.springframework.stereotype.Component; + +import java.io.IOException; +import java.security.GeneralSecurityException; + +@Component("openAIRETokenValidator") +public class OpenAIRETokenValidator implements TokenValidator { + + private Environment environment; + private AuthenticationService nonVerifiedUserAuthenticationService; + private OpenAIRECustomProvider openAIRECustomProvider; + + public OpenAIRETokenValidator(Environment environment, AuthenticationService nonVerifiedUserAuthenticationService, OpenAIRECustomProvider openAIRECustomProvider) { + this.environment = environment; + this.nonVerifiedUserAuthenticationService = nonVerifiedUserAuthenticationService; + this.openAIRECustomProvider = openAIRECustomProvider; + } + + public OpenAIREResponseToken getAccessToken(OpenAIRERequest openAIRERequest) { + return this.openAIRECustomProvider.getAccessToken( + openAIRERequest.getCode(), this.environment.getProperty("openaire.login.redirect_uri"), + this.environment.getProperty("openaire.login.client_id"), this.environment.getProperty("openaire.login.client_secret") + ); + } + + @Override + public Principal validateToken(LoginInfo credentials) throws NonValidTokenException, IOException, GeneralSecurityException, NullEmailException { + OpenAIREUser openAIREUser = this.openAIRECustomProvider.getUser(credentials.getTicket()); + LoginProviderUser user = new LoginProviderUser(); + user.setId(openAIREUser.getId()); + user.setEmail(openAIREUser.getEmail()); + user.setName(openAIREUser.getName()); + user.setProvider(credentials.getProvider()); + user.setSecret(credentials.getTicket()); + + return this.nonVerifiedUserAuthenticationService.Touch(user); + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/openaire/helpers/OpenAIRERequest.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/openaire/helpers/OpenAIRERequest.java new file mode 100644 index 000000000..928ef2b55 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/openaire/helpers/OpenAIRERequest.java @@ -0,0 +1,12 @@ +package eu.eudat.logic.security.validators.openaire.helpers; + +public class OpenAIRERequest { + 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/openaire/helpers/OpenAIREResponseToken.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/openaire/helpers/OpenAIREResponseToken.java new file mode 100644 index 000000000..372a3482e --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/openaire/helpers/OpenAIREResponseToken.java @@ -0,0 +1,20 @@ +package eu.eudat.logic.security.validators.openaire.helpers; + +public class OpenAIREResponseToken { + private String accessToken; + private Integer expiresIn; + + 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; + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/orcid/ORCIDTokenValidator.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/orcid/ORCIDTokenValidator.java index 8d365a052..b87ac2cbd 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/orcid/ORCIDTokenValidator.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/validators/orcid/ORCIDTokenValidator.java @@ -7,7 +7,6 @@ import eu.eudat.logic.security.customproviders.ORCID.ORCIDUser; import eu.eudat.logic.security.validators.TokenValidator; import eu.eudat.logic.security.validators.orcid.helpers.ORCIDRequest; import eu.eudat.logic.security.validators.orcid.helpers.ORCIDResponseToken; -import eu.eudat.logic.services.ApiContext; import eu.eudat.logic.services.operations.authentication.AuthenticationService; import eu.eudat.models.data.login.LoginInfo; import eu.eudat.models.data.loginprovider.LoginProviderUser; @@ -25,14 +24,12 @@ public class ORCIDTokenValidator implements TokenValidator { private ORCIDCustomProvider orcidCustomProvider; private Environment environment; private AuthenticationService nonVerifiedUserAuthenticationService; - private ApiContext apiContext; @Autowired - public ORCIDTokenValidator(Environment environment, AuthenticationService nonVerifiedUserAuthenticationService, ORCIDCustomProvider orcidCustomProvider, ApiContext apiContext) { + public ORCIDTokenValidator(Environment environment, AuthenticationService nonVerifiedUserAuthenticationService, ORCIDCustomProvider orcidCustomProvider) { this.environment = environment; this.nonVerifiedUserAuthenticationService = nonVerifiedUserAuthenticationService; this.orcidCustomProvider = orcidCustomProvider; - this.apiContext = apiContext; } @Override 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 edd24cae1..88aba641f 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 @@ -5,7 +5,6 @@ import eu.eudat.exceptions.security.NullEmailException; import eu.eudat.exceptions.security.UnauthorisedException; import eu.eudat.logic.security.validators.TokenValidator; import eu.eudat.logic.security.validators.TokenValidatorFactoryImpl; -import eu.eudat.logic.services.ApiContext; import eu.eudat.logic.services.operations.authentication.AuthenticationService; import eu.eudat.models.data.login.LoginInfo; import eu.eudat.models.data.loginprovider.LoginProviderUser; @@ -28,14 +27,12 @@ import java.util.Map; public class TwitterTokenValidator implements TokenValidator { private Environment environment; - private ApiContext apiContext; private AuthenticationService nonVerifiedUserAuthenticationService; private TwitterServiceProvider twitterServiceProvider; @Autowired - public TwitterTokenValidator(ApiContext apiContext, Environment environment, AuthenticationService nonVerifiedUserAuthenticationService) { + public TwitterTokenValidator(Environment environment, AuthenticationService nonVerifiedUserAuthenticationService) { this.environment = environment; - this.apiContext = apiContext; this.nonVerifiedUserAuthenticationService = nonVerifiedUserAuthenticationService; this.twitterServiceProvider = new TwitterServiceProvider(this.environment.getProperty("twitter.login.clientId"), this.environment.getProperty("twitter.login.clientSecret")); } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/types/ParagraphStyle.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/types/ParagraphStyle.java index c908ca0b1..ba104013d 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/types/ParagraphStyle.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/types/ParagraphStyle.java @@ -4,7 +4,7 @@ package eu.eudat.logic.utilities.documents.types; * Created by ikalyvas on 2/26/2018. */ public enum ParagraphStyle { - TEXT(0), HEADER1(1), HEADER2(2), HEADER3(3), HEADER4(4), TITLE(5), FOOTER(6), COMMENT(7); + TEXT(0), HEADER1(1), HEADER2(2), HEADER3(3), HEADER4(4), TITLE(5), FOOTER(6), COMMENT(7), HEADER5(8), HEADER6(9); private Integer value; @@ -34,6 +34,10 @@ public enum ParagraphStyle { return FOOTER; case 7: return COMMENT; + case 8: + return HEADER5; + case 9: + return HEADER6; default: throw new RuntimeException("Unsupported ParagraphStyle Code"); } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java index 657946e0a..f8733633a 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java @@ -25,10 +25,8 @@ import java.math.BigInteger; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; -/** - * Created by ikalyvas on 2/26/2018. - */ public class WordBuilder { private Map> options = new HashMap<>(); @@ -46,7 +44,7 @@ public class WordBuilder { XWPFParagraph paragraph = mainDocumentPart.createParagraph(); XWPFRun run = paragraph.createRun(); if (item != null) - run.setText(" " + item); + run.setText(" " + item); run.setFontSize(11); return paragraph; }); @@ -65,8 +63,9 @@ public class WordBuilder { paragraph.setStyle("Heading1"); XWPFRun run = paragraph.createRun(); run.setText(item); - run.setBold(true); - run.setFontSize(12); +// run.setBold(true); +// run.setFontSize(12); +// run.setStyle("0"); return paragraph; }); this.options.put(ParagraphStyle.HEADER2, (mainDocumentPart, item) -> { @@ -74,8 +73,8 @@ public class WordBuilder { paragraph.setStyle("Heading2"); XWPFRun run = paragraph.createRun(); run.setText(" " + item); - run.setBold(true); - run.setFontSize(12); +// run.setBold(true); +// run.setFontSize(12); return paragraph; }); this.options.put(ParagraphStyle.HEADER3, (mainDocumentPart, item) -> { @@ -83,8 +82,29 @@ public class WordBuilder { paragraph.setStyle("Heading3"); XWPFRun run = paragraph.createRun(); run.setText(" " + item); - run.setBold(true); - run.setFontSize(11); +// run.setBold(true); +// run.setFontSize(11); + return paragraph; + }); + this.options.put(ParagraphStyle.HEADER4, (mainDocumentPart, item) -> { + XWPFParagraph paragraph = mainDocumentPart.createParagraph(); + paragraph.setStyle("Heading4"); + XWPFRun run = paragraph.createRun(); + run.setText(item); + return paragraph; + }); + this.options.put(ParagraphStyle.HEADER5, (mainDocumentPart, item) -> { + XWPFParagraph paragraph = mainDocumentPart.createParagraph(); + paragraph.setStyle("Heading5"); + XWPFRun run = paragraph.createRun(); + run.setText(" " + item); + return paragraph; + }); + this.options.put(ParagraphStyle.HEADER6, (mainDocumentPart, item) -> { + XWPFParagraph paragraph = mainDocumentPart.createParagraph(); + paragraph.setStyle("Heading6"); + XWPFRun run = paragraph.createRun(); + run.setText(" " + item); return paragraph; }); this.options.put(ParagraphStyle.FOOTER, (mainDocumentPart, item) -> { @@ -96,7 +116,7 @@ public class WordBuilder { this.options.put(ParagraphStyle.COMMENT, (mainDocumentPart, item) -> { XWPFParagraph paragraph = mainDocumentPart.createParagraph(); XWPFRun run = paragraph.createRun(); - run.setText(" " + item); + run.setText(item); run.setItalic(true); return paragraph; }); @@ -114,7 +134,7 @@ public class WordBuilder { public void createPages(List datasetProfilePages, XWPFDocument mainDocumentPart, Boolean createListing, VisibilityRuleService visibilityRuleService) { datasetProfilePages.forEach(item -> { - createSections(item.getSections(), mainDocumentPart, ParagraphStyle.HEADER1, 0, createListing, visibilityRuleService); + createSections(item.getSections(), mainDocumentPart, ParagraphStyle.HEADER4, 0, createListing, visibilityRuleService); }); } @@ -127,7 +147,7 @@ public class WordBuilder { CTDecimalNumber number = paragraph.getCTP().getPPr().getNumPr().addNewIlvl(); number.setVal(BigInteger.valueOf(indent)); } - createSections(section.getSections(), mainDocumentPart, ParagraphStyle.HEADER2, 1, createListing, visibilityRuleService); + createSections(section.getSections(), mainDocumentPart, ParagraphStyle.HEADER5, 1, createListing, visibilityRuleService); createCompositeFields(section.getCompositeFields(), mainDocumentPart, 2, createListing, visibilityRuleService); } }); @@ -138,12 +158,12 @@ public class WordBuilder { compositeFields.forEach(compositeField -> { if (visibilityRuleService.isElementVisible(compositeField.getId()) && hasVisibleFields(compositeField, visibilityRuleService)) { if (compositeField.getTitle() != null && !compositeField.getTitle().isEmpty() && !createListing) { - XWPFParagraph paragraph = addParagraphContent(compositeField.getNumbering() + " " + compositeField.getTitle(), mainDocumentPart, ParagraphStyle.HEADER3, numId); + XWPFParagraph paragraph = addParagraphContent(compositeField.getNumbering() + " " + compositeField.getTitle(), mainDocumentPart, ParagraphStyle.HEADER6, numId); CTDecimalNumber number = paragraph.getCTP().getPPr().getNumPr().addNewIlvl(); number.setVal(BigInteger.valueOf(indent)); } createFields(compositeField.getFields(), mainDocumentPart, 3, createListing, visibilityRuleService); - if (!compositeField.getMultiplicityItems().isEmpty()) { + if (compositeField.getMultiplicityItems() != null && !compositeField.getMultiplicityItems().isEmpty()) { for (FieldSet multiplicityFieldset : compositeField.getMultiplicityItems()) { createFields(multiplicityFieldset.getFields(), mainDocumentPart, 3, createListing, visibilityRuleService); } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/helpers/ListHelper.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/helpers/ListHelper.java new file mode 100644 index 000000000..8857e4481 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/helpers/ListHelper.java @@ -0,0 +1,17 @@ +package eu.eudat.logic.utilities.helpers; + +import org.springframework.stereotype.Component; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Function; +import java.util.function.Predicate; + +@Component +public class ListHelper { + + public Predicate distinctByKey(Function keyExtractor) { + Map seen = new ConcurrentHashMap<>(); + return t -> seen.putIfAbsent(keyExtractor.apply(t), Boolean.TRUE) == null; + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/Field.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/Field.java index 5e96bf6f6..7903a4ddc 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/Field.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/Field.java @@ -43,6 +43,7 @@ public class Field implements ViewStyleDefinition getValidations() { return this.validations.stream().map(item -> (int) item.getValue()).collect(Collectors.toList()); } - public void setValidations(List validations) { this.validations = ValidationType.fromIntegers(validations); } @@ -145,6 +141,7 @@ public class Field implements ViewStyleDefinition getFields() { return fields; } - public void setFields(List fields) { this.fields = fields; } @@ -30,7 +29,6 @@ public class FieldSet implements Comparable, ViewStyleDefinition viewStylefields = new ModelBuilder().toViewStyleDefinition(this.fields, eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field.class); - item.setFields(viewStylefields); + List viewStyleFields = new ModelBuilder().toViewStyleDefinition(this.fields, eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field.class); + item.setFields(viewStyleFields); item.setId(this.id); item.setDescription(this.description); item.setTitle(this.title); @@ -108,6 +98,7 @@ public class FieldSet implements Comparable, ViewStyleDefinition { root.setAttribute("url", this.url); root.setAttribute("optionsRoot", this.optionsRoot); - root.setAttribute("multiAutoComplete", this.multiAutoComplete.toString()); + if (this.multiAutoComplete != null) + root.setAttribute("multiAutoComplete", this.multiAutoComplete.toString()); Element element = doc.createElement("option"); element.setAttribute("label", this.autoCompleteOptions.getLabel()); element.setAttribute("value", autoCompleteOptions.getValue()); diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/datarepository/DataRepositoryModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/datarepository/DataRepositoryModel.java index 6a5984ed9..200bf2d78 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/datarepository/DataRepositoryModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/datarepository/DataRepositoryModel.java @@ -1,6 +1,8 @@ package eu.eudat.models.data.datarepository; +import com.fasterxml.jackson.annotation.JsonProperty; import eu.eudat.data.entities.DataRepository; +import eu.eudat.data.entities.UserInfo; import eu.eudat.models.DataModel; import java.util.Date; @@ -10,17 +12,20 @@ import java.util.UUID; * Created by ikalyvas on 9/3/2018. */ public class DataRepositoryModel implements DataModel { - public UUID id; - public String label; - public String abbreviation; - public String uri; - public Date created; - public Date modified; + private UUID id; + @JsonProperty("name") + private String label; + private String pid; + private String abbreviation; + private String uri; + private Date created; + private Date modified; + private String tag; // Api fetching the data + private String source; // Actual harvested source public UUID getId() { return id; } - public void setId(UUID id) { this.id = id; } @@ -28,15 +33,20 @@ public class DataRepositoryModel implements DataModel()); + entity.setRegistries(new HashSet<>()); for (Registry registry : this.registries) { entity.getRegistries().add(registry.toDataModel()); } } if (this.dataRepositories != null && !this.dataRepositories.isEmpty()) { - entity.setDatasetDataRepositories(new HashSet()); + entity.setDatasetDataRepositories(new HashSet<>()); for (DataRepository dataRepositoryModel : this.dataRepositories) { eu.eudat.data.entities.DataRepository dataRepository = dataRepositoryModel.toDataModel(); DatasetDataRepository datasetDataRepository = new DatasetDataRepository(); @@ -224,7 +224,7 @@ public class DatasetWizardModel implements DataModel()); + entity.setServices(new HashSet<>()); for (Service serviceModel : this.services) { eu.eudat.data.entities.Service service = serviceModel.toDataModel(); DatasetService datasetService = new DatasetService(); @@ -234,7 +234,7 @@ public class DatasetWizardModel implements DataModel()); + entity.setDatasetExternalDatasets(new HashSet<>()); for (ExternalDatasetListingModel externalDataset : this.externalDatasets) { ExternalDataset externalDatasetEntity = externalDataset.toDataModel(); DatasetExternalDataset datasetExternalDataset = new DatasetExternalDataset(); diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java index 86ed120b7..8a9d283e9 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java @@ -268,9 +268,9 @@ public class DataManagementPlanEditorModel implements DataModel(this.organisations.stream().map(item -> item.toDataModel()).collect(Collectors.toList()))); + dataManagementPlanEntity.setOrganisations(new HashSet<>(this.organisations.stream().map(Organisation::toDataModel).collect(Collectors.toList()))); if (this.researchers != null && !this.researchers.isEmpty()) - dataManagementPlanEntity.setResearchers(new HashSet<>(this.researchers.stream().map(item -> item.toDataModel()).collect(Collectors.toList()))); + dataManagementPlanEntity.setResearchers(new HashSet<>(this.researchers.stream().map(Researcher::toDataModel).collect(Collectors.toList()))); dataManagementPlanEntity.setVersion(this.version); dataManagementPlanEntity.setLabel(this.label); if (this.grant != null) { @@ -293,13 +293,13 @@ public class DataManagementPlanEditorModel implements DataModel { private String id; private int ordinal; + private String rdaCommonStandard; private String numbering; private ViewStyle viewStyle; private DefaultValue defaultValue; @@ -28,7 +29,6 @@ public class Field implements DatabaseViewStyleDefinition, XmlSerializable getValidations() { return validations; } - public void setValidations(List validations) { this.validations = validations; } @@ -84,7 +85,6 @@ public class Field implements DatabaseViewStyleDefinition, XmlSerializable getFields() { return fields; } - public void setFields(List fields) { this.fields = fields; } @@ -35,7 +34,6 @@ public class FieldSet implements DatabaseViewStyleDefinition, XmlSerializable { +public class ExternalDatasetSourcesModel extends ExternalListingItem { @Override - public ExternalDatasetModel fromExternalItem(List> values) { + public ExternalDatasetSourcesModel fromExternalItem(List> values) { for (Map item : values) { ExternalSourcesItemModel model = new ExternalSourcesItemModel(); model.setId(item.get("pid")); model.setUri(item.get("uri")); model.setName(item.get("name")); + model.setSource(item.get("source")); this.add(model); } return this; diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ExternalSourcesItemModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ExternalSourcesItemModel.java index 521563627..cc35ff289 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ExternalSourcesItemModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ExternalSourcesItemModel.java @@ -3,6 +3,7 @@ package eu.eudat.models.data.external; public class ExternalSourcesItemModel { private String id; + private String pid; private String name; private String description; private String uri; @@ -14,15 +15,20 @@ public class ExternalSourcesItemModel { public String getId() { return id; } - public void setId(String id) { this.id = id; } + public String getPid() { + return pid; + } + public void setPid(String pid) { + this.pid = pid; + } + public String getName() { return name; } - public void setName(String name) { this.name = name; } @@ -30,7 +36,6 @@ public class ExternalSourcesItemModel { public String getDescription() { return description; } - public void setDescription(String description) { this.description = description; } @@ -38,7 +43,6 @@ public class ExternalSourcesItemModel { public String getUri() { return uri; } - public void setUri(String uri) { this.uri = uri; } @@ -46,7 +50,6 @@ public class ExternalSourcesItemModel { public String getRemoteId() { return remoteId; } - public void setRemoteId(String remoteId) { this.remoteId = remoteId; } @@ -54,7 +57,6 @@ public class ExternalSourcesItemModel { public String getAbbreviation() { return abbreviation; } - public void setAbbreviation(String abbreviation) { this.abbreviation = abbreviation; } @@ -62,7 +64,6 @@ public class ExternalSourcesItemModel { public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } @@ -70,7 +71,6 @@ public class ExternalSourcesItemModel { public String getSource() { return source; } - public void setSource(String source) { this.source = source; } diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/FundersExternalSourcesModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/FundersExternalSourcesModel.java index 794d5c2dd..5526a5552 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/FundersExternalSourcesModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/FundersExternalSourcesModel.java @@ -13,6 +13,7 @@ public class FundersExternalSourcesModel extends ExternalListingItem{ +public class ProjectsExternalSourcesModel extends ExternalListingItem { + private static final ObjectMapper mapper = new ObjectMapper(); + @Override public ProjectsExternalSourcesModel fromExternalItem(List> values) { for (Map item : values) { ExternalSourcesItemModel model = new ExternalSourcesItemModel(); - model.setRemoteId(item.get("pid")); - model.setUri(item.get("uri")); - model.setName(item.get("name")); - model.setDescription(item.get("description")); - model.setTag(item.get("tag")); - this.add(model); + try { + JsonNode node = mapper.readTree(mapper.writeValueAsBytes(item)); + JsonNode name = node.get("name"); + if (name != null && !name.isNull() && name.isObject()) { + model.setName(node.get("name").get("$").asText()); + } else { + model.setName(item.get("name")); + } + + JsonNode pid = node.get("pid"); + if (pid != null && !pid.isNull() && pid.isObject()) { + model.setRemoteId(node.get("pid").get("$").asText()); + } else { + model.setRemoteId(item.get("pid")); + } + + JsonNode uri = node.get("uri"); + if (uri != null && !uri.isNull() && uri.isObject()) { + model.setUri(node.get("uri").get("$").asText()); + } else { + model.setUri(item.get("uri")); + } + + JsonNode description = node.get("description"); + if (description != null && !description.isNull() && description.isObject()) { + model.setDescription(node.get("description").get("$").asText()); + } else { + model.setDescription(item.get("description")); + } + + JsonNode tag = node.get("tag"); + if (tag != null && !tag.isNull() && tag.isObject()) { + model.setTag(node.get("tag").get("$").asText()); + } else { + model.setTag(item.get("tag")); + } + + this.add(model); + + } catch (IOException e) { + e.printStackTrace(); + } } return this; } diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/externaldataset/ExternalDatasetListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/externaldataset/ExternalDatasetListingModel.java index 5b5472ced..2ffc2c525 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/externaldataset/ExternalDatasetListingModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/externaldataset/ExternalDatasetListingModel.java @@ -10,34 +10,35 @@ import java.util.UUID; public class ExternalDatasetListingModel implements DataModel { private UUID id; - private String label; + private String name; private String abbreviation; private String reference; private Date created; private Date modified; private String info; private ExternalDatasetType type; + private String pid; + private String uri; + private String tag; // Api fetching the data + private String source; // Actual harvested source public UUID getId() { return id; } - public void setId(UUID id) { this.id = id; } - public String getLabel() { - return label; + public String getName() { + return name; } - - public void setLabel(String label) { - this.label = label; + public void setName(String name) { + this.name = name; } public String getAbbreviation() { return abbreviation; } - public void setAbbreviation(String abbreviation) { this.abbreviation = abbreviation; } @@ -45,7 +46,6 @@ public class ExternalDatasetListingModel implements DataModel { public UUID id; public String label; public String abbreviation; public Date created; public Date modified; + private String source; public UUID getId() { return id; } - public void setId(UUID id) { this.id = id; } @@ -27,7 +25,6 @@ public class ExternalDatasetModel implements DataModel entity.setId(this.id); entity.setLabel(this.label); entity.setType(this.type); - entity.setReference(this.reference == null ? "dmp:" + this.label : this.reference); + entity.setReference(this.reference == null ? "dmp:" + this.label : this.source.toLowerCase() + ":" + this.reference); entity.setDefinition(this.definition); entity.setCreated(this.created == null ? new Date() : this.created); entity.setStatus(this.status != null ? this.getStatus() : eu.eudat.data.entities.Grant.Status.ACTIVE.getValue()); diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/Grant.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/Grant.java index 2cb1d6b0c..f8cde3ca3 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/Grant.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/Grant.java @@ -189,7 +189,7 @@ public class Grant implements DataModel { entity.setAbbreviation(this.abbreviation); entity.setLabel(this.label); entity.setType(this.type); - entity.setReference(this.reference == null ? "dmp:" + this.label : this.reference); + entity.setReference(this.reference == null ? "dmp:" + this.label : this.source.toLowerCase() + ":" + this.reference); entity.setUri(this.uri); entity.setDefinition(this.definition); entity.setStartdate(this.startDate); diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanListingModel.java index 8cc675975..bfb8bf1cc 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanListingModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanListingModel.java @@ -183,6 +183,14 @@ public class DataManagementPlanListingModel implements DataModel new AssociatedProfile().fromData(item)).collect(Collectors.toList()); + return this; + } + public DataManagementPlanListingModel fromDataModelDatasets(DMP entity) { this.fromDataModel(entity); this.status = entity.getStatus(); diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java index 6aac4b997..d1cd16647 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java @@ -27,6 +27,7 @@ public class DatasetListingModel implements DataModel new DataRepository().fromDataModel(item.getDataRepository())).collect(Collectors.toList())); this.services = LabelBuilder.getLabel(entity.getServices().stream().map(item -> new Service().fromDataModel(item.getService())).collect(Collectors.toList())); this.finalizedAt = entity.getFinalizedAt(); + this.dmpPublishedAt = entity.getDmp().getPublishedAt(); return this; } 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 098f27875..fe9da0885 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 @@ -176,7 +176,7 @@ public class Project implements DataModel metadata; + + public DatasetIdRDAExportModel getDataset_id() { + return dataset_id; + } + public void setDataset_id(DatasetIdRDAExportModel dataset_id) { + this.dataset_id = dataset_id; + } + + public String getDescription() { + return description; + } + public void setDescription(String description) { + this.description = description; + } + + public Date getIssued() { + return issued; + } + public void setIssued(Date issued) { + this.issued = issued; + } + + public String getLanguage() { + return language; + } + public void setLanguage(String language) { + this.language = language; + } + + public String getTitle() { + return title; + } + public void setTitle(String title) { + this.title = title; + } + + public String getSensitive_data() { + return sensitive_data; + } + public void setSensitive_data(String sensitive_data) { + this.sensitive_data = sensitive_data; + } + + public String getData_quality_assurance() { + return data_quality_assurance; + } + public void setData_quality_assurance(String data_quality_assurance) { + this.data_quality_assurance = data_quality_assurance; + } + + public List getMetadata() { + return metadata; + } + public void setMetadata(List metadata) { + this.metadata = metadata; + } + + + public DatasetRDAExportModel fromDataModel(Dataset dataset) { + // Parsing dataset template definition to create a map of which question of the template corresponds to the RDA common standard. Map: TemplateId -> rdaProperty + List rdaPropertiesThatExistOnDatasetTemplate = xmlNodeListFromExpression(dataset.getProfile().getDefinition(), "//rdaCommonStandard/text()"); + List rdaProperties = new LinkedList<>(); + for (String item : rdaPropertiesThatExistOnDatasetTemplate) { + item = item.replace("dataset.", ""); + rdaProperties.add(item); + } + List datasetTemplateIdsWithRdaProperties = xmlNodeListFromExpression(dataset.getProfile().getDefinition(), "//rdaCommonStandard/text()/ancestor::field/@id"); + Map templateIdsToRDAProperties = combineListsIntoOrderedMap(datasetTemplateIdsWithRdaProperties, rdaProperties); + + // Parsing dataset answers from json to map. Map: TemplateId -> datasetValue + JSONObject jObject = new JSONObject(dataset.getProperties()); + Map templateIdsToValues = jObject.toMap(); + + // Map: rdaProperty -> datasetValue + MultiValuedMap rdaToValueMap = new ArrayListValuedHashMap<>(); + for (String templateId : templateIdsToRDAProperties.keySet()) { + if (templateIdsToValues.containsKey(templateId)) { + rdaToValueMap.put(templateIdsToRDAProperties.get(templateId), templateIdsToValues.get(templateId).toString()); + } + } + + // Creates and fills a map to include metadata keys and values. + MultiValuedMap metadataJsonMap = new ArrayListValuedHashMap<>(); + for (String key : rdaToValueMap.keySet()) { + if (key.startsWith("metadata.")) { + metadataJsonMap.putAll(key.replace("metadata.", ""), rdaToValueMap.get(key)); + } + } + // Removes metadata keys from rdaToValueMap. + for (String metadataKey : metadataJsonMap.keySet()) rdaToValueMap.remove(metadataKey); + + DatasetRDAExportModel datasetRDAExportModel = mapper.convertValue(rdaToValueMap, DatasetRDAExportModel.class); + datasetRDAExportModel.setTitle(dataset.getLabel()); + datasetRDAExportModel.setIssued(dataset.getCreated()); + datasetRDAExportModel.setLanguage("en"); // mock data; + datasetRDAExportModel.setDataset_id(new DatasetIdRDAExportModel(dataset.getId().toString(), "argos_internal")); + + List datasetMetadataRDAExportModels = new LinkedList<>(); + for (String key : metadataJsonMap.keySet()) { + for (String value : metadataJsonMap.get(key)) { + datasetMetadataRDAExportModels.add(new DatasetMetadataRDAExportModel().fromDataModel(key,value)); + } + } + datasetRDAExportModel.setMetadata(datasetMetadataRDAExportModels); + + return datasetRDAExportModel; + } + + private List xmlNodeListFromExpression(String xml, String expression) { + List valuesList = new LinkedList<>(); + Document document = XmlBuilder.fromXml(xml); + XPathFactory xpathFactory = XPathFactory.newInstance(); + XPath xpath = xpathFactory.newXPath(); + try { + XPathExpression expr = xpath.compile(expression); + NodeList nodeList = (NodeList) expr.evaluate(document, XPathConstants.NODESET); + for (int i = 0; i < nodeList.getLength(); i++) { + Node node = nodeList.item(i); + valuesList.add(node.getNodeValue()); + } + } catch (XPathExpressionException e) { + e.printStackTrace(); + } + + return valuesList; + } + + private Map combineListsIntoOrderedMap (List keys, List values) { + if (keys.size() != values.size()) + throw new IllegalArgumentException ("Cannot combine lists with dissimilar sizes"); + Map map = new LinkedHashMap<>(); + for (int i=0; i x.getRole().equals(UserDMP.UserDMPRoles.OWNER.getValue())).findFirst().get().getUser()); + // Mock up data on "language" and "ethical_issues" for now. this.language = "en"; - this.ethical_issues_exist = "no"; + this.ethical_issues_exist = "unknown"; + + this.project = new ProjectRDAExportModel().fromDataModel(entity.getGrant()); return this; } diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/rda/FunderIdRDAExportModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/rda/FunderIdRDAExportModel.java new file mode 100644 index 000000000..d58abeb5f --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/rda/FunderIdRDAExportModel.java @@ -0,0 +1,25 @@ +package eu.eudat.models.data.rda; + +public class FunderIdRDAExportModel { + private String funder_id; + private String funder_id_type; + + public String getFunder_id() { + return funder_id; + } + public void setFunder_id(String funder_id) { + this.funder_id = funder_id; + } + + public String getFunder_id_type() { + return funder_id_type; + } + public void setFunder_id_type(String funder_id_type) { + this.funder_id_type = funder_id_type; + } + + FunderIdRDAExportModel(String funder_id, String funder_id_type) { + this.funder_id = funder_id; + this.funder_id_type = funder_id_type; + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/rda/FundingRDAExportModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/rda/FundingRDAExportModel.java new file mode 100644 index 000000000..0739b7766 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/rda/FundingRDAExportModel.java @@ -0,0 +1,42 @@ +package eu.eudat.models.data.rda; + +import eu.eudat.data.entities.Funder; +import eu.eudat.data.entities.Grant; + +public class FundingRDAExportModel { + private FunderIdRDAExportModel funder_id; + private GrantIdRDAExportModel grant_id; + private String funding_status; + + public FunderIdRDAExportModel getFunder_id() { + return funder_id; + } + public void setFunder_id(FunderIdRDAExportModel funder_id) { + this.funder_id = funder_id; + } + + public GrantIdRDAExportModel getGrant_id() { + return grant_id; + } + public void setGrant_id(GrantIdRDAExportModel grant_id) { + this.grant_id = grant_id; + } + + public String getFunding_status() { + return funding_status; + } + public void setFunding_status(String funding_status) { + this.funding_status = funding_status; + } + + public FundingRDAExportModel fromDataModel(Funder funder, Grant grant) { + this.funding_status = "planned"; // mock data + if (funder != null) { + this.funder_id = new FunderIdRDAExportModel(funder.getReference(), "argos_internal"); + } + if (grant != null) { + this.grant_id = new GrantIdRDAExportModel(grant.getReference(), "argos_internal"); + } + return this; + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/rda/GrantIdRDAExportModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/rda/GrantIdRDAExportModel.java new file mode 100644 index 000000000..8bcac2735 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/rda/GrantIdRDAExportModel.java @@ -0,0 +1,25 @@ +package eu.eudat.models.data.rda; + +public class GrantIdRDAExportModel { + private String grant_id; + private String grant_id_type; + + public String getGrant_id() { + return grant_id; + } + public void setGrant_id(String grant_id) { + this.grant_id = grant_id; + } + + public String getGrant_id_type() { + return grant_id_type; + } + public void setGrant_id_type(String grant_id_type) { + this.grant_id_type = grant_id_type; + } + + GrantIdRDAExportModel(String grant_id, String grant_id_type) { + this.grant_id = grant_id; + this.grant_id_type = grant_id_type; + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/rda/ProjectRDAExportModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/rda/ProjectRDAExportModel.java new file mode 100644 index 000000000..2d5b1912a --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/rda/ProjectRDAExportModel.java @@ -0,0 +1,54 @@ +package eu.eudat.models.data.rda; + +import eu.eudat.data.entities.Grant; + +import java.util.Date; + +public class ProjectRDAExportModel { + private String title; + private String description; + private Date project_start; + private Date project_end; + private FundingRDAExportModel funding; + + public String getTitle() { + return title; + } + public void setTitle(String title) { + this.title = title; + } + + public String getDescription() { + return description; + } + public void setDescription(String description) { + this.description = description; + } + + public Date getProject_start() { + return project_start; + } + public void setProject_start(Date project_start) { + this.project_start = project_start; + } + + public Date getProject_end() { + return project_end; + } + public void setProject_end(Date project_end) { + this.project_end = project_end; + } + + public FundingRDAExportModel getFunding() { + return funding; + } + public void setFunding(FundingRDAExportModel funding) { + this.funding = funding; + } + + + public ProjectRDAExportModel fromDataModel(Grant grant) { + this.funding = new FundingRDAExportModel().fromDataModel(grant.getFunder(), grant); + return this; + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/rda/RDAExportModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/rda/RDAExportModel.java new file mode 100644 index 000000000..b4720d350 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/rda/RDAExportModel.java @@ -0,0 +1,36 @@ +package eu.eudat.models.data.rda; + +import eu.eudat.data.entities.DMP; +import eu.eudat.data.entities.Dataset; + +import java.util.LinkedList; +import java.util.List; + +public class RDAExportModel { + private DmpRDAExportModel dmp; + private List datasets; + + public DmpRDAExportModel getDmp() { + return dmp; + } + public void setDmp(DmpRDAExportModel dmp) { + this.dmp = dmp; + } + + public List getDatasets() { + return datasets; + } + public void setDatasets(List datasets) { + this.datasets = datasets; + } + + public RDAExportModel fromDataModel(DMP dmp) { + this.dmp = new DmpRDAExportModel().fromDataModel(dmp); + this.datasets = new LinkedList<>(); + for (Dataset dataset : dmp.getDataset()) { + if (dataset.getStatus() != Dataset.Status.DELETED.getValue() && dataset.getStatus() != Dataset.Status.CANCELED.getValue()) + this.datasets.add(new DatasetRDAExportModel().fromDataModel(dataset)); + } + return this; + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/registries/RegistryModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/registries/RegistryModel.java index ec33afb13..89906eb03 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/registries/RegistryModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/registries/RegistryModel.java @@ -1,34 +1,43 @@ package eu.eudat.models.data.registries; +import com.fasterxml.jackson.annotation.JsonProperty; import eu.eudat.data.entities.Registry; +import eu.eudat.data.entities.UserInfo; import eu.eudat.models.DataModel; import java.util.Date; +import java.util.Map; import java.util.UUID; -/** - * Created by ikalyvas on 9/3/2018. - */ public class RegistryModel implements DataModel { - public UUID id; - public String label; - public String abbreviation; - public String uri; - public Date created; - public Date modified; + private UUID id; + private String name; + private String label; + private String pid; + private String abbreviation; + private String uri; + private Date created; + private Date modified; + private String tag; // Api fetching the data + private String source; // Actual harvested source 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 getLabel() { return label; } - public void setLabel(String label) { this.label = label; } @@ -36,7 +45,6 @@ public class RegistryModel implements DataModel { public String getAbbreviation() { return abbreviation; } - public void setAbbreviation(String abbreviation) { this.abbreviation = abbreviation; } @@ -44,7 +52,6 @@ public class RegistryModel implements DataModel { public String getUri() { return uri; } - public void setUri(String uri) { this.uri = uri; } @@ -52,7 +59,6 @@ public class RegistryModel implements DataModel { public Date getCreated() { return created; } - public void setCreated(Date created) { this.created = created; } @@ -60,19 +66,46 @@ public class RegistryModel implements DataModel { public Date getModified() { return modified; } - public void setModified(Date modified) { this.modified = modified; } + public String getTag() { + return tag; + } + public void setTag(String tag) { + this.tag = tag; + } + + public String getPid() { + return pid; + } + public void setPid(String pid) { + this.pid = pid; + } + + public String getSource() { + return source; + } + public void setSource(String source) { + this.source = source; + } + @Override public RegistryModel fromDataModel(Registry entity) { this.id = entity.getId(); this.abbreviation = entity.getAbbreviation(); this.created = entity.getCreated(); this.label = entity.getLabel(); + this.name = entity.getLabel(); this.modified = entity.getModified(); this.uri = entity.getUri(); + String source1 = entity.getReference().substring(0, entity.getReference().indexOf(":")); + if (source1.equals("dmp")) { + this.source = "Internal"; + } else { + this.source = source1; + } return this; } @@ -82,11 +115,17 @@ public class RegistryModel implements DataModel { registry.setAbbreviation(this.abbreviation); registry.setCreated(this.created != null ? this.created : new Date()); registry.setId(this.id != null ? this.id : UUID.randomUUID()); - registry.setLabel(this.label); + registry.setLabel(this.label != null ? this.label : this.name); registry.setUri(this.uri); registry.setModified(new Date()); - registry.setReference("dmpdata/" + registry.getId()); + if (this.source == null) this.source = "dmp"; + if (this.source.equals(registry.getId().toString().substring(0, this.source.length()))) { + registry.setReference(registry.getId().toString()); + } else { + registry.setReference(this.source + ":" + registry.getId()); + } registry.setStatus((short)0); + registry.setCreationUser(new UserInfo()); return registry; } diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/services/ServiceModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/services/ServiceModel.java index d518ac8eb..19359d350 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/services/ServiceModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/services/ServiceModel.java @@ -1,26 +1,28 @@ package eu.eudat.models.data.services; import eu.eudat.data.entities.Service; +import eu.eudat.data.entities.UserInfo; import eu.eudat.models.DataModel; import java.util.Date; import java.util.UUID; -/** - * Created by ikalyvas on 9/3/2018. - */ public class ServiceModel implements DataModel { - public UUID id; - public String label; - public String abbreviation; - public String uri; - public Date created; - public Date modified; + private UUID id; + private String label; + private String name; + private String pid; + private String abbreviation; + private String uri; + private Date created; + private Date modified; + private String reference; + private String tag; + private String source; public UUID getId() { return id; } - public void setId(UUID id) { this.id = id; } @@ -28,15 +30,27 @@ public class ServiceModel implements DataModel { public String getLabel() { return label; } - public void setLabel(String label) { this.label = label; } + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + + public String getPid() { + return pid; + } + public void setPid(String pid) { + this.pid = pid; + } + public String getAbbreviation() { return abbreviation; } - public void setAbbreviation(String abbreviation) { this.abbreviation = abbreviation; } @@ -44,7 +58,6 @@ public class ServiceModel implements DataModel { public String getUri() { return uri; } - public void setUri(String uri) { this.uri = uri; } @@ -52,7 +65,6 @@ public class ServiceModel implements DataModel { public Date getCreated() { return created; } - public void setCreated(Date created) { this.created = created; } @@ -60,19 +72,46 @@ public class ServiceModel implements DataModel { public Date getModified() { return modified; } - public void setModified(Date modified) { this.modified = modified; } + public String getReference() { + return reference; + } + public void setReference(String reference) { + this.reference = reference; + } + + public String getTag() { + return tag; + } + public void setTag(String tag) { + this.tag = tag; + } + + public String getSource() { + return source; + } + public void setSource(String source) { + this.source = source; + } + @Override public ServiceModel fromDataModel(Service entity) { this.abbreviation = entity.getAbbreviation(); this.created = entity.getCreated(); this.id = entity.getId(); this.label = entity.getLabel(); + this.name = entity.getLabel(); this.modified = entity.getModified(); this.uri = entity.getUri(); + String source = entity.getReference().substring(0, entity.getReference().indexOf(":")); + if (source.equals("dmp")) { + this.source = "Internal"; + } else { + this.source = source; + } return this; } @@ -82,12 +121,19 @@ public class ServiceModel implements DataModel { service.setId(this.id != null ? this.id : UUID.randomUUID()); service.setAbbreviation(this.abbreviation); service.setCreated(this.created != null ? this.created : new Date()); - service.setLabel(this.label); + service.setLabel(this.label != null ? this.label : this.name); service.setModified(new Date()); service.setUri(this.uri); - service.setReference("innerdata/" + service.getId()); + if (this.source == null) this.source = "dmp"; + if (this.reference == null) this.reference = service.getId().toString(); + if (this.source.equals(this.reference.substring(0, this.source.length()))) { + service.setReference(this.reference); + } else { + service.setReference(this.source + ":" + this.reference); + } service.setModified(new Date()); - service.setStatus((short)0); + service.setStatus((short) 0); + service.setCreationUser(new UserInfo()); return service; } diff --git a/dmp-backend/web/src/main/resources/ExternalUrls.xml b/dmp-backend/web/src/main/resources/ExternalUrls.xml index 4235a1b5c..d987d3fcc 100644 --- a/dmp-backend/web/src/main/resources/ExternalUrls.xml +++ b/dmp-backend/web/src/main/resources/ExternalUrls.xml @@ -6,46 +6,50 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + cristin + + 1 + External + https://eestore.paas2.uninett.no/api/metadataschema/?search={like}&page={page}&size={pageSize} + 1 + application/vnd.api+json; charset=utf-8 + + $['data'][*]['attributes'] + + 'pid' + 'name' + 'uri' + 'description' + 'source' + + + $['meta']['pagination']['page','pages','count'] + + - FIRST - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + cristin + + 1 + External + https://eestore.paas2.uninett.no/api/tags/?search={like}&page={page}&size={pageSize} + 1 + application/vnd.api+json; charset=utf-8 + + $['data'][*]['attributes'] + + 'pid' + 'name' + 'uri' + 'description' + + + $['meta']['pagination']['page','pages','count'] + + - FIRST - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - internal - - 1 - GrantInternalMockUpData.json - Internal + cristin + + 2 + https://eestore.paas2.uninett.no/api/projectrepo/?search={like}&page={page}&size={pageSize} + 1 + application/vnd.api+json; charset=utf-8 $['data'][*]['attributes'] @@ -175,56 +145,73 @@ $['meta']['pagination']['page','pages','count'] - + + openAIRE + + 1 + https://services.openaire.eu/search/v2/api/resources?query=((oaftype%20exact%20project)%20and%20((projectcode_nt%20exact%20%22{like}%22)or({like}))){funderQuery}&page={page}&size={pageSize}&format=json + &fq=(funder%20exact%20%22{funderId}%22) + 0 + application/json; charset=utf-8 + + $['results'][*]['result']['metadata']['oaf:entity']['oaf:project'] + + 'originalId' + 'title' + 'count' + + + $['meta']['pagination']['page','pages','count'] + + - FIRST - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - internal - + - FIRST - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + openAire + + 1 + External + https://eestore.paas2.uninett.no/api/projectrepo/?search={like}&page={page}&size={pageSize} + 1 + application/vnd.api+json; charset=utf-8 + + $['data'][*]['attributes'] + + 'pid' + 'name' + 'uri' + 'description' + 'source' + + + $['meta']['pagination']['page','pages','count'] + + + - FIRST - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + cristin + + 1 + External + https://eestore.paas2.uninett.no/api/datarepo/?search={like}&page={page}&size={pageSize} + 1 + application/vnd.api+json; charset=utf-8 + + $['data'][*]['attributes'] + + 'pid' + 'name' + 'uri' + 'description' + 'source' + + + $['meta']['pagination']['page','pages','count'] + + + + + FIRST + + + + + + + cristin + + 1 + External + https://eestore.paas2.uninett.no/api/servicerepo/?search={like}&page={page}&size={pageSize} + 1 + application/vnd.api+json; charset=utf-8 + + $['data'][*]['attributes'] + + 'pid' + 'name' + 'uri' + 'description' + 'source' + + + $['meta']['pagination']['page','pages','count'] + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - internal 1 Internal - ServicesInternalMockUpData.json + mockData/ServicesInternalMockUpData.json $['data'][*]['attributes'] @@ -417,55 +531,42 @@ $['meta']['pagination']['page','pages','count'] - + --> - FIRST - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - internal - + cristin + 1 - Internal - ResearcherInternalMockUpData.json + External + https://eestore.paas2.uninett.no/api/personrepo/?search={like}&page={page}&size={pageSize} + 1 + application/vnd.api+json; charset=utf-8 + + $['data'][*]['attributes'] + + 'pid' + 'name' + 'uri' + 'description' + 'count' + + + $['meta']['pagination']['page','pages','count'] + + - FIRST - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - internal - + cristin + 1 - Internal - OrganisationInternalMockUpData.json + External + https://eestore.paas2.uninett.no/api/organizationrepo/?search={like}&page={page}&size={pageSize} + 1 + application/vnd.api+json; charset=utf-8 + + $['data'][*]['attributes'] + + 'pid' + 'name' + 'uri' + 'description' + 'count' + + + $['meta']['pagination']['page','pages','count'] + + - FIRST - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - internal - + cristin + 1 - Internal - DatasetsInternalMockUpData.json + External + https://eestore.paas2.uninett.no/api/datasetmdrepo/?search={like}&page={page}&size={pageSize} + 1 + application/vnd.api+json; charset=utf-8 $['data'][*]['attributes'] @@ -595,6 +683,42 @@ $['meta']['pagination']['page','pages','count'] + FIRST diff --git a/dmp-backend/web/src/main/resources/ExternalUrlsProduction.xml b/dmp-backend/web/src/main/resources/ExternalUrlsProduction.xml new file mode 100644 index 000000000..ecd11ddb9 --- /dev/null +++ b/dmp-backend/web/src/main/resources/ExternalUrlsProduction.xml @@ -0,0 +1,279 @@ + + + + + 1000 + + + + + internal + + 1 + Internal + RegistriesInternalMockUpData.json + + $['data'][*]['attributes'] + + 'pid' + + 'uri' + 'description' + + + $['meta']['pagination']['page','pages','count'] + + + + + FIRST + + + + + + internal + + 1 + Internal + TagsInternalMockUpData.json + + $['data'][*]['attributes'] + + 'pid' + 'name' + 'uri' + 'description' + + + $['meta']['pagination']['page','pages','count'] + + + FIRST + + + + + + openAIRE + + 1 + https://services.openaire.eu/search/v2/api/resources?query=((oaftype%20exact%20project)%20and%20((projectcode_nt%20exact%20%22{like}%22)or({like}))){funderQuery}&page={page}&size={pageSize}&format=json + &fq=(funder%20exact%20%22{funderId}%22) + 0 + application/json; charset=utf-8 + + $['results'][*]['result']['metadata']['oaf:entity']['oaf:project'] + + 'originalId' + 'title' + 'count' + + + $['meta']['pagination']['page','pages','count'] + + + FIRST + + + + + + FIRST + + + + + + servicesOpenAire + + 1 + External + https://services.openaire.eu/search/v2/api/publications?&refine=true&fields=relfunder&page={page}&size=0&format=json + 0 + application/json; charset=utf-8 + + $['refineResults']['relfunder'][*] + + 'name' + 'id' + 'count' + + + + + servicesOpenAire + + 1 + External + https://services.openaire.eu/search/v2/api/datasets?&refine=true&fields=relfunder&page=0&size={page}&format=json + 0 + application/json; charset=utf-8 + + $['refineResults']['relfunder'][*] + + 'name' + 'id' + 'count' + + + + + servicesOpenAire + + 1 + External + https://services.openaire.eu/search/v2/api/software?&refine=true&fields=relfunder&page={page}&size=0&format=json + 0 + application/json; charset=utf-8 + + $['refineResults']['relfunder'][*] + + 'name' + 'id' + 'count' + + + + + servicesOpenAire + + 1 + External + https://services.openaire.eu/search/v2/api/other?&refine=true&fields=relfunder&page={page}&size=0&format=json + 0 + application/json; charset=utf-8 + + $['refineResults']['relfunder'][*] + + 'name' + 'id' + 'count' + + + + + FIRST + + + + + + internal + + 1 + Internal + RepositoriesInternalMockUpData.json + + $['data'][*]['attributes'] + + 'pid' + 'name' + 'uri' + 'description' + + + $['meta']['pagination']['page','pages','count'] + + + FIRST + + + + + + + internal + + 1 + Internal + ServicesInternalMockUpData.json + + $['data'][*]['attributes'] + + 'pid' + + 'uri' + 'description' + + + $['meta']['pagination']['page','pages','count'] + + + FIRST + + + + + + + internal + + 1 + Internal + ResearcherInternalMockUpData.json + + $['data'][*]['attributes'] + + 'pid' + 'name' + 'uri' + 'description' + + + $['meta']['pagination']['page','pages','count'] + + + FIRST + + + + + + + internal + + 1 + Internal + OrganisationInternalMockUpData.json + + $['data'][*]['attributes'] + + 'pid' + 'name' + 'uri' + 'description' + + + $['meta']['pagination']['page','pages','count'] + + + FIRST + + + + + + internal + + 1 + Internal + DatasetsInternalMockUpData.json + + $['data'][*]['attributes'] + + 'pid' + 'name' + 'uri' + 'description' + + + $['meta']['pagination']['page','pages','count'] + + + FIRST + + + + + diff --git a/dmp-backend/web/src/main/resources/ExternalUrlsStaging.xml b/dmp-backend/web/src/main/resources/ExternalUrlsStaging.xml new file mode 100644 index 000000000..6f942f028 --- /dev/null +++ b/dmp-backend/web/src/main/resources/ExternalUrlsStaging.xml @@ -0,0 +1,298 @@ + + + + + 1000 + + + + + cristin + + 1 + External + https://eestore.paas2.uninett.no/api/metadataschema/?search={like}&page={page}&size={pageSize} + 1 + application/vnd.api+json; charset=utf-8 + + $['data'][*]['attributes'] + + 'pid' + 'name' + 'uri' + 'description' + 'source' + + + $['meta']['pagination']['page','pages','count'] + + + FIRST + + + + + + cristin + + 1 + External + https://eestore.paas2.uninett.no/api/tags/?search={like}&page={page}&size={pageSize} + 1 + application/vnd.api+json; charset=utf-8 + + $['data'][*]['attributes'] + + 'pid' + 'name' + 'uri' + 'description' + + + $['meta']['pagination']['page','pages','count'] + + + FIRST + + + + + + openAIRE + + 1 + https://services.openaire.eu/search/v2/api/resources?query=((oaftype%20exact%20project)%20and%20((projectcode_nt%20exact%20%22{like}%22)or({like}))){funderQuery}&page={page}&size={pageSize}&format=json + &fq=(funder%20exact%20%22{funderId}%22) + 0 + application/json; charset=utf-8 + + $['results'][*]['result']['metadata']['oaf:entity']['oaf:project'] + + 'originalId' + 'title' + 'count' + + + $['meta']['pagination']['page','pages','count'] + + + FIRST + + + + + + FIRST + + + + + + servicesOpenAire + + 1 + External + https://services.openaire.eu/search/v2/api/publications?&refine=true&fields=relfunder&page={page}&size=0&format=json + 0 + application/json; charset=utf-8 + + $['refineResults']['relfunder'][*] + + 'name' + 'id' + 'count' + + + + + servicesOpenAire + + 1 + External + https://services.openaire.eu/search/v2/api/datasets?&refine=true&fields=relfunder&page=0&size={page}&format=json + 0 + application/json; charset=utf-8 + + $['refineResults']['relfunder'][*] + + 'name' + 'id' + 'count' + + + + + servicesOpenAire + + 1 + External + https://services.openaire.eu/search/v2/api/software?&refine=true&fields=relfunder&page={page}&size=0&format=json + 0 + application/json; charset=utf-8 + + $['refineResults']['relfunder'][*] + + 'name' + 'id' + 'count' + + + + + servicesOpenAire + + 1 + External + https://services.openaire.eu/search/v2/api/other?&refine=true&fields=relfunder&page={page}&size=0&format=json + 0 + application/json; charset=utf-8 + + $['refineResults']['relfunder'][*] + + 'name' + 'id' + 'count' + + + + + FIRST + + + + + + cristin + + 1 + External + https://eestore.paas2.uninett.no/api/datarepo/?search={like}&page={page}&size={pageSize} + 1 + application/vnd.api+json; charset=utf-8 + + $['data'][*]['attributes'] + + 'pid' + 'name' + 'uri' + 'description' + 'source' + + + $['meta']['pagination']['page','pages','count'] + + + FIRST + + + + + + + cristin + + 1 + External + https://eestore.paas2.uninett.no/api/servicerepo/?search={like}&page={page}&size={pageSize} + 1 + application/vnd.api+json; charset=utf-8 + + $['data'][*]['attributes'] + + 'pid' + 'name' + 'uri' + 'description' + 'source' + + + $['meta']['pagination']['page','pages','count'] + + + FIRST + + + + + + + cristin + + 1 + External + https://eestore.paas2.uninett.no/api/personrepo/?search={like}&page={page}&size={pageSize} + 1 + application/vnd.api+json; charset=utf-8 + + $['data'][*]['attributes'] + + 'pid' + 'name' + 'uri' + 'description' + 'count' + + + $['meta']['pagination']['page','pages','count'] + + + FIRST + + + + + + + cristin + + 1 + External + https://eestore.paas2.uninett.no/api/organizationrepo/?search={like}&page={page}&size={pageSize} + 1 + application/vnd.api+json; charset=utf-8 + + $['data'][*]['attributes'] + + 'pid' + 'name' + 'uri' + 'description' + 'count' + + + $['meta']['pagination']['page','pages','count'] + + + FIRST + + + + + + cristin + + 1 + External + https://eestore.paas2.uninett.no/api/datasetmdrepo/?search={like}&page={page}&size={pageSize} + 1 + application/vnd.api+json; charset=utf-8 + + $['data'][*]['attributes'] + + 'pid' + 'name' + 'uri' + 'description' + 'source' + + + $['meta']['pagination']['page','pages','count'] + + + FIRST + + + + + + diff --git a/dmp-backend/web/src/main/resources/RDACommonStandards.txt b/dmp-backend/web/src/main/resources/RDACommonStandards.txt new file mode 100644 index 000000000..134b84e73 --- /dev/null +++ b/dmp-backend/web/src/main/resources/RDACommonStandards.txt @@ -0,0 +1,39 @@ +ethical_issues_exist +cost +cost.title +cost.description +cost.value +cost.currency_code +contact +contact.mail +contact.name +contact.contact_id +contact.contact_id.contact_id +contact.contact_id.contact_id_type +project +project.title +project.project_start +project.project_end +project.funding +project.funding.funder_id +project.funding.funder_id.funder_id +project.funding.funder_id.funder_id_type +project.funding.grant_id +project.funding.grant_id.grant_id +project.funding.grant_id.grant_id_type +dataset +dataset.title +dataset.type +dataset.personal_data +dataset.sensitive_data +dataset.dataset_id +dataset.dataset_id.dataset_id +dataset.dataset_id.dataset_id_type +dataset.metadata +dataset.metadata.language +dataset.metadata.metadata_id +dataset.metadata.metadata_id.metadata_id +dataset.metadata.metadata_id.metadata_id_type +dataset.security_and_privacy +dataset.security_and_privacy.title +dataset.security_and_privacy.description \ No newline at end of file diff --git a/dmp-backend/web/src/main/resources/application-devel.properties b/dmp-backend/web/src/main/resources/application-devel.properties index d6460eb55..00fb05c37 100644 --- a/dmp-backend/web/src/main/resources/application-devel.properties +++ b/dmp-backend/web/src/main/resources/application-devel.properties @@ -15,21 +15,22 @@ http-logger.server-address = http://localhost:31311 pdf.converter.url=http://localhost:88/ ####################CONFIGURATION FILES OVERRIDES CONFIGURATIONS########## -configuration.externalUrls=/tmp/ExternalUrls.xml -configuration.dynamicGrantUrl=/tmp/GrantConfiguration.xml -configuration.dynamicProjectUrl=/tmp/ProjectConfiguration.xml -configuration.dynamicFunderUrl=/tmp/FunderConfiguration.xml -configuration.h2020template=C:\\Users\\gkolokythas\\Documents\\openDmp\\dmp-backend\\web\\src\\main\\resources\\documents\\h2020.docx -configuration.resources.path = +configuration.externalUrls=/web/src/main/resources/ExternalUrls.xml +configuration.rda=/web/src/main/resources/RDACommonStandards.txt +configuration.h2020template=/web/src/main/resources/documents/h2020.docx +configuration.configurable_login_providers=/web/src/main/resources/configurableLoginProviders.json -####################MOCK FILES CONFIGURATIONS########## -dataset.tags.mock=/mockupTags.json #############TWITTER LOGIN CONFIGURATIONS######### twitter.login.redirect_uri=http://127.0.0.1:4200/login/twitter #############LINKEDIN LOGIN CONFIGURATIONS######### +linkedin.login.clientId= +linkedin.login.clientSecret= linkedin.login.redirect_uri=http://localhost:4200/login/linkedin +linkedin.login.user_info_url=https://api.linkedin.com/v2/me +linkedin.login.user_email=https://api.linkedin.com/v2/emailAddress?q=members&projection=(elements*(handle~)) +linkedin.login.access_token_url=https://www.linkedin.com/uas/oauth2/accessToken #############FACEBOOK LOGIN CONFIGURATIONS######### facebook.login.clientId= @@ -40,6 +41,8 @@ facebook.login.namespace= b2access.externallogin.user_info_url=https://b2access-integration.fz-juelich.de:443/oauth2/userinfo b2access.externallogin.access_token_url=https://b2access-integration.fz-juelich.de:443/oauth2/token b2access.externallogin.redirect_uri=http://opendmp.eu/api/oauth/authorized/b2access +b2access.externallogin.clientid= +b2access.externallogin.clientSecret= #############ORCID CONFIGURATIONS######### orcid.login.client_id=APP-766DI5LP8T75FC4R @@ -47,6 +50,13 @@ orcid.login.client_secret=f6ddc717-f49e-4bce-b302-2e479b226a24 orcid.login.access_token_url=https://orcid.org/oauth/token orcid.login.redirect_uri=http://localhost:4200/login/external/orcid +#############OPENAIRE CONFIGURATIONS######### +openaire.login.client_id= +openaire.login.client_secret= +openaire.login.access_token_url= +openaire.login.redirect_uri= +openaire.login.user_info_url= + #############CONFIRMATION EMAIL CONFIGURATIONS######### conf_email.expiration_time_seconds=14400 conf_email.subject=OpenDMP email confirmation diff --git a/dmp-backend/web/src/main/resources/application-production.properties b/dmp-backend/web/src/main/resources/application-production.properties index 6de88b0a2..9218ae216 100644 --- a/dmp-backend/web/src/main/resources/application-production.properties +++ b/dmp-backend/web/src/main/resources/application-production.properties @@ -17,11 +17,9 @@ pdf.converter.url=http://docsbox-web/ ####################CONFIGURATION FILES OVERRIDES CONFIGURATIONS########## configuration.externalUrls=/tmp/ExternalUrls.xml +configuration.rda=/tmp/RDACommonStandards.txt configuration.h2020template=/tmp/h2020.docx -configuration.resources.path=/tmp - -####################MOCK FILES CONFIGURATIONS########## -dataset.tags.mock=/mockupTags.json +configuration.configurable_login_providers= ####################SPRING MAIL CONFIGURATIONS################# spring.mail.default-encoding=UTF-8 @@ -46,6 +44,9 @@ google.login.clientId= linkedin.login.clientId= linkedin.login.clientSecret= linkedin.login.redirect_uri=https://opendmp.eu/login/linkedin +linkedin.login.user_info_url=https://api.linkedin.com/v2/me +linkedin.login.user_email=https://api.linkedin.com/v2/emailAddress?q=members&projection=(elements*(handle~)) +linkedin.login.access_token_url=https://www.linkedin.com/uas/oauth2/accessToken #############TWITTER LOGIN CONFIGURATIONS######### twitter.login.clientId= @@ -65,6 +66,13 @@ orcid.login.client_secret= orcid.login.access_token_url=https://orcid.org/oauth/token orcid.login.redirect_uri=https://opendmp.eu/login/external/orcid +#############OPENAIRE CONFIGURATIONS######### +openaire.login.client_id= +openaire.login.client_secret= +openaire.login.access_token_url= +openaire.login.redirect_uri= +openaire.login.user_info_url= + #############SPRING DATASOURCE CONFIGURATIONS######### spring.datasource.maxIdle: 10 spring.datasource.max-active: 70 diff --git a/dmp-backend/web/src/main/resources/application-staging.properties b/dmp-backend/web/src/main/resources/application-staging.properties index 226accae4..a4b4a0385 100644 --- a/dmp-backend/web/src/main/resources/application-staging.properties +++ b/dmp-backend/web/src/main/resources/application-staging.properties @@ -17,11 +17,9 @@ pdf.converter.url=http://docsbox-web/ ####################CONFIGURATION FILES OVERRIDES CONFIGURATIONS########## configuration.externalUrls=/tmp/ExternalUrls.xml -configuration.h2020template=/tmp/h2020.docx -configuration.resources.path=/tmp/ - -####################MOCK FILES CONFIGURATIONS########## -dataset.tags.mock=mockupTags.json +configuration.rda=/tmp/RDACommonStandards.txt +configuration.h2020template=tmp/h2020.docx +configuration.configurable_login_providers= ####################INVITATION MAIL CONFIGURATIONS############## ####################GENERIC MAIL CONFIGURATIONS################# @@ -48,6 +46,9 @@ google.login.clientId= linkedin.login.clientId= linkedin.login.clientSecret= linkedin.login.redirect_uri=https://devel.opendmp.eu/login/linkedin +linkedin.login.user_info_url=https://api.linkedin.com/v2/me +linkedin.login.user_email=https://api.linkedin.com/v2/emailAddress?q=members&projection=(elements*(handle~)) +linkedin.login.access_token_url=https://www.linkedin.com/uas/oauth2/accessToken #############TWITTER LOGIN CONFIGURATIONS######### twitter.login.clientId= @@ -71,6 +72,13 @@ orcid.login.client_secret= orcid.login.access_token_url=https://orcid.org/oauth/token orcid.login.redirect_uri=https://opendmp.eu/login/external/orcid +#############OPENAIRE CONFIGURATIONS######### +openaire.login.client_id= +openaire.login.client_secret= +openaire.login.access_token_url= +openaire.login.redirect_uri= +openaire.login.user_info_url= + #############ZENODO CONFIGURATIONS######### zenodo.url=https://sandbox.zenodo.org/api/ zenodo.access_token= diff --git a/dmp-backend/web/src/main/resources/application.properties b/dmp-backend/web/src/main/resources/application.properties index cacdd641f..ddd1ca1f9 100644 --- a/dmp-backend/web/src/main/resources/application.properties +++ b/dmp-backend/web/src/main/resources/application.properties @@ -19,6 +19,12 @@ spring.mail.test-connection=false spring.mail.properties.mail.smtp.auth=false spring.mail.properties.mail.smtp.starttls.enable=false +####################CONFIGURATION FILES OVERRIDES CONFIGURATIONS########## +configuration.externalUrls= +configuration.rda= +configuration.h2020template= +configuration.configurable_login_providers= + #############LOGIN CONFIGURATIONS######### #############GENERIC LOGIN CONFIGURATIONS######### autouser.root.email= @@ -37,6 +43,9 @@ google.login.clientId= linkedin.login.clientId= linkedin.login.clientSecret= linkedin.login.redirect_uri=http://opendmp.eu/login/linkedin +linkedin.login.user_info_url=https://api.linkedin.com/v2/me +linkedin.login.user_email=https://api.linkedin.com/v2/emailAddress?q=members&projection=(elements*(handle~)) +linkedin.login.access_token_url=https://www.linkedin.com/uas/oauth2/accessToken #############TWITTER LOGIN CONFIGURATIONS######### twitter.login.clientId= diff --git a/dmp-backend/web/src/main/resources/configurableLoginProviders.json b/dmp-backend/web/src/main/resources/configurableLoginProviders.json new file mode 100644 index 000000000..ae519164b --- /dev/null +++ b/dmp-backend/web/src/main/resources/configurableLoginProviders.json @@ -0,0 +1,27 @@ +{ + "providers": [ + { + "enabled": false, + "configurableLoginId": "myId", + "name": "myApp", + "clientId": "", + "clientSecret": "", + "redirect_uri": "", + "access_token_url": "", + "grant_type": "authorization_code", + "token": { + "access_token": "access_token", + "expires_in": "expires_in" + }, + "user": { + "id": "sub", + "name": "name", + "email": "email", + "user_info_url": "" + }, + "oauthUrl": "/authorize", + "scope": "email", + "state": "123562" + } + ] +} diff --git a/dmp-backend/web/src/main/resources/documents/h2020.docx b/dmp-backend/web/src/main/resources/documents/h2020.docx index b3e1fa144..2f98459a0 100644 Binary files a/dmp-backend/web/src/main/resources/documents/h2020.docx and b/dmp-backend/web/src/main/resources/documents/h2020.docx differ diff --git a/dmp-backend/web/src/main/resources/DatasetsInternalMockUpData.json b/dmp-backend/web/src/main/resources/mockData/DatasetsInternalMockUpData.json similarity index 100% rename from dmp-backend/web/src/main/resources/DatasetsInternalMockUpData.json rename to dmp-backend/web/src/main/resources/mockData/DatasetsInternalMockUpData.json diff --git a/dmp-backend/web/src/main/resources/FunderInternalMockUpData.json b/dmp-backend/web/src/main/resources/mockData/FunderInternalMockUpData.json similarity index 100% rename from dmp-backend/web/src/main/resources/FunderInternalMockUpData.json rename to dmp-backend/web/src/main/resources/mockData/FunderInternalMockUpData.json diff --git a/dmp-backend/web/src/main/resources/GrantInternalMockUpData.json b/dmp-backend/web/src/main/resources/mockData/GrantInternalMockUpData.json similarity index 100% rename from dmp-backend/web/src/main/resources/GrantInternalMockUpData.json rename to dmp-backend/web/src/main/resources/mockData/GrantInternalMockUpData.json diff --git a/dmp-backend/web/src/main/resources/OrganisationInternalMockUpData.json b/dmp-backend/web/src/main/resources/mockData/OrganisationInternalMockUpData.json similarity index 100% rename from dmp-backend/web/src/main/resources/OrganisationInternalMockUpData.json rename to dmp-backend/web/src/main/resources/mockData/OrganisationInternalMockUpData.json diff --git a/dmp-backend/web/src/main/resources/ProjectInternalMockUpData.json b/dmp-backend/web/src/main/resources/mockData/ProjectInternalMockUpData.json similarity index 100% rename from dmp-backend/web/src/main/resources/ProjectInternalMockUpData.json rename to dmp-backend/web/src/main/resources/mockData/ProjectInternalMockUpData.json diff --git a/dmp-backend/web/src/main/resources/RegistriesInternalMockUpData.json b/dmp-backend/web/src/main/resources/mockData/RegistriesInternalMockUpData.json similarity index 100% rename from dmp-backend/web/src/main/resources/RegistriesInternalMockUpData.json rename to dmp-backend/web/src/main/resources/mockData/RegistriesInternalMockUpData.json diff --git a/dmp-backend/web/src/main/resources/RepositoriesInternalMockUpData.json b/dmp-backend/web/src/main/resources/mockData/RepositoriesInternalMockUpData.json similarity index 100% rename from dmp-backend/web/src/main/resources/RepositoriesInternalMockUpData.json rename to dmp-backend/web/src/main/resources/mockData/RepositoriesInternalMockUpData.json diff --git a/dmp-backend/web/src/main/resources/ResearcherInternalMockUpData.json b/dmp-backend/web/src/main/resources/mockData/ResearcherInternalMockUpData.json similarity index 100% rename from dmp-backend/web/src/main/resources/ResearcherInternalMockUpData.json rename to dmp-backend/web/src/main/resources/mockData/ResearcherInternalMockUpData.json diff --git a/dmp-backend/web/src/main/resources/ServicesInternalMockUpData.json b/dmp-backend/web/src/main/resources/mockData/ServicesInternalMockUpData.json similarity index 100% rename from dmp-backend/web/src/main/resources/ServicesInternalMockUpData.json rename to dmp-backend/web/src/main/resources/mockData/ServicesInternalMockUpData.json diff --git a/dmp-backend/web/src/main/resources/TagsInternalMockUpData.json b/dmp-backend/web/src/main/resources/mockData/TagsInternalMockUpData.json similarity index 100% rename from dmp-backend/web/src/main/resources/TagsInternalMockUpData.json rename to dmp-backend/web/src/main/resources/mockData/TagsInternalMockUpData.json diff --git a/dmp-backend/web/src/main/resources/mockupTags.json b/dmp-backend/web/src/main/resources/mockData/mockupTags.json similarity index 100% rename from dmp-backend/web/src/main/resources/mockupTags.json rename to dmp-backend/web/src/main/resources/mockData/mockupTags.json diff --git a/dmp-dataset-templates/AcademyOfFinland.xml b/dmp-dataset-templates/AcademyOfFinland.xml new file mode 100644 index 000000000..e9ce27510 --- /dev/null +++ b/dmp-dataset-templates/AcademyOfFinland.xml @@ -0,0 +1,256 @@ + + + + + + + + + + +
+ + +
+ 1.1 + + + + 1.1.1 + + + + + + + + + What kinds of data is your research based on? What data will be collected, produced or reused?What file formats will the data be in? + Give a rough estimate of the size of the data produced or collected. Also explain what kinds of existing data you will use, for example, the types of texts, images, photographs, measurements, statistics, physical samples or codes. + + +
+
+ 1.2 + + + + 1.2.1 + + + + + + + + + How will the consistency and quality of data be controlled? + Explain how the data collection, analysis and processing methods used may affect the quality of data and how you will minimize the risks related to data accuracy. + + +
+ + 1 + General description of data + + +
+ +
+ + +
+ 3.1 + + + + 3.1.1 + + + + + + + + + How will you document your data to make them findable, accessible, interoperable and reusable for you and others? What kinds of metadata standards, files or other documentation will you use to help others understand and use your data? + + + +
+ + 3 + Documentation and metadata + + +
+
+ + +
+ 4.1 + + + + 4.1.1 + + + + + + + + + Where will your data be stored, and how will they be backed up? + Describe where you will store and back up your data during your research project. Methods for preserving and sharing your data after your research project has ended are explained in more detail in Section 5 + Consider who will be responsible for backup and recovery. If there are several researchers involved, create a plan with your collaborators and ensure safe transfer between participants. + +
+
+ 4.2 + + + + 4.2.1 + + + + + + + + + Who will be responsible for controlling access to your data, and how will secured access be controlled? + Describe who has access to your data, what they are authorised to do with the data and how you will ensure the safe transfer of data to your collaborators. + + +
+ + 4 + Storage and backup during the research project + + +
+
+ + +
+ 5.1 + + + + 5.1.1 + + + + + + + + + What part of the data can be made openly available or published? Where and when will the data, or their metadata, be made available? + Describe whether you will publish or otherwise make all your data or only parts of them openly available. If your data or parts of them cannot be opened, please explain why. + + +
+
+ 5.2 + + + + 5.2.1 + + + + + + + + + Where will data with long-term value be archived, and for how long? + Briefly describe what data to archive and for how long – as well as what data to dispose of after the project. Describe the access policy to the archived data. + + +
+ + 5 + Opening, publishing and archiving the data after the research project + + +
+
+ + +
+ 6.1 + + + + 6.1.1 + + + + + + + + + Who will be responsible for specific tasks of data management during the research project life cycle? + Estimate also the resources (e.g. financial, time and effort) required for data management. + Estimate the need to hire expert help to manage, preserve and share the data. Consider the additional computational facilities and resources that need to be accessed, and what the associated costs will amount to. + +
+ + 6 + Data management responsibilities and resources + + +
+ + \ No newline at end of file diff --git a/dmp-dataset-templates/FWF.xml b/dmp-dataset-templates/FWF.xml new file mode 100644 index 000000000..84c5a7986 --- /dev/null +++ b/dmp-dataset-templates/FWF.xml @@ -0,0 +1,1287 @@ + + + + + + + + +
+ + +
+ 1.1 + + + + 1.1.1 + + + + + + + + + What kinds of data/source code will be generated or reused (type, format, volume)? + + + +
+
+ 1.2 + + + + 1.2.1 + + + + + + + + + How will the research data be generated and which methods will be used? + + + +
+
+ 1.3 + + + + 1.3.1 + + + + + + + + + How will you structure the data and handle versioning? + + + +
+
+ 1.4 + + + + 1.4.1 + + + + + + + + + Who is the target audience? + + + +
+ + 1 + Data Characteristics: Description of the data + + +
+
+ +
+ + +
+ 2.1.1 + + + + 2.1.1.1 + + + + + true + + + true + + + + + + + 2.1.1.2 + + + + + + + + + 2.1.1.3 + + + + + true + + + + + + + + Will you use metadata to describe the data? + + + +
+
+ 2.1.2 + + + + 2.1.2.1 + + + + + + + + 2.1.2.2 + + + + + + + + + URL/Location + + + +
+
+ 2.1.3 + + + + 2.1.3.1 + + + + + true + + + true + + + + + + + 2.1.3.2 + + + + + + + + + 2.1.3.3 + + + + + true + + + + + + + + Will your metadata use standardized vocabularies? + + + +
+
+ 2.1.4 + + + + 2.1.4.1 + + + + + + + + 2.1.4.2 + + + + + + + + + URL/Description + + + +
+ + 2.1 + Metadata standards + + What metadata standards (if any) will be in use and why? +
+
+ +
+ + +
+ 2.2.1.1 + + + + 2.2.1.1.1 + + + + + some + + + none + + + + + + + + + + + Will all your data be openly accessible? + + + +
+
+ 2.2.1.2 + + + + 2.2.1.2.1 + + + + + + + + 2.2.1.2.2 + + + + + + + + 2.2.1.2.3 + + + + + + + + + Data type/ Reason/ URL + + + +
+
+ 2.2.1.3 + + + + 2.2.1.3.1 + + + + + + + + 2.2.1.3.2 + + + + + + + + 2.2.1.3.3 + + + + + + + + + Data type/ Reason/ URL + + + +
+
+ 2.2.1.4 + + + + 2.2.1.4.1 + + + + + + + + + 2.2.1.4.2 + + + + + true + + + + + + + + How will the data be made available? + + + +
+
+ 2.2.1.5 + + + + 2.2.1.5.1 + + + + + + + + 2.2.1.5.2 + + + + + + + + + URL/Name + + + +
+ + 2.2.1 + What information is needed for the data to be findable, accessible, interoperable and re-usable (FAIR) in the future? + + +
+
+ + +
+ 2.2.2.1 + + + + 2.2.2.1.1 + + + + + true + + + + + + + + Will you provide persistent identifiers for your data? + + + +
+
+ 2.2.2.2 + + + + 2.2.2.2.1 + + + + + + + + + + + + Persistent identifiers + 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. + + +
+
+ 2.2.2.3 + + + + 2.2.2.3.1 + + + + + true + + + + + + + + Will you provide searchable metadata for your data? + + + +
+
+ 2.2.2.4 + + + + 2.2.2.4.1 + + + + + + + + + 2.2.2.4.2 + + + + + true + + + + + + + + What services will you use to provide searchable metadata? + + + +
+
+ 2.2.2.5 + + + + 2.2.2.5.1 + + + + + + + + 2.2.2.5.2 + + + + + + + + + URL/Name + + + +
+ + 2.2.2 + Is the data machine-readable? + + +
+
+ + +
+ 2.2.3.1 + + + + 2.2.3.1.1 + + + + + + + + + How are you planning to document this information? + + + +
+ + 2.2.3 + How are you planning to document this information? + + +
+ + + 2.2 + Documentation of data + + +
+
+ + +
+ 2.3.1 + + + + 2.3.1.1 + + + + + + + + + What quality assurance processes will you adopt? + + + +
+
+ 2.3.2 + + + + 2.3.2.1 + + + + + + + + + How will the consistency and quality of data collection be controlled and documented? + + + +
+ + 2.3 + Data quality control + + +
+ + + 2 + Documentation and Metadata + + +
+
+ +
+ + +
+ 3.1.1 + + + + 3.1.1.1 + + + + + + + + + What persistent identifier will be used? + + + +
+ + 3.1 + Data sharing strategy + + +
+
+ + +
+ 3.2.1 + + + + 3.2.1.1 + + + + + true + + + + + + + + Will there be data that will not be stored for long-term? + + + +
+
+ 3.2.2 + + + + 3.2.2.1 + + + + + + + + + What data will not be stored for long-term? + + + +
+
+ 3.2.3 + + + + 3.2.3.1 + + + + + true + + + true + + + + + + + + Will there be data that will be preserved for long-term? + + + +
+
+ 3.2.4 + + + + 3.2.4.1 + + + + + + + + + What data will be preserved for long-term + + + +
+
+ 3.2.5 + + + + 3.2.5.1 + + + + + true + + + false + + + + + + + + Will you use standardised formats for some or all of your data? + + + +
+
+ 3.2.6 + + + + 3.2.6.1 + + + + + + + + + 3.2.6.2 + + + + + true + + + + + + + + Which standardised data formats do you plan on using? + + + +
+
+ 3.2.7 + + + + 3.2.7.1 + + + + + + + + 3.2.7.2 + + + + + + + + + Standardized formats + Is the structure of the file(s) provided in a standardized format? + + +
+
+ 3.2.8 + + + + 3.2.8.1 + + + + + + + + 3.2.8.2 + + + + + + + + 3.2.8.3 + + + + + + + + + Please describe the formats you plan to store your data in, including any URLs to documentation. + + + +
+
+ 3.2.9 + + + + 3.2.9.1 + + + + + + + + + How will the data be stored after the project ends? + + + +
+
+ 3.2.10 + + + + 3.2.10.1 + + + + + + + + + + + + Where will the data be stored after the project ends? Is the storage sufficiently secure for the data and does the storage provide backup and recovery procedures? + + + +
+
+ 3.2.11 + + + + 3.2.11.1 + + + + + + + + + + + + For how long will the data be stored? + + + +
+
+ 3.2.12 + + + + 3.2.12.1 + + + + + + + + + Are there any costs that need to be covered for storage? + + + +
+
+ 3.2.13 + + + + 3.2.13.1 + + + + + + + + + + + + At what point during or after the project will the data be stored? + + + +
+
+ 3.2.14 + + + + 3.2.14.1 + + + + + + + + + Are there any technical barriers to making the research data fully or partially accessible? + + + +
+ + 3.2 + Data storage strategy + + +
+ + + 3 + Data Availability and Storage + + +
+ + + \ No newline at end of file diff --git a/dmp-dataset-templates/Horizon2020_V2_Wordlist_fixes.xml b/dmp-dataset-templates/Horizon2020_V2_Wordlist_fixes.xml new file mode 100644 index 000000000..b86ec2096 --- /dev/null +++ b/dmp-dataset-templates/Horizon2020_V2_Wordlist_fixes.xml @@ -0,0 +1,1881 @@ + + + + + + + + +
+ + +
+ 1.1 + + + + + 1.1.1 + + + + + + + + + What is the purpose of the data collection/generation and its relation to the objectives of the project? + + + +
+
+ 1.2 + + + + + 1.2.1 + + + + + + + + + What types and formats of data will the project generate/collect? + + + +
+
+ 1.3 + + + + + 1.3.1 + + + + + + + + + Will you re-use any existing data and how? + + + +
+
+ 1.4 + + + + + 1.4.1 + + + + + + + + + What is the origin of the data? + + + +
+
+ 1.5 + + + + + 1.5.1 + + + + + + + + + What is the expected size of the data? + + + +
+
+ 1.6 + + + + + 1.6.1 + + + + + + + + + To whom might it be useful ('data utility')? + + + +
+ + 1 + Data Summary + + 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. +
+
+ +
+ + +
+ 2.1.1 + + + + + 2.1.1.1 + + + + + + + true + + + true + + + true + + + true + + + true + + + + + + + + 2.1.1.2 + + + + + + + + + + 2.1.1.3 + + + + + true + + + + + + + + Will you use metadata to describe the data? + + + +
+
+ 2.1.2 + + + + + 2.1.2.1 + + + + + + + + + + + 2.1.2.2 + + + + + + + + + + + URL/Location + + + +
+
+ 2.1.3 + + + + + 2.1.3.1 + + + + + true + + + true + + + + + + + + 2.1.3.2 + + + + + + + + + + + + 2.1.3.3 + + + + + true + + + + + + + + Will your metadata use standardised vocabularies? + + + +
+
+ 2.1.4 + + + + + 2.1.4.1 + + + + + + + + + + + 2.1.4.2 + + + + + + + + + + + URL/Description + + + +
+
+ 2.1.5 + + + + + 2.1.5.1 + + + + + + + + + + + Will you make the metadata available free-of-charge? + + + +
+
+ 2.1.6 + + + + + 2.1.6.1 + + + + + + + + + + + Will your metadata be harvestable? + + + +
+
+ 2.1.7 + + + + + 2.1.7.1 + + + + + + + true + + + + + + + + Will you use naming conventions for your data? + + + +
+
+ 2.1.8 + + + + + 2.1.8.1 + + + + + + + + + + + 2.1.8.2 + + + + + + + + + + + URL/Name + + + +
+
+ 2.1.9 + + + + + 2.1.9.1 + + + + + + + + + + + Will you provide clear version numbers for your data? + + + +
+
+ 2.1.10 + + + + + 2.1.10.1 + + + + + + + true + + + + + + + + Will you provide persistent identifiers for your data? + + + +
+
+ 2.1.11 + + + + + 2.1.11.1 + + + + + + + + + + + + + + Persistent identifiers + 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. + + +
+
+ 2.1.12 + + + + + 2.1.12.1 + + + + + + + true + + + + + + + + Will you provide searchable metadata for your data? + + + +
+
+ 2.1.13 + + + + + 2.1.13.1 + + + + + + + + + + + + 2.1.13.2 + + + + + + + true + + + + + + + + What services will you use to provide searchable metadata? + + + +
+
+ 2.1.14 + + + + + 2.1.14.1 + + + + + + + + + + + 2.1.14.2 + + + + + + + + + + + URL/Name + + + +
+
+ 2.1.15 + + + + + 2.1.15.1 + + + + + + + true + + + false + + + + + + + + Will you use standardised formats for some or all of your data? + + + +
+
+ 2.1.16 + + + + + 2.1.16.1 + + + + + + + + + + + + 2.1.16.2 + + + + + + + true + + + + + + + + Which standardised data formats do you plan on using? + + + +
+
+ 2.1.17 + + + + + 2.1.17.1 + + + + + + + + + + + 2.1.17.2 + + + + + + + + + + + Standardised formats + Is the structure of the file(s) provided in a standardised format? + + +
+
+ 2.1.18 + + + + + 2.1.18.1 + + + + + + + + + + + 2.1.18.2 + + + + + + + + + + + 2.1.18.3 + + + + + + + + + + + Please describe the formats you plan to store your data in, including any URLs to documentation. + + + +
+
+ 2.1.19 + + + + + 2.1.19.1 + + + + + + + some + + + none + + + + + + + + + + + Are the file formats you will use open? + + + +
+
+ 2.1.20 + + + + + 2.1.20.1 + + + + + + + + + + + Please describe which data are not in an open format and why? + + + +
+
+ 2.1.21 + + + + + 2.1.21.1 + + + + + + + + + + + Please describe which data are not in an open format and why? + + + +
+
+ 2.1.22 + + + + + 2.1.22.1 + + + + + + + forsomedata + + + fornodata + + + + + + + + + + + Do supported open-source tools exist for accessing the data? + + + +
+
+ 2.1.23 + + + + + 2.1.23.1 + + + + + + + + + + + Please describe which data require proprietary tools to access the data? + + + +
+
+ 2.1.24 + + + + + 2.1.24.1 + + + + + + + + + + + Please describe which data require proprietary tools to access the data? + + + +
+
+ 2.1.25 + + + + + 2.1.25.1 + + + + + + + + + + + Will you provide metadata describing the quality of the data? + + + +
+ + 2.1 + Making data findable, including provisions for metadata + + 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 +
+
+ + +
+ 2.2.1 + + + + + 2.2.1.1 + + + + + + + true + + + + + + + + Are there ethical or legal issues that can impact sharing the data? + + + +
+
+ 2.2.2 + + + + + 2.2.2.1 + + + + + + + some + + + none + + + + + + + + + + + Will all your data be openly accessible? + + + +
+
+ 2.2.3 + + + + + 2.2.3.1 + + + + + + + + + + + 2.2.3.2 + + + + + + + + + + + 2.2.3.3 + + + + + + + + + + + Data type/ Reason/ URL + + + +
+
+ 2.2.4 + + + + + 2.2.4.1 + + + + + + + + + 2.2.4.2 + + + + + + + + + 2.2.4.3 + + + + + + + + + Data type/ Reason/ URL + + + +
+
+ 2.2.5 + + + + + 2.2.5.1 + + + + + + + + + + + + 2.2.5.2 + + + + + + + true + + + + + + + + How will the data be made available? + Select the repository where your data will be uploaded. + + +
+
+ 2.2.6 + + + + + 2.2.6.1 + + + + + + + + + + + 2.2.6.2 + + + + + + + + + + + URL/Name + + + +
+
+ 2.2.7 + + + + + 2.2.7.1 + + + + + + + + + + + + + + Is the storage sufficiently secure for the data and does the storage provide backup and recovery procedures? + + + +
+
+ 2.2.8 + + + + + 2.2.8.1 + + + + + + + true + + + true + + + + + + + + Are there any methods or tools required to access the data? + + + +
+
+ 2.2.9 + + + + + 2.2.9.1 + + + + + + + + + + + 2.2.9.2 + + + + + + + + + + + Please provide links describing the methods for accessing the data. + + + +
+
+ 2.2.10 + + + + + 2.2.10.1 + + + + + + + + + + + 2.2.10.2 + + + + + + + + + + + Please provide links describing the tools for accessing the data. + + + +
+
+ 2.2.11 + + + + + 2.2.11.1 + + + + + + + + + + + + + + Will you also make auxiliary data that may be of interest to researchers available? + + + +
+ + 2.2 + Making data openly accessible + + 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. +
+
+ + +
+ 2.3.1 + + + + + 2.3.1.1 + + + + + + + some + + + none + + + + + + + + + + + Will you use a standard vocabulary for your data types? + + + +
+
+ 2.3.2 + + + + + 2.3.2.1 + + + + + + + + + + + Will you provide a mapping to more commonly used ontologies? + + + +
+
+ 2.3.3 + + + + + 2.3.3.1 + + + + + + + + + + + Will you provide a mapping to more commonly used ontologies? + + + +
+ + 2.3 + Making data interoperable + + 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. +
+
+ + +
+ 2.4.1 + + + + + 2.4.1.1 + + + + + + + later + + + never + + + + + + + + + + + When do you plan to make your data available for reuse? + + + +
+
+ 2.4.2 + + + + + 2.4.2.1 + + + + + + + + + + + Please specify how long after the project has ended the data will be made available? + + + +
+
+ 2.4.3 + + + + + 2.4.3.1 + + + + + + + + + + + Please describe the reason the data will not be made available. + + + +
+
+ 2.4.4 + + + + + 2.4.4.1 + + + + + + + + + + + + What internationally recognised licence will you use for your data? + + + +
+
+ 2.4.5 + + + + + 2.4.5.1 + + + + + + + true + + + + + + + + Do you have documented procedures for quality assurance of your data? + + + +
+
+ 2.4.6 + + + + + 2.4.6.1 + + + + + + + + + + <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? + + + +
+
+ 2.4.8 + + + + + 2.4.8.1 + + + + + + + + + + + + + + How long do you intend to support data reuse? + + + +
+
+ 2.4.9 + + + + + 2.4.9.1 + + + + + + + + + + + Please specify why the data will be unsupported for reuse. + + + +
+ + 2.4 + Increase data reuse + + 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. +
+
+ + +
+ 2.5.1 + + + + + 2.5.1.1 + + + + + + + + + + + + + + How will the cost of making your data findable, accessible, interoperable and reusable be covered? + + + +
+
+ 2.5.2 + + + + + 2.5.2.1 + + + + + + + false + + + + + + + + Will you identify a data manager to manage your data, if not who will be responsible for the management of your data? + + + +
+
+ 2.5.3 + + + + + 2.5.3.1 + + + + + + + + + + + Identify the people or roles that will be responsible for the management of the project data + + + +
+
+ 2.5.4 + + + + + 2.5.4.1 + + + + + + + other + + + + + + + + + + + How do you intend to ensure data reuse after your project finishes? + + + +
+ + 2.5 + Allocation of resources + + 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. +
+ + + 2 + FAIR Data + + 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. +
+
+ + +
+ 3.1 + + + + + 3.1.1 + + + + + + + keptoninsecure + + + + + + + + + + + What do you plan to do with research data of limited use + + + +
+
+ 3.2 + + + + + 3.2.1 + + + + + + + + + + + Please describe why the data will be kept on insecure, unmanaged storage + + + +
+ + 3 + Data Security + + +
+
+ + +
+ 4.1 + + + + + 4.1.1 + + + + + + + true + + + + + + + + Do you make use of other procedures for data management? + + + +
+
+ 4.2 + + + + + 4.2.1 + + + + + + + + + + + Please provide links to documentation on these other procedures. + + + +
+ + 4 + Other + + +
+ + \ No newline at end of file diff --git a/dmp-dataset-templates/NationalScienceCenterPoland.xml b/dmp-dataset-templates/NationalScienceCenterPoland.xml new file mode 100644 index 000000000..a93d5a345 --- /dev/null +++ b/dmp-dataset-templates/NationalScienceCenterPoland.xml @@ -0,0 +1 @@ +
1.1.1dmp1.1.1.1What quality assurance processes will you use?
1.1.21.1.2.1Which existing data (yours or third party) will you re-use?
1.1.31.1.3.1How data provenance will be documented?
1.1.41.1.4.1How will you organize your files and handle versioning?
1.1How will new data be collected or produced and/or how will existing data be reused? What standards, methodologies or software will be used if new data are collected or produced?
1.2.11.2.1.1What is the purpose of the data collection/generation and its relation to the objectives of the project?
1.2.21.2.2.1 What is the origin of the data?
1.2.31.2.3.11.2.3.21.2.3.31.2.3.4What type, format and volume of data will you collect, generate or reuse?
1.2What data (for example the kinds, formats, and volumes) will be collected or produced?The descriptions should include the type, format and content of each dataset. Furthermore, provide an estimation of the volume of the generated data sets. Give details on the data format: the way in which the data is encoded for storage, often reflected by the filename extension (i.e. pdf. xls.) Give preference to open and standard formats.
1Data description and collection or re-use of existing data
2.1.12.1.1.1truetruetrue2.1.1.22.1.1.3trueWill you use metadata to describe the data?
2.1.22.1.2.12.1.2.2URL/Location
2.1.32.1.3.1truetrue2.1.3.22.1.3.3trueWill your metadata use standardised vocabularies?
2.1.42.1.4.12.1.4.2URL/Description
2.1.52.1.5.1What information is required for users (computer or human) to read and interpret the data in the future?
2.1.62.1.6.1trueIs the data machine-readable?
2.1.72.1.7.1trueWill you provide searchable metadata for your data?
2.1.82.1.8.12.1.8.2trueWhat services will you use to provide searchable metadata?
2.1.92.1.9.12.1.9.2URL/Name
2.1.102.1.10.1How will you generate this documentation?
2.1.112.1.11.1trueWill you use standardized formats to annotate some or all of your (meta)data?
2.1.122.1.12.12.1.12.2trueWhich standardised data formats do you plan on using?
2.1.132.1.13.12.1.13.2Other standardized formatsIs the structure of the file(s) provided in a standardized format?
2.1.142.1.14.1Will you use international standards or schemes (i.e. Dublin Core, DDI) to structure metadata?
2.1.152.1.15.1 Persistent identifiers
2.1What metadata and documentation (for example methodology or data collection and way of organising data) will accompany data?
2.2.12.2.1.1true2.2.1.2Do you have documented procedures for quality assurance of your data?
2.2.22.2.2.1How the data collection, analysis and processing methods used may affect the quality of data?
2.2.32.2.3.1How measurement error and bias will be eliminated?
2.2.42.2.4.1How you will minimise the risks related to data accuracy?
2.2What data quality control measures will be used?
2Documentation and data quality
3.1.13.1.1.13.1.1.2What is your storage capacity and where will the data be stored?
3.1.23.1.2.1What are the back-up procedures?
3.1.33.1.3.1Are special measures needed to transfer data from mobile devices, from fieldwork sites or from home equipment to a central work server?
3.1.43.1.4.1Do analogue or paper-based research data (maps, photographs, text) need to be digitised to increase their potential for sharing?
3.1How will data and metadata be stored and backed up during the research process?
3.2.13.2.1.1keptoninsecureWhat do you plan to do with research data of limited use
3.2.23.2.2.1Please describe why the data will be kept on insecure, unmanaged storage
3.2.33.2.3.1How the data will be recovered in the event of an incident?
3.2.43.2.4.1Who will have an access to the data during the research?
3.2.53.2.5.1How access to data will be controlled, especially in collaborative partnerships?
3.2How will data security and protection of sensitive data be taken care of during the research?If external services are asked for storage, it is important that this does not conflict with the policy of each entity involved in the project, especially concerning the issue of sensitive data. Consider data protection, particularly if your data is sensitive for example containing personal data, politically sensitive information, dual-use data. Explain which institutional data protection policies are in place.
3Storage and backup during the research process
5.1.15.1.1.1How will potential users find out about your data?
5.1.25.1.2.1For how long will the data be stored?
5.1.35.1.3.1Are there any barriers and constraints to making the research data fully or partially accessible?
5.1.45.1.4.1Will journal publishers require deposit of data supporting article findings?
5.1.55.1.5.1Do you need to ask participants for their consent for data to be shared?
5.1How and when will data be shared? Are there possible restrictions to data sharing or embargo reasons?
5.2.15.2.1.15.2.1.25.2.1.3What data must be retained or destroyed for contractual, legal, or regulatory purposes?
5.2.25.2.2.1How it will be decided what data to keep?
5.2.35.2.3.1What procedure would be used to select data to be preserved?
5.2.45.2.4.15.2.4.2true5.2.4.3What repository will you be using? Is this repository conform to the FAIR Data Principles?
5.2.55.2.5.15.2.5.2URL/Name
5.2How will data for preservation be selected, and where will data be preserved long term (for example a data repository or archive)?Consider how and on which repository the data will be made available. Outline the plan for data preservation and give information on how long the data will be retained. Consider the cost of data deposit and storage space for long-term storage. Estimate how much data storage space is needed for the entire duration of the project. Please, explain whether you choose digital repository maintained by a nonprofit organisation?
5.3.15.3.1.1Do data need to be converted to a standard or open format with long-term validity for long-term preservation?
5.3.25.3.2.1Is additional equipment or software needed for scanning or conversion?
5.3.35.3.3.1What mechanism will be used for data sharing; e.g. request handled directly, repository?
5.3What methods or software tools will be needed to access and use the data?The methods applied to data sharing will depend on several factors such as type, size, complexity and sensitivity of data. Indicate whether potential users need specific tools to access and (re-)use the data. Consider the sustainability of software needed for accessing the data.
5.4.15.4.1.1trueWill persistent identifier for the data be obtained?
5.4.25.4.2.1Which existing persistent identifier will be used (e.g. Digital Object Identifiers, Accession Numbers)?
5.4How will the application of a unique and persistent identifier (such as a Digital Object Identifier (DOI)) to each data set be ensured?Explain how the data might be re-used in other contexts. Persistent identifier should be applied so that data can be reliably and efficiently located and referred to. Persistent identifiers also help to track citations and reuse.
5Data sharing and long-term preservationData have to be shared as soon as possible, but at the latest at the time of publication of the respective scientific output. Please, also consider how the reuse of your data will be valued and acknowledged by other researchers. Explain when the data will be made available. Justify the retention period for data storage. Indicate the expected timely release. Indicate whether data sharing will be postponed or restricted for example to publish, protect intellectual property, or seek patents. Consider whether a non-disclosure agreement would give sufficient protection for confidential data.
6.1.16.1.1.1Who will be responsible for data management (i.e. data steward)?
6.1.26.1.2.1What is the role of data steward in your institution?
6.1.36.1.3.1What is his/her position in the institution?
6.1Who will be responsible for data management?
6.2.16.2.1.1What resources will be dedicated to data management and ensuring that data will be FAIR?
6.2.26.2.2.1What are the costs for making data FAIR in your project?
6.2.36.2.3.1How will these be covered?
6.2What resources will be dedicated to data management and ensuring that data will be FAIR?
6Data management responsibilities and resources
 \ No newline at end of file diff --git a/dmp-dataset-templates/NetherlandsOrganisationForScientificResearch (NWO).xml b/dmp-dataset-templates/NetherlandsOrganisationForScientificResearch (NWO).xml new file mode 100644 index 000000000..e4fedbd0e --- /dev/null +++ b/dmp-dataset-templates/NetherlandsOrganisationForScientificResearch (NWO).xml @@ -0,0 +1,885 @@ + + + + + + + + + +
+ + +
+ 1.1 + + + + 1.1.1 + + + + + + + + 1.1.2 + + + + + + + + + Name applicant and project number + + + Fill in the name of the projectleader and the project number allocated by NWO +
+
+ 1.2 + + + + 1.2.1 + + + + + + + + + Did you ask for support of the data management support office of your institution? + + + NWO urgently advises researchers to seek support with the completion of this data management plan at an early stage. All universities and university medical centres provide professionalised support for research data management through their university library or ICT-department. A list of contact persons can be found on the website of NWO. +
+ + 1 + General Information + + +
+
+ + +
+ 2.1 + + + + 2.1.1 + + + + + + + + + Describe the data that will be collected/generated within the project + + + Describe the data and documents that will be generated during the project +
+
+ 2.2 + + + + 2.2.1 + + + + + + + + + Specify the type and format of the data + + + Which type and format data will be stored, digital/non-digital, raw/processed data, software, curricula material or combinations of these. NWO understands ‘data’ to be both collected, unprocessed data as well as analysed, generated data. This can be in all conceivable formats; digital and non-digital (for example samples, completed questionnaires, sound recordings, etc.). +
+ + 2 + Description dataset + + +
+
+ +
+ + +
+ 3.1.1 + + + + 3.1.1.1 + + + + + + + + 3.1.1.2 + + + + + + + + + What is the volume of the data and where will the data be stored? + + + Make a realistic estimation of the volume of the data that will be generated and the necessary storage capacity and state where you plan to store the data during the research. In the case of digital data, NWO data to be stored in the central storage centre of your institution, for example the ICT department and/or the university library. +
+
+ 3.1.2 + + + + 3.1.2.1 + + + + + + + + + Is there sufficient storage capacity during the project? + + + It is important that there is enough storage capacity, and in the case of digital data, also a backup of your data. An automatic backup by the ICT Department is safer than a manual backup. Storage of data on laptops, hard disks or external media is in general risky and will therefore, in principle, not be accepted by NWO. If external services are used then you must ensure that no conflicts of interest with the policy of research partners or co-financiers and with the policy of your department or institute, for example about the security of sensitive data +
+
+ 3.1.3 + + + + 3.1.3.1 + + + + + + + + 3.1.3.2 + + + + + + + + + Will the data be backed up regularly during the project? Who is responsible for this? + + + +
+
+ 3.1.4 + + + + 3.1.4.1 + + + + + + + + 3.1.4.2 + + + + + + + + + + + + What are the expected costs? How will these costs be covered? + Please specify these and state an amount that is as realistic as possible. + + Make a realistic estimation of the costs. Important factors that determine the costs are: +a. the type of data; +b. b. the capacity needed for storage and backup; +c. c. the amount of manual work for the allocating of metadata and the drawing up of other documentation such as code books and queries used in the statistical package; +d. d. the extent to which the data needs to be made secure; +e. e. the hiring in of external data management and other expertise. + +
+ + 3.1 + During the research + + +
+
+ + +
+ 3.2.1 + + + + 3.2.1.1 + + + + + true + + + false + + + + + + + 3.2.1.2 + + + + + + + + + + Will the data be stored in trusted repository after the project? + + + Specify in which trusted repository the data will be stored. There are a number of international certification schemes which determine the trustworthiness of data repositories. Of these the international Data Seal of Approval is the most basic set of criteria. Trusted Digital Repositories with a quality mark include repositories with a Data Seal of Approval, DIN-31644-, ISO-16363- or WDS/ICSU certification. An overview of existing repositories with Data Seal of Approval can be found in this list of repositories. +
+
+ 3.2.2 + + + + 3.2.2.1 + + + + + + + + + How will the data be made findable, accessible, interoperable and re-usable? + + + +
+
+ 3.2.3 + + + + 3.2.3.1 + + + + + true + + + + + + + + Will you provide persistent identifiers for your data? + + + A persistent identifier helps to make your data findable and citable by others. Most trusted repositories will provide a PID upon deposition of the data. +
+
+ 3.2.4 + + + + 3.2.4.1 + + + + + + + + + + + + Persistent identifiers + + + +
+
+ 3.2.5 + + + + 3.2.5.1 + + + + + + + + + For how long will the data be archived? + + + According to the Netherlands Code of Conduct for Scientific Practice (2018), raw and processed data must be stored for a period appropriate for the discipline and methodology at issue. NWO considers a minimal period of 10 years reasonable. +
+
+ 3.2.6 + + + + 3.2.6.1 + + + + + + + + 3.2.6.2 + + + + + + + + + + + + What are the expected costs? How will these costs be covered? + Specify this and state an amount that is as realistic as possible. + + +
+ + 3.2 + After the research + + The data should preferably be stored for the long-term in a national or international trusted repository. If this is not possible then the data should be stored by the institutional repository. Contact the intended data repository or archive well in advance about the requirements for depositing the data. +
+ + + 3 + Data Storage + + +
+
+ +
+ + +
+ 4.1.1 + + + + 4.1.1.1 + + + + + true + + + true + + + true + + + + + + + 4.1.1.2 + + + + + + + + + 4.1.1.3 + + + + + true + + + + + + + + Will you use metadata to describe the data? + + + +
+
+ 4.1.2 + + + + 4.1.2.1 + + + + + + + + 4.1.2.2 + + + + + + + + + URL/Location + + + +
+
+ 4.1.3 + + + + 4.1.3.1 + + + + + true + + + true + + + + + + + 4.1.3.2 + + + + + + + + + 4.1.3.3 + + + + + true + + + + + + + + Will your metadata use standardized vocabularies? + + + +
+
+ 4.1.4 + + + + 4.1.4.1 + + + + + + + + 4.1.4.2 + + + + + + + + + URL/Description + + + +
+
+ 4.1.5 + + + + 4.1.5.1 + + + + + true + + + + + + + + Will you use naming conventions for your data? + + + +
+
+ 4.1.6 + + + + 4.1.6.1 + + + + + + + + 4.1.6.2 + + + + + + + + + URL/Name + + + +
+
+ 4.1.7 + + + + 4.1.7.1 + + + + + + + + + Will you provide clear version numbers for your data? + + + +
+
+ 4.1.8 + + + + 4.1.8.1 + + + + + true + + + + + + + + Will you provide searchable metadata for your data? + + + +
+
+ 4.1.9 + + + + 4.1.9.1 + + + + + + + + + 4.1.9.2 + + + + + true + + + + + + + + What services will you use to provide searchable metadata? + + + +
+
+ 4.1.10 + + + + 4.1.10.1 + + + + + + + + 4.1.10.2 + + + + + + + + + URL/Name + + + +
+ + 4.1 + How will the data be documented? + + +
+ + + 4 + Standards and Metadata + + To make data findable and readable in the future and to be able to interpret it the data collection must be provided with descriptive information in the form of metadata. Without metadata – meaning without a good documentation of the data – most data can not be interpreted ore reused properly. Disciplines have developed different standards for metadata. That way datasets stemming from the same discipline can be linked or data can be combined. A widely used standards is the Dublin Core standard. The Digital Curation Centre (DCC) maintains a list of widely used disciplinary meta data standards. +
+
+ + +
+ 5.1 + + + + 5.1.1 + + + + + later + + + never + + + + + + + + + + + Are the data available for reuse after the project and when? + + + +
+
+ 5.2 + + + + 5.2.1 + + + + + + + + + Please specify how long after the project has ended the data will be made available? + + + +
+
+ 5.3 + + + + 5.3.1 + + + + + + + + + Please explain why the data are not suitable and/or available for reuse. + + + +
+
+ 5.4 + + + + 5.4.1 + + + + + true + + + + + + + 5.4.2 + + + + + + + + + Is there part of the data that cannot be made (directly) available? If yes, then please state the part concerned. + + + +
+
+ 5.5 + + + + 5.5.1 + + + + + true + + + + + + + + Are there any conditions for the reuse of the data? + + + State whether there are embargoes, licenses, commercial objectives or other conditions apply to the reuse of the data. +
+
+ 5.6 + + + + 5.6.1 + + + + + + + + + Are these conditions defined in a consortium agreement? + + + +
+ + 5 + Making data available + + NWO expects data stemming from NOW funded research projects to be made openly available for reuse after the end of the project. Following the guidelines of the European Commission the general rule for NWO is: “as open as possible, as closed as necessary”. If there are good reasons not to make data openly available immediately after the project (or only after an embargo period) please motivate here. In addition it is advised to determine which conditions apply to obtain access to your data. Examples of this are agreements that will be made concerning methodology, publications, the access period, availability of data, the costs (handling fee), copyright aspects, etc. +
+ + \ No newline at end of file diff --git a/dmp-dataset-templates/ScienceFoundationIrelandLuxembourgNationalResearchFund.xml b/dmp-dataset-templates/ScienceFoundationIrelandLuxembourgNationalResearchFund.xml new file mode 100644 index 000000000..3a7467e76 --- /dev/null +++ b/dmp-dataset-templates/ScienceFoundationIrelandLuxembourgNationalResearchFund.xml @@ -0,0 +1,1540 @@ + + + + + + + + + + +
+ +
+ + +
+ 1.1.1 + + + + 1.1.1.1 + + + + + + + + + Explain which methodologies or software will be used if new data are collected or produced. + + + +
+
+ 1.1.2 + + + + 1.1.2.1 + + + + + + + + + State any constraints on re-use of existing data if there are any. + + + +
+
+ 1.1.3 + + + + 1.1.3.1 + + + + + + + + + Explain how data provenance will be documented. + + + +
+
+ 1.1.4 + + + + 1.1.4.1 + + + + + + + + + Briefly state the reasons if the re-use of any existing data sources has been considered but discarded. + + + +
+ + 1.1 + How will new data be collected or produced and/or how will existing data be re-used? + + +
+
+ + +
+ 1.2.1 + + + + 1.2.1.1 + + + + + + + + + + + + Give details on the kind of data: + + + +
+
+ 1.2.2 + + + + 1.2.2.1 + + + + + + + + + + + + Give details on the data format: + + + +
+
+ 1.2.3 + + + + 1.2.3.1 + + + + + + + + + Justify the use of certain formats. + For example, decisions may be based on staff +expertise within the host organisation, a +preference for open formats, standards +accepted by data repositories, widespread +usage within the research community, or on +the software or equipment that will be used. + Give preference to open and standard +formats as they facilitate sharing and +long-term re-use of data (several repositories +provide lists of such ‘preferred formats’). + +
+
+ 1.2.4 + + + + 1.2.4.1 + + + + + + + + + Give details on the volumes. + they can be expressed in storage space required (bytes), +and/or in numbers of objects, files, rows, and columns. + + +
+ + 1.2 + What data (for example the kind, formats, and volumes), will be collected or produced? + + +
+ + + 1 + Data Description And Collection Or Re-use Of Existing Data + + +
+
+ +
+ + +
+ 2.1.1 + + + + 2.1.1.1 + + + + + + + + + Indicate which metadata will be provided to help others identify and discover the data. + + + +
+
+ 2.1.2 + + + + 2.1.2.1 + + + + + + + + + + + + Indicate which metadata standards will be used. + Use community metadata standards where +these are in place + + +
+
+ 2.1.3 + + + + 2.1.3.1 + + + + + + + + + Indicate how the data will be organised during the project. + Mentioning for example +conventions, version control, and folder +structures. Consistent, well-ordered research +data will be easier to find, understand, and +re-use. + + +
+
+ 2.1.4 + + + + 2.1.4.1 + + + + + + + + + Consider what other documentation is needed to enable re-use. + This may include information on the methodology used to +collect the data, analytical and procedural +information, definitions of variables, units of +measurement, and so on. + + +
+
+ 2.1.5 + + + + 2.1.5.1 + + + + + + + + + Consider how this information will be captured and where it will be recorded. + + For example in a database with links to each +item, a ‘readme’ text file, file headers, code +books, or lab notebooks. + +
+ + 2.1 + What metadata and documentation will accompany the data? + + For example the methodology of data collection and way of organizing data +
+
+ + +
+ 2.2.1 + + + + 2.2.1.1 + + + + + + + + + Explain how the consistency and quality of data collection will be controlled and documented + This may include processes +such as calibration, repeated samples or +measurements, standardised data capture, +data entry validation, peer review of data, or +representation with controlled vocabularies. + + +
+ + 2.2 + What data quality control measures will be used? + + +
+ + + 2 + Documentation And Data Quality + + +
+
+ +
+ + +
+ 3.1.1 + + + + 3.1.1.1 + + + + + + + + 3.1.1.2 + + + + + + + + + + + + Describe where the data will be stored and backed up during research activities and how often the backup will be performed. + It is recommended to store data in least at two separate locations. + Give preference to the use of robust, +managed storage with automatic backup, +such as provided by IT support services +of the home institution. Storing data on +laptops, stand-alone hard drives, or external +storage devices such as USB sticks is not +recommended. + +
+ + 3.1 + How will data and metadata be stored and backed up during the research? + + +
+
+ + +
+ 3.2.1 + + + + 3.2.1.1 + + + + + + + + + Explain how the data will be recovered in the event of an incident. + + + +
+
+ 3.2.2 + + + + 3.2.2.1 + + + + + + + + + Explain who will have access to the data during the research and how access to data is controlled, especially in collaborative partnerships. + + + +
+
+ 3.2.3 + + + + 3.2.3.1 + + + + + + + + + Describe the main risks and how these will be managed. + Consider data protection, particularly +if your data is sensitive for example +containing personal data, politically sensitive +information, or trade secrets. + + +
+
+ 3.2.4 + + + + 3.2.4.1 + + + + + + + + + Explain which institutional data protection policies are in place. + + + +
+ + 3.2 + How will data security and protection of sensitive data be taken care of during the research? + + +
+ + + 3 + Storage And Backup During The Research Process + + +
+ +
+ +
+ + +
+ 5.1.1 + + + + 5.1.1.1 + + + + + + + + + Explain how the data will be discoverable. and shared + + For example by deposit in a +trustworthy data repository, indexed in a +catalogue, use of a secure data service, +direct handling of data requests, or use of +another mechanism. + +
+
+ 5.1.2 + + + + 5.1.2.1 + + + + + + + + + Outline the plan for data preservation and give information on how long the data will be retained. + + + +
+
+ 5.1.3 + + + + 5.1.3.1 + + + + + + + + + Explain when the data will be made available. + + + +
+
+ 5.1.4 + + + + 5.1.4.1 + + + + + + + + + Indicate the expected timely release. + + + +
+
+ 5.1.5 + + + + 5.1.5.1 + + + + + true + + + + + + + + Will exclusive use of the data be claimed? + + + +
+
+ 5.1.6 + + + + 5.1.6.1 + + + + + + + + 5.1.6.2 + + + + + + + + + For what reason and how long exclusive use will be claimed? + + + +
+
+ 5.1.7 + + + + 5.1.7.1 + + + + + + + + + + + 5.1.7.2 + + + + + + + + + Indicate whether data sharing will be postponed or restricted + + For example to +publish, protect intellectual property, or seek +patents. + +
+
+ 5.1.8 + + + + 5.1.8.1 + + + + + + + + + Indicate who will be able to use the data. + + + +
+
+ 5.1.9 + + + + 5.1.9.1 + + + + + true + + + true + + + + + + + + Is it necessary to restrict access to certain communities or to apply a data sharing agreement? + + + +
+
+ 5.1.10 + + + + 5.1.10.1 + + + + + + + + + Explain how and why. + + + +
+
+ 5.1.11 + + + + 5.1.11.1 + + + + + + + + + Explain what action will be taken to overcome or to minimise restrictions. + + + +
+ + 5.1 + How and when will data be shared? Are there possible restrictions to data sharing or embargo reasons? + + +
+
+ + +
+ 5.2.1 + + + + 5.2.1.1 + + + + + + + + 5.2.1.2 + + + + + + + + + + + + Indicate what data must be retained or destroyed for contractual, legal, or regulatory purposes. + + + +
+
+ 5.2.2 + + + + 5.2.2.1 + + + + + + + + + Indicate how it will be decided what data to keep. + + + +
+
+ 5.2.3 + + + + 5.2.3.1 + + + + + + + + + Describe the data to be preserved long-term. + + + +
+
+ 5.2.4 + + + + 5.2.4.1 + + + + + + + + + Explain the foreseeable research uses (and/ or users) for the data. + + + +
+
+ 5.2.5 + + + + 5.2.5.1 + + + + + + + + + Indicate where the data will be deposited. + + + +
+
+ 5.2.6 + + + + 5.2.6.1 + + + + + false + + + + + + + + Will there be established repository proposed? + + + +
+
+ 5.2.7 + + + + 5.2.7.1 + + + + + + + + + Demonstrate that the data can be curated effectively beyond the lifetime of the grant. + It is recommended to demonstrate that the +repositories policies and procedures +(including any metadata standards, and +costs involved) have been checked. + + +
+ + 5.2 + How will data for preservation be selected, and where data will be preserved long-term? + + For example a data repository or archive +
+
+ + +
+ 5.3.1 + + + + 5.3.1.1 + + + + + Another mechanism + + + + + + + + + + 5.3.1.2 + + + + + + + + + Indicate how the data will be shared. + + + +
+
+ 5.3.2 + + + + 5.3.2.1 + + + + + + + + + Indicate whether potential users need specific tools to access and (re-)use the data. + Consider the sustainability of software +needed for accessing the data. + + +
+ + 5.3 + What methods or software tools are needed to access and use data? + + +
+
+ + +
+ 5.4.1 + + + + 5.4.1.1 + + + + + + + + + Explain how the data might be re-used in other contexts + Persistent identifiers should +be applied so that data can be reliably and +efficiently located and referred to. Persistent +identifiers also help to track citations and +re-use. + + +
+
+ 5.4.2 + + + + 5.4.2.1 + + + + + + + + + Indicate whether a persistent identifier for the data will be pursued + Typically, a +trustworthy, long-term repository will provide +a persistent identifier. + + +
+ + 5.4 + How will the application of a unique and persistent identifier to each data set be ensured? + + Such as a Digital Object Identifier (DOI) +
+ + + 5 + Data Sharing And Long-term Preservation + + +
+
+ +
+ + +
+ 6.1.1 + + + + 6.1.1.1 + + + + + + + + 6.1.1.2 + + + + + + + + + Outline the roles and responsibilities for data management/stewardship activities. + Name responsible individual(s) where possible. + For example data capture, metadata production, +data quality, storage and backup, data +archiving, and data sharing. + +
+
+ 6.1.2 + + + + 6.1.2.1 + + + + + true + + + + + + + + Is it a collaborative project + + + +
+
+ 6.1.3 + + + + 6.1.3.1 + + + + + + + + + Explain the co-ordination of data management responsibilities across partners + + + +
+
+ 6.1.4 + + + + 6.1.4.1 + + + + + + + + + Indicate who is responsible for implementing the DMP, and for ensuring it is reviewed and, if necessary, revised. + + Consider regular updates of the DMP + +
+ + 6.1 + Who will be responsible for data management? + + For example role, position, and institution. i.e. the data steward +
+
+ + +
+ 6.2.1 + + + + 6.2.1.1 + + + + + + + + + Explain how the necessary resources (for example time) to prepare the data for sharing/preservation (data curation) have been costed in. + Carefully consider and justify +any resources needed to deliver the data. +These may include storage costs, hardware, +staff time, costs of preparing data for +deposit, and repository charges. + + +
+
+ 6.2.2 + + + + 6.2.2.1 + + + + + true + + + + + + + + Indicate whether additional resources will be needed to prepare data for deposit or to meet any charges from data repositories + + + +
+
+ 6.2.3 + + + + 6.2.3.1 + + + + + + + + + Explain how much is needed and how such costs will be covered. + + + +
+ + 6.2 + What resources will be dedicated to data management and ensuring that data will be FAIR (Findable, Accessible, Interoperable, Re-usable)? + + For example financial and time +
+ + + 6 + Data Management Responsibilities And Resources + + +
+ + \ No newline at end of file diff --git a/dmp-dataset-templates/SwedishResearchCouncil.xml b/dmp-dataset-templates/SwedishResearchCouncil.xml new file mode 100644 index 000000000..d3d7879d5 --- /dev/null +++ b/dmp-dataset-templates/SwedishResearchCouncil.xml @@ -0,0 +1 @@ +
1.1.11.1.1.1What is the purpose of the data collection/generation and its relation to the objectives of the project?
1.1.21.1.2.1What is the origin of the data?
1.1How will data be collected, created or reused?
1.2.11.2.1.11.2.1.21.2.1.31.2.1.4What types of data will be created and/or collected, in terms of data format and amount/volume of data?
1.2What types of data will be created and/or collected, in terms of data format and amount/volume of data?
1Description of data – reuse of existing data and/or production of new data
2.1.12.1.1.1truetruetrue2.1.1.22.1.1.3trueWill you use metadata to describe the data?
2.1.22.1.2.12.1.2.2URL/Location
2.1.32.1.3.1truetrue2.1.3.22.1.3.3trueWill your metadata use standardised vocabularies?
2.1.42.1.4.12.1.4.2URL/Description
2.1.52.1.5.1true Will you provide searchable metadata for your data?
2.1.62.1.6.12.1.6.2trueWhat services will you use to provide searchable metadata?
2.1.72.1.7.12.1.7.2URL/Name
2.1How will the material be documented and described, with associated metadata relating to structure, standards and format for descriptions of the content, collection method, etc.?
2.2.12.2.1.1How will data quality be safeguarded and documented (for example repeated measurements, validation of data input, etc.)?
2.2How will data quality be safeguarded and documented (for example repeated measurements, validation of data input, etc.)?
2Documentation and data quality
3.1.13.1.1.1 Is the storage sufficiently secure for the data and does the storage provide backup and recovery procedures?
3.1How is storage and backup of data and metadata safeguarded during the research process?
3.2.13.2.1.1How is data security and controlled access to data safeguarded, in relation to the handling of sensitive data and personal data, for example?
3.2.23.2.2.1keptoninsecureWhat do you plan to do with research data of limited use?
3.2.33.2.3.1Please describe why the data will be kept on insecure, unmanaged storage
3.2How is data security and controlled access to data safeguarded, in relation to the handling of sensitive data and personal data, for example?
3Storage and backup
5.1.15.1.1.1somenoneWill all your data be openly accessible?
5.1.25.1.2.15.1.2.25.1.2.3Data type/ Reason/ URL
5.1.35.1.3.15.1.3.25.1.3.3Data type/ Reason/ URL
5.1How, when and where will research data or information about data (metadata) be made accessible? Are there any conditions, embargoes and limitations on the access to and reuse of data to be considered?
5.2.15.2.1.15.2.1.2In what way is long-term storage safeguarded, and by whom?
5.2.25.2.2.1How will the selection of data for long-term storage be made?
5.2In what way is long-term storage safeguarded, and by whom? How will the selection of data for long-term storage be made?
5.3.15.3.1.1truetrueAre there any methods or tools required to access the data?
5.3.25.3.2.15.3.2.2Please provide links describing the methods for accessing the data.
5.3.35.3.3.15.3.3.2Please provide links describing the tools for accessing the data.
5.3.45.3.4.1forsomedatafornodataDo supported open-source tools exist for accessing the data?
5.3.55.3.5.1Please describe which data require proprietary tools to access the data?
5.3.65.3.6.1Please describe which data require proprietary tools to access the data?
5.3Will specific systems, software, source code or other types of services be necessary in order to understand, partake of or use/analyse data in the long term?
5.4.15.4.1.1Persistent identifiersSelect 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.
5.4How will the use of unique and persistent identifiers, such as a Digital Object Identifier (DOI), be safeguarded?
5Accessibility and long-term storage
6.1.16.1.1.1falseWill you identify a data manager to manage your data, if not who will be responsible for the management of your data?
6.1.26.1.2.1 Identify the people or roles that will be responsible for the management of the project data.
6.1Who is responsible for data management and (possibly) supports the work with this while the research project is in progress? Who is responsible for data management, ongoing management and long-term storage after the research project has ended?
6.2.16.2.1.1What resources (costs, labour input or other) will be required for data management (including storage, back-up, provision of access and processing for long-term storage)?
6.2.26.2.2.1What resources will be needed to ensure that data fulfill the FAIR (findable, accessible, interoperable and reusable) principles?
6.2What resources (costs, labour input or other) will be required for data management (including storage, back-up, provision of access and processing for long-term storage)? What resources will be needed to ensure that data fulfil the FAIR principles?
6Responsibility and resources
 \ No newline at end of file diff --git a/dmp-dataset-templates/TheResearchCouncilOfNorway.xml b/dmp-dataset-templates/TheResearchCouncilOfNorway.xml new file mode 100644 index 000000000..7170ca130 --- /dev/null +++ b/dmp-dataset-templates/TheResearchCouncilOfNorway.xml @@ -0,0 +1,293 @@ + + + + + + + +
+ +
+ + +
+ 1.1.1 + + + + 1.1.1.1 + + + + + + + + + What is the purpose of the data collection/generation and its relation to the objectives of the project? + + + +
+
+ 1.1.2 + + + + 1.1.2.1 + + + + + + + + + What types and formats of data will the project generate/collect? + + + +
+
+ 1.1.3 + + + + 1.1.3.1 + + + + + + + + + What is the origin of the data? + + + +
+ + 1.1 + The kind of data that will be generated + + +
+
+ + +
+ 1.2.1 + + + + 1.2.1.1 + + + + + true + + + true + + + + + + + 1.2.1.2 + + + + + + + + + 1.2.1.3 + + + + + true + + + + + + + + Will you use metadata to describe the data? + + + +
+
+ 1.2.2 + + + + 1.2.2.1 + + + + + + + + 1.2.2.2 + + + + + + + + + URL/Location + + + +
+ + 1.2 + How the data will be described + + +
+ + + 1 + Data Origin and Description + + +
+
+ + +
+ 2.1 + + + + 2.1.1 + + + + + + + + + Where the data will be stored + + + +
+ + 2 + Storage and Backup + + +
+
+ +
+ + +
+ 3.1.1 + + + + 3.1.1.1 + + + + + + + + + Are there ethical or legal issues that can impact sharing the data? + + + +
+
+ 3.1.2 + + + + 3.1.2.1 + + + + + + + + + 3.1.2.2 + + + + + true + + + + + + + + How will the data be made available? + + + +
+
+ 3.1.3 + + + + 3.1.3.1 + + + + + + + + 3.1.3.2 + + + + + + + + + URL/Name + + + +
+ + 3.1 + Whether and how the data can be shared + + +
+ + + 3 + Data Sharing and Long-term Preservation + + +
+ + \ No newline at end of file diff --git a/dmp-dataset-templates/UKResearchInnovation.xml b/dmp-dataset-templates/UKResearchInnovation.xml new file mode 100644 index 000000000..2d0953e0e --- /dev/null +++ b/dmp-dataset-templates/UKResearchInnovation.xml @@ -0,0 +1 @@ +
1.1.11.1.1.1What is the purpose of the data collection/generation and its relation to the objectives of the project?Up to three lines of text that summarise the type of study (or studies) for which the data are being collected.
1.1Type of study
1.2.11.2.1.1What is the origin of the data?Types of data to be managed in the following terms: quantitative, qualitative; generated from surveys, clinical measurements, interviews, medical records, electronic health records, administrative records, genotypic data, images, tissue samples...
1.2Types of data
1.3.11.3.1.1What types and formats of data will the project generate/collect?File formats, software used, number of records, databases, sweeps, repetitions… (in terms that are meaningful in your field). Do formats and software enable sharing and long-term validity of data?
1.3Format and scale of the data
1Description of the data
2.1.12.1.1.1What internationally recognised licence will you use for your data?
2.1.22.1.2.1trueWill you use naming conventions for your data?
2.1.32.1.3.12.1.3.2URL/Name
2.1Methodologies for data collection / generationHow the data will be collected/generated and which community data standards (if any) will be used at this stage.
2.2.12.2.1.1truetrue2.2.1.22.2.1.3trueWill you use standardised vocabularies?
2.2.22.2.2.12.2.2.2URL/Description
2.2.32.2.3.1truefalseWill you use standardised formats for some or all of your data?
2.2.42.2.4.12.2.4.2trueWhich standardised data formats do you plan on using?
2.2.52.2.5.12.2.5.2Standardised formatsIs the structure of the file(s) provided in a standardised format?
2.2.62.2.6.12.2.6.22.2.6.3Please describe the formats you plan to store your data in, including any URLs to documentation.
2.2.72.2.7.1Will you provide metadata describing the quality of the data?
2.2Data quality and standardsHow consistency and quality of data collection / generation will be controlled and documented, through processes of calibration, repeat samples or measurements, standardised data capture or recording, data entry validation, peer review of data or representation with controlled vocabularies.
2Data collection / generationMake sure you justify why new data collection or long term management is needed in your Case for Support. Focus in this template on the good practice and standards for ensuring new data are of high quality and processing is well documented
3.1.13.1.1.1Briefly describe how data will be stored, backed-up, managed and curated in the short to medium term. Specify any community agreed or other formal data standards used (with URL references).
3.1Managing, storing and curating data
3.2.13.2.1.1truetruetrue3.2.1.23.2.1.3trueWill you use metadata to describe the data?
3.2.23.2.2.13.2.2.2URL/Location
3.2.33.2.3.1Will your metadata be harvestable?
3.2Metadata standards and data documentationWhat metadata is produced about the data generated from the research/innovation? For example, descriptions of data that enable research/innovation data to be used by others outside of your own team. This may include documenting the methods used to generate the data, analytical and procedural information, capturing instrument metadata alongside data, documenting provenance of data and their coding, detailed descriptions for variables, records,etc.
3.3Data preservation strategy and standards
3Data management, documentation and curation
4.1.14.1.1.1truefalse4.1.1.2If your organisation is ISO compliant? If yes, please state the registration number.
4.1.24.1.2.1Identify formal information standards with which your study is or will be compliant.
4.1Formal information/data security standards
4.2.14.2.1.1keptoninsecureWhat do you plan to do with research data of limited use
4.2.24.2.2.1Please describe why the data will be kept on insecure, unmanaged storage
4.2Main risks to data securityAll personal data has an element of risk. Summarise the main risks to the confidentiality and security of information related to human participants, the level of risk and how these risks will be managed. Cover the main processes or facilities for storage and processing of personal data, data access, with controls put in place and any auditing of user compliance with consent and security conditions. It is not sufficient to write not applicable under this heading
4Data security and confidentiality of potentially disclosive informationThis section MUST be completed if your data includes personal data relating to human participants. For other research/innovation, the safeguarding and security of data should also be considered. Information provided will be in line with your ethical review. Please note this section concerns protecting the data, not the patients.
5.1.15.1.1.15.1.1.25.1.1.3trueHow will the data be made available?Identify any data repository (-ies) that are, or will be, entrusted with storing, curating and/or sharing data from your study, where they exist for particular disciplinary domains or data types.
5.1.25.1.2.15.1.2.2URL/Name
5.1.35.1.3.1somenoneWill all your data be openly accessible?Is the data you propose to collect (or existing data you propose to use) in the study suitable for sharing? If yes, briefly state why it is suitable. If No, indicate why the data will not be suitable for sharing and then go to Section 6.
5.1.45.1.4.15.1.4.25.1.4.3Data type/ Reason/ URL
5.1.55.1.5.15.1.5.25.1.5.3Data type/ Reason/ URL
5.1Suitability for sharing
5.2.15.2.1.1As part of the consent process, proposed procedures for data sharing should be set out clearly and current and potential future risks associated with this explained to participants.
5.2Restrictions or delays to sharing, with planned actions to limit such restrictionsRestriction to data sharing may be due to participant confidentiality, consent agreements or IPR. Strategies to limit restrictions may include data being anonymised or aggregated; gaining participant consent for data sharing; gaining copyright permissions. For prospective studies, consent procedures should include provision for data sharing to maximise the value of the data for wider research/innovation use, while providing adequate safeguards for participants.
5.3.15.3.1.1truetrueAre there any methods or tools required to access the data?
5.3.25.3.2.15.3.2.2Please provide links describing the methods for accessing the data.
5.3.35.3.3.15.3.3.2Please provide links describing the tools for accessing the data.
5.3.45.3.4.1How widely accessible is this depository? Indicate whether your policy or approach to data sharing is (or will be) published on your study website (or by other means).
5.3Discovery by potential users of the research/innovation dataIndicate how potential new users (outside of your organisation) can find out about your data and identify whether it could be suitable for their research/innovation purposes, e.g. through summary information (metadata) being readily available on the study website or in databases or catalogues.
5.4.15.4.1.1falseWill you identify a data manager to manage your data, if not who will be responsible for the management of your data?
5.4.25.4.2.1Identify the people or roles that will be responsible for the management of the project data
5.4Governance of accessIdentify who makes or will make the decision on whether to supply the data to a potential new user. Indicate whether the data will be deposited in and available from an identified community database, repository, archive or other infrastructure established to curate and share data.
5.5.15.5.1.1What are the timescale/dependencies for when data will be accessible to others outside of your team?Summarize the principles of your current/intended policy.
5.5The study team’s exclusive use of the dataUKRI’s requirement is for timely data sharing, with the understanding that a limited, defined period of exclusive use of data for primary research/innovation is reasonable according to the nature and value of the data, and that this restriction on sharing should be based on simple, clear principles.
5.6.15.6.1.1Indicate whether external users are (will be) bound by data sharing agreements, setting out their main responsibilities.
5.6Regulation of responsibilities of users
5Data sharing and access
6.16.1.16.1.2Apart from the PI, who is responsible at your organisation/within your consortia for
6Responsibilities
7.17.1.1Complete, policies which are relevant to your study, and are in the public domain, e.g. accessible through the internet. (Data Management Policy & Procedures, Data Security Policy, Data Sharing Policy, Institutional Information Policy)
7Relevant institutional, departmental or study policies on data sharing and data security
8.18.1.1falsetrue8.1.2Is Author of this Data Management Plan different to that of the Principal Investigator?
8.28.2.18.2.28.2.3Author of this Data Management Plan details
8Author of this Data Management Plan (Name) and, if different to that of the Principal Investigator, their telephone & email contact details
 \ 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 new file mode 100644 index 000000000..4cc036bdb --- /dev/null +++ b/dmp-db-scema/updates/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/Funder_add_column_CreationUser.sql b/dmp-db-scema/updates/04/Funder_add_column_CreationUser.sql new file mode 100644 index 000000000..7c84eb69f --- /dev/null +++ b/dmp-db-scema/updates/04/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/Funder_update_CreationUser_values.sql new file mode 100644 index 000000000..130130ab9 --- /dev/null +++ b/dmp-db-scema/updates/04/Funder_update_CreationUser_values.sql @@ -0,0 +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 diff --git a/dmp-db-scema/updates/04/Researcher_add_column_CreationUser.sql b/dmp-db-scema/updates/04/Researcher_add_column_CreationUser.sql new file mode 100644 index 000000000..55b7a4542 --- /dev/null +++ b/dmp-db-scema/updates/04/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/05/External_References_Reference_Prefix_Update.sql b/dmp-db-scema/updates/05/External_References_Reference_Prefix_Update.sql new file mode 100644 index 000000000..615ebb4c9 --- /dev/null +++ b/dmp-db-scema/updates/05/External_References_Reference_Prefix_Update.sql @@ -0,0 +1,31 @@ +-- 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/Grant_Funder_Project_Reference_Prefix_Update.sql b/dmp-db-scema/updates/05/Grant_Funder_Project_Reference_Prefix_Update.sql new file mode 100644 index 000000000..bb1e529fe --- /dev/null +++ b/dmp-db-scema/updates/05/Grant_Funder_Project_Reference_Prefix_Update.sql @@ -0,0 +1,26 @@ +-- 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-frontend/angular.json b/dmp-frontend/angular.json index 1ccca7310..6de6bf84c 100644 --- a/dmp-frontend/angular.json +++ b/dmp-frontend/angular.json @@ -23,9 +23,12 @@ "styles": [ "src/styles.scss", "src/assets/scss/material-dashboard.scss", - "src/assets/css/demo.css" + "src/assets/css/demo.css", + "node_modules/cookieconsent/build/cookieconsent.min.css" ], - "scripts": [] + "scripts": [ + "node_modules/cookieconsent/build/cookieconsent.min.js" + ] }, "configurations": { "production": { diff --git a/dmp-frontend/browserslist b/dmp-frontend/browserslist new file mode 100644 index 000000000..80848532e --- /dev/null +++ b/dmp-frontend/browserslist @@ -0,0 +1,12 @@ +# This file is used by the build system to adjust CSS and JS output to support the specified browsers below. +# For additional information regarding the format and rule options, please see: +# https://github.com/browserslist/browserslist#queries + +# You can see what browsers were selected by your queries by running: +# npx browserslist + +> 0.5% +last 2 versions +Firefox ESR +not dead +not IE 9-11 # For IE 9-11 support, remove 'not'. \ No newline at end of file diff --git a/dmp-frontend/package.json b/dmp-frontend/package.json index 8b88cd0a1..cc6e1ab8a 100644 --- a/dmp-frontend/package.json +++ b/dmp-frontend/package.json @@ -1,63 +1,61 @@ { - "name": "dmp-frontend2", - "version": "0.0.0", - "license": "MIT", - "scripts": { - "ng": "ng", - "start": "ng serve", - "build": "ng build --prod", - "test": "ng test", - "lint": "ng lint", - "e2e": "ng e2e" - }, - "private": true, - "dependencies": { - "@angular/animations": "^6.1.7", - "@angular/common": "^6.1.7", - "@angular/compiler": "^6.1.7", - "@angular/core": "^6.1.7", - "@angular/flex-layout": "6.0.0-beta.18", - "@angular/forms": "^6.1.7", - "@angular/material-moment-adapter": "^6.4.7", - "@angular/platform-browser": "^6.1.7", - "@ngx-translate/core": "^10.0.2", - "@ngx-translate/http-loader": "^3.0.1", - "@swimlane/ngx-datatable": "^13.1.0", - "bootstrap": "^4.1.3", - "core-js": "^2.5.5", - "file-saver": "^2.0.0-rc.3", - "moment": "^2.22.2", - "moment-timezone": "^0.5.23", - "ngx-cookie-service": "^1.0.10", - "rxjs": "^6.3.2", - "rxjs-compat": "^6.3.2", - "web-animations-js": "^2.3.1", - "zone.js": "^0.8.26" - }, - "devDependencies": { - "@angular-devkit/build-angular": "^0.8.5", - "@angular/cdk": "^6.3.0", - "@angular/material": "^6.4.7", - "@angular/cli": "6.2.5", - "@angular/compiler-cli": "^6.1.10", - "@angular/http": "^6.1.10", - "@angular/platform-browser-dynamic": "^6.1.10", - "@angular/router": "^6.1.10", - "@angular/language-service": "^6.1.10", - "@types/facebook-js-sdk": "^2.8.4", - "@types/file-saver": "^1.3.1", - "@types/gapi": "^0.0.36", - "@types/gapi.auth2": "^0.0.47", - "@types/jasmine": "~2.8.9", - "@types/jasminewd2": "~2.0.5", - "@types/moment-timezone": "^0.5.4", - "@types/node": "^10.11.7", - "codelyzer": "~4.5.0", - "jasmine-core": "^3.2.1", - "jasmine-spec-reporter": "^4.2.1", - "protractor": "~5.4.1", - "ts-node": "~7.0.1", - "tslint": "~5.11.0", - "typescript": "2.9.1" - } + "name": "dmp-frontend2", + "version": "0.0.0", + "license": "MIT", + "scripts": { + "ng": "ng", + "start": "ng serve", + "build": "ng build --prod", + "test": "ng test", + "lint": "ng lint", + "e2e": "ng e2e" + }, + "private": true, + "dependencies": { + "@angular/animations": "^8.2.7", + "@angular/common": "^8.2.7", + "@angular/compiler": "^8.2.7", + "@angular/core": "^8.2.7", + "@angular/forms": "^8.2.7", + "@angular/material-moment-adapter": "^8.2.0", + "@angular/platform-browser": "^8.2.7", + "@ngx-translate/core": "^11.0.1", + "@ngx-translate/http-loader": "^4.0.0", + "@swimlane/ngx-datatable": "^16.0.2", + "@w11k/angular-sticky-things": "^1.1.2", + "bootstrap": "^4.3.1", + "cookieconsent": "^3.1.1", + "core-js": "^2.5.5", + "file-saver": "^2.0.2", + "moment": "^2.24.0", + "moment-timezone": "^0.5.26", + "ngx-cookie-service": "^2.2.0", + "ngx-cookieconsent": "^2.2.3", + "rxjs": "^6.3.2", + "tslib": "^1.10.0", + "web-animations-js": "^2.3.2", + "zone.js": "~0.9.1" + }, + "devDependencies": { + "@angular-devkit/build-angular": "~0.803.5", + "@angular/cdk": "^8.2.0", + "@angular/material": "^8.2.0", + "@angular/cli": "8.3.5", + "@angular/compiler-cli": "^8.2.7", + "@angular/platform-browser-dynamic": "^8.2.7", + "@angular/router": "^8.2.7", + "@angular/language-service": "^8.2.7", + "@types/facebook-js-sdk": "^3.3.0", + "@types/file-saver": "^2.0.1", + "@types/gapi": "^0.0.39", + "@types/gapi.auth2": "^0.0.50", + "@types/jasmine": "~3.4.0", + "@types/jasminewd2": "~2.0.6", + "@types/moment-timezone": "^0.5.12", + "@types/node": "^10.11.7", + "codelyzer": "^5.1.1", + "ts-node": "~8.4.1", + "tslint": "~5.20.0", + "typescript": "3.5.3" + } } diff --git a/dmp-frontend/src/app/app-routing.module.ts b/dmp-frontend/src/app/app-routing.module.ts index 6e0f16745..9ba283c4d 100644 --- a/dmp-frontend/src/app/app-routing.module.ts +++ b/dmp-frontend/src/app/app-routing.module.ts @@ -14,7 +14,7 @@ const appRoutes: Routes = [ }, { path: 'datasetcreatewizard', - loadChildren: './ui/dataset-create-wizard/dataset-create-wizard.module#DatasetCreateWizardModule', + loadChildren: () => import('./ui/dataset-create-wizard/dataset-create-wizard.module').then(m => m.DatasetCreateWizardModule), data: { breadcrumb: true, title: 'GENERAL.TITLES.DATASETCREATEWIZARD' @@ -22,7 +22,7 @@ const appRoutes: Routes = [ }, { path: 'explore', - loadChildren: './ui/explore-dataset/explore-dataset.module#ExploreDatasetModule', + loadChildren: () => import('./ui/explore-dataset/explore-dataset.module').then(m => m.ExploreDatasetModule), data: { breadcrumb: true, title: 'GENERAL.TITLES.EXPLORE' @@ -30,7 +30,7 @@ const appRoutes: Routes = [ }, { path: 'explore-plans', - loadChildren: './ui/explore-dmp/explore-dmp.module#ExploreDmpModule', + loadChildren: () => import('./ui/explore-dmp/explore-dmp.module').then(m => m.ExploreDmpModule), data: { breadcrumb: true, title: 'GENERAL.TITLES.EXPLORE-PLANS' @@ -38,7 +38,7 @@ const appRoutes: Routes = [ }, { path: 'datasets', - loadChildren: './ui/dataset/dataset.module#DatasetModule', + loadChildren: () => import('./ui/dataset/dataset.module').then(m => m.DatasetModule), data: { breadcrumb: true, title: 'GENERAL.TITLES.DATASETS' @@ -46,23 +46,24 @@ const appRoutes: Routes = [ }, { path: 'about', - loadChildren: './ui/about/about.module#AboutModule', + loadChildren: () => import('./ui/about/about.module').then(m => m.AboutModule), data: { breadcrumb: true, title: 'GENERAL.TITLES.ABOUT' } }, - { - path: 'grants', - loadChildren: './ui/grant/grant.module#GrantModule', - data: { - breadcrumb: true, - title: 'GENERAL.TITLES.GRANTS' - } - }, + // ----------- UNCOMMENT TO ADD AGAIN GRANTS -------- + // { + // path: 'grants', + // loadChildren: () => import('./ui/grant/grant.module').then(m => m.GrantModule), + // data: { + // breadcrumb: true, + // title: 'GENERAL.TITLES.GRANTS' + // } + // }, { path: 'plans', - loadChildren: './ui/dmp/dmp.module#DmpModule', + loadChildren: () => import('./ui/dmp/dmp.module').then(m => m.DmpModule), data: { breadcrumb: true, title: 'GENERAL.TITLES.PLANS' @@ -70,7 +71,7 @@ const appRoutes: Routes = [ }, { path: 'dmp-profiles', - loadChildren: './ui/admin/dmp-profile/dmp-profile.module#DmpProfileModule', + loadChildren: () => import('./ui/admin/dmp-profile/dmp-profile.module').then(m => m.DmpProfileModule), data: { breadcrumb: true, title: 'GENERAL.TITLES.DMP-PROFILES' @@ -78,7 +79,7 @@ const appRoutes: Routes = [ }, { path: 'quick-wizard', - loadChildren: './ui/quick-wizard/quick-wizard.module#OuickWizardModule', + loadChildren: () => import('./ui/quick-wizard/quick-wizard.module').then(m => m.OuickWizardModule), data: { breadcrumb: true, title: "GENERAL.TITLES.QUICK-WIZARD" @@ -86,29 +87,69 @@ const appRoutes: Routes = [ }, { path: 'dataset-profiles', - loadChildren: './ui/admin/dataset-profile/dataset-profile.module#DatasetProfileModule', + loadChildren: () => import('./ui/admin/dataset-profile/dataset-profile.module').then(m => m.DatasetProfileModule), data: { breadcrumb: true, title: 'GENERAL.TITLES.DATASET-PROFILES' } }, + { + path: 'contact-support', + loadChildren: () => import('./ui/contact/contact.module').then(m => m.ContactModule), + data: { + breadcrumb: true, + title: 'CONTACT.SUPPORT.TITLE' + } + }, + { + path: 'glossary', + loadChildren: () => import('./ui/glossary/glossary.module').then(m => m.GlossaryModule), + data: { + breadcrumb: true, + title: 'GLOSSARY.TITLE' + } + }, + { + path: 'faq', + loadChildren: () => import('./ui/faq/faq.module').then(m => m.FaqModule), + data: { + breadcrumb: true, + title: 'FAQ.TITLE' + } + }, + { + path: 'privacy-policy', + loadChildren: () => import('./ui/sidebar/sidebar-footer/privacy/privacy.module').then(m => m.PrivacyModule), + data: { + breadcrumb: true, + title: 'GENERAL.TITLES.PRIVACY' + } + }, + { + path: 'terms-of-service', + loadChildren: () => import('./ui/sidebar/sidebar-footer/terms/terms.module').then(m => m.TermsModule), + data: { + breadcrumb: true, + title: 'GENERAL.TITLES.TERMS' + } + }, { path: 'home', - loadChildren: './ui/dashboard/dashboard.module#DashboardModule', + loadChildren: () => import('./ui/dashboard/dashboard.module').then(m => m.DashboardModule), data: { breadcrumb: true } }, { path: 'unauthorized', - loadChildren: './ui/misc/unauthorized/unauthorized.module#UnauthorizedModule', + loadChildren: () => import('./ui/misc/unauthorized/unauthorized.module').then(m => m.UnauthorizedModule), data: { breadcrumb: true }, }, { path: 'users', - loadChildren: './ui/admin/user/user.module#UserModule', + loadChildren: () => import('./ui/admin/user/user.module').then(m => m.UserModule), data: { breadcrumb: true, title: 'GENERAL.TITLES.USERS' @@ -116,7 +157,7 @@ const appRoutes: Routes = [ }, { path: 'profile', - loadChildren: './ui/user-profile/user-profile.module#UserProfileModule', + loadChildren: () => import('./ui/user-profile/user-profile.module').then(m => m.UserProfileModule), data: { breadcrumb: true, title: 'GENERAL.TITLES.PROFILE' @@ -124,14 +165,14 @@ const appRoutes: Routes = [ }, { path: 'login/admin', - loadChildren: './ui/auth/admin-login/admin-login.module#AdminLoginModule', + loadChildren: () => import('./ui/auth/admin-login/admin-login.module').then(m => m.AdminLoginModule), data: { breadcrumb: true }, }, { path: 'login', - loadChildren: './ui/auth/login/login.module#LoginModule', + loadChildren: () => import('./ui/auth/login/login.module').then(m => m.LoginModule), data: { breadcrumb: true, title: 'GENERAL.TITLES.LOGIN' diff --git a/dmp-frontend/src/app/app.component.scss b/dmp-frontend/src/app/app.component.scss index 634a06f22..51ca45e9b 100644 --- a/dmp-frontend/src/app/app.component.scss +++ b/dmp-frontend/src/app/app.component.scss @@ -1,17 +1,21 @@ .fixed { - position: fixed; - top: 0; - /* Sets the sticky toolbar to be on top */ - z-index: 1000; - width: 100%; + position: fixed; + top: 0; + /* Sets the sticky toolbar to be on top */ + z-index: 1000; + width: 100%; } .main-container { - margin-top: 64px; - padding-top: 10px; + margin-top: 64px; + padding-top: 10px; } .sidebar-shadow { - box-shadow: 0 4px 18px 0px rgba(0, 0, 0, 0.12), 0 7px 10px -5px rgba(0, 0, 0, 0.15); - z-index: 100; + box-shadow: 0 4px 18px 0px rgba(0, 0, 0, 0.12), 0 7px 10px -5px rgba(0, 0, 0, 0.15); + z-index: 100; +} + +::ng-deep .mat-chip { + height: auto !important; } diff --git a/dmp-frontend/src/app/app.component.ts b/dmp-frontend/src/app/app.component.ts index 4c0a5ade9..013a2c0f5 100644 --- a/dmp-frontend/src/app/app.component.ts +++ b/dmp-frontend/src/app/app.component.ts @@ -1,13 +1,17 @@ + +import { of as observableOf, Subscription } from 'rxjs'; + +import { switchMap, filter, map } from 'rxjs/operators'; import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { Observable } from 'rxjs'; import { environment } from '../environments/environment'; import { AuthService } from './core/services/auth/auth.service'; import { CultureService } from './core/services/culture/culture-service'; import { BreadCrumbResolverService } from './ui/misc/breadcrumb/service/breadcrumb.service'; -import { filter, map } from 'rxjs/operators'; import { Title } from '@angular/platform-browser'; +import { NgcCookieConsentService, NgcStatusChangeEvent } from "ngx-cookieconsent"; +import { CookieService } from "ngx-cookie-service"; declare const gapi: any; @@ -20,9 +24,10 @@ declare var $: any; }) export class AppComponent implements OnInit { - hasBreadCrumb = Observable.of(false); + hasBreadCrumb = observableOf(false); sideNavOpen = false; helpContentEnabled = environment.HelpService.Enabled; + private statusChangeSubscription: Subscription; constructor( private router: Router, @@ -31,8 +36,9 @@ export class AppComponent implements OnInit { private translate: TranslateService, private breadCrumbResolverService: BreadCrumbResolverService, private titleService: Title, - private language: TranslateService, - private cultureService: CultureService + private cultureService: CultureService, + private cookieService: CookieService, + private ccService: NgcCookieConsentService ) { this.initializeServices(); } @@ -46,12 +52,16 @@ export class AppComponent implements OnInit { } ngOnInit() { - this.hasBreadCrumb = this.router.events - .filter(event => event instanceof NavigationEnd) - .map(() => this.route) - .map(route => route.firstChild) - .switchMap(route => route.data) - .map(data => data['breadcrumb']); + if (!this.cookieService.check("cookiesConsent")) { + this.cookieService.set("cookiesConsent", "false", 356); + } + + this.hasBreadCrumb = this.router.events.pipe( + filter(event => event instanceof NavigationEnd), + map(() => this.route), + map(route => route.firstChild), + switchMap(route => route.data), + map(data => data['breadcrumb'])); const appTitle = this.titleService.getTitle(); this.router @@ -69,17 +79,45 @@ export class AppComponent implements OnInit { }) ).subscribe((ttl: string) => { if (ttl.length > 0) { - this.language.get(ttl).subscribe((translated: string) => { - this.language.get('GENERAL.TITLES.PREFIX').subscribe( (titlePrefix: string) => { + this.translate.get(ttl).subscribe((translated: string) => { + this.translate.get('GENERAL.TITLES.PREFIX').subscribe((titlePrefix: string) => { this.titleService.setTitle(titlePrefix + translated); }); }); } else { - this.language.get('GENERAL.TITLES.GENERAL').subscribe((translated: string) => { + this.translate.get('GENERAL.TITLES.GENERAL').subscribe((translated: string) => { this.titleService.setTitle(translated); }); } }); + + this.statusChangeSubscription = this.ccService.statusChange$.subscribe((event: NgcStatusChangeEvent) => { + if (event.status == "dismiss") { + this.cookieService.set("cookiesConsent", "true", 365); + } + }); + + this.translate + .get(['COOKIE.MESSAGE', 'COOKIE.DISMISS', 'COOKIE.DENY', 'COOKIE.LINK', 'COOKIE.POLICY']) + .subscribe(data => { + this.ccService.getConfig().content = this.ccService.getConfig().content || {}; + // Override default messages with the translated ones + this.ccService.getConfig().content.message = data['COOKIE.MESSAGE']; + this.ccService.getConfig().content.dismiss = data['COOKIE.DISMISS']; + this.ccService.getConfig().content.deny = data['COOKIE.DENY']; + this.ccService.getConfig().content.link = data['COOKIE.LINK']; + this.ccService.getConfig().content.policy = data['COOKIE.POLICY']; + + if (this.cookieService.get("cookiesConsent") == "true") { + this.ccService.getConfig().enabled = false; + } + this.ccService.destroy(); + this.ccService.init(this.ccService.getConfig()); + }) + } + + ngOnDestroy() { + this.statusChangeSubscription.unsubscribe(); } login() { @@ -99,9 +137,10 @@ export class AppComponent implements OnInit { this.router.navigate(['/plans'], { queryParams: { /*refresh : Math.random() ,returnUrl: this.state.url*/ } }); } - goToGrants() { - this.router.navigate(['/grants'], { queryParams: { /*refresh : Math.random() ,returnUrl: this.state.url*/ } }); - } + // ----------- UNCOMMENT TO ADD AGAIN GRANTS -------- + // goToGrants() { + // this.router.navigate(['/grants'], { queryParams: { /*refresh : Math.random() ,returnUrl: this.state.url*/ } }); + // } initializeServices() { this.translate.setDefaultLang('en'); diff --git a/dmp-frontend/src/app/app.module.ts b/dmp-frontend/src/app/app.module.ts index 7d4640e5e..b82670f0c 100644 --- a/dmp-frontend/src/app/app.module.ts +++ b/dmp-frontend/src/app/app.module.ts @@ -1,7 +1,7 @@ import { OverlayModule } from '@angular/cdk/overlay'; import { HttpClient, HttpClientModule } from '@angular/common/http'; import { LOCALE_ID, NgModule } from '@angular/core'; -import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core'; import { MatMomentDateModule, MAT_MOMENT_DATE_FORMATS } from '@angular/material-moment-adapter'; import { BrowserModule, Title } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; @@ -23,12 +23,45 @@ import { ReactiveFormsModule, FormsModule } from '@angular/forms'; import { DatasetCreateWizardModule } from './ui/dataset-create-wizard/dataset-create-wizard.module'; import { NavbarModule } from './ui/navbar/navbar.module'; import { SidebarModule } from './ui/sidebar/sidebar.module'; +import { NgcCookieConsentModule, NgcCookieConsentConfig } from 'ngx-cookieconsent'; +import { CookieService } from "ngx-cookie-service"; +import { environment } from '../environments/environment'; // AoT requires an exported function for factories export function HttpLoaderFactory(http: HttpClient) { return new TranslateHttpLoader(http, 'assets/i18n/', '.json'); } +const cookieConfig: NgcCookieConsentConfig = { + enabled: true, + cookie: { + domain: environment.App // or 'your.domain.com' // it is mandatory to set a domain, for cookies to work properly (see https://goo.gl/S2Hy2A) + }, + palette: { + popup: { + background: "#000000", + text: "#ffffff", + link: "#ffffff" + }, + button: { + background: "#00b29f", + text: "#ffffff", + border: "transparent" + } + }, + content: { + message: "This website uses cookies to enhance the user experience.", + dismiss: "Got it!", + deny: "Refuse cookies", + link: "Learn more", + href: "http://localhost:4200/terms-of-service", + policy: "Cookie Policy" + }, + position: "bottom-right", + theme: 'edgeless', + type: 'info' +}; + @NgModule({ imports: [ BrowserModule, @@ -57,7 +90,8 @@ export function HttpLoaderFactory(http: HttpClient) { FormsModule, DatasetCreateWizardModule, NavbarModule, - SidebarModule + SidebarModule, + NgcCookieConsentModule.forRoot(cookieConfig) ], declarations: [ AppComponent @@ -75,7 +109,8 @@ export function HttpLoaderFactory(http: HttpClient) { deps: [CultureService], useFactory: (cultureService) => cultureService.getCurrentCulture().name }, - Title + Title, + CookieService ], bootstrap: [AppComponent] }) diff --git a/dmp-frontend/src/app/common/date/moment-utc-date-adapter.ts b/dmp-frontend/src/app/common/date/moment-utc-date-adapter.ts index 722f3ae2f..659926878 100644 --- a/dmp-frontend/src/app/common/date/moment-utc-date-adapter.ts +++ b/dmp-frontend/src/app/common/date/moment-utc-date-adapter.ts @@ -1,5 +1,5 @@ import { Inject, Injectable, Optional } from '@angular/core'; -import { MAT_DATE_LOCALE } from '@angular/material'; +import { MAT_DATE_LOCALE } from '@angular/material/core'; import { MomentDateAdapter } from '@angular/material-moment-adapter'; import * as moment from 'moment'; import { Moment } from 'moment'; diff --git a/dmp-frontend/src/app/common/http/interceptors/response-payload.interceptor.ts b/dmp-frontend/src/app/common/http/interceptors/response-payload.interceptor.ts index 125ac38ce..f34b273d4 100644 --- a/dmp-frontend/src/app/common/http/interceptors/response-payload.interceptor.ts +++ b/dmp-frontend/src/app/common/http/interceptors/response-payload.interceptor.ts @@ -1,6 +1,6 @@ import { HttpHandler, HttpHeaderResponse, HttpProgressEvent, HttpRequest, HttpResponse, HttpSentEvent, HttpUserEvent } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { MatSnackBar } from '@angular/material'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { BaseInterceptor } from './base.interceptor'; diff --git a/dmp-frontend/src/app/common/http/interceptors/status-code.interceptor.ts b/dmp-frontend/src/app/common/http/interceptors/status-code.interceptor.ts index 78a4aa331..867889a96 100644 --- a/dmp-frontend/src/app/common/http/interceptors/status-code.interceptor.ts +++ b/dmp-frontend/src/app/common/http/interceptors/status-code.interceptor.ts @@ -1,3 +1,5 @@ + +import {tap} from 'rxjs/operators'; import { Injectable } from "@angular/core"; import { BaseInterceptor } from "./base.interceptor"; import { InterceptorType } from "./interceptor-type"; @@ -10,11 +12,11 @@ export class StatusCodeInterceptor extends BaseInterceptor { type: InterceptorType; interceptRequest(req: HttpRequest, next: HttpHandler): Observable> { - return next.handle(req).do(event => { }, err => { + return next.handle(req).pipe(tap(event => { }, err => { if (err.status === 480) { this.router.navigate(['confirmation']); } - }); + })); } constructor( diff --git a/dmp-frontend/src/app/common/material/material.module.ts b/dmp-frontend/src/app/common/material/material.module.ts index 909d1ea8e..c450d3ea2 100644 --- a/dmp-frontend/src/app/common/material/material.module.ts +++ b/dmp-frontend/src/app/common/material/material.module.ts @@ -1,37 +1,35 @@ import { NgModule } from '@angular/core'; -import { - MatButtonModule, - MatToolbarModule, - MatIconModule, - MatCardModule, - MatGridListModule, - MatSnackBarModule, - MatSidenavModule, - MatListModule, - MatChipsModule, - MatFormFieldModule, - MatSelectModule, - MatOptionModule, - MatInputModule, - MatExpansionModule, - MatAutocompleteModule, - MatProgressSpinnerModule, - MatTabsModule, - MatDialogModule, - MatMenuModule, - MatRadioModule, - MatStepperModule, - MatTooltipModule, - MatProgressBarModule, - MatCheckboxModule, - MatDatepickerModule, - MatButtonToggleModule, - MatSliderModule, - MatSlideToggleModule, - MatTableModule, - MatPaginatorModule, - MatSortModule, -} from '@angular/material'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatButtonModule } from '@angular/material/button'; +import { MatButtonToggleModule } from '@angular/material/button-toggle'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatChipsModule } from '@angular/material/chips'; +import { MatOptionModule } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatExpansionModule } from '@angular/material/expansion'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatGridListModule } from '@angular/material/grid-list'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatListModule } from '@angular/material/list'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressBarModule } from '@angular/material/progress-bar'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatRadioModule } from '@angular/material/radio'; +import { MatSelectModule } from '@angular/material/select'; +import { MatSidenavModule } from '@angular/material/sidenav'; +import { MatSlideToggleModule } from '@angular/material/slide-toggle'; +import { MatSliderModule } from '@angular/material/slider'; +import { MatSnackBarModule } from '@angular/material/snack-bar'; +import { MatSortModule } from '@angular/material/sort'; +import { MatStepperModule } from '@angular/material/stepper'; +import { MatTableModule } from '@angular/material/table'; +import { MatTabsModule } from '@angular/material/tabs'; +import { MatToolbarModule } from '@angular/material/toolbar'; +import { MatTooltipModule } from '@angular/material/tooltip'; import { CdkTableModule } from '@angular/cdk/table'; @NgModule({ diff --git a/dmp-frontend/src/app/common/ui/common-ui.module.ts b/dmp-frontend/src/app/common/ui/common-ui.module.ts index 124c9957a..fe8455d39 100644 --- a/dmp-frontend/src/app/common/ui/common-ui.module.ts +++ b/dmp-frontend/src/app/common/ui/common-ui.module.ts @@ -2,17 +2,20 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; import { MaterialModule } from '../material/material.module'; +import { FormsModule } from '@angular/forms'; @NgModule({ imports: [ CommonModule, MaterialModule, - TranslateModule + TranslateModule, + FormsModule ], exports: [ CommonModule, MaterialModule, - TranslateModule + TranslateModule, + FormsModule ] }) export class CommonUiModule { } 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 460ce2b50..b8b70efd8 100644 --- a/dmp-frontend/src/app/core/common/enum/auth-provider.ts +++ b/dmp-frontend/src/app/core/common/enum/auth-provider.ts @@ -5,5 +5,7 @@ export enum AuthProvider { LinkedIn = 4, //NativeLogin=5, B2Access = 6, - ORCID = 7 + ORCID = 7, + OpenAire = 8, + Configurable = 9 } diff --git a/dmp-frontend/src/app/core/common/enum/role.ts b/dmp-frontend/src/app/core/common/enum/role.ts new file mode 100644 index 000000000..a11abaf81 --- /dev/null +++ b/dmp-frontend/src/app/core/common/enum/role.ts @@ -0,0 +1,4 @@ +export enum Role { + Owner = 0, + Member = 1 +} diff --git a/dmp-frontend/src/app/core/model/admin/dataset-profile/dataset-profile.ts b/dmp-frontend/src/app/core/model/admin/dataset-profile/dataset-profile.ts index 18a16cd33..916cf3b28 100644 --- a/dmp-frontend/src/app/core/model/admin/dataset-profile/dataset-profile.ts +++ b/dmp-frontend/src/app/core/model/admin/dataset-profile/dataset-profile.ts @@ -54,6 +54,7 @@ export interface Field { data: any; visible: Visibility; validations: ValidationType[]; + rdaCommonStandard: string; } export interface ViewStyle { diff --git a/dmp-frontend/src/app/core/model/configurable-provider/configurableProvider.ts b/dmp-frontend/src/app/core/model/configurable-provider/configurableProvider.ts new file mode 100644 index 000000000..c8098f618 --- /dev/null +++ b/dmp-frontend/src/app/core/model/configurable-provider/configurableProvider.ts @@ -0,0 +1,9 @@ +export class ConfigurableProvider { + configurableLoginId: string; + name: string; + clientId: string; + redirect_uri: string; + oauthUrl: string; + scope: string; + state: string; +} diff --git a/dmp-frontend/src/app/core/model/data-repository/data-repository.ts b/dmp-frontend/src/app/core/model/data-repository/data-repository.ts index 76f5cf372..3037199c0 100644 --- a/dmp-frontend/src/app/core/model/data-repository/data-repository.ts +++ b/dmp-frontend/src/app/core/model/data-repository/data-repository.ts @@ -5,4 +5,5 @@ export interface DataRepositoryModel { uri: string; pid: string; info: string; + source: string; } diff --git a/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts b/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts index 80e0f931e..1776ab9be 100644 --- a/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts +++ b/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts @@ -15,4 +15,5 @@ export interface DatasetListingModel { created: Date; modified: Date; finalizedAt: Date; + dmpPublishedAt?: Date; } diff --git a/dmp-frontend/src/app/core/model/dmp/dmp-create-wizard/dmp-create-wizard-form.model.ts b/dmp-frontend/src/app/core/model/dmp/dmp-create-wizard/dmp-create-wizard-form.model.ts index f53ef7d9c..a3303ccac 100644 --- a/dmp-frontend/src/app/core/model/dmp/dmp-create-wizard/dmp-create-wizard-form.model.ts +++ b/dmp-frontend/src/app/core/model/dmp/dmp-create-wizard/dmp-create-wizard-form.model.ts @@ -1,10 +1,9 @@ -import { DmpModel } from "../dmp" -import { DatasetProfileModel } from "../../dataset/dataset-profile"; -import { FormGroup } from "@angular/forms/src/model"; -import { ValidationContext } from "../../../../common/forms/validation/validation-context"; -import { Validators, FormBuilder } from "@angular/forms"; +import { FormBuilder, FormGroup, Validators } from "@angular/forms"; 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 { DatasetProfileModel } from "../../dataset/dataset-profile"; +import { DmpModel } from "../dmp"; export class DmpCreateWizardFormModel { dmp: DmpModel; @@ -18,7 +17,7 @@ export class DmpCreateWizardFormModel { return this; } - buildForm(context: ValidationContext = null): FormGroup{ + buildForm(context: ValidationContext = null): FormGroup { if (context == null) { context = this.createValidationContext(); } const formBuilder = new FormBuilder(); const formGroup = formBuilder.group({ @@ -37,6 +36,3 @@ export class DmpCreateWizardFormModel { return baseContext; } } - - - diff --git a/dmp-frontend/src/app/core/model/external-dataset/external-dataset.ts b/dmp-frontend/src/app/core/model/external-dataset/external-dataset.ts index e4cff37d9..40d841e5e 100644 --- a/dmp-frontend/src/app/core/model/external-dataset/external-dataset.ts +++ b/dmp-frontend/src/app/core/model/external-dataset/external-dataset.ts @@ -3,8 +3,9 @@ import { ExternalDatasetType } from '../../common/enum/external-dataset-type'; export interface ExternalDatasetModel { abbreviation: String; id: String; - label: String; + name: String; reference: String; type: ExternalDatasetType; info: String; -} \ No newline at end of file + source: String; +} diff --git a/dmp-frontend/src/app/core/model/organisation/organization.ts b/dmp-frontend/src/app/core/model/organisation/organization.ts index 58e807273..5fd54c7ab 100644 --- a/dmp-frontend/src/app/core/model/organisation/organization.ts +++ b/dmp-frontend/src/app/core/model/organisation/organization.ts @@ -5,4 +5,5 @@ export interface OrganizationModel { name: string; label: string; status: Status; + tag: string; } diff --git a/dmp-frontend/src/app/core/model/registry/registry.ts b/dmp-frontend/src/app/core/model/registry/registry.ts index c9568466c..6658e9b57 100644 --- a/dmp-frontend/src/app/core/model/registry/registry.ts +++ b/dmp-frontend/src/app/core/model/registry/registry.ts @@ -3,7 +3,9 @@ export interface RegistryModel { abbreviation: String; definition: String; id: String; + pid: String; label: String; reference: String; uri: String; + source: String; } diff --git a/dmp-frontend/src/app/core/query/explore-dataset/explore-dataset-criteria.ts b/dmp-frontend/src/app/core/query/explore-dataset/explore-dataset-criteria.ts index 65d03f029..7c10b2bf0 100644 --- a/dmp-frontend/src/app/core/query/explore-dataset/explore-dataset-criteria.ts +++ b/dmp-frontend/src/app/core/query/explore-dataset/explore-dataset-criteria.ts @@ -1,8 +1,10 @@ import { GrantStateType } from "../../common/enum/grant-state-type"; import { BaseCriteria } from "../base-criteria"; +import { Role } from '../../common/enum/role'; export class ExploreDatasetCriteriaModel extends BaseCriteria { public grantStatus: GrantStateType; + public role: Role; public dmpIds: string[] = []; public grants: string[] = []; public datasetProfile: string[] = []; diff --git a/dmp-frontend/src/app/core/query/explore-dmp/explore-dmp-criteria.ts b/dmp-frontend/src/app/core/query/explore-dmp/explore-dmp-criteria.ts index cfd2ea409..e577c31aa 100644 --- a/dmp-frontend/src/app/core/query/explore-dmp/explore-dmp-criteria.ts +++ b/dmp-frontend/src/app/core/query/explore-dmp/explore-dmp-criteria.ts @@ -1,8 +1,10 @@ import { BaseCriteria } from "../base-criteria"; import { GrantStateType } from "../../common/enum/grant-state-type"; +import { Role } from '../../common/enum/role'; export class ExploreDmpCriteriaModel extends BaseCriteria { public grantStatus: GrantStateType; + public role: Role; public grants: string[] = []; public datasetProfile: string[] = []; public dmpOrganisations: string[] = []; 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 b08921e01..7eea789d2 100644 --- a/dmp-frontend/src/app/core/services/auth/auth.service.ts +++ b/dmp-frontend/src/app/core/services/auth/auth.service.ts @@ -1,10 +1,12 @@ + +import { of as observableOf, throwError as observableThrowError, Observable } from 'rxjs'; + +import { map, catchError, takeUntil } from 'rxjs/operators'; import { HttpClient, HttpHeaders } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { MatSnackBar } from '@angular/material'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { takeUntil } from 'rxjs/operators'; -import { Observable } from 'rxjs/Rx'; import { environment } from '../../../../environments/environment'; import { SnackBarNotificationComponent } from '../../../library/notification/snack-bar/snack-bar-notification.component'; import { BaseService } from '../../common/base/base.service'; @@ -12,6 +14,7 @@ import { Credential } from '../../model/auth/credential'; import { LoginInfo } from '../../model/auth/login-info'; import { Principal } from '../../model/auth/Principal'; import { UiNotificationService, SnackBarNotificationLevel } from '../notification/ui-notification-service'; +import { ConfigurableProvider } from "../../model/configurable-provider/configurableProvider"; @Injectable() @@ -67,31 +70,31 @@ export class AuthService extends BaseService { public login(loginInfo: LoginInfo): Observable { const url = this.actionUrl + 'externallogin'; - return this.http.post(url, loginInfo, { headers: this.headers }) - .map((res: any) => { + return this.http.post(url, loginInfo, { headers: this.headers }).pipe( + map((res: any) => { const principal = this.current(res.payload); //this.loginContextSubject.next(true); return principal; - }) - .catch((error: any) => { + }), + catchError((error: any) => { //this.loginContextSubject.next(false); - return Observable.throw(error); - }); + return observableThrowError(error); + })); } public nativeLogin(credentials: Credential): Observable { const url = this.actionUrl + 'nativelogin'; - return this.http.post(url, credentials, { headers: this.headers }) - .map((res: any) => { + return this.http.post(url, credentials, { headers: this.headers }).pipe( + map((res: any) => { const principal = this.current(res.payload); //this.loginContextSubject.next(true); return principal; - }) - .catch((error: any) => { + }), + catchError((error: any) => { //this.loginContextSubject.next(false); - return Observable.throw(error); - }); + return observableThrowError(error); + })); } @@ -116,22 +119,22 @@ export class AuthService extends BaseService { const principal = this.current(); if (!principal) { this.clear(); - return Observable.of(); + return observableOf(); } let headers = this.headers; headers = headers.set('AuthToken', principal.token); - return this.http.post(url, null, { headers: headers }) - .map((res: any) => { + return this.http.post(url, null, { headers: headers }).pipe( + map((res: any) => { const princ = this.current(res.payload); return princ; - }) - .catch((error: any) => { + }), + catchError((error: any) => { //console.warn('could not retrieve me info:\n', error); this.clear(); const princ = this.current(); this.router.navigate(['/login']); - return Observable.of(princ); - }); + return observableOf(princ); + })); } public onLogOutSuccess(logoutMessage: any) { @@ -143,4 +146,14 @@ export class AuthService extends BaseService { this.uiNotificationService.snackBarNotification(this.language.instant('GENERAL.SNACK-BAR.UNSUCCESSFUL-LOGOUT'), SnackBarNotificationLevel.Error); this.router.navigate(['/login']); } + + public getConfigurableProviders(): Observable { + const url = this.actionUrl + 'configurableLogin'; + return this.http.get(url, { headers: this.headers }).pipe( + map((res: any) => { + const providers = res.payload.providers; + return providers; + }) + ); + } } diff --git a/dmp-frontend/src/app/core/services/dataset-profile/dataset-profile.service.ts b/dmp-frontend/src/app/core/services/dataset-profile/dataset-profile.service.ts index 644e4028d..56d259e2e 100644 --- a/dmp-frontend/src/app/core/services/dataset-profile/dataset-profile.service.ts +++ b/dmp-frontend/src/app/core/services/dataset-profile/dataset-profile.service.ts @@ -1,10 +1,12 @@ import { HttpClient, HttpHeaders, HttpResponse } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; +import { takeUntil } from "rxjs/operators"; import { environment } from '../../../../environments/environment'; import { BaseHttpParams } from '../../../common/http/base-http-params'; import { InterceptorType } from '../../../common/http/interceptors/interceptor-type'; import { DatasetProfileEditorModel } from '../../../ui/admin/dataset-profile/editor/dataset-profile-editor-model'; +import { BaseService } from "../../common/base/base.service"; import { DatasetProfile } from '../../model/admin/dataset-profile/dataset-profile'; import { DataTableData } from '../../model/data-table/data-table-data'; import { DataTableRequest } from '../../model/data-table/data-table-request'; @@ -14,12 +16,16 @@ import { DatasetProfileCriteria } from '../../query/dataset-profile/dataset-prof import { BaseHttpService } from '../http/base-http.service'; @Injectable() -export class DatasetProfileService { +export class DatasetProfileService extends BaseService { + + private rdaCommonStandards: String[]; + private rdaCommonStandardsLoading: boolean; private actionUrl: string; private headers = new HttpHeaders(); constructor(private http: BaseHttpService, private httpClient: HttpClient) { + super(); this.actionUrl = environment.Server + 'admin/'; } @@ -70,4 +76,17 @@ export class DatasetProfileService { formData.append('file', file[0], labelSent); return this.http.post(this.actionUrl + "upload", formData, { params: params }); } + + getRDACommonStandards(): String[] { + if (!this.rdaCommonStandards && !this.rdaCommonStandardsLoading) { this.getRDACommonStandardsInternal(); } + return this.rdaCommonStandards; + } + + private getRDACommonStandardsInternal() { + this.rdaCommonStandardsLoading = true; + return this.http.get(this.actionUrl + "getRDACommonStandards").pipe(takeUntil(this._destroyed)).subscribe(x => { + this.rdaCommonStandards = x; + this.rdaCommonStandardsLoading = false; + }); + } } diff --git a/dmp-frontend/src/app/core/services/dataset-wizard/dataset-wizard.service.ts b/dmp-frontend/src/app/core/services/dataset-wizard/dataset-wizard.service.ts index b08009aad..e11802ccd 100644 --- a/dmp-frontend/src/app/core/services/dataset-wizard/dataset-wizard.service.ts +++ b/dmp-frontend/src/app/core/services/dataset-wizard/dataset-wizard.service.ts @@ -2,17 +2,14 @@ import { HttpClient, HttpHeaders, HttpResponse } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; import { environment } from '../../../../environments/environment'; -import { RequestItem } from '../../query/request-item'; +import { BaseHttpParams } from '../../../common/http/base-http-params'; +import { InterceptorType } from '../../../common/http/interceptors/interceptor-type'; import { DatasetProfileDefinitionModel } from '../../model/dataset-profile-definition/dataset-profile-definition'; import { DatasetProfileModel } from '../../model/dataset/dataset-profile'; import { DatasetWizardModel } from '../../model/dataset/dataset-wizard'; -import { DmpModel } from '../../model/dmp/dmp'; import { DatasetProfileCriteria } from '../../query/dataset-profile/dataset-profile-criteria'; -import { DmpCriteria } from '../../query/dmp/dmp-criteria'; +import { RequestItem } from '../../query/request-item'; import { BaseHttpService } from '../http/base-http.service'; -import { ContentType } from '@angular/http/src/enums'; -import { BaseHttpParams } from '../../../common/http/base-http-params'; -import { InterceptorType } from '../../../common/http/interceptors/interceptor-type'; @Injectable() export class DatasetWizardService { @@ -70,7 +67,7 @@ export class DatasetWizardService { return this.http.get(this.actionUrl + id + '/unlock', { headers: this.headers }); } - public uploadXml(fileList: FileList, datasetTitle: string, dmpId: string, datasetProfileId: string): Observable { + public uploadXml(fileList: FileList, datasetTitle: string, dmpId: string, datasetProfileId: string): Observable { const formData: FormData = new FormData(); if (fileList instanceof FileList) { for (let i = 0; i < fileList.length; i++) { @@ -90,6 +87,6 @@ export class DatasetWizardService { } public updateDatasetProfile(id: String): Observable { - return this.http.get(this.actionUrl + "profile/"+ id, { headers: this.headers }); + return this.http.get(this.actionUrl + "profile/" + id, { headers: this.headers }); } } diff --git a/dmp-frontend/src/app/core/services/dataset/dataset.service.ts b/dmp-frontend/src/app/core/services/dataset/dataset.service.ts index 920b644ba..d1b59d588 100644 --- a/dmp-frontend/src/app/core/services/dataset/dataset.service.ts +++ b/dmp-frontend/src/app/core/services/dataset/dataset.service.ts @@ -31,8 +31,8 @@ export class DatasetService { return this.http.get(this.actionUrl + 'makepublic/' + id); } - getDatasetProfiles(): Observable { - return this.http.get(environment.Server + 'datasetprofiles/getAll'); + getDatasetProfiles(dataTableRequest: DataTableRequest): Observable { + return this.http.post(environment.Server + 'datasetprofiles/getAll', dataTableRequest); } getDatasetProfilesUsedPaged(dataTableRequest: DataTableRequest) { 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 4cb45c308..2df142252 100644 --- a/dmp-frontend/src/app/core/services/dmp/dmp.service.ts +++ b/dmp-frontend/src/app/core/services/dmp/dmp.service.ts @@ -2,23 +2,22 @@ import { HttpClient, HttpHeaders, HttpResponse } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; import { environment } from '../../../../environments/environment'; +import { BaseHttpParams } from '../../../common/http/base-http-params'; +import { InterceptorType } from '../../../common/http/interceptors/interceptor-type'; import { DynamicFieldGrantCriteria } from '../../../models/dynamic-field-grant/DynamicFieldGrantCriteria'; import { DataTableData } from '../../model/data-table/data-table-data'; import { DataTableRequest } from '../../model/data-table/data-table-request'; +import { DatasetListingModel } from '../../model/dataset/dataset-listing'; import { DatasetProfileModel } from '../../model/dataset/dataset-profile'; +import { DatasetsToBeFinalized } from '../../model/dataset/datasets-toBeFinalized'; import { DmpModel } from '../../model/dmp/dmp'; import { DmpListingModel } from '../../model/dmp/dmp-listing'; +import { DmpOverviewModel } from '../../model/dmp/dmp-overview'; import { DatasetProfileCriteria } from '../../query/dataset-profile/dataset-profile-criteria'; import { DmpCriteria } from '../../query/dmp/dmp-criteria'; +import { ExploreDmpCriteriaModel } from '../../query/explore-dmp/explore-dmp-criteria'; import { RequestItem } from '../../query/request-item'; import { BaseHttpService } from '../http/base-http.service'; -import { ContentType } from '@angular/http/src/enums'; -import { BaseHttpParams } from '../../../common/http/base-http-params'; -import { InterceptorType } from '../../../common/http/interceptors/interceptor-type'; -import { ExploreDmpCriteriaModel } from '../../query/explore-dmp/explore-dmp-criteria'; -import { DmpOverviewModel } from '../../model/dmp/dmp-overview'; -import { DatasetListingModel } from '../../model/dataset/dataset-listing'; -import { DatasetsToBeFinalized } from '../../model/dataset/datasets-toBeFinalized'; @Injectable() export class DmpService { @@ -93,7 +92,7 @@ export class DmpService { } getDoi(id: string): Observable { - return this.http.post(this.actionUrl + 'createZenodoDoi/' + id, {headers: this.headers}); + return this.http.post(this.actionUrl + 'createZenodoDoi/' + id, { headers: this.headers }); } getDynamicField(requestItem: RequestItem): any { @@ -119,7 +118,7 @@ export class DmpService { return this.httpClient.get(this.actionUrl + 'rda/' + id, { responseType: 'blob', observe: 'response' }); } - public uploadXml(fileList: FileList, dmpTitle: string): Observable { + public uploadXml(fileList: FileList, dmpTitle: string): Observable { const formData: FormData = new FormData(); if (fileList instanceof FileList) { for (let i = 0; i < fileList.length; i++) { diff --git a/dmp-frontend/src/app/core/services/email-confirmation/email-confirmation.service.ts b/dmp-frontend/src/app/core/services/email-confirmation/email-confirmation.service.ts index fc7673568..29433964f 100644 --- a/dmp-frontend/src/app/core/services/email-confirmation/email-confirmation.service.ts +++ b/dmp-frontend/src/app/core/services/email-confirmation/email-confirmation.service.ts @@ -1,7 +1,7 @@ +import { HttpHeaders } from '@angular/common/http'; import { Injectable } from "@angular/core"; -import { HttpHeaders } from "@angular/common/http/src/headers"; -import { BaseHttpService } from "../http/base-http.service"; import { environment } from "../../../../environments/environment"; +import { BaseHttpService } from "../http/base-http.service"; @Injectable() export class EmailConfirmationService { @@ -17,6 +17,6 @@ export class EmailConfirmationService { } public sendConfirmationEmail(email: string) { - return this.http.post(this.actioUrl, email, {headers: this.headers}); + return this.http.post(this.actioUrl, email, { headers: this.headers }); } } diff --git a/dmp-frontend/src/app/core/services/help-content/help-content.service.ts b/dmp-frontend/src/app/core/services/help-content/help-content.service.ts index 638e289c9..f0397b5b6 100644 --- a/dmp-frontend/src/app/core/services/help-content/help-content.service.ts +++ b/dmp-frontend/src/app/core/services/help-content/help-content.service.ts @@ -1,55 +1,57 @@ +import { HttpClient } from '@angular/common/http'; /** * Created by stefania on 7/17/17. */ import { Injectable } from '@angular/core'; -import { Http, Response } from '@angular/http'; -import { Observable } from 'rxjs/Rx'; +import { Observable, throwError as observableThrowError } from 'rxjs'; +import { catchError, map } from 'rxjs/operators'; import { environment } from '../../../../environments/environment'; import { PageHelpContent } from '../../model/help-content/page-help-content'; import { CachedContentItem } from './cached-content-item'; + @Injectable() export class HelpContentService { private _helpServiceUrl = environment.HelpService.Url; cache = new Map(); - constructor(private http: Http) { + constructor(private http: HttpClient) { } - getActivePageContent(route: string) { - if (!this.cache.get(route) || !this.isValidCachedItem(route)) { - return this.http.get(this._helpServiceUrl + '/page/route?q=' + route) - .map(res => { - this.cache.set(route, { timestamp: Date.now(), content: res.json() }); - return res.json(); - }) - .catch(this.handleError); - } - return Observable.create(observer => observer.next(this.cache.get(route).content)); - } - private extractData(res: Response) { - const body = res.json(); - return body.data || {}; - } - private handleError(error: Response | any) { - // In a real world app, we might use a remote logging infrastructure - // We'd also dig deeper into the error to get a better message - let errMsg = ''; - if (error instanceof Response) { - const body = error.text() || ''; - //const err = body.error || JSON.stringify(body); - errMsg = `${error.status} - ${error.statusText || ''} ${body}`; - } else { - errMsg = (error.message) ? error.message : - error.status ? `${error.status} - ${error.statusText}` : 'Server error'; - console.error(errMsg); // log to console instead - } - return Observable.throw(errMsg); - } + // getActivePageContent(route: string) { + // if (!this.cache.get(route) || !this.isValidCachedItem(route)) { + // return this.http.get(this._helpServiceUrl + '/page/route?q=' + route).pipe( + // map((res: Response) => { + // this.cache.set(route, { timestamp: Date.now(), content: res.json() as PageHelpContent }); + // return res.json(); + // }), + // catchError(this.handleError)); + // } + // return Observable.create(observer => observer.next(this.cache.get(route).content)); + // } + // private extractData(res: Response) { + // const body = res.json(); + // return body. || {}; + // } + // private handleError(error: Response | any) { + // // In a real world app, we might use a remote logging infrastructure + // // We'd also dig deeper into the error to get a better message + // let errMsg = ''; + // if (error instanceof Response) { + // const body = error.text() || ''; + // //const err = body.error || JSON.stringify(body); + // errMsg = `${error.status} - ${error.statusText || ''} ${body}`; + // } else { + // errMsg = (error.message) ? error.message : + // error.status ? `${error.status} - ${error.statusText}` : 'Server error'; + // console.error(errMsg); // log to console instead + // } + // return observableThrowError(errMsg); + // } - isValidCachedItem(route) { - const cachedTimestamp = this.cache.get(route).timestamp; - const currentTimestamp = Date.now(); - if (currentTimestamp - cachedTimestamp > 30000) { return false; } else { return true; } - } + // isValidCachedItem(route) { + // const cachedTimestamp = this.cache.get(route).timestamp; + // const currentTimestamp = Date.now(); + // if (currentTimestamp - cachedTimestamp > 30000) { return false; } else { return true; } + // } } diff --git a/dmp-frontend/src/app/core/services/http/base-http.service.ts b/dmp-frontend/src/app/core/services/http/base-http.service.ts index a3e0aca26..7fe8f473d 100644 --- a/dmp-frontend/src/app/core/services/http/base-http.service.ts +++ b/dmp-frontend/src/app/core/services/http/base-http.service.ts @@ -1,3 +1,5 @@ + +import {map} from 'rxjs/operators'; import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; @@ -39,7 +41,7 @@ export class BaseHttpService { } private interceptRepsonse(observable: Observable): Observable { - return observable + return observable.pipe( // .catch((errorResponse) => { // if (errorResponse.status === 401) { // this.snackBar.openFromComponent(SnackBarNotificationComponent, { @@ -69,7 +71,7 @@ export class BaseHttpService { // } // } // }) - .map(response => { + map(response => { if (response instanceof Blob) { return response; } if (response['statusCode'] === ApiMessageCode.SUCCESS_MESSAGE) { //throw new Error('Request failed'); @@ -83,6 +85,6 @@ export class BaseHttpService { } else { return response['payload']; } - }); + })); } } diff --git a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.html b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.html index 80447c971..adc236268 100644 --- a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.html +++ b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.html @@ -1,13 +1,13 @@
- + {{this._displayFn(selectedItem)}} cancel - + diff --git a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.scss b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.scss index 59bdf7561..07c37ced4 100644 --- a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.scss +++ b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.scss @@ -1,22 +1,32 @@ .multiple-auto-complete { - margin-left: inherit; - margin-right: inherit; + margin-left: inherit; + margin-right: inherit; - .multi-chip-list { - padding-left: 0; - } + .multi-chip-list { + padding-left: 0; - .multi-loading-bar { - padding-right: 0; - padding-left: 0; - } + .chip { + border-radius: 2em !important; + height: auto !important; + min-width: fit-content !important; + } + } - .not-loading { - display: none; - } + .multi-loading-bar { + padding-right: 0; + padding-left: 0; + } + + .not-loading { + display: none; + } } .two-line-mat-option { - height: 3.5em; - line-height: 1.2em; + // height: 3.5em; + line-height: 1.2em; +} + +::ng-deep .mat-autocomplete-panel.panel-width { + max-width: 78vw !important; } diff --git a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts index 73763d3e5..a19d1c55d 100644 --- a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts +++ b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts @@ -2,7 +2,9 @@ import { FocusMonitor } from '@angular/cdk/a11y'; import { COMMA, ENTER } from '@angular/cdk/keycodes'; import { Component, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Optional, Output, Self, ViewChild } from '@angular/core'; import { ControlValueAccessor, NgControl } from '@angular/forms'; -import { MatAutocompleteSelectedEvent, MatAutocompleteTrigger, MatChipInputEvent, MatFormFieldControl } from '@angular/material'; +import { MatAutocompleteSelectedEvent, MatAutocompleteTrigger } from '@angular/material/autocomplete'; +import { MatChipInputEvent } from '@angular/material/chips'; +import { MatFormFieldControl } from '@angular/material/form-field'; import { Observable, of as observableOf, Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged, map, mergeMap, startWith, tap } from 'rxjs/operators'; import { AutoCompleteGroup } from '../auto-complete-group'; @@ -87,8 +89,8 @@ export class MultipleAutoCompleteComponent implements OnInit, MatFormFieldContro } private _selectedValue; - @ViewChild('textInput') textInput: ElementRef; - @ViewChild(MatAutocompleteTrigger) autocomplete: MatAutocompleteTrigger; + @ViewChild('textInput', { static: true }) textInput: ElementRef; + @ViewChild(MatAutocompleteTrigger, { static: true }) autocomplete: MatAutocompleteTrigger; constructor( private fm: FocusMonitor, diff --git a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete-configuration.ts b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete-configuration.ts index d90d89a58..97aedab67 100644 --- a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete-configuration.ts +++ b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete-configuration.ts @@ -8,6 +8,8 @@ export interface SingleAutoCompleteConfiguration { minFilteringChars?: number; // Load and present items from start, without user query. Default: true. loadDataOnStart?: boolean; + // Remove item after selection. + removeAfterSelection?: boolean; // Static or initial items. initialItems?: (data?: any) => Observable; // Data retrieval function @@ -20,6 +22,12 @@ export interface SingleAutoCompleteConfiguration { titleFn?: (item: any) => string; // Property formating for dropdown subtitleFn?: (item: any) => string; + // Property formating for icon on chip + iconFn?: (item: any) => string; + // Property for link on chip + linkFn?: (item: any) => string; + // Disable option. + disableOption?: (item: any) => boolean; //Extra data passed to query function extraData?: any; // Callback to intercept value assignment based on item selection diff --git a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.html b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.html index 46fd53fe5..abe733c08 100644 --- a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.html +++ b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.html @@ -1,6 +1,7 @@
- + + {{_iconFn(value)}} {{_displayFn(value)}} cancel @@ -8,10 +9,10 @@ - + - + {{_titleFn(item)}}
@@ -20,7 +21,7 @@ - + {{_titleFn(item)}}
diff --git a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.scss b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.scss index 4f67174f7..4a8d65c72 100644 --- a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.scss +++ b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.scss @@ -1,22 +1,35 @@ .auto-complete { - margin-left: inherit; - margin-right: inherit; + margin-left: inherit; + margin-right: inherit; - .not-loading { - display: none; - } + .not-loading { + display: none; + } - .chip-list { - width: 100%; - } + .chip-list { + width: 100%; + } - .progress-loader { - position: absolute; - right: 0; - } + .progress-loader { + position: absolute; + right: 0; + } } .two-line-mat-option { - height: 3.5em; - line-height: 1.2em; + // height: 3.5em; + line-height: 1.2em; +} + +.chip { + cursor: pointer; + opacity: 1 !important; +} + +.chip:hover { + background-color: #c5c5c5; +} + +::ng-deep .mat-autocomplete-panel.panel-width { + max-width: 78vw !important; } diff --git a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts index 1d740aefb..2079b101a 100644 --- a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts +++ b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts @@ -2,12 +2,14 @@ import { FocusMonitor } from '@angular/cdk/a11y'; import { COMMA, ENTER } from '@angular/cdk/keycodes'; import { Component, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Optional, Output, Self } from '@angular/core'; import { ControlValueAccessor, NgControl } from '@angular/forms'; -import { MatAutocompleteSelectedEvent, MatFormFieldControl } from '@angular/material'; +import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; +import { MatFormFieldControl } from '@angular/material/form-field'; import { Observable, of as observableOf, Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged, map, mergeMap, startWith, tap } from 'rxjs/operators'; import { AutoCompleteGroup } from '../auto-complete-group'; import { SingleAutoCompleteConfiguration } from './single-auto-complete-configuration'; import { switchMap } from 'rxjs/internal/operators/switchMap'; +import { Router } from '@angular/router'; @Component({ @@ -23,6 +25,8 @@ export class SingleAutoCompleteComponent implements OnInit, MatFormFieldControl< @Input() configuration: SingleAutoCompleteConfiguration; // Selected Option Event @Output() optionSelected: EventEmitter = new EventEmitter(); + // Removed Option Event + @Output() optionRemoved: EventEmitter = new EventEmitter(); id = `single-autocomplete-${SingleAutoCompleteComponent.nextId++}`; stateChanges = new Subject(); @@ -84,6 +88,7 @@ export class SingleAutoCompleteComponent implements OnInit, MatFormFieldControl< constructor( private fm: FocusMonitor, private elRef: ElementRef, + private router: Router, @Optional() @Self() public ngControl: NgControl) { fm.monitor(elRef.nativeElement, true).subscribe((origin) => { @@ -136,6 +141,21 @@ export class SingleAutoCompleteComponent implements OnInit, MatFormFieldControl< return null; } + _iconFn(item: any): string { + if (this.configuration.iconFn && item) { return this.configuration.iconFn(item); } + return null; + } + + _linkFn(item: any): string { + if (this.configuration.linkFn && item) { return this.configuration.linkFn(item); } + return null; + } + + _disableOption(item: any): boolean { + if (this.configuration.disableOption && item) { return this.configuration.disableOption(item); } + return null; + } + _requestDelay(): number { return this.configuration.requestDelay || this.requestDelay; } @@ -153,6 +173,13 @@ export class SingleAutoCompleteComponent implements OnInit, MatFormFieldControl< //this._inputValue = " "; this.stateChanges.next(); this.optionSelected.emit(event.option.value); + if (this.configuration.removeAfterSelection) { + this.clearAutocomplete() + } + } + + private clearAutocomplete() { + this._setValue(null); } private _setValue(value: any) { @@ -218,6 +245,13 @@ export class SingleAutoCompleteComponent implements OnInit, MatFormFieldControl< chipRemove(): void { this._setValue(null); + this.optionRemoved.emit(); + } + + linkToOption(value: any): void { + if (this._linkFn(value)) { + this.router.navigate([]).then(result => { window.open(this._linkFn(value), '_blank'); }); + } } autoCompleteDisplayFn() { diff --git a/dmp-frontend/src/app/library/confirmation-dialog/confirmation-dialog.component.html b/dmp-frontend/src/app/library/confirmation-dialog/confirmation-dialog.component.html index 233425676..59b533a6d 100644 --- a/dmp-frontend/src/app/library/confirmation-dialog/confirmation-dialog.component.html +++ b/dmp-frontend/src/app/library/confirmation-dialog/confirmation-dialog.component.html @@ -1,17 +1,31 @@
-
-
- {{ data.message }} +
+
+ {{ data.icon }}
-
close
+
{{ data.warning }}
+
+ close +
+
+
+
{{ data.message }}
+
+ close +
+
+
+
{{ data.privacyPolicyNames }}
+ + {{'GENERAL.CONFIRMATION-DIALOG.ACTIONS.POLICY-AGREE' | translate}} + +
{{'GENERAL.CONFIRMATION-DIALOG.ACTIONS.REQUIRED' | translate}}
-
-
-
+
+
+
+
diff --git a/dmp-frontend/src/app/library/confirmation-dialog/confirmation-dialog.component.scss b/dmp-frontend/src/app/library/confirmation-dialog/confirmation-dialog.component.scss index 98a0908bc..025bfb9d5 100644 --- a/dmp-frontend/src/app/library/confirmation-dialog/confirmation-dialog.component.scss +++ b/dmp-frontend/src/app/library/confirmation-dialog/confirmation-dialog.component.scss @@ -1,26 +1,44 @@ .confirmation-dialog { - .confirmation-message { - padding-bottom: 20px; - } + .confirmation { + padding-bottom: 20px; + } - .close-btn { - margin-left: auto; - cursor: pointer; - } + .privacy-policy-names { + font-weight: 700; + padding: 1em; + } - .cancel { - background-color: #aaaaaa; - color: #ffffff; - } + .close-btn { + margin-left: auto; + cursor: pointer; + } - .confirm { - background-color: #2cba6c; - color: #ffffff; - } + .warn-text { + color: #f44336; + } - .delete { - background-color: #ba2c2c; - color: #ffffff; - } + .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/app/library/confirmation-dialog/confirmation-dialog.component.ts b/dmp-frontend/src/app/library/confirmation-dialog/confirmation-dialog.component.ts index 26e1e63f3..cfb0f0b40 100644 --- a/dmp-frontend/src/app/library/confirmation-dialog/confirmation-dialog.component.ts +++ b/dmp-frontend/src/app/library/confirmation-dialog/confirmation-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; @Component({ selector: 'app-confirmation-dialog', @@ -8,6 +8,8 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; }) export class ConfirmationDialogComponent { + agreePrivacyPolicyNames = false; + constructor( public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: any diff --git a/dmp-frontend/src/app/library/contact-dialog/contact-dialog.component.html b/dmp-frontend/src/app/library/contact-dialog/contact-dialog.component.html deleted file mode 100644 index 5bd3b5757..000000000 --- a/dmp-frontend/src/app/library/contact-dialog/contact-dialog.component.html +++ /dev/null @@ -1,33 +0,0 @@ -
-
- {{'CONTACT.SUPPORT.SUBTITLE' | translate}} -
-
- close -
-
- -
-
- - - - - {{data.get('subject').getError('backendError').message}} - - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - - - - - - {{data.get('description').getError('backendError').message}} - - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
-
-
-
-
diff --git a/dmp-frontend/src/app/library/contact-dialog/contact-dialog.module.ts b/dmp-frontend/src/app/library/contact-dialog/contact-dialog.module.ts deleted file mode 100644 index a0fe4ea9f..000000000 --- a/dmp-frontend/src/app/library/contact-dialog/contact-dialog.module.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonUiModule } from '../../common/ui/common-ui.module'; -import { ContactDialogComponent } from './contact-dialog.component'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; - -@NgModule({ - imports: [CommonUiModule, FormsModule, ReactiveFormsModule], - declarations: [ContactDialogComponent], - exports: [ContactDialogComponent], - entryComponents: [ContactDialogComponent] -}) -export class ContactDialogModule { - constructor() { } -} diff --git a/dmp-frontend/src/app/library/deactivate/can-deactivate.guard.ts b/dmp-frontend/src/app/library/deactivate/can-deactivate.guard.ts new file mode 100644 index 000000000..aac88736e --- /dev/null +++ b/dmp-frontend/src/app/library/deactivate/can-deactivate.guard.ts @@ -0,0 +1,39 @@ +import { Injectable } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { CanDeactivate } from '@angular/router'; +import { Observable } from 'rxjs'; +import { TranslateService } from '@ngx-translate/core'; +import { map } from 'rxjs/operators'; +import { BaseComponent } from '../../core/common/base/base.component'; +import { CheckDeactivateBaseComponent } from './deactivate.component'; +import { ConfirmationDialogComponent } from '../confirmation-dialog/confirmation-dialog.component'; + +@Injectable() +export class CanDeactivateGuard extends BaseComponent implements CanDeactivate { + + constructor( + private dialog: MatDialog, + public language: TranslateService + ) { + super(); + } + + canDeactivate(component: CheckDeactivateBaseComponent): boolean | Observable { + + if (component.canDeactivate()) { + return true; + } else { + const dialogRef = this.dialog.open(ConfirmationDialogComponent, { + maxWidth: '700px', + data: { + message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.LEAVE-PAGE'), + warning: this.language.instant('GENERAL.CONFIRMATION-DIALOG.LEAVE-WARNING'), + cancelButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CANCEL'), + confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.LEAVE'), + icon: 'error_outline' + } + }); + return dialogRef.afterClosed().pipe(map(x => x ? true : false)); + } + } +} diff --git a/dmp-frontend/src/app/library/deactivate/deactivate.component.ts b/dmp-frontend/src/app/library/deactivate/deactivate.component.ts new file mode 100644 index 000000000..ce05a6632 --- /dev/null +++ b/dmp-frontend/src/app/library/deactivate/deactivate.component.ts @@ -0,0 +1,16 @@ +import { BaseComponent } from '../../core/common/base/base.component'; +import { HostListener } from '@angular/core'; + +export abstract class CheckDeactivateBaseComponent extends BaseComponent { + + protected constructor() { super(); } + + abstract canDeactivate(): boolean; + + @HostListener('window:beforeunload', ['$event']) + unloadNotification($event: any) { + if (!this.canDeactivate()) { + $event.returnValue = true; + } + } +} diff --git a/dmp-frontend/src/app/library/export-method-dialog/export-method-dialog.component.scss b/dmp-frontend/src/app/library/export-method-dialog/export-method-dialog.component.scss index 953b1843e..df9136d68 100644 --- a/dmp-frontend/src/app/library/export-method-dialog/export-method-dialog.component.scss +++ b/dmp-frontend/src/app/library/export-method-dialog/export-method-dialog.component.scss @@ -10,7 +10,7 @@ button { // background-color: #aaaaaa; - background-color: #4687f0; + background-color: #00b29f; color: #ffffff; } } diff --git a/dmp-frontend/src/app/library/export-method-dialog/export-method-dialog.component.ts b/dmp-frontend/src/app/library/export-method-dialog/export-method-dialog.component.ts index 2658b3ba7..37406942a 100644 --- a/dmp-frontend/src/app/library/export-method-dialog/export-method-dialog.component.ts +++ b/dmp-frontend/src/app/library/export-method-dialog/export-method-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, Inject } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; @Component({ diff --git a/dmp-frontend/src/app/library/notification/notification.component.ts b/dmp-frontend/src/app/library/notification/notification.component.ts index a42d08a62..20527fe02 100644 --- a/dmp-frontend/src/app/library/notification/notification.component.ts +++ b/dmp-frontend/src/app/library/notification/notification.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { MatDialog, MatSnackBar } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../core/common/base/base.component'; import { UiNotificationService, UiNotificationType, PopupNotification, SnackBarNotification, SnackBarNotificationLevel } from '../../core/services/notification/ui-notification-service'; diff --git a/dmp-frontend/src/app/library/notification/popup/popup-notification.component.html b/dmp-frontend/src/app/library/notification/popup/popup-notification.component.html index 47795943f..3e0877065 100644 --- a/dmp-frontend/src/app/library/notification/popup/popup-notification.component.html +++ b/dmp-frontend/src/app/library/notification/popup/popup-notification.component.html @@ -1,5 +1,5 @@

{{notification.title}}

{{notification.message}} - - + + diff --git a/dmp-frontend/src/app/library/notification/popup/popup-notification.component.ts b/dmp-frontend/src/app/library/notification/popup/popup-notification.component.ts index 84a11666a..b672e34f6 100644 --- a/dmp-frontend/src/app/library/notification/popup/popup-notification.component.ts +++ b/dmp-frontend/src/app/library/notification/popup/popup-notification.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { PopupNotification } from '../../../core/services/notification/ui-notification-service'; @Component({ diff --git a/dmp-frontend/src/app/library/notification/snack-bar/snack-bar-notification.component.html b/dmp-frontend/src/app/library/notification/snack-bar/snack-bar-notification.component.html index 75af56131..29e4f7ad5 100644 --- a/dmp-frontend/src/app/library/notification/snack-bar/snack-bar-notification.component.html +++ b/dmp-frontend/src/app/library/notification/snack-bar/snack-bar-notification.component.html @@ -1 +1 @@ -{{message}} +{{message}} diff --git a/dmp-frontend/src/app/library/notification/snack-bar/snack-bar-notification.component.scss b/dmp-frontend/src/app/library/notification/snack-bar/snack-bar-notification.component.scss new file mode 100644 index 000000000..bfbfa5beb --- /dev/null +++ b/dmp-frontend/src/app/library/notification/snack-bar/snack-bar-notification.component.scss @@ -0,0 +1,3 @@ +.snackBar { + color: white; +} diff --git a/dmp-frontend/src/app/library/notification/snack-bar/snack-bar-notification.component.ts b/dmp-frontend/src/app/library/notification/snack-bar/snack-bar-notification.component.ts index 2af227f3c..ff8745b38 100644 --- a/dmp-frontend/src/app/library/notification/snack-bar/snack-bar-notification.component.ts +++ b/dmp-frontend/src/app/library/notification/snack-bar/snack-bar-notification.component.ts @@ -1,10 +1,11 @@ import { Component, Inject } from '@angular/core'; -import { MAT_SNACK_BAR_DATA } from '@angular/material'; +import { MAT_SNACK_BAR_DATA } from '@angular/material/snack-bar'; import { SnackBarNotification } from '../../../core/services/notification/ui-notification-service'; @Component({ selector: 'app-snack-bar-notification', - templateUrl: './snack-bar-notification.component.html' + templateUrl: './snack-bar-notification.component.html', + styleUrls: ['./snack-bar-notification.component.scss'] }) export class SnackBarNotificationComponent { diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-editor-model.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-editor-model.ts index ff076d543..d80d1ebbf 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-editor-model.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-editor-model.ts @@ -30,6 +30,7 @@ export class FieldEditorModel extends BaseFormModel { public visible: VisibilityEditorModel = new VisibilityEditorModel(); public data: FieldDataEditorModel; public validations: ValidationType[] = []; + public rdaCommonStandard: string; fromModel(item: Field): FieldEditorModel { this.id = item.id; @@ -39,6 +40,7 @@ export class FieldEditorModel extends BaseFormModel { this.validations = item.validations; this.viewStyle = new ViewStyleEditorModel().fromModel(item.viewStyle); this.visible = new VisibilityEditorModel().fromModel(item.visible); + this.rdaCommonStandard = item.rdaCommonStandard; if (item.data) { if (this.viewStyle.renderStyle === 'combobox') { @@ -66,7 +68,8 @@ export class FieldEditorModel extends BaseFormModel { // title: [this.title], page: [{ value: this.page, disabled: (disabled && !skipDisable.includes('FieldEditorModel.page')) }], ordinal: [{ value: this.ordinal, disabled: (disabled && !skipDisable.includes('FieldEditorModel.ordinal')) }], - validations: [{ value: this.validations, disabled: (disabled && !skipDisable.includes('FieldEditorModel.validations')) }] + validations: [{ value: this.validations, disabled: (disabled && !skipDisable.includes('FieldEditorModel.validations')) }], + rdaCommonStandard: [{value: this.rdaCommonStandard, disabled: (disabled && !skipDisable.includes('FieldSetEditorModel.rdaCommonStandard')) }] }); formGroup.addControl('defaultValue', this.defaultValue.buildForm(disabled, skipDisable)); diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.html index 5e3d64c3e..6de806122 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.html +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.html @@ -4,7 +4,7 @@ {{'DATASET-PROFILE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.COMPOSITE-CHECKBOX' | translate}} {{'DATASET-PROFILE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.MULTIPLICITY-CHECKBOX' | translate}} - {{'DATASET-PROFILE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.COMMENT-CHECKBOX' | translate}} + {{'DATASET-PROFILE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.COMMENT-CHECKBOX' | translate}}
@@ -34,7 +34,7 @@ + [formControl]="this.form.get('ordinal')" required>
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.ts index 256a522fc..e0ed0479f 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { FormArray, FormControl, FormGroup } from '@angular/forms'; import { FieldEditorModel } from '../../../admin/field-editor-model'; -import { FieldSetEditorModel } from '../../../admin/field-set-editor-model'; +import { Guid } from '../../../../../../common/types/guid'; @Component({ selector: 'app-dataset-profile-editor-composite-field-component', @@ -27,6 +27,10 @@ export class DatasetProfileEditorCompositeFieldComponent implements OnInit { } } this.isComposite = (this.form.get('fields') as FormArray).length > 1; + + if (this.viewOnly) { + this.form.get('hasCommentField').disable(); + } } onIsCompositeChange(isComposite: boolean) { @@ -51,6 +55,7 @@ export class DatasetProfileEditorCompositeFieldComponent implements OnInit { addNewField() { const field: FieldEditorModel = new FieldEditorModel(); + field.id=Guid.create().toString(); (this.form.get('fields')).push(field.buildForm()); } diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-profile-editor-default-value/component-profile-editor-default-value.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-profile-editor-default-value/component-profile-editor-default-value.component.html index 446ad980a..b9c42bc35 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-profile-editor-default-value/component-profile-editor-default-value.component.html +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-profile-editor-default-value/component-profile-editor-default-value.component.html @@ -1,84 +1,79 @@
- - - - {{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.DEFAULT-VALUES.NONE' | + + + + {{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.DEFAULT-VALUES.NONE' | translate}} - {{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.DEFAULT-VALUES.BOOLEAN-DECISION.YES' + {{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.DEFAULT-VALUES.BOOLEAN-DECISION.YES' | translate}} - {{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.DEFAULT-VALUES.BOOLEAN-DECISION.NO' + {{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.DEFAULT-VALUES.BOOLEAN-DECISION.NO' | translate}} - - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + - - - - {{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.DEFAULT-VALUES.CHECK-BOX.CHECKED' | - translate}} - {{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.DEFAULT-VALUES.CHECK-BOX.UNCHECKED' - | - translate}} - - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - + + + + {{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.DEFAULT-VALUES.CHECK-BOX.CHECKED' | translate}} + {{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.DEFAULT-VALUES.CHECK-BOX.UNCHECKED' | translate}} + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + - - - - - - - {{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.DEFAULT-VALUES.NONE' | translate }} - {{opt.get('label').value}} - - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - + + + + + + + {{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.DEFAULT-VALUES.NONE' | translate }} + {{opt.get('label').value}} + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + - - + + - + - - + + - - - - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - + + + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + - - - - {{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.DEFAULT-VALUES.NONE' | translate}} - {{opt.get('label').value}} - - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - + + + + {{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.DEFAULT-VALUES.NONE' | translate}} + {{opt.get('label').value}} + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + - - - - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - + + + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + - - - - - - - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - - + + + + + + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.html index 0e0547147..20c5d1371 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.html +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.html @@ -11,18 +11,21 @@ required> {{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.BooleanDecision)}} {{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.CheckBox)}} + {{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.TextArea)}} + {{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.FreeText)}} {{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.ComboBox)}} {{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.InternalDmpEntities)}} - {{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.FreeText)}} {{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.RadioBox)}} - {{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.TextArea)}} {{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.DatePicker)}} {{'GENERAL.VALIDATION.REQUIRED' | translate}} + + - + + + @@ -37,6 +41,16 @@ + + {{'DATASET-PROFILE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.RDA-COMMON-STANDARDS' | translate}} + + -- + + {{property}} + + + +
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.scss b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.scss index 946679a44..3db0dee74 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.scss +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.scss @@ -1,3 +1,3 @@ -.full-width{ - width: 100%; -} \ No newline at end of file +.full-width { + width: 100%; +} diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.ts index 1d109c26e..bdc243b73 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.ts @@ -16,6 +16,7 @@ import { RuleEditorModel } from '../../../admin/rule-editor-model'; import { DatePickerDataEditorModel } from '../../../admin/field-data/date-picker-data-editor-models'; import { ResearchersAutoCompleteFieldDataEditorModel } from '../../../admin/field-data/researchers-auto-complete-field-data-editor-model'; import { DatasetProfileInternalDmpEntitiesType } from '../../../../../../core/common/enum/dataset-profile-internal-dmp-entities-type'; +import { DatasetProfileService } from "../../../../../../core/services/dataset-profile/dataset-profile.service"; @Component({ selector: 'app-dataset-profile-editor-field-component', @@ -33,7 +34,8 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements constructor( - public enumUtils: EnumUtils + public enumUtils: EnumUtils, + public datasetProfileService: DatasetProfileService ) { super(); } ngOnInit() { diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/section/dataset-profile-editor-section.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/section/dataset-profile-editor-section.component.ts index 98b885051..92a3dc424 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/section/dataset-profile-editor-section.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/section/dataset-profile-editor-section.component.ts @@ -32,6 +32,7 @@ export class DatasetProfileEditorSectionComponent extends BaseComponent implemen addField() { const fieldSet: FieldSetEditorModel = new FieldSetEditorModel(); const field: FieldEditorModel = new FieldEditorModel(); + field.id=Guid.create().toString(); fieldSet.fields.push(field); if (this.dataModel.fieldSets) { fieldSet.id=Guid.create().toString(); diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.html index 65945f77d..18bce0c76 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.html +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.html @@ -9,17 +9,20 @@ {{'DATASET-PROFILE-EDITOR.TITLE.NEW-PROFILE-VERSION' | translate}} {{form.get('label').value}} +

{{form.get('label').value}}

- + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + - + {{'GENERAL.VALIDATION.REQUIRED' | translate}} +
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts index 0f3b1ece8..1307ab4c7 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts @@ -1,7 +1,10 @@ -import { HttpErrorResponse } from '@angular/common/http'; + +import { of as observableOf, Observable } from 'rxjs'; +import { HttpErrorResponse } from '@angular/common/http'; import { Component, OnInit, ViewChild } from '@angular/core'; import { FormArray, FormControl, FormGroup } from '@angular/forms'; -import { MatHorizontalStepper, MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; +import { MatHorizontalStepper } from '@angular/material/stepper'; import { ActivatedRoute, ParamMap, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { map, takeUntil } from 'rxjs/operators'; @@ -18,7 +21,6 @@ import { ConfirmationDialogComponent } from '../../../../library/confirmation-di import { DatasetProfileEnum } from '../../../../core/common/enum/dataset-profile'; import * as FileSaver from 'file-saver'; import { BreadcrumbItem } from '../../../misc/breadcrumb/definition/breadcrumb-item'; -import { Observable } from 'rxjs'; import { DatasetStatus } from '../../../../core/common/enum/dataset-status'; //import * as data from 'src/assets/resources/skipDisable.json'; @@ -42,7 +44,7 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn newVersionId: string; dataWizardModel: DatasetWizardModel; breadCrumbs: Observable; - @ViewChild('stepper') stepper: MatHorizontalStepper; + @ViewChild('stepper', { static: false }) stepper: MatHorizontalStepper; viewOnly = false; constructor( @@ -70,67 +72,68 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn this.datasetProfileService.getDatasetProfileById(this.datasetProfileId) .pipe(map(data => data as DatasetProfile), takeUntil(this._destroyed)) .subscribe( - data => { - try { - this.dataModel = new DatasetProfileEditorModel().fromModel(data); - // this.isDeleted = this.masterItem.isActive === IsActive.Inactive; - if (this.dataModel.status === DatasetProfileEnum.FINALIZED) { - this.form = this.dataModel.buildForm(true, skipDisable); - this.viewOnly = true; - } else { - this.form = this.dataModel.buildForm(); + data => { + try { + this.dataModel = new DatasetProfileEditorModel().fromModel(data); + // this.isDeleted = this.masterItem.isActive === IsActive.Inactive; + if (this.dataModel.status === DatasetProfileEnum.FINALIZED) { + this.form = this.dataModel.buildForm(true, skipDisable); + this.viewOnly = true; + } else { + this.form = this.dataModel.buildForm(); + } + this.prepareForm(); + } catch { + this.logger.error('Could not parse MasterItem: ' + data); + this.uiNotificationService.snackBarNotification(this.language.instant('NOTIFICATIONS.DEFAULT.ERROR'), SnackBarNotificationLevel.Error); } - this.prepareForm(); - } catch { - this.logger.error('Could not parse MasterItem: ' + data); - this.uiNotificationService.snackBarNotification(this.language.instant('NOTIFICATIONS.DEFAULT.ERROR'), SnackBarNotificationLevel.Error); - } - }, - error => this.onCallbackError(error) + }, + error => this.onCallbackError(error) ); - this.breadCrumbs = Observable.of([{ - parentComponentName: 'DatasetProfileListingComponent', - label: this.language.instant('NAV-BAR.TEMPLATE'), - url: '/dataset-profiles/' + this.datasetProfileId - }]); + this.breadCrumbs = observableOf([{ + parentComponentName: 'DatasetProfileListingComponent', + label: this.language.instant('NAV-BAR.TEMPLATE'), + url: '/dataset-profiles/' + this.datasetProfileId + }]); } else if (cloneId != null) { this.isClone = true; this.datasetProfileService.clone(cloneId) .pipe(map(data => data as DatasetProfile), takeUntil(this._destroyed)) .subscribe( - data => { - try { - this.dataModel = new DatasetProfileEditorModel().fromModel(data); - // this.isDeleted = this.masterItem.isActive === IsActive.Inactive; - this.dataModel.status = DatasetProfileEnum.SAVED; - this.form = this.dataModel.buildForm(); - this.prepareForm(); - } catch { - this.logger.error('Could not parse MasterItem: ' + data); - this.uiNotificationService.snackBarNotification(this.language.instant('NOTIFICATIONS.DEFAULT.ERROR'), SnackBarNotificationLevel.Error); - } - }, - error => this.onCallbackError(error) + data => { + try { + this.dataModel = new DatasetProfileEditorModel().fromModel(data); + // this.isDeleted = this.masterItem.isActive === IsActive.Inactive; + this.dataModel.status = DatasetProfileEnum.SAVED; + this.form = this.dataModel.buildForm(); + this.prepareForm(); + } catch { + this.logger.error('Could not parse MasterItem: ' + data); + this.uiNotificationService.snackBarNotification(this.language.instant('NOTIFICATIONS.DEFAULT.ERROR'), SnackBarNotificationLevel.Error); + } + }, + error => this.onCallbackError(error) ); } else if (this.newVersionId != null) { this.isNewVersion = true; this.datasetProfileService.getDatasetProfileById(this.newVersionId) .pipe(map(data => data as DatasetProfile), takeUntil(this._destroyed)) .subscribe( - data => { - try { - this.dataModel = new DatasetProfileEditorModel().fromModel(data); - // this.isDeleted = this.masterItem.isActive === IsActive.Inactive; - this.form = this.dataModel.buildForm(); - this.form.get('version').setValue(this.form.get('version').value + 1); - this.form.controls['label'].disable(); - this.prepareForm(); - } catch { - this.logger.error('Could not parse MasterItem: ' + data); - this.uiNotificationService.snackBarNotification(this.language.instant('NOTIFICATIONS.DEFAULT.ERROR'), SnackBarNotificationLevel.Error); - } - }, - error => this.onCallbackError(error) + data => { + try { + this.dataModel = new DatasetProfileEditorModel().fromModel(data); + // this.isDeleted = this.masterItem.isActive === IsActive.Inactive; + this.form = this.dataModel.buildForm(); + this.form.get('version').setValue(this.form.get('version').value + 1); + this.form.controls['label'].disable(); + this.form.controls['description'].disable(); + this.prepareForm(); + } catch { + this.logger.error('Could not parse MasterItem: ' + data); + this.uiNotificationService.snackBarNotification(this.language.instant('NOTIFICATIONS.DEFAULT.ERROR'), SnackBarNotificationLevel.Error); + } + }, + error => this.onCallbackError(error) ); } else { this.dataModel = new DatasetProfileEditorModel(); @@ -199,7 +202,7 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn .subscribe(() => { this.router.navigate(['/dataset-profiles']); }, - error => this.onCallbackErrorNewVersion(error) + error => this.onCallbackErrorNewVersion(error) ); } else { this.form.get('status').setValue(DatasetStatus.Draft); @@ -246,6 +249,7 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn public delete(): void { if (this.datasetProfileId && !this.isNew) { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { + restoreFocus: false, data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.DELETE-ITEM'), confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CONFIRM'), @@ -259,18 +263,18 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn this.datasetProfileService.delete(this.datasetProfileId, this.form.value) .pipe(takeUntil(this._destroyed)) .subscribe( - complete => { - this.uiNotificationService.snackBarNotification(this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-DATASET-PROFILE-DELETE'), SnackBarNotificationLevel.Success); - this.router.navigate(['/dataset-profiles']); - }, - error => { - this.onCallbackError(error); - if (error.error.statusCode == 674) { - this.uiNotificationService.snackBarNotification(this.language.instant('GENERAL.SNACK-BAR.UNSUCCESSFUL-DATASET-PROFILE-DELETE'), SnackBarNotificationLevel.Error); - } else { - this.uiNotificationService.snackBarNotification(this.language.instant(error.message), SnackBarNotificationLevel.Error); + complete => { + this.uiNotificationService.snackBarNotification(this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-DATASET-PROFILE-DELETE'), SnackBarNotificationLevel.Success); + this.router.navigate(['/dataset-profiles']); + }, + error => { + this.onCallbackError(error); + if (error.error.statusCode == 674) { + this.uiNotificationService.snackBarNotification(this.language.instant('GENERAL.SNACK-BAR.UNSUCCESSFUL-DATASET-PROFILE-DELETE'), SnackBarNotificationLevel.Error); + } else { + this.uiNotificationService.snackBarNotification(this.language.instant(error.message), SnackBarNotificationLevel.Error); + } } - } ); } }); diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.ts index 645bbf351..3b39d931b 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; import { takeUntil } from 'rxjs/operators'; import { ValidationErrorModel } from '../../../../../common/forms/validation/error-model/validation-error-model'; @@ -49,6 +49,8 @@ export class DatasetProfileCriteriaComponent extends BaseCriteriaComponent imple openDialog(): void { const dialogRef = this.dialog.open(DialodConfirmationUploadDatasetProfiles, { + width: '500px', + restoreFocus: false, data: { message: this.language.instant('DATASET-WIZARD.UPLOAD.UPLOAD-XML-FILE-TITLE'), confirmButton: this.language.instant('DATASET-WIZARD.UPLOAD.UPLOAD-XML'), diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html index e38401954..dec3649ac 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html @@ -15,7 +15,7 @@
- +
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.ts index e72e64e55..8db9791c4 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.ts @@ -1,4 +1,4 @@ -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { Inject, Component } from '@angular/core'; diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.scss b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.scss index 6bf311012..2eb955561 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.scss +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.scss @@ -33,7 +33,8 @@ mat-row:hover { // } mat-row:nth-child(odd) { - background-color: #eef0fb; + background-color: #0c748914; + // background-color: #eef0fb; } ::ng-deep .mat-paginator-container { 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 5b6db04b5..ffa8c646b 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 @@ -1,9 +1,11 @@ import { DataSource } from '@angular/cdk/table'; import { Component, OnInit, ViewChild } from '@angular/core'; -import { MatPaginator, MatSort, PageEvent } from '@angular/material'; +import { MatPaginator, PageEvent } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import { ActivatedRoute, Params, Router } from '@angular/router'; -import { Observable } from 'rxjs'; -import { takeUntil } from 'rxjs/operators'; +import { TranslateService } from '@ngx-translate/core'; +import { merge as observableMerge, Observable, of as observableOf } from 'rxjs'; +import { map, startWith, switchMap, takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../../core/common/base/base.component'; import { DataTableRequest } from '../../../../core/model/data-table/data-table-request'; import { DatasetListingModel } from '../../../../core/model/dataset/dataset-listing'; @@ -11,11 +13,9 @@ import { DmpModel } from '../../../../core/model/dmp/dmp'; import { DatasetProfileCriteria } from '../../../../core/query/dataset-profile/dataset-profile-criteria'; import { DatasetProfileService } from '../../../../core/services/dataset-profile/dataset-profile.service'; import { DmpService } from '../../../../core/services/dmp/dmp.service'; -import { DatasetProfileCriteriaComponent } from './criteria/dataset-profile.component'; -import { error } from 'selenium-webdriver'; -import { UiNotificationService, SnackBarNotificationLevel } from '../../../../core/services/notification/ui-notification-service'; -import { TranslateService } from '@ngx-translate/core'; +import { UiNotificationService } from '../../../../core/services/notification/ui-notification-service'; import { BreadcrumbItem } from '../../../misc/breadcrumb/definition/breadcrumb-item'; +import { DatasetProfileCriteriaComponent } from './criteria/dataset-profile.component'; @Component({ selector: 'app-dataset-profile-listing-component', @@ -24,9 +24,9 @@ import { BreadcrumbItem } from '../../../misc/breadcrumb/definition/breadcrumb-i }) export class DatasetProfileListingComponent extends BaseComponent implements OnInit { - @ViewChild(MatPaginator) _paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; - @ViewChild(DatasetProfileCriteriaComponent) criteria: DatasetProfileCriteriaComponent; + @ViewChild(MatPaginator, { static: true }) _paginator: MatPaginator; + @ViewChild(MatSort, { static: true }) sort: MatSort; + @ViewChild(DatasetProfileCriteriaComponent, { static: true }) criteria: DatasetProfileCriteriaComponent; breadCrumbs: Observable; dataSource: DatasetDataSource | null; @@ -70,7 +70,7 @@ export class DatasetProfileListingComponent extends BaseComponent implements OnI this.criteria.setCriteria(this.getDefaultCriteria()); this.refresh(); this.criteria.setRefreshCallback(() => this.refresh()); - this.breadCrumbs = Observable.of([{ + this.breadCrumbs = observableOf([{ parentComponentName: null, label: this.language.instant('NAV-BAR.DATASET-TEMPLATES'), url: '/dataset-profiles' @@ -80,7 +80,7 @@ export class DatasetProfileListingComponent extends BaseComponent implements OnI } setDmpTitle(dmpId: String) { - this.dmpService.getSingle(dmpId).map(data => data as DmpModel) + this.dmpService.getSingle(dmpId).pipe(map(data => data as DmpModel)) .pipe(takeUntil(this._destroyed)) .subscribe(data => { this.titlePrefix = data.label; @@ -140,9 +140,9 @@ export class DatasetDataSource extends DataSource { //this._sort.matSortChange ]; - return Observable.merge(...displayDataChanges) - .startWith(null) - .switchMap(() => { + return observableMerge(...displayDataChanges).pipe( + startWith(null), + switchMap(() => { const startIndex = this._paginator.pageIndex * this._paginator.pageSize; let fields: Array = new Array(); if (this._sort.active) { fields = this._sort.direction === 'asc' ? ['+' + this._sort.active] : ['-' + this._sort.active]; } @@ -153,7 +153,7 @@ export class DatasetDataSource extends DataSource { request.criteria.allVersions = true; } return this._service.getPaged(request); - }) + }), /*.catch((error: any) => { this._snackBar.openFromComponent(SnackBarNotificationComponent, { data: { message: 'GENERAL.SNACK-BAR.FORMS-BAD-REQUEST', language: this._languageService }, @@ -163,14 +163,14 @@ export class DatasetDataSource extends DataSource { //this._criteria.criteria.onCallbackError(error); return Observable.of(null); })*/ - .map(result => { + map(result => { return result; - }) - .map(result => { + }), + map(result => { if (!result) { return []; } if (this._paginator.pageIndex === 0) { this.totalCount = result.totalCount; } return result.data; - }); + })); } disconnect() { diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/preview/dataset-profile-preview.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/preview/dataset-profile-preview.component.ts index a8daf5820..97ea7d06d 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/preview/dataset-profile-preview.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/preview/dataset-profile-preview.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../../core/common/base/base.component'; import { DatasetProfileService } from '../../../../core/services/dataset-profile/dataset-profile.service'; diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.scss b/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.scss index 25d42604c..b0459dd25 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.scss +++ b/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.scss @@ -16,7 +16,8 @@ } ::ng-deep .mat-checkbox-checked.mat-accent .mat-checkbox-background, .mat-checkbox-indeterminate.mat-accent .mat-checkbox-background { - background-color: #0070c0; + background-color: #00b29f; + // background-color: #0070c0; } ::ng-deep .mat-checkbox-disabled.mat-checkbox-checked .mat-checkbox-background, .mat-checkbox-disabled.mat-checkbox-indeterminate .mat-checkbox-background { diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.ts b/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.ts index 0254b95a0..f56b1843f 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.ts +++ b/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.ts @@ -1,9 +1,12 @@ + +import {of as observableOf, Observable } from 'rxjs'; + +import {map, takeUntil } from 'rxjs/operators'; import { AfterViewInit, Component, OnInit } from '@angular/core'; import { AbstractControl, FormArray, FormControl, FormGroup } from '@angular/forms'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import * as FileSaver from 'file-saver'; -import { takeUntil } from 'rxjs/operators'; import { environment } from '../../../../../environments/environment'; import { ValidationErrorModel } from '../../../../common/forms/validation/error-model/validation-error-model'; import { BaseComponent } from '../../../../core/common/base/base.component'; @@ -16,7 +19,6 @@ import { SnackBarNotificationLevel, UiNotificationService } from '../../../../co import { EnumUtils } from '../../../../core/services/utilities/enum-utils.service'; import { DmpProfileEditorModel, DmpProfileFieldEditorModel } from './dmp-profile-editor.model'; import { BreadcrumbItem } from '../../../misc/breadcrumb/definition/breadcrumb-item'; -import { Observable } from 'rxjs'; import { DmpProfileExternalAutoCompleteFieldDataEditorModel } from './external-autocomplete/dmp-profile-external-autocomplete-field-editor.model'; @Component({ @@ -53,7 +55,7 @@ export class DmpProfileEditorComponent extends BaseComponent implements AfterVie if (this.dmpProfileId != null) { this.isNew = false; - this.dmpProfileService.getSingle(this.dmpProfileId).map(data => data as DmpProfile) + this.dmpProfileService.getSingle(this.dmpProfileId).pipe(map(data => data as DmpProfile)) .pipe(takeUntil(this._destroyed)) .subscribe(data => { this.dmpProfileModel = new DmpProfileEditorModel().fromModel(data); @@ -62,7 +64,7 @@ export class DmpProfileEditorComponent extends BaseComponent implements AfterVie this.formGroup.disable(); this.viewOnly = true } - this.breadCrumbs = Observable.of([{ + this.breadCrumbs = observableOf([{ parentComponentName: 'DmpProfileListingComponent', label: this.language.instant('NAV-BAR.TEMPLATE'), url: '/dmp-profiles/' + this.dmpProfileId @@ -74,7 +76,7 @@ export class DmpProfileEditorComponent extends BaseComponent implements AfterVie this.formGroup = this.dmpProfileModel.buildForm(); this.addField(); }); - this.breadCrumbs = Observable.of([{ + this.breadCrumbs = observableOf([{ parentComponentName: 'DmpProfileListingComponent', label: this.language.instant('NAV-BAR.TEMPLATE'), url: '/dmp-profiles/' + this.dmpProfileId diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html index 0f3cf0408..83c70604d 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html +++ b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html @@ -15,7 +15,7 @@
- +
diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.ts b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.ts index 0846e2896..42a7dfa61 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.ts +++ b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.ts @@ -1,4 +1,4 @@ -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { Inject, Component } from '@angular/core'; diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dmp-profile-criteria.component.ts b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dmp-profile-criteria.component.ts index 466097b9e..def43eae6 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dmp-profile-criteria.component.ts +++ b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dmp-profile-criteria.component.ts @@ -5,7 +5,7 @@ import { DmpCriteria } from '../../../../../core/query/dmp/dmp-criteria'; import { DmpProfileCriteria } from '../../../../../core/query/dmp/dmp-profile-criteria'; import { BaseCriteriaComponent } from '../../../../misc/criteria/base-criteria.component'; import { DialodConfirmationUploadDmpProfiles } from './dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; import { takeUntil } from 'rxjs/operators'; import { DmpProfileService } from '../../../../../core/services/dmp/dmp-profile.service'; @@ -55,6 +55,7 @@ export class DmpProfileCriteriaComponent extends BaseCriteriaComponent implement openDialog(): void { const dialogRef = this.dialog.open(DialodConfirmationUploadDmpProfiles, { + restoreFocus: false, data: { message: this.language.instant('DMP-PROFILE-LISTING.UPLOAD.UPLOAD-XML-FILE-TITLE'), confirmButton: this.language.instant('DMP-PROFILE-LISTING.UPLOAD.UPLOAD-XML'), diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.scss b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.scss index 772182938..fe822c9c8 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.scss +++ b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.scss @@ -16,7 +16,8 @@ } mat-row:nth-child(odd) { - background-color: #eef0fb; + background-color: #0c748914; + // background-color: #eef0fb; } .mat-fab-bottom-right { diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.ts b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.ts index 4353d5e7f..856548bc0 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.ts +++ b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.ts @@ -1,10 +1,14 @@ + +import {merge as observableMerge, of as observableOf, Observable } from 'rxjs'; + +import {map, switchMap, startWith, takeUntil } from 'rxjs/operators'; import { DataSource } from '@angular/cdk/table'; import { Component, OnInit, ViewChild } from '@angular/core'; -import { MatPaginator, MatSnackBar, MatSort, PageEvent } from '@angular/material'; +import { MatPaginator, PageEvent } from '@angular/material/paginator'; +import { MatSnackBar } from '@angular/material/snack-bar'; +import { MatSort } from '@angular/material/sort'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { Observable } from 'rxjs'; -import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../../core/common/base/base.component'; import { DmpProfileListing } from '../../../../core/model/dmp-profile/dmp-profile-listing'; import { DmpProfileCriteria } from '../../../../core/query/dmp/dmp-profile-criteria'; @@ -20,9 +24,9 @@ import { BreadcrumbItem } from '../../../misc/breadcrumb/definition/breadcrumb-i }) export class DmpProfileListingComponent extends BaseComponent implements OnInit { - @ViewChild(MatPaginator) _paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; - @ViewChild(DmpProfileCriteriaComponent) criteria: DmpProfileCriteriaComponent; + @ViewChild(MatPaginator, { static: true }) _paginator: MatPaginator; + @ViewChild(MatSort, { static: true }) sort: MatSort; + @ViewChild(DmpProfileCriteriaComponent, { static: true }) criteria: DmpProfileCriteriaComponent; dataSource: DatasetDataSource | null; displayedColumns: String[] = ['label', 'status', 'created']; @@ -54,7 +58,7 @@ export class DmpProfileListingComponent extends BaseComponent implements OnInit this.criteria.setCriteria(this.getDefaultCriteria()); this.refresh(); this.criteria.setRefreshCallback(() => this.refresh()); - this.breadCrumbs = Observable.of([{ + this.breadCrumbs = observableOf([{ parentComponentName: null, label: this.languageService.instant('NAV-BAR.DMP-TEMPLATES'), url: '/dmp-profiles' @@ -101,16 +105,16 @@ export class DatasetDataSource extends DataSource { //this._sort.matSortChange ]; - return Observable.merge(...displayDataChanges) - .startWith(null) - .switchMap(() => { + return observableMerge(...displayDataChanges).pipe( + startWith(null), + switchMap(() => { const startIndex = this._paginator.pageIndex * this._paginator.pageSize; let fields: Array = new Array(); if (this._sort.active) { fields = this._sort.direction === 'asc' ? ['+' + this._sort.active] : ['-' + this._sort.active]; } const request = new DataTableRequest(startIndex, this._paginator.pageSize, { fields: fields }); request.criteria = this._criteria.criteria; return this._service.getPaged(request); - }) + }), /*.catch((error: any) => { this._snackBar.openFromComponent(SnackBarNotificationComponent, { data: { message: 'GENERAL.SNACK-BAR.FORMS-BAD-REQUEST', language: this._languageService }, @@ -120,14 +124,14 @@ export class DatasetDataSource extends DataSource { //this._criteria.criteria.onCallbackError(error); return Observable.of(null); })*/ - .map(result => { + map(result => { return result; - }) - .map(result => { + }), + map(result => { if (!result) { return []; } if (this._paginator.pageIndex === 0) { this.totalCount = result.totalCount; } return result.data; - }); + }),); } disconnect() { diff --git a/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.scss b/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.scss index ed359a1d6..4f28a0670 100644 --- a/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.scss +++ b/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.scss @@ -12,7 +12,8 @@ } mat-row:nth-child(odd) { - background-color: #eef0fb; + background-color: #0c748914; + // background-color: #eef0fb; } } diff --git a/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.ts b/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.ts index 13b8e43bd..36e12bdad 100644 --- a/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.ts +++ b/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.ts @@ -1,8 +1,13 @@ + +import {of as observableOf, merge as observableMerge, Observable } from 'rxjs'; + +import {map, catchError, switchMap, startWith} from 'rxjs/operators'; import { DataSource } from '@angular/cdk/table'; import { AfterViewInit, Component, OnInit, ViewChild } from '@angular/core'; -import { MatPaginator, MatSnackBar, MatSort } from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSnackBar } from '@angular/material/snack-bar'; +import { MatSort } from '@angular/material/sort'; import { TranslateService } from '@ngx-translate/core'; -import { Observable } from 'rxjs'; import { UserListingModel } from '../../../../core/model/user/user-listing'; import { UserCriteria } from '../../../../core/query/user/user-criteria'; import { UserService } from '../../../../core/services/user/user.service'; @@ -41,28 +46,28 @@ export class UsersDataSource extends DataSource { // this._paginator.pageIndex = 0; //}) - return Observable.merge(...displayDataChanges) - .startWith(null) - .switchMap(() => { + return observableMerge(...displayDataChanges).pipe( + startWith(null), + switchMap(() => { const startIndex = this._paginator.pageIndex * this._paginator.pageSize; let fields: Array = new Array(); if (this._sort.active) { fields = this._sort.direction === 'asc' ? ['+' + this._sort.active] : ['-' + this._sort.active]; } const request = new DataTableRequest(startIndex, this._paginator.pageSize, { fields: fields }); request.criteria = this._criteria.getFormData(); return this._service.getPaged(request); - }) - .catch((error: any) => { + }), + catchError((error: any) => { this._snackBar.openFromComponent(SnackBarNotificationComponent, { data: { message: 'GENERAL.SNACK-BAR.FORMS-BAD-REQUEST', language: this._languageService }, duration: 3000, }); this._criteria.onCallbackError(error); - return Observable.of(null); - }) - .map(result => { + return observableOf(null); + }), + map(result => { return result; - }) - .map(result => { + }), + map(result => { if (!result) { return []; } if (this._paginator.pageIndex === 0) { this.totalCount = result.totalCount; } //result.data.forEach((element: any) => { @@ -75,7 +80,7 @@ export class UsersDataSource extends DataSource { // element.roles = roles; //}); return result.data; - }); + }),); } disconnect() { @@ -90,9 +95,9 @@ export class UsersDataSource extends DataSource { }) export class UserListingComponent implements OnInit, AfterViewInit { - @ViewChild(MatPaginator) _paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; - @ViewChild(UserCriteriaComponent) criteria: UserCriteriaComponent; + @ViewChild(MatPaginator, { static: true }) _paginator: MatPaginator; + @ViewChild(MatSort, { static: true }) sort: MatSort; + @ViewChild(UserCriteriaComponent, { static: true }) criteria: UserCriteriaComponent; breadCrumbs: Observable; dataSource: UsersDataSource | null; @@ -107,7 +112,7 @@ export class UserListingComponent implements OnInit, AfterViewInit { } ngOnInit() { - this.breadCrumbs = Observable.of([{ + this.breadCrumbs = observableOf([{ parentComponentName: null, label: this.languageService.instant('NAV-BAR.USERS-BREADCRUMB'), url: "/users" diff --git a/dmp-frontend/src/app/ui/auth/login/b2access/b2access-login.component.ts b/dmp-frontend/src/app/ui/auth/login/b2access/b2access-login.component.ts index 32a1cba27..a0c38b6ec 100644 --- a/dmp-frontend/src/app/ui/auth/login/b2access/b2access-login.component.ts +++ b/dmp-frontend/src/app/ui/auth/login/b2access/b2access-login.component.ts @@ -36,7 +36,11 @@ export class B2AccessLoginComponent extends BaseComponent implements OnInit { } public b2AccessGetAuthCode() { - window.location.href = environment.loginProviders.b2accessConfiguration.oauthUrl + '?response_type=code&client_id=' + environment.loginProviders.b2accessConfiguration.clientId + '&redirect_uri=' + environment.loginProviders.b2accessConfiguration.redirectUri + '&state=987654321&scope=USER_PROFILE'; + window.location.href = environment.loginProviders.b2accessConfiguration.oauthUrl + + '?response_type=code&client_id=' + environment.loginProviders.b2accessConfiguration.clientId + + '&redirect_uri=' + environment.loginProviders.b2accessConfiguration.redirectUri + + '&state=' + environment.loginProviders.b2accessConfiguration.state + + '&scope=USER_PROFILE'; } public b2AccessLogin(code: String) { diff --git a/dmp-frontend/src/app/ui/auth/login/configurable-login/configurable-login.component.html b/dmp-frontend/src/app/ui/auth/login/configurable-login/configurable-login.component.html new file mode 100644 index 000000000..e69de29bb diff --git a/dmp-frontend/src/app/ui/auth/login/configurable-login/configurable-login.component.ts b/dmp-frontend/src/app/ui/auth/login/configurable-login/configurable-login.component.ts new file mode 100644 index 000000000..dfeef2274 --- /dev/null +++ b/dmp-frontend/src/app/ui/auth/login/configurable-login/configurable-login.component.ts @@ -0,0 +1,94 @@ +import { Component, OnInit, Input } from "@angular/core"; +import { BaseComponent } from "../../../../core/common/base/base.component"; +import { ActivatedRoute, Router, Params } from "@angular/router"; +import { HttpClient } from "@angular/common/http"; +import { LoginService } from "../utilities/login.service"; +import { AuthService } from "../../../../core/services/auth/auth.service"; +import { takeUntil } from "rxjs/operators"; +import { environment } from "../../../../../environments/environment"; +import { AuthProvider } from "../../../../core/common/enum/auth-provider"; +import { ConfigurableProvider } from "../../../../core/model/configurable-provider/configurableProvider"; +import { ConfigurableProvidersService } from "../utilities/configurableProviders.service"; + +@Component({ + selector: 'app-configurable-login', + templateUrl: './configurable-login.component.html', +}) +export class ConfigurableLoginComponent extends BaseComponent implements OnInit { + private returnUrl: string; + + // private configurableLoginId: string; + // private clientId: string; + // private oauthUrl: string; + // private redirectUri: string; + // private state: string; + // @Input() scope: string; + + private provider: ConfigurableProvider; + private providerId: string; + + constructor( + private route: ActivatedRoute, + private loginService: LoginService, + private authService: AuthService, + private router: Router, + private httpClient: HttpClient, + private providers: ConfigurableProvidersService + ) { + super(); + } + + ngOnInit(): void { + const params = this.route.snapshot.params; + this.providerId = params['id']; + if (this.providers.providers === undefined) { + this.authService.getConfigurableProviders() + .pipe(takeUntil(this._destroyed)) + .subscribe((data) => { + this.providers.providers = data; + this.provider = this.providers.providers.find(item => item.configurableLoginId == this.providerId) + this.route.queryParams + .pipe(takeUntil(this._destroyed)) + .subscribe((params: Params) => { + const returnUrlFromParams = params['returnUrl']; + if (returnUrlFromParams) { this.returnUrl = returnUrlFromParams; } + if (!params['code']) { this.configurableAuthorize(); } else { this.configurableLoginUser(params['code'], params['state']) } + }) + }); + } else { + this.provider = this.providers.providers.find(item => item.configurableLoginId == this.providerId) + this.route.queryParams + .pipe(takeUntil(this._destroyed)) + .subscribe((params: Params) => { + const returnUrlFromParams = params['returnUrl']; + if (returnUrlFromParams) { this.returnUrl = returnUrlFromParams; } + if (!params['code']) { this.configurableAuthorize(); } else { this.configurableLoginUser(params['code'], params['state']) } + }) + } + } + + public configurableAuthorize() { + let authUrl = this.provider.oauthUrl + + '?response_type=code&client_id=' + this.provider.clientId + + '&redirect_uri=' + this.provider.redirect_uri + + '&scope=' + this.provider.scope; + if (this.provider.state.length > 0) authUrl = authUrl + '&state=' + this.provider.state + window.location.href = authUrl; + } + + public configurableLoginUser(code: string, state: string) { + if (state !== this.provider.state) { + this.router.navigate(['/login']) + } + this.httpClient.post(environment.Server + 'auth/configurableProviderRequestToken', { code: code, provider: AuthProvider.Configurable, configurableLoginId: this.providerId }) + .pipe(takeUntil(this._destroyed)) + .subscribe((data: any) => { + this.authService.login({ ticket: data.payload.accessToken, provider: AuthProvider.Configurable, data: { configurableLoginId: this.provider.configurableLoginId } }) + .pipe(takeUntil(this._destroyed)) + .subscribe( + res => this.loginService.onLogInSuccess(res, this.returnUrl), + error => this.loginService.onLogInError(error) + ) + }) + } +} diff --git a/dmp-frontend/src/app/ui/auth/login/img/openaire.png b/dmp-frontend/src/app/ui/auth/login/img/openaire.png new file mode 100644 index 000000000..473bb3f59 Binary files /dev/null and b/dmp-frontend/src/app/ui/auth/login/img/openaire.png differ diff --git a/dmp-frontend/src/app/ui/auth/login/img/openaire_small.png b/dmp-frontend/src/app/ui/auth/login/img/openaire_small.png new file mode 100644 index 000000000..b4c2a3df3 Binary files /dev/null and b/dmp-frontend/src/app/ui/auth/login/img/openaire_small.png differ diff --git a/dmp-frontend/src/app/ui/auth/login/linkedin-login/linkedin-login.component.ts b/dmp-frontend/src/app/ui/auth/login/linkedin-login/linkedin-login.component.ts index 5af22cde4..bf2981f99 100644 --- a/dmp-frontend/src/app/ui/auth/login/linkedin-login/linkedin-login.component.ts +++ b/dmp-frontend/src/app/ui/auth/login/linkedin-login/linkedin-login.component.ts @@ -1,11 +1,12 @@ import { Component, OnInit } from '@angular/core'; -import { ActivatedRoute, Params } from '@angular/router'; +import { ActivatedRoute, Params, Router } from '@angular/router'; import { takeUntil } from 'rxjs/operators'; import { environment } from '../../../../../environments/environment'; import { BaseComponent } from '../../../../core/common/base/base.component'; import { AuthProvider } from '../../../../core/common/enum/auth-provider'; import { AuthService } from '../../../../core/services/auth/auth.service'; import { LoginService } from '../utilities/login.service'; +import { HttpClient } from "@angular/common/http"; @Component({ selector: 'app-linkedin-login', @@ -18,7 +19,9 @@ export class LinkedInLoginComponent extends BaseComponent implements OnInit { constructor( private route: ActivatedRoute, private loginService: LoginService, - private authService: AuthService + private authService: AuthService, + private router: Router, + private httpClient: HttpClient ) { super(); } @@ -29,21 +32,31 @@ export class LinkedInLoginComponent extends BaseComponent implements OnInit { .subscribe((params: Params) => { const returnUrl = params['returnUrl']; if (returnUrl) { this.returnUrl = returnUrl; } - if (!params['code']) { this.linkedinAuthorize(); } else { this.linkedInLoginUser(params['code']); } + if (!params['code']) { this.linkedinAuthorize(); } else { this.linkedInLoginUser(params['code'], params['state']); } }); } public linkedinAuthorize() { - window.location.href = environment.loginProviders.linkedInConfiguration.oauthUrl + '?response_type=code&client_id=' + environment.loginProviders.linkedInConfiguration.clientId + '&redirect_uri=' + environment.loginProviders.linkedInConfiguration.redirectUri + '&state=987654321'; + window.location.href = environment.loginProviders.linkedInConfiguration.oauthUrl + + '?response_type=code&client_id=' + environment.loginProviders.linkedInConfiguration.clientId + + '&redirect_uri=' + environment.loginProviders.linkedInConfiguration.redirectUri + + '&state=' + environment.loginProviders.linkedInConfiguration.state + + '&scope=r_emailaddress'; } - - public linkedInLoginUser(code: string) { - this.authService.login({ ticket: code, provider: AuthProvider.LinkedIn }) + public linkedInLoginUser(code: string, state: string) { + if (state !== environment.loginProviders.linkedInConfiguration.state) { + this.router.navigate(['/login']); + } + this.httpClient.post(environment.Server + 'auth/linkedInRequestToken', { code: code, provider: AuthProvider.LinkedIn }) .pipe(takeUntil(this._destroyed)) - .subscribe( - res => this.loginService.onLogInSuccess(res, this.returnUrl), - error => this.loginService.onLogInError(error) - ); + .subscribe((data: any) => { + this.authService.login({ ticket: data.payload.accessToken, provider: AuthProvider.LinkedIn, data: null }) + .pipe(takeUntil(this._destroyed)) + .subscribe( + res => this.loginService.onLogInSuccess(res, this.returnUrl), + error => this.loginService.onLogInError(error) + ); + }); } } 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 da8ce40e0..7b674a5c4 100644 --- a/dmp-frontend/src/app/ui/auth/login/login.component.html +++ b/dmp-frontend/src/app/ui/auth/login/login.component.html @@ -7,28 +7,52 @@ +
+
+
+
+
+
-
-
+
+
+ + + + + +
+
+
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 0ec524671..6a4c37731 100644 --- a/dmp-frontend/src/app/ui/auth/login/login.component.scss +++ b/dmp-frontend/src/app/ui/auth/login/login.component.scss @@ -28,30 +28,32 @@ margin-top: 40px; } -@media (min-width: 1200px) { - .container { - width: 100%; - } -} - -@media (min-width: 992px) { - .container { - width: 100%; - } -} - -@media (min-width: 768px) { - .container { - width: 100%; - } -} - .container { height: 100%; position: relative; z-index: 1; } +@-webkit-keyframes card { + from { + top: -40px; + } + + to { + top: 0; + } +} + +@keyframes card { + from { + top: -40px; + } + + to { + top: 0; + } +} + .card { position: relative; padding: 20px; @@ -74,26 +76,6 @@ animation-fill-mode: forwards; } -@-webkit-keyframes card { - from { - top: -40px; - } - - to { - top: 0; - } -} - -@keyframes card { - from { - top: -40px; - } - - to { - top: 0; - } -} - .card-header { position: relative; overflow: hidden; @@ -118,14 +100,62 @@ .social-btns { height: 6em; + justify-content: center; } .social-btns i { font-size: 2.5em; - padding: 1em; + padding: 0.8em; color: #fff; } +.social-btns .col { + flex-grow: 0; +} + +.social-btns i:hover { + background-color: #f5f5f51c; + border-radius: 60%; +} + +.accesss-methods { + height: 5em; + justify-content: center; +} + +.accesss-methods .col-auto:hover { + background-color: #f5f5f51c; + border-radius: 100%; +} + +.accesss-methods .logo { + flex-grow: 0; + padding-top: 21px; + padding-bottom: 21px; +} + +.accesss-methods .openaire-logo { + flex-grow: 0; + padding-top: 21px; + padding-bottom: 21px; + margin-top: 5px; + height: 90px; +} + +.accesss-methods .orcid-logo { + height: 75px; + padding-top: 8px; + margin-top: 13px; +} + +.accesss-methods .configurable-logo { + flex-grow: 0; + padding-top: 21px; + padding-bottom: 21px; + margin-top: 5px; + height: 90px; +} + .tip { margin-top: -20px; } @@ -177,18 +207,28 @@ span.iconmedium { float: left; width: 100px; height: 56px; - margin-left: 2em; - margin-right: 2em; } span.orcidIconMedium { background: url(img/ORCIDiD_medium.png) no-repeat; background-position: center; float: right; - width: 100px; + width: 56px; height: 56px; - margin-left: 2em; - margin-right: 2em; +} + +span.openaireIcon { + background: url(img/openaire_small.png) no-repeat; + background-position: center; + float: right; + width: 80px; + height: 56px; +} + +span.configurableIcon { + float: right; + width: 80px; + height: 56px; } .b2access-button { @@ -201,6 +241,16 @@ span.orcidIconMedium { width: fit-content; } +.openaire-button { + margin-top: 10px; + width: fit-content; +} + +.configurable-button { + margin-top: 10px; + width: fit-content; +} + .login-logo { background: url(img/open-dmp.png) no-repeat; width: 273px; @@ -218,6 +268,41 @@ span.orcidIconMedium { height: auto; } -.accesss-methods { - height: 5em; +@media (min-width: 1200px) { + .container { + width: 100%; + } +} + +@media (min-width: 992px) { + .container { + width: 100%; + } +} + +@media (min-width: 768px) { + .container { + width: 100%; + } +} + +@media (min-width: 401px) and (max-width: 560px) { + .social-btns i { + padding: 0.4em !important; + } + .accesss-methods { + padding-top: 1em; + } +} + +@media (min-width: 0px) and (max-width: 400px) { + .social-btns i { + padding: 0.4em !important; + } + .card-header { + height: 350px !important; + } + .accesss-methods { + padding-top: 1em; + } } 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 c15aced02..8de93aac9 100644 --- a/dmp-frontend/src/app/ui/auth/login/login.component.ts +++ b/dmp-frontend/src/app/ui/auth/login/login.component.ts @@ -6,6 +6,8 @@ import { BaseComponent } from '../../../core/common/base/base.component'; import { AuthProvider } from '../../../core/common/enum/auth-provider'; import { AuthService } from '../../../core/services/auth/auth.service'; import { LoginService } from './utilities/login.service'; +import { ConfigurableProvider } from "../../../core/model/configurable-provider/configurableProvider"; +import { ConfigurableProvidersService } from "./utilities/configurableProviders.service"; /// /// @@ -21,12 +23,14 @@ export class LoginComponent extends BaseComponent implements OnInit, AfterViewIn public auth2: any; private returnUrl: string; + //public cofigurableProviders: ConfigurableProvider[]; constructor( private router: Router, private route: ActivatedRoute, private loginService: LoginService, - private authService: AuthService + private authService: AuthService, + public configurableProviderService: ConfigurableProvidersService ) { super(); } ngOnInit(): void { @@ -36,6 +40,11 @@ export class LoginComponent extends BaseComponent implements OnInit, AfterViewIn const returnUrl = params['returnUrl']; if (returnUrl) { this.returnUrl = returnUrl; } }); + this.authService.getConfigurableProviders() + .pipe(takeUntil(this._destroyed)) + .subscribe((data: any) => { + this.configurableProviderService.providers = data; + }) } ngAfterViewInit() { @@ -58,6 +67,14 @@ export class LoginComponent extends BaseComponent implements OnInit, AfterViewIn this.router.navigate(['/login/external/orcid']); } + public openaireLogin() { + this.router.navigate(['/login/openaire']); + } + + public configurableLogin(provider: ConfigurableProvider) { + this.router.navigate(['/login/configurable/' + provider.configurableLoginId]) + } + public hasFacebookOauth(): boolean { return this.hasProvider(AuthProvider.Facebook); } @@ -82,6 +99,10 @@ export class LoginComponent extends BaseComponent implements OnInit, AfterViewIn return this.hasProvider(AuthProvider.ORCID); } + public hasOpenAireOauth(): boolean { + return this.hasProvider(AuthProvider.OpenAire); + } + public initProviders() { if (this.hasProvider(AuthProvider.Google)) { this.initializeGoogleOauth(); } if (this.hasProvider(AuthProvider.Facebook)) { this.initializeFacebookOauth(); } @@ -102,6 +123,7 @@ export class LoginComponent extends BaseComponent implements OnInit, AfterViewIn case AuthProvider.Twitter: return this.hasAllRequiredFieldsConfigured(environment.loginProviders.twitterConfiguration); case AuthProvider.B2Access: return this.hasAllRequiredFieldsConfigured(environment.loginProviders.b2accessConfiguration); case AuthProvider.ORCID: return this.hasAllRequiredFieldsConfigured(environment.loginProviders.orcidConfiguration); + case AuthProvider.OpenAire: return this.hasAllRequiredFieldsConfigured(environment.loginProviders.openAireConfiguration); default: throw new Error('Unsupported Provider Type'); } } @@ -165,4 +187,8 @@ export class LoginComponent extends BaseComponent implements OnInit, AfterViewIn } }, { scope: 'user_friends,email' }); } + + public hasConfigurableProviders(): boolean { + return !(this.configurableProviderService.providers == undefined) && this.configurableProviderService.providers.length > 0 + } } 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 de4b22391..898fb98cb 100644 --- a/dmp-frontend/src/app/ui/auth/login/login.module.ts +++ b/dmp-frontend/src/app/ui/auth/login/login.module.ts @@ -9,6 +9,9 @@ import { LoginService } from './utilities/login.service'; import { B2AccessLoginComponent } from './b2access/b2access-login.component'; import { OrcidLoginComponent } from './orcid-login/orcid-login.component'; import { EmailConfirmation } from './email-confirmation/email-confirmation.component'; +import { OpenAireLoginComponent } from "./openaire-login/openaire-login.component"; +import { ConfigurableLoginComponent } from "./configurable-login/configurable-login.component"; +import { ConfigurableProvidersService } from "./utilities/configurableProviders.service"; @NgModule({ imports: [ @@ -22,8 +25,10 @@ import { EmailConfirmation } from './email-confirmation/email-confirmation.compo TwitterLoginComponent, B2AccessLoginComponent, OrcidLoginComponent, - EmailConfirmation + EmailConfirmation, + OpenAireLoginComponent, + ConfigurableLoginComponent ], - providers: [LoginService] + providers: [LoginService, ConfigurableProvidersService] }) export class LoginModule { } 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 88c7fc0b4..0a2e7049f 100644 --- a/dmp-frontend/src/app/ui/auth/login/login.routing.ts +++ b/dmp-frontend/src/app/ui/auth/login/login.routing.ts @@ -6,6 +6,8 @@ import { LinkedInLoginComponent } from './linkedin-login/linkedin-login.componen import { LoginComponent } from './login.component'; 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"; const routes: Routes = [ { path: '', component: LoginComponent }, @@ -14,7 +16,9 @@ const routes: Routes = [ { path: 'external/orcid', component: OrcidLoginComponent }, { path: 'external/b2access', component: B2AccessLoginComponent }, { path: 'confirmation/:token', component: EmailConfirmation }, - { path: 'confirmation', component: EmailConfirmation } + { path: 'confirmation', component: EmailConfirmation }, + { path: 'openaire', component: OpenAireLoginComponent}, + { path: 'configurable/:id', component: ConfigurableLoginComponent} ]; @NgModule({ diff --git a/dmp-frontend/src/app/ui/auth/login/openaire-login/openaire-login.component.html b/dmp-frontend/src/app/ui/auth/login/openaire-login/openaire-login.component.html new file mode 100644 index 000000000..e69de29bb diff --git a/dmp-frontend/src/app/ui/auth/login/openaire-login/openaire-login.component.ts b/dmp-frontend/src/app/ui/auth/login/openaire-login/openaire-login.component.ts new file mode 100644 index 000000000..14754d688 --- /dev/null +++ b/dmp-frontend/src/app/ui/auth/login/openaire-login/openaire-login.component.ts @@ -0,0 +1,61 @@ +import { Component, OnInit } from "@angular/core"; +import { BaseComponent } from "../../../../core/common/base/base.component"; +import { ActivatedRoute, Router, Params } from "@angular/router"; +import { LoginService } from "../utilities/login.service"; +import { AuthService } from "../../../../core/services/auth/auth.service"; +import { HttpClient } from "@angular/common/http"; +import { takeUntil } from "rxjs/operators"; +import { environment } from "../../../../../environments/environment"; +import { AuthProvider } from "../../../../core/common/enum/auth-provider"; + +@Component({ + selector: 'app-openaire-login', + templateUrl: './openaire-login.component.html', +}) +export class OpenAireLoginComponent extends BaseComponent implements OnInit { + private returnUrl: string; + + constructor( + private route: ActivatedRoute, + private loginService: LoginService, + private authService: AuthService, + private router: Router, + private httpClient: HttpClient + ) { + super(); + } + + ngOnInit(): void { + this.route.queryParams + .pipe(takeUntil(this._destroyed)) + .subscribe((params: Params) => { + const returnUrlFromParams = params['returnUrl']; + if (returnUrlFromParams) { this.returnUrl = returnUrlFromParams; } + if (!params['code']) { this.openaireAuthorize(); } else { this.openaireLoginUser(params['code'], params['state']) } + }) + } + + public openaireAuthorize() { + window.location.href = environment.loginProviders.openAireConfiguration.oauthUrl + + '?response_type=code&client_id=' + environment.loginProviders.openAireConfiguration.clientId + + '&redirect_uri=' + environment.loginProviders.openAireConfiguration.redirectUri + + '&state=' + environment.loginProviders.openAireConfiguration.state + + '&scope=openid profile email'; + } + + public openaireLoginUser(code: string, state: string) { + if (state !== environment.loginProviders.openAireConfiguration.state) { + this.router.navigate(['/login']) + } + this.httpClient.post(environment.Server + 'auth/openAireRequestToken', { code: code, provider: AuthProvider.OpenAire }) + .pipe(takeUntil(this._destroyed)) + .subscribe((data: any) => { + this.authService.login({ ticket: data.payload.accessToken, provider: AuthProvider.OpenAire, data: null }) + .pipe(takeUntil(this._destroyed)) + .subscribe( + res => this.loginService.onLogInSuccess(res, this.returnUrl), + error => this.loginService.onLogInError(error) + ); + }); + } +} diff --git a/dmp-frontend/src/app/ui/auth/login/utilities/configurableProviders.service.ts b/dmp-frontend/src/app/ui/auth/login/utilities/configurableProviders.service.ts new file mode 100644 index 000000000..64ef44970 --- /dev/null +++ b/dmp-frontend/src/app/ui/auth/login/utilities/configurableProviders.service.ts @@ -0,0 +1,15 @@ +import { Injectable } from "@angular/core"; +import { BaseService } from "../../../../core/common/base/base.service"; +import { ConfigurableProvider } from "../../../../core/model/configurable-provider/configurableProvider"; + +@Injectable() +export class ConfigurableProvidersService extends BaseService { + + public providers: ConfigurableProvider[]; + + constructor( + ) { + super(); + } + +} diff --git a/dmp-frontend/src/app/ui/auth/login/utilities/login.service.ts b/dmp-frontend/src/app/ui/auth/login/utilities/login.service.ts index 93d5db2be..59426a466 100644 --- a/dmp-frontend/src/app/ui/auth/login/utilities/login.service.ts +++ b/dmp-frontend/src/app/ui/auth/login/utilities/login.service.ts @@ -44,11 +44,11 @@ export class LoginService extends BaseService { public onLogInSuccess(loginResponse: any, returnUrl: string) { this.zone.run(() => { - this.uiNotificationService.snackBarNotification(this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-LOGIN'), SnackBarNotificationLevel.Success); - if (this.authService.current().culture) { this.cultureService.cultureSelected(this.authService.current().culture); } - const redirectUrl = returnUrl || '/'; - this.router.navigate([redirectUrl]); - }); + this.uiNotificationService.snackBarNotification(this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-LOGIN'), SnackBarNotificationLevel.Success); + if (this.authService.current().culture) { this.cultureService.cultureSelected(this.authService.current().culture); } + const redirectUrl = returnUrl || '/'; + this.router.navigate([redirectUrl]); + }); } public onLogInError(errorMessage: string) { diff --git a/dmp-frontend/src/app/ui/contact/contact-content/contact-content.component.html b/dmp-frontend/src/app/ui/contact/contact-content/contact-content.component.html new file mode 100644 index 000000000..a052f8455 --- /dev/null +++ b/dmp-frontend/src/app/ui/contact/contact-content/contact-content.component.html @@ -0,0 +1,33 @@ +
+
+
+
+

{{ 'CONTACT.TITLE-DASHED' | translate}}

+
+
+
+
+ + + + + {{formGroup.get('subject').getError('backendError').message}} + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + + + + + + {{formGroup.get('description').getError('backendError').message}} + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+
+
+
+
+
+
diff --git a/dmp-frontend/src/app/ui/contact/contact-content/contact-content.component.scss b/dmp-frontend/src/app/ui/contact/contact-content/contact-content.component.scss new file mode 100644 index 000000000..cdbae5052 --- /dev/null +++ b/dmp-frontend/src/app/ui/contact/contact-content/contact-content.component.scss @@ -0,0 +1,23 @@ +h1 { + text-align: center; +} + +img { + height: 150px; + width: 100%; +} + +.contact-component { + margin-top: 80px; +} + +.contact-container { + margin: 1em; + padding: 2em; + box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.14); + background-color: #ffffff; +} + +.contact-actions { + padding-right: 1em; +} diff --git a/dmp-frontend/src/app/ui/contact/contact-content/contact-content.component.ts b/dmp-frontend/src/app/ui/contact/contact-content/contact-content.component.ts new file mode 100644 index 000000000..b7b4dcc70 --- /dev/null +++ b/dmp-frontend/src/app/ui/contact/contact-content/contact-content.component.ts @@ -0,0 +1,87 @@ +import { FormGroup, AbstractControl, FormControl, FormArray } from '@angular/forms'; +import { Component, OnInit, Input } from '@angular/core'; +import { Location } from '@angular/common'; +import { takeUntil } from 'rxjs/operators'; +import { TranslateService } from '@ngx-translate/core'; +import { ContactEmailFormModel } from '../../../core/model/contact/contact-email-form-model'; +import { ContactSupportService } from '../../../core/services/contact-support/contact-support.service'; +import { BaseComponent } from '../../../core/common/base/base.component'; +import { UiNotificationService, SnackBarNotificationLevel } from '../../../core/services/notification/ui-notification-service'; +import { ValidationErrorModel } from '../../../common/forms/validation/error-model/validation-error-model'; + +@Component({ + selector: 'app-contact-content', + templateUrl: './contact-content.component.html', + styleUrls: ['./contact-content.component.scss'] +}) +export class ContactContentComponent extends BaseComponent implements OnInit { + + @Input() isDialog: boolean; + @Input() form: FormGroup; + private contactEmailFormModel: ContactEmailFormModel; + public formGroup: FormGroup; + + constructor( + private contactSupportService: ContactSupportService, + private _location: Location, + private uiNotificationService: UiNotificationService, + private language: TranslateService, + ) { + super(); + } + + ngOnInit() { + if (this.isDialog) { + this.formGroup = this.form; + } else { + this.contactEmailFormModel = new ContactEmailFormModel(); + this.formGroup = this.contactEmailFormModel.buildForm(); + } + } + + cancel() { + this._location.back(); + } + + send() { + this.contactSupportService.postEmail(this.formGroup.value) + .pipe(takeUntil(this._destroyed)) + .subscribe( + complete => this.onCallbackSuccess(), + error => this.onCallbackError(error) + ); + this.formGroup.reset(); + } + + onCallbackSuccess(): void { + this.uiNotificationService.snackBarNotification(this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-EMAIL-SEND'), SnackBarNotificationLevel.Success); + } + + onCallbackError(errorResponse: any) { + this.setErrorModel(errorResponse.error); + this.validateAllFormFields(this.formGroup); + this.uiNotificationService.snackBarNotification(this.language.instant('GENERAL.SNACK-BAR.UNSUCCESSFUL-EMAIL-SEND'), SnackBarNotificationLevel.Error); + } + + public setErrorModel(validationErrorModel: ValidationErrorModel) { + Object.keys(validationErrorModel).forEach(item => { + (this.contactEmailFormModel.validationErrorModel)[item] = (validationErrorModel)[item]; + }); + } + + public validateAllFormFields(formControl: AbstractControl) { + if (formControl instanceof FormControl) { + formControl.updateValueAndValidity({ emitEvent: false }); + } else if (formControl instanceof FormGroup) { + Object.keys(formControl.controls).forEach(item => { + const control = formControl.get(item); + this.validateAllFormFields(control); + }); + } else if (formControl instanceof FormArray) { + formControl.controls.forEach(item => { + this.validateAllFormFields(item); + }); + } + } + +} diff --git a/dmp-frontend/src/app/ui/contact/contact-dialog/contact-dialog.component.html b/dmp-frontend/src/app/ui/contact/contact-dialog/contact-dialog.component.html new file mode 100644 index 000000000..0bc464f10 --- /dev/null +++ b/dmp-frontend/src/app/ui/contact/contact-dialog/contact-dialog.component.html @@ -0,0 +1,17 @@ +
+
+
+ {{'CONTACT.SUPPORT.SUBTITLE' | translate}} +
+
+ close +
+
+
+ +
+
+
+
+
+
diff --git a/dmp-frontend/src/app/library/contact-dialog/contact-dialog.component.scss b/dmp-frontend/src/app/ui/contact/contact-dialog/contact-dialog.component.scss similarity index 83% rename from dmp-frontend/src/app/library/contact-dialog/contact-dialog.component.scss rename to dmp-frontend/src/app/ui/contact/contact-dialog/contact-dialog.component.scss index e2869c014..f9b1e58ff 100644 --- a/dmp-frontend/src/app/library/contact-dialog/contact-dialog.component.scss +++ b/dmp-frontend/src/app/ui/contact/contact-dialog/contact-dialog.component.scss @@ -2,6 +2,7 @@ min-width: 150px; max-width: 500px; width: 100%; + margin-bottom: 1.125rem; } .full-width { diff --git a/dmp-frontend/src/app/library/contact-dialog/contact-dialog.component.ts b/dmp-frontend/src/app/ui/contact/contact-dialog/contact-dialog.component.ts similarity index 84% rename from dmp-frontend/src/app/library/contact-dialog/contact-dialog.component.ts rename to dmp-frontend/src/app/ui/contact/contact-dialog/contact-dialog.component.ts index c886ad48f..dca466aef 100644 --- a/dmp-frontend/src/app/library/contact-dialog/contact-dialog.component.ts +++ b/dmp-frontend/src/app/ui/contact/contact-dialog/contact-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { FormGroup } from '@angular/forms'; @Component({ @@ -11,7 +11,7 @@ export class ContactDialogComponent { constructor( public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: FormGroup + @Inject(MAT_DIALOG_DATA) public data: any ) { } cancel() { @@ -19,7 +19,7 @@ export class ContactDialogComponent { } send() { - this.dialogRef.close(this.data); + this.dialogRef.close(this.data.formGroup); } close() { diff --git a/dmp-frontend/src/app/ui/contact/contact.module.ts b/dmp-frontend/src/app/ui/contact/contact.module.ts new file mode 100644 index 000000000..ec900601e --- /dev/null +++ b/dmp-frontend/src/app/ui/contact/contact.module.ts @@ -0,0 +1,26 @@ +import { NgModule } from '@angular/core'; +import { CommonUiModule } from '../../common/ui/common-ui.module'; +import { ContactRoutingModule } from './contact.routing'; +import { ContactContentComponent } from './contact-content/contact-content.component'; +import { ContactDialogComponent } from './contact-dialog/contact-dialog.component'; +import { ReactiveFormsModule } from '@angular/forms'; + +@NgModule({ + imports: [ + CommonUiModule, + ContactRoutingModule, + ReactiveFormsModule + ], + declarations: [ + ContactContentComponent, + ContactDialogComponent + ], + entryComponents: [ + ContactContentComponent, + ContactDialogComponent + ], + exports: [ + ContactDialogComponent + ] +}) +export class ContactModule { } diff --git a/dmp-frontend/src/app/ui/contact/contact.routing.ts b/dmp-frontend/src/app/ui/contact/contact.routing.ts new file mode 100644 index 000000000..cc67a2045 --- /dev/null +++ b/dmp-frontend/src/app/ui/contact/contact.routing.ts @@ -0,0 +1,16 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { ContactContentComponent } from './contact-content/contact-content.component'; + +const routes: Routes = [ + { + path: '', + component: ContactContentComponent, + }, +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class ContactRoutingModule { } diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.html b/dmp-frontend/src/app/ui/dashboard/dashboard.component.html index de1c123b3..63fdf84c6 100644 --- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.html +++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.html @@ -8,37 +8,28 @@
- +
- +
- +
- +
- + +
- +
@@ -56,21 +47,17 @@
- +
- +
- + +
- +
@@ -83,7 +70,7 @@

{{'DASHBOARD.DATA-MANAGEMENT-PLANS' | translate}}

{{ dashboardStatisticsData?.totalDataManagementPlanCount }} {{'HOME.DMPS' | translate}}

-

{{ 'GENERAL.ACTIONS.VIEW-ALL' | translate }}

+ {{ 'GENERAL.ACTIONS.VIEW-ALL' | translate }}
@@ -97,7 +84,7 @@

DATASETS

{{ dashboardStatisticsData?.totalDataSetCount }} {{'HOME.DATASETS' | translate}}

-

{{ 'GENERAL.ACTIONS.VIEW-ALL' | translate }}

+ {{ 'GENERAL.ACTIONS.VIEW-ALL' | translate }}
diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss b/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss index a2bbd0d6a..7e724b6c0 100644 --- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss +++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss @@ -1,109 +1,115 @@ .header-image { - background: url('/assets/images/dashboard-bg.png') no-repeat; - background-size: cover; - margin-top: 70px; - min-height: 20em; - position: relative; + background: url("/assets/images/dashboard-bg.png") no-repeat; + background-size: cover; + margin-top: 70px; + min-height: 20em; + 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; + background: rgba(255, 255, 255, 0.7); + position: absolute; + bottom: 0px; + padding-left: 5em; + padding-right: 10em; + padding-top: 2em; + padding-bottom: 2em; } .dashboard-main-container { - margin-top: 0px; + margin-top: 0px; } .non-auth-main-container { - padding: 0; + padding: 0; } .non-auth-stats { - background-color: rgba(255, 255, 255, 0.5); + background-color: rgba(255, 255, 255, 0.5); } .non-auth-title-container { - margin-top: 3em; + margin-top: 3em; } .dashboard { - .card { - padding: 25px 20px 20px 20px; - display: flex; - flex-direction: column; - align-items: center; - } + .card { + padding: 25px 20px 20px 20px; + display: flex; + flex-direction: column; + align-items: center; + } - .card h6, - p { - color: #999; - } + .card h6, + p { + color: #999; + } - .icon { - margin-top: 20px; - width: 130px; - height: 130px; - border: 1px solid #e5e5e5; - border-radius: 50%; - display: flex; - justify-content: center; - align-items: center; - } + .icon { + margin-top: 20px; + width: 130px; + height: 130px; + border: 1px solid #e5e5e5; + border-radius: 50%; + display: flex; + justify-content: center; + align-items: center; + } - .icon i { - font-size: 55px; - color: #e91e63; - } + .icon i { + font-size: 55px; + color: #e91e63; + } - .card-title { - margin-top: 30px; - margin-bottom: 3px; - } + .card-title { + margin-top: 30px; + margin-bottom: 3px; + } - .card-description { - margin-bottom: 20px; - } + .card-description { + margin-bottom: 20px; + } - .card-dataset { - display: flex; - flex-direction: column; - padding: 20px; - position: relative; - margin-top: 40px; - } + .card-dataset { + display: flex; + flex-direction: column; + padding: 20px; + position: relative; + margin-top: 40px; + } - .card { - box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.14); - border-radius: 6px; - color: rgba(0, 0, 0, 0.87); - background: #fff; - } + .card { + box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.14); + border-radius: 6px; + color: rgba(0, 0, 0, 0.87); + background: #fff; + } - .card-raised { - box-shadow: 0 10px 30px -12px rgba(0, 0, 0, 0.42), 0 4px 25px 0px rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2); - } + .card-raised { + box-shadow: 0 10px 30px -12px rgba(0, 0, 0, 0.42), 0 4px 25px 0px rgba(0, 0, 0, 0.12), + 0 8px 10px -5px rgba(0, 0, 0, 0.2); + } - .full-width { - width: 100%; - } + .full-width { + width: 100%; + } } .info { - display: flex; - flex-wrap: nowrap; + display: flex; + flex-wrap: nowrap; } .subtitle { - margin-bottom: 0px !important; + margin-bottom: 0px !important; } .view-all { - margin-left: auto; - margin-bottom: 0px !important; + margin-left: auto; + margin-bottom: 0px !important; + color: #6aa4d9; +} + +.view-all:hover { + color: rgb(46, 117, 182) !important; } diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts b/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts index c489236cf..b8cb32450 100644 --- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts @@ -1,7 +1,10 @@ + +import {of as observableOf, Observable } from 'rxjs'; + +import {mergeMap, takeUntil } from 'rxjs/operators'; import { Component, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; import { Router, ActivatedRoute, Params } from '@angular/router'; -import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../core/common/base/base.component'; import { RecentActivityType } from '../../core/common/enum/recent-activity-type'; import { DashboardStatisticsModel } from '../../core/model/dashboard/dashboard-statistics-model'; @@ -24,7 +27,6 @@ import { DatasetService } from '../../core/services/dataset/dataset.service'; import { ExploreDatasetCriteriaModel } from '../../core/query/explore-dataset/explore-dataset-criteria'; import { BreadcrumbItem } from '../misc/breadcrumb/definition/breadcrumb-item'; import { IBreadCrumbComponent } from '../misc/breadcrumb/definition/IBreadCrumbComponent'; -import { Observable } from 'rxjs'; @Component({ selector: 'app-dashboard', @@ -90,7 +92,7 @@ export class DashboardComponent extends BaseComponent implements OnInit, IBreadC // }; const breadCrumbs = []; - this.breadCrumbs = Observable.of(breadCrumbs); + this.breadCrumbs = observableOf(breadCrumbs); if (!this.isAuthenticated()) { this.dashboardService.getStatistics() @@ -109,9 +111,9 @@ export class DashboardComponent extends BaseComponent implements OnInit, IBreadC }); } - this.filteredOptions = this.searchControl.valueChanges.flatMap(x => { + this.filteredOptions = this.searchControl.valueChanges.pipe(mergeMap(x => { return this.searchBarService.search(x); - }); + })); } public isAuthenticated(): boolean { @@ -146,7 +148,7 @@ export class DashboardComponent extends BaseComponent implements OnInit, IBreadC getPublicDmps() { const dmpCriteria = new ExploreDmpCriteriaModel(); const fields: Array = new Array(); - fields.push('asc'); + fields.push('-finalizedAt'); const dataTableRequest: DataTableRequest = 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; }); @@ -162,18 +164,22 @@ export class DashboardComponent extends BaseComponent implements OnInit, IBreadC } dmpClicked(dmp: DmpListingModel) { - this.router.navigate(['/plans/publicEdit/' + dmp.id]); + if (!this.isAuthenticated()) { + this.router.navigate(['../explore-plans/overview', dmp.id], { relativeTo: this.route }); + } else { + this.router.navigate(['/plans/publicEdit/' + dmp.id]); + } } datasetClicked(dataset: DatasetListingModel) { this.router.navigate(['/datasets/publicEdit/' + dataset.id]); } - viewAllPublicDmpsClicked() { - this.router.navigate(['/explore-plans']); - } + // viewAllPublicDmpsClicked() { + // this.router.navigate(['/explore-plans']); + // } - viewAllPublicDatasetsClicked() { - this.router.navigate(['explore']); - } + // viewAllPublicDatasetsClicked() { + // this.router.navigate(['explore']); + // } } diff --git a/dmp-frontend/src/app/ui/dashboard/dataset-info-counter/dataset-info-counter.component.css b/dmp-frontend/src/app/ui/dashboard/dataset-info-counter/dataset-info-counter.component.css index 69a97ae21..17d724e05 100644 --- a/dmp-frontend/src/app/ui/dashboard/dataset-info-counter/dataset-info-counter.component.css +++ b/dmp-frontend/src/app/ui/dashboard/dataset-info-counter/dataset-info-counter.component.css @@ -38,7 +38,8 @@ } .about-item .length { - color: rgb(70, 135, 240); + color: #00b29f; + /* color: #089dbb; */ } .about-item .title { @@ -53,7 +54,8 @@ } .icon { - color: #92d050; + color: #08bd63; + /* color: #92d050; */ } hr { diff --git a/dmp-frontend/src/app/ui/dashboard/dmp-info-counter/dmp-info-counter.component.css b/dmp-frontend/src/app/ui/dashboard/dmp-info-counter/dmp-info-counter.component.css index ee94cbfe9..23ba20a1a 100644 --- a/dmp-frontend/src/app/ui/dashboard/dmp-info-counter/dmp-info-counter.component.css +++ b/dmp-frontend/src/app/ui/dashboard/dmp-info-counter/dmp-info-counter.component.css @@ -4,7 +4,8 @@ .icon { /* color: rgb(112, 173, 71); */ - color: #92d050; + color: #08bd63; + /* color: #92d050; */ } .gray-container { diff --git a/dmp-frontend/src/app/ui/dashboard/dmp-info-counter/dmp-info-counter.component.spec.ts b/dmp-frontend/src/app/ui/dashboard/dmp-info-counter/dmp-info-counter.component.spec.ts deleted file mode 100644 index 25f83e934..000000000 --- a/dmp-frontend/src/app/ui/dashboard/dmp-info-counter/dmp-info-counter.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { DmpInfoCounterComponent } from './dmp-info-counter.component'; - -describe('DmpInfoCounterComponent', () => { - let component: DmpInfoCounterComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ DmpInfoCounterComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(DmpInfoCounterComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.css b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.css index 7b3b12d9a..fd3281a27 100644 --- a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.css +++ b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.css @@ -1,59 +1,69 @@ .grey { - color: rgb(162, 162, 162); + color: rgb(162, 162, 162); } .card-draft { - height: calc(100% - 60px); + height: calc(100% - 60px); } .draft-desc { - position: relative; - overflow: hidden; - height: 60px; - font-size: 14px; - padding-top: 15px; - margin-bottom: 30px; + position: relative; + overflow: hidden; + height: 60px; + font-size: 14px; + padding-top: 15px; + margin-bottom: 30px; } .draft-desc:after { - content: ""; - text-align: right; - position: absolute; - bottom: 0; - right: 0; - width: 70%; - height: 1.4em; - background: linear-gradient(to right, rgba(255, 255, 255, 0), rgba(255, 255, 255, 1) 50%); + content: ""; + text-align: right; + position: absolute; + bottom: 0; + right: 0; + width: 70%; + height: 1.4em; + background: linear-gradient(to right, rgba(255, 255, 255, 0), rgba(255, 255, 255, 1) 50%); } td:hover .draft-desc:after { - background: rgba(255, 255, 255, 0); + background: rgba(255, 255, 255, 0); } .draft-subtitle { - font-weight: 400; - color: rgb(162, 162, 162); + font-weight: 400; + color: rgb(162, 162, 162); } .draft-title { - font-weight: 500; - color: black; + font-weight: 500; + color: black; } .drafts-more-btn { - text-align: right; + text-align: right; } .grant-pill { - width: 80%; - border: 1px solid rgb(231, 230, 230); - color: rgb(145, 145, 145); - background-color: rgb(242, 242, 242); - border-radius: 10em; - text-align: center; - max-width: 160px; - padding-left: 0.5em; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; + width: 80%; + border: 1px solid rgb(231, 230, 230); + color: rgb(145, 145, 145); + background-color: rgb(242, 242, 242); + border-radius: 10em; + text-align: center; + max-width: 160px; + padding-left: 0.5em; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.view-all { + margin-left: auto; + margin-bottom: 0px !important; + color: #6aa4d9; +} + +.view-all:hover { + color: rgb(46, 117, 182) !important; } diff --git a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html index aca1ec484..cca60626e 100644 --- a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html +++ b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html @@ -4,7 +4,7 @@

{{ 'TYPES.DATASET-STATUS.DRAFT' | translate }}

{{ 'TYPES.DATASET-STATUS.DRAFT-DESC' | translate }}

-
{{ 'GENERAL.ACTIONS.VIEW-ALL' | translate}}
+ {{ 'GENERAL.ACTIONS.VIEW-ALL' | translate}}
diff --git a/dmp-frontend/src/app/ui/dashboard/info-counter/info-counter.component.html b/dmp-frontend/src/app/ui/dashboard/info-counter/info-counter.component.html index e66c8d8cb..637414fc0 100644 --- a/dmp-frontend/src/app/ui/dashboard/info-counter/info-counter.component.html +++ b/dmp-frontend/src/app/ui/dashboard/info-counter/info-counter.component.html @@ -13,8 +13,8 @@
-
{{ 'GENERAL.ACTIONS.VIEW-ALL' | translate}}
-
{{ 'GENERAL.ACTIONS.VIEW-ALL' | translate}}
+ {{ 'GENERAL.ACTIONS.VIEW-ALL' | translate}} + {{ 'GENERAL.ACTIONS.VIEW-ALL' | translate}}
diff --git a/dmp-frontend/src/app/ui/dashboard/quick-wizard-create-add/quick-wizard-create-add.component.ts b/dmp-frontend/src/app/ui/dashboard/quick-wizard-create-add/quick-wizard-create-add.component.ts index 74b8cde91..b0a82ffca 100644 --- a/dmp-frontend/src/app/ui/dashboard/quick-wizard-create-add/quick-wizard-create-add.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/quick-wizard-create-add/quick-wizard-create-add.component.ts @@ -2,7 +2,7 @@ import { BaseComponent } from "../../../core/common/base/base.component"; import { OnInit, Component } from "@angular/core"; import { Router, ActivatedRoute } from "@angular/router"; import { TranslateService } from "@ngx-translate/core"; -import { MatSnackBar } from "@angular/material"; +import { MatSnackBar } from "@angular/material/snack-bar"; @Component({ selector: 'app-quick-wizard-create-add-component', diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css index bb91d4d54..f7ea0a2b1 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css @@ -1,48 +1,68 @@ th { - text-transform: uppercase; + text-transform: uppercase; +} + +a { + color: #212529; +} + +.table-row { + cursor: pointer; + display: table-row; } .is-public { - padding-left: 5px; - padding-right: 5px; - border: 1px solid rgb(197, 224, 180); - color: rgb(131, 184, 95); - background-color: rgb(240, 247, 236); - border-radius: 10em; - text-align: center; + padding-left: 5px; + padding-right: 5px; + border: 1px solid #00b29f3b; + color: #00b29f; + background-color: #00b29f0f; + border-radius: 10em; + text-align: center; } .template-name { - padding-left: 0.5em; - border: 1px solid rgb(218, 227, 243); - color: rgb(43, 104, 209); - background-color: rgb(236, 241, 249); - border-radius: 10em; - text-align: center; - max-width: 160px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; + padding-left: 0.5em; + border: 1px solid rgb(218, 227, 243); + color: rgb(43, 104, 209); + background-color: rgb(236, 241, 249); + border-radius: 10em; + text-align: center; + max-width: 160px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } .chip { - padding: 0.1em 1em; - margin-bottom: 1em; - margin-left: 2.5em; - margin-right: 2.5em; - border-radius: 10em; - background-color: rgba(0, 112, 192, 1); - /* background-color: #007bff; */ - color: #fff; - text-transform: uppercase; - text-align: center; - font-weight: 500; - max-width: 160px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; + padding: 0.1em 1em; + margin-bottom: 1em; + margin-left: 2.5em; + margin-right: 2.5em; + border-radius: 10em; + background-color: #0d7489; + /* background-color: rgba(0, 112, 192, 1); */ + /* background-color: #007bff; */ + color: #fff; + text-transform: uppercase; + text-align: center; + font-weight: 500; + max-width: 160px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } .mat-icon-button :hover { - color: rgb(120, 173, 220); + color: rgb(120, 173, 220); +} + +.view-all { + margin-left: auto; + margin-bottom: 0px !important; + color: #6aa4d9; +} + +.view-all:hover { + color: rgb(46, 117, 182) !important; } diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html index fbadad74e..34629bfd0 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html @@ -8,8 +8,8 @@ {{ 'RECENT-ACTIVITY.LICENSE' | translate}}

-
- {{ 'GENERAL.ACTIONS.VIEW-ALL' | translate}}
+ + {{ 'GENERAL.ACTIONS.VIEW-ALL' | translate}}
@@ -24,30 +24,34 @@ - + + - + - - + - + - + 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 b0c2f0250..c1d40d0cd 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 @@ -10,7 +10,7 @@ import { Router } from '@angular/router'; import { Principal } from '../../../core/model/auth/Principal'; import { TranslateService } from '@ngx-translate/core'; import { ConfirmationDialogComponent } from '../../../library/confirmation-dialog/confirmation-dialog.component'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { ExportMethodDialogComponent } from '../../../library/export-method-dialog/export-method-dialog.component'; import { BaseComponent } from '../../../core/common/base/base.component'; import { UiNotificationService, SnackBarNotificationLevel } from '../../../core/services/notification/ui-notification-service'; @@ -67,6 +67,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn deleteClicked(dmp: DmpListingModel) { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { maxWidth: '300px', + restoreFocus: false, data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.DELETE-ITEM'), confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.DELETE'), @@ -86,31 +87,6 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn }); } - advancedClicked(dmp: DmpListingModel) { - const dialogRef = this.dialog.open(ExportMethodDialogComponent, { - maxWidth: '500px', - data: { - message: "Download as:", - XMLButton: "XML", - documentButton: "Document", - pdfButton: "PDF", - jsonButton: "JSON" - - } - }); - dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => { - if (result == "pdf") { - this.downloadPDF(dmp.id); - } else if (result == "xml") { - this.downloadXml(dmp.id); - } else if (result == "doc") { - this.downloadDocx(dmp.id); - } else if (result == "json") { - this.downloadJson(dmp.id) - } - }); - } - onCallbackSuccess(): void { this.uiNotificationService.snackBarNotification(this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-UPDATE'), SnackBarNotificationLevel.Success); this.router.navigate(['/plans']); @@ -139,9 +115,9 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn } } - navigateToUrl() { - this.router.navigate(["plans/"]); - } + // navigateToUrl() { + // this.router.navigate(["plans/"]); + // } roleDisplay(value: any) { const principal: Principal = this.authentication.current(); @@ -164,14 +140,14 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn } } - dmpProfileDisplay(value: any) { - if (value != null) { - return value; - } - else { - return "--"; - } - } + // dmpProfileDisplay(value: any) { + // if (value != null) { + // return value; + // } + // else { + // return "--"; + // } + // } downloadXml(id: string) { this.dmpService.downloadXML(id) @@ -233,4 +209,29 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn } return filename; } + + // advancedClicked(dmp: DmpListingModel) { + // const dialogRef = this.dialog.open(ExportMethodDialogComponent, { + // maxWidth: '500px', + // data: { + // message: "Download as:", + // XMLButton: "XML", + // documentButton: "Document", + // pdfButton: "PDF", + // jsonButton: "JSON" + + // } + // }); + // dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => { + // if (result == "pdf") { + // this.downloadPDF(dmp.id); + // } else if (result == "xml") { + // this.downloadXml(dmp.id); + // } else if (result == "doc") { + // this.downloadDocx(dmp.id); + // } else if (result == "json") { + // this.downloadJson(dmp.id) + // } + // }); + // } } diff --git a/dmp-frontend/src/app/ui/dashboard/recent-visited-activity/recent-visited-activity.component.css b/dmp-frontend/src/app/ui/dashboard/recent-visited-activity/recent-visited-activity.component.css index 8402448b8..e79187de7 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-visited-activity/recent-visited-activity.component.css +++ b/dmp-frontend/src/app/ui/dashboard/recent-visited-activity/recent-visited-activity.component.css @@ -5,9 +5,9 @@ th { .is-public { padding-left: 5px; padding-right: 5px; - border: 1px solid rgb(197, 224, 180); - color: rgb(131, 184, 95); - background-color: rgb(240, 247, 236); + border: 1px solid #00b29f3b; + color: #00b29f; + background-color: #00b29f0f; border-radius: 10em; text-align: center; } diff --git a/dmp-frontend/src/app/ui/dashboard/wizard/wizard.component.html b/dmp-frontend/src/app/ui/dashboard/wizard/wizard.component.html index 602b338ab..d262335be 100644 --- a/dmp-frontend/src/app/ui/dashboard/wizard/wizard.component.html +++ b/dmp-frontend/src/app/ui/dashboard/wizard/wizard.component.html @@ -1,10 +1,10 @@ -
-
-
-

{{ title }}

-

{{ subtitle }}

-
- {{ icon }} -
-
-
+ +
+
+

{{ title }}

+

{{ subtitle }}

+
+ {{ icon }} +
+
+ diff --git a/dmp-frontend/src/app/ui/dashboard/wizard/wizard.component.spec.ts b/dmp-frontend/src/app/ui/dashboard/wizard/wizard.component.spec.ts deleted file mode 100644 index b5ec8b2c9..000000000 --- a/dmp-frontend/src/app/ui/dashboard/wizard/wizard.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { WizardComponent } from './wizard.component'; - -describe('WizardComponent', () => { - let component: WizardComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ WizardComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(WizardComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.html b/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.html index bced5e940..48da68a57 100644 --- a/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.html +++ b/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.html @@ -7,17 +7,13 @@ {{'DATASET-CREATE-WIZARD.FIRST-STEP.TITLE'| translate}}
- +
-
- -
+
@@ -26,20 +22,13 @@ {{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.THIRD-STEP.TITLE' | translate}}
- +
- - - + + +
diff --git a/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.ts b/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.ts index f20537d92..cfa7614b2 100644 --- a/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.ts +++ b/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.ts @@ -1,12 +1,14 @@ + +import { of as observableOf, Observable } from 'rxjs'; import { Component, OnInit, ViewChild } from '@angular/core'; import { FormBuilder, FormGroup, FormArray } from '@angular/forms'; -import { MatStepper, MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; +import { MatStepper } from '@angular/material/stepper'; import { Router } from '@angular/router'; import { BaseComponent } from '../../core/common/base/base.component'; import { QuickWizardService } from '../../core/services/quick-wizard/quick-wizard.service'; import { DatasetCreateWizardModel } from './dataset-create-wizard.model'; import { IBreadCrumbComponent } from '../misc/breadcrumb/definition/IBreadCrumbComponent'; -import { Observable } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { BreadcrumbItem } from '../misc/breadcrumb/definition/breadcrumb-item'; import { SnackBarNotificationLevel, UiNotificationService } from '../../core/services/notification/ui-notification-service'; @@ -14,22 +16,24 @@ import { TranslateService } from '@ngx-translate/core'; import { DatasetEditorWizardComponent } from '../quick-wizard/dataset-editor/dataset-editor-wizard.component'; import { DatasetStatus } from '../../core/common/enum/dataset-status'; import { ConfirmationDialogComponent } from '../../library/confirmation-dialog/confirmation-dialog.component'; +import { CheckDeactivateBaseComponent } from '../../library/deactivate/deactivate.component'; @Component({ selector: 'dataset-create-wizard.component', templateUrl: 'dataset-create-wizard.component.html', styleUrls: ['./dataset-create-wizard.component.scss'], }) -export class DatasetCreateWizard extends BaseComponent implements OnInit, IBreadCrumbComponent { +export class DatasetCreateWizard extends CheckDeactivateBaseComponent implements OnInit, IBreadCrumbComponent { breadCrumbs: Observable; - @ViewChild(DatasetEditorWizardComponent) datasetEditorWizardComponent: DatasetEditorWizardComponent; + @ViewChild(DatasetEditorWizardComponent, { static: false }) datasetEditorWizardComponent: DatasetEditorWizardComponent; isLinear = false; isNew = true; + isSubmitted = false; formGroup: FormGroup; datasetCreateWizardModel: DatasetCreateWizardModel; - @ViewChild('stepper') stepper: MatStepper; + @ViewChild('stepper', { static: true }) stepper: MatStepper; constructor( private router: Router, @@ -46,7 +50,7 @@ export class DatasetCreateWizard extends BaseComponent implements OnInit, IBread this.datasetCreateWizardModel = new DatasetCreateWizardModel(); this.formGroup = this.datasetCreateWizardModel.buildForm(); this.language.get('NAV-BAR.DATASET-DESCRIPTION-WIZARD').pipe(takeUntil(this._destroyed)).subscribe(x => { - this.breadCrumbs = Observable.of([ + this.breadCrumbs = observableOf([ { parentComponentName: 'Dashboard', label: x, @@ -68,7 +72,7 @@ export class DatasetCreateWizard extends BaseComponent implements OnInit, IBread .pipe(takeUntil(this._destroyed)) .subscribe( complete => this.onCallbackSuccess(dmpId) - ) + ); } else { return; } @@ -77,6 +81,7 @@ export class DatasetCreateWizard extends BaseComponent implements OnInit, IBread saveFinalize() { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { maxWidth: '300px', + restoreFocus: false, data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.FINALIZE-ITEM'), confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CONFIRM'), @@ -126,7 +131,7 @@ export class DatasetCreateWizard extends BaseComponent implements OnInit, IBread .pipe(takeUntil(this._destroyed)) .subscribe( complete => this.onCallbackSuccess(dmpId) - ) + ); } hasDatasets() { @@ -142,6 +147,7 @@ export class DatasetCreateWizard extends BaseComponent implements OnInit, IBread } onCallbackSuccess(dmpId: string): void { + this.isSubmitted = true; this.uiNotificationService.snackBarNotification(this.isNew ? this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-CREATION') : this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-UPDATE'), SnackBarNotificationLevel.Success); this.router.navigate(['/plans/overview/' + dmpId]); } @@ -154,4 +160,8 @@ export class DatasetCreateWizard extends BaseComponent implements OnInit, IBread return this.stepper.selectedIndex == 1; } } + + canDeactivate(): boolean { + return this.isSubmitted || !this.formGroup.dirty; + } } diff --git a/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.module.ts b/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.module.ts index dbb004455..8c5d790ec 100644 --- a/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.module.ts +++ b/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.module.ts @@ -7,10 +7,11 @@ import { ConfirmationDialogModule } from '../../library/confirmation-dialog/conf import { UrlListingModule } from '../../library/url-listing/url-listing.module'; import { DatasetDescriptionFormModule } from '../misc/dataset-description-form/dataset-description-form.module'; import { OuickWizardModule } from '../quick-wizard/quick-wizard.module'; -import { QuickWizardRoutingModule } from '../quick-wizard/quick-wizard.rooting'; import { DatasetCreateWizard } from './dataset-create-wizard.component'; import { DatasetCreateWizardRoutingModule } from './dataset-create-wizard.routing'; import { DatasetDmpSelector } from './dmp-selector/dataset-dmp-selector.component'; +import { QuickWizardRoutingModule } from '../quick-wizard/quick-wizard.routing'; +import { CanDeactivateGuard } from '../../library/deactivate/can-deactivate.guard'; @NgModule({ @@ -32,6 +33,9 @@ import { DatasetDmpSelector } from './dmp-selector/dataset-dmp-selector.componen DatasetDmpSelector, ], entryComponents: [ + ], + providers: [ + CanDeactivateGuard ] }) export class DatasetCreateWizardModule { } diff --git a/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.routing.ts b/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.routing.ts index 63689111c..0eb34454b 100644 --- a/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.routing.ts +++ b/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.routing.ts @@ -2,6 +2,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { DatasetCreateWizard } from './dataset-create-wizard.component'; import { DatasetDmpSelector } from './dmp-selector/dataset-dmp-selector.component'; +import { CanDeactivateGuard } from '../../library/deactivate/can-deactivate.guard'; const routes: Routes = [ { @@ -10,6 +11,7 @@ const routes: Routes = [ data: { breadcrumb: true }, + canDeactivate: [CanDeactivateGuard] }, { path: '', diff --git a/dmp-frontend/src/app/ui/dataset-create-wizard/dmp-selector/dataset-dmp-selector.component.ts b/dmp-frontend/src/app/ui/dataset-create-wizard/dmp-selector/dataset-dmp-selector.component.ts index 9736f9d4b..5cd431fe7 100644 --- a/dmp-frontend/src/app/ui/dataset-create-wizard/dmp-selector/dataset-dmp-selector.component.ts +++ b/dmp-frontend/src/app/ui/dataset-create-wizard/dmp-selector/dataset-dmp-selector.component.ts @@ -1,25 +1,23 @@ -import { Component, OnInit, ViewChild, Input } from '@angular/core'; -import { BaseComponent } from '../../../core/common/base/base.component'; -import { IBreadCrumbComponent } from '../../misc/breadcrumb/definition/IBreadCrumbComponent'; + +import { Component, Input, OnInit } from '@angular/core'; +import { FormArray, FormControl, FormGroup } from '@angular/forms'; +import { MatStepper } from '@angular/material/stepper'; +import { ActivatedRoute, Router } from '@angular/router'; import { Observable } from 'rxjs'; -import { BreadcrumbItem } from '../../misc/breadcrumb/definition/breadcrumb-item'; -import { MatStepper, MatSnackBar } from '@angular/material'; -import { FormGroup, FormArray } from '@angular/forms'; -import { DatasetProfileModel } from '../../../core/model/dataset/dataset-profile'; -import { takeUntil } from 'rxjs/operators'; -import { RequestItem } from '../../../core/query/request-item'; -import { DmpCriteria } from '../../../core/query/dmp/dmp-criteria'; -import { Params, ActivatedRoute, Router } from '@angular/router'; -import { DatasetProfileCriteria } from '../../../core/query/dataset-profile/dataset-profile-criteria'; -import { DataTableRequest } from '../../../core/model/data-table/data-table-request'; -import { DmpListingModel } from '../../../core/model/dmp/dmp-listing'; -import { ValidationErrorModel } from '../../../common/forms/validation/error-model/validation-error-model'; -import { SingleAutoCompleteConfiguration } from '../../../library/auto-complete/single/single-auto-complete-configuration'; -import { DatasetWizardService } from '../../../core/services/dataset-wizard/dataset-wizard.service'; -import { TranslateService } from '@ngx-translate/core'; -import { DmpService } from '../../../core/services/dmp/dmp.service'; -import { FormControl } from '@angular/forms/src/model'; +import { map, takeUntil } from 'rxjs/operators'; +import { BaseComponent } from '../../../core/common/base/base.component'; import { DmpStatus } from '../../../core/common/enum/dmp-status'; +import { DataTableRequest } from '../../../core/model/data-table/data-table-request'; +import { DatasetProfileModel } from '../../../core/model/dataset/dataset-profile'; +import { DmpListingModel } from '../../../core/model/dmp/dmp-listing'; +import { DatasetProfileCriteria } from '../../../core/query/dataset-profile/dataset-profile-criteria'; +import { DmpCriteria } from '../../../core/query/dmp/dmp-criteria'; +import { RequestItem } from '../../../core/query/request-item'; +import { DatasetWizardService } from '../../../core/services/dataset-wizard/dataset-wizard.service'; +import { DmpService } from '../../../core/services/dmp/dmp.service'; +import { SingleAutoCompleteConfiguration } from '../../../library/auto-complete/single/single-auto-complete-configuration'; +import { BreadcrumbItem } from '../../misc/breadcrumb/definition/breadcrumb-item'; +import { IBreadCrumbComponent } from '../../misc/breadcrumb/definition/IBreadCrumbComponent'; @Component({ selector: 'dataset-dmp-selector-component', @@ -79,8 +77,8 @@ export class DatasetDmpSelector extends BaseComponent implements OnInit, IBreadC dmpDataTableRequest.criteria.status = DmpStatus.Draft; dmpDataTableRequest.criteria.like = query; - return this.dmpService.getPaged(dmpDataTableRequest, "autocomplete") - .map(y => y.data); + return this.dmpService.getPaged(dmpDataTableRequest, "autocomplete").pipe( + map(y => y.data)); } loadDatasetProfiles() { diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.html index 5fb58d9ef..a48b76f1b 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.html +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.html @@ -1,21 +1,17 @@
-
+
+
{{'DATASET-WIZARD.DIALOGUE.TITLE' | translate}}
+
close
+
+
- + - - {{getErrorMessage()}} - +
-
-
-
- -
-
- -
+
+
+
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.scss b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.scss index 30b14f9a7..20aec23ed 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.scss +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.scss @@ -1,6 +1,11 @@ .confirmation-message { - padding-bottom: 20px; + padding-bottom: 20px; } + +.close-btn { + cursor: pointer; +} + .dataset-copy-dialog { - width: 350px; + margin-bottom: 1.125rem; } diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.ts index 6ac820ac8..93b237741 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.ts @@ -1,5 +1,7 @@ + +import {map} from 'rxjs/operators'; import { Component } from "@angular/core"; -import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material"; +import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog"; import { SingleAutoCompleteConfiguration } from "../../../../library/auto-complete/single/single-auto-complete-configuration"; import { Observable } from "rxjs"; import { DataTableRequest } from "../../../../core/model/data-table/data-table-request"; @@ -9,6 +11,7 @@ import { DmpService } from "../../../../core/services/dmp/dmp.service"; import { Inject } from "@angular/core"; import { DmpModel } from "../../../../core/model/dmp/dmp"; import { TranslateService } from "@ngx-translate/core"; +import { DmpAssociatedProfileModel } from '../../../../core/model/dmp-profile/dmp-associated-profile'; @Component({ selector: 'dataset-copy-dialogue-component', @@ -19,6 +22,7 @@ export class DatasetCopyDialogueComponent { dmpAutoCompleteConfiguration: SingleAutoCompleteConfiguration; dmpModel: DmpModel; + datasetDescriptionTemplateLabel: String; constructor( public dialogRef: MatDialogRef, @@ -32,7 +36,9 @@ export class DatasetCopyDialogueComponent { filterFn: this.searchDmp.bind(this), initialItems: (extraData) => this.searchDmp(''), displayFn: (item) => item['label'], - titleFn: (item) => item['label'] + titleFn: (item) => item['label'], + disableOption: (item) => !this.existsDatasetDescriptionTemplate(item['associatedProfiles']), + subtitleFn: (item) => !this.existsDatasetDescriptionTemplate(item['associatedProfiles']) ? this.getErrorMessage() : null }; } @@ -57,19 +63,23 @@ export class DatasetCopyDialogueComponent { const dmpDataTableRequest: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); dmpDataTableRequest.criteria = new DmpCriteria(); dmpDataTableRequest.criteria.like = query; - return this.dmpService.getPaged(dmpDataTableRequest, "autocomplete").map(x => x.data); + return this.dmpService.getPaged(dmpDataTableRequest, "autocomplete").pipe(map(x => x.data)); + } + + existsDatasetDescriptionTemplate(associatedProfiles: DmpAssociatedProfileModel[]): boolean { + return associatedProfiles.some((profile) => profile.id === this.data.datasetProfileId); } datasetProfileValidate() { - return this.dmpService.getSingle(this.data.formControl.value.id).map(result => result as DmpModel) - .map(result => { + return this.dmpService.getSingle(this.data.formControl.value.id).pipe(map(result => result as DmpModel), + map(result => { this.dmpModel = result this.dmpModel.profiles.forEach((element) => { if (element.id == this.data.datasetProfileId) { this.data.datasetProfileExist = true; } }) - }); + }),); } getErrorMessage() { @@ -84,4 +94,8 @@ export class DatasetCopyDialogueComponent { return false; } } + + close() { + this.dialogRef.close(false); + } } diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.html index 1a82038bb..299133f87 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.html +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.html @@ -2,21 +2,21 @@
- + {{formGroup.get('label').getError('backendError').message}} {{'GENERAL.VALIDATION.REQUIRED' | translate}}
- + {{formGroup.get('uri').getError('backendError').message}} {{'GENERAL.VALIDATION.REQUIRED' | translate}}
- + {{formGroup.get('description').getError('backendError').message}} {{'GENERAL.VALIDATION.REQUIRED' | translate}} 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 3f573a7a1..ebce512d8 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 @@ -219,14 +219,16 @@ export class ExternalRegistryEditorModel { public label: String; public reference: String; public uri: 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.abbreviation = abbreviation; this.definition = definition; this.id = id; this.label = label; this.reference = reference; this.uri = uri; + this.source = source; } fromModel(item: RegistryModel): ExternalRegistryEditorModel { @@ -234,8 +236,9 @@ export class ExternalRegistryEditorModel { this.definition = item.definition; this.id = item.id; this.label = item.label; - this.reference = item.reference; + this.reference = item.pid ? item.pid : item.reference; this.uri = item.uri; + this.source = item.source return this; } @@ -247,7 +250,8 @@ export class ExternalRegistryEditorModel { label: [this.label], reference: [this.reference], uri: [this.uri], - definition: [this.definition] + definition: [this.definition], + source: [this.source] }); } } @@ -256,28 +260,31 @@ export class ExternalDatasetEditorModel { public abbreviation: String; public id: String; - public label: String; + public name: String; public reference: String; public type: ExternalDatasetType; public info: String; public validationErrorModel: ValidationErrorModel = new ValidationErrorModel(); + public source: String; - constructor(id?: string, abbreviation?: string, label?: string, reference?: string, info?: string, type?: ExternalDatasetType) { + constructor(id?: string, abbreviation?: string, name?: string, reference?: string, source?: String, info?: string, type?: ExternalDatasetType) { this.id = id; - this.label = label; + this.name = name; this.abbreviation = abbreviation; this.reference = reference; this.info = info; this.type = type; + this.source = source; } fromModel(item: ExternalDatasetModel): ExternalDatasetEditorModel { this.abbreviation = item.abbreviation; this.id = item.id; - this.label = item.label; + this.name = item.name; this.reference = item.reference; this.type = item.type; this.info = item.info; + this.source = item.source; return this; } @@ -285,10 +292,11 @@ export class ExternalDatasetEditorModel { return new FormBuilder().group({ id: [this.id], abbreviation: [this.abbreviation], - label: [this.label], + name: [this.name], reference: [this.reference], type: [this.type, Validators.required], - info: [this.info] + info: [this.info], + source: [this.source] }); } } @@ -302,13 +310,15 @@ export class ExternalDataRepositoryEditorModel { public info: string; public created: Date; public modified: Date; + public source: string; - constructor(id?: string, label?: string, abbreviation?: string, uri?: string, reference?: string) { + constructor(id?: string, label?: string, abbreviation?: string, uri?: string, reference?: string, source?: string) { this.id = id; this.label = label; this.abbreviation = abbreviation; this.uri = uri; this.reference = reference; + this.source = source; } fromModel(item: DataRepositoryModel): ExternalDataRepositoryEditorModel { @@ -318,6 +328,7 @@ export class ExternalDataRepositoryEditorModel { this.uri = item.uri; this.info = item.info; this.reference = item.pid; + this.source = item.source; return this; } @@ -328,7 +339,8 @@ export class ExternalDataRepositoryEditorModel { abbreviation: [this.abbreviation], uri: [this.uri], info: [this.info], - reference: [this.reference] + reference: [this.reference], + source: [this.source] }); } } diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html index e402503ab..601b3f209 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html @@ -1,41 +1,54 @@
-
-
-

{{datasetWizardModel?.label}} - - - {{ 'GENERAL.STATUSES.EDIT' | translate }} -

-
-

{{ 'DATASET-WIZARD.TITLE.NEW' | translate }}

+
+
+
+
+

{{datasetWizardModel?.label}} + - + {{ 'GENERAL.STATUSES.EDIT' | translate }} +

+
+

{{ 'DATASET-WIZARD.TITLE.NEW' | translate }}

+
+ +
+ + + + + + +
+
+
+ + + + + + +
-
- - - - - - - - -
@@ -47,14 +60,11 @@ - + - + {{profile.label}} @@ -71,172 +81,44 @@ {{'DATASET-PROFILE-EDITOR.STEPS.PAGES.EXTERNAL-REFERENCES' | translate}} - + - +
library_books {{'DATASET-PROFILE-EDITOR.STEPS.PAGES.DESCRIPTION' | translate}}
- - +
+
+
+ + +
+
+
+ +
+
+
+ info_outlined +
{{'DATASET-WIZARD.ACTIONS.INFO' | translate}}
- - + +
- +
- - - - - - - - - - diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss index b2049965d..49e23b07c 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss @@ -1,101 +1,155 @@ +@media (max-width: 768px) { + .main-content { + padding: 30px 0px; + } + + ::ng-deep .mat-expansion-panel-header { + min-height: 48px; + height: auto !important; + } + + ::ng-deep .mat-expansion-panel-body { + padding: 0 0px 16px !important; + } + + ::ng-deep .mat-vertical-content { + padding: 0 14px 24px 14px !important; + } +} + .dataset-wizard { - .step-container { - margin-top: 1em; - } - .external-item-card { - margin-top: 1em; - } - .external-item-action-row, - .description-action-row { - margin-top: 1em; - } - .deleteButton, .reverseButton { - margin-top: 15px; - margin-bottom: 15px; - margin-right: 15px; - text-transform: uppercase; - } - .cancelButton { - margin-top: 15px; - margin-bottom: 15px; - margin-right: 15px; - text-transform: uppercase; - } - .saveButton { - margin-top: 15px; - margin-bottom: 15px; - margin-right: 15px; - text-transform: uppercase; - } - .saveAndFinalizeButton { - margin-top: 15px; - margin-bottom: 15px; - margin-right: 15px; - } - .finalizeButton { - margin-top: 15px; - margin-bottom: 15px; - margin-right: 15px; - text-transform: uppercase; - } - .downloadPDF { - margin-top: 15px; - margin-bottom: 15px; - margin-right: 15px; - } - .downloadXML { - margin-top: 15px; - margin-bottom: 15px; - margin-right: 15px; - } - .downloadDOCX { - margin-top: 15px; - margin-bottom: 15px; - margin-right: 15px; - } - .updateDatasetProfile { - margin-top: 15px; - margin-bottom: 15px; - margin-right: 15px; - } + .toc-pane-container { + &.is-sticky~.nav-spacer { + height: 500px; // the container size } + // height: calc(100vh - 100px); // the container size } + } + } - .actions { - display: flex; - justify-content: flex-end; - } + .step-container { + margin-top: 1em; + } - // .actions > button { - // background-color: #0070c0; - // color: #ffffff; - // text-transform: uppercase; - // } + .external-item-card { + margin-top: 1em; + } - .more-horiz { - font-size: 28px; - color: #aaaaaa; - } + .external-item-action-row, + .description-action-row { + margin-top: 1em; + } - .more-icon :hover { - color: #4687e6; - } + .deleteButton, + .reverseButton { + margin-top: 15px; + margin-bottom: 15px; + margin-right: 15px; + text-transform: uppercase; + } - .new-dataset { - height: 3.5em; - } + .cancelButton { + margin-top: 15px; + margin-bottom: 15px; + margin-right: 15px; + text-transform: uppercase; + } + + .saveButton { + margin-top: 15px; + margin-bottom: 15px; + margin-right: 15px; + text-transform: uppercase; + } + + .saveAndFinalizeButton { + margin-top: 15px; + margin-bottom: 15px; + margin-right: 15px; + } + + .finalizeButton { + margin-top: 15px; + margin-bottom: 15px; + margin-right: 15px; + text-transform: uppercase; + } + + .export-btn { + padding-right: 6px; + } + + .downloadPDF { + margin-top: 15px; + margin-bottom: 15px; + margin-right: 15px; + } + + .downloadXML { + margin-top: 15px; + margin-bottom: 15px; + margin-right: 15px; + } + + .downloadDOCX { + margin-top: 15px; + margin-bottom: 15px; + margin-right: 15px; + } + + .updateDatasetProfile { + margin-top: 15px; + margin-bottom: 15px; + margin-right: 15px; + } + + .actions { + display: flex; + justify-content: flex-end; + } + + // .actions > button { + // background-color: #0070c0; + // color: #ffffff; + // text-transform: uppercase; + // } + + .more-horiz { + font-size: 28px; + color: #aaaaaa; + } + + .more-icon :hover { + color: #00b29f; + } + + .new-dataset { + height: 3.5em; + } } .menu-item { - width: 248px; + width: 248px; } ::ng-deep .mat-tab-labels { - justify-content: space-between; + justify-content: space-between; } ::ng-deep .mat-tab-label-content { - text-transform: uppercase; + text-transform: uppercase; } ::ng-deep .mat-ink-bar { - background-color: #0070c0 !important; + background-color: #00b29f !important; + // background-color: #0070c0 !important; +} + +.toc-pane-container { + &.is-sticky~.nav-spacer { + height: 500px; // the container size } + // height: calc(100vh - 100px); // the container size } + } +} + +.is-sticky { + margin-top: 70px !important; } diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts index 8653f846d..c8019b93c 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts @@ -1,14 +1,17 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; -import { MatDialog, MatSnackBar, MatStepper } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; +import { MatSnackBar } from '@angular/material/snack-bar'; +import { MatStepper } from '@angular/material/stepper'; import { ActivatedRoute, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import * as FileSaver from 'file-saver'; -import { Observable } from 'rxjs'; -import { takeUntil } from 'rxjs/operators'; +import { Observable, of as observableOf } from 'rxjs'; +import { catchError, map, takeUntil } from 'rxjs/operators'; import { ValidationErrorModel } from '../../../common/forms/validation/error-model/validation-error-model'; import { BaseComponent } from '../../../core/common/base/base.component'; import { DatasetStatus } from '../../../core/common/enum/dataset-status'; +import { DmpStatus } from '../../../core/common/enum/dmp-status'; import { DataTableRequest } from '../../../core/model/data-table/data-table-request'; import { DatasetProfileModel } from '../../../core/model/dataset/dataset-profile'; import { DmpModel } from '../../../core/model/dmp/dmp'; @@ -23,13 +26,12 @@ import { ExternalSourcesService } from '../../../core/services/external-sources/ import { SnackBarNotificationLevel, UiNotificationService } from '../../../core/services/notification/ui-notification-service'; import { SingleAutoCompleteConfiguration } from '../../../library/auto-complete/single/single-auto-complete-configuration'; import { ConfirmationDialogComponent } from '../../../library/confirmation-dialog/confirmation-dialog.component'; -import { ExportMethodDialogComponent } from '../../../library/export-method-dialog/export-method-dialog.component'; import { BreadcrumbItem } from '../../misc/breadcrumb/definition/breadcrumb-item'; import { IBreadCrumbComponent } from '../../misc/breadcrumb/definition/IBreadCrumbComponent'; import { DatasetDescriptionFormEditorModel } from '../../misc/dataset-description-form/dataset-description-form.model'; +import { LinkToScroll } from '../../misc/dataset-description-form/tableOfContentsMaterial/table-of-contents'; import { DatasetCopyDialogueComponent } from './dataset-copy-dialogue/dataset-copy-dialogue.component'; import { DatasetWizardEditorModel } from './dataset-wizard-editor.model'; -import { DmpStatus } from '../../../core/common/enum/dmp-status'; @Component({ selector: 'app-dataset-wizard-component', @@ -40,7 +42,6 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr breadCrumbs: Observable; viewOnly = false; - @ViewChild('stepper') stepper: MatStepper; editMode = false; publicMode = false; @@ -59,7 +60,6 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr profileUpdateId: string; downloadDocumentId: string; isLinear = false; - hasReversableStatus: boolean = false; constructor( private datasetWizardService: DatasetWizardService, @@ -88,8 +88,10 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr this.dmpAutoCompleteConfiguration = { filterFn: this.searchDmp.bind(this), initialItems: (extraData) => this.searchDmp(''), - displayFn: (item) => item['label'], - titleFn: (item) => item['label'] + displayFn: (item) => this.getDatasetDisplay(item), + titleFn: (item) => item['label'], + iconFn: (item) => this.publicMode ? '' : (item['status'] ? 'lock' : 'lock_open'), + linkFn: (item) => this.publicMode ? '/explore-plans/overview/' + item['id'] : '/plans/overview/' + item['id'] }; const params = this.route.snapshot.params; @@ -109,7 +111,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr .subscribe(data => { this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(data); this.needsUpdate(); - this.breadCrumbs = Observable.of([ + this.breadCrumbs = observableOf([ { parentComponentName: null, label: this.datasetWizardModel.label, @@ -132,19 +134,15 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr this.loadDatasetProfiles(); this.registerFormListeners(); // this.availableProfiles = this.datasetWizardModel.dmp.profiles; - - if (this.formGroup.get('dmp').value.status == DmpStatus.Draft && this.formGroup.get('status').value == DatasetStatus.Finalized) { - this.hasReversableStatus = true; - } }, - error => { - this.uiNotificationService.snackBarNotification(this.language.instant('DATASET-WIZARD.MESSAGES.DATAESET-NOT-FOUND'), SnackBarNotificationLevel.Error); - this.router.navigate(['/plans']); - return Observable.of(null); - }); + error => { + this.uiNotificationService.snackBarNotification(this.language.instant('DATASET-WIZARD.MESSAGES.DATAESET-NOT-FOUND'), SnackBarNotificationLevel.Error); + this.router.navigate(['/datasets/edit/' + this.itemId]); + return observableOf(null); + }); } else if (dmpId != null) { this.isNew = true; - this.dmpService.getSingle(dmpId).map(data => data as DmpModel) + this.dmpService.getSingle(dmpId).pipe(map(data => data as DmpModel)) .pipe(takeUntil(this._destroyed)) .subscribe(data => { this.datasetWizardModel = new DatasetWizardEditorModel(); @@ -158,17 +156,17 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr this.registerFormListeners(); // this.availableProfiles = data.profiles; - this.breadCrumbs = Observable.of([ + this.breadCrumbs = observableOf([ { parentComponentName: null, label: this.language.instant('NAV-BAR.MY-DATASET-DESCRIPTIONS'), url: '/datasets', notFoundResolver: [ - { - parentComponentName: null, - label: this.datasetWizardModel.dmp.grant.label, - url: '/grants/edit/' + this.datasetWizardModel.dmp.grant.id - }, + // { + // parentComponentName: null, + // label: this.datasetWizardModel.dmp.grant.label, + // url: '/grants/edit/' + this.datasetWizardModel.dmp.grant.id + // }, { parentComponentName: null, label: this.datasetWizardModel.dmp.label, @@ -186,7 +184,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(data); this.formGroup = this.datasetWizardModel.buildForm(); this.formGroup.get('id').setValue(null); - this.dmpService.getSingle(newDmpId).map(data => data as DmpModel) + this.dmpService.getSingle(newDmpId).pipe(map(data => data as DmpModel)) .pipe(takeUntil(this._destroyed)) .subscribe(data => { setTimeout(() => { @@ -194,17 +192,17 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr this.formGroup.get('dmp').setValue(this.datasetWizardModel.dmp); this.loadDatasetProfiles(); - this.breadCrumbs = Observable.of([ + this.breadCrumbs = observableOf([ { parentComponentName: null, label: this.language.instant('NAV-BAR.MY-DATASET-DESCRIPTIONS'), url: '/datasets', notFoundResolver: [ - { - parentComponentName: null, - label: this.datasetWizardModel.dmp.grant.label, - url: '/grants/edit/' + this.datasetWizardModel.dmp.grant.id - }, + // { + // parentComponentName: null, + // label: this.datasetWizardModel.dmp.grant.label, + // url: '/grants/edit/' + this.datasetWizardModel.dmp.grant.id + // }, { parentComponentName: null, label: this.datasetWizardModel.dmp.label, @@ -226,12 +224,12 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr } else if (this.publicId != null) { // For Finalized -> Public Datasets this.isNew = false; this.datasetWizardService.getSinglePublic(this.publicId) - .pipe(takeUntil(this._destroyed)) - .catch((error: any) => { - this.uiNotificationService.snackBarNotification(error.error.message, SnackBarNotificationLevel.Error); - this.router.navigate(['/explore']); - return Observable.of(null); - }) + .pipe(takeUntil(this._destroyed)).pipe( + catchError((error: any) => { + this.uiNotificationService.snackBarNotification(error.error.message, SnackBarNotificationLevel.Error); + this.router.navigate(['/datasets/publicEdit/' + this.publicId]); + return observableOf(null); + })) .subscribe(data => { if (data) { this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(data); @@ -246,7 +244,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr const breadcrumbs = []; breadcrumbs.push({ parentComponentName: null, label: this.language.instant('NAV-BAR.PUBLIC DATASETS'), url: '/explore' }); breadcrumbs.push({ parentComponentName: null, label: this.datasetWizardModel.label, url: '/datasets/publicEdit/' + this.datasetWizardModel.id }); - this.breadCrumbs = Observable.of(breadcrumbs); + this.breadCrumbs = observableOf(breadcrumbs); } }); this.publicMode = true; @@ -256,17 +254,17 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr .subscribe(data => { this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(data); this.needsUpdate(); - this.breadCrumbs = Observable.of([ + this.breadCrumbs = observableOf([ { parentComponentName: null, label: this.language.instant('NAV-BAR.MY-DATASET-DESCRIPTIONS'), url: '/datasets', notFoundResolver: [ - { - parentComponentName: null, - label: this.datasetWizardModel.dmp.grant.label, - url: '/grants/edit/' + this.datasetWizardModel.dmp.grant.id - }, + // { + // parentComponentName: null, + // label: this.datasetWizardModel.dmp.grant.label, + // url: '/grants/edit/' + this.datasetWizardModel.dmp.grant.id + // }, { parentComponentName: null, label: this.datasetWizardModel.dmp.label, @@ -294,7 +292,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr //if (this.viewOnly) { this.formGroup.disable(); } // For future use, to make Dataset edit like DMP. this.registerFormListeners(); this.dmpValueChanged(null); - this.breadCrumbs = Observable.of([ + this.breadCrumbs = observableOf([ { parentComponentName: null, label: this.language.instant('DATASET-LISTING.ACTIONS.CREATE-NEW').toUpperCase(), @@ -349,7 +347,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr const dmpDataTableRequest: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); dmpDataTableRequest.criteria = new DmpCriteria(); dmpDataTableRequest.criteria.like = query; - return this.dmpService.getPaged(dmpDataTableRequest, "autocomplete").map(x => x.data); + return this.dmpService.getPaged(dmpDataTableRequest, "autocomplete").pipe(map(x => x.data)); } loadDatasetProfiles() { @@ -369,6 +367,13 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr this.router.navigate(['/datasets']); } + getDatasetDisplay(item: any): string { + if (!this.publicMode) { + return (item['status'] ? this.language.instant('TYPES.DATASET-STATUS.FINALISED').toUpperCase() : this.language.instant('TYPES.DATASET-STATUS.DRAFT').toUpperCase()) + ': ' + item['label']; + } + else { return item['label']; } + } + getDefinition() { // if (this.formGroup.invalid) { setTimeout(() => this.stepper.selectedIndex = 0); return; } this.datasetWizardService.getDefinition(this.formGroup.get('profile').value) @@ -392,7 +397,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr public isSemiFormValid(formGroup: FormGroup): boolean { var isValid: boolean = true; Object.keys(formGroup.controls).forEach(controlName => { - if (controlName != 'datasetProfileDefinition' && formGroup.get(controlName).invalid) { + if (controlName != 'datasetProfileDefinition' && !formGroup.get(controlName).disabled && !(formGroup.get(controlName).valid)) { isValid = false; } }); @@ -403,17 +408,17 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr this.datasetWizardService.createDataset(this.formGroup.value) .pipe(takeUntil(this._destroyed)) .subscribe( - complete => { - this.datasetWizardService.getSingle(complete.id) - .pipe(takeUntil(this._destroyed)) - .subscribe( - result => { - this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(result); - } - ); - this.onCallbackSuccess(); - }, - error => this.onCallbackError(error) + complete => { + this.datasetWizardService.getSingle(complete.id) + .pipe(takeUntil(this._destroyed)) + .subscribe( + result => { + this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(result); + } + ); + this.onCallbackSuccess(); + }, + error => this.onCallbackError(error) ); } @@ -429,8 +434,24 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr this.submit(); } + hasReversableStatus(): boolean { + if (this.formGroup.get('dmp').value) { + return (this.formGroup.get('dmp').value.status == DmpStatus.Draft && this.formGroup.get('status').value == DatasetStatus.Finalized); + } else { + return false; + } + } + + hasNotReversableStatus(): boolean { + if (this.formGroup.get('dmp').value && !this.publicMode) { + return (this.formGroup.get('dmp').value.status == DmpStatus.Finalized && this.formGroup.get('status').value == DatasetStatus.Finalized); + } else { + return false; + } + } + reverse() { - this.hasReversableStatus = false; + this.viewOnly = false; this.datasetWizardModel.status = DatasetStatus.Draft; setTimeout(x => { this.formGroup = null; }); setTimeout(x => { @@ -442,6 +463,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr saveFinalize() { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { + restoreFocus: false, data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.FINALIZE-ITEM'), confirmButton: this.language.instant('QUICKWIZARD.SAVE-DIALOG.ACTIONS.AFFIRMATIVE'), @@ -506,26 +528,26 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr }); } - advancedClicked() { - const dialogRef = this.dialog.open(ExportMethodDialogComponent, { - maxWidth: '500px', - data: { - message: "Download as:", - XMLButton: "XML", - documentButton: "Document", - pdfButton: "PDF" - } - }); - dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => { - if (result == "pdf") { - this.downloadPDF(); - } else if (result == "xml") { - this.downloadXML(); - } else if (result == "doc") { - this.downloadDOCX(); - } - }); - } + // advancedClicked() { + // const dialogRef = this.dialog.open(ExportMethodDialogComponent, { + // maxWidth: '500px', + // data: { + // message: "Download as:", + // XMLButton: "XML", + // documentButton: "Document", + // pdfButton: "PDF" + // } + // }); + // dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => { + // if (result == "pdf") { + // this.downloadPDF(); + // } else if (result == "xml") { + // this.downloadXML(); + // } else if (result == "doc") { + // this.downloadDOCX(); + // } + // }); + // } getFilenameFromContentDispositionHeader(header: string): string { const regex: RegExp = new RegExp(/filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/g); @@ -577,13 +599,10 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr this.formGroup.disable(); } - isActiveStep(index: number) { - return this.stepper.selectedIndex === index; - } - openConfirm(dmpLabel, id): void { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { maxWidth: '300px', + restoreFocus: false, data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.DELETE-ITEM'), confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.DELETE'), @@ -596,8 +615,8 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr this.datasetWizardService.delete(id) .pipe(takeUntil(this._destroyed)) .subscribe( - complete => { this.onCallbackSuccess(); this.router.navigateByUrl('/datasets') }, - error => this.onCallbackError(error) + complete => { this.onCallbackSuccess(); this.router.navigateByUrl('/datasets') }, + error => this.onCallbackError(error) ); } }); @@ -606,6 +625,8 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr openDmpSearchDialogue() { const formControl = new FormControl(); const dialogRef = this.dialog.open(DatasetCopyDialogueComponent, { + width: '500px', + restoreFocus: false, data: { formControl: formControl, datasetId: this.formGroup.value.id, @@ -637,6 +658,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr openUpdateDatasetProfileDialogue() { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { + restoreFocus: false, data: { message: this.language.instant('DATASET-EDITOR.VERSION-DIALOG.QUESTION'), confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CONFIRM'), @@ -652,4 +674,9 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr } }); } + + linkToScroll: LinkToScroll; + onStepFound(linkToScroll: LinkToScroll) { + this.linkToScroll = linkToScroll; + } } 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 7f7c8a9e7..02aa3e1e8 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 @@ -41,6 +41,9 @@
+
+ {{'DATASET-EDITOR.FIELDS.EXTERNAL-DATASETS-DESCRIPTION' | translate}} +
@@ -49,7 +52,7 @@

- {{i+1}}) {{suggestion.get('label').value}} + {{i+1}}) {{suggestion.get('name').value}}

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 d4894cf99..6b3ba5f13 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 @@ -1,6 +1,6 @@ import { Component, Input, OnInit } from '@angular/core'; import { FormArray, FormGroup } from '@angular/forms'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { Observable } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; @@ -66,38 +66,43 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl this.dataRepositoriesAutoCompleteConfiguration = { filterFn: this.searchDatasetExternalDataRepositories.bind(this), + removeAfterSelection: true, initialItems: (type) => this.searchDatasetExternalDataRepositories('', type), displayFn: (item) => item ? item.name : null, titleFn: (item) => item ? item.name : null, - subtitleFn: (item) => item.tag ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item.tag : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE') + subtitleFn: (item) => item.source ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item.source : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE') }; this.externalDatasetAutoCompleteConfiguration = { filterFn: this.searchDatasetExternalDatasets.bind(this), + removeAfterSelection: true, initialItems: (type) => this.searchDatasetExternalDatasets('', type),//.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1), - displayFn: (item) => item ? item.label : null, - titleFn: (item) => item ? item.label : null, - subtitleFn: (item) => item.tag ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item.tag : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE') + displayFn: (item) => item ? item.name : null, + titleFn: (item) => item ? item.name : null, + subtitleFn: (item) => item.source ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item.source : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE') }; this.registriesAutoCompleteConfiguration = { filterFn: this.searchDatasetExternalRegistries.bind(this), + removeAfterSelection: true, initialItems: (type) => this.searchDatasetExternalRegistries('', type), - displayFn: (item) => item ? item.label : null, - titleFn: (item) => item ? item.label: null, - subtitleFn: (item) => item.tag ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item.tag : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE') + displayFn: (item) => item ? item.name : null, + titleFn: (item) => item ? item.name : null, + subtitleFn: (item) => item.source ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item.source : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE') }; this.servicesAutoCompleteConfiguration = { filterFn: this.searchDatasetExternalServices.bind(this), + removeAfterSelection: true, initialItems: (type) => this.searchDatasetExternalServices('', type), displayFn: (item) => item ? item.label : null, titleFn: (item) => item ? item.label : null, - subtitleFn: (item) => item.tag ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item.tag : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE') + subtitleFn: (item) => item.source ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item.source : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE') }; this.tagsAutoCompleteConfiguration = { filterFn: this.searchDatasetTags.bind(this), + removeAfterSelection: true, initialItems: (type) => this.searchDatasetTags('', type), displayFn: (item) => item ? item.name : null, titleFn: (item) => item ? item.name : null, @@ -110,12 +115,12 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl } externalDatasetsOnItemChange(event) { - const externalDatasetModel = new ExternalDatasetEditorModel(event.id, event.abbreviation, event.label, event.reference); + const externalDatasetModel = new ExternalDatasetEditorModel(event.id, event.abbreviation, event.name, event.pid ? event.pid : event.reference, event.source); (this.formGroup.get('externalDatasets')).push(externalDatasetModel.buildForm()); } registriesOnItemChange(event) { - const registryModel = new ExternalRegistryEditorModel(event.abbreviation, event.definition, event.id, event.label, event.reference, event.uri); + const registryModel = new ExternalRegistryEditorModel(event.abbreviation, event.definition, event.id, event.name, event.pid ? event.pid : event.reference, event.uri, event.source); (this.formGroup.get('registries')).push(registryModel.buildForm()); } @@ -131,15 +136,15 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl dataRepositoriesOnItemChange(event) { - const dataRepositoryModel = new ExternalDataRepositoryEditorModel(event.id, event.name, event.abbreviation, event.uri, event.pid); + const dataRepositoryModel = new ExternalDataRepositoryEditorModel(event.id, event.name, event.abbreviation, event.uri, event.pid, event.source); (this.formGroup.get('dataRepositories')).push(dataRepositoryModel.buildForm()); } addDataRepository() { const dialogRef = this.dialog.open(DatasetExternalDataRepositoryDialogEditorComponent, { - data: { - - } + width: '500px', + restoreFocus: false, + data: {} }); dialogRef.afterClosed() .pipe(takeUntil(this._destroyed)) @@ -152,9 +157,9 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl addRegistry() { const dialogRef = this.dialog.open(DatasetExternalRegistryDialogEditorComponent, { - data: { - - } + width: '500px', + restoreFocus: false, + data: {} }); dialogRef.afterClosed() .pipe(takeUntil(this._destroyed)) @@ -167,9 +172,9 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl addExternalDataset() { const dialogRef = this.dialog.open(DatasetExternalDatasetDialogEditorComponent, { - data: { - - } + width: '500px', + restoreFocus: false, + data: {} }); dialogRef.afterClosed() .pipe(takeUntil(this._destroyed)) @@ -182,9 +187,9 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl addService() { const dialogRef = this.dialog.open(DatasetExternalServiceDialogEditorComponent, { - data: { - - } + width: '500px', + restoreFocus: false, + data: {} }); dialogRef.afterClosed() .pipe(takeUntil(this._destroyed)) diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.html index 7e23bfd1a..900f5f4aa 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.html +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.html @@ -1,5 +1,12 @@
-

{{'DATASET-REFERENCED-MODELS.DATA-REPOSITORY.TITLE' | translate}}

+
+
+ {{'DATASET-REFERENCED-MODELS.DATA-REPOSITORY.TITLE' | translate}} +
+
+ close +
+
@@ -15,8 +22,7 @@
-
-
+
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.scss b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.scss index e69de29bb..b1538a730 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.scss +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.scss @@ -0,0 +1,3 @@ +.close-btn { + cursor: pointer; +} diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.ts index 450c3fb39..7215a1d49 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../../../../core/common/base/base.component'; import { ExternalDataRepositoryService } from '../../../../../../core/services/external-sources/data-repository/extternal-data-repository.service'; @@ -24,7 +24,6 @@ export class DatasetExternalDataRepositoryDialogEditorComponent extends BaseComp this.formGroup = datarepo.buildForm(); } - send(value: any) { this.externalDataRepositoryService.create(this.formGroup.value) .pipe(takeUntil(this._destroyed)) @@ -32,4 +31,8 @@ export class DatasetExternalDataRepositoryDialogEditorComponent extends BaseComp (item) => this.dialogRef.close(item) ); } + + close() { + this.dialogRef.close(false); + } } diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.html index ba644cbdc..530a33bd4 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.html +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.html @@ -1,9 +1,16 @@
-

{{'DATASET-REFERENCED-MODELS.EXTERNAL-DATASET.TITLE' | translate}}

+
+
+ {{'DATASET-REFERENCED-MODELS.EXTERNAL-DATASET.TITLE' | translate}} +
+
+ close +
+
- - {{'GENERAL.VALIDATION.REQUIRED' | translate}} + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} @@ -11,8 +18,7 @@
-
-
+
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.scss b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.scss index e69de29bb..b1538a730 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.scss +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.scss @@ -0,0 +1,3 @@ +.close-btn { + cursor: pointer; +} diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.ts index 2f9a97d9e..88914f5f2 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../../../../core/common/base/base.component'; import { ExternalDatasetService } from '../../../../../../core/services/external-sources/dataset/external-dataset.service'; @@ -24,7 +24,6 @@ export class DatasetExternalDatasetDialogEditorComponent extends BaseComponent i this.formGroup = externalDatasetModel.buildForm(); } - send(value: any) { this.externalDatasetService.create(this.formGroup.value) .pipe(takeUntil(this._destroyed)) @@ -32,4 +31,8 @@ export class DatasetExternalDatasetDialogEditorComponent extends BaseComponent i (item) => this.dialogRef.close(item) ); } + + close() { + this.dialogRef.close(false); + } } diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.html index 14f7e4673..111e52fc6 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.html +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.html @@ -1,5 +1,12 @@
-

{{'DATASET-REFERENCED-MODELS.REGISTRY.TITLE' | translate}}

+
+
+ {{'DATASET-REFERENCED-MODELS.REGISTRY.TITLE' | translate}} +
+
+ close +
+
@@ -15,8 +22,7 @@
-
-
+
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.scss b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.scss index e69de29bb..b1538a730 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.scss +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.scss @@ -0,0 +1,3 @@ +.close-btn { + cursor: pointer; +} diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.ts index bfdb4e797..96e538083 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../../../../core/common/base/base.component'; import { ExternalRegistryService } from '../../../../../../core/services/external-sources/registry/external-registry.service'; @@ -24,7 +24,6 @@ export class DatasetExternalRegistryDialogEditorComponent extends BaseComponent this.formGroup = registryModel.buildForm(); } - send(value: any) { this.externalRegistryService.create(this.formGroup.value) .pipe(takeUntil(this._destroyed)) @@ -32,4 +31,8 @@ export class DatasetExternalRegistryDialogEditorComponent extends BaseComponent (item) => this.dialogRef.close(item) ); } + + close() { + this.dialogRef.close(false); + } } diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.html index 092ecf4c9..994c214e7 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.html +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.html @@ -1,5 +1,12 @@
-

{{'DATASET-REFERENCED-MODELS.SERVICES.TITLE' | translate}}

+
+
+ {{'DATASET-REFERENCED-MODELS.SERVICES.TITLE' | translate}} +
+
+ close +
+
@@ -15,8 +22,7 @@
-
-
+
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.scss b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.scss index e69de29bb..b1538a730 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.scss +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.scss @@ -0,0 +1,3 @@ +.close-btn { + cursor: pointer; +} diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.ts index ac12d5369..f97c8b685 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../../../../core/common/base/base.component'; import { ExternalServiceService } from '../../../../../../core/services/external-sources/service/external-service.service'; @@ -31,4 +31,8 @@ export class DatasetExternalServiceDialogEditorComponent extends BaseComponent i (item) => this.dialogRef.close(item) ); } + + close() { + this.dialogRef.close(false); + } } diff --git a/dmp-frontend/src/app/ui/dataset/dataset.module.ts b/dmp-frontend/src/app/ui/dataset/dataset.module.ts index 1296235b4..c2a467d1e 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset.module.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset.module.ts @@ -1,11 +1,15 @@ import { NgModule } from '@angular/core'; +import { AngularStickyThingsModule } from '@w11k/angular-sticky-things'; import { CommonFormsModule } from '../../common/forms/common-forms.module'; import { CommonUiModule } from '../../common/ui/common-ui.module'; import { AutoCompleteModule } from '../../library/auto-complete/auto-complete.module'; import { ConfirmationDialogModule } from '../../library/confirmation-dialog/confirmation-dialog.module'; +import { ExportMethodDialogModule } from '../../library/export-method-dialog/export-method-dialog.module'; import { UrlListingModule } from '../../library/url-listing/url-listing.module'; import { DatasetDescriptionFormModule } from '../misc/dataset-description-form/dataset-description-form.module'; +import { TableOfContentsModule } from '../misc/dataset-description-form/tableOfContentsMaterial/table-of-contents.module'; import { ExternalSourcesModule } from '../misc/external-sources/external-sources.module'; +import { DatasetCopyDialogueComponent } from './dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component'; import { DatasetEditorComponent } from './dataset-wizard/dataset-editor/dataset-editor.component'; import { DatasetWizardComponent } from './dataset-wizard/dataset-wizard.component'; import { DatasetExternalReferencesEditorComponent } from './dataset-wizard/external-references/dataset-external-references-editor.component'; @@ -15,11 +19,9 @@ import { DatasetExternalRegistryDialogEditorComponent } from './dataset-wizard/e import { DatasetExternalServiceDialogEditorComponent } from './dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component'; import { DatasetRoutingModule } from './dataset.routing'; import { DatasetCriteriaComponent } from './listing/criteria/dataset-criteria.component'; -import { DatasetListingComponent } from './listing/dataset-listing.component'; -import { DatasetCopyDialogueComponent } from './dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component'; import { DatasetUploadDialogue } from './listing/criteria/dataset-upload-dialogue/dataset-upload-dialogue.component'; +import { DatasetListingComponent } from './listing/dataset-listing.component'; import { DatasetListingItemComponent } from './listing/listing-item/dataset-listing-item.component'; -import { ExportMethodDialogModule } from '../../library/export-method-dialog/export-method-dialog.module'; @NgModule({ imports: [ @@ -31,6 +33,8 @@ import { ExportMethodDialogModule } from '../../library/export-method-dialog/exp ExternalSourcesModule, ExportMethodDialogModule, DatasetDescriptionFormModule, + TableOfContentsModule, + AngularStickyThingsModule, DatasetRoutingModule ], declarations: [ diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html index 51bdd3dfb..878a4b1d6 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html +++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html @@ -16,9 +16,9 @@
{{'CRITERIA.DATA-SETS.STATUS'| translate}}
+ {{ 'TYPES.DATASET-STATUS.ANY' | translate }} {{ 'TYPES.DATASET-STATUS.DRAFT' | translate }} {{ 'TYPES.DATASET-STATUS.FINALISED' | translate }} - {{ 'TYPES.DATASET-STATUS.ANY' | translate }}
@@ -79,15 +79,9 @@
{{'CRITERIA.DATA-SETS.ROLE' | translate }}
- - {{ 'TYPES.DATASET-ROLE.ANY' | translate }} - - - {{ 'TYPES.DATASET-ROLE.OWNER' | translate }} - - - {{ 'TYPES.DATASET-ROLE.MEMBER' | translate }} - + {{ 'TYPES.DATASET-ROLE.ANY' | translate }} + {{ 'TYPES.DATASET-ROLE.OWNER' | translate }} + {{ 'TYPES.DATASET-ROLE.MEMBER' | translate }}
diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.scss b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.scss index f4822491e..1dcdc4636 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.scss +++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.scss @@ -3,7 +3,8 @@ } .category-title { - color: #2e75b6; + color: black; + // color: #089dbb; margin-top: 8px; margin-bottom: 12px; } @@ -20,7 +21,7 @@ .filters-title { width: 90px; - color: #2e75b6; + color: #089dbb; background-color: white; padding: 0px 20px; margin-top: -10px; diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts index c25d3a896..cfcee2add 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts +++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts @@ -1,39 +1,38 @@ -import { Component, OnInit } from '@angular/core'; -import { Observable } from 'rxjs'; -import { ValidationErrorModel } from '../../../../common/forms/validation/error-model/validation-error-model'; -import { DatasetStatus } from '../../../../core/common/enum/dataset-status'; -import { ExternalSourceItemModel } from '../../../../core/model/external-sources/external-source-item'; -import { DatasetCriteria } from '../../../../core/query/dataset/dataset-criteria'; -import { TagCriteria } from '../../../../core/query/tag/tag-criteria'; -import { ExternalSourcesService } from '../../../../core/services/external-sources/external-sources.service'; -import { EnumUtils } from '../../../../core/services/utilities/enum-utils.service'; -import { RequestItem } from '../../../../core/query/request-item'; -import { BaseCriteriaComponent } from '../../../misc/criteria/base-criteria.component'; -import { DmpCriteria } from '../../../../core/query/dmp/dmp-criteria'; -import { DmpService } from '../../../../core/services/dmp/dmp.service'; -import { DataTableRequest } from '../../../../core/model/data-table/data-table-request'; -import { DataTableData } from '../../../../core/model/data-table/data-table-data'; -import { DmpListingModel } from '../../../../core/model/dmp/dmp-listing'; -import { Input } from '@angular/core'; -import { MatDialog, MatSnackBar } from '@angular/material'; -import { DatasetUploadDialogue } from './dataset-upload-dialogue/dataset-upload-dialogue.component'; -import { takeUntil } from 'rxjs/operators'; -import { reserveSlots } from '@angular/core/src/render3/instructions'; -import { DatasetWizardService } from '../../../../core/services/dataset-wizard/dataset-wizard.service'; -import { ViewChild } from '@angular/core'; -import { UiNotificationService, SnackBarNotificationLevel } from '../../../../core/services/notification/ui-notification-service'; + +import { Component, Input, OnInit } from '@angular/core'; +import { FormBuilder, FormControl, FormGroup } from '@angular/forms'; +import { MatDialog } from '@angular/material/dialog'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { FormGroup, FormBuilder, FormControl } from '@angular/forms'; -import { MultipleAutoCompleteConfiguration } from '../../../../library/auto-complete/multiple/multiple-auto-complete-configuration'; -import { OrganisationCriteria } from '../../../../core/query/organisation/organisation-criteria'; -import { OrganisationService } from '../../../../core/services/organisation/organisation.service'; -import { GrantCriteria } from '../../../../core/query/grant/grant-criteria'; -import { GrantService } from '../../../../core/services/grant/grant.service'; -import { UserCriteria } from '../../../../core/query/user/user-criteria'; -import { UserService } from '../../../../core/services/user/user.service'; +import { Observable } from 'rxjs'; +import { map, takeUntil } from 'rxjs/operators'; +import { ValidationErrorModel } from '../../../../common/forms/validation/error-model/validation-error-model'; +import { DatasetStatus } from '../../../../core/common/enum/dataset-status'; +import { DataTableData } from '../../../../core/model/data-table/data-table-data'; +import { DataTableRequest } from '../../../../core/model/data-table/data-table-request'; +import { DmpListingModel } from '../../../../core/model/dmp/dmp-listing'; +import { ExternalSourceItemModel } from '../../../../core/model/external-sources/external-source-item'; import { DatasetProfileCriteria } from '../../../../core/query/dataset-profile/dataset-profile-criteria'; +import { DatasetCriteria } from '../../../../core/query/dataset/dataset-criteria'; +import { DmpCriteria } from '../../../../core/query/dmp/dmp-criteria'; +import { GrantCriteria } from '../../../../core/query/grant/grant-criteria'; +import { OrganisationCriteria } from '../../../../core/query/organisation/organisation-criteria'; +import { RequestItem } from '../../../../core/query/request-item'; +import { TagCriteria } from '../../../../core/query/tag/tag-criteria'; +import { UserCriteria } from '../../../../core/query/user/user-criteria'; +import { DatasetWizardService } from '../../../../core/services/dataset-wizard/dataset-wizard.service'; import { DatasetService } from '../../../../core/services/dataset/dataset.service'; +import { DmpService } from '../../../../core/services/dmp/dmp.service'; +import { ExternalSourcesService } from '../../../../core/services/external-sources/external-sources.service'; +import { GrantService } from '../../../../core/services/grant/grant.service'; +import { SnackBarNotificationLevel, UiNotificationService } from '../../../../core/services/notification/ui-notification-service'; +import { OrganisationService } from '../../../../core/services/organisation/organisation.service'; +import { UserService } from '../../../../core/services/user/user.service'; +import { EnumUtils } from '../../../../core/services/utilities/enum-utils.service'; +import { MultipleAutoCompleteConfiguration } from '../../../../library/auto-complete/multiple/multiple-auto-complete-configuration'; +import { BaseCriteriaComponent } from '../../../misc/criteria/base-criteria.component'; +import { DatasetUploadDialogue } from './dataset-upload-dialogue/dataset-upload-dialogue.component'; @Component({ selector: 'app-dataset-criteria-component', @@ -65,43 +64,43 @@ export class DatasetCriteriaComponent extends BaseCriteriaComponent implements O tagsAutoCompleteConfiguration = { filterFn: this.filterTags.bind(this), - initialItems: (excludedItems: any[]) => this.filterTags('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterTags('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['name'], titleFn: (item) => item['name'] }; datasetTemplateAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterDatasetTemplate.bind(this), - initialItems: (excludedItems: any[]) => this.filterDatasetTemplate('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterDatasetTemplate('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['label'], titleFn: (item) => item['label'], subtitleFn: (item) => item['description'] }; dmpAutoCompleteConfiguration = { - filterFn: (x, excluded) => this.filterDmps(x).map(x => x.data), - initialItems: (extraData) => this.filterDmps('').map(x => x.data), + filterFn: (x, excluded) => this.filterDmps(x).pipe(map(x => x.data)), + initialItems: (extraData) => this.filterDmps('').pipe(map(x => x.data)), displayFn: (item) => item['label'], titleFn: (item) => item['label'] }; collaboratorsAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterCollaborators.bind(this), - initialItems: (excludedItems: any[]) => this.filterCollaborators('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterCollaborators('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['name'], titleFn: (item) => item['name'] }; grantAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterGrant.bind(this), - initialItems: (excludedItems: any[]) => this.filterGrant('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterGrant('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['label'], titleFn: (item) => item['label'] }; organisationAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterOrganisations.bind(this), - initialItems: (excludedItems: any[]) => this.filterOrganisations('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterOrganisations('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['name'], titleFn: (item) => item['name'] } @@ -200,7 +199,7 @@ export class DatasetCriteriaComponent extends BaseCriteriaComponent implements O const datasetTemplateRequestItem: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); datasetTemplateRequestItem.criteria = new DatasetProfileCriteria(); datasetTemplateRequestItem.criteria.like = query; - return this.datasetService.getDatasetProfilesUsedPaged(datasetTemplateRequestItem).map(x => x.data); + return this.datasetService.getDatasetProfilesUsedPaged(datasetTemplateRequestItem).pipe(map(x => x.data)); } filterDmps(value: string): Observable> { @@ -218,7 +217,7 @@ export class DatasetCriteriaComponent extends BaseCriteriaComponent implements O const grantRequestItem: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); grantRequestItem.criteria = new GrantCriteria(); grantRequestItem.criteria.like = query; - return this.grantService.getPaged(grantRequestItem, "autocomplete").map(x => x.data); + return this.grantService.getPaged(grantRequestItem, "autocomplete").pipe(map(x => x.data)); } filterOrganisations(value: string) { @@ -227,7 +226,7 @@ export class DatasetCriteriaComponent extends BaseCriteriaComponent implements O const dataTableRequest: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); dataTableRequest.criteria = new OrganisationCriteria(); dataTableRequest.criteria.labelLike = value; - return this.organisationService.searchInternalOrganisations(dataTableRequest).map(x => x.data); + return this.organisationService.searchInternalOrganisations(dataTableRequest).pipe(map(x => x.data)); } filterCollaborators(query: string) { @@ -236,7 +235,7 @@ export class DatasetCriteriaComponent extends BaseCriteriaComponent implements O const collaboratorsRequestItem: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); collaboratorsRequestItem.criteria = new UserCriteria(); collaboratorsRequestItem.criteria.collaboratorLike = query; - return this.userService.getCollaboratorsPaged(collaboratorsRequestItem).map(x => x.data); + return this.userService.getCollaboratorsPaged(collaboratorsRequestItem).pipe(map(x => x.data)); } fileImport(event) { @@ -256,8 +255,8 @@ export class DatasetCriteriaComponent extends BaseCriteriaComponent implements O this.datasetWizardService.uploadXml(result.fileList, result.datasetTitle, result.dmpId, result.datasetProfileId) .pipe(takeUntil(this._destroyed)) .subscribe( - complete => this.onCallbackSuccess(), - error => this.onCallbackError(error) + complete => this.onCallbackSuccess(), + error => this.onCallbackError(error) ); } }) diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-upload-dialogue/dataset-upload-dialogue.component.html b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-upload-dialogue/dataset-upload-dialogue.component.html index 79681602e..f631c3a39 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-upload-dialogue/dataset-upload-dialogue.component.html +++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-upload-dialogue/dataset-upload-dialogue.component.html @@ -32,7 +32,7 @@
- +
diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-upload-dialogue/dataset-upload-dialogue.component.ts b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-upload-dialogue/dataset-upload-dialogue.component.ts index eb3d34ed1..d4aeef786 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-upload-dialogue/dataset-upload-dialogue.component.ts +++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-upload-dialogue/dataset-upload-dialogue.component.ts @@ -1,5 +1,7 @@ + +import {map, takeUntil } from 'rxjs/operators'; import { Component, Inject, OnInit } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { Observable } from 'rxjs'; import { DataTableData } from '../../../../../core/model/data-table/data-table-data'; import { DmpListingModel } from '../../../../../core/model/dmp/dmp-listing'; @@ -10,7 +12,6 @@ import { ValidationErrorModel } from '../../../../../common/forms/validation/err import { BaseCriteriaComponent } from '../../../../misc/criteria/base-criteria.component'; import { DmpModel } from '../../../../../core/model/dmp/dmp'; import { DatasetProfileModel } from '../../../../../core/model/dataset/dataset-profile'; -import { takeUntil } from 'rxjs/operators'; import { DatasetWizardService } from '../../../../../core/services/dataset-wizard/dataset-wizard.service'; import { RequestItem } from '../../../../../core/query/request-item'; import { DatasetProfileCriteria } from '../../../../../core/query/dataset-profile/dataset-profile-criteria'; @@ -31,8 +32,8 @@ export class DatasetUploadDialogue extends BaseCriteriaComponent implements OnIn availableProfiles: DatasetProfileModel[] = []; dmpAutoCompleteConfiguration = { - filterFn: (x, excluded) => this.filterDmps(x).map(x => x.data), - initialItems: (extraData) => this.filterDmps('').map(x => x.data), + filterFn: (x, excluded) => this.filterDmps(x).pipe(map(x => x.data)), + initialItems: (extraData) => this.filterDmps('').pipe(map(x => x.data)), displayFn: (item) => item['label'], titleFn: (item) => item['label'] }; diff --git a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html index e92a69879..dc2c0efbc 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html +++ b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html @@ -1,28 +1,30 @@
-
+

{{'DASHBOARD.DATASETS' | translate}} {{titlePrefix}}

-
+
-
-
+
+
-
+
- - +
+
+
+
+
diff --git a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.scss b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.scss index d60d77eee..194373976 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.scss +++ b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.scss @@ -1,3 +1,16 @@ +@import "node_modules/bootstrap/scss/functions"; +@import "node_modules/bootstrap/scss/variables"; +@import "node_modules/bootstrap/scss/mixins/_breakpoints"; + +@include media-breakpoint-down(sm) { + .lightblue-btn { + font-size: 12px; + } + ::ng-deep .mat-paginator-container { + height: auto !important; + } +} + ::ng-deep .mat-paginator-container { flex-direction: row-reverse !important; justify-content: space-between !important; @@ -20,7 +33,8 @@ } ::ng-deep .mat-paginator-range-actions { - width: 55% !important; + width: auto !important; + min-width: 55% !important; min-height: 43px !important; justify-content: space-between; } @@ -43,55 +57,17 @@ } ::ng-deep .mat-radio-button.mat-accent.mat-radio-checked .mat-radio-outer-circle { - border-color: #2e75b6; + border-color: #777777; + // border-color: #00b29f; } ::ng-deep .mat-radio-button.mat-accent .mat-radio-inner-circle { - color: #2e75b6; - background-color: #2e75b6; + // color: #00b29f; + // background-color: #00b29f; + color: #777777; + background-color: #777777; } .mat-radio-button.mat-accent .mat-radio-ripple .mat-ripple-element { background-color: #2e74b649; } - -// .mat-table { -// margin: 24px; -// } - -// .mat-fab-bottom-right { -// float: right; -// z-index: 5; -// } - -// .full-width { -// width: 100%; -// } - -// .mat-card { -// margin: 16px 0; -// } - -// .mat-row { -// cursor: pointer; -// } - -// mat-row:hover { -// background-color: lightgray; -// } - -// mat-row:nth-child(even){ -// background-color:red; -// } - -// mat-row:nth-child(odd) { -// background-color: #eef0fb; -// } - -// h3 { -// margin-top: 0px; -// } - -// ::ng-deep .mat-paginator { -// margin-top: auto; -// } diff --git a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts index 0cd581f27..01e4afd8a 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts +++ b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts @@ -1,7 +1,9 @@ + +import { of as observableOf, Observable } from 'rxjs'; import { Component, OnInit, ViewChild } from '@angular/core'; -import { MatPaginator, MatSort, PageEvent } from '@angular/material'; +import { MatPaginator, PageEvent } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import { ActivatedRoute, Params, Router } from '@angular/router'; -import { Observable } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../core/common/base/base.component'; import { DataTableRequest } from '../../../core/model/data-table/data-table-request'; @@ -22,9 +24,9 @@ import { DatasetStatus } from '../../../core/common/enum/dataset-status'; }) export class DatasetListingComponent extends BaseComponent implements OnInit, IBreadCrumbComponent { - @ViewChild(MatPaginator) _paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; - @ViewChild(DatasetCriteriaComponent) criteria: DatasetCriteriaComponent; + @ViewChild(MatPaginator, { static: true }) _paginator: MatPaginator; + @ViewChild(MatSort, { static: false }) sort: MatSort; + @ViewChild(DatasetCriteriaComponent, { static: true }) criteria: DatasetCriteriaComponent; breadCrumbs: Observable; @@ -60,7 +62,7 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB this.criteria.setCriteria(this.getDefaultCriteria(dmp)); this.refresh(); this.criteria.setRefreshCallback((resetPages) => this.refresh(resetPages)); - this.breadCrumbs = Observable.of([{ + this.breadCrumbs = observableOf([{ parentComponentName: 'DmpEditorComponent', label: dmp.label, url: '/plans/edit/' + this.dmpId @@ -72,7 +74,7 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB this.criteria.setCriteria(this.getDefaultCriteria()); this.refresh(); this.criteria.setRefreshCallback((resetPages) => this.refresh(resetPages)); - this.breadCrumbs = Observable.of([{ + this.breadCrumbs = observableOf([{ parentComponentName: null, label: this.language.instant('NAV-BAR.MY-DATASET-DESCRIPTIONS'), url: "/datasets" @@ -134,9 +136,6 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB this.refresh(); } - rowClicked(dataset: DatasetListingModel) { - this.router.navigate(['/datasets/edit/' + dataset.id]); - } getDefaultCriteria(dmp: any = null): DatasetCriteria { const defaultCriteria = new DatasetCriteria(); @@ -157,4 +156,8 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB .pipe(takeUntil(this._destroyed)) .subscribe(); } + + // rowClicked(dataset: DatasetListingModel) { + // this.router.navigate(['/datasets/edit/' + dataset.id]); + // } } diff --git a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html index f750d5108..da72a5cb5 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html +++ b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html @@ -1,66 +1,82 @@ -
-
-
-
-

{{ dataset.grantAbbreviation }}

- +
+ +
+
+
+

{{ dataset.grantAbbreviation }}

+ + +
-
-
-
- - bookmark - - - bookmark - -

- {{ 'TYPES.DATASET-STATUS.DRAFT' | translate }}: {{ dataset.label }}

-

{{ dataset.label }}

-
-
-
-
-

{{dataset.description}}

-
-
-
-
-
- - storage +
+
+ + bookmark -

{{ dataset.dmp }}

+ + bookmark + +
+
+
+
+

+ {{ 'TYPES.DATASET-STATUS.DRAFT' | translate }}: {{ dataset.label }}

+

{{ dataset.label }}

+
+
+
+
+

{{dataset.description}}

+
+
+
+
+ + + storage + +

{{ dataset.dmp }}

+ +
- - work_outline - -

{{ dataset.grant }}

+
+
+ + work_outline + +

{{ dataset.grant }}

+
+
+ +
+ + assignment + +
+
{{ dataset.profile }}
+
+
+ +
+

{{'DATASET-LISTING.COLUMNS.LAST-EDITED' | translate}} {{ dataset.modified | date: "shortDate"}}

+

{{'DATASET-LISTING.COLUMNS.FINALIZED' | translate}} {{ dataset.finalizedAt | date: "shortDate"}}

+
+
- - assignment - -
-
{{ dataset.profile }}
+
+
- -
+
diff --git a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.scss b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.scss index cdaa2558f..72e315e7e 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.scss +++ b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.scss @@ -18,12 +18,13 @@ } .container-header :hover { - color: #4687e6; + color: #00b29f; } h4 { display: inline; padding-left: 1em; + color: #333333; } h4 > span { @@ -40,20 +41,17 @@ h4 > span { flex-wrap: wrap; } -.links { - display: flex; -} - .links :hover { - color: #4687e6; + color: #00b29f; } .about-item .length { - color: #4687f0; + color: #00b29f; } .about-item .title { margin: 2px 10px; + // text-transform: uppercase; } .about-item p { @@ -62,3 +60,19 @@ h4 > span { padding-top: 7px; color: #aaaaaa; } + +p { + color: #333333; +} + +.storage :hover { + color: #00b29f; +} + +.draft-bookmark { + color: #e7e6e6; +} + +.finalized-bookmark { + color: #08bd63; +} 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 5e2dfbc10..32e67f015 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 @@ -23,16 +23,17 @@ export class DatasetListingItemComponent implements OnInit { else { this.isDraft = false } } - itemClicked() { - this.onClick.emit(this.dataset); - } - grantClicked(dataset: DatasetListingModel) { - this.router.navigate(['/grants/edit/' + dataset.grantId]); - } + // grantClicked(dataset: DatasetListingModel) { + // this.router.navigate(['/grants/edit/' + dataset.grantId]); + // } - datasetClicked(dataset: DatasetListingModel) { - this.router.navigate(['/plans/edit/' + dataset.dmpId]) - } + // itemClicked() { + // this.onClick.emit(this.dataset); + // } + + // datasetClicked(dataset: DatasetListingModel) { + // this.router.navigate(['/plans/edit/' + dataset.dmpId]) + // } } diff --git a/dmp-frontend/src/app/ui/dmp/clone/dmp-clone.component.scss b/dmp-frontend/src/app/ui/dmp/clone/dmp-clone.component.scss index 0917e88e2..13ef5d884 100644 --- a/dmp-frontend/src/app/ui/dmp/clone/dmp-clone.component.scss +++ b/dmp-frontend/src/app/ui/dmp/clone/dmp-clone.component.scss @@ -14,7 +14,7 @@ .clone-mode { // line-height: 2em; text-transform: uppercase; - color: #4687e6; + color: #089dbb; font-weight: 400; align-self: center; } @@ -25,7 +25,7 @@ } .more-icon :hover { - color: #4687e6; + color: #00b29f; } ::ng-deep .mat-tab-labels { @@ -37,5 +37,6 @@ } ::ng-deep .mat-ink-bar { - background-color: #0070c0 !important; + background-color: #00b29f !important; + // background-color: #0070c0 !important; } diff --git a/dmp-frontend/src/app/ui/dmp/clone/dmp-clone.component.ts b/dmp-frontend/src/app/ui/dmp/clone/dmp-clone.component.ts index 4629561db..f9c8bd81d 100644 --- a/dmp-frontend/src/app/ui/dmp/clone/dmp-clone.component.ts +++ b/dmp-frontend/src/app/ui/dmp/clone/dmp-clone.component.ts @@ -1,13 +1,15 @@ + +import {of as observableOf, Observable } from 'rxjs'; + +import {map, takeUntil } from 'rxjs/operators'; import { Component, OnInit } from '@angular/core'; import { DmpWizardEditorModel } from '../wizard/dmp-wizard-editor.model'; import { FormGroup } from '@angular/forms'; -import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../core/common/base/base.component'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { DmpModel } from '../../../core/model/dmp/dmp'; import { TranslateService } from '@ngx-translate/core'; import { DmpService } from '../../../core/services/dmp/dmp.service'; -import { Observable } from 'rxjs'; import { BreadcrumbItem } from '../../misc/breadcrumb/definition/breadcrumb-item'; import { ValidationErrorModel } from '../../../common/forms/validation/error-model/validation-error-model'; import { UiNotificationService, SnackBarNotificationLevel } from '../../../core/services/notification/ui-notification-service'; @@ -48,7 +50,7 @@ export class DmpCloneComponent extends BaseComponent implements OnInit { .pipe(takeUntil(this._destroyed)) .subscribe((params: Params) => { this.itemId = params['id']; - this.dmpService.getSingle(this.itemId).map(data => data as DmpModel) + this.dmpService.getSingle(this.itemId).pipe(map(data => data as DmpModel)) .pipe(takeUntil(this._destroyed)) .subscribe(data => { this.dmp = new DmpWizardEditorModel(); @@ -72,7 +74,7 @@ export class DmpCloneComponent extends BaseComponent implements OnInit { 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/clone/' + this.dmp.id }); - this.breadCrumbs = Observable.of(breadCrumbs); + this.breadCrumbs = observableOf(breadCrumbs); }); }); } diff --git a/dmp-frontend/src/app/ui/dmp/dmp.routing.ts b/dmp-frontend/src/app/ui/dmp/dmp.routing.ts index bd7f84dd1..dc84fb904 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp.routing.ts +++ b/dmp-frontend/src/app/ui/dmp/dmp.routing.ts @@ -22,13 +22,14 @@ const routes: Routes = [ breadcrumb: true }, }, - { - path: 'grant/:grantId', - component: DmpListingComponent, - data: { - breadcrumb: true - }, - }, + // Uncomment to get dmp plans for grant with grantId + // { + // path: 'grant/:grantId', + // component: DmpListingComponent, + // data: { + // breadcrumb: true + // }, + // }, { path: 'edit/:id', component: DmpEditorComponent, @@ -53,13 +54,14 @@ const routes: Routes = [ title: 'GENERAL.TITLES.DMP-OVERVIEW' }, }, - { - path: 'new/grant/:grantId', - component: DmpEditorComponent, - data: { - breadcrumbs: 'new' - } - }, + // ----------- UNCOMMENT TO ADD AGAIN GRANTS -------- + // { + // path: 'new/grant/:grantId', + // component: DmpEditorComponent, + // data: { + // breadcrumbs: 'new' + // } + // }, { path: 'new', component: DmpEditorComponent, diff --git a/dmp-frontend/src/app/ui/dmp/editor/add-researcher/add-researcher.component.html b/dmp-frontend/src/app/ui/dmp/editor/add-researcher/add-researcher.component.html index e1b6b70a8..34133f7ad 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/add-researcher/add-researcher.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/add-researcher/add-researcher.component.html @@ -11,8 +11,7 @@
-
-
+
diff --git a/dmp-frontend/src/app/ui/dmp/editor/add-researcher/add-researcher.component.ts b/dmp-frontend/src/app/ui/dmp/editor/add-researcher/add-researcher.component.ts index 1647a569d..08d3940aa 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/add-researcher/add-researcher.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/add-researcher/add-researcher.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../../core/common/base/base.component'; import { ExternalResearcherService } from '../../../../core/services/external-sources/researcher/external-researcher.service'; diff --git a/dmp-frontend/src/app/ui/dmp/editor/available-profiles/available-profiles.component.html b/dmp-frontend/src/app/ui/dmp/editor/available-profiles/available-profiles.component.html index edd470258..9c670a435 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/available-profiles/available-profiles.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/available-profiles/available-profiles.component.html @@ -8,5 +8,5 @@

{{ 'DMP-EDITOR.DATASET-TEMPLATE-LIST.TEXT' | translate }} {{datasetsprofiles.selectedOptions.selected.length}}

- +
diff --git a/dmp-frontend/src/app/ui/dmp/editor/available-profiles/available-profiles.component.ts b/dmp-frontend/src/app/ui/dmp/editor/available-profiles/available-profiles.component.ts index bb653a32d..8045b1195 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/available-profiles/available-profiles.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/available-profiles/available-profiles.component.ts @@ -1,10 +1,12 @@ import { Component, Inject, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../../core/common/base/base.component'; import { DatasetProfileModel } from '../../../../core/model/dataset/dataset-profile'; import { DatasetService } from '../../../../core/services/dataset/dataset.service'; +import { DataTableRequest } from "../../../../core/model/data-table/data-table-request"; +import { DatasetProfileCriteria } from "../../../../core/query/dataset-profile/dataset-profile-criteria"; @Component({ selector: 'app-available-profiles-component', @@ -24,7 +26,13 @@ export class AvailableProfilesComponent extends BaseComponent implements OnInit ngOnInit(): void { this.formGroup = this.data['profiles']; - this.datasetService.getDatasetProfiles() + const fields: Array = new Array(); + fields.push('asc'); + const profileRequestItem: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); + profileRequestItem.criteria = new DatasetProfileCriteria(); + profileRequestItem.criteria.like = ''; + + this.datasetService.getDatasetProfiles(profileRequestItem) .pipe(takeUntil(this._destroyed)) .subscribe(data => { this.profiles = data; diff --git a/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.html b/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.html index d09a5c615..8b811e0d7 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.html @@ -10,7 +10,7 @@
-
+
bookmark bookmark diff --git a/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.scss b/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.scss index b6edcaa28..1b3deaba4 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.scss +++ b/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.scss @@ -1,3 +1,9 @@ +@media (max-width: 768px) { + button { + font-size: smaller; + } +} + .draft-bookmark { color: #e7e6e6; display: inline; @@ -7,7 +13,8 @@ } .finalized-bookmark { - color: #92d050; + color: #08bd63; + // color: #92d050; display: inline; position: absolute; margin-top: 0.5em; @@ -38,7 +45,7 @@ .show-more { background-color: #ffffff00; - color: #4687f0; + color: #00b29f; font-weight: 700; justify-self: center; } @@ -50,7 +57,8 @@ margin-left: 2.5em; margin-right: 2.5em; border-radius: 10em; - background-color: #0070c0; + background-color: #0d7489; + // background-color: #0070c0; // background-color: rgb(70, 135, 230); color: #fff; text-transform: uppercase; @@ -71,7 +79,7 @@ } h4 span { - color: #619ce3; + color: #089dbb; font-weight: 600; text-transform: uppercase; } 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 919176d93..1f9240f5f 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 @@ -25,13 +25,29 @@ - + + + + + -
@@ -49,7 +65,7 @@ work_outline {{ 'DMP-LISTING.COLUMNS.GRANT' | translate }} - + @@ -79,7 +95,7 @@ --> -
+
{{ activity.label }} -
- {{ dmpProfileDisplay(activity.profile) }} +
+ {{ activity.profile }}
+
--
 {{ activity.grant }}{{roleDisplay(activity.users)}}{{ roleDisplay(activity.users)}} {{ activity.organisations }} +
- {{ enumUtils.toDmpStatusString(activity.status) }} + {{'TYPES.DMP-VISIBILITY.PUBLIC' | translate}}
+ + {{ enumUtils.toDmpStatusString(activity.status) }} + {{ enumUtils.toDmpStatusString(activity.status) }} {{ activity.modifiedTime | date: "shortDate" }} - - + @@ -60,12 +64,30 @@ - + + + + + +
diff --git a/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.scss b/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.scss index 2e0aea0f9..35fc52eda 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.scss +++ b/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.scss @@ -1,6 +1,7 @@ .table-header { background-color: #eeeeee; - color: #0070c0; + color: #0c7489; + // color: #0070c0; height: 2em; } 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 941bb915d..33678428f 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 @@ -1,6 +1,6 @@ import { Component, Input, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; import { Principal } from '../../../../core/model/auth/Principal'; import { UserInfoListingModel } from '../../../../core/model/user/user-info-listing'; diff --git a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.html b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.html index 3fb185b9d..7b57c6b4a 100644 --- a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.html +++ b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.html @@ -32,10 +32,8 @@ --> - -
- +
+
- \ No newline at end of file + diff --git a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.ts b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.ts index 1f72b3798..ed144faf8 100644 --- a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.ts +++ b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.ts @@ -1,10 +1,12 @@ + +import {map, takeUntil } from 'rxjs/operators'; import { COMMA, ENTER } from '@angular/cdk/keycodes'; import { Component, Inject, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatChipInputEvent, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatChipInputEvent } from '@angular/material/chips'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; import { Observable } from 'rxjs'; -import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../core/common/base/base.component'; import { DmpInvitation } from '../../../core/model/dmp/invitation/dmp-invitation'; import { DmpInvitationUser } from '../../../core/model/dmp/invitation/dmp-invitation-user'; @@ -36,7 +38,7 @@ export class DmpInvitationDialogComponent extends BaseComponent implements OnIni usersAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterUsers.bind(this), - initialItems: (excludedItems: any[]) => this.filterUsers('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterUsers('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item.name, titleFn: (item) => item.name }; 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 6c2320f51..f0f777463 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 @@ -16,7 +16,7 @@
{{ 'TYPES.DMP-VISIBILITY.VISIBILITY' | translate }}
- {{ 'TYPES.DMP-VISIBILITY.ANY' | translate }} + {{ 'TYPES.DMP-VISIBILITY.ANY' | translate }} {{ 'TYPES.DMP-VISIBILITY.PUBLIC' | translate }} {{ 'TYPES.DMP-VISIBILITY.FINALIZED' | translate }} {{ 'TYPES.DMP-VISIBILITY.DRAFT' | translate }} @@ -67,7 +67,7 @@
{{ 'DATASET-PROFILE-LISTING.COLUMNS.ROLE' | translate }}
- {{ 'TYPES.DATASET-ROLE.ANY' | translate }} + {{ 'TYPES.DATASET-ROLE.ANY' | translate }} {{ 'TYPES.DATASET-ROLE.OWNER' | translate }} {{ 'TYPES.DATASET-ROLE.MEMBER' | translate }} diff --git a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.scss b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.scss index 02e99ec24..17d0636d7 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.scss +++ b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.scss @@ -22,7 +22,8 @@ } .category-title { - color: #2e75b6; + color: black; + // color: #089dbb; margin-top: 8px; margin-bottom: 12px; } @@ -39,7 +40,7 @@ .filters-title { width: 90px; - color: #2e75b6; + color: #089dbb; background-color: white; padding: 0px 20px; margin-top: -10px; @@ -51,21 +52,21 @@ color: #adadad; } -::ng-deep .mat-checkbox-inner-container { - background: white; -} +// ::ng-deep .mat-checkbox-inner-container { +// background: white; +// } -::ng-deep .mat-focused .mat-form-field-label { - color: #2e75b6 !important; -} +// ::ng-deep .mat-focused .mat-form-field-label { +// color: #00b29f !important; +// } -::ng-deep.mat-form-field-underline { - background-color: #adadad; -} +// ::ng-deep.mat-form-field-underline { +// background-color: #adadad; +// } -::ng-deep.mat-form-field-ripple { - background-color: #2e75b6 !important; -} +// ::ng-deep.mat-form-field-ripple { +// background-color: #00b29f !important; +// } // ::ng-deep .mat-checkbox { // background-color: #f6f6f6 !important; @@ -81,7 +82,7 @@ .mat-accent .mat-pseudo-checkbox-indeterminate, .mat-pseudo-checkbox-checked, .mat-pseudo-checkbox-indeterminate { - background-color: #2e75b6; + background-color: #00b29f; } ::ng-deep .mat-ripple-element { @@ -98,12 +99,15 @@ } ::ng-deep .mat-radio-button.mat-accent.mat-radio-checked .mat-radio-outer-circle { - border-color: #2e75b6; + border-color: #777777; + // border-color: #00b29f; } ::ng-deep .mat-radio-button.mat-accent .mat-radio-inner-circle { - color: #2e75b6; - background-color: #2e75b6; + color: #777777; + background-color: #777777; + // color: #00b29f; + // background-color: #00b29f; } .mat-radio-button.mat-accent .mat-radio-ripple .mat-ripple-element { 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 482edba58..88b4a0940 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 @@ -1,8 +1,9 @@ + +import {map, takeUntil } from 'rxjs/operators'; import { Component, Input, OnInit } from '@angular/core'; import { FormBuilder, FormControl } from '@angular/forms'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; -import { takeUntil } from 'rxjs/operators'; import { ValidationErrorModel } from '../../../../common/forms/validation/error-model/validation-error-model'; import { DataTableRequest } from '../../../../core/model/data-table/data-table-request'; import { GrantListingModel } from '../../../../core/model/grant/grant-listing'; @@ -46,14 +47,14 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni collaboratorsAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterCollaborators.bind(this), - initialItems: (excludedItems: any[]) => this.filterCollaborators('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterCollaborators('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['name'], titleFn: (item) => item['name'] }; datasetTemplateAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterDatasetTemplate.bind(this), - initialItems: (excludedItems: any[]) => this.filterDatasetTemplate('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterDatasetTemplate('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['label'], titleFn: (item) => item['label'], subtitleFn: (item) => item['description'] @@ -61,14 +62,14 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni grantAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterGrant.bind(this), - initialItems: (excludedItems: any[]) => this.filterGrant('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterGrant('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['label'], titleFn: (item) => item['label'] }; organisationAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterOrganisations.bind(this), - initialItems: (excludedItems: any[]) => this.filterOrganisations('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterOrganisations('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['name'], titleFn: (item) => item['name'] } @@ -140,7 +141,7 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni const grantRequestItem: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); grantRequestItem.criteria = new GrantCriteria(); grantRequestItem.criteria.like = query; - return this.grantService.getPaged(grantRequestItem, "autocomplete").map(x => x.data); + return this.grantService.getPaged(grantRequestItem, "autocomplete").pipe(map(x => x.data)); } filterOrganisations(value: string) { @@ -151,7 +152,7 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni dataTableRequest.criteria = new OrganisationCriteria(); dataTableRequest.criteria.labelLike = value; - return this.organisationService.searchInternalOrganisations(dataTableRequest).map(x => x.data); + return this.organisationService.searchInternalOrganisations(dataTableRequest).pipe(map(x => x.data)); } filterCollaborators(query: string) { @@ -160,7 +161,7 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni const collaboratorsRequestItem: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); collaboratorsRequestItem.criteria = new UserCriteria(); collaboratorsRequestItem.criteria.collaboratorLike = query; - return this.userService.getCollaboratorsPaged(collaboratorsRequestItem).map(x => x.data); + return this.userService.getCollaboratorsPaged(collaboratorsRequestItem).pipe(map(x => x.data)); } filterDatasetTemplate(query: string) { @@ -169,7 +170,7 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni const datasetTemplateRequestItem: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); datasetTemplateRequestItem.criteria = new DatasetProfileCriteria(); datasetTemplateRequestItem.criteria.like = query; - return this.dmpService.getDatasetProfilesUsedPaged(datasetTemplateRequestItem).map(x => x.data); + return this.dmpService.getDatasetProfilesUsedPaged(datasetTemplateRequestItem).pipe(map(x => x.data)); } fileSave(event) { diff --git a/dmp-frontend/src/app/ui/dmp/listing/criteria/upload-dialogue/dmp-upload-dialogue.component.html b/dmp-frontend/src/app/ui/dmp/listing/criteria/upload-dialogue/dmp-upload-dialogue.component.html index 4eeee2838..81779fadc 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/criteria/upload-dialogue/dmp-upload-dialogue.component.html +++ b/dmp-frontend/src/app/ui/dmp/listing/criteria/upload-dialogue/dmp-upload-dialogue.component.html @@ -15,7 +15,7 @@
- +
diff --git a/dmp-frontend/src/app/ui/dmp/listing/criteria/upload-dialogue/dmp-upload-dialogue.component.ts b/dmp-frontend/src/app/ui/dmp/listing/criteria/upload-dialogue/dmp-upload-dialogue.component.ts index 6e6101276..9a9dd31ad 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/criteria/upload-dialogue/dmp-upload-dialogue.component.ts +++ b/dmp-frontend/src/app/ui/dmp/listing/criteria/upload-dialogue/dmp-upload-dialogue.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { DmpService } from '../../../../../core/services/dmp/dmp.service'; @Component({ 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 5793ec346..18d5dc1fe 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,30 +1,35 @@
-
+

{{'DMP-LISTING.TITLE' | translate}} {{titlePrefix}}

-
- -
-
-
+
+
-
+
- +
+
+
+
+
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 b3f82ac86..4def11f1b 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 @@ -1,3 +1,16 @@ +@import "node_modules/bootstrap/scss/functions"; +@import "node_modules/bootstrap/scss/variables"; +@import "node_modules/bootstrap/scss/mixins/_breakpoints"; + +@include media-breakpoint-down(sm) { + .lightblue-btn { + font-size: 12px; + } + ::ng-deep .mat-paginator-container { + height: auto !important; + } +} + ::ng-deep .mat-paginator-container { flex-direction: row-reverse !important; justify-content: space-between !important; @@ -20,7 +33,8 @@ } ::ng-deep .mat-paginator-range-actions { - width: 55% !important; + width: auto !important; + min-width: 55% !important; min-height: 43px !important; justify-content: space-between; } 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 8ab68e0a3..6debbbd2c 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 @@ -1,7 +1,10 @@ + +import {of as observableOf, Observable } from 'rxjs'; import { Component, OnInit, ViewChild } from '@angular/core'; -import { MatDialog, MatPaginator, MatSort } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import { ActivatedRoute, Router } from '@angular/router'; -import { Observable } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../core/common/base/base.component'; import { DataTableRequest } from '../../../core/model/data-table/data-table-request'; @@ -23,11 +26,11 @@ import { TranslateService } from '@ngx-translate/core'; }) export class DmpListingComponent extends BaseComponent implements OnInit, IBreadCrumbComponent { - @ViewChild(MatPaginator) _paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; - @ViewChild(DmpCriteriaComponent) criteria: DmpCriteriaComponent; + @ViewChild(MatPaginator, { static: true }) _paginator: MatPaginator; + @ViewChild(MatSort, { static: false }) sort: MatSort; + @ViewChild(DmpCriteriaComponent, { static: true }) criteria: DmpCriteriaComponent; - breadCrumbs: Observable = Observable.of([{ parentComponentName: null, label: 'DMPs', url: "/plans" }]); + breadCrumbs: Observable = observableOf([{ parentComponentName: null, label: 'DMPs', url: "/plans" }]); itemId: string; grantId: string; showGrant: boolean; @@ -78,7 +81,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread // else this.language.get('NAV-BAR.MY-DMPS').pipe(takeUntil(this._destroyed)).subscribe(x => { - this.breadCrumbs = Observable.of([ + this.breadCrumbs = observableOf([ { parentComponentName: null, label: x, @@ -148,10 +151,9 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread this.refresh(); } - rowClicked(dmp: DmpListingModel) { - this.router.navigate(['/plans/overview/' + dmp.id]); - // this.router.navigate(['/plans/edit/' + dmp.id]); - } + // rowClicked(dmp: DmpListingModel) { + // this.router.navigate(['/plans/overview/' + dmp.id]); + // } addDataset(rowId: String) { this.router.navigate(['/datasets/new/' + rowId]); 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 2bdffd51c..eef507cea 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,83 +1,94 @@
-
-
-
-

- {{dmp.grantAbbreviation}}

- - - - - - - - + + + + + + + +
-
-
-
- - lock - - - lock - - - radio_button_checked - -

- {{ 'TYPES.DMP.DRAFT' | translate }}: {{dmp.label}}

-

{{dmp.label}}

-
-
-
-
-

{{dmp.description}}

-
-
-
-
- - settings - -

{{roleDisplay(dmp.users).toUpperCase()}}

- -
- - storage +
+
+ + lock_open -

- {{dmp.datasets.length}}

+ + lock + +
+
- - assignment -
-
{{profile.label}}
+
+
+ +
+

+ {{ 'TYPES.DMP.DRAFT' | translate }}: {{dmp.label}} +

+

{{dmp.label}}

+
+ +
+
+
+

{{dmp.description}}

+
+
+
+
+ + settings + +

{{roleDisplay(dmp.users).toUpperCase()}}

+
+
+ + + storage + +

{{dmp.datasets.length}}

+ +
+
+ assignment +
+
{{profile.label}}
+
+
+
+

{{'DMP-PROFILE-LISTING.COLUMNS.LAST-EDITED' | translate}} {{dmp.modifiedTime | date: "shortDate"}}

+

{{'TYPES.DMP.FINALISED' | translate}} {{dmp.finalizedAt | date: "shortDate"}}

+

{{'DMP-PROFILE-LISTING.COLUMNS.PUBLISHED' | translate}} {{dmp.publishedAt | date: "shortDate"}}

+
+
-

{{'DMP-PROFILE-LISTING.COLUMNS.LAST-EDITED' | translate}} {{dmp.modifiedTime | date: "shortDate"}}

-

{{'TYPES.DMP.FINALISED' | translate}} {{dmp.finalizedAt | date: "shortDate"}}

-

{{'DMP-PROFILE-LISTING.COLUMNS.PUBLISHED' | translate}} {{dmp.publishedAt | date: "shortDate"}}

+
- -
- +
diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss index 7b4733d6d..c7aab10fd 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss +++ b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss @@ -17,13 +17,14 @@ } .container-header :hover { - color: #4687e6; + color: #00b29f; } h4 { display: inline; padding-left: 1em; line-height: 1.7em; + color: #333333; } h4 > span { @@ -44,7 +45,7 @@ h4 > span { } .datasets-counter :hover { - color: #4687e6 !important; + color: #00b29f !important; } .about-item .title { @@ -59,16 +60,57 @@ h4 > span { color: #aaaaaa; } +p { + color: #333333; +} + .draft-icon { color: #aaaaaa; } +.lock-icon { + color: #0d7489; +} + .more-horiz { font-size: 28px; color: #aaaaaa; } .published-icon { - padding-top: 1px; - color: #92d050; + padding-top: 1px; + color: #08bd63; + // color: #92d050; +} + +.description { + margin-bottom: 0.4em; +} + +.outer-circle { + background: #08bd6342; + border-radius: 50%; + width: 20px; + height: 20px; + position: relative; + margin-top: 3px; +} + +.inner-circle { + position: absolute; + background: #08bd63; + border-radius: 50%; + height: 10px; + width: 10px; + top: 50%; + left: 50%; + margin: -5px 0px 0px -5px; +} + +.role { + min-width: 74px; +} + +::ng-deep .mat-menu-panel { + max-width: 282px !important; } 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 e1069718b..e41f78acd 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 @@ -1,16 +1,9 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { DmpListingModel } from '../../../../core/model/dmp/dmp-listing'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { DmpInvitationDialogComponent } from '../../invitation/dmp-invitation.component'; import { Router, ActivatedRoute } from '@angular/router'; -import { GrantListingModel } from '../../../../core/model/grant/grant-listing'; -import { RequestItem } from '../../../../core/query/request-item'; -import { TagCriteria } from '../../../../core/query/tag/tag-criteria'; -import { DmpCriteria } from '../../../../core/query/dmp/dmp-criteria'; -import { DatasetCriteria } from '../../../../core/query/dataset/dataset-criteria'; -import { DmpService } from '../../../../core/services/dmp/dmp.service'; import { DatasetService } from '../../../../core/services/dataset/dataset.service'; -import { DataTableRequest } from '../../../../core/model/data-table/data-table-request'; import { AuthService } from '../../../../core/services/auth/auth.service'; import { Principal } from '../../../../core/model/auth/Principal'; import { TranslateService } from '@ngx-translate/core'; @@ -34,8 +27,6 @@ export class DmpListingItemComponent implements OnInit { constructor( private router: Router, private dialog: MatDialog, - private route: ActivatedRoute, - private datasetService: DatasetService, private authentication: AuthService, private translate: TranslateService) { } @@ -57,6 +48,7 @@ export class DmpListingItemComponent implements OnInit { const dialogRef = this.dialog.open(DmpInvitationDialogComponent, { // height: '250px', // width: '700px', + restoreFocus: false, data: { dmpId: rowId, dmpName: rowName @@ -80,17 +72,17 @@ export class DmpListingItemComponent implements OnInit { this.router.navigate(['/plans/versions/' + rowId], { queryParams: { groupLabel: rowLabel } }); } - itemClicked() { - this.onClick.emit(this.dmp); - } + // itemClicked() { + // this.onClick.emit(this.dmp); + // } - grantClicked(grantId: String) { - this.router.navigate(['/grants/edit/' + grantId]); - } + // grantClicked(grantId: String) { + // this.router.navigate(['/grants/edit/' + grantId]); + // } - datasetClicked(dmpId: string) { - this.router.navigate(['/plans/edit/' + dmpId], { queryParams: { tab: "datasetDescriptions" } }); - } + // datasetClicked(dmpId: string) { + // this.router.navigate(['/plans/edit/' + dmpId], { queryParams: { tab: "datasetDescriptions" } }); + // } roleDisplay(value: any) { const principal: Principal = this.authentication.current(); 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 26a71ecfd..ebb4aef52 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 @@ -1,138 +1,161 @@
-
-
-

{{ dmp.label }}

- - {{ 'DMP-EDITOR.TITLE.SUBTITLE' | translate }}: {{ dmp.doi }} - -
-
- - - - - - - - - - - - - - - - - +
+
+
+ +
+

{{ dmp.label }}

+ + + + + + + +
+ +
+ + + + + + + + + + + + +
+
+
+ + {{ 'DMP-EDITOR.TITLE.SUBTITLE' | translate }}: {{ dmp.doi }} + +
-
-
-
-
-

{{ dmp.label }}

-

{{ dmp.description }}

-
-
+
+
+
+
+
+

{{ dmp.label }}

+

{{ dmp.description }}

+
+
+
settings

{{ roleDisplay(dmp.users) }}

+
-
- storage - -

- {{ dmp.datasets.length }}

-

- {{'NAV-BAR.DATASETS' | translate}}

-
+
+ storage + +

+ {{ dmp.datasets.length }}

+

+ {{'NAV-BAR.DATASETS' | translate}}

+
+
storage

{{ dmp.datasets.length }}

{{'NAV-BAR.DATASETS' | translate}}

+
+
assignment

{{ dmp.associatedProfiles.length }}

{{ 'DMP-EDITOR.FIELDS.TEMPLATES' | translate }}

+
+
person

{{ dmp.researchers.length }}

{{ 'DMP-EDITOR.FIELDS.RESEARCHERS' | translate }}

-
-
-
-
- bookmark - bookmark -

- {{ 'TYPES.DMP.DRAFT' | translate }}: {{ dataset.label }}

-

{{ dataset.label }}

-
- {{ dataset.datasetTemplate.label }}
+
+
+
+ bookmark + bookmark +

+ {{ 'TYPES.DMP.DRAFT' | translate }}: {{ dataset.label }}

+

{{ dataset.label }}

+
+ {{ dataset.datasetTemplate.label }}
+
-
-
- -
-
-
-
-
- {{ dmp.grant.abbreviation }} +
+
-

{{ dmp.grant.label }}

-

{{ dmp.grant.startDate | date: "shortDate" }} - {{ dmp.grant.endDate | date: "shortDate" }}

- - -

{{ dmp.grant.description }}

- - - - open_in_new - {{ 'GRANT-EDITOR.ACTIONS.VISIT-WEBSITE' | translate }} -
-
-
{{'DMP-OVERVIEW.RESEARCHERS' | translate}}
-
-
{{ researcher.name }}
+
+
+
+ {{ dmp.grant.abbreviation }} +
+

{{ dmp.grant.label }}

+

{{ dmp.grant.startDate | date: "shortDate" }} - {{ dmp.grant.endDate | date: "shortDate" }}

+ + +

{{ dmp.grant.description }}

+ + + + open_in_new + {{ 'GRANT-EDITOR.ACTIONS.VISIT-WEBSITE' | translate }} + +
+
+
{{'DMP-OVERVIEW.RESEARCHERS' | translate}}
+
+
{{ researcher.name }}
+
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss index 324ddea63..8e5b8b8e1 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss @@ -14,7 +14,11 @@ } .more-icon :hover { - color: #4687e6; + color: #00b29f; +} + +.export-btn { + padding-right: 6px; } .menu-item { @@ -54,7 +58,7 @@ .researchers-title { width: 120px; - color: #4687e6; + color: #089dbb; background-color: white; padding: 0px 10px; margin-top: -16px; @@ -78,7 +82,7 @@ } .container-header :hover { - color: #4687e6; + color: #00b29f; } .dataset-card { @@ -105,13 +109,13 @@ .show-more { background-color: #ffffff00; - color: #4687f0; + color: #00b29f; font-weight: 700; justify-self: center; } .visit-website { - background-color: #4687f0; + background-color: #00b29f; color: #ffffff; } @@ -124,7 +128,8 @@ } .finalized-bookmark { - color: #92d050; + color: #08bd63; + // color: #92d050; display: inline; position: absolute; margin-top: 0.5em; @@ -132,7 +137,7 @@ } h4 span { - color: #619ce3; + color: #089dbb; font-weight: 600; text-transform: uppercase; } @@ -144,7 +149,8 @@ h4 span { margin-left: 2.5em; margin-right: 2.5em; border-radius: 10em; - background-color: rgba(0, 112, 192, 1); + background-color: #0d7489; + // background-color: rgba(0, 112, 192, 1); // background-color: rgb(70, 135, 230); color: #fff; text-transform: uppercase; @@ -173,7 +179,7 @@ h4 span { } .datasets-counter :hover { - color: #4687e6 !important; + color: #00b29f !important; } .total-info { 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 2092badb5..39b5bc55f 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 @@ -1,10 +1,10 @@ + +import {of as observableOf, Observable } from 'rxjs'; import { Component, OnInit } from '@angular/core'; -import { FormGroup } from '@angular/forms'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import * as FileSaver from 'file-saver'; -import { Observable } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../core/common/base/base.component'; import { DatasetStatus } from '../../../core/common/enum/dataset-status'; @@ -17,10 +17,8 @@ import { AuthService } from '../../../core/services/auth/auth.service'; import { DmpService } from '../../../core/services/dmp/dmp.service'; import { SnackBarNotificationLevel, UiNotificationService } from '../../../core/services/notification/ui-notification-service'; import { ConfirmationDialogComponent } from '../../../library/confirmation-dialog/confirmation-dialog.component'; -import { ExportMethodDialogComponent } from '../../../library/export-method-dialog/export-method-dialog.component'; import { BreadcrumbItem } from '../../misc/breadcrumb/definition/breadcrumb-item'; import { DmpFinalizeDialogComponent, DmpFinalizeDialogInput, DmpFinalizeDialogOutput } from '../editor/dmp-finalize-dialog/dmp-finalize-dialog.component'; -import { ValidationErrorModel } from '../../../common/forms/validation/error-model/validation-error-model'; import { DatasetsToBeFinalized } from '../../../core/model/dataset/datasets-toBeFinalized'; @Component({ @@ -35,7 +33,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { isFinalized = false; isPublicView = true; hasPublishButton: boolean = true; - breadCrumbs: Observable = Observable.of(); + breadCrumbs: Observable = observableOf(); constructor( private route: ActivatedRoute, @@ -67,7 +65,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { 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/overview/' + this.dmp.id }); - this.breadCrumbs = Observable.of(breadCrumbs); + this.breadCrumbs = observableOf(breadCrumbs); }) } else if (publicId != null) { @@ -81,7 +79,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { const breadCrumbs = []; breadCrumbs.push({ parentComponentName: null, label: this.language.instant('NAV-BAR.PUBLIC-DMPS'), url: "/explore-plans" }); breadCrumbs.push({ parentComponentName: 'DmpListingComponent', label: this.dmp.label, url: '/plans/publicOverview/' + this.dmp.id }); - this.breadCrumbs = Observable.of(breadCrumbs); + this.breadCrumbs = observableOf(breadCrumbs); }); } }); @@ -96,7 +94,8 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { } grantClicked(grantId: String) { - this.router.navigate(['/grants/edit/' + grantId]); + // ----------- UNCOMMENT TO ADD AGAIN GRANTS -------- + // this.router.navigate(['/grants/edit/' + grantId]); } datasetClicked(datasetId: String) { @@ -133,56 +132,13 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { this.dmpService.delete(this.dmp.id) .pipe(takeUntil(this._destroyed)) .subscribe( - complete => { this.onCallbackSuccess() }, - error => this.onDeleteCallbackError(error) + complete => { this.onCallbackSuccess() }, + error => this.onDeleteCallbackError(error) ); } }); } - advancedClicked() { - const dialogRef = this.dialog.open(ExportMethodDialogComponent, { - maxWidth: '500px', - data: { - message: "Download as:", - XMLButton: "XML", - documentButton: "Document", - pdfButton: "PDF", - jsonButton: "JSON" - } - }); - dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => { - if (result == "pdf") { - this.downloadPDF(this.dmp.id); - } else if (result == "xml") { - this.downloadXml(this.dmp.id); - } else if (result == "doc") { - this.downloadDocx(this.dmp.id); - } else if (result == "json") { - this.downloadJson(this.dmp.id) - } - }); - } - - advancedClickedFinalized() { - const dialogRef = this.dialog.open(ExportMethodDialogComponent, { - maxWidth: '250px', - data: { - message: "Download as:", - documentButton: "Document", - pdfButton: "PDF", - isFinalized: true - } - }); - dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => { - if (result == "pdf") { - this.downloadPDF(this.dmp.id); - } else if (result == "doc") { - this.downloadDocx(this.dmp.id); - } - }); - } - onCallbackSuccess(): void { this.uiNotificationService.snackBarNotification(this.isNew ? this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-CREATION') : this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-UPDATE'), SnackBarNotificationLevel.Success); this.router.navigate(['/plans']); @@ -297,6 +253,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { getDoi(dmp: DmpOverviewModel) { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { maxWidth: '600px', + restoreFocus: false, data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ZENODO-DOI'), confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CONFIRM'), @@ -308,11 +265,11 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { this.dmpService.getDoi(dmp.id) .pipe(takeUntil(this._destroyed)) .subscribe( - complete => { - this.onDOICallbackSuccess(); - this.dmp.doi = complete; - }, - error => this.onDeleteCallbackError(error) + complete => { + this.onDOICallbackSuccess(); + this.dmp.doi = complete; + }, + error => this.onDeleteCallbackError(error) ); } }); @@ -331,9 +288,24 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { } publish(dmpId: String) { - this.dmpService.publish(dmpId) - .pipe(takeUntil(this._destroyed)) - .subscribe(() => { this.hasPublishButton = false }); + const dialogRef = this.dialog.open(ConfirmationDialogComponent, { + maxWidth: '500px', + restoreFocus: false, + data: { + message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.PUBLISH-ITEM'), + privacyPolicyNames: this.language.instant('GENERAL.CONFIRMATION-DIALOG.PRIVACY-POLICY-NAMES'), + confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CONFIRM'), + cancelButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CANCEL'), + isDeleteConfirmation: false + } + }); + dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => { + if (result) { + this.dmpService.publish(dmpId) + .pipe(takeUntil(this._destroyed)) + .subscribe(() => { this.hasPublishButton = false }); + } + }); } finalize(dmp: DmpOverviewModel) { @@ -348,6 +320,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { const dialogRef = this.dialog.open(DmpFinalizeDialogComponent, { maxWidth: '500px', + restoreFocus: false, data: { dialogInputModel: dialogInputModel, message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.FINALIZE-ITEM'), @@ -363,11 +336,11 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { this.dmpService.finalize(datasetsToBeFinalized, this.dmp.id) .pipe(takeUntil(this._destroyed)) .subscribe( - complete => { - this.dmp.status = DmpStatus.Finalized; - this.onCallbackSuccess() - }, - error => this.onFinalizeCallbackError(error) + complete => { + this.dmp.status = DmpStatus.Finalized; + this.onCallbackSuccess() + }, + error => this.onFinalizeCallbackError(error) ); } }); @@ -384,4 +357,48 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { viewVersions(rowId: String, rowLabel: String) { this.router.navigate(['/plans/versions/' + rowId], { queryParams: { groupLabel: rowLabel } }); } + + // advancedClicked() { + // const dialogRef = this.dialog.open(ExportMethodDialogComponent, { + // maxWidth: '500px', + // data: { + // message: "Download as:", + // XMLButton: "XML", + // documentButton: "Document", + // pdfButton: "PDF", + // jsonButton: "JSON" + // } + // }); + // dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => { + // if (result == "pdf") { + // this.downloadPDF(this.dmp.id); + // } else if (result == "xml") { + // this.downloadXml(this.dmp.id); + // } else if (result == "doc") { + // this.downloadDocx(this.dmp.id); + // } else if (result == "json") { + // this.downloadJson(this.dmp.id); + // } + // }); + // } + + // advancedClickedFinalized() { + // const dialogRef = this.dialog.open(ExportMethodDialogComponent, { + // maxWidth: '250px', + // data: { + // message: "Download as:", + // documentButton: "Document", + // pdfButton: "PDF", + // isFinalized: true + // } + // }); + // dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => { + // if (result == "pdf") { + // this.downloadPDF(this.dmp.id); + // } else if (result == "doc") { + // this.downloadDocx(this.dmp.id); + // } + // }); + // } + } diff --git a/dmp-frontend/src/app/ui/dmp/wizard/dmp-wizard.component.ts b/dmp-frontend/src/app/ui/dmp/wizard/dmp-wizard.component.ts index edef9da14..10d9901b8 100644 --- a/dmp-frontend/src/app/ui/dmp/wizard/dmp-wizard.component.ts +++ b/dmp-frontend/src/app/ui/dmp/wizard/dmp-wizard.component.ts @@ -1,10 +1,12 @@ + +import {of as observableOf, Observable } from 'rxjs'; + +import {map, takeUntil } from 'rxjs/operators'; import { Component, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatSnackBar } from '@angular/material'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { Observable } from 'rxjs'; -import { takeUntil } from 'rxjs/operators'; import { ValidationErrorModel } from '../../../common/forms/validation/error-model/validation-error-model'; import { BaseComponent } from '../../../core/common/base/base.component'; import { DmpModel } from '../../../core/model/dmp/dmp'; @@ -46,7 +48,7 @@ export class DmpWizardComponent extends BaseComponent implements OnInit, IBreadC .pipe(takeUntil(this._destroyed)) .subscribe((params: Params) => { this.itemId = params['id']; - this.dmpService.getSingle(this.itemId).map(data => data as DmpModel) + this.dmpService.getSingle(this.itemId).pipe(map(data => data as DmpModel)) .pipe(takeUntil(this._destroyed)) .subscribe(data => { this.dmp = new DmpWizardEditorModel(); @@ -68,7 +70,7 @@ export class DmpWizardComponent extends BaseComponent implements OnInit, IBreadC 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/clone/' + this.dmp.id }); - this.breadCrumbs = Observable.of(breadCrumbs); + this.breadCrumbs = observableOf(breadCrumbs); }); }); } diff --git a/dmp-frontend/src/app/ui/dmp/wizard/editor/dmp-wizard-editor.component.scss b/dmp-frontend/src/app/ui/dmp/wizard/editor/dmp-wizard-editor.component.scss index e8c0f3ca1..d7df7678d 100644 --- a/dmp-frontend/src/app/ui/dmp/wizard/editor/dmp-wizard-editor.component.scss +++ b/dmp-frontend/src/app/ui/dmp/wizard/editor/dmp-wizard-editor.component.scss @@ -14,7 +14,7 @@ } .input-btn :hover { - color: #4687f0 !important; + color: #00b29f !important; } .table-card .mat-grid-tile { diff --git a/dmp-frontend/src/app/ui/dmp/wizard/editor/dmp-wizard-editor.component.ts b/dmp-frontend/src/app/ui/dmp/wizard/editor/dmp-wizard-editor.component.ts index 550487887..f62972f4e 100644 --- a/dmp-frontend/src/app/ui/dmp/wizard/editor/dmp-wizard-editor.component.ts +++ b/dmp-frontend/src/app/ui/dmp/wizard/editor/dmp-wizard-editor.component.ts @@ -1,10 +1,11 @@ + +import {map, takeUntil } from 'rxjs/operators'; import { Component, Input, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatSnackBar } from '@angular/material'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { ActivatedRoute, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { Observable } from 'rxjs'; -import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../../core/common/base/base.component'; import { DatasetProfileModel } from '../../../../core/model/dataset/dataset-profile'; import { ExternalSourceItemModel } from '../../../../core/model/external-sources/external-source-item'; @@ -72,21 +73,21 @@ export class DmpWizardEditorComponent extends BaseComponent implements OnInit { this.profilesAutoCompleteConfiguration = { filterFn: this.filterProfiles.bind(this), - initialItems: (excludedItems: any[]) => this.filterProfiles('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterProfiles('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['label'], titleFn: (item) => item['label'] }; this.organisationsAutoCompleteConfiguration = { filterFn: this.filterOrganisations.bind(this), - initialItems: (excludedItems: any[]) => this.filterOrganisations('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterOrganisations('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['name'], titleFn: (item) => item['name'] }; this.researchersAutoCompleteConfiguration = { filterFn: this.filterResearchers.bind(this), - initialItems: (excludedItems: any[]) => this.filterResearchers('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterResearchers('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['name'], titleFn: (item) => item['name'] }; diff --git a/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.html b/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.html index aea9d7ec5..b9e9cafb4 100644 --- a/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.html +++ b/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.html @@ -1,10 +1,15 @@
-
{{'DATASET-LISTING.SELECT-DATASETS-TO-CLONE' | translate}} {{titlePrefix}}
- - - - {{dataset.label}} - - - +
+
{{'DATASET-LISTING.SELECT-DATASETS-TO-CLONE' | translate}} {{titlePrefix}}
+ + + + {{dataset.label}} + + + +
+
+
{{'DATASET-LISTING.SELECT-DATASETS-NONE' | translate}}
+
diff --git a/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.scss b/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.scss index 9070df5a0..83bae944c 100644 --- a/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.scss +++ b/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.scss @@ -1,36 +1,37 @@ .mat-table { - margin: 24px; + margin: 24px; } .mat-fab-bottom-right { - // top: auto !important; - // right: 20px !important; - // bottom: 10px !important; - // left: auto !important; - // position: fixed !important; - float: right; + // top: auto !important; + // right: 20px !important; + // bottom: 10px !important; + // left: auto !important; + // position: fixed !important; + float: right; } .full-width { - width: 100%; + width: 100%; } .mat-card { - margin: 16px 0; + margin: 16px 0; } .mat-row { - cursor: pointer; + cursor: pointer; } mat-row:hover { - background-color: lightgray; + background-color: lightgray; } // mat-row:nth-child(even){ // background-color:red; // } -mat-row:nth-child(odd){ - background-color:#eef0fb; - } +mat-row:nth-child(odd) { + background-color: #0c748914; + // background-color:#eef0fb; +} diff --git a/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.ts b/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.ts index 196132600..5d1d7c131 100644 --- a/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.ts +++ b/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.ts @@ -1,7 +1,9 @@ import { SelectionModel } from '@angular/cdk/collections'; import { Component, Input, OnInit, ViewChild } from '@angular/core'; import { FormArray, FormBuilder, FormControl, FormGroup } from '@angular/forms'; -import { MatPaginator, MatSnackBar, MatSort } from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSnackBar } from '@angular/material/snack-bar'; +import { MatSort } from '@angular/material/sort'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { takeUntil } from 'rxjs/operators'; @@ -20,9 +22,9 @@ import { DatasetCriteriaComponent } from '../../../dataset/listing/criteria/data }) export class DmpWizardDatasetListingComponent extends BaseComponent implements OnInit { - @ViewChild(MatPaginator) _paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; - @ViewChild(DatasetCriteriaComponent) criteria: DatasetCriteriaComponent; + @ViewChild(MatPaginator, { static: false }) _paginator: MatPaginator; + @ViewChild(MatSort, { static: false }) sort: MatSort; + @ViewChild(DatasetCriteriaComponent, { static: false }) criteria: DatasetCriteriaComponent; titlePrefix: String; diff --git a/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.html b/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.html index 632e26f3d..a7cd49185 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.html +++ b/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.html @@ -14,14 +14,18 @@
-
-
+
+
-
-
- +
+
+
+
+
+
+
diff --git a/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.scss b/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.scss index 148ad7fb3..ea5be4d58 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.scss +++ b/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.scss @@ -1,3 +1,16 @@ +@import "node_modules/bootstrap/scss/functions"; +@import "node_modules/bootstrap/scss/variables"; +@import "node_modules/bootstrap/scss/mixins/_breakpoints"; + +@include media-breakpoint-down(sm) { + .lightblue-btn { + font-size: 12px; + } + ::ng-deep .mat-paginator-container { + height: auto !important; + } +} + text-center { text-align: center; } @@ -54,7 +67,8 @@ text-center { } ::ng-deep .mat-paginator-range-actions { - width: 55% !important; + width: auto !important; + min-width: 55% !important; min-height: 43px !important; justify-content: space-between; } diff --git a/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.ts b/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.ts index 07cf35a9f..cde24dce1 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.ts +++ b/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.ts @@ -1,5 +1,7 @@ +import {of as observableOf, Observable } from 'rxjs'; import { Component, OnInit, ViewChild, ɵConsole } from '@angular/core'; -import { MatPaginator, MatSort } from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import { Router, ActivatedRoute, Params } from '@angular/router'; import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../core/common/base/base.component'; @@ -9,12 +11,8 @@ import { ExploreDatasetCriteriaModel } from '../../core/query/explore-dataset/ex import { DatasetService } from '../../core/services/dataset/dataset.service'; import { IBreadCrumbComponent } from '../misc/breadcrumb/definition/IBreadCrumbComponent'; import { BreadcrumbItem } from '../misc/breadcrumb/definition/breadcrumb-item'; -import { Observable } from 'rxjs'; import { TranslateService } from '@ngx-translate/core'; import { DmpService } from '../../core/services/dmp/dmp.service'; -import { DatasetCriteriaComponent } from '../dataset/listing/criteria/dataset-criteria.component'; -import { DmpModel } from '../../core/model/dmp/dmp'; -import { DatasetCriteria } from '../../core/query/dataset/dataset-criteria'; @Component({ @@ -24,8 +22,8 @@ import { DatasetCriteria } from '../../core/query/dataset/dataset-criteria'; }) export class ExploreDatasetListingComponent extends BaseComponent implements OnInit, IBreadCrumbComponent { - @ViewChild(MatPaginator) _paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; + @ViewChild(MatPaginator, { static: true }) _paginator: MatPaginator; + @ViewChild(MatSort, { static: false }) sort: MatSort; totalCount: number; listingItems: DatasetListingModel[] = []; @@ -78,7 +76,7 @@ export class ExploreDatasetListingComponent extends BaseComponent implements OnI label: this.language.instant('NAV-BAR.PUBLIC DATASETS'), url: "/explore" }) - this.breadCrumbs = Observable.of(breadCrumbs); + this.breadCrumbs = observableOf(breadCrumbs); } refresh(resetPages = false) { @@ -95,9 +93,9 @@ export class ExploreDatasetListingComponent extends BaseComponent implements OnI }); } - rowClicked(dataset: DatasetListingModel) { - this.router.navigate(['/datasets/publicEdit/' + dataset.id]); - } + // rowClicked(dataset: DatasetListingModel) { + // this.router.navigate(['/datasets/publicEdit/' + dataset.id]); + // } onCriteriaChange(event: ExploreDatasetCriteriaModel) { this.exploreDatasetCriteriaModel = event; diff --git a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filter-item/explore-dataset-filter-item.component.ts b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filter-item/explore-dataset-filter-item.component.ts index d50a69234..718f7baea 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filter-item/explore-dataset-filter-item.component.ts +++ b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filter-item/explore-dataset-filter-item.component.ts @@ -1,9 +1,11 @@ + +import {of as observableOf, Observable } from 'rxjs'; + +import {distinctUntilChanged, debounceTime, takeUntil } from 'rxjs/operators'; import { SelectionModel } from '@angular/cdk/collections'; import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; import { FormControl } from '@angular/forms'; -import { MatListOption, MatSelectionList } from '@angular/material'; -import { Observable } from 'rxjs'; -import { takeUntil } from 'rxjs/operators'; +import { MatListOption, MatSelectionList } from '@angular/material/list'; import { BaseComponent } from '../../../../core/common/base/base.component'; @Component({ @@ -26,7 +28,7 @@ export class ExploreDatasetFilterItemComponent extends BaseComponent implements filterOptions: (value) => Observable; @Input() - options: Observable = Observable.of([]); + options: Observable = observableOf([]); @Input() displayTitleFunc: (value) => string; @@ -44,14 +46,14 @@ export class ExploreDatasetFilterItemComponent extends BaseComponent implements private selectedOptions: any[] = []; - @ViewChild('optionsList') selectionList: MatSelectionList; + @ViewChild('optionsList', { static: true }) selectionList: MatSelectionList; constructor() { super(); } ngOnInit(): void { if (!this.multipleSelect) { this.selectionList.selectedOptions = new SelectionModel(this.multipleSelect); } - this.optionSearchControl.valueChanges.debounceTime(this.requestDelay) - .distinctUntilChanged() + this.optionSearchControl.valueChanges.pipe(debounceTime(this.requestDelay), + distinctUntilChanged(),) .pipe(takeUntil(this._destroyed)) .subscribe(x => { if (this.filterOptions) { this.options = this.filterOptions(x); } }); } diff --git a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.html b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.html index 46331edea..3684f2955 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.html +++ b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.html @@ -11,15 +11,11 @@
{{ 'FACET-SEARCH.GRANT-STATUS.TITLE' | translate }}
- - {{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ANY' | translate }} - - - {{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ACTIVE' | translate }} - - - {{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.INACTIVE' | translate }} - + + {{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ANY' | translate }} + {{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ACTIVE' | translate }} + {{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.INACTIVE' | translate }} +
@@ -49,6 +45,15 @@
+
+
{{ 'FACET-SEARCH.ROLE.TITLE' | translate }}
+ + {{ 'FACET-SEARCH.ROLE.ANY' | translate }} + {{ 'FACET-SEARCH.ROLE.OWNER' | translate }} + {{ 'FACET-SEARCH.ROLE.MEMBER' | translate }} + +
+
{{ 'FACET-SEARCH.DMP-ORGANISATIONS.TITLE' | translate }}
diff --git a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.scss b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.scss index 7eb7d69a8..b3f5e80d5 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.scss +++ b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.scss @@ -13,7 +13,8 @@ } .category-title { - color: #2e75b6; + color: black; + // color: #089dbb; margin-top: 8px; margin-bottom: 12px; } @@ -30,7 +31,7 @@ .filters-title { width: 90px; - color: #2e75b6; + color: #089dbb; background-color: white; padding: 0px 20px; margin-top: -10px; @@ -42,21 +43,21 @@ color: #adadad; } -::ng-deep .mat-checkbox-inner-container { - background: white; -} +// ::ng-deep .mat-checkbox-inner-container { +// background: white; +// } -::ng-deep .mat-focused .mat-form-field-label { - color: #2e75b6 !important; -} +// ::ng-deep .mat-focused .mat-form-field-label { +// color: #00b29f !important; +// } -::ng-deep.mat-form-field-underline { - background-color: #adadad; -} +// ::ng-deep.mat-form-field-underline { +// background-color: #adadad; +// } -::ng-deep.mat-form-field-ripple { - background-color: #2e75b6 !important; -} +// ::ng-deep.mat-form-field-ripple { +// background-color: #00b29f !important; +// } // ::ng-deep .mat-checkbox { // background-color: #f6f6f6 !important; @@ -72,7 +73,7 @@ .mat-accent .mat-pseudo-checkbox-indeterminate, .mat-pseudo-checkbox-checked, .mat-pseudo-checkbox-indeterminate { - background-color: #2e75b6; + background-color: #00b29f; } ::ng-deep .mat-ripple-element { @@ -89,12 +90,15 @@ } ::ng-deep .mat-radio-button.mat-accent.mat-radio-checked .mat-radio-outer-circle { - border-color: #2e75b6; + border-color: #777777; + // border-color: #00b29f; } ::ng-deep .mat-radio-button.mat-accent .mat-radio-inner-circle { - color: #2e75b6; - background-color: #2e75b6; + color: #777777; + background-color: #777777; + // color: #00b29f; + // background-color: #00b29f; } .mat-radio-button.mat-accent .mat-radio-ripple .mat-ripple-element { diff --git a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts index 0b167651b..2a2fd6880 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts +++ b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts @@ -1,8 +1,11 @@ + +import { of as observableOf, Observable } from 'rxjs'; + +import { map } from 'rxjs/operators'; import { AfterViewInit, Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; -import { MatAccordion } from '@angular/material'; -import { ActivatedRoute, Params } from '@angular/router'; +import { MatAccordion } from '@angular/material/expansion'; +import { ActivatedRoute } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { Observable } from 'rxjs'; import { BaseComponent } from '../../../core/common/base/base.component'; import { GrantStateType } from '../../../core/common/enum/grant-state-type'; import { DatasetProfileModel } from '../../../core/model/dataset/dataset-profile'; @@ -16,7 +19,6 @@ import { ExternalSourcesService } from '../../../core/services/external-sources/ import { GrantService } from '../../../core/services/grant/grant.service'; import { RequestItem } from '../../../core/query/request-item'; import { DataTableRequest } from '../../../core/model/data-table/data-table-request'; -import { AuthService } from '../../../core/services/auth/auth.service'; import { MultipleAutoCompleteConfiguration } from '../../../library/auto-complete/multiple/multiple-auto-complete-configuration'; import { DmpService } from '../../../core/services/dmp/dmp.service'; import { OrganisationCriteria } from '../../../core/query/organisation/organisation-criteria'; @@ -25,10 +27,8 @@ import { OrganizationModel } from '../../../core/model/organisation/organization import { DataTableData } from '../../../core/model/data-table/data-table-data'; import { DmpListingModel } from '../../../core/model/dmp/dmp-listing'; import { ExploreDmpCriteriaModel } from '../../../core/query/explore-dmp/explore-dmp-criteria'; -import { DmpModel } from '../../../core/model/dmp/dmp'; -import { BaseCriteriaComponent } from '../../misc/criteria/base-criteria.component'; -import { ValidationErrorModel } from '../../../common/forms/validation/error-model/validation-error-model'; -import { takeUntil } from 'rxjs/operators'; +import { DatasetProfileCriteria } from "../../../core/query/dataset-profile/dataset-profile-criteria"; +import { AuthService } from '../../../core/services/auth/auth.service'; @Component({ selector: 'app-explore-dataset-filters-component', @@ -49,7 +49,7 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI grantOptions: Observable; grantStateOptions: Observable; filteringOrganisationsAsync = false; - @ViewChild('facetAccordion') accordion: MatAccordion; + @ViewChild('facetAccordion', { static: false }) accordion: MatAccordion; displayGrantStateValue = (option) => option['value']; displayGrantStateLabel = (option) => option['label']; @@ -65,14 +65,14 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI tagsAutoCompleteConfiguration = { filterFn: this.filterTags.bind(this), - initialItems: (excludedItems: any[]) => this.filterTags('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterTags('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['name'], titleFn: (item) => item['name'] }; dmpAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { - filterFn: (x, excluded) => this.filterDmps(x).map(x => x.data), - initialItems: (extraData) => this.filterDmps('').map(x => x.data), + filterFn: (x, excluded) => this.filterDmps(x).pipe(map(x => x.data)), + initialItems: (extraData) => this.filterDmps('').pipe(map(x => x.data)), displayFn: (item) => item['label'], titleFn: (item) => item['label'] }; @@ -80,8 +80,8 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI grantAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterGrant.bind(this), initialItems: (excludedItems: any[]) => - this.filterGrant('') - .map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + this.filterGrant('').pipe( + map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['label'], titleFn: (item) => item['label'] } @@ -89,8 +89,8 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI profileAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterProfile.bind(this), initialItems: (excludedItems: any[]) => - this.getProfiles() - .map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + this.filterProfile('').pipe( + map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['label'], titleFn: (item) => item['label'] }; @@ -98,32 +98,32 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI organizationAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterOrganisation.bind(this), initialItems: (excludedItems: any[]) => - this.getOrganisations() - .map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + this.getOrganisations().pipe( + map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['name'], titleFn: (item) => item['name'] } constructor( public activatedRoute: ActivatedRoute, + private authentication: AuthService, public grantService: GrantService, public dmpService: DmpService, public organisationService: OrganisationService, public languageService: TranslateService, public datasetProfileService: DatasetService, public externalSourcesService: ExternalSourcesService, - private authentication: AuthService, ) { super(); } ngOnInit() { - setTimeout(x => { - this.grantStateOptions = Observable.of( + setTimeout(() => { + this.grantStateOptions = observableOf( [ { label: this.languageService.instant('FACET-SEARCH.GRANT-STATUS.OPTIONS.INACTIVE'), value: GrantStateType.Finished }, { label: this.languageService.instant('FACET-SEARCH.GRANT-STATUS.OPTIONS.ACTIVE'), value: GrantStateType.OnGoing }, ]); }); - this.profiles = this.datasetProfileService.getDatasetProfiles(); + // this.profiles = this.datasetProfileService.getDatasetProfiles(); this.dmpOrganisations = this.externalSourcesService.searchDMPOrganizations(''); } @@ -135,7 +135,7 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI this.facetCriteria.grantStatus = event.value; if (event.value === 'null') { this.facetCriteria.grantStatus = null; - this.grants = Observable.of([]); + this.grants = observableOf([]); this.facetCriteria.grants = []; } // if (event.option.selected) { @@ -151,7 +151,7 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI dataTableRequest.criteria.grantStateType = this.facetCriteria.grantStatus; dataTableRequest.criteria['length'] = 10; - this.grants = this.grantService.getPublicPaged(dataTableRequest).map(x => x.data); + this.grants = this.grantService.getPublicPaged(dataTableRequest).pipe(map(x => x.data)); this.facetCriteria.grants = []; } this.facetCriteriaChange.emit(this.facetCriteria); @@ -184,9 +184,9 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI this.facetCriteriaChange.emit(this.facetCriteria); } - getProfiles() { - return this.datasetProfileService.getDatasetProfiles(); - } + // getProfiles() { + // return this.datasetProfileService.getDatasetProfiles(); + // } removeProfile(profile) { this.facetCriteria.datasetProfile.splice(this.facetCriteria.datasetProfile.indexOf(profile), 1); @@ -199,7 +199,15 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI const dataTableRequest: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); dataTableRequest.criteria = new OrganisationCriteria(); dataTableRequest.criteria.labelLike = ''; - return this.organisationService.searchPublicOrganisations(dataTableRequest).map(x => x.data); + return this.organisationService.searchPublicOrganisations(dataTableRequest).pipe(map(x => x.data)); + } + + public roleChanged(event: any) { + this.facetCriteria.role = event.value; + if (event.value === 'null') { + this.facetCriteria.role = null; + } + this.facetCriteriaChange.emit(this.facetCriteria); } public dmpOrganisationChanged(event: any) { @@ -226,7 +234,7 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI dataTableRequest.criteria = grantCriteria; //const dataTableRequest: RequestItem = { criteria: grantCriteria }; //return this.grantService.getPaged(dataTableRequest, "autocomplete").map(x => x.data); - return this.grantService.getPublicPaged(dataTableRequest).map(x => x.data); + return this.grantService.getPublicPaged(dataTableRequest).pipe(map(x => x.data)); } public dmpOrganisationSearch(value: string): Observable { @@ -238,9 +246,9 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI this.facetCriteriaChange.emit(this.facetCriteria); } - public profileSearch(value: string) { - return this.datasetProfileService.getDatasetProfiles(); - } + // public profileSearch(value: string) { + // return this.datasetProfileService.getDatasetProfiles(); + // } public controlModified() { this.facetCriteriaChange.emit(this.facetCriteria); @@ -304,7 +312,7 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI filterDmps(value: string): Observable> { const fields: Array = new Array(); - fields.push('asc'); + fields.push('-finalizedAt'); const dmpDataTableRequest: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); dmpDataTableRequest.criteria = new ExploreDatasetCriteriaModel(); dmpDataTableRequest.criteria.like = value; @@ -331,17 +339,18 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI const grantRequestItem: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); grantRequestItem.criteria = new GrantCriteria(); grantRequestItem.criteria.like = query; - return this.grantService.getPublicPaged(grantRequestItem).map(x => x.data); + return this.grantService.getPublicPaged(grantRequestItem).pipe(map(x => x.data)); } filterProfile(query: string) { const fields: Array = new Array(); fields.push('asc'); - const profileRequestItem: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); - profileRequestItem.criteria = new ExploreDatasetCriteriaModel(); + const profileRequestItem: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); + profileRequestItem.criteria = new DatasetProfileCriteria(); profileRequestItem.criteria.like = query; - return this.dmpService.getPublicPaged(profileRequestItem, "listing").map(x => x.data); + return this.datasetProfileService.getDatasetProfiles(profileRequestItem); + // this.dmpService.getPublicPaged(profileRequestItem, "listing").pipe(map(x => x.data)); } filterOrganisation(value: string) { @@ -352,6 +361,10 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI dataTableRequest.criteria = new OrganisationCriteria(); dataTableRequest.criteria.labelLike = value; - return this.organisationService.searchPublicOrganisations(dataTableRequest).map(x => x.data); + return this.organisationService.searchPublicOrganisations(dataTableRequest).pipe(map(x => x.data)); + } + + public isAuthenticated(): boolean { + return !(!this.authentication.current()); } } diff --git a/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.html b/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.html index 1c8b1ac04..903822e55 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.html +++ b/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.html @@ -1,49 +1,72 @@ -
-
-
-
-

{{ dataset.grantAbbreviation }}

- -
-
-
-
- bookmark -

{{ dataset.label }}

-
-
-
-
-

{{dataset.description}}

-
-
-
-
- storage -

{{ dataset.dmp }}

- - work_outline -

{{ dataset.grant }}

- - assignment -
-
{{ dataset.profile }}
+
+ +
+
+
+

{{ dataset.grantAbbreviation }}

+
-

{{'DATASET-LISTING.COLUMNS.PUBLISHED' | translate}} {{dataset.created | date: "shortDate"}}

-
- -
+ + + +
+
diff --git a/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.scss b/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.scss index ac562eae6..26c7bf5b0 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.scss +++ b/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.scss @@ -20,6 +20,7 @@ h4 { display: inline; padding-left: 1em; + color: #333333; } .title h4 { @@ -33,7 +34,8 @@ h4 { } .about-item .length { - color: rgb(70, 135, 240); + color: #00b29f; + // color: #089dbb; } .about-item .title { @@ -47,6 +49,14 @@ h4 { color: #aaaaaa; } +p { + color: #333333; +} + +.finalized-bookmark { + color: #08bd63; +} + // .explore-dataset-info { // background-color: #f6f6f6; // padding: 8px 15px; diff --git a/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.ts b/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.ts index 4779e63b6..83ac3f9ad 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.ts +++ b/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.ts @@ -22,8 +22,8 @@ export class ExploreDatasetListingItemComponent implements OnInit { else { this.isDraft = false } } - itemClicked() { - this.onClick.emit(this.dataset); - } + // itemClicked() { + // this.onClick.emit(this.dataset); + // } } diff --git a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filter-item/explore-dmp-filter-item.component.ts b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filter-item/explore-dmp-filter-item.component.ts index 505b5bd24..5b706d5e4 100644 --- a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filter-item/explore-dmp-filter-item.component.ts +++ b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filter-item/explore-dmp-filter-item.component.ts @@ -1,9 +1,11 @@ + +import {of as observableOf, Observable } from 'rxjs'; + +import {distinctUntilChanged, debounceTime, takeUntil } from 'rxjs/operators'; import { SelectionModel } from '@angular/cdk/collections'; import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; import { FormControl } from '@angular/forms'; -import { MatListOption, MatSelectionList } from '@angular/material'; -import { Observable } from 'rxjs'; -import { takeUntil } from 'rxjs/operators'; +import { MatListOption, MatSelectionList } from '@angular/material/list'; import { BaseComponent } from '../../../../core/common/base/base.component'; @Component({ @@ -21,7 +23,7 @@ export class ExploreDmpFilterItemComponent extends BaseComponent implements OnIn @Input() filterOptions: (value) => Observable; @Input() - options: Observable = Observable.of([]); + options: Observable = observableOf([]); @Input() displayTitleFunc: (value) => string; @Input() @@ -33,16 +35,16 @@ export class ExploreDmpFilterItemComponent extends BaseComponent implements OnIn optionSearchControl = new FormControl(''); - private selectedOptions: any[] = []; + public selectedOptions: any[] = []; - @ViewChild('optionsList') selectionList: MatSelectionList; + @ViewChild('optionsList', { static: true }) selectionList: MatSelectionList; constructor() { super(); } ngOnInit(): void { if (!this.multipleSelect) { this.selectionList.selectedOptions = new SelectionModel(this.multipleSelect); } - this.optionSearchControl.valueChanges.debounceTime(this.requestDelay) - .distinctUntilChanged() + this.optionSearchControl.valueChanges.pipe(debounceTime(this.requestDelay), + distinctUntilChanged(),) .pipe(takeUntil(this._destroyed)) .subscribe(x => { if (this.filterOptions) { this.options = this.filterOptions(x); } }); } diff --git a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.html b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.html index c32321aa8..9ae8fe5d3 100644 --- a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.html +++ b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.html @@ -3,24 +3,29 @@
- + search
{{ 'FACET-SEARCH.GRANT-STATUS.TITLE' | translate }}
- {{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ANY' | translate }} - {{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ACTIVE' | translate }} - {{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.INACTIVE' | translate }} + + + {{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ANY' | translate }} + + + {{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ACTIVE' | translate }} + + + {{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.INACTIVE' | translate }} + +
{{ 'FACET-SEARCH.GRANT.TITLE' | translate }}
- + arrow_drop_down @@ -29,21 +34,31 @@
{{ 'FACET-SEARCH.PROFILES.TITLE' | translate }}
- + arrow_drop_down
+
+
{{ 'FACET-SEARCH.ROLE.TITLE' | translate }}
+ + + {{ 'FACET-SEARCH.ROLE.ANY' | translate }} + + + {{ 'FACET-SEARCH.ROLE.OWNER' | translate }} + + + {{ 'FACET-SEARCH.ROLE.MEMBER' | translate }} + + +
+
{{ 'FACET-SEARCH.DMP-ORGANISATIONS.TITLE' | translate }}
- + arrow_drop_down diff --git a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.scss b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.scss index 7eb7d69a8..b3f5e80d5 100644 --- a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.scss +++ b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.scss @@ -13,7 +13,8 @@ } .category-title { - color: #2e75b6; + color: black; + // color: #089dbb; margin-top: 8px; margin-bottom: 12px; } @@ -30,7 +31,7 @@ .filters-title { width: 90px; - color: #2e75b6; + color: #089dbb; background-color: white; padding: 0px 20px; margin-top: -10px; @@ -42,21 +43,21 @@ color: #adadad; } -::ng-deep .mat-checkbox-inner-container { - background: white; -} +// ::ng-deep .mat-checkbox-inner-container { +// background: white; +// } -::ng-deep .mat-focused .mat-form-field-label { - color: #2e75b6 !important; -} +// ::ng-deep .mat-focused .mat-form-field-label { +// color: #00b29f !important; +// } -::ng-deep.mat-form-field-underline { - background-color: #adadad; -} +// ::ng-deep.mat-form-field-underline { +// background-color: #adadad; +// } -::ng-deep.mat-form-field-ripple { - background-color: #2e75b6 !important; -} +// ::ng-deep.mat-form-field-ripple { +// background-color: #00b29f !important; +// } // ::ng-deep .mat-checkbox { // background-color: #f6f6f6 !important; @@ -72,7 +73,7 @@ .mat-accent .mat-pseudo-checkbox-indeterminate, .mat-pseudo-checkbox-checked, .mat-pseudo-checkbox-indeterminate { - background-color: #2e75b6; + background-color: #00b29f; } ::ng-deep .mat-ripple-element { @@ -89,12 +90,15 @@ } ::ng-deep .mat-radio-button.mat-accent.mat-radio-checked .mat-radio-outer-circle { - border-color: #2e75b6; + border-color: #777777; + // border-color: #00b29f; } ::ng-deep .mat-radio-button.mat-accent .mat-radio-inner-circle { - color: #2e75b6; - background-color: #2e75b6; + color: #777777; + background-color: #777777; + // color: #00b29f; + // background-color: #00b29f; } .mat-radio-button.mat-accent .mat-radio-ripple .mat-ripple-element { diff --git a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.ts b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.ts index 657872315..73c4f8048 100644 --- a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.ts +++ b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.ts @@ -1,17 +1,16 @@ + +import { of as observableOf, Observable } from 'rxjs'; + +import { map } from 'rxjs/operators'; import { AfterViewInit, Component, EventEmitter, Input, OnInit, Output, ViewChild } from "@angular/core"; -import { FormBuilder, FormControl, FormGroup } from "@angular/forms"; -import { MatAccordion, fadeInItems, MatGridTileHeaderCssMatStyler } from "@angular/material"; +import { MatAccordion } from "@angular/material/expansion"; import { ActivatedRoute } from "@angular/router"; import { TranslateService } from "@ngx-translate/core"; -import { Observable } from "rxjs"; -import { takeUntil } from "rxjs/operators"; import { ValidationErrorModel } from "../../../common/forms/validation/error-model/validation-error-model"; import { GrantStateType } from '../../../core/common/enum/grant-state-type'; import { DataTableRequest } from "../../../core/model/data-table/data-table-request"; import { DatasetProfileModel } from "../../../core/model/dataset/dataset-profile"; -import { ExternalSourceItemModel } from "../../../core/model/external-sources/external-source-item"; import { GrantListingModel } from "../../../core/model/grant/grant-listing"; -import { ExploreDatasetCriteriaModel } from "../../../core/query/explore-dataset/explore-dataset-criteria"; import { ExploreDmpCriteriaModel } from "../../../core/query/explore-dmp/explore-dmp-criteria"; import { GrantCriteria } from "../../../core/query/grant/grant-criteria"; import { DatasetService } from "../../../core/services/dataset/dataset.service"; @@ -23,6 +22,8 @@ import { BaseCriteriaComponent } from "../../misc/criteria/base-criteria.compone import { OrganizationModel } from "../../../core/model/organisation/organization"; import { OrganisationCriteria } from "../../../core/query/organisation/organisation-criteria"; import { OrganisationService } from "../../../core/services/organisation/organisation.service"; +import { DatasetProfileCriteria } from "../../../core/query/dataset-profile/dataset-profile-criteria"; +import { AuthService } from '../../../core/services/auth/auth.service'; @Component({ selector: 'app-explore-dmp-filters-component', @@ -50,7 +51,7 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements Active: string; Inactive: string; - @ViewChild('facetAccordion') accordion: MatAccordion; + @ViewChild('facetAccordion', { static: false }) accordion: MatAccordion; displayGrantStateValue = (option) => option['value']; displayGrantStateLabel = (option) => option['label']; @@ -67,8 +68,8 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements profileAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterProfile.bind(this), initialItems: (excludedItems: any[]) => - this.getProfiles() - .map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + this.filterProfile('').pipe( + map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['label'], titleFn: (item) => item['label'] }; @@ -76,8 +77,8 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements organizationAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterOrganisation.bind(this), initialItems: (excludedItems: any[]) => - this.getOrganisations() - .map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + this.getOrganisations().pipe( + map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['name'], titleFn: (item) => item['name'] } @@ -85,8 +86,8 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements grantAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterGrant.bind(this), initialItems: (excludedItems: any[]) => - this.filterGrant('') - .map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + this.filterGrant('').pipe( + map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['label'], titleFn: (item) => item['label'] } @@ -95,6 +96,7 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements public activatedRoute: ActivatedRoute, public languageService: TranslateService, public grantService: GrantService, + private authentication: AuthService, public datasetProfileService: DatasetService, public organisationService: OrganisationService, public externalSourcesService: ExternalSourcesService, @@ -111,16 +113,16 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements ngOnInit() { setTimeout(x => { - this.grantStateOptions = Observable.of( + this.grantStateOptions = observableOf( [ { label: this.languageService.instant('FACET-SEARCH.GRANT-STATUS.OPTIONS.INACTIVE'), value: GrantStateType.Finished }, { label: this.languageService.instant('FACET-SEARCH.GRANT-STATUS.OPTIONS.ACTIVE'), value: GrantStateType.OnGoing }, ]); }); - this.profiles = this.datasetProfileService.getDatasetProfiles(); + //this.profiles = this.datasetProfileService.getDatasetProfiles(); const fields: Array = new Array(); fields.push('asc'); - this.dmpOrganisations = this.organisationService.searchPublicOrganisations(new DataTableRequest(0, null, { fields: fields })).map(x => x.data); + this.dmpOrganisations = this.organisationService.searchPublicOrganisations(new DataTableRequest(0, null, { fields: fields })).pipe(map(x => x.data)); } ngAfterViewInit(): void { @@ -150,7 +152,7 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements const dataTableRequest: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); dataTableRequest.criteria = grantCriteria; - return this.grantService.getPublicPaged(dataTableRequest).map(x => x.data); + return this.grantService.getPublicPaged(dataTableRequest).pipe(map(x => x.data)); } grantStatusChanged(event) { @@ -160,7 +162,7 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements // if (!event.source.checked) { if (event.value === 'null') { this.facetCriteria.grantStatus = null; - this.grants = Observable.of([]); + this.grants = observableOf([]); this.facetCriteria.grants = []; } // if (event.checked) { @@ -174,7 +176,7 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements dataTableRequest.criteria.grantStateType = this.facetCriteria.grantStatus; dataTableRequest.criteria['length'] = 10; - this.grants = this.grantService.getPublicPaged(dataTableRequest).map(x => x.data); + this.grants = this.grantService.getPublicPaged(dataTableRequest).pipe(map(x => x.data)); this.facetCriteria.grants = []; } this.facetCriteriaChange.emit(this.facetCriteria); @@ -254,6 +256,14 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements } } + public roleChanged(event: any) { + this.facetCriteria.role = event.value; + if (event.value === 'null') { + this.facetCriteria.role = null; + } + this.facetCriteriaChange.emit(this.facetCriteria); + } + dmpOrganisationChanged(event: any) { const eventValue = event.option.value.id; if (event.option.selected) { this.facetCriteria.dmpOrganisations.push(eventValue); } @@ -264,9 +274,9 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements this.facetCriteriaChange.emit(this.facetCriteria); } - profileSearch(value: string) { - return this.datasetProfileService.getDatasetProfiles(); - } + // profileSearch(value: string) { + // return this.datasetProfileService.getDatasetProfiles(); + // } dmpOrganisationSearch(value: string): Observable { const fields: Array = new Array(); @@ -274,7 +284,7 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements const dataTableRequest: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); dataTableRequest.criteria = new OrganisationCriteria(); dataTableRequest.criteria.labelLike = value; - return this.organisationService.searchPublicOrganisations(dataTableRequest).map(x => x.data); + return this.organisationService.searchPublicOrganisations(dataTableRequest).pipe(map(x => x.data)); } removeOrganisation(organisation) { @@ -282,9 +292,9 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements this.facetCriteriaChange.emit(this.facetCriteria); } - getProfiles() { - return this.datasetProfileService.getDatasetProfiles(); - } + // getProfiles() { + // return this.datasetProfileService.getDatasetProfiles(); + // } getOrganisations() { const fields: Array = new Array(); @@ -292,7 +302,7 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements const dataTableRequest: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); dataTableRequest.criteria = new OrganisationCriteria(); dataTableRequest.criteria.labelLike = ''; - return this.organisationService.searchPublicOrganisations(dataTableRequest).map(x => x.data); + return this.organisationService.searchPublicOrganisations(dataTableRequest).pipe(map(x => x.data)); } filterGrant(query: string) { @@ -301,17 +311,17 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements const grantRequestItem: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); grantRequestItem.criteria = new GrantCriteria(); grantRequestItem.criteria.like = query; - return this.grantService.getPublicPaged(grantRequestItem).map(x => x.data); + return this.grantService.getPublicPaged(grantRequestItem).pipe(map(x => x.data)); } filterProfile(query: string) { const fields: Array = new Array(); fields.push('asc'); - const profileRequestItem: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); - profileRequestItem.criteria = new ExploreDatasetCriteriaModel(); + const profileRequestItem: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); + profileRequestItem.criteria = new DatasetProfileCriteria(); profileRequestItem.criteria.like = query; - return this.dmpService.getPublicPaged(profileRequestItem, "listing").map(x => x.data); + return this.datasetProfileService.getDatasetProfiles(profileRequestItem); } filterOrganisation(value: string) { @@ -322,7 +332,7 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements dataTableRequest.criteria = new OrganisationCriteria(); dataTableRequest.criteria.labelLike = value; - return this.organisationService.searchPublicOrganisations(dataTableRequest).map(x => x.data); + return this.organisationService.searchPublicOrganisations(dataTableRequest).pipe(map(x => x.data)); } displayLabel(value) { @@ -332,4 +342,8 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements isOptionSelected(profile: any) { return this.formGroup.value.map(x => x.id).indexOf(profile.id) !== -1; } + + public isAuthenticated(): boolean { + return !(!this.authentication.current()); + } } diff --git a/dmp-frontend/src/app/ui/explore-dmp/explore-dmp-listing.component.html b/dmp-frontend/src/app/ui/explore-dmp/explore-dmp-listing.component.html index c27f366de..394cdf4b5 100644 --- a/dmp-frontend/src/app/ui/explore-dmp/explore-dmp-listing.component.html +++ b/dmp-frontend/src/app/ui/explore-dmp/explore-dmp-listing.component.html @@ -14,14 +14,14 @@
-
-
+
+
-
-
- +
+
+
diff --git a/dmp-frontend/src/app/ui/explore-dmp/explore-dmp-listing.component.scss b/dmp-frontend/src/app/ui/explore-dmp/explore-dmp-listing.component.scss index 13d6d81db..d56c694f6 100644 --- a/dmp-frontend/src/app/ui/explore-dmp/explore-dmp-listing.component.scss +++ b/dmp-frontend/src/app/ui/explore-dmp/explore-dmp-listing.component.scss @@ -1,3 +1,16 @@ +@import "node_modules/bootstrap/scss/functions"; +@import "node_modules/bootstrap/scss/variables"; +@import "node_modules/bootstrap/scss/mixins/_breakpoints"; + +@include media-breakpoint-down(sm) { + .lightblue-btn { + font-size: 12px; + } + ::ng-deep .mat-paginator-container { + height: auto !important; + } +} + text-center { text-align: center; } @@ -54,7 +67,8 @@ text-center { } ::ng-deep .mat-paginator-range-actions { - width: 55% !important; + width: auto !important; + min-width: 55% !important; min-height: 43px !important; justify-content: space-between; } diff --git a/dmp-frontend/src/app/ui/explore-dmp/explore-dmp-listing.component.ts b/dmp-frontend/src/app/ui/explore-dmp/explore-dmp-listing.component.ts index 1e32b2e17..b9b735336 100644 --- a/dmp-frontend/src/app/ui/explore-dmp/explore-dmp-listing.component.ts +++ b/dmp-frontend/src/app/ui/explore-dmp/explore-dmp-listing.component.ts @@ -1,5 +1,8 @@ + +import { of as observableOf, Observable } from 'rxjs'; import { Component, OnInit, ViewChild } from "@angular/core"; -import { MatPaginator, MatSort } from "@angular/material"; +import { MatPaginator } from "@angular/material/paginator"; +import { MatSort } from "@angular/material/sort"; import { Router, ActivatedRoute } from "@angular/router"; import { takeUntil } from "rxjs/operators"; import { BaseComponent } from "../../core/common/base/base.component"; @@ -7,7 +10,6 @@ import { DataTableRequest } from "../../core/model/data-table/data-table-request import { DmpListingModel } from "../../core/model/dmp/dmp-listing"; import { ExploreDmpCriteriaModel } from "../../core/query/explore-dmp/explore-dmp-criteria"; import { DmpService } from "../../core/services/dmp/dmp.service"; -import { Observable } from "rxjs"; import { IBreadCrumbComponent } from "../misc/breadcrumb/definition/IBreadCrumbComponent"; import { BreadcrumbItem } from "../misc/breadcrumb/definition/breadcrumb-item"; import { TranslateService } from "@ngx-translate/core"; @@ -19,14 +21,15 @@ import { TranslateService } from "@ngx-translate/core"; }) export class ExploreDmpListingComponent extends BaseComponent implements OnInit, IBreadCrumbComponent { - @ViewChild(MatPaginator) _paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; + @ViewChild(MatPaginator, { static: true }) _paginator: MatPaginator; + sort = new MatSort(); exploreDmpCriteriaModel: ExploreDmpCriteriaModel; titlePrefix: string; totalCount: number; listingItems: DmpListingModel[] = []; breadCrumbs: Observable; + linkToDmpId: string; constructor( private dmpService: DmpService, @@ -35,6 +38,8 @@ export class ExploreDmpListingComponent extends BaseComponent implements OnInit, private language: TranslateService, ) { super(); + this.sort.direction = 'desc'; + this.sort.active = "publishedAt"; } ngOnInit() { @@ -46,7 +51,7 @@ export class ExploreDmpListingComponent extends BaseComponent implements OnInit, label: this.language.instant('NAV-BAR.PUBLIC-DMPS'), url: "/explore-plans" }) - this.breadCrumbs = Observable.of(breadCrumbs); + this.breadCrumbs = observableOf(breadCrumbs); } refresh() { @@ -63,9 +68,6 @@ export class ExploreDmpListingComponent extends BaseComponent implements OnInit, }); } - rowClicked(dmp: DmpListingModel) { - this.router.navigate(['overview', dmp.id], { relativeTo: this.route }); - } getDefaultCriteria(): ExploreDmpCriteriaModel { const defaultCriteria = new ExploreDmpCriteriaModel(); @@ -82,6 +84,10 @@ export class ExploreDmpListingComponent extends BaseComponent implements OnInit, this.refresh(); } + // rowClicked(dmp: DmpListingModel) { + // this.router.navigate(['overview', dmp.id], { relativeTo: this.route }); + // } + // @ViewChild(MatPaginator) _paginator: MatPaginator; // @ViewChild(MatSort) sort: MatSort; // criteria: ExploreDmpCriteriaModel = new ExploreDmpCriteriaModel(); diff --git a/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.html b/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.html index 09001a03f..1668731ed 100644 --- a/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.html +++ b/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.html @@ -1,37 +1,50 @@
-
-
-
- {{dmp.grantAbbreviation}} -
-
-
-
- radio_button_checked -

{{dmp.label}}

-
-
-
-
-

{{dmp.description}}

-
-
-
-
- - - - storage -

{{dmp.datasets.length}}

- - assignment -
-
{{profile.label}}
+ +
+
+
+ {{dmp.grantAbbreviation}} +
+
+
+
+
+ + +
+
+
+
+

{{dmp.label}}

+
+
+
+
+

{{dmp.description}}

+
+
+
+
+ + + + storage +

{{dmp.datasets.length}}

+
+
+ assignment +
+
{{profile.label}}
+
+
+
+

{{'DMP-PROFILE-LISTING.COLUMNS.PUBLISHED' | translate}} {{dmp.finalizedAt | date: "shortDate"}}

+
+
-

{{'DMP-PROFILE-LISTING.COLUMNS.PUBLISHED' | translate}} {{dmp.creationTime | date: "shortDate"}}

-
+
diff --git a/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.scss b/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.scss index 0476c1cea..53f7173c0 100644 --- a/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.scss +++ b/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.scss @@ -22,7 +22,8 @@ } .about-item .length { - color: rgb(70, 135, 240); + color: #00b29f; + // color: #089dbb; } .about-item .title { @@ -45,9 +46,60 @@ color: #aaaaaa; } +.custom-published-icon { + width: 20px; + height: 20px; + border-radius: 50%; + background-color: #08bd6342; + margin-top: 3px; +} + .published-icon { - padding-top: 1px; - color: #92d050; + color: #08bd63; + font-size: 12px; + margin-left: 4px; + padding-bottom: 7px; + // padding-top: 2px; + // padding-left: 4px; + // color: #92d050; +} + +.outer-circle { + background: #08bd6342; + border-radius: 50%; + width: 20px; + height: 20px; + position: relative; + margin-top: 3px; +} + +.inner-circle { + position: absolute; + background: #08bd63; + border-radius: 50%; + height: 10px; + width: 10px; + top: 50%; + left: 50%; + margin: -5px 0px 0px -5px; +} + +h4 { + display: inline; + padding-left: 1em; + line-height: 1.7em; +} + +h4 > span { + text-transform: uppercase; +} + +p { + color: #333333; +} + +.description { + margin-bottom: 0.4em; } // .explore-dmp-listing-item { 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 3539bf743..468b239d6 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 @@ -3,6 +3,7 @@ import { DmpListingModel } from '../../../core/model/dmp/dmp-listing'; 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'; @Component({ selector: 'app-explore-dmp-listing-item-component', @@ -17,15 +18,17 @@ export class ExploreDmpListingItemComponent implements OnInit { constructor( private authentication: AuthService, - private translate: TranslateService + private translate: TranslateService, + private router: Router, + private route: ActivatedRoute ) { } ngOnInit() { } - itemClicked() { - this.onClick.emit(this.dmp); - } + // itemClicked() { + // this.onClick.emit(this.dmp); + // } roleDisplay(value: any) { const principal: Principal = this.authentication.current(); diff --git a/dmp-frontend/src/app/ui/faq/dialog/faq-dialog.component.html b/dmp-frontend/src/app/ui/faq/dialog/faq-dialog.component.html new file mode 100644 index 000000000..cce770206 --- /dev/null +++ b/dmp-frontend/src/app/ui/faq/dialog/faq-dialog.component.html @@ -0,0 +1,16 @@ +
+
+
+ {{'FAQ.TITLE' | translate}} +
+
+ close +
+
+
+ +
+
+
+
+
diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/faq/faq-dialog.component.scss b/dmp-frontend/src/app/ui/faq/dialog/faq-dialog.component.scss similarity index 78% rename from dmp-frontend/src/app/ui/sidebar/sidebar-footer/faq/faq-dialog.component.scss rename to dmp-frontend/src/app/ui/faq/dialog/faq-dialog.component.scss index e2869c014..cf0d57845 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/faq/faq-dialog.component.scss +++ b/dmp-frontend/src/app/ui/faq/dialog/faq-dialog.component.scss @@ -11,3 +11,7 @@ .close-btn { cursor: pointer; } + +.faq { + margin-bottom: 1.125rem; +} diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/faq/faq-dialog.component.ts b/dmp-frontend/src/app/ui/faq/dialog/faq-dialog.component.ts similarity index 78% rename from dmp-frontend/src/app/ui/sidebar/sidebar-footer/faq/faq-dialog.component.ts rename to dmp-frontend/src/app/ui/faq/dialog/faq-dialog.component.ts index 8b680044f..d0ca1f63e 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/faq/faq-dialog.component.ts +++ b/dmp-frontend/src/app/ui/faq/dialog/faq-dialog.component.ts @@ -1,6 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { FormGroup } from '@angular/forms'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; @Component({ selector: 'app-faq-dialog', @@ -9,10 +8,14 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; }) export class FaqDialogComponent { + public isDialog: boolean = false; + constructor( public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: FormGroup - ) { } + @Inject(MAT_DIALOG_DATA) public data: any + ) { + this.isDialog = data.isDialog; + } cancel() { this.dialogRef.close(); diff --git a/dmp-frontend/src/app/ui/faq/faq-content/faq-content.component.html b/dmp-frontend/src/app/ui/faq/faq-content/faq-content.component.html new file mode 100644 index 000000000..a39ef2f82 --- /dev/null +++ b/dmp-frontend/src/app/ui/faq/faq-content/faq-content.component.html @@ -0,0 +1,36 @@ +
+
+
+

{{ 'FAQ.TITLE-DASHED' | translate}}

+
+
+
+
+

What is ARGOS?

+

ARGOS is an open and collaborative platform for creating Data Management Plans according to funders or institutions’ open science policy requirements. ARGOS technology provides solutions and workflows that connect the DMP to the actual data where they are stored and link to other useful information such as publications and funding information, thus enabling the association between research outputs and processes and leading to the creation of coherent/ complete research entities. ARGOS is comprised of two major features: the ARGOS template and the Dataset Description.

+ +
+

Who is it for?

+

ARGOS is inclusive to all researchers and research coordinators who may use the tool to create machine actionable DMPs. Funding and Research Performing Organizations as well as research communities may use the tool and create Dataset Description templates according to their preferences or requirements. ARGOS may be used for purposes other than research projects, such as on the occasion of trainings that familiarise scientists with the data management planning process.

+ +
+

How can I use it?

+

ARGOS is comprised of two main functionalities: DMP templates and Dataset Descriptions. Additional entities are Projects that link to funders and grants information.
ARGOS can be used for: +

A. viewing/ consulting publicly released DMPs and Dataset Descriptions or Projects corresponding to DMPs

+ The tool offers options for publishing DMPs in two modes, private or public. To view public DMPs and Dataset Descriptions, there is no need for login to the platform. + +

B. writing and publishing a DMP

+ The tool helps researchers comply with mandates that may be attached to their grant proposal/ project funding. They can therefore choose from the most suitable to their needs template from the Dataset Descriptions collection and proceed with answering the corresponding questions. Once finalized, researchers can assign a DOI to their DMP, publish and eventually cite it. + +

C. practicing in writing DMPs and Dataset Descriptions

+ Given that Data Management Planning reflects the data management lifecycle and in accordance/ response to the increasing demand of the global scientific/ research community for training in Research Data Management (RDM), ARGOS may be used for educational purposes. Examples may refer to embedding DMP and DMP tools in specific curricula or even utilization of the tool for researchers and students familiarization with the concept and process, as part of library instructions’ sessions. +

+ +
+

What is the difference between the “Wizard” and the “Expert” modes/ features?

+

There are two ways of creating a DMP: the “Wizard” and the “Expert”. The DMP Wizard combines the most necessary fields of the DMP template and the Data Description template. It is an easy way of starting a DMP and completing a Dataset Description. The downside when using the Wizard is that it only supports one Dataset Description. To add more datasets documentation, someone must open the DMP from DMP Expert. +
DMP expert contains extra fields for describing the project, grant, funding, contributors and associations between DMP authors, etc. DMP Expert is advised for use when further modification and personalization is to take place. +

+
+
+
diff --git a/dmp-frontend/src/app/ui/faq/faq-content/faq-content.component.scss b/dmp-frontend/src/app/ui/faq/faq-content/faq-content.component.scss new file mode 100644 index 000000000..ce11947c3 --- /dev/null +++ b/dmp-frontend/src/app/ui/faq/faq-content/faq-content.component.scss @@ -0,0 +1,12 @@ +h1 { + text-align: center; +} + +img { + height: 150px; + width: 100%; +} + +.faq-component { + margin-top: 80px; +} diff --git a/dmp-frontend/src/app/ui/faq/faq-content/faq-content.component.ts b/dmp-frontend/src/app/ui/faq/faq-content/faq-content.component.ts new file mode 100644 index 000000000..179cbc410 --- /dev/null +++ b/dmp-frontend/src/app/ui/faq/faq-content/faq-content.component.ts @@ -0,0 +1,17 @@ +import { Component, OnInit, Input } from '@angular/core'; + +@Component({ + selector: 'app-faq-content', + templateUrl: './faq-content.component.html', + styleUrls: ['./faq-content.component.scss'] +}) +export class FaqContentComponent implements OnInit { + + @Input() isDialog: boolean; + + constructor() { } + + ngOnInit() { + } + +} diff --git a/dmp-frontend/src/app/ui/faq/faq.module.ts b/dmp-frontend/src/app/ui/faq/faq.module.ts new file mode 100644 index 000000000..654c43b93 --- /dev/null +++ b/dmp-frontend/src/app/ui/faq/faq.module.ts @@ -0,0 +1,24 @@ +import { NgModule } from '@angular/core'; +import { CommonUiModule } from '../../common/ui/common-ui.module'; +import { FaqRoutingModule } from './faq.routing'; +import { FaqDialogComponent } from './dialog/faq-dialog.component'; +import { FaqContentComponent } from './faq-content/faq-content.component'; + +@NgModule({ + imports: [ + CommonUiModule, + FaqRoutingModule + ], + declarations: [ + FaqContentComponent, + FaqDialogComponent + ], + entryComponents: [ + FaqContentComponent, + FaqDialogComponent + ], + exports: [ + FaqDialogComponent + ] +}) +export class FaqModule { } diff --git a/dmp-frontend/src/app/ui/faq/faq.routing.ts b/dmp-frontend/src/app/ui/faq/faq.routing.ts new file mode 100644 index 000000000..24793d00a --- /dev/null +++ b/dmp-frontend/src/app/ui/faq/faq.routing.ts @@ -0,0 +1,16 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { FaqContentComponent } from './faq-content/faq-content.component'; + +const routes: Routes = [ + { + path: '', + component: FaqContentComponent, + }, +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class FaqRoutingModule { } diff --git a/dmp-frontend/src/app/ui/glossary/dialog/glossary-dialog.component.html b/dmp-frontend/src/app/ui/glossary/dialog/glossary-dialog.component.html new file mode 100644 index 000000000..674bc6d88 --- /dev/null +++ b/dmp-frontend/src/app/ui/glossary/dialog/glossary-dialog.component.html @@ -0,0 +1,16 @@ +
+
+
+ {{'GLOSSARY.TITLE' | translate}} +
+
+ close +
+
+
+ +
+
+
+
+
diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/glossary/glossary-dialog.component.scss b/dmp-frontend/src/app/ui/glossary/dialog/glossary-dialog.component.scss similarity index 75% rename from dmp-frontend/src/app/ui/sidebar/sidebar-footer/glossary/glossary-dialog.component.scss rename to dmp-frontend/src/app/ui/glossary/dialog/glossary-dialog.component.scss index e2869c014..541a908f9 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/glossary/glossary-dialog.component.scss +++ b/dmp-frontend/src/app/ui/glossary/dialog/glossary-dialog.component.scss @@ -11,3 +11,7 @@ .close-btn { cursor: pointer; } + +.glossary { + margin-bottom: 1.125rem; +} diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/glossary/glossary-dialog.component.ts b/dmp-frontend/src/app/ui/glossary/dialog/glossary-dialog.component.ts similarity index 80% rename from dmp-frontend/src/app/ui/sidebar/sidebar-footer/glossary/glossary-dialog.component.ts rename to dmp-frontend/src/app/ui/glossary/dialog/glossary-dialog.component.ts index b2d7c36e1..976d36ead 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/glossary/glossary-dialog.component.ts +++ b/dmp-frontend/src/app/ui/glossary/dialog/glossary-dialog.component.ts @@ -1,6 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { FormGroup } from '@angular/forms'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; @Component({ selector: 'app-glossary-dialog', @@ -9,10 +8,14 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; }) export class GlossaryDialogComponent { + public isDialog: boolean; + constructor( public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: FormGroup - ) { } + @Inject(MAT_DIALOG_DATA) public data: any + ) { + this.isDialog = data.isDialog; + } cancel() { this.dialogRef.close(); diff --git a/dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.html b/dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.html new file mode 100644 index 000000000..cb6e81d5b --- /dev/null +++ b/dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.html @@ -0,0 +1,24 @@ +
+
+
+

{{ 'GLOSSARY.TITLE-DASHED' | translate}}

+
+
+
+
+

DMP

+

A DMP - short for Data Management Plan - is a document describing the processes that the data have undergone and the tools used for their handling and storage during a research lifecycle. Most importantly, DMPs secure provenance and enable re-use of data by appointing data managers and by including information on how data can be re-used by others in the future. Therefore, a DMP is a living document which is modified according to the data developments of a project before it’s completed and handed over at the end of the project. + Public funders increasingly contain DMPs in their grant proposals or policy funding requirements. A good paradigm is the European Commission demands for the production and delivery of DMPs for projects funded under the Horizon 2020 Funding Programme. On that note, and to encourage good data management practices uptake, many European institutions include DMPs in post-graduate researchers policies and offer relevant support to staff and students. +

+ +

DMP template

+

DMP template contains general but vital information about the name and the duration of the project that the DMP corresponds to, the contributing organisations and individuals as well as the datasets that are under the Dataset Description section. It also offers the possibility of describing datasets other than primary data generated, under “External References” section. A DMP template can have many Dataset Descriptions. +

+ +

Dataset Description

+

Dataset Description documents the management processes of datasets following funder’s or institution’s requirements. A dataset description is essentially a questionnaire template with underlying added value services for interoperability and machine readability of information which is developed based on the given requirements. Management requirements differ from funder to funder and from institution to institution, hence the growing collection of Dataset Descriptions to select from. + Moreover, a Dataset Description links to the documentation of one dataset, hence a DMP template may contain more than one dataset descriptions on the occasion when multiple datasets were used during the project. When documentation of some of the project’s datasets falls under additional requirements (e.g. projects receiving multiple grants from different sources), there is the possibility of describing datasets with more than one Dataset Description template. +

+
+
+
diff --git a/dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.scss b/dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.scss new file mode 100644 index 000000000..035ab5f7a --- /dev/null +++ b/dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.scss @@ -0,0 +1,12 @@ +h1 { + text-align: center; +} + +img { + height: 150px; + width: 100%; +} + +.glossary-component { + margin-top: 80px; +} diff --git a/dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.ts b/dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.ts new file mode 100644 index 000000000..7eb9ef04b --- /dev/null +++ b/dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.ts @@ -0,0 +1,17 @@ +import { Component, OnInit, Input } from '@angular/core'; + +@Component({ + selector: 'app-glossary-content', + templateUrl: './glossary-content.component.html', + styleUrls: ['./glossary-content.component.scss'] +}) +export class GlossaryContentComponent implements OnInit { + + @Input() isDialog: boolean; + + constructor() { } + + ngOnInit() { + } + +} diff --git a/dmp-frontend/src/app/ui/glossary/glossary.module.ts b/dmp-frontend/src/app/ui/glossary/glossary.module.ts new file mode 100644 index 000000000..07cf5d1a6 --- /dev/null +++ b/dmp-frontend/src/app/ui/glossary/glossary.module.ts @@ -0,0 +1,24 @@ +import { NgModule } from '@angular/core'; +import { GlossaryRoutingModule } from './glossary.routing'; +import { GlossaryContentComponent } from './glossary-content/glossary-content.component'; +import { GlossaryDialogComponent } from './dialog/glossary-dialog.component'; +import { CommonUiModule } from '../../common/ui/common-ui.module'; + +@NgModule({ + imports: [ + CommonUiModule, + GlossaryRoutingModule + ], + declarations: [ + GlossaryContentComponent, + GlossaryDialogComponent + ], + entryComponents: [ + GlossaryContentComponent, + GlossaryDialogComponent + ], + exports: [ + GlossaryDialogComponent + ] +}) +export class GlossaryModule { } diff --git a/dmp-frontend/src/app/ui/glossary/glossary.routing.ts b/dmp-frontend/src/app/ui/glossary/glossary.routing.ts new file mode 100644 index 000000000..cbcc962e9 --- /dev/null +++ b/dmp-frontend/src/app/ui/glossary/glossary.routing.ts @@ -0,0 +1,16 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { GlossaryContentComponent } from './glossary-content/glossary-content.component'; + +const routes: Routes = [ + { + path: '', + component: GlossaryContentComponent, + }, +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class GlossaryRoutingModule { } diff --git a/dmp-frontend/src/app/ui/grant/editor/grant-editor.component.ts b/dmp-frontend/src/app/ui/grant/editor/grant-editor.component.ts index a893eb3d7..6011e48a9 100644 --- a/dmp-frontend/src/app/ui/grant/editor/grant-editor.component.ts +++ b/dmp-frontend/src/app/ui/grant/editor/grant-editor.component.ts @@ -1,10 +1,13 @@ + +import {of as observableOf, Observable } from 'rxjs'; + +import {map, takeUntil } from 'rxjs/operators'; import { Component, OnInit } from '@angular/core'; import { AbstractControl, FormArray, FormControl, FormGroup } from '@angular/forms'; -import { MatDialog, MatSnackBar } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { Observable } from 'rxjs'; -import { takeUntil } from 'rxjs/operators'; import { environment } from '../../../../environments/environment'; import { ValidationErrorModel } from '../../../common/forms/validation/error-model/validation-error-model'; import { BaseComponent } from '../../../core/common/base/base.component'; @@ -13,7 +16,6 @@ import { GrantListingModel } from '../../../core/model/grant/grant-listing'; import { GrantFileUploadService } from '../../../core/services/grant/grant-file-upload.service'; import { GrantService } from '../../../core/services/grant/grant.service'; import { ConfirmationDialogComponent } from '../../../library/confirmation-dialog/confirmation-dialog.component'; -import { SnackBarNotificationComponent } from '../../../library/notification/snack-bar/snack-bar-notification.component'; import { BreadcrumbItem } from '../../misc/breadcrumb/definition/breadcrumb-item'; import { IBreadCrumbComponent } from '../../misc/breadcrumb/definition/IBreadCrumbComponent'; import { GrantEditorModel } from './grant-editor.model'; @@ -26,7 +28,7 @@ import { SnackBarNotificationLevel, UiNotificationService } from '../../../core/ }) export class GrantEditorComponent extends BaseComponent implements OnInit, IBreadCrumbComponent { - breadCrumbs: Observable = Observable.of([]); + breadCrumbs: Observable = observableOf([]); isNew = true; grant: GrantEditorModel; formGroup: FormGroup = null; @@ -55,7 +57,7 @@ export class GrantEditorComponent extends BaseComponent implements OnInit, IBrea if (itemId != null) { this.isNew = false; - this.grantService.getSingle(itemId).map(data => data as GrantListingModel) + this.grantService.getSingle(itemId).pipe(map(data => data as GrantListingModel)) .pipe(takeUntil(this._destroyed)) .subscribe(data => { this.grant = new GrantEditorModel().fromModel(data); @@ -71,11 +73,11 @@ export class GrantEditorComponent extends BaseComponent implements OnInit, IBrea label: this.grant.label, url: '/grants/edit/' + this.grant.id }); - this.breadCrumbs = Observable.of(breadCrumbs); + this.breadCrumbs = observableOf(breadCrumbs); }); } else { this.language.get('QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.CREATE-NEW-GRANT').pipe(takeUntil(this._destroyed)).subscribe(x => { - this.breadCrumbs = Observable.of([ + this.breadCrumbs = observableOf([ { parentComponentName: null, label: this.language.instant('NAV-BAR.GRANTS').toUpperCase(), @@ -139,6 +141,7 @@ export class GrantEditorComponent extends BaseComponent implements OnInit, IBrea public delete(): void { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { maxWidth: '300px', + restoreFocus: false, data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.DELETE-ITEM'), confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CONFIRM'), diff --git a/dmp-frontend/src/app/ui/grant/grant.routing.ts b/dmp-frontend/src/app/ui/grant/grant.routing.ts index 95808665c..9c715987d 100644 --- a/dmp-frontend/src/app/ui/grant/grant.routing.ts +++ b/dmp-frontend/src/app/ui/grant/grant.routing.ts @@ -3,30 +3,31 @@ import { RouterModule, Routes } from '@angular/router'; import { GrantEditorComponent } from './editor/grant-editor.component'; import { GrantListingComponent } from './listing/grant-listing.component'; +// ----------- UNCOMMENT TO ADD AGAIN GRANTS -------- const routes: Routes = [ - { - path: '', - component: GrantListingComponent, - data: { - breadcrumb: true - }, - }, - { - path: 'edit/:id', - component: GrantEditorComponent, - data: { - breadcrumb: true, - title: 'GENERAL.TITLES.GRANT-EDIT' - } - }, - { - path: 'new', - component: GrantEditorComponent, - data: { - breadcrumb: true, - title: 'GENERAL.TITLES.GRANT-NEW' - }, - } + // { + // path: '', + // component: GrantListingComponent, + // data: { + // breadcrumb: true + // }, + // }, + // { + // path: 'edit/:id', + // component: GrantEditorComponent, + // data: { + // breadcrumb: true, + // title: 'GENERAL.TITLES.GRANT-EDIT' + // } + // }, + // { + // path: 'new', + // component: GrantEditorComponent, + // data: { + // breadcrumb: true, + // title: 'GENERAL.TITLES.GRANT-NEW' + // }, + // } ]; @NgModule({ diff --git a/dmp-frontend/src/app/ui/grant/listing/criteria/grant-criteria.component.scss b/dmp-frontend/src/app/ui/grant/listing/criteria/grant-criteria.component.scss index eea90799c..107230090 100644 --- a/dmp-frontend/src/app/ui/grant/listing/criteria/grant-criteria.component.scss +++ b/dmp-frontend/src/app/ui/grant/listing/criteria/grant-criteria.component.scss @@ -27,7 +27,8 @@ } .category-title { - color: #2e75b6; + color: black; + // color: #089dbb; margin-top: 8px; margin-bottom: 12px; } @@ -44,7 +45,7 @@ .filters-title { width: 90px; - color: #2e75b6; + color: #089dbb; background-color: white; padding: 0px 20px; margin-top: -10px; @@ -56,26 +57,26 @@ color: #adadad; } - ::ng-deep .mat-checkbox-inner-container { - background: white; - } - - ::ng-deep .mat-focused .mat-form-field-label { - color: #2e75b6 !important; - } - - ::ng-deep.mat-form-field-underline { - background-color: #adadad; - } - - ::ng-deep.mat-form-field-ripple { - background-color: #2e75b6 !important; - } - -// ::ng-deep .mat-checkbox { -// background-color: #f6f6f6 !important; +// ::ng-deep .mat-checkbox-inner-container { +// background: white; // } +// ::ng-deep .mat-focused .mat-form-field-label { +// color: #00b29f !important; +// } + +// ::ng-deep.mat-form-field-underline { +// background-color: #adadad; +// } + +// ::ng-deep.mat-form-field-ripple { +// background-color: #00b29f !important; +// } + + ::ng-deep .mat-checkbox { + background-color: #f6f6f6 !important; + } + ::ng-deep .mat-checkbox .mat-checkbox-frame { border: 1px solid #aaaaaa; } @@ -86,7 +87,7 @@ .mat-accent .mat-pseudo-checkbox-indeterminate, .mat-pseudo-checkbox-checked, .mat-pseudo-checkbox-indeterminate { - background-color: #2e75b6; + background-color: #00b29f; } ::ng-deep .mat-ripple-element { @@ -103,12 +104,15 @@ } ::ng-deep .mat-radio-button.mat-accent.mat-radio-checked .mat-radio-outer-circle { - border-color: #2e75b6; + border-color: #777777; + // border-color: #00b29f; } ::ng-deep .mat-radio-button.mat-accent .mat-radio-inner-circle { - color: #2e75b6; - background-color: #2e75b6; + color: #777777; + background-color: #777777; + // color: #00b29f; + // background-color: #00b29f; } .mat-radio-button.mat-accent .mat-radio-ripple .mat-ripple-element { diff --git a/dmp-frontend/src/app/ui/grant/listing/criteria/grant-criteria.component.ts b/dmp-frontend/src/app/ui/grant/listing/criteria/grant-criteria.component.ts index 2e6906705..7f960926a 100644 --- a/dmp-frontend/src/app/ui/grant/listing/criteria/grant-criteria.component.ts +++ b/dmp-frontend/src/app/ui/grant/listing/criteria/grant-criteria.component.ts @@ -5,7 +5,7 @@ import { ValidationErrorModel } from '../../../../common/forms/validation/error- import { GrantStateType } from '../../../../core/common/enum/grant-state-type'; import { GrantCriteria } from '../../../../core/query/grant/grant-criteria'; import { BaseCriteriaComponent } from '../../../misc/criteria/base-criteria.component'; -import { ErrorStateMatcher } from '@angular/material'; +import { ErrorStateMatcher } from '@angular/material/core'; @Component({ selector: 'app-grant-criteria-component', diff --git a/dmp-frontend/src/app/ui/grant/listing/grant-listing.component.ts b/dmp-frontend/src/app/ui/grant/listing/grant-listing.component.ts index 966bbb642..75716efba 100644 --- a/dmp-frontend/src/app/ui/grant/listing/grant-listing.component.ts +++ b/dmp-frontend/src/app/ui/grant/listing/grant-listing.component.ts @@ -1,7 +1,9 @@ + +import {of as observableOf, Observable } from 'rxjs'; import { Component, OnInit, ViewChild } from '@angular/core'; -import { MatPaginator, MatSort } from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import { Router, ActivatedRoute, Params } from '@angular/router'; -import { Observable } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../core/common/base/base.component'; import { DataTableRequest } from '../../../core/model/data-table/data-table-request'; @@ -20,9 +22,9 @@ import { TranslateService } from '@ngx-translate/core'; }) export class GrantListingComponent extends BaseComponent implements OnInit, IBreadCrumbComponent { - @ViewChild(MatPaginator) _paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; - @ViewChild(GrantCriteriaComponent) criteria: GrantCriteriaComponent; + @ViewChild(MatPaginator, { static: true }) _paginator: MatPaginator; + @ViewChild(MatSort, { static: false }) sort: MatSort; + @ViewChild(GrantCriteriaComponent, { static: true }) criteria: GrantCriteriaComponent; breadCrumbs: Observable; totalCount: number; @@ -43,7 +45,7 @@ export class GrantListingComponent extends BaseComponent implements OnInit, IBre this.refresh(); this.criteria.setRefreshCallback((resetPages) => this.refresh(resetPages)); - this.breadCrumbs = Observable.of([{ + this.breadCrumbs = observableOf([{ parentComponentName: null, label: this.language.instant('NAV-BAR.GRANTS').toUpperCase(), url: '/grants' diff --git a/dmp-frontend/src/app/ui/misc/breadcrumb/breadcrumb.component.scss b/dmp-frontend/src/app/ui/misc/breadcrumb/breadcrumb.component.scss index c80112f1a..543dc4cc3 100644 --- a/dmp-frontend/src/app/ui/misc/breadcrumb/breadcrumb.component.scss +++ b/dmp-frontend/src/app/ui/misc/breadcrumb/breadcrumb.component.scss @@ -44,7 +44,7 @@ } .active { - color: #4687f0; + color: #00b29f; } .icon { diff --git a/dmp-frontend/src/app/ui/misc/breadcrumb/breadcrumb.component.ts b/dmp-frontend/src/app/ui/misc/breadcrumb/breadcrumb.component.ts index c0cff89a4..b84757738 100644 --- a/dmp-frontend/src/app/ui/misc/breadcrumb/breadcrumb.component.ts +++ b/dmp-frontend/src/app/ui/misc/breadcrumb/breadcrumb.component.ts @@ -1,6 +1,9 @@ + +import {of as observableOf, Observable } from 'rxjs'; + +import {filter, mergeMap, distinctUntilChanged, map} from 'rxjs/operators'; import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; -import { Observable } from 'rxjs'; import { BreadcrumbItem } from './definition/breadcrumb-item'; import { BreadCrumbResolverService } from './service/breadcrumb.service'; import { TranslateService } from '@ngx-translate/core'; @@ -11,10 +14,10 @@ import { TranslateService } from '@ngx-translate/core'; styleUrls: ['./breadcrumb.component.scss'] }) export class BreadcrumbComponent implements OnInit { - breadcrumbs$ = this.router.events - .filter(event => event instanceof NavigationEnd) - .distinctUntilChanged() - .flatMap(event => this.buildBreadCrumb(this.activatedRoute.root)); + breadcrumbs$ = this.router.events.pipe( + filter(event => event instanceof NavigationEnd), + distinctUntilChanged(), + mergeMap(event => this.buildBreadCrumb(this.activatedRoute.root)),); constructor( @@ -30,15 +33,15 @@ export class BreadcrumbComponent implements OnInit { buildBreadCrumb(route: ActivatedRoute): Observable { if (this.breadCrumbService.resolve(route)) { - return this.breadCrumbService.resolve(route).map(x => { + return this.breadCrumbService.resolve(route).pipe(map(x => { x.unshift({ label: this.language.instant('NAV-BAR.HOME'), url: '/home', icon: 'dashboard' }); return x; - }); + })); } - return Observable.of([]); + return observableOf([]); } navigate(url, params) { diff --git a/dmp-frontend/src/app/ui/misc/breadcrumb/service/breadcrumb.service.ts b/dmp-frontend/src/app/ui/misc/breadcrumb/service/breadcrumb.service.ts index ed6071b93..184a50a6a 100644 --- a/dmp-frontend/src/app/ui/misc/breadcrumb/service/breadcrumb.service.ts +++ b/dmp-frontend/src/app/ui/misc/breadcrumb/service/breadcrumb.service.ts @@ -1,6 +1,7 @@ + +import {of as observableOf, Observable } from 'rxjs'; import { Injectable, NgZone } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { Observable } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { BaseService } from '../../../../core/common/base/base.service'; import { BreadcrumbItem } from '../definition/breadcrumb-item'; @@ -11,7 +12,7 @@ export class BreadCrumbResolverService extends BaseService { private activeComponents = []; private parentComponents = []; - private breadCrumbs: Observable = Observable.of([]); + private breadCrumbs: Observable = observableOf([]); constructor( private router: Router, private zone: NgZone @@ -25,7 +26,7 @@ export class BreadCrumbResolverService extends BaseService { public clear() { this.activeComponents.length = 0; - this.breadCrumbs = Observable.of([]); + this.breadCrumbs = observableOf([]); } public resolve(activatedRoute: ActivatedRoute): Observable { @@ -34,7 +35,7 @@ export class BreadCrumbResolverService extends BaseService { this.activeComponents.filter(x => routeComponents.indexOf(x.constructor.name) !== -1).forEach(x => { if (x.hasOwnProperty('breadCrumbs')) { const componentItems = this.resolveDependentComponents((x).breadCrumbs, []); - this.breadCrumbs = Observable.of(componentItems); + this.breadCrumbs = observableOf(componentItems); } }); return this.breadCrumbs; diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.html b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.html index 2f675c6dd..50d76924d 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.html +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.html @@ -1,10 +1,8 @@ -
+
-
+
-
+
{{form.get('numbering').value}} {{form.get('title').value}}
- - +
+
+ +
+ +
+
+
-
+
@@ -52,7 +60,7 @@
-
diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.scss b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.scss index 80e23cb0a..c1b1aa04a 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.scss +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.scss @@ -1,20 +1,24 @@ .dynamic-form-section { - .expansion-panel { - background-color: #eeeeee54; - margin-bottom: 1em; - } - .addOneFieldButton { - margin-top: -15px; - margin-left: -11px; - } + .expansion-panel { + background-color: #eeeeee54; + margin-bottom: 1em; + } + .addOneFieldButton { + margin-top: -15px; + margin-left: -11px; + } } -.styleBorder{ - border: 0.2em solid lightgray; - border-radius: 0.5em; - margin-bottom: 0.5em; +.styleBorder { + border: 0.2em solid lightgray; + border-radius: 0.5em; + margin-bottom: 0.5em; } -.mat-expansion-panel-header-description{ - padding-bottom: 18px; - color: black; +.mat-expansion-panel-header-description { + padding-bottom: 18px; + color: black; } +::ng-deep .mat-expansion-panel-header { + height: auto !important; + min-height: 48px; +} diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.ts b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.ts index 2d17c1c31..17bcc6596 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.ts +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.ts @@ -1,23 +1,29 @@ -import { AfterViewInit, Component, Input, OnInit } from '@angular/core'; +import { AfterViewInit, Component, Input, OnInit, OnChanges, SimpleChanges } from '@angular/core'; import { FormGroup, FormArray, AbstractControl } from '@angular/forms'; import { FormFocusService } from '../../form-focus/form-focus.service'; import { VisibilityRulesService } from '../../visibility-rules/visibility-rules.service'; import { DatasetDescriptionSectionEditorModel, DatasetDescriptionCompositeFieldEditorModel } from '../../dataset-description-form.model'; import { FormCompositeFieldComponent } from '../form-composite-field/form-composite-field.component'; +import { LinkToScroll } from '../../tableOfContentsMaterial/table-of-contents'; @Component({ selector: 'app-form-section', templateUrl: './form-section.component.html', styleUrls: ['./form-section.component.scss'] }) -export class FormSectionComponent implements OnInit { +export class FormSectionComponent implements OnInit, OnChanges { //@Input() section: DatasetDescriptionSectionEditorModel; @Input() datasetProfileId: String; @Input() form: FormGroup; @Input() pathName: string; @Input() path: string; + @Input() linkToScroll: LinkToScroll; //trackByFn = (index, item) => item ? item['id'] : null; + panelExpanded = true; + // sub = true; + subsectionLinkToScroll: LinkToScroll; + constructor( public visibilityRulesService: VisibilityRulesService, private formFocusService: FormFocusService @@ -29,6 +35,21 @@ export class FormSectionComponent implements OnInit { // } } + ngOnChanges(changes: SimpleChanges) { + + if (changes['linkToScroll']) { + if (changes['linkToScroll'].currentValue && changes['linkToScroll'].currentValue.section) { + + if (this.pathName === changes['linkToScroll'].currentValue.section) { + this.panelExpanded = true; + } else if (changes['linkToScroll'].currentValue.section.includes(this.pathName)) { + this.subsectionLinkToScroll = changes['linkToScroll'].currentValue; + this.panelExpanded = true; + } + } + } + } + // ngAfterViewInit() { // this.visibilityRulesService.triggerVisibilityEvaluation(); // } @@ -39,6 +60,12 @@ export class FormSectionComponent implements OnInit { ((this.form.get('compositeFields').get('' + fieldsetIndex).get('multiplicityItems'))).push(compositeField.buildForm()); } + deleteCompositeFieldFormGroup(compositeFildIndex: number) { + const firstMultiplicityItem = this.form.get('compositeFields').get('' + compositeFildIndex).get('multiplicityItems').get('' + 0).get('fields').get('' + 0).value; + this.form.get('compositeFields').get('' + compositeFildIndex).get('fields').get('' + 0).patchValue(firstMultiplicityItem); + ((this.form.get('compositeFields').get('' + compositeFildIndex).get('multiplicityItems'))).removeAt(0); + } + deleteMultipeFieldFromCompositeFormGroup(compositeFildIndex: number, fildIndex: number) { ((this.form.get('compositeFields').get('' + compositeFildIndex).get('multiplicityItems'))).removeAt(fildIndex); } diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.html b/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.html index 4780ce4c1..810d19280 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.html +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.html @@ -1,21 +1,22 @@ -
-
- - -
- -
-
- - {{pageFormGroup.get('title').value}} - + + +
+
+
+ +
+
+ + {{pageFormGroup.get('title').value}} +
- -
- + +
+ +
-
- + +
diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.scss b/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.scss index 6bedcb460..65de16db2 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.scss +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.scss @@ -1,66 +1,16 @@ +@media (max-width: 768px) { + .dynamic-form-editor { + .form-container { + padding: 0px; + } + } +} + +.form-container { +} + .dynamic-form-editor { mat-vertical-stepper { background-color: #ffffff; } } - -// .ng-sidebar { -// width: 40%; -// } - -// /* .toc-container { -// background: #f9f9f9 none repeat scroll 0 0; -// border: 1px solid #aaa; -// display: table; -// font-size: 95%; -// margin-bottom: 1em; -// padding: 20px; -// width: 100%; -// } */ - -// .ui-steps .ui-steps-item { -// min-width: 10%; -// } - -// .dynamic-form-editor { -// // background-color: #e0e0e0; -// // min-height: 80vh; -// mat-vertical-stepper { -// background-color: #e0e0e0; -// } -// } - -// .ng-sidebar-container { -// overflow: inherit !important; - -// } - -// /* .ng-sidebar__content { -// overflow: inherit !important; -// } */ - -// .alignment-center{ -// text-align: center; -// } - - -// .demo-progress-bar-container { - -// width: 100%; - - -// } - -// .form-progress-bar { - -// margin: 20px 0; - -// } - -// .full-width{ -// width:100%; -// } - -// .full-height{ -// height:100%; -// } diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.ts b/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.ts index 0b873b888..d20672e07 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.ts +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.ts @@ -1,17 +1,9 @@ -import { AfterViewInit, Component, Input, OnInit, ViewChild } from '@angular/core'; +import { AfterViewInit, Component, Input, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatStepper } from '@angular/material'; -import { ActivatedRoute, Router } from '@angular/router'; -import 'rxjs/add/operator/switchMap'; -import { takeUntil } from 'rxjs/operators'; -import { Pair } from '../../../common/types/pair'; +import { MatHorizontalStepper } from '@angular/material/stepper'; import { BaseComponent } from '../../../core/common/base/base.component'; -import { CompositeField } from '../../../core/model/dataset-profile-definition/composite-field'; -import { DatasetProfileDefinitionModel } from '../../../core/model/dataset-profile-definition/dataset-profile-definition'; import { Rule } from '../../../core/model/dataset-profile-definition/rule'; -import { Section } from '../../../core/model/dataset-profile-definition/section'; -import { DatasetDescriptionFormEditorModel } from './dataset-description-form.model'; -import { FormFocusService } from './form-focus/form-focus.service'; +import { LinkToScroll } from './tableOfContentsMaterial/table-of-contents'; import { VisibilityRulesService } from './visibility-rules/visibility-rules.service'; @Component({ @@ -19,107 +11,38 @@ import { VisibilityRulesService } from './visibility-rules/visibility-rules.serv templateUrl: './dataset-description-form.component.html', styleUrls: ['./dataset-description-form.component.scss'] }) -export class DatasetDescriptionFormComponent extends BaseComponent implements OnInit, AfterViewInit { +export class DatasetDescriptionFormComponent extends BaseComponent implements OnInit, AfterViewInit, OnChanges { - // pathName: string; - // pages: Array; - // activeStepperIndex = 1; - // visibleSidebar = false; - // datasetProfileDefinitionModel: DatasetDescriptionFormEditorModel; - // private currentPageIndex = 0; - // @ViewChild('stepper') stepper: MatStepper; - - // //@Input() dataModel: DatasetProfileDefinitionModel; + @ViewChild('stepper', { static: false }) stepper: MatHorizontalStepper; @Input() path: string; @Input() form: FormGroup; @Input() visibilityRules: Rule[] = []; - // id: string; - // trackByFn = (index, item) => item ? item['id'] : null; - // pageTrackByFn = (index, item) => item['id']; @Input() datasetProfileId: String; - + @Input() linkToScroll: LinkToScroll; constructor( - private router: Router, - private route: ActivatedRoute, private visibilityRulesService: VisibilityRulesService, - private formFocusService: FormFocusService ) { super(); - //this.datasetId = route.snapshot.params['id']; } - // getSubForm(subformName) { - // return this.form.controls[subformName]; - // } - ngOnInit() { - - // this.visibilityRulesService.formGroup = this.form; this.visibilityRulesService.buildVisibilityRules(this.visibilityRules, this.form); - // this.datasetProfileDefinitionModel = new DatasetDescriptionFormEditorModel().fromModel(this.dataModel); - // this.visibilityRulesService.setModel(this.datasetProfileDefinitionModel); + } - // this.createPagination(); + ngOnChanges(changes: SimpleChanges) { - // const sections: Pair[] = this.datasetProfileDefinitionModel.pages.map(page => new Pair(page.sections, page.ordinal)).filter(x => x); - // const compositeFields: Pair[] = sections.map(section => new Pair(section.left.flatMap(sec => sec.compositeFields), section.right)).filter(x => x); - // const nestedSections: Pair[] = sections.map(section => new Pair(section.left.flatMap(x => x.sections), section.right)).filter(x => x); - // const nestedCompositeFields: Pair[] = nestedSections.map(section => new Pair(section.left.flatMap(x => x.compositeFields), section.right)).filter(x => x); - // const compositeFieldsUnion: Pair[] = compositeFields.concat(nestedCompositeFields); - - //const fields = compositeFieldsUnion.flatJoinOn(x => x.right); - //this.formFocusService.setFields(compositeFieldsUnion); - // this.route.fragment - // .pipe(takeUntil(this._destroyed)) - // .subscribe((fragment: string) => { - // const self = this; - // setTimeout(function () { self.scrollTo(fragment); }); - // }); + // When the form is changed set stepper index to 0. + if (this.stepper && changes['form'] && !changes['form'].isFirstChange()) { + this.stepper.selectedIndex = 0; + } else if (this.stepper && changes['linkToScroll'] && changes['linkToScroll'].currentValue) { + if (changes['linkToScroll'].currentValue.page >= 0) { + this.stepper.selectedIndex = changes['linkToScroll'].currentValue.page; + } + } } ngAfterViewInit() { - //this.visibilityRulesService.triggerVisibilityEvaluation(); - // this.route.queryParams - // .pipe(takeUntil(this._destroyed)) - // .subscribe((params) => { - // if (params && 'page' in params) { - // this.changeCurrentPage(params['page']); - // } - // }); + } - - - // toggleSidebar() { - // this.visibleSidebar = !this.visibleSidebar; - // } - - // shouldDisplaySection(section: Section): Boolean { - // return (section.page) === this.currentPageIndex; - // } - - // createPagination() { - - // } - - // changePageIndex(index: any) { - // this.router.navigate([this.route.snapshot.url[0] + '/' + this.route.snapshot.url[1]], { queryParams: { page: this.pages[index - 1] } }); - // } - - // scrollTo(sectionID: string) { - // if (!sectionID) { return; } - // const element = document.querySelector('#' + sectionID); - // if (!element) { return; } - // element.scrollIntoView(); - // this.visibleSidebar = true; - // } - - // changeCurrentPage(pageString: string) { - // //if (!pageString) { return; } - // const page = parseInt(pageString); - // /*if (isNaN(page)) { return; } - // const pageIndex = this.pages.indexOf(page); - // if (pageIndex === -1) { return; }*/ - // this.stepper.selectedIndex = page; - // } } diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.module.ts b/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.module.ts index fa3f68655..ef078ce38 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.module.ts +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.module.ts @@ -1,4 +1,5 @@ import { NgModule } from '@angular/core'; +import { AngularStickyThingsModule } from '@w11k/angular-sticky-things'; import { CommonFormsModule } from '../../../common/forms/common-forms.module'; import { CommonUiModule } from '../../../common/ui/common-ui.module'; import { AutoCompleteModule } from '../../../library/auto-complete/auto-complete.module'; @@ -8,13 +9,16 @@ import { FormProgressIndicationComponent } from './components/form-progress-indi import { FormSectionComponent } from './components/form-section/form-section.component'; import { DatasetDescriptionFormComponent } from './dataset-description-form.component'; import { FormFocusService } from './form-focus/form-focus.service'; +import { TableOfContentsModule } from './tableOfContentsMaterial/table-of-contents.module'; import { VisibilityRulesService } from './visibility-rules/visibility-rules.service'; @NgModule({ imports: [ CommonUiModule, CommonFormsModule, - AutoCompleteModule + AutoCompleteModule, + // TableOfContentsModule, + // AngularStickyThingsModule ], declarations: [ DatasetDescriptionFormComponent, diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/tableOfContentsMaterial/table-of-contents.html b/dmp-frontend/src/app/ui/misc/dataset-description-form/tableOfContentsMaterial/table-of-contents.html new file mode 100644 index 000000000..fa0ce0a4a --- /dev/null +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/tableOfContentsMaterial/table-of-contents.html @@ -0,0 +1,11 @@ +
+
Contents
+ + +
+ + {{link.name}} + + +
+
diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/tableOfContentsMaterial/table-of-contents.module.ts b/dmp-frontend/src/app/ui/misc/dataset-description-form/tableOfContentsMaterial/table-of-contents.module.ts new file mode 100644 index 000000000..b28ec7804 --- /dev/null +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/tableOfContentsMaterial/table-of-contents.module.ts @@ -0,0 +1,12 @@ +import {CommonModule} from '@angular/common'; +import {NgModule} from '@angular/core'; +import {TableOfContents} from './table-of-contents'; +import {RouterModule} from '@angular/router'; + +@NgModule({ + imports: [CommonModule, RouterModule], + declarations: [TableOfContents], + exports: [TableOfContents], + entryComponents: [TableOfContents], +}) +export class TableOfContentsModule { } diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/tableOfContentsMaterial/table-of-contents.scss b/dmp-frontend/src/app/ui/misc/dataset-description-form/tableOfContentsMaterial/table-of-contents.scss new file mode 100644 index 000000000..b3c4e796e --- /dev/null +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/tableOfContentsMaterial/table-of-contents.scss @@ -0,0 +1,50 @@ +.docs-toc-container { + width: 100%; + padding: 5px 0 10px 10px; + cursor: pointer; + border-left: solid 4px #0c7489; + + .scroll-container { + overflow-y: auto; + // calc(100vh - 250px) + height: calc(100vh - 250px); + } + + .docs-link { + color: rgba(0, 0, 0, 0.54); + // color: mat-color($app-blue-theme-foreground, secondary-text); + transition: color 100ms; + + &:hover, + &.docs-active { + color: #0c7489; + // color: mat-color($primary, if($is-dark-theme, 200, default)); + } + } +} + +.docs-toc-heading { + margin: 0; + padding: 0; + font-size: 13px; + font-weight: bold; +} + +span { + line-height: 16px; + margin: 8px 0 0; + position: relative; + text-decoration: none; + display: block; + text-overflow: ellipsis !important; + overflow: hidden; + color: rgba(0, 0, 0, 0.54); +} + +.docs-level-mat-expansion-panel { + margin-left: 12px; +} + +.docs-level-h5 { + margin-left: 24px; +} diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/tableOfContentsMaterial/table-of-contents.ts b/dmp-frontend/src/app/ui/misc/dataset-description-form/tableOfContentsMaterial/table-of-contents.ts new file mode 100644 index 000000000..4c399bee2 --- /dev/null +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/tableOfContentsMaterial/table-of-contents.ts @@ -0,0 +1,116 @@ +import { DOCUMENT } from '@angular/common'; +import { Component, ElementRef, EventEmitter, Inject, OnInit, Output } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { interval, Subject, Subscription } from 'rxjs'; +import { distinctUntilChanged } from 'rxjs/operators'; +import { BaseComponent } from '../../../../core/common/base/base.component'; + +interface Link { + /* id of the section*/ + id: string; + /* header type h3/h4 */ + type: string; + /* If the anchor is in view of the page */ + active: boolean; + /* name of the anchor */ + name: string; + /* top offset px of the anchor */ + top: number; + page: number; + section: number; +} + +@Component({ + selector: 'table-of-contents', + styleUrls: ['./table-of-contents.scss'], + templateUrl: './table-of-contents.html' +}) +export class TableOfContents extends BaseComponent implements OnInit { + + links: Link[] = []; + container: string; + headerSelectors = '.toc-page-header, .toc-section-header, .toc-copositeField-header'; + @Output() stepFound = new EventEmitter(); + subscription: Subscription; + linksSubject: Subject = new Subject(); + + constructor( + @Inject(DOCUMENT) private _document: Document) { + super(); + } + + + ngOnInit(): void { + //emit value every 500ms + const source = interval(500); + this.subscription = source.subscribe(val => { + const headers = Array.from(this._document.querySelectorAll(this.headerSelectors)) as HTMLElement[]; + this.linksSubject.next(headers); + }); + + this.linksSubject.asObservable() + .pipe(distinctUntilChanged((p: HTMLElement[], q: HTMLElement[]) => JSON.stringify(p) == JSON.stringify(q))) + .subscribe(headers => { + const links: Array = []; + + if (headers.length) { + let page; + let section; + for (const header of headers) { + let name; + let id; + if (header.classList.contains('toc-page-header')) { + name = header.innerText.trim().replace(/^link/, ''); + id = header.id; + page = header.id.split('_')[1]; + section = undefined; + } else if (header.classList.contains('toc-section-header')) { + name = header.childNodes[0].childNodes[0].childNodes[0].childNodes[0].childNodes[0].nodeValue.trim().replace(/^link/, ''); + id = header.id; + page = header.id.split('.')[1]; + section = header.id; + } else if (header.classList.contains('toc-copositeField-header')) { + name = (header.childNodes[0]).nodeValue.trim().replace(/^link/, ''); + id = header.id; + // id = header.parentElement.parentElement.parentElement.id; + } + const { top } = header.getBoundingClientRect(); + links.push({ + name, + id, + type: header.tagName.toLowerCase(), + top: top, + active: false, + page: page, + section: section + }); + } + } + this.links = links; + }) + } + + goToStep(link: Link) { + // this.selectedLinkId = link.id; + this.stepFound.emit({ + page: link.page, + section: link.section + }); + + setTimeout(() => { + const target = document.getElementById(link.id); + target.scrollIntoView(true); + + var scrolledY = window.scrollY; + if (scrolledY) { + window.scroll(0, scrolledY - 70); + } + }, 500); + } + +} + +export interface LinkToScroll { + page: number; + section: number; +} diff --git a/dmp-frontend/src/app/ui/misc/help-content/help-content.component.ts b/dmp-frontend/src/app/ui/misc/help-content/help-content.component.ts index bb566812a..fa4aa9f41 100644 --- a/dmp-frontend/src/app/ui/misc/help-content/help-content.component.ts +++ b/dmp-frontend/src/app/ui/misc/help-content/help-content.component.ts @@ -32,11 +32,11 @@ export class HelpContentComponent extends BaseComponent implements OnInit { .pipe(takeUntil(this._destroyed)) .subscribe(event => { if (event instanceof NavigationStart) { - this._helpContentService.getActivePageContent(event['url']) - .pipe(takeUntil(this._destroyed)) - .subscribe( - pageContent => this.shiftThroughContent(pageContent), - error => this.handleError(error)); + // this._helpContentService.getActivePageContent(event['url']) + // .pipe(takeUntil(this._destroyed)) + // .subscribe( + // pageContent => this.shiftThroughContent(pageContent), + // error => this.handleError(error)); } }); } diff --git a/dmp-frontend/src/app/ui/misc/navigation/navigation.component.html b/dmp-frontend/src/app/ui/misc/navigation/navigation.component.html index 6c0094a15..6cb8c962b 100644 --- a/dmp-frontend/src/app/ui/misc/navigation/navigation.component.html +++ b/dmp-frontend/src/app/ui/misc/navigation/navigation.component.html @@ -6,7 +6,8 @@ {{'NAV-BAR.PUBLIC-DATASETS' | translate}}
- {{'NAV-BAR.GRANTS' | translate}} + + {{'NAV-BAR.DMPS' | translate}} {{'NAV-BAR.DATASETS' | translate}} {{'NAV-BAR.USERS' | translate}} diff --git a/dmp-frontend/src/app/ui/misc/navigation/navigation.component.scss b/dmp-frontend/src/app/ui/misc/navigation/navigation.component.scss index 49e0c7cb1..4c53a9302 100644 --- a/dmp-frontend/src/app/ui/misc/navigation/navigation.component.scss +++ b/dmp-frontend/src/app/ui/misc/navigation/navigation.component.scss @@ -21,7 +21,7 @@ margin-right: 30px; margin-left: 20px; } - + } .progress-bar { @@ -29,15 +29,15 @@ left: 0; position: fixed; width: 100%; - z-index: 1; + z-index: 4; } - + } .two-line-mat-option { - height: 3.5em; + // height: 3.5em; line-height: 1.2em; } .buttonNav:hover { color: aliceblue; - - } \ No newline at end of file + + } diff --git a/dmp-frontend/src/app/ui/misc/navigation/navigation.component.ts b/dmp-frontend/src/app/ui/misc/navigation/navigation.component.ts index 50799203a..f3a288b66 100644 --- a/dmp-frontend/src/app/ui/misc/navigation/navigation.component.ts +++ b/dmp-frontend/src/app/ui/misc/navigation/navigation.component.ts @@ -1,9 +1,10 @@ + +import {mergeMap, distinctUntilChanged, debounceTime, takeUntil } from 'rxjs/operators'; import { Component, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { Observable } from 'rxjs'; -import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../core/common/base/base.component'; import { AppRole } from '../../../core/common/enum/app-role'; import { SearchBarItem } from '../../../core/model/dashboard/search-bar-item'; @@ -59,9 +60,9 @@ export class NavigationComponent extends BaseComponent implements OnInit { titleFn: (item) => item['label'] }; - this.filteredOptions = this.searchControl.valueChanges.debounceTime(500).distinctUntilChanged().flatMap(x => { + this.filteredOptions = this.searchControl.valueChanges.pipe(debounceTime(500),distinctUntilChanged(),mergeMap(x => { return this.searchBarService.search(x); - }); + }),); } searchGrant(query: string) { diff --git a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.html b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.html index c6b2a11c3..f922a2279 100644 --- a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.html +++ b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.html @@ -11,12 +11,12 @@
- - {{'USER-DIALOG.USER-PROFILE' | translate}} person - +
+ person{{'USER-DIALOG.USER-PROFILE' | translate}} +
- - {{ 'USER-DIALOG.LOG-OUT' | translate }} exit_to_app - +
+ exit_to_app{{ 'USER-DIALOG.LOG-OUT' | translate }} +
diff --git a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.scss b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.scss index 448c2eec5..dc9cbf6a1 100644 --- a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.scss +++ b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.scss @@ -5,3 +5,7 @@ $mat-card-header-size: 40px !default; border-radius: 50%; flex-shrink: 0; } + +.profile, .logout { + margin-left: 3em; +} 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 cef11698d..1486663fa 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 @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { Principal } from '../../../../core/model/auth/Principal'; import { AuthService } from '../../../../core/services/auth/auth.service'; diff --git a/dmp-frontend/src/app/ui/misc/search/search.component.ts b/dmp-frontend/src/app/ui/misc/search/search.component.ts index 137eaf4d0..f12184af2 100644 --- a/dmp-frontend/src/app/ui/misc/search/search.component.ts +++ b/dmp-frontend/src/app/ui/misc/search/search.component.ts @@ -1,3 +1,5 @@ + +import {mergeMap, distinctUntilChanged, debounceTime} from 'rxjs/operators'; import { Component, OnInit } from "@angular/core"; import { AuthService } from '../../../core/services/auth/auth.service'; import { FormControl } from "@angular/forms"; @@ -25,9 +27,9 @@ export class SearchComponent implements OnInit { constructor(private authentication: AuthService, private router: Router, private searchBarService: SearchBarService) {} ngOnInit() { - this.filteredOptions = this.searchControl.valueChanges.debounceTime(500).distinctUntilChanged().flatMap(x => { + this.filteredOptions = this.searchControl.valueChanges.pipe(debounceTime(500),distinctUntilChanged(),mergeMap(x => { return this.searchBarService.search(x); - }); + }),); } public isAuthenticated(): boolean { diff --git a/dmp-frontend/src/app/ui/navbar/navbar.component.scss b/dmp-frontend/src/app/ui/navbar/navbar.component.scss index 53aa88437..72ab45098 100644 --- a/dmp-frontend/src/app/ui/navbar/navbar.component.scss +++ b/dmp-frontend/src/app/ui/navbar/navbar.component.scss @@ -10,9 +10,9 @@ $mat-card-header-size: 40px !default; .progress-bar { top: 70px; left: 0; - position: absolute; width: 100%; - z-index: 1; + position: fixed; + z-index: 4; } .fixed-navbar { diff --git a/dmp-frontend/src/app/ui/navbar/navbar.component.spec.ts b/dmp-frontend/src/app/ui/navbar/navbar.component.spec.ts deleted file mode 100644 index 9032ad2ca..000000000 --- a/dmp-frontend/src/app/ui/navbar/navbar.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { NavbarComponent } from './navbar.component'; - -describe('NavbarComponent', () => { - let component: NavbarComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ NavbarComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(NavbarComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/dmp-frontend/src/app/ui/navbar/navbar.component.ts b/dmp-frontend/src/app/ui/navbar/navbar.component.ts index 7a746226c..4bb6d9652 100644 --- a/dmp-frontend/src/app/ui/navbar/navbar.component.ts +++ b/dmp-frontend/src/app/ui/navbar/navbar.component.ts @@ -4,7 +4,7 @@ import { GENERAL_ROUTES, DMP_ROUTES, DATASETS_ROUTES } from '../sidebar/sidebar. import { Location, LocationStrategy, PathLocationStrategy } from '@angular/common'; import { Router } from '@angular/router'; import { AuthService } from '../../core/services/auth/auth.service'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { UserDialogComponent } from '../misc/navigation/user-dialog/user-dialog.component'; import { AppRole } from '../../core/common/enum/app-role'; import { ProgressIndicationService } from '../../core/services/progress-indication/progress-indication-service'; diff --git a/dmp-frontend/src/app/ui/quick-wizard/dataset-editor/dataset-editor-wizard.component.ts b/dmp-frontend/src/app/ui/quick-wizard/dataset-editor/dataset-editor-wizard.component.ts index 20cdcca30..72f746bb5 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/dataset-editor/dataset-editor-wizard.component.ts +++ b/dmp-frontend/src/app/ui/quick-wizard/dataset-editor/dataset-editor-wizard.component.ts @@ -81,6 +81,9 @@ export class DatasetEditorWizardComponent extends BaseComponent implements OnIni this.editedDataset = false; this._inputValue = "list"; (this.formGroup.get('datasets').get('datasetsList') as FormArray).removeAt(index); + if (index == 0) { + this.isFirst = true; + } } addDataset(isFirst: boolean) { @@ -88,7 +91,7 @@ export class DatasetEditorWizardComponent extends BaseComponent implements OnIni let dataset = new QuickWizardDatasetDescriptionModel().fromModel(this.datasetProfileDefinition); let formGroup = dataset.buildForm(); - if(isFirst) { + if (isFirst) { formGroup.get('datasetLabel').setValue( this.datasetProfile.value["label"] + " " + this.language.instant('GENERAL.NAMES.DATASET') @@ -106,9 +109,17 @@ export class DatasetEditorWizardComponent extends BaseComponent implements OnIni formArray.push(formGroup); this.lastIndexOfDataset = formArray.length - 1; this.editedDataset = true; + this.scrollToTop(); } listingMode() { if (this.toggleButton === 0) return true; } + + scrollToTop() { + var currentScroll = document.documentElement.scrollTop || document.body.scrollTop; + if (currentScroll > 0) { + window.scrollTo(0, 0); + } + } } diff --git a/dmp-frontend/src/app/ui/quick-wizard/dmp-editor/dmp-editor-wizard.component.html b/dmp-frontend/src/app/ui/quick-wizard/dmp-editor/dmp-editor-wizard.component.html index 9aadfa650..1062c7c30 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/dmp-editor/dmp-editor-wizard.component.html +++ b/dmp-frontend/src/app/ui/quick-wizard/dmp-editor/dmp-editor-wizard.component.html @@ -33,6 +33,7 @@ + {{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.SECOND-STEP.FIELDS.PROFILE-HINT' | translate}} diff --git a/dmp-frontend/src/app/ui/quick-wizard/dmp-editor/dmp-editor-wizard.component.ts b/dmp-frontend/src/app/ui/quick-wizard/dmp-editor/dmp-editor-wizard.component.ts index 244c44097..7f4fbea97 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/dmp-editor/dmp-editor-wizard.component.ts +++ b/dmp-frontend/src/app/ui/quick-wizard/dmp-editor/dmp-editor-wizard.component.ts @@ -1,9 +1,10 @@ + +import {of as observableOf, Observable } from 'rxjs'; import { Component, Input, OnInit } from '@angular/core'; import { AbstractControl, FormArray, FormControl, FormGroup } from '@angular/forms'; -import { MatSnackBar } from '@angular/material'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { ActivatedRoute, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { Observable } from 'rxjs'; import { ValidationErrorModel } from '../../../common/forms/validation/error-model/validation-error-model'; import { BaseComponent } from "../../../core/common/base/base.component"; import { DatasetProfileModel } from '../../../core/model/dataset/dataset-profile'; @@ -24,7 +25,7 @@ import { DmpEditorWizardModel } from './dmp-editor-wizard-model'; }) export class DmpEditorWizardComponent extends BaseComponent implements OnInit, IBreadCrumbComponent { - breadCrumbs: Observable = Observable.of([]); + breadCrumbs: Observable = observableOf([]); isNew = true; dmp: DmpEditorWizardModel; @@ -65,7 +66,7 @@ export class DmpEditorWizardComponent extends BaseComponent implements OnInit, I this.formGroup.get('label').setValue(this.language.instant('QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.SECOND-STEP.DMP-NAME') + this.dmpLabel); this.formGroup.get('label').setValue(this.language.instant('QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.SECOND-STEP.DMP-NAME') + this.dmpLabel); - this.breadCrumbs = Observable.of([{ + this.breadCrumbs = observableOf([{ parentComponentName: 'grant', label: this.language.instant('NAV-BAR.DMP'), url: '/quick-wizard/dmp' diff --git a/dmp-frontend/src/app/ui/quick-wizard/funder-editor/funder-editor-wizard.component.html b/dmp-frontend/src/app/ui/quick-wizard/funder-editor/funder-editor-wizard.component.html index b36d0a087..b4606ff50 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/funder-editor/funder-editor-wizard.component.html +++ b/dmp-frontend/src/app/ui/quick-wizard/funder-editor/funder-editor-wizard.component.html @@ -1,23 +1,24 @@
-
+

{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.ABOUT-FUNDER' | translate}}

- + + {{'DMP-EDITOR.FIELDS.EXTERNAL-SOURCE-HINT' | translate}}

{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.ABOUT-NEW-FUNDER' | translate}}

- - - {{formGroup.get('label').getError('backendError').message}} - + + + {{funderFormGroup.get('label').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}}
diff --git a/dmp-frontend/src/app/ui/quick-wizard/funder-editor/funder-editor-wizard.component.ts b/dmp-frontend/src/app/ui/quick-wizard/funder-editor/funder-editor-wizard.component.ts index ab1433438..45334e50a 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/funder-editor/funder-editor-wizard.component.ts +++ b/dmp-frontend/src/app/ui/quick-wizard/funder-editor/funder-editor-wizard.component.ts @@ -5,6 +5,7 @@ import { FunderService } from '../../../core/services/funder/funder.service'; import { RequestItem } from '../../../core/query/request-item'; import { FunderCriteria } from '../../../core/query/funder/funder-criteria'; import { FunderFormModel } from '../../dmp/editor/grant-tab/funder-form-model'; +import { TranslateService } from '@ngx-translate/core'; @Component({ selector: 'app-quick-wizard-funder-editor-component', @@ -15,11 +16,14 @@ export class FunderEditorWizardComponent implements OnInit { isNew = false; funder: FunderFormModel; - @Input() formGroup: FormGroup; + funderLabelCleared = true; + @Input() funderFormGroup: FormGroup; + @Input() grantformGroup: FormGroup; funderAutoCompleteConfiguration: SingleAutoCompleteConfiguration; constructor( - private funderService: FunderService + private funderService: FunderService, + private language: TranslateService ) { } ngOnInit() { @@ -28,16 +32,17 @@ export class FunderEditorWizardComponent implements OnInit { filterFn: this.searchFunder.bind(this), initialItems: (extraData) => this.searchFunder(''), displayFn: (item) => item['label'], - titleFn: (item) => item['label'] + titleFn: (item) => item['label'], + subtitleFn: (item) => item['source'] ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['source'] : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE') }; - if (!this.formGroup) { + if (!this.funderFormGroup) { this.funder = new FunderFormModel(); - this.formGroup = this.funder.buildForm(); + this.funderFormGroup = this.funder.buildForm(); } - this.formGroup.get('existFunder').enable(); - this.formGroup.get('label').disable(); + this.funderFormGroup.get('existFunder').enable(); + this.funderFormGroup.get('label').disable(); } searchFunder(query: string) { @@ -50,13 +55,50 @@ export class FunderEditorWizardComponent implements OnInit { create() { this.isNew = !this.isNew; if (this.isNew) { - this.formGroup.get('existFunder').disable(); - this.formGroup.get('existFunder').reset(); - this.formGroup.get('label').enable(); + this.funderFormGroup.get('existFunder').disable(); + this.funderFormGroup.get('existFunder').reset(); + this.funderFormGroup.get('label').enable(); } else { - this.formGroup.get('existFunder').enable(); - this.formGroup.get('label').disable(); - this.formGroup.get('label').reset(); + this.funderFormGroup.get('existFunder').enable(); + this.funderFormGroup.get('label').disable(); + this.funderFormGroup.get('label').reset(); + } + } + + onFunderSelected() { + if (this.grantformGroup.get('existGrant').disabled) { + this.grantformGroup.get('existGrant').enable(); + this.grantformGroup.get('label').disable(); + this.grantformGroup.get('description').disable(); + } else { + this.grantformGroup.get('existGrant').disable(); + this.grantformGroup.get('label').enable(); + this.grantformGroup.get('description').enable(); + } + } + + onFunderRemoved() { + if (this.grantformGroup.get('existGrant').enabled) { + this.grantformGroup.get('existGrant').disable(); + this.grantformGroup.get('existGrant').reset(); + this.grantformGroup.get('label').enable(); + this.grantformGroup.get('description').enable(); + } else { + this.grantformGroup.get('existGrant').enable(); + this.grantformGroup.get('label').disable(); + this.grantformGroup.get('label').reset(); + this.grantformGroup.get('description').disable(); + this.grantformGroup.get('description').reset(); + } + } + + controlModified(event: any) { + if (event && this.funderLabelCleared) { + this.funderLabelCleared = false; + this.onFunderSelected(); + } else if (!event) { + this.funderLabelCleared = true; + this.onFunderRemoved(); } } diff --git a/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.html b/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.html index ddb3a4e8c..2b4d9e1b0 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.html +++ b/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.html @@ -10,8 +10,9 @@

{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.ABOUT-GRANT' | translate}}

- + + {{'DMP-EDITOR.FIELDS.EXTERNAL-SOURCE-HINT' | translate}} {{grantformGroup.get('grant').getError('backendError').message}} @@ -52,9 +53,8 @@
- - - + +
diff --git a/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.ts b/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.ts index 338a5b98e..47f1c730a 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.ts +++ b/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.ts @@ -1,9 +1,10 @@ + +import { of as observableOf, Observable } from 'rxjs'; import { Component, Input, OnInit } from '@angular/core'; import { AbstractControl, FormArray, FormControl, FormGroup } from '@angular/forms'; -import { MatSnackBar } from '@angular/material'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { ActivatedRoute, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { Observable } from 'rxjs'; import { ValidationErrorModel } from '../../../common/forms/validation/error-model/validation-error-model'; import { BaseComponent } from "../../../core/common/base/base.component"; import { GrantCriteria } from '../../../core/query/grant/grant-criteria'; @@ -21,7 +22,7 @@ import { GrantEditorWizardModel } from './grant-editor-wizard-model'; styleUrls: ['./grant-editor-wizard.component.scss'] }) export class GrantEditorWizardComponent extends BaseComponent implements OnInit, IBreadCrumbComponent { - breadCrumbs: Observable = Observable.of([]); + breadCrumbs: Observable = observableOf([]); isNew = false; grant: GrantEditorWizardModel; @@ -33,7 +34,6 @@ export class GrantEditorWizardComponent extends BaseComponent implements OnInit, constructor( public snackBar: MatSnackBar, - private route: ActivatedRoute, public router: Router, public language: TranslateService, private grantService: GrantService @@ -42,7 +42,7 @@ export class GrantEditorWizardComponent extends BaseComponent implements OnInit, } ngOnInit() { - this.breadCrumbs = Observable.of([{ + this.breadCrumbs = observableOf([{ parentComponentName: 'QuickCreate', label: this.language.instant('NAV-BAR.GRANT'), url: '/quick-wizard/grant' @@ -56,7 +56,7 @@ export class GrantEditorWizardComponent extends BaseComponent implements OnInit, initialItems: (extraData) => this.searchGrant(''), displayFn: (item) => item['label'], titleFn: (item) => item['label'], - subtitleFn: (item) => item ? item['source'] : null + subtitleFn: (item) => item['source'] ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['source'] : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE') }; if (!this.grantformGroup) { @@ -64,9 +64,13 @@ export class GrantEditorWizardComponent extends BaseComponent implements OnInit, this.grantformGroup = this.grant.buildForm(); } - this.grantformGroup.get('existGrant').enable(); - this.grantformGroup.get('label').disable(); - this.grantformGroup.get('description').disable(); + if (this.funderFormGroup && this.funderFormGroup.get('funder')) { + this.grantformGroup.get('existGrant').enable(); + this.grantformGroup.get('label').disable(); + this.grantformGroup.get('description').disable(); + } else { + this.grantformGroup.get('existGrant').disable(); + } // this.route.params // .pipe(takeUntil(this._destroyed)) @@ -100,6 +104,10 @@ export class GrantEditorWizardComponent extends BaseComponent implements OnInit, return this.grantformGroup.valid; } + isFunderFormInvalid() { + return !this.funderFormGroup.get('existFunder').value && !this.funderFormGroup.get('label').valid; + } + public touchAllFormFields(formControl: AbstractControl) { if (formControl instanceof FormControl) { formControl.markAsTouched(); @@ -171,4 +179,9 @@ export class GrantEditorWizardComponent extends BaseComponent implements OnInit, this.grantformGroup.get('description').reset(); } } + + onGrantSelected() { + this.grantformGroup.get('label').disable(); + this.grantformGroup.get('description').disable(); + } } diff --git a/dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.html b/dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.html index b53fb7f43..208838c21 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.html +++ b/dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.html @@ -9,6 +9,7 @@ + {{'DMP-EDITOR.FIELDS.EXTERNAL-SOURCE-HINT' | translate}}
diff --git a/dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.ts b/dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.ts index 73c5c22dc..bc81cbc21 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.ts +++ b/dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.ts @@ -5,6 +5,7 @@ import { ProjectService } from '../../../core/services/project/project.service'; import { RequestItem } from '../../../core/query/request-item'; import { ProjectCriteria } from '../../../core/query/project/project-criteria'; import { ProjectFormModel } from '../../dmp/editor/grant-tab/project-form-model'; +import { TranslateService } from '@ngx-translate/core'; @Component({ selector: 'app-quick-wizard-project-editor-component', @@ -19,7 +20,8 @@ export class ProjectEditorWizardComponent implements OnInit { projectAutoCompleteConfiguration: SingleAutoCompleteConfiguration; constructor( - private projectService: ProjectService + private projectService: ProjectService, + private language: TranslateService ) { } ngOnInit() { @@ -27,7 +29,8 @@ export class ProjectEditorWizardComponent implements OnInit { filterFn: this.searchProject.bind(this), initialItems: (extraData) => this.searchProject(''), displayFn: (item) => item['label'], - titleFn: (item) => item['label'] + titleFn: (item) => item['label'], + subtitleFn: (item) => item['source'] ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['source'] : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE') }; if (!this.formGroup) { diff --git a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.html b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.html index 523570bac..8b3a7c7c9 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.html +++ b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.html @@ -10,15 +10,13 @@ {{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.TITLE' | translate}} -
- -
+
- +
@@ -27,12 +25,12 @@
- +
-
@@ -48,12 +46,7 @@ - - +
diff --git a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts index fcaddc47f..9345b7ea1 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts +++ b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts @@ -1,16 +1,18 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; + +import { of as observableOf, Observable } from 'rxjs'; +import { Component, OnInit, ViewChild, HostListener } from '@angular/core'; import { AbstractControl, FormArray, FormControl, FormGroup } from '@angular/forms'; -import { MatDialog, MatSnackBar, MatStepper } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; +import { MatSnackBar } from '@angular/material/snack-bar'; +import { MatStepper } from '@angular/material/stepper'; import { ActivatedRoute, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { Observable } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { ValidationErrorModel } from '../../../common/forms/validation/error-model/validation-error-model'; -import { BaseComponent } from "../../../core/common/base/base.component"; import { DatasetStatus } from '../../../core/common/enum/dataset-status'; import { DmpStatus } from '../../../core/common/enum/dmp-status'; import { DatasetService } from '../../../core/services/dataset/dataset.service'; -import { SnackBarNotificationLevel, UiNotificationService } from '../../../core/services/notification/ui-notification-service'; +import { SnackBarNotificationLevel, UiNotificationService, PopupNotification } from '../../../core/services/notification/ui-notification-service'; import { QuickWizardService } from '../../../core/services/quick-wizard/quick-wizard.service'; import { ConfirmationDialogComponent } from '../../../library/confirmation-dialog/confirmation-dialog.component'; import { DmpFinalizeDialogComponent, DmpFinalizeDialogDataset, DmpFinalizeDialogInput } from '../../dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component'; @@ -21,25 +23,26 @@ import { GrantEditorWizardModel } from '../grant-editor/grant-editor-wizard-mode import { QuickWizardEditorWizardModel } from './quick-wizard-editor.model'; import { FunderFormModel } from '../../dmp/editor/grant-tab/funder-form-model'; import { ProjectFormModel } from '../../dmp/editor/grant-tab/project-form-model'; +import { CheckDeactivateBaseComponent } from '../../../library/deactivate/deactivate.component'; @Component({ selector: 'app-quick-wizard-editor-component', templateUrl: 'quick-wizard-editor.component.html', styleUrls: ['./quick-wizard-editor.component.scss'] }) -export class QuickWizardEditorComponent extends BaseComponent implements OnInit, IBreadCrumbComponent { +export class QuickWizardEditorComponent extends CheckDeactivateBaseComponent implements OnInit, IBreadCrumbComponent { - breadCrumbs: Observable = Observable.of([]); - @ViewChild('stepper') stepper: MatStepper; - @ViewChild(DatasetEditorWizardComponent) datasetEditorWizardComponent: DatasetEditorWizardComponent; + breadCrumbs: Observable = observableOf([]); + @ViewChild('stepper', { static: true }) stepper: MatStepper; + @ViewChild(DatasetEditorWizardComponent, { static: false }) datasetEditorWizardComponent: DatasetEditorWizardComponent; isNew = true; + isSubmitted = false; quickWizard: QuickWizardEditorWizardModel; allDatasets: DmpFinalizeDialogDataset[] = []; formGroup: FormGroup = null; constructor( public snackBar: MatSnackBar, - private route: ActivatedRoute, public router: Router, public language: TranslateService, public datasetService: DatasetService, @@ -57,7 +60,7 @@ export class QuickWizardEditorComponent extends BaseComponent implements OnInit, this.quickWizard.project = new ProjectFormModel(); this.formGroup = this.quickWizard.buildForm(); this.language.get('NAV-BAR.DMP-WIZARD').pipe(takeUntil(this._destroyed)).subscribe(x => { - this.breadCrumbs = Observable.of([ + this.breadCrumbs = observableOf([ { parentComponentName: 'Dashboard', label: x, @@ -86,6 +89,7 @@ export class QuickWizardEditorComponent extends BaseComponent implements OnInit, } this.onSubmitSave(); } else { + this.uiNotificationService.popupNotification(this.language.instant('GENERAL.NOTIFICATION-DIALOG.POPUP.TITLE'), this.language.instant('GENERAL.NOTIFICATION-DIALOG.POPUP.MESSAGE')); return; } } @@ -103,6 +107,7 @@ export class QuickWizardEditorComponent extends BaseComponent implements OnInit, const dialogRef = this.dialog.open(DmpFinalizeDialogComponent, { maxWidth: '500px', + restoreFocus: false, data: { dialogInputModel: dialogInputModel, confirmButton: this.language.instant('DMP-FINALISE-DIALOG.SUBMIT'), @@ -117,17 +122,19 @@ export class QuickWizardEditorComponent extends BaseComponent implements OnInit, } this.formGroup.get('dmp').get('status').setValue(DmpStatus.Finalized); this.onSubmitSaveAndFinalize(); + } else { + this.uiNotificationService.popupNotification(this.language.instant('GENERAL.NOTIFICATION-DIALOG.POPUP.TITLE'), this.language.instant('GENERAL.NOTIFICATION-DIALOG.POPUP.MESSAGE')); } } }); } hasDatasets() { - return (this.formGroup.get('datasets').get('datasetsList') as FormArray).length > 0; + return this.formGroup.get('datasets').get('datasetsList').valid; } public isFormValid() { - return this.formGroup.get('grant').valid; + return this.formGroup.get('grant').valid && this.formGroup.get('funder').valid; } public touchAllFormFields(formControl: AbstractControl) { @@ -156,6 +163,7 @@ export class QuickWizardEditorComponent extends BaseComponent implements OnInit, onSubmitSave(): void { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { + restoreFocus: false, data: { message: this.language.instant('QUICKWIZARD.SAVE-DIALOG.TITLE'), confirmButton: this.language.instant('QUICKWIZARD.SAVE-DIALOG.ACTIONS.AFFIRMATIVE'), @@ -177,6 +185,7 @@ export class QuickWizardEditorComponent extends BaseComponent implements OnInit, } onCallbackSuccess(): void { + this.isSubmitted = true; this.uiNotificationService.snackBarNotification(this.isNew ? this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-CREATION') : this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-UPDATE'), SnackBarNotificationLevel.Success); this.router.navigate(['/home']); } @@ -214,4 +223,9 @@ export class QuickWizardEditorComponent extends BaseComponent implements OnInit, return this.formGroup.get('grant').get('label').value; } } + + canDeactivate(): boolean { + return this.isSubmitted || !this.formGroup.dirty; + } + } diff --git a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard.module.ts b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard.module.ts index e6925ddd6..d0f5980af 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard.module.ts +++ b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard.module.ts @@ -3,7 +3,7 @@ import { CommonFormsModule } from '../../common/forms/common-forms.module'; import { CommonUiModule } from '../../common/ui/common-ui.module'; import { ConfirmationDialogModule } from '../../library/confirmation-dialog/confirmation-dialog.module'; import { UrlListingModule } from '../../library/url-listing/url-listing.module'; -import { QuickWizardRoutingModule } from './quick-wizard.rooting'; +import { QuickWizardRoutingModule } from './quick-wizard.routing'; import { GrantEditorWizardComponent } from './grant-editor/grant-editor-wizard.component'; import { DmpEditorWizardComponent } from './dmp-editor/dmp-editor-wizard.component'; import { QuickWizardEditorComponent } from './quick-wizard-editor/quick-wizard-editor.component'; @@ -13,7 +13,7 @@ import { DatasetDescriptionFormModule } from '../misc/dataset-description-form/d import { DmpModule } from '../dmp/dmp.module'; import { FunderEditorWizardComponent } from './funder-editor/funder-editor-wizard.component'; import { ProjectEditorWizardComponent } from './project-editor/project-editor-wizard.component'; - +import { CanDeactivateGuard } from '../../library/deactivate/can-deactivate.guard'; @NgModule({ imports: [ @@ -36,6 +36,9 @@ import { ProjectEditorWizardComponent } from './project-editor/project-editor-wi ], exports: [ DatasetEditorWizardComponent, + ], + providers: [ + CanDeactivateGuard ] }) export class OuickWizardModule { } diff --git a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard.rooting.ts b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard.rooting.ts deleted file mode 100644 index fd9248ede..000000000 --- a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard.rooting.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; -import { DmpEditorWizardComponent } from './dmp-editor/dmp-editor-wizard.component'; -import { GrantEditorWizardComponent } from './grant-editor/grant-editor-wizard.component'; -import { QuickWizardEditorComponent } from './quick-wizard-editor/quick-wizard-editor.component'; -import { DatasetEditorWizardComponent } from './dataset-editor/dataset-editor-wizard.component'; - -const routes: Routes = [ - { - path: '', - component: QuickWizardEditorComponent, - data: { - breadcrumb: true - }, - },{ - path: 'grant', - component: GrantEditorWizardComponent, - data: { - breadcrumb: true - }, - }, - { - path: 'dmp', - component: DmpEditorWizardComponent, - data: { - breadcrumb: true - }, - }, - { - path: 'dataset', - component: DatasetEditorWizardComponent, - data: { - breadcrumb: true - }, - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] -}) -export class QuickWizardRoutingModule { } diff --git a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard.routing.ts b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard.routing.ts new file mode 100644 index 000000000..31456ea00 --- /dev/null +++ b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard.routing.ts @@ -0,0 +1,42 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { QuickWizardEditorComponent } from './quick-wizard-editor/quick-wizard-editor.component'; +import { CanDeactivateGuard } from '../../library/deactivate/can-deactivate.guard'; + +const routes: Routes = [ + { + path: '', + component: QuickWizardEditorComponent, + data: { + breadcrumb: true + }, + canDeactivate: [CanDeactivateGuard] + }, + // { + // path: 'grant', + // component: GrantEditorWizardComponent, + // data: { + // breadcrumb: true + // }, + // }, + // { + // path: 'dmp', + // component: DmpEditorWizardComponent, + // data: { + // breadcrumb: true + // }, + // }, + // { + // path: 'dataset', + // component: DatasetEditorWizardComponent, + // data: { + // breadcrumb: true + // }, + // } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class QuickWizardRoutingModule { } diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/faq/faq-dialog.component.html b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/faq/faq-dialog.component.html deleted file mode 100644 index c4f4f2a6a..000000000 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/faq/faq-dialog.component.html +++ /dev/null @@ -1,39 +0,0 @@ -
-
- {{'FAQ.TITLE' | translate}} -
-
- close -
-
-
-

What is ARGOS?

-

ARGOS is an open and collaborative platform for creating Data Management Plans according to funders or institutions’ open science policy requirements. ARGOS technology provides solutions and workflows that connect the DMP to the actual data where they are stored and link to other useful information such as publications and funding information, thus enabling the association between research outputs and processes and leading to the creation of coherent/ complete research entities. ARGOS is comprised of two major features: the ARGOS template and the Dataset Description.

- -
-

Who is it for?

-

ARGOS is inclusive to all researchers and research coordinators who may use the tool to create machine actionable DMPs. Funding and Research Performing Organizations as well as research communities may use the tool and create Dataset Description templates according to their preferences or requirements. ARGOS may be used for purposes other than research projects, such as on the occasion of trainings that familiarise scientists with the data management planning process.

- -
-

How can I use it?

-

ARGOS is comprised of two main functionalities: DMP templates and Dataset Descriptions. Additional entities are Projects that link to funders and grants information.
ARGOS can be used for: -

A. viewing/ consulting publicly released DMPs and Dataset Descriptions or Projects corresponding to DMPs

- The tool offers options for publishing DMPs in two modes, private or public. To view public DMPs and Dataset Descriptions, there is no need for login to the platform. - -

B. writing and publishing a DMP

- The tool helps researchers comply with mandates that may be attached to their grant proposal/ project funding. They can therefore choose from the most suitable to their needs template from the Dataset Descriptions collection and proceed with answering the corresponding questions. Once finalized, researchers can assign a DOI to their DMP, publish and eventually cite it. - -

C. practicing in writing DMPs and Dataset Descriptions

- Given that Data Management Planning reflects the data management lifecycle and in accordance/ response to the increasing demand of the global scientific/ research community for training in Research Data Management (RDM), ARGOS may be used for educational purposes. Examples may refer to embedding DMP and DMP tools in specific curricula or even utilization of the tool for researchers and students familiarization with the concept and process, as part of library instructions’ sessions. -

- -
-

What is the difference between the “Wizard” and the “Expert” modes/ features?

-

There are two ways of creating a DMP: the “Wizard” and the “Expert”. The DMP Wizard combines the most necessary fields of the DMP template and the Data Description template. It is an easy way of starting a DMP and completing a Dataset Description. The downside when using the Wizard is that it only supports one Dataset Description. To add more datasets documentation, someone must open the DMP from DMP Expert. -
DMP expert contains extra fields for describing the project, grant, funding, contributors and associations between DMP authors, etc. DMP Expert is advised for use when further modification and personalization is to take place. -

- -
-
-
-
diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/glossary/glossary-dialog.component.html b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/glossary/glossary-dialog.component.html deleted file mode 100644 index 4b6ef450c..000000000 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/glossary/glossary-dialog.component.html +++ /dev/null @@ -1,26 +0,0 @@ -
-
- {{'GLOSSARY.TITLE' | translate}} -
-
- close -
-
-
-

DMP

-

A DMP - short for Data Management Plan - is a document describing the processes that the data have undergone and the tools used for their handling and storage during a research lifecycle. Most importantly, DMPs secure provenance and enable re-use of data by appointing data managers and by including information on how data can be re-used by others in the future. Therefore, a DMP is a living document which is modified according to the data developments of a project before it’s completed and handed over at the end of the project. - Public funders increasingly contain DMPs in their grant proposals or policy funding requirements. A good paradigm is the European Commission demands for the production and delivery of DMPs for projects funded under the Horizon 2020 Funding Programme. On that note, and to encourage good data management practices uptake, many European institutions include DMPs in post-graduate researchers policies and offer relevant support to staff and students. -

- -

DMP template

-

DMP template contains general but vital information about the name and the duration of the project that the DMP corresponds to, the contributing organisations and individuals as well as the datasets that are under the Dataset Description section. It also offers the possibility of describing datasets other than primary data generated, under “External References” section. A DMP template can have many Dataset Descriptions. -

- -

Dataset Description

-

Dataset Description documents the management processes of datasets following funder’s or institution’s requirements. A dataset description is essentially a questionnaire template with underlying added value services for interoperability and machine readability of information which is developed based on the given requirements. Management requirements differ from funder to funder and from institution to institution, hence the growing collection of Dataset Descriptions to select from. - Moreover, a Dataset Description links to the documentation of one dataset, hence a DMP template may contain more than one dataset descriptions on the occasion when multiple datasets were used during the project. When documentation of some of the project’s datasets falls under additional requirements (e.g. projects receiving multiple grants from different sources), there is the possibility of describing datasets with more than one Dataset Description template. -

-
-
-
-
diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.component.html b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.component.html new file mode 100644 index 000000000..89e52c053 --- /dev/null +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.component.html @@ -0,0 +1,12 @@ +
+
+
+

{{ 'PRIVACY-POLICY.TITLE' | translate}}

+
+
+
+
+

{{ 'PRIVACY-POLICY.MAIN-CONTENT' | translate}}

+
+
+
diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.component.scss b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.component.scss new file mode 100644 index 000000000..9b960ac31 --- /dev/null +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.component.scss @@ -0,0 +1,12 @@ +h1 { + text-align: center; +} + +img { + height: 150px; + width: 100%; +} + +.privacy-component { + margin-top: 80px; +} diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.component.ts b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.component.ts new file mode 100644 index 000000000..d90640371 --- /dev/null +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-privacy', + templateUrl: './privacy.component.html', + styleUrls: ['./privacy.component.scss'] +}) +export class PrivacyComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.module.ts b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.module.ts new file mode 100644 index 000000000..37921fc36 --- /dev/null +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.module.ts @@ -0,0 +1,15 @@ +import { NgModule } from '@angular/core'; +import { PrivacyComponent } from './privacy.component'; +import { PrivacyRoutingModule } from './privacy.routing'; +import { CommonUiModule } from '../../../../common/ui/common-ui.module'; + +@NgModule({ + imports: [ + CommonUiModule, + PrivacyRoutingModule + ], + declarations: [ + PrivacyComponent + ] +}) +export class PrivacyModule { } diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.routing.ts b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.routing.ts new file mode 100644 index 000000000..6a17f75b9 --- /dev/null +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.routing.ts @@ -0,0 +1,16 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { PrivacyComponent } from './privacy.component'; + +const routes: Routes = [ + { + path: '', + component: PrivacyComponent, + }, +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class PrivacyRoutingModule { } diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.css b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.css index f1fb4aa11..62dc5de9d 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.css +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.css @@ -1,27 +1,31 @@ .sidebar-footer { - padding: white; - color: rgb(117, 117, 117); - /* background-color: #ffffff; */ - /* box-shadow: 0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(255, 255, 255, 0.4); */ + padding: white; + color: rgb(117, 117, 117); + background-color: #3333333d; + /* background-color: #ffffff; */ + /* box-shadow: 0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(255, 255, 255, 0.4); */ } .sidebar-footer .option { - margin: 0px; - padding-top: 2px; - padding-bottom: 2px; - padding-right: 10px; - border-radius: 0px; - color: white; - cursor: pointer; - display: inline-flex; + margin: 0px; + padding-top: 2px; + padding-bottom: 2px; + border-radius: 0px; + color: white; + cursor: pointer; + display: inline-flex; + font-size: small; } .sidebar-footer :hover { - color: #4687e6; + color: #00b29f; } .sidebar-footer .vl { - border-right: 1px solid #d4d4d4; - color: white; + border-right: 1px solid #d4d4d4; + color: white; } +.option-active { + color: #00b29f !important; +} diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.html b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.html index b369bb370..d9e66567b 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.html +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.html @@ -1,4 +1,4 @@ -
+
-
-

{{'FOOTER.GLOSSARY' | translate}}

+
+
+

+ + {{'FOOTER.GLOSSARY' | translate}}

+
+
+

+ + {{'FOOTER.FAQ' | translate}}

+
+
+

+ + {{'FOOTER.CONTACT-SUPPORT' | translate}}

+
-
-

{{'FOOTER.FAQ' | translate}}

-
-
-

{{'FOOTER.CONTACT-SUPPORT' | translate}}

+
+
+ + + {{'FOOTER.TERMS-OF-SERVICE' | translate}} +
+
+ + + {{'FOOTER.PRIVACY-POLICY' | translate}} +
diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.ts b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.ts index b3e69608a..c03321df9 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.ts +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { AbstractControl, FormArray, FormControl, FormGroup } from '@angular/forms'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; import { takeUntil } from 'rxjs/operators'; import { ValidationErrorModel } from '../../../common/forms/validation/error-model/validation-error-model'; @@ -8,9 +8,10 @@ import { BaseComponent } from '../../../core/common/base/base.component'; import { ContactEmailFormModel } from '../../../core/model/contact/contact-email-form-model'; import { ContactSupportService } from '../../../core/services/contact-support/contact-support.service'; import { SnackBarNotificationLevel, UiNotificationService } from '../../../core/services/notification/ui-notification-service'; -import { ContactDialogComponent } from '../../../library/contact-dialog/contact-dialog.component'; -import { FaqDialogComponent } from './faq/faq-dialog.component'; -import { GlossaryDialogComponent } from './glossary/glossary-dialog.component'; +import { GlossaryDialogComponent } from '../../glossary/dialog/glossary-dialog.component'; +import { Router } from '@angular/router'; +import { FaqDialogComponent } from '../../faq/dialog/faq-dialog.component'; +import { ContactDialogComponent } from '../../contact/contact-dialog/contact-dialog.component'; @Component({ selector: 'app-sidebar-footer', @@ -25,6 +26,7 @@ export class SidebarFooterComponent extends BaseComponent implements OnInit { constructor( private dialog: MatDialog, private language: TranslateService, + public router: Router, private contactSupportService: ContactSupportService, private uiNotificationService: UiNotificationService ) { @@ -42,9 +44,12 @@ export class SidebarFooterComponent extends BaseComponent implements OnInit { } else { const dialogRef = this.dialog.open(ContactDialogComponent, { - width: '400px', + width: '550px', disableClose: true, - data: this.formGroup + data: { + isDialog: true, + formGroup: this.formGroup + } }); dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(data => { if (data) { @@ -67,6 +72,9 @@ export class SidebarFooterComponent extends BaseComponent implements OnInit { else { const dialogRef = this.dialog.open(GlossaryDialogComponent, { disableClose: true, + data: { + isDialog: true + } }); } } @@ -78,6 +86,9 @@ export class SidebarFooterComponent extends BaseComponent implements OnInit { else { const dialogRef = this.dialog.open(FaqDialogComponent, { disableClose: true, + data: { + isDialog: true + } }); } } diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.html b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.html new file mode 100644 index 000000000..e469ae59b --- /dev/null +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.html @@ -0,0 +1,12 @@ +
+
+
+

{{ 'TERMS-OF-SERVICE.TITLE' | translate}}

+
+
+
+
+

{{ 'TERMS-OF-SERVICE.MAIN-CONTENT' | translate}}

+
+
+
diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.scss b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.scss new file mode 100644 index 000000000..b49fda4bd --- /dev/null +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.scss @@ -0,0 +1,12 @@ +h1 { + text-align: center; +} + +img { + height: 150px; + width: 100%; +} + +.terms-component { + margin-top: 80px; +} diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.ts b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.ts new file mode 100644 index 000000000..b17d4e5ed --- /dev/null +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-terms', + templateUrl: './terms.component.html', + styleUrls: ['./terms.component.scss'] +}) +export class TermsComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.module.ts b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.module.ts new file mode 100644 index 000000000..d9c62dcc5 --- /dev/null +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.module.ts @@ -0,0 +1,15 @@ +import { NgModule } from '@angular/core'; +import { TermsComponent } from './terms.component'; +import { TermsRoutingModule } from './terms.routing'; +import { CommonUiModule } from '../../../../common/ui/common-ui.module'; + +@NgModule({ + imports: [ + CommonUiModule, + TermsRoutingModule + ], + declarations: [ + TermsComponent + ], +}) +export class TermsModule { } diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.routing.ts b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.routing.ts new file mode 100644 index 000000000..718e98c0e --- /dev/null +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.routing.ts @@ -0,0 +1,16 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { TermsComponent } from './terms.component'; + +const routes: Routes = [ + { + path: '', + component: TermsComponent, + }, +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class TermsRoutingModule { } diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts b/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts index bc45ba34f..3ecc0de2b 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts +++ b/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { MatDialog } from '@angular/material'; +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'; @@ -43,13 +43,10 @@ export const PUBLIC_ROUTES: RouteInfo[] = [ { path: '/explore', title: 'SIDE-BAR.PUBLIC-DESC', icon: 'public' } ]; -export const GRANTS_ROUTES: RouteInfo[] = [ - { path: '/grants', title: 'SIDE-BAR.MY-GRANTS', icon: 'work_outline' } -]; - // export const GRANTS_ROUTES: RouteInfo[] = [ // { path: '/grants', title: 'SIDE-BAR.MY-GRANTS', icon: 'work_outline' } // ]; + 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' }, @@ -113,14 +110,15 @@ export class SidebarComponent implements OnInit { } this.groupMenuItems.push(this.datasetItems); - this.grantItems = { - title: 'SIDE-BAR.GRANTS', - routes: GRANTS_ROUTES, - requiresAuthentication: true, - requiresAdmin: false, - isGeneral: false - } - this.groupMenuItems.push(this.grantItems); + // ----------- UNCOMMENT TO ADD AGAIN GRANTS -------- + // this.grantItems = { + // title: 'SIDE-BAR.GRANTS', + // routes: GRANTS_ROUTES, + // requiresAuthentication: true, + // requiresAdmin: false, + // isGeneral: false + // } + // this.groupMenuItems.push(this.grantItems); this.adminItems = { title: 'SIDE-BAR.ADMIN', diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar.module.ts b/dmp-frontend/src/app/ui/sidebar/sidebar.module.ts index 06ed28055..a42c97328 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar.module.ts +++ b/dmp-frontend/src/app/ui/sidebar/sidebar.module.ts @@ -2,29 +2,26 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { CommonFormsModule } from '../../common/forms/common-forms.module'; import { CommonUiModule } from '../../common/ui/common-ui.module'; -import { ContactDialogModule } from '../../library/contact-dialog/contact-dialog.module'; -import { FaqDialogComponent } from './sidebar-footer/faq/faq-dialog.component'; -import { GlossaryDialogComponent } from './sidebar-footer/glossary/glossary-dialog.component'; import { SidebarFooterComponent } from './sidebar-footer/sidebar-footer.component'; import { SidebarComponent } from './sidebar.component'; +import { GlossaryModule } from '../glossary/glossary.module'; +import { FaqModule } from '../faq/faq.module'; +import { ContactModule } from '../contact/contact.module'; @NgModule({ imports: [ CommonUiModule, CommonFormsModule, - ContactDialogModule, - RouterModule + GlossaryModule, + FaqModule, + RouterModule, + ContactModule ], declarations: [ SidebarComponent, - SidebarFooterComponent, - GlossaryDialogComponent, - FaqDialogComponent - ], - entryComponents: [ - GlossaryDialogComponent, - FaqDialogComponent + SidebarFooterComponent ], + entryComponents: [], exports: [SidebarComponent] }) export class SidebarModule { } 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 a25e82b14..a5e847417 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 @@ -3,15 +3,15 @@ import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms' import { ActivatedRoute, Params, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import * as moment from 'moment-timezone'; -import { takeUntil } from 'rxjs/operators'; -import { Observable } from 'rxjs/Rx'; +import { Observable, of } from 'rxjs'; +import { map, takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../core/common/base/base.component'; import { CultureInfo } from '../../core/model/culture-info'; +import { DmpModel } from '../../core/model/dmp/dmp'; import { UserListingModel } from '../../core/model/user/user-listing'; import { AuthService } from '../../core/services/auth/auth.service'; import { CultureService } from '../../core/services/culture/culture-service'; import { UserService } from '../../core/services/user/user.service'; -import { DmpModel } from '../../core/model/dmp/dmp'; const availableLanguages: any[] = require('../../../assets/resources/language.json'); @@ -47,7 +47,7 @@ export class UserProfileComponent extends BaseComponent implements OnInit, OnDes .subscribe((params: Params) => { this.currentUserId = this.authService.current().id; const userId = !params['id'] ? 'me' : params['id']; - this.user = this.userService.getUser(userId).map(result => { + this.user = this.userService.getUser(userId).pipe(map(result => { result['additionalinfo'] = JSON.parse(result['additionalinfo']); this.formGroup = new FormBuilder().group({ language: new FormControl(result['additionalinfo']['language'] ? availableLanguages.filter(x => x.value === result['additionalinfo']['language']['value']).pop() : '', [Validators.required]), @@ -63,7 +63,7 @@ export class UserProfileComponent extends BaseComponent implements OnInit, OnDes .subscribe(x => { if (x) { this.cultures = this._filterCulture(x); } }); this.formGroup.disable(); return result; - }); + })); }); } @@ -91,18 +91,18 @@ export class UserProfileComponent extends BaseComponent implements OnInit, OnDes private _filterTimezone(value: string): Observable { if (value && typeof value === 'string') { const filterValue = value.toLowerCase(); - return Observable.of(moment.tz.names().filter(option => option.toLowerCase().includes(filterValue))); + return of(moment.tz.names().filter(option => option.toLowerCase().includes(filterValue))); } else { - return Observable.of(moment.tz.names()); + return of(moment.tz.names()); } } private _filterCulture(value: string): Observable { if (value && typeof value === 'string') { const filterValue = value.toLowerCase(); - return Observable.of(this.cultureService.getCultureValues().filter(option => option.displayName.toLowerCase().includes(filterValue))); + return of(this.cultureService.getCultureValues().filter(option => option.displayName.toLowerCase().includes(filterValue))); } else { - return Observable.of(this.cultureService.getCultureValues()); + return of(this.cultureService.getCultureValues()); } } @@ -132,7 +132,7 @@ export class UserProfileComponent extends BaseComponent implements OnInit, OnDes this.authService.me() .pipe(takeUntil(this._destroyed)) .subscribe(result => this.router.navigate(['/profile'])); - // .subscribe(result => window.location.reload()); + // .subscribe(result => window.location.reload()); }, error => { console.log(error); diff --git a/dmp-frontend/src/assets/css/demo.css b/dmp-frontend/src/assets/css/demo.css index 040ac2225..89ae2d45e 100644 --- a/dmp-frontend/src/assets/css/demo.css +++ b/dmp-frontend/src/assets/css/demo.css @@ -78,7 +78,7 @@ h6 { } .sidebar[data-color="danger"] li.active>a { - background-color: #4687e6; + background-color: rgb(0, 178, 159); /* -webkit-box-shadow: 0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(255, 255, 255, 0.4); */ /* box-shadow: 0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(255, 255, 255, 0.4); */ box-shadow: none; @@ -174,7 +174,8 @@ h6 { } .card .card-header-blue .card-icon, .card .card-header-blue .card-text, .card .card-header-blue:not(.card-header-icon):not(.card-header-text), .card.bg-warning, .card.card-rotate.bg-warning .front, .card.card-rotate.bg-warning .back { - background: linear-gradient(60deg, rgb(0, 112, 192), rgb(0, 112, 192)); + /* background: linear-gradient(60deg, rgb(0, 112, 192), rgb(0, 112, 192)); */ + background: linear-gradient(60deg, rgb(12, 116, 137), rgb(12, 116, 137)); } .card .card-header-blue .card-icon, .card .card-header-blue:not(.card-header-icon):not(.card-header-text), .card .card-header-blue .card-text { @@ -182,6 +183,10 @@ h6 { box-shadow: 0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(0, 0, 0, 0.14); } +.card .card-header-blue:hover { + background: #268295 !important; +} + .card-stats .card-header.card-header-icon i { font-size: 36px; line-height: 56px; @@ -347,5 +352,5 @@ table>thead>tr>th, .table>tbody>tr>th, .table>tfoot>tr>th, .table>thead>tr>td, . } .attach-file :hover { - color: #667eff + color: #00b29f } diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index db93124b2..d83361069 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -38,14 +38,28 @@ "DELETE-ITEM": "Delete this item?", "DELETE-USER": "Remove this collaborator?", "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?", + "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?", "ACTIONS": { "CONFIRM": "Yes", "NO": "No", "DELETE": "Delete", "REMOVE": "Remove", - "CANCEL": "Cancel" + "CANCEL": "Cancel", + "LEAVE": "Leave", + "POLICY-AGREE": "Make names publicly visible.", + "REQUIRED": "Click on checkbox is required." + } + }, + "NOTIFICATION-DIALOG": { + "POPUP": { + "TITLE": "Missing Dataset", + "MESSAGE": "At least one dataset has to be created to proceed on saving DMP.", + "CLOSE": "Close" } }, "ACTIONS": { @@ -60,6 +74,8 @@ "PREFIX": "Open DMP - ", "GENERAL": "Data Management Plans Creator", "ABOUT": "About", + "PRIVACY": "Privacy Policy", + "TERMS": "Terms Of Service", "PLANS": "My DMPs", "EXPLORE-PLANS": "Published DMPs", "QUICK-WIZARD": "New DMP (Wizard)", @@ -92,8 +108,21 @@ "DATASET-UPDATE": "Update Dataset Description", "DATASET-PROFILES-NEW-VERSION": "New Version of Dataset Description Template", "DATASET-PROFILES-CLONE": "New Clone of Dataset Description Template" + }, + "FILE-TYPES": { + "PDF": "PDF", + "XML": "XML", + "JSON": "JSON", + "DOC": "Document" } }, + "COOKIE": { + "MESSAGE": "This website uses cookies to enhance the user experience.", + "DISMISS": "Accept", + "DENY": "Refuse cookies", + "LINK": "Learn more", + "POLICY": "Cookie Policy" + }, "EMAIL-CONFIRMATION": { "EXPIRED-EMAIL": "Mail invitation expired", "CARD-TITLE": "E-mail", @@ -219,7 +248,8 @@ "MULTIPLICITY-ADD-ONE-FIELD": "Add one more fieldset", "ORDER": "Order", "COMMENT-PLACEHOLDER": "Please Specify", - "COMMENT-HINT": "Provide additional information or justification about your selection" + "COMMENT-HINT": "Provide additional information or justification about your selection", + "RDA-COMMON-STANDARDS": "RDA Common Standards" }, "ACTIONS": { "ADD-CHILD-FIELD": "Add Child Field +" @@ -344,6 +374,7 @@ "PUBLISH": "Publish", "FINALIZE": "Finalize", "ADV-EXP": "Advanced Export", + "EXP-AS": "Export As", "DOWNLOAD-XML": "Download XML", "DOWNLOAD-DOCX": "Download Document", "DOWNLOAD-PDF": "Download PDF", @@ -414,6 +445,7 @@ "SAVE-AND-FINALISE": "Save and Finalize", "FINALIZE": "Finalize", "REVERSE": "Undo Finalization", + "INFO": "Datasets of finalized DMPs can't revert to unfinalized", "DOWNLOAD-PDF": "Download PDF", "DOWNLOAD-XML": "Download XML", "DOWNLOAD-DOCX": "Download DOCX", @@ -432,12 +464,13 @@ "UPLOAD-XML-FILE-CANCEL": "Cancel" }, "DIALOGUE": { + "TITLE": "Copy Dataset Description to DMP", "DMP-SEARCH": { "PLACEHOLDER": "Search DMP" }, "COPY": "Copy", "CANCEL": "Cancel", - "ERROR-MESSAGE": "Selected DMP does not contain this Dataset Description Template" + "ERROR-MESSAGE": "Does not contain this Dataset Description Template" } }, "DMP-OVERVIEW": { @@ -451,6 +484,7 @@ "DATASET-LISTING": { "TITLE": "Dataset Descriptions", "SELECT-DATASETS-TO-CLONE": "Select which datasets to include in the new DMP. Selected datasets will be editable.", + "SELECT-DATASETS-NONE": "Not available Dataset Descriptions for this DMP.", "COLUMNS": { "NAME": "Name", "REFERNCE": "Reference", @@ -632,7 +666,8 @@ }, "DATASET-TEMPLATE-LIST": { "TITLE": "Available Dataset Templates", - "TEXT": "Dataset Profiles selected: " + "TEXT": "Dataset Profiles selected: ", + "OK": "OK" } }, "DMP-PROFILE-LISTING": { @@ -728,7 +763,8 @@ "DATAREPOSITORIES": "Data Repositories", "REGISTRIES": "Registries", "SERVICES": "Services", - "EXTERNAL-DATASETS": "External Dataset", + "EXTERNAL-DATASETS": "External Datasets", + "EXTERNAL-DATASETS-DESCRIPTION": "Datasets related to the one being described in the DMP, either utilized for its production or being a derivative or byproduct of its utilization", "EXTERNAL-DATASET-TYPE": "External Dataset Type", "EXTERNAL-DATASET-INFO": "External Dataset Info", "DATAREPOSITORIES-INFO": "Data Repositories Info", @@ -839,7 +875,11 @@ "DATASET-PROFILE-COMBO-BOX-TYPE": { "WORD-LIST": "Word List", "AUTOCOMPLETE": "Autocomplete", - "EXTERNAL-SOURCE-HINT": "External source" + "EXTERNAL-SOURCE-HINT": "External source", + "ACTIONS": { + "YES": "Yes", + "NO": "No" + } }, "DATASET-PROFILE-INTERNAL-DMP-ENTITIES-TYPE": { "RESEARCHERS": "Researchers", @@ -918,16 +958,28 @@ "FOOTER": { "CONTACT-SUPPORT": "Contact Support", "FAQ": "FAQ", - "GLOSSARY": "Glossary" + "GLOSSARY": "Glossary", + "TERMS-OF-SERVICE": "Terms Of Service", + "PRIVACY-POLICY": "Privacy Policy" }, "GLOSSARY": { "TITLE": "Glossary", + "TITLE-DASHED": "-Glossary-", "CLOSE": "Close" }, "FAQ": { "TITLE": "FAQ", + "TITLE-DASHED": "-FAQ-", "CLOSE": "Close" }, + "PRIVACY-POLICY": { + "TITLE": "-Privacy Policy-", + "MAIN-CONTENT": "" + }, + "TERMS-OF-SERVICE": { + "TITLE": "-Terms Of Service-", + "MAIN-CONTENT": "" + }, "CONTACT": { "SUPPORT": { "TITLE": "Contact Support", @@ -937,6 +989,7 @@ "CANCEL": "Cancel", "SEND": "Send" }, + "TITLE-DASHED": "-Contact Support-", "GUIDE": "Guide", "HELP": "Help", "GLOSSARY": "Glossary" @@ -1009,14 +1062,20 @@ } }, "GRANT": { - "TITLE": "Grant", + "TITLE": "Related Grant", "FILTER": "Filter Grants" }, "PROFILES": { "TITLE": "Dataset specification" }, + "ROLE": { + "TITLE": "Role", + "ANY": "Any", + "OWNER": "Owner", + "MEMBER": "Member" + }, "DMP-ORGANISATIONS": { - "TITLE": "DMP Organizations", + "TITLE": "Organization", "FILTER": "Filter Organizations" } }, diff --git a/dmp-frontend/src/assets/resources/skipDisable.json b/dmp-frontend/src/assets/resources/skipDisable.json index f87242f24..52c3be7b1 100644 --- a/dmp-frontend/src/assets/resources/skipDisable.json +++ b/dmp-frontend/src/assets/resources/skipDisable.json @@ -9,5 +9,6 @@ "TextAreaFieldDataEditorModel.label", "FreeTextFieldDataEditorModel.label", "WordListFieldDataEditorModel.label", - "FieldDataOptionEditorModel.label" + "FieldDataOptionEditorModel.label", + "FieldSetEditorModel.rdaCommonStandard" ] diff --git a/dmp-frontend/src/assets/scss/blue-theme.scss b/dmp-frontend/src/assets/scss/blue-theme.scss index 9e72e7d71..41868c1f7 100644 --- a/dmp-frontend/src/assets/scss/blue-theme.scss +++ b/dmp-frontend/src/assets/scss/blue-theme.scss @@ -1,70 +1,70 @@ -@import 'app/ui/misc/navigation/navigation.component.scss'; -@import '../node_modules/@angular/material/theming'; +@import "app/ui/misc/navigation/navigation.component.scss"; +@import "~@angular/material/theming"; // @import '../../../node_modules/@angular/material/theming'; $app-blue-theme-primary-palette: ( - 50: #e8eaf6, - 100: #c5cae9, - 200: #9fa8da, - 300: #7986cb, - 400: #5c6bc0, - 500: #3f51b5, - 600: #3949ab, - 700: #303f9f, - 800: #283593, - 900: #1a237e, - A100: #8c9eff, - A200: #536dfe, - A400: #3d5afe, - A700: #304ffe, - contrast: ( - 50: $black-87-opacity, - 100: $black-87-opacity, - 200: $black-87-opacity, - 300: white, - 400: white, - 500: $white-87-opacity, - 600: $white-87-opacity, - 700: $white-87-opacity, - 800: $white-87-opacity, - 900: $white-87-opacity, - A100: $black-87-opacity, - A200: white, - A400: white, - A700: $white-87-opacity, - ), + 50: #e2eef1, + 100: #b6d5dc, + 200: #86bac4, + 300: #559eac, + 400: #30899b, + 500: #0c7489, + 600: #0a6c81, + 700: #086176, + 800: #06576c, + 900: #034459, + A100: #8bddff, + A200: #58cfff, + A400: #25c0ff, + A700: #0bb9ff, + contrast: ( + 50: #000000, + 100: #000000, + 200: #000000, + 300: #000000, + 400: #ffffff, + 500: #ffffff, + 600: #ffffff, + 700: #ffffff, + 800: #ffffff, + 900: #ffffff, + A100: #000000, + A200: #000000, + A400: #ffffff, + A700: #ffffff + ) ); $app-blue-theme-accent-palette: ( - 50: #fce4ec, - 100: #f8bbd0, - 200: #f48fb1, - 300: #f06292, - 400: #ec407a, - 500: #e91e63, - 600: #d81b60, - 700: #c2185b, - 800: #ad1457, - 900: #880e4f, - A100: #ff80ab, - A200: #ff4081, - A400: #f50057, - A700: #c51162, - contrast: ( - 50: $black-87-opacity, - 100: $black-87-opacity, - 200: $black-87-opacity, - 300: $black-87-opacity, - 400: $black-87-opacity, - 500: white, - 600: white, - 700: $white-87-opacity, - 800: $white-87-opacity, - 900: $white-87-opacity, - A100: $black-87-opacity, - A200: white, - A400: white, - A700: white, - ) + 50: #e0f6f3, + 100: #b3e8e2, + 200: #80d9cf, + 300: #4dc9bc, + 400: #26bead, + 500: #00b29f, + 600: #00ab97, + 700: #00a28d, + 800: #009983, + 900: #008a72, + A100: #b6fff0, + A200: #83ffe6, + A400: #50ffdc, + A700: #36ffd7, + contrast: ( + 50: #000000, + 100: #000000, + 200: #000000, + 300: #000000, + 400: #000000, + 500: #ffffff, + 600: #ffffff, + 700: #000000, + 800: #000000, + 900: #000000, + A100: #000000, + A200: #ffffff, + A400: #ffffff, + A700: #ffffff + ) ); $app-blue-theme-primary: mat-palette($app-blue-theme-primary-palette); @@ -72,71 +72,70 @@ $app-blue-theme-accent: mat-palette($app-blue-theme-accent-palette, A200, A100, $app-blue-theme-warn: mat-palette($mat-red); $app-blue-theme-background: ( - status-bar: map_get($mat-grey, 300), - app-bar: map_get($mat-grey, 100), - background: map_get($mat-grey, 50), - hover: rgba(black, 0.04), - card: white, - dialog: white, - disabled-button: rgba(black, 0.12), - raised-button: white, - focused-button: $dark-focused, - selected-button: map_get($mat-grey, 300), - selected-disabled-button: map_get($mat-grey, 400), - disabled-button-toggle: map_get($mat-grey, 200), - unselected-chip: map_get($mat-grey, 300), - disabled-list-option: map_get($mat-grey, 200), + status-bar: map_get($mat-grey, 300), + app-bar: map_get($mat-grey, 100), + background: map_get($mat-grey, 50), + hover: rgba(black, 0.04), + card: white, + dialog: white, + disabled-button: rgba(black, 0.12), + raised-button: white, + focused-button: $dark-focused, + selected-button: map_get($mat-grey, 300), + selected-disabled-button: map_get($mat-grey, 400), + disabled-button-toggle: map_get($mat-grey, 200), + unselected-chip: map_get($mat-grey, 300), + disabled-list-option: map_get($mat-grey, 200) ); $app-blue-theme-foreground: ( - base: black, - divider: $dark-dividers, - dividers: $dark-dividers, - disabled: $dark-disabled-text, - disabled-button: rgba(black, 0.26), - disabled-text: $dark-disabled-text, - hint-text: $dark-disabled-text, - secondary-text: $dark-secondary-text, - icon: rgba(black, 0.54), - icons: rgba(black, 0.54), - text: rgba(black, 0.87), - slider-min: rgba(black, 0.87), - slider-off: rgba(black, 0.26), - slider-off-active: rgba(black, 0.38), + base: black, + divider: $dark-dividers, + dividers: $dark-dividers, + disabled: $dark-disabled-text, + disabled-button: rgba(black, 0.26), + disabled-text: $dark-disabled-text, + hint-text: $dark-disabled-text, + secondary-text: $dark-secondary-text, + icon: rgba(black, 0.54), + icons: rgba(black, 0.54), + text: rgba(black, 0.87), + slider-min: rgba(black, 0.87), + slider-off: rgba(black, 0.26), + slider-off-active: rgba(black, 0.38) ); $custom-theme: ( - primary: $app-blue-theme-primary, - accent: $app-blue-theme-accent, - warn: $app-blue-theme-warn, - is-dark: false, - foreground: $app-blue-theme-foreground, - background: $app-blue-theme-background, + primary: $app-blue-theme-primary, + accent: $app-blue-theme-accent, + warn: $app-blue-theme-warn, + is-dark: false, + foreground: $app-blue-theme-foreground, + background: $app-blue-theme-background ); $custom-typography: mat-typography-config( - $font-family: 'Lato, regular', - $headline: mat-typography-level(32px, 48px, 700), - $body-1: mat-typography-level(16px, 24px, 500) + $font-family: "Lato, regular", + $headline: mat-typography-level(32px, 48px, 700), + $body-1: mat-typography-level(16px, 24px, 500) ); .blue-theme { - @include mat-core(); + @include mat-core(); - @include angular-material-theme($custom-theme); - @include navigation-component-theme($custom-theme); + @include angular-material-theme($custom-theme); + @include navigation-component-theme($custom-theme); - // Override typography CSS classes (e.g., mat-h1, mat-display-1, mat-typography, etc.). - @include mat-base-typography($custom-typography); + // Override typography CSS classes (e.g., mat-h1, mat-display-1, mat-typography, etc.). + @include mat-base-typography($custom-typography); - // Override typography for a specific Angular Material components. - @include mat-checkbox-typography($custom-typography); + // Override typography for a specific Angular Material components. + @include mat-checkbox-typography($custom-typography); - // Override typography for all Angular Material, including mat-base-typography and all components. - @include angular-material-typography($custom-typography); - //If you're using Material's theming, you can also pass in your typography config to the mat-core mixin: - - // Override the typography in the core CSS. - @include mat-core($custom-typography); + // Override typography for all Angular Material, including mat-base-typography and all components. + @include angular-material-typography($custom-typography); + //If you're using Material's theming, you can also pass in your typography config to the mat-core mixin: + // Override the typography in the core CSS. + @include mat-core($custom-typography); } diff --git a/dmp-frontend/src/assets/scss/core/_tables.scss b/dmp-frontend/src/assets/scss/core/_tables.scss index 2d3da29c3..0a11b48eb 100644 --- a/dmp-frontend/src/assets/scss/core/_tables.scss +++ b/dmp-frontend/src/assets/scss/core/_tables.scss @@ -31,7 +31,8 @@ > tfoot > tr > th, > thead > tr > td, > tbody > tr > td, - > tfoot > tr > td{ + > tfoot > tr > td, + > tbody > a > td{ padding: 12px 8px; vertical-align: middle; } @@ -67,6 +68,10 @@ > tbody > tr{ position: relative; + } + + > tbody > a{ + position: relative; } } @@ -83,6 +88,14 @@ margin-bottom: 5px; } } + > tbody > tr > a{ + font-size: $font-paragraph; + + b{ + display: block; + margin-bottom: 5px; + } + } .td-name{ font-weight: $font-weight-default; font-size: 1.5em; @@ -183,3 +196,11 @@ thead.thead-inverse, .table.table-hover tbody tr:hover{ background-color: #f5f5f5; } + +.table-striped>tbody>a:nth-of-type(odd){ + background-color: #f9f9f9; +} + +.table.table-hover tbody a:hover{ + background-color: #f5f5f5; +} diff --git a/dmp-frontend/src/assets/scss/core/variables/_brand.scss b/dmp-frontend/src/assets/scss/core/variables/_brand.scss index 4a9a39cfe..14113fb30 100644 --- a/dmp-frontend/src/assets/scss/core/variables/_brand.scss +++ b/dmp-frontend/src/assets/scss/core/variables/_brand.scss @@ -3,7 +3,7 @@ /* brand Colors */ -$brand-primary: $purple-500 !default; +$brand-primary: $indigo-500 !default; $brand-info: $cyan-500 !default; $brand-success: $green-500 !default; $brand-warning: $orange-500 !default; diff --git a/dmp-frontend/src/assets/scss/core/variables/_colors.scss b/dmp-frontend/src/assets/scss/core/variables/_colors.scss index db0c1986a..05404a310 100644 --- a/dmp-frontend/src/assets/scss/core/variables/_colors.scss +++ b/dmp-frontend/src/assets/scss/core/variables/_colors.scss @@ -62,20 +62,20 @@ $deep-purple-a400: #651fff !default; $deep-purple-a700: #6200ea !default; $deep-purple: $deep-purple-500 !default; -$indigo-50: #e8eaf6 !default; -$indigo-100: #c5cae9 !default; -$indigo-200: #9fa8da !default; -$indigo-300: #7986cb !default; -$indigo-400: #5c6bc0 !default; -$indigo-500: #3f51b5 !default; -$indigo-600: #3949ab !default; -$indigo-700: #303f9f !default; -$indigo-800: #283593 !default; -$indigo-900: #1a237e !default; -$indigo-a100: #8c9eff !default; -$indigo-a200: #536dfe !default; -$indigo-a400: #3d5afe !default; -$indigo-a700: #304ffe !default; +$indigo-50: #e2eef1 !default; +$indigo-100: #b6d5dc !default; +$indigo-200: #86bac4 !default; +$indigo-300: #559eac !default; +$indigo-400: #30899b !default; +$indigo-500: #0c7489 !default; +$indigo-600: #0a6c81 !default; +$indigo-700: #086176 !default; +$indigo-800: #06576c !default; +$indigo-900: #034459 !default; +$indigo-a100: #8bddff !default; +$indigo-a200: #58cfff !default; +$indigo-a400: #25c0ff !default; +$indigo-a700: #0bb9ff !default; $indigo: $indigo-500 !default; $blue-50: #e3f2fd !default; diff --git a/dmp-frontend/src/assets/scss/material-dashboard.scss b/dmp-frontend/src/assets/scss/material-dashboard.scss index 94856c0dd..3ca0d9f37 100644 --- a/dmp-frontend/src/assets/scss/material-dashboard.scss +++ b/dmp-frontend/src/assets/scss/material-dashboard.scss @@ -14,43 +14,54 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ - @import "~@angular/material/prebuilt-themes/indigo-pink.css"; +@import "~@angular/material/prebuilt-themes/indigo-pink.css"; +@import "~@angular/material/theming"; // @import '../../../node_modules/@angular/material/theming'; +@import "./blue-theme.scss"; - @import "core/variables"; - @import "core/mixins"; - @import "~bootstrap/scss/bootstrap"; +@include mat-core(); +// Define a theme. +$custom-theme-primary: mat-palette($app-blue-theme-primary-palette, 900); +$custom-theme-accent: mat-palette($app-blue-theme-accent-palette); +// $custom-theme-accent: mat-palette($mat-pink, A200, A100, A400); +$custom-theme-warn: mat-palette($mat-red); +$custom-theme: mat-light-theme($custom-theme-primary, $custom-theme-accent, $custom-theme-warn); +@include angular-material-theme($custom-theme); - // Core Components - @import "core/buttons"; - @import "core/checkboxes"; - @import "core/radios"; - @import "core/forms"; - @import "core/input-group"; - @import "core/images"; - @import "core/navbar"; - @import "core/alerts"; - @import "core/type"; - @import "core/tabs"; - @import "core/tooltip"; - @import "core/popover"; - @import "core/dropdown"; - @import "core/togglebutton"; - @import "core/ripples"; - @import "core/footers"; - @import "core/sidebar-and-main-panel"; - @import "core/fixed-plugin"; - @import "core/tables"; - @import "core/misc"; +@import "core/variables"; +@import "core/mixins"; +@import "~bootstrap/scss/bootstrap"; + +// Core Components +@import "core/buttons"; +@import "core/checkboxes"; +@import "core/radios"; +@import "core/forms"; +@import "core/input-group"; +@import "core/images"; +@import "core/navbar"; +@import "core/alerts"; +@import "core/type"; +@import "core/tabs"; +@import "core/tooltip"; +@import "core/popover"; +@import "core/dropdown"; +@import "core/togglebutton"; +@import "core/ripples"; +@import "core/footers"; +@import "core/sidebar-and-main-panel"; +@import "core/fixed-plugin"; +@import "core/tables"; +@import "core/misc"; @import "core/cards"; @import "core/cards/card-stats"; @import "core/cards/card-profile"; @import "core/cards/card-plain"; - //plugin scss - @import "core/plugins/animate"; - @import "core/plugins/chartist"; - @import "core/plugins/perfect-scrollbar"; +//plugin scss +@import "core/plugins/animate"; +@import "core/plugins/chartist"; +@import "core/plugins/perfect-scrollbar"; - @import "core/responsive"; +@import "core/responsive"; diff --git a/dmp-frontend/src/environments/environment.prod.ts b/dmp-frontend/src/environments/environment.prod.ts index 553348a00..601551986 100644 --- a/dmp-frontend/src/environments/environment.prod.ts +++ b/dmp-frontend/src/environments/environment.prod.ts @@ -15,6 +15,7 @@ export const environment = { clientId: '', oauthUrl: 'https://www.linkedin.com/oauth/v2/authorization', redirectUri: 'http://localhost:4200/login/linkedin', + state: '' }, twitterConfiguration: { clientId: '', @@ -23,7 +24,8 @@ export const environment = { b2accessConfiguration: { clientId: '', oauthUrl: 'https://b2access-integration.fz-juelich.de:443/oauth2-as/oauth2-authz', - redirectUri: 'http://opendmp.eu/api/oauth/authorized/b2access' + redirectUri: 'http://opendmp.eu/api/oauth/authorized/b2access', + state: '' }, orcidConfiguration: { clientId: 'APP-766DI5LP8T75FC4R', diff --git a/dmp-frontend/src/environments/environment.staging.ts b/dmp-frontend/src/environments/environment.staging.ts index c5ee26c68..63cfd85e5 100644 --- a/dmp-frontend/src/environments/environment.staging.ts +++ b/dmp-frontend/src/environments/environment.staging.ts @@ -15,6 +15,7 @@ export const environment = { clientId: '', oauthUrl: 'https://www.linkedin.com/oauth/v2/authorization', redirectUri: 'https://devel.opendmp.eu/login/linkedin', + state: '' }, twitterConfiguration: { clientId: '', @@ -23,7 +24,8 @@ export const environment = { b2accessConfiguration: { clientId: '', oauthUrl: 'https://b2access-integration.fz-juelich.de:443/oauth2-as/oauth2-authz', - redirectUri: 'http://devel.opendmp.eu/api/oauth/authorized/b2access' + redirectUri: 'http://devel.opendmp.eu/api/oauth/authorized/b2access', + state: '' }, orcidConfiguration: { clientId: '', diff --git a/dmp-frontend/src/environments/environment.ts b/dmp-frontend/src/environments/environment.ts index 1af978058..193d09ace 100644 --- a/dmp-frontend/src/environments/environment.ts +++ b/dmp-frontend/src/environments/environment.ts @@ -8,13 +8,15 @@ export const environment = { }, defaultCulture: 'en-US', loginProviders: { - enabled: [1, 2, 3, 4, 5, 6, 7], + enabled: [1, 2, 3, 4, 5, 6, 7, 8], facebookConfiguration: { clientId: '' }, googleConfiguration: { clientId: '' }, linkedInConfiguration: { clientId: '', oauthUrl: 'https://www.linkedin.com/oauth/v2/authorization', redirectUri: 'http://localhost:4200/login/linkedin' + redirectUri: 'http://localhost:4200/login/linkedin', + state: '987654321' }, twitterConfiguration: { clientId: '', @@ -23,12 +25,19 @@ export const environment = { b2accessConfiguration: { clientId: '', oauthUrl: 'https://b2access-integration.fz-juelich.de:443/oauth2-as/oauth2-authz', - redirectUri: 'http://opendmp.eu/api/oauth/authorized/b2access' + redirectUri: 'http://localhost:4200/api/oauth/authorized/b2access', + state: '' }, orcidConfiguration: { clientId: 'APP-766DI5LP8T75FC4R', oauthUrl: 'https://orcid.org/oauth/authorize', redirectUri: 'http://localhost:4200/login/external/orcid' + }, + openAireConfiguration: { + clientId: '', + oauthUrl: '', + redirectUri: '', + state: '987654321' } }, logging: { diff --git a/dmp-frontend/src/polyfills.ts b/dmp-frontend/src/polyfills.ts index 1c0925f52..fa3cd0117 100644 --- a/dmp-frontend/src/polyfills.ts +++ b/dmp-frontend/src/polyfills.ts @@ -11,36 +11,20 @@ * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera), * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile. * - * Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html + * Learn more in https://angular.io/guide/browser-support */ /*************************************************************************************************** - * BROWSER POLYFILLS - */ +* BROWSER POLYFILLS +*/ -/** IE9, IE10 and IE11 requires all of the following polyfills. **/ -import 'core-js/es6/symbol'; -import 'core-js/es6/object'; -import 'core-js/es6/function'; -import 'core-js/es6/parse-int'; -import 'core-js/es6/parse-float'; -import 'core-js/es6/number'; -import 'core-js/es6/math'; -import 'core-js/es6/string'; -import 'core-js/es6/date'; -import 'core-js/es6/array'; -import 'core-js/es7/array'; //for array.includes -import 'core-js/es6/regexp'; -import 'core-js/es6/map'; -import 'core-js/es6/weak-map'; -import 'core-js/es6/set'; +import 'core-js/es7/array'; /** IE10 and IE11 requires the following for NgClass support on SVG elements */ //import 'classlist.js'; // Run `npm install --save classlist.js`. /** Evergreen browsers require these. **/ import 'core-js/es6/reflect'; -import 'core-js/es7/reflect'; /** diff --git a/dmp-frontend/src/styles.scss b/dmp-frontend/src/styles.scss index 107299ff2..affbc2410 100644 --- a/dmp-frontend/src/styles.scss +++ b/dmp-frontend/src/styles.scss @@ -1,18 +1,20 @@ +// @import "~@covalent/core/theming/all-theme"; +@import "~@angular/material/theming"; // @import '../node_modules/@angular/material/theming'; @import "~@angular/material/prebuilt-themes/indigo-pink.css"; +// Material-Bootstrap configuration @import "~bootstrap/scss/bootstrap"; -//Material-Bootstrap configuration -@import "assets/scss/bootstrap-material"; -@import "~@angular/material/theming"; -// @import "~@covalent/core/theming/all-theme"; -@include mat-core(); +// Custom Theme +// @import "./assets/scss/blue-theme.scss"; + // Define a theme. -$primary: mat-palette($mat-indigo); -$accent: mat-palette($mat-pink, A200, A100, A400); -$theme: mat-light-theme($primary, $accent); +// $primary: mat-palette($app-blue-theme-primary-palette); +// $accent: mat-palette($mat-pink, A200, A100, A400); +// $theme: mat-light-theme($primary, $accent); + // Include all theme styles for the components. -@include angular-material-theme($theme); +// @include angular-material-theme($theme); // @include covalent-theme($theme); .snackbar-warning { @@ -31,7 +33,9 @@ $theme: mat-light-theme($primary, $accent); } .lightblue-btn { - background-color: rgba(0, 112, 192, 1) !important; + background-color: rgb(0, 178, 159) !important; + color: white !important; + // background-color: rgba(0, 112, 192, 1) !important; } .listing-item { @@ -55,7 +59,8 @@ $theme: mat-light-theme($primary, $accent); .chip { padding: 0.1em 1em; border-radius: 10em; - background-color: rgba(0, 112, 192, 1); + background-color: #0d7489; + // background-color: rgba(0, 112, 192, 1); color: #fff; text-transform: uppercase; font-weight: 500; @@ -70,7 +75,8 @@ $theme: mat-light-theme($primary, $accent); border: 0.1em solid rgb(218, 227, 243); border-radius: 10em; background-color: rgb(236, 241, 249); - color: rgba(0, 112, 192, 1); + color: rgb(0, 178, 159); + // color: rgba(0, 112, 192, 1); // color: rgb(68, 114, 196); text-transform: uppercase; font-weight: 500; @@ -117,22 +123,23 @@ $theme: mat-light-theme($primary, $accent); margin-bottom: 0px; } - .draft-bookmark { - color: #e7e6e6; - display: inline; - position: absolute; - padding-top: 3px; - } + // .draft-bookmark { + // color: #e7e6e6; + // display: inline; + // position: absolute; + // padding-top: 3px; + // } - .finalized-bookmark { - color: #92d050; - display: inline; - position: absolute; - padding-top: 3px; - } + // .finalized-bookmark { + // color: #08bd63; + // // color: #92d050; + // display: inline; + // position: absolute; + // padding-top: 3px; + // } h4 span { - color: #619ce3; + color: #089dbb; font-weight: 600; } } diff --git a/dmp-frontend/src/tsconfig.spec.json b/dmp-frontend/src/tsconfig.spec.json index 18bad40ed..c89454bef 100644 --- a/dmp-frontend/src/tsconfig.spec.json +++ b/dmp-frontend/src/tsconfig.spec.json @@ -3,8 +3,6 @@ "compilerOptions": { "outDir": "../out-tsc/spec", "baseUrl": "./", - "module": "commonjs", - "target": "es5", "types": [ "jasmine", "node" diff --git a/dmp-frontend/tsconfig.json b/dmp-frontend/tsconfig.json index c670a34f6..bfd2e9604 100644 --- a/dmp-frontend/tsconfig.json +++ b/dmp-frontend/tsconfig.json @@ -1,7 +1,9 @@ { "compilerOptions": { - "target": "es5", - "module": "commonjs", + "downlevelIteration": true, + "importHelpers": true, + "target": "es2015", + "module": "esnext", "moduleResolution": "node", "sourceMap": true, "emitDecoratorMetadata": true, diff --git a/dmp-frontend/tslint.json b/dmp-frontend/tslint.json index 4d352749b..b82bc955a 100644 --- a/dmp-frontend/tslint.json +++ b/dmp-frontend/tslint.json @@ -136,12 +136,12 @@ "app", "kebab-case" ], - "use-input-property-decorator": true, - "use-output-property-decorator": true, - "use-host-property-decorator": true, + "no-inputs-metadata-property": true, + "no-outputs-metadata-property": true, + "no-host-metadata-property": true, "no-input-rename": true, "no-output-rename": true, - "use-life-cycle-interface": true, + "use-lifecycle-interface": true, "use-pipe-transform-interface": true, "component-class-suffix": true, "directive-class-suffix": true
{{'USERS.LISTING.NAME' | translate}}