From 56ff28d7279d83b168133a679bf7144f98e91866 Mon Sep 17 00:00:00 2001
From: Demetriad Sinzeanu <demetriad.sinzeanu@thinslices.com>
Date: Tue, 30 Oct 2018 13:50:38 +0200
Subject: [PATCH] refactor(utils): Update isLatestVersion method
---
.../src/manuscriptDetails/ManuscriptHeader.js | 4 ++--
.../component-manuscript/src/components/ManuscriptLayout.js | 4 ++--
.../component-manuscript/src/components/ManuscriptPage.js | 2 +-
packages/component-manuscript/src/components/utils.js | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.js b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.js
index 2397e22c0..f93e6c4c3 100644
--- a/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.js
+++ b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.js
@@ -23,7 +23,7 @@ const ManuscriptHeader = ({
manuscriptType = {},
editorInChief = 'Unassigned',
collection: { visibleStatus = 'Draft', customId, handlingEditor },
- latestVersion,
+ isLatestVersion,
}) => {
const { authors = [], metadata = {}, submitted = null } = fragment
const { title = 'No title', journal = '', type = '' } = metadata
@@ -35,7 +35,7 @@ const ManuscriptHeader = ({
justify="space-between"
>
<H2 mb={1}>{title}</H2>
- {latestVersion ? (
+ {isLatestVersion ? (
<Tag data-test-id="fragment-status" status>
{visibleStatus}
</Tag>
diff --git a/packages/component-manuscript/src/components/ManuscriptLayout.js b/packages/component-manuscript/src/components/ManuscriptLayout.js
index 23e81d809..1a186419f 100644
--- a/packages/component-manuscript/src/components/ManuscriptLayout.js
+++ b/packages/component-manuscript/src/components/ManuscriptLayout.js
@@ -67,7 +67,7 @@ const ManuscriptLayout = ({
recommendationHandler,
inviteHandlingEditor,
versions,
- latestVersion,
+ isLatestVersion,
}) => (
<Root pb={30}>
{!isEmpty(collection) && !isEmpty(fragment) ? (
@@ -88,8 +88,8 @@ const ManuscriptLayout = ({
handlingEditors={handlingEditors}
inviteHE={toggleAssignHE}
isFetching={isFetchingData.editorsFetching}
+ isLatestVersion={isLatestVersion}
journal={journal}
- latestVersion={latestVersion}
resendInvitation={inviteHandlingEditor.assignHE}
revokeInvitation={inviteHandlingEditor.revokeHE}
versions={versions}
diff --git a/packages/component-manuscript/src/components/ManuscriptPage.js b/packages/component-manuscript/src/components/ManuscriptPage.js
index f51a9a4e5..5b902498b 100644
--- a/packages/component-manuscript/src/components/ManuscriptPage.js
+++ b/packages/component-manuscript/src/components/ManuscriptPage.js
@@ -288,7 +288,7 @@ export default compose(
shouldReview:
get(currentUser, 'isReviewer', false) &&
isUndefined(submittedOwnRecommendation),
- latestVersion: isLatestVersion(collection, fragment),
+ isLatestVersion: isLatestVersion(collection, fragment),
}),
),
withInviteHandlingEditor,
diff --git a/packages/component-manuscript/src/components/utils.js b/packages/component-manuscript/src/components/utils.js
index 1e48117b8..f98db2189 100644
--- a/packages/component-manuscript/src/components/utils.js
+++ b/packages/component-manuscript/src/components/utils.js
@@ -76,7 +76,7 @@ export const parseVersion = version => ({
})
export const isLatestVersion = (collection, fragment) =>
- get(fragment, 'id') === last(collection.fragments)
+ get(fragment, 'id', '') === last(get(collection, 'fragments', []))
export const parseJournalIssue = (journal, metadata) =>
journal.issueTypes.find(t => t.value === get(metadata, 'issue'))
--
GitLab