add download functionality to s3 fine uploader

js/components/ascribe_uploader/file_drag_and_drop_preview.js

@@ -40,8 +40,11 @@ let FileDragAndDropPreview = React.createClass({
         }
     },
 
-    // implement a handle cancel action here that triggers fineuploaders cancel method
+    handleDownloadFile() {
-    // to delete files that are currently uploading
+        if(this.props.file.s3Url) {
+            open(this.props.file.s3Url);
+        }
+    },
 
     render() {
         let previewElement;
@@ -53,14 +56,16 @@ let FileDragAndDropPreview = React.createClass({
                                 progress={this.props.file.progress}
                                 url={this.props.file.url}
                                 toggleUploadProcess={this.toggleUploadProcess}
-                                areAssetsDownloadable={this.props.areAssetsDownloadable}/>);
+                                areAssetsDownloadable={this.props.areAssetsDownloadable}
+                                downloadFile={this.handleDownloadFile}/>);
         } else {
             previewElement = (<FileDragAndDropPreviewOther
                                 onClick={this.handleDeleteFile}
                                 progress={this.props.file.progress}
                                 type={this.props.file.type.split('/')[1]}
                                 toggleUploadProcess={this.toggleUploadProcess}
-                                areAssetsDownloadable={this.props.areAssetsDownloadable}/>);
+                                areAssetsDownloadable={this.props.areAssetsDownloadable}
+                                downloadFile={this.handleDownloadFile}/>);
         }
 
         return (

js/components/ascribe_uploader/file_drag_and_drop_preview_image.js

@@ -31,10 +31,6 @@ let FileDragAndDropPreviewImage = React.createClass({
         this.props.toggleUploadProcess();
     },
 
-    downloadFile() {
-        console.log('implement this');
-    },
-
     render() {
         let imageStyle = {
             backgroundImage: 'url("' + this.props.url + '")',

js/components/ascribe_uploader/file_drag_and_drop_preview_other.js

@@ -11,7 +11,7 @@ let FileDragAndDropPreviewOther = React.createClass({
         progress: React.PropTypes.number,
         areAssetsDownloadable: React.PropTypes.bool,
         toggleUploadProcess: React.PropTypes.func,
-        downloadFile: React.PropTypes.func,
+        downloadFile: React.PropTypes.func
     },
 
     getInitialState() {
@@ -31,10 +31,6 @@ let FileDragAndDropPreviewOther = React.createClass({
         this.props.toggleUploadProcess();
     },
 
-    downloadFile() {
-        console.log('implement this');
-    },
-
     render() {
 
         let actionSymbol;

js/components/ascribe_uploader/react_s3_fine_uploader.js

@@ -314,25 +314,6 @@ var ReactS3FineUploader = React.createClass({
         }
     },
 
-    onDeleteComplete(id, xhr, isError) {
-        if(isError) {
-            let notification = new GlobalNotificationModel('Couldn\'t delete file', 'danger', 10000);
-            GlobalNotificationActions.appendGlobalNotification(notification);
-        } else {
-            this.removeFileWithIdFromFilesToUpload(id);
-
-            let notification = new GlobalNotificationModel('File deleted', 'success', 5000);
-            GlobalNotificationActions.appendGlobalNotification(notification);
-        }
-
-        if(this.props.isReadyForFormSubmission && this.props.isReadyForFormSubmission(this.state.filesToUpload)) {
-            // if so, set uploadstatus to true
-            this.props.setIsUploadReady(true);
-        } else {
-            this.props.setIsUploadReady(false);
-        }
-    },
-
     onProgress(id, name, uploadedBytes, totalBytes) {
         let newState = React.addons.update(this.state, {
             filesToUpload: { [id]: {
@@ -364,13 +345,32 @@ var ReactS3FineUploader = React.createClass({
             let newState = React.addons.update(this.state, {filesToUpload: {$set: updatedFilesToUpload}});
             this.setState(newState);
         } else {
-            let notification = new GlobalNotificationModel('Could not load attached files (Further data)', 'success', 5000);
+            let notification = new GlobalNotificationModel('Could not load attached files (Further data)', 'danger', 10000);
             GlobalNotificationActions.appendGlobalNotification(notification);
 
             throw new Error('The session request failed', response);
         }
     },
 
+    onDeleteComplete(id, xhr, isError) {
+        if(isError) {
+            let notification = new GlobalNotificationModel('Couldn\'t delete file', 'danger', 10000);
+            GlobalNotificationActions.appendGlobalNotification(notification);
+        } else {
+            this.removeFileWithIdFromFilesToUpload(id);
+
+            let notification = new GlobalNotificationModel('File deleted', 'success', 5000);
+            GlobalNotificationActions.appendGlobalNotification(notification);
+        }
+
+        if(this.props.isReadyForFormSubmission && this.props.isReadyForFormSubmission(this.state.filesToUpload)) {
+            // if so, set uploadstatus to true
+            this.props.setIsUploadReady(true);
+        } else {
+            this.props.setIsUploadReady(false);
+        }
+    },
+
     handleDeleteFile(fileId) {
         // In some instances (when the file was already uploaded and is just displayed to the user)
         // fineuploader does not register an id on the file (we do, don't be confused by this!).
@@ -390,12 +390,8 @@ var ReactS3FineUploader = React.createClass({
             let fileToDelete = this.state.filesToUpload[fileId];
             S3Fetcher
                 .deleteFile(fileToDelete.s3Key, fileToDelete.s3Bucket)
-                .then((res) => {
+                .then(() => this.onDeleteComplete(fileToDelete.id, null, false))
-                    console.log(res);
+                .catch(() => this.onDeleteComplete(fileToDelete.id, null, true));
-                })
-                .catch((err) => {
-                    console.log(err);
-                });
         }
     },