Add functionality for displaying file name upon uploading single file

js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview.js

@@ -5,22 +5,31 @@ import React from 'react';
 import FileDragAndDropPreviewImage from './file_drag_and_drop_preview_image';
 import FileDragAndDropPreviewOther from './file_drag_and_drop_preview_other';
 
-
 import { getLangText } from '../../../utils/lang_utils';
+import { truncateTextAtCharIndex } from '../../../utils/general_utils';
+import { extractFileExtensionFromString } from '../../../utils/file_utils';
 
-let FileDragAndDropPreview = React.createClass({
 
+const { shape, string, number, func, bool } = React.PropTypes;
+
+const FileDragAndDropPreview = React.createClass({
     propTypes: {
-        file: React.PropTypes.shape({
+        file: shape({
-            url: React.PropTypes.string,
+            url: string,
-            type: React.PropTypes.string
+            type: string,
+            progress: number,
+            id: number,
+            status: string,
+            s3Url: string,
+            s3UrlSafe: string
         }).isRequired,
-        handleDeleteFile: React.PropTypes.func,
+        handleDeleteFile: func,
-        handleCancelFile: React.PropTypes.func,
+        handleCancelFile: func,
-        handlePauseFile: React.PropTypes.func,
+        handlePauseFile: func,
-        handleResumeFile: React.PropTypes.func,
+        handleResumeFile: func,
-        areAssetsDownloadable: React.PropTypes.bool,
+        areAssetsDownloadable: bool,
-        areAssetsEditable: React.PropTypes.bool
+        areAssetsEditable: bool,
+        numberOfDisplayedFiles: number
     },
 
     toggleUploadProcess() {
@@ -50,45 +59,78 @@ let FileDragAndDropPreview = React.createClass({
         }
     },
 
-    render() {
+    getFileName() {
-        let previewElement;
+        const { numberOfDisplayedFiles, file } = this.props;
-        let removeBtn;
 
-        // Decide whether an image or a placeholder picture should be displayed
+        if(numberOfDisplayedFiles === 1) {
-        if(this.props.file.type.split('/')[0] === 'image') {
+            return (
-            previewElement = (<FileDragAndDropPreviewImage
+                <span className="file-name">
-                                onClick={this.handleDeleteFile}
+                    {truncateTextAtCharIndex(file.name, 30, '(...).' + extractFileExtensionFromString(file.name))}
-                                progress={this.props.file.progress}
+                </span>
-                                url={this.props.file.url}
+            );
-                                toggleUploadProcess={this.toggleUploadProcess}
-                                areAssetsDownloadable={this.props.areAssetsDownloadable}
-                                downloadUrl={this.props.file.s3UrlSafe}/>);
         } else {
-            previewElement = (<FileDragAndDropPreviewOther
+            return null;
-                                onClick={this.handleDeleteFile}
-                                progress={this.props.file.progress}
-                                type={this.props.file.type.split('/')[1]}
-                                toggleUploadProcess={this.toggleUploadProcess}
-                                areAssetsDownloadable={this.props.areAssetsDownloadable}
-                                downloadUrl={this.props.file.s3UrlSafe}/>);
         }
+    },
 
+    getRemoveButton() {
         if(this.props.areAssetsEditable) {
-           removeBtn = (<div className="delete-file">
+            return (
+                <div className="delete-file">
                     <span
                         className="glyphicon glyphicon-remove text-center"
                         aria-hidden="true"
                         title={getLangText('Remove file')}
                         onClick={this.handleDeleteFile}/>
-                        </div>);
+                </div>
+            );
+        } else {
+            return null;
+        }
+    },
+
+    render() {
+        const { file,
+                areAssetsDownloadable,
+                numberOfDisplayedFiles } = this.props;
+        const innerStyle = numberOfDisplayedFiles === 1 ? { verticalAlign: 'middle' } : null;
+        const outerStyle = numberOfDisplayedFiles !== 1 ? { display: 'inline-block' } : null;
+
+        let previewElement;
+
+        // Decide whether an image or a placeholder picture should be displayed
+        if(file.type.split('/')[0] === 'image') {
+            previewElement = (
+                <FileDragAndDropPreviewImage
+                    onClick={this.handleDeleteFile}
+                    progress={file.progress}
+                    url={file.url}
+                    toggleUploadProcess={this.toggleUploadProcess}
+                    areAssetsDownloadable={areAssetsDownloadable}
+                    downloadUrl={file.s3UrlSafe}/>
+            );
+        } else {
+            previewElement = (
+                <FileDragAndDropPreviewOther
+                    onClick={this.handleDeleteFile}
+                    progress={file.progress}
+                    type={file.type.split('/')[1]}
+                    toggleUploadProcess={this.toggleUploadProcess}
+                    areAssetsDownloadable={areAssetsDownloadable}
+                    downloadUrl={file.s3UrlSafe}/>
+                );
         }
 
         return (
+            <div style={outerStyle}>
                 <div
+                    style={innerStyle}
                     className="file-drag-and-drop-position">
-                {removeBtn}
+                    {this.getRemoveButton()}
                     {previewElement}
                 </div>
+                {this.getFileName()}
+            </div>
         );
     }
 });

js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_image.js

@@ -6,13 +6,16 @@ import ProgressBar from 'react-bootstrap/lib/ProgressBar';
 import AscribeSpinner from '../../ascribe_spinner';
 import { getLangText } from '../../../utils/lang_utils';
 
-let FileDragAndDropPreviewImage = React.createClass({
+
+const { number, string, func, bool } = React.PropTypes;
+
+const FileDragAndDropPreviewImage = React.createClass({
     propTypes: {
-        progress: React.PropTypes.number,
+        progress: number,
-        url: React.PropTypes.string,
+        url: string,
-        toggleUploadProcess: React.PropTypes.func,
+        toggleUploadProcess: func,
-        downloadUrl: React.PropTypes.string,
+        downloadUrl: string,
-        areAssetsDownloadable: React.PropTypes.bool
+        areAssetsDownloadable: bool
     },
 
     getInitialState() {

js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_iterator.js

@@ -46,7 +46,8 @@ let FileDragAndDropPreviewIterator = React.createClass({
                                     handlePauseFile={handlePauseFile}
                                     handleResumeFile={handleResumeFile}
                                     areAssetsDownloadable={areAssetsDownloadable}
-                                    areAssetsEditable={areAssetsEditable}/>
+                                    areAssetsEditable={areAssetsEditable}
+                                    numberOfDisplayedFiles={files.length}/>
                             );
                         })}
                     </div>

js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_other.js

@@ -6,13 +6,16 @@ import ProgressBar from 'react-bootstrap/lib/ProgressBar';
 import AscribeSpinner from '../../ascribe_spinner';
 import { getLangText } from '../../../utils/lang_utils';
 
-let FileDragAndDropPreviewOther = React.createClass({
+
+const { string, number, bool, func } = React.PropTypes;
+
+const FileDragAndDropPreviewOther = React.createClass({
     propTypes: {
-        type: React.PropTypes.string,
+        type: string,
-        progress: React.PropTypes.number,
+        progress: number,
-        areAssetsDownloadable: React.PropTypes.bool,
+        areAssetsDownloadable: bool,
-        toggleUploadProcess: React.PropTypes.func,
+        toggleUploadProcess: func,
-        downloadUrl: React.PropTypes.string
+        downloadUrl: string
     },
 
     getInitialState() {

js/utils/file_utils.js

@@ -85,3 +85,15 @@ export function computeHashOfFile(file) {
         loadNext();
     });
 }
+
+/**
+ * Extracts a file extension from a string, by splitting by dot and taking
+ * the last substring
+ * @param  {string} s file's name + extension
+ * @return {string}   file extension
+ *
+ * Via: http://stackoverflow.com/a/190878/1263876
+ */
+export function extractFileExtensionFromString(s) {
+    return s.split('.').pop();
+}

sass/ascribe_uploader.scss

@@ -45,6 +45,10 @@
 
 .file-drag-and-drop-preview-iterator-spacing {
     margin-bottom: 1em;
+
+    .file-name {
+        font-size: 1.1em;
+    }
 }
 
 .file-drag-and-drop-dialog {