From 5dbf849a3216da8694999bbd64ff8011a407ba9a Mon Sep 17 00:00:00 2001
From: "konstantina.galouni"
 <konstantina.galouni@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Tue, 27 Mar 2018 14:35:05 +0000
Subject: [PATCH] 1. Columns changed from 4 to 3 for 'Search Projects' in
 community portals ('Acronym' and 'Name' merged to 'Project'). 2. Links added
 to 'Search Projects' and 'Search Content Providers' in community portals.

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@51537 d315682c-612b-4755-9ff5-7f18f6832af3
---
 .../searchPageTableView.component.html        | 20 ++++++++++++++++++-
 .../searchPageTableView.component.ts          |  4 ++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/searchPages/searchUtils/searchPageTableView.component.html b/searchPages/searchUtils/searchPageTableView.component.html
index f8bf49cc..66caa8ea 100644
--- a/searchPages/searchUtils/searchPageTableView.component.html
+++ b/searchPages/searchUtils/searchPageTableView.component.html
@@ -128,13 +128,25 @@
                     </td>
 
                     <!--Community Projects - name is also used for Community Content Providers-->
-                    <td *ngIf="result.hasOwnProperty('acronym')" [class]="'uk-text-center uk-width-1-'+columnNames.length">
+                    <!-- <td *ngIf="result.hasOwnProperty('acronym')" [class]="'uk-text-center uk-width-1-'+columnNames.length">
                       <span *ngIf="result.acronym">{{result.acronym}}</span>
                       <span *ngIf="!result.acronym">-</span>
                     </td>
                     <td *ngIf="result.hasOwnProperty('name')" [class]="'uk-text-center uk-width-1-'+columnNames.length">
                       <span *ngIf="result.name">{{result.name}}</span>
                       <span *ngIf="!result.name">-</span>
+                    </td> -->
+
+                    <!--Community Projects-->
+                    <td *ngIf="result.hasOwnProperty('acronym') && result.hasOwnProperty('name')" [class]="'uk-text-center uk-width-1-'+columnNames.length">
+                      <a [queryParams]="(result.openaireId) ? {projectId: result.openaireId} : {grantId: encode(result.grantId), funder: encode(result.funder)}"
+                          routerLinkActive="router-link-active" routerLink="/search/project">
+                        <span *ngIf="result.name">{{result.name}}</span>
+                        <span *ngIf="result.name && result.acronym">(</span>
+                        <span *ngIf="result.acronym">{{result.acronym}}</span>
+                        <span *ngIf="result.name && result.acronym">)</span>
+                        <span *ngIf="!result.name && !result.acronym">[no title available]</span>
+                      </a>
                     </td>
                     <td *ngIf="result.hasOwnProperty('grantId')" [class]="'uk-text-center uk-width-1-'+columnNames.length">
                       <span *ngIf="result.grantId">{{result.grantId}}</span>
@@ -146,6 +158,12 @@
                     </td>
 
                     <!--Community Content Providers-->
+                    <td *ngIf="!result.hasOwnProperty('acronym') && result.hasOwnProperty('name')" [class]="'uk-text-center uk-width-1-'+columnNames.length">
+                      <a [queryParams]="{datasourceId: result.openaireId}" routerLinkActive="router-link-active" routerLink="/search/dataprovider">
+                        <span *ngIf="result.name">{{result.name}}</span>
+                        <span *ngIf="!result.name">[no name available]</span>
+                      </a>
+                    </td>
                     <td *ngIf="result.hasOwnProperty('officialname')" [class]="'uk-text-center uk-width-1-'+columnNames.length">
                       <span *ngIf="result.officialname">{{result.officialname}}</span>
                       <span *ngIf="!result.officialname">-</span>
diff --git a/searchPages/searchUtils/searchPageTableView.component.ts b/searchPages/searchUtils/searchPageTableView.component.ts
index 8efa867b..5ff0f030 100644
--- a/searchPages/searchUtils/searchPageTableView.component.ts
+++ b/searchPages/searchUtils/searchPageTableView.component.ts
@@ -490,4 +490,8 @@ Transform initial - not filtered results to get the filtered number
 
       return true;
     }
+
+    public encode(param: string): string {
+      return StringUtils.URIEncode(param);
+    }
 }