Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

fix(suggestions): Properly provide suggestions (#4332)

Karl-Aksel Puulmannef2e277f893f
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5299ccbe6b..23ad02cec6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ All notable changes to this project will be documented in this file.
### Fixed
- Fix access to Stats API feature in CE plausible/analytics#4244
+- Fix filter suggestions when same filter previously applied
## v2.1.1 - 2024-06-06
diff --git a/assets/js/dashboard/util/filters.js b/assets/js/dashboard/util/filters.js
index c15934e259..5761aa68b7 100644
--- a/assets/js/dashboard/util/filters.js
+++ b/assets/js/dashboard/util/filters.js
@@ -160,8 +160,15 @@ export function fetchSuggestions(apiPath, query, input, additionalFilter) {
function queryForSuggestions(query, additionalFilter) {
let filters = query.filters
- if (additionalFilter && additionalFilter[2].length > 0) {
- filters = filters.concat([additionalFilter])
+ if (additionalFilter) {
+ const [_operation, filterKey, clauses] = additionalFilter
+
+ // For suggestions, we remove already-applied filter with same key from query and add new filter (if feasible)
+ if (clauses.length > 0) {
+ filters = replaceFilterByPrefix(query, filterKey, additionalFilter)
+ } else {
+ filters = omitFiltersByKeyPrefix(query, filterKey)
+ }
}
return { ...query, filters }
}