From 40fa93df2d071edd1ae7580acba21e4584303920 Mon Sep 17 00:00:00 2001
From: Demetriad Sinzeanu <demetriad.sinzeanu@thinslices.com>
Date: Tue, 30 Oct 2018 13:35:23 +0200
Subject: [PATCH] feat(ManuscriptHeader): As user, I want to see the label
"You're viewing a previous version of the m
---
packages/component-faraday-ui/src/Tag.js | 47 ++++++++++++-------
.../src/manuscriptDetails/ManuscriptHeader.js | 11 +++--
.../src/components/ManuscriptLayout.js | 2 +
.../src/components/ManuscriptPage.js | 16 ++++---
.../src/components/utils.js | 4 ++
5 files changed, 54 insertions(+), 26 deletions(-)
diff --git a/packages/component-faraday-ui/src/Tag.js b/packages/component-faraday-ui/src/Tag.js
index 856a69c88..189c88776 100644
--- a/packages/component-faraday-ui/src/Tag.js
+++ b/packages/component-faraday-ui/src/Tag.js
@@ -1,27 +1,40 @@
-import styled, { css } from 'styled-components'
+import { has } from 'lodash'
import { th } from '@pubsweet/ui-toolkit'
+import styled, { css } from 'styled-components'
import { marginHelper } from './styledHelpers'
-export const tagCSS = ({ status }) =>
- status
- ? css`
- padding: calc(${th('gridUnit')} / 4) ${th('gridUnit')};
- height: 24px;
- font-family: ${th('fontHeading')};
- `
- : css`
- height: 14px;
- font-size: 85%;
- padding: calc(${th('gridUnit')} / 4) calc(${th('gridUnit')} / 4) 0px;
- margin-right: 1px;
- font-family: ${th('fontInterface')};
- `
+const tagCSS = props => {
+ if (has(props, 'oldStatus')) {
+ return css`
+ background-color: ${th('tag.statusBackgroundColor')};
+ font-size: 85%;
+ height: 24px;
+ padding: calc(${th('gridUnit')} / 4) ${th('gridUnit')};
+ `
+ }
+
+ if (has(props, `status`)) {
+ return css`
+ background-color: ${th('tag.statusBackgroundColor')};
+ padding: calc(${th('gridUnit')} / 4) ${th('gridUnit')};
+ height: 24px;
+ font-family: ${th('fontHeading')};
+ `
+ }
+
+ return css`
+ background-color: ${th('tag.backgroundColor')};
+ height: 14px;
+ font-size: 85%;
+ padding: calc(${th('gridUnit')} / 4) calc(${th('gridUnit')} / 4) 0px;
+ margin-right: 1px;
+ font-family: ${th('fontInterface')};
+ `
+}
/** @component */
export default styled.div`
- background-color: ${({ status }) =>
- status ? th('tag.statusBackgroundColor') : th('tag.backgroundColor')};
border-radius: ${th('tag.borderRadius')
? th('tag.borderRadius')
: th('borderRadius')};
diff --git a/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.js b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.js
index b7e6f5389..2397e22c0 100644
--- a/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.js
+++ b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.js
@@ -23,6 +23,7 @@ const ManuscriptHeader = ({
manuscriptType = {},
editorInChief = 'Unassigned',
collection: { visibleStatus = 'Draft', customId, handlingEditor },
+ latestVersion,
}) => {
const { authors = [], metadata = {}, submitted = null } = fragment
const { title = 'No title', journal = '', type = '' } = metadata
@@ -34,9 +35,13 @@ const ManuscriptHeader = ({
justify="space-between"
>
<H2 mb={1}>{title}</H2>
- <Tag data-test-id="fragment-status" status>
- {visibleStatus}
- </Tag>
+ {latestVersion ? (
+ <Tag data-test-id="fragment-status" status>
+ {visibleStatus}
+ </Tag>
+ ) : (
+ <Tag oldStatus>Viewing an Older Version</Tag>
+ )}
</Row>
{authors.length > 0 && (
<Row
diff --git a/packages/component-manuscript/src/components/ManuscriptLayout.js b/packages/component-manuscript/src/components/ManuscriptLayout.js
index 3e5b1c7ad..23e81d809 100644
--- a/packages/component-manuscript/src/components/ManuscriptLayout.js
+++ b/packages/component-manuscript/src/components/ManuscriptLayout.js
@@ -67,6 +67,7 @@ const ManuscriptLayout = ({
recommendationHandler,
inviteHandlingEditor,
versions,
+ latestVersion,
}) => (
<Root pb={30}>
{!isEmpty(collection) && !isEmpty(fragment) ? (
@@ -88,6 +89,7 @@ const ManuscriptLayout = ({
inviteHE={toggleAssignHE}
isFetching={isFetchingData.editorsFetching}
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 ab96f5c6b..f51a9a4e5 100644
--- a/packages/component-manuscript/src/components/ManuscriptPage.js
+++ b/packages/component-manuscript/src/components/ManuscriptPage.js
@@ -72,6 +72,7 @@ import {
redirectToError,
parseSearchParams,
getPublonsReviewers,
+ isLatestVersion,
} from './utils'
import {
@@ -281,12 +282,15 @@ export default compose(
toggleEditorialComments: toggle,
editorialCommentsExpanded: expanded,
})),
- withProps(({ currentUser, collection, submittedOwnRecommendation }) => ({
- getSignedUrl,
- shouldReview:
- get(currentUser, 'isReviewer', false) &&
- isUndefined(submittedOwnRecommendation),
- })),
+ withProps(
+ ({ currentUser, collection, submittedOwnRecommendation, fragment }) => ({
+ getSignedUrl,
+ shouldReview:
+ get(currentUser, 'isReviewer', false) &&
+ isUndefined(submittedOwnRecommendation),
+ latestVersion: isLatestVersion(collection, fragment),
+ }),
+ ),
withInviteHandlingEditor,
withInviteReviewer,
withSubmitRevision,
diff --git a/packages/component-manuscript/src/components/utils.js b/packages/component-manuscript/src/components/utils.js
index e579d6836..1e48117b8 100644
--- a/packages/component-manuscript/src/components/utils.js
+++ b/packages/component-manuscript/src/components/utils.js
@@ -3,6 +3,7 @@ import {
has,
get,
find,
+ last,
omit,
isEmpty,
debounce,
@@ -74,6 +75,9 @@ export const parseVersion = version => ({
abstract: get(version, 'metadata.abstract'),
})
+export const isLatestVersion = (collection, fragment) =>
+ get(fragment, 'id') === last(collection.fragments)
+
export const parseJournalIssue = (journal, metadata) =>
journal.issueTypes.find(t => t.value === get(metadata, 'issue'))
--
GitLab