pix2pix datasets in full effect

3 files changed, 18 insertions, 3 deletions

diff --git a/app/client/dataset/dataset.loader.js b/app/client/dataset/dataset.loader.js
index 6757593..64185bc 100644
--- a/app/client/dataset/dataset.loader.js
+++ b/app/client/dataset/dataset.loader.js
@@ -40,11 +40,13 @@ export const getDataset = (module, datasetLookup, name, folder, date) => {
 }
 
 export const load = module => {
+  console.log(module)
   return Promise.all([
     actions.folder.index({ module }),
     actions.file.index({ module }),
+    actions.task.index({ module }),
   ]).then(res => {
-    const [folders, files] = res
+    const [folders, files, tasks] = res
 
     let datasetLookup = {}
     let folderLookup = {}
diff --git a/app/client/dataset/dataset.new.js b/app/client/dataset/dataset.new.js
index 1705598..617aa90 100644
--- a/app/client/dataset/dataset.new.js
+++ b/app/client/dataset/dataset.new.js
@@ -23,7 +23,7 @@ function NewDatasetForm (props) {
           onSave={(name) => {
             actions.createFolder(module, name)
             .then(folder => {
-              window.location.href = '/samplernn/datasets/' + folder.id + '/'
+              window.location.href = '/' + module.name + '/datasets/' + folder.id + '/'
             })
           }}
         />
diff --git a/app/client/dataset/dataset.reducer.js b/app/client/dataset/dataset.reducer.js
index 287ebb8..d7951d0 100644
--- a/app/client/dataset/dataset.reducer.js
+++ b/app/client/dataset/dataset.reducer.js
@@ -10,17 +10,30 @@ const datasetInitialState = () => ({
   loading: true,
   error: null,
   data: null,
+  folder_id: 0,
 })
 
 const datasetReducer = (state = datasetInitialState(), action) => {
   switch(action.type) {
+    case types.app.load_progress:
+      return {
+        ...state,
+        progress: action.progress
+      }
+
     case types.dataset.load:
       return {
         ...state,
         loading: false,
         data: action.data,
       }
-    
+
+    case types.dataset.set_folder:
+      return {
+        ...state,
+        folder_id: action.data.folder_id,
+      }
+
     case types.folder.create:
       if (action.data.module === 'samplernn') {
         return {