From dd6a2a0df70c942271d0be5ea369f502b8768d68 Mon Sep 17 00:00:00 2001
From: Aldo Mihasi <amihasi@cite-sa.gr>
Date: Mon, 17 Jul 2023 10:29:06 +0300
Subject: [PATCH] adding key property in the prefilling model as the identifier
 of the prefilling repository

---
 .../eu/eudat/logic/proxy/fetching/RemoteFetcher.java     | 2 +-
 .../java/eu/eudat/models/data/prefilling/Prefilling.java | 9 +++++++++
 .../web/src/main/resources/externalUrls/ExternalUrls.xml | 4 ++--
 dmp-frontend/src/app/core/model/dataset/prefilling.ts    | 1 +
 .../prefill-dataset/prefill-dataset.component.ts         | 4 ++--
 5 files changed, 15 insertions(+), 5 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 c77964083..4d228e7b7 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
@@ -363,7 +363,7 @@ public class RemoteFetcher {
             Results remainingResults = optionalResults.orElseGet(Results::new);
             remainingResults.getResults().addAll(results.getResults());
 
-            return remainingResults.getResults().stream().peek(x -> x.put("tag", tag)).collect(Collectors.toList());
+            return remainingResults.getResults().stream().peek(x -> x.put("tag", tag)).peek(x -> x.put("key", key)).collect(Collectors.toList());
         }
         else {
             return new LinkedList<>();
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/prefilling/Prefilling.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/prefilling/Prefilling.java
index 67babe9de..873c59e34 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/prefilling/Prefilling.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/prefilling/Prefilling.java
@@ -6,6 +6,7 @@ public class Prefilling {
     private String pid;
     private String name;
     private Map<String, Object> data;
+    private String key;
     private String tag;
 
     public String getPid() {
@@ -32,6 +33,14 @@ public class Prefilling {
         this.data = data;
     }
 
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
     public String getTag() {
         return tag;
     }
diff --git a/dmp-backend/web/src/main/resources/externalUrls/ExternalUrls.xml b/dmp-backend/web/src/main/resources/externalUrls/ExternalUrls.xml
index 95aaac7fa..4281c6d37 100644
--- a/dmp-backend/web/src/main/resources/externalUrls/ExternalUrls.xml
+++ b/dmp-backend/web/src/main/resources/externalUrls/ExternalUrls.xml
@@ -1203,7 +1203,7 @@ but not
             <prefillingSearch>
                 <urlConfig>
                     <key>zenodo</key>
-                    <label>zenodo</label>
+                    <label>Zenodo</label>
                     <ordinal>1</ordinal>
                     <type>External</type>
                     <url>https://zenodo.org/api/records/?page={page}&amp;size={pageSize}&amp;q=title:"{like}" doi:"{like}" conceptdoi:"{like}"</url>
@@ -1264,7 +1264,7 @@ but not
             <prefillingSearch>
                 <urlConfig>
                     <key>openaire</key>
-                    <label>openaire</label>
+                    <label>Openaire</label>
                     <ordinal>1</ordinal>
                     <type>External</type>
                     <url>https://services.openaire.eu/search/v2/api/datasets/?q={like}&amp;page={page}&amp;size={pageSize}&amp;format=json</url>
diff --git a/dmp-frontend/src/app/core/model/dataset/prefilling.ts b/dmp-frontend/src/app/core/model/dataset/prefilling.ts
index 1b5b93538..978dfe1eb 100644
--- a/dmp-frontend/src/app/core/model/dataset/prefilling.ts
+++ b/dmp-frontend/src/app/core/model/dataset/prefilling.ts
@@ -2,5 +2,6 @@ export interface Prefilling {
 	pid: string;
 	name: string;
 	data: any;
+	key: string;
 	tag: string;
 }
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/prefill-dataset/prefill-dataset.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/prefill-dataset/prefill-dataset.component.ts
index e46a2b184..999f51668 100644
--- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/prefill-dataset/prefill-dataset.component.ts
+++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/prefill-dataset/prefill-dataset.component.ts
@@ -69,13 +69,13 @@ export class PrefillDatasetComponent extends BaseComponent implements OnInit {
 	next() {
 		if(this.isPrefilled) {
 			if(this.prefillForm.get('prefill').value.data == null) {
-				this.prefillingService.getPrefillingDataset(this.prefillForm.get('prefill').value.pid, this.prefillForm.get('profile').value.id, this.prefillForm.get('prefill').value.tag).subscribe(wizard => {
+				this.prefillingService.getPrefillingDataset(this.prefillForm.get('prefill').value.pid, this.prefillForm.get('profile').value.id, this.prefillForm.get('prefill').value.key).subscribe(wizard => {
 					wizard.profile = this.prefillForm.get('profile').value;
 					this.closeDialog(wizard);
 				});
 			}
 			else {
-				this.prefillingService.getPrefillingDatasetUsingData(this.prefillForm.get('prefill').value.data, this.prefillForm.get('profile').value.id, this.prefillForm.get('prefill').value.tag).subscribe(wizard => {
+				this.prefillingService.getPrefillingDatasetUsingData(this.prefillForm.get('prefill').value.data, this.prefillForm.get('profile').value.id, this.prefillForm.get('prefill').value.key).subscribe(wizard => {
 					wizard.profile = this.prefillForm.get('profile').value;
 					this.closeDialog(wizard);
 				});