diff --git a/src/components/HOCs/WithReviewTasks/WithReviewTasks.js b/src/components/HOCs/WithReviewTasks/WithReviewTasks.js index 5d52edf8b..443906e2e 100644 --- a/src/components/HOCs/WithReviewTasks/WithReviewTasks.js +++ b/src/components/HOCs/WithReviewTasks/WithReviewTasks.js @@ -144,6 +144,10 @@ export const WithReviewTasks = function(WrappedComponent) { } } + clearCriteria = () => { + this.props.clearFilters() + } + updateURL(props, criteria) { let searchCriteria = _merge({filters:{}}, criteria) @@ -238,6 +242,7 @@ export const WithReviewTasks = function(WrappedComponent) { updateReviewTasks={(criteria) => this.update(this.props, criteria)} refresh={this.refresh} reviewCriteria={criteria} + clearFilterCriteria={this.clearCriteria} pageSize={criteria.pageSize} changePageSize={this.changePageSize} setFiltered={this.setFiltered} diff --git a/src/components/HOCs/WithSavedFilters/WithSavedFilters.js b/src/components/HOCs/WithSavedFilters/WithSavedFilters.js index a59d8a4bf..6d9c67ae4 100644 --- a/src/components/HOCs/WithSavedFilters/WithSavedFilters.js +++ b/src/components/HOCs/WithSavedFilters/WithSavedFilters.js @@ -100,6 +100,7 @@ const WithSavedFilters = function(WrappedComponent, appSettingName) { getBriefFilters = savedFilters => { const criteria = buildSearchCriteriafromURL(savedFilters) + return _compact(_map(criteria.filters, (value, key) => { let op = '=' let textValue = value diff --git a/src/components/KeywordAutosuggestInput/InTableTagFilter.js b/src/components/KeywordAutosuggestInput/InTableTagFilter.js index bb4fba155..a7a2a8326 100644 --- a/src/components/KeywordAutosuggestInput/InTableTagFilter.js +++ b/src/components/KeywordAutosuggestInput/InTableTagFilter.js @@ -3,6 +3,7 @@ import { FormattedMessage } from 'react-intl' import KeywordAutosuggestInput from './KeywordAutosuggestInput' import External from '../External/External' import Modal from '../Modal/Modal' +import SvgSymbol from '../SvgSymbol/SvgSymbol' import messages from './Messages' /** @@ -23,16 +24,27 @@ export default class InTableTagFilter extends Component { this.setState({showTagChooser: false, currentValue: null}) } + clearFilter = () => { + this.setState({currentValue: ''}, () => { + this.props.onChange(this.state.currentValue) + }) + } + render() { return (