Merge branch 'Development' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
This commit is contained in:
commit
9580f89eea
|
@ -18,6 +18,7 @@ public class DataManagementPlanCriteria extends Criteria<DMP> {
|
||||||
private List<String> organisations;
|
private List<String> organisations;
|
||||||
private Integer role;
|
private Integer role;
|
||||||
private List<UUID> collaborators;
|
private List<UUID> collaborators;
|
||||||
|
private List<UUID> datasetTemplates;
|
||||||
|
|
||||||
public Date getPeriodStart() {
|
public Date getPeriodStart() {
|
||||||
return periodStart;
|
return periodStart;
|
||||||
|
@ -81,4 +82,11 @@ public class DataManagementPlanCriteria extends Criteria<DMP> {
|
||||||
public void setCollaborators(List<UUID> collaborators) {
|
public void setCollaborators(List<UUID> collaborators) {
|
||||||
this.collaborators = collaborators;
|
this.collaborators = collaborators;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<UUID> getDatasetTemplates() {
|
||||||
|
return datasetTemplates;
|
||||||
|
}
|
||||||
|
public void setDatasetTemplates(List<UUID> datasetTemplates) {
|
||||||
|
this.datasetTemplates = datasetTemplates;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,12 +6,50 @@ import java.util.List;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
public class DatasetProfileCriteria extends Criteria<DatasetProfile> {
|
public class DatasetProfileCriteria extends Criteria<DatasetProfile> {
|
||||||
|
|
||||||
|
public enum DatasetProfileFilter {
|
||||||
|
DMPs((short) 0), Datasets((short) 1);
|
||||||
|
|
||||||
|
private short value;
|
||||||
|
private DatasetProfileFilter(short value) {
|
||||||
|
this.value = value;
|
||||||
|
}
|
||||||
|
public short getValue() { return value; }
|
||||||
|
|
||||||
|
public static DatasetProfileFilter fromInteger(short value) {
|
||||||
|
switch (value) {
|
||||||
|
case 0:
|
||||||
|
return DMPs;
|
||||||
|
case 1:
|
||||||
|
return Datasets;
|
||||||
|
default:
|
||||||
|
throw new RuntimeException("Unsupported DatasetProfile filter");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private boolean allVersions;
|
private boolean allVersions;
|
||||||
private List<UUID> groupIds;
|
private List<UUID> groupIds;
|
||||||
|
private Short filter;
|
||||||
|
private UUID userId;
|
||||||
|
|
||||||
public boolean getAllVersions() { return allVersions; }
|
public boolean getAllVersions() { return allVersions; }
|
||||||
public void setAllVersions(boolean allVersions) { this.allVersions = allVersions; }
|
public void setAllVersions(boolean allVersions) { this.allVersions = allVersions; }
|
||||||
|
|
||||||
public List<UUID> getGroupIds() { return groupIds; }
|
public List<UUID> getGroupIds() { return groupIds; }
|
||||||
public void setGroupIds(List<UUID> groupIds) { this.groupIds = groupIds; }
|
public void setGroupIds(List<UUID> groupIds) { this.groupIds = groupIds; }
|
||||||
|
|
||||||
|
public Short getFilter() {
|
||||||
|
return filter;
|
||||||
|
}
|
||||||
|
public void setFilter(Short filter) {
|
||||||
|
this.filter = filter;
|
||||||
|
}
|
||||||
|
|
||||||
|
public UUID getUserId() {
|
||||||
|
return userId;
|
||||||
|
}
|
||||||
|
public void setUserId(UUID userId) {
|
||||||
|
this.userId = userId;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -68,6 +68,9 @@ public class DMPDaoImpl extends DatabaseAccess<DMP> implements DMPDao {
|
||||||
if (criteria.getCollaborators() != null && !criteria.getCollaborators().isEmpty()) {
|
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()));
|
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()));
|
query.where((builder, root) -> builder.notEqual(root.get("status"), DMP.DMPStatus.DELETED.getValue()));
|
||||||
return query;
|
return query;
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.scheduling.annotation.Async;
|
import org.springframework.scheduling.annotation.Async;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
import javax.persistence.criteria.JoinType;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
@ -34,6 +35,16 @@ public class DatasetProfileDaoImpl extends DatabaseAccess<DatasetProfile> implem
|
||||||
nestedRoot.get("groupId")), Arrays.asList(new SelectionField(FieldSelectionType.FIELD, "version")), String.class)));
|
nestedRoot.get("groupId")), Arrays.asList(new SelectionField(FieldSelectionType.FIELD, "version")), String.class)));
|
||||||
if (criteria.getGroupIds() != null && !criteria.getGroupIds().isEmpty())
|
if (criteria.getGroupIds() != null && !criteria.getGroupIds().isEmpty())
|
||||||
query.where((builder, root) -> root.get("groupId").in(criteria.getGroupIds()));
|
query.where((builder, root) -> root.get("groupId").in(criteria.getGroupIds()));
|
||||||
|
if (criteria.getFilter() != null && criteria.getUserId() != null) {
|
||||||
|
if (criteria.getFilter().equals(DatasetProfileCriteria.DatasetProfileFilter.DMPs.getValue())) {
|
||||||
|
query.initSubQuery(UUID.class).where((builder, root) ->
|
||||||
|
builder.and(root.get("id").in(
|
||||||
|
query.subQuery((builder1, root1) -> builder1.equal(root1.join("dmps", JoinType.LEFT).join("users", JoinType.LEFT).join("user", JoinType.LEFT).get("id"), criteria.getUserId()),
|
||||||
|
Arrays.asList(new SelectionField(FieldSelectionType.FIELD, "id")))),
|
||||||
|
builder.notEqual(root.get("id"), criteria.getUserId())));
|
||||||
|
//query.where(((builder, root) -> builder.equal(root.join("dmps", JoinType.LEFT).join("users", JoinType.LEFT).join("user", JoinType.LEFT).get("id"), criteria.getUserId())));
|
||||||
|
}
|
||||||
|
}
|
||||||
query.where(((builder, root) -> builder.notEqual(root.get("status"), DatasetProfile.Status.DELETED.getValue())));
|
query.where(((builder, root) -> builder.notEqual(root.get("status"), DatasetProfile.Status.DELETED.getValue())));
|
||||||
return query;
|
return query;
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,6 +4,7 @@ package eu.eudat.data.entities;
|
||||||
import eu.eudat.data.converters.DateToUTCConverter;
|
import eu.eudat.data.converters.DateToUTCConverter;
|
||||||
import eu.eudat.queryable.queryableentity.DataEntity;
|
import eu.eudat.queryable.queryableentity.DataEntity;
|
||||||
import org.hibernate.annotations.GenericGenerator;
|
import org.hibernate.annotations.GenericGenerator;
|
||||||
|
import org.hibernate.annotations.ManyToAny;
|
||||||
import org.hibernate.annotations.Type;
|
import org.hibernate.annotations.Type;
|
||||||
|
|
||||||
import javax.persistence.*;
|
import javax.persistence.*;
|
||||||
|
@ -16,7 +17,7 @@ import java.util.stream.Collectors;
|
||||||
@NamedEntityGraphs({
|
@NamedEntityGraphs({
|
||||||
@NamedEntityGraph(
|
@NamedEntityGraph(
|
||||||
name = "dataManagementPlanListingModel",
|
name = "dataManagementPlanListingModel",
|
||||||
attributeNodes = {@NamedAttributeNode("organisations"), @NamedAttributeNode("researchers"),
|
attributeNodes = {@NamedAttributeNode("organisations"), @NamedAttributeNode("researchers"), @NamedAttributeNode("associatedDmps"),
|
||||||
@NamedAttributeNode("project"), @NamedAttributeNode(value = "users", subgraph = "users"), @NamedAttributeNode("creator"), @NamedAttributeNode("profile"), @NamedAttributeNode("dataset")},
|
@NamedAttributeNode("project"), @NamedAttributeNode(value = "users", subgraph = "users"), @NamedAttributeNode("creator"), @NamedAttributeNode("profile"), @NamedAttributeNode("dataset")},
|
||||||
subgraphs = {
|
subgraphs = {
|
||||||
@NamedSubgraph(name = "users", attributeNodes = {@NamedAttributeNode("user")}),
|
@NamedSubgraph(name = "users", attributeNodes = {@NamedAttributeNode("user")}),
|
||||||
|
@ -91,9 +92,16 @@ public class DMP implements DataEntity<DMP, UUID> {
|
||||||
private Project project;
|
private Project project;
|
||||||
|
|
||||||
|
|
||||||
@Type(type = "eu.eudat.configurations.typedefinition.XMLType")
|
/*@Type(type = "eu.eudat.configurations.typedefinition.XMLType")
|
||||||
@Column(name = "\"AssociatedDmps\"", columnDefinition = "xml", nullable = true)
|
@Column(name = "\"AssociatedDmps\"", columnDefinition = "xml", nullable = true)
|
||||||
private String associatedDmps;
|
private String associatedDmps;*/
|
||||||
|
@OneToMany(fetch = FetchType.LAZY)
|
||||||
|
@JoinTable(name = "\"DMPDatasetProfile\"",
|
||||||
|
joinColumns = {@JoinColumn(name = "\"dmp\"", referencedColumnName = "\"ID\"")},
|
||||||
|
inverseJoinColumns = {@JoinColumn(name = "\"datasetprofile\"", referencedColumnName = "\"ID\"")}
|
||||||
|
)
|
||||||
|
private List<DatasetProfile> associatedDmps;
|
||||||
|
|
||||||
|
|
||||||
@ManyToOne(fetch = FetchType.LAZY)
|
@ManyToOne(fetch = FetchType.LAZY)
|
||||||
@JoinColumn(name = "\"Profile\"")
|
@JoinColumn(name = "\"Profile\"")
|
||||||
|
@ -229,10 +237,10 @@ public class DMP implements DataEntity<DMP, UUID> {
|
||||||
this.project = project;
|
this.project = project;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getAssociatedDmps() {
|
public List<DatasetProfile> getAssociatedDmps() {
|
||||||
return associatedDmps;
|
return associatedDmps;
|
||||||
}
|
}
|
||||||
public void setAssociatedDmps(String associatedDmps) {
|
public void setAssociatedDmps(List<DatasetProfile> associatedDmps) {
|
||||||
this.associatedDmps = associatedDmps;
|
this.associatedDmps = associatedDmps;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -79,6 +79,13 @@ public class DatasetProfile implements DataEntity<DatasetProfile,UUID>{
|
||||||
@Column(name = "\"Version\"", nullable = false)
|
@Column(name = "\"Version\"", nullable = false)
|
||||||
private Short version;
|
private Short version;
|
||||||
|
|
||||||
|
@ManyToMany(fetch = FetchType.LAZY)
|
||||||
|
@JoinTable(name = "\"DMPDatasetProfile\"",
|
||||||
|
joinColumns = {@JoinColumn(name = "\"datasetprofile\"", referencedColumnName = "\"ID\"")},
|
||||||
|
inverseJoinColumns = {@JoinColumn(name = "\"dmp\"", referencedColumnName = "\"ID\"")}
|
||||||
|
)
|
||||||
|
private List<DMP> dmps;
|
||||||
|
|
||||||
|
|
||||||
public String getDescription() {
|
public String getDescription() {
|
||||||
return description;
|
return description;
|
||||||
|
|
|
@ -94,6 +94,13 @@ public class Admin extends BaseController {
|
||||||
return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataTableData<DatasetProfileListingModel>>().status(ApiMessageCode.NO_MESSAGE).payload(datasetProfileTableData));
|
return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataTableData<DatasetProfileListingModel>>().status(ApiMessageCode.NO_MESSAGE).payload(datasetProfileTableData));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@RequestMapping(method = RequestMethod.POST, value = {"/datasetprofiles/using/paged"}, produces = "application/json")
|
||||||
|
public @ResponseBody
|
||||||
|
ResponseEntity<ResponseItem<DataTableData<DatasetProfileListingModel>>> getUsingDatasetProfilesPaged(@RequestBody DatasetProfileTableRequestItem datasetProfileTableRequestItem, Principal principal) throws Exception {
|
||||||
|
DataTableData<DatasetProfileListingModel> datasetProfileTableData = this.datasetProfileManager.getDatasetProfilesUsedByDMP(datasetProfileTableRequestItem, principal);
|
||||||
|
return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataTableData<DatasetProfileListingModel>>().status(ApiMessageCode.NO_MESSAGE).payload(datasetProfileTableData));
|
||||||
|
}
|
||||||
|
|
||||||
@RequestMapping(method = RequestMethod.POST, value = {"/preview"}, consumes = "application/json", produces = "application/json")
|
@RequestMapping(method = RequestMethod.POST, value = {"/preview"}, consumes = "application/json", produces = "application/json")
|
||||||
public ResponseEntity<ResponseItem<PagedDatasetProfile>> getPreview(@RequestBody DatasetProfile profile, @ClaimedAuthorities(claims = {ADMIN}) Principal principal) {
|
public ResponseEntity<ResponseItem<PagedDatasetProfile>> getPreview(@RequestBody DatasetProfile profile, @ClaimedAuthorities(claims = {ADMIN}) Principal principal) {
|
||||||
eu.eudat.data.entities.DatasetProfile modelDefinition = AdminManager.generateViewStyleDefinition(profile, getApiContext());
|
eu.eudat.data.entities.DatasetProfile modelDefinition = AdminManager.generateViewStyleDefinition(profile, getApiContext());
|
||||||
|
|
|
@ -133,7 +133,6 @@ public class DataManagementPlanManager {
|
||||||
|
|
||||||
CompletableFuture itemsFuture;
|
CompletableFuture itemsFuture;
|
||||||
if(fieldsGroup.equals("listing")){
|
if(fieldsGroup.equals("listing")){
|
||||||
|
|
||||||
itemsFuture = pagedItems.withHint(HintedModelFactory.getHint(DataManagementPlanListingModel.class))
|
itemsFuture = pagedItems.withHint(HintedModelFactory.getHint(DataManagementPlanListingModel.class))
|
||||||
.selectAsync(item -> {
|
.selectAsync(item -> {
|
||||||
item.setDataset(
|
item.setDataset(
|
||||||
|
@ -670,29 +669,19 @@ public class DataManagementPlanManager {
|
||||||
datasetsElement.appendChild(datasetElement);
|
datasetsElement.appendChild(datasetElement);
|
||||||
}
|
}
|
||||||
Element profiles = xmlDoc.createElement("profiles");
|
Element profiles = xmlDoc.createElement("profiles");
|
||||||
// Get DatasetProfiles from dmp to add to XML.
|
|
||||||
if (dmp.getAssociatedDmps() != null && !dmp.getAssociatedDmps().isEmpty()) {
|
// Get DatasetProfiles from DMP to add to XML.
|
||||||
Document viewStyleDoc = XmlBuilder.fromXml(dmp.getAssociatedDmps());
|
for (DatasetProfile datasetProfile : dmp.getAssociatedDmps()) {
|
||||||
Element item = (Element) viewStyleDoc.getElementsByTagName("profiles").item(0);
|
Element researcherElement = xmlDoc.createElement("researcher");
|
||||||
if (item != null) {
|
|
||||||
NodeList associatedProfilesElement = item.getChildNodes();
|
|
||||||
for (int temp = 0; temp < associatedProfilesElement.getLength(); temp++) {
|
|
||||||
Node associatedProfileElement = associatedProfilesElement.item(temp);
|
|
||||||
if (associatedProfileElement.getNodeType() == Node.ELEMENT_NODE) {
|
|
||||||
Element profile = xmlDoc.createElement("profile");
|
Element profile = xmlDoc.createElement("profile");
|
||||||
Element profileLabel = xmlDoc.createElement("profilelabel");
|
Element profileLabel = xmlDoc.createElement("profilelabel");
|
||||||
Node labelNode = associatedProfileElement.getAttributes().item(0);
|
profileLabel.setTextContent(datasetProfile.getLabel());
|
||||||
profileLabel.setTextContent(labelNode.getNodeValue());
|
|
||||||
profile.appendChild(profileLabel);
|
profile.appendChild(profileLabel);
|
||||||
Element profileId = xmlDoc.createElement("profileId");
|
Element profileId = xmlDoc.createElement("profileId");
|
||||||
Node idNode = associatedProfileElement.getAttributes().item(1);
|
profileId.setTextContent(datasetProfile.getId().toString());
|
||||||
profileId.setTextContent(idNode.getNodeValue());
|
|
||||||
profile.appendChild(profileId);
|
profile.appendChild(profileId);
|
||||||
profiles.appendChild(profile);
|
profiles.appendChild(profile);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
dmpElement.appendChild(profiles);
|
dmpElement.appendChild(profiles);
|
||||||
dmpElement.appendChild(datasetsElement);
|
dmpElement.appendChild(datasetsElement);
|
||||||
xmlDoc.appendChild(dmpElement);
|
xmlDoc.appendChild(dmpElement);
|
||||||
|
|
|
@ -3,7 +3,6 @@ package eu.eudat.logic.managers;
|
||||||
import com.jayway.jsonpath.DocumentContext;
|
import com.jayway.jsonpath.DocumentContext;
|
||||||
import com.jayway.jsonpath.JsonPath;
|
import com.jayway.jsonpath.JsonPath;
|
||||||
import eu.eudat.data.dao.criteria.DatasetProfileCriteria;
|
import eu.eudat.data.dao.criteria.DatasetProfileCriteria;
|
||||||
import eu.eudat.data.dao.entities.DatasetProfileDao;
|
|
||||||
import eu.eudat.data.entities.DatasetProfile;
|
import eu.eudat.data.entities.DatasetProfile;
|
||||||
import eu.eudat.data.query.items.item.datasetprofile.DatasetProfileAutocompleteRequest;
|
import eu.eudat.data.query.items.item.datasetprofile.DatasetProfileAutocompleteRequest;
|
||||||
import eu.eudat.data.query.items.table.datasetprofile.DatasetProfileTableRequestItem;
|
import eu.eudat.data.query.items.table.datasetprofile.DatasetProfileTableRequestItem;
|
||||||
|
@ -21,6 +20,7 @@ import eu.eudat.models.data.datasetprofile.DatasetProfileListingModel;
|
||||||
import eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field;
|
import eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field;
|
||||||
import eu.eudat.models.data.helpermodels.Tuple;
|
import eu.eudat.models.data.helpermodels.Tuple;
|
||||||
import eu.eudat.models.data.helpers.common.DataTableData;
|
import eu.eudat.models.data.helpers.common.DataTableData;
|
||||||
|
import eu.eudat.models.data.security.Principal;
|
||||||
import eu.eudat.queryable.QueryableList;
|
import eu.eudat.queryable.QueryableList;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.http.*;
|
import org.springframework.http.*;
|
||||||
|
@ -188,4 +188,19 @@ public class DatasetProfileManager {
|
||||||
throw new DatasetProfileNewVersionException("Version to update not the latest.");
|
throw new DatasetProfileNewVersionException("Version to update not the latest.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public DataTableData<DatasetProfileListingModel> getDatasetProfilesUsedByDMP(DatasetProfileTableRequestItem datasetProfileTableRequestItem, Principal principal) {
|
||||||
|
|
||||||
|
datasetProfileTableRequestItem.getCriteria().setFilter(DatasetProfileCriteria.DatasetProfileFilter.DMPs.getValue());
|
||||||
|
datasetProfileTableRequestItem.getCriteria().setUserId(principal.getId());
|
||||||
|
|
||||||
|
QueryableList<DatasetProfile> items = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().getWithCriteria(datasetProfileTableRequestItem.getCriteria());
|
||||||
|
List<DatasetProfileListingModel> listingModels = items.select(item -> new DatasetProfileListingModel().fromDataModel(item));
|
||||||
|
|
||||||
|
DataTableData<DatasetProfileListingModel> data = new DataTableData<>();
|
||||||
|
data.setData(listingModels);
|
||||||
|
data.setTotalCount((long) listingModels.size());
|
||||||
|
|
||||||
|
return data;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,6 @@ import eu.eudat.models.DataModel;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
|
|
||||||
public class DatasetProfileListingModel implements DataModel<DatasetProfile, DatasetProfileListingModel> {
|
public class DatasetProfileListingModel implements DataModel<DatasetProfile, DatasetProfileListingModel> {
|
||||||
|
|
||||||
private UUID id;
|
private UUID id;
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
package eu.eudat.models.data.dmp;
|
package eu.eudat.models.data.dmp;
|
||||||
|
|
||||||
|
import eu.eudat.data.entities.DatasetProfile;
|
||||||
import eu.eudat.logic.utilities.interfaces.XmlSerializable;
|
import eu.eudat.logic.utilities.interfaces.XmlSerializable;
|
||||||
import org.w3c.dom.Document;
|
import org.w3c.dom.Document;
|
||||||
import org.w3c.dom.Element;
|
import org.w3c.dom.Element;
|
||||||
|
@ -41,4 +42,17 @@ public class AssociatedProfile implements XmlSerializable<AssociatedProfile> {
|
||||||
this.label = item.getAttribute("label");
|
this.label = item.getAttribute("label");
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public DatasetProfile toData() {
|
||||||
|
DatasetProfile profile = new DatasetProfile();
|
||||||
|
profile.setId(this.id);
|
||||||
|
profile.setLabel(this.label);
|
||||||
|
return profile;
|
||||||
|
}
|
||||||
|
|
||||||
|
public AssociatedProfile fromData(DatasetProfile entity) {
|
||||||
|
this.id = entity.getId();
|
||||||
|
this.label = entity.getLabel();
|
||||||
|
return this;
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -206,7 +206,13 @@ public class DataManagementPlan implements DataModel<DMP, DataManagementPlan> {
|
||||||
if (entity.getCreator() != null) this.creator.fromDataModel(entity.getCreator());
|
if (entity.getCreator() != null) this.creator.fromDataModel(entity.getCreator());
|
||||||
|
|
||||||
if (entity.getAssociatedDmps() != null && !entity.getAssociatedDmps().isEmpty()) {
|
if (entity.getAssociatedDmps() != null && !entity.getAssociatedDmps().isEmpty()) {
|
||||||
Document viewStyleDoc = XmlBuilder.fromXml(entity.getAssociatedDmps());
|
this.profiles = new LinkedList<>();
|
||||||
|
for (DatasetProfile datasetProfile: entity.getAssociatedDmps()) {
|
||||||
|
AssociatedProfile associatedProfile = new AssociatedProfile().fromData(datasetProfile);
|
||||||
|
this.profiles.add(associatedProfile);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*Document viewStyleDoc = XmlBuilder.fromXml(entity.getAssociatedDmps());
|
||||||
Element item = (Element) viewStyleDoc.getElementsByTagName("profiles").item(0);
|
Element item = (Element) viewStyleDoc.getElementsByTagName("profiles").item(0);
|
||||||
this.profiles = new LinkedList<>();
|
this.profiles = new LinkedList<>();
|
||||||
if (item != null) {
|
if (item != null) {
|
||||||
|
@ -248,13 +254,19 @@ public class DataManagementPlan implements DataModel<DMP, DataManagementPlan> {
|
||||||
dataManagementPlanEntity.setStatus((short) this.status);
|
dataManagementPlanEntity.setStatus((short) this.status);
|
||||||
dataManagementPlanEntity.setDescription(this.description);
|
dataManagementPlanEntity.setDescription(this.description);
|
||||||
if (this.profiles != null) {
|
if (this.profiles != null) {
|
||||||
Document associatedProfileDoc = XmlBuilder.getDocument();
|
/* Document associatedProfileDoc = XmlBuilder.getDocument();
|
||||||
Element associatedProfilesElement = associatedProfileDoc.createElement("profiles");
|
Element associatedProfilesElement = associatedProfileDoc.createElement("profiles");
|
||||||
for (AssociatedProfile associatedProfile : this.profiles) {
|
for (AssociatedProfile associatedProfile : this.profiles) {
|
||||||
associatedProfilesElement.appendChild(associatedProfile.toXml(associatedProfileDoc));
|
associatedProfilesElement.appendChild(associatedProfile.toXml(associatedProfileDoc));
|
||||||
}
|
}
|
||||||
associatedProfileDoc.appendChild(associatedProfilesElement);
|
associatedProfileDoc.appendChild(associatedProfilesElement);
|
||||||
dataManagementPlanEntity.setAssociatedDmps(XmlBuilder.generateXml(associatedProfileDoc));
|
dataManagementPlanEntity.setAssociatedDmps(XmlBuilder.generateXml(associatedProfileDoc));*/
|
||||||
|
|
||||||
|
List<DatasetProfile> datasetProfiles = new LinkedList<>();
|
||||||
|
for (AssociatedProfile profile : this.profiles) {
|
||||||
|
datasetProfiles.add(profile.toData());
|
||||||
|
}
|
||||||
|
dataManagementPlanEntity.setAssociatedDmps(datasetProfiles);
|
||||||
}
|
}
|
||||||
dataManagementPlanEntity.setProperties(this.properties != null ? JSONObject.toJSONString(this.properties) : null);
|
dataManagementPlanEntity.setProperties(this.properties != null ? JSONObject.toJSONString(this.properties) : null);
|
||||||
dataManagementPlanEntity.setGroupId(this.groupId != null ? this.groupId : UUID.randomUUID());
|
dataManagementPlanEntity.setGroupId(this.groupId != null ? this.groupId : UUID.randomUUID());
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package eu.eudat.models.data.dmp;
|
package eu.eudat.models.data.dmp;
|
||||||
|
|
||||||
import eu.eudat.data.entities.DMP;
|
import eu.eudat.data.entities.DMP;
|
||||||
|
import eu.eudat.data.entities.DatasetProfile;
|
||||||
import eu.eudat.data.entities.UserDMP;
|
import eu.eudat.data.entities.UserDMP;
|
||||||
import eu.eudat.models.DataModel;
|
import eu.eudat.models.DataModel;
|
||||||
import eu.eudat.models.data.dataset.Dataset;
|
import eu.eudat.models.data.dataset.Dataset;
|
||||||
|
@ -175,13 +176,19 @@ public class DataManagementPlanNewVersionModel implements DataModel<DMP, DataMan
|
||||||
entity.setResearchers(new HashSet<>(this.researchers.stream().map(item -> item.toDataModel()).collect(Collectors.toList())));
|
entity.setResearchers(new HashSet<>(this.researchers.stream().map(item -> item.toDataModel()).collect(Collectors.toList())));
|
||||||
if (this.project != null) entity.setProject(this.project.toDataModel());
|
if (this.project != null) entity.setProject(this.project.toDataModel());
|
||||||
if (this.profiles != null) {
|
if (this.profiles != null) {
|
||||||
Document associatedProfileDoc = XmlBuilder.getDocument();
|
/*Document associatedProfileDoc = XmlBuilder.getDocument();
|
||||||
Element associatedProfilesElement = associatedProfileDoc.createElement("profiles");
|
Element associatedProfilesElement = associatedProfileDoc.createElement("profiles");
|
||||||
for (AssociatedProfile associatedProfile : this.profiles) {
|
for (AssociatedProfile associatedProfile : this.profiles) {
|
||||||
associatedProfilesElement.appendChild(associatedProfile.toXml(associatedProfileDoc));
|
associatedProfilesElement.appendChild(associatedProfile.toXml(associatedProfileDoc));
|
||||||
}
|
}
|
||||||
associatedProfileDoc.appendChild(associatedProfilesElement);
|
associatedProfileDoc.appendChild(associatedProfilesElement);
|
||||||
entity.setAssociatedDmps(XmlBuilder.generateXml(associatedProfileDoc));
|
entity.setAssociatedDmps(XmlBuilder.generateXml(associatedProfileDoc));*/
|
||||||
|
|
||||||
|
List<DatasetProfile> datasetProfiles = new LinkedList<>();
|
||||||
|
for (AssociatedProfile profile : this.profiles) {
|
||||||
|
datasetProfiles.add(profile.toData());
|
||||||
|
}
|
||||||
|
entity.setAssociatedDmps(datasetProfiles);
|
||||||
}
|
}
|
||||||
return entity;
|
return entity;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package eu.eudat.models.data.listingmodels;
|
package eu.eudat.models.data.listingmodels;
|
||||||
|
|
||||||
import eu.eudat.data.entities.DMP;
|
import eu.eudat.data.entities.DMP;
|
||||||
|
import eu.eudat.data.entities.DatasetProfile;
|
||||||
import eu.eudat.logic.utilities.builders.XmlBuilder;
|
import eu.eudat.logic.utilities.builders.XmlBuilder;
|
||||||
import eu.eudat.models.DataModel;
|
import eu.eudat.models.DataModel;
|
||||||
import eu.eudat.models.data.dmp.AssociatedProfile;
|
import eu.eudat.models.data.dmp.AssociatedProfile;
|
||||||
|
@ -174,7 +175,13 @@ public class DataManagementPlanListingModel implements DataModel<DMP, DataManage
|
||||||
this.projectId = entity.getProject().getId().toString();
|
this.projectId = entity.getProject().getId().toString();
|
||||||
|
|
||||||
if (entity.getAssociatedDmps() != null && !entity.getAssociatedDmps().isEmpty()) {
|
if (entity.getAssociatedDmps() != null && !entity.getAssociatedDmps().isEmpty()) {
|
||||||
Document viewStyleDoc = XmlBuilder.fromXml(entity.getAssociatedDmps());
|
this.associatedProfiles = new LinkedList<>();
|
||||||
|
for (DatasetProfile datasetProfile: entity.getAssociatedDmps()) {
|
||||||
|
AssociatedProfile associatedProfile = new AssociatedProfile().fromData(datasetProfile);
|
||||||
|
this.associatedProfiles.add(associatedProfile);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*Document viewStyleDoc = XmlBuilder.fromXml(entity.getAssociatedDmps());
|
||||||
Element item = (Element) viewStyleDoc.getElementsByTagName("profiles").item(0);
|
Element item = (Element) viewStyleDoc.getElementsByTagName("profiles").item(0);
|
||||||
this.associatedProfiles = new LinkedList<>();
|
this.associatedProfiles = new LinkedList<>();
|
||||||
if (item != null) {
|
if (item != null) {
|
||||||
|
@ -185,7 +192,7 @@ public class DataManagementPlanListingModel implements DataModel<DMP, DataManage
|
||||||
this.associatedProfiles.add(new AssociatedProfile().fromXml((Element) associatedProfileElement));
|
this.associatedProfiles.add(new AssociatedProfile().fromXml((Element) associatedProfileElement));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}*/
|
||||||
}
|
}
|
||||||
|
|
||||||
return this;
|
return this;
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package eu.eudat.models.data.listingmodels;
|
package eu.eudat.models.data.listingmodels;
|
||||||
|
|
||||||
import eu.eudat.data.entities.DMP;
|
import eu.eudat.data.entities.DMP;
|
||||||
|
import eu.eudat.data.entities.DatasetProfile;
|
||||||
import eu.eudat.logic.utilities.builders.XmlBuilder;
|
import eu.eudat.logic.utilities.builders.XmlBuilder;
|
||||||
import eu.eudat.models.DataModel;
|
import eu.eudat.models.DataModel;
|
||||||
import eu.eudat.models.data.dataset.DatasetOverviewModel;
|
import eu.eudat.models.data.dataset.DatasetOverviewModel;
|
||||||
|
@ -166,6 +167,13 @@ public class DataManagementPlanOverviewModel implements DataModel<DMP, DataManag
|
||||||
this.researchers = entity.getResearchers().stream().map(item -> new Researcher().fromDataModel(item)).collect(Collectors.toList());
|
this.researchers = entity.getResearchers().stream().map(item -> new Researcher().fromDataModel(item)).collect(Collectors.toList());
|
||||||
|
|
||||||
if (entity.getAssociatedDmps() != null && !entity.getAssociatedDmps().isEmpty()) {
|
if (entity.getAssociatedDmps() != null && !entity.getAssociatedDmps().isEmpty()) {
|
||||||
|
this.associatedProfiles = new LinkedList<>();
|
||||||
|
for (DatasetProfile datasetProfile : entity.getAssociatedDmps()) {
|
||||||
|
AssociatedProfile associatedProfile = new AssociatedProfile().fromData(datasetProfile);
|
||||||
|
this.associatedProfiles.add(associatedProfile);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/*if (entity.getAssociatedDmps() != null && !entity.getAssociatedDmps().isEmpty()) {
|
||||||
Document viewStyleDoc = XmlBuilder.fromXml(entity.getAssociatedDmps());
|
Document viewStyleDoc = XmlBuilder.fromXml(entity.getAssociatedDmps());
|
||||||
Element item = (Element) viewStyleDoc.getElementsByTagName("profiles").item(0);
|
Element item = (Element) viewStyleDoc.getElementsByTagName("profiles").item(0);
|
||||||
this.associatedProfiles = new LinkedList<>();
|
this.associatedProfiles = new LinkedList<>();
|
||||||
|
@ -178,7 +186,7 @@ public class DataManagementPlanOverviewModel implements DataModel<DMP, DataManag
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}*/
|
||||||
|
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,4 +10,5 @@ export class DmpCriteria extends BaseCriteria {
|
||||||
public status?: number;
|
public status?: number;
|
||||||
public role?: number;
|
public role?: number;
|
||||||
public collaborators?: string[] = [];
|
public collaborators?: string[] = [];
|
||||||
|
public datasetTemplates?: string[] = [];
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,6 +39,10 @@ export class DatasetProfileService {
|
||||||
return this.http.post<DataTableData<DatasetListingModel>>(this.actionUrl + 'datasetprofiles/getPaged', dataTableRequest);
|
return this.http.post<DataTableData<DatasetListingModel>>(this.actionUrl + 'datasetprofiles/getPaged', dataTableRequest);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getDatasetProfilesUsedPaged(dataTableRequest: DataTableRequest<DatasetProfileCriteria>) {
|
||||||
|
return this.http.post<DataTableData<DatasetListingModel>>(this.actionUrl + 'datasetprofiles/using/paged', dataTableRequest);
|
||||||
|
}
|
||||||
|
|
||||||
preview(data: DatasetProfile): Observable<DatasetProfileDefinitionModel> {
|
preview(data: DatasetProfile): Observable<DatasetProfileDefinitionModel> {
|
||||||
return this.http.post<DatasetProfileDefinitionModel>(this.actionUrl + 'preview', data);
|
return this.http.post<DatasetProfileDefinitionModel>(this.actionUrl + 'preview', data);
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,6 +17,8 @@ import { DatasetProfileEditorModel } from './dataset-profile-editor-model';
|
||||||
import { ConfirmationDialogComponent } from '../../../../library/confirmation-dialog/confirmation-dialog.component';
|
import { ConfirmationDialogComponent } from '../../../../library/confirmation-dialog/confirmation-dialog.component';
|
||||||
import { DatasetProfileEnum } from '../../../../core/common/enum/dataset-profile';
|
import { DatasetProfileEnum } from '../../../../core/common/enum/dataset-profile';
|
||||||
import * as FileSaver from 'file-saver';
|
import * as FileSaver from 'file-saver';
|
||||||
|
import { BreadcrumbItem } from '../../../misc/breadcrumb/definition/breadcrumb-item';
|
||||||
|
import { Observable } from 'rxjs';
|
||||||
//import * as data from 'src/assets/resources/skipDisable.json';
|
//import * as data from 'src/assets/resources/skipDisable.json';
|
||||||
|
|
||||||
const skipDisable: any[] = require('../../../../../assets/resources/skipDisable.json');
|
const skipDisable: any[] = require('../../../../../assets/resources/skipDisable.json');
|
||||||
|
@ -36,6 +38,7 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn
|
||||||
private datasetProfileId: string;
|
private datasetProfileId: string;
|
||||||
newVersionId: string;
|
newVersionId: string;
|
||||||
dataWizardModel: DatasetWizardModel;
|
dataWizardModel: DatasetWizardModel;
|
||||||
|
breadCrumbs: Observable<BreadcrumbItem[]>;
|
||||||
@ViewChild('stepper') stepper: MatHorizontalStepper;
|
@ViewChild('stepper') stepper: MatHorizontalStepper;
|
||||||
viewOnly = false;
|
viewOnly = false;
|
||||||
|
|
||||||
|
@ -82,6 +85,11 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn
|
||||||
},
|
},
|
||||||
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
|
||||||
|
}]);
|
||||||
} else if (cloneId != null) {
|
} else if (cloneId != null) {
|
||||||
this.datasetProfileService.clone(cloneId)
|
this.datasetProfileService.clone(cloneId)
|
||||||
.pipe(map(data => data as DatasetProfile), takeUntil(this._destroyed))
|
.pipe(map(data => data as DatasetProfile), takeUntil(this._destroyed))
|
||||||
|
|
|
@ -15,6 +15,7 @@ import { DatasetProfileCriteriaComponent } from './criteria/dataset-profile.comp
|
||||||
import { error } from 'selenium-webdriver';
|
import { error } from 'selenium-webdriver';
|
||||||
import { UiNotificationService, SnackBarNotificationLevel } from '../../../../core/services/notification/ui-notification-service';
|
import { UiNotificationService, SnackBarNotificationLevel } from '../../../../core/services/notification/ui-notification-service';
|
||||||
import { TranslateService } from '@ngx-translate/core';
|
import { TranslateService } from '@ngx-translate/core';
|
||||||
|
import { BreadcrumbItem } from '../../../misc/breadcrumb/definition/breadcrumb-item';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-dataset-profile-listing-component',
|
selector: 'app-dataset-profile-listing-component',
|
||||||
|
@ -27,6 +28,7 @@ export class DatasetProfileListingComponent extends BaseComponent implements OnI
|
||||||
@ViewChild(MatSort) sort: MatSort;
|
@ViewChild(MatSort) sort: MatSort;
|
||||||
@ViewChild(DatasetProfileCriteriaComponent) criteria: DatasetProfileCriteriaComponent;
|
@ViewChild(DatasetProfileCriteriaComponent) criteria: DatasetProfileCriteriaComponent;
|
||||||
|
|
||||||
|
breadCrumbs: Observable<BreadcrumbItem[]>;
|
||||||
dataSource: DatasetDataSource | null;
|
dataSource: DatasetDataSource | null;
|
||||||
displayedColumns: String[] = ['label', 'description', 'created', 'actions'];
|
displayedColumns: String[] = ['label', 'description', 'created', 'actions'];
|
||||||
pageEvent: PageEvent;
|
pageEvent: PageEvent;
|
||||||
|
@ -55,16 +57,24 @@ export class DatasetProfileListingComponent extends BaseComponent implements OnI
|
||||||
this.criteria.setCriteria(this.getDefaultCriteria());
|
this.criteria.setCriteria(this.getDefaultCriteria());
|
||||||
this.refresh();
|
this.refresh();
|
||||||
this.criteria.setRefreshCallback(() => this.refresh());
|
this.criteria.setRefreshCallback(() => this.refresh());
|
||||||
|
// this.breadCrumbs = Observable.of([{
|
||||||
|
// parentComponentName: null,
|
||||||
|
// label: this.language.instant('NAV-BAR.DATASET-TEMPLATES'),
|
||||||
|
// url: 'plans/edit/' + this.dmpId
|
||||||
|
// }]);
|
||||||
} else {
|
} else {
|
||||||
this.itemId = params['groupId'];
|
this.itemId = params['groupId'];
|
||||||
|
|
||||||
if (this.itemId) {
|
if (this.itemId) {
|
||||||
const datasetProfileLabel = this.route.snapshot.queryParams.groupLabel;
|
const datasetProfileLabel = this.route.snapshot.queryParams.groupLabel;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.criteria.setCriteria(this.getDefaultCriteria());
|
this.criteria.setCriteria(this.getDefaultCriteria());
|
||||||
this.refresh();
|
this.refresh();
|
||||||
this.criteria.setRefreshCallback(() => this.refresh());
|
this.criteria.setRefreshCallback(() => this.refresh());
|
||||||
|
this.breadCrumbs = Observable.of([{
|
||||||
|
parentComponentName: null,
|
||||||
|
label: this.language.instant('NAV-BAR.DATASET-TEMPLATES'),
|
||||||
|
url: '/dataset-profiles'
|
||||||
|
}]);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,6 +15,8 @@ import { DmpProfileService } from '../../../../core/services/dmp/dmp-profile.ser
|
||||||
import { SnackBarNotificationLevel, UiNotificationService } from '../../../../core/services/notification/ui-notification-service';
|
import { SnackBarNotificationLevel, UiNotificationService } from '../../../../core/services/notification/ui-notification-service';
|
||||||
import { EnumUtils } from '../../../../core/services/utilities/enum-utils.service';
|
import { EnumUtils } from '../../../../core/services/utilities/enum-utils.service';
|
||||||
import { DmpProfileEditorModel, DmpProfileFieldEditorModel } from './dmp-profile-editor.model';
|
import { DmpProfileEditorModel, DmpProfileFieldEditorModel } from './dmp-profile-editor.model';
|
||||||
|
import { BreadcrumbItem } from '../../../misc/breadcrumb/definition/breadcrumb-item';
|
||||||
|
import { Observable } from 'rxjs';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-dmp-profile-editor-component',
|
selector: 'app-dmp-profile-editor-component',
|
||||||
|
@ -29,6 +31,7 @@ export class DmpProfileEditorComponent extends BaseComponent implements AfterVie
|
||||||
formGroup: FormGroup = null;
|
formGroup: FormGroup = null;
|
||||||
host = environment.Server;
|
host = environment.Server;
|
||||||
dmpProfileId: string;
|
dmpProfileId: string;
|
||||||
|
breadCrumbs: Observable<BreadcrumbItem[]>;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private dmpProfileService: DmpProfileService,
|
private dmpProfileService: DmpProfileService,
|
||||||
|
@ -58,12 +61,22 @@ export class DmpProfileEditorComponent extends BaseComponent implements AfterVie
|
||||||
this.formGroup.disable();
|
this.formGroup.disable();
|
||||||
this.viewOnly = true
|
this.viewOnly = true
|
||||||
}
|
}
|
||||||
|
this.breadCrumbs = Observable.of([{
|
||||||
|
parentComponentName: 'DmpProfileListingComponent',
|
||||||
|
label: this.language.instant('NAV-BAR.TEMPLATE'),
|
||||||
|
url: '/dmp-profiles/' + this.dmpProfileId
|
||||||
|
}]);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
this.dmpProfileModel = new DmpProfileEditorModel();
|
this.dmpProfileModel = new DmpProfileEditorModel();
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this.formGroup = this.dmpProfileModel.buildForm();
|
this.formGroup = this.dmpProfileModel.buildForm();
|
||||||
});
|
});
|
||||||
|
this.breadCrumbs = Observable.of([{
|
||||||
|
parentComponentName: 'DmpProfileListingComponent',
|
||||||
|
label: this.language.instant('NAV-BAR.TEMPLATE'),
|
||||||
|
url: '/dmp-profiles/' + this.dmpProfileId
|
||||||
|
}]);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,6 +11,7 @@ import { DmpProfileCriteria } from '../../../../core/query/dmp/dmp-profile-crite
|
||||||
import { DmpProfileService } from '../../../../core/services/dmp/dmp-profile.service';
|
import { DmpProfileService } from '../../../../core/services/dmp/dmp-profile.service';
|
||||||
import { DataTableRequest } from '../../../../core/model/data-table/data-table-request';
|
import { DataTableRequest } from '../../../../core/model/data-table/data-table-request';
|
||||||
import { DmpProfileCriteriaComponent } from './criteria/dmp-profile-criteria.component';
|
import { DmpProfileCriteriaComponent } from './criteria/dmp-profile-criteria.component';
|
||||||
|
import { BreadcrumbItem } from '../../../misc/breadcrumb/definition/breadcrumb-item';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-dmp-profile-listing-component',
|
selector: 'app-dmp-profile-listing-component',
|
||||||
|
@ -28,6 +29,7 @@ export class DmpProfileListingComponent extends BaseComponent implements OnInit
|
||||||
pageEvent: PageEvent;
|
pageEvent: PageEvent;
|
||||||
titlePrefix: String;
|
titlePrefix: String;
|
||||||
dmpId: String;
|
dmpId: String;
|
||||||
|
breadCrumbs: Observable<BreadcrumbItem[]>;
|
||||||
|
|
||||||
statuses = [
|
statuses = [
|
||||||
{ value: '0', viewValue: 'Active' },
|
{ value: '0', viewValue: 'Active' },
|
||||||
|
@ -44,7 +46,6 @@ export class DmpProfileListingComponent extends BaseComponent implements OnInit
|
||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
this.route.params
|
this.route.params
|
||||||
.pipe(takeUntil(this._destroyed))
|
.pipe(takeUntil(this._destroyed))
|
||||||
|
@ -53,6 +54,11 @@ export class DmpProfileListingComponent extends BaseComponent implements OnInit
|
||||||
this.criteria.setCriteria(this.getDefaultCriteria());
|
this.criteria.setCriteria(this.getDefaultCriteria());
|
||||||
this.refresh();
|
this.refresh();
|
||||||
this.criteria.setRefreshCallback(() => this.refresh());
|
this.criteria.setRefreshCallback(() => this.refresh());
|
||||||
|
this.breadCrumbs = Observable.of([{
|
||||||
|
parentComponentName: null,
|
||||||
|
label: this.languageService.instant('NAV-BAR.DMP-TEMPLATES'),
|
||||||
|
url: '/dmp-profiles'
|
||||||
|
}]);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -73,7 +79,6 @@ export class DmpProfileListingComponent extends BaseComponent implements OnInit
|
||||||
// debugger;
|
// debugger;
|
||||||
// this.datasetService.makeDatasetPublic(id).pipe(takeUntil(this._destroyed)).subscribe();
|
// this.datasetService.makeDatasetPublic(id).pipe(takeUntil(this._destroyed)).subscribe();
|
||||||
// }
|
// }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export class DatasetDataSource extends DataSource<DmpProfileListing> {
|
export class DatasetDataSource extends DataSource<DmpProfileListing> {
|
||||||
|
@ -96,7 +101,6 @@ export class DatasetDataSource extends DataSource<DmpProfileListing> {
|
||||||
//this._sort.matSortChange
|
//this._sort.matSortChange
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
return Observable.merge(...displayDataChanges)
|
return Observable.merge(...displayDataChanges)
|
||||||
.startWith(null)
|
.startWith(null)
|
||||||
.switchMap(() => {
|
.switchMap(() => {
|
||||||
|
|
|
@ -9,6 +9,7 @@ import { UserService } from '../../../../core/services/user/user.service';
|
||||||
import { SnackBarNotificationComponent } from '../../../../library/notification/snack-bar/snack-bar-notification.component';
|
import { SnackBarNotificationComponent } from '../../../../library/notification/snack-bar/snack-bar-notification.component';
|
||||||
import { DataTableRequest } from '../../../../core/model/data-table/data-table-request';
|
import { DataTableRequest } from '../../../../core/model/data-table/data-table-request';
|
||||||
import { UserCriteriaComponent } from './criteria/user-criteria.component';
|
import { UserCriteriaComponent } from './criteria/user-criteria.component';
|
||||||
|
import { BreadcrumbItem } from '../../../misc/breadcrumb/definition/breadcrumb-item';
|
||||||
|
|
||||||
export class UsersDataSource extends DataSource<UserListingModel> {
|
export class UsersDataSource extends DataSource<UserListingModel> {
|
||||||
|
|
||||||
|
@ -93,6 +94,7 @@ export class UserListingComponent implements OnInit, AfterViewInit {
|
||||||
@ViewChild(MatSort) sort: MatSort;
|
@ViewChild(MatSort) sort: MatSort;
|
||||||
@ViewChild(UserCriteriaComponent) criteria: UserCriteriaComponent;
|
@ViewChild(UserCriteriaComponent) criteria: UserCriteriaComponent;
|
||||||
|
|
||||||
|
breadCrumbs: Observable<BreadcrumbItem[]>;
|
||||||
dataSource: UsersDataSource | null;
|
dataSource: UsersDataSource | null;
|
||||||
displayedColumns: String[] = ['name', 'email', 'lastloggedin', 'roles'];
|
displayedColumns: String[] = ['name', 'email', 'lastloggedin', 'roles'];
|
||||||
|
|
||||||
|
@ -105,6 +107,11 @@ export class UserListingComponent implements OnInit, AfterViewInit {
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
|
this.breadCrumbs = Observable.of([{
|
||||||
|
parentComponentName: null,
|
||||||
|
label: this.languageService.instant('NAV-BAR.USERS-BREADCRUMB'),
|
||||||
|
url: "/users"
|
||||||
|
}]);
|
||||||
//this.refresh(); //called on ngAfterViewInit with default criteria
|
//this.refresh(); //called on ngAfterViewInit with default criteria
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,7 @@ export class DatasetCreateWizard extends BaseComponent implements OnInit, IBread
|
||||||
this.breadCrumbs = Observable.of([
|
this.breadCrumbs = Observable.of([
|
||||||
{
|
{
|
||||||
parentComponentName: 'Dashboard',
|
parentComponentName: 'Dashboard',
|
||||||
label: 'Dataset description wizard',
|
label: this.language.instant('NAV-BAR.DATASET-DESCRIPTION-WIZARD'),
|
||||||
url: '/datasetcreatewizard'
|
url: '/datasetcreatewizard'
|
||||||
}]
|
}]
|
||||||
);
|
);
|
||||||
|
|
|
@ -136,7 +136,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr
|
||||||
this.breadCrumbs = Observable.of([
|
this.breadCrumbs = Observable.of([
|
||||||
{
|
{
|
||||||
parentComponentName: null,
|
parentComponentName: null,
|
||||||
label: 'Datasets',
|
label: this.language.instant('NAV-BAR.DATASET'),
|
||||||
url: '/datasets',
|
url: '/datasets',
|
||||||
notFoundResolver: [
|
notFoundResolver: [
|
||||||
{
|
{
|
||||||
|
@ -178,7 +178,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr
|
||||||
this.breadCrumbs = Observable.of([
|
this.breadCrumbs = Observable.of([
|
||||||
{
|
{
|
||||||
parentComponentName: null,
|
parentComponentName: null,
|
||||||
label: 'Datasets',
|
label: this.language.instant('NAV-BAR.DATASETS'),
|
||||||
url: '/datasets',
|
url: '/datasets',
|
||||||
notFoundResolver: [
|
notFoundResolver: [
|
||||||
{
|
{
|
||||||
|
@ -214,7 +214,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr
|
||||||
this.breadCrumbs = Observable.of([
|
this.breadCrumbs = Observable.of([
|
||||||
{
|
{
|
||||||
parentComponentName: null,
|
parentComponentName: null,
|
||||||
label: 'Datasets',
|
label: this.language.instant('NAV-BAR.DATASETS'),
|
||||||
url: '/datasets',
|
url: '/datasets',
|
||||||
notFoundResolver: [
|
notFoundResolver: [
|
||||||
{
|
{
|
||||||
|
@ -260,7 +260,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr
|
||||||
this.breadCrumbs = Observable.of([
|
this.breadCrumbs = Observable.of([
|
||||||
{
|
{
|
||||||
parentComponentName: null,
|
parentComponentName: null,
|
||||||
label: 'Datasets',
|
label: this.language.instant('NAV-BAR.DATASETS'),
|
||||||
url: '/datasets',
|
url: '/datasets',
|
||||||
notFoundResolver: [
|
notFoundResolver: [
|
||||||
{
|
{
|
||||||
|
@ -286,7 +286,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr
|
||||||
this.breadCrumbs = Observable.of([
|
this.breadCrumbs = Observable.of([
|
||||||
{
|
{
|
||||||
parentComponentName: null,
|
parentComponentName: null,
|
||||||
label: 'Datasets',
|
label: this.language.instant('NAV-BAR.DATASETS'),
|
||||||
url: '/datasets',
|
url: '/datasets',
|
||||||
notFoundResolver: [
|
notFoundResolver: [
|
||||||
{
|
{
|
||||||
|
|
|
@ -12,6 +12,7 @@ import { DmpService } from '../../../core/services/dmp/dmp.service';
|
||||||
import { BreadcrumbItem } from '../../misc/breadcrumb/definition/breadcrumb-item';
|
import { BreadcrumbItem } from '../../misc/breadcrumb/definition/breadcrumb-item';
|
||||||
import { IBreadCrumbComponent } from '../../misc/breadcrumb/definition/IBreadCrumbComponent';
|
import { IBreadCrumbComponent } from '../../misc/breadcrumb/definition/IBreadCrumbComponent';
|
||||||
import { DatasetCriteriaComponent } from './criteria/dataset-criteria.component';
|
import { DatasetCriteriaComponent } from './criteria/dataset-criteria.component';
|
||||||
|
import { TranslateService } from '@ngx-translate/core';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-dataset-listing-component',
|
selector: 'app-dataset-listing-component',
|
||||||
|
@ -38,6 +39,7 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB
|
||||||
private router: Router,
|
private router: Router,
|
||||||
private route: ActivatedRoute,
|
private route: ActivatedRoute,
|
||||||
private dmpService: DmpService,
|
private dmpService: DmpService,
|
||||||
|
private language: TranslateService,
|
||||||
) {
|
) {
|
||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
|
@ -56,7 +58,11 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB
|
||||||
this.criteria.setCriteria(this.getDefaultCriteria(dmp));
|
this.criteria.setCriteria(this.getDefaultCriteria(dmp));
|
||||||
this.refresh();
|
this.refresh();
|
||||||
this.criteria.setRefreshCallback((resetPages) => this.refresh(resetPages));
|
this.criteria.setRefreshCallback((resetPages) => this.refresh(resetPages));
|
||||||
this.breadCrumbs = Observable.of([{ parentComponentName: 'DmpEditorComponent', label: dmp.label, url: 'plans/edit/' + this.dmpId }]);
|
this.breadCrumbs = Observable.of([{
|
||||||
|
parentComponentName: 'DmpEditorComponent',
|
||||||
|
label: dmp.label,
|
||||||
|
url: '/plans/edit/' + this.dmpId
|
||||||
|
}]);
|
||||||
if (params['dmpLabel'] !== undefined) {
|
if (params['dmpLabel'] !== undefined) {
|
||||||
this.titlePrefix = 'for ' + params['dmpLabel'];
|
this.titlePrefix = 'for ' + params['dmpLabel'];
|
||||||
}
|
}
|
||||||
|
@ -64,7 +70,11 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB
|
||||||
this.criteria.setCriteria(this.getDefaultCriteria());
|
this.criteria.setCriteria(this.getDefaultCriteria());
|
||||||
this.refresh();
|
this.refresh();
|
||||||
this.criteria.setRefreshCallback((resetPages) => this.refresh(resetPages));
|
this.criteria.setRefreshCallback((resetPages) => this.refresh(resetPages));
|
||||||
this.breadCrumbs = Observable.of([]);
|
this.breadCrumbs = Observable.of([{
|
||||||
|
parentComponentName: null,
|
||||||
|
label: this.language.instant('NAV-BAR.DATASET-DESCRIPTIONS'),
|
||||||
|
url: "/datasets"
|
||||||
|
}]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.status != null && this.status == 0) {
|
if (this.status != null && this.status == 0) {
|
||||||
|
|
|
@ -117,7 +117,11 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
|
||||||
if (this.isAuthenticated) {
|
if (this.isAuthenticated) {
|
||||||
// if (!this.isAuthenticated) {
|
// if (!this.isAuthenticated) {
|
||||||
const breadCrumbs = [];
|
const breadCrumbs = [];
|
||||||
breadCrumbs.push({ parentComponentName: null, label: 'DMPs', url: "/plans" });
|
breadCrumbs.push({
|
||||||
|
parentComponentName: null,
|
||||||
|
label: this.language.instant('NAV-BAR.DMPS'),
|
||||||
|
url: "/plans"
|
||||||
|
});
|
||||||
const breadcrumb = await this.projectService.getSingle(this.dmp.project.id).map(x => ({ label: x.label, url: '/projects/edit/' + x.id }) as BreadcrumbItem).toPromise();
|
const breadcrumb = await this.projectService.getSingle(this.dmp.project.id).map(x => ({ label: x.label, url: '/projects/edit/' + x.id }) as BreadcrumbItem).toPromise();
|
||||||
breadCrumbs.push(
|
breadCrumbs.push(
|
||||||
{
|
{
|
||||||
|
@ -159,7 +163,7 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
|
||||||
this.breadCrumbs = Observable.of([
|
this.breadCrumbs = Observable.of([
|
||||||
{
|
{
|
||||||
parentComponentName: 'DmpListingComponent',
|
parentComponentName: 'DmpListingComponent',
|
||||||
label: 'DMPs',
|
label: this.language.instant('NAV-BAR.DMPS'),
|
||||||
url: 'plans',
|
url: 'plans',
|
||||||
notFoundResolver: [await this.projectService.getSingle(this.dmp.project.id).map(x => ({ label: x.label, url: '/projects/edit/' + x.id }) as BreadcrumbItem).toPromise()]
|
notFoundResolver: [await this.projectService.getSingle(this.dmp.project.id).map(x => ({ label: x.label, url: '/projects/edit/' + x.id }) as BreadcrumbItem).toPromise()]
|
||||||
}]
|
}]
|
||||||
|
@ -190,7 +194,7 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
|
||||||
this.breadCrumbs = Observable.of([
|
this.breadCrumbs = Observable.of([
|
||||||
{
|
{
|
||||||
parentComponentName: 'DmpListingComponent',
|
parentComponentName: 'DmpListingComponent',
|
||||||
label: 'DMPs',
|
label: this.language.instant('NAV-BAR.DMPS'),
|
||||||
url: 'plans',
|
url: 'plans',
|
||||||
}
|
}
|
||||||
]);
|
]);
|
||||||
|
|
|
@ -23,6 +23,19 @@
|
||||||
</div>
|
</div>
|
||||||
<!-- End of Visibility Filter-->
|
<!-- End of Visibility Filter-->
|
||||||
|
|
||||||
|
<!-- Related Dataset Templates Filter -->
|
||||||
|
<div *ngIf="showProject" class="col-10 gray-container">
|
||||||
|
<h6 class="category-title">{{ 'CRITERIA.DMP.RELATED-DATASET-TEMPLATES' | translate}}</h6>
|
||||||
|
<mat-form-field>
|
||||||
|
<app-multiple-auto-complete [formControl]="formGroup.get('datasetTemplates')"
|
||||||
|
placeholder="{{ 'CRITERIA.DMP.SELECT-DATASET-TEMPLATES' | translate }}"
|
||||||
|
[configuration]="datasetTemplateAutoCompleteConfiguration">
|
||||||
|
</app-multiple-auto-complete>
|
||||||
|
<mat-icon matSuffix class="style-icon">arrow_drop_down</mat-icon>
|
||||||
|
</mat-form-field>
|
||||||
|
</div>
|
||||||
|
<!-- End of Related Dataset Templates Filter -->
|
||||||
|
|
||||||
<!-- Related Project Filters -->
|
<!-- Related Project Filters -->
|
||||||
<div *ngIf="showProject" class="col-10 gray-container">
|
<div *ngIf="showProject" class="col-10 gray-container">
|
||||||
<h6 class="category-title">{{ 'DMP-RELATED-PROJECT.RELATED-PROJECT' | translate}}</h6>
|
<h6 class="category-title">{{ 'DMP-RELATED-PROJECT.RELATED-PROJECT' | translate}}</h6>
|
||||||
|
|
|
@ -17,6 +17,8 @@ import { UserService } from '../../../../core/services/user/user.service';
|
||||||
import { MultipleAutoCompleteConfiguration } from '../../../../library/auto-complete/multiple/multiple-auto-complete-configuration';
|
import { MultipleAutoCompleteConfiguration } from '../../../../library/auto-complete/multiple/multiple-auto-complete-configuration';
|
||||||
import { BaseCriteriaComponent } from '../../../misc/criteria/base-criteria.component';
|
import { BaseCriteriaComponent } from '../../../misc/criteria/base-criteria.component';
|
||||||
import { DmpUploadDialogue } from './upload-dialogue/dmp-upload-dialogue.component';
|
import { DmpUploadDialogue } from './upload-dialogue/dmp-upload-dialogue.component';
|
||||||
|
import { DatasetProfileCriteria } from '../../../../core/query/dataset-profile/dataset-profile-criteria';
|
||||||
|
import { DatasetProfileService } from '../../../../core/services/dataset-profile/dataset-profile.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-dmp-criteria-component',
|
selector: 'app-dmp-criteria-component',
|
||||||
|
@ -39,6 +41,7 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni
|
||||||
role: new FormControl,
|
role: new FormControl,
|
||||||
organisations: new FormControl(),
|
organisations: new FormControl(),
|
||||||
collaborators: new FormControl(),
|
collaborators: new FormControl(),
|
||||||
|
datasetTemplates: new FormControl()
|
||||||
});
|
});
|
||||||
|
|
||||||
collaboratorsAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = {
|
collaboratorsAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = {
|
||||||
|
@ -48,6 +51,13 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni
|
||||||
titleFn: (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)),
|
||||||
|
displayFn: (item) => item['label'],
|
||||||
|
titleFn: (item) => item['label']
|
||||||
|
};
|
||||||
|
|
||||||
projectAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = {
|
projectAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = {
|
||||||
filterFn: this.filterProject.bind(this),
|
filterFn: this.filterProject.bind(this),
|
||||||
initialItems: (excludedItems: any[]) => this.filterProject('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)),
|
initialItems: (excludedItems: any[]) => this.filterProject('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)),
|
||||||
|
@ -70,6 +80,7 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni
|
||||||
private dialog: MatDialog,
|
private dialog: MatDialog,
|
||||||
private organisationService: OrganisationService,
|
private organisationService: OrganisationService,
|
||||||
private userService: UserService,
|
private userService: UserService,
|
||||||
|
private datasetProfileService: DatasetProfileService
|
||||||
) {
|
) {
|
||||||
super(new ValidationErrorModel());
|
super(new ValidationErrorModel());
|
||||||
}
|
}
|
||||||
|
@ -94,6 +105,9 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni
|
||||||
this.formGroup.get('collaborators').valueChanges
|
this.formGroup.get('collaborators').valueChanges
|
||||||
.pipe(takeUntil(this._destroyed))
|
.pipe(takeUntil(this._destroyed))
|
||||||
.subscribe(x => this.controlModified());
|
.subscribe(x => this.controlModified());
|
||||||
|
this.formGroup.get('datasetTemplates').valueChanges
|
||||||
|
.pipe(takeUntil(this._destroyed))
|
||||||
|
.subscribe(x => this.controlModified());
|
||||||
//if (this.criteria == null) { this.criteria = new DataManagementPlanCriteria(); }
|
//if (this.criteria == null) { this.criteria = new DataManagementPlanCriteria(); }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -103,6 +117,7 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni
|
||||||
this.formGroup.get('status').patchValue(criteria.status);
|
this.formGroup.get('status').patchValue(criteria.status);
|
||||||
this.formGroup.get('role').patchValue(criteria.role);
|
this.formGroup.get('role').patchValue(criteria.role);
|
||||||
this.formGroup.get('collaborators').patchValue(criteria.collaborators);
|
this.formGroup.get('collaborators').patchValue(criteria.collaborators);
|
||||||
|
this.formGroup.get('datasetTemplates').patchValue(criteria.datasetTemplates);
|
||||||
}
|
}
|
||||||
|
|
||||||
onCallbackError(error: any) {
|
onCallbackError(error: any) {
|
||||||
|
@ -147,6 +162,15 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni
|
||||||
return this.userService.getCollaboratorsPaged(collaboratorsRequestItem).map(x => x.data);
|
return this.userService.getCollaboratorsPaged(collaboratorsRequestItem).map(x => x.data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
filterDatasetTemplate(query: string) {
|
||||||
|
const fields: Array<string> = new Array<string>();
|
||||||
|
fields.push('asc');
|
||||||
|
const datasetTemplateRequestItem: DataTableRequest<DatasetProfileCriteria> = new DataTableRequest(0, null, { fields: fields });
|
||||||
|
datasetTemplateRequestItem.criteria = new DatasetProfileCriteria();
|
||||||
|
datasetTemplateRequestItem.criteria.like = query;
|
||||||
|
return this.datasetProfileService.getDatasetProfilesUsedPaged(datasetTemplateRequestItem).map(x => x.data);
|
||||||
|
}
|
||||||
|
|
||||||
fileSave(event) {
|
fileSave(event) {
|
||||||
const dialogRef = this.dialog.open(DmpUploadDialogue, {
|
const dialogRef = this.dialog.open(DmpUploadDialogue, {
|
||||||
data: {
|
data: {
|
||||||
|
|
|
@ -14,6 +14,7 @@ import { BreadcrumbItem } from '../../misc/breadcrumb/definition/breadcrumb-item
|
||||||
import { IBreadCrumbComponent } from '../../misc/breadcrumb/definition/IBreadCrumbComponent';
|
import { IBreadCrumbComponent } from '../../misc/breadcrumb/definition/IBreadCrumbComponent';
|
||||||
import { DmpInvitationDialogComponent } from '../invitation/dmp-invitation.component';
|
import { DmpInvitationDialogComponent } from '../invitation/dmp-invitation.component';
|
||||||
import { DmpCriteriaComponent } from './criteria/dmp-criteria.component';
|
import { DmpCriteriaComponent } from './criteria/dmp-criteria.component';
|
||||||
|
import { TranslateService } from '@ngx-translate/core';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-dmp-listing-component',
|
selector: 'app-dmp-listing-component',
|
||||||
|
@ -39,7 +40,8 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
|
||||||
private router: Router,
|
private router: Router,
|
||||||
private route: ActivatedRoute,
|
private route: ActivatedRoute,
|
||||||
private dialog: MatDialog,
|
private dialog: MatDialog,
|
||||||
public enumUtils: EnumUtils
|
public enumUtils: EnumUtils,
|
||||||
|
private language: TranslateService,
|
||||||
) {
|
) {
|
||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
|
@ -67,13 +69,18 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
|
||||||
|
|
||||||
if (this.itemId) {
|
if (this.itemId) {
|
||||||
const dmplabel = this.route.snapshot.queryParams.groupLabel;
|
const dmplabel = this.route.snapshot.queryParams.groupLabel;
|
||||||
breadCrumbs.push(
|
breadCrumbs.push({
|
||||||
{ parentComponentName: null, label: 'DMPs', url: '/plans' },
|
parentComponentName: null,
|
||||||
);
|
label: this.language.instant('NAV-BAR.DMPS'),
|
||||||
|
url: '/plans'
|
||||||
|
});
|
||||||
}
|
}
|
||||||
else breadCrumbs.push({ parentComponentName: null, label: 'DMPs', url: "/plans" })
|
else breadCrumbs.push({
|
||||||
|
parentComponentName: null,
|
||||||
|
label: this.language.instant('NAV-BAR.DMPS'),
|
||||||
|
url: "/plans"
|
||||||
|
})
|
||||||
this.breadCrumbs = Observable.of(breadCrumbs);
|
this.breadCrumbs = Observable.of(breadCrumbs);
|
||||||
|
|
||||||
this.criteria.setCriteria(this.getDefaultCriteria());
|
this.criteria.setCriteria(this.getDefaultCriteria());
|
||||||
this.refresh();
|
this.refresh();
|
||||||
this.criteria.setRefreshCallback((resetPages) => this.refresh(resetPages));
|
this.criteria.setRefreshCallback((resetPages) => this.refresh(resetPages));
|
||||||
|
@ -102,12 +109,12 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
|
||||||
status: value.status,
|
status: value.status,
|
||||||
role: value.role
|
role: value.role
|
||||||
}
|
}
|
||||||
if (value.collaborators) {
|
if (value.datasetTemplates)
|
||||||
request.criteria.collaborators = value.collaborators.map(x => x.id)
|
request.criteria.datasetTemplates = value.datasetTemplates.map(x => x.id);
|
||||||
}
|
if (value.collaborators)
|
||||||
if (value.organisations) {
|
request.criteria.collaborators = value.collaborators.map(x => x.id);
|
||||||
request.criteria.organisations = value.organisations.map(x => x.id)
|
if (value.organisations)
|
||||||
}
|
request.criteria.organisations = value.organisations.map(x => x.id);
|
||||||
if (this.itemId) {
|
if (this.itemId) {
|
||||||
request.criteria.groupIds = [this.itemId];
|
request.criteria.groupIds = [this.itemId];
|
||||||
request.criteria.allVersions = true;
|
request.criteria.allVersions = true;
|
||||||
|
@ -132,7 +139,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
|
||||||
}
|
}
|
||||||
|
|
||||||
rowClicked(dmp: DmpListingModel) {
|
rowClicked(dmp: DmpListingModel) {
|
||||||
this.router.navigate(['/plans/overview/' + dmp.id, { dmpLabel: dmp.label }]);
|
this.router.navigate(['/plans/overview/' + dmp.id]);
|
||||||
// this.router.navigate(['/plans/edit/' + dmp.id]);
|
// this.router.navigate(['/plans/edit/' + dmp.id]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -53,13 +53,11 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
|
||||||
.pipe(takeUntil(this._destroyed))
|
.pipe(takeUntil(this._destroyed))
|
||||||
.subscribe(data => {
|
.subscribe(data => {
|
||||||
this.dmp = data;
|
this.dmp = data;
|
||||||
})
|
|
||||||
if (params['dmpLabel'] !== undefined) {
|
|
||||||
const breadCrumbs = [];
|
const breadCrumbs = [];
|
||||||
breadCrumbs.push({ parentComponentName: null, label: 'DMPs', url: "/plans" });
|
breadCrumbs.push({ parentComponentName: null, label: 'DMPs', url: "/plans" });
|
||||||
breadCrumbs.push({ parentComponentName: 'DmpListingComponent', label: params['dmpLabel'], url: '/overview/' + itemId });
|
breadCrumbs.push({ parentComponentName: 'DmpListingComponent', label: this.dmp.label, url: '/overview/' + this.dmp.id });
|
||||||
this.breadCrumbs = Observable.of(breadCrumbs);
|
this.breadCrumbs = Observable.of(breadCrumbs);
|
||||||
}
|
})
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,6 +10,7 @@ import { DatasetService } from '../../core/services/dataset/dataset.service';
|
||||||
import { IBreadCrumbComponent } from '../misc/breadcrumb/definition/IBreadCrumbComponent';
|
import { IBreadCrumbComponent } from '../misc/breadcrumb/definition/IBreadCrumbComponent';
|
||||||
import { BreadcrumbItem } from '../misc/breadcrumb/definition/breadcrumb-item';
|
import { BreadcrumbItem } from '../misc/breadcrumb/definition/breadcrumb-item';
|
||||||
import { Observable } from 'rxjs';
|
import { Observable } from 'rxjs';
|
||||||
|
import { TranslateService } from '@ngx-translate/core';
|
||||||
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
|
@ -30,6 +31,7 @@ export class ExploreDatasetListingComponent extends BaseComponent implements OnI
|
||||||
constructor(
|
constructor(
|
||||||
private datasetService: DatasetService,
|
private datasetService: DatasetService,
|
||||||
private router: Router,
|
private router: Router,
|
||||||
|
private language: TranslateService,
|
||||||
) {
|
) {
|
||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
|
@ -38,7 +40,11 @@ export class ExploreDatasetListingComponent extends BaseComponent implements OnI
|
||||||
this.refresh();
|
this.refresh();
|
||||||
|
|
||||||
const breadCrumbs = [];
|
const breadCrumbs = [];
|
||||||
breadCrumbs.push({ parentComponentName: null, label: 'PUBLIC DATASETS', url: "/explore" })
|
breadCrumbs.push({
|
||||||
|
parentComponentName: null,
|
||||||
|
label: this.language.instant('NAV-BAR.PUBLIC DATASETS'),
|
||||||
|
url: "/explore"
|
||||||
|
})
|
||||||
this.breadCrumbs = Observable.of(breadCrumbs);
|
this.breadCrumbs = Observable.of(breadCrumbs);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,6 +10,7 @@ import { DmpService } from "../../core/services/dmp/dmp.service";
|
||||||
import { Observable } from "rxjs";
|
import { Observable } from "rxjs";
|
||||||
import { IBreadCrumbComponent } from "../misc/breadcrumb/definition/IBreadCrumbComponent";
|
import { IBreadCrumbComponent } from "../misc/breadcrumb/definition/IBreadCrumbComponent";
|
||||||
import { BreadcrumbItem } from "../misc/breadcrumb/definition/breadcrumb-item";
|
import { BreadcrumbItem } from "../misc/breadcrumb/definition/breadcrumb-item";
|
||||||
|
import { TranslateService } from "@ngx-translate/core";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-explore-dmp-listing-component',
|
selector: 'app-explore-dmp-listing-component',
|
||||||
|
@ -29,7 +30,8 @@ export class ExploreDmpListingComponent extends BaseComponent implements OnInit,
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private dmpService: DmpService,
|
private dmpService: DmpService,
|
||||||
private router: Router
|
private router: Router,
|
||||||
|
private language: TranslateService,
|
||||||
) {
|
) {
|
||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
|
@ -38,7 +40,11 @@ export class ExploreDmpListingComponent extends BaseComponent implements OnInit,
|
||||||
this.refresh();
|
this.refresh();
|
||||||
|
|
||||||
const breadCrumbs = [];
|
const breadCrumbs = [];
|
||||||
breadCrumbs.push({ parentComponentName: null, label: 'PUBLIC DMPS', url: "/explore-plans" })
|
breadCrumbs.push({
|
||||||
|
parentComponentName: null,
|
||||||
|
label: this.language.instant('NAV-BAR.PUBLIC DMPS'),
|
||||||
|
url: "/explore-plans"
|
||||||
|
})
|
||||||
this.breadCrumbs = Observable.of(breadCrumbs);
|
this.breadCrumbs = Observable.of(breadCrumbs);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -6,6 +6,7 @@ import { BreadCrumbResolverService } from './service/breadcrumb.service';
|
||||||
import { DashboardService } from '../../../core/services/dashboard/dashboard.service';
|
import { DashboardService } from '../../../core/services/dashboard/dashboard.service';
|
||||||
import { assertDataInRangeInternal } from '@angular/core/src/render3/util';
|
import { assertDataInRangeInternal } from '@angular/core/src/render3/util';
|
||||||
import { url } from 'inspector';
|
import { url } from 'inspector';
|
||||||
|
import { TranslateService } from '@ngx-translate/core';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-breadcrumb',
|
selector: 'app-breadcrumb',
|
||||||
|
@ -22,19 +23,22 @@ export class BreadcrumbComponent implements OnInit {
|
||||||
constructor(
|
constructor(
|
||||||
public activatedRoute: ActivatedRoute,
|
public activatedRoute: ActivatedRoute,
|
||||||
private router: Router,
|
private router: Router,
|
||||||
private breadCrumbService: BreadCrumbResolverService
|
private breadCrumbService: BreadCrumbResolverService,
|
||||||
|
private language: TranslateService,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
buildBreadCrumb(route: ActivatedRoute): Observable<BreadcrumbItem[]> {
|
buildBreadCrumb(route: ActivatedRoute): Observable<BreadcrumbItem[]> {
|
||||||
if (this.breadCrumbService.resolve(route)) {
|
if (this.breadCrumbService.resolve(route)) {
|
||||||
return this.breadCrumbService.resolve(route).map(x => {
|
return this.breadCrumbService.resolve(route).map(x => {
|
||||||
x.unshift({ label: 'HOME', url: '/home', icon: 'dashboard' }); return x;
|
x.unshift({
|
||||||
|
label: this.language.instant('NAV-BAR.HOME'),
|
||||||
|
url: '/home',
|
||||||
|
icon: 'dashboard'
|
||||||
|
}); return x;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
return Observable.of([]);
|
return Observable.of([]);
|
||||||
|
@ -45,10 +49,6 @@ export class BreadcrumbComponent implements OnInit {
|
||||||
}
|
}
|
||||||
|
|
||||||
currentUrl(breadcrumb) {
|
currentUrl(breadcrumb) {
|
||||||
if (breadcrumb.url == this.router.url) {
|
return (breadcrumb.url === this.router.url);
|
||||||
return true;
|
|
||||||
} else {
|
|
||||||
false
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -60,14 +60,18 @@ export class ProjectEditorComponent extends BaseComponent implements OnInit, IBr
|
||||||
.subscribe(data => {
|
.subscribe(data => {
|
||||||
this.project = new ProjectEditorModel().fromModel(data);
|
this.project = new ProjectEditorModel().fromModel(data);
|
||||||
this.formGroup = this.project.buildForm(null, this.project.type === ProjectType.External || !this.editMode);
|
this.formGroup = this.project.buildForm(null, this.project.type === ProjectType.External || !this.editMode);
|
||||||
this.breadCrumbs = Observable.of([
|
this.breadCrumbs = Observable.of([{
|
||||||
{ parentComponentName: 'ProjectListingComponent', label: 'Projects', url: '/projects' },
|
parentComponentName: 'ProjectListingComponent',
|
||||||
]);
|
label: this.language.instant('NAV-BAR.PROJECTS'),
|
||||||
|
url: '/projects'
|
||||||
|
}]);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
this.breadCrumbs = Observable.of([
|
this.breadCrumbs = Observable.of([{
|
||||||
{ parentComponentName: 'ProjectListingComponent', label: 'Projects', url: '/projects' },
|
parentComponentName: 'ProjectListingComponent',
|
||||||
]);
|
label: this.language.instant('NAV-BAR.PROJECTS'),
|
||||||
|
url: '/projects'
|
||||||
|
}]);
|
||||||
this.project = new ProjectEditorModel();
|
this.project = new ProjectEditorModel();
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this.formGroup = this.project.buildForm();
|
this.formGroup = this.project.buildForm();
|
||||||
|
|
|
@ -58,7 +58,6 @@ export class DmpEditorWizardComponent extends BaseComponent implements OnInit, I
|
||||||
titleFn: (item) => item['label']
|
titleFn: (item) => item['label']
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
if (this.formGroup == null) {
|
if (this.formGroup == null) {
|
||||||
this.dmp = new DmpEditorWizardModel();
|
this.dmp = new DmpEditorWizardModel();
|
||||||
this.formGroup = this.dmp.buildForm();
|
this.formGroup = this.dmp.buildForm();
|
||||||
|
@ -66,14 +65,11 @@ 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.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 = Observable.of([{
|
||||||
{
|
|
||||||
parentComponentName: 'project',
|
parentComponentName: 'project',
|
||||||
label: 'Dmp',
|
label: this.language.instant('NAV-BAR.DMP'),
|
||||||
url: '/quick-wizard/dmp'
|
url: '/quick-wizard/dmp'
|
||||||
}]
|
}]);
|
||||||
);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
formSubmit(): void {
|
formSubmit(): void {
|
||||||
|
@ -160,6 +156,4 @@ export class DmpEditorWizardComponent extends BaseComponent implements OnInit, I
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
|
@ -44,13 +44,11 @@ export class ProjectEditorWizardComponent extends BaseComponent implements OnIni
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
this.breadCrumbs = Observable.of([
|
this.breadCrumbs = Observable.of([{
|
||||||
{
|
|
||||||
parentComponentName: 'QuickCreate',
|
parentComponentName: 'QuickCreate',
|
||||||
label: 'Project',
|
label: this.language.instant('NAV-BAR.PROJECT'),
|
||||||
url: '/quick-wizard/project'
|
url: '/quick-wizard/project'
|
||||||
}]
|
}]);
|
||||||
);
|
|
||||||
|
|
||||||
const projectRequestItem: RequestItem<ProjectCriteria> = new RequestItem();
|
const projectRequestItem: RequestItem<ProjectCriteria> = new RequestItem();
|
||||||
projectRequestItem.criteria = new ProjectCriteria();
|
projectRequestItem.criteria = new ProjectCriteria();
|
||||||
|
@ -71,9 +69,6 @@ export class ProjectEditorWizardComponent extends BaseComponent implements OnIni
|
||||||
this.formGroup.get('label').disable();
|
this.formGroup.get('label').disable();
|
||||||
this.formGroup.get('description').disable();
|
this.formGroup.get('description').disable();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// this.route.params
|
// this.route.params
|
||||||
// .pipe(takeUntil(this._destroyed))
|
// .pipe(takeUntil(this._destroyed))
|
||||||
// .subscribe((params: Params) => {
|
// .subscribe((params: Params) => {
|
||||||
|
@ -102,7 +97,6 @@ export class ProjectEditorWizardComponent extends BaseComponent implements OnIni
|
||||||
// });
|
// });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public isFormValid() {
|
public isFormValid() {
|
||||||
return this.formGroup.valid;
|
return this.formGroup.valid;
|
||||||
}
|
}
|
||||||
|
@ -153,7 +147,6 @@ export class ProjectEditorWizardComponent extends BaseComponent implements OnIni
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
searchProject(query: string) {
|
searchProject(query: string) {
|
||||||
const projectRequestItem: RequestItem<ProjectCriteria> = new RequestItem();
|
const projectRequestItem: RequestItem<ProjectCriteria> = new RequestItem();
|
||||||
projectRequestItem.criteria = new ProjectCriteria();
|
projectRequestItem.criteria = new ProjectCriteria();
|
||||||
|
@ -176,5 +169,4 @@ export class ProjectEditorWizardComponent extends BaseComponent implements OnIni
|
||||||
this.formGroup.get('description').reset();
|
this.formGroup.get('description').reset();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
|
@ -47,14 +47,11 @@ export class QuickWizardEditorComponent extends BaseComponent implements OnInit,
|
||||||
this.quickWizard = new QuickWizardEditorWizardModel();
|
this.quickWizard = new QuickWizardEditorWizardModel();
|
||||||
this.quickWizard.project = new ProjectEditorWizardModel();
|
this.quickWizard.project = new ProjectEditorWizardModel();
|
||||||
this.formGroup = this.quickWizard.buildForm();
|
this.formGroup = this.quickWizard.buildForm();
|
||||||
this.breadCrumbs = Observable.of([
|
this.breadCrumbs = Observable.of([{
|
||||||
{
|
|
||||||
parentComponentName: 'Dashboard',
|
parentComponentName: 'Dashboard',
|
||||||
label: 'DMP Wizard',
|
label: this.language.instant('NAV-BAR.DMP-WIZARD'),
|
||||||
url: '/quick-wizard'
|
url: '/quick-wizard'
|
||||||
}]
|
}]);
|
||||||
);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
isActive(step: string): boolean {
|
isActive(step: string): boolean {
|
||||||
|
|
|
@ -51,13 +51,26 @@
|
||||||
"BREADCRUMB-ROOT": "Dashboard",
|
"BREADCRUMB-ROOT": "Dashboard",
|
||||||
"TITLE": "OpenDMP",
|
"TITLE": "OpenDMP",
|
||||||
"PROJECTS": "Projects",
|
"PROJECTS": "Projects",
|
||||||
|
"PROJECT": "Project",
|
||||||
|
"DMP": "Dmp",
|
||||||
"DMPS": "DMPs",
|
"DMPS": "DMPs",
|
||||||
"DATASETS": "Datasets",
|
"DATASETS": "Datasets",
|
||||||
|
"DATASET": "Dataset",
|
||||||
"PUBLIC-DATASETS": "Explore OpenDMP",
|
"PUBLIC-DATASETS": "Explore OpenDMP",
|
||||||
"USERS": "Users",
|
"USERS": "Users",
|
||||||
"DATASETS-ADMIN": "Dataset Profiles",
|
"DATASETS-ADMIN": "Dataset Profiles",
|
||||||
"DMP-PROFILES": "DMP Profiles",
|
"DMP-PROFILES": "DMP Profiles",
|
||||||
"ABOUT": "About"
|
"ABOUT": "About",
|
||||||
|
"DATASET-DESCRIPTIONS": "DATASET DESCRIPTIONS",
|
||||||
|
"DATASET-DESCRIPTION-WIZARD": "Dataset description wizard",
|
||||||
|
"PUBLIC DATASETS": "PUBLIC DATASETS",
|
||||||
|
"PUBLIC DMPS": "PUBLIC DMPS",
|
||||||
|
"HOME": "HOME",
|
||||||
|
"DMP-WIZARD": "DMP Wizard",
|
||||||
|
"DATASET-TEMPLATES": "DATASET TEMPLATES",
|
||||||
|
"TEMPLATE": "TEMPLATE",
|
||||||
|
"DMP-TEMPLATES": "DMP TEMPLATES",
|
||||||
|
"USERS-BREADCRUMB": "USERS"
|
||||||
},
|
},
|
||||||
"SIDE-BAR": {
|
"SIDE-BAR": {
|
||||||
"GENERAL": "GENERAL",
|
"GENERAL": "GENERAL",
|
||||||
|
@ -519,7 +532,9 @@
|
||||||
"PROJECTS": "Projects",
|
"PROJECTS": "Projects",
|
||||||
"SELECT-PROJECTS": "Select Projects",
|
"SELECT-PROJECTS": "Select Projects",
|
||||||
"SELECT-COLLABORATORS": "Select Collaborators",
|
"SELECT-COLLABORATORS": "Select Collaborators",
|
||||||
"RELATED-COLLABORATORS": "Related Collaborators"
|
"RELATED-COLLABORATORS": "Related Collaborators",
|
||||||
|
"SELECT-DATASET-TEMPLATES": "Select Dataset Templates",
|
||||||
|
"RELATED-DATASET-TEMPLATES": "Related Dataset Templates"
|
||||||
},
|
},
|
||||||
"USERS": {
|
"USERS": {
|
||||||
"LABEL": "Search",
|
"LABEL": "Search",
|
||||||
|
|
Loading…
Reference in New Issue