diff --git a/packages/component-faraday-ui/src/AuthorReply.js b/packages/component-faraday-ui/src/AuthorReply.js
index 053d3003c53eab5b821e14be66f4ba3de15d4452..3d1ed3491414d373c33bcee1c0325911ac92c605 100644
--- a/packages/component-faraday-ui/src/AuthorReply.js
+++ b/packages/component-faraday-ui/src/AuthorReply.js
@@ -67,7 +67,7 @@ AuthorReply.propTypes = {
/** Previews the file from the server then updates the form. */
onPreview: PropTypes.func,
/** Reply File. */
- replyFile: PropTypes.object, //eslint-disable-line
+ replyFile: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
}
AuthorReply.defaultProps = {
replyContent: undefined,
diff --git a/packages/component-faraday-ui/src/contextualBoxes/AuthorReviews.js b/packages/component-faraday-ui/src/contextualBoxes/AuthorReviews.js
index 580363ef7f0cdb25b713ab9cbadf5b26d7cec3e3..613ab6e4ffc0d3121b89bfab25a09b80a748e7e9 100644
--- a/packages/component-faraday-ui/src/contextualBoxes/AuthorReviews.js
+++ b/packages/component-faraday-ui/src/contextualBoxes/AuthorReviews.js
@@ -10,6 +10,7 @@ import {
Text,
indexReviewers,
} from '../'
+import { FragmentsOnCompositeTypes } from 'graphql'
const SubmittedReportsNumberForAuthorReviews = ({ reports }) => (
<Row fitContent justify="flex-end">
diff --git a/packages/component-faraday-ui/src/contextualBoxes/HERecommendation.js b/packages/component-faraday-ui/src/contextualBoxes/HERecommendation.js
index a1f02843ed93b9bdd19053fc80ab0bd50d7981d3..9fd76615c9dab0dead6421bd4d6e486836ebf90a 100644
--- a/packages/component-faraday-ui/src/contextualBoxes/HERecommendation.js
+++ b/packages/component-faraday-ui/src/contextualBoxes/HERecommendation.js
@@ -108,7 +108,6 @@ const HERecommendation = ({
/>
</ItemOverrideAlert>
</Row>
-
{get(formValues, 'recommendation') === 'minor' ||
get(formValues, 'recommendation') === 'major' ? (
<Row mt={2}>
@@ -148,7 +147,6 @@ const HERecommendation = ({
</ResponsiveItem>
</ResponsiveRow>
)}
-
<Row justify="flex-end" mt={2}>
<Button
data-test-id="button-editorial-recommendation-submit"
diff --git a/packages/component-faraday-ui/src/contextualBoxes/HERecommendation.md b/packages/component-faraday-ui/src/contextualBoxes/HERecommendation.md
index 8d00e6a5fd7d66796ff780a4ddbc1d9adb172546..45874db4a4e567de25d688c774c6db4e596fc1ca 100644
--- a/packages/component-faraday-ui/src/contextualBoxes/HERecommendation.md
+++ b/packages/component-faraday-ui/src/contextualBoxes/HERecommendation.md
@@ -2,10 +2,37 @@ HE recommendation.
```js
const formValues = {
- recommendation: 'minor-revision',
+ recommendation: 'minor',
}
+const options = [
+ {
+ value: 'publish',
+ label: 'Publish',
+ message: 'Recommend Manuscript for Publishing',
+ button: 'Submit Recommendation',
+ },
+ {
+ value: 'reject',
+ label: 'Reject',
+ message: 'Recommend Manuscript for Rejection',
+ button: 'Submit Recommendation',
+ },
+ {
+ value: 'minor',
+ label: 'Request Minor Revision',
+ message: 'Request Minor Revision',
+ button: 'Request Revision',
+ },
+ {
+ value: 'major',
+ label: 'Request Major Revision',
+ message: 'Request Major Revision',
+ button: 'Request Revision',
+ },
+]
;<HERecommendation
formValues={formValues}
+ options={options}
modalKey="heRecommendation"
onRecommendationSubmit={(values, props) => {
props.setFetching(true)
diff --git a/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.md b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.md
index 6c3c740eb7cd9fe5a00be6e3abceb337b6777308..e8d4243ea27d655c5d98b001eaed06afa1907828 100644
--- a/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.md
+++ b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.md
@@ -2,33 +2,65 @@ Manuscript header without a HE assigned.
```js
const authors = [
- {
+ {
+ affiliation: 'TSD',
+ affiliationNumber: 1,
+ country: 'AX',
+ id: '5001955e-cc18-42d4-b0ca-15ecbafc48fe',
email: 'john.doe@gmail.com',
firstName: 'John',
lastName: 'Doe',
isSubmitting: true,
+ isCorresponding: true,
+ title: 'mr',
},
{
- email: 'michael.felps@gmail.com',
- firstName: 'Michael',
- lastName: 'Felps',
+ affiliation: 'TSD',
+ affiliationNumber: 1,
+ country: 'AX',
+ id: '5001955e-cc18-42d4-b0ca-15ecsdfc48fe',
+ email: 'john.doe@gmail.com',
+ firstName: 'John',
+ lastName: 'Doe',
isSubmitting: true,
isCorresponding: true,
+ title: 'mr',
},
{
- email: 'barrack.obama@gmail.com',
- firstName: 'Barrack',
- lastName: 'Obama',
+ affiliation: 'TSD',
+ affiliationNumber: 1,
+ country: 'AX',
+ id: '5001955e-cc18-42d4-b0ca-15ec56fc48fe',
+ email: 'john.doe@gmail.com',
+ firstName: 'John',
+ lastName: 'Doe',
+ isSubmitting: true,
+ isCorresponding: true,
+ title: 'mr',
},
{
- email: 'barrack.obama@gmail1.com',
- firstName: 'Barrack 1',
- lastName: 'Obama',
+ affiliation: 'TSD',
+ affiliationNumber: 1,
+ country: 'AX',
+ id: '5001955e-cc18-42d4-b0ca-144cbafc48fe',
+ email: 'john.doe@gmail.com',
+ firstName: 'John',
+ lastName: 'Doe',
+ isSubmitting: true,
+ isCorresponding: true,
+ title: 'mr',
},
{
- email: 'barrack.obama@gmail2.com',
- firstName: 'Barrack 2',
- lastName: 'Obama',
+ affiliation: 'TSD',
+ affiliationNumber: 1,
+ country: 'AX',
+ id: '5001955e-cc18-42d4-b0ca-15ec33fc48fe',
+ email: 'john.doe@gmail.com',
+ firstName: 'John',
+ lastName: 'Doe',
+ isSubmitting: true,
+ isCorresponding: true,
+ title: 'mr',
},
]
@@ -93,33 +125,65 @@ Manuscript header with a pending HE invitation.
```js
const authors = [
- {
+ {
+ affiliation: 'TSD',
+ affiliationNumber: 1,
+ country: 'AX',
+ id: '5001955e-cc18-42d4-b0ca-15ecbafc48fe',
email: 'john.doe@gmail.com',
firstName: 'John',
lastName: 'Doe',
isSubmitting: true,
+ isCorresponding: true,
+ title: 'mr',
},
{
- email: 'michael.felps@gmail.com',
- firstName: 'Michael',
- lastName: 'Felps',
+ affiliation: 'TSD',
+ affiliationNumber: 1,
+ country: 'AX',
+ id: '5001955e-cc18-42d4-b0ca-15ecsdfc48fe',
+ email: 'john.doe@gmail.com',
+ firstName: 'John',
+ lastName: 'Doe',
isSubmitting: true,
isCorresponding: true,
+ title: 'mr',
},
{
- email: 'barrack.obama@gmail.com',
- firstName: 'Barrack',
- lastName: 'Obama',
+ affiliation: 'TSD',
+ affiliationNumber: 1,
+ country: 'AX',
+ id: '5001955e-cc18-42d4-b0ca-15ec56fc48fe',
+ email: 'john.doe@gmail.com',
+ firstName: 'John',
+ lastName: 'Doe',
+ isSubmitting: true,
+ isCorresponding: true,
+ title: 'mr',
},
{
- email: 'barrack.obama@gmail1.com',
- firstName: 'Barrack 1',
- lastName: 'Obama',
+ affiliation: 'TSD',
+ affiliationNumber: 1,
+ country: 'AX',
+ id: '5001955e-cc18-42d4-b0ca-144cbafc48fe',
+ email: 'john.doe@gmail.com',
+ firstName: 'John',
+ lastName: 'Doe',
+ isSubmitting: true,
+ isCorresponding: true,
+ title: 'mr',
},
{
- email: 'barrack.obama@gmail2.com',
- firstName: 'Barrack 2',
- lastName: 'Obama',
+ affiliation: 'TSD',
+ affiliationNumber: 1,
+ country: 'AX',
+ id: '5001955e-cc18-42d4-b0ca-15ec33fc48fe',
+ email: 'john.doe@gmail.com',
+ firstName: 'John',
+ lastName: 'Doe',
+ isSubmitting: true,
+ isCorresponding: true,
+ title: 'mr',
},
]
@@ -205,32 +269,64 @@ Manuscript header with a pending HE invitation.
```js
const authors = [
{
+ affiliation: 'TSD',
+ affiliationNumber: 1,
+ country: 'AX',
+ id: '5001955e-cc18-42d4-b0ca-15ecbafc48fe',
email: 'john.doe@gmail.com',
firstName: 'John',
lastName: 'Doe',
isSubmitting: true,
+ isCorresponding: true,
+ title: 'mr',
},
{
- email: 'michael.felps@gmail.com',
- firstName: 'Michael',
- lastName: 'Felps',
+ affiliation: 'TSD',
+ affiliationNumber: 1,
+ country: 'AX',
+ id: '5001955e-cc18-42d4-b0ca-15ecsdfc48fe',
+ email: 'john.doe@gmail.com',
+ firstName: 'John',
+ lastName: 'Doe',
isSubmitting: true,
isCorresponding: true,
+ title: 'mr',
},
{
- email: 'barrack.obama@gmail.com',
- firstName: 'Barrack',
- lastName: 'Obama',
+ affiliation: 'TSD',
+ affiliationNumber: 1,
+ country: 'AX',
+ id: '5001955e-cc18-42d4-b0ca-15ec56fc48fe',
+ email: 'john.doe@gmail.com',
+ firstName: 'John',
+ lastName: 'Doe',
+ isSubmitting: true,
+ isCorresponding: true,
+ title: 'mr',
},
{
- email: 'barrack.obama@gmail1.com',
- firstName: 'Barrack 1',
- lastName: 'Obama',
+ affiliation: 'TSD',
+ affiliationNumber: 1,
+ country: 'AX',
+ id: '5001955e-cc18-42d4-b0ca-144cbafc48fe',
+ email: 'john.doe@gmail.com',
+ firstName: 'John',
+ lastName: 'Doe',
+ isSubmitting: true,
+ isCorresponding: true,
+ title: 'mr',
},
{
- email: 'barrack.obama@gmail2.com',
- firstName: 'Barrack 2',
- lastName: 'Obama',
+ affiliation: 'TSD',
+ affiliationNumber: 1,
+ country: 'AX',
+ id: '5001955e-cc18-42d4-b0ca-15ec33fc48fe',
+ email: 'john.doe@gmail.com',
+ firstName: 'John',
+ lastName: 'Doe',
+ isSubmitting: true,
+ isCorresponding: true,
+ title: 'mr',
},
]
@@ -267,7 +363,11 @@ const fragment = {
},
}
-const currentUser = {}
+const currentUser = {
+ permissions: {
+ canAssignHE: false,
+ },
+}
const journal = {
manuscriptTypes: [
diff --git a/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptVersion.md b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptVersion.md
index 00e12ce334886136eb8308dd2c6b5fdc7a018e68..cee73787f78450a832987131c913cf7274943267 100644
--- a/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptVersion.md
+++ b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptVersion.md
@@ -1,19 +1,22 @@
Manuscript version component
```js
-
const history = {
- push: v => console.log('go to version -> ', v)
-};
-
-const fragment={};
-const collection={
- fragments: ['1','2'],
-};
+ push: v => console.log('go to version -> ', v),
+}
-<ManuscriptVersion
+const fragment = {}
+const collection = {
+ fragments: ['1', '2'],
+}
+const versions = [
+ { label: 'Version 1', value: '10d28459-6f8e-4f6c-a57e-65979e5f8d2' },
+ { label: 'Version 2', value: '10d28459-6f8e-4f6c-a57e-65979e5f854' },
+]
+;<ManuscriptVersion
collection={collection}
history={history}
fragment={fragment}
- />
+ versions={versions}
+/>
```
diff --git a/packages/component-faraday-ui/src/manuscriptDetails/ResponseToInvitation.md b/packages/component-faraday-ui/src/manuscriptDetails/ResponseToInvitation.md
index e7f3a21c9d5f65814365bd1e87054d925a0fb775..588a77de8ffc3b45d90266d6d0ef94629240c262 100644
--- a/packages/component-faraday-ui/src/manuscriptDetails/ResponseToInvitation.md
+++ b/packages/component-faraday-ui/src/manuscriptDetails/ResponseToInvitation.md
@@ -5,10 +5,9 @@ const formValues = {
decision: 'accept',
}
;<RemoteOpener>
- {({ toggle, expanded }) => (
+ {({ toggle }) => (
<ResponseToInvitation
commentsOn="decline"
- expanded={expanded}
label="Do you agree to be the handling editor for this manuscript?"
formValues={formValues}
onResponse={(values, { setFetching }) => {
@@ -26,9 +25,8 @@ A Reviewer response to an invitation.
```js
<RemoteOpener>
- {({ toggle, expanded }) => (
+ {({ toggle }) => (
<ResponseToInvitation
- expanded={expanded}
label="Do you agree to review this manuscript?"
onResponse={(values, { setFetching }) => {
console.log('on response: ', values)
diff --git a/packages/component-faraday-ui/src/pending/ControlledAccordion.js b/packages/component-faraday-ui/src/pending/ControlledAccordion.js
index 0c63d576edfad292aeb7f5be3d6509b82e9e52c5..8b13d447880797521288f08ec1e46d8ab39bcd2e 100644
--- a/packages/component-faraday-ui/src/pending/ControlledAccordion.js
+++ b/packages/component-faraday-ui/src/pending/ControlledAccordion.js
@@ -24,8 +24,8 @@ class ControlledAccordion extends React.Component {
const shouldScroll = !prevProps.expanded && this.props.expanded
if (this.props.scrollIntoView && shouldScroll) {
- const appBarHeight = 70 // TODO -- take height from constants
- const appBarMargin = 16 // TODO -- take margin from constants
+ const appBarHeight = 70
+ const appBarMargin = 16
this.scroller.scrollTop =
this._accordion.offsetTop - appBarHeight - appBarMargin
}
diff --git a/packages/component-faraday-ui/src/submissionRevision/ManuscriptFiles.md b/packages/component-faraday-ui/src/submissionRevision/ManuscriptFiles.md
index 42a8e212005461b35ce3cedc2926dc0ffff6b7a2..5129d1d5a62f8cc632451b7b3eba4be8b0e69006 100644
--- a/packages/component-faraday-ui/src/submissionRevision/ManuscriptFiles.md
+++ b/packages/component-faraday-ui/src/submissionRevision/ManuscriptFiles.md
@@ -14,8 +14,6 @@ const Wrapper = compose(
reduxForm({
form: 'styleguide',
}),
-)(( props ) => (
- <ManuscriptFiles {...props} />
-))
+)(props => <ManuscriptFiles {...props} />)
;<Wrapper />
-```
\ No newline at end of file
+```
diff --git a/packages/component-faraday-ui/src/submissionRevision/ResponseToReviewer.md b/packages/component-faraday-ui/src/submissionRevision/ResponseToReviewer.md
index e9264445b46902365f4a0d50608d13bd67fde690..903a52a7079d90ebd8749503990df5bba2460577 100644
--- a/packages/component-faraday-ui/src/submissionRevision/ResponseToReviewer.md
+++ b/packages/component-faraday-ui/src/submissionRevision/ResponseToReviewer.md
@@ -1,7 +1,24 @@
```js
+const { reduxForm, getFormValues, change } = require('redux-form')
+const { compose } = require('recompose')
+const { connect } = require('react-redux')
+
const allowedFileExtensions = ['pdf', 'doc', 'docx']
-const onUpload = (f) => {console.log('Upload', f)}
+const onUpload = file => console.log('Upload', file)
-<ResponseToReviewer onUpload={onUpload} allowedFileExtensions={allowedFileExtensions}/>
+const Wrapper = compose(
+ connect(state => ({
+ formValues: getFormValues('Response to reviewer')(state),
+ })),
+ reduxForm({
+ form: 'Response to reviewer',
+ }),
+)(props => (
+ <ResponseToReviewer
+ onUpload={onUpload}
+ allowedFileExtensions={allowedFileExtensions}
+ />
+))
+;<Wrapper />
```
diff --git a/packages/component-faraday-ui/src/submissionRevision/SubmitRevision.js b/packages/component-faraday-ui/src/submissionRevision/SubmitRevision.js
index 5c94d87182ae337a9a78147e5dd4fca40ef82bee..aec7021b003dc65598b05a433a0d4db559d70641 100644
--- a/packages/component-faraday-ui/src/submissionRevision/SubmitRevision.js
+++ b/packages/component-faraday-ui/src/submissionRevision/SubmitRevision.js
@@ -113,7 +113,7 @@ SubmitRevision.propTypes = {
/** An async call that returns the securized S3 file url. */
getSignedUrl: PropTypes.func,
/** Value containing the revision's file for the reviewer's response. */
- responseFile: PropTypes.func,
+ responseFile: PropTypes.object, //eslint-disable-line
/** Downloads the file from the server. */
downloadFile: PropTypes.func,
/** Uploads the file then updates the form. */
@@ -138,7 +138,7 @@ SubmitRevision.defaultProps = {
hasFormError: false,
deleteAuthor: () => {},
getSignedUrl: () => {},
- responseFile: () => {},
+ responseFile: {},
downloadFile: () => {},
addResponseFile: () => {},
deleteResponseFile: () => {},