From 90b71f3b436584201af539c298f8a66a834bb914 Mon Sep 17 00:00:00 2001
From: Bogdan Cochior <bogdan.cochior@thinslices.com>
Date: Wed, 18 Apr 2018 17:23:46 +0300
Subject: [PATCH] fix(filters): wip: fix ordering
---
.../src/components/Dashboard/Dashboard.js | 4 ++--
.../src/components/Dashboard/DashboardFilters.js | 11 +++++------
.../src/components/Dashboard/DashboardPage.js | 11 +++++++++++
3 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/packages/components-faraday/src/components/Dashboard/Dashboard.js b/packages/components-faraday/src/components/Dashboard/Dashboard.js
index 6945dbc1d..422d289e1 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 6641e5a9e..3f9ebd4e4 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 3aa057755..9e4a831bc 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(
{
--
GitLab