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.

Sign up for GitHub

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

Jump to bottom

task/WC-13: Update citation format for publications with versions. #1445

Merged
merged 4 commits into from
Oct 3, 2024
Merged

task/WC-13: Update citation format for publications with versions. #1445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
409ea91
Update citation format for versions
jarosenb Sep 23, 2024
c976276
fix type error
jarosenb Sep 23, 2024
e1745cf
linting
jarosenb Sep 23, 2024
0616034
Merge branch 'main' into task/WC-14--citation-version-format
jarosenb Oct 3, 2024
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
1 change: 1 addition & 0 deletions client/modules/_hooks/src/datafiles/projects/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ export type TPreviewTreeData = {
uuid: string;
value: TEntityValue;
order: number;
version?: number;
publicationDate?: string;
children: TPreviewTreeData[];
};
Expand Down
4 changes: 2 additions & 2 deletions client/modules/datafiles/src/projects/ProjectCitation/ProjectCitation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ export const PublishedCitation: React.FC<{
)
.join(', ')}{' '}
({new Date(entityDetails.publicationDate).getFullYear()}). "
{entityDetails.value.title}", in <i>{data.baseProject.title}</i>.
DesignSafe-CI.{' '}
{entityDetails.value.title}", in <i>{data.baseProject.title}</i>
{(version ?? 1) > 1 && <span> [Version {version}]</span>}. DesignSafe-CI.{' '}
{doi && (
<a
href={`https://doi.org/${doi}`}
Expand Down
6 changes: 5 additions & 1 deletion client/modules/datafiles/src/projects/ProjectPreview/ProjectPreview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,11 @@ export const PublishedEntityDisplay: React.FC<{
{preview ? (
<ProjectCitation projectId={projectId} entityUuid={treeData.uuid} />
) : (
<PublishedCitation projectId={projectId} entityUuid={treeData.uuid} />
<PublishedCitation
projectId={projectId}
entityUuid={treeData.uuid}
version={treeData.version ?? 1}
/>
)}
<br />
{citationMetrics && (
Expand Down
13 changes: 7 additions & 6 deletions client/src/datafiles/layouts/published/PublishedDetailLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ export const PublishedDetailLayout: React.FC = () => {
const { data, isError } = usePublicationDetail(projectId ?? '');
const { allVersions } = usePublicationVersions(projectId ?? '');
const version = (projectId ?? '').split('v')[1];
const selectedVersion =
version ||
searchParams.get('version') ||
Math.max(...allVersions).toString();

useEffect(() => {
if (version) {
const newSearchParams = new URLSearchParams(searchParams);
Expand All @@ -62,11 +67,6 @@ export const PublishedDetailLayout: React.FC = () => {
useEffect(() => {
if (!data) return;

const selectedVersion =
version ||
searchParams.get('version') ||
Math.max(...allVersions).toString();

data?.baseProject.projectType !== 'other' &&
apiClient.get(
`/api/datafiles/tapis/public/listing/designsafe.storage.published/${projectId}${
Expand All @@ -75,7 +75,7 @@ export const PublishedDetailLayout: React.FC = () => {
: ''
}`
);
}, [data, allVersions, searchParams, version, projectId]);
}, [data, selectedVersion, searchParams, projectId]);

if (isError) {
return (
Expand Down Expand Up @@ -171,6 +171,7 @@ export const PublishedDetailLayout: React.FC = () => {
<PublishedCitation
projectId={projectId}
entityUuid={data.tree.children[0].uuid}
version={parseInt(selectedVersion)}
/>
<br />
<div>
Expand Down
Loading