Merge pull request #2745 from ORCID/lmendoza/PD-4994

PD-4994,PD-4993

Author: cryptalith

src/app/record/components/top-bar/top-bar.component.html

@@ -11,7 +11,9 @@
   [emailVerified]="emailVerified"
   [justRegistered]="justRegistered"
 ></app-top-bar-verification-email>
-<ng-container *ngIf="!isPublicRecord && !recordWithIssues">
+<ng-container
+  *ngIf="!isPublicRecord && !recordWithIssues && userInfo?.LOCKED !== 'true'"
+>
   <orcid-registry-permission-notifications
     *ngIf="permissionPanelNotifications?.length"
     [title]="permissionPanelTitle"

src/app/record/components/top-bar/top-bar.component.ts

@@ -178,7 +178,8 @@ export class TopBarComponent implements OnInit, OnDestroy {
     }
 
     if (event.actionId === 'connect') {
-      const target = raw.authorizationUrl?.uri
+      const integration = this.parseOrcidIntegrationIntro(raw?.notificationIntro)
+      const target = integration?.link || raw.authorizationUrl?.uri
       this._inbox
         .flagAsRead(raw.putCode)
         .pipe(first())
@@ -212,7 +213,12 @@ export class TopBarComponent implements OnInit, OnDestroy {
       .subscribe((grouped) => {
         this.permissionPanelRaw = grouped
         this.permissionPanelNotifications = grouped.map((n) => {
-          const orgName = n?.sourceDescription || ''
+          const integration = this.parseOrcidIntegrationIntro(n?.notificationIntro)
+          const orgName =
+            integration?.memberName ||
+            n?.source?.sourceName?.content ||
+            n?.sourceDescription ||
+            ''
           const escaped = orgName
             .replace(/&/g, '&')
             .replace(/</g, '&lt;')
@@ -242,6 +248,19 @@ export class TopBarComponent implements OnInit, OnDestroy {
       })
   }
 
+  private parseOrcidIntegrationIntro(
+    intro?: string
+  ): { memberName: string; link: string } | null {
+    if (!intro || !intro.includes('::')) {
+      return null
+    }
+    const [memberName, link] = intro.split('::')
+    if (!memberName || !link) {
+      return null
+    }
+    return { memberName, link }
+  }
+
   resendVerificationEmailModal(email: string) {
     this._verificationEmailModalService.openVerificationEmailModal(email)
   }