diff --git a/src/app/develop/develop.component.ts b/src/app/develop/develop.component.ts index 0eb6bbb..85e9e59 100644 --- a/src/app/develop/develop.component.ts +++ b/src/app/develop/develop.component.ts @@ -25,7 +25,7 @@ import {StakeholderUtils} from "../utils/indicator-utils";
For research outcomes (publications, datasets, software and other research data) you can use the Selective Access APIs by adding the funder parameter.
- Selective Access APIs @@ -43,14 +43,14 @@ import {StakeholderUtils} from "../utils/indicator-utils";
For projects you can use the Selective Access APIs and the Bulk Access APIs.
-
\ - + Selective Access APIs - Bulk Access APIs diff --git a/src/app/manageStakeholders/manageStakeholders.component.html b/src/app/manageStakeholders/manageStakeholders.component.html index 1825397..a3d8956 100644 --- a/src/app/manageStakeholders/manageStakeholders.component.html +++ b/src/app/manageStakeholders/manageStakeholders.component.html @@ -90,7 +90,7 @@
- +

{{stakeholder.name}} diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html index 2e7986e..879b194 100644 --- a/src/app/monitor/monitor.component.html +++ b/src/app/monitor/monitor.component.html @@ -181,7 +181,7 @@

- @@ -193,7 +193,7 @@ class="custom-description-overlay uk-card uk-card-default uk-flex uk-flex-middle uk-flex-center">
- +
diff --git a/src/app/monitor/monitor.module.ts b/src/app/monitor/monitor.module.ts index 798f77e..d119467 100644 --- a/src/app/monitor/monitor.module.ts +++ b/src/app/monitor/monitor.module.ts @@ -23,7 +23,7 @@ import {SearchFilterModule} from "../openaireLibrary/searchPages/searchUtils/sea import {PageContentModule} from "../openaireLibrary/dashboard/sharedComponents/page-content/page-content.module"; import {IconsService} from '../openaireLibrary/utils/icons/icons.service'; import {IconsModule} from '../openaireLibrary/utils/icons/icons.module'; -import {filters, incognito} from "../openaireLibrary/utils/icons/icons"; +import {filters, graph, incognito} from "../openaireLibrary/utils/icons/icons"; import {LogoUrlPipeModule} from "../openaireLibrary/utils/pipes/logoUrlPipe.module"; @NgModule({ @@ -47,6 +47,6 @@ import {LogoUrlPipeModule} from "../openaireLibrary/utils/pipes/logoUrlPipe.modu }) export class MonitorModule { constructor(private iconsService: IconsService) { - this.iconsService.registerIcons([incognito, filters]); + this.iconsService.registerIcons([incognito, filters, graph]); } } diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index aa21038..d17f9b4 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit aa210384bc1df7b11595243096fd9fd5c8e01ae8 +Subproject commit d17f9b4d5c548a8f5f36cc7049f1b27ac23874d3 diff --git a/src/app/search/searchPages/advanced/searchDataproviders.component.ts b/src/app/search/searchPages/advanced/searchDataproviders.component.ts index 45fd48c..2a569a6 100644 --- a/src/app/search/searchPages/advanced/searchDataproviders.component.ts +++ b/src/app/search/searchPages/advanced/searchDataproviders.component.ts @@ -1,20 +1,22 @@ -import {Component} from '@angular/core'; +import {Component, Input} from '@angular/core'; import {SearchCustomFilter} from "../../../openaireLibrary/searchPages/searchUtils/searchUtils.class"; import {ActivatedRoute, Router} from "@angular/router"; import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service"; import {Subscriber} from "rxjs"; import {ConfigurationService} from "../../../openaireLibrary/utils/configuration/configuration.service"; +import {SearchForm} from "../../../openaireLibrary/searchPages/searchUtils/newSearchPage.component"; @Component({ selector: 'monitor-advanced-search-dataproviders', template: ` ` }) export class MonitorAdvancedSearchDataprovidersComponent { + @Input() searchForm: SearchForm = {class: 'search-form', dark: false}; customFilter: SearchCustomFilter = null; initialized: boolean = false; showSwitchSearchLink:boolean = false; diff --git a/src/app/search/searchPages/advanced/searchOrganizations.component.ts b/src/app/search/searchPages/advanced/searchOrganizations.component.ts index 9a1cfc9..9bf7004 100644 --- a/src/app/search/searchPages/advanced/searchOrganizations.component.ts +++ b/src/app/search/searchPages/advanced/searchOrganizations.component.ts @@ -1,19 +1,21 @@ -import {Component} from '@angular/core'; +import {Component, Input} from '@angular/core'; import {ActivatedRoute, Router} from "@angular/router"; import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service"; import {SearchCustomFilter} from "../../../openaireLibrary/searchPages/searchUtils/searchUtils.class"; import {Subscriber} from "rxjs"; import {ConfigurationService} from "../../../openaireLibrary/utils/configuration/configuration.service"; +import {SearchForm} from "../../../openaireLibrary/searchPages/searchUtils/newSearchPage.component"; @Component({ selector: 'monitor-advanced-search-organizations', template: ` + [piwikSiteId]="piwikSiteId" [searchForm]="searchForm"> ` }) export class MonitorAdvancedSearchOrganizationsComponent { + @Input() searchForm: SearchForm = {class: 'search-form', dark: false}; initialized: boolean = false; customFilter: SearchCustomFilter = null; piwikSiteId; diff --git a/src/app/search/searchPages/advanced/searchProjects.component.ts b/src/app/search/searchPages/advanced/searchProjects.component.ts index 23c4c04..991cf6c 100644 --- a/src/app/search/searchPages/advanced/searchProjects.component.ts +++ b/src/app/search/searchPages/advanced/searchProjects.component.ts @@ -1,10 +1,11 @@ -import {Component} from '@angular/core'; +import {Component, Input} from '@angular/core'; import {SearchCustomFilter} from "../../../openaireLibrary/searchPages/searchUtils/searchUtils.class"; import {ActivatedRoute, Router} from "@angular/router"; import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service"; import {Subscriber} from "rxjs"; import {properties} from "../../../../environments/environment"; import {ConfigurationService} from "../../../openaireLibrary/utils/configuration/configuration.service"; +import {SearchForm} from "../../../openaireLibrary/searchPages/searchUtils/newSearchPage.component"; @Component({ selector: 'monitor-advanced-search-projects', @@ -13,13 +14,14 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration [customFilter]=customFilter [hasPrefix]="false" [includeOnlyResultsAndFilter]="false" [showSwitchSearchLink]="showSwitchSearchLink" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/simple/projects'" - [piwikSiteId]="piwikSiteId" + [piwikSiteId]="piwikSiteId" [searchForm]="searchForm" > ` }) export class MonitorAdvancedSearchProjectsComponent { + @Input() searchForm: SearchForm = {class: 'search-form', dark: false}; customFilter: SearchCustomFilter = null; initialized: boolean = false; showSwitchSearchLink:boolean = false; diff --git a/src/app/search/searchPages/advanced/searchResearchResults.component.ts b/src/app/search/searchPages/advanced/searchResearchResults.component.ts index 6883b18..e3f96d3 100644 --- a/src/app/search/searchPages/advanced/searchResearchResults.component.ts +++ b/src/app/search/searchPages/advanced/searchResearchResults.component.ts @@ -1,10 +1,11 @@ -import {Component} from '@angular/core'; +import {Component, Input} from '@angular/core'; import {SearchCustomFilter} from "../../../openaireLibrary/searchPages/searchUtils/searchUtils.class"; import {ActivatedRoute, Router} from "@angular/router"; import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service"; import {Subscriber} from "rxjs"; import {properties} from "../../../../environments/environment"; import {ConfigurationService} from "../../../openaireLibrary/utils/configuration/configuration.service"; +import {SearchForm} from "../../../openaireLibrary/searchPages/searchUtils/newSearchPage.component"; @Component({ selector: 'monitor-advanced-search-results', @@ -21,6 +22,7 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration export class MonitorAdvancedSearchResearchResultsComponent { customFilter: SearchCustomFilter = null; initialized: boolean = false; + @Input() searchForm: SearchForm = {class: 'search-form', dark: true}; properties; piwikSiteId; constructor(private route: ActivatedRoute, diff --git a/src/app/search/searchPages/simple/searchDataproviders.component.ts b/src/app/search/searchPages/simple/searchDataproviders.component.ts index f2e0506..a2e6bad 100644 --- a/src/app/search/searchPages/simple/searchDataproviders.component.ts +++ b/src/app/search/searchPages/simple/searchDataproviders.component.ts @@ -1,20 +1,22 @@ -import {Component} from '@angular/core'; +import {Component, Input} from '@angular/core'; import {SearchCustomFilter} from "../../../openaireLibrary/searchPages/searchUtils/searchUtils.class"; import {ActivatedRoute, Router} from "@angular/router"; import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service"; import {Subscriber} from "rxjs"; import {ConfigurationService} from "../../../openaireLibrary/utils/configuration/configuration.service"; +import {SearchForm} from "../../../openaireLibrary/searchPages/searchUtils/newSearchPage.component"; @Component({ selector: 'monitor-search-dataproviders', template: ` ` }) export class MonitorSearchDataprovidersComponent { + @Input() searchForm: SearchForm = {class: 'search-form', dark: false}; customFilter: SearchCustomFilter = null; initialized: boolean = false; showSwitchSearchLink:boolean = false; diff --git a/src/app/search/searchPages/simple/searchOrganizations.component.ts b/src/app/search/searchPages/simple/searchOrganizations.component.ts index 787e7d4..ddc6e9a 100644 --- a/src/app/search/searchPages/simple/searchOrganizations.component.ts +++ b/src/app/search/searchPages/simple/searchOrganizations.component.ts @@ -1,17 +1,19 @@ -import {Component} from '@angular/core'; +import {Component, Input} from '@angular/core'; import {ActivatedRoute, Router} from "@angular/router"; import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service"; import {Subscriber} from "rxjs"; import {ConfigurationService} from "../../../openaireLibrary/utils/configuration/configuration.service"; +import {SearchForm} from "../../../openaireLibrary/searchPages/searchUtils/newSearchPage.component"; @Component({ selector: 'monitor-search-organizations', template: ` - + ` }) export class MonitorSearchOrganizationsComponent { + @Input() searchForm: SearchForm = {class: 'search-form', dark: false}; initialized: boolean = false; piwikSiteId; constructor(private route: ActivatedRoute, diff --git a/src/app/search/searchPages/simple/searchProjects.component.ts b/src/app/search/searchPages/simple/searchProjects.component.ts index e5ec4b1..e315d47 100644 --- a/src/app/search/searchPages/simple/searchProjects.component.ts +++ b/src/app/search/searchPages/simple/searchProjects.component.ts @@ -1,10 +1,11 @@ -import {Component} from '@angular/core'; +import {Component, Input} from '@angular/core'; import {SearchCustomFilter} from "../../../openaireLibrary/searchPages/searchUtils/searchUtils.class"; import {ActivatedRoute, Router} from "@angular/router"; import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service"; import {Subscriber} from "rxjs"; import {properties} from "../../../../environments/environment"; import {ConfigurationService} from "../../../openaireLibrary/utils/configuration/configuration.service"; +import {SearchForm} from "../../../openaireLibrary/searchPages/searchUtils/newSearchPage.component"; @Component({ selector: 'monitor-search-projects', @@ -13,12 +14,13 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration [customFilter]=customFilter [hasPrefix]="false" [includeOnlyResultsAndFilter]="false" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/simple/projects'" - [piwikSiteId]="piwikSiteId"> + [piwikSiteId]="piwikSiteId" [searchForm]="searchForm"> ` }) export class MonitorSearchProjectsComponent { + @Input() searchForm: SearchForm = {class: 'search-form', dark: false}; customFilter: SearchCustomFilter = null; initialized: boolean = false; properties; diff --git a/src/app/search/searchPages/simple/searchResearchResults.component.ts b/src/app/search/searchPages/simple/searchResearchResults.component.ts index 2025210..38ecd56 100644 --- a/src/app/search/searchPages/simple/searchResearchResults.component.ts +++ b/src/app/search/searchPages/simple/searchResearchResults.component.ts @@ -1,10 +1,11 @@ -import {Component} from '@angular/core'; +import {Component, Input} from '@angular/core'; import {SearchCustomFilter} from "../../../openaireLibrary/searchPages/searchUtils/searchUtils.class"; import {ActivatedRoute, Router} from "@angular/router"; import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service"; import {Subscriber} from "rxjs"; import {properties} from "../../../../environments/environment"; import {ConfigurationService} from "../../../openaireLibrary/utils/configuration/configuration.service"; +import {SearchForm} from "../../../openaireLibrary/searchPages/searchUtils/newSearchPage.component"; @Component({ selector: 'monitor-search-results', @@ -13,12 +14,14 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration [customFilter]=customFilter [hasPrefix]="false" [includeOnlyResultsAndFilter]="false" [showSwitchSearchLink]="true" + [searchForm]="searchForm" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/research-outcomes'" [piwikSiteId]="piwikSiteId" > `, }) export class MonitorSearchResearchResultsComponent { + @Input() searchForm: SearchForm = {class: 'search-form', dark: false}; customFilter: SearchCustomFilter = null; initialized: boolean = false; properties; diff --git a/src/app/topic/topic.component.html b/src/app/topic/topic.component.html index 351b62f..211e871 100644 --- a/src/app/topic/topic.component.html +++ b/src/app/topic/topic.component.html @@ -1,7 +1,7 @@