Merge remote-tracking branch 'origin/develop' into angular-16

This commit is contained in:
Konstantina Galouni 2023-10-16 13:27:45 +03:00
commit 65ba5ef994
7 changed files with 123 additions and 85 deletions

View File

@ -198,7 +198,7 @@ export class AppComponent {
new MenuItem("", "Registries", "", "/search/entity-registries", false, ["datasource"], ["/search/entity-registries"], {}), 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("", "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)) { if (Session.isPortalAdministrator(this.user)) {
this.userMenuItems.push(new MenuItem("", "Manage all links", "", "/claims", false, [], ["/claims"], {})); this.userMenuItems.push(new MenuItem("", "Manage all links", "", "/claims", false, [], ["/claims"], {}));

View File

@ -74,7 +74,7 @@
</div> </div>
</ng-container> </ng-container>
<ng-container *ngIf="!showLoading && funders?.length"> <ng-container *ngIf="!showLoading && funders?.length">
<div class="uk-container uk-container-large" uk-height-match="target: .percentage;"> <div class="uk-container uk-container-large">
<div id="target" class="uk-section uk-padding-remove-top uk-margin-top" uk-height-match="target: .alias;"> <div id="target" class="uk-section uk-padding-remove-top uk-margin-top" uk-height-match="target: .alias;">
<div> <div>
<div *ngIf="funders" class="uk-padding-small uk-padding-remove-vertical uk-margin-medium-bottom uk-flex uk-flex-wrap uk-flex-middle uk-flex-between"> <div *ngIf="funders" class="uk-padding-small uk-padding-remove-vertical uk-margin-medium-bottom uk-flex uk-flex-wrap uk-flex-middle uk-flex-between">
@ -120,14 +120,15 @@
<div *ngIf="!displayedFunders || displayedFunders?.length == 0" class="uk-text-center uk-margin-large-top"> <div *ngIf="!displayedFunders || displayedFunders?.length == 0" class="uk-text-center uk-margin-large-top">
No funders available No funders available
</div> </div>
<div class="uk-grid uk-padding-small" [ngClass]="gridView ? 'uk-child-width-1-2@m uk-child-width-1-3@l' : 'uk-child-width-1-1'" <div class="uk-grid uk-grid-match uk-padding-small" [ngClass]="gridView ? 'uk-child-width-1-2@m uk-child-width-1-3@l' : 'uk-child-width-1-1'"
uk-grid uk-height-match="target: .info;"> uk-grid uk-height-match="target: .info;">
<div *ngFor="let funder of displayedFunders.slice((currentPage-1)*pageSize, currentPage*pageSize)"> <div *ngFor="let funder of displayedFunders.slice((currentPage-1)*pageSize, currentPage*pageSize)">
<!-- funder's card for GRID view --> <!-- funder's card for GRID view -->
<ng-container *ngIf="gridView || isMobile; else elseBlock"> <ng-container *ngIf="gridView || isMobile; else elseBlock">
<div class="uk-card uk-card-default uk-card-hover uk-card-body funder-grid"> <div class="uk-card uk-card-default uk-card-hover funder-grid">
<!-- OA % --> <!-- OA % -->
<div class="percentage uk-flex uk-flex-right uk-margin-bottom"> <!-- <div class="percentage uk-flex uk-flex-right uk-margin-bottom">-->
<div class="uk-position-top-right uk-padding-small">
<div *ngIf="funder.openAccessResearchProducts && funder.researchProducts" class="uk-text-center"> <div *ngIf="funder.openAccessResearchProducts && funder.researchProducts" class="uk-text-center">
<div class="uk-flex uk-flex-middle uk-flex-center"> <div class="uk-flex uk-flex-middle uk-flex-center">
<span class="uk-margin-xsmall-right open-access"> <span class="uk-margin-xsmall-right open-access">
@ -138,66 +139,68 @@
<span class="uk-h6 uk-text-small">Open Access</span> <span class="uk-h6 uk-text-small">Open Access</span>
</div> </div>
</div> </div>
<!-- funder logo --> <div class="uk-card-body">
<div class="uk-card-media-top uk-padding-large uk-padding-remove-vertical uk-flex uk-flex-center uk-flex-middle uk-height-xsmall"> <!-- funder logo -->
<img *ngIf="funder.logoUrl; else elseBlock" [src]="funder | logoUrl" [alt]="funder.name + ' logo'" class="uk-height-max-xsmall uk-blend-multiply"> <div class="uk-card-media-top uk-margin-medium-top uk-padding-large uk-padding-remove-vertical uk-flex uk-flex-center uk-flex-middle uk-height-xsmall">
<ng-template #elseBlock> <img *ngIf="funder.logoUrl; else elseBlock" [src]="funder | logoUrl" [alt]="funder.name + ' logo'" class="uk-height-max-xsmall uk-blend-multiply">
<img src="assets/common-assets/placeholder.png" alt="OpenAIRE placeholder logo" class="uk-height-max-xsmall uk-blend-multiply"> <ng-template #elseBlock>
</ng-template> <img src="assets/common-assets/placeholder.png" alt="OpenAIRE placeholder logo" class="uk-height-max-xsmall uk-blend-multiply">
</div> </ng-template>
<!-- funder alias --> </div>
<div class="alias uk-text-uppercase uk-text-small uk-margin-top type"> <!-- funder alias -->
<ng-container *ngIf="funder.alias"> <div class="alias uk-text-uppercase uk-text-small uk-margin-top type">
{{funder.alias}} <ng-container *ngIf="funder.alias">
</ng-container> {{funder.alias}}
</div> </ng-container>
<!-- funder name --> </div>
<div class="name uk-h6 uk-margin-remove multi-line-ellipsis lines-2"> <!-- funder name -->
<ng-container *ngIf="funder.name" > <div class="name uk-h6 uk-margin-remove multi-line-ellipsis lines-2">
{{funder.name}} <ng-container *ngIf="funder.name" >
</ng-container> {{funder.name}}
</div> </ng-container>
<div class="info uk-margin-medium-top"> </div>
<!-- Monitor dashboard --> <div class="info uk-margin-medium-top">
<div> <!-- Monitor dashboard -->
<!-- PUBLIC status --> <div class="monitor-dashboard">
<a *ngIf="funder.monitorDashboard && funder.monitorDashboardStatus != 'PRIVATE' && funder.monitorDashboardStatus != 'RESTRICTED'" <!-- PUBLIC status -->
class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text" <a *ngIf="funder.monitorDashboard && funder.monitorDashboardStatus != 'PRIVATE' && funder.monitorDashboardStatus != 'RESTRICTED'"
target="_blank" [href]="'https://'+(properties.environment =='beta' || properties.environment =='development'?'beta.':'')+'monitor.openaire.eu/dashboard/'+funder.alias"> class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text"
<span class="uk-flex uk-flex-middle"> target="_blank" [href]="'https://'+(properties.environment =='beta' || properties.environment =='development'?'beta.':'')+'monitor.openaire.eu/dashboard/'+funder.alias">
<span class="uk-flex uk-flex-middle">
<img src="assets/common-assets/common/Symbol.png" alt="OpenAIRE logo"
class="uk-margin-xsmall-right" style="width: 17px; height: 17px;">
<span class="monitor-dashboard-link uk-text-uppercase">Monitor Dashboard</span>
</span>
</a>
<!-- RESTRICTED status -->
<span *ngIf="funder.monitorDashboard && funder.monitorDashboardStatus == 'RESTRICTED'"
class="uk-flex uk-flex-middle">
<img src="assets/common-assets/common/Symbol.png" alt="OpenAIRE logo" <img src="assets/common-assets/common/Symbol.png" alt="OpenAIRE logo"
class="uk-margin-xsmall-right" style="width: 17px; height: 17px;"> class="uk-margin-xsmall-right" style="width: 17px; height: 17px;">
<span class="monitor-dashboard-link uk-text-uppercase">Monitor Dashboard</span> <span class="monitor-dashboard-link uk-text-uppercase uk-text-bold uk-text-small">Monitor Dashboard</span>
<icon class="uk-margin-xsmall-left" name="closed_access" [flex]="true" [ratio]="1"></icon>
</span> </span>
</a> </div>
<!-- RESTRICTED status --> <!-- Projects -->
<span *ngIf="funder.monitorDashboard && funder.monitorDashboardStatus == 'RESTRICTED'" <div>
class="uk-flex uk-flex-middle"> <a *ngIf="funder.projects"
<img src="assets/common-assets/common/Symbol.png" alt="OpenAIRE logo" class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text"
class="uk-margin-xsmall-right" style="width: 17px; height: 17px;"> [routerLink]="properties.searchLinkToProjects" [queryParams]="{'funder': urlEncodeAndQuote(funder.id)}">
<span class="monitor-dashboard-link uk-text-uppercase uk-text-bold uk-text-small">Monitor Dashboard</span> <span class="uk-flex uk-flex-middle">
<icon class="uk-margin-xsmall-left" name="closed_access" [flex]="true" [ratio]="1"></icon> <span>Projects ({{funder.projects | number}})</span>
</span> </span>
</div> </a>
<!-- Projects --> </div>
<div> <!-- Research products -->
<a *ngIf="funder.projects" <div>
class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text" <a *ngIf="funder.researchProducts"
[routerLink]="properties.searchLinkToProjects" [queryParams]="{'funder': urlEncodeAndQuote(funder.id)}"> class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text"
<span class="uk-flex uk-flex-middle"> [routerLink]="properties.searchLinkToResults" [queryParams]="{'relfunder': urlEncodeAndQuote(funder.id)}">
<span>Projects ({{funder.projects | number}})</span> <span class="uk-flex uk-flex-middle">
</span> <span>Research Products ({{funder.researchProducts | number}})</span>
</a> </span>
</div> </a>
<!-- Research products --> </div>
<div>
<a *ngIf="funder.researchProducts"
class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text"
[routerLink]="properties.searchLinkToResults" [queryParams]="{'relfunder': urlEncodeAndQuote(funder.id)}">
<span class="uk-flex uk-flex-middle">
<span>Research Products ({{funder.researchProducts | number}})</span>
</span>
</a>
</div> </div>
</div> </div>
</div> </div>

View File

@ -164,21 +164,23 @@ export class FundersComponent implements OnInit {
// 3rd call // 3rd call
let queriedFunders3 = data[2][1][0].values; let queriedFunders3 = data[2][1][0].values;
queriedFunders3.forEach(queriedFunder => { queriedFunders3.forEach(queriedFunder => {
if(this.fundersMap.has(queriedFunder.id)) { if(+queriedFunder.number > 1) {
this.fundersMap.get(queriedFunder.id).projects = +queriedFunder.number; if (this.fundersMap.has(queriedFunder.id)) {
} else { this.fundersMap.get(queriedFunder.id).projects = +queriedFunder.number;
this.fundersMap.set(queriedFunder.id, { } else {
"id": queriedFunder.id, this.fundersMap.set(queriedFunder.id, {
"name": queriedFunder.name, "id": queriedFunder.id,
"alias": '', "name": queriedFunder.name,
"researchProducts": 0, "alias": '',
"openAccessResearchProducts": 0, "researchProducts": 0,
"openAccessPercentage": 0, "openAccessResearchProducts": 0,
"projects": +queriedFunder.number, "openAccessPercentage": 0,
"monitorDashboard": '', "projects": +queriedFunder.number,
"monitorDashboardStatus": '', "monitorDashboard": '',
"logoUrl": '' "monitorDashboardStatus": '',
}); "logoUrl": ''
});
}
} }
}); });

View File

@ -1,6 +1,8 @@
import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties"; 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", environment: "beta",
adminToolsPortalType: "explore", adminToolsPortalType: "explore",
dashboard: "explore", dashboard: "explore",
@ -33,7 +35,7 @@ export let properties: EnvProperties = {
cordisURL: "http://cordis.europa.eu/projects/", cordisURL: "http://cordis.europa.eu/projects/",
openDoarURL: "http://v2.sherpa.ac.uk/id/repository/", openDoarURL: "http://v2.sherpa.ac.uk/id/repository/",
r3DataURL: "http://service.re3data.org/repository/", r3DataURL: "http://service.re3data.org/repository/",
swhURL: "https://archive.softwareheritage.org/", // swhURL: "https://archive.softwareheritage.org/",
fairSharingURL: "https://fairsharing.org/", fairSharingURL: "https://fairsharing.org/",
eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/", eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/",
sherpaURL: "http://sherpa.ac.uk/romeo/issn/", 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" egiNotebookLink: "https://marketplace.eosc-portal.eu/services/egi-notebooks?q=EGI+Notebook"
}; };
export let properties: EnvProperties = {
...props, ...common, ...commonBeta
}

View File

@ -1,6 +1,8 @@
import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties"; 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", environment: "production",
adminToolsPortalType: "explore", adminToolsPortalType: "explore",
dashboard: "explore", dashboard: "explore",
@ -33,7 +35,7 @@ export let properties: EnvProperties = {
cordisURL: "http://cordis.europa.eu/projects/", cordisURL: "http://cordis.europa.eu/projects/",
openDoarURL: "http://v2.sherpa.ac.uk/id/repository/", openDoarURL: "http://v2.sherpa.ac.uk/id/repository/",
r3DataURL: "http://service.re3data.org/repository/", r3DataURL: "http://service.re3data.org/repository/",
swhURL: "https://archive.softwareheritage.org/", // swhURL: "https://archive.softwareheritage.org/",
fairSharingURL: "https://fairsharing.org/", fairSharingURL: "https://fairsharing.org/",
eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/", eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/",
sherpaURL: "http://sherpa.ac.uk/romeo/issn/", sherpaURL: "http://sherpa.ac.uk/romeo/issn/",
@ -131,3 +133,7 @@ export let properties: EnvProperties = {
myOrcidLinksPage: "/my-orcid-links", 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" 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
}

View File

@ -1,6 +1,9 @@
import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties"; 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", environment: "test",
dashboard: "explore", dashboard: "explore",
adminToolsPortalType: "explore", adminToolsPortalType: "explore",
@ -32,7 +35,7 @@ export let properties: EnvProperties = {
cordisURL: "http://cordis.europa.eu/projects/", cordisURL: "http://cordis.europa.eu/projects/",
openDoarURL: "http://v2.sherpa.ac.uk/id/repository/", openDoarURL: "http://v2.sherpa.ac.uk/id/repository/",
r3DataURL: "http://service.re3data.org/repository/", r3DataURL: "http://service.re3data.org/repository/",
swhURL: "https://archive.softwareheritage.org/", // swhURL: "https://archive.softwareheritage.org/",
fairSharingURL: "https://fairsharing.org/", fairSharingURL: "https://fairsharing.org/",
eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/", eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/",
sherpaURL: "http://sherpa.ac.uk/romeo/issn/", sherpaURL: "http://sherpa.ac.uk/romeo/issn/",
@ -128,3 +131,7 @@ export let properties: EnvProperties = {
myOrcidLinksPage: "/my-orcid-links", 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" 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
}

View File

@ -4,8 +4,10 @@
// The list of which env maps to which file can be found in `.angular-cli.json`. // 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 {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", environment: "development",
adminToolsPortalType: "explore", adminToolsPortalType: "explore",
dashboard: "explore", dashboard: "explore",
@ -21,17 +23,22 @@ export let properties: EnvProperties = {
useNewStatistisTool: true, useNewStatistisTool: true,
claimsAPIURL: "http://rudie.di.uoa.gr:8980/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/", 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/", // 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/", searchAPIURLLAst: "http://beta.services.openaire.eu/search/v2/api/",
searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources", searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources",
// to here
openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=", openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=",
csvAPIURL: "https://beta.services.openaire.eu/search/v2/api/reports", csvAPIURL: "https://beta.services.openaire.eu/search/v2/api/reports",
// From here
searchCrossrefAPIURL: "https://api.crossref.org/works", searchCrossrefAPIURL: "https://api.crossref.org/works",
searchDataciteAPIURL: "https://api.datacite.org/works", searchDataciteAPIURL: "https://api.datacite.org/works",
searchOrcidURL: "https://pub.orcid.org/v2.1/", searchOrcidURL: "https://pub.orcid.org/v2.1/",
orcidURL: "https://orcid.org/", orcidURL: "https://orcid.org/",
// to here
orcidAPIURL: "http://duffy.di.uoa.gr:19480/uoa-orcid-service/", orcidAPIURL: "http://duffy.di.uoa.gr:19480/uoa-orcid-service/",
orcidTokenURL : "https://sandbox.orcid.org/oauth/authorize?", orcidTokenURL : "https://sandbox.orcid.org/oauth/authorize?",
orcidClientId: "APP-A5M3KTX6NCN67L91", orcidClientId: "APP-A5M3KTX6NCN67L91",
// From here
doiURL: "https://doi.org/", doiURL: "https://doi.org/",
pmcURL: "http://europepmc.org/articles/", pmcURL: "http://europepmc.org/articles/",
pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/", pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/",
@ -39,9 +46,11 @@ export let properties: EnvProperties = {
cordisURL: "http://cordis.europa.eu/projects/", cordisURL: "http://cordis.europa.eu/projects/",
openDoarURL: "http://v2.sherpa.ac.uk/id/repository/", openDoarURL: "http://v2.sherpa.ac.uk/id/repository/",
r3DataURL: "http://service.re3data.org/repository/", r3DataURL: "http://service.re3data.org/repository/",
swhURL: "https://archive.softwareheritage.org/", // swhURL: "https://archive.softwareheritage.org/",
fairSharingURL: "https://fairsharing.org/", fairSharingURL: "https://fairsharing.org/",
// to here
eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/", eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/",
// From here
sherpaURL: "http://sherpa.ac.uk/romeo/issn/", sherpaURL: "http://sherpa.ac.uk/romeo/issn/",
sherpaURLSuffix: "/", sherpaURLSuffix: "/",
zenodo: "https://zenodo.org/", 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", 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", 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", 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", helpdesk: "https://www.openaire.eu/support/helpdesk",
helpdeskEmail: "helpdesk@openaire.eu", helpdeskEmail: "helpdesk@openaire.eu",
utilsService: "http://dl170.madgik.di.uoa.gr:8000", 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" egiNotebookLink: "https://marketplace.eosc-portal.eu/services/egi-notebooks?q=EGI+Notebook"
}; };
export let properties: EnvProperties = {
...props, ...common, ...commonDev
}