diff --git a/packages/components-faraday/src/components/Dashboard/Dashboard.js b/packages/components-faraday/src/components/Dashboard/Dashboard.js index 6945dbc1de252a9bf328d38051f97f032b2d39fa..422d289e1b6910380a6850e6687da60d68d5c0dd 100644 --- a/packages/components-faraday/src/components/Dashboard/Dashboard.js +++ b/packages/components-faraday/src/components/Dashboard/Dashboard.js @@ -55,13 +55,13 @@ export default compose( }, getItems: ({ filters, - sortOrder, + filterValues = {}, currentUser, dashboard, filterItems, }) => () => filterItems(dashboard.all).sort((a, b) => { - if (sortOrder === 'newest') return a.created - b.created < 0 + if (filterValues.order === 'newest') return a.created - b.created < 0 return a.created - b.created > 0 }), }), diff --git a/packages/components-faraday/src/components/Dashboard/DashboardFilters.js b/packages/components-faraday/src/components/Dashboard/DashboardFilters.js index 6641e5a9e391d29444ee1d45c4c3c09c6f545585..3f9ebd4e4a7ef1091b6af2bc5e1604d86d5b25cd 100644 --- a/packages/components-faraday/src/components/Dashboard/DashboardFilters.js +++ b/packages/components-faraday/src/components/Dashboard/DashboardFilters.js @@ -3,11 +3,6 @@ import { Menu, th } from '@pubsweet/ui' import { compose, withHandlers } from 'recompose' import styled from 'styled-components' -const sortOptions = [ - { label: 'Newest first', value: 'newest' }, - { label: 'Oldest first', value: 'oldest' }, -] - const DashboardFilters = ({ view, status, @@ -39,7 +34,11 @@ const DashboardFilters = ({ </FilterGroup> <FilterGroup> <span>Sort</span> - <Menu inline onChange={changeSort} options={sortOptions} /> + <Menu + inline + onChange={changeFilterValue('order')} + options={getFilterOptions('order')} + /> </FilterGroup> </FiltersContainer> </Root> diff --git a/packages/components-faraday/src/components/Dashboard/DashboardPage.js b/packages/components-faraday/src/components/Dashboard/DashboardPage.js index 3aa05775599c03585160a8a6c6a8bfa06bba3047..9e4a831bc87b3b327530c91d67ffc3335cc78ac8 100644 --- a/packages/components-faraday/src/components/Dashboard/DashboardPage.js +++ b/packages/components-faraday/src/components/Dashboard/DashboardPage.js @@ -59,6 +59,10 @@ export default compose( { label: 'All', value: 'all' }, { label: 'Submitted', value: 'submitted' }, { label: 'Draft', value: 'draft' }, + { label: 'HE Invited', value: 'heInvited' }, + { label: 'HE Assigned', value: 'heAssigned' }, + { label: 'Reviewers Invited', value: 'reviewersInvited' }, + { label: 'Under Review', value: 'underReview' }, ], filterFn: filterValue => item => { if (filterValue === 'all' || filterValue === '') return true @@ -86,6 +90,13 @@ export default compose( return false }, }, + order: { + options: [ + { label: 'Newest first', value: 'newest' }, + { label: 'Oldest first', value: 'oldest' }, + ], + filterFn: () => () => true, + }, }), withContext( {