From 2db6ee98e49eef43a4a4ec5633119927de75798d Mon Sep 17 00:00:00 2001 From: argirok Date: Fri, 11 Nov 2022 11:20:02 +0200 Subject: [PATCH 01/20] Eosc data transfer: - add and use separate property for login url - use new API url --- src/app/openaireLibrary | 2 +- src/environments/environment.prod.ts | 3 ++- src/environments/environment.ts | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 65cc850..764b92a 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 65cc8504eaa645b32af7ea4238445d9cc47c2556 +Subproject commit 764b92ae66c45836e9d59ff0f9c3827addef4ead diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 43b822e..cd88cdb 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -110,7 +110,8 @@ export let properties: EnvProperties = { altMetricsAPIURL: "https://api.altmetric.com/v1/doi/", reCaptchaSiteKey: null, footerGrantText : "", - eoscDataTransferAPI : "https://eosc-data-transfer.vm.fedcloud.eu", + eoscDataTransferAPI : "https://eosc-data-transfer.test.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", diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 3a6ccce..82ff516 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -110,7 +110,8 @@ 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", -- 2.17.1 From c95aab77c8618c6fd95653b5a8b0bceb7352d309 Mon Sep 17 00:00:00 2001 From: argirok Date: Fri, 11 Nov 2022 13:55:19 +0200 Subject: [PATCH 02/20] Data transfer: update list of destinations properties --- src/environments/environment.prod.ts | 13 +++++++++---- src/environments/environment.ts | 17 ++++++++--------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index cd88cdb..8a93b2f 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -113,9 +113,14 @@ export let properties: EnvProperties = { eoscDataTransferAPI : "https://eosc-data-transfer.test.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 82ff516..c8054c5 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -113,15 +113,14 @@ export let properties: EnvProperties = { 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", + defaultFolder: "/", auth: "token"} }, {label: "FTP", value: - {label : "FTP", id: "ftp", - loginUrl : null} - } - ] - + {label : "FTP", id: "ftp", auth: "password"} + }, + {label: "S3", value: + {label : "S3", id: "s3", auth: "keys"} + }] }; -- 2.17.1 From c17c76feadb3644c6b6e1a3de1975e95b4486436 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Wed, 4 Jan 2023 13:27:49 +0200 Subject: [PATCH 03/20] [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" + } +] }; -- 2.17.1 From b98ff13e0d586a7c892dc5fba0bb4e22b49df3c5 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Thu, 5 Jan 2023 19:14:26 +0200 Subject: [PATCH 04/20] [Library | data-transfer-v2]: transferData.component: Get destinationOptions from API (/storage/types). --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 161052d..3c20944 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 161052d97ccfbaf6211775c4a4f64681a37f361e +Subproject commit 3c20944aec78714d59265b1bfebea91b2cadbbb7 -- 2.17.1 From 09647ae0744d03d37a82d290b359d5b1bac26560 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Thu, 5 Jan 2023 19:20:03 +0200 Subject: [PATCH 05/20] Updating openaireLibrary --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 3c20944..96d2e66 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 3c20944aec78714d59265b1bfebea91b2cadbbb7 +Subproject commit 96d2e66c1c3fa690a00216bf00ada77b33219f12 -- 2.17.1 From 77b9876829fe7c0bf305991f45f5f5eb91ed569c Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 13 Feb 2023 19:39:08 +0200 Subject: [PATCH 06/20] [Library | data-transfer-v2]: Use new transfer API to get destinations, do the transfer, request status of transfer | Updated messages and checks for buttons. --- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 96d2e66..95a87dc 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 96d2e66c1c3fa690a00216bf00ada77b33219f12 +Subproject commit 95a87dcefd5b40f729fecf5dcd2d9f3d241b48a7 diff --git a/src/assets/common-assets b/src/assets/common-assets index 0c6b2ac..8c62240 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 0c6b2ac12b4796e41bf4cc8de93c157efa866543 +Subproject commit 8c62240a403dd8a592eac78d565b185b3b1043c0 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 996b485..99ecab0 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 996b48573c7cc42a8c50ac447f1fd84c7f0836c4 +Subproject commit 99ecab0b4e9ceed21424c8fa26ef270b4695b11e -- 2.17.1 From 53bae7c2d266ebbd1b17aa3380297f93e7669350 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Tue, 14 Feb 2023 01:16:51 +0200 Subject: [PATCH 07/20] Updating libraries.. --- src/app/openaireLibrary | 2 +- src/assets/openaire-theme | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 95a87dc..b34f1cd 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 95a87dcefd5b40f729fecf5dcd2d9f3d241b48a7 +Subproject commit b34f1cdfbf9cf617d13f33c49705550088ae6d91 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 99ecab0..3b10e32 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 99ecab0b4e9ceed21424c8fa26ef270b4695b11e +Subproject commit 3b10e32e0df3103a23b36d58b2c6656396b18428 -- 2.17.1 From e496cbd37cb1eb703227bc2ed696f12b3cc7ca06 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 3 Mar 2023 15:12:26 +0200 Subject: [PATCH 08/20] [Library | data-transfer-v2]: transferData.component.ts: Check we are on client side to open the modal | [Bug fix] In error message. --- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index b34f1cd..ed85607 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit b34f1cdfbf9cf617d13f33c49705550088ae6d91 +Subproject commit ed856076d4d3dc5d2430b49085dd915e373026c1 diff --git a/src/assets/common-assets b/src/assets/common-assets index 8c62240..e0c850a 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 8c62240a403dd8a592eac78d565b185b3b1043c0 +Subproject commit e0c850adad45d61fe7e07f340eea2dc7870ff3c9 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 3b10e32..a72ea0d 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 3b10e32e0df3103a23b36d58b2c6656396b18428 +Subproject commit a72ea0d0c9d0b490de6c77a238d501ee75216960 -- 2.17.1 From d0a050e24498bb44bfca8f2ddafd5b694859dec7 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Thu, 9 Mar 2023 11:15:43 +0200 Subject: [PATCH 09/20] Updating src/app/openaireLibrary... --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index ed85607..e02ac38 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit ed856076d4d3dc5d2430b49085dd915e373026c1 +Subproject commit e02ac38b7cae182f24a2ba95d498069b4850cfe8 -- 2.17.1 From 0be6dfd5fdd3952531ffcee43244afdbfd23a96a Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 10 Mar 2023 14:54:15 +0200 Subject: [PATCH 10/20] [Library | data-transfer-v2]: transferData.component.ts: Added class field "s3UrlRegex" and updated s3 regex to accept any url starting from s3://, https://, http://, www. --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index e02ac38..bb6707c 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit e02ac38b7cae182f24a2ba95d498069b4850cfe8 +Subproject commit bb6707cc0d8486226415781861078ed0f67e2f28 -- 2.17.1 From e196a2babaf35252ecf205d94ff0aa428191426c Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 10 Mar 2023 16:47:02 +0200 Subject: [PATCH 11/20] Updating src/app/openaireLibrary... --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index bb6707c..3e8dce7 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit bb6707cc0d8486226415781861078ed0f67e2f28 +Subproject commit 3e8dce7947463bd10b6b2ba33e794942894d1574 -- 2.17.1 From 6958dab128127a83ce26867605046827cecada11 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Wed, 15 Mar 2023 10:53:19 +0200 Subject: [PATCH 12/20] [Library | data-transfer-v]: transferData.component: Updated input labels, added uk-grid-small for the two columns, destination url changed to destination system and protocol (https:// or s3://) is applied programmatically. --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 3e8dce7..71b5964 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 3e8dce7947463bd10b6b2ba33e794942894d1574 +Subproject commit 71b5964f2c241c60c100443838261c6047d84264 -- 2.17.1 From ee8a6b37b5714eb669f3b0a38da3403ec87e69f0 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Thu, 16 Mar 2023 20:56:20 +0200 Subject: [PATCH 13/20] [EOSC EXPLORE | data-transfer-v2]: Updating libraries... --- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 71b5964..aa5425d 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 71b5964f2c241c60c100443838261c6047d84264 +Subproject commit aa5425d0910fd11a5b498760d2b04496be01cd36 diff --git a/src/assets/common-assets b/src/assets/common-assets index e0c850a..95c2b50 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit e0c850adad45d61fe7e07f340eea2dc7870ff3c9 +Subproject commit 95c2b50a57696a80dd3dd376880f26cb21d65817 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index a72ea0d..c4e2781 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit a72ea0d0c9d0b490de6c77a238d501ee75216960 +Subproject commit c4e2781acc42f281265a70d6cd75616cdd6fa762 -- 2.17.1 From 7399cddeabbd7acd8ca15cb0eba01a4f43ba59e2 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Thu, 16 Mar 2023 20:57:31 +0200 Subject: [PATCH 14/20] Updating openaireLibrary... --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index aa5425d..217a396 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit aa5425d0910fd11a5b498760d2b04496be01cd36 +Subproject commit 217a3969db9ecacbe211190e2d32f9c99f853f03 -- 2.17.1 From bcc0bb4299c8067cb88906578ed220b8ae270ade Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Tue, 16 May 2023 16:36:43 +0300 Subject: [PATCH 15/20] [Library | data-transfer-v2]: For data transfer, open full screen modal instead of alert modal | Support transfer of hierarchical files | Show description in storage types. 1. full-screen-modal.component.ts: Added cancelButton: boolean = true; and show cancel button, only if cancelButton is true and okButton is false. 2. transferData.module.ts: Imported FullScreenModalModule. 3. transferData.component.html: Replaced with and updated the interface accordingly | In inputs, set [inputClass]="'flat'". 4. transferData.component.ts: a. Configure FullScreenModal, instread of AlertModal. b. In destinationOptions, set label to dest.description (used to be dest.destination). c. In transfer, in destinations, use also element.path, to keep the initial structure/ hierarchy when transfering files. --- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 217a396..ab43152 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 217a3969db9ecacbe211190e2d32f9c99f853f03 +Subproject commit ab43152a6a6c931aaab5c5a95b9300566be9852b diff --git a/src/assets/common-assets b/src/assets/common-assets index 95c2b50..f15bbfa 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 95c2b50a57696a80dd3dd376880f26cb21d65817 +Subproject commit f15bbfa7265f170e06b256f086f2acedfa3f72e0 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index c4e2781..c92a0de 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit c4e2781acc42f281265a70d6cd75616cdd6fa762 +Subproject commit c92a0dea1b7fc51f0cf272f8d4343735d000a23b -- 2.17.1 From 64a5512700859be93aa656a52c74feda3be67051 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Wed, 7 Jun 2023 14:51:41 +0300 Subject: [PATCH 16/20] [EOSC Explore | data-transfer-v2] Updating openaire-theme before merge with develop branch --- src/assets/openaire-theme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index c92a0de..468b2b0 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit c92a0dea1b7fc51f0cf272f8d4343735d000a23b +Subproject commit 468b2b008f474c88dacc52991a5231693833f1f9 -- 2.17.1 From 2e0970588182fb0af95fde26f8976c017895dc33 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Wed, 7 Jun 2023 14:53:12 +0300 Subject: [PATCH 17/20] [EOSC Explore | data-transfer-v2] Updating (merged) openaireLibrary before merge with develop branch --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index ab43152..9852bde 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit ab43152a6a6c931aaab5c5a95b9300566be9852b +Subproject commit 9852bdeebffa02a68d8c5cb3d71151288a84b8d0 -- 2.17.1 From 43fb4692b4419c0e97d354d0f827cead6c6d8c31 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Thu, 8 Jun 2023 10:23:15 +0300 Subject: [PATCH 18/20] [EOSC Explore | data-transfer-v2]: Updated version to 3.0.0 and added changes for prod release. 1. environment.prod.ts: Updated eoscDataTransferAPI property to use production API (vm, not test). 2. package.json: Updated version from 2.0.2 to 3.0.0. 3. CHANGELOG.md: Added changes for 3.0.0 production release. --- CHANGELOG.md | 4 ++++ package.json | 2 +- src/environments/environment.prod.ts | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d349ae4..ee6a5a8 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] - 08/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/environments/environment.prod.ts b/src/environments/environment.prod.ts index 8a93b2f..2ce71db 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -110,7 +110,7 @@ export let properties: EnvProperties = { altMetricsAPIURL: "https://api.altmetric.com/v1/doi/", reCaptchaSiteKey: null, footerGrantText : "", - eoscDataTransferAPI : "https://eosc-data-transfer.test.fedcloud.eu", + eoscDataTransferAPI : "https://eosc-data-transfer.vm.fedcloud.eu", eoscDataTransferLoginUrl:"https://explore.eosc-portal.eu/egi-login-service/openid_connect_login", eoscDataTransferDestinations : [ {label: "dcache", value: -- 2.17.1 From e4630dd3a5c295bd64ec13bf390aa4c4430c55be Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Tue, 13 Jun 2023 16:12:13 +0300 Subject: [PATCH 19/20] EOSC Explore | data-transfer-v2: Updating openaireLibrary & updated date in CHANGELOG.md --- CHANGELOG.md | 2 +- src/app/openaireLibrary | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee6a5a8..c38eeee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ 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] - 08/06/2023 +## [3.0.0] - 13/06/2023 ### Changed * Upgraded uikit version to 3.13.10 * NEW user interface & API calls to Data Transfer Service diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 9852bde..806cec4 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 9852bdeebffa02a68d8c5cb3d71151288a84b8d0 +Subproject commit 806cec4043f9ecaa881c439f0c6c725766d91568 -- 2.17.1 From 5bfe200abd8107b8336f734f09f70a51c2e4bb55 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Tue, 13 Jun 2023 16:14:15 +0300 Subject: [PATCH 20/20] Updating openaireLibrary --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 806cec4..a0b4ccf 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 806cec4043f9ecaa881c439f0c6c725766d91568 +Subproject commit a0b4ccff23473b19320fcc76195f629fd1f264f1 -- 2.17.1