From ddf2cc3f5dccc1b22275c3b39366e51036d7815f Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Thu, 7 Jun 2018 16:07:12 +0200
Subject: folder list on new dataset page

---
 app/client/modules/samplernn/index.js              |  1 +
 app/client/modules/samplernn/samplernn.module.js   |  1 +
 .../modules/samplernn/views/samplernn.import.js    |  3 +-
 .../modules/samplernn/views/samplernn.new.js       | 51 +++++-----------------
 4 files changed, 16 insertions(+), 40 deletions(-)

(limited to 'app/client/modules/samplernn')

diff --git a/app/client/modules/samplernn/index.js b/app/client/modules/samplernn/index.js
index 98195df..55c492e 100644
--- a/app/client/modules/samplernn/index.js
+++ b/app/client/modules/samplernn/index.js
@@ -25,6 +25,7 @@ function router () {
 function links(){
   return (
     <span>
+      <span><Link to="/samplernn/new/">new</Link></span>
       <span><Link to="/samplernn/datasets/">datasets</Link></span>
       <span><Link to="/samplernn/graph/">graph</Link></span>
       <span><Link to="/samplernn/results/">results</Link></span>
diff --git a/app/client/modules/samplernn/samplernn.module.js b/app/client/modules/samplernn/samplernn.module.js
index 60411b4..6fb4f33 100644
--- a/app/client/modules/samplernn/samplernn.module.js
+++ b/app/client/modules/samplernn/samplernn.module.js
@@ -1,5 +1,6 @@
 const samplernnModule = {
   name: 'samplernn',
+  displayName: 'SampleRNN',
   datatype: 'audio',
 }
 
diff --git a/app/client/modules/samplernn/views/samplernn.import.js b/app/client/modules/samplernn/views/samplernn.import.js
index 61df4da..653d930 100644
--- a/app/client/modules/samplernn/views/samplernn.import.js
+++ b/app/client/modules/samplernn/views/samplernn.import.js
@@ -34,11 +34,12 @@ class SampleRNNImport extends Component {
     if (id) {
       if (parseInt(id)) localStorage.setItem('samplernn.last_id', id)
       if (! samplernn.folder || samplernn.folder.id !== id) {
-        samplernnActions.load_directories(id)
+        this.props.actions.load_directories(id)
       }
     }
   }
   render(){
+    const { samplernn } = this.props
     let datasets = [], folder;
     if (this.props.samplernn.data) {
       datasets = (this.props.samplernn.data.folders || []).map(folder => {
diff --git a/app/client/modules/samplernn/views/samplernn.new.js b/app/client/modules/samplernn/views/samplernn.new.js
index 821c1d8..b25eab0 100644
--- a/app/client/modules/samplernn/views/samplernn.new.js
+++ b/app/client/modules/samplernn/views/samplernn.new.js
@@ -4,49 +4,21 @@ import { connect } from 'react-redux'
 import { Link } from 'react-router-dom'
 import util from '../../../util'
 
-import {
-  Group, Param
-} from '../../../common'
-
-import NewDatasetForm from '../../../dataset/dataset.new'
+import { Views } from '../../../common'
 
 import * as samplernnActions from '../samplernn.actions'
 import samplernnModule from '../samplernn.module'
 
-class SampleRNNNew extends Component {
-  constructor(props){
-    super(props)
-    props.actions.load_directories()
-  }
-  render(){
-    const { samplernn, history } = this.props
-    console.log(samplernn)
-    let folders
-    if (samplernn.data) {
-      folders = samplernn.data.folders.map(folder => {
-        console.log(folder)
-        const datasetCount = folder.datasets ? folder.datasets.length : 0
-        const [ className, size ] = util.hush_null(datasetCount)
-        return (
-          <Param title={<Link to={'/samplernn/datasets/' + folder.id + '/'}>{folder.name}</Link>}>
-            <span className={className}>{datasetCount} dataset{util.courtesy_s(datasetCount)}</span>
-          </Param>
-        )
-      })
-    }
-    return (
-      <div class='app samplernn'>
-        <div class='col narrow'>
-          <NewDatasetForm module={samplernnModule} history={history} />
-          {folders && <div class='col folderList'>
-            <Group title='Projects'>
-              {folders}
-            </Group>
-          </div>}
-        </div>
-      </div>
-    )
-  }
+function SampleRNNNew(props){
+  return (
+    <Views.New
+      db={props.samplernn}
+      path='/samplernn/datasets/'
+      actions={props.actions}
+      module={samplernnModule}
+      history={props.history}
+    />
+  )
 }
 
 const mapStateToProps = state => ({
@@ -58,3 +30,4 @@ const mapDispatchToProps = (dispatch, ownProps) => ({
 })
 
 export default connect(mapStateToProps, mapDispatchToProps)(SampleRNNNew)
+
-- 
cgit v1.2.3-70-g09d2