From 9577c7841d5671d86f1c9c1252384c2508bc3c73 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Tue, 17 May 2022 12:15:15 +0300
Subject: [PATCH] [common-assets & Library | new-theme]: Fixes for orcid
 dropdown in authors and increase timeout for addThis check for warning. 1.
 addThis.component.ts: [Bug fix] Increased timeout to 4 sec and fix check
 (sometimes innerText was undefined). 2. searchMyOrcidResults.component.html:
 [Bug fix] Removed uk-animation-fade from results and added uk-scrollspy. 3.
 showAuthors.component.ts: [Bug fix] Fixed copy to clipboard -
 data-clipboard-target was not working because we have multiple clipboards in
 the same page (reverted code to old way of copying). 4.
 timeout-interceptor.service.ts: Reverted timeout time for client. 5.
 utils.css: Added custom css for .orcid-dropdown input (orcid dropdown in
 authors).

---
 .../landing-utils/addThis.component.ts        | 17 ++++++++++----
 .../searchMyOrcidResults.component.html       |  4 ++--
 timeout-interceptor.service.ts                |  2 +-
 utils/authors/showAuthors.component.ts        | 23 ++++++++-----------
 4 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/landingPages/landing-utils/addThis.component.ts b/landingPages/landing-utils/addThis.component.ts
index 9753b1a0..88224fb9 100644
--- a/landingPages/landing-utils/addThis.component.ts
+++ b/landingPages/landing-utils/addThis.component.ts
@@ -1,4 +1,14 @@
-import {Component, EventEmitter, Inject, OnInit, Output, RendererFactory2, ViewEncapsulation} from '@angular/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Inject,
+  OnInit,
+  Output,
+  RendererFactory2,
+  ViewChild,
+  ViewEncapsulation
+} from '@angular/core';
 import {ActivatedRoute} from '@angular/router';
 import {DOCUMENT} from "@angular/common";
 import {Subscriber} from "rxjs";
@@ -67,11 +77,10 @@ export class AddThisComponent implements OnInit {
           }
         }
         this.subs.push(setTimeout(() => {
-          if(this.document.getElementById('addThis') && this.document.getElementById('addThis').innerText.length ==0){
+          if(this.document.getElementById('addThis') && this.document.getElementById('addThis').innerText){
             this.showWarning = true;
           }
-        }, 2000));
-
+        }, 4000));
       }catch (e) {
           // console.error(e)
       }
diff --git a/orcid/my-orcid-links/searchMyOrcidResults.component.html b/orcid/my-orcid-links/searchMyOrcidResults.component.html
index 731a80f0..c7848ea2 100644
--- a/orcid/my-orcid-links/searchMyOrcidResults.component.html
+++ b/orcid/my-orcid-links/searchMyOrcidResults.component.html
@@ -5,10 +5,10 @@
                   [totalResults]="totalResults">
   </no-load-paging>
 
-  <ul class="uk-list search-results uk-margin-remove-top">
+  <ul class="uk-list search-results uk-margin-remove-top" uk-scrollspy="cls: uk-animation-fade; target: .uk-card; delay: 100">
     <errorMessages *ngIf="status != errorCodes.NONE" [status]="[status]" [type]="'results'"></errorMessages>
 
-    <li *ngFor="let result of previewResults" class="uk-animation-fade">
+    <li *ngFor="let result of previewResults">
       <div class="uk-card uk-card-default uk-padding">
         <div class="uk-grid uk-grid-divider">
         <div class="uk-width-expand@m uk-width-1-1 uk-first-column">
diff --git a/timeout-interceptor.service.ts b/timeout-interceptor.service.ts
index ca5b7c7a..c1374c82 100644
--- a/timeout-interceptor.service.ts
+++ b/timeout-interceptor.service.ts
@@ -20,7 +20,7 @@ export class TimeoutInterceptor implements HttpInterceptor {
       return next.handle(req);
     }
 
-    const timeoutValue = isPlatformServer(this.platformId)?3000:16000;//req.headers.get('timeout') || this.defaultTimeout;
+    const timeoutValue = isPlatformServer(this.platformId)?3000:6000;//req.headers.get('timeout') || this.defaultTimeout;
     const timeoutValueNumeric = Number(timeoutValue);
     return next.handle(req).pipe(timeout(timeoutValueNumeric));
   }
diff --git a/utils/authors/showAuthors.component.ts b/utils/authors/showAuthors.component.ts
index 4beae32e..ca3e737e 100644
--- a/utils/authors/showAuthors.component.ts
+++ b/utils/authors/showAuthors.component.ts
@@ -25,7 +25,7 @@ import {properties} from "../../../../environments/environment";
           </span>
       </a>
       <div *ngIf="(author.orcid || author.orcid_pending) && testBrowser"
-           class="default-dropdown uk-margin-remove-top uk-dropdown"
+           class="default-dropdown uk-margin-remove-top uk-dropdown orcid-dropdown"
            uk-dropdown="mode:click; offset: 4" style="min-width: 465px !important;">
         <div class="uk-padding-small">
           <h6 class="uk-margin-remove">{{author.fullName}}</h6>
@@ -42,11 +42,10 @@ import {properties} from "../../../../environments/environment";
             <div>
               <div class="clipboard-wrapper uk-width-1-1 uk-flex uk-flex-middle uk-flex-center" 
                    style="min-height: 43px; min-width: 280px;">
-                <span id="element" class="uk-padding-small uk-text-emphasis">
-                  {{properties.orcidURL+(author.orcid ? author.orcid : author.orcid_pending)}}
-                </span>
+                <input #element class="uk-padding-small uk-text-emphasis uk-width-medium uk-disabled"
+                       [value]="properties.orcidURL+(author.orcid ? author.orcid : author.orcid_pending)"/>
                 <a [class]="'uk-link copy orcid_clipboard_btn orcid_clipboard_btn_auhtor_'+i"
-                   data-clipboard-target="#element" title="Copy to clipboard">
+                   title="Copy to clipboard" (click)="copyToClipboard(element)">
                   COPY
                 </a>
               </div>
@@ -118,9 +117,7 @@ export class ShowAuthorsComponent {
     this.testBrowser = isPlatformBrowser(platformId);
   }
   
-  ngOnInit() {
-    this.createClipboard();
-  }
+  ngOnInit() {}
   
   public onClick() {
     if (this.modal) {
@@ -144,12 +141,10 @@ export class ShowAuthorsComponent {
     this.authorsModal.open();
   }
 
-  private createClipboard() {
-    if (typeof window !== 'undefined') {
-      delete this.clipboard;
-      let Clipboard;
-      Clipboard = require('clipboard');
-      this.clipboard = new Clipboard('.orcid_clipboard_btn');
+  copyToClipboard(element: HTMLInputElement) {
+    element.select();
+    if (typeof document !== 'undefined') {
+      document.execCommand('copy');
     }
   }
 }