From 3e02680f5e4cf0ed4fbf8a3c9445046efc086199 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Fri, 8 Dec 2023 15:33:44 +0200
Subject: [PATCH] [angular-16-irish-monitor]: Add orcid in user class. Fix
 orcid button text. Remove capitalize from buttons in download and data dump.

---
 login/utils/helper.class.ts                          | 4 ++++
 orcid/my-orcid-links/myOrcidLinks.component.ts       | 2 +-
 searchPages/searchUtils/newSearchPage.component.html | 7 ++++---
 searchPages/searchUtils/searchDownload.component.ts  | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/login/utils/helper.class.ts b/login/utils/helper.class.ts
index 4c6301af..ea0a83d5 100644
--- a/login/utils/helper.class.ts
+++ b/login/utils/helper.class.ts
@@ -10,6 +10,7 @@ export class User {
   expirationDate: number;
   role: string[];
   accessToken?: string;
+  orcid?: string;
   refreshToken?: string;
 
   constructor(info: any) {
@@ -23,6 +24,9 @@ export class User {
     if(info.refreshToken) {
       this.refreshToken = info.refreshToken;
     }
+    if(info.orcid) {
+      this.orcid = info.orcid;
+    }
     this.fullname = (info.name) ? info.name : "";
     if (this.fullname == "") {
       if (this.firstname != "") {
diff --git a/orcid/my-orcid-links/myOrcidLinks.component.ts b/orcid/my-orcid-links/myOrcidLinks.component.ts
index 29d66592..5ed92e52 100644
--- a/orcid/my-orcid-links/myOrcidLinks.component.ts
+++ b/orcid/my-orcid-links/myOrcidLinks.component.ts
@@ -32,7 +32,7 @@ declare var UIkit: any;
               My ORCID links
             </div>
             <span *ngIf="authorNameParam" class="uk-width-1-1 uk-width-expand@m">
-              <a class="uk-button-text uk-align-left uk-align-right@m" [queryParams]="authorNameParam" 
+              <a class="uk-button uk-button-text uk-align-left uk-align-right@m" [queryParams]="authorNameParam" 
                   [routerLink]="properties.searchLinkToAdvancedResults" routerLinkActive="router-link-active">
                 Discover {{openaireEntities.RESULTS | lowercase}} related to you
               </a>
diff --git a/searchPages/searchUtils/newSearchPage.component.html b/searchPages/searchUtils/newSearchPage.component.html
index 10663822..df53c3b4 100644
--- a/searchPages/searchUtils/newSearchPage.component.html
+++ b/searchPages/searchUtils/newSearchPage.component.html
@@ -288,7 +288,7 @@
               <div class="uk-flex uk-flex-middle uk-flex-wrap uk-child-width-1-1 uk-child-width-auto@m" [class.uk-flex-between]="!mobile"
                    [class.uk-margin-top]="mobile">
                 <!-- Total results, number of pages -->
-                <div class="uk-width-expand@m uk-margin-remove-bottom uk-text-truncate uk-margin-medium-right" [class.uk-h6]="!mobile" [class.uk-text-center]="mobile">
+                <div class="uk-width-expand@m uk-margin-remove-bottom uk-text-truncate" [class.uk-margin-medium-right]="!mobile" [class.uk-h6]="!mobile" [class.uk-text-center]="mobile">
                   <ng-container *ngIf="results && searchUtils.totalResults > 0">
                     <span>{{searchUtils.totalResults|number}}</span>
                     <span class="uk-text-meta uk-text-capitalize"> {{type}}</span>
@@ -316,8 +316,9 @@
                       [type]="csvPath" [csvParams]="csvParams" [totalResults]="searchUtils.totalResults">
                   </search-download>
                   <ng-container *ngIf="properties.zenodoDumpUrl && entityType == 'result'">
-                    <button [href]="properties.zenodoDumpUrl" target="_blank" class=" uk-margin-left uk-button uk-button-link uk-flex uk-flex-middle uk-text-capitalize">
-                      <img src="assets/common-assets/common/zenodoDump.png" width="20px"><span class="uk-margin-xsmall-left">Data dump</span></button>
+                    <a [href]="properties.zenodoDumpUrl" target="_blank" class=" uk-margin-left uk-button uk-button-link uk-flex uk-flex-middle">
+                      <img src="assets/common-assets/common/zenodoDump.png" width="20"><span class="uk-margin-xsmall-left">Data dump</span>
+                    </a>
                   </ng-container>
                 </div>
               </div>
diff --git a/searchPages/searchUtils/searchDownload.component.ts b/searchPages/searchUtils/searchDownload.component.ts
index af9d2cf2..39448aec 100644
--- a/searchPages/searchUtils/searchDownload.component.ts
+++ b/searchPages/searchUtils/searchDownload.component.ts
@@ -16,7 +16,7 @@ import {properties} from "../../../../environments/environment";
   template: `
       <button [attr.uk-tooltip]="'title: Download' + ((totalResults > csvLimit)?' the first 2000 ':' ') + 'results.' + 
       ((totalResults > csvLimit && properties.zenodoDumpUrl)?' To get all results download the data dump. ':' ') "
-              class="uk-button uk-button-link uk-flex uk-flex-middle uk-text-capitalize" [class.uk-disabled]="isDisabled"
+              class="uk-button uk-button-link uk-flex uk-flex-middle" [class.uk-disabled]="isDisabled"
               [disabled]="isDisabled"
               (click)="downloadfile(downloadURLAPI+'?format=csv'+csvParams,type+'-report-'+((totalResults > csvLimit)?'2000 ':totalResults))">
           <icon name="download" [flex]="true"></icon>