From 8e22fe60b0e68371649d57461c4d08683a397d7e Mon Sep 17 00:00:00 2001
From: argirok <argirokokogiannaki@gmail.com>
Date: Fri, 11 Nov 2022 11:55:15 +0200
Subject: [PATCH] Data transfer: remove checks for only zenodo dois

---
 landingPages/result/resultLanding.component.html | 6 ++----
 utils/dataTransfer/transferData.component.html   | 4 ++--
 utils/dataTransfer/transferData.component.ts     | 6 ++----
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html
index cedd2c18..a41ffda3 100644
--- a/landingPages/result/resultLanding.component.html
+++ b/landingPages/result/resultLanding.component.html
@@ -60,8 +60,7 @@
                   </orcid-work>
                 </li>
                 <li *ngIf=" properties.enableEoscDataTransfer && resultLandingInfo.resultType == 'dataset' &&
-                resultLandingInfo.identifiers && resultLandingInfo.identifiers.get('doi') && 
-                resultLandingInfo.identifiers.get('doi').join('').indexOf('zenodo.')!=-1"
+                resultLandingInfo.identifiers && resultLandingInfo.identifiers.get('doi')"
                     class="uk-text-center">
                   <egi-transfer-data [dois]="resultLandingInfo.identifiers.get('doi')" [isOpen]="egiTransferModalOpen"></egi-transfer-data>
                 </li>
@@ -157,8 +156,7 @@
 										</orcid-work>
 									</div>
 									<div *ngIf=" properties.enableEoscDataTransfer && resultLandingInfo.resultType == 'dataset' &&
-									resultLandingInfo.identifiers && resultLandingInfo.identifiers.get('doi') && 
-									resultLandingInfo.identifiers.get('doi').join('').indexOf('zenodo.')!=-1"
+									resultLandingInfo.identifiers && resultLandingInfo.identifiers.get('doi')"
 											class="">
 										<egi-transfer-data [dois]="resultLandingInfo.identifiers.get('doi')" [isOpen]="egiTransferModalOpen"></egi-transfer-data>
 									</div>
diff --git a/utils/dataTransfer/transferData.component.html b/utils/dataTransfer/transferData.component.html
index 2a478607..2e4c059f 100644
--- a/utils/dataTransfer/transferData.component.html
+++ b/utils/dataTransfer/transferData.component.html
@@ -28,8 +28,8 @@
           <div class="uk-grid uk-child-width-1-2 uk-grid-divider">
 <!--            Source -->
             <div class="uk-first-column source">
-              <p class="uk-text-meta uk-text-xsmall uk-margin-remove-bottom uk-margin-top">Available Zenodo DOI URLs:</p>
-              <div input type="select" [(value)]="selectedSourceUrl" placeholder="Zenodo DOI URL" hint="Select..."
+              <p class="uk-text-meta uk-text-xsmall uk-margin-remove-bottom uk-margin-top">Available DOI URLs:</p>
+              <div input type="select" [(value)]="selectedSourceUrl" placeholder="DOI URL" hint="Select..."
                    [options]="sourceUrls" (valueChange)="this.parse()"></div>
               <div *ngIf="status!='loading'" class="uk-margin-top">
                 <div>{{this.downloadElements.length}} files found:</div>
diff --git a/utils/dataTransfer/transferData.component.ts b/utils/dataTransfer/transferData.component.ts
index 3fa5129a..736a1ee7 100644
--- a/utils/dataTransfer/transferData.component.ts
+++ b/utils/dataTransfer/transferData.component.ts
@@ -87,9 +87,7 @@ export class EGIDataTransferComponent {
       }
 
       for (let doi of this.dois) {
-        if (doi.indexOf("zenodo.") != -1) {
           this.sourceUrls.push(this.doiPrefix + doi);
-        }
       }
       try {
         this.sourceUrls.sort(function (a, b) {
@@ -147,8 +145,8 @@ export class EGIDataTransferComponent {
             this.status = "init";
           }, error => {
             this.status = "errorParser";
-            this.message = "Couldn't get download URLs from zenodo";
-            UIkit.notification("Couldn't get download URLs from zenodo", {
+            this.message = error.error && error.error.id && error.error.id == 'doiNotSupported'?'DOI not supported':( error.error && error.error.id && error.error.id? error.error.id:'Error parsing information') ;
+            UIkit.notification(this.message, {
               status: 'error',
               timeout: 3000,
               pos: 'bottom-right'