From d292a3e1ed215f5e82162d4663b92492c5f13297 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni"
 <konstantina.galouni@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Mon, 24 Feb 2020 13:45:22 +0000
Subject: [PATCH] [Trunk | Library]: 1. searchDataproviders.service.ts &
 searchOrganizations.service.ts & searchProjects.service.ts: Remove 'type'
 parameter from request. 2. newSearchPage.component.ts: 'type' parameter is
 added for every type (not only for results). 3.
 entitiesSelection.component.ts: [Bug fix] For content providers:
 value="dataprovider". 4. searchDataProviders.component.ts &
 searchOrganizations.component.ts & searchProjects.component.ts: Initialize
 "csvParams" correctly according to queries built in search pages (search
 redesign).

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58132 d315682c-612b-4755-9ff5-7f18f6832af3
---
 searchPages/searchDataProviders.component.ts  | 21 +++++++++++--------
 searchPages/searchOrganizations.component.ts  | 13 +++++++-----
 searchPages/searchProjects.component.ts       | 18 +++++++++-------
 .../searchResearchResults.component.ts        | 15 ++++++-------
 .../entitiesSelection.component.ts            |  4 ++--
 .../searchUtils/newSearchPage.component.ts    | 10 ++++++++-
 services/searchDataproviders.service.ts       |  3 ++-
 services/searchOrganizations.service.ts       |  3 ++-
 services/searchProjects.service.ts            |  3 ++-
 9 files changed, 56 insertions(+), 34 deletions(-)

diff --git a/searchPages/searchDataProviders.component.ts b/searchPages/searchDataProviders.component.ts
index 85a46031..6886598c 100644
--- a/searchPages/searchDataProviders.component.ts
+++ b/searchPages/searchDataProviders.component.ts
@@ -17,12 +17,12 @@ import {NewSearchPageComponent} from "./searchUtils/newSearchPage.component";
  
     <new-search-page
       pageTitle="{{(simpleView?'':'Advanced ')}} Search for {{ 'content providers' | titlecase }}"
-      entityType="content provider"
+      entityType="dataprovider"
       type="content providers"
       [results]="results"
       [searchUtils]="searchUtils"
       [fieldIds]="fieldIds" [fieldIdsMap]="fieldIdsMap" [selectedFields]="selectedFields"
-      [csvParams]="csvParams" csvPath="projects"
+      [csvParams]="csvParams" csvPath="datasources"
       [simpleSearchLink]="simpleSearchLink" [advancedSearchLink]="advancedSearchLink"
       [disableForms]="disableForms"
       [loadPaging]="loadPaging"
@@ -116,7 +116,7 @@ export class SearchDataProvidersComponent {
 
     this.searchPage.fieldIds = this.fieldIds;
     this.selectedFields =[];
-    this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, this.refineFields, [], this.fieldIdsMap,this.customFilter,params, "datasource");
+    this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, this.refineFields, [], this.fieldIdsMap,this.customFilter,params, "dataprovider");
 
      // this.searchPage.selectedFields = this.selectedFields;
     // this.searchPage.fieldIdsMap = this.fieldIdsMap;
@@ -134,12 +134,15 @@ export class SearchDataProvidersComponent {
       size=0;
     }
     if(page <= this.pagingLimit  || this.searchUtils.status == this.errorCodes.LOADING) {
-      if(parameters!= null && parameters != ''  ) {
-        this.csvParams ="&fq=( "+this.resourcesQuery + "and (" + parameters + "))";
-      }else{
-        this.csvParams ="&fq="+this.resourcesQuery;
-      }
-      this.csvParams += (refineFieldsFilterQuery?refineFieldsFilterQuery:'');
+      // if(parameters!= null && parameters != ''  ) {
+      //   this.csvParams ="&fq=( "+this.resourcesQuery + "and (" + parameters + "))";
+      // }else{
+      //   this.csvParams ="&fq="+this.resourcesQuery;
+      // }
+      // this.csvParams += (refineFieldsFilterQuery?refineFieldsFilterQuery:'');
+
+      this.csvParams = (parameters ? ("&fq=("+parameters) : "") + (parameters ? ")" : "");
+      this.csvParams += (refineFieldsFilterQuery ? refineFieldsFilterQuery : "");
 
       //var errorCodes:ErrorCodes = new ErrorCodes();
       this.searchUtils.status = this.errorCodes.LOADING;
diff --git a/searchPages/searchOrganizations.component.ts b/searchPages/searchOrganizations.component.ts
index 31e3c56b..38f20d28 100644
--- a/searchPages/searchOrganizations.component.ts
+++ b/searchPages/searchOrganizations.component.ts
@@ -133,11 +133,14 @@ public resourcesQuery = "(oaftype exact organization)";
       size=0;
     }
     if(page <= this.pagingLimit || this.searchUtils.status == this.errorCodes.LOADING) {
-      if(parameters!= null && parameters != ''  ) {
-        this.csvParams ="&fq=( "+this.resourcesQuery + "and (" + parameters + "))";
-      }else{
-        this.csvParams ="&fq="+this.resourcesQuery;
-      }
+      // if(parameters!= null && parameters != ''  ) {
+      //   this.csvParams ="&fq=( "+this.resourcesQuery + "and (" + parameters + "))";
+      // }else{
+      //   this.csvParams ="&fq="+this.resourcesQuery;
+      // }
+
+      this.csvParams = (parameters ? ("&fq=("+parameters) : "") + (parameters ? ")" : "");
+      this.csvParams += (refineFieldsFilterQuery ? refineFieldsFilterQuery : "");
 
       //var errorCodes:ErrorCodes = new ErrorCodes();
       this.searchUtils.status = this.errorCodes.LOADING;
diff --git a/searchPages/searchProjects.component.ts b/searchPages/searchProjects.component.ts
index af6f401f..31dbad40 100644
--- a/searchPages/searchProjects.component.ts
+++ b/searchPages/searchProjects.component.ts
@@ -135,14 +135,18 @@ export class SearchProjectsComponent {
       size=0;
     }
     if(page <= this.pagingLimit || this.searchUtils.status == this.errorCodes.LOADING) {
-      if(parameters!= null && parameters != ''  ) {
-        this.csvParams ="&fq=( "+this.resourcesQuery + "and (" + parameters + "))";
-      }else{
-        this.csvParams ="&fq="+this.resourcesQuery;
-      }
-      this.csvParams += (refineFieldsFilterQuery?refineFieldsFilterQuery:'');
+      // if(parameters!= null && parameters != ''  ) {
+      //   this.csvParams ="&fq=( "+this.resourcesQuery + "and (" + parameters + "))";
+      // }else{
+      //   this.csvParams ="&fq="+this.resourcesQuery;
+      // }
+      // this.csvParams += (refineFieldsFilterQuery?refineFieldsFilterQuery:'');
+      //
+      // //var errorCodes:ErrorCodes = new ErrorCodes();
+
+      this.csvParams = (parameters ? ("&fq=("+parameters) : "") + (parameters ? ")" : "");
+      this.csvParams += (refineFieldsFilterQuery ? refineFieldsFilterQuery : "");
 
-      //var errorCodes:ErrorCodes = new ErrorCodes();
       this.searchUtils.status = this.errorCodes.LOADING;
       //this.searchPage.openLoading();
       this.disableForms = true;
diff --git a/searchPages/searchResearchResults.component.ts b/searchPages/searchResearchResults.component.ts
index ea08f820..38fee3c5 100644
--- a/searchPages/searchResearchResults.component.ts
+++ b/searchPages/searchResearchResults.component.ts
@@ -13,7 +13,7 @@ import {RangeFilter} from "../utils/rangeFilter/rangeFilterHelperClasses.class";
 
 @Component({
   selector: 'search-research-results',
-  template: `
+  template: `    
     <new-search-page
       pageTitle="{{(simpleView?'':'Advanced ')}} Search for {{ getEntityName(resultType, true, true) | titlecase }}"
       [entityType]="resultType"
@@ -149,12 +149,13 @@ export class SearchResearchResultsComponent {
       size = 0;
     }
     if (page <= this.pagingLimit || this.searchUtils.status == this.errorCodes.LOADING) {
-      if (parameters != null && parameters != '') {
-        this.csvParams = "&fq=(" + this.resourcesQuery + " and (" + parameters + "))";
-      } else {
-        this.csvParams = "&fq=" + this.resourcesQuery;
-      }
-      this.csvParams += (refineFieldsFilterQuery ? refineFieldsFilterQuery : '');
+      // if (parameters != null && parameters != '') {
+      //   this.csvParams = "&fq=(" + this.resourcesQuery + " and (" + parameters + "))";
+      // } else {
+      //   this.csvParams = "&fq=" + this.resourcesQuery;
+      // }
+      this.csvParams = (parameters ? ("&fq=("+parameters) : "") + (parameters ? ")" : "");
+      this.csvParams += (refineFieldsFilterQuery ? refineFieldsFilterQuery : "");
 
       this.searchUtils.status = this.errorCodes.LOADING;
       this.disableForms = true;
diff --git a/searchPages/searchUtils/entitiesSelection.component.ts b/searchPages/searchUtils/entitiesSelection.component.ts
index 9f687004..3872db77 100644
--- a/searchPages/searchUtils/entitiesSelection.component.ts
+++ b/searchPages/searchUtils/entitiesSelection.component.ts
@@ -13,7 +13,7 @@ import {Router} from "@angular/router";
       <option *ngIf="simpleView && (showResearchOutcomes + showDataProviders + showOrganizations + showProjects )>1 " value="all">All content</option>
       <option *ngIf="showResearchOutcomes" value="result">Research outcomes</option>
       <option *ngIf="showProjects" value="project">Projects</option>
-      <option *ngIf="showDataProviders" value="content provider">Content providers</option>
+      <option *ngIf="showDataProviders" value="dataprovider">Content providers</option>
       <option *ngIf="showOrganizations" value="organization">Organizations</option>
     </select>
     <button *ngIf="!show && currentEntity"  class="uk-select uk-width-auto  portal-box uk-text-small">
@@ -92,7 +92,7 @@ export class EntitiesSelectionComponent {
       url = (simpleView?this.properties.searchLinkToResults:this.properties.searchLinkToAdvancedResults);
     }else if(this.selectedEntity == "project"){
       url = (simpleView?this.properties.searchLinkToProjects:this.properties.searchLinkToAdvancedProjects);
-    }else if(this.selectedEntity == "content provider"){
+    }else if(this.selectedEntity == "dataprovider"){
       url = (simpleView?this.properties.searchLinkToDataProviders:this.properties.searchLinkToAdvancedDataProviders);
     }else if(this.selectedEntity == "organization"){
       url = (simpleView?this.properties.searchLinkToOrganizations:this.properties.searchLinkToAdvancedOrganizations);
diff --git a/searchPages/searchUtils/newSearchPage.component.ts b/searchPages/searchUtils/newSearchPage.component.ts
index aee7f68c..f81219b0 100644
--- a/searchPages/searchUtils/newSearchPage.component.ts
+++ b/searchPages/searchUtils/newSearchPage.component.ts
@@ -62,7 +62,7 @@ export class NewSearchPageComponent {
   @Input() usedBy: string = "search";
   @Input() showResultCount: boolean = true;
   @Input() showMoreFilterValuesInline: boolean = true;
-  @Input() filterValuesNum: number = 5;
+  @Input() filterValuesNum: number = 6;
   @Input() keywordFields = [];
   @Input() simpleView: boolean = true;
   @Input() formPlaceholderText = "Type Keywords...";
@@ -695,7 +695,15 @@ export class NewSearchPageComponent {
       allFqs += "&type=software";
     } else if (this.entityType == "other") {
       allFqs += "&type=other";
+    } else if(this.entityType == "project") {
+      allFqs += "&type=projects";
+    } else if(this.entityType == "organization") {
+      allFqs += "&type=organizations";
+    } else if(this.entityType == "dataprovider") {
+      allFqs += "&type=datasources";
     }
+    console.log("AllFqs (check type): "+allFqs);
+    console.log("type: "+this.entityType);
     // var keyword = URLparams['keyword'];
     // var doiQuery = "";
     // var keywordQuery = "";
diff --git a/services/searchDataproviders.service.ts b/services/searchDataproviders.service.ts
index c71a80ad..21aef0a7 100644
--- a/services/searchDataproviders.service.ts
+++ b/services/searchDataproviders.service.ts
@@ -35,7 +35,8 @@ export class SearchDataprovidersService {
     }
     //((oaftype exact datasource) and(collectedfromdatasourceid exact "openaire____::47ce9e9f4fad46e732cff06419ecaabb"))
     advancedSearchDataproviders (params: string, page: number, size: number, properties: EnvProperties, refineParams:string=null,  refineFields:string[] =null, refineQuery:string = null  ):any {
-      let url =  properties.searchAPIURLLAst+"resources2/?format=json&type=datasources";
+    // &type=datasources
+      let url =  properties.searchAPIURLLAst+"resources2/?format=json";
 
       if(params!= null && params != ''  ) {
         url +="&query=(" + params + ")";
diff --git a/services/searchOrganizations.service.ts b/services/searchOrganizations.service.ts
index 98fd1c46..8aeb3be7 100644
--- a/services/searchOrganizations.service.ts
+++ b/services/searchOrganizations.service.ts
@@ -57,7 +57,8 @@ export class SearchOrganizationsService {
                     .pipe(map(res => [res['meta'].total, this.parseResults(res['results']),RefineResultsUtils.parse(res['refineResults'],refineFields, "organization")]));
     }
     advancedSearchOrganizations (params: string, page: number, size: number, properties:EnvProperties, refineParams:string=null,  refineFields:string[] =null, refineQuery:string = null   ):any {
-      let url = properties.searchAPIURLLAst+"resources2/?format=json&type=organizations";
+    // &type=organizations
+      let url = properties.searchAPIURLLAst+"resources2/?format=json";
       var basicQuery = "(reldatasourcecompatibilityid exact driver or reldatasourcecompatibilityid exact driver-openaire2.0 or " +
                 "reldatasourcecompatibilityid exact openaire2.0 or reldatasourcecompatibilityid exact openaire3.0 or " +
                 "reldatasourcecompatibilityid exact openaire2.0_data or reldatasourcecompatibilityid exact hostedBy or relproject=*)";
diff --git a/services/searchProjects.service.ts b/services/searchProjects.service.ts
index e55164ee..3982f614 100644
--- a/services/searchProjects.service.ts
+++ b/services/searchProjects.service.ts
@@ -52,7 +52,8 @@ export class SearchProjectsService {
       .pipe(map(res => [res['meta'].total, this.parseResults(res['results'])]));
     }
     advancedSearchProjects (params: string, page: number, size: number, properties:EnvProperties, refineParams:string=null,  refineFields:string[] =null, refineQuery:string = null  ):any {
-      let url = properties.searchAPIURLLAst+"resources2/?format=json&type=projects";
+    // &type=projects
+      let url = properties.searchAPIURLLAst+"resources2/?format=json";
       // var basicQuery = "(oaftype exact project) "
       // url += "?query=";
       if(params!= null && params != ''  ) {