From 746c9f9399487ece15c369c4dd9e3388d415c22c Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Tue, 5 Jun 2018 21:03:31 +0200
Subject: separate dataset stuff from samplernn stuff

---
 app/client/modules/samplernn/views/samplernn.import.js |  8 ++++++--
 app/client/modules/samplernn/views/samplernn.show.js   | 12 ++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

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

diff --git a/app/client/modules/samplernn/views/samplernn.import.js b/app/client/modules/samplernn/views/samplernn.import.js
index 6f5f78a..cce4aea 100644
--- a/app/client/modules/samplernn/views/samplernn.import.js
+++ b/app/client/modules/samplernn/views/samplernn.import.js
@@ -9,7 +9,7 @@ import Select from '../../../common/select.component'
 import TextInput from '../../../common/textInput.component'
 import Button from '../../../common/button.component'
 
-import SampleRNNDatasets from '../samplernn.datasets'
+import DatasetComponent from '../../../dataset/dataset.component'
 
 const samplernnModule = {
   name: 'samplernn',
@@ -90,7 +90,11 @@ class SampleRNNImport extends Component {
             </div>
           </div>
         </div>
-        <SampleRNNDatasets
+        <DatasetComponent
+          loading={samplernn.loading}
+          progress={samplernn.progress}
+          module={samplernnModule}
+          data={samplernn.data}
           id="unsorted"
           folder={folder}
           history={this.props.history}
diff --git a/app/client/modules/samplernn/views/samplernn.show.js b/app/client/modules/samplernn/views/samplernn.show.js
index 8b42d44..8a9d589 100644
--- a/app/client/modules/samplernn/views/samplernn.show.js
+++ b/app/client/modules/samplernn/views/samplernn.show.js
@@ -10,10 +10,10 @@ import * as audioPlayerActions from '../../../common/audioPlayer/audioPlayer.act
 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 UploadStatus from '../../../dataset/upload.status'
 import { FileList, FileRow } from '../../../common/fileList.component'
 
-import SampleRNNDatasets from '../samplernn.datasets'
+import DatasetComponent from '../../../dataset/dataset.component'
 
 import samplernnModule from '../samplernn.module'
 
@@ -43,7 +43,7 @@ class SampleRNNShow extends Component {
         <div class='heading'>
           <div class='spaced'>
             <h1>{folder ? folder.name : <Loading />}</h1>
-            <DatasetStatus />
+            <UploadStatus />
           </div>
         </div>
         {folder && folder.name && folder.name !== 'unsorted' &&
@@ -54,8 +54,12 @@ class SampleRNNShow extends Component {
             canUpload canAddURL
           />
         }
-        <SampleRNNDatasets
+        <DatasetComponent
+          loading={samplernn.loading}
+          progress={samplernn.progress}
           id={samplernn.folder_id}
+          module={samplernnModule}
+          data={samplernn.data}
           folder={folder}
           history={history}
           onPickFile={(file, e) => {
-- 
cgit v1.2.3-70-g09d2