From 158ca488807b02f10f6b57f14016f395d5837b1c Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Sun, 3 Jun 2018 02:52:52 +0200
Subject: remembering the dataset form

---
 app/client/dataset/dataset.component.js            | 103 ---------------------
 app/client/dataset/dataset.form.js                 |  87 +++++++++++++++++
 app/client/modules/samplernn/samplernn.datasets.js |  12 +--
 app/client/modules/samplernn/samplernn.inspect.js  |   7 --
 app/client/modules/samplernn/samplernn.loss.js     |   2 -
 app/client/modules/samplernn/samplernn.results.js  |   9 +-
 6 files changed, 90 insertions(+), 130 deletions(-)
 delete mode 100644 app/client/dataset/dataset.component.js
 create mode 100644 app/client/dataset/dataset.form.js

(limited to 'app/client')

diff --git a/app/client/dataset/dataset.component.js b/app/client/dataset/dataset.component.js
deleted file mode 100644
index 73f1720..0000000
--- a/app/client/dataset/dataset.component.js
+++ /dev/null
@@ -1,103 +0,0 @@
-import { h, Component } from 'preact'
-import { bindActionCreators } from 'redux'
-import { connect } from 'react-redux'
-
-import * as datasetActions from './dataset.actions'
-
-import Group from '../common/group.component'
-import Param from '../common/param.component'
-import { FileList } from '../common/fileList.component'
-import FileUpload from '../common/fileUpload.component'
-import TextInput from '../common/textInput.component'
-
-class Dataset extends Component {
-  constructor(props){
-    super()
-  }
-  render(){
-    const {
-      loading, status, error,
-      module, title, folder, files,
-      canRename, canUpload, canAddURL, canDeleteFile,
-      linkFiles,
-      fileOptions, pickFile, onPick
-    } = this.props
-    // sort files??
-
-    if (!folder.id) {
-      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>}
-              </Group>
-            </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>
-      </div>
-    )
-  }
-  curry(action) {
-    const { module, folder } = this.props
-    return (param) => action(module, folder, param)
-  }
-  renderFolderNameInput(name){
-    return <TextInput
-      title={!this.props.folder.id ? 'Create a new dataset' : 'Dataset name'}
-      value={name}
-      onSave={this.curry(this.props.actions.dataset.createOrUpdateFolder)}
-    />
-  }
-  renderUploadInput(){
-    return <FileUpload
-      title='Upload a file'
-      mime='image.*'
-      onUpload={this.curry(this.props.actions.dataset.uploadFile)}
-    />
-  }
-  renderURLInput(){
-    return <TextInput
-      title='Fetch a URL'
-      placeholder='http://'
-      onSave={this.curry(this.props.actions.dataset.handleURL)}
-    />
-  }
-}
-
-const mapStateToProps = state => state.dataset
-
-const mapDispatchToProps = (dispatch, ownProps) => ({
-  actions: {
-    dataset: bindActionCreators(datasetActions, dispatch),
-  }
-})
-
-export default connect(mapStateToProps, mapDispatchToProps)(Dataset)
diff --git a/app/client/dataset/dataset.form.js b/app/client/dataset/dataset.form.js
new file mode 100644
index 0000000..fd00518
--- /dev/null
+++ b/app/client/dataset/dataset.form.js
@@ -0,0 +1,87 @@
+import { h, Component } from 'preact'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+
+import * as datasetActions from './dataset.actions'
+
+import Group from '../common/group.component'
+import Param from '../common/param.component'
+import { FileList } from '../common/fileList.component'
+import FileUpload from '../common/fileUpload.component'
+import TextInput from '../common/textInput.component'
+
+class DatasetForm extends Component {
+  constructor(props){
+    super()
+  }
+  render(){
+    const {
+      loading, status, error,
+      module, folder,
+      canRename, canUpload, canAddURL
+    } = this.props
+    // sort files??
+
+    if (!folder.id) {
+      return (
+        <div className='dataset'>
+          <div className='params row'>
+            <div className='column'>
+              {canRename
+              ? this.renderFolderNameInput(folder.name)
+              : <h2>{folder.name}</h2>}
+            </div>
+          </div>
+        </div>
+      )
+    }
+    return (
+      <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>
+    )
+  }
+  curry(action) {
+    const { module, folder } = this.props
+    return (param) => action(module, folder, param)
+  }
+  renderFolderNameInput(name){
+    return <TextInput
+      title={!this.props.folder.id ? 'Create a new dataset' : 'Dataset name'}
+      value={name}
+      onSave={this.curry(this.props.actions.dataset.createOrUpdateFolder)}
+    />
+  }
+  renderUploadInput(){
+    return <FileUpload
+      title='Upload a file'
+      mime='image.*'
+      onUpload={this.curry(this.props.actions.dataset.uploadFile)}
+    />
+  }
+  renderURLInput(){
+    return <TextInput
+      title='Fetch a URL'
+      placeholder='http://'
+      onSave={this.curry(this.props.actions.dataset.handleURL)}
+    />
+  }
+}
+
+const mapStateToProps = state => state.dataset
+
+const mapDispatchToProps = (dispatch, ownProps) => ({
+  actions: {
+    dataset: bindActionCreators(datasetActions, dispatch),
+  }
+})
+
+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){
-- 
cgit v1.2.3-70-g09d2