callback > promise

app/components/DropToImport/DropToImport.js

@@ -54,20 +54,17 @@ class DropToImport extends Component {
       }
 
       for (const file of files) {
-        importFile(
+        const doc = await importFile({
-          {
           documents: this.props.documents,
           file,
           documentId,
           collectionId,
-          },
+        });
-          doc => {
+
         if (redirect) {
           this.props.history.push(doc.url);
         }
       }
-        );
-      }
     } catch (err) {
       // TODO: show error alert.
     } finally {

app/menus/CollectionMenu.js

@@ -40,19 +40,15 @@ class CollectionMenu extends Component {
     this.file.click();
   };
 
-  onFilePicked = (ev: SyntheticEvent) => {
+  onFilePicked = async (ev: SyntheticEvent) => {
     const files = getDataTransferFiles(ev);
-
+    const document = await importFile({
-    importFile(
-      {
       file: files[0],
       documents: this.props.documents,
       collectionId: this.props.collection.id,
-      },
+    });
-      document => {
+
     this.props.history.push(document.url);
-      }
-    );
   };
 
   onEdit = (ev: SyntheticEvent) => {

app/utils/importFile.js

@@ -9,10 +9,13 @@ type Options = {
   documentId?: string,
 };
 
-const importFile = async (
+const importFile = async ({
-  { documents, file, documentId, collectionId }: Options,
+  documents,
-  callback: Document => *
+  file,
-) => {
+  documentId,
+  collectionId,
+}: Options): Promise<Document> => {
+  return new Promise(resolve => {
     const reader = new FileReader();
 
     reader.onload = async ev => {
@@ -28,9 +31,10 @@ const importFile = async (
       let document = new Document(data);
       document = await document.save();
       documents.add(document);
-    callback(document);
+      resolve(document);
     };
     reader.readAsText(file);
+  });
 };
 
 export default importFile;