3 files changed, 47 insertions, 48 deletions

diff --git a/app/client/modules/samplernn/samplernn.actions.js b/app/client/modules/samplernn/samplernn.actions.js
index 3386247..5bf8a37 100644
--- a/app/client/modules/samplernn/samplernn.actions.js
+++ b/app/client/modules/samplernn/samplernn.actions.js
@@ -3,31 +3,25 @@ import types from '../../types'
 
 import actions from '../../actions'
 
-// bindActionCreators(actions.folder, dispatch),
-// bindActionCreators(actions.file, dispatch),
-// bindActionCreators(taskActions, dispatch),
-// bindActionCreators(systemActions, dispatch),
-
 export const load_directories = () => (dispatch) => {
   // load datasets
   // load directories from server
   console.log(actions)
-  actions.folder.index({ module: 'samplernn' })
-    .then(folders => {
-      console.log('got folders')
-    })
-  actions.file.index({ module: 'samplernn' })
-    .then(files => {
-      console.log('got files')      
-    })
-  actions.socket.list_directory({ module: 'samplernn', dir: 'results' })
-    .then(dirs => {
-      console.log('got results')
-    })
-  actions.socket.list_directory({ module: 'samplernn', dir: 'datasets' })
-    .then(dirs => {
-      console.log('got datasets')
+  Promise.all([
+    actions.folder.index({ module: 'samplernn' }),
+    actions.file.index({ module: 'samplernn' }),
+    actions.task.index({ module: 'samplernn' }),
+    actions.socket.list_directory({ module: 'samplernn', dir: 'results' }),
+    actions.socket.list_directory({ module: 'samplernn', dir: 'datasets' }),
+  ]).then(res => {
+    console.log(res)
+    const [folders, files, results, datasets] = res
+    console.log(folders.length, files.length, results.length, datasets.length)
+    dispatch({
+      type: types.samplernn.init,
+      data: { folders, files, results, datasets },
     })
+  })
 }
 
 export const fetch_url = (url) => (dispatch) => {
diff --git a/app/client/modules/samplernn/samplernn.datasets.js b/app/client/modules/samplernn/samplernn.datasets.js
index 960c976..f358170 100644
--- a/app/client/modules/samplernn/samplernn.datasets.js
+++ b/app/client/modules/samplernn/samplernn.datasets.js
@@ -53,10 +53,6 @@ class SampleRNNDatasets extends Component {
     const { samplernn } = this.props
     // console.log(samplernn.upload)
     // sort files??
-    const module = {
-      name: 'samplernn',
-      datatype: 'audio',
-    }
     return (
       <div className='app'>
         <div className='heading'>
@@ -70,10 +66,36 @@ class SampleRNNDatasets extends Component {
           linkFiles
           fileOptions={this.fileOptions}
           onPick={this.handlePick}
-          module={module}
           folder={samplernn.input.folder}
           files={samplernn.input.files}
         />
+        {this.renderData()}
+      </div>
+    )
+  }
+  renderData(){
+    const { samplernn } = this.props
+    if (samplernn.data === null) {
+      return
+    }
+    return (
+      <div class='row params'>
+        <FileList
+          title='Folders'
+          files={samplernn.data.folders}
+        />
+        <FileList
+          title='Files'
+          files={samplernn.data.files}
+        />
+        <FileList
+          title='Datasets'
+          files={samplernn.data.datasets}
+        />
+        <FileList
+          title='Results'
+          files={samplernn.data.results}
+        />
       </div>
     )
   }
diff --git a/app/client/modules/samplernn/samplernn.reducer.js b/app/client/modules/samplernn/samplernn.reducer.js
index 9ecd492..8d1ed74 100644
--- a/app/client/modules/samplernn/samplernn.reducer.js
+++ b/app/client/modules/samplernn/samplernn.reducer.js
@@ -15,37 +15,28 @@ const samplernnInitialState = {
     folder: {},
     files: [],
   },
+  data: null,
 }
 
 const samplernnReducer = (state = samplernnInitialState, action) => {
   switch(action.type) {
-    case types.socket.connect:
-      return {
-        ...state,
-      }
-    case types.task.task_begin:
+    case types.samplernn.init:
       return {
         ...state,
+        data: action.data,
       }
-    case types.task.task_finish:
+    case types.socket.connect:
       return {
         ...state,
       }
-    case types.folder.index:
+    case types.task.task_begin:
       return {
         ...state,
-        folders: action.data,
-        folder: action.data[0],
       }
-    case types.folder.update:
-      return state
-
-    case types.file.index:
+    case types.task.task_finish:
       return {
         ...state,
-        files: action.data
       }
-
     case types.file.create:
       if (state.folder.id === action.data.folder_id) {
         return {
@@ -54,7 +45,6 @@ const samplernnReducer = (state = samplernnInitialState, action) => {
         }
       }
       return state
-
     case types.folder.upload_complete:
       if (state.folder.id === action.folder) {
         return {
@@ -63,13 +53,6 @@ const samplernnReducer = (state = samplernnInitialState, action) => {
         }
       }
       return state
-
-    case types.system.list_directory:
-      console.log('list directory', action.data)
-      return {
-        ...state,
-      }
-    
     case types.socket.status:
       return samplernnSocket(state, action.data)
     default: