From a1f6d20b2c9c54ecdf8cd3d8d07def0343f592f8 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Sat, 9 Jun 2018 01:41:15 +0200
Subject: deploy bundle

---
 app/client/common/fileList.component.js | 2 +-
 app/client/dataset/dataset.component.js | 2 ++
 app/server/site.js                      | 1 +
 app/server/util/upload.js               | 4 +++-
 4 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/client/common/fileList.component.js b/app/client/common/fileList.component.js
index 7e23044..0dd22ea 100644
--- a/app/client/common/fileList.component.js
+++ b/app/client/common/fileList.component.js
@@ -88,7 +88,7 @@ export const FileRow = props => {
           {file.persisted === false
             ? <span className='unpersisted'>{name}</span>
             : (linkFiles && file.url)
-            ? <a target='_blank' onClick={(e) => onClick && onClick(file, e)} href={file.url}>{name}</a>
+            ? <a target='_blank' onClick={(e) => { e.preventDefault(); onClick && onClick(file, e) }} href={file.url}>{name}</a>
             : <span class='link' onClick={(e) => onClick && onClick(file, e)}>{name}</span>
           }
         </div>
diff --git a/app/client/dataset/dataset.component.js b/app/client/dataset/dataset.component.js
index dec02b6..09a1b86 100644
--- a/app/client/dataset/dataset.component.js
+++ b/app/client/dataset/dataset.component.js
@@ -72,6 +72,7 @@ class DatasetComponent extends Component {
                   fileListClassName=''
                   rowClassName='input_file'
                   fields={'name date size delete'}
+                  linkFiles
                   onClick={onPickFile}
                   onDelete={(file) => this.onDeleteFile(file)}
                 />
@@ -106,6 +107,7 @@ class DatasetComponent extends Component {
                   files={dataset.output.map(id => fileLookup[id])}
                   orderBy='epoch desc'
                   fields={'name date epoch size'}
+                  linkFiles
                   onClick={onPickFile}
                   onDelete={(file) => this.onDeleteFile(file)}
                 />
diff --git a/app/server/site.js b/app/server/site.js
index f256c43..5ad57a4 100644
--- a/app/server/site.js
+++ b/app/server/site.js
@@ -47,6 +47,7 @@ app.post('/api/folder/:id/upload/',
         upload.put({
           file: file,
           preserveFilename: true,
+          sanitizeFilename: req.body.generated !== 'true',
           dirname: dirname,
           unacceptable: function(err){
             console.log('unacceptable')
diff --git a/app/server/util/upload.js b/app/server/util/upload.js
index 205a90b..ca801da 100644
--- a/app/server/util/upload.js
+++ b/app/server/util/upload.js
@@ -44,7 +44,9 @@ module.exports.put = function (opt) {
     filename = uuid() + "." + extension;
   }
 
-  filename = filename.replace(/-/g,'_').replace(/\s/g,'_').replace(/_+/g,'_')
+  if (opt.sanitizeFilename) {
+    filename = filename.replace(/-/g,'_').replace(/\s/g,'_').replace(/_+/g,'_')    
+  }
   var remote_path = opt.dirname + filename
 
   if (types && ! extension) {
-- 
cgit v1.2.3-70-g09d2