From 12f173bb06e28637fba32cccc844aff4af0fafb8 Mon Sep 17 00:00:00 2001
From: Alexandru Munteanu <alexandru.munt@gmail.com>
Date: Fri, 29 Jun 2018 15:11:01 +0300
Subject: [PATCH] fix(filters): archived items visible when inProgress filter
is selected
---
.../src/components/Filters/priorityFilter.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/packages/components-faraday/src/components/Filters/priorityFilter.js b/packages/components-faraday/src/components/Filters/priorityFilter.js
index 80367b1ce..47ffbc88c 100644
--- a/packages/components-faraday/src/components/Filters/priorityFilter.js
+++ b/packages/components-faraday/src/components/Filters/priorityFilter.js
@@ -37,7 +37,10 @@ const filterFn = (filterValue, { currentUser, userPermissions = [] }) => ({
case FILTER_VALUES.NEEDS_ATTENTION:
return get(statuses, `${status}.${userRole}.needsAttention`)
case FILTER_VALUES.IN_PROGRESS:
- return !get(statuses, `${status}.${userRole}.needsAttention`)
+ return (
+ !archivedStatuses.includes(status) &&
+ !get(statuses, `${status}.${userRole}.needsAttention`)
+ )
default:
return true
}
--
GitLab