diff --git a/CHANGELOG.md b/CHANGELOG.md index d349ae4..c38eeee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - *Fixed (for any bug fixes)* - *Security (in case of vulnerabilities)* +## [3.0.0] - 13/06/2023 +### Changed +* Upgraded uikit version to 3.13.10 +* NEW user interface & API calls to Data Transfer Service ## [2.0.2] - 01/06/2023 ### Added diff --git a/package.json b/package.json index 4c3906c..74e0151 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "eosc", - "version": "2.0.2", + "version": "3.0.0", "scripts": { "ng": "ng", "start": "ng serve --disable-host-check --host 0.0.0.0 --port 4400", diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 17c2b03..a0b4ccf 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 17c2b03c9e281ae1d5c4a32b812c3b1c11a9f3da +Subproject commit a0b4ccff23473b19320fcc76195f629fd1f264f1 diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 43b822e..2ce71db 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -111,10 +111,16 @@ export let properties: EnvProperties = { reCaptchaSiteKey: null, footerGrantText : "", eoscDataTransferAPI : "https://eosc-data-transfer.vm.fedcloud.eu", + eoscDataTransferLoginUrl:"https://explore.eosc-portal.eu/egi-login-service/openid_connect_login", eoscDataTransferDestinations : [ - {label: "EGI dCache (dcache-demo.desy.de)", value: - {label : "EGI dCache (dcache-demo.desy.de)", url: "https://dcache-demo.desy.de:2443", id: "dcache", - webpage : "https://dcache-demo.desy.de", defaultFolder: "/", hasBrowse: true, - loginUrl : "https://explore.eosc-portal.eu/egi-login-service/openid_connect_login", cookieName: "EGIAccessToken"} + {label: "dcache", value: + {label : "EGI dCache", id: "dcache", + defaultFolder: "/", auth: "token"} + }, + {label: "FTP", value: + {label : "FTP", id: "ftp", auth: "password"} + }, + {label: "S3", value: + {label : "S3", id: "s3", auth: "keys"} }] }; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 5aef624..93bc491 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -110,17 +110,39 @@ export let properties: EnvProperties = { altMetricsAPIURL: "https://api.altmetric.com/v1/doi/", reCaptchaSiteKey: null, footerGrantText : "This OpenAIRE gateway is part of a project that has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452", - eoscDataTransferAPI : "https://eosc-data-transfer.vm.fedcloud.eu", + eoscDataTransferAPI : "https://eosc-data-transfer.test.fedcloud.eu", + eoscDataTransferLoginUrl:"http://rudie.di.uoa.gr:8580/openid_connect_login", eoscDataTransferDestinations : [ - {label: "EGI dCache (dcache-demo.desy.de)", value: - {label : "EGI dCache (dcache-demo.desy.de)", url: "https://dcache-demo.desy.de:2443", id: "dcache", - webpage : "https://dcache-demo.desy.de", defaultFolder: "/", hasBrowse: true, - loginUrl : "http://rudie.di.uoa.gr:8580/openid_connect_login", cookieName: "EGIAccessToken"} + // {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", - loginUrl : null} + { + "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" } - ] - +] };