From d38fd8419223560bc82f6153de80f889bbd75b01 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Mon, 4 Jun 2018 21:45:45 +0200
Subject: show tasks on dashboard

---
 app/client/dashboard/dashboard.component.js | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'app/client/dashboard/dashboard.component.js')

diff --git a/app/client/dashboard/dashboard.component.js b/app/client/dashboard/dashboard.component.js
index d9aece1..0081d67 100644
--- a/app/client/dashboard/dashboard.component.js
+++ b/app/client/dashboard/dashboard.component.js
@@ -27,18 +27,23 @@ class Dashboard extends Component {
     // }
   }
   render(){
-    const { queue, files, images, site } = this.props
+    const { site, queue, images } = this.props
+    const { tasks } = queue
     return (
       <div className='dashboard'>
         <DashboardHeader />
         <div className='params'>
           <div className='column'>
-            <Group title='Completed Tasks'>
-              <TaskList tasks={queue} />
-            </Group>
-            <Group title='Upcoming Tasks'>
-              <TaskList tasks={queue} />
-            </Group>
+            {!!queue.completed.length &&
+              <Group title='Completed Tasks'>
+                <TaskList tasks={queue.completed.map(id => task.id)} />
+              </Group>
+            }
+            {!!queue.queue.length &&
+              <Group title='Upcoming Tasks'>
+                <TaskList tasks={queue.queue.map(id => task.id)} />
+              </Group>
+            }
           </div>
         </div>
       </div>
@@ -49,7 +54,7 @@ const mapStateToProps = state => ({
   site: state.system.site,
   images: state.dashboard.images,
   files: state.dashboard.files,
-  queue: state.queue.queue,
+  queue: state.queue,
 })
 
 const mapDispatchToProps = (dispatch, ownProps) => ({
-- 
cgit v1.2.3-70-g09d2