summaryrefslogtreecommitdiff
path: root/public/bundle.js
diff options
context:
space:
mode:
Diffstat (limited to 'public/bundle.js')
-rw-r--r--public/bundle.js35
1 files changed, 28 insertions, 7 deletions
diff --git a/public/bundle.js b/public/bundle.js
index 4c5842d..5afaddf 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -3116,10 +3116,10 @@ _socket.socket.on('task_res', function (data) {
case 'kill':
break;
case 'stdout':
- console.log(data.data);
+ return (0, _store.dispatch)({ type: _types2.default.system.stdout, data: data.data });
break;
case 'stderr':
- console.log(data.data);
+ return (0, _store.dispatch)({ type: _types2.default.system.stderr, data: data.data });
break;
case 'add':
break;
@@ -3518,7 +3518,10 @@ var System = function (_Component) {
}, {
key: 'renderCommandOutput',
value: function renderCommandOutput() {
- var cmd = this.props.cmd;
+ var _props2 = this.props,
+ cmd = _props2.cmd,
+ stdout = _props2.stdout,
+ stderr = _props2.stderr;
var output = void 0;
if (cmd.loading) {
@@ -3533,6 +3536,12 @@ var System = function (_Component) {
output += cmd.stderr;
}
}
+ } else {
+ output = stdout;
+ if (cmd.stderr) {
+ output += '\n\n_________________________________\n\n';
+ output += stderr;
+ }
}
return (0, _preact.h)(
'div',
@@ -3623,9 +3632,11 @@ var systemInitialState = {
loaded: false,
name: null,
error: null,
- stdout: null,
- stderr: null
- }
+ stdout: "",
+ stderr: ""
+ },
+ stdout: "",
+ stderr: ""
};
var systemReducer = function systemReducer() {
@@ -3726,6 +3737,14 @@ var systemReducer = function systemReducer() {
stderr: action.data.stderr
}
});
+ case _types2.default.system.stdout:
+ return _extends({}, state, {
+ stdout: state.stdout + action.data
+ });
+ case _types2.default.system.stderr:
+ return _extends({}, state, {
+ stderr: state.stderr + action.data
+ });
default:
return state;
}
@@ -3898,7 +3917,9 @@ exports.default = {
relay_connected: 'SYSTEM_RELAY_CONNECTED',
relay_disconnected: 'SYSTEM_RELAY_DISCONNECTED',
rpc_connected: 'SYSTEM_RPC_CONNECTED',
- rpc_disconnected: 'SYSTEM_RPC_DISCONNECTED'
+ rpc_disconnected: 'SYSTEM_RPC_DISCONNECTED',
+ stdout: 'SYSTEM_STDOUT',
+ stderr: 'SYSTEM_STDERR'
},
task: {
starting_task: 'TASK_STARTING_TASK',