create these datasets

4 files changed, 33 insertions, 26 deletions

diff --git a/app/client/modules/samplernn/samplernn.datasets.js b/app/client/modules/samplernn/samplernn.datasets.js
index 0a42b8f..11dcb6b 100644
--- a/app/client/modules/samplernn/samplernn.datasets.js
+++ b/app/client/modules/samplernn/samplernn.datasets.js
@@ -67,7 +67,7 @@ class SampleRNNDatasets extends Component {
       return <span>Loading</span>
     }
     console.log(samplernn)
-    if (!samplernn.data.folder || !samplernn.data.folders.length) {
+    if (!samplernn.data.folders.length) {
       console.log('no folders, redirect to /new')
       return history.push('/samplernn/new/')
     }
@@ -76,24 +76,7 @@ class SampleRNNDatasets extends Component {
     console.log(folder)
     if (!folder || !folder.name) return
     console.log(folder.name)
-    return (
-      <div className='app'>
-        <div class='heading'>
-          <h1>{folder.name}</h1>
-        </div>
-        {folder.name !== 'unsorted' &&
-          <DatasetForm
-            title='Add Files'
-            module={samplernnModule}
-            folder={folder}
-            canUpload canAddURL
-          />
-        }
-        {this.renderDataset()}
-      </div>
-    )
-  }
-  renderDataset(){
+
     return (
       <div class='rows params datasets'>
         <div class='row dataset'>
diff --git a/app/client/modules/samplernn/samplernn.import.js b/app/client/modules/samplernn/samplernn.import.js
index 593c67d..6895e86 100644
--- a/app/client/modules/samplernn/samplernn.import.js
+++ b/app/client/modules/samplernn/samplernn.import.js
@@ -19,10 +19,16 @@ const samplernnModule = {
 class SampleRNNImport extends Component {
   render(){
     return (
-      <SampleRNNDatasets
-        id="unsorted"
-        beforeRow={row => this.beforeRow(row)}
-      />
+      <div className='app'>
+        <div class='heading'>
+          <h1>import</h1>
+        </div>
+        <SampleRNNDatasets
+          id="unsorted"
+          history={this.props.history}
+          beforeRow={row => this.beforeRow(row)}
+        />
+      </div>
     )
   }
   beforeRow(row){
diff --git a/app/client/modules/samplernn/samplernn.reducer.js b/app/client/modules/samplernn/samplernn.reducer.js
index d91d64d..65d9e3d 100644
--- a/app/client/modules/samplernn/samplernn.reducer.js
+++ b/app/client/modules/samplernn/samplernn.reducer.js
@@ -10,6 +10,7 @@ const samplernnInitialState = {
 }
 
 const samplernnReducer = (state = samplernnInitialState, action) => {
+  console.log(action.type)
   switch(action.type) {
     case types.samplernn.init:
       return {
diff --git a/app/client/modules/samplernn/samplernn.show.js b/app/client/modules/samplernn/samplernn.show.js
index 24d60ab..f16758a 100644
--- a/app/client/modules/samplernn/samplernn.show.js
+++ b/app/client/modules/samplernn/samplernn.show.js
@@ -18,15 +18,32 @@ const samplernnModule = {
 
 class SampleRNNShow extends Component {
   render(){
+    const { samplernn, match, history } = this.props
+    const { folder } = samplernn || {}
+    console.log(folder)
     return (
-      <SampleRNNDatasets
-        id={this.props.match.params.id}
-      />
+      <div className='app'>
+        <div class='heading'>
+          <h1>{folder ? folder.name : 'Loading...'}</h1>
+        </div>
+        {folder && folder.name !== 'unsorted' &&
+          <DatasetForm
+            title='Add Files'
+            module={samplernnModule}
+            folder={folder}
+            canUpload canAddURL
+          />
+        }
+        <SampleRNNDatasets
+          id={this.props.match.params.id}
+        />
+      </div>
     )
   }
 }
 
 const mapStateToProps = state => ({
+  samplernn: state.module.samplernn,
 })
 
 const mapDispatchToProps = (dispatch, ownProps) => ({