move views into own folder and begin prising away dataset code

8 files changed, 86 insertions, 77 deletions

diff --git a/app/client/modules/pix2pix/index.js b/app/client/modules/pix2pix/index.js
index 0343963..f60cf36 100644
--- a/app/client/modules/pix2pix/index.js
+++ b/app/client/modules/pix2pix/index.js
@@ -15,7 +15,6 @@ function links(){
   return (
     <span>
       <span><Link to="/pix2pix/datasets/">datasets</Link></span>
-      <span><Link to="/pix2pix/graph/">graph</Link></span>
       <span><Link to="/pix2pix/live/">live</Link></span>
     </span>
   )
diff --git a/app/client/modules/samplernn/index.js b/app/client/modules/samplernn/index.js
index 6459056..7d5e36e 100644
--- a/app/client/modules/samplernn/index.js
+++ b/app/client/modules/samplernn/index.js
@@ -1,21 +1,21 @@
 import { h, Component } from 'preact'
 import { Route, Link } from 'react-router-dom'
-import SampleRNNNew from './samplernn.new'
-import SampleRNNShow from './samplernn.show'
-import SampleRNNDatasets from './samplernn.datasets'
-import SampleRNNImport from './samplernn.import'
-import SampleRNNResults from './samplernn.results'
-import SampleRNNLoss from './samplernn.loss'
+
+import SampleRNNNew from './views/samplernn.new'
+import SampleRNNShow from './views/samplernn.show'
+import SampleRNNImport from './views/samplernn.import'
+import SampleRNNResults from './views/samplernn.results'
+import SampleRNNGraph from './views/samplernn.graph'
 
 function router () {
   return (
     <section>
       <Route exact path='/samplernn/new/' component={SampleRNNNew} />
-      <Route exact path='/samplernn/graph/' component={SampleRNNLoss} />
-      <Route exact path='/samplernn/import/' component={SampleRNNImport} />
       <Route exact path='/samplernn/datasets/' component={SampleRNNShow} />
       <Route exact path='/samplernn/datasets/:id/' component={SampleRNNShow} />
+      <Route exact path='/samplernn/import/' component={SampleRNNImport} />
       <Route exact path='/samplernn/results/' component={SampleRNNResults} />
+      <Route exact path='/samplernn/graph/' component={SampleRNNGraph} />
     </section>
   )
 }
diff --git a/app/client/modules/samplernn/samplernn.datasets.js b/app/client/modules/samplernn/samplernn.datasets.js
index 607f041..f8cba29 100644
--- a/app/client/modules/samplernn/samplernn.datasets.js
+++ b/app/client/modules/samplernn/samplernn.datasets.js
@@ -14,31 +14,6 @@ import Loading from '../../common/loading.component'
 import samplernnModule from './samplernn.module'
 
 class SampleRNNDatasets extends Component {
-  constructor(props){
-    super(props)
-    this.pickFile = this.pickFile.bind(this)
-  }
-  componentWillMount(){
-    const id = this.props.id
-    console.log('load dataset:', id, this.props.id)
-    const { match, samplernn, actions } = this.props
-    if (id === 'new') return
-    if (id) {
-      if (parseInt(id)) localStorage.setItem('samplernn.last_id', id)
-      if (! samplernn.folder || samplernn.folder.id !== id) {
-        actions.load_directories(id)
-      }
-    }
-  }
-  pickFile(file){
-    console.log('pick', file)
-  }
-  onDeleteFile(file){
-    const yes = confirm('Are you sure you want to delete this file?')
-    if (yes) {
-      actions.file.destroy(file)
-    }
-  }
   render(){
     const { samplernn, folder, match, history } = this.props
     if (samplernn.loading) {
@@ -128,16 +103,27 @@ class SampleRNNDatasets extends Component {
     })
     return datasets
   }
+  onDeleteFile(file){
+    const yes = confirm('Are you sure you want to delete this file?')
+    if (yes) {
+      console.log('delete: confirmed')
+      if (this.props.onDeleteFile) {
+        console.log('calling custom deletefile function')
+        this.props.onDeleteFile(file)
+      } else {
+        actions.file.destroy(file)
+      }
+    }
+  }
 }
 
 const mapStateToProps = state => ({
   samplernn: state.module.samplernn,
   runner: state.system.runner,
-  task: state.task,
 })
 
 const mapDispatchToProps = (dispatch, ownProps) => ({
-  actions: bindActionCreators(samplernnActions, dispatch),
+  samplernnActions: bindActionCreators(samplernnActions, dispatch),
 })
 
 export default connect(mapStateToProps, mapDispatchToProps)(SampleRNNDatasets)
diff --git a/app/client/modules/samplernn/samplernn.loss.js b/app/client/modules/samplernn/views/samplernn.graph.js
index 6ca69ef..821f1cb 100644
--- a/app/client/modules/samplernn/samplernn.loss.js
+++ b/app/client/modules/samplernn/views/samplernn.graph.js
@@ -2,18 +2,18 @@ import { h, Component } from 'preact'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
 
-import { lerp, norm, randint, randrange } from '../../util'
+import { lerp, norm, randint, randrange } from '../../../util'
 
-import * as samplernnActions from './samplernn.actions'
+import * as samplernnActions from '../samplernn.actions'
 
-import Group from '../../common/group.component'
-import Slider from '../../common/slider.component'
-import Select from '../../common/select.component'
-import Button from '../../common/button.component'
-import { FileList } from '../../common/fileList.component'
-import TextInput from '../../common/textInput.component'
+import Group from '../../../common/group.component'
+import Slider from '../../../common/slider.component'
+import Select from '../../../common/select.component'
+import Button from '../../../common/button.component'
+import { FileList } from '../../../common/fileList.component'
+import TextInput from '../../../common/textInput.component'
 
-class SampleRNNLoss extends Component {
+class SampleRNNGraph extends Component {
   constructor(props){
     super()
     props.actions.load_loss()
@@ -23,7 +23,7 @@ class SampleRNNLoss extends Component {
     return (
       <div className='app lossGraph'>
         <div className='heading'>
-          <h3>SampleRNN Loss</h3>
+          <h3>SampleRNN Loss Graph</h3>
           <canvas ref={(ref) => this.refs['canvas'] = ref} />
         </div>
       </div>
@@ -156,4 +156,4 @@ const mapDispatchToProps = (dispatch, ownProps) => ({
   actions: bindActionCreators(samplernnActions, dispatch),
 })
 
-export default connect(mapStateToProps, mapDispatchToProps)(SampleRNNLoss)
+export default connect(mapStateToProps, mapDispatchToProps)(SampleRNNGraph)
diff --git a/app/client/modules/samplernn/samplernn.import.js b/app/client/modules/samplernn/views/samplernn.import.js
index 495ee53..6f5f78a 100644
--- a/app/client/modules/samplernn/samplernn.import.js
+++ b/app/client/modules/samplernn/views/samplernn.import.js
@@ -1,15 +1,15 @@
 import { h, Component } from 'preact'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
-import * as util from '../../util'
+import * as util from '../../../util'
 
-import * as samplernnActions from './samplernn.actions'
+import * as samplernnActions from '../samplernn.actions'
 
-import Select from '../../common/select.component'
-import TextInput from '../../common/textInput.component'
-import Button from '../../common/button.component'
+import Select from '../../../common/select.component'
+import TextInput from '../../../common/textInput.component'
+import Button from '../../../common/button.component'
 
-import SampleRNNDatasets from './samplernn.datasets'
+import SampleRNNDatasets from '../samplernn.datasets'
 
 const samplernnModule = {
   name: 'samplernn',
@@ -26,6 +26,18 @@ class SampleRNNImport extends Component {
       selected: {},
     }
   }
+  componentWillMount(){
+    const id = this.props.match.params.id || localStorage.getItem('samplernn.last_id')
+    console.log('load dataset:', id)
+    const { match, samplernn, samplernnActions } = this.props
+    if (id === 'new') return
+    if (id) {
+      if (parseInt(id)) localStorage.setItem('samplernn.last_id', id)
+      if (! samplernn.folder || samplernn.folder.id !== id) {
+        samplernnActions.load_directories(id)
+      }
+    }
+  }
   render(){
     let datasets = [], folder;
     if (this.props.samplernn.data) {
diff --git a/app/client/modules/samplernn/samplernn.new.js b/app/client/modules/samplernn/views/samplernn.new.js
index 66551bb..d76e6c0 100644
--- a/app/client/modules/samplernn/samplernn.new.js
+++ b/app/client/modules/samplernn/views/samplernn.new.js
@@ -1,15 +1,15 @@
 import { h, Component } from 'preact'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
-import * as util from '../../util'
+import * as util from '../../../util'
 
-import * as samplernnActions from './samplernn.actions'
+import * as samplernnActions from '../samplernn.actions'
 
-import DatasetForm from '../../dataset/dataset.form'
-import NewDatasetForm from '../../dataset/dataset.new'
-import { FileList, FileRow } from '../../common/fileList.component'
+import DatasetForm from '../../../dataset/dataset.form'
+import NewDatasetForm from '../../../dataset/dataset.new'
+import { FileList, FileRow } from '../../../common/fileList.component'
 
-import samplernnModule from './samplernn.module'
+import samplernnModule from '../samplernn.module'
 
 class SampleRNNNew extends Component {
   constructor(props){
diff --git a/app/client/modules/samplernn/samplernn.results.js b/app/client/modules/samplernn/views/samplernn.results.js
index 31079ce..12367a3 100644
--- a/app/client/modules/samplernn/samplernn.results.js
+++ b/app/client/modules/samplernn/views/samplernn.results.js
@@ -3,12 +3,12 @@ import { bindActionCreators } from 'redux'
 import { Link } from 'react-router-dom';
 import { connect } from 'react-redux'
 
-import * as util from '../../util'
-import * as samplernnActions from './samplernn.actions'
-import * as audioPlayerActions from '../../common/audioPlayer/audioPlayer.actions'
-import Loading from '../../common/loading.component'
+import * as util from '../../../util'
+import * as samplernnActions from '../samplernn.actions'
+import * as audioPlayerActions from '../../../common/audioPlayer/audioPlayer.actions'
 
-import { FileList, FileRow } from '../../common/fileList.component'
+import Loading from '../../../common/loading.component'
+import { FileList, FileRow } from '../../../common/fileList.component'
 
 class SampleRNNResults extends Component {
   constructor(props){
diff --git a/app/client/modules/samplernn/samplernn.show.js b/app/client/modules/samplernn/views/samplernn.show.js
index acc7692..8b42d44 100644
--- a/app/client/modules/samplernn/samplernn.show.js
+++ b/app/client/modules/samplernn/views/samplernn.show.js
@@ -1,27 +1,39 @@
 import { h, Component } from 'preact'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
-import * as util from '../../util'
+import * as util from '../../../util'
 
-import * as samplernnActions from './samplernn.actions'
-import * as samplernnTasks from './samplernn.tasks'
-import * as audioPlayerActions from '../../common/audioPlayer/audioPlayer.actions'
+import * as samplernnActions from '../samplernn.actions'
+import * as samplernnTasks from '../samplernn.tasks'
+import * as audioPlayerActions from '../../../common/audioPlayer/audioPlayer.actions'
 
-import Loading from '../../common/loading.component'
-import DatasetForm from '../../dataset/dataset.form'
-import NewDatasetForm from '../../dataset/dataset.new'
-import DatasetStatus from '../../dataset/dataset.status'
-import { FileList, FileRow } from '../../common/fileList.component'
+import Loading from '../../../common/loading.component'
+import DatasetForm from '../../../dataset/dataset.form'
+import NewDatasetForm from '../../../dataset/dataset.new'
+import DatasetStatus from '../../../dataset/dataset.status'
+import { FileList, FileRow } from '../../../common/fileList.component'
 
-import SampleRNNDatasets from './samplernn.datasets'
+import SampleRNNDatasets from '../samplernn.datasets'
 
-import samplernnModule from './samplernn.module'
+import samplernnModule from '../samplernn.module'
 
 class SampleRNNShow extends Component {
   constructor(props){
     super(props)
     this.datasetActions = this.datasetActions.bind(this)
   }
+  componentWillMount(){
+    const id = this.props.match.params.id || localStorage.getItem('samplernn.last_id')
+    console.log('load dataset:', id)
+    const { match, samplernn, actions } = this.props
+    if (id === 'new') return
+    if (id) {
+      if (parseInt(id)) localStorage.setItem('samplernn.last_id', id)
+      if (! samplernn.folder || samplernn.folder.id !== id) {
+        actions.load_directories(id)
+      }
+    }
+  }
   render(){
     const { samplernn, match, history } = this.props
     const { folderLookup } = (samplernn.data || {})
@@ -43,7 +55,7 @@ class SampleRNNShow extends Component {
           />
         }
         <SampleRNNDatasets
-          id={this.props.match.params.id || localStorage.getItem('samplernn.last_id')}
+          id={samplernn.folder_id}
           folder={folder}
           history={history}
           onPickFile={(file, e) => {
@@ -59,7 +71,7 @@ class SampleRNNShow extends Component {
   }
   datasetActions(dataset, isFetching=false, isProcessing=false){
     const { samplernn, remote } = this.props
-    const input = fileLookup[dataset.input[0]]
+    const input = samplernn.data.fileLookup[dataset.input[0]]
     if (! input) return null
     if (input.name && input.name.match(/(gif|jpe?g|png)$/i)) return null
     return (