remembering the dataset form

5 files changed, 19 insertions, 59 deletions

diff --git a/app/client/dataset/dataset.component.js b/app/client/dataset/dataset.form.js
index 73f1720..fd00518 100644
--- a/app/client/dataset/dataset.component.js
+++ b/app/client/dataset/dataset.form.js
@@ -10,17 +10,15 @@ import { FileList } from '../common/fileList.component'
 import FileUpload from '../common/fileUpload.component'
 import TextInput from '../common/textInput.component'
 
-class Dataset extends Component {
+class DatasetForm extends Component {
   constructor(props){
     super()
   }
   render(){
     const {
       loading, status, error,
-      module, title, folder, files,
-      canRename, canUpload, canAddURL, canDeleteFile,
-      linkFiles,
-      fileOptions, pickFile, onPick
+      module, folder,
+      canRename, canUpload, canAddURL
     } = this.props
     // sort files??
 
@@ -29,38 +27,24 @@ class Dataset extends Component {
         <div className='dataset'>
           <div className='params row'>
             <div className='column'>
-              <Group title={title || 'Dataset'}>
-                {canRename
-                ? this.renderFolderNameInput(folder.name)
-                : <Param title='Dataset name'>{folder.name}</Param>}
-              </Group>
+              {canRename
+              ? this.renderFolderNameInput(folder.name)
+              : <h2>{folder.name}</h2>}
             </div>
           </div>
         </div>
       )
     }
     return (
-      <div className='dataset'>
-        <div className='params row'>
-          <div className='column'>
-            <Group title={title || 'Dataset'}>
-              {canRename
-              ? this.renderFolderNameInput(folder.name)
-              : <Param title='Dataset name'>{folder.name}</Param>}
-              {folder.id && canUpload && this.renderUploadInput()}
-              {folder.id && canAddURL && this.renderURLInput()}
-            </Group>
-          </div>
-        </div>
-        <div className='params col'>
-          <FileList
-            title='Files'
-            files={files}
-            options={fileOptions}
-            onClick={() => onPick && onPick(file)}
-            canDelete={canDeleteFile}
-            linkFiles={linkFiles}
-          />
+      <div className='params row'>
+        <div className='col'>
+          <Group title={title || 'Dataset'}>
+            {canRename
+            ? this.renderFolderNameInput(folder.name)
+            : <Param title='Dataset name'>{folder.name}</Param>}
+            {folder.id && canUpload && this.renderUploadInput()}
+            {folder.id && canAddURL && this.renderURLInput()}
+          </Group>
         </div>
       </div>
     )
@@ -100,4 +84,4 @@ const mapDispatchToProps = (dispatch, ownProps) => ({
   }
 })
 
-export default connect(mapStateToProps, mapDispatchToProps)(Dataset)
+export default connect(mapStateToProps, mapDispatchToProps)(DatasetForm)
diff --git a/app/client/modules/samplernn/samplernn.datasets.js b/app/client/modules/samplernn/samplernn.datasets.js
index aa729a5..f5f4a1d 100644
--- a/app/client/modules/samplernn/samplernn.datasets.js
+++ b/app/client/modules/samplernn/samplernn.datasets.js
@@ -5,14 +5,8 @@ import * as util from '../../util'
 
 import * as samplernnActions from './samplernn.actions'
 
-import Dataset from '../../dataset/dataset.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 DatasetForm from '../../dataset/dataset.form'
 import { FileList, FileRow } from '../../common/fileList.component'
-import TextInput from '../../common/textInput.component'
 
 class SampleRNNDatasets extends Component {
   constructor(props){
@@ -100,9 +94,7 @@ class SampleRNNDatasets extends Component {
     })
     return (
       <div className='app'>
-        <div className='heading'>
-          <h2>SampleRNN</h2>
-        </div>
+        <DatasetForm folder={folder} canRename canUpload canAddURL />
         <div class='rows params datasets'>
           <div class='row dataset'>
             <div class='col'>input</div>
diff --git a/app/client/modules/samplernn/samplernn.inspect.js b/app/client/modules/samplernn/samplernn.inspect.js
index 5009328..f21d618 100644
--- a/app/client/modules/samplernn/samplernn.inspect.js
+++ b/app/client/modules/samplernn/samplernn.inspect.js
@@ -3,13 +3,6 @@ import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
 
 import * as samplernnActions from './samplernn.actions'
-
-import Dataset from '../../dataset/dataset.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'
 
diff --git a/app/client/modules/samplernn/samplernn.loss.js b/app/client/modules/samplernn/samplernn.loss.js
index f8b4676..dd6805a 100644
--- a/app/client/modules/samplernn/samplernn.loss.js
+++ b/app/client/modules/samplernn/samplernn.loss.js
@@ -6,8 +6,6 @@ import { lerp, norm, randint, randrange } from '../../util'
 
 import * as samplernnActions from './samplernn.actions'
 
-import Dataset from '../../dataset/dataset.component'
-
 import Group from '../../common/group.component'
 import Slider from '../../common/slider.component'
 import Select from '../../common/select.component'
diff --git a/app/client/modules/samplernn/samplernn.results.js b/app/client/modules/samplernn/samplernn.results.js
index d55b347..06092fb 100644
--- a/app/client/modules/samplernn/samplernn.results.js
+++ b/app/client/modules/samplernn/samplernn.results.js
@@ -1,18 +1,11 @@
 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 Dataset from '../../dataset/dataset.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, FileRow } from '../../common/fileList.component'
-import TextInput from '../../common/textInput.component'
 
 class SampleRNNResults extends Component {
   constructor(props){