From 3045d7afecefbd559aa21f1e147f6d9cbbb0e4e5 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Thu, 12 Mar 2020 10:46:02 +0000 Subject: [PATCH] [Trunk | Library]: 1. searchResearchResults.service.ts & resultLanding.service.ts: Do not stringify null or undefined value for description. 2. claimResultSearchForm.component.ts: Do not stringify null or undefined value for accessRights. git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58234 d315682c-612b-4755-9ff5-7f18f6832af3 --- claims/claim-utils/claimResultSearchForm.component.ts | 2 +- landingPages/result/resultLanding.service.ts | 6 ++++-- services/searchResearchResults.service.ts | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/claims/claim-utils/claimResultSearchForm.component.ts b/claims/claim-utils/claimResultSearchForm.component.ts index 2cf9a057..6153999e 100644 --- a/claims/claim-utils/claimResultSearchForm.component.ts +++ b/claims/claim-utils/claimResultSearchForm.component.ts @@ -620,7 +620,7 @@ export class ClaimResultSearchFormComponent { entity.result.url = prefixUrl + entity.id; entity.result.source = String("openaire"); entity.result.date = (item.year && item.year != "") ? item.year : null; - entity.result.accessRights = String(item.title.accessMode); + entity.result.accessRights = (item.title && item.title.accessMode) ? String(item.title.accessMode) : ""; entity.type = type; entity.result.embargoEndDate = (item.embargoEndDate && item.embargoEndDate != "") ? item.embargoEndDate : entity.result.embargoEndDate; diff --git a/landingPages/result/resultLanding.service.ts b/landingPages/result/resultLanding.service.ts index 591bbf8c..c4052ae4 100644 --- a/landingPages/result/resultLanding.service.ts +++ b/landingPages/result/resultLanding.service.ts @@ -92,9 +92,11 @@ export class ResultLandingService { this.resultLandingInfo.dateofacceptance = data[0].dateofacceptance; this.resultLandingInfo.publisher = data[0].publisher; if(!Array.isArray(data[0].description)) { - this.resultLandingInfo.description = String(data[0].description); + //this.resultLandingInfo.description = String(data[0].description); + this.resultLandingInfo.description = (data[0] && data[0].description) ? String(data[0].description) : ""; } else { - this.resultLandingInfo.description = String(data[0].description[0]); + //this.resultLandingInfo.description = String(data[0].description[0]); + this.resultLandingInfo.description = (data[0] && data[0].description[0]) ? String(data[0].description[0]) : ""; } this.resultLandingInfo.embargoEndDate = data[0].embargoenddate; } diff --git a/services/searchResearchResults.service.ts b/services/searchResearchResults.service.ts index c0555a32..f67357ee 100644 --- a/services/searchResearchResults.service.ts +++ b/services/searchResearchResults.service.ts @@ -266,9 +266,9 @@ export class SearchResearchResultsService { result.year = (date && (date).indexOf('-') !== -1)?date.split('-')[0]:date; if(!Array.isArray(resData.description)) { - result.description = String(resData.description); + result.description = (resData.description) ? String(resData.description) : ""; } else { - result.description = String(resData.description[0]); + result.description = (resData.description[0]) ? String(resData.description[0]) : ""; } if(result.description && result.description.length > this.sizeOfDescription) {