reload the whole page. easier

1 files changed, 180 insertions, 38 deletions

diff --git a/public/bundle.js b/public/bundle.js
index 6596af0..a2e6d29 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -2092,7 +2092,8 @@ var TextInput = function (_Component) {
             value: this.props.value,
             onInput: this.handleInput,
             onKeydown: this.handleKeydown,
-            placeholder: this.props.placeholder
+            placeholder: this.props.placeholder,
+            autofocus: this.props.autofocus
           })
         )
       );
@@ -2614,7 +2615,7 @@ exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.uploadFiles = exports.fetchURL = exports.uploadFile = exports.createOrUpdateFolder = undefined;
+exports.uploadFiles = exports.fetchURL = exports.uploadFile = exports.updateFolder = exports.createFolder = undefined;
 
 var _types = __webpack_require__(/*! ../types */ "./app/client/types.js");
 
@@ -2628,29 +2629,32 @@ var _api = __webpack_require__(/*! ../api */ "./app/client/api/index.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var createOrUpdateFolder = exports.createOrUpdateFolder = function createOrUpdateFolder(module, folder, name) {
+var createFolder = exports.createFolder = function createFolder(module, name) {
+  return function (dispatch) {
+    return _actions2.default.folder.create({
+      // username... should get added inside the API
+      module: module.name,
+      datatype: module.datatype,
+      activity: 'dataset',
+      name: name
+    });
+  };
+}; // import socket from '../socket'
+var updateFolder = exports.updateFolder = function updateFolder(module, folder, name) {
   return function (dispatch) {
     if (!folder || !folder.id) {
-      _actions2.default.folder.create({
-        // username... should get added inside the API
-        module: module.name,
-        datatype: module.datatype,
-        activity: 'dataset',
-        name: name
-      }).then(function (folder) {
-        // set current folder
-      });
-    } else {
-      _actions2.default.folder.update({
-        id: folder.id,
-        module: module.name,
-        datatype: module.datatype,
-        activity: 'dataset',
-        name: name
-      });
+      return null;
     }
+    return _actions2.default.folder.update({
+      id: folder.id,
+      module: module.name,
+      datatype: module.datatype,
+      activity: 'dataset',
+      name: name
+    });
   };
-}; // import socket from '../socket'
+};
+
 var uploadFile = exports.uploadFile = function uploadFile(module, folder, file) {
   return function (dispatch) {
     var fd = new FormData();
@@ -2760,10 +2764,10 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
 var DatasetForm = function (_Component) {
   _inherits(DatasetForm, _Component);
 
-  function DatasetForm(props) {
+  function DatasetForm() {
     _classCallCheck(this, DatasetForm);
 
-    return _possibleConstructorReturn(this, (DatasetForm.__proto__ || Object.getPrototypeOf(DatasetForm)).call(this));
+    return _possibleConstructorReturn(this, (DatasetForm.__proto__ || Object.getPrototypeOf(DatasetForm)).apply(this, arguments));
   }
 
   _createClass(DatasetForm, [{
@@ -2824,9 +2828,9 @@ var DatasetForm = function (_Component) {
     key: 'renderFolderNameInput',
     value: function renderFolderNameInput(name) {
       return (0, _preact.h)(_textInput2.default, {
-        title: !this.props.folder.id ? 'Create a new dataset' : 'Dataset name',
+        title: 'Dataset name',
         value: name,
-        onSave: this.curry(this.props.actions.dataset.createOrUpdateFolder)
+        onSave: this.curry(this.props.actions.dataset.updateFolder)
       });
     }
   }, {
@@ -2868,6 +2872,95 @@ exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(
 
 /***/ }),
 
+/***/ "./app/client/dataset/dataset.new.js":
+/*!*******************************************!*\
+  !*** ./app/client/dataset/dataset.new.js ***!
+  \*******************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _preact = __webpack_require__(/*! preact */ "./node_modules/preact/dist/preact.esm.js");
+
+var _redux = __webpack_require__(/*! redux */ "./node_modules/redux/es/redux.js");
+
+var _reactRedux = __webpack_require__(/*! react-redux */ "./node_modules/react-redux/es/index.js");
+
+var _dataset = __webpack_require__(/*! ./dataset.actions */ "./app/client/dataset/dataset.actions.js");
+
+var datasetActions = _interopRequireWildcard(_dataset);
+
+var _textInput = __webpack_require__(/*! ../common/textInput.component */ "./app/client/common/textInput.component.js");
+
+var _textInput2 = _interopRequireDefault(_textInput);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function NewDatasetForm(props) {
+  var loading = props.loading,
+      status = props.status,
+      error = props.error,
+      history = props.history,
+      actions = props.actions,
+      module = props.module;
+
+  if (loading) return (0, _preact.h)(
+    'span',
+    null,
+    'Loading...'
+  );
+  console.log(props);
+  return (0, _preact.h)(
+    'div',
+    { 'class': 'opaque' },
+    (0, _preact.h)(
+      'div',
+      { 'class': 'heading' },
+      (0, _preact.h)(
+        'h2',
+        null,
+        'Create a new dataset'
+      )
+    ),
+    (0, _preact.h)(
+      'div',
+      { 'class': 'params' },
+      (0, _preact.h)(_textInput2.default, {
+        autofocus: true,
+        title: 'Name your dataset',
+        onSave: function onSave(name) {
+          actions.createFolder(module, name).then(function (folder) {
+            window.location.href = '/samplernn/datasets/' + folder.id + '/';
+          });
+        }
+      })
+    )
+  );
+}
+
+var mapStateToProps = function mapStateToProps(state) {
+  console.log(state);
+  return state.dataset;
+};
+
+var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
+  return {
+    actions: (0, _redux.bindActionCreators)(datasetActions, dispatch)
+  };
+};
+
+exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(NewDatasetForm);
+
+/***/ }),
+
 /***/ "./app/client/dataset/dataset.reducer.js":
 /*!***********************************************!*\
   !*** ./app/client/dataset/dataset.reducer.js ***!
@@ -4443,7 +4536,6 @@ function router() {
     (0, _preact.h)(_reactRouterDom.Route, { exact: true, path: '/samplernn/inspect/', component: _samplernn6.default }),
     (0, _preact.h)(_reactRouterDom.Route, { exact: true, path: '/samplernn/datasets/', component: _samplernn2.default }),
     (0, _preact.h)(_reactRouterDom.Route, { exact: true, path: '/samplernn/datasets/:id/', component: _samplernn2.default }),
-    (0, _preact.h)(_reactRouterDom.Route, { exact: true, path: '/samplernn/datasets/new/', component: _samplernn2.default }),
     (0, _preact.h)(_reactRouterDom.Route, { exact: true, path: '/samplernn/results/', component: _samplernn4.default })
   );
 }
@@ -4568,7 +4660,6 @@ var load_directories = exports.load_directories = function load_directories(id)
         folder.datasets.push(dataset);
         return dataset;
       };
-
       // take all of the folders and put them in a lookup
       var folderLookup = folders.reduce(function (folderLookup, folder) {
         folderLookup[folder.id] = { id: folder.id, name: folder.name, folder: folder, datasets: [] };
@@ -4669,6 +4760,7 @@ var load_directories = exports.load_directories = function load_directories(id)
       });
       if (id) {
         var folder = id === 'unsorted' ? folderLookup.unsorted : folderLookup[id];
+        console.log(id);
         dispatch({
           type: _types2.default.samplernn.set_folder,
           folder: folder
@@ -4780,6 +4872,10 @@ var _dataset = __webpack_require__(/*! ../../dataset/dataset.form */ "./app/clie
 
 var _dataset2 = _interopRequireDefault(_dataset);
 
+var _dataset3 = __webpack_require__(/*! ../../dataset/dataset.new */ "./app/client/dataset/dataset.new.js");
+
+var _dataset4 = _interopRequireDefault(_dataset3);
+
 var _fileList = __webpack_require__(/*! ../../common/fileList.component */ "./app/client/common/fileList.component.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -4803,13 +4899,14 @@ var SampleRNNDatasets = function (_Component) {
     _this.fileOptions = _this.fileOptions.bind(_this);
     _this.pickFile = _this.pickFile.bind(_this);
     var id = props.match.params.id || localStorage.getItem('samplernn.last_id');
-    if (!id && props.location.pathname.match(/\/new\//)) {
-      id = 'new';
-    } else if (id) {
+    console.log('load dataset:', id);
+    if (id === 'new') return _possibleConstructorReturn(_this);
+    if (id) {
       localStorage.setItem('samplernn.last_id', id);
-    }
-    if (id && (!props.samplernn.folder || props.samplernn.folder.id !== id)) {
-      props.actions.load_directories(id);
+      if (!props.samplernn.folder || props.samplernn.folder.id !== id) {
+        console.log('load directories');
+        props.actions.load_directories(id);
+      }
     }
     return _this;
   }
@@ -4862,10 +4959,25 @@ var SampleRNNDatasets = function (_Component) {
   }, {
     key: 'render',
     value: function render() {
-      var samplernn = this.props.samplernn;
+      var _props = this.props,
+          samplernn = _props.samplernn,
+          match = _props.match,
+          history = _props.history;
 
       var folder = samplernn.folder;
-      if (!folder || !folder.name) return;
+      if (match.params.id === 'new') {
+        return (0, _preact.h)(_dataset4.default, { module: { name: 'samplernn', datatype: 'audio' }, history: history });
+      }
+      if (samplernn.loading) {
+        return (0, _preact.h)(
+          'span',
+          null,
+          'Loading'
+        );
+      }
+      if (!folder || !samplernn.data.folders.length) {
+        return history.push('/samplernn/datasets/new/');
+      }
       return (0, _preact.h)(
         'div',
         { className: 'app' },
@@ -4878,7 +4990,11 @@ var SampleRNNDatasets = function (_Component) {
             folder.name
           )
         ),
-        folder.name !== 'unsorted' && (0, _preact.h)(_dataset2.default, { title: 'Add Files', folder: folder, canUpload: true, canAddURL: true }),
+        folder.name !== 'unsorted' && (0, _preact.h)(_dataset2.default, {
+          title: 'Add Files',
+          folder: folder,
+          canUpload: true, canAddURL: true
+        }),
         this.renderDataset()
       );
     }
@@ -5446,26 +5562,52 @@ var samplernnReducer = function samplernnReducer() {
         loading: false,
         data: action.data
       });
+
     case _types2.default.socket.connect:
       return _extends({}, state);
+
     case _types2.default.task.task_begin:
       return _extends({}, state);
+
     case _types2.default.task.task_finish:
       return _extends({}, state);
+
+    case _types2.default.folder.create:
+      if (action.data.module === 'samplernn') {
+        return _extends({}, state, {
+          loading: false
+          // folder: {
+          //   ...action.data,
+          //   input: [],
+          //   checkpoints: [],
+          //   output: [],
+          // }
+        });
+      }
+      return state;
+
     case _types2.default.file.create:
       if (state.folder.id === action.data.folder_id) {
         return _extends({}, state, {
-          files: [action.data].concat(state.files)
+          loading: false,
+          folder: _extends({}, state.folder, {
+            input: [action.data].concat(state.folder.input)
+          })
         });
       }
       return state;
+
     case _types2.default.folder.upload_complete:
       if (state.folder.id === action.folder) {
         return _extends({}, state, {
-          files: [action.files].concat(state.files)
+          loading: false,
+          folder: _extends({}, state.folder, {
+            input: [action.data].concat(state.folder.input)
+          })
         });
       }
       return state;
+
     case _types2.default.socket.status:
       return samplernnSocket(state, action.data);