From 84bd4f0fc63f3352d76113ce79492510e1b9b4b3 Mon Sep 17 00:00:00 2001
From: Bogdan Cochior <bogdan.cochior@thinslices.com>
Date: Fri, 21 Sep 2018 15:49:14 +0300
Subject: [PATCH] fix: cr feedback
---
.../component-faraday-selectors/src/index.js | 26 ++++++++++++-------
.../src/ManuscriptCard.js | 4 +--
.../src/manuscriptDetails/ManuscriptHeader.js | 2 +-
.../src/components/ManuscriptPage.js | 6 ++++-
.../src/components/Dashboard/DashboardPage.js | 2 +-
5 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/packages/component-faraday-selectors/src/index.js b/packages/component-faraday-selectors/src/index.js
index cf7ada724..143fbdb4d 100644
--- a/packages/component-faraday-selectors/src/index.js
+++ b/packages/component-faraday-selectors/src/index.js
@@ -183,15 +183,23 @@ const parseInvitedHE = (handlingEditor, state, collectionId) =>
? 'Invited'
: handlingEditor.name,
}
+
const hideCustomIdStatuses = ['draft', 'technicalChecks']
-export const newestFirstParseDashboard = (state, items) =>
- chain(items)
+
+export const parseCollectionDetails = (state, collection) => ({
+ ...collection,
+ customId:
+ !hideCustomIdStatuses.includes(get(collection, 'status', 'draft')) &&
+ collection.customId,
+ handlingEditor: parseInvitedHE(
+ collection.handlingEditor,
+ state,
+ collection.id,
+ ),
+})
+
+export const newestFirstParseDashboard = (state = {}) =>
+ chain(state.collections)
.orderBy(['created'], ['desc'])
- .map(item => ({
- ...item,
- customId:
- !hideCustomIdStatuses.includes(get(item, 'status', 'draft')) &&
- item.customId,
- handlingEditor: parseInvitedHE(item.handlingEditor, state, item.id),
- }))
+ .map(item => parseCollectionDetails(state, item))
.value()
diff --git a/packages/component-faraday-ui/src/ManuscriptCard.js b/packages/component-faraday-ui/src/ManuscriptCard.js
index 269c04018..e9f0e796f 100644
--- a/packages/component-faraday-ui/src/ManuscriptCard.js
+++ b/packages/component-faraday-ui/src/ManuscriptCard.js
@@ -26,7 +26,7 @@ const ManuscriptCard = ({
onCardClick,
fragment = {},
manuscriptType = {},
- collection: { visibleStatus = 'Draft', handlingEditor, customId },
+ collection: { visibleStatus = 'Draft', handlingEditor, customId, id: collId },
}) => {
const {
authors = [],
@@ -82,7 +82,7 @@ const ManuscriptCard = ({
<Item justify="flex-end" onClick={e => e.stopPropagation()}>
<OpenModal
confirmText="Delete"
- modalKey={`delete-${customId}`}
+ modalKey={`delete-${collId}`}
onConfirm={onDelete}
title="Are you sure you want to delete this submission?"
>
diff --git a/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.js b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.js
index a4d5c432c..cc7976660 100644
--- a/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.js
+++ b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.js
@@ -40,7 +40,7 @@ const ManuscriptHeader = ({
</Row>
)}
<Row alignItems="center" justify="flex-start" mb={1}>
- <Text customId mr={1}>{`ID ${customId}`}</Text>
+ {customId && <Text customId mr={1}>{`ID ${customId}`}</Text>}
{submitted && (
<DateParser durationThreshold={0} timestamp={submitted}>
{timestamp => <Text mr={3}>Submitted on {timestamp}</Text>}
diff --git a/packages/component-manuscript/src/components/ManuscriptPage.js b/packages/component-manuscript/src/components/ManuscriptPage.js
index e8e823d05..c1abbef8a 100644
--- a/packages/component-manuscript/src/components/ManuscriptPage.js
+++ b/packages/component-manuscript/src/components/ManuscriptPage.js
@@ -37,6 +37,7 @@ import {
pendingHEInvitation,
currentUserIsReviewer,
canMakeRecommendation,
+ parseCollectionDetails,
canOverrideTechnicalChecks,
} from 'pubsweet-component-faraday-selectors'
import { RemoteOpener } from 'pubsweet-component-faraday-ui'
@@ -72,7 +73,10 @@ export default compose(
handlingEditors: selectHandlingEditors(state),
hasManuscriptFailure: hasManuscriptFailure(state),
fragment: selectFragment(state, match.params.version),
- collection: selectCollection(state, match.params.project),
+ collection: parseCollectionDetails(
+ state,
+ selectCollection(state, match.params.project),
+ ),
pendingHEInvitation: pendingHEInvitation(state, match.params.project),
editorialRecommendations: selectEditorialRecommendations(
state,
diff --git a/packages/components-faraday/src/components/Dashboard/DashboardPage.js b/packages/components-faraday/src/components/Dashboard/DashboardPage.js
index 646720b8a..eda5819b4 100644
--- a/packages/components-faraday/src/components/Dashboard/DashboardPage.js
+++ b/packages/components-faraday/src/components/Dashboard/DashboardPage.js
@@ -21,7 +21,7 @@ export default compose(
state => {
const { collections, conversion } = state
const currentUser = selectCurrentUser(state)
- const dashboard = newestFirstParseDashboard(state, collections)
+ const dashboard = newestFirstParseDashboard(state)
const userPermissions = getUserPermissions(state)
return {
--
GitLab