[Trunk | Library]:

1. orcidWork.ts: When description is >5000 characters, do not send it to ORCID work.
2. orcid.component.ts: When redirecting to /orcid by ORCID UI (source in not "openaire"), do not query for new tokens if user already has valid tokens in OpenAIRE.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60480 d315682c-612b-4755-9ff5-7f18f6832af3

orcid/orcid.component.ts

@@ -27,6 +27,8 @@ export class OrcidComponent {
   public orcidMessage: string = "";
 
   public source: string = "";
+  public code: string = "";
+  public gotToken: boolean = false;
 
   public routerHelper:RouterHelper = new RouterHelper();
 
@@ -42,9 +44,16 @@ export class OrcidComponent {
     this.updateUrl( properties.domain + properties.baseLink + this.route.url);
 
     this.subscriptions.push(this.route.queryParams.subscribe(params => {
+      this.gotToken = false;
+
       this.source = params['source'];
-      if (params['code']) {
+      this.code = params['code'];
+      if (this.code) {
+        if(this.source == "openaire") {
           this.getToken(params['code']);
+        } else {
+          this.getPersonalDetails();
+        }
       } else if(params['error']) {
         this.showLoading = false;
         this.orcidMessage = params['error_description'];
@@ -70,6 +79,7 @@ export class OrcidComponent {
     this.showLoading = true;
     this.orcidService.getToken(code).subscribe(
       gotTokens => {
+        this.gotToken = true;
         if(gotTokens == null || gotTokens['value'] == false) {
           this.showLoading = false;
           this.message = "<div>An error occured while trying to connect your ORCID iD with OpenAIRE. Please try again!</div>" +
@@ -89,6 +99,24 @@ export class OrcidComponent {
             this.message = "<div>Thank you for connecting your ORCID iD with OpenAIRE!</div>" +
               "<div class='uk-margin-small-top'>You will automatically be redirected to our advanced search page where you can link OpenAIRE research results with your ORCID iD.</div>";
 
+            this.getPersonalDetails();
+          }
+          // this.message = "Thank you for connecting your ORCID iD with OpenAIRE! Please close this window and continue!";
+        }
+      },
+      error => {
+        this.gotToken = true;
+
+        console.error("Error getting token from code: "+code, error);
+        this.message = "An error occured while trying to connect your ORCID iD with OpenAIRE. Please try again!";
+      },
+      () => {
+        this.showLoading = false;
+      }
+    )
+  }
+
+  private getPersonalDetails() {
     //get author name
     this.subscriptions.push(this.orcidService.getPersonalDetails().subscribe(
       details => {
@@ -109,28 +137,21 @@ export class OrcidComponent {
       },
       error => {
         console.error("Error getting personal details", error);
+        if(this.gotToken) {
           this._router.navigate([properties.searchLinkToAdvancedResults], {});
+        } else {
+          this.getToken(this.code);
+        }
       },
       () => {
+        if(this.gotToken) {
           setTimeout(() => {
             this.message += "<div class='uk-margin-top'>If you are not authomatically redirected, please navigate to our search pages.</div>";
           }, 3000);
         }
+      }
     ));
   }
-          // this.message = "Thank you for connecting your ORCID iD with OpenAIRE! Please close this window and continue!";
-        }
-      },
-      error => {
-        console.error("Error getting token from code: "+code, error);
-        this.message = "An error occured while trying to connect your ORCID iD with OpenAIRE. Please try again!";
-      },
-      () => {
-        this.showLoading = false;
-      }
-    )
-  }
-
 
   private updateTitle(title: string) {
     this._title.setTitle(title);

orcid/orcidWork.ts

@@ -62,6 +62,8 @@ export class WorkV3_0 {
   }
 
   public static resultLandingInfoConvert(resultLandingInfo: ResultLandingInfo, putCode: string) : WorkV3_0 {
+    let description_limit: number = 5000;
+
     let work: WorkV3_0 = {};
     // let work = {};
 
@@ -104,7 +106,7 @@ export class WorkV3_0 {
       work['journal-title'] = { "value": resultLandingInfo.journal.journal };
     }
 
-    if(resultLandingInfo.description) {
+    if(resultLandingInfo.description && resultLandingInfo.description.length < description_limit) {
       work['short-description'] = resultLandingInfo.description;
     }