Merge branch 'hindawi-theme' of https://gitlab.coko.foundation/xpub/xpub-faraday into hindawi-theme

packages/component-faraday-ui/src/RadioWithComments.js

@@ -2,20 +2,32 @@ import React from 'react'
 import { get } from 'lodash'
 import { Field } from 'redux-form'
 import styled from 'styled-components'
-import { required as requiredValidator } from 'xpub-validators'
 import { ValidatedField, YesOrNo } from '@pubsweet/ui'
+import { required as requiredValidator } from 'xpub-validators'
 
-import { Label, Item, IconTooltip, Row, Textarea, marginHelper } from './'
+import {
+  Row,
+  Item,
+  Text,
+  Label,
+  Textarea,
+  ActionLink,
+  IconTooltip,
+  marginHelper,
+  RowOverrideAlert,
+} from './'
 
 const RadioWithComments = ({
   required,
+  subtitle,
   radioLabel,
   formValues,
   commentsOn,
-  commentsLabel,
   radioFieldName,
   tooltipContent,
+  commentsSubtitle,
   commentsFieldName,
+  commentsPlaceholder,
   ...rest
 }) => (
   <Root {...rest}>
@@ -36,16 +48,24 @@ const RadioWithComments = ({
     </Row>
 
     {get(formValues, radioFieldName, '') === commentsOn && (
-      <Row alignItems="center" justify="flex-start">
+      <RowOverrideAlert alignItems="center" justify="flex-start">
         <Item data-test="submission-conflicts-text" vertical>
-          <Label required={required}>{commentsLabel}</Label>
+          {commentsSubtitle && (
+            <Text secondary>
+              {commentsSubtitle}
+              {subtitle && (
+                <ActionLink to={subtitle.link}>{subtitle.label}</ActionLink>
+              )}
+            </Text>
+          )}
           <ValidatedField
             component={Textarea}
             name={commentsFieldName}
+            placeholder={commentsPlaceholder}
             validate={required ? [requiredValidator] : []}
           />
         </Item>
-      </Row>
+      </RowOverrideAlert>
     )}
   </Root>
 )

packages/component-wizard/src/components/StepTwo.js

@@ -2,6 +2,7 @@ import React, { Fragment } from 'react'
 import { get } from 'lodash'
 import { Field } from 'redux-form'
 import { required } from 'xpub-validators'
+import { withHandlers } from 'recompose'
 import {
   Row,
   Text,
@@ -27,6 +28,8 @@ const StepTwo = ({
   formValues,
   authorsError,
   manuscriptTypes,
+  getTooltipContent,
+  journal: { submission: { questions = [] } },
   ...rest
 }) => (
   <Fragment>
@@ -89,38 +92,31 @@ const StepTwo = ({
       version={version}
     />
 
-    <RadioWithComments
-      commentsFieldName="conflicts.message"
-      commentsLabel="Conflict of interest details"
-      commentsOn="yes"
-      formValues={formValues}
-      radioFieldName="conflicts.hasConflicts"
-      radioLabel="Do any authors have conflicts of interest to declare?"
-      required
-      tooltipContent={ConflictsTooltip}
-    />
-    <RadioWithComments
-      commentsFieldName="conflicts.dataAvailabilityMessage"
-      commentsLabel="Data availability statement"
-      commentsOn="no"
-      formValues={formValues}
-      radioFieldName="conflicts.hasDataAvailability"
-      radioLabel="Have you included a data availability statement in your manuscript?"
-      tooltipContent={DataAvailabilityTooltip}
-    />
-    <RadioWithComments
-      commentsFieldName="conflicts.fundingMessage"
-      commentsLabel="Funding statement"
-      commentsOn="no"
-      formValues={formValues}
-      radioFieldName="conflicts.hasFunding"
-      radioLabel="Have you provided a funding statement in your manuscript?"
-      tooltipContent={FundingTooltip}
-    />
+    {questions.map(q => (
+      <RadioWithComments
+        formValues={formValues}
+        key={q.id}
+        tooltipContent={getTooltipContent(q.id)}
+        {...q}
+      />
+    ))}
   </Fragment>
 )
 
-export default StepTwo
+export default withHandlers({
+  getTooltipContent: () => questionId => () => {
+    switch (questionId) {
+      case 'conflictsOfInterest':
+        return <ConflictsTooltip />
+      case 'dataAvailability':
+        return <DataAvailabilityTooltip />
+      case 'funding':
+        return <FundingTooltip />
+      default:
+        return null
+    }
+  },
+})(StepTwo)
 
 const ConflictsTooltip = () => (
   <Text secondary>

packages/component-wizard/src/components/SubmissionWizard.js

@@ -69,7 +69,11 @@ const Wizard = ({
     </Steps>
 
     <StepRoot className="wizard-step" step={step}>
-      {wizardSteps[step].component({ manuscriptTypes, journal, ...rest })}
+      {React.createElement(wizardSteps[step].component, {
+        manuscriptTypes,
+        journal,
+        ...rest,
+      })}
       <Row justify="center" mt={2}>
         {(isAuthorsFetching || isFilesFetching) && isLastStep ? (
           <Spinner />

packages/xpub-faraday/app/config/journal/index.js

@@ -11,3 +11,4 @@ export { default as articleSections } from './article-sections-tbrm'
 export { default as manuscriptTypes } from './manuscript-types'
 export { default as title } from './title'
 export { default as wizard } from './wizard'
+export { default as submission } from './submission'

packages/xpub-faraday/app/config/journal/metadata.js

 export default {
   issn: '2474-7394',
   logo: '/assets/logo-hindawi@2x.png',
-  nameText: 'Faraday Journal',
+  nameText: 'Bioinorganic Chemistry and Applications',
   email: 'faraday@hindawi.com',
   mts: {
     doctype: 'article SYSTEM "JATS-archivearticle1-mathml3.dtd"',

packages/xpub-faraday/app/config/journal/submission.js

+export default {
+  questions: [
+    {
+      id: 'conflictsOfInterest',
+      commentsFieldName: 'conflicts.message',
+      commentsSubtitle: '',
+      subtitle: null,
+      commentsPlaceholder: 'Please provide the conflicts of interest',
+      commentsOn: 'yes',
+      radioFieldName: 'conflicts.hasConflicts',
+      radioLabel: 'Do any authors have conflicts of interest to declare?',
+      required: true,
+    },
+    {
+      id: 'dataAvailability',
+      commentsFieldName: 'conflicts.dataAvailabilityMessage',
+      commentsSubtitle:
+        'For more information about the data availability statement, please ',
+      subtitle: {
+        link: 'https://www.hindawi.com/journals/bca/guidelines/',
+        label: 'click here',
+      },
+      commentsPlaceholder:
+        'Please provide a statement describing the availability of the underlying data related to your submission',
+      commentsOn: 'no',
+      radioFieldName: 'conflicts.hasDataAvailability',
+      radioLabel:
+        'Have you included a data availability statement in your manuscript?',
+      required: false,
+    },
+    {
+      id: 'funding',
+      commentsFieldName: 'conflicts.fundingMessage',
+      commentsSubtitle: '',
+      commentsPlaceholder:
+        'Please provide a statement describing how the research and publication of your article is funded',
+      subtitle: null,
+      commentsOn: 'no',
+      radioFieldName: 'conflicts.hasFunding',
+      radioLabel: 'Have you provided a funding statement in your manuscript?',
+      required: false,
+    },
+  ],
+}