diff --git a/assets/js/dashboard/components/combobox.js b/assets/js/dashboard/components/combobox.js
index 9514d4c80..44019f112 100644
--- a/assets/js/dashboard/components/combobox.js
+++ b/assets/js/dashboard/components/combobox.js
@@ -29,7 +29,7 @@ export default function MyCombobox(props) {
function onOpen() {
setOptions([])
- fetchOptions(props.selection.value)
+ fetchOptions(props.selection.label)
}
function onBlur(e) {
diff --git a/assets/js/dashboard/filters.js b/assets/js/dashboard/filters.js
index 8c21a24c9..aa1e9277f 100644
--- a/assets/js/dashboard/filters.js
+++ b/assets/js/dashboard/filters.js
@@ -9,8 +9,7 @@ import {
FILTER_GROUPS,
formatFilterGroup,
filterGroupForFilter,
- toFilterType,
- valueWithoutPrefix
+ parseQueryFilter
} from "./stats/modals/filter";
function removeFilter(key, history, query) {
@@ -38,8 +37,7 @@ function clearAllFilters(history, query) {
}
function filterText(key, rawValue, query) {
- let type = toFilterType(rawValue)
- const value = valueWithoutPrefix(rawValue)
+ const {type, value} = parseQueryFilter(rawValue)
if (key === "goal") {
return <>Completed goal {value}>
@@ -47,7 +45,8 @@ function filterText(key, rawValue, query) {
if (key === "props") {
const [metaKey, metaValue] = Object.entries(value)[0]
const eventName = query.filters.goal ? query.filters.goal : 'event'
- return <>{eventName}.{metaKey} {toFilterType(metaValue)} {valueWithoutPrefix(metaValue)}>
+ const metaFilter = parseQueryFilter(metaValue)
+ return <>{eventName}.{metaKey} {metaFilter.type} {metaFilter.value}>
}
if (key === "browser_version") {
const isNotSet = query.filters.browser === '(not set)' || (!query.filters.browser)
diff --git a/assets/js/dashboard/stats/modals/filter.js b/assets/js/dashboard/stats/modals/filter.js
index 1d075d586..09efb1fbc 100644
--- a/assets/js/dashboard/stats/modals/filter.js
+++ b/assets/js/dashboard/stats/modals/filter.js
@@ -29,32 +29,31 @@ function getFormState(filterGroup, query) {
if (entries && entries.length == 1) {
const propKey = entries[0][0]
- const propValue = valueWithoutPrefix(entries[0][1])
+ const {type, value} = parseQueryFilter(entries[0][1])
return {
'prop_key': { label: propKey, value: propKey, type: FILTER_TYPES.is },
- 'prop_value': { label: propValue, value: propValue, type: toFilterType(entries[0][1]) }
+ 'prop_value': { label: value, value: value, type: type }
}
}
}
return FILTER_GROUPS[filterGroup].reduce((result, filter) => {
const rawFilterValue = query.filters[filter] || ''
- const type = toFilterType(rawFilterValue)
- const filterValue = valueWithoutPrefix(rawFilterValue)
+ const {type, value} = parseQueryFilter(rawFilterValue)
- let filterLabel = filterValue
+ let filterLabel = value
- if (filter === 'country' && filterValue !== '') {
+ if (filter === 'country' && value !== '') {
filterLabel = (new URLSearchParams(window.location.search)).get('country_name')
}
- if (filter === 'region' && filterValue !== '') {
+ if (filter === 'region' && value !== '') {
filterLabel = (new URLSearchParams(window.location.search)).get('region_name')
}
- if (filter === 'city' && filterValue !== '') {
+ if (filter === 'city' && value !== '') {
filterLabel = (new URLSearchParams(window.location.search)).get('city_name')
}
- return Object.assign(result, { [filter]: { label: filterLabel, value: filterValue, type } })
+ return Object.assign(result, { [filter]: { label: filterLabel, value: value, type } })
}, {})
}
@@ -70,15 +69,15 @@ const FILTER_PREFIXES = {
[FILTER_TYPES.is]: ''
};
-export function toFilterType(value) {
- return Object.keys(FILTER_PREFIXES)
- .find(type => FILTER_PREFIXES[type] === value[0]) || FILTER_TYPES.is;
-}
+export function parseQueryFilter(queryFilter) {
+ const type = Object.keys(FILTER_PREFIXES)
+ .find(type => FILTER_PREFIXES[type] === queryFilter[0]) || FILTER_TYPES.is;
+
+ const value = [FILTER_TYPES.isNot, FILTER_TYPES.contains].includes(type)
+ ? queryFilter.substring(1)
+ : queryFilter;
-export function valueWithoutPrefix(value) {
- return [FILTER_TYPES.isNot, FILTER_TYPES.contains].includes(toFilterType(value))
- ? value.substring(1)
- : value;
+ return {type, value}
}
function toFilterQuery(value, type) {