.gitignore

@@ -48,4 +48,3 @@ bin/
 *.classpath
 openDMP/dmp-backend/uploads/
 openDMP/dmp-backend/tmp/
-dmp-frontend/.angular/

README.md

@@ -1,9 +1,3 @@
-
-**Important note: The deployment, troubleshooting, maintenance and operation of on-premises / self-served OpenDMP instances for development, testing or production use, shall be the sole responsibility of the adopter. No support is guaranteed by OpenDMP implentation team for issues that may be encountered during deployment, extension or operation of such installations.**
-
-**Documentation is provided on a best-effort basis for the code and processes around the development, deployment and operation of OpenDMP. If you find any misalignment of the actual processes with the related documentation, please let us know so that the misalignment is addressed for the benefit of future adopters.**
-
-
 # Using Docker Compose with Argos
 
 ARGOS is an open extensible service that simplifies the management, validation, monitoring and maintenance and of Data Management Plans. It allows actors (researchers, managers, supervisors etc) to create actionable DMPs that may be freely exchanged among infrastructures for carrying out specific aspects of the Data management process in accordance with the intentions and commitment of Data owners.

dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanBlueprintCriteria.java

@@ -3,14 +3,4 @@ package eu.eudat.data.dao.criteria;
 import eu.eudat.data.entities.DMPProfile;
 
 public class DataManagementPlanBlueprintCriteria extends Criteria<DMPProfile> {
-
-    private Integer status;
-
-    public Integer getStatus() {
-        return status;
-    }
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
 }

dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanCriteria.java

@@ -1,7 +1,6 @@
 package eu.eudat.data.dao.criteria;
 
 import eu.eudat.data.entities.DMP;
-import eu.eudat.data.entities.DMPProfile;
 import eu.eudat.data.entities.Grant;
 
 import java.util.Date;
@@ -11,7 +10,6 @@ import java.util.UUID;
 public class DataManagementPlanCriteria extends Criteria<DMP> {
     private Date periodStart;
     private Date periodEnd;
-    private DMPProfile profile;
     private List<eu.eudat.data.entities.Grant> grants;
     private boolean allVersions;
     private List<UUID> groupIds;
@@ -39,13 +37,6 @@ public class DataManagementPlanCriteria extends Criteria<DMP> {
         this.periodEnd = periodEnd;
     }
 
-    public DMPProfile getProfile() {
-        return profile;
-    }
-    public void setProfile(DMPProfile profile) {
-        this.profile = profile;
-    }
-
     public List<Grant> getGrants() {
         return grants;
     }

dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDaoImpl.java

@@ -42,8 +42,6 @@ public class DMPDaoImpl extends DatabaseAccess<DMP> implements DMPDao {
 			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.getProfile() != null)
-			query.where((builder, root) -> builder.equal(root.get("profile"), criteria.getProfile()));
 		if (criteria.getGrants() != null && !criteria.getGrants().isEmpty())
 			query.where(((builder, root) -> root.get("grant").in(criteria.getGrants())));
 		if (!criteria.getAllVersions())
@@ -77,7 +75,7 @@ public class DMPDaoImpl extends DatabaseAccess<DMP> implements DMPDao {
 			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("datasetprofile").get("id").in(criteria.getDatasetTemplates()));
+			query.where((builder, root) -> root.join("associatedDmps", JoinType.LEFT).get("id").in(criteria.getDatasetTemplates()));
 		}
 		if (criteria.getGrantStatus() != null) {
 			if (criteria.getGrantStatus().equals(GrantStateType.FINISHED.getValue().shortValue()))

dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPProfileDaoImpl.java

@@ -72,13 +72,6 @@ public class DMPProfileDaoImpl extends DatabaseAccess<DMPProfile> implements DMP
         QueryableList<DMPProfile> query = getDatabaseService().getQueryable(DMPProfile.class);
         if (criteria.getLike() != null && !criteria.getLike().isEmpty())
             query.where((builder, root) -> builder.like(builder.upper(root.get("label")), "%" + criteria.getLike().toUpperCase() + "%"));
-        if (criteria.getStatus() != null) {
-            if (criteria.getStatus() == DMPProfile.Status.FINALIZED.getValue()) {
-                query.where((builder, root) -> builder.equal(root.get("status"), DMPProfile.Status.FINALIZED.getValue()));
-            } else if (criteria.getStatus() == DMPProfile.Status.SAVED.getValue()) {
-                query.where((builder, root) -> builder.equal(root.get("status"), DMPProfile.Status.SAVED.getValue()));
-            }
-        }
         query.where(((builder, root) -> builder.notEqual(root.get("status"), DMPProfile.Status.DELETED.getValue())));
         return query;
     }

dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DescriptionTemplateTypeDaoImpl.java

@@ -23,7 +23,7 @@ public class DescriptionTemplateTypeDaoImpl extends DatabaseAccess<DescriptionTe
     @Override
     public DescriptionTemplateType findFromName(String name){
         try {
-            return this.getDatabaseService().getQueryable(DescriptionTemplateType.class).where((builder, root) -> builder.and(builder.equal(root.get("name"), name), builder.notEqual(root.get("status"), DescriptionTemplateType.Status.DELETED.getValue()))).getSingle();
+            return this.getDatabaseService().getQueryable(DescriptionTemplateType.class).where((builder, root) -> builder.equal(root.get("name"), name)).getSingle();
         }
         catch(Exception e){
             return null;

dmp-backend/data/src/main/java/eu/eudat/data/query/items/dmpblueprint/DataManagementPlanBlueprintTableRequest.java

@@ -15,8 +15,6 @@ public class DataManagementPlanBlueprintTableRequest extends TableQuery<DataMana
         QueryableList<DMPProfile> query = this.getQuery();
         if (this.getCriteria().getLike() != null && !this.getCriteria().getLike().isEmpty())
             query.where((builder, root) -> builder.like(root.get("label"), "%" + this.getCriteria().getLike() + "%"));
-        if (this.getCriteria().getStatus() != null)
-            query.where((builder, root) -> builder.equal(root.get("status"), this.getCriteria().getStatus()));
         return query;
     }
 

dmp-backend/web/pom.xml

@@ -46,10 +46,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-mail</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-webflux</artifactId>
-        </dependency>
         <!-- https://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple -->
         <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
 
@@ -226,7 +222,6 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>1.5.9.RELEASE</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java

@@ -57,7 +57,7 @@ public class Admin extends BaseController {
 
 	@Transactional
 	@RequestMapping(method = RequestMethod.POST, value = {"/addDmp"}, consumes = "application/json", produces = "application/json")
-	public ResponseEntity<Object> addDmp(@Valid @RequestBody DatasetProfile profile, @ClaimedAuthorities(claims = {ADMIN ,DATASET_PROFILE_MANAGER}) Principal principal) throws Exception {
+	public ResponseEntity<Object> addDmp(@Valid @RequestBody DatasetProfile profile, @ClaimedAuthorities(claims = {ADMIN ,DATASET_PROFILE_MANAGER}) Principal principal) {
 		//this.getLoggerService().info(principal, "Admin Added Dataset Profile");
 		DatasetProfile shortenProfile = profile.toShort();
 		DescriptionTemplate modelDefinition = AdminManager.generateViewStyleDefinition(shortenProfile, getApiContext());
@@ -80,7 +80,7 @@ public class Admin extends BaseController {
 
 	@Transactional
 	@RequestMapping(method = RequestMethod.POST, value = {"/addDmp/{id}"}, consumes = "application/json", produces = "application/json")
-	public ResponseEntity<ResponseItem<UUID>> updateDmp(@PathVariable String id, @RequestBody DatasetProfile profile, @ClaimedAuthorities(claims = {ADMIN, DATASET_PROFILE_MANAGER}) Principal principal) throws Exception {
+	public ResponseEntity<ResponseItem<UUID>> updateDmp(@PathVariable String id, @RequestBody DatasetProfile profile, @ClaimedAuthorities(claims = {ADMIN, DATASET_PROFILE_MANAGER}) Principal principal) {
 		DatasetProfile shortenProfile = profile.toShort();
 		DescriptionTemplate modelDefinition = AdminManager.generateViewStyleDefinition(shortenProfile, getApiContext());
 		DescriptionTemplate datasetprofile = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id));
@@ -124,7 +124,7 @@ public class Admin extends BaseController {
 	}
 
 	@RequestMapping(method = RequestMethod.POST, value = {"/preview"}, consumes = "application/json", produces = "application/json")
-	public ResponseEntity<ResponseItem<PagedDatasetProfile>> getPreview(@RequestBody DatasetProfile profile, @ClaimedAuthorities(claims = {ADMIN, DATASET_PROFILE_MANAGER}) Principal principal) throws Exception {
+	public ResponseEntity<ResponseItem<PagedDatasetProfile>> getPreview(@RequestBody DatasetProfile profile, @ClaimedAuthorities(claims = {ADMIN, DATASET_PROFILE_MANAGER}) Principal principal) {
 		DescriptionTemplate modelDefinition = AdminManager.generateViewStyleDefinition(profile, getApiContext());
 		eu.eudat.models.data.user.composite.DatasetProfile datasetProfile = userManager.generateDatasetProfileModel(modelDefinition);
 		PagedDatasetProfile pagedDatasetProfile = new PagedDatasetProfile();
@@ -161,7 +161,6 @@ public class Admin extends BaseController {
 			datasetProfile.setStatus(profile.getStatus());
 			datasetProfile.setDescription(profile.getDescription());
 			datasetProfile.setLanguage(profile.getLanguage());
-			datasetProfile.setType(profile.getType().getName());
 			return this.datasetProfileManager.getDocument(datasetProfile, profile.getLabel());
 		} else {
 			return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<eu.eudat.models.data.admin.composite.DatasetProfile>().status(ApiMessageCode.ERROR_MESSAGE).message("NOT AUTHORIZE"));

dmp-backend/web/src/main/java/eu/eudat/controllers/DMPProfileController.java

@@ -5,7 +5,6 @@ import eu.eudat.data.entities.DMPProfile;
 import eu.eudat.data.entities.DescriptionTemplate;
 import eu.eudat.data.query.items.dmpblueprint.DataManagementPlanBlueprintTableRequest;
 import eu.eudat.data.query.items.table.dmpprofile.DataManagementPlanProfileTableRequest;
-import eu.eudat.exceptions.dmpblueprint.DmpBlueprintUsedException;
 import eu.eudat.logic.managers.DataManagementProfileManager;
 import eu.eudat.logic.security.claims.ClaimedAuthorities;
 import eu.eudat.logic.services.ApiContext;
@@ -30,7 +29,6 @@ import java.io.IOException;
 import java.util.List;
 
 import static eu.eudat.types.Authorities.ADMIN;
-import static eu.eudat.types.Authorities.DATASET_PROFILE_MANAGER;
 
 /**
  * Created by ikalyvas on 3/21/2018.
@@ -73,7 +71,7 @@ public class DMPProfileController extends BaseController {
 
     @RequestMapping(method = RequestMethod.GET, value = {"/getSingleBlueprint/{id}"}, produces = "application/json")
     public @ResponseBody
-    ResponseEntity<ResponseItem<DataManagementPlanBlueprintListingModel>> getSingleBlueprint(@PathVariable String id, Principal principal) {
+    ResponseEntity<ResponseItem<DataManagementPlanBlueprintListingModel>> getSingleBlueprint(@PathVariable String id, Principal principal) throws IllegalAccessException, InstantiationException {
         DataManagementPlanBlueprintListingModel dataManagementPlanBlueprintListingModel = this.dataManagementProfileManager.getSingleBlueprint(id, principal);
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataManagementPlanBlueprintListingModel>().status(ApiMessageCode.NO_MESSAGE).payload(dataManagementPlanBlueprintListingModel));
     }
@@ -92,43 +90,23 @@ public class DMPProfileController extends BaseController {
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataTableData<DataManagementPlanBlueprintListingModel>>().status(ApiMessageCode.NO_MESSAGE).payload(dataTable));
     }
 
-    @Transactional
-    @RequestMapping(method = RequestMethod.POST, value = {"/clone/{id}"}, consumes = "application/json", produces = "application/json")
-    public ResponseEntity<ResponseItem<DataManagementPlanBlueprintListingModel>> clone(@PathVariable String id, @ClaimedAuthorities(claims = {ADMIN}) Principal principal) {
-        DataManagementPlanBlueprintListingModel dmpBlueprint = this.dataManagementProfileManager.getSingleBlueprint(id, principal);
-        dmpBlueprint.setLabel(dmpBlueprint.getLabel() + " new ");
-        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataManagementPlanBlueprintListingModel>().payload(dmpBlueprint));
-    }
-
-    @Transactional
-    @RequestMapping(method = RequestMethod.DELETE, value = {"{id}"}, consumes = "application/json", produces = "application/json")
-    public @ResponseBody
-    ResponseEntity<ResponseItem<Void>> inactivate(@PathVariable String id, @ClaimedAuthorities(claims = {ADMIN}) Principal principal) {
-        try {
-            this.dataManagementProfileManager.inactivate(id);
-            return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<Void>().status(ApiMessageCode.SUCCESS_MESSAGE));
-        } catch (DmpBlueprintUsedException exception) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<Void>().status(ApiMessageCode.UNSUCCESS_DELETE).message(exception.getMessage()));
-        }
-    }
-
     @RequestMapping(method = RequestMethod.GET, value = {"/getXml/{id}"}, produces = "application/json")
     public @ResponseBody
-    ResponseEntity  getXml( @RequestHeader("Content-Type") String contentType, @PathVariable String id, Principal principal) throws IOException {
+    ResponseEntity  getXml( @RequestHeader("Content-Type") String contentType, @PathVariable String id, Principal principal) throws IllegalAccessException, InstantiationException, IOException {
         if (contentType.equals("application/xml")) {
-            DataManagementPlanBlueprintListingModel dataManagementPlanBlueprintListingModel = this.dataManagementProfileManager.getSingleBlueprint(id, principal);
-            return this.dataManagementProfileManager.getDocument(dataManagementPlanBlueprintListingModel);
+            DataManagementPlanProfileListingModel dataManagementPlanProfileListingModel = this.dataManagementProfileManager.getSingle(id, principal);
+            return this.dataManagementProfileManager.getDocument(dataManagementPlanProfileListingModel,dataManagementPlanProfileListingModel.getLabel());
         }else {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<DataManagementPlanBlueprintListingModel>().status(ApiMessageCode.ERROR_MESSAGE).message("NOT AUTHORIZE"));
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<DataManagementPlanProfileListingModel>().status(ApiMessageCode.ERROR_MESSAGE).message("NOT AUTHORIZE"));
         }
     }
 
     @RequestMapping(method = RequestMethod.POST, value = {"/upload"})
     public ResponseEntity<Object> setDatasetProfileXml(@RequestParam("file") MultipartFile file,
-                                                       @ClaimedAuthorities(claims = {ADMIN}) Principal principal) throws Exception {
-        eu.eudat.logic.utilities.documents.xml.dmpXml.dmpBlueprintModel.DmpBlueprint dmpBlueprintModel = this.dataManagementProfileManager.createDmpProfileFromXml(file);
-        DataManagementPlanBlueprintListingModel dmpBlueprint = dmpBlueprintModel.toDmpProfileCompositeModel(file.getOriginalFilename());
-        this.dataManagementProfileManager.createOrUpdateBlueprint(dmpBlueprint, principal);
+                                                       @ClaimedAuthorities(claims = {ADMIN}) Principal principal) throws IllegalAccessException,IOException,Exception{
+        eu.eudat.logic.utilities.documents.xml.dmpXml.dmpProfileModel.DmpProfile dmpProfileModel = this.dataManagementProfileManager.createDmpProfileFromXml(file);
+        DataManagementPlanProfileListingModel dataManagementPlan = dmpProfileModel.toDmpProfileCompositeModel(file.getOriginalFilename());
+        this.dataManagementProfileManager.createOrUpdate(dataManagementPlan, principal);
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<List<DescriptionTemplate>>()
                 .status(ApiMessageCode.SUCCESS_MESSAGE).message(""));
     }

dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfiles.java

@@ -6,7 +6,6 @@ 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.datasetprofile.DatasetProfileWithPrefillingPropertyModel;
 import eu.eudat.models.data.helpers.responses.ResponseItem;
 import eu.eudat.types.ApiMessageCode;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,12 +42,5 @@ public class DatasetProfiles extends BaseController {
         List<DatasetProfileListingModel> datasetProfileTableData = this.datasetProfileManager.getAll(tableRequestItem);
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<List<DatasetProfileListingModel>>().status(ApiMessageCode.NO_MESSAGE).payload(datasetProfileTableData));
     }
-
-    @RequestMapping(method = RequestMethod.POST, value = {"/datasetprofiles/getAllWithPrefilling"}, produces = "application/json")
-    public @ResponseBody
-    ResponseEntity<ResponseItem<List<DatasetProfileWithPrefillingPropertyModel>>> getAllWithPrefilling(@RequestBody DatasetProfileTableRequestItem tableRequestItem) {
-        List<DatasetProfileWithPrefillingPropertyModel> datasetProfileTableData = this.datasetProfileManager.getAllWithPrefilling(tableRequestItem);
-        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<List<DatasetProfileWithPrefillingPropertyModel>>().status(ApiMessageCode.NO_MESSAGE).payload(datasetProfileTableData));
-    }
 }
 

dmp-backend/web/src/main/java/eu/eudat/exceptions/dmpblueprint/DmpBlueprintUsedException.java

@@ -1,18 +0,0 @@
-package eu.eudat.exceptions.dmpblueprint;
-
-public class DmpBlueprintUsedException extends RuntimeException {
-    public DmpBlueprintUsedException() {
-    }
-
-    public DmpBlueprintUsedException(String message) {
-        super(message);
-    }
-
-    public DmpBlueprintUsedException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public DmpBlueprintUsedException(Throwable cause) {
-        super(cause);
-    }
-}

dmp-backend/web/src/main/java/eu/eudat/logic/builders/entity/DatasetProfileBuilder.java

@@ -1,7 +1,6 @@
 package eu.eudat.logic.builders.entity;
 
 import eu.eudat.data.entities.DescriptionTemplate;
-import eu.eudat.data.entities.DescriptionTemplateType;
 import eu.eudat.logic.builders.Builder;
 import eu.eudat.data.entities.Dataset;
 
@@ -18,8 +17,6 @@ public class DatasetProfileBuilder extends Builder<DescriptionTemplate> {
 
     private String label;
 
-    private DescriptionTemplateType type;
-
     private Set<Dataset> dataset;
 
     private String definition;
@@ -44,11 +41,6 @@ public class DatasetProfileBuilder extends Builder<DescriptionTemplate> {
         return this;
     }
 
-    public DatasetProfileBuilder type(DescriptionTemplateType type) {
-        this.type = type;
-        return this;
-    }
-
     public DatasetProfileBuilder dataset(Set<Dataset> dataset) {
         this.dataset = dataset;
         return this;
@@ -96,7 +88,6 @@ public class DatasetProfileBuilder extends Builder<DescriptionTemplate> {
         descriptionTemplate.setModified(modified);
         descriptionTemplate.setLabel(label);
         descriptionTemplate.setLanguage(language);
-        descriptionTemplate.setType(type);
         return descriptionTemplate;
     }
 }

dmp-backend/web/src/main/java/eu/eudat/logic/managers/AdminManager.java

@@ -3,7 +3,6 @@ package eu.eudat.logic.managers;
 import eu.eudat.data.dao.entities.DatasetDao;
 import eu.eudat.data.dao.entities.DatasetProfileDao;
 import eu.eudat.data.entities.DescriptionTemplate;
-import eu.eudat.data.entities.DescriptionTemplateType;
 import eu.eudat.exceptions.datasetprofile.DatasetProfileWithDatasetsExeption;
 import eu.eudat.logic.builders.entity.DatasetProfileBuilder;
 import eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.ViewStyleModel;
@@ -19,9 +18,8 @@ import java.util.UUID;
 
 public class AdminManager {
 
-    public static DescriptionTemplate generateViewStyleDefinition(DatasetProfile profile, ApiContext apiContext) throws Exception {
+    public static DescriptionTemplate generateViewStyleDefinition(DatasetProfile profile, ApiContext apiContext) {
         ViewStyleModel viewStyleModel = new ViewStyleModel();
-        viewStyleModel.setEnablePrefilling(profile.isEnablePrefilling());
         viewStyleModel.setSections(new ModelBuilder().toViewStyleDefinition(profile.getSections(), eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Section.class));
         viewStyleModel.setPages(new ModelBuilder().toViewStyleDefinition(profile.getPages(), eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Page.class));
         Document viewStyleDoc = XmlBuilder.getDocument();
@@ -37,17 +35,8 @@ public class AdminManager {
             profile.setLanguage("en");
         }
 
-        DescriptionTemplateType type;
-        try {
-            type = apiContext.getOperationsContext().getDatabaseRepository().getDescriptionTemplateTypeDao().findFromName(profile.getType());
-        }
-        catch (Exception e) {
-            throw new Exception("Description template type '" + profile.getType() + "' could not be found.");
-        }
-
         DescriptionTemplate descriptionTemplate = apiContext.getOperationsContext().getBuilderFactory().getBuilder(DatasetProfileBuilder.class).definition(xml).label(profile.getLabel())
                 .status(profile.getStatus()).created(new Date()).description(profile.getDescription()).language(profile.getLanguage())
-                .type(type)
                 .build();
 
         if (descriptionTemplate.getGroupId() == null) {

dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java

@@ -202,14 +202,14 @@ public class DashBoardManager {
                 .selectAsync(item -> recentActivityDataBuilder.label(item.getLabel()).timestamp(item.getModified()).id(item.getId().toString()).build())
                 .whenComplete((datasetActivities, throwable) -> activity.setRecentDatasetActivities(datasetActivities));
 
-        /*CompletableFuture<List<RecentActivityData>> grants = grantRepository.getAuthenticated(grantRepository.getWithCriteria(grantCriteria), user)
+        CompletableFuture<List<RecentActivityData>> grants = grantRepository.getAuthenticated(grantRepository.getWithCriteria(grantCriteria), user)
                 .withHint("grantRecentActivity")
                 .orderBy((builder, root) -> builder.desc(root.get("modified")))
                 .take(numberofactivities)
                 .selectAsync(item -> recentActivityDataBuilder.label(item.getLabel()).timestamp(item.getModified()).id(item.getId().toString()).build())
-                .whenComplete((grantActivities, throwable) -> activity.setRecentGrantActivities(grantActivities));*/
+                .whenComplete((grantActivities, throwable) -> activity.setRecentGrantActivities(grantActivities));
 
-        CompletableFuture.allOf(/*grants, */dmps, datasets).join();
+        CompletableFuture.allOf(grants, dmps, datasets).join();
         return activity;
     }
 

dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java

@@ -1,7 +1,5 @@
 package eu.eudat.logic.managers;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import eu.eudat.configurations.dynamicgrant.DynamicGrantConfiguration;
 import eu.eudat.configurations.dynamicgrant.entities.Property;
@@ -68,7 +66,6 @@ import eu.eudat.models.data.userinfo.UserListingModel;
 import eu.eudat.queryable.QueryableList;
 import eu.eudat.types.Authorities;
 import eu.eudat.types.MetricNames;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.apache.poi.xwpf.usermodel.XWPFParagraph;
 import org.apache.poi.xwpf.usermodel.XWPFRun;
@@ -146,7 +143,6 @@ public class DataManagementPlanManager {
     public DataTableData<DataManagementPlanListingModel> getPaged(DataManagementPlanTableRequest dataManagementPlanTableRequest, Principal principal, String fieldsGroup) throws Exception {
         UUID principalID = principal.getId();
         List<Dmp> dmps = null;
-
         QueryableList<DMP> items = null;
         QueryableList<DMP> authItems = null;
         Long totalData = 0L;
@@ -484,7 +480,7 @@ public class DataManagementPlanManager {
 
         DMP newDmp = dataManagementPlan.toDataModel();
         if(dataManagementPlan.getProfile() != null){
-            DMPProfile dmpProfile = apiContext.getOperationsContext().getDatabaseRepository().getDmpProfileDao().find(dataManagementPlan.getProfile());
+            DMPProfile dmpProfile = apiContext.getOperationsContext().getDatabaseRepository().getDmpProfileDao().find(dataManagementPlan.getProfile().getId());
             newDmp.setProfile(dmpProfile);
         }
         if (newDmp.getStatus() == (int) DMP.DMPStatus.FINALISED.getValue()) {
@@ -531,7 +527,7 @@ public class DataManagementPlanManager {
         }
 
         if(this.dataManagementProfileManager.fieldInBlueprint(newDmp.getProfile(), SystemFieldType.GRANT, principal)) {
-            if (newDmp.getGrant() != null && newDmp.getGrant().getType().equals(Grant.GrantType.INTERNAL.getValue())) {
+            if (newDmp.getGrant().getType().equals(Grant.GrantType.INTERNAL.getValue())) {
                 checkIfUserCanEditGrant(newDmp, user);
             }
             assignGrandUserIfInternal(newDmp, user);
@@ -544,23 +540,13 @@ public class DataManagementPlanManager {
         }
 
         if(newDmp.getId() != null){
-            UUID dmpId = newDmp.getId();
-            List<DMPDatasetProfile> dmpDatasetProfiles = apiContext.getOperationsContext().getDatabaseRepository().getDmpDatasetProfileDao().asQueryable()
-                    .where((builder, root) -> builder.equal(root.get("dmp").get("id"), dmpId)).toList();
-            for (DMPDatasetProfile dmpDatasetProfile : dmpDatasetProfiles) {
-                if (newDmp.getAssociatedDmps().stream().filter(dmpDatasetProfile1 -> dmpDatasetProfile1.getId() != null).noneMatch(dmpDatasetProfile1 -> dmpDatasetProfile1.getId().equals(dmpDatasetProfile.getId()))) {
-                    apiContext.getOperationsContext().getDatabaseRepository().getDmpDatasetProfileDao().delete(dmpDatasetProfile);
-                }
-            }
             for(DMPDatasetProfile dmpDatasetProfile : newDmp.getAssociatedDmps()){
                 apiContext.getOperationsContext().getDatabaseRepository().getDmpDatasetProfileDao().createOrUpdate(dmpDatasetProfile);
             }
         }
 
         if(this.dataManagementProfileManager.fieldInBlueprint(newDmp.getProfile(), SystemFieldType.GRANT, principal)) {
-            if (newDmp.getGrant() != null) {
-                apiContext.getOperationsContext().getDatabaseRepository().getGrantDao().createOrUpdate(newDmp.getGrant());
-            }
+            apiContext.getOperationsContext().getDatabaseRepository().getGrantDao().createOrUpdate(newDmp.getGrant());
         }
         newDmp = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().createOrUpdate(newDmp);
 
@@ -730,7 +716,7 @@ public class DataManagementPlanManager {
             newDmp.setId(null);
 
             if(this.dataManagementProfileManager.fieldInBlueprint(newDmp.getProfile(), SystemFieldType.GRANT, principal)) {
-                if (newDmp.getGrant() != null && newDmp.getGrant().getType().equals(Grant.GrantType.INTERNAL.getValue())) {
+                if (newDmp.getGrant().getType().equals(Grant.GrantType.INTERNAL.getValue())) {
                     checkIfUserCanEditGrant(newDmp, user);
                 }
                 assignGrandUserIfInternal(newDmp, user);
@@ -742,15 +728,13 @@ public class DataManagementPlanManager {
                 assignProjectUserIfInternal(newDmp, user);
             }
             if(this.dataManagementProfileManager.fieldInBlueprint(newDmp.getProfile(), SystemFieldType.GRANT, principal)) {
-                if (newDmp.getGrant() != null) {
-                    if (newDmp.getGrant().getStartdate() == null) {
-                        newDmp.getGrant().setStartdate(new Date());
-                    }
-                    if (newDmp.getGrant().getEnddate() == null) {
-                        newDmp.getGrant().setEnddate(Date.from(Instant.now().plus(365, ChronoUnit.DAYS)));
-                    }
-                    databaseRepository.getGrantDao().createOrUpdate(newDmp.getGrant());
+                if (newDmp.getGrant().getStartdate() == null) {
+                    newDmp.getGrant().setStartdate(new Date());
                 }
+                if (newDmp.getGrant().getEnddate() == null) {
+                    newDmp.getGrant().setEnddate(Date.from(Instant.now().plus(365, ChronoUnit.DAYS)));
+                }
+                databaseRepository.getGrantDao().createOrUpdate(newDmp.getGrant());
             }
             DMP tempDmp = databaseRepository.getDmpDao().createOrUpdate(newDmp);
             newDmp.setId(tempDmp.getId());
@@ -819,7 +803,7 @@ public class DataManagementPlanManager {
         newDmp.setId(null);
 
         if(this.dataManagementProfileManager.fieldInBlueprint(newDmp.getProfile(), SystemFieldType.GRANT, principal)) {
-            if (newDmp.getGrant() != null && newDmp.getGrant().getType().equals(Grant.GrantType.INTERNAL.getValue())) {
+            if (newDmp.getGrant().getType().equals(Grant.GrantType.INTERNAL.getValue())) {
                 checkIfUserCanEditGrant(newDmp, user);
             }
             assignGrandUserIfInternal(newDmp, user);
@@ -831,9 +815,7 @@ public class DataManagementPlanManager {
             assignProjectUserIfInternal(newDmp, user);
         }
         if(this.dataManagementProfileManager.fieldInBlueprint(newDmp.getProfile(), SystemFieldType.GRANT, principal)) {
-            if (newDmp.getGrant() != null) {
-                databaseRepository.getGrantDao().createOrUpdate(newDmp.getGrant());
-            }
+            databaseRepository.getGrantDao().createOrUpdate(newDmp.getGrant());
         }
         DMP tempDmp = databaseRepository.getDmpDao().createOrUpdate(newDmp);
         newDmp.setId(tempDmp.getId());
@@ -1370,243 +1352,204 @@ public class DataManagementPlanManager {
         DataManagementPlanBlueprintListingModel dmpBlueprintModel = new DataManagementPlanBlueprintListingModel();
         dmpBlueprintModel.fromDataModel(dmpProfile);
         DataManagementPlanBlueprint dmpBlueprint = dmpBlueprintModel.getDefinition();
-        for(Section section: dmpBlueprint.getSections()) {
-            wordBuilder.addParagraphContent(section.getOrdinal() + ". " + section.getLabel(), document, ParagraphStyle.HEADER1, BigInteger.ZERO, 0);
-//            XWPFParagraph sectionInfoParagraph = document.createParagraph();
-//            sectionInfoParagraph.setSpacingBetween(1.0);
-//            XWPFRun runSectionTitle = sectionInfoParagraph.createRun();
-//            runSectionTitle.setText("Title: ");
-//            runSectionTitle.setColor("000000");
-//            XWPFRun runSectionTitleText = sectionInfoParagraph.createRun();
-//            runSectionTitleText.setText(section.getLabel());
-//            runSectionTitleText.setColor("116a78");
-//            XWPFParagraph sectionDescriptionParagraph = document.createParagraph();
-//            XWPFRun runSectionDescription = sectionDescriptionParagraph.createRun();
-//            runSectionDescription.setText("Description: ");
-//            runSectionDescription.setColor("000000");
-//            XWPFRun runSectionDescriptionText = sectionDescriptionParagraph.createRun();
-//            runSectionDescriptionText.setText(section.getDescription());
-//            runSectionDescriptionText.setColor("116a78");
+        for(Section section: dmpBlueprint.getSections()){
+            wordBuilder.addParagraphContent("Section " + section.getOrdinal(), document, ParagraphStyle.HEADER1, BigInteger.ZERO, 0);
+            XWPFParagraph sectionInfoParagraph = document.createParagraph();
+            sectionInfoParagraph.setSpacingBetween(1.0);
+            XWPFRun runSectionTitle = sectionInfoParagraph.createRun();
+            runSectionTitle.setText("Title: ");
+            runSectionTitle.setColor("000000");
+            XWPFRun runSectionTitleText = sectionInfoParagraph.createRun();
+            runSectionTitleText.setText(section.getLabel());
+            runSectionTitleText.setColor("116a78");
+            XWPFParagraph sectionDescriptionParagraph = document.createParagraph();
+            XWPFRun runSectionDescription = sectionDescriptionParagraph.createRun();
+            runSectionDescription.setText("Description: ");
+            runSectionDescription.setColor("000000");
+            XWPFRun runSectionDescriptionText = sectionDescriptionParagraph.createRun();
+            runSectionDescriptionText.setText(section.getDescription());
+            runSectionDescriptionText.setColor("116a78");
 
-            //wordBuilder.addParagraphContent("Section Fields", document, ParagraphStyle.HEADER2, BigInteger.ZERO, 0);
+            wordBuilder.addParagraphContent("Section Fields", document, ParagraphStyle.HEADER2, BigInteger.ZERO, 0);
             section.getFields().sort(Comparator.comparingInt(FieldModel::getOrdinal));
-            for (FieldModel field : section.getFields()) {
-                if (field.getCategory() == FieldCategory.SYSTEM) {
+            for(FieldModel field: section.getFields()){
+                if(field.getCategory() == FieldCategory.SYSTEM){
                     SystemField systemField = field.toSystemField();
-                    if (systemField.getType() == SystemFieldType.LANGUAGE) continue;
                     XWPFParagraph systemFieldParagraph = document.createParagraph();
-//                    systemFieldParagraph.setSpacingBetween(1.0);
+                    systemFieldParagraph.setSpacingBetween(1.0);
                     XWPFRun runSyStemFieldTitle = systemFieldParagraph.createRun();
-                    runSyStemFieldTitle.setText(systemField.getLabel() + ": ");
+                    runSyStemFieldTitle.setText("Title: ");
                     runSyStemFieldTitle.setColor("000000");
-//                    XWPFRun runSystemFieldTitleText = systemFieldParagraph.createRun();
-//                    runSystemFieldTitleText.setText(systemField.getLabel());
-//                    runSystemFieldTitleText.setColor("116a78");
-//                    if(systemField.getDescription() != null && !systemField.getDescription().isEmpty()){
-//                        XWPFParagraph systemFieldDescription = document.createParagraph();
-//                        systemFieldDescription.setSpacingBetween(1.0);
-//                        XWPFRun runSyStemFieldDescription = systemFieldDescription.createRun();
-//                        runSyStemFieldDescription.setText("Description: ");
-//                        runSyStemFieldDescription.setColor("000000");
-//                        XWPFRun runSystemFieldDescriptionText = systemFieldDescription.createRun();
-//                        runSystemFieldDescriptionText.setText(systemField.getDescription());
-//                        runSystemFieldDescriptionText.setColor("116a78");
-//                    }
-//                    XWPFParagraph systemFieldInput = document.createParagraph();
-//                    systemFieldInput.setSpacingBetween(1.0);
-//                    XWPFRun runInput = systemFieldInput.createRun();
-//                    runInput.setText("Input: ");
-//                    runInput.setColor("000000");
+                    XWPFRun runSystemFieldTitleText = systemFieldParagraph.createRun();
+                    runSystemFieldTitleText.setText(systemField.getLabel());
+                    runSystemFieldTitleText.setColor("116a78");
+                    if(systemField.getDescription() != null && !systemField.getDescription().isEmpty()){
+                        XWPFParagraph systemFieldDescription = document.createParagraph();
+                        systemFieldDescription.setSpacingBetween(1.0);
+                        XWPFRun runSyStemFieldDescription = systemFieldDescription.createRun();
+                        runSyStemFieldDescription.setText("Description: ");
+                        runSyStemFieldDescription.setColor("000000");
+                        XWPFRun runSystemFieldDescriptionText = systemFieldDescription.createRun();
+                        runSystemFieldDescriptionText.setText(systemField.getDescription());
+                        runSystemFieldDescriptionText.setColor("116a78");
+                    }
+                    XWPFParagraph systemFieldInput = document.createParagraph();
+                    systemFieldInput.setSpacingBetween(1.0);
+                    XWPFRun runInput = systemFieldInput.createRun();
+                    runInput.setText("Input: ");
+                    runInput.setColor("000000");
                     switch (systemField.getType()) {
                         case TEXT:
-                            XWPFRun runTitle = systemFieldParagraph.createRun();
+                            XWPFRun runTitle = systemFieldInput.createRun();
                             runTitle.setText(dmpEntity.getLabel());
                             runTitle.setColor("116a78");
                             break;
                         case HTML_TEXT:
-                            wordBuilder.addParagraphContent(dmpEntity.getDescription(), document, ParagraphStyle.HTML, BigInteger.ZERO, 0);
+                            XWPFRun runDescription = systemFieldInput.createRun();
+                            runDescription.setText(dmpEntity.getDescription());
+                            runDescription.setColor("116a78");
                             break;
                         case RESEARCHERS:
-                            for (Researcher researcher : dmpEntity.getResearchers()) {
-                                XWPFRun runResearcher = systemFieldParagraph.createRun();
-                                runResearcher.addBreak();
-                                runResearcher.setText(researcher.getLabel());
+                            for(Researcher researcher: dmpEntity.getResearchers()){
+                                XWPFRun runResearcher = systemFieldInput.createRun();
+                                runResearcher.setText("• " + researcher.getLabel());
                                 runResearcher.setColor("116a78");
                             }
                             break;
                         case ORGANIZATIONS:
-                            for (Organisation organisation : dmpEntity.getOrganisations()) {
-                                XWPFRun runOrganisation = systemFieldParagraph.createRun();
-                                runOrganisation.addBreak();
-                                runOrganisation.setText(organisation.getLabel());
+                            for(Organisation organisation: dmpEntity.getOrganisations()){
+                                XWPFRun runOrganisation = systemFieldInput.createRun();
+                                runOrganisation.setText("• " + organisation.getLabel());
                                 runOrganisation.setColor("116a78");
                             }
                             break;
-//                        case LANGUAGE:
-//                            XWPFRun runLanguage = systemFieldParagraph.createRun();
-//                            runLanguage.setText(objectMapper.readValue(dmpEntity.getExtraProperties(), HashMap.class).get("language").toString());
-//                            runLanguage.setColor("116a78");
-//                            break;
+                        case LANGUAGE:
+                            XWPFRun runLanguage = systemFieldInput.createRun();
+                            runLanguage.setText(objectMapper.readValue(dmpEntity.getExtraProperties(), HashMap.class).get("language").toString());
+                            runLanguage.setColor("116a78");
+                            break;
                         case CONTACT:
-                            XWPFRun runContact = systemFieldParagraph.createRun();
-                            runContact.setText(dmpEntity.getCreator() == null ? "" : dmpEntity.getCreator().getName());
+                            XWPFRun runContact = systemFieldInput.createRun();
+                            runContact.setText(dmpEntity.getCreator().getName());
                             runContact.setColor("116a78");
                             break;
                         case FUNDER:
-                            if (dmpEntity.getGrant() != null && dmpEntity.getGrant().getFunder() != null) {
-                                XWPFRun runFunder = systemFieldParagraph.createRun();
-                                runFunder.setText(dmpEntity.getGrant().getFunder().getLabel());
-                                runFunder.setColor("116a78");
-                            }
+                            XWPFRun runFunder = systemFieldInput.createRun();
+                            runFunder.setText(dmpEntity.getGrant().getFunder().getLabel());
+                            runFunder.setColor("116a78");
                             break;
                         case GRANT:
-                            if (dmpEntity.getGrant() != null) {
-                                XWPFRun runGrant = systemFieldParagraph.createRun();
-                                runGrant.setText(dmpEntity.getGrant().getLabel());
-                                runGrant.setColor("116a78");
-                            }
+                            XWPFRun runGrant = systemFieldInput.createRun();
+                            runGrant.setText(dmpEntity.getGrant().getLabel());
+                            runGrant.setColor("116a78");
                             break;
                         case PROJECT:
-                            if (dmpEntity.getProject() != null) {
-                                XWPFRun runProject = systemFieldParagraph.createRun();
-                                runProject.setText(dmpEntity.getProject().getLabel());
-                                runProject.setColor("116a78");
-                            }
+                            XWPFRun runProject = systemFieldInput.createRun();
+                            runProject.setText(dmpEntity.getProject().getLabel());
+                            runProject.setColor("116a78");
                             break;
                         case LICENSE:
-                            Map extraProperties = objectMapper.readValue(dmpEntity.getExtraProperties(), HashMap.class);
-                            if (extraProperties.containsKey("license")) {
-                                Map<String, String> license = ((Map<String, String>) extraProperties.get("license"));
-                                if (license != null && !StringUtils.isEmpty(license.get("pid"))) {
-                                    XWPFRun runLicense = systemFieldParagraph.createRun();
-                                    runLicense.setText(license.get("pid").toString());
-                                    runLicense.setColor("116a78");
-                                }
-                            }
+                            XWPFRun runLicense = systemFieldInput.createRun();
+                            runLicense.setText(objectMapper.readValue(dmpEntity.getExtraProperties(), HashMap.class).get("license").toString());
+                            runLicense.setColor("116a78");
                             break;
                         case ACCESS_RIGHTS:
-                            Map extraPropertiesMap = objectMapper.readValue(dmpEntity.getExtraProperties(), HashMap.class);
-                            if (extraPropertiesMap.containsKey("visible")) {
-                                XWPFRun runAccessRights = systemFieldParagraph.createRun();
-                                runAccessRights.setText(Boolean.valueOf(extraPropertiesMap.get("visible").toString()) ? "Public" : "Restricted");
-                                runAccessRights.setColor("116a78");
-                            }
+                            XWPFRun runAccessRights = systemFieldInput.createRun();
+                            runAccessRights.setText(objectMapper.readValue(dmpEntity.getExtraProperties(), HashMap.class).get("visible").toString());
+                            runAccessRights.setColor("116a78");
                             break;
                     }
-                    //document.createParagraph();
-                } else if (field.getCategory() == FieldCategory.EXTRA) {
-
-                    Map dmpProperties = objectMapper.readValue(dmpEntity.getProperties(), HashMap.class);
-                    if (dmpProperties != null && (!dmpProperties.containsKey(field.getId().toString()) || StringUtils.isEmpty((String) dmpProperties.get(field.getId().toString()))))
-                        continue;
+                    document.createParagraph();
+                }
+                else if(field.getCategory() == FieldCategory.EXTRA){
                     ExtraField extraField = field.toExtraField();
                     XWPFParagraph extraFieldParagraph = document.createParagraph();
                     extraFieldParagraph.setSpacingBetween(1.0);
                     XWPFRun runExtraFieldLabel = extraFieldParagraph.createRun();
-                    runExtraFieldLabel.setText(extraField.getLabel() + ": ");
-                    runExtraFieldLabel.setColor("000000");
-//                    if(extraField.getDescription() != null && !extraField.getDescription().isEmpty()){
-//                        XWPFRun runExtraFieldDescription = extraFieldParagraph.createRun();
-//                        runExtraFieldDescription.setText(extraField.getDescription());
-//                        runExtraFieldDescription.setColor("116a78");
-//                    }
-                    XWPFRun runExtraFieldInput = extraFieldParagraph.createRun();
-                    switch (extraField.getType()) {
-                        case TEXT:
-                            runExtraFieldInput.setText((String) dmpProperties.get(field.getId().toString()));
-                            runExtraFieldInput.setColor("116a78");
-                            break;
-                        case RICH_TEXT:
-                            wordBuilder.addParagraphContent(dmpProperties.get(field.getId().toString()), document, ParagraphStyle.HTML, BigInteger.ZERO, 0);
-//                            runExtraFieldInput.setText((String) dmpProperties.get(field.getId().toString()));
-//                            runExtraFieldInput.setColor("116a78");
-                            break;
-                        case DATE:
-                            runExtraFieldInput.setText((String) dmpProperties.get(field.getId().toString()));
-                            runExtraFieldInput.setColor("116a78");
-                            break;
-                        case NUMBER:
-                            runExtraFieldInput.setText((String) dmpProperties.get(field.getId().toString()));
-                            runExtraFieldInput.setColor("116a78");
-                            break;
+                    runExtraFieldLabel.setText(extraField.getLabel());
+                    runExtraFieldLabel.setColor("116a78");
+                    if(extraField.getDescription() != null && !extraField.getDescription().isEmpty()){
+                        XWPFRun runExtraFieldDescription = extraFieldParagraph.createRun();
+                        runExtraFieldDescription.setText(extraField.getDescription());
+                        runExtraFieldDescription.setColor("116a78");
                     }
-
+                    XWPFRun runExtraFieldInput = extraFieldParagraph.createRun();
+                    runExtraFieldInput.setText(extraField.getLabel());
+                    runExtraFieldInput.setColor("116a78");
                 }
             }
 
-            //if(!section.getDescriptionTemplates().isEmpty()){
-            final Boolean isFinalized = dmpEntity.getStatus() == DMP.DMPStatus.FINALISED.getValue();
-            final Boolean isPublic = dmpEntity.isPublic();
-            List<Dataset> datasets = dmpEntity.getDataset().stream()
-                    .filter(item -> item.getStatus() != Dataset.Status.CANCELED.getValue())
-                    .filter(item -> item.getStatus() != Dataset.Status.DELETED.getValue())
-                    .filter(item -> !isPublic && !isFinalized || item.getStatus() == Dataset.Status.FINALISED.getValue())
-                    .filter(item -> item.getDmpSectionIndex().equals(section.getOrdinal() - 1))
-                    .sorted(Comparator.comparing(Dataset::getCreated)).collect(Collectors.toList());
-
-            if (datasets.size() > 0)
-                wordBuilder.addParagraphContent("Descriptions", document, ParagraphStyle.HEADER2, BigInteger.ZERO, 0);
-            for (Dataset datasetEntity : datasets) {
-
-
-                Map<String, Object> properties = new HashMap<>();
-                if (datasetEntity.getProperties() != null) {
-                    //ObjectMapper objectMapper = new ObjectMapper();
-                    try {
-                        properties = objectMapper.readValue(datasetEntity.getProperties(), LinkedHashMap.class);
-                    } catch (IOException e) {
-                        logger.error(e.getLocalizedMessage(), e);
-                    }
-                                 /*JSONObject jObject = new JSONObject(datasetEntity.getProperties());
-                                 properties = jObject.toMap();*/
+            if(!section.getDescriptionTemplates().isEmpty()){
+                wordBuilder.addParagraphContent("Section descriptions", document, ParagraphStyle.HEADER2, BigInteger.ZERO, 0);
+                wordBuilder.addParagraphContent("Description Templates", document, ParagraphStyle.HEADER4, BigInteger.ZERO, 0);
+                for(eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.DescriptionTemplate descriptionTemplate: section.getDescriptionTemplates()){
+                    XWPFParagraph templateParagraph = document.createParagraph();
+                    XWPFRun runTemplateLabel = templateParagraph.createRun();
+                    runTemplateLabel.setText("• " + descriptionTemplate.getLabel());
+                    runTemplateLabel.setColor("116a78");
                 }
 
-
-                // Dataset Description custom style.
-                XWPFParagraph datasetDescriptionParagraph = document.createParagraph();
-                datasetDescriptionParagraph.setStyle("Heading4");
-                datasetDescriptionParagraph.setSpacingBetween(1.5);
-                XWPFRun datasetDescriptionRun = datasetDescriptionParagraph.createRun();
-                datasetDescriptionRun.setText(datasetEntity.getLabel());
-                //datasetDescriptionRun.setColor("2E75B6");
-                //datasetDescriptionRun.setBold(true);
-                datasetDescriptionRun.setFontSize(15);
+                final Boolean isFinalized = dmpEntity.getStatus() == DMP.DMPStatus.FINALISED.getValue();
+                final Boolean isPublic = dmpEntity.isPublic();
+                dmpEntity.getDataset().stream()
+                        .filter(item -> item.getStatus() != Dataset.Status.CANCELED.getValue())
+                        .filter(item -> item.getStatus() != Dataset.Status.DELETED.getValue())
+                        .filter(item -> !isPublic && !isFinalized || item.getStatus() == Dataset.Status.FINALISED.getValue())
+                        .filter(item -> item.getDmpSectionIndex().equals(section.getOrdinal() - 1))
+                        .sorted(Comparator.comparing(Dataset::getCreated))
+                        .forEach(datasetEntity -> {
+                            Map<String, Object> properties = new HashMap<>();
+                            if (datasetEntity.getProperties() != null) {
+                                //ObjectMapper objectMapper = new ObjectMapper();
+                                try {
+                                    properties = objectMapper.readValue(datasetEntity.getProperties(), LinkedHashMap.class);
+                                } catch (IOException e) {
+                                    logger.error(e.getLocalizedMessage(), e);
+                                }
+                                 /*JSONObject jObject = new JSONObject(datasetEntity.getProperties());
+                                 properties = jObject.toMap();*/
+                            }
 
 
-                // Custom style for the Dataset title.
-                //wordBuilder.addParagraphContent("Title: " + datasetEntity.getLabel(), document, ParagraphStyle.HEADER1, BigInteger.ZERO);
-//                XWPFParagraph datasetLabelParagraph = document.createParagraph();
-////                          datasetLabelParagraph.setStyle("Heading2");
-//                datasetLabelParagraph.setSpacingBetween(1.0);
-//                XWPFRun runDatasetTitle1 = datasetLabelParagraph.createRun();
-//                runDatasetTitle1.setText("Title: ");
-//                runDatasetTitle1.setColor("000000");
-//                //runDatasetTitle1.setBold(true);
-//                //runDatasetTitle1.setFontSize(12);
-//                XWPFRun runDatasetTitle = datasetLabelParagraph.createRun();
-//                runDatasetTitle.setText(datasetEntity.getLabel());
-//                runDatasetTitle.setColor("116a78");
-                //runDatasetTitle.setBold(true);
-                //runDatasetTitle.setFontSize(12);
+                            // Dataset Description custom style.
+                            XWPFParagraph datasetDescriptionParagraph = document.createParagraph();
+                            datasetDescriptionParagraph.setStyle("Heading4");
+                            datasetDescriptionParagraph.setSpacingBetween(1.5);
+                            XWPFRun datasetDescriptionRun = datasetDescriptionParagraph.createRun();
+                            datasetDescriptionRun.setText("Dataset Description");
+                            //datasetDescriptionRun.setColor("2E75B6");
+                            //datasetDescriptionRun.setBold(true);
+                            datasetDescriptionRun.setFontSize(15);
 
-                XWPFParagraph descriptionParagraph = document.createParagraph();
-//                XWPFRun descriptionParagraphRun = descriptionParagraph.createRun();
-//                descriptionParagraphRun.setText("Description: ");
-//                descriptionParagraphRun.setColor("000000");
-                wordBuilder.addParagraphContent(datasetEntity.getDescription(), document, ParagraphStyle.HTML, BigInteger.ZERO, 0);
 
-                XWPFParagraph datasetTemplateParagraph = document.createParagraph();
+                            // Custom style for the Dataset title.
+                            //wordBuilder.addParagraphContent("Title: " + datasetEntity.getLabel(), document, ParagraphStyle.HEADER1, BigInteger.ZERO);
+                            XWPFParagraph datasetLabelParagraph = document.createParagraph();
+//                          datasetLabelParagraph.setStyle("Heading2");
+                            datasetLabelParagraph.setSpacingBetween(1.0);
+                            XWPFRun runDatasetTitle1 = datasetLabelParagraph.createRun();
+                            runDatasetTitle1.setText("Title: ");
+                            runDatasetTitle1.setColor("000000");
+                            //runDatasetTitle1.setBold(true);
+                            //runDatasetTitle1.setFontSize(12);
+                            XWPFRun runDatasetTitle = datasetLabelParagraph.createRun();
+                            runDatasetTitle.setText(datasetEntity.getLabel());
+                            runDatasetTitle.setColor("116a78");
+                            //runDatasetTitle.setBold(true);
+                            //runDatasetTitle.setFontSize(12);
+
+                            XWPFParagraph datasetTemplateParagraph = document.createParagraph();
 //                          datasetTemplateParagraph.setStyle("Heading3");
-                XWPFRun runDatasetTemplate1 = datasetTemplateParagraph.createRun();
-                runDatasetTemplate1.setText("Template: ");
-                runDatasetTemplate1.setColor("000000");
-                //runDatasetTemplate1.setBold(true);
-                //runDatasetTemplate1.setFontSize(12);
-                XWPFRun runDatasetTemplate = datasetTemplateParagraph.createRun();
-                runDatasetTemplate.setText(datasetEntity.getProfile().getLabel());
-                runDatasetTemplate.setColor("116a78");
-                //runDatasetTemplate.setBold(true);
-                //runDatasetTemplate.setFontSize(12);
+                            XWPFRun runDatasetTemplate1 = datasetTemplateParagraph.createRun();
+                            runDatasetTemplate1.setText("Template: ");
+                            runDatasetTemplate1.setColor("000000");
+                            //runDatasetTemplate1.setBold(true);
+                            //runDatasetTemplate1.setFontSize(12);
+                            XWPFRun runDatasetTemplate = datasetTemplateParagraph.createRun();
+                            runDatasetTemplate.setText(datasetEntity.getProfile().getLabel());
+                            runDatasetTemplate.setColor("116a78");
+                            //runDatasetTemplate.setBold(true);
+                            //runDatasetTemplate.setFontSize(12);
 
 //                          /*XWPFParagraph externalReferencesParagraph = document.createParagraph();
 //                          externalReferencesParagraph.setStyle("Heading3");
@@ -1644,30 +1587,30 @@ public class DataManagementPlanManager {
 //
 //
 
-                XWPFParagraph datasetDescParagraph = document.createParagraph();
-                XWPFRun runDatasetDescription1 = datasetDescParagraph.createRun();
-                runDatasetDescription1.setText("Type: ");
-                runDatasetDescription1.setColor("000000");
-                XWPFRun runDatasetDescription = datasetDescParagraph.createRun();
-                runDatasetDescription.setText(datasetEntity.getProfile().getType().getName());
-                runDatasetDescription.setColor("116a78");
-                //wordBuilder.addParagraphContent(datasetEntity.getDescription(), document, ParagraphStyle.HTML, BigInteger.ZERO, 0);
+                            XWPFParagraph datasetDescParagraph = document.createParagraph();
+                            XWPFRun runDatasetDescription1 = datasetDescParagraph.createRun();
+                            runDatasetDescription1.setText("Description: ");
+                            runDatasetDescription1.setColor("000000");
+                            XWPFRun runDatasetDescription = datasetDescParagraph.createRun();
+                            runDatasetDescription.setText(datasetEntity.getProfile().getLabel());
+                            runDatasetDescription.setColor("116a78");
+                            //wordBuilder.addParagraphContent(datasetEntity.getDescription(), document, ParagraphStyle.HTML, BigInteger.ZERO, 0);
 
-                document.createParagraph();
+                            document.createParagraph();
 
-                PagedDatasetProfile pagedDatasetProfile = datasetManager.getPagedProfile(dataset, datasetEntity);
-                visibilityRuleService.setProperties(properties);
-                visibilityRuleService.buildVisibilityContext(pagedDatasetProfile.getRules());
-                try {
-                    wordBuilder.build(document, pagedDatasetProfile, visibilityRuleService);
-                } catch (IOException e) {
-                    logger.error(e.getMessage(), e);
-                }
-                // Page break at the end of the Dataset.
-                XWPFParagraph parBreakDataset = document.createParagraph();
-                parBreakDataset.setPageBreak(true);
+                            PagedDatasetProfile pagedDatasetProfile = datasetManager.getPagedProfile(dataset, datasetEntity);
+                            visibilityRuleService.setProperties(properties);
+                            visibilityRuleService.buildVisibilityContext(pagedDatasetProfile.getRules());
+                            try {
+                                wordBuilder.build(document, pagedDatasetProfile, visibilityRuleService);
+                            } catch (IOException e) {
+                                logger.error(e.getMessage(), e);
+                            }
+                            // Page break at the end of the Dataset.
+                            XWPFParagraph parBreakDataset = document.createParagraph();
+                            parBreakDataset.setPageBreak(true);
+                        });
             }
-            //}
         }
 
 //        // Removes the top empty headings.
@@ -1765,9 +1708,9 @@ public class DataManagementPlanManager {
             Element dmpProfileId = xmlDoc.createElement("dmpProfileId");
             dmpProfileId.setTextContent(dmpProfile.getId().toString());
             dmpProfileElement.appendChild(dmpProfileId);
-//            Element values = xmlDoc.createElement("values");
-//            values.setTextContent(dmpProfile.getDefinition());
-//            dmpProfileElement.appendChild(values);
+            Element values = xmlDoc.createElement("values");
+            values.setTextContent(dmpProfile.getDefinition());
+            dmpProfileElement.appendChild(values);
         }
         dmpElement.appendChild(dmpProfileElement);
 
@@ -1807,7 +1750,7 @@ public class DataManagementPlanManager {
 
         // Funder.
         Element funder = xmlDoc.createElement("funder");
-        if (this.dataManagementProfileManager.fieldInBlueprint(dmp.getProfile(), SystemFieldType.GRANT, principal) && this.dataManagementProfileManager.fieldInBlueprint(dmp.getProfile(), SystemFieldType.FUNDER, principal) && dmp.getGrant() != null) {
+        if (this.dataManagementProfileManager.fieldInBlueprint(dmp.getProfile(), SystemFieldType.GRANT, principal) && this.dataManagementProfileManager.fieldInBlueprint(dmp.getProfile(), SystemFieldType.FUNDER, principal)) {
             Element funderLabel = xmlDoc.createElement("label");
             Element funderId = xmlDoc.createElement("id");
             funderLabel.setTextContent(dmp.getGrant().getFunder().getLabel());
@@ -1825,7 +1768,7 @@ public class DataManagementPlanManager {
         dmpElement.appendChild(funder);
         // Grant.
         Element grant = xmlDoc.createElement("grant");
-        if (this.dataManagementProfileManager.fieldInBlueprint(dmp.getProfile(), SystemFieldType.GRANT, principal) && dmp.getGrant() != null) {
+        if (this.dataManagementProfileManager.fieldInBlueprint(dmp.getProfile(), SystemFieldType.GRANT, principal)) {
             Element grantLabel = xmlDoc.createElement("label");
             Element grantId = xmlDoc.createElement("id");
             grantLabel.setTextContent(dmp.getGrant().getLabel());
@@ -1843,7 +1786,7 @@ public class DataManagementPlanManager {
         dmpElement.appendChild(grant);
         // Project.
         Element project = xmlDoc.createElement("project");
-        if (this.dataManagementProfileManager.fieldInBlueprint(dmp.getProfile(), SystemFieldType.PROJECT, principal) && dmp.getProject() != null) {
+        if (this.dataManagementProfileManager.fieldInBlueprint(dmp.getProfile(), SystemFieldType.PROJECT, principal)) {
             Element projectId = xmlDoc.createElement("id");
             Element projectLabel = xmlDoc.createElement("label");
             Element projectDescription = xmlDoc.createElement("description");
@@ -1887,33 +1830,8 @@ public class DataManagementPlanManager {
             researchersElement.appendChild(researcherElement);
         }
         dmpElement.appendChild(researchersElement);
-
-        Element extraFields = xmlDoc.createElement("extraFields");
-        Map<String, Object> dmpProperties = new ObjectMapper().readValue(dmp.getProperties(), new TypeReference<Map<String, Object>>() {});
-        DataManagementPlanBlueprint blueprint = this.dataManagementProfileManager.getSingleBlueprint(dmp.getProfile().getId().toString(), principal).getDefinition();
-        blueprint.getSections().forEach(section -> {
-            section.getFields().forEach(fieldModel -> {
-                if (fieldModel.getCategory() == FieldCategory.EXTRA) {
-                    Element extraField = xmlDoc.createElement("extraField");
-                    Element extraFieldId = xmlDoc.createElement("id");
-                    extraFieldId.setTextContent(fieldModel.getId().toString());
-                    Element extraFieldLabel = xmlDoc.createElement("label");
-                    extraFieldLabel.setTextContent(fieldModel.getLabel());
-                    Element extraFieldValue = xmlDoc.createElement("value");
-                    Object value = dmpProperties.get(fieldModel.getId().toString());
-                    if (value != null) {
-                        extraFieldValue.setTextContent((String) value);
-                    }
-                    extraField.appendChild(extraFieldId);
-                    extraField.appendChild(extraFieldLabel);
-                    extraField.appendChild(extraFieldValue);
-                    extraFields.appendChild(extraField);
-                }
-            });
-        });
-        dmpElement.appendChild(extraFields);
-
         Element datasetsElement = xmlDoc.createElement("datasets");
+
         for (Dataset dataset : datasets) {
             Element datasetElement = xmlDoc.createElement("dataset");
             datasetElement.setAttribute("name", dataset.getLabel());
@@ -1922,10 +1840,6 @@ public class DataManagementPlanManager {
             datasetElement.appendChild(datasetDescriptionElement);
             datasetDescriptionElement.setTextContent(dataset.getDescription());
 
-            Element datasetDmpSectionIndex = xmlDoc.createElement("dmpSectionIndex");
-            datasetElement.appendChild(datasetDmpSectionIndex);
-            datasetDmpSectionIndex.setTextContent(String.valueOf(dataset.getDmpSectionIndex()));
-
             Element datsetProfileElement = xmlDoc.createElement("profile-id");
             datasetElement.appendChild(datsetProfileElement);
             datsetProfileElement.setTextContent(dataset.getProfile().getId().toString());
@@ -1946,8 +1860,8 @@ public class DataManagementPlanManager {
             datasetElement.appendChild(xmlBuilder.createPages(pagedDatasetProfile.getPages(), visibilityRuleService, xmlDoc));
             datasetsElement.appendChild(datasetElement);
         }
-
         Element profiles = xmlDoc.createElement("profiles");
+
         // Get DatasetProfiles from DMP to add to XML.
         for (DMPDatasetProfile dmpDescriptionProfile : dmp.getAssociatedDmps()) {
             DescriptionTemplate descriptionTemplate = dmpDescriptionProfile.getDatasetprofile();
@@ -1964,15 +1878,6 @@ public class DataManagementPlanManager {
             Element profileVersion = xmlDoc.createElement("profileVersion");
             profileVersion.setTextContent(String.valueOf(descriptionTemplate.getVersion()));
             profile.appendChild(profileVersion);
-            Element profileInSections = xmlDoc.createElement("profileInSections");
-            Map<String, Object> data = new ObjectMapper().readValue(dmpDescriptionProfile.getData(), new TypeReference<Map<String, Object>>() {});
-            List<Integer> sections = (List<Integer>) data.get("dmpSectionIndex");
-            for(int section: sections) {
-                Element profileInSection = xmlDoc.createElement("section");
-                profileInSection.setTextContent(String.valueOf(section));
-                profileInSections.appendChild(profileInSection);
-            }
-            profile.appendChild(profileInSections);
             profiles.appendChild(profile);
         }
         dmpElement.appendChild(profiles);
@@ -2083,83 +1988,59 @@ public class DataManagementPlanManager {
             // Creates new dataManagementPlan to fill it with the data model that was parsed from the xml.
             // Creates properties.
             DataManagementPlanEditorModel dm = new DataManagementPlanEditorModel();
+//            DataManagementPlanProfile dmpProfile = new DataManagementPlanProfile();
+//
+//            List<Field> fieldList = new LinkedList<>();
+//            Field field = new Field();
+//            field.setLabel(dataManagementPlans.get(0).getDmpProfile().getDmpProfileName());
+//            field.setId(dataManagementPlans.get(0).getDmpProfile().getDmpProfileId());
+//
+//            fieldList.add(field);
+//            dmpProfile.setFields(fieldList);
 
-            DmpProfileImportModel dmpProfileImportModel = dataManagementPlans.get(0).getDmpProfile();
-            UUID profileId = null;
-            if (dmpProfileImportModel != null) {
-                profileId = dmpProfileImportModel.getDmpProfileId();
-            }
-            else {
-                profileId = UUID.fromString("86635178-36a6-484f-9057-a934e4eeecd5");
-            }
-            dm.setProfile(profileId);
+            /*Tuple tuple = new Tuple();
+            tuple.setId(dataManagementPlans.get(0).getDmpProfile().getDmpProfileId());
+            tuple.setLabel(dataManagementPlans.get(0).getDmpProfile().getDmpProfileName());*/
+            eu.eudat.models.data.funder.Funder funder = new eu.eudat.models.data.funder.Funder();
+            FunderImportModels funderImport = dataManagementPlans.get(0).getFunderImportModels();
+            funder.setId(funderImport.getId());
+            funder.setLabel(funderImport.getLabel());
+            FunderDMPEditorModel funderEditor = new FunderDMPEditorModel();
+            funderEditor.setExistFunder(funder);
 
+            eu.eudat.models.data.grant.Grant grant = new eu.eudat.models.data.grant.Grant();
+            GrantImportModels grantImport = dataManagementPlans.get(0).getGrantImport();
+            grant.setId(grantImport.getId());
+            grant.setLabel(grantImport.getLabel());
+            grant.setAbbreviation(grantImport.getAbbreviation());
+            grant.setDescription(grantImport.getDescription());
+            GrantDMPEditorModel grantEditor = new GrantDMPEditorModel();
+            grantEditor.setExistGrant(grant);
 
-            Map<String, Object> dmpPropertiesMap = new HashMap<>();
-            if (dataManagementPlans.get(0).getExtraFieldsImportModels() != null) {
-                for (ExtraFieldsImportModels extraField: dataManagementPlans.get(0).getExtraFieldsImportModels()) {
-                    dmpPropertiesMap.put(extraField.getId(), extraField.getValue());
-                }
-            }
-            dm.setProperties(dmpPropertiesMap);
-
-            if (this.dataManagementProfileManager.fieldInBlueprint(dmpProfileImportModel.getDmpProfileId().toString(), SystemFieldType.FUNDER, principal)) {
-                eu.eudat.models.data.funder.Funder funder = new eu.eudat.models.data.funder.Funder();
-                FunderImportModels funderImport = dataManagementPlans.get(0).getFunderImportModels();
-                funder.setId(funderImport.getId());
-                funder.setLabel(funderImport.getLabel());
-                FunderDMPEditorModel funderEditor = new FunderDMPEditorModel();
-                funderEditor.setExistFunder(funder);
-
-                dm.setFunder(funderEditor);
-            }
-
-            if (this.dataManagementProfileManager.fieldInBlueprint(dmpProfileImportModel.getDmpProfileId().toString(), SystemFieldType.GRANT, principal)) {
-                eu.eudat.models.data.grant.Grant grant = new eu.eudat.models.data.grant.Grant();
-                GrantImportModels grantImport = dataManagementPlans.get(0).getGrantImport();
-                grant.setId(grantImport.getId());
-                grant.setLabel(grantImport.getLabel());
-                grant.setAbbreviation(grantImport.getAbbreviation());
-                grant.setDescription(grantImport.getDescription());
-                GrantDMPEditorModel grantEditor = new GrantDMPEditorModel();
-                grantEditor.setExistGrant(grant);
-
-                dm.setGrant(grantEditor);
-            }
-
-            if (this.dataManagementProfileManager.fieldInBlueprint(dmpProfileImportModel.getDmpProfileId().toString(), SystemFieldType.PROJECT, principal)) {
-                eu.eudat.models.data.project.Project project = new eu.eudat.models.data.project.Project();
-                ProjectImportModels projectImport = dataManagementPlans.get(0).getProjectImportModels();
-                project.setId(projectImport.getId());
-                project.setLabel(projectImport.getLabel());
-                ProjectDMPEditorModel projectEditor = new ProjectDMPEditorModel();
-                projectEditor.setExistProject(project);
-
-                dm.setProject(projectEditor);
-            }
+            eu.eudat.models.data.project.Project project = new eu.eudat.models.data.project.Project();
+            ProjectImportModels projectImport = dataManagementPlans.get(0).getProjectImportModels();
+            project.setId(projectImport.getId());
+            project.setLabel(projectImport.getLabel());
+            ProjectDMPEditorModel projectEditor = new ProjectDMPEditorModel();
+            projectEditor.setExistProject(project);
 
             List<eu.eudat.models.data.dmp.AssociatedProfile> associatedProfiles = new LinkedList<>();
-//            if (profiles != null && profiles.length > 0) {
-//                for (String profile : profiles) {
-//                    DescriptionTemplate exProfile = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(profile));
-//                    AssociatedProfile associatedProfile = new AssociatedProfile().fromData(exProfile);
-//                    associatedProfiles.add(associatedProfile);
-//                }
-//            }
+            if (profiles != null && profiles.length > 0) {
+                for (String profile : profiles) {
+                    DescriptionTemplate exProfile = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(profile));
+                    AssociatedProfile associatedProfile = new AssociatedProfile().fromData(exProfile);
+                    associatedProfiles.add(associatedProfile);
+                }
+            }
 
             for (AssociatedProfileImportModels a : dataManagementPlans.get(0).getProfilesImportModels()) {
                 try {
                     DescriptionTemplate exProfile = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(a.getId());
                     AssociatedProfile associatedProfile = new AssociatedProfile().fromData(exProfile);
-                    Map<String, Object> data = new HashMap<>();
-                    List<Integer> sections = new ArrayList<>(a.getSection());
-                    data.put("dmpSectionIndex", sections);
-                    associatedProfile.setData(data);
                     associatedProfiles.add(associatedProfile);
                 } catch (Exception ignored) {
                 }
             }
-
             List<eu.eudat.models.data.dmp.Organisation> organisations = new ArrayList<>();
             for (OrganisationImportModel org : dataManagementPlans.get(0).getOrganisationImportModels()) {
                 eu.eudat.models.data.dmp.Organisation organisation = new eu.eudat.models.data.dmp.Organisation();
@@ -2168,7 +2049,6 @@ public class DataManagementPlanManager {
                 organisation.setKey(organisation.getReference().split(":")[0]);
                 organisations.add(organisation);
             }
-
             List<eu.eudat.models.data.dmp.Researcher> researchers = new LinkedList<>();
             for (ResearcherImportModels res : dataManagementPlans.get(0).getResearchersImportModels()) {
                 eu.eudat.models.data.dmp.Researcher researcher = new eu.eudat.models.data.dmp.Researcher();
@@ -2184,6 +2064,9 @@ public class DataManagementPlanManager {
 
             // Sets properties.
             dm.setLabel(files[0].getOriginalFilename());  // Sets label.
+            dm.setGrant(grantEditor);  //Sets grant property.
+            dm.setFunder(funderEditor);
+            dm.setProject(projectEditor);
             dm.setDescription(dataManagementPlans.get(0).getDescriptionImport()); // Sets description property.
             dm.setProfiles(associatedProfiles);
             dm.setOrganisations(organisations);  // Sets organisations property.
@@ -2229,7 +2112,6 @@ public class DataManagementPlanManager {
             for (DatasetImportModels das: dataManagementPlans.get(0).getDatasetImportModels()) {
                 eu.eudat.data.entities.Dataset dataset = new eu.eudat.data.entities.Dataset();
                 dataset.setLabel(das.getName());
-                dataset.setDmpSectionIndex(das.getDmpSectionIndex());
                 try {
                     dataset.setProfile(databaseRepository.getDatasetProfileDao().find(das.getProfile()));
                 } catch (Exception ignored) {
@@ -2286,11 +2168,6 @@ public class DataManagementPlanManager {
                 dmp.setUsers(new HashSet<>(apiContext.getOperationsContext().getDatabaseRepository().getUserDmpDao().asQueryable().where((builder, root) -> builder.equal(root.get("dmp").get("id"), dmpId)).toList()));
                 this.updateIndex(dmp);
             }
-            for(DMPDatasetProfile dmpDatasetProfile : dmp.getAssociatedDmps()){
-                dmpDatasetProfile.setDmp(dmp);
-                apiContext.getOperationsContext().getDatabaseRepository().getDmpDatasetProfileDao().createOrUpdate(dmpDatasetProfile);
-            }
-
             dmp.getDataset().forEach(dataset -> {
                 dataset.setStatus(Dataset.Status.SAVED.getValue());
                 dataset.setCreated(new Date());
@@ -2350,19 +2227,19 @@ public class DataManagementPlanManager {
     }
 
     private void assignGrandUserIfInternal(DMP dmp, UserInfo user) {
-        if (dmp.getGrant() != null && dmp.getGrant().getCreationUser() == null && (dmp.getGrant().getReference() != null && dmp.getGrant().getReference().startsWith("dmp:"))) {
+        if (dmp.getGrant().getCreationUser() == null && (dmp.getGrant().getReference() != null && dmp.getGrant().getReference().startsWith("dmp:"))) {
             dmp.getGrant().setCreationUser(user);
         }
     }
 
     private void assignFunderUserIfInternal(DMP dmp, UserInfo user) {
-        if (dmp.getGrant() != null && dmp.getGrant().getFunder() != null && dmp.getGrant().getFunder().getCreationUser() == null && ( dmp.getGrant().getFunder().getReference() != null && dmp.getGrant().getFunder().getReference().startsWith("dmp:"))) {
+        if (dmp.getGrant().getFunder().getCreationUser() == null && ( dmp.getGrant().getFunder().getReference() != null && dmp.getGrant().getFunder().getReference().startsWith("dmp:"))) {
             dmp.getGrant().getFunder().setCreationUser(user);
         }
     }
 
     private void assignProjectUserIfInternal(DMP dmp, UserInfo user) {
-        if (dmp.getProject() != null && dmp.getProject().getCreationUser() == null && (dmp.getProject().getReference() != null && dmp.getProject().getReference().startsWith("dmp:"))) {
+        if (dmp.getProject().getCreationUser() == null && (dmp.getProject().getReference() != null && dmp.getProject().getReference().startsWith("dmp:"))) {
             dmp.getProject().setCreationUser(user);
         }
     }
@@ -2442,7 +2319,7 @@ public class DataManagementPlanManager {
     * */
 
     private void checkIfUserCanEditGrant(DMP dmp, UserInfo user) throws Exception{
-        if (dmp.getGrant() != null && dmp.getGrant().getId() != null) {
+        if (dmp.getGrant().getId() != null) {
             Grant grant = apiContext.getOperationsContext().getDatabaseRepository().getGrantDao().find(dmp.getGrant().getId());
             if (grant.getFunder() != null && dmp.getGrant().getFunder() != null
                     && !grant.getFunder().getId().equals(dmp.getGrant().getFunder().getId())) {

dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementProfileManager.java

@@ -2,22 +2,17 @@ package eu.eudat.logic.managers;
 
 import com.jayway.jsonpath.DocumentContext;
 import com.jayway.jsonpath.JsonPath;
-import eu.eudat.data.dao.criteria.DataManagementPlanCriteria;
 import eu.eudat.data.dao.criteria.RequestItem;
-import eu.eudat.data.dao.entities.DatasetDao;
-import eu.eudat.data.dao.entities.DatasetProfileDao;
+import eu.eudat.data.dao.entities.DMPProfileDao;
 import eu.eudat.data.entities.DMPProfile;
-import eu.eudat.data.entities.DescriptionTemplate;
 import eu.eudat.data.query.items.dmpblueprint.DataManagementPlanBlueprintTableRequest;
 import eu.eudat.data.query.items.item.dmpprofile.DataManagementPlanProfileCriteriaRequest;
 import eu.eudat.data.query.items.table.dmpprofile.DataManagementPlanProfileTableRequest;
-import eu.eudat.exceptions.datasetprofile.DatasetProfileWithDatasetsExeption;
-import eu.eudat.exceptions.dmpblueprint.DmpBlueprintUsedException;
 import eu.eudat.logic.services.operations.DatabaseRepository;
 import eu.eudat.logic.utilities.builders.XmlBuilder;
 import eu.eudat.logic.utilities.documents.helpers.FileEnvelope;
-import eu.eudat.logic.utilities.documents.xml.dmpXml.ExportXmlBuilderDmpBlueprint;
-import eu.eudat.logic.utilities.documents.xml.dmpXml.ImportXmlBuilderDmpBlueprint;
+import eu.eudat.logic.utilities.documents.xml.dmpXml.ExportXmlBuilderDmpProfile;
+import eu.eudat.logic.utilities.documents.xml.dmpXml.ImportXmlBuilderDmpProfile;
 import eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.*;
 import eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.types.FieldCategory;
 import eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.types.SystemFieldType;
@@ -114,11 +109,6 @@ public class DataManagementProfileManager {
         return dataManagementPlanBlueprintListingModel;
     }
 
-    public boolean fieldInBlueprint(String id, SystemFieldType type, Principal principal) {
-        DMPProfile dmpProfile = databaseRepository.getDmpProfileDao().find(UUID.fromString(id));
-        return this.fieldInBlueprint(dmpProfile, type, principal);
-    }
-
     public boolean fieldInBlueprint(DMPProfile dmpProfile, SystemFieldType type, Principal principal) {
         DataManagementPlanBlueprintListingModel dmpBlueprint = new DataManagementPlanBlueprintListingModel();
         dmpBlueprint.fromDataModel(dmpProfile);
@@ -135,17 +125,6 @@ public class DataManagementProfileManager {
         return false;
     }
 
-    public List<Integer> sectionIndexesForDescriptionTemplate(DMPProfile dmpProfile, UUID descriptionTemplateId) {
-        DataManagementPlanBlueprintListingModel dmpBlueprint = new DataManagementPlanBlueprintListingModel();
-        dmpBlueprint.fromDataModel(dmpProfile);
-        List<Integer> sectionIndexes = new ArrayList<>();
-        for(int i = 0; i < dmpBlueprint.getDefinition().getSections().size(); i++) {
-            Section section = dmpBlueprint.getDefinition().getSections().get(i);
-            if(section.getHasTemplates() && section.getDescriptionTemplates().stream().anyMatch(x -> x.getDescriptionTemplateId().equals(descriptionTemplateId))) sectionIndexes.add(i);
-        }
-        return sectionIndexes;
-    }
-
     public List<DataManagementPlanProfileListingModel> getWithCriteria(DataManagementPlanProfileCriteriaRequest dataManagementPlanProfileCriteriaRequest) throws IllegalAccessException, InstantiationException {
         QueryableList<DMPProfile> items = databaseRepository.getDmpProfileDao().getWithCriteria(dataManagementPlanProfileCriteriaRequest.getCriteria());
         List<DataManagementPlanProfileListingModel> datamanagementPlans = items.select(item -> new DataManagementPlanProfileListingModel().fromDataModel(item));
@@ -162,20 +141,8 @@ public class DataManagementProfileManager {
         apiContext.getOperationsContext().getDatabaseRepository().getDmpProfileDao().createOrUpdate(dmpProfile);
     }
 
-    public void inactivate(String id) {
-        DMPProfile dmpProfile = databaseRepository.getDmpProfileDao().find(UUID.fromString(id));
-        DataManagementPlanCriteria dataManagementPlanCriteria = new DataManagementPlanCriteria();
-        dataManagementPlanCriteria.setProfile(dmpProfile);
-        if (dmpProfile.getStatus() == DMPProfile.Status.SAVED.getValue() || databaseRepository.getDmpDao().getWithCriteria(dataManagementPlanCriteria).count() == 0) {
-            dmpProfile.setStatus(DMPProfile.Status.DELETED.getValue());
-            databaseRepository.getDmpProfileDao().createOrUpdate(dmpProfile);
-        } else {
-            throw new DmpBlueprintUsedException("This blueprint can not deleted, because DMPs are associated with it");
-        }
-    }
-
-    public ResponseEntity<byte[]> getDocument(DataManagementPlanBlueprintListingModel dmpProfile) throws IOException {
-        FileEnvelope envelope = getXmlDocument(dmpProfile);
+    public ResponseEntity<byte[]> getDocument(DataManagementPlanProfileListingModel dmpProfile, String label) throws IllegalAccessException, IOException, InstantiationException {
+        FileEnvelope envelope = getXmlDocument(dmpProfile, label);
         InputStream resource = new FileInputStream(envelope.getFile());
         logger.info("Mime Type of " + envelope.getFilename() + " is " +
                 new MimetypesFileTypeMap().getContentType(envelope.getFile()));
@@ -194,18 +161,18 @@ public class DataManagementProfileManager {
                 HttpStatus.OK);
     }
 
-    public FileEnvelope getXmlDocument(DataManagementPlanBlueprintListingModel dmpProfile) throws IOException {
-        ExportXmlBuilderDmpBlueprint xmlBuilder = new ExportXmlBuilderDmpBlueprint();
+    public FileEnvelope getXmlDocument(DataManagementPlanProfileListingModel dmpProfile, String label) throws InstantiationException, IllegalAccessException, IOException {
+        ExportXmlBuilderDmpProfile xmlBuilder = new ExportXmlBuilderDmpProfile();
         File file = xmlBuilder.build(dmpProfile, environment);
         FileEnvelope fileEnvelope = new FileEnvelope();
         fileEnvelope.setFile(file);
-        fileEnvelope.setFilename(dmpProfile.getLabel());
+        fileEnvelope.setFilename(label);
         return fileEnvelope;
     }
 
 
-    public eu.eudat.logic.utilities.documents.xml.dmpXml.dmpBlueprintModel.DmpBlueprint createDmpProfileFromXml(MultipartFile multiPartFile) {
-        ImportXmlBuilderDmpBlueprint xmlBuilder = new ImportXmlBuilderDmpBlueprint();
+    public eu.eudat.logic.utilities.documents.xml.dmpXml.dmpProfileModel.DmpProfile createDmpProfileFromXml(MultipartFile multiPartFile) {
+        ImportXmlBuilderDmpProfile xmlBuilder = new ImportXmlBuilderDmpProfile();
         try {
             return xmlBuilder.build(convert(multiPartFile));
         } catch (IOException e) {

dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java

@@ -1,5 +1,7 @@
 package eu.eudat.logic.managers;
 
+import com.jayway.jsonpath.DocumentContext;
+import com.jayway.jsonpath.JsonPath;
 import eu.eudat.data.dao.criteria.DatasetProfileCriteria;
 import eu.eudat.data.entities.DescriptionTemplate;
 import eu.eudat.data.entities.UserDatasetProfile;
@@ -8,21 +10,17 @@ import eu.eudat.data.query.items.item.datasetprofile.DatasetProfileAutocompleteR
 import eu.eudat.data.query.items.table.datasetprofile.DatasetProfileTableRequestItem;
 import eu.eudat.exceptions.datasetprofile.DatasetProfileNewVersionException;
 import eu.eudat.logic.builders.model.models.DataTableDataBuilder;
-import eu.eudat.logic.proxy.config.*;
+import eu.eudat.logic.proxy.config.Semantic;
 import eu.eudat.logic.proxy.config.configloaders.ConfigLoader;
-import eu.eudat.logic.proxy.config.entities.GeneralUrls;
-import eu.eudat.logic.proxy.fetching.RemoteFetcher;
 import eu.eudat.logic.services.ApiContext;
 import eu.eudat.logic.services.operations.DatabaseRepository;
 import eu.eudat.logic.utilities.builders.XmlBuilder;
 import eu.eudat.logic.utilities.documents.helpers.FileEnvelope;
 import eu.eudat.logic.utilities.documents.xml.datasetProfileXml.ExportXmlBuilderDatasetProfile;
 import eu.eudat.logic.utilities.documents.xml.datasetProfileXml.ImportXmlBuilderDatasetProfile;
-import eu.eudat.models.data.admin.composite.DatasetProfile;
 import eu.eudat.models.data.components.commons.datafield.AutoCompleteData;
 import eu.eudat.models.data.datasetprofile.DatasetProfileAutocompleteItem;
 import eu.eudat.models.data.datasetprofile.DatasetProfileListingModel;
-import eu.eudat.models.data.datasetprofile.DatasetProfileWithPrefillingPropertyModel;
 import eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field;
 import eu.eudat.models.data.externaldataset.ExternalAutocompleteFieldModel;
 import eu.eudat.models.data.helpers.common.DataTableData;
@@ -36,11 +34,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
 import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -57,8 +54,6 @@ import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.xpath.*;
 import java.io.*;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -69,20 +64,20 @@ public class DatasetProfileManager {
     private static final Logger logger = LoggerFactory.getLogger(DatasetProfileManager.class);
     private static final List<String> cache = new ArrayList<>();
 
-    private final ApiContext apiContext;
-    private final DatabaseRepository databaseRepository;
-    private final Environment environment;
-    private final ConfigLoader configLoader;
+    private ApiContext apiContext;
+    private DatabaseRepository databaseRepository;
+    private Environment environment;
+    private ConfigLoader configLoader;
+
     private final MetricsManager metricsManager;
-    private final RemoteFetcher remoteFetcher;
+
     @Autowired
-    public DatasetProfileManager(ApiContext apiContext, Environment environment, ConfigLoader configLoader, MetricsManager metricsManager, RemoteFetcher remoteFetcher) {
+    public DatasetProfileManager(ApiContext apiContext, Environment environment, ConfigLoader configLoader, MetricsManager metricsManager) {
         this.apiContext = apiContext;
         this.databaseRepository = apiContext.getOperationsContext().getDatabaseRepository();
         this.environment = environment;
         this.configLoader = configLoader;
         this.metricsManager = metricsManager;
-        this.remoteFetcher = remoteFetcher;
     }
 
     @Transactional
@@ -134,21 +129,6 @@ public class DatasetProfileManager {
         return datasetProfiles;
     }
 
-    public List<DatasetProfileWithPrefillingPropertyModel> getAllWithPrefilling(DatasetProfileTableRequestItem tableRequestItem) {
-        List<DatasetProfileWithPrefillingPropertyModel> datasetProfiles = new ArrayList<>();
-        if (!tableRequestItem.getCriteria().getIds().isEmpty()) {
-            tableRequestItem.getCriteria().getIds().forEach(id -> {
-                DatasetProfile datasetProfile = this.getDatasetProfile(id.toString());
-                DatasetProfileWithPrefillingPropertyModel profileModel = new DatasetProfileWithPrefillingPropertyModel();
-                profileModel.setId(id);
-                profileModel.setLabel(datasetProfile.getLabel());
-                profileModel.setEnablePrefilling(datasetProfile.isEnablePrefilling());
-                datasetProfiles.add(profileModel);
-            });
-        }
-        return datasetProfiles;
-    }
-
     public eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field queryForField(String xml, String fieldId) throws XPathExpressionException {
         eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field field = new Field();
         Document document = XmlBuilder.fromXml(xml);
@@ -161,10 +141,10 @@ public class DatasetProfileManager {
         return field;
     }
 
-    public List<ExternalAutocompleteFieldModel> getAutocomplete(AutoCompleteData data, String like) {
-        /*List<ExternalAutocompleteFieldModel> result = new LinkedList<>();
+    public static List<ExternalAutocompleteFieldModel> getAutocomplete(AutoCompleteData data, String like) {
+        List<ExternalAutocompleteFieldModel> result = new LinkedList<>();
         SimpleClientHttpRequestFactory simpleFactory = new SimpleClientHttpRequestFactory();
-
+        
         RestTemplate restTemplate = new RestTemplate(simpleFactory);
         HttpHeaders headers = new HttpHeaders();
         DocumentContext jsonContext = null;
@@ -183,7 +163,7 @@ public class DatasetProfileManager {
                     	if (url.contains("zenodo")) {
                     		url = url.replace("?", "/?");
                     	}
-
+       
                         url = url.replace("{like}", like.equals("") ? "*" : like);
                         url = url.replace("%20", " ");
                         url = url.replace("%22", "\"");
@@ -199,7 +179,7 @@ public class DatasetProfileManager {
                     headers.setContentType(MediaType.APPLICATION_JSON);
                     entity = new HttpEntity<>("parameters", headers);
 
-
+                   
                     response = restTemplate.exchange(url, HttpMethod.GET, entity, Object.class);
                     jsonContext = JsonPath.parse(response.getBody());
                     jsonItems = jsonContext.read(singleData.getOptionsRoot() + "['" + singleData.getAutoCompleteOptions().getLabel() + "','" + singleData.getAutoCompleteOptions().getValue() + "','" + singleData.getAutoCompleteOptions().getSource() + "','" + "uri" + "']");
@@ -225,72 +205,8 @@ public class DatasetProfileManager {
         }
 
         return result.stream().sorted(Comparator.comparing(ExternalAutocompleteFieldModel::getLabel)).collect(Collectors.toList());
-*/
-        List<ExternalAutocompleteFieldModel> result = new LinkedList<>();
-        ExternalUrlCriteria urlCriteria = new ExternalUrlCriteria();
-        GeneralUrls genericUrls = new GeneralUrls();
-        int ordinal = 1;
-        List<Map<String, String>> rawResults = new ArrayList<>();
-        genericUrls.setFetchMode(FetchStrategy.FIRST);
-        urlCriteria.setLike(like);
-        for (AutoCompleteData.AutoCompleteSingleData singleData : data.getAutoCompleteSingleDataList()) {
-            UrlConfiguration urlConfiguration = new UrlConfiguration();
-            try {
-                URI uri;
-                if (singleData.getUrl().contains("?")) {
-                    uri = new URI(singleData.getUrl().substring(0, singleData.getUrl().lastIndexOf("?")));
-                } else {
-                    uri = new URI(singleData.getUrl());
-                }
-                String source = singleData.getAutoCompleteOptions().getSource();
-                source = source != null && !source.isEmpty() ? source : uri.getHost();
-                String uriString = singleData.getAutoCompleteOptions().getUri();
-                uriString = uriString != null && !uriString.isEmpty() ? uriString : "uri";
-                String parsedUrl = singleData.getUrl();
-                parsedUrl = parsedUrl.replace("%20", " ");
-                parsedUrl = parsedUrl.replace("%22", "\"");
-                while (parsedUrl.contains("&amp;")) {
-                    parsedUrl = parsedUrl.replace("&amp;", "&");
-                }
-                urlConfiguration.setUrl(parsedUrl);
-                urlConfiguration.setOrdinal(ordinal);
-                urlConfiguration.setType("External");
-                urlConfiguration.setContentType(MediaType.APPLICATION_JSON_VALUE);
-                urlConfiguration.setFirstpage("1");
-                urlConfiguration.setRequestType(singleData.getMethod() != null ? singleData.getMethod() : "GET");
-                DataUrlConfiguration dataUrlConfiguration = new DataUrlConfiguration();
-                dataUrlConfiguration.setPath(singleData.getOptionsRoot());
-                DataFieldsUrlConfiguration fieldsUrlConfiguration = new DataFieldsUrlConfiguration();
-                fieldsUrlConfiguration.setId(singleData.getAutoCompleteOptions().getValue());
-                fieldsUrlConfiguration.setName(singleData.getAutoCompleteOptions().getLabel());
-                fieldsUrlConfiguration.setSource(singleData.getAutoCompleteOptions().getSource().isEmpty()? null : singleData.getAutoCompleteOptions().getSource());
-                fieldsUrlConfiguration.setUri(uriString);
-                dataUrlConfiguration.setFieldsUrlConfiguration(fieldsUrlConfiguration);
-                urlConfiguration.setKey(source);
-                urlConfiguration.setLabel(source);
-                urlConfiguration.setData(dataUrlConfiguration);
-                if (singleData.getHasAuth()) {
-                    AuthenticationConfiguration authenticationConfiguration = new AuthenticationConfiguration();
-                    authenticationConfiguration.setAuthUrl(singleData.getAuth().getUrl());
-                    authenticationConfiguration.setAuthMethod(singleData.getAuth().getMethod());
-                    authenticationConfiguration.setAuthTokenPath(singleData.getAuth().getPath());
-                    authenticationConfiguration.setAuthRequestBody(singleData.getAuth().getBody());
-                    authenticationConfiguration.setType(singleData.getAuth().getType());
-                    urlConfiguration.setAuth(authenticationConfiguration);
-                }
-                genericUrls.getUrls().add(urlConfiguration);
-                List<Map<String, String>> singleResults =  this.remoteFetcher.getExternalGeneric(urlCriteria, genericUrls);
-                if (!singleResults.isEmpty() && !singleResults.get(0).containsKey("source") && !singleData.getAutoCompleteOptions().getSource().isEmpty()) {
-                    singleResults.forEach(singleResult -> singleResult.put("source", singleData.getAutoCompleteOptions().getSource()));
-                }
-                rawResults.addAll(singleResults);
-                genericUrls.getUrls().clear();
-            } catch (URISyntaxException e) {
-                logger.error(e.getMessage(), e);
-            }
-        }
-        rawResults.forEach(item -> result.add(new ExternalAutocompleteFieldModel(parseItem(item.get("pid")), parseItem(item.get("name")), parseItem(item.get("source")), parseItem(item.get("uri")))));
-        return result;
+
+        //return result;
     }
 
     private static String parseItem(Object item) {

dmp-backend/web/src/main/java/eu/eudat/logic/managers/GrantManager.java

@@ -140,7 +140,6 @@ public class GrantManager {
 
             grants.add(grant);
         }
-        grants = grants.stream().filter(grant -> grant.getLabel() != null).collect(Collectors.toList());
         grants.sort(Comparator.comparing(Grant::getLabel));
         grants = grants.stream().filter(listHelper.distinctByKey(Grant::getLabel)).collect(Collectors.toList());
         return grants;

dmp-backend/web/src/main/java/eu/eudat/logic/managers/PrefillingManager.java

@@ -27,13 +27,11 @@ public class PrefillingManager {
     private final ObjectMapper objectMapper;
     private final DatasetManager datasetManager;
     private final LicenseManager licenseManager;
-    private final PrefillingMapper prefillingMapper;
 
     @Autowired
-    public PrefillingManager(ApiContext apiContext, ConfigLoader configLoader, DatasetManager datasetManager, LicenseManager licenseManager, PrefillingMapper prefillingMapper) {
+    public PrefillingManager(ApiContext apiContext, ConfigLoader configLoader, DatasetManager datasetManager, LicenseManager licenseManager) {
         this.apiContext = apiContext;
         this.configLoader = configLoader;
-        this.prefillingMapper = prefillingMapper;
         this.objectMapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         this.datasetManager = datasetManager;
         this.licenseManager = licenseManager;
@@ -64,14 +62,14 @@ public class PrefillingManager {
         PrefillingGet prefillingGet = prefillingConfig.getPrefillingGet();
         Map<String, Object> prefillingEntity = getSingle(prefillingGet.getUrl(), prefillId);
         DescriptionTemplate descriptionTemplate = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(profileId);
-        return prefillingMapper.mapPrefilledEntityToDatasetWizard(prefillingEntity, prefillingGet, prefillingConfig.getType(), descriptionTemplate, datasetManager, licenseManager);
+        return PrefillingMapper.mapPrefilledEntityToDatasetWizard(prefillingEntity, prefillingGet, prefillingConfig.getType(), descriptionTemplate, datasetManager, licenseManager);
     }
 
     public DatasetWizardModel getPrefilledDatasetUsingData(Map<String, Object> data, String configId, UUID profileId) throws Exception {
         PrefillingConfig prefillingConfig = configLoader.getExternalUrls().getPrefillings().get(configId);
         PrefillingGet prefillingGet = prefillingConfig.getPrefillingGet();
         DescriptionTemplate descriptionTemplate = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(profileId);
-        return prefillingMapper.mapPrefilledEntityToDatasetWizard(data, prefillingGet, prefillingConfig.getType(), descriptionTemplate, datasetManager, licenseManager);
+        return PrefillingMapper.mapPrefilledEntityToDatasetWizard(data, prefillingGet, prefillingConfig.getType(), descriptionTemplate, datasetManager, licenseManager);
     }
 
     private Map<String, Object> getSingle(String url, String id) {

dmp-backend/web/src/main/java/eu/eudat/logic/mapper/prefilling/PrefillingMapper.java

@@ -27,8 +27,6 @@ import eu.eudat.models.data.license.LicenseModel;
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -37,18 +35,11 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
-@Component
 public class PrefillingMapper {
     private static final Logger logger = LoggerFactory.getLogger(PrefillingMapper.class);
     private static final ObjectMapper mapper = new ObjectMapper().configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
-    private final DatasetProfileManager datasetProfileManager;
 
-    @Autowired
-    public PrefillingMapper(DatasetProfileManager datasetProfileManager) {
-        this.datasetProfileManager = datasetProfileManager;
-    }
-
-    public DatasetWizardModel mapPrefilledEntityToDatasetWizard(Map<String, Object> prefilledEntity, PrefillingGet prefillingGet, String type,
+    public static DatasetWizardModel mapPrefilledEntityToDatasetWizard(Map<String, Object> prefilledEntity, PrefillingGet prefillingGet, String type,
                                                                        DescriptionTemplate profile, DatasetManager datasetManager, LicenseManager licenseManager) throws Exception {
         DatasetWizardModel datasetWizardModel = new DatasetWizardModel();
         datasetWizardModel.setProfile(new DatasetProfileOverviewModel().fromDataModel(profile));
@@ -86,7 +77,7 @@ public class PrefillingMapper {
         return datasetWizardModel;
     }
 
-    private void setValue(PrefillingMapping prefillingMapping, String value, DatasetWizardModel datasetWizardModel, JsonNode parentNode, Map<String, Object> properties, String type, LicenseManager licenseManager) throws InvocationTargetException, IllegalAccessException, JsonProcessingException {
+    private static void setValue(PrefillingMapping prefillingMapping, String value, DatasetWizardModel datasetWizardModel, JsonNode parentNode, Map<String, Object> properties, String type, LicenseManager licenseManager) throws InvocationTargetException, IllegalAccessException, JsonProcessingException {
         String trimRegex = prefillingMapping.getTrimRegex() != null ? prefillingMapping.getTrimRegex() : "";
         if (!value.startsWith("\"") && !value.startsWith("[") && !value.equals("null")) {
             value = "\"" + value + "\"";
@@ -225,7 +216,7 @@ public class PrefillingMapper {
         }
     }
 
-    private Object parseComboBoxValues(JsonNode node, List<String> parsedValues) throws JsonProcessingException {
+    private static Object parseComboBoxValues(JsonNode node, List<String> parsedValues) throws JsonProcessingException {
         List<Object> normalizedValues = new ArrayList<>();
         boolean isMultiSelect;
         String type = node.isArray() ? node.get(0).get("data").get("type").asText() : node.get("data").get("type").asText();
@@ -236,7 +227,7 @@ public class PrefillingMapper {
             for (String format : parsedValues) {
                 List<ExternalAutocompleteFieldModel> result = new ArrayList<>();
                 try {
-                    result = datasetProfileManager.getAutocomplete(autoCompleteData, format);
+                    result = DatasetProfileManager.getAutocomplete(autoCompleteData, format);
                 }
                 catch (Exception e) {
                     logger.error(e.getMessage(), e);

dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/AuthType.java

@@ -1,23 +0,0 @@
-package eu.eudat.logic.proxy.config;
-
-public enum AuthType {
-    ;
-    private final String name;
-
-    AuthType(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public static AuthType fromName(String name) {
-        for (AuthType authType : AuthType.values()) {
-            if (authType.getName().equals(name)) {
-                return authType;
-            }
-        }
-        throw new IllegalArgumentException("AuthType [" + name + "] is not supported");
-    }
-}

dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/AuthenticationConfiguration.java

@@ -1,57 +0,0 @@
-package eu.eudat.logic.proxy.config;
-
-import javax.xml.bind.annotation.XmlElement;
-
-public class AuthenticationConfiguration {
-
-    private String authUrl;
-    private String authMethod = "GET";
-    private String authTokenPath;
-    private String authRequestBody;
-    private String type;
-
-    public String getAuthUrl() {
-        return authUrl;
-    }
-
-    @XmlElement(name = "authUrl")
-    public void setAuthUrl(String authUrl) {
-        this.authUrl = authUrl;
-    }
-
-    public String getAuthMethod() {
-        return authMethod;
-    }
-
-    @XmlElement(name = "authUrlMethod")
-    public void setAuthMethod(String authMethod) {
-        this.authMethod = authMethod;
-    }
-
-    public String getAuthTokenPath() {
-        return authTokenPath;
-    }
-
-    @XmlElement(name = "authTokenJpath")
-    public void setAuthTokenPath(String authTokenPath) {
-        this.authTokenPath = authTokenPath;
-    }
-
-    public String getAuthRequestBody() {
-        return authRequestBody;
-    }
-
-    @XmlElement(name = "authUrlBody")
-    public void setAuthRequestBody(String authRequestBody) {
-        this.authRequestBody = authRequestBody;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    @XmlElement(name = "authType")
-    public void setType(String type) {
-        this.type = type;
-    }
-}

dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/UrlConfiguration.java

@@ -21,7 +21,6 @@ public class UrlConfiguration {
     private String requestType = "GET";
     private String requestBody = "";
     private String filterType = "remote";
-    private AuthenticationConfiguration auth;
 
     private List<QueryConfig> queries;
 
@@ -144,13 +143,4 @@ public class UrlConfiguration {
     public void setQueries(List<QueryConfig> queries) {
         this.queries = queries;
     }
-
-    public AuthenticationConfiguration getAuth() {
-        return auth;
-    }
-
-    @XmlElement(name="authentication")
-    public void setAuth(AuthenticationConfiguration auth) {
-        this.auth = auth;
-    }
 }

dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entities/GeneralUrls.java

@@ -1,31 +0,0 @@
-package eu.eudat.logic.proxy.config.entities;
-
-import eu.eudat.logic.proxy.config.FetchStrategy;
-import eu.eudat.logic.proxy.config.UrlConfiguration;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class GeneralUrls extends GenericUrls{
-
-    List<UrlConfiguration> urls;
-    FetchStrategy fetchMode;
-
-    public GeneralUrls() {
-        this.urls = new ArrayList<>();
-    }
-
-    @Override
-    public List<UrlConfiguration> getUrls() {
-        return urls;
-    }
-
-    @Override
-    public FetchStrategy getFetchMode() {
-        return fetchMode;
-    }
-
-    public void setFetchMode(FetchStrategy fetchMode) {
-        this.fetchMode = fetchMode;
-    }
-}

dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java

@@ -15,14 +15,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
-import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.*;
-import org.springframework.http.client.reactive.ReactorClientHttpConnector;
-import org.springframework.http.codec.json.Jackson2JsonDecoder;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
-import org.springframework.web.reactive.function.client.WebClient;
-import reactor.netty.http.client.HttpClient;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Unmarshaller;
@@ -38,16 +33,10 @@ public class RemoteFetcher {
     private static final Logger logger = LoggerFactory.getLogger(RemoteFetcher.class);
 
     private ConfigLoader configLoader;
-    private final WebClient client;
 
     @Autowired
     public RemoteFetcher(ConfigLoader configLoader) {
         this.configLoader = configLoader;
-        this.client = WebClient.builder().codecs(clientCodecConfigurer -> {
-                    clientCodecConfigurer.defaultCodecs().jackson2JsonDecoder(new Jackson2JsonDecoder(new ObjectMapper(), MediaType.APPLICATION_JSON));
-                    clientCodecConfigurer.defaultCodecs().maxInMemorySize(2 * ((int) Math.pow(1024, 3))); //GK: Why here???
-                }
-        ).clientConnector(new ReactorClientHttpConnector(HttpClient.create().followRedirect(true))).build();
     }
 
     @Cacheable(value = "repositories", keyGenerator = "externalUrlsKeyGenerator")
@@ -209,11 +198,7 @@ public class RemoteFetcher {
             ifFunderQueryExist(urlConfiguration, externalUrlCriteria);
             if (urlConfiguration.getType() == null || urlConfiguration.getType().equals("External")) {
                 try {
-                    String auth = null;
-                    if (urlConfiguration.getAuth() != null) {
-                        auth = this.getAuthentication(urlConfiguration.getAuth());
-                    }
-                    results.addAll(getAllResultsFromUrl(urlConfiguration.getUrl(), fetchStrategy, urlConfiguration.getData(), urlConfiguration.getPaginationPath(), externalUrlCriteria, urlConfiguration.getLabel(), urlConfiguration.getKey(), urlConfiguration.getContentType(), urlConfiguration.getFirstpage(), urlConfiguration.getRequestBody(), urlConfiguration.getRequestType(), urlConfiguration.getFilterType(), urlConfiguration.getQueries(), auth));
+                    results.addAll(getAllResultsFromUrl(urlConfiguration.getUrl(), fetchStrategy, urlConfiguration.getData(), urlConfiguration.getPaginationPath(), externalUrlCriteria, urlConfiguration.getLabel(), urlConfiguration.getKey(), urlConfiguration.getContentType(), urlConfiguration.getFirstpage(), urlConfiguration.getRequestBody(), urlConfiguration.getRequestType(), urlConfiguration.getFilterType(), urlConfiguration.getQueries()));
                 } catch (Exception e) {
                     logger.error(e.getLocalizedMessage(), e);
                 }
@@ -232,19 +217,6 @@ public class RemoteFetcher {
         return results;
     }
 
-    private String getAuthentication(AuthenticationConfiguration authenticationConfiguration) {
-        HttpMethod method = HttpMethod.valueOf(authenticationConfiguration.getAuthMethod());
-        Map<String, Object> reponse = this.client.method(method).uri(authenticationConfiguration.getAuthUrl())
-                .contentType(MediaType.APPLICATION_JSON)
-                .bodyValue(this.parseBodyString(authenticationConfiguration.getAuthRequestBody()))
-                .exchangeToMono(mono -> mono.bodyToMono(new ParameterizedTypeReference<Map<String, Object>>() {
-                })).block();
-
-
-
-        return authenticationConfiguration.getType() + " " + reponse.get(authenticationConfiguration.getAuthTokenPath());
-    }
-
     private List<Map<String, Object>> getAllWithData(List<UrlConfiguration> urlConfigs, ExternalUrlCriteria externalUrlCriteria) {
 
         List<Map<String, Object>> results = new LinkedList<>();
@@ -301,7 +273,7 @@ public class RemoteFetcher {
     protected String replaceCriteriaOnUrl(String path, ExternalUrlCriteria externalUrlCriteria, String firstPage, List<QueryConfig> queries) {
         String completedPath = path;
         if (externalUrlCriteria.getLike() != null) {
-            if ((path.contains("openaire") || path.contains("orcid") || path.contains("ror") || path.contains("fairsharing")) && externalUrlCriteria.getLike().equals("")) {
+            if ((path.contains("openaire") || path.contains("orcid") || path.contains("ror")) && externalUrlCriteria.getLike().equals("")) {
                 completedPath = completedPath.replaceAll("\\{like}", "*");
                 completedPath = completedPath.replaceAll("\\{query}", "*");
             } else {
@@ -357,13 +329,13 @@ public class RemoteFetcher {
         return completedPath;
     }
 
-    private List<Map<String, String>> getAllResultsFromUrl(String path, FetchStrategy fetchStrategy, final DataUrlConfiguration jsonDataPath, final String jsonPaginationPath, ExternalUrlCriteria externalUrlCriteria, String tag, String key, String contentType, String firstPage, String requestBody, String requestType, String filterType, List<QueryConfig> queries, String auth) throws Exception {
+    private List<Map<String, String>> getAllResultsFromUrl(String path, FetchStrategy fetchStrategy, final DataUrlConfiguration jsonDataPath, final String jsonPaginationPath, ExternalUrlCriteria externalUrlCriteria, String tag, String key, String contentType, String firstPage, String requestBody, String requestType, String filterType, List<QueryConfig> queries) throws Exception {
         Set<Integer> pages = new HashSet<>();
 
         String replacedPath = replaceCriteriaOnUrl(path, externalUrlCriteria, firstPage, queries);
         String replacedBody = replaceCriteriaOnUrl(requestBody, externalUrlCriteria, firstPage, queries);
 
-        Results results = getResultsFromUrl(replacedPath, jsonDataPath, jsonPaginationPath, contentType, replacedBody, requestType, auth);
+        Results results = getResultsFromUrl(replacedPath, jsonDataPath, jsonPaginationPath, contentType, replacedBody, requestType);
         if(results != null) {
             if (filterType != null && filterType.equals("local") && (externalUrlCriteria.getLike() != null && !externalUrlCriteria.getLike().isEmpty())) {
                 results.setResults(results.getResults().stream()
@@ -382,7 +354,7 @@ public class RemoteFetcher {
                 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<Results> optionalResults = pages.parallelStream()
-                    .map(page -> getResultsFromUrl(path + "&page=" + page, jsonDataPath, jsonPaginationPath, contentType, replacedBody, requestType, auth))
+                    .map(page -> getResultsFromUrl(path + "&page=" + page, jsonDataPath, jsonPaginationPath, contentType, replacedBody, requestType))
                     .filter(Objects::nonNull)
                     .reduce((result1, result2) -> {
                         result1.getResults().addAll(result2.getResults());
@@ -415,7 +387,7 @@ public class RemoteFetcher {
             JsonNode jsonBody = new ObjectMapper().readTree(replacedBody);
             entity = new HttpEntity<>(jsonBody, headers);
 
-            response = restTemplate.exchange(replacedPath, HttpMethod.valueOf(requestType), entity, String.class);
+            response = restTemplate.exchange(replacedPath, HttpMethod.resolve(requestType), entity, String.class);
             if (response.getStatusCode() == HttpStatus.OK) {
                 if (response.getHeaders().get("Content-Type").get(0).contains("json")) {
                     DocumentContext jsonContext = JsonPath.parse(response.getBody());
@@ -431,12 +403,12 @@ public class RemoteFetcher {
     }
 
 
-    protected Results getResultsFromUrl(String urlString, DataUrlConfiguration jsonDataPath, String jsonPaginationPath, String contentType, String requestBody, String requestType, String auth) {
+    protected Results getResultsFromUrl(String urlString, DataUrlConfiguration jsonDataPath, String jsonPaginationPath, String contentType, String requestBody, String requestType) {
 
         try {
-        	//RestTemplate restTemplate = new RestTemplate(new SimpleClientHttpRequestFactory());
-        	//HttpHeaders headers = new HttpHeaders();
-        	//HttpEntity<JsonNode> entity;
+        	RestTemplate restTemplate = new RestTemplate();
+        	HttpHeaders headers = new HttpHeaders();
+        	HttpEntity<JsonNode> entity;
         	ResponseEntity<String> response;
 			/*
 			 * URL url = new URL(urlString.replaceAll(" ", "%20"));
@@ -444,27 +416,14 @@ public class RemoteFetcher {
 			 * HttpURLConnection con = (HttpURLConnection) url.openConnection();
 			 * con.setRequestMethod("GET");
 			 */
-           /* if (contentType != null && !contentType.isEmpty()) {
+            if (contentType != null && !contentType.isEmpty()) {
                headers.setAccept(Collections.singletonList(MediaType.valueOf(contentType)));
                headers.setContentType(MediaType.valueOf(contentType));
             }
-            if (auth != null) {
-                headers.set("Authorization", auth);
-            }*/
             JsonNode jsonBody = new ObjectMapper().readTree(requestBody);
-//            entity = new HttpEntity<>(jsonBody, headers);
+            entity = new HttpEntity<>(jsonBody, headers);
 
-
-            response = this.client.method(HttpMethod.valueOf(requestType)).uri(urlString).headers(httpHeaders -> {
-                if (contentType != null && !contentType.isEmpty()) {
-                    httpHeaders.setAccept(Collections.singletonList(MediaType.valueOf(contentType)));
-                    httpHeaders.setContentType(MediaType.valueOf(contentType));
-                }
-                if (auth != null) {
-                    httpHeaders.set("Authorization", auth);
-                }
-            }).bodyValue(jsonBody).retrieve().toEntity(String.class).block();
-            //response = restTemplate.exchange(urlString, HttpMethod.resolve(requestType), entity, String.class);
+            response = restTemplate.exchange(urlString, HttpMethod.resolve(requestType), entity, String.class);
             if (response.getStatusCode() == HttpStatus.OK) { // success
                 //do here all the parsing
                 Results results = new Results();
@@ -472,7 +431,7 @@ public class RemoteFetcher {
                     DocumentContext jsonContext = JsonPath.parse(response.getBody());
 
                     if (jsonDataPath.getFieldsUrlConfiguration().getPath() != null) {
-                        results = RemoteFetcherUtils.getFromJsonWithRecursiveFetching(jsonContext, jsonDataPath, this, requestBody, requestType, auth);
+                        results = RemoteFetcherUtils.getFromJsonWithRecursiveFetching(jsonContext, jsonDataPath, this, requestBody, requestType);
                     } else if (jsonDataPath.getFieldsUrlConfiguration().getFirstName() != null) {
                         results = RemoteFetcherUtils.getFromJsonWithFirstAndLastName(jsonContext, jsonDataPath);
                     } else {
@@ -594,18 +553,8 @@ public class RemoteFetcher {
         return null;
     }
 
-    private String parseBodyString(String bodyString) {
-        String finalBodyString = bodyString;
-        if (bodyString.contains("{env:")) {
-            int index = bodyString.indexOf("{env: ");
-            while (index >= 0) {
-                int endIndex = bodyString.indexOf("}", index + 6);
-                String envName = bodyString.substring(index + 6, endIndex);
-                finalBodyString = finalBodyString.replace("{env: " + envName + "}", System.getenv(envName));
-                index = bodyString.indexOf("{env: ", index + 6);
-            }
-        }
-        return finalBodyString;
-    }
+
+
+
 
 }

dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcherUtils.java

@@ -28,7 +28,7 @@ public class RemoteFetcherUtils {
                 new HashMap<>(1, 1));
     }
 
-    public static Results getFromJsonWithRecursiveFetching(DocumentContext jsonContext, DataUrlConfiguration jsonDataPath, RemoteFetcher remoteFetcher, String requestBody, String requestType, String auth) {
+    public static Results getFromJsonWithRecursiveFetching(DocumentContext jsonContext, DataUrlConfiguration jsonDataPath, RemoteFetcher remoteFetcher, String requestBody, String requestType) {
         Results results = new Results(parseData(jsonContext, jsonDataPath),
                 new HashMap<>(1, 1));
 
@@ -37,7 +37,7 @@ public class RemoteFetcherUtils {
             externalUrlCriteria.setPath(result.get("path"));
             externalUrlCriteria.setHost(result.get("host"));
             String replacedPath = remoteFetcher.replaceCriteriaOnUrl(jsonDataPath.getUrlConfiguration().getUrl(), externalUrlCriteria, jsonDataPath.getUrlConfiguration().getFirstpage(), jsonDataPath.getUrlConfiguration().getQueries());
-            return remoteFetcher.getResultsFromUrl(replacedPath, jsonDataPath.getUrlConfiguration().getData(), jsonDataPath.getUrlConfiguration().getData().getPath(), jsonDataPath.getUrlConfiguration().getContentType(), requestBody, requestType, auth);
+            return remoteFetcher.getResultsFromUrl(replacedPath, jsonDataPath.getUrlConfiguration().getData(), jsonDataPath.getUrlConfiguration().getData().getPath(), jsonDataPath.getUrlConfiguration().getContentType(), requestBody, requestType);
         }).filter(Objects::nonNull).map(results1 -> results1.getResults().get(0)).collect(Collectors.toList());
         return new Results(multiResults, new HashMap<>(1, 1));
     }
@@ -98,22 +98,8 @@ public class RemoteFetcherUtils {
                             }
                         } else {
                             value = value.replace("'", "");
-                            if (value.contains(".")) {
-                                String[] parts = value.split("\\.");
-                                Map<String, Object> tempMap = stringObjectMap;
-                                for (int i = 0; i < parts.length; i++) {
-                                    if (tempMap.containsKey(parts[i])) {
-                                        if (i + 1 < parts.length) {
-                                            tempMap = (Map<String, Object>) tempMap.get(parts[i]);
-                                        } else {
-                                            parsedData.get(parsedData.size() - 1).put(field.getName().equals("types") ? "tags" : value, normalizeValue(tempMap.get(parts[i]), (field.getName().equals("types") || field.getName().equals("uri"))));
-                                        }
-                                    }
-                                }
-                            } else {
-                                if (stringObjectMap.containsKey(value)) {
-                                    parsedData.get(parsedData.size() - 1).put(field.getName().equals("types") ? "tags" : value, normalizeValue(stringObjectMap.get(value), (field.getName().equals("types") || field.getName().equals("uri"))));
-                                }
+                            if (stringObjectMap.containsKey(value)) {
+                                parsedData.get(parsedData.size() - 1).put(field.getName().equals("types") ? "tags" : value, normalizeValue(stringObjectMap.get(value), (field.getName().equals("types") || field.getName().equals("uri"))));
                             }
                         }
                     }
@@ -149,8 +135,7 @@ public class RemoteFetcherUtils {
                 }
             }
         } else if (value instanceof Map) {
-            String key = ((Map<String, String>)value).containsKey("$") ? "$" : "content";
-            return ((Map<String, String>)value).get(key);
+            return ((Map<String, String>)value).get("content");
         }
         return value != null ? value.toString() : null;
     }

dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java

@@ -24,7 +24,6 @@ import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.util.Units;
 import org.apache.poi.xwpf.usermodel.*;
 import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlObject;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.jsoup.Jsoup;
@@ -1020,44 +1019,60 @@ public class WordBuilder {
         int descrParPos = -1;
         XWPFParagraph descrPar = null;
         for(XWPFParagraph p: document.getParagraphs()){
-
-            if( dmpEntity != null) {
-                this.replaceTextSegment(p, "'{ARGOS.DMP.TITLE}'", dmpEntity.getLabel());
-                this.replaceTextSegment(p, "'{ARGOS.DMP.VERSION}'", "Version " + dmpEntity.getVersion());
-            }
-            if( datasetEntity != null) {
-                this.replaceTextSegment(p, "'{ARGOS.DATASET.TITLE}'", datasetEntity.getLabel());
-            }
-
-            String researchersNames = "";
-            Set<Researcher> researchers = dmpEntity.getResearchers();
-            int i = 0;
-            for(Researcher researcher : researchers){
-                i++;
-                researchersNames += researcher.getLabel() + (i < researchers.size() ? ", " : "");
-            }
-            this.replaceTextSegment(p, "'{ARGOS.DMP.RESEARCHERS}'", researchersNames, 15);
-
-            String organisationsNames = "";
-            Set<Organisation> organisations = dmpEntity.getOrganisations();
-            i = 0;
-            for(Organisation organisation : organisations){
-                i++;
-                organisationsNames += organisation.getLabel() + (i < organisations.size() ? ", " : "");
-            }
-            this.replaceTextSegment(p, "'{ARGOS.DMP.ORGANIZATIONS}'", organisationsNames, 15);
-
-            if(this.textSegmentExists(p,"'{ARGOS.DMP.DESCRIPTION}'")) {
-                descrParPos = parPos;
-                descrPar = p;
-                this.replaceTextSegment(p, "'{ARGOS.DMP.DESCRIPTION}'", "");
-            }
-            if(this.textSegmentExists(p,"'{ARGOS.DATASET.DESCRIPTION}'")) {
-                descrParPos = parPos;
-                descrPar = p;
-                this.replaceTextSegment(p, "'{ARGOS.DATASET.DESCRIPTION}'", "");
+            List<XWPFRun> runs = p.getRuns();
+            if(runs != null){
+                for(XWPFRun r : runs){
+                    String text = r.getText(0);
+                    if(text != null){
+                        if(text.contains("{ARGOS.DMP.TITLE}")) {
+                            text = text.replace("{ARGOS.DMP.TITLE}", dmpEntity.getLabel());
+                            r.setText(text, 0);
+                        } else if(text.contains("{ARGOS.DMP.VERSION}")) {
+                            text = text.replace("{ARGOS.DMP.VERSION}", "Version " + dmpEntity.getVersion());
+                            r.setText(text, 0);
+                        } else if(datasetEntity != null && text.contains("{ARGOS.DATASET.TITLE}")) {
+                            text = text.replace("{ARGOS.DATASET.TITLE}", datasetEntity.getLabel());
+                            r.setText(text, 0);
+//                        } else if(text.equals("Description") && ((!isDataset && (dmpEntity == null || dmpEntity.getDescription() != null)) || (isDataset && (datasetEntity == null || datasetEntity.getDescription() == null)))) {
+//                            r.setText("", 0);
+                        } else if((dmpEntity != null && text.contains("{ARGOS.DMP.DESCRIPTION}") && !isDataset) || (datasetEntity != null && text.contains("{ARGOS.DATASET.DESCRIPTION}") && isDataset)) {
+                            descrParPos = parPos;
+                            descrPar = p;
+                            if(dmpEntity != null && !isDataset) {
+                                text = text.replace("{ARGOS.DMP.DESCRIPTION}", "");
+                            } else if(datasetEntity != null && isDataset) {
+                                text = text.replace("{ARGOS.DATASET.DESCRIPTION}", "");
+                            }
+                            r.setText(text, 0);
+                        } else if(text.equals("{ARGOS.DMP.RESEARCHERS}")) {
+                            String researchersNames = "";
+                            Set<Researcher> researchers = dmpEntity.getResearchers();
+                            int i = 0;
+                            for(Researcher researcher : researchers){
+                                i++;
+                                researchersNames += researcher.getLabel() + (i < researchers.size() ? ", " : "");
+                            }
+                            text = text.replace("{ARGOS.DMP.RESEARCHERS}", researchersNames);
+                            r.setText(text, 0);
+                            r.setFontSize(17);
+                        } else if(text.equals("{ARGOS.DMP.ORGANIZATIONS}")) {
+                            String organisationsNames = "";
+                            Set<Organisation> organisations = dmpEntity.getOrganisations();
+                            int i = 0;
+                            for(Organisation organisation : organisations){
+                                i++;
+                                organisationsNames += organisation.getLabel() + (i < organisations.size() ? ", " : "");
+                            }
+                            text = text.replace("{ARGOS.DMP.ORGANIZATIONS}", organisationsNames);
+                            r.setText(text, 0);
+                            r.setFontSize(17);
+                        }
+                    }
+                }
             }
+            parPos++;
         }
+
         if((descrParPos != -1) && (dmpEntity!=null) && (dmpEntity.getDescription() != null) && !isDataset) {
             XmlCursor cursor = descrPar.getCTP().newCursor();
             cursor.toNextSibling();
@@ -1081,7 +1096,7 @@ public class WordBuilder {
                 XWPFParagraph p = it.next().getCell(0).getParagraphs().get(0);
                 XWPFRun run = p.createRun();
                 run.setText(dmpEntity.getGrant().getFunder().getLabel());
-                run.setFontSize(15);
+                run.setFontSize(17);
                 p.setAlignment(ParagraphAlignment.CENTER);
             }
             it = tbl.getRows().iterator();
@@ -1096,7 +1111,7 @@ public class WordBuilder {
                     text += parts.length > 1 ? "/ No "+parts[parts.length - 1] : "";
                 }
                 run.setText(text);
-                run.setFontSize(15);
+                run.setFontSize(17);
                 p.setAlignment(ParagraphAlignment.CENTER);
             }
     }
@@ -1104,165 +1119,43 @@ public class WordBuilder {
     public void fillFooter(DMP dmpEntity, Dataset datasetEntity, XWPFDocument document, boolean isDataset) {
         document.getFooterList().forEach(xwpfFooter -> {
             List<XWPFRun> runs = xwpfFooter.getParagraphs().get(0).getRuns();
-            for(XWPFParagraph p : xwpfFooter.getParagraphs()){
-                if(p != null){
-                    if( dmpEntity != null) {
-                        this.replaceTextSegment(p, "'{ARGOS.DMP.TITLE}'", dmpEntity.getLabel());
-                    }
-                    if( datasetEntity != null) {
-                        this.replaceTextSegment(p, "'{ARGOS.DATASET.TITLE}'", datasetEntity.getLabel());
-                    }
-                    Map<String, String> license = null;
-                    try {
-                        license = ((Map<String, String>) mapper.readValue(dmpEntity.getExtraProperties(), Map.class).get("license"));
-                        if (license != null && license.get("pid") != null) {
-                            this.replaceTextSegment(p, "'{ARGOS.DMP.LICENSE}'", license.get("pid"));
-                        } else {
-                            this.replaceTextSegment(p, "'{ARGOS.DMP.LICENSE}'", "License: -");
+            if(runs != null){
+                for(XWPFRun r : runs){
+                    String text = r.getText(0);
+                    if(text != null){
+                        if(text.contains("{ARGOS.DMP.TITLE}")){
+                            text = text.replace("{ARGOS.DMP.TITLE}", dmpEntity.getLabel());
+                            r.setText(text, 0);
+                        }
+                        if(text.contains("{ARGOS.DATASET.TITLE}") && datasetEntity != null){
+                            text = text.replace("{ARGOS.DATASET.TITLE}", datasetEntity.getLabel());
+                            r.setText(text, 0);
+                        }
+                        if(text.contains("{ARGOS.DMP.LICENSE}")){
+                            try{
+                                Map<String, String> license = ((Map<String, String>) mapper.readValue(dmpEntity.getExtraProperties(), Map.class).get("license"));
+                                text = text.replace("{ARGOS.DMP.LICENSE}", license.get("pid"));
+                            }
+                            catch (JsonProcessingException | NullPointerException e){
+                                text = text.replace("{ARGOS.DMP.LICENSE}", "License: -");
+                            }
+                            r.setText(text, 0);
+                        }
+                        if(text.contains("{ARGOS.DMP.DOI}")){
+                            if(dmpEntity.getDois() != null && !dmpEntity.getDois().isEmpty())
+                                text = text.replace("{ARGOS.DMP.DOI}", dmpEntity.getDois().iterator().next().getDoi());
+                            else
+                                text = text.replace("{ARGOS.DMP.DOI}", "-");
+                            r.setText(text, 0);
+                        }
+                        if(text.contains("{ARGOS.DMP.LAST_MODIFIED}")){
+                            DateFormat formatter = new SimpleDateFormat("dd/MM/yyyy");
+                            text = text.replace("{ARGOS.DMP.LAST_MODIFIED}", formatter.format(dmpEntity.getModified()));
+                            r.setText(text, 0);
                         }
-                    } catch (JsonProcessingException e) {
-                        this.replaceTextSegment(p, "'{ARGOS.DMP.LICENSE}'", "License: -");
                     }
-                    if(dmpEntity.getDois() != null && !dmpEntity.getDois().isEmpty()) {
-                        this.replaceTextSegment(p, "'{ARGOS.DMP.DOI}'", dmpEntity.getDois().iterator().next().getDoi());
-                    } else {
-                        this.replaceTextSegment(p, "'{ARGOS.DMP.DOI}'", "-");
-                    }
-                    DateFormat formatter = new SimpleDateFormat("dd/MM/yyyy");
-                    this.replaceTextSegment(p, "'{ARGOS.DMP.LAST_MODIFIED}'", formatter.format(dmpEntity.getModified()));
                 }
             }
         });
     }
-
-    private boolean textSegmentExists(XWPFParagraph paragraph, String textToFind) {
-        TextSegment foundTextSegment = null;
-        PositionInParagraph startPos = new PositionInParagraph(0, 0, 0);
-        while((foundTextSegment = this.searchText(paragraph, textToFind, startPos)) != null) {
-            return true;
-        }
-        return false;
-    }
-
-    private void replaceTextSegment(XWPFParagraph paragraph, String textToFind, String replacement) {
-        this.replaceTextSegment(paragraph, textToFind, replacement, null);
-    }
-
-    private void replaceTextSegment(XWPFParagraph paragraph, String textToFind, String replacement, Integer fontSize) {
-        TextSegment foundTextSegment = null;
-        PositionInParagraph startPos = new PositionInParagraph(0, 0, 0);
-        while((foundTextSegment = this.searchText(paragraph, textToFind, startPos)) != null) { // search all text segments having text to find
-
-            System.out.println(foundTextSegment.getBeginRun()+":"+foundTextSegment.getBeginText()+":"+foundTextSegment.getBeginChar());
-            System.out.println(foundTextSegment.getEndRun()+":"+foundTextSegment.getEndText()+":"+foundTextSegment.getEndChar());
-
-            // maybe there is text before textToFind in begin run
-            XWPFRun beginRun = paragraph.getRuns().get(foundTextSegment.getBeginRun());
-            String textInBeginRun = beginRun.getText(foundTextSegment.getBeginText());
-            String textBefore = textInBeginRun.substring(0, foundTextSegment.getBeginChar()); // we only need the text before
-
-            // maybe there is text after textToFind in end run
-            XWPFRun endRun = paragraph.getRuns().get(foundTextSegment.getEndRun());
-            String textInEndRun = endRun.getText(foundTextSegment.getEndText());
-            String textAfter = textInEndRun.substring(foundTextSegment.getEndChar() + 1); // we only need the text after
-
-            if (foundTextSegment.getEndRun() == foundTextSegment.getBeginRun()) {
-                textInBeginRun = textBefore + replacement + textAfter; // if we have only one run, we need the text before, then the replacement, then the text after in that run
-            } else {
-                textInBeginRun = textBefore + replacement; // else we need the text before followed by the replacement in begin run
-                endRun.setText(textAfter, foundTextSegment.getEndText()); // and the text after in end run
-            }
-
-            beginRun.setText(textInBeginRun, foundTextSegment.getBeginText());
-            if (fontSize != null) {
-                beginRun.setFontSize(fontSize);
-            }
-            // runs between begin run and end run needs to be removed
-            for (int runBetween = foundTextSegment.getEndRun() - 1; runBetween > foundTextSegment.getBeginRun(); runBetween--) {
-                paragraph.removeRun(runBetween); // remove not needed runs
-            }
-
-        }
-    }
-
-    /**
-     * this methods parse the paragraph and search for the string searched.
-     * If it finds the string, it will return true and the position of the String
-     * will be saved in the parameter startPos.
-     *
-     * @param searched
-     * @param startPos
-     */
-    private TextSegment searchText(XWPFParagraph paragraph, String searched, PositionInParagraph startPos) {
-        int startRun = startPos.getRun(),
-                startText = startPos.getText(),
-                startChar = startPos.getChar();
-        int beginRunPos = 0, candCharPos = 0;
-        boolean newList = false;
-
-        //CTR[] rArray = paragraph.getRArray(); //This does not contain all runs. It lacks hyperlink runs for ex.
-        java.util.List<XWPFRun> runs = paragraph.getRuns();
-
-        int beginTextPos = 0, beginCharPos = 0; //must be outside the for loop
-
-        //for (int runPos = startRun; runPos < rArray.length; runPos++) {
-        for (int runPos = startRun; runPos < runs.size(); runPos++) {
-            //int beginTextPos = 0, beginCharPos = 0, textPos = 0, charPos; //int beginTextPos = 0, beginCharPos = 0 must be outside the for loop
-            int textPos = 0, charPos;
-            //CTR ctRun = rArray[runPos];
-            CTR ctRun = runs.get(runPos).getCTR();
-            XmlCursor c = ctRun.newCursor();
-            c.selectPath("./*");
-            try {
-                while (c.toNextSelection()) {
-                    XmlObject o = c.getObject();
-                    if (o instanceof CTText) {
-                        if (textPos >= startText) {
-                            String candidate = ((CTText) o).getStringValue();
-                            if (runPos == startRun) {
-                                charPos = startChar;
-                            } else {
-                                charPos = 0;
-                            }
-
-                            for (; charPos < candidate.length(); charPos++) {
-                                if ((candidate.charAt(charPos) == searched.charAt(0)) && (candCharPos == 0)) {
-                                    beginTextPos = textPos;
-                                    beginCharPos = charPos;
-                                    beginRunPos = runPos;
-                                    newList = true;
-                                }
-                                if (candidate.charAt(charPos) == searched.charAt(candCharPos)) {
-                                    if (candCharPos + 1 < searched.length()) {
-                                        candCharPos++;
-                                    } else if (newList) {
-                                        TextSegment segment = new TextSegment();
-                                        segment.setBeginRun(beginRunPos);
-                                        segment.setBeginText(beginTextPos);
-                                        segment.setBeginChar(beginCharPos);
-                                        segment.setEndRun(runPos);
-                                        segment.setEndText(textPos);
-                                        segment.setEndChar(charPos);
-                                        return segment;
-                                    }
-                                } else {
-                                    candCharPos = 0;
-                                }
-                            }
-                        }
-                        textPos++;
-                    } else if (o instanceof CTProofErr) {
-                        c.removeXml();
-                    } else if (o instanceof CTRPr) {
-                        //do nothing
-                    } else {
-                        candCharPos = 0;
-                    }
-                }
-            } finally {
-                c.dispose();
-            }
-        }
-        return null;
-    }
 }

dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/ExportXmlBuilderDatasetProfile.java

@@ -36,8 +36,6 @@ public class ExportXmlBuilderDatasetProfile {
         Element pages = (Element)xmlDoc.getFirstChild();
         pages.setAttribute("description", datasetProfile.getDescription());
         pages.setAttribute("language", datasetProfile.getLanguage());
-        pages.setAttribute("type", datasetProfile.getType());
-        pages.setAttribute("enablePrefilling", String.valueOf(datasetProfile.isEnablePrefilling()));
         String xml = XmlBuilder.generateXml(xmlDoc);
         writer.write(xml);
         writer.close();

dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/DatasetProfile.java

@@ -14,8 +14,6 @@ public class DatasetProfile {
 
     private String description;
     private String language;
-    private String type;
-    private boolean enablePrefilling;
 
     private List<Page> page;
 
@@ -46,32 +44,12 @@ public class DatasetProfile {
         this.language = language;
     }
 
-    @XmlAttribute(name = "type")
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @XmlAttribute(name = "enablePrefilling")
-    public boolean isEnablePrefilling() {
-        return enablePrefilling;
-    }
-
-    public void setEnablePrefilling(boolean enablePrefilling) {
-        this.enablePrefilling = enablePrefilling;
-    }
-
     public eu.eudat.models.data.admin.composite.DatasetProfile toAdminCompositeModel(String label){
         eu.eudat.models.data.admin.composite.DatasetProfile newDatasetEntityProfile = new eu.eudat.models.data.admin.composite.DatasetProfile();
         newDatasetEntityProfile.setLabel(label);
         newDatasetEntityProfile.setStatus(DescriptionTemplate.Status.SAVED.getValue());
         newDatasetEntityProfile.setDescription(description);
         newDatasetEntityProfile.setLanguage(language);
-        newDatasetEntityProfile.setType(type);
-        newDatasetEntityProfile.setEnablePrefilling(enablePrefilling);
         List<eu.eudat.models.data.admin.components.datasetprofile.Page> pagesDatasetEntity = new LinkedList<>();
         List<eu.eudat.models.data.admin.components.datasetprofile.Section> sectionDatasetEntity = new LinkedList<>();
         for (Page xmlPage: page) {

dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/dmpXml/ExportXmlBuilderDmpBlueprint.java

@@ -1,46 +0,0 @@
-package eu.eudat.logic.utilities.documents.xml.dmpXml;
-
-import eu.eudat.logic.utilities.builders.XmlBuilder;
-
-import eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.DataManagementPlanBlueprint;
-import eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.Section;
-import eu.eudat.models.data.listingmodels.DataManagementPlanBlueprintListingModel;
-import org.springframework.core.env.Environment;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.UUID;
-
-public class ExportXmlBuilderDmpBlueprint {
-
-
-    public File build(DataManagementPlanBlueprintListingModel dmpProfile, Environment environment) throws IOException {
-
-        File xmlFile = new File(environment.getProperty("temp.temp") + UUID.randomUUID() + ".xml");
-        BufferedWriter writer = new BufferedWriter(new FileWriter(xmlFile, true));
-        Document xmlDoc = XmlBuilder.getDocument();
-        Element root = xmlDoc.createElement("root");
-        Element definition = xmlDoc.createElement("definition");
-//        Element root = xmlDoc.createElement(dmpProfile.getLabel());
-        definition.appendChild(createDefinition(dmpProfile.getDefinition(), xmlDoc));
-        root.appendChild(definition);
-        xmlDoc.appendChild(root);
-        String xml = XmlBuilder.generateXml(xmlDoc);
-        writer.write(xml);
-        writer.close();
-        return xmlFile;
-    }
-
-    public Element createDefinition(DataManagementPlanBlueprint dmpDefinition, Document doc) {
-        Element sections = doc.createElement("sections");
-        for (Section section : dmpDefinition.getSections()) {
-            sections.appendChild(section.toXml(doc));
-        }
-        return sections;
-    }
-
-}

dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/dmpXml/ExportXmlBuilderDmpProfile.java

@@ -0,0 +1,56 @@
+package eu.eudat.logic.utilities.documents.xml.dmpXml;
+
+import eu.eudat.logic.utilities.builders.XmlBuilder;
+
+import eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.DataManagementPlanProfile;
+import eu.eudat.models.data.listingmodels.DataManagementPlanProfileListingModel;
+import org.springframework.core.env.Environment;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.UUID;
+
+public class ExportXmlBuilderDmpProfile {
+
+
+    public File build(DataManagementPlanProfileListingModel dmpProfile, Environment environment) throws IOException {
+
+        File xmlFile = new File(environment.getProperty("temp.temp") + UUID.randomUUID() + ".xml");
+        BufferedWriter writer = new BufferedWriter(new FileWriter(xmlFile, true));
+        Document xmlDoc = XmlBuilder.getDocument();
+        Element root = xmlDoc.createElement("root");
+        Element definition = xmlDoc.createElement("definition");
+//        Element root = xmlDoc.createElement(dmpProfile.getLabel());
+        definition.appendChild(createDefinition(dmpProfile.getDefinition(), xmlDoc));
+        root.appendChild(definition);
+        xmlDoc.appendChild(root);
+        String xml = XmlBuilder.generateXml(xmlDoc);
+        writer.write(xml);
+        writer.close();
+        return xmlFile;
+    }
+
+    public Element createDefinition(DataManagementPlanProfile dmpDefinition, Document element) {
+        Element fields = element.createElement("fieldSets");
+        dmpDefinition.getFields().forEach(item -> {
+            Element field = element.createElement("field");
+            field.setAttribute("id", "" + item.getId());
+            field.setAttribute("type", "" + item.getType());
+            field.setAttribute("dataType", "" + item.getDataType());
+            field.setAttribute("required", "" + item.getRequired());
+            field.setAttribute("label", "" + item.getLabel());
+            if(item.getValue()!=null) {
+                Element value = element.createElement("value");
+                value.setAttribute("value", ""+item.getValue());
+                field.appendChild(value);
+            }
+            fields.appendChild(field);
+        });
+        return fields;
+    }
+
+}

dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/dmpXml/ImportXmlBuilderDmpProfile.java

@@ -1,6 +1,6 @@
 package eu.eudat.logic.utilities.documents.xml.dmpXml;
 
-import eu.eudat.logic.utilities.documents.xml.dmpXml.dmpBlueprintModel.DmpBlueprint;
+import eu.eudat.logic.utilities.documents.xml.dmpXml.dmpProfileModel.DmpProfile;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -10,16 +10,16 @@ import javax.xml.bind.Unmarshaller;
 import java.io.File;
 import java.io.IOException;
 
-public class ImportXmlBuilderDmpBlueprint {
-    private static final Logger logger = LoggerFactory.getLogger(ImportXmlBuilderDmpBlueprint.class);
+public class ImportXmlBuilderDmpProfile {
+    private static final Logger logger = LoggerFactory.getLogger(ImportXmlBuilderDmpProfile.class);
 
-    public DmpBlueprint build(File xmlFile) throws IOException {
-        DmpBlueprint dmpProfile = new DmpBlueprint();
+    public DmpProfile build(File xmlFile) throws IOException {
+        DmpProfile dmpProfile = new DmpProfile();
         JAXBContext jaxbContext = null;
         try {
-            jaxbContext = JAXBContext.newInstance(DmpBlueprint.class);
+            jaxbContext = JAXBContext.newInstance(DmpProfile.class);
             Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
-            dmpProfile = (DmpBlueprint) unmarshaller.unmarshal(xmlFile);
+            dmpProfile = (DmpProfile) unmarshaller.unmarshal(xmlFile);
         } catch (JAXBException e) {
             logger.error(e.getMessage(), e);
         }

dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/dmpXml/dmpBlueprintModel/DescriptionTemplate.java

@@ -1,73 +0,0 @@
-package eu.eudat.logic.utilities.documents.xml.dmpXml.dmpBlueprintModel;
-
-import eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.types.FieldCategory;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.util.UUID;
-
-@XmlRootElement(name = "descriptionTemplate")
-public class DescriptionTemplate {
-
-    private String id;
-    private String descriptionTemplateId;
-    private String label;
-    private Integer minMultiplicity;
-    private Integer maxMultiplicity;
-
-    @XmlAttribute(name = "id")
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    @XmlAttribute(name = "descriptionTemplateId")
-    public String getDescriptionTemplateId() {
-        return descriptionTemplateId;
-    }
-
-    public void setDescriptionTemplateId(String descriptionTemplateId) {
-        this.descriptionTemplateId = descriptionTemplateId;
-    }
-
-    @XmlAttribute(name = "label")
-    public String getLabel() {
-        return label;
-    }
-
-    public void setLabel(String label) {
-        this.label = label;
-    }
-
-    @XmlAttribute(name = "minMultiplicity")
-    public Integer getMinMultiplicity() {
-        return minMultiplicity;
-    }
-
-    public void setMinMultiplicity(Integer minMultiplicity) {
-        this.minMultiplicity = minMultiplicity;
-    }
-
-    @XmlAttribute(name = "maxMultiplicity")
-    public Integer getMaxMultiplicity() {
-        return maxMultiplicity;
-    }
-
-    public void setMaxMultiplicity(Integer maxMultiplicity) {
-        this.maxMultiplicity = maxMultiplicity;
-    }
-
-    public eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.DescriptionTemplate toDmpBlueprintCompositeModel() {
-        eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.DescriptionTemplate descriptionTemplate = new eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.DescriptionTemplate();
-        descriptionTemplate.setId(UUID.fromString(this.id));
-        descriptionTemplate.setDescriptionTemplateId(UUID.fromString(this.descriptionTemplateId));
-        descriptionTemplate.setLabel(this.label);
-        descriptionTemplate.setMinMultiplicity(this.minMultiplicity);
-        descriptionTemplate.setMaxMultiplicity(this.maxMultiplicity);
-        return descriptionTemplate;
-    }
-
-}

dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/dmpXml/dmpBlueprintModel/DescriptionTemplates.java

@@ -1,20 +0,0 @@
-package eu.eudat.logic.utilities.documents.xml.dmpXml.dmpBlueprintModel;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.util.List;
-
-@XmlRootElement(name = "descriptionTemplates")
-public class DescriptionTemplates {
-
-    private List<DescriptionTemplate> descriptionTemplates;
-
-    @XmlElement(name = "descriptionTemplate")
-    public List<DescriptionTemplate> getDescriptionTemplates() {
-        return descriptionTemplates;
-    }
-    public void setDescriptionTemplates(List<DescriptionTemplate> descriptionTemplates) {
-        this.descriptionTemplates = descriptionTemplates;
-    }
-
-}

dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/dmpXml/dmpBlueprintModel/DmpBlueprint.java

@@ -1,35 +0,0 @@
-package eu.eudat.logic.utilities.documents.xml.dmpXml.dmpBlueprintModel;
-
-import eu.eudat.data.entities.DMPProfile;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.util.Date;
-
-@XmlRootElement(name = "root")
-public class DmpBlueprint {
-
-    private DmpBlueprintDefinition dmpBlueprintDefinition;
-
-    @XmlElement(name = "definition")
-    public DmpBlueprintDefinition getDmpBlueprintDefinition() {
-        return dmpBlueprintDefinition;
-    }
-
-    public void setDmpBlueprintDefinition(DmpBlueprintDefinition dmpBlueprintDefinition) {
-        this.dmpBlueprintDefinition = dmpBlueprintDefinition;
-    }
-
-    public eu.eudat.models.data.listingmodels.DataManagementPlanBlueprintListingModel toDmpProfileCompositeModel(String label) {
-        eu.eudat.models.data.listingmodels.DataManagementPlanBlueprintListingModel dmpProfileModel = new eu.eudat.models.data.listingmodels.DataManagementPlanBlueprintListingModel();
-        dmpProfileModel.setLabel(label);
-        dmpProfileModel.setStatus(DMPProfile.Status.SAVED.getValue());
-        dmpProfileModel.setCreated(new Date());
-        dmpProfileModel.setModified(new Date());
-        if (this.dmpBlueprintDefinition != null) {
-            dmpProfileModel.setDefinition(this.dmpBlueprintDefinition.toDmpBlueprintCompositeModel());
-        }
-        return dmpProfileModel;
-    }
-
-}

dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/dmpXml/dmpBlueprintModel/DmpBlueprintDefinition.java

@@ -1,34 +0,0 @@
-package eu.eudat.logic.utilities.documents.xml.dmpXml.dmpBlueprintModel;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.util.LinkedList;
-import java.util.List;
-
-@XmlRootElement(name = "definition")
-public class DmpBlueprintDefinition {
-
-    private Sections sections;
-
-    @XmlElement(name = "sections")
-    public Sections getSections() {
-        return sections;
-    }
-    public void setSections(Sections sections) {
-        this.sections = sections;
-    }
-
-
-    public eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.DataManagementPlanBlueprint toDmpBlueprintCompositeModel() {
-        eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.DataManagementPlanBlueprint dmpBlueprint = new eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.DataManagementPlanBlueprint();
-        List<eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.Section> dmpBlueprintSections = new LinkedList<>();
-        if (this.sections != null && this.sections.getSections() != null) {
-            for (Section section : this.sections.getSections()) {
-                dmpBlueprintSections.add(section.toDmpBlueprintCompositeModel());
-            }
-        }
-        dmpBlueprint.setSections(dmpBlueprintSections);
-        return dmpBlueprint;
-    }
-
-}

dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/dmpXml/dmpBlueprintModel/ExtraField.java

@@ -1,96 +0,0 @@
-package eu.eudat.logic.utilities.documents.xml.dmpXml.dmpBlueprintModel;
-
-import eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.types.FieldCategory;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.util.UUID;
-
-@XmlRootElement(name = "extraField")
-public class ExtraField {
-
-    private String id;
-    private int type;
-    private String label;
-    private String placeholder;
-    private String description;
-    private int ordinal;
-    private boolean required;
-
-    @XmlAttribute(name = "id")
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    @XmlAttribute(name = "type")
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    @XmlAttribute(name = "label")
-    public String getLabel() {
-        return label;
-    }
-
-    public void setLabel(String label) {
-        this.label = label;
-    }
-
-    @XmlAttribute(name = "placeholder")
-    public String getPlaceholder() {
-        return placeholder;
-    }
-
-    public void setPlaceholder(String placeholder) {
-        this.placeholder = placeholder;
-    }
-
-    @XmlAttribute(name = "description")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    @XmlAttribute(name = "ordinal")
-    public int getOrdinal() {
-        return ordinal;
-    }
-
-    public void setOrdinal(int ordinal) {
-        this.ordinal = ordinal;
-    }
-
-    @XmlAttribute(name = "required")
-    public boolean isRequired() {
-        return required;
-    }
-
-    public void setRequired(boolean required) {
-        this.required = required;
-    }
-
-    public eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.FieldModel toDmpBlueprintCompositeModel() {
-        eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.FieldModel systemField = new eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.FieldModel();
-        systemField.setId(UUID.fromString(this.id));
-        systemField.setCategory(FieldCategory.EXTRA);
-        systemField.setType(this.type);
-        systemField.setLabel(this.label);
-        systemField.setPlaceholder(this.placeholder);
-        systemField.setDescription(this.description);
-        systemField.setOrdinal(this.ordinal);
-        systemField.setRequired(this.required);
-        return systemField;
-    }
-
-}

dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/dmpXml/dmpBlueprintModel/ExtraFields.java

@@ -1,20 +0,0 @@
-package eu.eudat.logic.utilities.documents.xml.dmpXml.dmpBlueprintModel;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.util.List;
-
-@XmlRootElement(name = "extraFields")
-public class ExtraFields {
-
-    private List<ExtraField> extraFields;
-
-    @XmlElement(name = "extraField")
-    public List<ExtraField> getExtraFields() {
-        return extraFields;
-    }
-    public void setExtraFields(List<ExtraField> extraFields) {
-        this.extraFields = extraFields;
-    }
-
-}

dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/dmpXml/dmpBlueprintModel/Section.java

@@ -1,123 +0,0 @@
-package eu.eudat.logic.utilities.documents.xml.dmpXml.dmpBlueprintModel;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.UUID;
-
-@XmlRootElement(name = "section")
-public class Section {
-
-    private String id;
-    private String label;
-    private String description;
-    private int ordinal;
-    private SystemFields systemFields;
-    private ExtraFields extraFields;
-    private boolean hasTemplates;
-    private DescriptionTemplates descriptionTemplates;
-
-    @XmlAttribute(name = "id")
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    @XmlAttribute(name = "label")
-    public String getLabel() {
-        return label;
-    }
-
-    public void setLabel(String label) {
-        this.label = label;
-    }
-
-    @XmlAttribute(name = "description")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    @XmlAttribute(name = "ordinal")
-    public int getOrdinal() {
-        return ordinal;
-    }
-
-    public void setOrdinal(int ordinal) {
-        this.ordinal = ordinal;
-    }
-
-    @XmlElement(name = "systemFields")
-    public SystemFields getSystemFields() {
-        return systemFields;
-    }
-
-    public void setSystemFields(SystemFields systemFields) {
-        this.systemFields = systemFields;
-    }
-
-    @XmlElement(name = "extraFields")
-    public ExtraFields getExtraFields() {
-        return extraFields;
-    }
-
-    public void setExtraFields(ExtraFields extraFields) {
-        this.extraFields = extraFields;
-    }
-
-    @XmlAttribute(name = "hasTemplates")
-    public boolean isHasTemplates() {
-        return hasTemplates;
-    }
-
-    public void setHasTemplates(boolean hasTemplates) {
-        this.hasTemplates = hasTemplates;
-    }
-
-    @XmlElement(name = "descriptionTemplates")
-    public DescriptionTemplates getDescriptionTemplates() {
-        return descriptionTemplates;
-    }
-
-    public void setDescriptionTemplates(DescriptionTemplates descriptionTemplates) {
-        this.descriptionTemplates = descriptionTemplates;
-    }
-
-    public eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.Section toDmpBlueprintCompositeModel() {
-        eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.Section section = new eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.Section();
-        section.setId(UUID.fromString(this.id));
-        section.setLabel(this.label);
-        section.setDescription(this.description);
-        section.setOrdinal(this.ordinal);
-        section.setHasTemplates(this.hasTemplates);
-        List<eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.FieldModel> dmpBlueprintFieldModels = new LinkedList<>();
-        if (this.systemFields != null && this.systemFields.getSystemFields() != null) {
-            for (SystemField systemField : this.systemFields.getSystemFields()) {
-                dmpBlueprintFieldModels.add(systemField.toDmpBlueprintCompositeModel());
-            }
-        }
-        if (this.extraFields != null&& this.extraFields.getExtraFields() != null) {
-            for (ExtraField extraField : this.extraFields.getExtraFields()) {
-                dmpBlueprintFieldModels.add(extraField.toDmpBlueprintCompositeModel());
-            }
-        }
-        section.setFields(dmpBlueprintFieldModels);
-        List<eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.DescriptionTemplate> dmpBlueprintDescriptionTemplates = new LinkedList<>();
-        if (this.descriptionTemplates != null && this.descriptionTemplates.getDescriptionTemplates() != null) {
-            for (DescriptionTemplate descriptionTemplate : this.descriptionTemplates.getDescriptionTemplates()) {
-                dmpBlueprintDescriptionTemplates.add(descriptionTemplate.toDmpBlueprintCompositeModel());
-            }
-        }
-        section.setDescriptionTemplates(dmpBlueprintDescriptionTemplates);
-        return section;
-    }
-
-}

dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/dmpXml/dmpBlueprintModel/Sections.java

@@ -1,19 +0,0 @@
-package eu.eudat.logic.utilities.documents.xml.dmpXml.dmpBlueprintModel;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.util.List;
-
-@XmlRootElement(name = "sections")
-public class Sections {
-
-    private List<Section> sections;
-
-    @XmlElement(name = "section")
-    public List<Section> getSections() {
-        return sections;
-    }
-    public void setSections(List<Section> sections) {
-        this.sections = sections;
-    }
-}

dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/dmpXml/dmpBlueprintModel/SystemField.java

@@ -1,96 +0,0 @@
-package eu.eudat.logic.utilities.documents.xml.dmpXml.dmpBlueprintModel;
-
-import eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.types.FieldCategory;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.util.UUID;
-
-@XmlRootElement(name = "systemField")
-public class SystemField {
-
-    private String id;
-    private int type;
-    private String label;
-    private String placeholder;
-    private String description;
-    private int ordinal;
-    private boolean required;
-
-    @XmlAttribute(name = "id")
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    @XmlAttribute(name = "type")
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    @XmlAttribute(name = "label")
-    public String getLabel() {
-        return label;
-    }
-
-    public void setLabel(String label) {
-        this.label = label;
-    }
-
-    @XmlAttribute(name = "placeholder")
-    public String getPlaceholder() {
-        return placeholder;
-    }
-
-    public void setPlaceholder(String placeholder) {
-        this.placeholder = placeholder;
-    }
-
-    @XmlAttribute(name = "description")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    @XmlAttribute(name = "ordinal")
-    public int getOrdinal() {
-        return ordinal;
-    }
-
-    public void setOrdinal(int ordinal) {
-        this.ordinal = ordinal;
-    }
-
-    @XmlAttribute(name = "required")
-    public boolean isRequired() {
-        return required;
-    }
-
-    public void setRequired(boolean required) {
-        this.required = required;
-    }
-
-    public eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.FieldModel toDmpBlueprintCompositeModel() {
-        eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.FieldModel systemField = new eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.FieldModel();
-        systemField.setId(UUID.fromString(this.id));
-        systemField.setCategory(FieldCategory.SYSTEM);
-        systemField.setType(this.type);
-        systemField.setLabel(this.label);
-        systemField.setPlaceholder(this.placeholder);
-        systemField.setDescription(this.description);
-        systemField.setOrdinal(this.ordinal);
-        systemField.setRequired(this.required);
-        return systemField;
-    }
-
-}

dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/dmpXml/dmpBlueprintModel/SystemFields.java

@@ -1,20 +0,0 @@
-package eu.eudat.logic.utilities.documents.xml.dmpXml.dmpBlueprintModel;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.util.List;
-
-@XmlRootElement(name = "systemFields")
-public class SystemFields {
-
-    private List<SystemField> systemFields;
-
-    @XmlElement(name = "systemField")
-    public List<SystemField> getSystemFields() {
-        return systemFields;
-    }
-    public void setSystemFields(List<SystemField> systemFields) {
-        this.systemFields = systemFields;
-    }
-
-}

dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/dmpXml/dmpProfileModel/DMPProfileFieldDataType.java

@@ -0,0 +1,23 @@
+package eu.eudat.logic.utilities.documents.xml.dmpXml.dmpProfileModel;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "datatype")
+public class DMPProfileFieldDataType {
+
+    private int datatype;
+
+    @XmlAttribute(name = "datatype")
+    public int getDatatype() {
+        return datatype;
+    }
+
+    public void setDatatype(int datatype) {
+        this.datatype = datatype;
+    }
+
+    public eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.types.DMPProfileFieldDataType toDmpProfileCompositeModel() {
+        return eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.types.DMPProfileFieldDataType.fromInteger(datatype);
+    }
+}

dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/dmpXml/dmpProfileModel/DMPProfileType.java

@@ -0,0 +1,26 @@
+package eu.eudat.logic.utilities.documents.xml.dmpXml.dmpProfileModel;
+
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "type")
+public class DMPProfileType {
+
+    private int type;
+
+    @XmlAttribute(name = "type")
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.types.DMPProfileType toDmpProfileCompositeModel() {
+       return eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.types.DMPProfileType.fromInteger(type);
+    }
+
+
+}

dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/dmpXml/dmpProfileModel/DmpProfile.java

@@ -0,0 +1,33 @@
+package eu.eudat.logic.utilities.documents.xml.dmpXml.dmpProfileModel;
+
+import eu.eudat.data.entities.DMPProfile;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Date;
+import java.util.UUID;
+
+@XmlRootElement(name = "root")
+public class DmpProfile {
+
+    private DmpProfileDefinition dmpProfileDefinition;
+
+    @XmlElement(name = "definition")
+    public DmpProfileDefinition getDmpProfileDefinition() {
+        return dmpProfileDefinition;
+    }
+
+    public void setDmpProfileDefinition(DmpProfileDefinition dmpProfileDefinition) {
+        this.dmpProfileDefinition = dmpProfileDefinition;
+    }
+
+    public eu.eudat.models.data.listingmodels.DataManagementPlanProfileListingModel toDmpProfileCompositeModel(String label) {
+        eu.eudat.models.data.listingmodels.DataManagementPlanProfileListingModel dmpProfileModel = new eu.eudat.models.data.listingmodels.DataManagementPlanProfileListingModel();
+        dmpProfileModel.setLabel(label);
+        dmpProfileModel.setStatus(DMPProfile.Status.SAVED.getValue());
+        dmpProfileModel.setCreated(new Date());
+        dmpProfileModel.setModified(new Date());
+        dmpProfileModel.setDefinition(this.dmpProfileDefinition.toDmpProfileCompositeModel());
+        return dmpProfileModel;
+    }
+}

dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/dmpXml/dmpProfileModel/DmpProfileDefinition.java

@@ -0,0 +1,36 @@
+package eu.eudat.logic.utilities.documents.xml.dmpXml.dmpProfileModel;
+
+
+import eu.eudat.logic.utilities.documents.xml.dmpXml.dmpProfileModel.FieldSets;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.LinkedList;
+import java.util.List;
+
+@XmlRootElement(name = "definition")
+public class DmpProfileDefinition {
+
+    private FieldSets fieldSets;
+
+    @XmlElement(name = "fieldSets")
+    public FieldSets getFieldSets() {
+        return fieldSets;
+    }
+
+    public void setFieldSets(FieldSets fieldSets) {
+        this.fieldSets = fieldSets;
+    }
+
+    public eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.DataManagementPlanProfile toDmpProfileCompositeModel() {
+        eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.DataManagementPlanProfile dmpProfileDefinitionModel = new eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.DataManagementPlanProfile();
+        List<eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.Field> dmpProfileDefinitionFields = new LinkedList<>();
+        for (Field field:this.fieldSets.fields) {
+            dmpProfileDefinitionFields.add(field.toDmpProfileCompositeModel());
+        }
+        dmpProfileDefinitionModel.setFields(dmpProfileDefinitionFields);
+        return dmpProfileDefinitionModel;
+    }
+
+
+}

dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/dmpXml/dmpProfileModel/Field.java

@@ -0,0 +1,90 @@
+package eu.eudat.logic.utilities.documents.xml.dmpXml.dmpProfileModel;
+
+
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlValue;
+import java.util.UUID;
+
+@XmlRootElement(name = "field")
+public class Field {
+
+    private String id;
+
+    private String label;
+
+    private int dataType;
+
+    private boolean required;
+
+    private int type;
+
+//    private Object value;
+
+    @XmlAttribute(name = "id")
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    @XmlAttribute(name = "label")
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    @XmlAttribute(name = "dataType")
+    public int getDataType() {
+        return dataType;
+    }
+
+    public void setDataType(int dataType) {
+        this.dataType = dataType;
+    }
+
+    @XmlAttribute(name = "required")
+    public boolean isRequired() {
+        return required;
+    }
+
+    public void setRequired(boolean required) {
+        this.required = required;
+    }
+
+    @XmlAttribute(name = "type")
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+//    @XmlValue
+//    public Object getValue() {
+//        return value;
+//    }
+//
+//    public void setValue(Object value) {
+//        this.value = value;
+//    }
+
+    public eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.Field toDmpProfileCompositeModel() {
+        eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.Field field = new eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.Field();
+        field.setId(UUID.fromString(this.id));
+        field.setDataType(eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.types.DMPProfileFieldDataType.fromInteger(this.dataType));
+        field.setLabel(this.label);
+        field.setRequired(this.required);
+        field.setType(eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.types.DMPProfileType.fromInteger(this.type));
+      //  field.setValue(this.value);
+        return field;
+    }
+
+}

dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/dmpXml/dmpProfileModel/FieldSets.java

@@ -0,0 +1,22 @@
+package eu.eudat.logic.utilities.documents.xml.dmpXml.dmpProfileModel;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.LinkedList;
+import java.util.List;
+
+@XmlRootElement(name = "fieldSets")
+public class FieldSets {
+
+    List<Field> fields;
+
+    @XmlElement(name = "field")
+    public List<Field> getField() {
+        return fields;
+    }
+
+    public void setField(List<Field> fields) {
+        this.fields = fields;
+    }
+
+}

dmp-backend/web/src/main/java/eu/eudat/models/data/admin/composite/DatasetProfile.java

@@ -14,7 +14,6 @@ public class DatasetProfile {
     private String label;
     private String description;
     private String type;
-    private boolean enablePrefilling;
     private List<Page> pages;
     private List<Section> sections;
     private Short status;
@@ -44,13 +43,6 @@ public class DatasetProfile {
         this.type = type;
     }
 
-    public boolean isEnablePrefilling() {
-        return enablePrefilling;
-    }
-    public void setEnablePrefilling(boolean enablePrefilling) {
-        this.enablePrefilling = enablePrefilling;
-    }
-
     public List<Page> getPages() {
         return pages;
     }
@@ -88,7 +80,6 @@ public class DatasetProfile {
     }
 
     public void buildProfile(eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.ViewStyleModel viewStyle) {
-        this.enablePrefilling = viewStyle.isEnablePrefilling();
         this.sections = new ModelBuilder().fromViewStyleDefinition(viewStyle.getSections(), Section.class);
         this.pages = new ModelBuilder().fromViewStyleDefinition(viewStyle.getPages(), Page.class);
     }
@@ -98,7 +89,6 @@ public class DatasetProfile {
         shortProfile.setLabel(this.label);
         shortProfile.setDescription(this.description);
         shortProfile.setType(this.type);
-        shortProfile.setEnablePrefilling(this.enablePrefilling);
         List<Section> shortSection = new LinkedList<>();
         for (Section toshortSection : this.getSections()) {
             shortSection.add(toshortSection.toShort());

dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/AutoCompleteData.java

@@ -10,62 +10,11 @@ import java.util.List;
 import java.util.Map;
 
 public class AutoCompleteData extends ComboBoxData<AutoCompleteData> {
-
-    public static class AuthAutoCompleteData {
-        private String url;
-        private String method;
-        private String body;
-        private String path;
-        private String type;
-
-        public String getUrl() {
-            return url;
-        }
-
-        public void setUrl(String url) {
-            this.url = url;
-        }
-
-        public String getMethod() {
-            return method;
-        }
-
-        public void setMethod(String method) {
-            this.method = method;
-        }
-
-        public String getBody() {
-            return body;
-        }
-
-        public void setBody(String body) {
-            this.body = body;
-        }
-
-        public String getPath() {
-            return path;
-        }
-
-        public void setPath(String path) {
-            this.path = path;
-        }
-
-        public String getType() {
-            return type;
-        }
-
-        public void setType(String type) {
-            this.type = type;
-        }
-    }
     public static class AutoCompleteSingleData {
         private int autocompleteType;
         private String url;
         private ComboBoxData.Option autoCompleteOptions;
         private String optionsRoot;
-        private Boolean hasAuth;
-        private AuthAutoCompleteData auth;
-        private String method;
 
         public int getAutocompleteType() {
             return autocompleteType;
@@ -89,36 +38,12 @@ public class AutoCompleteData extends ComboBoxData<AutoCompleteData> {
             this.url = url;
         }
 
-        public Boolean getHasAuth() {
-            return hasAuth;
-        }
-
-        public void setHasAuth(Boolean hasAuth) {
-            this.hasAuth = hasAuth;
-        }
-
-        public AuthAutoCompleteData getAuth() {
-            return auth;
-        }
-
-        public void setAuth(AuthAutoCompleteData auth) {
-            this.auth = auth;
-        }
-
         public ComboBoxData.Option getAutoCompleteOptions() {
             return autoCompleteOptions;
         }
         public void setAutoCompleteOptions(ComboBoxData.Option autoCompleteOptions) {
             this.autoCompleteOptions = autoCompleteOptions;
         }
-
-        public String getMethod() {
-            return method;
-        }
-
-        public void setMethod(String method) {
-            this.method = method;
-        }
     }
 
     private Boolean multiAutoComplete;
@@ -145,22 +70,11 @@ public class AutoCompleteData extends ComboBoxData<AutoCompleteData> {
             parent.setAttribute("url", singleData.url);
             parent.setAttribute("optionsRoot", singleData.optionsRoot);
             parent.setAttribute("autoCompleteType", Integer.toString(singleData.autocompleteType));
-            parent.setAttribute("hasAuth", Boolean.toString(singleData.hasAuth));
-            parent.setAttribute("method", singleData.method);
             Element element = doc.createElement("option");
             element.setAttribute("label", singleData.autoCompleteOptions.getLabel());
             element.setAttribute("value", singleData.autoCompleteOptions.getValue());
             element.setAttribute("source", singleData.autoCompleteOptions.getSource());
             parent.appendChild(element);
-            if (singleData.hasAuth) {
-                Element authElement = doc.createElement("auth");
-                authElement.setAttribute("url", singleData.auth.url);
-                authElement.setAttribute("method", singleData.auth.method);
-                authElement.setAttribute("body", singleData.auth.body);
-                authElement.setAttribute("path", singleData.auth.path);
-                authElement.setAttribute("type", singleData.auth.type);
-                parent.appendChild(authElement);
-            }
             root.appendChild(parent);
         }
         return root;
@@ -194,8 +108,6 @@ public class AutoCompleteData extends ComboBoxData<AutoCompleteData> {
         } else {
             singleData.autocompleteType = AutocompleteType.fromValue(Integer.parseInt(item.getAttribute("autoCompleteType"))).getValue();
         }
-        singleData.hasAuth = Boolean.parseBoolean(item.getAttribute("hasAuth"));
-        singleData.method = item.hasAttribute("method") ? item.getAttribute("method") : "GET";
         Element optionElement = (Element) item.getElementsByTagName("option").item(0);
         if (optionElement != null) {
             singleData.autoCompleteOptions = new Option();
@@ -204,17 +116,6 @@ public class AutoCompleteData extends ComboBoxData<AutoCompleteData> {
             singleData.autoCompleteOptions.setSource(optionElement.getAttribute("source"));
             singleData.autoCompleteOptions.setUri(optionElement.getAttribute("uri"));
         }
-        if (singleData.hasAuth) {
-            Element authElement = (Element) item.getElementsByTagName("auth").item(0);
-            if (authElement != null) {
-                singleData.auth = new AuthAutoCompleteData();
-                singleData.auth.setUrl(authElement.getAttribute("url"));
-                singleData.auth.setMethod(authElement.getAttribute("method"));
-                singleData.auth.setBody(authElement.getAttribute("body"));
-                singleData.auth.setPath(authElement.getAttribute("path"));
-                singleData.auth.setType(authElement.getAttribute("type"));
-            }
-        }
     }
 
     @Override
@@ -240,8 +141,6 @@ public class AutoCompleteData extends ComboBoxData<AutoCompleteData> {
                 this.autoCompleteSingleDataList.get(i).autoCompleteOptions = new Option();
                 this.autoCompleteSingleDataList.get(i).url = (String) singleData.get("url");
                 this.autoCompleteSingleDataList.get(i).optionsRoot = (String) singleData.get("optionsRoot");
-                this.autoCompleteSingleDataList.get(i).hasAuth = (Boolean) singleData.get("hasAuth");
-                this.autoCompleteSingleDataList.get(i).method = singleData.containsKey("method") ? (String) singleData.get("method") : "GET";
 
                 if (singleData.get("autoCompleteType") == null) {
                     this.autoCompleteSingleDataList.get(i).autocompleteType = AutocompleteType.UNCACHED.getValue();
@@ -255,17 +154,6 @@ public class AutoCompleteData extends ComboBoxData<AutoCompleteData> {
                     this.autoCompleteSingleDataList.get(i).autoCompleteOptions.setSource(options.get("source"));
                     this.autoCompleteSingleDataList.get(i).autoCompleteOptions.setUri(options.get("uri"));
                 }
-                if (this.autoCompleteSingleDataList.get(i).hasAuth) {
-                    Map<String, String> auth = (Map<String, String>) singleData.get("auth");
-                    if (auth != null) {
-                        this.autoCompleteSingleDataList.get(i).auth = new AuthAutoCompleteData();
-                        this.autoCompleteSingleDataList.get(i).auth.setUrl(auth.get("url"));
-                        this.autoCompleteSingleDataList.get(i).auth.setType(auth.get("type"));
-                        this.autoCompleteSingleDataList.get(i).auth.setPath(auth.get("path"));
-                        this.autoCompleteSingleDataList.get(i).auth.setBody(auth.get("body"));
-                        this.autoCompleteSingleDataList.get(i).auth.setMethod(auth.get("method"));
-                    }
-                }
                 i++;
             }
         }
@@ -302,8 +190,6 @@ public class AutoCompleteData extends ComboBoxData<AutoCompleteData> {
                     node.appendChild(autoCompleteSingles.item(i));
                     node.setAttribute("url", item.getAttribute("url"));
                     node.setAttribute("optionsRoot", item.getAttribute("optionsRoot"));
-                    node.setAttribute("hasAuth", item.getAttribute("hasAuth"));
-                    node.setAttribute("method", item.hasAttribute("method") ? item.getAttribute("method") : "GET");
                     autoCompletes.add(singleToMap(node));
                 }
             }
@@ -328,16 +214,6 @@ public class AutoCompleteData extends ComboBoxData<AutoCompleteData> {
         return dataMap;
     }
 
-    private Map<String, Object> authToMap(Element item){
-        HashMap dataMap = new HashMap();
-        dataMap.put("url", item != null ? item.getAttribute("url") : "");
-        dataMap.put("method", item != null ? item.getAttribute("method") : "");
-        dataMap.put("body", item != null ? item.getAttribute("body") : "");
-        dataMap.put("path", item != null ? item.getAttribute("path") : "");
-        dataMap.put("type", item != null ? item.getAttribute("type") : "");
-        return dataMap;
-    }
-
     private Map<String, Object> singleToMap(Element item) {
         Map<String, Object> dataMap = new HashMap<>();
         if (!item.getAttribute("autoCompleteType").isEmpty()) {
@@ -345,12 +221,8 @@ public class AutoCompleteData extends ComboBoxData<AutoCompleteData> {
         }
         dataMap.put("optionsRoot", item != null ? item.getAttribute("optionsRoot") : "");
         dataMap.put("url", item != null ? item.getAttribute("url") : "");
-        dataMap.put("hasAuth", item != null ? item.getAttribute("hasAuth") : "false");
         Element optionElement = (Element) item.getElementsByTagName("option").item(0);
         dataMap.put("autoCompleteOptions", item != null ? optionToMap(optionElement) : null);
-        Element authElement = (Element) item.getElementsByTagName("auth").item(0);
-        dataMap.put("auth", item != null ? authToMap(authElement) : null);
-        dataMap.put("method", item != null && item.hasAttribute("method") ? item.getAttribute("method") : "GET");
         return dataMap;
     }
 

dmp-backend/web/src/main/java/eu/eudat/models/data/datasetprofile/DatasetProfileWithPrefillingPropertyModel.java

@@ -1,30 +0,0 @@
-package eu.eudat.models.data.datasetprofile;
-
-import java.util.UUID;
-
-public class DatasetProfileWithPrefillingPropertyModel {
-    private UUID id;
-    private String label;
-    private boolean enablePrefilling;
-
-    public UUID getId() {
-        return id;
-    }
-    public void setId(UUID id) {
-        this.id = id;
-    }
-
-    public String getLabel() {
-        return label;
-    }
-    public void setLabel(String label) {
-        this.label = label;
-    }
-
-    public boolean isEnablePrefilling() {
-        return enablePrefilling;
-    }
-    public void setEnablePrefilling(boolean enablePrefilling) {
-        this.enablePrefilling = enablePrefilling;
-    }
-}

dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/AssociatedProfileImportModels.java

@@ -1,31 +1,19 @@
 package eu.eudat.models.data.dmp;
 
-import java.util.List;
 import java.util.UUID;
 import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "profile")
 public class AssociatedProfileImportModels {
     private UUID id;
     private String label;
-    private List<Integer> section;
 
     @XmlElement(name = "profileId")
     public UUID getId() { return id; }
     public void setId(UUID id) { this.id = id; }
 
-    @XmlElement(name = "profileLabel")
+    @XmlElement(name = "profilelabel")
     public String getLabel() { return label; }
     public void setLabel(String label) { this.label = label; }
-
-    @XmlElementWrapper(name="profileInSections")
-    @XmlElement(name = "section")
-    public List<Integer> getSection() {
-        return section;
-    }
-    public void setSection(List<Integer> section) {
-        this.section = section;
-    }
 }

dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlan.java

@@ -256,12 +256,10 @@ public class DataManagementPlan implements DataModel<DMP, DataManagementPlan> {
         if (this.properties != null) {
             this.extraFields = new ArrayList<>();
             this.properties.forEach((id, value) -> {
-                if (value != null) {
-                    ExtraFieldModel extraField = new ExtraFieldModel();
-                    extraField.setId(id);
-                    extraField.setValue(value.toString());
-                    this.extraFields.add(extraField);
-                }
+                ExtraFieldModel extraField = new ExtraFieldModel();
+                extraField.setId(id);
+                extraField.setValue(value.toString());
+                this.extraFields.add(extraField);
             });
         }
         if (entity.getUsers() != null && entity.getUsers().stream().anyMatch(userDMP -> userDMP.getRole().equals(UserDMP.UserDMPRoles.OWNER.getValue())))
@@ -381,12 +379,10 @@ public class DataManagementPlan implements DataModel<DMP, DataManagementPlan> {
         if (this.properties != null) {
             this.extraFields = new ArrayList<>();
             this.properties.forEach((id, value) -> {
-                if (value != null) {
-                    ExtraFieldModel extraField = new ExtraFieldModel();
-                    extraField.setId(id);
-                    extraField.setValue(value.toString());
-                    this.extraFields.add(extraField);
-                }
+                ExtraFieldModel extraField = new ExtraFieldModel();
+                extraField.setId(id);
+                extraField.setValue(value.toString());
+                this.extraFields.add(extraField);
             });
         }
         if (entity.getUsers() != null && entity.getUsers().stream().anyMatch(userDMP -> userDMP.getRole().equals(UserDMP.UserDMPRoles.OWNER.getValue())))

dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java

@@ -23,7 +23,7 @@ public class DataManagementPlanEditorModel implements DataModel<DMP, DataManagem
     private UUID id;
     private String label;
     private UUID groupId;
-    private UUID profile;
+    private Tuple<UUID, String> profile;
     private int version;
     private int status;
     private boolean lockable;
@@ -53,10 +53,10 @@ public class DataManagementPlanEditorModel implements DataModel<DMP, DataManagem
         this.id = id;
     }
 
-    public UUID getProfile() {
+    public Tuple<UUID, String> getProfile() {
         return profile;
     }
-    public void setProfile(UUID profile) {
+    public void setProfile(Tuple<UUID, String> profile) {
         this.profile = profile;
     }
 
@@ -226,7 +226,7 @@ public class DataManagementPlanEditorModel implements DataModel<DMP, DataManagem
     @Override
     public DataManagementPlanEditorModel fromDataModel(DMP entity) {
         this.id = entity.getId();
-        this.profile = entity.getProfile() != null ? entity.getProfile().getId() : null;
+        this.profile = entity.getProfile() != null ? new Tuple<UUID, String>(entity.getProfile().getId(), entity.getProfile().getLabel()) : null;
         this.organisations = entity.getOrganisations().stream().map(item -> new Organisation().fromDataModel(item)).collect(Collectors.toList());
         this.researchers = entity.getResearchers().stream().map(item -> new Researcher().fromDataModel(item)).collect(Collectors.toList());
         this.version = entity.getVersion();
@@ -289,7 +289,7 @@ public class DataManagementPlanEditorModel implements DataModel<DMP, DataManagem
         DMP dataManagementPlanEntity = new DMP();
         if (this.profile != null) {
             DMPProfile dmpProfile = new DMPProfile();
-            dmpProfile.setId(this.profile);
+            dmpProfile.setId(this.profile.getId());
             dataManagementPlanEntity.setProfile(dmpProfile);
         }
         dataManagementPlanEntity.setId(this.id);
@@ -302,7 +302,7 @@ public class DataManagementPlanEditorModel implements DataModel<DMP, DataManagem
         if (this.grant != null) {
             if (this.grant.getExistGrant() != null && this.grant.getLabel() == null && this.grant.getDescription() == null)
                 dataManagementPlanEntity.setGrant(this.grant.getExistGrant().toDataModel());
-            else if (this.grant.getLabel() != null) {
+            else {
                 Grant grant = new Grant();
                 grant.setId(UUID.randomUUID());
                 grant.setAbbreviation("");
@@ -342,7 +342,7 @@ public class DataManagementPlanEditorModel implements DataModel<DMP, DataManagem
         if (this.project != null) {
             if (this.project.getExistProject() != null && this.project.getLabel() == null && this.project.getDescription() == null)
                 dataManagementPlanEntity.setProject(this.project.getExistProject().toDataModel());
-            else if (this.project.getLabel() != null) {
+            else {
                 Project project = new Project();
                 project.setId(UUID.randomUUID());
                 project.setAbbreviation("");
@@ -378,8 +378,7 @@ public class DataManagementPlanEditorModel implements DataModel<DMP, DataManagem
             dataManagementPlanEntity.setAssociatedDmps(dmpDatasetProfiles);
         }
         if(this.extraFields != null) {
-            this.properties = new HashMap<>();
-            this.extraFields.forEach((extraField) -> this.properties.put(extraField.getId(), extraField.getValue()));
+            this.properties = this.extraFields.stream().collect(Collectors.toMap(ExtraFieldModel::getId, ExtraFieldModel::getValue));
         }
         dataManagementPlanEntity.setProperties(this.properties != null ? JSONObject.toJSONString(this.properties) : null);
         dataManagementPlanEntity.setGroupId(this.groupId != null ? this.groupId : UUID.randomUUID());

dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanNewVersionModel.java

@@ -196,7 +196,7 @@ public class DataManagementPlanNewVersionModel implements DataModel<DMP, DataMan
         if (this.grant != null) {
             if (this.grant.getExistGrant() != null && this.grant.getLabel() == null && this.grant.getDescription() == null)
                 entity.setGrant(this.grant.getExistGrant().toDataModel());
-            else if (this.grant.getLabel() != null) {
+            else {
                 eu.eudat.data.entities.Grant grant = new eu.eudat.data.entities.Grant();
                 grant.setId(UUID.randomUUID());
                 grant.setAbbreviation("");
@@ -236,7 +236,7 @@ public class DataManagementPlanNewVersionModel implements DataModel<DMP, DataMan
         if (this.project != null) {
             if (this.project.getExistProject() != null && this.project.getLabel() == null && this.project.getDescription() == null)
                 entity.setProject(this.project.getExistProject().toDataModel());
-            else if (this.project.getLabel() != null) {
+            else {
                 Project project = new Project();
                 project.setId(UUID.randomUUID());
                 project.setAbbreviation("");

dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DatasetImportModels.java

@@ -17,7 +17,6 @@ public class DatasetImportModels {
 
     private String name;
     private UUID profile;
-    private int dmpSectionIndex;
     private HashMap<String, String> fieldImportModels;
 
     @XmlAttribute(name ="name")
@@ -28,7 +27,6 @@ public class DatasetImportModels {
         this.name = name;
     }
 
-    @XmlElement(name = "profile-id")
     public UUID getProfile() {
         return profile;
     }
@@ -36,14 +34,6 @@ public class DatasetImportModels {
         this.profile = profile;
     }
 
-    @XmlElement(name = "dmpSectionIndex")
-    public int getDmpSectionIndex() {
-        return dmpSectionIndex;
-    }
-    public void setDmpSectionIndex(int dmpSectionIndex) {
-        this.dmpSectionIndex = dmpSectionIndex;
-    }
-
     @XmlJavaTypeAdapter(PageAdapter.class)
     @XmlElement(name = "pages")
     public HashMap<String, String> getFieldImportModels() {

dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DmpImportModel.java

@@ -17,7 +17,6 @@ public class DmpImportModel {
     private List<OrganisationImportModel> organisationImportModels;
     private List<ResearcherImportModels> researchersImportModels;
     private List<UserInfoImportModels> associatedUsersImportModels;
-    private List<ExtraFieldsImportModels> extraFieldsImportModels;
     private List<DynamicFieldWithValueImportModels> dynamicFieldsImportModels;
     private List<DatasetImportModels> datasetImportModels;
     private String language;
@@ -105,15 +104,6 @@ public class DmpImportModel {
         this.associatedUsersImportModels = associatedUsersImportModels;
     }
 
-    @XmlElementWrapper(name="extraFields")
-    @XmlElement(name = "extraField")
-    public List<ExtraFieldsImportModels> getExtraFieldsImportModels() {
-        return extraFieldsImportModels;
-    }
-    public void setExtraFieldsImportModels(List<ExtraFieldsImportModels> extraFieldsImportModels) {
-        this.extraFieldsImportModels = extraFieldsImportModels;
-    }
-
     @XmlElementWrapper(name="dynamicFieldWithValues")
     @XmlElement(name = "dynamicFieldWithValue")
     public List<DynamicFieldWithValueImportModels> getDynamicFieldsImportModels() {

dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/ExtraFieldsImportModels.java

@@ -1,36 +0,0 @@
-package eu.eudat.models.data.dmp;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "extraField")
-public class ExtraFieldsImportModels {
-
-    private String id;
-    private String label;
-    private String value;
-
-    @XmlElement(name = "id")
-    public String getId() {
-        return id;
-    }
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    @XmlElement(name = "label")
-    public String getLabel() {
-        return label;
-    }
-    public void setLabel(String label) {
-        this.label = label;
-    }
-
-    @XmlElement(name = "value")
-    public String getValue() {
-        return value;
-    }
-    public void setValue(String value) {
-        this.value = value;
-    }
-}

dmp-backend/web/src/main/java/eu/eudat/models/data/entities/xmlmodels/datasetprofiledefinition/ViewStyleModel.java

@@ -11,18 +11,9 @@ import java.util.LinkedList;
 import java.util.List;
 
 public class ViewStyleModel implements XmlSerializable<ViewStyleModel> {
-    private boolean enablePrefilling;
     private List<Section> sections;
     private List<Page> pages;
 
-    public boolean isEnablePrefilling() {
-        return enablePrefilling;
-    }
-
-    public void setEnablePrefilling(boolean enablePrefilling) {
-        this.enablePrefilling = enablePrefilling;
-    }
-
     public List<Section> getSections() {
         return sections;
     }
@@ -42,8 +33,6 @@ public class ViewStyleModel implements XmlSerializable<ViewStyleModel> {
     @Override
     public Element toXml(Document doc) {
         Element root = doc.createElement("root");
-        Element prefilling = doc.createElement("enablePrefilling");
-        prefilling.setTextContent(String.valueOf(this.enablePrefilling));
         Element sections = doc.createElement("sections");
         Element pages = doc.createElement("pages");
         for (Section section : this.sections) {
@@ -55,7 +44,6 @@ public class ViewStyleModel implements XmlSerializable<ViewStyleModel> {
             pages.appendChild(page.toXml(doc));
         }
 
-        root.appendChild(prefilling);
         root.appendChild(pages);
         root.appendChild(sections);
         return root;
@@ -64,12 +52,6 @@ public class ViewStyleModel implements XmlSerializable<ViewStyleModel> {
     @Override
     public ViewStyleModel fromXml(Element element) {
 
-        this.enablePrefilling = true;
-        Element prefilling = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "enablePrefilling");
-        if (prefilling != null) {
-            this.enablePrefilling = Boolean.parseBoolean(prefilling.getChildNodes().item(0).getNodeValue());
-        }
-
         this.sections = new LinkedList();
         Element sections = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "sections");
         if (sections != null) {

dmp-backend/web/src/main/java/eu/eudat/models/data/entities/xmlmodels/dmpprofiledefinition/DescriptionTemplate.java

@@ -55,8 +55,8 @@ public class DescriptionTemplate implements XmlSerializable<DescriptionTemplate>
         rootElement.setAttribute("id", this.getId().toString());
         rootElement.setAttribute("descriptionTemplateId", this.getDescriptionTemplateId().toString());
         rootElement.setAttribute("label", this.label);
-        if (this.minMultiplicity != null) rootElement.setAttribute("minMultiplicity", String.valueOf(this.minMultiplicity));
-        if (this.maxMultiplicity != null) rootElement.setAttribute("maxMultiplicity", String.valueOf(this.maxMultiplicity));
+        rootElement.setAttribute("minMultiplicity", String.valueOf(this.minMultiplicity));
+        rootElement.setAttribute("maxMultiplicity", String.valueOf(this.maxMultiplicity));
         return rootElement;
     }
 

dmp-backend/web/src/main/java/eu/eudat/models/data/entities/xmlmodels/dmpprofiledefinition/types/SystemFieldType.java

@@ -49,7 +49,7 @@ public enum SystemFieldType {
             case 10:
                 return ACCESS_RIGHTS;
             default:
-                throw new RuntimeException("Unsupported System Section Type");
+                throw new RuntimeException("Unsupported System Field Type");
         }
     }
 }

dmp-backend/web/src/main/java/eu/eudat/models/data/user/composite/DatasetProfile.java

@@ -12,8 +12,6 @@ import java.util.Map;
 public class DatasetProfile implements PropertiesModelBuilder {
     private String description;
     private String language;
-    private String type;
-    private boolean enablePrefilling;
     private List<Section> sections;
     private List<Rule> rules;
     private List<Page> pages;
@@ -35,22 +33,6 @@ public class DatasetProfile implements PropertiesModelBuilder {
         this.language = language;
     }
 
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public boolean isEnablePrefilling() {
-        return enablePrefilling;
-    }
-
-    public void setEnablePrefilling(boolean enablePrefilling) {
-        this.enablePrefilling = enablePrefilling;
-    }
-
     public List<Section> getSections() {
         return sections;
     }
@@ -85,7 +67,6 @@ public class DatasetProfile implements PropertiesModelBuilder {
     }
 
     public void buildProfile(eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.ViewStyleModel viewStyle) {
-        this.enablePrefilling = viewStyle.isEnablePrefilling();
         this.sections = new ModelBuilder().fromViewStyleDefinition(viewStyle.getSections(), Section.class);
         this.pages = new ModelBuilder().fromViewStyleDefinition(viewStyle.getPages(), Page.class);
         this.rules = ModelBuilderCollector.collectRules(viewStyle.getSections());

dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DatasetRDAMapper.java

@@ -52,7 +52,6 @@ public class DatasetRDAMapper {
 		rda.setTitle(dataset.getLabel());
 		rda.setDescription(dataset.getDescription());
 		rda.setAdditionalProperty("template", dataset.getProfile().getId());
-		rda.setAdditionalProperty("dmpSectionIndex", dataset.getDmpSectionIndex());
 		try {
 			JSONObject jObject = new JSONObject(dataset.getProperties());
 			Map<String, Object> templateIdsToValues = jObject.toMap();
@@ -285,12 +284,6 @@ public class DatasetRDAMapper {
 		eu.eudat.data.entities.Dataset entity = new eu.eudat.data.entities.Dataset();
 		entity.setLabel(rda.getTitle());
 		entity.setDescription(rda.getDescription());
-		if (rda.getAdditionalProperties().get("dmpSectionIndex") != null) {
-			entity.setDmpSectionIndex(Integer.parseInt(rda.getAdditionalProperties().get("dmpSectionIndex").toString()));
-		} else {
-			entity.setDmpSectionIndex(0);
-		}
-
 		try {
 			DescriptionTemplate profile = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(rda.getAdditionalProperties().get("template").toString()));
 			entity.setProfile(profile);

dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DmpRDAMapper.java

@@ -1,11 +1,8 @@
 package eu.eudat.models.rda.mapper;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import eu.eudat.data.entities.*;
-import eu.eudat.logic.managers.DataManagementProfileManager;
 import eu.eudat.logic.services.ApiContext;
 import eu.eudat.logic.utilities.helpers.StreamDistinctBy;
-import eu.eudat.models.data.dmp.AssociatedProfile;
 import eu.eudat.models.rda.Dmp;
 import eu.eudat.models.rda.DmpId;
 import net.minidev.json.JSONObject;
@@ -27,13 +24,13 @@ public class DmpRDAMapper {
 
 	private DatasetRDAMapper datasetRDAMapper;
 	private ApiContext apiContext;
-	private DataManagementProfileManager dataManagementProfileManager;
+
 
 	@Autowired
-	public DmpRDAMapper(DatasetRDAMapper datasetRDAMapper, ApiContext apiContext, DataManagementProfileManager dataManagementProfileManager) throws IOException {
+	public DmpRDAMapper(DatasetRDAMapper datasetRDAMapper, ApiContext apiContext) throws IOException {
 		this.datasetRDAMapper = datasetRDAMapper;
 		this.apiContext = apiContext;
-		this.dataManagementProfileManager = dataManagementProfileManager;
+
 	}
 
 	@Transactional
@@ -90,19 +87,7 @@ public class DmpRDAMapper {
 					rda.getCost().add(CostRDAMapper.toRDA((Map)costl));
 				});
 			}
-			UserInfo contactDb = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(UUID.fromString((String) extraProperties.get("contact")));
-			UserInfo contact = new UserInfo();
-			contact.setId(contactDb.getId());
-			contact.setName(contactDb.getName());
-			contact.setEmail(contactDb.getEmail());
-			if(contact.getEmail() == null){
-				for(UserDMP userDMP: dmp.getUsers()){
-					if(userDMP.getDmp().getId() == dmp.getId() && userDMP.getUser().getEmail() != null){
-						contact.setEmail(userDMP.getUser().getEmail());
-						break;
-					}
-				}
-			}
+			UserInfo contact = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(UUID.fromString((String) extraProperties.get("contact")));
 			rda.setContact(ContactRDAMapper.toRDA(contact));
 		}
 
@@ -119,15 +104,10 @@ public class DmpRDAMapper {
 		}
 //		rda.getContributor().addAll(dmp.getUsers().stream().map(ContributorRDAMapper::toRDA).collect(Collectors.toList()));
 		rda.setDataset(dmp.getDataset().stream().filter(dataset -> dataset.getStatus() != eu.eudat.elastic.entities.Dmp.DMPStatus.DELETED.getValue()).map(dataset -> datasetRDAMapper.toRDA(dataset, rda)).collect(Collectors.toList()));
-		rda.setProject(Collections.singletonList(ProjectRDAMapper.toRDA(dmp.getProject(), dmp.getGrant())));
-
-		rda.setAdditionalProperty("templates", dmp.getAssociatedDmps().stream().map(item -> item.getDatasetprofile().getId().toString()).toArray());
-		rda.setAdditionalProperty("blueprintId", dmp.getProfile().getId());
-		rda.setAdditionalProperty("license", extraProperties.get("license"));
-		rda.setAdditionalProperty("visible", extraProperties.get("visible"));
-		rda.setAdditionalProperty("publicDate", extraProperties.get("publicDate"));
-		rda.setAdditionalProperty("contact", extraProperties.get("contact"));
-		rda.setAdditionalProperty("dmpProperties", dmp.getProperties());
+		if (dmp.getProject() != null) {
+			rda.setProject(Collections.singletonList(ProjectRDAMapper.toRDA(dmp.getProject(), dmp.getGrant())));
+		}
+		rda.setAdditionalProperty("templates", dmp.getAssociatedDmps().stream().map(datasetProfile -> datasetProfile.getId().toString()).toArray());
 		return rda;
 	}
 
@@ -146,46 +126,26 @@ public class DmpRDAMapper {
 				entity.setDois(new HashSet<>());
 			}
 		}
-
-		String blueprintId = (String) rda.getAdditionalProperties().get("blueprintId");
-			DMPProfile blueprint = apiContext.getOperationsContext().getDatabaseRepository().getDmpProfileDao().find(UUID.fromString(blueprintId));
-			entity.setProfile(blueprint);
-
-		if (((List<String>) rda.getAdditionalProperties().get("templates")) != null && !((List<String>) rda.getAdditionalProperties().get("templates")).isEmpty()) {
-			List<DescriptionTemplate> descriptionTemplates = ((List<String>) rda.getAdditionalProperties().get("templates")).stream().map(this::getProfile).filter(Objects::nonNull).collect(Collectors.toList());
-			Set<DMPDatasetProfile> dmpDatasetProfiles = new HashSet<>();
-			for (DescriptionTemplate profile : descriptionTemplates) {
-				DMPDatasetProfile dmpDatasetProfile = new DMPDatasetProfile();
-				dmpDatasetProfile.setDmp(entity);
-				dmpDatasetProfile.setDatasetprofile(profile);
-				String indexes = this.dataManagementProfileManager.sectionIndexesForDescriptionTemplate(blueprint, profile.getId()).stream()
-						.map(String::valueOf) // convert each int to a string
-						.collect(Collectors.joining(","));
-				dmpDatasetProfile.setData("{\"dmpSectionIndex\":[" +  indexes + "]}");
-				dmpDatasetProfiles.add(dmpDatasetProfile);
-			}
-			entity.setAssociatedDmps(dmpDatasetProfiles);
+		if (((List<String>) rda.getAdditionalProperties().get("templates")) != null && !((List<String>) rda.getAdditionalProperties().get("templates")).isEmpty() && entity.getId() != null) {
+			entity.setAssociatedDmps(((List<String>) rda.getAdditionalProperties().get("templates")).stream().map(x -> this.getProfile(x, entity.getId())).filter(Objects::nonNull).collect(Collectors.toSet()));
+		}
+		if (entity.getAssociatedDmps() == null) {
+			entity.setAssociatedDmps(new HashSet<>());
+		}
+		if (profiles != null && entity.getId() != null) {
+			for (String profile : profiles) {
+				entity.getAssociatedDmps().add(this.getProfile(profile, entity.getId()));
+			}
 		}
-
-//		if (entity.getAssociatedDmps() == null) {
-//			entity.setAssociatedDmps(new HashSet<>());
-//		}
-//		if (profiles != null && entity.getId() != null) {
-//			for (String profile : profiles) {
-//				entity.getAssociatedDmps().add(this.getProfile(profile, entity.getId()));
-//			}
-//		}
 		if (rda.getContributor() != null && !rda.getContributor().isEmpty() && rda.getContributor().get(0).getContributorId() != null) {
 			entity.setResearchers(rda.getContributor().stream().filter(r -> r.getContributorId() != null).map(ContributorRDAMapper::toEntity).filter(StreamDistinctBy.distinctByKey(Researcher::getReference)).collect(Collectors.toSet()));
 		}
 		entity.setCreated(rda.getCreated());
 		entity.setModified(rda.getModified());
 		entity.setDescription(rda.getDescription());
-		if(entity.getAssociatedDmps().size() > 0) {
-			DescriptionTemplate defaultProfile = entity.getAssociatedDmps().stream().findFirst().get().getDatasetprofile();
-			entity.setDataset(rda.getDataset().stream().map(rda1 -> datasetRDAMapper.toEntity(rda1, defaultProfile)).collect(Collectors.toSet()));
-		}
-        if (rda.getProject() != null && rda.getProject().size() > 0) {
+		DescriptionTemplate defaultProfile = ((DescriptionTemplate)entity.getAssociatedDmps().toArray()[0]);
+		entity.setDataset(rda.getDataset().stream().map(rda1 -> datasetRDAMapper.toEntity(rda1, defaultProfile)).collect(Collectors.toSet()));
+		if (rda.getProject().size() > 0) {
 			Map<String, Object> result = ProjectRDAMapper.toEntity(rda.getProject().get(0), apiContext);
 			entity.setProject((Project) result.get("project"));
 			result.entrySet().stream().filter(entry -> entry.getKey().startsWith("grant")).forEach(entry -> entity.setGrant((Grant) entry.getValue()));
@@ -193,19 +153,16 @@ public class DmpRDAMapper {
 
 		Map<String, Object> extraProperties = new HashMap<>();
 		extraProperties.put("language", LanguageRDAMapper.mapRDAIsoToLanguageIso(rda.getLanguage()));
-		if (rda.getAdditionalProperties().get("license") != null) extraProperties.put("license", rda.getAdditionalProperties().get("license"));
-		if (rda.getAdditionalProperties().get("visible") != null) extraProperties.put("visible", rda.getAdditionalProperties().get("visible"));
-		if (rda.getAdditionalProperties().get("publicDate") != null) extraProperties.put("publicDate", rda.getAdditionalProperties().get("publicDate"));
-		if (rda.getAdditionalProperties().get("contact") != null) extraProperties.put("contact", rda.getAdditionalProperties().get("contact"));
+
 		entity.setExtraProperties(JSONObject.toJSONString(extraProperties));
 
-		if (rda.getAdditionalProperties().get("dmpProperties") != null) entity.setProperties(rda.getAdditionalProperties().get("dmpProperties").toString());
-
-
 		return entity;
 	}
 
-	private DescriptionTemplate getProfile(String id) {
-		return  apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().asQueryable().where(((builder, root) -> builder.equal(root.get("id"), UUID.fromString(id)))).getSingleOrDefault();
+	private DMPDatasetProfile getProfile(String descriptionTemplateId, UUID dmpId) {
+		return  apiContext.getOperationsContext().getDatabaseRepository().getDmpDatasetProfileDao().asQueryable().where(((builder, root) -> builder.and(
+				builder.equal(root.get("datasetprofile"), UUID.fromString(descriptionTemplateId)),
+				builder.equal(root.get("dmp"), dmpId))
+		)).getSingleOrDefault();
 	}
 }

dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/ProjectRDAMapper.java

@@ -17,13 +17,13 @@ public class ProjectRDAMapper {
 	public static Project toRDA(eu.eudat.data.entities.Project project, Grant grant) {
 		Project rda = new Project();
 		try {
-			rda.setTitle(grant.getLabel());
-			rda.setDescription(grant.getDescription());
-			if (grant.getStartdate() != null) {
-				rda.setStart(grant.getStartdate().toString());
+			rda.setTitle(project.getLabel());
+			rda.setDescription(project.getDescription());
+			if (project.getStartdate() != null) {
+				rda.setStart(project.getStartdate().toString());
 			}
-			if (grant.getEnddate() != null) {
-				rda.setEnd(grant.getEnddate().toString());
+			if (project.getEnddate() != null) {
+				rda.setEnd(project.getEnddate().toString());
 			}
 			rda.setFunding(Collections.singletonList(FundingRDAMapper.toRDA(grant)));
 

dmp-db-scema/updates/00.00.014_Rename_DatasetProfile_and_add_Type_column.sql

@@ -13,7 +13,7 @@ ADD COLUMN "Type" uuid;
 INSERT INTO public."DescriptionTemplateType" ("ID", "Name", "Status")
 VALUES  ('709a8400-10ca-11ee-be56-0242ac120002', 'Dataset', 1);
 
-UPDATE public."DescriptionTemplate" SET "Type" = '709a8400-10ca-11ee-be56-0242ac120002';
+UPDATE public."DescriptionTemplate" SET ("Type") = '709a8400-10ca-11ee-be56-0242ac120002';
 
 ALTER TABLE public."DescriptionTemplate" 
 ALTER COLUMN "Type" SET NOT NULL;

dmp-db-scema/updates/00.00.016_Insert_default_blueprint_and_add_dmpSectionIndex_to datasets.sql

@@ -4,7 +4,7 @@ BEGIN
    PERFORM * FROM "DBVersion" WHERE version = this_version;
    IF FOUND THEN RETURN; END IF;
 
-INSERT INTO public."DMPProfile" VALUES ('86635178-36a6-484f-9057-a934e4eeecd5', 'Dmp Default Blueprint', '<root><sections><section id="f94e50e0-cb97-4c65-8b88-e5db6badd41d" label="Main Info" description="" ordinal="1" hasTemplates="false"><systemFields><systemField id="e62c3fa2-4cbe-41bf-a00e-ad722c7c7da1" type="0" label="Title of DMP" placeholder="Title of DMP" description="" required="true" ordinal="1"></systemField><systemField id="eed2871d-5201-401e-8453-87afbeac77e3" type="1" label="Description" placeholder="Fill with description" description="Briefly describe the context and purpose of the DMP" required="true" ordinal="2"></systemField><systemField id="41a0b1db-b186-467d-8edf-7d3b2456f95e" type="2" label="Researchers" placeholder="Select researchers" description="Add here the names of people that have produced, processed, analysed the data described in the DMP." required="false" ordinal="3"></systemField><systemField id="0f0afb55-a11b-41db-a4d0-67ebb74d8685" type="3" label="Organizations" placeholder="Select organization" description="Add here the names of the organizations contributing to the creation and revision of the DMPs" required="false" ordinal="4"></systemField><systemField id="db493026-3130-4730-9b93-da6b77d2eea4" type="4" label="Language" placeholder="Language" description="Select the language of your DMP" required="true" ordinal="5"></systemField><systemField id="22deb104-1c46-4ea8-8261-8fdc9500dca2" type="5" label="Contact" placeholder="Contact" description="" required="true" ordinal="6"></systemField></systemFields><descriptionTemplates></descriptionTemplates></section><section id="3c2608e5-9320-4d94-9ed7-1eab9500d84b" label="Funding" description="" ordinal="2" hasTemplates="false"><systemFields><systemField id="527af8fe-27b0-4715-9e1e-35a2fce834a1" type="6" label="Funding organizations" placeholder="Funder" description="Select a funder of your research or add new" required="true" ordinal="1"></systemField><systemField id="4d12904e-2501-4d57-8d2b-1ac795c297e7" type="7" label="Grants" placeholder="Grant" description="Find the grant of your research or add new" required="true" ordinal="2"></systemField><systemField id="82f235c8-98fc-48d1-8245-36ab08f01036" type="8" label="Project" placeholder="Project" description="Projects in Argos are perceived as distinct activities falling under a grant or common activities under different grants in collaborative schemas, eg open call for contributions. Please complete it for the grant associated to your organization if your project falls under this category. In all other cases, please leave blank and it will be autocompleted." required="false" ordinal="3"></systemField></systemFields><descriptionTemplates></descriptionTemplates></section><section id="2a77e1f6-9989-4aeb-acd9-48e911a92abd" label="License" description="" ordinal="3" hasTemplates="false"><systemFields><systemField id="75c31705-6731-45dd-9853-75c5d0627439" type="9" label="License" placeholder="License" description="Assign a license to your DMP by selecting the most appropriate from the list." required="false" ordinal="1"></systemField><systemField id="990df932-eae6-44ca-85da-5378b010f439" type="10" label="Access Rights" placeholder="Access Rights" description="Choose how the DMP is displayed after is published on Zenodo. By choosing Open Access, the DMP will be open on Zenodo after the Publication Date. By choosing Restricted Access, the DMP will be restricted after the publication is made." required="false" ordinal="2"></systemField></systemFields><descriptionTemplates></descriptionTemplates></section><section id="0db7845b-0e7c-41df-8d91-cbca97995fd5" label="Templates" description="" ordinal="4" hasTemplates="true"><systemFields></systemFields><descriptionTemplates></descriptionTemplates></section></sections></root>',1, now(),now());
+INSERT INTO public."DMPProfile" VALUES ('86635178-36a6-484f-9057-a934e4eeecd5', 'Dmp Default Blueprint', '<root><sections><section id="f94e50e0-cb97-4c65-8b88-e5db6badd41d" label="Main Info" description="A DMP in Argos consists of key information about research, such as purpose, objectives and researchers involved, but also about documentation of research datasets that highlight the steps followed and the means used across data management activities." ordinal="1" hasTemplates="false"><systemFields><systemField id="e62c3fa2-4cbe-41bf-a00e-ad722c7c7da1" type="0" label="Title of DMP" placeholder="Title of DMP" description="" required="true" ordinal="1"></systemField><systemField id="eed2871d-5201-401e-8453-87afbeac77e3" type="1" label="Description" placeholder="Fill with description" description="Briefly describe the context and purpose of the DMP" required="true" ordinal="2"></systemField><systemField id="41a0b1db-b186-467d-8edf-7d3b2456f95e" type="2" label="Researchers" placeholder="Select researchers" description="Add here the names of people that have produced, processed, analysed the data described in the DMP." required="false" ordinal="3"></systemField><systemField id="0f0afb55-a11b-41db-a4d0-67ebb74d8685" type="3" label="Organizations" placeholder="Select organization" description="Add here the names of the organizations contributing to the creation and revision of the DMPs" required="false" ordinal="4"></systemField><systemField id="db493026-3130-4730-9b93-da6b77d2eea4" type="4" label="Language" placeholder="Language" description="Select the language of your DMP" required="true" ordinal="5"></systemField><systemField id="22deb104-1c46-4ea8-8261-8fdc9500dca2" type="5" label="Contact" placeholder="Contact" description="" required="true" ordinal="6"></systemField></systemFields><descriptionTemplates></descriptionTemplates></section><section id="3c2608e5-9320-4d94-9ed7-1eab9500d84b" label="Funding" description="Add here information about the scope, funding, actors of your DMP and decide on access and re-use issues for the DMP output that you are creating." ordinal="2" hasTemplates="false"><systemFields><systemField id="527af8fe-27b0-4715-9e1e-35a2fce834a1" type="6" label="Funding organizations" placeholder="Funder" description="Select a funder of your research or add new" required="true" ordinal="1"></systemField><systemField id="4d12904e-2501-4d57-8d2b-1ac795c297e7" type="7" label="Grants" placeholder="Grant" description="Find the grant of your research or add new" required="true" ordinal="2"></systemField><systemField id="82f235c8-98fc-48d1-8245-36ab08f01036" type="8" label="Project" placeholder="Project" description="Projects in Argos are perceived as distinct activities falling under a grant or common activities under different grants in collaborative schemas, eg open call for contributions. Please complete it for the grant associated to your organization if your project falls under this category. In all other cases, please leave blank and it will be autocompleted." required="false" ordinal="3"></systemField></systemFields><descriptionTemplates></descriptionTemplates></section><section id="2a77e1f6-9989-4aeb-acd9-48e911a92abd" label="License" description="Each DMP can contain specific license informatation over how much open and available it is, that way you can determine who can see your dataset and for how long that data will be private." ordinal="3" hasTemplates="false"><systemFields><systemField id="75c31705-6731-45dd-9853-75c5d0627439" type="9" label="License" placeholder="License" description="Assign a license to your DMP by selecting the most appropriate from the list." required="false" ordinal="1"></systemField><systemField id="990df932-eae6-44ca-85da-5378b010f439" type="10" label="Access Rights" placeholder="Access Rights" description="Choose how the DMP is displayed after is published on Zenodo. By choosing Open Access, the DMP will be open on Zenodo after the Publication Date. By choosing Restricted Access, the DMP will be restricted after the publication is made." required="false" ordinal="2"></systemField></systemFields><descriptionTemplates></descriptionTemplates></section><section id="0db7845b-0e7c-41df-8d91-cbca97995fd5" label="Dataset Info" description="Datasets are documented following pre-defined templates which set the content of dataset descriptions. In Argos, a DMP can contain as many dataset descriptions as the datasets it documents." ordinal="4" hasTemplates="true"><systemFields></systemFields><descriptionTemplates></descriptionTemplates></section></sections></root>',1, now(),now());
 UPDATE public."DMP" SET "Profile" = '86635178-36a6-484f-9057-a934e4eeecd5' WHERE "Profile" IS NULL;
 UPDATE public."Dataset" SET "DmpSectionIndex" = '3' WHERE "DmpSectionIndex" IS NULL;
 UPDATE public."DMPDatasetProfile" SET "data" = '{"dmpSectionIndex":[3]}' WHERE "data" IS NULL;

dmp-frontend/src/app/app.component.html

@@ -25,4 +25,7 @@
 <app-notification *ngIf="!onlySplash"></app-notification>
 <router-outlet *ngIf="onlySplash"></router-outlet>
 
-<ngx-guided-tour [skipText]="'DASHBOARD.TOUR-GUIDE.LEAVE-TOUR'| translate" [nextText]="'DASHBOARD.TOUR-GUIDE.GOT-IT'| translate"></ngx-guided-tour>
+<ngx-guided-tour
+	[skipText]="'DASHBOARD.TOUR-GUIDE.LEAVE-TOUR'| translate"
+	[nextText]="'DASHBOARD.TOUR-GUIDE.GOT-IT'| translate"
+></ngx-guided-tour>

dmp-frontend/src/app/app.component.scss

@@ -40,70 +40,3 @@
 ::ng-deep .mat-chip {
   height: auto !important;
 }
-
-.notification-header {
-    height: 64px;
-    background: var(--unnamed-color-var(--primary-color)) 0% 0% no-repeat padding-box;
-    background: var(--primary-color) 0% 0% no-repeat padding-box;
-    box-shadow: 0px 3px 6px #00000029;
-    padding: 0.6rem;
-    margin: 30px 0px 0px 0px;
-    border-radius: 4px;
-    opacity: 1;
-  
-    .info {
-      flex: 2;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-}
-
-.notification-discard-btn {
-    background: transparent;
-    border: 1px solid #ffffff;
-    color: white;
-    border-radius: 30px;
-    opacity: 1;
-    width: 110px;
-    height: 40px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-}
-
-.notification-title {
-    text-align: left;
-    font-weight: 400;
-    font-size: 14px;
-    color: #ffffff;
-    opacity: 0.75;
-}
-
-.notification-subtitle {
-    text-align: left;
-    color: #ffffff;
-    font-weight: 700;
-    font-size: 16px;
-    opacity: 1;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-.notification-link {
-    color: #ffffff;
-	text-decoration: underline;
-}
-
-.notification-save-btn {
-    background: #ffffff 0% 0% no-repeat padding-box !important;
-    border-radius: 30px;
-    opacity: 1;
-    width: 110px;
-    height: 40px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    font-weight: 700;
-    color: var(--primary-color);
-}

dmp-frontend/src/app/app.component.ts

@@ -20,8 +20,6 @@ import { MatomoInjector } from 'ngx-matomo';
 import { MatomoService } from './core/services/matomo/matomo-service';
 import { SideNavService } from './core/services/sidenav/side-nav.sevice';
 import { MatSidenav } from '@angular/material/sidenav';
-import { runInThisContext } from 'vm';
-import * as moment from 'moment';
 
 
 declare const gapi: any;
@@ -41,7 +39,7 @@ export class AppComponent implements OnInit, AfterViewInit {
 	private statusChangeSubscription: Subscription;
 	onlySplash = true;
 
-	@ViewChild('sidenav') sidenav: MatSidenav;
+	@ViewChild('sidenav') sidenav:MatSidenav;
 
 	constructor(
 		private router: Router,
@@ -54,7 +52,7 @@ export class AppComponent implements OnInit, AfterViewInit {
 		private cookieService: CookieService,
 		private ccService: NgcCookieConsentService,
 		private language: LanguageService,
-		public configurationService: ConfigurationService,
+		private configurationService: ConfigurationService,
 		private location: Location,
 		private matomoService: MatomoService,
 		private sidenavService: SideNavService
@@ -65,34 +63,34 @@ export class AppComponent implements OnInit, AfterViewInit {
 	}
 	ngAfterViewInit(): void {
 		setTimeout(() => {
-			this.sideNavSubscription = this.sidenavService.status().subscribe(isopen => {
+			this.sideNavSubscription = this.sidenavService.status().subscribe(isopen=>{
 				const hamburger = document.getElementById('hamburger');
-				if (isopen) {
+				if(isopen){
 					//update value of hamburfer
-					if (!hamburger) {//try later
+					if(!hamburger){//try later
 						setTimeout(() => {
-							const hamburger = document.getElementById('hamburger');
-							if (hamburger) {
-								hamburger.classList.add('change');
+							const hamburger  = document.getElementById('hamburger');
+							if(hamburger){
+								hamburger.classList.add('change');		
 							}
 						}, 300);
-					} else {
+					}else{
 						hamburger.classList.add('change');
 					}
 					this.sidenav.open()
-				} else {//closed
-					if (!hamburger) {//try later
+				}else{//closed
+					if(!hamburger){//try later
 						setTimeout(() => {
-							const hamburger = document.getElementById('hamburger');
-							if (hamburger) {
+							const hamburger  = document.getElementById('hamburger');
+							if(hamburger){
 								hamburger.classList.remove('change');
 							}
 						}, 300);
-					} else {
+					}else{
 						hamburger.classList.remove('change');
 					}
 					this.sidenav.close();
-
+	
 				}
 			});
 		});
@@ -122,8 +120,8 @@ export class AppComponent implements OnInit, AfterViewInit {
 		}
 		if (!this.cookieService.check("cookiesConsent")) {
 			// this.cookieService.set("cookiesConsent", "false", 356);
-			this.cookieService.set("cookiesConsent", "false", 356, null, null, false, 'Lax');
-
+			this.cookieService.set("cookiesConsent", "false", 356,null,null,false, 'Lax');
+			
 		}
 
 		this.hasBreadCrumb = this.router.events.pipe(
@@ -157,7 +155,7 @@ export class AppComponent implements OnInit, AfterViewInit {
 		this.statusChangeSubscription = this.ccService.statusChange$.subscribe((event: NgcStatusChangeEvent) => {
 			if (event.status == "dismiss") {
 				// this.cookieService.set("cookiesConsent", "true", 365);
-				this.cookieService.set("cookiesConsent", "true", 356, null, null, false, 'Lax');
+				this.cookieService.set("cookiesConsent", "true", 356,null,null,false, 'Lax');
 			}
 		});
 
@@ -179,7 +177,7 @@ export class AppComponent implements OnInit, AfterViewInit {
 				}
 				this.ccService.destroy();
 				this.ccService.init(this.ccService.getConfig());
-			});
+		});
 	}
 
 	translateTitle(ttl: string) {
@@ -198,7 +196,7 @@ export class AppComponent implements OnInit, AfterViewInit {
 
 	ngOnDestroy() {
 		this.statusChangeSubscription.unsubscribe();
-		if (this.sideNavSubscription) {
+		if(this.sideNavSubscription){
 			this.sideNavSubscription.unsubscribe();
 		}
 	}

dmp-frontend/src/app/core/model/admin/dataset-profile/dataset-profile.ts

@@ -4,7 +4,6 @@ import { UserInfoListingModel } from "../../user/user-info-listing";
 export interface DatasetProfile {
 	label: string;
 	type: string;
-	enablePrefilling: boolean;
 	sections: Section[];
 	pages: Page[];
 	status: number;

dmp-frontend/src/app/core/model/dataset-profile-definition/auth-type.enum.ts

@@ -1,3 +0,0 @@
-export enum AuthType {
-	BEARER = 'Bearer'
-}

dmp-frontend/src/app/core/model/dataset-profile-definition/field-data/field-data.ts

@@ -12,22 +12,11 @@ export interface AutoCompleteFieldData extends FieldData {
 	multiAutoComplete: boolean;
 }
 
-export interface AuthAutoCompleteData extends FieldData {
-	url: string;
-	method: string;
-	body: string;
-	path: string;
-	type: string;
-}
-
 export interface AutoCompleteSingleData extends FieldData {
 	url: string;
 	optionsRoot: string;
 	autoCompleteOptions: FieldDataOption;
 	autocompleteType: number;
-	hasAuth: boolean;
-	method: string;
-	auth: AuthAutoCompleteData;
 }
 
 export interface CheckBoxFieldData extends FieldData {

dmp-frontend/src/app/core/model/dataset-profile-definition/html-method.enum.ts

@@ -1,6 +0,0 @@
-export enum HtmlMethod {
-	GET = 'GET',
-	POST = 'POST',
-	PUT = 'PUT',
-	PATCH = 'PATCH'
-}

dmp-frontend/src/app/core/model/dataset/dataset-profile.ts

@@ -5,12 +5,6 @@ export interface DatasetProfileModel {
 	description: string;
 }
 
-export interface DatasetProfileWithPrefillingModel {
-	id: string;
-	label: string;
-	enablePrefilling: boolean;
-}
-
 // export class DatasetProfileModel implements Serializable<DatasetProfileModel> {
 // 	public id: String;
 // 	public label: String;

dmp-frontend/src/app/core/query/dataset-profile/dataset-profile-criteria.ts

@@ -3,7 +3,6 @@ import { BaseCriteria } from "../base-criteria";
 export class DatasetProfileCriteria extends BaseCriteria {
 	public id: String;
 	public groupIds: string[];
-	public ids: string[];
 	public allVersions: boolean;
 	public finalized: boolean = true;
 	public status: number;

dmp-frontend/src/app/core/query/dmp/dmp-blueprint-criteria.ts

@@ -1,5 +1,5 @@
 import { BaseCriteria } from "../base-criteria";
 
 export class DmpBlueprintCriteria extends BaseCriteria {
-    public status?: number;
+
 }

dmp-frontend/src/app/core/services/configuration/configuration.service.ts

@@ -101,21 +101,6 @@ export class ConfigurationService extends BaseComponent {
 		return this._maxFileSizeInMB;
 	}
 
-	private _newReleaseNotificationLink: number;
-	get newReleaseNotificationLink(): number {
-		return this._newReleaseNotificationLink;
-	}
-
-	private _newReleaseNotificationExpires: number;
-	get newReleaseNotificationExpires(): number {
-		return this._newReleaseNotificationExpires;
-	}
-
-	private _newReleaseNotificationVersionCode: number;
-	get newReleaseNotificationVersionCode(): number {
-		return this._newReleaseNotificationVersionCode;
-	}
-
 	public loadConfiguration(): Promise<any> {
 		return new Promise((r, e) => {
 
@@ -161,9 +146,6 @@ export class ConfigurationService extends BaseComponent {
 			this._matomoSiteId = config.matomo.siteId;
 		}
 		this._maxFileSizeInMB = config.maxFileSizeInMB;
-		this._newReleaseNotificationExpires = config.newReleaseNotification?.expires;
-		this._newReleaseNotificationLink = config.newReleaseNotification?.link;
-		this._newReleaseNotificationVersionCode = config.newReleaseNotification?.versionCode;
 	}
 
 }

dmp-frontend/src/app/core/services/dataset/dataset.service.ts

@@ -1,9 +1,10 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
+import { environment } from '../../../../environments/environment';
 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, DatasetProfileWithPrefillingModel } from '../../model/dataset/dataset-profile';
+import { DatasetProfileModel } from '../../model/dataset/dataset-profile';
 import { DatasetCriteria } from '../../query/dataset/dataset-criteria';
 import { ExploreDatasetCriteriaModel } from '../../query/explore-dataset/explore-dataset-criteria';
 import { BaseHttpService } from '../http/base-http.service';
@@ -42,10 +43,6 @@ export class DatasetService {
 		return this.http.post<DatasetProfileModel[]>(this.configurationSevice.server + 'datasetprofiles/getAll', dataTableRequest);
 	}
 
-	getDatasetProfilesWithPrefilling(dataTableRequest: DataTableRequest<DatasetProfileCriteria>): Observable<DatasetProfileWithPrefillingModel[]> {
-		return this.http.post<DatasetProfileWithPrefillingModel[]>(this.configurationSevice.server + 'datasetprofiles/getAllWithPrefilling', dataTableRequest);
-	}
-
 	getDatasetProfilesUsedPaged(dataTableRequest: DataTableRequest<DatasetProfileCriteria>) {
 		return this.http.post<DataTableData<DatasetListingModel>>(this.actionUrl + 'datasetProfilesUsedByDatasets/paged', dataTableRequest);
 	}

dmp-frontend/src/app/core/services/dmp/dmp-profile.service.ts

@@ -67,14 +67,6 @@ export class DmpProfileService {
 		return this.http.post(this.actionUrl + "upload", formData, { params: params });
 	}
 
-	clone(id: string): Observable<DmpBlueprint> {
-		return this.http.post<DmpBlueprint>(this.actionUrl + 'clone/' + id, { headers: this.headers });
-	}
-
-	delete(id: string): Observable<any> {
-		return this.http.delete<any>(this.actionUrl + id, { headers: this.headers });
-	}
-
 	externalAutocomplete(lookUpItem: RequestItem<DmpProfileExternalAutocompleteCriteria>): Observable<any> {
 		return this.httpClient.post(this.actionUrl + 'search/autocomplete', lookUpItem);
 	}

dmp-frontend/src/app/core/services/prefilling.service.ts

@@ -20,10 +20,10 @@ export class PrefillingService {
 	}
 
 	public getPrefillingDataset(pid: string, profileId: string, configId: string): Observable<DatasetWizardModel> {
-		return this.http.get<DatasetWizardModel>(this.actionUrl + 'generate/' + encodeURIComponent(pid) + '?configId=' + encodeURIComponent(configId) + '&profileId=' + encodeURIComponent(profileId), { headers: this.headers });
+		return this.http.get<DatasetWizardModel>(this.actionUrl + '/generate/' + encodeURIComponent(pid) + '?configId=' + encodeURIComponent(configId) + '&profileId=' + encodeURIComponent(profileId), { headers: this.headers });
 	}
 
 	public getPrefillingDatasetUsingData(data: any, profileId: string, configId: string): Observable<DatasetWizardModel> {
-		return this.http.post<DatasetWizardModel>(this.actionUrl + 'generateUsingData' + '?configId=' + encodeURIComponent(configId) + '&profileId=' + encodeURIComponent(profileId), data, { headers: this.headers });
+		return this.http.post<DatasetWizardModel>(this.actionUrl + '/generateUsingData' + '?configId=' + encodeURIComponent(configId) + '&profileId=' + encodeURIComponent(profileId), data, { headers: this.headers });
 	}
 }

dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete-configuration.ts

@@ -37,6 +37,5 @@ export interface MultipleAutoCompleteConfiguration {
 	autoSelectFirstOptionOnBlur?: boolean;
 
 	appendClassToItem?: {class: string, applyFunc: (item:any) => boolean}[];
-	canRemoveItem?: (selectedItem: any) => boolean;
 
 }

dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts

@@ -220,9 +220,6 @@ export class MultipleAutoCompleteComponent extends _CustomComponentMixinBase imp
 	ngOnChanges(changes: SimpleChanges) {
 		if (changes['configuration'] && changes['configuration'].isFirstChange) {
 			this.getSelectedItems(this.value);
-		} 
-		if (changes['value'] && !changes['value'].isFirstChange()) {
-			this.getSelectedItems(this.value);
 		}
 	}
 
@@ -483,10 +480,6 @@ export class MultipleAutoCompleteComponent extends _CustomComponentMixinBase imp
 		if (event != null) {
 			event.stopPropagation();
 		}
-		if (this.configuration.canRemoveItem != null && !this.configuration.canRemoveItem(item)) {
-			event.stopPropagation();
-			return;
-		}
 		const valueToDelete = this._valueToAssign(item);
 		this.value = this.value.filter(x => this.stringify(x) !== this.stringify(valueToDelete)); //TODO, maybe we need to implement equality here differently.
 		this.optionRemoved.emit(item);

dmp-frontend/src/app/library/rich-text-editor/rich-text-editor.component.ts

@@ -47,8 +47,7 @@ export class RichTextEditorComponent {
 			{	name: 'H3 header', class: '', tag: 'h3'	},
 			{	name: 'H4 header', class: '', tag: 'h4'	},
 			{	name: 'H5 header', class: '', tag: 'h5'},
-			{	name: 'H6 header', class: '', tag: 'h6'},
-			{	name: 'Highlight', class: 'highlight', tag: ''}
+			{	name: 'H6 header', class: '', tag: 'h6'}
 		],
 		toolbarHiddenButtons: [
 			[
@@ -57,7 +56,7 @@ export class RichTextEditorComponent {
 			],
 			[
 				'fontSize',
-				'backgroundColor',
+				// 'backgroundColor',
 				// 'customClasses',
 				'insertImage',
 				'insertVideo',

dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/auto-complete-auth-field-data.model.ts

@@ -1,35 +0,0 @@
-import { FormGroup, Validators } from "@angular/forms";
-import { FieldDataEditorModel } from "./field-data-editor-model";
-import { AuthAutoCompleteData, AutoCompleteSingleData } from "@app/core/model/dataset-profile-definition/field-data/field-data";
-
-export class AuthFieldEditorModel extends FieldDataEditorModel<AuthFieldEditorModel> {
-	url: string;
-	method: string;
-	body: string;
-	path: string;
-	type: string;
-
-	buildForm(disabled: boolean = false, skipDisable: Array<String> = []): FormGroup {
-		const formGroup = this.formBuilder.group({
-			method: [{ value: this.method, disabled: (disabled && !skipDisable.includes('AuthFieldEditorModel.method')) }],
-			url: [{ value: this.url, disabled: (disabled && !skipDisable.includes('AuthFieldEditorModel.url')) }, [Validators.required]],
-			body: [{ value: this.body, disabled: (disabled && !skipDisable.includes('AuthFieldEditorModel.body')) }],
-			path: [{ value: this.path, disabled: (disabled && !skipDisable.includes('AuthFieldEditorModel.path')) }, [Validators.required]],
-			type: [{ value: this.type, disabled: (disabled && !skipDisable.includes('AuthFieldEditorModel.type')) }, [Validators.required]]
-		});
-
-		return formGroup;
-	}
-
-	fromModel(item: AuthAutoCompleteData): AuthFieldEditorModel {
-		if (item) {
-			this.url = item.url;
-			this.method = item.method;
-			this.body = item.body;
-			this.path = item.path;
-			this.type = item.type;
-		}
-		return this;
-	}
-
-}

dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/auto-complete-single-data.ts

@@ -3,7 +3,6 @@ import { DatasetProfileComboBoxType } from '@app/core/common/enum/dataset-profil
 import { FieldDataOptionEditorModel } from './field-data-option-editor-model';
 import { FormGroup, Validators } from '@angular/forms';
 import { AutoCompleteFieldData, AutoCompleteSingleData } from '@app/core/model/dataset-profile-definition/field-data/field-data';
-import { AuthFieldEditorModel } from './auto-complete-auth-field-data.model';
 
 export class AutoCompleteSingleDataEditorModel extends FieldDataEditorModel<AutoCompleteSingleDataEditorModel> {
 
@@ -12,9 +11,6 @@ export class AutoCompleteSingleDataEditorModel extends FieldDataEditorModel<Auto
 
 	public autoCompleteOptions: FieldDataOptionEditorModel = new FieldDataOptionEditorModel();
 	public autoCompleteType: number;
-	public method: string;
-	public hasAuth: boolean;
-	public auth: AuthFieldEditorModel = new AuthFieldEditorModel();
 	//public multiAutoCompleteOptions: FieldDataOptionEditorModel = new FieldDataOptionEditorModel();
 
 	buildForm(disabled: boolean = false, skipDisable: Array<String> = []): FormGroup {
@@ -22,12 +18,9 @@ export class AutoCompleteSingleDataEditorModel extends FieldDataEditorModel<Auto
 			label: [{ value: this.label, disabled: (disabled && !skipDisable.includes('AutoCompleteSingleDataEditorModel.label')) }],
 			url: [{ value: this.url, disabled: (disabled && !skipDisable.includes('AutoCompleteSingleDataEditorModel.url')) },[Validators.required]],
 			optionsRoot: [{ value: this.optionsRoot, disabled: (disabled && !skipDisable.includes('AutoCompleteSingleDataEditorModel.optionsRoot')) }, [Validators.required]],
-			autoCompleteType: [{ value: this.autoCompleteType, disabled: (disabled && !skipDisable.includes('AutoCompleteSingleDataEditorModel.autoCompleteType')) }],
-			hasAuth: [{ value: this.hasAuth, disabled: (disabled && !skipDisable.includes('AutoCompleteSingleDataEditorModel.hasAuth')) }],
-			method: [{ value: this.method, disabled: (disabled && !skipDisable.includes('AutoCompleteSingleDataEditorModel.method')) }]
+			autoCompleteType: [{ value: this.autoCompleteType, disabled: (disabled && !skipDisable.includes('AutoCompleteSingleDataEditorModel.autoCompleteType')) }]
 		});
 		formGroup.addControl('autoCompleteOptions', this.autoCompleteOptions.buildForm(disabled, skipDisable));
-		formGroup.addControl('auth', this.auth.buildForm(disabled, skipDisable));
 
 		return formGroup;
 	}
@@ -37,10 +30,7 @@ export class AutoCompleteSingleDataEditorModel extends FieldDataEditorModel<Auto
 		this.label = item.label;
 		this.optionsRoot = item.optionsRoot;
 		this.autoCompleteType = item.autocompleteType;
-		this.hasAuth = item.hasAuth;
-		this.method = item.method ? item.method : 'GET';
 		this.autoCompleteOptions = new FieldDataOptionEditorModel().fromModel(item.autoCompleteOptions);
-		this.auth = new AuthFieldEditorModel().fromModel(item.auth);
 		return this;
 	}
 }

dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/auto-complete/dataset-profile-editor-auto-complete-field.component.html

@@ -11,47 +11,41 @@
 		 [formControl]="form.get('data').get('label')">
 	</mat-form-field>
 
-
+	
 	<h6 class="col-12" style="font-weight: bold">{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-SOURCE-TITLE' | translate}}</h6>
 	<div class="col-12 d-flex align-items-center" style="margin-bottom: 1em;">
-		<button mat-raised-button
-			type="button"
+		<button mat-raised-button 
+			type="button" 
 			(click)="addSource()"
 			style="margin-right: 2em;"
 			>
 			<!-- [ngClass]="{'text-danger':form.get('data').errors?.emptyArray && form.touched}" -->
 			{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-ADD_SOURCE' | translate}}
-
+			
 		</button>
-
+		
 		<!-- *ngIf="form.get('data').errors?.emptyArray && form.get('data').touched" -->
 		<div class="d-flex" *ngIf="form.get('data').errors?.emptyArray && form.get('data').touched">
-			<mat-icon
+			<mat-icon 
 			class="text-danger"
 			matTooltip="At least one source must be provided."
 			>warning_amber</mat-icon>
 			<small class="text-danger">{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.ERROR-MESSAGES.FIELD-OTHER-SOURCES-REQUIRED'| translate}}</small>
 		</div>
-
+		
 	</div>
 </div>
-
+	
 	<div *ngFor="let singleForm of multiForm.controls; let i = index" class="row">
-		<!-- <mat-form-field class="col-12">
+		<mat-form-field class="col-12">
 			<mat-label>{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-TYPE' | translate}}</mat-label>
 			<mat-select [formControl]="singleForm.get('autoCompleteType')">
 				<mat-option [value]="0">{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-TYPE-UNCACHED' | translate}}</mat-option>
 				<mat-option [value]="1">{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-TYPE-CACHED' | translate}}</mat-option>
 			</mat-select>
-		</mat-form-field> -->
-		<mat-form-field class="col-md-6">
-			<mat-label>{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-AUTH-METHOD' | translate}}</mat-label>
-			<mat-select [formControl]="singleForm.get('method')">
-				<mat-option *ngFor="let method of htmlMethods | keyvalue" [value]="method.value">{{method.value}}</mat-option>
-			</mat-select>
 		</mat-form-field>
 
-		<mat-form-field class="col-md-6">
+		<mat-form-field class="col-md-12">
 			<mat-label>{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-URL' | translate}}</mat-label>
 			<input matInput [formControl]="singleForm.get('url')">
 			<mat-error *ngIf="singleForm.get('url').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
@@ -76,37 +70,6 @@
 			<input matInput [formControl]="singleForm.get('autoCompleteOptions').get('source')">
 			<mat-error *ngIf="singleForm.get('autoCompleteOptions').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 		</mat-form-field>
-		<mat-checkbox class="col-12" [formControl]="singleForm.get('hasAuth')">{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-HAS-AUTH' | translate}}</mat-checkbox>
-		<div *ngIf="singleForm.get('hasAuth').value === true" class="row">
-			<mat-form-field class="col-md-6">
-				<mat-label>{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-AUTH-METHOD' | translate}}</mat-label>
-				<mat-select [formControl]="singleForm.get('auth').get('method')">
-					<mat-option *ngFor="let method of htmlMethods | keyvalue" [value]="method.value">{{method.value}}</mat-option>
-				</mat-select>
-			</mat-form-field>
-			<mat-form-field class="col-md-6">
-				<mat-label>{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-URL' | translate}}</mat-label>
-				<input matInput [formControl]="singleForm.get('auth').get('url')">
-				<mat-error *ngIf="singleForm.get('auth').get('url').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-			</mat-form-field>
-			<mat-form-field class="col-md-6">
-				<mat-label>{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-AUTH-TYPE' | translate}}</mat-label>
-				<mat-select [formControl]="singleForm.get('auth').get('type')">
-					<mat-option *ngFor="let type of authTypes | keyvalue" [value]="type.value">{{type.value}}</mat-option>
-				</mat-select>
-			</mat-form-field>
-			<mat-form-field class="col-md-6">
-				<mat-label>{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-OPTIONS-ROOT' | translate}}</mat-label>
-				<input matInput [formControl]="singleForm.get('auth').get('path')">
-				<mat-error *ngIf="singleForm.get('auth').get('path').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-			</mat-form-field>
-			<mat-form-field class="col-md-12">
-				<mat-label>{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-AUTH-BODY' | translate}}</mat-label>
-				<textarea matInput [formControl]="singleForm.get('auth').get('body')"></textarea>
-				<mat-error *ngIf="singleForm.get('auth').get('body').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-			</mat-form-field>
-		</div>
-
 		<button mat-button type="button" (click)="removeSource(i)"><mat-icon>delete</mat-icon></button>
 	</div>
 

dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/auto-complete/dataset-profile-editor-auto-complete-field.component.ts

@@ -3,8 +3,6 @@ import { FormGroup, FormArray, AbstractControl } from '@angular/forms';
 import { DatasetProfileComboBoxType } from '../../../../../../../core/common/enum/dataset-profile-combo-box-type';
 import { AutoCompleteFieldDataEditorModel } from '../../../../admin/field-data/auto-complete-field-data-editor-model';
 import { AutoCompleteSingleDataEditorModel } from '@app/ui/admin/dataset-profile/admin/field-data/auto-complete-single-data';
-import { HtmlMethod } from '@app/core/model/dataset-profile-definition/html-method.enum';
-import { AuthType } from '@app/core/model/dataset-profile-definition/auth-type.enum';
 
 @Component({
 	selector: 'app-dataset-profile-editor-auto-complete-field-component',
@@ -13,9 +11,6 @@ import { AuthType } from '@app/core/model/dataset-profile-definition/auth-type.e
 })
 export class DatasetProfileEditorAutoCompleteFieldComponent implements OnInit {
 
-	public htmlMethods = HtmlMethod;
-	public authTypes = AuthType;
-
 	@Input() form: FormGroup;
 	private data: AutoCompleteFieldDataEditorModel = new AutoCompleteFieldDataEditorModel();
 	multiForm: FormArray;

dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/word-list/dataset-profile-editor-word-list-field.component.html

@@ -30,7 +30,7 @@
 				<input matInput [formControl]="form.get('data').get('options').get(''+i).get('value')">
 			</mat-form-field>
 			<button mat-icon-button class="col-auto" (click)="deleteRow(i)" type="button"
-				[disabled]="form.get('data').get('options').get(''+i).get('label').disabled || form.get('data').get('options').get(''+i).get('value').disabled">
+				[disabled]="this.form.disabled">
 				<mat-icon>delete</mat-icon>
 			</button>
 		</div>

dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor-model.ts

@@ -16,7 +16,6 @@ export class DatasetProfileEditorModel extends BaseFormModel {
 	public version: number;
 	private description: string;
 	private type: string;
-	public enablePrefilling: boolean;
 	private language: string;
 	private users: UserInfoListingModel[] = [];
 
@@ -25,7 +24,6 @@ export class DatasetProfileEditorModel extends BaseFormModel {
 		if (item.pages) { this.pages = item.pages.map(x => new PageEditorModel().fromModel(x)); }
 		this.label = item.label;
 		this.type = item.type;
-		this.enablePrefilling = item.enablePrefilling;
 		this.status = item.status;
 		this.version = item.version;
 		this.description = item.description;
@@ -39,7 +37,6 @@ export class DatasetProfileEditorModel extends BaseFormModel {
 			label: [{ value: this.label, disabled: (disabled && !skipDisable.includes('DatasetProfileEditorModel.label')) }, [Validators.required]],
 			description: [{ value: this.description, disabled: (disabled && !skipDisable.includes('DatasetProfileEditorModel.description')) }, [Validators.required]],
 			type: [{ value: this.type, disabled: (disabled && !skipDisable.includes('DatasetProfileEditorModel.type')) }, [Validators.required]],
-			enablePrefilling: [{ value: this.enablePrefilling, disabled: (disabled && !skipDisable.includes('DatasetProfileEditorModel.enablePrefilling')) }, []],
 			language: [{ value: this.language, disabled: (disabled && !skipDisable.includes('DatasetProfileEditorModel.language')) }, [Validators.required]],
 			status: [{ value: this.status, disabled: (disabled && !skipDisable.includes('DatasetProfileEditorModel.status')) }],
 			version: [{ value: this.version, disabled: (disabled && !skipDisable.includes('DatasetProfileEditorModel.version')) }],

dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.html

@@ -170,15 +170,7 @@
 							</mat-form-field>
 						</div>
 						<div class="col-12">
-							<div class="heading">1.5 {{'DATASET-PROFILE-EDITOR.STEPS.GENERAL-INFO.DESCRIPTION-TEMPLATE-PREFILLING'| translate}}</div>
-							<div class="full-width basic-info-input">	
-								<mat-checkbox [formControl]="form.get('enablePrefilling')">
-									{{'DATASET-PROFILE-EDITOR.STEPS.GENERAL-INFO.DESCRIPTION-TEMPLATE-ENABLE-PREFILLING'| translate}}
-								</mat-checkbox>
-							</div>
-						</div>
-						<div class="col-12">
-							<div class="heading">1.6 {{'DATASET-PROFILE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-USERS'| translate}}</div>
+							<div class="heading">1.5 {{'DATASET-PROFILE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-USERS'| translate}}</div>
 							<div class="hint">{{'DATASET-PROFILE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-USERS-HINT'| translate}}</div>
 							<div class="full-width basic-info-input">
 								<table class="col-12 user-table">

dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts

@@ -214,7 +214,6 @@ export class DatasetProfileEditorComponent extends CheckDeactivateBaseComponent
 					);
 			} else {
 				this.dataModel = new DatasetProfileEditorModel();
-				this.dataModel.enablePrefilling = true;
 				this.form = this.dataModel.buildForm();
 				// this.form.setValidators([EditorCustomValidators.atLeastOneElementListValidator('pages'), EditorCustomValidators.pagesHaveAtLeastOneSection('pages', 'sections')]);
 

dmp-frontend/src/app/ui/admin/dmp-profile/dmp-profile.routing.ts

@@ -8,7 +8,6 @@ import { AdminAuthGuard } from '@app/core/admin-auth-guard.service';
 const routes: Routes = [
 	{ path: '', component: DmpProfileListingComponent, canActivate: [AdminAuthGuard] },
 	{ path: 'new', component: DmpProfileEditorComponent, canActivate: [AdminAuthGuard], data: { title: 'GENERAL.TITLES.DMP-BLUEPRINT-NEW' } },
-	{ path: 'clone/:cloneid', component: DmpProfileEditorComponent, canActivate: [AdminAuthGuard], data: { title: 'GENERAL.TITLES.DMP-BLUEPRINT-CLONE' } },
 	{ path: ':id', component: DmpProfileEditorComponent, canActivate: [AdminAuthGuard], data: { title: 'GENERAL.TITLES.DMP-BLUEPRINT-EDIT' } },
 ];
 

dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-blueprint-editor.model.ts

@@ -5,15 +5,15 @@ import { ValidationErrorModel } from "@common/forms/validation/error-model/valid
 import { ValidationContext } from "@common/forms/validation/validation-context";
 
 export class DmpBlueprintEditor {
-	public id: string;
+    public id: string;
 	public label: string;
-	public definition: DmpBlueprintDefinitionEditor = new DmpBlueprintDefinitionEditor();
-	public status: number;
+    public definition: DmpBlueprintDefinitionEditor = new DmpBlueprintDefinitionEditor();
+    public status: number;
 	public created: Date;
 	public modified: Date;
 	public validationErrorModel: ValidationErrorModel = new ValidationErrorModel();
 
-	fromModel(item: DmpBlueprint): DmpBlueprintEditor {
+    fromModel(item: DmpBlueprint): DmpBlueprintEditor {
 		this.id = item.id;
 		this.label = item.label;
 		this.definition = new DmpBlueprintDefinitionEditor().fromModel(item.definition);
@@ -51,9 +51,9 @@ export class DmpBlueprintEditor {
 
 export class DmpBlueprintDefinitionEditor {
 
-	public sections: SectionDmpBlueprintEditor[] = new Array<SectionDmpBlueprintEditor>();
+    public sections: SectionDmpBlueprintEditor[] = new Array<SectionDmpBlueprintEditor>();
 
-	fromModel(item: DmpBlueprintDefinition): DmpBlueprintDefinitionEditor {
+    fromModel(item: DmpBlueprintDefinition): DmpBlueprintDefinitionEditor {
 		if (item.sections) { item.sections.map(x => this.sections.push(new SectionDmpBlueprintEditor().fromModel(x))); }
 		return this;
 	}
@@ -62,7 +62,7 @@ export class DmpBlueprintDefinitionEditor {
 		const formBuilder = new FormBuilder();
 		const formGroup = formBuilder.group({});
 		const sectionsFormArray = new Array<FormGroup>();
-		this.sections.sort((a, b) => a.ordinal - b.ordinal).forEach(item => {
+		this.sections.forEach(item => {
 			const form: FormGroup = item.buildForm();
 			sectionsFormArray.push(form);
 		});
@@ -72,23 +72,23 @@ export class DmpBlueprintDefinitionEditor {
 }
 
 export class SectionDmpBlueprintEditor {
-	public id: string;
-	public label: string;
-	public description: string;
-	public ordinal: number;
-	public fields: FieldInSectionEditor[] = new Array<FieldInSectionEditor>();
+    public id: string;
+    public label: string;
+    public description: string;
+    public ordinal: number;
+    public fields: FieldInSectionEditor[] = new Array<FieldInSectionEditor>();
 	public hasTemplates: boolean;
-	public descriptionTemplates: DescriptionTemplatesInSectionEditor[] = new Array<DescriptionTemplatesInSectionEditor>();
+    public descriptionTemplates: DescriptionTemplatesInSectionEditor[] = new Array<DescriptionTemplatesInSectionEditor>();
 	public validationErrorModel: ValidationErrorModel = new ValidationErrorModel();
 
-	fromModel(item: SectionDmpBlueprint): SectionDmpBlueprintEditor {
+    fromModel(item: SectionDmpBlueprint): SectionDmpBlueprintEditor {
 		this.id = item.id;
 		this.label = item.label;
 		this.description = item.description;
-		this.ordinal = item.ordinal;
+        this.ordinal = item.ordinal;
 		if (item.fields) { item.fields.map(x => this.fields.push(new FieldInSectionEditor().fromModel(x))); }
 		this.hasTemplates = item.hasTemplates;
-		if (item.descriptionTemplates) { item.descriptionTemplates.map(x => this.descriptionTemplates.push(new DescriptionTemplatesInSectionEditor().fromModel(x))); }
+        if (item.descriptionTemplates) { item.descriptionTemplates.map(x => this.descriptionTemplates.push(new DescriptionTemplatesInSectionEditor().fromModel(x))); }
 		return this;
 	}
 
@@ -101,14 +101,14 @@ export class SectionDmpBlueprintEditor {
 			ordinal: [{ value: this.ordinal, disabled: disabled }, context.getValidation('ordinal')],
 			hasTemplates: [{ value: this.hasTemplates, disabled: disabled }, context.getValidation('hasTemplates')]
 		});
-		const formBuilder = new FormBuilder();
-		const fieldsFormArray = new Array<FormGroup>();
-		this.fields.sort((a, b) => a.ordinal - b.ordinal).forEach(item => {
+        const formBuilder = new FormBuilder();
+        const fieldsFormArray = new Array<FormGroup>();
+		this.fields.forEach(item => {
 			const form: FormGroup = item.buildForm();
 			fieldsFormArray.push(form);
 		});
 		formGroup.addControl('fields', formBuilder.array(fieldsFormArray));
-		const descriptionTemplatesFormArray = new Array<FormGroup>();
+        const descriptionTemplatesFormArray = new Array<FormGroup>();
 		this.descriptionTemplates.forEach(item => {
 			const form: FormGroup = item.buildForm();
 			descriptionTemplatesFormArray.push(form);
@@ -121,7 +121,7 @@ export class SectionDmpBlueprintEditor {
 		const baseContext: ValidationContext = new ValidationContext();
 		baseContext.validation.push({ key: 'id', validators: [BackendErrorValidator(this.validationErrorModel, 'id')] });
 		baseContext.validation.push({ key: 'label', validators: [Validators.required, BackendErrorValidator(this.validationErrorModel, 'label')] });
-		baseContext.validation.push({ key: 'description', validators: [BackendErrorValidator(this.validationErrorModel, 'description')] });
+		baseContext.validation.push({ key: 'description', validators: [Validators.required, BackendErrorValidator(this.validationErrorModel, 'description')] });
 		baseContext.validation.push({ key: 'ordinal', validators: [Validators.required, BackendErrorValidator(this.validationErrorModel, 'ordinal')] });
 		baseContext.validation.push({ key: 'hasTemplates', validators: [BackendErrorValidator(this.validationErrorModel, 'hasTemplates')] });
 		baseContext.validation.push({ key: 'descriptionTemplates', validators: [BackendErrorValidator(this.validationErrorModel, 'descriptionTemplates')] });
@@ -130,25 +130,25 @@ export class SectionDmpBlueprintEditor {
 }
 
 export class FieldInSectionEditor {
-	public id: string;
+    public id: string;
 	public category: FieldCategory;
-	public type: number;
-	public label: string;
-	public placeholder: string;
-	public description: string;
-	public required: boolean;
-	public ordinal: number;
+    public type: number;
+    public label: string;
+    public placeholder: string;
+    public description: string;
+    public required: boolean;
+    public ordinal: number;
 	public validationErrorModel: ValidationErrorModel = new ValidationErrorModel();
 
-	fromModel(item: FieldInSection): FieldInSectionEditor {
+    fromModel(item: FieldInSection): FieldInSectionEditor {
 		this.id = item.id;
 		this.category = item.category;
 		this.type = item.type;
 		this.label = item.label;
-		this.placeholder = item.placeholder;
-		this.description = item.description;
-		this.required = item.required;
-		this.ordinal = item.ordinal;
+        this.placeholder = item.placeholder;
+        this.description = item.description;
+        this.required = item.required;
+        this.ordinal = item.ordinal;
 		return this;
 	}
 
@@ -182,19 +182,19 @@ export class FieldInSectionEditor {
 }
 
 export class DescriptionTemplatesInSectionEditor {
-	public id: string;
-	public descriptionTemplateId: string;
-	public label: string;
-	public minMultiplicity: number;
-	public maxMultiplicity: number;
+    public id: string;
+    public descriptionTemplateId: string;
+    public label: string;
+    public minMultiplicity: number;
+    public maxMultiplicity: number;
 	public validationErrorModel: ValidationErrorModel = new ValidationErrorModel();
 
-	fromModel(item: DescriptionTemplatesInSection): DescriptionTemplatesInSectionEditor {
+    fromModel(item: DescriptionTemplatesInSection): DescriptionTemplatesInSectionEditor {
 		this.id = item.id;
 		this.descriptionTemplateId = item.descriptionTemplateId;
-		this.label = item.label;
-		this.minMultiplicity = item.minMultiplicity;
-		this.maxMultiplicity = item.maxMultiplicity;
+        this.label = item.label;
+        this.minMultiplicity = item.minMultiplicity;
+        this.maxMultiplicity = item.maxMultiplicity;
 		return this;
 	}
 
@@ -253,4 +253,4 @@ export class DescriptionTemplatesInSectionEditor {
 // 		});
 // 		return formGroup;
 // 	}
-// }
+// }

dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.html

@@ -2,11 +2,7 @@
 	<div class="container-fluid dmp-profile-editor">
 		<div class="row align-items-center mb-4" *ngIf="formGroup">
 			<div class="col-auto">
-				<h3 *ngIf="isNew && !isClone">{{'DMP-PROFILE-EDITOR.TITLE.NEW' | translate}}</h3>
-				<h3 *ngIf="isNew && isClone">
-					<span>{{'DMP-PROFILE-EDITOR.TITLE.NEW-PROFILE-CLONE' | translate}}</span>
-					{{formGroup.get('label').value}}
-				</h3>
+				<h3 *ngIf="isNew">{{'DMP-PROFILE-EDITOR.TITLE.NEW' | translate}}</h3>
 				<h3 *ngIf="!isNew">{{formGroup.get('label').value}}</h3>
 			</div>
 			<div class="col"></div>
@@ -16,10 +12,10 @@
 					{{'DMP-PROFILE-EDITOR.ACTIONS.DELETE' | translate}}
 				</button>
 			</div>
-			<div class="col-auto" *ngIf="formGroup.get('status').value==1">
+			<!-- <div class="col-auto" *ngIf="formGroup.get('status').value==1">
 				<button mat-button class="finalize-btn" (click)="downloadXML()"
 				 type="button">{{'DMP-PROFILE-EDITOR.ACTIONS.DOWNLOAD-XML' | translate }}</button>
-			</div>
+			</div> -->
 			<div *ngIf="formGroup.get('status').value!=1" class="col-auto">
 				<button mat-button  class="finalize-btn" (click)="finalize()"
 				 [disabled]="!this.isFormValid()" type="button">{{'DMP-PROFILE-EDITOR.ACTIONS.FINALIZE' | translate }}</button>
@@ -69,7 +65,7 @@
 															<div class="col-6">
 																<mat-form-field>
 																	<mat-label>Section description</mat-label>
-																	<input matInput type="text" name="description" formControlName="description">
+																	<input matInput type="text" name="description" formControlName="description" required>
 																	<mat-error *ngIf="section.get('description').hasError('required')">
 																		{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 																</mat-form-field>
@@ -86,7 +82,7 @@
 																		<mat-form-field>
 																			<mat-label>System fields</mat-label>
 																			<mat-select multiple [disabled]="viewOnly" [value]="systemFieldListPerSection[sectionIndex]">
-																				<mat-option *ngFor="let f of fieldList" [disabled]="systemFieldDisabled(f.type, sectionIndex)" [value]="f.type" (click)="selectedFieldType(f.type, sectionIndex)">{{f.label}}</mat-option>
+																				<mat-option *ngFor="let f of fieldList" [disabled]="systemFieldDisabled(f.type, sectionIndex)" [value]="f.type" (click)="selectedFieldType(f.label, f.type, sectionIndex)">{{f.label}}</mat-option>
 																			</mat-select>
 																			<mat-error *ngIf="fieldsArray(sectionIndex).hasError('required')">
 																				{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
@@ -210,7 +206,7 @@
 													<div class="col-12">
 														<div class="row">
 															<div class="col-12">
-																<mat-checkbox formControlName="hasTemplates" (change)="checkForProfiles($event, sectionIndex)">
+																<mat-checkbox formControlName="hasTemplates">
 																	Description Templates
 																</mat-checkbox>
 															</div>
@@ -222,7 +218,7 @@
 															<div class="col-12">
 																<mat-form-field>
 																	<mat-label>Description Templates</mat-label>
-																	<app-multiple-auto-complete placeholder="Description Templates" [disabled]="viewOnly" [value]="descriptionTemplatesPerSection[sectionIndex]" [hidePlaceholder]="true" required='false' [configuration]="profilesAutoCompleteConfiguration" (optionRemoved)="onRemoveTemplate($event, sectionIndex)" (optionActionClicked)="onPreviewTemplate($event, sectionIndex)" (optionSelected)="onOptionSelected($event, sectionIndex)">
+																	<app-multiple-auto-complete placeholder="Description Templates" [disabled]="viewOnly" [value]="descriptionTemplatesPerSection[sectionIndex]" [hidePlaceholder]="true" required='false' [configuration]="profilesAutoCompleteConfiguration" (optionRemoved)="onRemoveTemplate($event, sectionIndex)" (optionSelected)="onOptionSelected($event, sectionIndex)">
 																	</app-multiple-auto-complete>
 																	<!-- <button matSuffix class="input-btn" (click)="allAvailableProfiles($event)">
 																		<mat-icon class="icon-btn">view_list</mat-icon>

dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.ts

@@ -49,7 +49,6 @@ import { FormValidationErrorsDialogComponent } from '@common/forms/form-validati
 export class DmpProfileEditorComponent extends BaseComponent implements AfterViewInit {
 
 	isNew = true;
-	isClone = false;
 	viewOnly = false;
 	dmpProfileModel: DmpProfileEditorModel;
 	dmpBlueprintModel: DmpBlueprintEditor;
@@ -75,6 +74,7 @@ export class DmpProfileEditorComponent extends BaseComponent implements AfterVie
 		{label: 'License', type: SystemFieldType.LICENSE}, 
 		{label: 'Access Rights', type: SystemFieldType.ACCESS_RIGHTS}
 	];
+	selectedSystemFields: string[] = [];
 	systemFieldListPerSection: Array<Array<any>> = new Array();
 	descriptionTemplatesPerSection: Array<Array<DatasetProfileModel>> = new Array<Array<DatasetProfileModel>>();
 
@@ -113,7 +113,6 @@ export class DmpProfileEditorComponent extends BaseComponent implements AfterVie
 			.pipe(takeUntil(this._destroyed))
 			.subscribe((params: Params) => {
 				this.dmpProfileId = params['id'];
-				const cloneId = params['cloneid'];
 
 				if (this.dmpProfileId != null) {
 					this.isNew = false;
@@ -134,21 +133,6 @@ export class DmpProfileEditorComponent extends BaseComponent implements AfterVie
 								url: '/dmp-profiles/' + this.dmpProfileId
 							}]);
 						});
-				} else if (cloneId != null) {
-					this.isClone = true;
-					this.dmpProfileService.clone(cloneId).pipe(map(data => data as DmpBlueprint), takeUntil(this._destroyed))
-						.subscribe(
-							data => {
-								this.dmpBlueprintModel = new DmpBlueprintEditor().fromModel(data);
-								this.dmpBlueprintModel.id = null;
-								this.dmpBlueprintModel.created = null;
-								this.dmpBlueprintModel.status = DmpProfileStatus.Draft;
-								this.formGroup = this.dmpBlueprintModel.buildForm();
-								this.buildSystemFields();
-								this.fillDescriptionTemplatesInMultAutocomplete();
-							},
-							error => this.onCallbackError(error)
-						);
 				} else {
 					this.dmpProfileModel = new DmpProfileEditorModel();
 					this.dmpBlueprintModel = new DmpBlueprintEditor();
@@ -192,13 +176,6 @@ export class DmpProfileEditorComponent extends BaseComponent implements AfterVie
 		}
 	}
 
-	checkForProfiles(event, sectionIndex: number) {
-		if (event.checked === false) {
-			this.descriptionTemplatesPerSection[sectionIndex] = new Array<DatasetProfileModel>();
-			this.descriptionTemplatesArray(sectionIndex).clear();
-		}
-	}
-
 	filterProfiles(value: string): Observable<DatasetProfileModel[]> {
 		const request = new DataTableRequest<DatasetProfileCriteria>(null, null, { fields: ['+label'] });
 		const criteria = new DatasetProfileCriteria();
@@ -218,17 +195,10 @@ export class DmpProfileEditorComponent extends BaseComponent implements AfterVie
 		section.ordinal = this.sectionsArray().length + 1;
 		section.hasTemplates = false;
 		this.sectionsArray().push(section.buildForm());
-		this.systemFieldListPerSection.push(new Array());
-		this.descriptionTemplatesPerSection.push(new Array());
 	}
 
 	removeSection(sectionIndex: number): void {
-		this.systemFieldListPerSection.splice(sectionIndex, 1);
-		this.descriptionTemplatesPerSection.splice(sectionIndex, 1);
 		this.sectionsArray().removeAt(sectionIndex);
-		this.sectionsArray().controls.forEach((section, index) => {
-			section.get('ordinal').setValue(index + 1);
-		});
 	}
 
 	fieldsArray(sectionIndex: number): FormArray {
@@ -249,9 +219,6 @@ export class DmpProfileEditorComponent extends BaseComponent implements AfterVie
 	  
 	removeField(sectionIndex: number, fieldIndex: number): void {
 		this.fieldsArray(sectionIndex).removeAt(fieldIndex);
-		this.fieldsArray(sectionIndex).controls.forEach((field, index) => {
-			field.get('ordinal').setValue(index + 1);
-		});
 	}
 
 	systemFieldsArray(sectionIndex: number): FormArray {
@@ -278,15 +245,14 @@ export class DmpProfileEditorComponent extends BaseComponent implements AfterVie
 		return this.fieldList.find(f => f.type == type).label;
 	}
 
-	selectedFieldType(type: SystemFieldType, sectionIndex: number): void {
-		if (this.systemFieldDisabled(type, sectionIndex)) return;
-		let index = this.systemFieldListPerSection[sectionIndex].indexOf(type);
+	selectedFieldType(systemField: string, type: SystemFieldType, sectionIndex: number): void {
+		let index = this.selectedSystemFields.indexOf(systemField);
 		if (index == -1) {
-			this.systemFieldListPerSection[sectionIndex].push(type);
+			this.selectedSystemFields.push(systemField);
 			this.addSystemField(sectionIndex, type);
 		} 
 		else {
-			this.systemFieldListPerSection[sectionIndex].splice(index, 1);
+			this.selectedSystemFields.splice(index, 1);
 			this.removeSystemField(sectionIndex, type);
 		}
 	}
@@ -307,9 +273,6 @@ export class DmpProfileEditorComponent extends BaseComponent implements AfterVie
 	}
 	  
 	removeSystemFieldWithIndex(sectionIndex: number, fieldIndex: number): void {
-		let type: SystemFieldType = this.fieldsArray(sectionIndex).at(fieldIndex).get('type').value;
-		let index = this.systemFieldListPerSection[sectionIndex].indexOf(type);
-		this.systemFieldListPerSection[sectionIndex] = this.systemFieldListPerSection[sectionIndex].filter(types => types != type);
 		this.fieldsArray(sectionIndex).removeAt(fieldIndex);
 	}
 
@@ -369,19 +332,11 @@ export class DmpProfileEditorComponent extends BaseComponent implements AfterVie
 	drop(event: CdkDragDrop<string[]>, sectionIndex: number) {
 		moveItemInArray(this.fieldsArray(sectionIndex).controls, event.previousIndex, event.currentIndex);
     	moveItemInArray(this.fieldsArray(sectionIndex).value, event.previousIndex, event.currentIndex);
-		this.fieldsArray(sectionIndex).controls.forEach((field, index) => {
-			field.get('ordinal').setValue(index + 1);
-		});
 	}
 
 	dropSections(event: CdkDragDrop<string[]>) {
 		moveItemInArray(this.sectionsArray().controls, event.previousIndex, event.currentIndex);
     	moveItemInArray(this.sectionsArray().value, event.previousIndex, event.currentIndex);
-		this.sectionsArray().controls.forEach((section, index) => {
-			section.get('ordinal').setValue(index + 1);
-		});
-    	moveItemInArray(this.systemFieldListPerSection, event.previousIndex, event.currentIndex);
-    	moveItemInArray(this.descriptionTemplatesPerSection, event.previousIndex, event.currentIndex);
 	}
 
 	moveItemInFormArray(formArray: FormArray, fromIndex: number, toIndex: number): void {
@@ -405,30 +360,36 @@ export class DmpProfileEditorComponent extends BaseComponent implements AfterVie
 		foundIndex !== -1 && this.descriptionTemplatesArray(sectionIndex).removeAt(foundIndex);
 	}
 
-	onPreviewTemplate(event, sectionIndex: number) {
-		const dialogRef = this.dialog.open(DatasetPreviewDialogComponent, {
-			width: '590px',
-			minHeight: '200px',
-			restoreFocus: false,
-			data: {
-				template: event
-			},
-			panelClass: 'custom-modalbox'
-		});
-		dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => {
-			if (result) {
-				const profile: DescriptionTemplatesInSectionEditor = new DescriptionTemplatesInSectionEditor();
-				profile.id = Guid.create().toString();
-				profile.descriptionTemplateId = event.id;
-				profile.label = event.label;
-				this.descriptionTemplatesArray(sectionIndex).push(profile.buildForm());
-				
-				const items = this.descriptionTemplatesPerSection[sectionIndex];
-				items.push({id: event.id, label: event.label, description: ""});
-				this.descriptionTemplatesPerSection[sectionIndex] = [...items];
-			}
-		});
-	}
+	// onPreviewTemplate(event, sectionIndex: number) {
+	// 	const dialogRef = this.dialog.open(DatasetPreviewDialogComponent, {
+	// 		width: '590px',
+	// 		minHeight: '200px',
+	// 		restoreFocus: false,
+	// 		data: {
+	// 			template: event
+	// 		},
+	// 		panelClass: 'custom-modalbox'
+	// 	});
+	// 	dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => {
+	// 		if (result) {
+	// 			let profiles = this.sectionsArray().at(sectionIndex).get('descriptionTemplates').value;//this.formGroup.get('profiles').value;
+	// 			const profile: DescriptionTemplatesInSectionEditor = new DescriptionTemplatesInSectionEditor();
+	// 			profile.id = Guid.create().toString();
+	// 			profile.descriptionTemplateId = event.id;
+	// 			profile.label = event.label;
+	// 			profiles.push(profile.buildForm());
+	// 			this.sectionsArray().at(sectionIndex).get('descriptionTemplates').setValue(profiles);//this.formGroup.get('profiles').setValue(profiles);
+	// 			this.profilesAutoCompleteConfiguration = {
+	// 				filterFn: this.filterProfiles.bind(this),
+	// 				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'],
+	// 				subtitleFn: (item) => item['description'],
+	// 				popupItemActionIcon: 'visibility'
+	// 			};
+	// 		}
+	// 	});
+	// }
 
 	onOptionSelected(item, sectionIndex){
 		const profile: DescriptionTemplatesInSectionEditor = new DescriptionTemplatesInSectionEditor();
@@ -438,48 +399,23 @@ export class DmpProfileEditorComponent extends BaseComponent implements AfterVie
 		this.descriptionTemplatesArray(sectionIndex).push(profile.buildForm());
 	}
 
-	checkValidity() {
-		this.formService.touchAllFormFields(this.formGroup);
-		if (!this.isFormValid()) { return false; }
-		let errorMessages = [];
-		if(!this.hasTitle()) {
-			errorMessages.push("Title should be set.");
-		}
-		if(!this.hasDescription()) {
-			errorMessages.push("Description should be set.");
-		}
-		if(!this.hasDescriptionTemplates()) {
-			errorMessages.push("At least one section should have description templates.");
-		}
-		if(errorMessages.length > 0) {
-			this.showValidationErrorsDialog(undefined, errorMessages);
-			return false;
-		}
-		return true;
-	}
-
 	formSubmit(): void {
-		if (this.checkValidity())
-			this.onSubmit();
+		this.formService.touchAllFormFields(this.formGroup);
+		if (!this.isFormValid()) { return; }
+		if(!this.hasDescriptionTemplates()) {
+			this.showValidationErrorsDialog(undefined, ["At least one section should have description templates."]);
+			return;
+		}
+		this.onSubmit();
 	}
 
 	public isFormValid() {
 		return this.formGroup.valid;
 	}
 
-	hasTitle(): boolean {
-		const dmpBlueprint: DmpBlueprint = this.formGroup.value;
-		return dmpBlueprint.definition.sections.some(section => section.fields.some(field => (field.category === FieldCategory.SYSTEM || field.category as unknown === 'SYSTEM') && field.type === SystemFieldType.TEXT));
-	}
-
-	hasDescription(): boolean {
-		const dmpBlueprint: DmpBlueprint = this.formGroup.value;
-		return dmpBlueprint.definition.sections.some(section => section.fields.some(field => (field.category === FieldCategory.SYSTEM || field.category as unknown === 'SYSTEM') && field.type === SystemFieldType.HTML_TEXT));
-	}
-
 	hasDescriptionTemplates(): boolean {
 		const dmpBlueprint: DmpBlueprint = this.formGroup.value;
-		return dmpBlueprint.definition.sections.some(section => section.hasTemplates == true);
+		return (dmpBlueprint.definition.sections.filter(s => s.hasTemplates == true).length > 0) ? true : false;
 	}
 
 	private showValidationErrorsDialog(projectOnly?: boolean, errmess?: string[]) {
@@ -578,29 +514,13 @@ export class DmpProfileEditorComponent extends BaseComponent implements AfterVie
 		.subscribe(
 			confirmed =>{
 				if(confirmed){
-					if(this.formGroup.get('status').value == DmpProfileStatus.Draft) {
-						this.formGroup.get('status').setValue(DmpProfileStatus.Deleted);
-						this.dmpProfileService.createBlueprint(this.formGroup.value)
-							.pipe(takeUntil(this._destroyed))
-							.subscribe(
-								complete => this.onCallbackSuccess(),
-								error => this.onCallbackError(error)
-						);
-					}
-					else {
-						this.dmpProfileService.delete(this.dmpProfileId)
-							.pipe(takeUntil(this._destroyed))
-							.subscribe(
-								complete => this.onCallbackSuccess(),
-								error => {
-									if (error.error.statusCode == 674) {
-										this.uiNotificationService.snackBarNotification(this.language.instant('GENERAL.SNACK-BAR.UNSUCCESSFUL-DMP-BLUEPRINT-DELETE'), SnackBarNotificationLevel.Error);
-									} else {
-										this.uiNotificationService.snackBarNotification(this.language.instant(error.message), SnackBarNotificationLevel.Error);
-									}
-								}
-						);
-					}
+					this.formGroup.get('status').setValue(DmpProfileStatus.Deleted);
+					this.dmpProfileService.createDmp(this.formGroup.value)
+						.pipe(takeUntil(this._destroyed))
+						.subscribe(
+							complete => this.onCallbackSuccess(),
+							error => this.onCallbackError(error)
+					);
 				}
 			}
 		)
@@ -608,10 +528,10 @@ export class DmpProfileEditorComponent extends BaseComponent implements AfterVie
 	}
 
 	finalize() {
-		if (this.checkValidity()) {
-			this.formGroup.get('status').setValue(DmpProfileStatus.Finalized);
-			this.onSubmit();
-		}	
+		//const data = this.form.value;
+		this.formGroup.get('status').setValue(DmpProfileStatus.Finalized);
+
+		this.onSubmit();
 	}
 
 	downloadXML(): void {