From fe35d87e1e69210b7b0c91d251e83347c5d4ac88 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Tue, 16 Oct 2018 18:50:04 +0200
Subject: deploy bundle

---
 app/client/common/taskList.component.js               | 16 ++++++++--------
 app/client/dataset/dataset.loader.js                  |  4 ++--
 app/client/modules/pix2pixhd/pix2pixhd.actions.js     |  2 +-
 app/client/modules/pix2pixhd/views/pix2pixhd.train.js | 14 +++++++-------
 4 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'app/client')

diff --git a/app/client/common/taskList.component.js b/app/client/common/taskList.component.js
index a2f1df0..f1c1e86 100644
--- a/app/client/common/taskList.component.js
+++ b/app/client/common/taskList.component.js
@@ -26,7 +26,7 @@ class TaskList extends Component {
     const taskList = tasks.map(mapFn).sort(sortFn).map(pair => {
       const task = pair[1]
       const { dataset } = task
-      let dataset_link, label = dataset;
+      let dataset_link, label = "", href = "";
       // console.log(task)
       switch (task.activity) {
         case 'train':
@@ -48,17 +48,17 @@ class TaskList extends Component {
           break
       }
       if (task.folder_id) {
-        const href = '/' + task.module +
-                     '/' + (task.module === 'samplernn' ? 'datasets' : 'sequences') +
-                     '/' + task.folder_id + '/'
-        dataset_link = <Link to={href}>{label}</Link>
-      } else {
-        dataset_link = label
+        href = '/' + task.module +
+               '/' + (task.module === 'samplernn' ? 'datasets' : 'sequences') +
+               '/' + task.folder_id + '/'
       }
       return (
         <div className='row'>
           <div className='activity'>{task.activity} {task.module}</div>
-          <div className='dataset'>{dataset_link}</div>
+          {task.folder_id
+            ? <div className='dataset'><Link to={href}><span className='datasetName'>{dataset}</span>{label}</Link></div>
+            : <div className='dataset'><span className='datasetName'>{dataset}</span>{label}</div>
+          }
           <div className={"age " + util.carbon_date(task.updated_at)} title={task.updated_at}>{util.get_age(task.updated_at)}</div>
           <div className='options'>
             <span className='destroy' onClick={() => this.handleDestroy(task)}>x</span>
diff --git a/app/client/dataset/dataset.loader.js b/app/client/dataset/dataset.loader.js
index f1ff75e..e7f838d 100644
--- a/app/client/dataset/dataset.loader.js
+++ b/app/client/dataset/dataset.loader.js
@@ -18,6 +18,8 @@ export const unsortedFolder = (module, instantiate=false) => {
 }
 
 export const emptyDataset = (module, datasetLookup, name, folder) => {
+  folder = folder || unsortedFolder(module)
+  folder.datasets.push(name)
   const dataset = {
     name,
     folder_id: folder.id,
@@ -26,8 +28,6 @@ export const emptyDataset = (module, datasetLookup, name, folder) => {
     output: [],
   }
   datasetLookup[name] = dataset
-  folder = folder || unsortedFolder(module)
-  folder.datasets.push(name)
   return dataset
 }
 
diff --git a/app/client/modules/pix2pixhd/pix2pixhd.actions.js b/app/client/modules/pix2pixhd/pix2pixhd.actions.js
index d067017..68119e1 100644
--- a/app/client/modules/pix2pixhd/pix2pixhd.actions.js
+++ b/app/client/modules/pix2pixhd/pix2pixhd.actions.js
@@ -168,7 +168,7 @@ export const load_results = (id) => (dispatch) => {
     })
   }).then(res => {
     const [folders, files, results, renders] = res //, datasets, results, output, datasetUsage, lossReport] = res
-    console.log(files, results, renders)
+    // console.log(files, results, renders)
     dispatch({
       type: types.pix2pixhd.load_results,
       results: {
diff --git a/app/client/modules/pix2pixhd/views/pix2pixhd.train.js b/app/client/modules/pix2pixhd/views/pix2pixhd.train.js
index d4e390c..e5bd7f6 100644
--- a/app/client/modules/pix2pixhd/views/pix2pixhd.train.js
+++ b/app/client/modules/pix2pixhd/views/pix2pixhd.train.js
@@ -159,13 +159,13 @@ class Pix2PixHDTrain extends Component {
     if (currentDataset && currentDataset.folder_id) {
       folder_id = currentDataset.folder_id || folder_id
       console.log("dataset folder id", folder_id)
-      const processed = currentDataset.input
-        .map(f => this.props.pix2pixhd.data.fileLookup[f])
-        .reduce((a, b) => {
-          console.log(b)
-          return b.processed || a
-        }, false)
-      console.log("is processed?", processed)
+      // const processed = currentDataset.input
+      //   .map(f => this.props.pix2pixhd.data.fileLookup[f])
+      //   .reduce((a, b) => {
+      //     console.log(b)
+      //     return b.processed || a
+      //   }, false)
+      // console.log("is processed?", processed)
     }
     console.log(currentDataset)
     console.log("so folder id is..", folder_id)
-- 
cgit v1.2.3-70-g09d2