Merge pull request #1608 from CSCfi/CSCTTV-3033

Cscttv 3033
CSCfi · Dec 14, 2022 · 786d814 · 786d814
2 parents 7345d72 + 5f7c5f3
commit 786d814
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -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
@@ -137,7 +137,7 @@ export class SinglePersonComponent implements OnInit {
 
         const personRes = result.persons[0];
         this.person = personRes;
-
+        this.person.orcidLink = 'https://orcid.org/' + this.person.orcid;
         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
@@ -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
   ) {}
 }