From 9c7b8955560bfcc660053880828e9cc09d6d103a Mon Sep 17 00:00:00 2001 From: jrcastro2 Date: Tue, 17 Dec 2024 15:59:49 +0100 Subject: [PATCH 1/2] affiliationsSuggestions: Fix display of CERN authors info --- .../overrides/CDSAffiliationsSuggestions.js | 69 ++++++------------- 1 file changed, 21 insertions(+), 48 deletions(-) diff --git a/assets/js/components/deposit/overrides/CDSAffiliationsSuggestions.js b/assets/js/components/deposit/overrides/CDSAffiliationsSuggestions.js index ae03ca7..2def389 100644 --- a/assets/js/components/deposit/overrides/CDSAffiliationsSuggestions.js +++ b/assets/js/components/deposit/overrides/CDSAffiliationsSuggestions.js @@ -15,63 +15,36 @@ export const CDSAffiliationsSuggestions = ({ makeSubheader, makeIdEntry }) => { - const CDSmakeIdEntry = (identifier) => { - let icon, link; - - switch (identifier.scheme) { - case "orcid": - icon = "/static/images/orcid.svg"; - link = `https://orcid.org/${identifier.identifier}`; - break; - case "gnd": - icon = "/static/images/gnd-icon.svg"; - link = `https://d-nb.info/gnd/${identifier.identifier}`; - break; - case "ror": // ROR doesn't recommend displaying ROR IDs - case "isni": - case "grid": - return; // Skip these schemes - case "cern": - const { department, group, section } = creatibutor.props || {}; - const workgroup = [department, group, section].filter(Boolean).join('-'); - icon = "/static/images/cern-favicon.ico"; - return ( - - - {creatibutor.props.email} - {workgroup && - } - - ) - default: - return ( - <> - {identifier.scheme}: {identifier.identifier} - - ); - } - + const CDSmakeIdEntry = (creatibutor) => { + const { department, group, section } = creatibutor.props || {}; + const workgroup = [department, group, section].filter(Boolean).join("-"); return ( - - - - {identifier.scheme === "orcid" && identifier.identifier} - + + + {creatibutor.props.email} + {workgroup && ( + + )} ); }; const CDSidString = []; creatibutor.identifiers?.forEach((i) => { - CDSidString.push(CDSmakeIdEntry(i)); + CDSidString.push(makeIdEntry(i)); }); + // CERN specific + if (creatibutor.props?.is_cern) { + CDSidString.push(CDSmakeIdEntry(creatibutor)); + } + let name = creatibutor.name; const subheader = makeSubheader(creatibutor, isOrganization); From dedd7902c612fcf1f4818a7ff79d34356259bfe4 Mon Sep 17 00:00:00 2001 From: jrcastro2 Date: Tue, 17 Dec 2024 16:08:21 +0100 Subject: [PATCH 2/2] release: v1.2.1 --- CHANGES.md | 4 ++++ site/cds_rdm/__init__.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 252e6ba..b5644ac 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,9 @@ # Changes +Version 1.2.1 (released 2024-12-17) + +- affiliationsSuggestions: Fix display of CERN authors info + Version 1.2.0 (released 2024-12-16) - doi: add support for optional DOI diff --git a/site/cds_rdm/__init__.py b/site/cds_rdm/__init__.py index 88bd0fe..4777758 100644 --- a/site/cds_rdm/__init__.py +++ b/site/cds_rdm/__init__.py @@ -10,7 +10,7 @@ from .ext import CDS_RDM_REST, CDS_RDM_UI -__version__ = "1.2.0" +__version__ = "1.2.1" __all__ = ( "__version__",