auto scroll to bottom

2 files changed, 22 insertions, 7 deletions

diff --git a/app/client/socket/socket.system.js b/app/client/socket/socket.system.js
index 0cdc625..38140c3 100644
--- a/app/client/socket/socket.system.js
+++ b/app/client/socket/socket.system.js
@@ -7,15 +7,27 @@ socket.on('system_res', (data) => {
   console.log('system response', data)
   switch (data.type) {
     case 'relay_connected':
-      return dispatch({ type: types.system.relay_connected })
+      return dispatch({
+        type: types.system.relay_connected
+      })
     case 'relay_disconnected':
-      return dispatch({ type: types.system.relay_disconnected })
+      return dispatch({
+        type: types.system.relay_disconnected
+      })
     case 'rpc_connected':
-      return dispatch({ type: types.system.rpc_connected, runner: data.runner })
+      return dispatch({
+        type: types.system.rpc_connected,
+        runner: data.runner,
+      })
     case 'rpc_disconnected':
-      return dispatch({ type: types.system.rpc_disconnected })
+      return dispatch({
+        type: types.system.rpc_disconnected
+      })
     case 'relay_status':
-      return dispatch({ type: data.rpc_connected ? types.system.rpc_connected : types.system.rpc_disconnected, runner: data.runner })
+      return dispatch({
+        type: data.rpc_connected ? types.system.rpc_connected : types.system.rpc_disconnected,
+        runner: data.runner,
+      })
     case 'command_output':
       return dispatch({
         type: types.system.command_output,
diff --git a/app/client/socket/socket.task.js b/app/client/socket/socket.task.js
index 0c8429b..ba074c0 100644
--- a/app/client/socket/socket.task.js
+++ b/app/client/socket/socket.task.js
@@ -3,6 +3,8 @@ import types from '../types'
 
 import { socket } from './socket.connection'
 
+let finishTimeout;
+
 socket.on('task_res', (data) => {
   console.log('system response', data)
   switch (data.type) {
@@ -10,12 +12,13 @@ socket.on('task_res', (data) => {
       // return dispatch({ type: types.system.rpc_connected, runner: data.runner })
       break
     case 'task_begin':
-      return dispatch({ type: types.task.task_begin, data: data.data })
+      clearTimeout(finishTimeout)
+      return dispatch({ type: types.task.task_begin, task: data.task })
       break
     case 'stop':
       break
     case 'task_finish':
-      return dispatch({ type: types.task.task_finish, data: data.data })
+      return finishTimeout = setTimeout(() => dispatch({ type: types.task.task_finish, task: data.task }), 100)
       break
     case 'kill':
       break