From d78c194dd08c8cdeea58cb3a770318ad064bb324 Mon Sep 17 00:00:00 2001 From: Robert Joonas Date: Tue, 4 Apr 2023 18:59:33 +0100 Subject: [PATCH] get applied filters from query + remove option --- .../stats/modals/prop-filter-modal.js | 18 +++++++++++++++--- assets/js/dashboard/util/filters.js | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/assets/js/dashboard/stats/modals/prop-filter-modal.js b/assets/js/dashboard/stats/modals/prop-filter-modal.js index 1a8dd73af..59e7c85fd 100644 --- a/assets/js/dashboard/stats/modals/prop-filter-modal.js +++ b/assets/js/dashboard/stats/modals/prop-filter-modal.js @@ -7,13 +7,25 @@ import { FILTER_TYPES } from "../../util/filters"; import { parseQuery } from '../../query' import * as api from '../../api' import { apiPath, siteBasePath } from '../../util/url' -import { toFilterQuery } from '../../util/filters'; +import { toFilterQuery, parsePrefix } from '../../util/filters'; function PropFilterModal(props) { const query = parseQuery(props.location.search, props.site) const [formState, setFormState] = useState(getFormState()) function getFormState() { + const rawValue = query.filters['props'] + if (rawValue) { + const [[propKey, propVal]] = Object.entries(rawValue) + const {type, values} = parsePrefix(propVal) + const clauses = values.map(val => { return {value: val, label: val}}) + + return { + prop_key: {value: propKey, label: propKey}, + prop_value: { type: type, clauses: clauses } + } + } + return { prop_key: null, prop_value: { type: FILTER_TYPES.is, clauses: [] } @@ -77,7 +89,7 @@ function PropFilterModal(props) { } function shouldShowClear() { - return true + return !!query.filters['props'] } function handleSubmit() { @@ -119,7 +131,7 @@ function PropFilterModal(props) {