Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Support using matches/contains for most filters (#3721)
Karl-Aksel Puulmann0065cd30521e
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 409e960b0f..ece2d5aba2 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 propertiesdiff --git a/assets/js/dashboard/stats/devices/index.js b/assets/js/dashboard/stats/devices/index.jsindex 916a4f876f..49852bd9b8 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 <BrowserVersions site={this.props.site} query={this.props.query} />}return <Browsers site={this.props.site} query={this.props.query} />case 'os':- if (this.props.query.filters.os) {+ if (isFilteringOnFixedValue(this.props.query, 'os')) {return <OperatingSystemVersions site={this.props.site} query={this.props.query} />}return <OperatingSystems site={this.props.site} query={this.props.query} />diff --git a/assets/js/dashboard/stats/sources/index.js b/assets/js/dashboard/stats/sources/index.jsindex 716f62689c..36062eaf5f 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 <SearchTerms {...props} />- } else if (props.query.filters.source) {+ } else if (isFilteringOnFixedValue(props.query, 'source')) {return <ReferrerList {...props} />} else {return <SourceList {...props} />diff --git a/assets/js/dashboard/util/filters.js b/assets/js/dashboard/util/filters.jsindex e936c6e58c..9c8884f3bf 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'