From 21950f664e8c2e815c3de4d622cba75d39c09050 Mon Sep 17 00:00:00 2001
From: Bogdan Cochior <bogdan.cochior@thinslices.com>
Date: Fri, 24 Aug 2018 11:41:11 +0300
Subject: [PATCH] refactor(details): move manuscript components
---
packages/component-faraday-ui/src/WizardFiles.js | 2 +-
.../component-faraday-ui/src/helpers/withFileDownload.js | 4 ++--
packages/component-faraday-ui/src/index.js | 4 ----
.../src/{ => manuscriptDetails}/ManuscriptFileList.js | 2 +-
.../src/{ => manuscriptDetails}/ManuscriptFileList.md | 0
.../src/{ => manuscriptDetails}/ManuscriptHeader.js | 0
.../src/{ => manuscriptDetails}/ManuscriptHeader.md | 0
.../src/{ => manuscriptDetails}/ManuscriptMetadata.js | 9 +++++++--
.../src/{ => manuscriptDetails}/ManuscriptMetadata.md | 2 +-
.../src/{ => manuscriptDetails}/ManuscriptVersion.js | 0
.../src/{ => manuscriptDetails}/ManuscriptVersion.md | 0
.../component-faraday-ui/src/manuscriptDetails/index.js | 4 ++++
.../src/components/ManuscriptLayout.js | 6 +++++-
packages/xpub-faraday/app/FaradayApp.js | 2 +-
14 files changed, 22 insertions(+), 13 deletions(-)
rename packages/component-faraday-ui/src/{ => manuscriptDetails}/ManuscriptFileList.js (97%)
rename packages/component-faraday-ui/src/{ => manuscriptDetails}/ManuscriptFileList.md (100%)
rename packages/component-faraday-ui/src/{ => manuscriptDetails}/ManuscriptHeader.js (100%)
rename packages/component-faraday-ui/src/{ => manuscriptDetails}/ManuscriptHeader.md (100%)
rename packages/component-faraday-ui/src/{ => manuscriptDetails}/ManuscriptMetadata.js (83%)
rename packages/component-faraday-ui/src/{ => manuscriptDetails}/ManuscriptMetadata.md (95%)
rename packages/component-faraday-ui/src/{ => manuscriptDetails}/ManuscriptVersion.js (100%)
rename packages/component-faraday-ui/src/{ => manuscriptDetails}/ManuscriptVersion.md (100%)
diff --git a/packages/component-faraday-ui/src/WizardFiles.js b/packages/component-faraday-ui/src/WizardFiles.js
index a95da12f3..ca5112d51 100644
--- a/packages/component-faraday-ui/src/WizardFiles.js
+++ b/packages/component-faraday-ui/src/WizardFiles.js
@@ -82,7 +82,7 @@ export default compose(
})
},
downloadFile: ({ downloadFile, token }) => file => {
- downloadFile({ fileId: file.id, token, fileName: file.name })
+ downloadFile(file)
},
deleteFile: ({ deleteFile, files, setFormFiles }) => type => file => {
deleteFile(file.id, type).then(() => {
diff --git a/packages/component-faraday-ui/src/helpers/withFileDownload.js b/packages/component-faraday-ui/src/helpers/withFileDownload.js
index 8ed0e5fac..2285f8e0a 100644
--- a/packages/component-faraday-ui/src/helpers/withFileDownload.js
+++ b/packages/component-faraday-ui/src/helpers/withFileDownload.js
@@ -25,9 +25,9 @@ const removeAnchorElement = (a, url) => {
}
export const withFileDownload = withHandlers({
- downloadFile: () => ({ fileId, token, fileName = 'file' }) => {
+ downloadFile: ({ token }) => file => {
if (!token) return
-
+ const { id: fileId, name: fileName } = file
const fileURL = `${
window.location.origin
}/api/files/${fileId}?${qs.stringify({
diff --git a/packages/component-faraday-ui/src/index.js b/packages/component-faraday-ui/src/index.js
index a7b1716c4..71413c78b 100644
--- a/packages/component-faraday-ui/src/index.js
+++ b/packages/component-faraday-ui/src/index.js
@@ -23,10 +23,6 @@ export { default as WizardAuthors } from './WizardAuthors'
export { default as WizardFiles } from './WizardFiles'
export { default as PreviewFile } from './PreviewFile'
export { default as DownloadZipFiles } from './DownloadZipFiles'
-export { default as ManuscriptVersion } from './ManuscriptVersion'
-export { default as ManuscriptHeader } from './ManuscriptHeader'
-export { default as ManuscriptMetadata } from './ManuscriptMetadata'
-export { default as ManuscriptFileList } from './ManuscriptFileList'
// Manuscript Details
export * from './manuscriptDetails'
diff --git a/packages/component-faraday-ui/src/ManuscriptFileList.js b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptFileList.js
similarity index 97%
rename from packages/component-faraday-ui/src/ManuscriptFileList.js
rename to packages/component-faraday-ui/src/manuscriptDetails/ManuscriptFileList.js
index 74b5eb01e..3d139b5c2 100644
--- a/packages/component-faraday-ui/src/ManuscriptFileList.js
+++ b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptFileList.js
@@ -1,7 +1,7 @@
import React, { Fragment } from 'react'
import { Text, FileItem, Item, Row } from 'pubsweet-component-faraday-ui'
-import { withFilePreview, withFileDownload } from './helpers'
+import { withFilePreview, withFileDownload } from '../helpers'
const ManuscriptFileList = ({
files: { manuscripts = [], coverLetter = [], supplementary = [] },
diff --git a/packages/component-faraday-ui/src/ManuscriptFileList.md b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptFileList.md
similarity index 100%
rename from packages/component-faraday-ui/src/ManuscriptFileList.md
rename to packages/component-faraday-ui/src/manuscriptDetails/ManuscriptFileList.md
diff --git a/packages/component-faraday-ui/src/ManuscriptHeader.js b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.js
similarity index 100%
rename from packages/component-faraday-ui/src/ManuscriptHeader.js
rename to packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.js
diff --git a/packages/component-faraday-ui/src/ManuscriptHeader.md b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.md
similarity index 100%
rename from packages/component-faraday-ui/src/ManuscriptHeader.md
rename to packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.md
diff --git a/packages/component-faraday-ui/src/ManuscriptMetadata.js b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptMetadata.js
similarity index 83%
rename from packages/component-faraday-ui/src/ManuscriptMetadata.js
rename to packages/component-faraday-ui/src/manuscriptDetails/ManuscriptMetadata.js
index 2978f4269..911feef48 100644
--- a/packages/component-faraday-ui/src/ManuscriptMetadata.js
+++ b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptMetadata.js
@@ -10,6 +10,7 @@ import {
const ManuscriptMetadata = ({
getSignedUrl,
+ currentUser: { token },
fragment: {
files = {},
authors = [],
@@ -20,7 +21,7 @@ const ManuscriptMetadata = ({
<Fragment>
{!!abstract && (
<Item mb={1}>
- <ContextualBox label="Abstract" transparent>
+ <ContextualBox label="Abstract" startExpanded transparent>
<Text dangerouslySetInnerHTML={{ __html: abstract }} mb={1} mt={1} />
</ContextualBox>
</Item>
@@ -44,7 +45,11 @@ const ManuscriptMetadata = ({
files.supplementary.length})`}
transparent
>
- <ManuscriptFileList files={files} getSignedUrl={getSignedUrl} />
+ <ManuscriptFileList
+ files={files}
+ getSignedUrl={getSignedUrl}
+ token={token}
+ />
</ContextualBox>
</Item>
)}
diff --git a/packages/component-faraday-ui/src/ManuscriptMetadata.md b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptMetadata.md
similarity index 95%
rename from packages/component-faraday-ui/src/ManuscriptMetadata.md
rename to packages/component-faraday-ui/src/manuscriptDetails/ManuscriptMetadata.md
index 432cebaf3..81ab9d0f5 100644
--- a/packages/component-faraday-ui/src/ManuscriptMetadata.md
+++ b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptMetadata.md
@@ -33,5 +33,5 @@ const fragment = {
supplementary: [],
},
}
-;<ManuscriptMetadata fragment={fragment} />
+;<ManuscriptMetadata fragment={fragment} currentUser={{}}/>
```
diff --git a/packages/component-faraday-ui/src/ManuscriptVersion.js b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptVersion.js
similarity index 100%
rename from packages/component-faraday-ui/src/ManuscriptVersion.js
rename to packages/component-faraday-ui/src/manuscriptDetails/ManuscriptVersion.js
diff --git a/packages/component-faraday-ui/src/ManuscriptVersion.md b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptVersion.md
similarity index 100%
rename from packages/component-faraday-ui/src/ManuscriptVersion.md
rename to packages/component-faraday-ui/src/manuscriptDetails/ManuscriptVersion.md
diff --git a/packages/component-faraday-ui/src/manuscriptDetails/index.js b/packages/component-faraday-ui/src/manuscriptDetails/index.js
index 624245e73..ea34a18be 100644
--- a/packages/component-faraday-ui/src/manuscriptDetails/index.js
+++ b/packages/component-faraday-ui/src/manuscriptDetails/index.js
@@ -1 +1,5 @@
export { default as ManuscriptDetailsTop } from './ManuscriptDetailsTop'
+export { default as ManuscriptVersion } from './ManuscriptVersion'
+export { default as ManuscriptHeader } from './ManuscriptHeader'
+export { default as ManuscriptMetadata } from './ManuscriptMetadata'
+export { default as ManuscriptFileList } from './ManuscriptFileList'
diff --git a/packages/component-manuscript/src/components/ManuscriptLayout.js b/packages/component-manuscript/src/components/ManuscriptLayout.js
index 8120863b8..aeca22f0a 100644
--- a/packages/component-manuscript/src/components/ManuscriptLayout.js
+++ b/packages/component-manuscript/src/components/ManuscriptLayout.js
@@ -38,7 +38,11 @@ const ManuscriptLayout = ({
fragment={fragment}
journal={journal}
/>
- <ManuscriptMetadata fragment={fragment} getSignedUrl={getSignedUrl} />
+ <ManuscriptMetadata
+ currentUser={currentUser}
+ fragment={fragment}
+ getSignedUrl={getSignedUrl}
+ />
</Fragment>
) : (
<Text>Loading...</Text>
diff --git a/packages/xpub-faraday/app/FaradayApp.js b/packages/xpub-faraday/app/FaradayApp.js
index 4b2e91eb2..10ebbe7f7 100644
--- a/packages/xpub-faraday/app/FaradayApp.js
+++ b/packages/xpub-faraday/app/FaradayApp.js
@@ -63,7 +63,7 @@ const MainContainer = styled.div`
display: flex;
flex-direction: column;
overflow-y: auto;
- padding: 0 calc(${th('gridUnit')} * 10);
+ padding: 0 calc(${th('gridUnit')} * 12);
padding-top: calc(${th('appBar.height')} + ${th('gridUnit')} * 3 )};
`
// #endregion
--
GitLab