From dcae80b51da01febc2922b109901b10aad9bbe83 Mon Sep 17 00:00:00 2001
From: Jure Triglav <juretriglav@gmail.com>
Date: Thu, 11 Jun 2020 14:02:03 +0200
Subject: [PATCH] feat: display custom metadata in decision page
---
app/app.js | 2 +-
.../src/components/DecisionPage.js | 1 +
.../assignEditors/AssignEditorsReviewers.js | 2 ++
.../src/components/atoms/Columns.js | 8 ++---
.../src/components/decision/DecisionLayout.js | 30 ++++++++--------
.../src/components/metadata/ReviewMetadata.js | 4 +++
.../src/components/JournalProvider.js | 12 -------
.../xpub-journal/src/components/index.js | 1 -
app/storage/forms/submit.json | 36 +++++++++----------
scripts/clearAndSeed.js | 2 +-
webpack/webpack.config.js | 4 +++
11 files changed, 50 insertions(+), 52 deletions(-)
delete mode 100644 app/components/xpub-journal/src/components/JournalProvider.js
delete mode 100644 app/components/xpub-journal/src/components/index.js
diff --git a/app/app.js b/app/app.js
index 6dcd21b31c..b49bf20d8f 100644
--- a/app/app.js
+++ b/app/app.js
@@ -18,7 +18,7 @@ const rootEl = document.getElementById('root')
ReactDOM.render(
<XpubProvider>
- <JournalProvider journal={journal}>
+ <JournalProvider journal={JSON.parse(JSON.stringify(journal))}>
<Root history={history} routes={routes} theme={theme} />
</JournalProvider>
</XpubProvider>,
diff --git a/app/components/component-xpub-review/src/components/DecisionPage.js b/app/components/component-xpub-review/src/components/DecisionPage.js
index 19cfb55fc0..cd85962bab 100644
--- a/app/components/component-xpub-review/src/components/DecisionPage.js
+++ b/app/components/component-xpub-review/src/components/DecisionPage.js
@@ -96,6 +96,7 @@ const fragmentFields = `
}
keywords
}
+ submission
suggestions {
reviewers {
opposed
diff --git a/app/components/component-xpub-review/src/components/assignEditors/AssignEditorsReviewers.js b/app/components/component-xpub-review/src/components/assignEditors/AssignEditorsReviewers.js
index 75e8167261..9691a272be 100644
--- a/app/components/component-xpub-review/src/components/assignEditors/AssignEditorsReviewers.js
+++ b/app/components/component-xpub-review/src/components/assignEditors/AssignEditorsReviewers.js
@@ -8,7 +8,9 @@ const Root = styled.div``
const Title = styled.div``
const AssignEditorsReviewers = ({ manuscript, AssignEditor }) => {
+ // TODO:
const journal = useContext(JournalContext)
+ // const journal = { id: 'temp' }
return (
<Root>
<Title>Assign Editors</Title>
diff --git a/app/components/component-xpub-review/src/components/atoms/Columns.js b/app/components/component-xpub-review/src/components/atoms/Columns.js
index 406921bd16..1b91fb653a 100644
--- a/app/components/component-xpub-review/src/components/atoms/Columns.js
+++ b/app/components/component-xpub-review/src/components/atoms/Columns.js
@@ -3,7 +3,7 @@ import styled from 'styled-components'
const Columns = styled.div`
display: grid;
grid-column-gap: 2em;
- grid-template-areas: 'manuscript admin';
+ grid-template-areas: 'manuscript chat';
grid-template-columns: minmax(200px, 80ch) minmax(200px, 50ch);
justify-content: center;
`
@@ -12,8 +12,8 @@ const Manuscript = styled.div`
grid-area: manuscript;
`
-const Admin = styled.div`
- grid-area: admin;
+const Chat = styled.div`
+ grid-area: chat;
`
-export { Columns, Manuscript, Admin }
+export { Columns, Manuscript, Chat }
diff --git a/app/components/component-xpub-review/src/components/decision/DecisionLayout.js b/app/components/component-xpub-review/src/components/decision/DecisionLayout.js
index fb9dccd8d0..df806b5690 100644
--- a/app/components/component-xpub-review/src/components/decision/DecisionLayout.js
+++ b/app/components/component-xpub-review/src/components/decision/DecisionLayout.js
@@ -8,15 +8,15 @@ import AssignEditorsReviewers from '../assignEditors/AssignEditorsReviewers'
import AssignEditor from '../assignEditors/AssignEditor'
import ReviewMetadata from '../metadata/ReviewMetadata'
import Decision from './Decision'
-import EditorSection from './EditorSection'
-import { Columns, Manuscript, Admin } from '../atoms/Columns'
+// import EditorSection from './EditorSection'
+import { Columns, Manuscript, Chat } from '../atoms/Columns'
import AdminSection from '../atoms/AdminSection'
-const addEditor = (manuscript, label) => ({
- content: <EditorSection manuscript={manuscript} />,
- key: manuscript.id,
- label,
-})
+// const addEditor = (manuscript, label) => ({
+// content: <EditorSection manuscript={manuscript} />,
+// key: manuscript.id,
+// label,
+// })
const DecisionLayout = ({
handleSubmit,
@@ -46,7 +46,7 @@ const DecisionLayout = ({
label,
})
- editorSections.push(addEditor(manuscript, label))
+ // editorSections.push(addEditor(manuscript, label))
}, [])
const submittedMoment = moment()
@@ -81,26 +81,26 @@ const DecisionLayout = ({
label,
})
- editorSections.push(addEditor(manuscript, label))
+ // editorSections.push(addEditor(manuscript, label))
}
return (
<Columns>
<Manuscript>
- <Tabs
+ Temp
+ {/* <Tabs
activeKey={editorSections[editorSections.length - 1].key}
sections={editorSections}
title="Versions"
- />
- </Manuscript>
-
- <Admin>
+ /> */}
<Tabs
activeKey={decisionSections[decisionSections.length - 1].key}
sections={decisionSections}
title="Versions"
/>
- </Admin>
+ </Manuscript>
+
+ <Chat></Chat>
</Columns>
)
}
diff --git a/app/components/component-xpub-review/src/components/metadata/ReviewMetadata.js b/app/components/component-xpub-review/src/components/metadata/ReviewMetadata.js
index 18cbfab494..2d06726f18 100644
--- a/app/components/component-xpub-review/src/components/metadata/ReviewMetadata.js
+++ b/app/components/component-xpub-review/src/components/metadata/ReviewMetadata.js
@@ -51,6 +51,7 @@ const filesToAttachment = file => ({
const ReviewMetadata = ({ manuscript }) => (
<Root>
<Title>Metadata</Title>
+
<Metadata>
<div>
<Heading>Open Peer Review :</Heading>
@@ -137,6 +138,9 @@ const ReviewMetadata = ({ manuscript }) => (
)}
</div>
)}
+ <Title>Additional metadata</Title>
+ {// TODO
+ JSON.stringify(JSON.parse(manuscript.submission), null, 2)}
</Metadata>
</Root>
)
diff --git a/app/components/xpub-journal/src/components/JournalProvider.js b/app/components/xpub-journal/src/components/JournalProvider.js
deleted file mode 100644
index 2832803495..0000000000
--- a/app/components/xpub-journal/src/components/JournalProvider.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-import { withContext, getContext } from 'recompose'
-
-export const JournalProvider = withContext(
- { journal: PropTypes.object },
- ({ journal }) => ({ journal }),
-)(props => React.Children.only(props.children))
-
-export const withJournal = getContext({
- journal: PropTypes.object,
-})
diff --git a/app/components/xpub-journal/src/components/index.js b/app/components/xpub-journal/src/components/index.js
deleted file mode 100644
index 2a193d6a18..0000000000
--- a/app/components/xpub-journal/src/components/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { JournalProvider, withJournal } from './JournalProvider'
diff --git a/app/storage/forms/submit.json b/app/storage/forms/submit.json
index 79aa205656..dbcfd834ef 100644
--- a/app/storage/forms/submit.json
+++ b/app/storage/forms/submit.json
@@ -8,12 +8,6 @@
"component": "TextField",
"name": "submission.name",
"placeholder": "Enter your name",
- "validate": [
- "required"
- ],
- "validateValue": {
- "minChars": "10"
- },
"order": "1"
},
{
@@ -22,12 +16,6 @@
"component": "TextField",
"name": "submission.affiliation",
"placeholder": "Enter your affiliation",
- "validate": [
- "required"
- ],
- "validateValue": {
- "minChars": "10"
- },
"order": "2"
},
{
@@ -46,10 +34,25 @@
"placeholder": "Enter keywords...",
"parse": "split",
"format": "join",
+ "order": "20",
+ "validateValue": {
+ "minChars": "4",
+ "maxChars": "6"
+ },
"validate": [
- "required"
- ],
- "order": "20"
+ {
+ "value": "minChars",
+ "label": "minimum Characters"
+ },
+ {
+ "value": "maxChars",
+ "label": "maximum Characters"
+ },
+ {
+ "value": "required",
+ "label": "Required"
+ }
+ ]
},
{
"title": "Type of Research Object",
@@ -74,9 +77,6 @@
"label": "Registered Report"
}
],
- "validate": [
- "required"
- ],
"order": "7"
},
{
diff --git a/scripts/clearAndSeed.js b/scripts/clearAndSeed.js
index 98df7a9e81..93b8738352 100644
--- a/scripts/clearAndSeed.js
+++ b/scripts/clearAndSeed.js
@@ -10,7 +10,7 @@ const clearDb = async () => {
`)
if (rows.length) {
- logger.info('Overwriting existing database due to clobber option')
+ logger.info('Overwriting existing database')
// TODO this is dangerous, change it
let dropQuery = rows.map(
row => `DROP TABLE ${row.schemaname}.${row.tablename} CASCADE`,
diff --git a/webpack/webpack.config.js b/webpack/webpack.config.js
index b7d0207913..91d735c414 100644
--- a/webpack/webpack.config.js
+++ b/webpack/webpack.config.js
@@ -66,6 +66,10 @@ module.exports = webpackEnv => {
resolve: {
alias: {
'wax-prosemirror-themes': path.resolve(__dirname, '../app/theme'),
+ 'xpub-journal': path.resolve(
+ __dirname,
+ '../app/components/xpub-journal',
+ ),
joi: 'joi-browser',
config: clientConfigPath,
},
--
GitLab