currenttask stuff

2 files changed, 9 insertions, 7 deletions

diff --git a/app/client/common/currentTask.component.js b/app/client/common/currentTask.component.js
index d429681..b5fa9f5 100644
--- a/app/client/common/currentTask.component.js
+++ b/app/client/common/currentTask.component.js
@@ -13,11 +13,12 @@ function CurrentTask ({ cpu, gpu, processor }) {
     return <div>{processor_name} idle</div>
   }
   const { last_message, pid, task } = p
-  const { activity, epoch, epochs, dataset, module } = { task }
+  const { activity, epoch, epochs, dataset, module } = task
   return (
     <div>
-      #{pid}: {module} {activity} {dataset} {epoch} ({epochs})<br/>
-      {last_message}
+      #{pid}: <b>{module} {activity}</b> <i>{dataset}</i> {epochs} epoch{util.courtesy_s(epochs)} (currently #{epoch})
+      <br/><br/>
+      <div class='quiet'>{last_message}</div>
     </div>
   )
 }
diff --git a/app/client/common/folderList.component.js b/app/client/common/folderList.component.js
index 13ef398..ccf9848 100644
--- a/app/client/common/folderList.component.js
+++ b/app/client/common/folderList.component.js
@@ -24,12 +24,13 @@ export default function FolderList ({ db, path, emptyText }) {
     )
   }
   console.log(db.data.folders)
-  const folders = db.data.folders.map(folder => {
-    const datasetCount = folder.datasets ? folder.datasets.length : 0
-    const [ className, size ] = util.hush_null(datasetCount)
+  const folders = db.data.folders.map(raw_folder => {
+    const folder = db.data.folderLookup[raw_folder.id]
+    const fileCount = folder.files ? folder.files.length : 0
+    const [ className, size ] = util.hush_null(fileCount)
     return (
       <Param title={<Link to={path + folder.id + '/'}>{folder.name}</Link>}>
-        <span className={className}>{datasetCount} dataset{util.courtesy_s(datasetCount)}</span>
+        <span className={className}>{fileCount} file{util.courtesy_s(fileCount)}</span>
       </Param>
     )
   })