From c9e915c0aebf7911aa348b31cad5d11085eb01ad Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 9 Dec 2016 16:12:30 +0000 Subject: [PATCH] Deposit Pages: Show proper messages (Publications or Research Data) | Landing pages' tabs: redirect results to search pages git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@44893 d315682c-612b-4755-9ff5-7f18f6832af3 --- portal-2/src/app/deposit/deposit.component.ts | 5 ++--- .../app/deposit/depositDatasets.component.ts | 2 +- .../depositDatasetsResult.component.ts | 2 +- .../app/deposit/depositResult.component.ts | 4 ++-- .../dataProvider/datasetsTab.component.ts | 2 +- .../dataProvider/datasourcesTab.component.ts | 3 ++- .../dataProvider/projectsTab.component.ts | 2 +- .../dataProvider/publicationsTab.component.ts | 2 +- .../relatedDatasourcesTab.component.ts | 12 ++++++----- .../dataProvider/tabs.component.ts | 5 +++-- .../organization/organization.component.ts | 2 +- .../landingPages/person/person.component.ts | 4 ++-- .../project/project.component.html | 4 ++-- .../landingPages/project/project.component.ts | 4 ++-- .../navigationBar.component.ts | 2 +- .../app/utils/entities/dataProviderInfo.ts | 1 + .../utils/properties/openaireProperties.ts | 20 +++++++++++++++++++ 17 files changed, 50 insertions(+), 26 deletions(-) diff --git a/portal-2/src/app/deposit/deposit.component.ts b/portal-2/src/app/deposit/deposit.component.ts index 18f1a946..5c666ec6 100644 --- a/portal-2/src/app/deposit/deposit.component.ts +++ b/portal-2/src/app/deposit/deposit.component.ts @@ -20,7 +20,7 @@ import {SearchOrganizationsService} from '../services/searchOrganizations.servic Then you are required to publish in open access. - One way to do this is to deposit your publications into an + One way to do this is to deposit your {{requestFor}} into an open access repository.

@@ -82,8 +82,7 @@ export class DepositComponent { if(this.requestFor == "Publications") { this._router.navigate( ['deposit-publications-result'], { queryParams: { "organizationId": id } } ); - } else if(this.requestFor == "Datasets") { - console.info("call deposit result for datasets") + } else if(this.requestFor == "Research Data") { this._router.navigate( ['deposit-datasets-result'], { queryParams: { "organizationId": id } } ); } } diff --git a/portal-2/src/app/deposit/depositDatasets.component.ts b/portal-2/src/app/deposit/depositDatasets.component.ts index f26e3a7e..587b7e68 100644 --- a/portal-2/src/app/deposit/depositDatasets.component.ts +++ b/portal-2/src/app/deposit/depositDatasets.component.ts @@ -3,7 +3,7 @@ import {Component} from '@angular/core'; @Component({ selector: 'deposit-datasets', template: ` - + ` }) diff --git a/portal-2/src/app/deposit/depositDatasetsResult.component.ts b/portal-2/src/app/deposit/depositDatasetsResult.component.ts index 4de7ffce..1cd59fe4 100644 --- a/portal-2/src/app/deposit/depositDatasetsResult.component.ts +++ b/portal-2/src/app/deposit/depositDatasetsResult.component.ts @@ -3,7 +3,7 @@ import {Component} from '@angular/core'; @Component({ selector: 'deposit-datasets-result', template: ` - + ` }) diff --git a/portal-2/src/app/deposit/depositResult.component.ts b/portal-2/src/app/deposit/depositResult.component.ts index 7fb72e64..81c524bb 100644 --- a/portal-2/src/app/deposit/depositResult.component.ts +++ b/portal-2/src/app/deposit/depositResult.component.ts @@ -34,7 +34,7 @@ import {OrganizationService} from '../services/organization.service';

-

Please use the information/contacts shown below to deposit your publications.

+

Please use the information/contacts shown below to deposit your {{requestFor}}.

View all {{searchDataprovidersComponent.searchUtils.totalResults}} results
@@ -60,7 +60,7 @@ import {OrganizationService} from '../services/organization.service'; No ID for organization.
- You can still deposit your publications and/or research data in + You can still deposit your {{requestFor}} in OpenAIRE's Zenodo catch-all repository hosted by CERN. diff --git a/portal-2/src/app/landingPages/dataProvider/datasetsTab.component.ts b/portal-2/src/app/landingPages/dataProvider/datasetsTab.component.ts index 6a1d594b..b510de8d 100644 --- a/portal-2/src/app/landingPages/dataProvider/datasetsTab.component.ts +++ b/portal-2/src/app/landingPages/dataProvider/datasetsTab.component.ts @@ -32,7 +32,7 @@ export class DatasetsTabComponent { constructor () {} ngOnInit() { - this.linkToSearchDatasets = OpenaireProperties.getLinkToSearchDatasets()+this.paramsForSearchLink; + this.linkToSearchDatasets = OpenaireProperties.getLinkToAdvancedSearchDatasets()+this.paramsForSearchLink; } ngOnDestroy() {} diff --git a/portal-2/src/app/landingPages/dataProvider/datasourcesTab.component.ts b/portal-2/src/app/landingPages/dataProvider/datasourcesTab.component.ts index d3cc7953..34662fdf 100644 --- a/portal-2/src/app/landingPages/dataProvider/datasourcesTab.component.ts +++ b/portal-2/src/app/landingPages/dataProvider/datasourcesTab.component.ts @@ -32,7 +32,8 @@ export class DatasourcesTabComponent { constructor () {} ngOnInit() { - this.linkToSearchDataproviders = OpenaireProperties.getLinkToSearchDataProviders()+this.paramsForSearchLink; + this.linkToSearchDataproviders = OpenaireProperties.getLinkToAdvancedSearchDataProviders()+this.paramsForSearchLink; + console.info(this.linkToSearchDataproviders); } ngOnDestroy() {} diff --git a/portal-2/src/app/landingPages/dataProvider/projectsTab.component.ts b/portal-2/src/app/landingPages/dataProvider/projectsTab.component.ts index 4de909ab..2d3abb5e 100644 --- a/portal-2/src/app/landingPages/dataProvider/projectsTab.component.ts +++ b/portal-2/src/app/landingPages/dataProvider/projectsTab.component.ts @@ -33,7 +33,7 @@ export class ProjectsTabComponent { constructor () {} ngOnInit() { - this.linkToSearchProjects = OpenaireProperties.getLinkToSearchProjects()+this.paramsForSearchLink; + this.linkToSearchProjects = OpenaireProperties.getLinkToAdvancedSearchProjects()+this.paramsForSearchLink; } ngOnDestroy() {} diff --git a/portal-2/src/app/landingPages/dataProvider/publicationsTab.component.ts b/portal-2/src/app/landingPages/dataProvider/publicationsTab.component.ts index a576fb15..dd2499a0 100644 --- a/portal-2/src/app/landingPages/dataProvider/publicationsTab.component.ts +++ b/portal-2/src/app/landingPages/dataProvider/publicationsTab.component.ts @@ -32,7 +32,7 @@ export class PublicationsTabComponent { constructor () {} ngOnInit() { - this.linkToSearchPublications = OpenaireProperties.getLinkToSearchPublications()+this.paramsForSearchLink; + this.linkToSearchPublications = OpenaireProperties.getLinkToAdvancedSearchPublications()+this.paramsForSearchLink; } ngOnDestroy() {} diff --git a/portal-2/src/app/landingPages/dataProvider/relatedDatasourcesTab.component.ts b/portal-2/src/app/landingPages/dataProvider/relatedDatasourcesTab.component.ts index 7507b9f1..ca4457a9 100644 --- a/portal-2/src/app/landingPages/dataProvider/relatedDatasourcesTab.component.ts +++ b/portal-2/src/app/landingPages/dataProvider/relatedDatasourcesTab.component.ts @@ -22,8 +22,8 @@ import {OpenaireProperties} from '../../utils/properties/openaireProperties'; - - + + @@ -34,7 +34,9 @@ import {OpenaireProperties} from '../../utils/properties/openaireProperties'; @@ -44,14 +46,14 @@ import {OpenaireProperties} from '../../utils/properties/openaireProperties'; }) export class RelatedDatasourcesTabComponent { - @Input() paramsForSearchLink: string = ""; + @Input() dataproviderId: string; @Input() searchPublicationsComponent : SearchPublicationsComponent; private linkToSearchPublications = ""; constructor () {} ngOnInit() { - //this.linkToSearchPublications = OpenaireProperties.getLinkToSearchPublications()+this.paramsForSearchLink; + this.linkToSearchPublications = OpenaireProperties.getLinkToAdvancedSearchPublications()+"?&hostedBy=";//+ +"&ho=and&collectedFrom="+ +"&co=and"; } ngOnDestroy() {} diff --git a/portal-2/src/app/landingPages/dataProvider/tabs.component.ts b/portal-2/src/app/landingPages/dataProvider/tabs.component.ts index 8f2643c0..e6bca35c 100644 --- a/portal-2/src/app/landingPages/dataProvider/tabs.component.ts +++ b/portal-2/src/app/landingPages/dataProvider/tabs.component.ts @@ -112,6 +112,7 @@ import { SearchDataprovidersService } from '../../services/searchDataproviders.s [organizations]="organizations">
@@ -171,9 +172,9 @@ export class TabsComponent { } if(this.resultsBy == "collectedFrom") { - this.paramsForSearchLink = "?collectedfromdatasourceid="+this.id; + this.paramsForSearchLink = "?collectedFrom="+this.id+"&co=and"; } else if (this.resultsBy == "hostedBy") { - this.paramsForSearchLink = "?resulthostingdatasourceid="+this.id; + this.paramsForSearchLink = "?hostedBy="+this.id+"&ho=and"; } } diff --git a/portal-2/src/app/landingPages/organization/organization.component.ts b/portal-2/src/app/landingPages/organization/organization.component.ts index 79142620..37103704 100644 --- a/portal-2/src/app/landingPages/organization/organization.component.ts +++ b/portal-2/src/app/landingPages/organization/organization.component.ts @@ -222,7 +222,7 @@ export class OrganizationComponent { private searchDataproviders() { this.searchDataprovidersComponent.getResultsForEntity("organization", this.organizationId, 1, 10); - this.linkToSearchDataproviders = OpenaireProperties.getLinkToSearchDataProviders(); + this.linkToSearchDataproviders = OpenaireProperties.getLinkToAdvancedSearchDataProviders() + "?organization=" + this.organizationId + "&or=and";; } private searchDataprovidersInit() { diff --git a/portal-2/src/app/landingPages/person/person.component.ts b/portal-2/src/app/landingPages/person/person.component.ts index 6dddfd38..f3cead68 100644 --- a/portal-2/src/app/landingPages/person/person.component.ts +++ b/portal-2/src/app/landingPages/person/person.component.ts @@ -112,11 +112,11 @@ export class PersonComponent { private searchPublications() { this.searchPublicationsComponent.getResultsForEntity("person", this.personId, 1, 10); - this.linkToSearchPublications = OpenaireProperties.getLinkToSearchPublications(); + this.linkToSearchPublications = OpenaireProperties.getLinkToAdvancedSearchPublications() + "?person=" + this.personId + "&pe=and"; } private searchDatasets() { this.searchDatasetsComponent.getResultsForEntity("person", this.personId, 1, 10); - this.linkToSearchDatasets = OpenaireProperties.getLinkToSearchDatasets(); + this.linkToSearchDatasets = OpenaireProperties.getLinkToAdvancedSearchDatasets() + "?person=" + this.personId + "&pe=and"; } } diff --git a/portal-2/src/app/landingPages/project/project.component.html b/portal-2/src/app/landingPages/project/project.component.html index 777f2338..5c18de51 100644 --- a/portal-2/src/app/landingPages/project/project.component.html +++ b/portal-2/src/app/landingPages/project/project.component.html @@ -147,8 +147,8 @@
  • - - Publication details + + View all Project Publications
  • diff --git a/portal-2/src/app/landingPages/project/project.component.ts b/portal-2/src/app/landingPages/project/project.component.ts index 0f62c82e..3942f7fe 100644 --- a/portal-2/src/app/landingPages/project/project.component.ts +++ b/portal-2/src/app/landingPages/project/project.component.ts @@ -91,12 +91,12 @@ export class ProjectComponent{ private searchPublications() { this.searchPublicationsComponent.getResultsForEntity("project", this.projectId, 1, 10); - this.linkToSearchPublications = OpenaireProperties.getLinkToSearchPublications() + "?relprojectid=" + this.projectId; + this.linkToSearchPublications = OpenaireProperties.getLinkToAdvancedSearchPublications() + "?project=" + this.projectId+"&pr=and"; } private searchDatasets() { this.searchDatasetsComponent.getResultsForEntity("project", this.projectId, 1, 10); - this.linkToSearchDatasets = OpenaireProperties.getLinkToSearchDatasets() + "?relprojectid=" + this.projectId;; + this.linkToSearchDatasets = OpenaireProperties.getLinkToAdvancedSearchDatasets() + "?project=" + this.projectId+"&pr=and"; } private searchDatasetsInit() { diff --git a/portal-2/src/app/sharedComponents/navigationBar.component.ts b/portal-2/src/app/sharedComponents/navigationBar.component.ts index 16f5c0ce..f112bd01 100644 --- a/portal-2/src/app/sharedComponents/navigationBar.component.ts +++ b/portal-2/src/app/sharedComponents/navigationBar.component.ts @@ -56,7 +56,7 @@ import 'rxjs/Rx';
    • diff --git a/portal-2/src/app/utils/entities/dataProviderInfo.ts b/portal-2/src/app/utils/entities/dataProviderInfo.ts index 20a7f2f3..40de590f 100644 --- a/portal-2/src/app/utils/entities/dataProviderInfo.ts +++ b/portal-2/src/app/utils/entities/dataProviderInfo.ts @@ -79,6 +79,7 @@ export class DataProviderInfo { "aggregator::pubsrepository::unknown", "aggregator::pubsrepository::journals", "entityregistry::projects", + "entityregistry::repositories", "infospace", "scholarcomminfra", "pubscatalogue::unknown" diff --git a/portal-2/src/app/utils/properties/openaireProperties.ts b/portal-2/src/app/utils/properties/openaireProperties.ts index f727c23d..166cbf2c 100644 --- a/portal-2/src/app/utils/properties/openaireProperties.ts +++ b/portal-2/src/app/utils/properties/openaireProperties.ts @@ -117,6 +117,26 @@ export class OpenaireProperties { return this.baseSearchLink + this.searchLinkToPeople; } + //Advanced searchPages + public static getLinkToAdvancedSearchPublications():string{ + return this.baseSearchLink + this.searchLinkToAdvancedPublications; + } + public static getLinkToAdvancedSearchProjects():string{ + return this.baseSearchLink + this.searchLinkToAdvancedProjects; + } + public static getLinkToAdvancedSearchDataProviders():string{ + return this.baseSearchLink + this.searchLinkToAdvancedDataProviders; + } + public static getLinkToAdvancedSearchDatasets():string{ + return this.baseSearchLink + this.searchLinkToAdvancedDatasets; + } + public static getLinkToAdvancedSearchOrganizations():string{ + return this.baseSearchLink + this.searchLinkToAdvancedOrganizations; + } + public static getLinkToAdvancedSearchPeople():string{ + return this.baseSearchLink + this.searchLinkToAdvancedPeople; + } + // Services - APIs' getters // public static getSearchAPIURL():string{ // return this.searchAPIURL;
    NameAggregation NumberData Provider NameNumber of publications/ datasets
    - {{item.count}} + + {{item.count}} +