From aed67b083329a559f72e502ff10d4cf5ec45517a Mon Sep 17 00:00:00 2001 From: Alex Martzios Date: Tue, 24 Sep 2024 10:53:05 +0300 Subject: [PATCH 1/9] [develop] update submodules --- explore/src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index 22794202..bef6dda2 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 2279420241dcecb156055fb10251930111e29197 +Subproject commit bef6dda2c21e5ef4f40352c34ebd2b62d0ad84a6 From e9f53ad5053e4a615e33a392c5eeaf88ff12cdcb Mon Sep 17 00:00:00 2001 From: argirok Date: Tue, 15 Oct 2024 14:21:56 +0300 Subject: [PATCH 2/9] [develop | ADDED| DONE ] add properties for dl170 --- services/cache/mecache/dl170-properties.file | 4 ++++ services/cache/mecache/package.json | 3 ++- services/utils-service/dl170-properties.file | 14 ++++++++++++++ services/utils-service/package.json | 3 ++- services/utils-service/properties.file | 6 +++--- 5 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 services/cache/mecache/dl170-properties.file create mode 100644 services/utils-service/dl170-properties.file diff --git a/services/cache/mecache/dl170-properties.file b/services/cache/mecache/dl170-properties.file new file mode 100644 index 00000000..0bfaa207 --- /dev/null +++ b/services/cache/mecache/dl170-properties.file @@ -0,0 +1,4 @@ +port = 3000 +utilsService= http://dl170.madgik.di.uoa.gr:8000 +environment = development +preloadRequests =https://dev-openaire.d4science.org/openaire/info/,https://dev-openaire.d4science.org/openaire/contexts/,https://dev-openaire.d4science.org/provision/mvc/vocabularies/dnet:provenanceActions.json,https://dev-openaire.d4science.org/provision/mvc/vocabularies/dnet:subject_classification_typologies.json,https://dev-openaire.d4science.org/provision/mvc/vocabularies/dnet:publication_resource.json,https://dev-openaire.d4science.org/provision/mvc/vocabularies/dnet:dataCite_resource.json,https://dev-openaire.d4science.org/provision/mvc/vocabularies/dnet:languages.json,https://dev-openaire.d4science.org/provision/mvc/vocabularies/dnet:access_modes.json,https://dev-openaire.d4science.org/provision/mvc/vocabularies/dnet:datasource_typologies.json,https://dev-openaire.d4science.org/provision/mvc/vocabularies/dnet:datasourceCompatibilityLevel.json,https://dev-openaire.d4science.org/provision/mvc/vocabularies/dnet:countries.json diff --git a/services/cache/mecache/package.json b/services/cache/mecache/package.json index 27345f42..9b30bb70 100644 --- a/services/cache/mecache/package.json +++ b/services/cache/mecache/package.json @@ -7,7 +7,8 @@ "start": "node cache.js", "prepare-dist": "rm -rf dist; mkdir dist; cp package.json ./dist; cp cache.js ./dist; cp properties.file ./dist;", "prepare-beta": " npm run prepare-dist; cp beta-properties.file ./dist/properties.file", - "prepare-prod": " npm run prepare-dist; cp production-properties.file ./dist/properties.file" + "prepare-prod": " npm run prepare-dist; cp production-properties.file ./dist/properties.file", + "prepare-dl170": " npm run prepare-dist; cp dl170-properties.file ./dist/properties.file" }, "dependencies": { "access-log": "^0.4.1", diff --git a/services/utils-service/dl170-properties.file b/services/utils-service/dl170-properties.file new file mode 100644 index 00000000..c06ac7a5 --- /dev/null +++ b/services/utils-service/dl170-properties.file @@ -0,0 +1,14 @@ +userInfoUrl = http://dl170.madgik.di.uoa.gr:19080/login-service/userInfo +searchServiceAPIUrl = https://beta.services.openaire.eu/search/v2/api/ +monitorAPIUrl = http://dl170.madgik.di.uoa.gr:19380/uoa-monitor-service/ +irishMonitorAPIUrl = http://dl170.madgik.di.uoa.gr:19680/irish-monitor-service/ +fundersServiceAPIUrl = https://dev-openaire.d4science.org/openaire/funders/ +ssl = false +localPath = true +# photo size in KB +max.size = 200 +# file size in KB +big-max.size = 1000 +port = 8000 + + diff --git a/services/utils-service/package.json b/services/utils-service/package.json index b816d04a..f202d15e 100644 --- a/services/utils-service/package.json +++ b/services/utils-service/package.json @@ -7,7 +7,8 @@ "start": "node uploadService.js", "prepare-dist": "rm -rf dist; mkdir dist; cp package.json ./dist; cp uploadService.js ./dist; cp properties.file ./dist;", "prepare-beta": " npm run prepare-dist; cp beta-properties.file ./dist/properties.file", - "prepare-prod": " npm run prepare-dist; cp production-properties.file ./dist/properties.file" + "prepare-prod": " npm run prepare-dist; cp production-properties.file ./dist/properties.file", + "prepare-dl170": " npm run prepare-dist; cp dl170-properties.file ./dist/properties.file" }, "keywords": [], "author": "", diff --git a/services/utils-service/properties.file b/services/utils-service/properties.file index ad1fea18..f3678991 100644 --- a/services/utils-service/properties.file +++ b/services/utils-service/properties.file @@ -1,7 +1,7 @@ -userInfoUrl = http://mpagasas.di.uoa.gr:19080/login-service/userInfo +userInfoUrl = http://dl170.madgik.di.uoa.gr:19080/login-service/userInfo searchServiceAPIUrl = https://beta.services.openaire.eu/search/v2/api/ -monitorAPIUrl = http://duffy.di.uoa.gr:19380/uoa-monitor-service/ -irishMonitorAPIUrl = http://mpagasas.di.uoa.gr:19780/irish-monitor-service/ +monitorAPIUrl = http://dl170.madgik.di.uoa.gr:19380/uoa-monitor-service/ +irishMonitorAPIUrl = http://dl170.madgik.di.uoa.gr:19680/irish-monitor-service/ fundersServiceAPIUrl = https://dev-openaire.d4science.org/openaire/funders/ ssl = false localPath = true From 5bdc50c15150f51e8d0e061d3d21caaca4f2b43a Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Thu, 17 Oct 2024 14:59:38 +0300 Subject: [PATCH 3/9] Updating openaireLibrary --- explore/src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index bef6dda2..19b52253 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit bef6dda2c21e5ef4f40352c34ebd2b62d0ad84a6 +Subproject commit 19b5225396a51be7883b61a250b868bae6c2b1b5 From b08e993d0276ba542bae8336c99c1a5914fa8cf9 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Tue, 29 Oct 2024 16:20:40 +0200 Subject: [PATCH 4/9] Updating openaireLibrary & common-assets --- explore/src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index 19b52253..ebff3041 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 19b5225396a51be7883b61a250b868bae6c2b1b5 +Subproject commit ebff30414f3e62a2a44ee5fa98ae314b16cec789 From 48039e9d24f94891274e14fee08fede984a2b969 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 25 Nov 2024 17:32:42 +0200 Subject: [PATCH 5/9] Updating openaireLibrary & openaire-theme --- explore/src/app/openaireLibrary | 2 +- explore/src/assets/openaire-theme | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index ebff3041..503ab406 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit ebff30414f3e62a2a44ee5fa98ae314b16cec789 +Subproject commit 503ab40616c53a071cd74fb2802cd3de130923f6 diff --git a/explore/src/assets/openaire-theme b/explore/src/assets/openaire-theme index b4d09b7c..c6d21a6c 160000 --- a/explore/src/assets/openaire-theme +++ b/explore/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit b4d09b7cd942893c238d4152eeac1bbc822a0b13 +Subproject commit c6d21a6c027df56ae3bbf5c489b2ee9893924aef From 0739873ceb078c4d6335beb609518bc906d81933 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Thu, 28 Nov 2024 17:00:17 +0200 Subject: [PATCH 6/9] [develop | DONE | FIXED]: funders.component.ts: Fixed filtering by "rfo" (irish dashboard) | Removed asc., desc. from sorting options and updated misleading labels. --- explore/src/app/funders/funders.component.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/explore/src/app/funders/funders.component.ts b/explore/src/app/funders/funders.component.ts index 418b3329..623dec5a 100644 --- a/explore/src/app/funders/funders.component.ts +++ b/explore/src/app/funders/funders.component.ts @@ -118,12 +118,12 @@ export class FundersComponent implements OnInit { {value: 'rfo', label: 'Funders with RFO dashboard'} ]; this.sortOptions = [ - {value: 'alphAsc', label: 'Alphabetically asc. (A-Z)'}, - {value: 'alphDsc', label: 'Alphabetically desc. (Z-A)'}, - {value: 'oaDsc', label: 'Open Access % desc.'}, - {value: 'countryAsc', label: 'Country desc. (A-Z)'}, - {value: 'researcProductsDsc', label: this.openaireEntities.RESULTS+' desc.'}, - {value: 'projectsDsc', label: this.openaireEntities.PROJECTS+' desc.'} + {value: 'alphAsc', label: 'Alphabetically (A-Z)'}, + {value: 'alphDsc', label: 'Alphabetically (Z-A)'}, + {value: 'oaDsc', label: 'Openness'}, + {value: 'countryAsc', label: 'Country name (A-Z)'}, + {value: 'researcProductsDsc', label: 'Number of ' + this.openaireEntities.RESULTS}, + {value: 'projectsDsc', label: 'Number of ' + this.openaireEntities.PROJECTS} ]; this.getFunders(); this.keywordControl = this.fb.control(''); @@ -404,7 +404,7 @@ export class FundersComponent implements OnInit { } if(this.show == 'rfo') { - displayedFunders = displayedFunders.filter(funder => funder.monitorDashboard && funder.monitorDashboard?.length > 0 && ((funder.irishDashboardStatus && funder.irishDashboardStatus != 'PRIVATE'))); + displayedFunders = displayedFunders.filter(funder => funder.irishDashboard && funder.irishDashboard?.length > 0 && ((funder.irishDashboardStatus && funder.irishDashboardStatus != 'PRIVATE'))); } this.displayedFunders = displayedFunders; From 360626a35d6c3894e30d382b420140a64c6be5d6 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 2 Dec 2024 14:46:25 +0200 Subject: [PATCH 7/9] [develop | DONE | CHANGED]: funders.component.ts: Updated label of "Openness" sorting option to "Openness score". --- explore/src/app/funders/funders.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/explore/src/app/funders/funders.component.ts b/explore/src/app/funders/funders.component.ts index 623dec5a..4ec0579f 100644 --- a/explore/src/app/funders/funders.component.ts +++ b/explore/src/app/funders/funders.component.ts @@ -120,7 +120,7 @@ export class FundersComponent implements OnInit { this.sortOptions = [ {value: 'alphAsc', label: 'Alphabetically (A-Z)'}, {value: 'alphDsc', label: 'Alphabetically (Z-A)'}, - {value: 'oaDsc', label: 'Openness'}, + {value: 'oaDsc', label: 'Openness score'}, {value: 'countryAsc', label: 'Country name (A-Z)'}, {value: 'researcProductsDsc', label: 'Number of ' + this.openaireEntities.RESULTS}, {value: 'projectsDsc', label: 'Number of ' + this.openaireEntities.PROJECTS} From 46a38c3284cf4768e8414dbaf81f9e34d72e36eb Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 2 Dec 2024 14:49:37 +0200 Subject: [PATCH 8/9] [develop | DONE | CHANGED]: #9526 - env-properties.ts & environment.ts: Added property "erasmusURL" | project.service.ts: Set project info url to ERASMUS+ (not CORDIS) when funding stream is ERASMUS+. --- explore/src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index 503ab406..b81609b2 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 503ab40616c53a071cd74fb2802cd3de130923f6 +Subproject commit b81609b265d8df5f67044a4bcde507bff198d994 From f323742e365fe566e18c1e93009b9595d53eb025 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Tue, 3 Dec 2024 11:09:52 +0200 Subject: [PATCH 9/9] [develop | DONE | ADDED]: Added "arXiv" pid. 1. env-properties.ts & environment.ts: Added and set property "arxivURL". 2. string-utils.class.ts & parsingFunctions.class.ts: Added method "isValidArxiv" and added "arXiv" in the list of pids portals expose. 3. showIdentifiers.component.ts: Added checks to also display "arXiv". --- explore/src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index b81609b2..799af0ba 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit b81609b265d8df5f67044a4bcde507bff198d994 +Subproject commit 799af0ba6afc4c88c00d6a452c5dba772121070b