fix: Add missing links and refactor some togglz conditionals (#2150)

ORCID · Feb 8, 2024 · 742cf18 · 742cf18
1 parent b0892d1
commit 742cf18
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/src/app/cdk/side-bar/side-bar/side-bar.component.html b/src/app/cdk/side-bar/side-bar/side-bar.component.html
@@ -11,7 +11,7 @@
   >
     Personal information
   </h2>
-  <ng-container *ngIf="!newRecordHeaderTogglz">
+  <ng-container *ngIf="isPublicRecord ? !newRecordHeaderTogglz : true ">
     <app-side-bar-id
       *ngIf="!hideOrcidId"
       [ngClass]="{

diff --git a/...-preview/top-bar-my-public-record-preview/top-bar-my-public-record-preview.component.html b/...-preview/top-bar-my-public-record-preview/top-bar-my-public-record-preview.component.html
@@ -2,7 +2,7 @@
   [id]="'status-bar'"
   role="region"
   [attr.aria-label]="regionStatusBar"
-  *ngIf="iAmEditingThisRecord && isPublicRecord"
+  *ngIf="!newRecordHeaderTogglz && iAmEditingThisRecord && isPublicRecord"
   [ngClass]="{ 'yellow-bg': !isMyRecord }"
 >
   <div class="container">

diff --git a/...rd-preview/top-bar-my-public-record-preview/top-bar-my-public-record-preview.component.ts b/...rd-preview/top-bar-my-public-record-preview/top-bar-my-public-record-preview.component.ts
@@ -19,6 +19,7 @@ import {
 })
 export class TopBarMyPublicRecordPreviewComponent implements OnInit {
   @Input() isPublicRecord: string
+  @Input() newRecordHeaderTogglz: boolean
   iAmEditingThisRecord = false
   isMyRecord: boolean
   effectiveRecord: string

diff --git a/src/app/record/components/record-info/record-info.component.html b/src/app/record/components/record-info/record-info.component.html
@@ -12,7 +12,7 @@
         </ng-container>
         <a
           class="underline"
-          href="#"
+          href="https://info.orcid.org/terms-of-use/"
           rel="noopener noreferrer"
           target="_blank"
           i18n="@@topBar.termsOfService"
@@ -25,7 +25,7 @@
         </ng-container>
         <a
           class="underline"
-          href="#"
+          href="https://support.orcid.org/"
           rel="noopener noreferrer"
           target="_blank"
           i18n="@@topBar.contactOrcid"
@@ -46,7 +46,7 @@
       <p>
         <a
           class="underline"
-          href="#"
+          href="https://support.orcid.org/hc/en-us/articles/360006894554-Reactivating-your-deactivated-ORCID-account"
           rel="noopener noreferrer"
           target="_blank"
           i18n="@@topBar.findOutReactivating"
@@ -65,7 +65,7 @@
       <p>
         <a
           class="underline"
-          href="#"
+          href="https://support.orcid.org/hc/en-us/articles/360006896634-I-have-more-than-one-ORCID-ID"
           rel="noopener noreferrer"
           target="_blank"
           i18n="@@topBar.findOutMoreAboutRemoving"
@@ -87,7 +87,7 @@
       <p>
         <a
           class="underline"
-          href="#"
+          href="https://support.orcid.org/hc/en-us/articles/360006897614-Visibility-settings"
           rel="noopener noreferrer"
           target="_blank"
           i18n="@@topBar.findOutVisibility"

diff --git a/src/app/record/components/top-bar/top-bar.component.html b/src/app/record/components/top-bar/top-bar.component.html
@@ -13,7 +13,7 @@
   [userRecord]="userRecord"
   [userStatus]="userStatus"
   [isPublicRecord]="isPublicRecord"
-  *ngIf="!newRecordHeaderTogglz && !recordWithIssues"
+  *ngIf="newRecordHeaderTogglz ? !isPublicRecord && !recordWithIssues : !recordWithIssues"
   [showPrintButton]="!platform.columns12"
 ></app-top-bar-actions>
 
@@ -270,7 +270,7 @@ <h1 class="name orc-font-heading-small">
       [userRecord]="userRecord"
       [userStatus]="userStatus"
       [isPublicRecord]="isPublicRecord"
-      *ngIf="!newRecordHeaderTogglz && !recordWithIssues && !platform.columns12"
+      *ngIf="newRecordHeaderTogglz ? !isPublicRecord && !recordWithIssues && !platform.columns12 : !recordWithIssues && !platform.columns12"
       [showIsThisYouButton]="true"
     ></app-top-bar-actions>
 

diff --git a/src/app/record/pages/my-orcid/my-orcid.component.html b/src/app/record/pages/my-orcid/my-orcid.component.html
@@ -1,8 +1,8 @@
 <main id="main">
   <ng-container *ngIf="!userNotFound">
     <app-top-bar-my-public-record-preview
-      *ngIf="!newRecordHeaderTogglz"
       [isPublicRecord]="publicOrcid"
+      [newRecordHeaderTogglz]="newRecordHeaderTogglz"
     ></app-top-bar-my-public-record-preview>
     <app-record-header
       *ngIf="!!publicOrcid && newRecordHeaderTogglz"