MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1. connectHelper.ts: bug fix - return null if we are in explore domain. 

2. searchPage.component.ts: bug fix - when filters or keyword changes (goTo function), call createIndexQueryParameters function and emit indexQuery as index for search pages that request resources.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@51869 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
konstantina.galouni 2018-04-25 13:30:59 +00:00
parent 2c201089be
commit 1034bfa117
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
connect/connectHelper.ts
View File

@ -11,7 +11,7 @@ export class ConnectHelper{
}else{
domain = domain.substr(0,domain.indexOf("."));
}
if(domain == "connect"){
if(domain == "connect" || domain == "explore"){
return null;
}
return domain;

14
searchPages/searchUtils/searchPage.component.ts
View File

@ -130,7 +130,7 @@ export class SearchPageComponent {
this._meta.updateTag({content:url},"property='og:url'");
}
public getQueryParametersFromUrl(params){
public getQueryParametersFromUrl(params){ // called by ngOnInit function of search find pages
// var parameters = "";
var allFqs = "";
@ -178,7 +178,7 @@ export class SearchPageComponent {
}
return (doiQuery.length > 0 ? doiQuery:keywordQuery) + allFqs;
}
public getIndexQueryParametersFromUrl(params){
public getIndexQueryParametersFromUrl(params){ // called by ngOnInit function of search pages that request 'resources'
// var parameters = "";
var allFqs = "";
@ -352,7 +352,7 @@ export class SearchPageComponent {
/*
*
*/
private createSearchQueryParameters(filters:Filter[]){
private createSearchQueryParameters(filters:Filter[]){ // called by goTo, result emited to and used by search find pages
var allFqs = "";
for (let filter of filters){
if(filter.countSelectedValues > 0 || (this.connectCommunityId && filter.filterId.indexOf("community")!=-1)){
@ -396,7 +396,7 @@ export class SearchPageComponent {
return (doiQuery.length > 0 ? doiQuery:keywordQuery) + allFqs;
}
/*private createIndexQueryParameters(filters:Filter[]){
private createIndexQueryParameters(filters:Filter[]){ // called by goTo, result emited to and used by search pages that request 'resources'
var allFqs = "";
for (let filter of filters){
if(filter.countSelectedValues > 0){
@ -433,7 +433,7 @@ export class SearchPageComponent {
}
return (doiQuery.length > 0 ? doiQuery:keywordQuery) + allFqs;
}*/
}
public isFiltered(){
var filtered=false;
this.showUnknownFilters = false;
@ -486,7 +486,7 @@ export class SearchPageComponent {
this.updateBaseUrlWithParameters(this.filters);
var queryParameters = this.createSearchQueryParameters(this.filters);
console.info("queryParams : "+queryParameters);
// var indexQuery = this.createIndexQueryParameters(this.filters);
var indexQuery = this.createIndexQueryParameters(this.filters);
this.location.go(location.pathname,urlParameters);
/* Code For Piwik*/
@ -499,7 +499,7 @@ export class SearchPageComponent {
/* End Piwik Code */
this.queryChange.emit({
value: queryParameters,
// index:indexQuery
index:indexQuery
});
if (typeof document !== 'undefined') {