From ac835f379b4dbed5491752cbb66c8a500b449246 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 7 Nov 2022 11:10:26 +0200 Subject: [PATCH] [Aggregator]: aggregators.ts: Removed "software" entity from disabled list of canada | home.component: Updated checks for numbers section. --- src/app/home/home.component.html | 19 ++++++++++++------- src/app/home/home.component.ts | 30 ++++++++++++++++++++++++++++-- src/app/openaireLibrary | 2 +- src/app/utils/aggregators.ts | 2 +- src/assets/openaire-theme | 2 +- 5 files changed, 43 insertions(+), 12 deletions(-) diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index 5cf65f1..d5241b7 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -9,13 +9,18 @@
A comprehensive and open dataset of research information covering - {{numbers.publicationsSize.number|number}}{{numbers.publicationsSize.size}} {{openaireEntities.PUBLICATIONS.toLowerCase()}}, - {{numbers.datasetsSize.number|number}}{{numbers.datasetsSize.size}} {{openaireEntities.DATASETS.toLowerCase()}} - , - {{numbers.softwareSize.number|number}}{{numbers.softwareSize.size}} {{openaireEntities.SOFTWARE.toLowerCase()}} items, from - {{numbers.datasourcesSize.number|number}}{{numbers.datasourcesSize.size}} {{openaireEntities.DATASOURCES.toLowerCase()}}, linked to - {{numbers.projectsSize.number|number}}{{numbers.projectsSize.size}} grants and - {{numbers.organizationsSize.number|number}}{{numbers.organizationsSize.size}} {{openaireEntities.ORGANIZATIONS.toLowerCase()}}. + {{numbers.publicationsSize.number|number}}{{numbers.publicationsSize.size}} {{openaireEntities.PUBLICATIONS.toLowerCase()}} + , + {{numbers.datasetsSize.number|number}}{{numbers.datasetsSize.size}} {{openaireEntities.DATASETS.toLowerCase()}} + , + {{numbers.softwareSize.number|number}}{{numbers.softwareSize.size}} {{openaireEntities.SOFTWARE.toLowerCase()}} items + , + from + {{numbers.datasourcesSize.number|number}}{{numbers.datasourcesSize.size}} {{openaireEntities.DATASOURCES.toLowerCase()}} + , linked to + {{numbers.projectsSize.number|number}}{{numbers.projectsSize.size}} grants + and + {{numbers.organizationsSize.number|number}}{{numbers.organizationsSize.size}} {{openaireEntities.ORGANIZATIONS.toLowerCase()}}.
All linked together through citations and semantics.
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 91567e1..1d7eba1 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -70,7 +70,9 @@ export class HomeComponent { customFilter:SearchCustomFilter= null; aggregatorId; aggregator:AggregatorInfo; - @ViewChild('numbersComponent', { static: true }) numbersComponent: NumbersComponent; + // @ViewChild('numbersComponent', { static: true }) numbersComponent: NumbersComponent; + + numbersLimit: number = 100; constructor ( private route: ActivatedRoute, @@ -350,8 +352,32 @@ export class HomeComponent { } public get showContentWithNumbers() { - if (this.numbers && this.numbers.publicationsSize && this.numbers.datasetsSize && (this.numbers.softwareSize || !this.showSoftware) && this.numbers.datasourcesSize && this.numbers.projectsSize && this.numbers.organizationsSize) { + if (this.numbers && (this.hasPublications || this.hasDatasets || this.hasSoftware || this.hasDatasources || this.hasProjects || this.hasOrganizations)) { return true; } } + + public get hasPublications() { + return this.showPublications && this.numbers.publicationsSize && this.numbers.publicationsSize.number >= this.numbersLimit; + } + + public get hasDatasets() { + return this.showDatasets && this.numbers.datasetsSize && this.numbers.datasetsSize.number >= this.numbersLimit; + } + + public get hasSoftware() { + return this.showSoftware && this.numbers.softwareSize && this.numbers.softwareSize.number >= this.numbersLimit; + } + + public get hasDatasources() { + return this.showDataProviders && this.numbers.datasourcesSize && this.numbers.datasourcesSize.number >= this.numbersLimit; + } + + public get hasProjects() { + return this.showProjects && this.numbers.projectsSize && this.numbers.projectsSize.number >= this.numbersLimit; + } + + public get hasOrganizations() { + return this.showOrganizations && this.numbers.organizationsSize && this.numbers.organizationsSize.number >= this.numbersLimit; + } } diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 510d48d..1f30f9d 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 510d48d9bf9b45b33c7be68aeeb47695e1d56905 +Subproject commit 1f30f9d88aac7499585cde51fcf656466edeb7a8 diff --git a/src/app/utils/aggregators.ts b/src/app/utils/aggregators.ts index 473cfac..e836df8 100644 --- a/src/app/utils/aggregators.ts +++ b/src/app/utils/aggregators.ts @@ -74,7 +74,7 @@ export class PortalAggregators { new AggregatorInfo("greece", "Greek Aggregator", "assets/common-assets/logo-small-aggregator.png", "Country", "country", "GR", "Greece") ]; static disabled = { - "canada": {pages: ["/search/find/services"], entities: ["software", "service"]}, + "canada": {pages: ["/search/find/services"], entities: ["service"]}, "italy": {pages: ["/search/find/services"], entities: ["service"]}, "greece": {pages: ["/search/find/services"], entities: ["service"]} }; diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index c2bf664..67483e8 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit c2bf664ce363f49f64ca5b05f3456dd902dcad5b +Subproject commit 67483e8b95c23aa8dcb2d1203e1fe89a4d7f033f