From c17c76feadb3644c6b6e1a3de1975e95b4486436 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Wed, 4 Jan 2023 13:27:49 +0200 Subject: [PATCH] [Eosc Explore & Library | data-transfer-v2]: environment.ts: Updated eoscDataTransferDestinations to be like api response. | transferData.component: Updated destinationOptions and selectedDestination according to the updated eoscDataTransferDestinations. --- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- src/environments/environment.ts | 40 +++++++++++++++++++++++++-------- 4 files changed, 34 insertions(+), 12 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 764b92a..5054331 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 764b92ae66c45836e9d59ff0f9c3827addef4ead +Subproject commit 50543311f2186435abd77c92ab920b7e37d710da diff --git a/src/assets/common-assets b/src/assets/common-assets index 2de3f62..0c6b2ac 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 2de3f625b772a264acb0579126b2bfce42778d0c +Subproject commit 0c6b2ac12b4796e41bf4cc8de93c157efa866543 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index f902074..996b485 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit f902074e00e01165f489e2fef12aad6551c03ccd +Subproject commit 996b48573c7cc42a8c50ac447f1fd84c7f0836c4 diff --git a/src/environments/environment.ts b/src/environments/environment.ts index c8054c5..7f72229 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -113,14 +113,36 @@ export let properties: EnvProperties = { eoscDataTransferAPI : "https://eosc-data-transfer.test.fedcloud.eu", eoscDataTransferLoginUrl:"http://rudie.di.uoa.gr:8580/openid_connect_login", eoscDataTransferDestinations : [ - {label: "dcache", value: - {label : "EGI dCache", id: "dcache", - defaultFolder: "/", auth: "token"} + // {label: "dcache", value: + // {label : "EGI dCache", id: "dcache", + // auth: "token"} + // }, + // {label: "FTP", value: + // {label : "FTP", id: "ftp", auth: "password"} + // }, + // {label: "S3", value: + // {label : "S3", id: "s3", auth: "keys"} + // }] + + { + "kind": "StorageInfo", + "destination": "dcache", + // "id": "dcache", // + "description": "EGI dCache", + // "label": "EGI dCache", // + "authType": "token", + "canBrowse": true, + "transferWith": "EGI Data Transfer" }, - {label: "FTP", value: - {label : "FTP", id: "ftp", auth: "password"} - }, - {label: "S3", value: - {label : "S3", id: "s3", auth: "keys"} - }] + { + "kind": "StorageInfo", + "destination": "s3", + // "id": "s3", // + "description": "Amazon S3 compatible object storage", + // "label": "Amazon S3 compatible object storage", // + "authType": "keys", + "canBrowse": true, + "transferWith": "EGI Data Transfer" + } +] };