diff --git a/CHANGELOG.md b/CHANGELOG.md
index 409e960b0..ece2d5aba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
### Added
- IP Block List in Site Settings
+- Allow filtering with `contains`/`matches` operator for Sources, Browsers and Operating Systems.
- Allow filtering by multiple custom properties
- Wildcard and member filtering on the Stats API `event:goal` property
- Allow filtering with `contains`/`matches` operator for custom properties
diff --git a/assets/js/dashboard/stats/devices/index.js b/assets/js/dashboard/stats/devices/index.js
index 916a4f876..49852bd9b 100644
--- a/assets/js/dashboard/stats/devices/index.js
+++ b/assets/js/dashboard/stats/devices/index.js
@@ -1,6 +1,7 @@
import React from 'react';
import * as storage from '../../util/storage'
+import { isFilteringOnFixedValue } from '../../util/filters'
import ListReport from '../reports/list'
import * as api from '../../api'
import * as url from '../../util/url'
@@ -161,12 +162,12 @@ export default class Devices extends React.Component {
renderContent() {
switch (this.state.mode) {
case 'browser':
- if (this.props.query.filters.browser) {
+ if (isFilteringOnFixedValue(this.props.query, 'browser')) {
return
}
return
case 'os':
- if (this.props.query.filters.os) {
+ if (isFilteringOnFixedValue(this.props.query, 'os')) {
return
}
return
diff --git a/assets/js/dashboard/stats/sources/index.js b/assets/js/dashboard/stats/sources/index.js
index 716f62689..36062eaf5 100644
--- a/assets/js/dashboard/stats/sources/index.js
+++ b/assets/js/dashboard/stats/sources/index.js
@@ -2,11 +2,13 @@ import React from 'react';
import SearchTerms from './search-terms'
import SourceList from './source-list'
import ReferrerList from './referrer-list'
+import { isFilteringOnFixedValue } from '../../util/filters'
+
export default function Sources(props) {
if (props.query.filters.source === 'Google') {
return
- } else if (props.query.filters.source) {
+ } else if (isFilteringOnFixedValue(props.query, 'source')) {
return
} else {
return
diff --git a/assets/js/dashboard/util/filters.js b/assets/js/dashboard/util/filters.js
index e936c6e58..9c8884f3b 100644
--- a/assets/js/dashboard/util/filters.js
+++ b/assets/js/dashboard/util/filters.js
@@ -10,9 +10,7 @@ export const FILTER_GROUPS = {
'props': ['prop_key', 'prop_value']
}
-export const ALLOW_FREE_CHOICE = new Set(
- FILTER_GROUPS['page'].concat(FILTER_GROUPS['utm']).concat(['prop_value'])
-)
+export const NO_CONTAINS_OPERATOR = new Set(['goal', 'screen'].concat(FILTER_GROUPS['location']))
export const FILTER_OPERATIONS = {
isNot: 'is not',
@@ -31,7 +29,7 @@ export function supportsIsNot(filterName) {
}
export function isFreeChoiceFilter(filterName) {
- return ALLOW_FREE_CHOICE.has(filterName)
+ return !NO_CONTAINS_OPERATOR.has(filterName)
}
// As of March 2023, Safari does not support negative lookbehind regexes. In case it throws an error, falls back to plain | matching. This means
@@ -102,6 +100,11 @@ export function parseQueryFilter(query, filter) {
return {type, clauses}
}
+export function isFilteringOnFixedValue(query, filter) {
+ const { type, clauses } = parseQueryFilter(query, filter)
+ return type == FILTER_OPERATIONS.is && clauses.length == 1
+}
+
export function formatFilterGroup(filterGroup) {
if (filterGroup === 'utm') {
return 'UTM tags'