From 674e33e9ce0c4cacec4bef32cfbe48f49bb1663f Mon Sep 17 00:00:00 2001
From: Bogdan Cochior <bogdan.cochior@thinslices.com>
Date: Fri, 11 May 2018 13:42:53 +0300
Subject: [PATCH] fix(develop): fix manuscript details page
---
.../src/components/ManuscriptLayout.js | 82 +++++++++++--------
.../src/components/ReviewReportCard.js | 2 +-
2 files changed, 48 insertions(+), 36 deletions(-)
diff --git a/packages/component-manuscript/src/components/ManuscriptLayout.js b/packages/component-manuscript/src/components/ManuscriptLayout.js
index abd4552f0..0a9e5dd89 100644
--- a/packages/component-manuscript/src/components/ManuscriptLayout.js
+++ b/packages/component-manuscript/src/components/ManuscriptLayout.js
@@ -1,4 +1,6 @@
-import React from 'react'
+import React, { Fragment } from 'react'
+import { isEmpty } from 'lodash'
+import { Redirect } from 'react-router-dom'
import ManuscriptHeader from './ManuscriptHeader'
import ManuscriptVersion from './ManuscriptVersion'
@@ -30,40 +32,50 @@ const ManuscriptLayout = ({
updateManuscript,
}) => (
<Root>
- <Container flex={3}>
- <Header>
- <LeftDetails>
- <BreadCrumbs>
- <span onClick={() => history.push('/')}>Dashboard</span>
- <span>Manuscript Details</span>
- </BreadCrumbs>
- <ManuscriptId>{`- ID ${project.customId}`}</ManuscriptId>
- </LeftDetails>
- <RightDetails>
- <ManuscriptVersion project={project} />
- </RightDetails>
- </Header>
- <ManuscriptHeader journal={journal} project={project} version={version} />
- <ManuscriptDetails collection={project} fragment={version} />
- <ReviewsAndReports
- currentUserIs={currentUserIs}
- project={project}
- version={version}
- />
- </Container>
- <SideBar flex={1}>
- <SideBarActions
- currentUserIs={currentUserIs}
- project={project}
- version={version}
- />
- <SideBarRoles
- currentUser={currentUser}
- editorInChief={editorInChief}
- project={project}
- version={version}
- />
- </SideBar>
+ {!isEmpty(project) && !isEmpty(version) ? (
+ <Fragment>
+ <Container flex={3}>
+ <Header>
+ <LeftDetails>
+ <BreadCrumbs>
+ <span onClick={() => history.push('/')}>Dashboard</span>
+ <span>Manuscript Details</span>
+ </BreadCrumbs>
+ <ManuscriptId>{`- ID ${project.customId}`}</ManuscriptId>
+ </LeftDetails>
+ <RightDetails>
+ <ManuscriptVersion project={project} />
+ </RightDetails>
+ </Header>
+ <ManuscriptHeader
+ journal={journal}
+ project={project}
+ version={version}
+ />
+ <ManuscriptDetails collection={project} fragment={version} />
+ <ReviewsAndReports
+ currentUserIs={currentUserIs}
+ project={project}
+ version={version}
+ />
+ </Container>
+ <SideBar flex={1}>
+ <SideBarActions
+ currentUserIs={currentUserIs}
+ project={project}
+ version={version}
+ />
+ <SideBarRoles
+ currentUser={currentUser}
+ editorInChief={editorInChief}
+ project={project}
+ version={version}
+ />
+ </SideBar>
+ </Fragment>
+ ) : (
+ <Redirect to="/404" />
+ )}
</Root>
)
diff --git a/packages/component-manuscript/src/components/ReviewReportCard.js b/packages/component-manuscript/src/components/ReviewReportCard.js
index 71bc110df..25cf1f73c 100644
--- a/packages/component-manuscript/src/components/ReviewReportCard.js
+++ b/packages/component-manuscript/src/components/ReviewReportCard.js
@@ -34,7 +34,7 @@ const ReviewReportCard = ({ report = {}, journal: { recommendations } }) => (
</Fragment>
)}
- {get(report, 'comments[0].content.files') &&
+ {get(report, 'comments[0].files') &&
!!report.comments[0].files.length && (
<Fragment>
<Spacing />
--
GitLab