From aab0341bea0d10fcdf287aa29d4cb6dfc4e65d4e Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Mon, 27 Sep 2021 12:19:24 +0300
Subject: [PATCH] [Explore | Trunk]: 1. dataProvider.service.ts &
 project.service.ts & resultLanding.service.ts &
 searchDataproviders.service.ts & searchOrganizations.service.ts &
 searchProjects.service.ts & searchResearchResults.service.ts: Removed case
 sensitivity in parsing relations (rels.rel.to.class). 2. orcid.service.ts:
 Removed unused imports | Added comment related to KPI metrics calculated by
 orcid API.

---
 landingPages/dataProvider/dataProvider.service.ts |  2 +-
 landingPages/project/project.service.ts           |  4 ++--
 landingPages/result/resultLanding.service.ts      | 12 ++++++------
 orcid/orcid.service.ts                            |  5 ++---
 services/searchDataproviders.service.ts           |  2 +-
 services/searchOrganizations.service.ts           |  2 +-
 services/searchProjects.service.ts                |  2 +-
 services/searchResearchResults.service.ts         |  2 +-
 8 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/landingPages/dataProvider/dataProvider.service.ts b/landingPages/dataProvider/dataProvider.service.ts
index 3882851f..7446a6c7 100644
--- a/landingPages/dataProvider/dataProvider.service.ts
+++ b/landingPages/dataProvider/dataProvider.service.ts
@@ -240,7 +240,7 @@ export class DataProviderService {
             for(let i=0; i<length; i++) {
                 mydata = data[5].length!=undefined ? data[5][i] : data[5];
                 if(mydata.hasOwnProperty("to")) {
-                    if(mydata['to'].class == "isProvidedBy" && mydata['to'].type == "organization") {
+                    if(mydata['to'].class && mydata['to'].class.toLowerCase() == "isprovidedby" && mydata['to'].type == "organization") {
                         //if(this.dataProviderInfo.organizations == undefined) {
                         if(this.dataProviderInfo.organizations.length == 0) {
                             //this.dataProviderInfo.organizations = new Array<{"name": string, "url": string}>();
diff --git a/landingPages/project/project.service.ts b/landingPages/project/project.service.ts
index ae4c65d6..b74a1d37 100644
--- a/landingPages/project/project.service.ts
+++ b/landingPages/project/project.service.ts
@@ -174,7 +174,7 @@ export class ProjectService {
             this.projectInfo.organizations = [];//new Map<string, string>();
 
             if(!Array.isArray(data[2])) {
-              if(data[2].hasOwnProperty("to") && data[2]['to'].class == "hasParticipant") {
+              if(data[2].hasOwnProperty("to") && data[2]['to'].class && data[2]['to'].class.toLowerCase() == "hasparticipant") {
                 let acronym: string = "";
                 let name: string = "";
                 let id: string = "";
@@ -200,7 +200,7 @@ export class ProjectService {
                   let acronym: string = "";
                   let name: string = "";
                   let id: string = "";
-                    if(data[2][i].hasOwnProperty("to") && data[2][i]['to'].class == "hasParticipant") {
+                    if(data[2][i].hasOwnProperty("to") && data[2][i]['to'].class && data[2][i]['to'].class.toLowerCase() == "hasparticipant") {
                         if(data[2][i].hasOwnProperty("legalshortname")) {
                           acronym = data[2][i].legalshortname;
                         }
diff --git a/landingPages/result/resultLanding.service.ts b/landingPages/result/resultLanding.service.ts
index c4e029f6..6d0a2ee8 100644
--- a/landingPages/result/resultLanding.service.ts
+++ b/landingPages/result/resultLanding.service.ts
@@ -185,22 +185,22 @@ export class ResultLandingService {
       for(let i=0; i<length; i++) {
         relation = Array.isArray(data[2]) ? data[2][i] : data[2];
         if(relation.hasOwnProperty("to")) {
-          if(relation['to'].class == "isProducedBy") {
+          if(relation['to'].class && relation['to'].class.toLowerCase() == "isproducedby") {
             this.resultLandingInfo.fundedByProjects = this.parsingFunctions.parseFundingByProjects(this.resultLandingInfo.fundedByProjects, relation, provenanceActionVocabulary);
-          } else if(relation['to'].class == "isRelatedTo") {
+          } else if(relation['to'].class && relation['to'].class.toLowerCase() == "isrelatedto") {
             let provenanceAction: string = "";
             if(provenanceActionVocabulary != null && relation.provenanceaction in provenanceActionVocabulary) {
               provenanceAction = provenanceActionVocabulary[relation.provenanceaction];
             }
 
             this.resultLandingInfo.relatedResearchResults = this.parsingFunctions.parseRelatedResearchResults(this.resultLandingInfo.relatedResearchResults, relation, provenanceAction);
-          } else if(relation['to'].class == "hasAmongTopNSimilarDocuments") {
+          } else if(relation['to'].class && relation['to'].class.toLowerCase() == "hasamongtopnsimilardocuments") {
             this.resultLandingInfo.similarResearchResults = this.parsingFunctions.parseSimilarResearchResults(this.resultLandingInfo.similarResearchResults, relation);
-          } else if(relation['to'].class == "hasAuthorInstitution") {
+          } else if(relation['to'].class && relation['to'].class.toLowerCase() == "hasauthorinstitution") {
             this.resultLandingInfo.organizations = this.parseRelatedOrganizations(this.resultLandingInfo.organizations, relation);
-          } else if(relation['to'].class == "isSupplementedBy") {
+          } else if(relation['to'].class && relation['to'].class.toLowerCase() == "issupplementedby") {
             this.resultLandingInfo.supplementaryResearchResults = this.parsingFunctions.parseSupplementaryResearchResults(this.resultLandingInfo.supplementaryResearchResults, relation);
-          } else if(relation['to'].class == "isSupplementTo") {
+          } else if(relation['to'].class && relation['to'].class.toLowerCase() == "issupplementto") {
             this.resultLandingInfo.supplementedByResearchResults = this.parsingFunctions.parseSupplementedByResearchResults(this.resultLandingInfo.supplementedByResearchResults, relation);
           }
         }
diff --git a/orcid/orcid.service.ts b/orcid/orcid.service.ts
index ec349cac..8af2c49b 100644
--- a/orcid/orcid.service.ts
+++ b/orcid/orcid.service.ts
@@ -4,8 +4,6 @@ import {map} from "rxjs/operators";
 import {ResultLandingInfo} from "../utils/entities/resultLandingInfo";
 import {CustomOptions} from "../services/servicesUtils/customOptions.class";
 import {WorkV3_0} from "./orcidWork";
-import {encode, toUnicode} from "punycode";
-import {Observable} from "rxjs";
 import {properties} from "../../../environments/environment";
 import {ConnectHelper} from "../connect/connectHelper";
 
@@ -52,6 +50,7 @@ export class OrcidService {
   saveWork(resultLandingInfo: ResultLandingInfo, pids: string) {
     let work = WorkV3_0.resultLandingInfoConvert(resultLandingInfo, null);
     let portalId: string = ConnectHelper.getCommunityFromDomain(properties.domain);
+    // if dashboard format changes, check in API the metrics service ("calculateMetrics" method) for orcid KPIs
     let dashboard: string = properties.environment + "_" + properties.dashboard + (portalId? "_" + portalId : "");
     let result = {
       "dashboard": dashboard,
@@ -143,4 +142,4 @@ export class OrcidService {
     let url: string = properties.orcidAPIURL+"orcid/personal-details";
     return this.http.get(url, CustomOptions.registryOptions());
   }
-}
\ No newline at end of file
+}
diff --git a/services/searchDataproviders.service.ts b/services/searchDataproviders.service.ts
index 385cf52c..3e7235bb 100644
--- a/services/searchDataproviders.service.ts
+++ b/services/searchDataproviders.service.ts
@@ -390,7 +390,7 @@ export class SearchDataprovidersService {
                 let relation = Array.isArray(resData['rels']['rel']) ? resData['rels']['rel'][i] : resData['rels']['rel'];
 
                 if(relation.hasOwnProperty("to")) {
-                    if(relation['to'].class == "isProvidedBy" && relation['to'].type == "organization") {
+                    if(relation['to'].class && relation['to'].class.toLowerCase() == "isprovidedby" && relation['to'].type == "organization") {
                         if(getOrganizations) {
                             let item: {"name":string, "id":string} = {"name": "", "id": ""};
                             //item['name'] = relation.legalname;
diff --git a/services/searchOrganizations.service.ts b/services/searchOrganizations.service.ts
index 13fcfa1c..978a5496 100644
--- a/services/searchOrganizations.service.ts
+++ b/services/searchOrganizations.service.ts
@@ -113,7 +113,7 @@ export class SearchOrganizationsService {
                     let relation = Array.isArray(resData['rels']['rel']) ? resData['rels']['rel'][j] : resData['rels']['rel'];
 
                     if(relation.hasOwnProperty("to")) {
-                        if(relation['to'].class == "isParticipant") {
+                        if(relation['to'].class && relation['to'].class.toLowerCase() == "isparticipant") {
                             if(result['projects'] == undefined) {
                                 result['projects'] = new Array<
                                     { "id": string, "acronym": string, "title": string,
diff --git a/services/searchProjects.service.ts b/services/searchProjects.service.ts
index ae0ccfae..daacbcf2 100644
--- a/services/searchProjects.service.ts
+++ b/services/searchProjects.service.ts
@@ -171,7 +171,7 @@ export class SearchProjectsService {
                     let relation = Array.isArray(resData['rels']['rel']) ? resData['rels']['rel'][j] : resData['rels']['rel'];
 
                     if(relation.hasOwnProperty("to")) {
-                         if(relation['to'].class == "hasParticipant") {
+                         if(relation['to'].class && relation['to'].class.toLowerCase() == "hasparticipant") {
                             if(result['organizations'] == undefined) {
                                 result['organizations'] = new Array<
                                     { "name": string, "id": string}>();
diff --git a/services/searchResearchResults.service.ts b/services/searchResearchResults.service.ts
index 92b0a2d8..1877c7a9 100644
--- a/services/searchResearchResults.service.ts
+++ b/services/searchResearchResults.service.ts
@@ -305,7 +305,7 @@ export class SearchResearchResultsService {
           let relation = Array.isArray(resData['rels']['rel']) ? resData['rels']['rel'][j] : resData['rels']['rel'];
           
           if (relation.hasOwnProperty("to")) {
-            if (relation['to'].class == "isProducedBy") {
+            if (relation['to'].class && relation['to'].class.toLowerCase() == "isproducedby") {
               result['projects'] = this.parseProjects(result['projects'], relation);
             }
           }