diff --git a/assets/js/dashboard/stats/modals/filter.js b/assets/js/dashboard/stats/modals/filter.js index b126ff2ca..189aa29f3 100644 --- a/assets/js/dashboard/stats/modals/filter.js +++ b/assets/js/dashboard/stats/modals/filter.js @@ -6,7 +6,7 @@ import { ChevronDownIcon } from '@heroicons/react/20/solid' import Combobox from '../../components/combobox' import Modal from './modal' -import { FILTER_GROUPS, parseQueryFilter, formatFilterGroup, formattedFilters, FILTER_PREFIXES, FILTER_TYPES } from '../../util/filters' +import { FILTER_GROUPS, parseQueryFilter, formatFilterGroup, formattedFilters, toFilterQuery, FILTER_TYPES } from '../../util/filters' import { parseQuery } from '../../query' import * as api from '../../api' import { apiPath, siteBasePath } from '../../util/url' @@ -35,12 +35,6 @@ function getFormState(filterGroup, query) { }, {}) } -function toFilterQuery(type, clauses) { - const prefix = FILTER_PREFIXES[type]; - const result = clauses.map(clause => clause.value.trim()).join('|') - return prefix + result; -} - function supportsContains(filterName) { return ['page', 'entry_page', 'exit_page'].includes(filterName) } diff --git a/assets/js/dashboard/util/filters.js b/assets/js/dashboard/util/filters.js index abda3d4a9..2c6cdb4a6 100644 --- a/assets/js/dashboard/util/filters.js +++ b/assets/js/dashboard/util/filters.js @@ -22,6 +22,19 @@ export const FILTER_PREFIXES = { [FILTER_TYPES.is]: '' }; +const NON_ESCAPED_PIPE_REGEX = /(? escapeFilterValue(clause.value.trim())).join('|') + return prefix + result; +} + function parsePrefix(rawValue) { const type = Object.keys(FILTER_PREFIXES) .find(type => FILTER_PREFIXES[type] === rawValue[0]) || FILTER_TYPES.is; @@ -31,8 +44,9 @@ function parsePrefix(rawValue) { : rawValue; const values = value - .split('|') + .split(NON_ESCAPED_PIPE_REGEX) .filter((clause) => !!clause) + .map((val) => val.replaceAll(ESCAPED_PIPE, '|')) return {type, values} }