updating task status on serverrrrrr

5 files changed, 32 insertions, 34 deletions

diff --git a/app/client/queue/queue.actions.js b/app/client/queue/queue.actions.js
index 1885e2c..6049e1b 100644
--- a/app/client/queue/queue.actions.js
+++ b/app/client/queue/queue.actions.js
@@ -18,4 +18,15 @@ export const add_task = (new_task) => (dispatch) => {
   .then((task) => {
     socket.task.add_task(task)
   })
-}
\ No newline at end of file
+}
+
+export const start_queue = (task, opt={}) => {
+  socket.task.start_queue(task, opt)
+  return { type: types.task.starting_queue, task, ...opt }
+}
+
+export const stop_queue = (task, opt={}) => {
+  socket.task.stop_queue(task, opt)
+  return { type: types.task.stopping_queue, task, ...opt }
+}
+
diff --git a/app/client/socket/socket.task.js b/app/client/socket/socket.task.js
index 44e6b27..7c581b8 100644
--- a/app/client/socket/socket.task.js
+++ b/app/client/socket/socket.task.js
@@ -6,7 +6,7 @@ import { socket } from './socket.connection'
 let finishTimeout;
 
 socket.on('task_res', (data) => {
-  console.log('system response', data)
+  console.log('task response', data)
   switch (data.type) {
     case 'start':
       // return dispatch({ type: types.system.rpc_connected, runner: data.runner })
@@ -55,34 +55,13 @@ socket.on('task_res', (data) => {
   }
 })
 
-export function add_task(task, opt={}) {
-  socket.emit('task', {
-    type: 'add',
-    task,
-    ...opt,
-  })
+export function emit(type, task={}, opt={}) {
+  socket.emit('task', { type, task, ...opt, })
 }
 
-export function remove_task(task, opt={}) {
-  socket.emit('task', {
-    type: 'remove',
-    task,
-    ...opt,
-  })
-}
-
-export function start_task(task, opt={}) {
-  socket.emit('task', {
-    type: 'start',
-    task,
-    ...opt,
-  })
-}
-
-export function stop_task(task, opt={}) {
-  socket.emit('task', {
-    type: 'stop',
-    task,
-    ...opt,
-  })
-}
+export const add_task = (task, opt={}) => emit('add', task, opt)
+export const remove_task = (task, opt={}) => emit('remove', task, opt)
+export const start_task = (task, opt={}) => emit('start', task, opt)
+export const stop_task = (task, opt={}) => emit('stop', task, opt)
+export const start_queue = (opt={}) => emit('start_queue', {}, opt)
+export const stop_queue = (opt={}) => emit('stop_queue', {}, opt)
diff --git a/app/client/system/system.actions.js b/app/client/system/system.actions.js
index c661769..7039ff2 100644
--- a/app/client/system/system.actions.js
+++ b/app/client/system/system.actions.js
@@ -32,7 +32,7 @@ export const changeTool = (tool) => {
 export const enqueue_test_task = (dataset) => dispatch => {
   const task = {
     module: 'test',
-    activity: 'test',
+    activity: 'cpu',
     dataset: dataset,
   }
   return actions.queue.add_task(task)
diff --git a/app/client/system/system.component.js b/app/client/system/system.component.js
index b4a0ed7..bf77237 100644
--- a/app/client/system/system.component.js
+++ b/app/client/system/system.component.js
@@ -94,7 +94,11 @@ class System extends Component {
                 <button onClick={() => actions.live.set_param('fruit', choice(fruits))}>Set</button>
               </Param>
               <Param title='Queue'>
-                <button onClick={() => actions.system.enqueue_test_task(choice(fruits))}>+ Add</button>
+                <button onClick={() => actions.queue.start_queue()}>Start</button>
+                <button onClick={() => actions.queue.stop_queue()}>Stop</button>
+              </Param>
+              <Param title=''>
+                <button onClick={() => actions.system.enqueue_test_task(choice(fruits))}>+Add</button>
               </Param>
             </Group>
           </div>
diff --git a/app/client/types.js b/app/client/types.js
index 0c7c785..2d4b359 100644
--- a/app/client/types.js
+++ b/app/client/types.js
@@ -26,9 +26,13 @@ export default {
 	]),
 	task: crud_type('task', [
 		'starting_task',
-		'task_begin',
 		'stopping_task',
+		'task_begin',
 		'task_finish',
+		'start_queue',
+		'stop_queue',
+		'starting_queue',
+		'stopping_queue',
 		'progress',
 		'epoch',
 	]),