modularize... circular dependencies... whatever

4 files changed, 31 insertions, 12 deletions

diff --git a/app/client/socket/index.js b/app/client/socket/index.js
index c0fed61..1430ac9 100644
--- a/app/client/socket/index.js
+++ b/app/client/socket/index.js
@@ -4,11 +4,13 @@ import types from '../types'
 import { socket } from './socket.connection'
 import * as system from './socket.system'
 import * as live from './socket.live'
+import * as task from './socket.task'
 
 export default {
   socket,
   system,
   live,
+  task,
 }
 
 socket.on('status', (data) => {
diff --git a/app/client/socket/socket.task.js b/app/client/socket/socket.task.js
index 936d2bc..d65ed13 100644
--- a/app/client/socket/socket.task.js
+++ b/app/client/socket/socket.task.js
@@ -13,16 +13,17 @@ socket.on('task_res', (data) => {
   }
 })
 
-export function start_task(task) {
+export function start_task(task, preempt) {
   socket.emit('task', {
-    cmd: 'start_task',
+    type: 'start',
     task,
+    preempt,
   })
 }
 
 export function stop_task(task) {
   socket.emit('task', {
-    cmd: 'stop_task',
+    type: 'stop',
     task,
   })
 }
diff --git a/app/client/system/system.component.js b/app/client/system/system.component.js
index 00c5395..5d75964 100644
--- a/app/client/system/system.component.js
+++ b/app/client/system/system.component.js
@@ -9,15 +9,25 @@ import * as systemActions from './system.actions'
 import * as taskActions from '../task/task.actions'
 
 const cpu_test_task = {
-  id: 1073,
-  activity: 'train',
+  activity: 'cpu',
   library: 'test',
   dataset: 'test',
   epochs: 1,
   opt: {}
 }
 const gpu_test_task = {
-
+  activity: 'gpu',
+  library: 'test',
+  dataset: 'test',
+  epochs: 1,
+  opt: {}
+}
+const live_test_task = {
+  activity: 'live',
+  library: 'test',
+  dataset: 'test',
+  epochs: 1,
+  opt: {}
 }
 
 class System extends Component {
@@ -61,13 +71,17 @@ class System extends Component {
             </Group>
             <Group title="Test">
               <Param title='CPU Test Task'>
-                <button onClick={() => actions.task.start_task(cpu_test_task)}>Start</button>
+                <button onClick={() => actions.task.start_task(cpu_test_task, { preempt: true, watch: true })}>Start</button>
                 <button onClick={() => actions.task.stop_task(cpu_test_task)}>Stop</button>
               </Param>
               <Param title='GPU Test Task'>
-                <button onClick={() => actions.task.start_task(gpu_test_task)}>Start</button>
+                <button onClick={() => actions.task.start_task(gpu_test_task, { preempt: true, watch: true })}>Start</button>
                 <button onClick={() => actions.task.stop_task(gpu_test_task)}>Stop</button>
               </Param>
+              <Param title='Live Test Task'>
+                <button onClick={() => actions.task.start_task(live_test_task, { preempt: true, watch: true })}>Start</button>
+                <button onClick={() => actions.task.stop_task(live_test_task)}>Stop</button>
+              </Param>
             </Group>
           </div>
           {this.renderCommandOutput()}
diff --git a/app/client/task/task.actions.js b/app/client/task/task.actions.js
index 466b8d7..ea3dfff 100644
--- a/app/client/task/task.actions.js
+++ b/app/client/task/task.actions.js
@@ -1,10 +1,12 @@
 import socket from '../socket'
+import types from '../types'
 
-export const start_task = (task) => {
+export const start_task = (task, opt={}) => {
   socket.task.start_task(task)
-  return { type: types.task.starting_task, task }
+  return { type: types.task.starting_task, task, ...opt }
 }
-export const stop_task = (task) => {
+
+export const stop_task = (task, opt={}) => {
   socket.task.stop_task(task)
-  return { type: types.task.stopping_task, task }
+  return { type: types.task.stopping_task, task, ...opt }
 }