2 files changed, 9 insertions, 4 deletions
diff --git a/app/client/common/fileUpload.component.js b/app/client/common/fileUpload.component.js
index e024f62..d5ccd79 100644
--- a/app/client/common/fileUpload.component.js
+++ b/app/client/common/fileUpload.component.js
@@ -11,14 +11,20 @@ class FileUpload extends Component {
     e.preventDefault()
     this.setState({ thumbnails: [], images: [] })
     const files = e.dataTransfer ? e.dataTransfer.files : e.target.files
+    const mimeFiles = []
     let i, f
     for (i = 0, f; i < files.length; i++) {
       f = files[i]
       if (!f) continue
-      break
+      mimeFiles.push(f)
       // if (!f.type.match(this.props.mime)) continue
-      this.props.onUpload && this.props.onUpload(f)
     }
+    const promises = mimeFiles.map(f => (
+      (resolve, reject) => {
+        this.props.onUpload(f).then(resolve).catch(reject)
+      }
+    ))
+    promises.reduce((p, fn) => p.then(fn), Promise.resolve())
   }
   render() {
     return (
diff --git a/app/client/dataset/dataset.actions.js b/app/client/dataset/dataset.actions.js
index a7be863..912535a 100644
--- a/app/client/dataset/dataset.actions.js
+++ b/app/client/dataset/dataset.actions.js
@@ -31,14 +31,13 @@ export const updateFolder = (module, folder, name, opt={}) => dispatch => {
 export const uploadFile = (module, folder, file, filename, opt) => dispatch => {
   const fd = new FormData()
   fd.append('file', file, filename)
-  actions.folder.upload(fd, {
+  return actions.folder.upload(fd, {
     id: folder.id,
     module: module.name,
     activity: 'file',
     epoch: 0,
     processed: false,
     generated: false,
-    opt,
   })
 }