diff --git a/assets/js/dashboard/stats/modals/prop-filter-modal.js b/assets/js/dashboard/stats/modals/prop-filter-modal.js index ace109147..1a8dd73af 100644 --- a/assets/js/dashboard/stats/modals/prop-filter-modal.js +++ b/assets/js/dashboard/stats/modals/prop-filter-modal.js @@ -6,7 +6,8 @@ import FilterTypeSelector from "../../components/filter-type-selector"; import { FILTER_TYPES } from "../../util/filters"; import { parseQuery } from '../../query' import * as api from '../../api' -import { apiPath } from '../../util/url' +import { apiPath, siteBasePath } from '../../util/url' +import { toFilterQuery } from '../../util/filters'; function PropFilterModal(props) { const query = parseQuery(props.location.search, props.site) @@ -72,20 +73,37 @@ function PropFilterModal(props) { } function isDisabled() { - return false + return !(formState.prop_key && formState.prop_value.clauses.length > 0) } function shouldShowClear() { return true } + function handleSubmit() { + const filterString = JSON.stringify({ [formState.prop_key.value]: toFilterQuery(formState.prop_value.type, formState.prop_value.clauses) }) + selectFiltersAndCloseModal(filterString) + } + + function selectFiltersAndCloseModal(filterString) { + const queryString = new URLSearchParams(window.location.search) + + if (filterString) { + queryString.set('props', filterString) + } else { + queryString.delete('props') + } + + props.history.replace({ pathname: siteBasePath(props.site), search: queryString.toString() }) + } + return ( <>