From eeb63a2de9cdea3e3d41253b124c86a3ab0c2c79 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Tue, 16 Apr 2024 11:47:12 +0300
Subject: [PATCH] [develop | DONE | CHANGED]: In search projects results, show
 funder name by default, and if not available, show funder short name. 1.
 searchResult.ts: Added field funderName: string; in class SearchResult. 2.
 result-preview.ts: Added field funderName: string; in class ResultPreview &
 in method "searchResultConvert()" set resultPreview.funderName =
 result.funderName; 3. searchProjects.service.ts: Added parsing of funderName.
 4. result-preview.component.html: Show funderName and if not available, show
 funderShortname. 5. entity-metadata.component.ts: Added check for funders
 display.

---
 landingPages/landing-utils/entity-metadata.component.ts | 2 +-
 services/searchProjects.service.ts                      | 1 +
 utils/entities/searchResult.ts                          | 1 +
 utils/result-preview/result-preview.component.html      | 8 ++++----
 utils/result-preview/result-preview.ts                  | 2 ++
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/landingPages/landing-utils/entity-metadata.component.ts b/landingPages/landing-utils/entity-metadata.component.ts
index 0378f127..4060446c 100644
--- a/landingPages/landing-utils/entity-metadata.component.ts
+++ b/landingPages/landing-utils/entity-metadata.component.ts
@@ -295,7 +295,7 @@ export class EntityMetadataComponent {
       return this.projects.map(project => {
         let value = project.funderShortname ? project.funderShortname : project.funderName;
         if (project.acronym || project.title) {
-          value = value + ' | ' + (project.acronym ? project.acronym :
+          value = (value ? value + ' | ' : '') + (project.acronym ? project.acronym :
             (project.title.length > 25 ? (project.title.slice(0, 25) + '...'): project.title));
         }
         // if(project.code) {
diff --git a/services/searchProjects.service.ts b/services/searchProjects.service.ts
index e9c48eaa..e9e704b9 100644
--- a/services/searchProjects.service.ts
+++ b/services/searchProjects.service.ts
@@ -231,6 +231,7 @@ export class SearchProjectsService {
                   let fundingData = Array.isArray(resData['fundingtree']) ? resData['fundingtree'][z] : resData['fundingtree'];
                   if(fundingData.hasOwnProperty("funder")) {
                     result['funderShortname'] = fundingData['funder'].shortname;
+                    result['funderName'] = fundingData['funder'].name;
                     result['funderId'] = fundingData['funder'].id;
                     result['jurisdiction'] = (fundingData['funder']['id']['jurisdiction'] )?fundingData['funder']['id']['jurisdiction']:"";
 
diff --git a/utils/entities/searchResult.ts b/utils/entities/searchResult.ts
index e59e56f7..ba762833 100644
--- a/utils/entities/searchResult.ts
+++ b/utils/entities/searchResult.ts
@@ -48,6 +48,7 @@ export class SearchResult {
   acronym: string;
   code: string;
   // callIdentifier?: string; // currently not parsed
+  funderName: string;
   funderShortname: string;
   budget?: string;
   contribution?: string;
diff --git a/utils/result-preview/result-preview.component.html b/utils/result-preview/result-preview.component.html
index 046eb7c0..70fa4f30 100644
--- a/utils/result-preview/result-preview.component.html
+++ b/utils/result-preview/result-preview.component.html
@@ -95,12 +95,12 @@
           <!-- 2nd section (funders, budget, authors, PIDs, publisher etc.) -->
           <div class="uk-text-small uk-margin-small-bottom">
             <!-- Funder -->
-            <div *ngIf="result.funderShortname || result.code" class="uk-margin-xsmall-bottom">
-						<span *ngIf="result.funderShortname">
+            <div *ngIf="(result.funderShortname || result.funderName) || result.code" class="uk-margin-xsmall-bottom">
+						<span *ngIf="result.funderShortname || result.funderName">
 							<span class="uk-text-meta">Funder: </span>
-                          {{result.funderShortname}}
+              {{result.funderName ? result.funderName : result.funderShortname}}
 						</span>
-              <span *ngIf="result.code" [class.uk-margin-left]="result.funderShortname">
+              <span *ngIf="result.code" [class.uk-margin-left]="result.funderShortname || result.funderName">
 							<span class="uk-text-meta">{{openaireEntities.PROJECT}} Code: </span>
                 {{result.code}}
 						</span>
diff --git a/utils/result-preview/result-preview.ts b/utils/result-preview/result-preview.ts
index 542e34f2..c8a38e1d 100644
--- a/utils/result-preview/result-preview.ts
+++ b/utils/result-preview/result-preview.ts
@@ -123,6 +123,7 @@ export class ResultPreview {
   acronym: string;
   code: string;
   // callIdentifier: string;  // currently not parsed
+  funderName: string;
   funderShortname: string;
   budget: string;
   contribution: string;
@@ -188,6 +189,7 @@ export class ResultPreview {
     resultPreview.acronym = result.acronym;
     resultPreview.code = result.code;
     // resultPreview.callIdentifier = result.callIdentifier;  // currently not parsed
+    resultPreview.funderName = result.funderName;
     resultPreview.funderShortname = result.funderShortname;
     resultPreview.budget = result.budget;
     resultPreview.contribution = result.contribution;