From c53e23708ecf31b3db90ca0616ff6660ce8d96d7 Mon Sep 17 00:00:00 2001 From: argirok Date: Mon, 23 May 2022 12:54:34 +0300 Subject: [PATCH] update transfer data component - real api calls --- .../result/resultLanding.component.ts | 1 + utils/dataTransfer/transferData.component.ts | 107 +++++++++--------- 2 files changed, 55 insertions(+), 53 deletions(-) diff --git a/landingPages/result/resultLanding.component.ts b/landingPages/result/resultLanding.component.ts index 2088c441..e7df9114 100644 --- a/landingPages/result/resultLanding.component.ts +++ b/landingPages/result/resultLanding.component.ts @@ -443,6 +443,7 @@ export class ResultLandingComponent { data => { this.resultLandingInfo = data; this.id = this.resultLandingInfo.objIdentifier; + console.log(this.resultLandingInfo.identifiers, this.resultLandingInfo.identifiers.get('doi'),this.resultLandingInfo.identifiers.get('doi').join('').indexOf('zenodo.')) //old // this.viewsFrameUrl = this.properties.framesAPIURL + 'merge.php?com=query&data=[{"query":"resRepoViews", "resTitle":"' + this.id + '", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":" ","color":"","type":"chart","size":200,"sort":"xaxis","xStyle":{"r":-30,"s":"6","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"Repository","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]}]&info_types=["column"]&stacking=normal&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false'; // this.downloadsFrameUrl = this.properties.framesAPIURL + 'merge.php?com=query&data=[{"query":"resRepoDownloads", "resTitle":"' + this.id + '", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":" ","color":"","type":"chart","size":200,"sort":"xaxis","xStyle":{"r":-30,"s":"6","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"Repository","yaxisheaders":["Monthly downloads"],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]}]&info_types=["column"]&stacking=normal&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false'; diff --git a/utils/dataTransfer/transferData.component.ts b/utils/dataTransfer/transferData.component.ts index f0fcb2ec..0a8ee2a5 100644 --- a/utils/dataTransfer/transferData.component.ts +++ b/utils/dataTransfer/transferData.component.ts @@ -6,13 +6,14 @@ import {Location} from '@angular/common'; import {StringUtils} from "../string-utils.class"; import {COOKIE} from "../../login/utils/helper.class"; import {Router} from "@angular/router"; +import {properties} from "../../../../environments/environment"; declare var UIkit; @Component({ selector: 'egi-transfer-data', template: ` @@ -23,17 +24,15 @@ declare var UIkit;
-
+

EOSC data transfer service

-
- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut - labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco - laboris nisi ut aliquip ex ea commodo consequat. +
+ In order to send data to a Cloud Storage, you would need to be authenticated, please login via EGI check-in.
@@ -112,14 +110,16 @@ export class EGIDataTransferComponent { sourceUrls = [] selectedSourceUrl = null; destinationPath = ""; - destinationOptions = [{label: "EGI storage", value: { url: "https://egi.storage.eu", id: "egi" } }]; + destinationOptions = [{label: "EGI storage", value: { url: "https://dcache-demo.desy.de:2443", id: "egi" , webpage:"https://dcache-demo.desy.de"} }]; selectedDestination = null; downloadElements = null; @Input() isOpen = false; - APIURL = "https://virtserver.swaggerhub.com/thebe14/eosc-future-data-transfer/1.0.0"; + APIURL = "https://eosc-data-transfer.vm.fedcloud.eu" + // APIURL = "https://virtserver.swaggerhub.com/thebe14/eosc-future-data-transfer/1.0.0"; status: "loading" | "success" | "errorParser" | "errorUser" | "errorTransfer" | "init" = "init"; message; + doiPrefix = properties.doiURL; validators = [Validators.required, StringUtils.urlValidator()]; constructor(private http: HttpClient, private location: Location, private _router: Router) { @@ -141,14 +141,22 @@ export class EGIDataTransferComponent { } open(){ this.accessToken = COOKIE.getCookie("EGIAccessToken"); - for(let doi of this.dois){ - if(doi.indexOf("zenodo.")!=-1){ - this.sourceUrls.push("https://doi.org/" + doi); + if(this.accessToken) { + for (let doi of this.dois) { + if (doi.indexOf("zenodo.") != -1) { + this.sourceUrls.push(this.doiPrefix + doi); + } } + try { + this.sourceUrls.sort(function (a, b) { + return Number(b.split("zenodo.")[1]) - Number(a.split("zenodo.")[1]); + }); + }catch (e){} + + this.selectedSourceUrl = this.sourceUrls[0]; + this.selectedDestination = this.destinationOptions[0].value; + this.parse(); } - this.selectedSourceUrl = this.sourceUrls[0]; - this.selectedDestination = this.destinationOptions[0].value; - this.parse(); this.isOpen = true; } close(){ @@ -169,29 +177,28 @@ export class EGIDataTransferComponent { } parse(){ - - this.subscriptions.push(this.http.get(this.APIURL + "/parser/zenodo?source=" + this.selectedSourceUrl ).subscribe( + this.status = "loading"; + this.message = null; + this.downloadElements = []; + this.subscriptions.push(this.http.get(this.APIURL + "/parser/zenodo?doi=" + encodeURIComponent(this.selectedSourceUrl)).subscribe( res => { - console.log(res) - this.downloadElements = []; for( let element of res['elements']){ //TODO remove element.downloadUrl = "https://zenodo.org/record/6354460/files/preprocessed_data/weights/atlas_EUCP_ICTP_CMIP6_REA_tas_weights.nc?download=1"; //TODO can we use element.name instead? - element.filename = this.parseFilename(element.downloadUrl); - console.log(element.filename) + // element.filename = element.name; //this.parseFilename(element.downloadUrl); + // console.log(element.filename) this.downloadElements.push(element) } - console.log(this.downloadElements) - // this.transfer(); - + // console.log(this.downloadElements) + 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", { status: 'error', - timeout: 6000, + timeout: 3000, pos: 'bottom-right' }); @@ -206,7 +213,7 @@ export class EGIDataTransferComponent { let headers = new HttpHeaders({'Authorization': 'Bearer '+this.accessToken}); this.subscriptions.push(this.http.get(this.APIURL + "/user/info", {headers: headers}).subscribe( res => { - console.log(res) + // console.log(res) let body = { "files": [], "params": { @@ -215,30 +222,24 @@ export class EGIDataTransferComponent { "retry": 3 } }; - console.log(this.selectedDestination) + + // console.log(this.selectedDestination) for (let element of this.downloadElements) { let file = { - "sources": [ - { - "url": element['downloadUrl'] - } - ], - "destinations": [ - { - "url": this.selectedDestination.url + this.destinationPath + element.filename - } - ], - "filesize": element['size'] + "sources": [element['downloadUrl']], + "destinations": [this.selectedDestination.url + this.destinationPath + element.name], + }; - //TODO priority? checksum? + //TODO priority? checksum? filesize? + // "filesize": element['size'] body.files.push(file); } let headers = new HttpHeaders({'Authorization': 'Bearer '+this.accessToken}); this.subscriptions.push(this.http.post(this.APIURL + "/transfer" ,body, {headers: headers}).subscribe( res => { - console.log(res) + // console.log(res) UIkit.notification('Data transfer has began! ', { status: 'success', timeout: 6000, @@ -248,14 +249,14 @@ export class EGIDataTransferComponent { this.status = "success" this.message = `
Data transfer has began!
-
Transfering ` + this.downloadElements.length + ` files to EGI Storage: +
Transfering ` + this.downloadElements.length + ` files to EGI Storage:
    `; // TODO LATER we can call status for each file and see if the transfer has been complete for(let element of this.downloadElements){ - console.log(element) - this.message += `
  • `+ element.filename+ `
    • `; - + // console.log(element) + // this.message += `
  • `+ element.name+ `
    • `; + this.message += `
  • `+ element.name+ `
    • `; } this.message += `