From e6a48cd469b99eac3f6a1d4f0bc20806678120e6 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Wed, 30 Aug 2023 16:49:52 +0300 Subject: [PATCH 1/8] [EOSC EXPLORE | develop] Added bipFrameAPIURL property. --- src/environments/environment.beta.ts | 1 + src/environments/environment.prod.ts | 1 + src/environments/environment.ts | 1 + 3 files changed, 3 insertions(+) diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 155ef95..9be2e6c 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -18,6 +18,7 @@ export let properties: EnvProperties = { statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/", + bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=", useNewStatistisTool: true, claimsAPIURL: "https://beta.services.openaire.eu/claims/rest/claimsService/", searchAPIURLLAst: "https://beta.services.openaire.eu/search/v2/api/", diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 2ce71db..2403203 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -18,6 +18,7 @@ export let properties: EnvProperties = { statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", statisticsFrameAPIURL: "https://www.openaire.eu/stats/", statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/", + bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=", useNewStatistisTool: true, claimsAPIURL: "https://services.openaire.eu/claims/rest/claimsService/", searchAPIURLLAst: "https://services.openaire.eu/search/v2/api/", diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 93bc491..2b26d4a 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -18,6 +18,7 @@ export let properties: EnvProperties = { statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/", + bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=", useNewStatistisTool: true, claimsAPIURL: "http://dl170.madgik.di.uoa.gr:8180/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/", searchAPIURLLAst: "http://beta.services.openaire.eu/search/v2/api/", From 887a0c162417b02446f02f68eeb36c44b2b053fb Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 4 Sep 2023 12:48:17 +0300 Subject: [PATCH 2/8] [Library | develop]: transferData.component.ts: Set "overwrite": false & in method "validatePath()", removed regex and check only if path starts with / | transferData.component.html: Updated checks for path validation | resultLanding.component.ts: Added field public belongsInEOSC: boolean = false; and initialize it | resultLanding.component.html: Added message above title "This {{getTypeName() | lowercase}} is not part of the European Open Science Cloud" when in EOSC portal, but result has no EOSC context. --- 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 a53c4e9..37208d8 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit a53c4e90d099d0bf3919df55edceaf7f793427d0 +Subproject commit 37208d82b6fb2ae84ad4e5c056f45289fb27d079 diff --git a/src/assets/common-assets b/src/assets/common-assets index 2fd5784..d18e0a7 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 2fd57843f85125e54adfb95b35776755037ea359 +Subproject commit d18e0a7e43e5ab74649481ecbf352ba49893c66f diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 5268f27..2df4b37 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 5268f277246347aad42349a06eecb915a452841b +Subproject commit 2df4b377a3e89b7dd26a011a2e1e1f07fdcedf2a From c56f633d443b0a02347eef2b5d812ac910164a3a Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 4 Sep 2023 14:46:25 +0300 Subject: [PATCH 3/8] [Library | develop]: resultLanding.component.html: Added check for message of non eosc results - do not show it in production environment until we get approval. --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 37208d8..bad8550 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 37208d82b6fb2ae84ad4e5c056f45289fb27d079 +Subproject commit bad855089cb0c522dbeb0a009553742f668049c0 From aa7aab1e4ef99a6c095c347597c23a81690f3b33 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 4 Sep 2023 14:47:07 +0300 Subject: [PATCH 4/8] [Eosc Explore | develop]: package.json: Increased version from 3.0.0 to 3.1.0 | CHANGELOG.md: Added changelog for version 3.1.0. --- CHANGELOG.md | 13 +++++++++++++ package.json | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c38eeee..e15329b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,19 @@ 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.1.0] - 05/09/2023 [BETA] +### Added +* Message for non eosc results i.e. This publication is not part of the European Open Science Cloud +* Impact-based indicators - Citations, Popularity, Influence, Impulse +### Changed +* Smaller window for the Data Transfer Service - not full screen +* Disabled overwrite params when submitting a job to EOSC Data transfer API +* NEW user interface & structure of the detailed page & specific user interface for small devices i.e. mobiles +* Updated access right icons +* Include Subjects as a new tab +### Fixed +* Too much recursion error in validating destination path of Data transfer - updated check + ## [3.0.0] - 13/06/2023 ### Changed * Upgraded uikit version to 3.13.10 diff --git a/package.json b/package.json index 74e0151..a5fea4e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "eosc", - "version": "3.0.0", + "version": "3.1.0", "scripts": { "ng": "ng", "start": "ng serve --disable-host-check --host 0.0.0.0 --port 4400", From 6f657c3194907e1824b99c937d45a10c78e620dd Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 4 Sep 2023 14:49:57 +0300 Subject: [PATCH 5/8] [Eosc Explore | develop]: CHANGELOG.md: Updated message of last changelog. --- CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e15329b..e16baf3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,9 +14,8 @@ 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.1.0] - 05/09/2023 [BETA] +## [3.1.0] - 05/09/2023 ### Added -* Message for non eosc results i.e. This publication is not part of the European Open Science Cloud * Impact-based indicators - Citations, Popularity, Influence, Impulse ### Changed * Smaller window for the Data Transfer Service - not full screen From 825e45f52dde9783e120a3354689253faae01f0d Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 8 Sep 2023 11:44:09 +0300 Subject: [PATCH 6/8] [EOSC EXPLORE | develop] Updating openaireLibrary | environment.beta.ts: Added property eoscDataTransferLoginUrl --- src/app/openaireLibrary | 2 +- src/environments/environment.beta.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index bad8550..741a70f 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit bad855089cb0c522dbeb0a009553742f668049c0 +Subproject commit 741a70fa1c236c83d96c4135063ef6bc8b0c431e diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 9be2e6c..886615a 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -112,6 +112,7 @@ 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", From a7701e895f4e2b7bfa2055ce54d9b08cc34d1458 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 11 Sep 2023 18:10:02 +0300 Subject: [PATCH 7/8] [Eosc Explore | develop]: CHANGELOG.md: Updated date for version 3.1.0 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e16baf3..79690a7 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.1.0] - 05/09/2023 +## [3.1.0] - 11/09/2023 ### Added * Impact-based indicators - Citations, Popularity, Influence, Impulse ### Changed From db68cb505fb56931fe584be05d9853d6aac5f728 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 11 Sep 2023 18:15:20 +0300 Subject: [PATCH 8/8] Updating openaireLibrary before production release --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 741a70f..f679385 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 741a70fa1c236c83d96c4135063ef6bc8b0c431e +Subproject commit f6793857253fa5ca79e9576b25d0f8d0f67d3835