Merge branch 'develop' of gitlab.coko.foundation:xpub/xpub-faraday into develop

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
       }),
   }),

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>

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(
     {