diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/client/dashboard/dashboard.component.js | 21 |
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) => ({ |