currenttask stuff

1 files changed, 35 insertions, 20 deletions

diff --git a/public/bundle.js b/public/bundle.js
index 98e3d54..e371ee4 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -2265,12 +2265,11 @@ function CurrentTask(_ref) {
   var last_message = p.last_message,
       pid = p.pid,
       task = p.task;
-  var _task = { task: task },
-      activity = _task.activity,
-      epoch = _task.epoch,
-      epochs = _task.epochs,
-      dataset = _task.dataset,
-      module = _task.module;
+  var activity = task.activity,
+      epoch = task.epoch,
+      epochs = task.epochs,
+      dataset = task.dataset,
+      module = task.module;
 
   return (0, _preact.h)(
     'div',
@@ -2278,18 +2277,33 @@ function CurrentTask(_ref) {
     '#',
     pid,
     ': ',
-    module,
-    ' ',
-    activity,
+    (0, _preact.h)(
+      'b',
+      null,
+      module,
+      ' ',
+      activity
+    ),
     ' ',
-    dataset,
+    (0, _preact.h)(
+      'i',
+      null,
+      dataset
+    ),
     ' ',
-    epoch,
-    ' (',
     epochs,
+    ' epoch',
+    _util2.default.courtesy_s(epochs),
+    ' (currently #',
+    epoch,
     ')',
     (0, _preact.h)('br', null),
-    last_message
+    (0, _preact.h)('br', null),
+    (0, _preact.h)(
+      'div',
+      { 'class': 'quiet' },
+      last_message
+    )
   );
 }
 
@@ -2672,10 +2686,11 @@ function FolderList(_ref) {
     );
   }
   console.log(db.data.folders);
-  var folders = db.data.folders.map(function (folder) {
-    var datasetCount = folder.datasets ? folder.datasets.length : 0;
+  var folders = db.data.folders.map(function (raw_folder) {
+    var folder = db.data.folderLookup[raw_folder.id];
+    var fileCount = folder.files ? folder.files.length : 0;
 
-    var _util$hush_null = _util2.default.hush_null(datasetCount),
+    var _util$hush_null = _util2.default.hush_null(fileCount),
         _util$hush_null2 = _slicedToArray(_util$hush_null, 2),
         className = _util$hush_null2[0],
         size = _util$hush_null2[1];
@@ -2690,9 +2705,9 @@ function FolderList(_ref) {
       (0, _preact.h)(
         'span',
         { className: className },
-        datasetCount,
-        ' dataset',
-        _util2.default.courtesy_s(datasetCount)
+        fileCount,
+        ' file',
+        _util2.default.courtesy_s(fileCount)
       )
     );
   });
@@ -5065,7 +5080,7 @@ function NewDatasetForm(props) {
         'h2',
         null,
         'Create a new ',
-        module.name,
+        module.displayName,
         ' project'
       )
     ),