nice size functions from bucky :)

1 files changed, 21 insertions, 4 deletions

diff --git a/app/client/common/fileList.component.js b/app/client/common/fileList.component.js
index b3bcd43..7d90045 100644
--- a/app/client/common/fileList.component.js
+++ b/app/client/common/fileList.component.js
@@ -5,13 +5,16 @@ import { Link } from 'react-router-dom';
 import moment from 'moment'
 import * as util from '../util'
 
+const defaultFields = new Set(['date', 'size'])
 class FileList extends Component {
   constructor(props){
     super()
   }
   render(){
     const { files, linkFiles, onClick } = this.props
+    let fields = this.props.fields || defaultFields
 	  const fileList = files.map(file => {
+      const size = util.hush_size(file.size)
 	   	return (
 		   	<div class='row file' key={file.name}>
           <div className="filename" title={file.name || file.url}>
@@ -20,10 +23,24 @@ class FileList extends Component {
               : <span class='link' onClick={() => onClick(file)}>{file.name || file.url}</span>
             }
           </div>
-          <div className="date">{moment(file.created_at).format("YYYY-MM-DD h:mm a")}</div>
-          <div className="size">{file.size ? ((file.size) / 1024 / 1024).toFixed(1) + ' mb.' : ''}</div>
-          <div className="epoch">{file.epoch > 0 ? 'epoch ' + file.epoch : ' '}</div>
-	        <div className='activity'>{file.activity || ''} {file.module || ''}</div>
+          {fields.has('date') &&
+            <div className={"date " + util.carbon_date(file.created_at)}>{moment(file.created_at).format("YYYY-MM-DD")}</div>
+          }
+          {fields.has('datetime') &&
+            <div className={"datetime " + util.carbon_date(file.created_at)}>{moment(file.created_at).format("YYYY-MM-DD h:mm a")}</div>
+          }
+          {fields.has('size') &&
+            <div className={"size " + size[0]}>{size[1]}</div>
+          }
+          {fields.has('epoch') &&
+            <div className="epoch">{file.epoch > 0 ? 'epoch ' + file.epoch : ' '}</div>
+          }
+	        {(fields.has('activity') || fields.has('module')) &&
+            <div className='activity'>
+              {fields.has('activity') && file.activity}
+              {fields.has('module') && file.module}
+            </div>
+          }
           {this.props.options && this.props.options(file)}
 		   	</div>
 	   	)