Merge branch 'faraday-master' of gitlab.coko.foundation:xpub/xpub into faraday-master

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

@@ -8,6 +8,7 @@ import { reduxForm, formValueSelector, SubmissionError } from 'redux-form'
 import WizardStep from './WizardStep'
 import { autosaveRequest } from '../redux/autosave'
 
+let cachedVersion = ''
 const wizardSelector = formValueSelector('wizard')
 
 const onChange = (
@@ -19,7 +20,8 @@ const onChange = (
   const prev = pick(prevValues, formSectionKeys)
   const newValues = pick(values, formSectionKeys)
   // TODO: fix this if it sucks down the road
-  if (!isEqual(prev, newValues)) {
+  if (!isEqual(prev, newValues) && cachedVersion !== version.rev) {
+    cachedVersion = version.rev
     dispatch(autosaveRequest())
     dispatch(
       actions.updateFragment(project, {

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

@@ -52,7 +52,9 @@ export default ({
             return (
               <ValidatedField
                 component={input => (
-                  <Comp {...rest} {...input} {...dispatchFns} />
+                  <div data-test={fieldId}>
+                    <Comp {...rest} {...input} {...dispatchFns} />{' '}
+                  </div>
                 )}
                 format={format}
                 key={fieldId}
@@ -64,12 +66,15 @@ export default ({
           },
         )}
       <ButtonContainer>
-        <Button onClick={isFirst ? () => history.push('/') : prevStep}>
+        <Button
+          data-test="button-prev"
+          onClick={isFirst ? () => history.push('/') : prevStep}
+        >
           {isFirst
             ? `${wizard.cancelText || 'Cancel'}`
             : `${wizard.backText || 'Back'}`}
         </Button>
-        <Button primary type="submit">
+        <Button data-test="button-next" primary type="submit">
           {isFinal
             ? `${wizard.submitText || 'Submit Manuscript'}`
             : `${wizard.nextText || 'Next'}`}

packages/components-faraday/src/components/Dashboard/Dashboard.js

@@ -27,7 +27,11 @@ const Dashboard = ({
     <Header>
       <Heading>Manuscripts</Heading>
       <HeaderButtons>
-        <Button onClick={createDraftSubmission} primary>
+        <Button
+          data-test="new-manuscript"
+          onClick={createDraftSubmission}
+          primary
+        >
           New
         </Button>
       </HeaderButtons>

packages/components-faraday/src/components/Files/Files.js

@@ -189,7 +189,7 @@ export default compose(
         ...files,
         [type]: files[type].filter(f => f.id !== id),
       }
-      setFiles(newFiles, type)
+      setFiles(newFiles)
       changeForm('wizard', 'files', files)
     },
   }),