fix progress

1 files changed, 18 insertions, 15 deletions

diff --git a/public/bundle.js b/public/bundle.js
index ee03725..c179c73 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -1199,9 +1199,9 @@ var FileList = exports.FileList = function FileList(props) {
       mapFn = _util$sort$orderByFn.mapFn,
       sortFn = _util$sort$orderByFn.sortFn;
 
-  var fileList = (files || []).
-  // .filter(f => !!f)
-  map(mapFn).sort(sortFn).map(function (pair) {
+  var fileList = (files || []).filter(function (f) {
+    return !!f;
+  }).map(mapFn).sort(sortFn).map(function (pair) {
     return (0, _preact.h)(FileRow, {
       file: pair[1],
       fields: fieldSet(fields),
@@ -1210,7 +1210,7 @@ var FileList = exports.FileList = function FileList(props) {
       onClick: onClick
     });
   });
-  if (!(files && files.length)) {
+  if (!fileList || !fileList.length) {
     return (0, _preact.h)(
       'div',
       { className: 'rows ' + className },
@@ -4834,6 +4834,7 @@ function _toArray(arr) { return Array.isArray(arr) ? arr : Array.from(arr); }
 var load_directories = exports.load_directories = function load_directories(id) {
   return function (dispatch) {
     // console.log(actions)
+    dispatch({ type: _types2.default.app.load_progress, progress: { i: 0, n: 7 } });
     (0, _util.allProgress)([_actions2.default.folder.index({ module: 'samplernn' }), _actions2.default.file.index({ module: 'samplernn' }), _actions2.default.task.index({ module: 'samplernn' }), _actions2.default.socket.list_directory({ module: 'samplernn', dir: 'datasets' }), _actions2.default.socket.list_directory({ module: 'samplernn', dir: 'results' }), _actions2.default.socket.list_directory({ module: 'samplernn', dir: 'output' }), load_loss()(dispatch)], function (percent, i, n) {
       dispatch({ type: _types2.default.app.load_progress, progress: { i: i, n: n } });
     }).then(function (res) {
@@ -6041,6 +6042,8 @@ var _types2 = _interopRequireDefault(_types);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
+
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 var samplernnInitialState = {
@@ -6094,14 +6097,9 @@ var samplernnReducer = function samplernnReducer() {
       return state;
 
     case _types2.default.file.create:
+    case _types2.default.folder.upload_complete:
       if (action.data.module === 'samplernn') {
         console.log(action.data, state.folder);
-        // const dataset = {
-        //   name,
-        //   input: [],
-        //   checkpoints: [],
-        //   output: [],
-        // }
         var dataset = void 0,
             old_dataset = void 0,
             folder = void 0,
@@ -6149,12 +6147,17 @@ var samplernnReducer = function samplernnReducer() {
       }
       return state;
 
-    case _types2.default.folder.upload_complete:
-      if (state.folder.id === action.folder) {
+    case _types2.default.file.destroy:
+      if (action.data.module === 'samplernn') {
+        // delete 
+        var _state$data$fileLooku = state.data.fileLookup,
+            removedFile = _state$data$fileLooku[action.data.id],
+            fileLookup = _objectWithoutProperties(_state$data$fileLooku, [action.data.id]);
+
         return _extends({}, state, {
           loading: false,
-          folder: _extends({}, state.folder, {
-            input: [action.data].concat(state.folder.input)
+          data: _extends({}, state.data, {
+            fileLookup: fileLookup
           })
         });
       }
@@ -8159,7 +8162,7 @@ document.body.style.backgroundImage = 'linear-gradient(' + (randint(40) + 40) +
 
 var allProgress = exports.allProgress = function allProgress(promises, progress_cb) {
   var d = 0;
-  progress_cb(0);
+  progress_cb(0, 0, promises.length);
   promises.forEach(function (p) {
     p.then(function (s) {
       d += 1;