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

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

@@ -114,12 +114,30 @@ export default compose(
     'item',
     {
       drop(
-        { changeList, listId: toListId, maxFiles, files, setError },
+        {
+          changeList,
+          listId: toListId,
+          maxFiles,
+          files,
+          setError,
+          allowedFileExtensions,
+          ...pm
+        },
         monitor,
       ) {
-        const { listId: fromListId, id } = monitor.getItem()
+        const { listId: fromListId, id, name } = monitor.getItem()
+        const fileExtention = name.split('.')[1]
+
+        if (
+          allowedFileExtensions &&
+          !allowedFileExtensions.includes(fileExtention)
+        ) {
+          setError('Invalid file type.')
+          return
+        }
+
         if (files.length >= maxFiles) {
-          setError('No more files of this type can be added.')
+          setError('No more files can be added to this section.')
           return
         }
 
@@ -148,7 +166,7 @@ export default compose(
         const fileExtention = file.name.split('.')[1]
 
         if (files.length >= maxFiles) {
-          setError('No more files of this type can be added.')
+          setError('No more files can be added to this section.')
           return
         }
 
@@ -158,7 +176,7 @@ export default compose(
         ) {
           addFile(file)
         } else {
-          setError('File type not allowed for these kind of files.')
+          setError('Invalid file type.')
         }
       },
     },

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

@@ -66,7 +66,6 @@ export default ({
             )
           },
         )}
-      <Files />
       <div className={classnames(classes.buttons)}>
         <Button onClick={isFirst ? () => history.push('/') : prevStep}>
           {isFirst

packages/xpub-faraday/app/config/journal/submit-wizard.js

@@ -13,6 +13,7 @@ import {
   requiredBasedOnType,
   editModeEnabled,
   parseEmptyHtml,
+  requiredFiles,
 } from './wizard-validators'
 
 const min3Chars = minChars(3)
@@ -174,37 +175,8 @@ export default {
         {
           fieldId: 'file-upload',
           renderComponent: Files,
+          validate: [requiredFiles],
         },
-        // {
-        //   fieldId: 'label-manuscript',
-        //   renderComponent: Label,
-        //   label: 'Main Manuscript',
-        // },
-        // {
-        //   fieldId: 'files.manuscripts',
-        //   label: 'Main Manuscript',
-        //   renderComponent: Supplementary,
-        // },
-        // {
-        //   fieldId: 'label-supplementary',
-        //   renderComponent: Label,
-        //   label: 'Supplemental Files',
-        // },
-        // {
-        //   fieldId: 'files.supplementary',
-        //   label: 'Supplemental Files',
-        //   renderComponent: Supplementary,
-        // },
-        // {
-        //   fieldId: 'label-cover',
-        //   renderComponent: Label,
-        //   label: 'Cover Letter',
-        // },
-        // {
-        //   fieldId: 'files.coverLetter',
-        //   label: 'Cover Letter',
-        //   renderComponent: Supplementary,
-        // },
       ],
     },
   ],

packages/xpub-faraday/app/config/journal/wizard-validators.js

@@ -29,3 +29,10 @@ export const editModeEnabled = value => {
   }
   return undefined
 }
+
+export const requiredFiles = (valus, formValues) => {
+  if (get(formValues, 'files.manuscripts').length === 0) {
+    return 'At least one main manuscript file is needed.'
+  }
+  return undefined
+}