Project

General

Profile

« Previous | Next » 

Revision 55371

Added by Konstantina Galouni about 5 years ago

[Trunk|Library]:
1. searchPage.component & advancedSearchPage.component:
goTo() function: use router.navigate instead of location.go (bug fix: error in paging because of false routerLinkActive class)
2. In all search (simple & dataproviders) and advanced search pages:
In queryChanged() function do not call getResuls() functions which queries api (goTo() of searchPage/advancedSearchPage.component reloads the page anyway).

View differences:

modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/advanced/advancedSearchOrps.component.ts
177 177 
    this.loadPaging = true;
178 178 

  		




  179
  179
  
    
    var parameters = $event.value;


  		




  180
  
  
    
    this.getResults(parameters, this.searchUtils.page,this.searchUtils.size, this.searchUtils.sortBy);


  		




  
  180
  
    
    //this.getResults(parameters, this.searchUtils.page,this.searchUtils.size, this.searchUtils.sortBy);


  		




  181
  181
  
    
    //console.info("queryChanged: Execute search query "+parameters);


  		




  182
  182
  
    

  		




  183
  183
  
    
  }


  		












  

    
      modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
    
  





  174
  174
  
    
    this.loadPaging = true;


  		




  175
  175
  
    

  		




  176
  176
  
    
    var parameters = $event.value;


  		




  177
  
  
    
    this.getResults(parameters, this.searchUtils.page,this.searchUtils.size);


  		




  
  177
  
    
    //this.getResults(parameters, this.searchUtils.page,this.searchUtils.size);


  		




  178
  178
  
    
    //console.info("queryChanged: Execute search query "+parameters);


  		




  179
  179
  
    

  		




  180
  180
  
    
  }


  		












  

    
      modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
    
  





  179
  179
  
    
    this.loadPaging = true;


  		




  180
  180
  
    

  		




  181
  181
  
    
    var parameters = $event.value;


  		




  182
  
  
    
    this.getResults(parameters, this.searchUtils.page,this.searchUtils.size);


  		




  
  182
  
    
    //this.getResults(parameters, this.searchUtils.page,this.searchUtils.size);


  		




  183
  183
  
    
    //console.info("queryChanged: Execute search query "+parameters);


  		




  184
  184
  
    

  		




  185
  185
  
    
  }


  		












  

    
      modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/advanced/advancedSearchDatasets.component.ts
    
  





  186
  186
  
    
    this.loadPaging = true;


  		




  187
  187
  
    

  		




  188
  188
  
    
    var parameters = $event.value;


  		




  189
  
  
    
    this.getResults(parameters, this.searchUtils.page,this.searchUtils.size, this.searchUtils.sortBy);


  		




  
  189
  
    
    //this.getResults(parameters, this.searchUtils.page,this.searchUtils.size, this.searchUtils.sortBy);


  		




  190
  190
  
    
    //console.info("queryChanged: Execute search query "+parameters);


  		




  191
  191
  
    

  		




  192
  192
  
    
  }


  		












  

    
      modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/advanced/advancedSearchProjects.component.ts
    
  





  181
  181
  
    
    this.loadPaging = true;


  		




  182
  182
  
    

  		




  183
  183
  
    
    var parameters = $event.value;


  		




  184
  
  
    
    this.getResults(parameters, this.searchUtils.page,this.searchUtils.size);


  		




  
  184
  
    
    //this.getResults(parameters, this.searchUtils.page,this.searchUtils.size);


  		




  185
  185
  
    
    //console.info("queryChanged: Execute search query "+parameters);


  		




  186
  186
  
    

  		




  187
  187
  
    
  }


  		












  

    
      modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/advanced/advancedSearchSoftware.component.ts
    
  





  187
  187
  
    
    this.loadPaging = true;


  		




  188
  188
  
    

  		




  189
  189
  
    
    var parameters = $event.value;


  		




  190
  
  
    
    this.getResults(parameters, this.searchUtils.page,this.searchUtils.size, this.searchUtils.sortBy);


  		




  
  190
  
    
    //this.getResults(parameters, this.searchUtils.page,this.searchUtils.size, this.searchUtils.sortBy);


  		




  191
  191
  
    
    //console.info("queryChanged: Execute search query "+parameters);


  		




  192
  192
  
    

  		




  193
  193
  
    
  }


  		












  

    
      modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/advanced/advancedSearchPublications.component.ts
    
  





  188
  188
  
    
    this.loadPaging = true;


  		




  189
  189
  
    

  		




  190
  190
  
    
    var parameters = $event.value;


  		




  191
  
  
    
    this.getResults(parameters, this.searchUtils.page,this.searchUtils.size, this.searchUtils.sortBy);


  		




  
  191
  
    
    //this.getResults(parameters, this.searchUtils.page,this.searchUtils.size, this.searchUtils.sortBy);


  		




  192
  192
  
    
    //console.info("queryChanged: Execute search query "+parameters);


  		




  193
  193
  
    

  		




  194
  194
  
    
  }


  		












  

    
      modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/searchUtils/searchPage.component.ts
    
  





  6
  6
  
    
import {Title, Meta}                  from '@angular/platform-browser';


  		




  7
  7
  
    

  		




  8
  8
  
    
import {Filter, Value}                from './searchHelperClasses.class';


  		




  9
  
  
    
import {SearchFields}   from '../../utils/properties/searchFields';


  		




  
  9
  
    
import {SearchFields}                 from '../../utils/properties/searchFields';


  		




  10
  10
  
    
import {SearchUtilsClass}             from './searchUtils.class';


  		




  11
  11
  
    
import {DOI, StringUtils}             from '../../utils/string-utils.class';


  		




  
  12
  
    
import {RouterHelper}                 from '../../utils/routerHelper.class';


  		




  12
  13
  
    
import {ModalLoading}                 from '../../utils/modal/loading.component';


  		




  13
  14
  
    
import {ErrorCodes}                   from '../../utils/properties/errorCodes';


  		




  14
  15
  
    
import {PiwikService}                 from '../../utils/piwik/piwik.service';


  		




  15
  16
  
    
import {EnvProperties}                from '../../utils/properties/env-properties';


  		




  16
  
  
    
import { SEOService } from '../../sharedComponents/SEO/SEO.service';


  		




  
  17
  
    
import { SEOService }                 from '../../sharedComponents/SEO/SEO.service';


  		




  17
  18
  
    

  		




  18
  19
  
    
@Component({


  		




  19
  20
  
    
    selector: 'search-page',


  		




  ......




  70
  71
  
    
  public resultsPerPage: number = 10;


  		




  71
  72
  
    
  public isPiwikEnabled;


  		




  72
  73
  
    
  properties:EnvProperties;


  		




  
  74
  
    
  public routerHelper:RouterHelper = new RouterHelper();


  		




  73
  75
  
    
  public errorCodes:ErrorCodes = new ErrorCodes();


  		




  74
  76
  
    

  		




  75
  77
  
    
  constructor (private route: ActivatedRoute,


  		




  ......




  532
  534
  
    
    //console.info("queryParams : "+queryParameters);


  		




  533
  535
  
    
    var indexQuery = this.createIndexQueryParameters(this.filters);


  		




  534
  536
  
    

  		




  535
  
  
    
    this.location.go(location.pathname,urlParameters);


  		




  
  537
  
    
    //this.location.go(location.pathname,urlParameters);


  		




  
  538
  
    
    this.router.navigate( [this.baseUrl], { queryParams: this.routerHelper.createQueryParams(this.parameterNames, this.parameterValues) } );


  		




  
  539
  
    
    


  		




  536
  540
  
    
/* Code For Piwik*/


  		




  537
  541
  
    
    if (typeof localStorage !== 'undefined') {


  		




  538
  542
  
    
      localStorage.setItem('previousRoute', this.router.url);


  		












  

    
      modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/searchUtils/advancedSearchPage.component.ts
    
  





  13
  13
  
    
import {ModalLoading}                 from '../../utils/modal/loading.component';


  		




  14
  14
  
    
import {StringUtils, Dates}           from '../../utils/string-utils.class';


  		




  15
  15
  
    
import {ErrorCodes}                   from '../../utils/properties/errorCodes';


  		




  
  16
  
    
import {RouterHelper}                 from '../../utils/routerHelper.class';


  		




  16
  17
  
    

  		




  17
  18
  
    
import {PiwikService}                 from '../../utils/piwik/piwik.service';


  		




  18
  19
  
    
import {EnvProperties}                from '../../utils/properties/env-properties';


  		




  ......




  55
  56
  
    
  public resultsPerPage: number = 0;


  		




  56
  57
  
    
  isPiwikEnabled = false;


  		




  57
  58
  
    
  properties:EnvProperties;


  		




  
  59
  
    
  public routerHelper:RouterHelper = new RouterHelper();


  		




  58
  60
  
    
  public errorCodes:ErrorCodes = new ErrorCodes();


  		




  59
  61
  
    

  		




  60
  62
  
    
  url = null;


  		




  ......




  265
  267
  
    
     this.searchUtils.page = page;


  		




  266
  268
  
    
    var urlParameters = this.createUrlParameters(true);


  		




  267
  269
  
    
    var queryParameters = this.createQueryParameters();


  		




  268
  
  
    
    this.location.go(location.pathname,urlParameters);


  		




  
  270
  
    
    //this.location.go(location.pathname,urlParameters);


  		




  
  271
  
    
    this.router.navigate( [this.searchUtils.baseUrl], { queryParams: this.routerHelper.createQueryParams(this.parameterNames, this.parameterValues) } );


  		




  
  272
  
    

  		




  269
  273
  
    
    this.queryChange.emit({


  		




  270
  274
  
    
        value: queryParameters


  		




  271
  275
  
    
    });


  		












  

    
      modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/dataProviders/entityRegistries.component.ts
    
  





  166
  166
  
    
    //console.info("queryChanged: Execute search query "+parameters);


  		




  167
  167
  
    
    var csv_parameters = $event.value;


  		




  168
  168
  
    

  		




  169
  
  
    
    this._getResults(parameters, csv_parameters, false, this.searchUtils.page, this.searchUtils.size);


  		




  
  169
  
    
    //this._getResults(parameters, csv_parameters, false, this.searchUtils.page, this.searchUtils.size);


  		




  170
  170
  
    
  }


  		




  171
  171
  
    
  private createFilters():Filter[] {


  		




  172
  172
  
    
    var filter_names=["Type","Compatibility Level"];


  		












  

    
      modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/dataProviders/journals.component.ts
    
  





  166
  166
  
    
    //console.info("queryChanged: Execute search query "+parameters);


  		




  167
  167
  
    
    var csv_parameters = $event.value;


  		




  168
  168
  
    

  		




  169
  
  
    
    this._getResults(parameters,csv_parameters, false, this.searchUtils.page, this.searchUtils.size);


  		




  
  169
  
    
    //this._getResults(parameters,csv_parameters, false, this.searchUtils.page, this.searchUtils.size);


  		




  170
  170
  
    
  }


  		




  171
  171
  
    
  private createFilters():Filter[] {


  		




  172
  172
  
    
    var filter_names=["Type","Compatibility Level"];


  		












  

    
      modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts
    
  





  167
  167
  
    

  		




  168
  168
  
    
    //console.info("queryChanged: Execute search query "+parameters);


  		




  169
  169
  
    

  		




  170
  
  
    
    this._getResults(parameters, csv_parameters, false, this.searchUtils.page, this.searchUtils.size);


  		




  
  170
  
    
    //this._getResults(parameters, csv_parameters, false, this.searchUtils.page, this.searchUtils.size);


  		




  171
  171
  
    
  }


  		




  172
  172
  
    
  private createFilters():Filter[] {


  		




  173
  173
  
    
    var filter_names=["Type","Compatibility Level"];


  		












  

    
      modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/simple/searchOrps.component.ts
    
  





  286
  286
  
    
    this.loadPaging = true;


  		




  287
  287
  
    

  		




  288
  288
  
    
    var parameters = $event.value;


  		




  289
  
  
    
    this._getResults(parameters, true, this.searchUtils.page, this.searchUtils.size, this.searchUtils.sortBy);


  		




  
  289
  
    
    //this._getResults(parameters, true, this.searchUtils.page, this.searchUtils.size, this.searchUtils.sortBy);


  		




  290
  290
  
    
  }


  		




  291
  291
  
    

  		




  292
  292
  
    
  private handleError(message: string, error) {


  		












  

    
      modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/simple/searchDataproviders.component.ts
    
  





  389
  389
  
    
    this.loadPaging = true;


  		




  390
  390
  
    

  		




  391
  391
  
    
    var parameters = $event.value;


  		




  392
  
  
    
    this._getResults(parameters, true, this.searchUtils.page, this.searchUtils.size);


  		




  
  392
  
    
    //this._getResults(parameters, true, this.searchUtils.page, this.searchUtils.size);


  		




  393
  393
  
    
  }


  		




  394
  394
  
    

  		




  395
  395
  
    
  private handleError(message: string, error) {


  		












  

    
      modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/simple/searchOrganizations.component.ts
    
  





  190
  190
  
    

  		




  191
  191
  
    
    var parameters = $event.value;


  		




  192
  192
  
    
    //console.info("queryChanged: Execute search query "+parameters);


  		




  193
  
  
    
    this._getResults(parameters, true, this.searchUtils.page, this.searchUtils.size);


  		




  
  193
  
    
    //this._getResults(parameters, true, this.searchUtils.page, this.searchUtils.size);


  		




  194
  194
  
    
  }


  		




  195
  195
  
    

  		




  196
  196
  
    
  private handleError(message: string, error) {


  		












  

    
      modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/simple/searchDatasets.component.ts
    
  





  309
  309
  
    

  		




  310
  310
  
    
    var parameters = $event.value;


  		




  311
  311
  
    
    //this.getResults(parameters, this.searchUtils.page, this.searchUtils.size, "searchPage");


  		




  312
  
  
    
    this._getResults(parameters, true, this.searchUtils.page, this.searchUtils.size, this.searchUtils.sortBy);


  		




  
  312
  
    
    //this._getResults(parameters, true, this.searchUtils.page, this.searchUtils.size, this.searchUtils.sortBy);


  		




  313
  313
  
    
  }


  		




  314
  314
  
    

  		




  315
  315
  
    
  private handleError(message: string, error) {


  		












  

    
      modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/simple/searchProjects.component.ts
    
  





  229
  229
  
    

  		




  230
  230
  
    
    this.urlParams = undefined;


  		




  231
  231
  
    
    var parameters = $event.value;


  		




  232
  
  
    
    this._getResults(parameters, true, this.searchUtils.page, this.searchUtils.size);


  		




  
  232
  
    
    //this._getResults(parameters, true, this.searchUtils.page, this.searchUtils.size);


  		




  233
  233
  
    
  }


  		




  234
  234
  
    

  		




  235
  235
  
    
  private handleError(message: string, error) {


  		












  

    
      modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/simple/searchSoftware.component.ts
    
  





  309
  309
  
    

  		




  310
  310
  
    
    var parameters = $event.value;


  		




  311
  311
  
    
    //this.getResults(parameters, this.searchUtils.page, this.searchUtils.size, "searchPage");


  		




  312
  
  
    
    this._getResults(parameters, true, this.searchUtils.page, this.searchUtils.size, this.searchUtils.sortBy);


  		




  
  312
  
    
    //this._getResults(parameters, true, this.searchUtils.page, this.searchUtils.size, this.searchUtils.sortBy);


  		




  313
  313
  
    
  }


  		




  314
  314
  
    

  		




  315
  315
  
    
  private handleError(message: string, error) {


  		












  

    
      modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/simple/searchPublications.component.ts
    
  





  338
  338
  
    

  		




  339
  339
  
    
    var parameters = $event.value;


  		




  340
  340
  
    
    //console.info("queryChanged: Execute search query "+parameters);


  		




  341
  
  
    
    this._getResults(parameters, true, this.searchUtils.page, this.searchUtils.size, this.searchUtils.sortBy);


  		




  
  341
  
    
    //this._getResults(parameters, true, this.searchUtils.page, this.searchUtils.size, this.searchUtils.sortBy);


  		




  342
  342
  
    

  		




  343
  343
  
    
  }


  		




  344
  344
  
    

  		












Also available in:  Unified diff