abstract this ugly datasets code!!

1 files changed, 23 insertions, 10 deletions

diff --git a/app/client/modules/samplernn/samplernn.datasets.js b/app/client/modules/samplernn/samplernn.datasets.js
index 2a8c224..d37102b 100644
--- a/app/client/modules/samplernn/samplernn.datasets.js
+++ b/app/client/modules/samplernn/samplernn.datasets.js
@@ -16,17 +16,22 @@ const samplernnModule = {
 
 class SampleRNNDatasets extends Component {
   constructor(props){
-    super()
+    super(props)
+    console.log('ba')
     this.fileOptions = this.fileOptions.bind(this)
     this.pickFile = this.pickFile.bind(this)
-    let id = props.match.params.id || localStorage.getItem('samplernn.last_id')
+  }
+  componentWillMount(){
+    const id = this.props.id || this.props.match.params.id || localStorage.getItem('samplernn.last_id')
+    console.log(id)
     console.log('load dataset:', id)
+    const { match, samplernn, actions } = this.props
     if (id === 'new') return
     if (id) {
       localStorage.setItem('samplernn.last_id', id)
-      if (! props.samplernn.folder || props.samplernn.folder.id !== id) {
+      if (! samplernn.folder || samplernn.folder.id !== id) {
         console.log('load directories')
-        props.actions.load_directories(id)
+        actions.load_directories(id)
       }
     }
   }
@@ -58,16 +63,22 @@ class SampleRNNDatasets extends Component {
   }
   render(){
     const { samplernn, match, history } = this.props
-    const folder = samplernn.folder
-    if (match.params.id === 'new') {
-      return <NewDatasetForm module={samplernnModule} history={history} />        
-    }
+    const id = this.props.id || localStorage.getItem('samplernn.last_id')
+    console.log(this.props.id)
+    if (this.props.id && this.props.id !== 'new') return null
     if (samplernn.loading) {
+      console.log('loading')
       return <span>Loading</span>
     }
-    if (!folder || !samplernn.data.folders.length) {
-      return history.push('/samplernn/datasets/new/')
+    if (!samplernn.folder || !samplernn.data.folders.length) {
+      console.log('no folders, redirect to /new')
+      return history.push('/samplernn/new/')
     }
+    console.log('render app')
+    const folder = samplernn.folder
+    console.log(folder)
+    if (!folder || !folder.name) return
+    console.log(folder.name)
     return (
       <div className='app'>
         <div class='heading'>
@@ -106,6 +117,7 @@ class SampleRNNDatasets extends Component {
       const dataset = pair[1]
       return (
         <div className='row dataset'>
+          {this.props.beforeRow && this.props.beforeRow(dataset)}
           <div className='col'>
             {!!dataset.input.length &&
               <FileList
@@ -113,6 +125,7 @@ class SampleRNNDatasets extends Component {
                 className='input_files'
                 fileListClassName=''
                 rowClassName='input_file'
+                options={this.fileOptions}
               />
             }
           </div>