fix runner client

1 files changed, 33 insertions, 45 deletions

diff --git a/public/bundle.js b/public/bundle.js
index 9af8c7b..d79ebdd 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -5031,13 +5031,14 @@ _socket.socket.on('status', function (data) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.run_script = exports.run_system_command = exports.list_directory = undefined;
 
 var _socket = __webpack_require__(/*! ./socket.system */ "./app/client/socket/socket.system.js");
 
-var list_directory = exports.list_directory = _socket.list_directory_async;
-var run_system_command = exports.run_system_command = _socket.run_system_command_async;
-var run_script = exports.run_script = _socket.run_script_async;
+var socketActions = _interopRequireWildcard(_socket);
+
+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; } }
+
+exports.default = socketActions;
 
 /***/ }),
 
@@ -5255,9 +5256,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.syscall_async = undefined;
 exports.run_system_command = run_system_command;
 exports.list_directory = list_directory;
-exports.run_system_command_async = run_system_command_async;
-exports.list_directory_async = list_directory_async;
-exports.run_script_async = run_script_async;
+exports.run_script = run_script;
 
 var _store = __webpack_require__(/*! ../store */ "./app/client/store.js");
 
@@ -5298,45 +5297,20 @@ _socket.socket.on('system_res', function (data) {
         type: data.rpc_connected ? _types2.default.system.rpc_connected : _types2.default.system.rpc_disconnected,
         runner: data.runner
       });
-    // case 'run_system_command':
-    //   return dispatch({
-    //     type: types.system.command_output,
-    //     data: data,
-    //   })
-    // case 'list_directory':
-    //   return dispatch({
-    //     type: types.system.list_directory,
-    //     data: data,
-    //   })
-    //   break
     default:
       break;
   }
 });
 
-function run_system_command(cmd) {
-  _socket.socket.emit('system', {
-    cmd: 'run_system_command',
-    payload: cmd
-  });
-}
-
-function list_directory(opt) {
-  _socket.socket.emit('system', {
-    cmd: 'list_directory',
-    payload: opt
-  });
-}
-
-function run_system_command_async(opt) {
+function run_system_command(opt) {
   return syscall_async('run_system_command', opt);
 }
-function list_directory_async(opt) {
+function list_directory(opt) {
   return syscall_async('list_directory', opt).then(function (res) {
     return res.files;
   });
 }
-function run_script_async(opt) {
+function run_script(opt) {
   return syscall_async('run_script', opt);
 }
 var syscall_async = exports.syscall_async = function syscall_async(tag, payload) {
@@ -5553,13 +5527,27 @@ var _types2 = _interopRequireDefault(_types);
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var run = exports.run = function run(cmd) {
-  _socket2.default.system.run_system_command(cmd);
-  return { type: _types2.default.system.running_command, cmd: cmd };
+  return function (dispatch) {
+    dispatch({ type: _types2.default.system.running_command, cmd: cmd });
+    _socket2.default.system.run_system_command(cmd).then(function (data) {
+      dispatch({
+        type: _types2.default.system.command_output,
+        data: data
+      });
+    });
+  };
 };
 
 var listDirectory = exports.listDirectory = function listDirectory(opt) {
-  _socket2.default.system.list_directory(opt);
-  return { type: _types2.default.system.listing_directory, opt: opt };
+  return function (dispatch) {
+    dispatch({ type: _types2.default.system.listing_directory, opt: opt });
+    _socket2.default.system.list_directory(opt).then(function (data) {
+      dispatch({
+        type: _types2.default.system.list_directory,
+        data: data
+      });
+    });
+  };
 };
 
 var changeTool = exports.changeTool = function changeTool(tool) {
@@ -5785,14 +5773,14 @@ var System = function (_Component) {
                 (0, _preact.h)(
                   'button',
                   { onClick: function onClick() {
-                      return actions.task.start_task(cpu_test_task, { preempt: true, watch: true });
+                      return actions.queue.start_task(cpu_test_task, { preempt: true, watch: true });
                     } },
                   'Start'
                 ),
                 (0, _preact.h)(
                   'button',
                   { onClick: function onClick() {
-                      return actions.task.stop_task(runner.cpu.task);
+                      return actions.queue.stop_task(runner.cpu.task);
                     } },
                   'Stop'
                 )
@@ -5803,14 +5791,14 @@ var System = function (_Component) {
                 (0, _preact.h)(
                   'button',
                   { onClick: function onClick() {
-                      return actions.task.start_task(gpu_test_task, { preempt: true, watch: true });
+                      return actions.queue.start_task(gpu_test_task, { preempt: true, watch: true });
                     } },
                   'Start'
                 ),
                 (0, _preact.h)(
                   'button',
                   { onClick: function onClick() {
-                      return actions.task.stop_task(runner.gpu.task);
+                      return actions.queue.stop_task(runner.gpu.task);
                     } },
                   'Stop'
                 )
@@ -5821,14 +5809,14 @@ var System = function (_Component) {
                 (0, _preact.h)(
                   'button',
                   { onClick: function onClick() {
-                      return actions.task.start_task(live_test_task, { preempt: true, watch: true });
+                      return actions.queue.start_task(live_test_task, { preempt: true, watch: true });
                     } },
                   'Start'
                 ),
                 (0, _preact.h)(
                   'button',
                   { onClick: function onClick() {
-                      return actions.task.stop_task(runner.cpu.task);
+                      return actions.queue.stop_task(runner.cpu.task);
                     } },
                   'Stop'
                 )