MaDgIK
/
connect
13
0
Fork 0
Code Issues Pull Requests Projects Releases 12 Wiki Activity

pass community Id parameter in advance pages of results as input | remove advanced search parameters in simple pages 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@52028 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2018-05-15 08:51:03 +00:00
parent 390020e0e7
commit beacb8e731
7 changed files with 56 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
connect-production-properties.json
View File

@ -60,11 +60,11 @@
"baseLink" : "https://beta.connect.openaire.eu",
"searchLinkToPublication" : "/search/publication?articleId:",
"searchLinkToProject" : "/search/project?projectId:",
"searchLinkToDataProvider" : "/search/dataprovider?datasourceId:",
"searchLinkToDataset" : "/search/dataset?datasetId:",
"searchLinkToOrganization" : "/search/organization?organizationId:",
"searchLinkToPublication" : "/search/publication?articleId=",
"searchLinkToProject" : "/search/project?projectId=",
"searchLinkToDataProvider" : "/search/dataprovider?datasourceId=",
"searchLinkToDataset" : "/search/dataset?datasetId=",
"searchLinkToOrganization" : "/search/organization?organizationId=",
"searchLinkToPublications" : "/search/find/publications",
"searchLinkToDataProviders" : "/search/find/dataproviders",

18
src/app/searchPages/advanced/advancedSearchDatasets.component.ts
View File

@ -1,4 +1,5 @@
import {Component, Input} from '@angular/core';
import {ActivatedRoute} from '@angular/router';
import {PiwikHelper} from '../../utils/piwikHelper';
import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
@ -6,7 +7,7 @@ import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
@Component({
selector: 'openaire-advanced-search-datasets',
template: `
<advanced-search-datasets>
<advanced-search-datasets [(connectCommunityId)]=connectCommunityId>
</advanced-search-datasets>
`
@ -14,9 +15,22 @@ import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
export class OpenaireAdvancedSearchDatasetsComponent {
connectCommunityId:string;
piwikSiteId = null;
constructor ( ) {
constructor ( private route: ActivatedRoute) {
}
ngOnInit() {
var communityId = ConnectHelper.getCommunityFromDomain(document.location.hostname);
this.piwikSiteId = PiwikHelper.siteIDs[communityId];
if(communityId){
this.connectCommunityId = communityId
}else{
this.route.queryParams.subscribe(data => {
if(data['communityId'] && data['communityId']!=""){
this.connectCommunityId = data['communityId'];
}
});
}
}
}

18
src/app/searchPages/advanced/advancedSearchPublications.component.ts
View File

@ -1,4 +1,5 @@
import {Component, Input} from '@angular/core';
import {ActivatedRoute} from '@angular/router';
import {PiwikHelper} from '../../utils/piwikHelper';
import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
@ -6,15 +7,28 @@ import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
@Component({
selector: 'openaire-advanced-search-publications',
template: `
<advanced-search-publications>
<advanced-search-publications [(connectCommunityId)]=connectCommunityId>
</advanced-search-publications>
`
})
export class OpenaireAdvancedSearchPublicationsComponent {
connectCommunityId:string;
piwikSiteId = null;
constructor ( ) {
constructor ( private route: ActivatedRoute) {
}
ngOnInit() {
var communityId = ConnectHelper.getCommunityFromDomain(document.location.hostname);
this.piwikSiteId = PiwikHelper.siteIDs[communityId];
if(communityId){
this.connectCommunityId = communityId
}else{
this.route.queryParams.subscribe(data => {
if(data['communityId'] && data['communityId']!=""){
this.connectCommunityId = data['communityId'];
}
});
}
}
}

19
src/app/searchPages/advanced/advancedSearchSoftware.component.ts
View File

@ -1,21 +1,34 @@
import {Component, Input} from '@angular/core';
import {ActivatedRoute} from '@angular/router';
import {PiwikHelper} from '../../utils/piwikHelper';
import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
@Component({
selector: 'openaire-advanced-search-software',
template: `
<advanced-search-software>
<advanced-search-software [(connectCommunityId)]=connectCommunityId>
</advanced-search-software>
`
})
export class OpenaireAdvancedSearchSoftwareComponent {
connectCommunityId:string;
piwikSiteId = null;
constructor ( ) {
constructor ( private route: ActivatedRoute) {
}
ngOnInit() {
var communityId = ConnectHelper.getCommunityFromDomain(document.location.hostname);
this.piwikSiteId = PiwikHelper.siteIDs[communityId];
}
if(communityId){
this.connectCommunityId = communityId
}else{
this.route.queryParams.subscribe(data => {
if(data['communityId'] && data['communityId']!=""){
this.connectCommunityId = data['communityId'];
}
});
}
}
}

3
src/app/searchPages/simple/searchDatasets.component.ts
View File

@ -9,7 +9,6 @@ import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
<search-datasets
openaireLink="https://beta.explore.openaire.eu/search/find/datasets"
[(advancedSearchParameters)]=advancedSearchParameters
[(connectCommunityId)]=connectCommunityId>
</search-datasets>
`
@ -25,13 +24,11 @@ export class OpenaireSearchDatasetsComponent {
var communityId = ConnectHelper.getCommunityFromDomain(document.location.hostname);
this.piwikSiteId = PiwikHelper.siteIDs[communityId];
if(communityId){
this.advancedSearchParameters = {community:communityId, co: "and"};
this.connectCommunityId = communityId
}else{
this.route.queryParams.subscribe(data => {
if(data['communityId'] && data['communityId']!=""){
this.advancedSearchParameters = {community: data['communityId'], co: "and"};
this.connectCommunityId = data['communityId'];
}
});

5
src/app/searchPages/simple/searchPublications.component.ts
View File

@ -8,7 +8,7 @@ import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
template: `
<search-publications openaireLink="https://beta.explore.openaire.eu/search/find/publications"
[(advancedSearchParameters)]=advancedSearchParameters
[(connectCommunityId)]=connectCommunityId>
</search-publications>
@ -26,13 +26,10 @@ export class OpenaireSearchPublicationsComponent {
var communityId = ConnectHelper.getCommunityFromDomain(document.location.hostname);
this.piwikSiteId = PiwikHelper.siteIDs[communityId];
if(communityId){
this.advancedSearchParameters = {community:communityId, co: "and"};
this.connectCommunityId = communityId
}else{
this.route.queryParams.subscribe(data => {
if(data['communityId'] && data['communityId']!=""){
this.advancedSearchParameters = {community: data['communityId'], co: "and"};
this.connectCommunityId = data['communityId'];
}
});

7
src/app/searchPages/simple/searchSoftware.component.ts
View File

@ -9,7 +9,6 @@ import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
<search-software
openaireLink="https://beta.explore.openaire.eu/search/find/software"
[(advancedSearchParameters)]=advancedSearchParameters
[(connectCommunityId)]=connectCommunityId>
</search-software>
`
@ -25,14 +24,12 @@ export class OpenaireSearchSoftwareComponent {
var communityId = ConnectHelper.getCommunityFromDomain(document.location.hostname);
this.piwikSiteId = PiwikHelper.siteIDs[communityId];
if(communityId){
this.advancedSearchParameters = {community:communityId, co: "and"};
this.connectCommunityId = communityId
this.connectCommunityId = communityId
}else{
this.route.queryParams.subscribe(data => {
if(data['communityId'] && data['communityId']!=""){
this.advancedSearchParameters = {community: data['communityId'], co: "and"};
this.connectCommunityId = data['communityId'];
this.connectCommunityId = data['communityId'];
}
});
}