From e8f204cea2301daaebb9c91997c6600cd42b7aea Mon Sep 17 00:00:00 2001
From: konolak <kari.konola@csc.fi>
Date: Wed, 14 Dec 2022 14:46:21 +0200
Subject: [PATCH 1/2] remove orcid logo from search results and add orcid link
 to single researchers view

---
 .../portal/components/results/persons/persons.component.html | 1 -
 .../single/single-person/single-person.component.html        | 5 ++++-
 .../single/single-person/single-person.component.ts          | 4 +++-
 src/app/portal/models/person/person.model.ts                 | 3 ++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/app/portal/components/results/persons/persons.component.html b/src/app/portal/components/results/persons/persons.component.html
index 2b347002b..a3319e820 100644
--- a/src/app/portal/components/results/persons/persons.component.html
+++ b/src/app/portal/components/results/persons/persons.component.html
@@ -34,7 +34,6 @@
           [innerHtml]="person.name | highlight: input"
         >
         </a>
-        <app-orcid></app-orcid>
       </ng-template>
     </div>
   </div>
diff --git a/src/app/portal/components/single/single-person/single-person.component.html b/src/app/portal/components/single/single-person/single-person.component.html
index c1fa40bc1..bd1b5c57d 100644
--- a/src/app/portal/components/single/single-person/single-person.component.html
+++ b/src/app/portal/components/single/single-person/single-person.component.html
@@ -45,14 +45,17 @@ <h2 i18n="@@404">404 - Virheellinen osoite</h2>
       <div class="row pb-3">
         <div class="col">
           <h1 class="mb-3">{{ person.name }}</h1>
+          <a [href]="person.orcidLink" target="_blank">
           <span *ngIf="person.orcid">
             <img
               class="orcid-icon"
               src="assets/img/orcid_icon.svg"
               alt="Orcid -palvelun logo"
             />
-            http://orcid.org/{{ person.orcid }}
+            https://orcid.org/{{ person.orcid }}
           </span>
+            <fa-icon icon="external-link-alt"></fa-icon>
+          </a>
         </div>
       </div>
 
diff --git a/src/app/portal/components/single/single-person/single-person.component.ts b/src/app/portal/components/single/single-person/single-person.component.ts
index 27b19c370..f43a53fcf 100644
--- a/src/app/portal/components/single/single-person/single-person.component.ts
+++ b/src/app/portal/components/single/single-person/single-person.component.ts
@@ -137,7 +137,9 @@ export class SinglePersonComponent implements OnInit {
 
         const personRes = result.persons[0];
         this.person = personRes;
-
+        console.log('res', this.person.orcidLink);
+        this.person.orcidLink = 'https://orcid.org/' + this.person.orcid;
+        console.log('res2', this.person.orcidLink);
         if (personRes) {
           this.setTitle(
             `${personRes.name} - ${$localize`:@@appName:Tiedejatutkimus.fi`}`
diff --git a/src/app/portal/models/person/person.model.ts b/src/app/portal/models/person/person.model.ts
index a8a49a74d..9c12b81ac 100644
--- a/src/app/portal/models/person/person.model.ts
+++ b/src/app/portal/models/person/person.model.ts
@@ -42,7 +42,8 @@ export class Person {
     public description: string,
     public fieldsOfScience: string,
     public keywords: string,
-    public uniqueDataSources: any
+    public uniqueDataSources: any,
+    public orcidLink?: string
   ) {}
 }
 

From 5f7c5f33d01bd7e35e3b265ddf7387f0f8688fb3 Mon Sep 17 00:00:00 2001
From: konolak <kari.konola@csc.fi>
Date: Wed, 14 Dec 2022 14:48:00 +0200
Subject: [PATCH 2/2] remove console logs

---
 .../components/single/single-person/single-person.component.ts  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/app/portal/components/single/single-person/single-person.component.ts b/src/app/portal/components/single/single-person/single-person.component.ts
index f43a53fcf..ce308424a 100644
--- a/src/app/portal/components/single/single-person/single-person.component.ts
+++ b/src/app/portal/components/single/single-person/single-person.component.ts
@@ -137,9 +137,7 @@ export class SinglePersonComponent implements OnInit {
 
         const personRes = result.persons[0];
         this.person = personRes;
-        console.log('res', this.person.orcidLink);
         this.person.orcidLink = 'https://orcid.org/' + this.person.orcid;
-        console.log('res2', this.person.orcidLink);
         if (personRes) {
           this.setTitle(
             `${personRes.name} - ${$localize`:@@appName:Tiedejatutkimus.fi`}`