diff --git a/assets/agenda/components/AgendaCoverageExistsFilter.tsx b/assets/agenda/components/AgendaCoverageExistsFilter.tsx index 6bcf84845..a6681ff42 100644 --- a/assets/agenda/components/AgendaCoverageExistsFilter.tsx +++ b/assets/agenda/components/AgendaCoverageExistsFilter.tsx @@ -5,8 +5,8 @@ import {get} from 'lodash'; import {gettext} from 'utils'; import {AgendaDropdown} from './AgendaDropdown'; -const filter = { - label: gettext('Coverage status'), +export const agendaCoverageStatusFilter = { + label: gettext('Any coverage status'), field: 'coverage_status', nestedField: 'coverage_status', }; @@ -18,7 +18,7 @@ const FILTER_VALUES = { COMPLETED: 'completed' }; -function getActiveFilterLabel(filter: any, activeFilter: any) { +export function getActiveFilterLabel(filter: any, activeFilter: any) { const filterValue = get(activeFilter, `${filter.field}[0]`); switch (filterValue) { @@ -38,7 +38,7 @@ function getActiveFilterLabel(filter: any, activeFilter: any) { function AgendaCoverageExistsFilter ({toggleFilter, activeFilter}: any) { return ( toggleFilter(filter.field, FILTER_VALUES.PLANNED)} + onClick={() => toggleFilter(agendaCoverageStatusFilter.field, FILTER_VALUES.PLANNED)} >{gettext('Coverage is planned')} diff --git a/assets/agenda/components/AgendaDropdown.tsx b/assets/agenda/components/AgendaDropdown.tsx index fb6854ee4..9a954c156 100644 --- a/assets/agenda/components/AgendaDropdown.tsx +++ b/assets/agenda/components/AgendaDropdown.tsx @@ -42,7 +42,7 @@ export function AgendaDropdown({ return ( 0} icon={filter.icon} optionLabel={optionLabel} label={getActiveFilterLabel(filter, activeFilter, isActive)} diff --git a/assets/search/actions.ts b/assets/search/actions.ts index 58e9b3279..250257ad4 100644 --- a/assets/search/actions.ts +++ b/assets/search/actions.ts @@ -182,6 +182,12 @@ export function resetFilter(filter?: any) { }; } +export const CLEAR_QUICK_FILTER = 'CLEAR_QUICK_FILTER'; +export function clearQuickFilter(filter?: string) { + return {type: CLEAR_QUICK_FILTER, filter}; +} + + export const SET_VIEW = 'SET_VIEW'; export function setView(view: any) { localStorage.setItem('view', view); diff --git a/assets/search/components/SearchResultsBar/SearchResultTagsList.tsx b/assets/search/components/SearchResultsBar/SearchResultTagsList.tsx index 8c008a6a1..62fcd54f1 100644 --- a/assets/search/components/SearchResultsBar/SearchResultTagsList.tsx +++ b/assets/search/components/SearchResultsBar/SearchResultTagsList.tsx @@ -3,7 +3,7 @@ import * as React from 'react'; import {SearchResultsTopicRow} from './SearchResultsTopicRow'; import {SearchResultsQueryRow} from './SearchResultsQueryRow'; import {SearchResultsAdvancedSearchRow} from './SearchResultsAdvancedSearchRow'; -import {SearchResultsFiltersRow} from './SearchResultsFiltersRow'; +import SearchResultsFiltersRow from './SearchResultsFiltersRow'; import {IFilterGroup, INavigation, ISearchFields, ISearchParams, ITopic, IUser} from 'interfaces'; import {SearchResultTagList} from './SearchResultTagList'; import {gettext} from 'utils'; @@ -34,6 +34,7 @@ export interface IProps { saveMyTopic?: (params: ISearchParams) => void; deselectMyTopic?: (topicId: ITopic['_id']) => void; + clearQuickFilter: (filter: string) => void; } export function SearchResultTagsList({ @@ -58,6 +59,7 @@ export function SearchResultTagsList({ deselectMyTopic, resetFilter, refresh, + clearQuickFilter, }: IProps) { return (