From aeeda91dcf42c406f75cbb8947ec97588ed08f47 Mon Sep 17 00:00:00 2001 From: amontenegro Date: Fri, 7 Aug 2026 11:43:01 -0600 Subject: [PATCH 1/3] PD-6056 more fixes --- src/assets/print-view/fetch-orcid.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/assets/print-view/fetch-orcid.js b/src/assets/print-view/fetch-orcid.js index 8d744f061..ad0416903 100644 --- a/src/assets/print-view/fetch-orcid.js +++ b/src/assets/print-view/fetch-orcid.js @@ -1208,16 +1208,19 @@ function recordIssueFromRecordJson(recordJson) { return { title: STRINGS.recordIsNotClaimedTitle, description: STRINGS.recordNotClaimedDescription, + orcid: jsonText(recordJson.orcid), } case 'LockedException': return { title: STRINGS.recordIsLockedTitle, description: STRINGS.lockedRecordDescription, + orcid: jsonText(recordJson.orcid), } case 'DeactivatedException': return { title: STRINGS.recordIsDeactivatedTitle, description: STRINGS.deactivatedRecordDescription, + orcid: jsonText(recordJson.orcid), } default: return null @@ -1247,7 +1250,7 @@ function renderRecordIssueMessage(recordIssue) { spacing1.textContent = ' ' redirectInfo.appendChild(spacing1) const arrow = document.createElement('img') - arrow.src = './assets/vectors/arrow-right.svg' + arrow.src = '../../assets/vectors/arrow-right.svg' arrow.alt = 'Arrow' redirectInfo.appendChild(arrow) const spacing2 = document.createElement('span') @@ -1260,8 +1263,13 @@ function renderRecordIssueMessage(recordIssue) { redirectInfo.appendChild(orcidIdDiv) issueContainer.appendChild(redirectInfo) } else { - const location = window.location.href - const currentIdUrl = sanitizeUrl(location + recordIssue.orcid) + const location = window.location.origin + console.log('-------------------------------') + console.log(recordIssue) + console.log(location) + const currentIdUrl = sanitizeUrl(location + '/' + recordIssue.orcid) + console.log(currentIdUrl) + console.log('-------------------------------') const recordParagraph = document.createElement('p') const orcidIdDiv = generateOrcidIdDiv(currentIdUrl, recordIssue) recordParagraph.appendChild(orcidIdDiv) From e7c5e80836b1f010e8c9f3ce4687af732eef7735 Mon Sep 17 00:00:00 2001 From: amontenegro Date: Fri, 7 Aug 2026 12:05:35 -0600 Subject: [PATCH 2/3] PD-6056 Fix alignment on deprecated records --- src/assets/print-view/fetch-orcid.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/assets/print-view/fetch-orcid.js b/src/assets/print-view/fetch-orcid.js index ad0416903..9316a2ca7 100644 --- a/src/assets/print-view/fetch-orcid.js +++ b/src/assets/print-view/fetch-orcid.js @@ -1239,7 +1239,11 @@ function renderRecordIssueMessage(recordIssue) { if (recordIssue.deprecated_orcid) { const deprecatedIdUrl = sanitizeUrl(recordIssue.deprecated_orcid) - const redirectInfo = document.createElement('p') + const redirectInfo = document.createElement('div') + redirectInfo.style.display = 'flex' + redirectInfo.style.alignItems = 'center' + redirectInfo.style.flexWrap = 'wrap' + redirectInfo.style.gap = '4px' const deprecatedLink = document.createElement('a') deprecatedLink.href = deprecatedIdUrl deprecatedLink.target = '_blank' @@ -1260,16 +1264,12 @@ function renderRecordIssueMessage(recordIssue) { sanitizeUrl(recordIssue.orcid), recordIssue ) + orcidIdDiv.style.marginTop = '0' redirectInfo.appendChild(orcidIdDiv) issueContainer.appendChild(redirectInfo) } else { const location = window.location.origin - console.log('-------------------------------') - console.log(recordIssue) - console.log(location) const currentIdUrl = sanitizeUrl(location + '/' + recordIssue.orcid) - console.log(currentIdUrl) - console.log('-------------------------------') const recordParagraph = document.createElement('p') const orcidIdDiv = generateOrcidIdDiv(currentIdUrl, recordIssue) recordParagraph.appendChild(orcidIdDiv) From e62e0a5d6870cd9ef27a0be5280a8d89a9e2d150 Mon Sep 17 00:00:00 2001 From: amontenegro Date: Fri, 7 Aug 2026 12:24:47 -0600 Subject: [PATCH 3/3] PD-6056 Set orcid only if present --- src/assets/print-view/fetch-orcid.js | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/src/assets/print-view/fetch-orcid.js b/src/assets/print-view/fetch-orcid.js index 9316a2ca7..9eacff8e6 100644 --- a/src/assets/print-view/fetch-orcid.js +++ b/src/assets/print-view/fetch-orcid.js @@ -1204,24 +1204,33 @@ function recordIssueFromRecordJson(recordJson) { deprecated_orcid: jsonText(recordJson.deprecated_orcid), orcid: jsonText(recordJson.orcid), } - case 'OrcidNotClaimedException': - return { + case 'OrcidNotClaimedException': { + const result = { title: STRINGS.recordIsNotClaimedTitle, description: STRINGS.recordNotClaimedDescription, - orcid: jsonText(recordJson.orcid), } - case 'LockedException': - return { + const orcid = jsonText(recordJson.orcid) + if (orcid) result.orcid = orcid + return result + } + case 'LockedException': { + const result = { title: STRINGS.recordIsLockedTitle, description: STRINGS.lockedRecordDescription, - orcid: jsonText(recordJson.orcid), } - case 'DeactivatedException': - return { + const orcid = jsonText(recordJson.orcid) + if (orcid) result.orcid = orcid + return result + } + case 'DeactivatedException': { + const result = { title: STRINGS.recordIsDeactivatedTitle, description: STRINGS.deactivatedRecordDescription, - orcid: jsonText(recordJson.orcid), } + const orcid = jsonText(recordJson.orcid) + if (orcid) result.orcid = orcid + return result + } default: return null }