summaryrefslogtreecommitdiff
path: root/app/client/dashboard/dashboard.component.js
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2018-06-04 21:45:45 +0200
committerJules Laplace <julescarbon@gmail.com>2018-06-04 21:45:45 +0200
commitd38fd8419223560bc82f6153de80f889bbd75b01 (patch)
tree33dd2e4a0c42a82726323350025bb8cbee51ca53 /app/client/dashboard/dashboard.component.js
parent5321bafae0916861e270b692a42b3b699a96d339 (diff)
show tasks on dashboard
Diffstat (limited to 'app/client/dashboard/dashboard.component.js')
-rw-r--r--app/client/dashboard/dashboard.component.js21
1 files changed, 13 insertions, 8 deletions
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) => ({