From 53ac7d3bc72690f26eeee3f5650ffae7cfaaa604 Mon Sep 17 00:00:00 2001 From: birjolaxew Date: Wed, 11 Nov 2020 11:38:36 +0100 Subject: [PATCH] Update Filters to use new navigation function --- assets/js/dashboard/filters.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/assets/js/dashboard/filters.js b/assets/js/dashboard/filters.js index aabf2a2ef..5319579d4 100644 --- a/assets/js/dashboard/filters.js +++ b/assets/js/dashboard/filters.js @@ -1,6 +1,6 @@ import React from 'react'; import { withRouter } from 'react-router-dom' -import {removeQueryParam} from './query' +import {navigateToQuery, removeQueryParam} from './query' import Datamap from 'datamaps' function filterText(key, value, query) { @@ -56,9 +56,15 @@ function filterText(key, value, query) { function renderFilter(history, [key, value], query) { function removeFilter() { - let newQuery = removeQueryParam(location.search, key) - if (key === 'goal') { newQuery = removeQueryParam(newQuery, 'props') } - history.push({search: newQuery}) + const newOpts = { + [key]: false + } + if (key === 'goal') { newOpts.props = false } + navigateToQuery( + history, + query, + newOpts + ) } return (