feat(submit-revision): move things to utils

packages/component-manuscript/src/components/SubmitRevision.js

 import React from 'react'
+import { get } from 'lodash'
 import PropTypes from 'prop-types'
 import { connect } from 'react-redux'
 import { th } from '@pubsweet/ui-toolkit'
-import { actions } from 'pubsweet-client'
 import { required } from 'xpub-validators'
 import { DragDropContext } from 'react-dnd'
-import { get, omit, debounce } from 'lodash'
 import styled, { css } from 'styled-components'
 import HTML5Backend from 'react-dnd-html5-backend'
 import { ValidatedField, Button } from '@pubsweet/ui'
@@ -35,24 +34,15 @@ import {
   deleteFile,
   getRequestStatus,
 } from 'pubsweet-components-faraday/src/redux/files'
+import {
+  requiredHTML,
+  requiredFiles,
+  onRevisionSubmit,
+  onRevisionChange,
+} from './utils'
 
 import { Expandable } from '../molecules/'
 
-const parseEmptyHtml = value => {
-  if (value && value.replace('<p></p>', '').replace('<h1></h1>', '')) {
-    return undefined
-  }
-  return 'Required'
-}
-
-const requiredFiles = (values, formValues) => {
-  const manuscripts = get(formValues, 'files.manuscripts')
-  if (!manuscripts || manuscripts.length === 0) {
-    return 'At least one main manuscript file is needed.'
-  }
-  return undefined
-}
-
 const TextAreaField = input => <Textarea {...input} height={70} rows={6} />
 const SubmitRevision = ({
   addFile,
@@ -65,18 +55,18 @@ const SubmitRevision = ({
 }) => (
   <Root>
     <Expandable label="Submit Revision" startExpanded>
-      <Expandable label="DETAILS & AUTHORS">
+      <Expandable label="DETAILS & AUTHORS" startExpanded>
         <Title>MANUSCRIPT TITLE*</Title>
         <ValidatedField
           component={input => <TitleEditor {...input} />}
           name="metadata.title"
-          validate={[parseEmptyHtml]}
+          validate={[requiredHTML]}
         />
         <Title>ABSTRACT*</Title>
         <ValidatedField
           component={input => <AbstractEditor {...input} />}
           name="metadata.abstract"
-          validate={[parseEmptyHtml]}
+          validate={[requiredHTML]}
         />
         <Title>AUTHORS DETAILS*</Title>
         <CustomValidatedField>
@@ -89,7 +79,7 @@ const SubmitRevision = ({
           />
         </CustomValidatedField>
       </Expandable>
-      <Expandable label="FILES">
+      <Expandable label="FILES" startExpanded>
         <CustomValidatedField>
           <ValidatedField
             component={() => (
@@ -140,16 +130,6 @@ const SubmitRevision = ({
   </Root>
 )
 
-const onChange = (values, dispatch, { project, version }) => {
-  const newValues = omit(values, 'authorForm')
-  dispatch(
-    actions.updateFragment(project, {
-      ...version,
-      revision: newValues,
-    }),
-  )
-}
-
 export default compose(
   withContext(
     {
@@ -219,10 +199,8 @@ export default compose(
   })),
   reduxForm({
     form: 'revision',
-    onChange: debounce(onChange, 1000, { maxWait: 5000 }),
-    onSubmit: (values, dispatch, { submitRevision, version, project }) => {
-      // submitRevision(project.id, version.id)
-    },
+    onChange: onRevisionChange,
+    onSubmit: onRevisionSubmit,
   }),
   DragDropContext(HTML5Backend),
   toClass,
@@ -298,8 +276,9 @@ const Root = styled.div`
 
 const Title = styled.span`
   align-self: center;
-  font-size: ${th('fontSizeBase')};
-  margin-bottom: 10px;
+  font-family: ${th('fontHeading')};
+  font-size: ${th('fontSizeBaseSmall')};
+  text-transform: uppercase;
 `
 
 const SubmitContainer = styled.div`

packages/component-manuscript/src/components/utils.js

@@ -186,3 +186,40 @@ export const onReviewSubmit = (
     onCancel: hideModal,
   })
 }
+
+const _onRevisionChange = (values, dispatch, { project, version }) => {
+  const newValues = omit(values, 'authorForm')
+  dispatch(
+    actions.updateFragment(project, {
+      ...version,
+      revision: newValues,
+    }),
+  )
+}
+export const onRevisionChange = debounce(_onRevisionChange, 1000, {
+  maxWait: 5000,
+})
+
+export const onRevisionSubmit = (
+  values,
+  dispatch,
+  { submitRevision, version, project },
+) => {
+  // submitRevision(project.id, version.id)
+}
+
+// revision validators
+export const requiredHTML = value => {
+  if (value && value.replace('<p></p>', '').replace('<h1></h1>', '')) {
+    return undefined
+  }
+  return 'Required'
+}
+
+export const requiredFiles = (values, formValues) => {
+  const manuscripts = get(formValues, 'files.manuscripts')
+  if (!manuscripts || manuscripts.length === 0) {
+    return 'At least one main manuscript file is needed.'
+  }
+  return undefined
+}