From 52334aec6a7410ea3d4263d3f4d3af31ddb82dc5 Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Fri, 13 Dec 2019 13:05:58 +0200 Subject: [PATCH 1/2] Fixes bug on not creating new "External Datasets" and "Data Repositories". (Issue #212) --- .../datarepository/DataRepositoryModel.java | 29 +++++++++---------- .../models/data/dataset/DataRepository.java | 16 +++++----- .../model/data-repository/data-repository.ts | 2 +- .../dataset-wizard-editor.model.ts | 10 +++---- ...-external-references-editor.component.html | 2 +- ...et-external-references-editor.component.ts | 2 +- ...ta-repository-dialog-editor.component.html | 4 +-- 7 files changed, 32 insertions(+), 33 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/datarepository/DataRepositoryModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/datarepository/DataRepositoryModel.java index 200bf2d78..339b6f660 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/datarepository/DataRepositoryModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/datarepository/DataRepositoryModel.java @@ -1,6 +1,5 @@ package eu.eudat.models.data.datarepository; -import com.fasterxml.jackson.annotation.JsonProperty; import eu.eudat.data.entities.DataRepository; import eu.eudat.data.entities.UserInfo; import eu.eudat.models.DataModel; @@ -8,13 +7,9 @@ import eu.eudat.models.DataModel; import java.util.Date; import java.util.UUID; -/** - * Created by ikalyvas on 9/3/2018. - */ public class DataRepositoryModel implements DataModel { private UUID id; - @JsonProperty("name") - private String label; + private String name; private String pid; private String abbreviation; private String uri; @@ -30,11 +25,11 @@ public class DataRepositoryModel implements DataModel, LabelGenerator { private String pid; - private String label; + private String name; private String uri; private String info; private String reference; @@ -21,11 +21,11 @@ public class DataRepository implements DataModel
- {{i+1}}) {{suggestion.get('label').value}} + {{i+1}}) {{suggestion.get('name').value}}
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts index 57a63660e..48d596ead 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts @@ -139,7 +139,7 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl .pipe(takeUntil(this._destroyed)) .subscribe(result => { if (!result) { return; } - const dataRepositoryModel = new ExternalDataRepositoryEditorModel(result.id, result.label, result.pid, result.uri, result.reference); + const dataRepositoryModel = new ExternalDataRepositoryEditorModel(result.id, result.name, result.pid, result.uri, result.reference); (this.formGroup.get('dataRepositories')).push(dataRepositoryModel.buildForm()); }); } diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.html index 900f5f4aa..2367cc238 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.html +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.html @@ -9,8 +9,8 @@
- - {{'GENERAL.VALIDATION.REQUIRED' | translate}} + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} From e96c927f9451bb33114629514d49a5fa189a68e2 Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Fri, 13 Dec 2019 13:08:32 +0200 Subject: [PATCH 2/2] Increases page size when fetching from external Urls. (Issue #208) --- .../java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java index ed92795dd..9c6c90d44 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java @@ -179,7 +179,7 @@ public class RemoteFetcher { if (externalUrlCriteria.getPageSize() != null) { completedPath = completedPath.replace("{pageSize}", externalUrlCriteria.getPageSize()); } else { - completedPath = completedPath.replace("{pageSize}", "10"); + completedPath = completedPath.replace("{pageSize}", "60"); } return completedPath; } @@ -244,7 +244,7 @@ public class RemoteFetcher { results = new Results(jsonContext.read(jsonDataPath.getPath() + "[" + jsonDataPath.getFieldsUrlConfiguration().getName() + "," + jsonDataPath.getFieldsUrlConfiguration().getDescription() + "," + jsonDataPath.getFieldsUrlConfiguration().getUri() + "," + jsonDataPath.getFieldsUrlConfiguration().getId() + "]"), - jsonContext.read(jsonPaginationPath)); + new HashMap<>(1, 1)); } results.results = results.results.stream().map(e -> e.entrySet().stream().collect(Collectors.toMap(x -> this.transformKey(jsonDataPath,x.getKey()), Map.Entry::getValue))) .collect(Collectors.toList());