[Connect|Trunk]

fix issues with search content providers/projects
clean up piwikHelper file



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@60731 d315682c-612b-4755-9ff5-7f18f6832af3

src/app/searchPages/simple/searchDataproviders.component.ts

@@ -97,7 +97,7 @@ export class OpenaireSearchDataprovidersComponent {
             if(this.searchUtils.size != 5 && this.searchUtils.size != 10 && this.searchUtils.size != 20 && this.searchUtils.size != 50) {
               this.searchUtils.size = 10;
             }
-            this.keyword = (params['fv0']?params['fv0']:(params['keyword']?params['keyword']:''));
+            this.keyword = decodeURIComponent(params['fv0']?params['fv0']:(params['keyword']?params['keyword']:''));
             this.selectedFields = [];
             this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, [], [], this.fieldIdsMap, this.customFilter, params, "dataprovider");
             if (this.initialLoad) {
@@ -163,7 +163,7 @@ export class OpenaireSearchDataprovidersComponent {
     return results;
   }
   filterResults(){
-    let results = this.allResults.filter(value => { return value.title.name.toLowerCase().indexOf(this.keyword.toLowerCase()) !=-1 })
+    let results = this.allResults.filter(value => {return value.title.name && value.title.name.toLowerCase().indexOf(this.keyword.toLowerCase()) !=-1 });
     // this.oldTotalResults = results.length;
     this.searchUtils.totalResults = results.length;
     this.results = results.slice((this.searchUtils.page - 1) * this.searchUtils.size, this.searchUtils.page *this.searchUtils.size );

src/app/searchPages/simple/searchProjects.component.ts

@@ -96,7 +96,7 @@ export class OpenaireSearchProjectsComponent {
             if(this.searchUtils.size != 5 && this.searchUtils.size != 10 && this.searchUtils.size != 20 && this.searchUtils.size != 50) {
               this.searchUtils.size = 10;
             }
-            this.keyword = (params['fv0']?params['fv0']:(params['keyword']?params['keyword']:''));
+            this.keyword = decodeURIComponent(params['fv0']?params['fv0']:(params['keyword']?params['keyword']:''));
             this.selectedFields = [];
             this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, this.refineFields, [], this.fieldIdsMap, this.customFilter, params, "project");
             this.filters = [];
@@ -197,7 +197,7 @@ export class OpenaireSearchProjectsComponent {
       let sResult:SearchResult = new SearchResult();
       sResult.id = result.openaireId;
       sResult.title = {name:"", accessMode: null, sc39: null};
-      sResult.title.name = result.name;
+      sResult.title.name = result.name?result.name:result.acronym;
       sResult.acronym = result['acronym'];
       sResult.code = result['grantId'];
       sResult['funderShortname'] = result['funder'];
@@ -211,7 +211,7 @@ export class OpenaireSearchProjectsComponent {
     this.disableForms = true;
     this.disableRefineForms = true;
     this.enableSearchView = false;
-    let results = this.allResults.filter(value => { return value.title.name.toLowerCase().indexOf(this.keyword.toLowerCase()) !=-1 });
+    let results = this.allResults.filter(value => { return value.title.name && value.title.name.toLowerCase().indexOf(this.keyword.toLowerCase()) !=-1 ||  value.acronym && value.acronym.toLowerCase().indexOf(this.keyword.toLowerCase()) !=-1});
     let funderFilterValues = [];
     for(let filter of this.filters){
       if(filter.countSelectedValues > 0){

src/app/utils/piwikHelper.ts

@@ -1,6 +1,5 @@
 export class PiwikHelper{
   public static siteIDs={
-    "connect": 80,
     "dh-ch":81,
     "sdsn-gr":82,
     "egi":83,
@@ -20,33 +19,18 @@ export class PiwikHelper{
     "science-innovation-policy":253,
     "covid-19":267,
     "rural-digital-europe":319,
-    "enermaps":318
+    "enermaps":318,
+    "galaxy":453
   };
   public static siteIDsProduction={
-    "connect": 112,
     "dh-ch":198,
     "sdsn-gr":200,
-    "egi":83,
-    "elixir-gr":84,
     "fam":197,
-    "instruct":86,
     "mes":196,
-    "ni":199,
+    "ni":199
-    "oa-pg":89,
-    "rda":90,
-    "aginfra":93,
-    "clarin":100,
-    "dariah":103,
-    "epos": 217,
-    "beopen": 218,
-    "risis":219,
-    "science-innovation-policy":253,
-    "covid-19":267,
-    "rural-digital-europe":319,
-    "enermaps":318
   };
   public static getSiteId(communityId:string, environment:string){
-    // if(environment == 'production'){
+    // if(environment == 'production' && this.siteIDsProduction[communityId]){
     //   return this.siteIDsProduction[communityId];
     // }
     return this.siteIDs[communityId];

src/assets/customization.css

@@ -161,6 +161,6 @@ a:not(.uk-button),
     border-color: var(--portal-main-color);
 }
 
-.uk-text-primary{
+.uk-text-primary, .landing .download-from a:hover{
     color:  var(--portal-main-color) !important;
 }

src/environments/environment.ts

@@ -58,7 +58,7 @@ export let properties: EnvProperties = {
   logoutUrl: 'http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_logout',
   cookieDomain: '.di.uoa.gr',
   feedbackmail: 'openaire.test@gmail.com',
-  cacheUrl: 'http://duffy.di.uoa.gr:3000/get?url=',
+  cacheUrl: 'http://dl170.madgik.di.uoa.gr:3000/get?url=',
   adminToolsAPIURL: 'http://duffy.di.uoa.gr:8080/uoa-admin-tools/',
   adminToolsCommunity: 'connect',
   datasourcesAPI: 'https://beta.services.openaire.eu/openaire/ds/search/',