From b1d4ac46656c391256a8d5591ebea90d9f40e84d Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Tue, 10 Oct 2023 17:42:40 +0300 Subject: [PATCH 1/6] [Library & Explore | develop]: Added in openaireLibrary environment files for common properties (environment.all.ts: Common properties among all portals, regardless environment, environment.-/test/beta/prod.ts: Common properties per environment among all portals) | environments/: Build and export properties by merging local properties and common properties. --- explore/src/environments/environment.beta.ts | 10 ++++++++-- explore/src/environments/environment.prod.ts | 10 ++++++++-- explore/src/environments/environment.test.ts | 11 +++++++++-- explore/src/environments/environment.ts | 18 ++++++++++++++++-- 4 files changed, 41 insertions(+), 8 deletions(-) diff --git a/explore/src/environments/environment.beta.ts b/explore/src/environments/environment.beta.ts index df37f765..78c529f4 100644 --- a/explore/src/environments/environment.beta.ts +++ b/explore/src/environments/environment.beta.ts @@ -1,6 +1,8 @@ import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties"; +import {common} from "../app/openaireLibrary/utils/properties/environments/environment.all"; +import {commonBeta} from "../app/openaireLibrary/utils/properties/environments/environment.beta"; -export let properties: EnvProperties = { +let props: EnvProperties = { environment: "beta", adminToolsPortalType: "explore", dashboard: "explore", @@ -33,7 +35,7 @@ export let properties: EnvProperties = { cordisURL: "http://cordis.europa.eu/projects/", openDoarURL: "http://v2.sherpa.ac.uk/id/repository/", r3DataURL: "http://service.re3data.org/repository/", - swhURL: "https://archive.softwareheritage.org/", + // swhURL: "https://archive.softwareheritage.org/", fairSharingURL: "https://fairsharing.org/", eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/", sherpaURL: "http://sherpa.ac.uk/romeo/issn/", @@ -128,3 +130,7 @@ export let properties: EnvProperties = { egiNotebookLink: "https://marketplace.eosc-portal.eu/services/egi-notebooks?q=EGI+Notebook" }; + +export let properties: EnvProperties = { + ...props, ...common, ...commonBeta +} diff --git a/explore/src/environments/environment.prod.ts b/explore/src/environments/environment.prod.ts index 9fc2b6c9..2560b132 100644 --- a/explore/src/environments/environment.prod.ts +++ b/explore/src/environments/environment.prod.ts @@ -1,6 +1,8 @@ import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties"; +import {common} from "../app/openaireLibrary/utils/properties/environments/environment.all"; +import {commonProd} from "../app/openaireLibrary/utils/properties/environments/environment.prod"; -export let properties: EnvProperties = { + let props: EnvProperties = { environment: "production", adminToolsPortalType: "explore", dashboard: "explore", @@ -33,7 +35,7 @@ export let properties: EnvProperties = { cordisURL: "http://cordis.europa.eu/projects/", openDoarURL: "http://v2.sherpa.ac.uk/id/repository/", r3DataURL: "http://service.re3data.org/repository/", - swhURL: "https://archive.softwareheritage.org/", + // swhURL: "https://archive.softwareheritage.org/", fairSharingURL: "https://fairsharing.org/", eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/", sherpaURL: "http://sherpa.ac.uk/romeo/issn/", @@ -131,3 +133,7 @@ export let properties: EnvProperties = { myOrcidLinksPage: "/my-orcid-links", footerGrantText: "OpenAIRE has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452" }; + +export let properties: EnvProperties = { + ...props, ...common, ...commonProd +} \ No newline at end of file diff --git a/explore/src/environments/environment.test.ts b/explore/src/environments/environment.test.ts index ee69aa9b..6866186d 100644 --- a/explore/src/environments/environment.test.ts +++ b/explore/src/environments/environment.test.ts @@ -1,6 +1,9 @@ import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties"; +import {common} from "../app/openaireLibrary/utils/properties/environments/environment.all"; +import {commonTest} from "../app/openaireLibrary/utils/properties/environments/environment.test"; -export let properties: EnvProperties = { +let props: EnvProperties = { +// export let properties: EnvProperties = { environment: "test", dashboard: "explore", adminToolsPortalType: "explore", @@ -32,7 +35,7 @@ export let properties: EnvProperties = { cordisURL: "http://cordis.europa.eu/projects/", openDoarURL: "http://v2.sherpa.ac.uk/id/repository/", r3DataURL: "http://service.re3data.org/repository/", - swhURL: "https://archive.softwareheritage.org/", + // swhURL: "https://archive.softwareheritage.org/", fairSharingURL: "https://fairsharing.org/", eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/", sherpaURL: "http://sherpa.ac.uk/romeo/issn/", @@ -128,3 +131,7 @@ export let properties: EnvProperties = { myOrcidLinksPage: "/my-orcid-links", footerGrantText: "OpenAIRE has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452" }; + +export let properties: EnvProperties = { + ...props, ...common, ...commonTest +} \ No newline at end of file diff --git a/explore/src/environments/environment.ts b/explore/src/environments/environment.ts index 875329e4..95a82a05 100644 --- a/explore/src/environments/environment.ts +++ b/explore/src/environments/environment.ts @@ -4,8 +4,10 @@ // The list of which env maps to which file can be found in `.angular-cli.json`. import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties"; +import {common} from "../app/openaireLibrary/utils/properties/environments/environment.all"; +import {commonDev} from "../app/openaireLibrary/utils/properties/environments/environment"; -export let properties: EnvProperties = { +let props: EnvProperties = { environment: "development", adminToolsPortalType: "explore", dashboard: "explore", @@ -21,17 +23,22 @@ export let properties: EnvProperties = { useNewStatistisTool: true, claimsAPIURL: "http://rudie.di.uoa.gr:8980/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/", // claimsAPIURL: "http://dl170.madgik.di.uoa.gr:8180/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/", + // From here searchAPIURLLAst: "http://beta.services.openaire.eu/search/v2/api/", searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources", + // to here openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=", csvAPIURL: "https://beta.services.openaire.eu/search/v2/api/reports", + // From here searchCrossrefAPIURL: "https://api.crossref.org/works", searchDataciteAPIURL: "https://api.datacite.org/works", searchOrcidURL: "https://pub.orcid.org/v2.1/", orcidURL: "https://orcid.org/", + // to here orcidAPIURL: "http://duffy.di.uoa.gr:19480/uoa-orcid-service/", orcidTokenURL : "https://sandbox.orcid.org/oauth/authorize?", orcidClientId: "APP-A5M3KTX6NCN67L91", + // From here doiURL: "https://doi.org/", pmcURL: "http://europepmc.org/articles/", pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/", @@ -39,9 +46,11 @@ export let properties: EnvProperties = { cordisURL: "http://cordis.europa.eu/projects/", openDoarURL: "http://v2.sherpa.ac.uk/id/repository/", r3DataURL: "http://service.re3data.org/repository/", - swhURL: "https://archive.softwareheritage.org/", + // swhURL: "https://archive.softwareheritage.org/", fairSharingURL: "https://fairsharing.org/", + // to here eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/", + // From here sherpaURL: "http://sherpa.ac.uk/romeo/issn/", sherpaURLSuffix: "/", zenodo: "https://zenodo.org/", @@ -50,6 +59,7 @@ export let properties: EnvProperties = { fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme", h2020Guidlines: "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020", ercGuidlines: "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf", + // to here helpdesk: "https://www.openaire.eu/support/helpdesk", helpdeskEmail: "helpdesk@openaire.eu", utilsService: "http://dl170.madgik.di.uoa.gr:8000", @@ -134,3 +144,7 @@ export let properties: EnvProperties = { egiNotebookLink: "https://marketplace.eosc-portal.eu/services/egi-notebooks?q=EGI+Notebook" }; + +export let properties: EnvProperties = { + ...props, ...common, ...commonDev +} \ No newline at end of file From bc05c92edca54fe3dd95a2274f15403f0aa43a95 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Wed, 11 Oct 2023 12:46:10 +0300 Subject: [PATCH 2/6] [Library | develop]: Added Full-Text in research products actions when available. 1. availableOn.component.ts: Added Full-Text before Data sources, as a separate action and as information for each instance. 2. parsingFunctions.class.ts: Added parsing for fulltext and updated method "compareHostedByCollectedFrom()" to sort by both access and existence of fulltext. 3. resultLanding.component.html: Removed classes for in mobile actions. 4. entity-actions.component.ts: Updated uk-text-bolder class for all actions. 5. result-preview.ts: Added "fulltext?: string;" in HostedByCollectedFrom. --- 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 5e4aaab0..9226a597 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 5e4aaab04f89446f956d524469ef2a856f556de5 +Subproject commit 9226a5975df57cdb43b795a202db565ac456f0b9 From 2d8400e9b7f232c3573448225bbc7f43e8736085 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Wed, 11 Oct 2023 13:24:21 +0300 Subject: [PATCH 3/6] [Explore | develop]: app.component.ts: Commented out MenuItem for funders page. --- explore/src/app/app.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/explore/src/app/app.component.ts b/explore/src/app/app.component.ts index 5b22f4ce..7de1b674 100644 --- a/explore/src/app/app.component.ts +++ b/explore/src/app/app.component.ts @@ -198,7 +198,7 @@ export class AppComponent { new MenuItem("", "Registries", "", "/search/entity-registries", false, ["datasource"], ["/search/entity-registries"], {}), new MenuItem("", "Browse all", "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], {})] ), - // new MenuItem("funders", "Funders", "", "/funders", false, [], ["/funders"], {}), + new MenuItem("funders", "Funders", "", "/funders", false, [], ["/funders"], {}), ]; if (Session.isPortalAdministrator(this.user)) { this.userMenuItems.push(new MenuItem("", "Manage all links", "", "/claims", false, [], ["/claims"], {})); From 185344d8787b1c6cc311ece57b06f22fcf5b5f2e Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 16 Oct 2023 11:44:18 +0300 Subject: [PATCH 4/6] [Library | develop]: search-input.component.ts: [Bug fix] Added cdr.detectChanges() call on ngAfterViewInit, to solve expressionChangedAfterItHasBeenChecked error. --- 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 9226a597..f0a48cd2 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 9226a5975df57cdb43b795a202db565ac456f0b9 +Subproject commit f0a48cd2e10ca9bc3c5edafa02c5af20b4106877 From 20ac4950135d09608c1441df96e1f3f9866dd1e5 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 16 Oct 2023 11:47:45 +0300 Subject: [PATCH 5/6] [Explore | develop]: funders.component.html: [Bug fix] Updated height-match cases and added uk-grid-match to fix and align heights of cards and their contents | funders.component.ts: Added check to not show when there is just one project for a funder (it is the custom unidentified project added for the data). --- .../src/app/funders/funders.component.html | 125 +++++++++--------- explore/src/app/funders/funders.component.ts | 32 ++--- 2 files changed, 81 insertions(+), 76 deletions(-) diff --git a/explore/src/app/funders/funders.component.html b/explore/src/app/funders/funders.component.html index 8759e2ea..0fac80e9 100644 --- a/explore/src/app/funders/funders.component.html +++ b/explore/src/app/funders/funders.component.html @@ -74,7 +74,7 @@ -
+
@@ -120,14 +120,15 @@
No funders available
-
-
+
-
+ +
@@ -138,66 +139,68 @@ Open Access
- -
- - - OpenAIRE placeholder logo - -
- -
- - {{funder.alias}} - -
- -
- - {{funder.name}} - -
-
- - diff --git a/explore/src/app/funders/funders.component.ts b/explore/src/app/funders/funders.component.ts index d68147ce..b08f1622 100644 --- a/explore/src/app/funders/funders.component.ts +++ b/explore/src/app/funders/funders.component.ts @@ -164,21 +164,23 @@ export class FundersComponent implements OnInit { // 3rd call let queriedFunders3 = data[2][1][0].values; queriedFunders3.forEach(queriedFunder => { - if(this.fundersMap.has(queriedFunder.id)) { - this.fundersMap.get(queriedFunder.id).projects = +queriedFunder.number; - } else { - this.fundersMap.set(queriedFunder.id, { - "id": queriedFunder.id, - "name": queriedFunder.name, - "alias": '', - "researchProducts": 0, - "openAccessResearchProducts": 0, - "openAccessPercentage": 0, - "projects": +queriedFunder.number, - "monitorDashboard": '', - "monitorDashboardStatus": '', - "logoUrl": '' - }); + if(+queriedFunder.number > 1) { + if (this.fundersMap.has(queriedFunder.id)) { + this.fundersMap.get(queriedFunder.id).projects = +queriedFunder.number; + } else { + this.fundersMap.set(queriedFunder.id, { + "id": queriedFunder.id, + "name": queriedFunder.name, + "alias": '', + "researchProducts": 0, + "openAccessResearchProducts": 0, + "openAccessPercentage": 0, + "projects": +queriedFunder.number, + "monitorDashboard": '', + "monitorDashboardStatus": '', + "logoUrl": '' + }); + } } }); From 7be7c084429291adea6e17b18f4314d394fdbcd7 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 16 Oct 2023 12:53:40 +0300 Subject: [PATCH 6/6] [Library | develop]: resultLanding.component.html: [Bug fix] Fix check isNumber for bip measures & remove check if value (show citation score also when it is 0). --- 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 f0a48cd2..fce84800 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit f0a48cd2e10ca9bc3c5edafa02c5af20b4106877 +Subproject commit fce848008aa7edf91be10a3a241d940abec0076a