1 files changed, 35 insertions, 25 deletions

diff --git a/app/client/modules/samplernn/samplernn.datasets.js b/app/client/modules/samplernn/samplernn.datasets.js
index b6a12cc..aa729a5 100644
--- a/app/client/modules/samplernn/samplernn.datasets.js
+++ b/app/client/modules/samplernn/samplernn.datasets.js
@@ -1,6 +1,7 @@
 import { h, Component } from 'preact'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
+import * as util from '../../util'
 
 import * as samplernnActions from './samplernn.actions'
 
@@ -18,11 +19,15 @@ class SampleRNNDatasets extends Component {
     super()
     this.fileOptions = this.fileOptions.bind(this)
     this.pickFile = this.pickFile.bind(this)
-    let id = props.match.params.id
+    let id = props.match.params.id || localStorage.getItem('samplernn.last_id')
     if (! id && props.location.pathname.match(/\/new\//)) {
       id = 'new'
+    } else if (id) {
+      localStorage.setItem('samplernn.last_id', id)
+    }
+    if (id && (! props.samplernn.folder || props.samplernn.folder.id !== id)) {
+      props.actions.load_directories(id)
     }
-    props.actions.load_directories(id)
   }
   pickFile(file){
     console.log('pick', file)
@@ -50,28 +55,45 @@ class SampleRNNDatasets extends Component {
       </div>
     )
   }
-  fetchURL(url) {
-  }
   render(){
     const { samplernn } = this.props
     const folder = samplernn.folder
     if (!folder.name) return
-    console.log(folder)
-    const datasets = folder.datasets.map(dataset =>{
-      console.log(dataset)
+    const { mapFn, sortFn } = util.sort.orderByFn('date desc')
+    const datasets = folder.datasets.map(mapFn).sort(sortFn).map(pair => {
+      const dataset = pair[1]
       return (
         <div className='row dataset'>
           <div className='col'>
-            {!!dataset.input.length && <FileList files={dataset.input} className='input_files' fileListClassName='' rowClassName='input_file' />}
+            {!!dataset.input.length &&
+              <FileList
+                files={dataset.input}
+                className='input_files'
+                fileListClassName=''
+                rowClassName='input_file'
+              />
+            }
           </div>
           <div className='col quiet'>
-            <div>{dataset.isBuilt ? 'has dataset' : 'not built'}</div>
+            <div>{dataset.isBuilt ? 'cached' : ''}</div>
           </div>
           <div className='col checkpoint'>
-            {!!dataset.checkpoints.length && <FileRow file={dataset.checkpoints[0]} />}
+            {!!dataset.checkpoints.length &&
+              <FileRow
+                file={dataset.checkpoints[0]}
+                fields={'name date epoch'}
+                className='row checkpoint'
+              />
+            }
           </div>
           <div className='col'>
-            {!!dataset.output.length && <FileList files={dataset.output} orderBy='epoch desc' />}
+            {!!dataset.output.length &&
+              <FileList
+                files={dataset.output}
+                orderBy='epoch desc'
+                fields={'name date epoch size'}
+              />
+            }
           </div>
         </div>
       )
@@ -79,12 +101,12 @@ class SampleRNNDatasets extends Component {
     return (
       <div className='app'>
         <div className='heading'>
-          <h3>SampleRNN</h3>
+          <h2>SampleRNN</h2>
         </div>
         <div class='rows params datasets'>
           <div class='row dataset'>
             <div class='col'>input</div>
-            <div class='col'>dataset</div>
+            <div class='col'></div>
             <div class='col'>checkpoint</div>
             <div class='col'>output</div>
           </div>
@@ -95,18 +117,6 @@ class SampleRNNDatasets extends Component {
   }
 }
 
-// <Dataset
-//   canRename
-//   canUpload
-//   canAddURL
-//   canDeleteFile
-//   linkFiles
-//   fileOptions={this.fileOptions}
-//   onPick={this.handlePick}
-//   folder={samplernn.folder}
-//   files={samplernn.folder.files}
-// />
-
 const mapStateToProps = state => ({
   samplernn: state.module.samplernn,
   runner: state.system.runner,