Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix affiliations #294

Merged
merged 2 commits into from
Dec 17, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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 (
<span className="font-weight-normal" key={creatibutor.props.email}>
<Image
src="/static/images/cern-favicon.ico"
className="inline-id-icon ml-5 mr-5"
verticalAlign="middle"
/>
{creatibutor.props.email}
{workgroup &&
<Label size="tiny" >
{workgroup}
</Label>}
</span>
)
default:
return (
<>
{identifier.scheme}: {identifier.identifier}
</>
);
}

const CDSmakeIdEntry = (creatibutor) => {
const { department, group, section } = creatibutor.props || {};
const workgroup = [department, group, section].filter(Boolean).join("-");
return (
<span key={identifier.identifier}>
<a href={link} target="_blank" rel="noopener noreferrer">
<Image src={icon} className="inline-id-icon mr-5" verticalAlign="middle" />
{identifier.scheme === "orcid" && identifier.identifier}
</a>
<span className="font-weight-normal" key={creatibutor.props.email}>
<Image
src="/static/images/cern-favicon.ico"
className="inline-id-icon ml-5 mr-5"
verticalAlign="middle"
/>
{creatibutor.props.email}
{workgroup && (
<Label size="tiny">
{workgroup}
</Label>
)}
</span>
);
};

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);

2 changes: 1 addition & 1 deletion site/cds_rdm/__init__.py
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@

from .ext import CDS_RDM_REST, CDS_RDM_UI

__version__ = "1.2.0"
__version__ = "1.2.1"

__all__ = (
"__version__",