Revert "8565-email-verification-notice-not-displayed-at-the-top-of-a-…

…record" This reverts commit d4b25dd.
ORCID · Apr 17, 2023 · 5ab7e14 · 5ab7e14
1 parent d4b25dd
commit 5ab7e14
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/...pp/record/components/top-bar-verification-email/top-bar-verification-email.component.html b/...pp/record/components/top-bar-verification-email/top-bar-verification-email.component.html
@@ -1,20 +1,19 @@
 <div
-  *ngIf="primaryEmail || verifyEmailSend || emailVerified"
   role="alert"
   class="info"
   [ngClass]="{
     'orc-font-body-small': !isMobile,
     'orc-font-small-print': isMobile,
-    'just-registered': !emailVerified,
+    'just-registered': justRegistered,
     'email-verified': emailVerified
   }"
 >
   <div class="col">
-    <mat-icon *ngIf="!emailVerified">info</mat-icon>
+    <mat-icon *ngIf="justRegistered">info</mat-icon>
     <mat-icon *ngIf="emailVerified">verified</mat-icon>
   </div>
   <div class="col l11 m6 s3">
-    <ng-container *ngIf="!verifyEmailSend">
+    <ng-container *ngIf="justRegistered && !verifyEmailSend">
       <h2 class="orc-font-body" i18n="@@topBar.thankYouForRegistering">
         Thank you for registering with ORCID
       </h2>
@@ -32,7 +31,7 @@ <h2 class="orc-font-body" i18n="@@topBar.thankYouForRegistering">
         Resend verification email
       </button>
     </ng-container>
-    <ng-container *ngIf="verifyEmailSend">
+    <ng-container *ngIf="justRegistered && verifyEmailSend">
       <h2 class="orc-font-body" i18n="@@side-bar.pleaseVerify">
         Please verify your primary email address!
       </h2>

diff --git a/src/app/record/components/top-bar-verification-email/top-bar-verification-email.component.ts b/src/app/record/components/top-bar-verification-email/top-bar-verification-email.component.ts
@@ -17,6 +17,8 @@ import { RecordService } from '../../../core/record/record.service'
 })
 export class TopBarVerificationEmailComponent implements OnInit, OnDestroy {
   $destroy: Subject<boolean> = new Subject<boolean>()
+
+  @Input() justRegistered: boolean
   @Input() emailVerified: boolean
 
   primaryEmail: string

diff --git a/src/app/record/components/top-bar/top-bar.component.html b/src/app/record/components/top-bar/top-bar.component.html
@@ -17,7 +17,9 @@
 ></app-top-bar-actions>
 
 <app-top-bar-verification-email
+  [justRegistered]="justRegistered"
   [emailVerified]="emailVerified"
+  *ngIf="justRegistered || emailVerified"
 ></app-top-bar-verification-email>
 
 <ng-container *ngIf="!isPublicRecord && !recordWithIssues">

diff --git a/src/app/record/pages/my-orcid/my-orcid.component.ts b/src/app/record/pages/my-orcid/my-orcid.component.ts
@@ -184,7 +184,7 @@ export class MyOrcidComponent implements OnInit, OnDestroy {
 
       if (!this.platform.queryParameters.hasOwnProperty('justRegistered')) {
         this._router.navigate(['/my-orcid'], {
-          queryParams: { ...this.platform.queryParameters, orcid: this.userInfo.EFFECTIVE_USER_ORCID, },
+          queryParams: { orcid: this.userInfo.EFFECTIVE_USER_ORCID },
         })
       } else {
         this._router.navigate(['/my-orcid'], {