Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

fix: clear stale segment params and dedupe filter prefetches

Blue Mouse832c4da64d3e
diff --git a/web/app/pages/Project/View/components/FilterRowsEditor.tsx b/web/app/pages/Project/View/components/FilterRowsEditor.tsx
index 73bc1ba79..1aca6d3c3 100644
--- a/web/app/pages/Project/View/components/FilterRowsEditor.tsx
+++ b/web/app/pages/Project/View/components/FilterRowsEditor.tsx
@@ -8,7 +8,14 @@ import {
import cx from 'clsx'
import _isEmpty from 'lodash/isEmpty'
import { CheckIcon, CaretUpDownIcon, TrashIcon } from '@phosphor-icons/react'
-import { useState, useEffect, useCallback, Fragment, useMemo } from 'react'
+import {
+ useState,
+ useEffect,
+ useCallback,
+ Fragment,
+ useMemo,
+ useRef,
+} from 'react'
import { useTranslation } from 'react-i18next'
import { useFiltersProxy } from '~/hooks/useAnalyticsProxy'
@@ -265,6 +272,7 @@ const FilterRowsEditor = ({
Record<string, string[]>
>({})
const [loadingColumns, setLoadingColumns] = useState<Set<string>>(new Set())
+ const inFlightRef = useRef<Set<string>>(new Set())
const { fetchFilters, fetchErrorsFilters, fetchVersionFilters } =
useFiltersProxy()
@@ -289,8 +297,15 @@ const FilterRowsEditor = ({
const fetchFilterValues = useCallback(
async (column: string) => {
- if (filterValuesCache[column] || loadingColumns.has(column)) return
+ if (
+ filterValuesCache[column] ||
+ loadingColumns.has(column) ||
+ inFlightRef.current.has(column)
+ ) {
+ return
+ }
+ inFlightRef.current.add(column)
setLoadingColumns((prev) => new Set(prev).add(column))
try {
let result: string[] = []
@@ -317,6 +332,7 @@ const FilterRowsEditor = ({
console.error('Failed to fetch filter values:', error)
setFilterValuesCache((prev) => ({ ...prev, [column]: [] }))
} finally {
+ inFlightRef.current.delete(column)
setLoadingColumns((prev) => {
const next = new Set(prev)
next.delete(column)
@@ -335,6 +351,14 @@ const FilterRowsEditor = ({
],
)
+ useEffect(() => {
+ const inFlight = inFlightRef.current
+
+ return () => {
+ inFlight.clear()
+ }
+ }, [])
+
useEffect(() => {
if (!active) {
return
@@ -350,7 +374,7 @@ const FilterRowsEditor = ({
}
panelOptions.forEach((column) => {
- if (!filterValuesCache[column] && !loadingColumns.has(column)) {
+ if (!filterValuesCache[column] && !inFlightRef.current.has(column)) {
fetchFilterValues(column)
}
})
@@ -360,7 +384,6 @@ const FilterRowsEditor = ({
panelOptions,
fetchFilterValues,
filterValuesCache,
- loadingColumns,
])
const addFilterRow = () => {
diff --git a/web/app/pages/Project/View/components/ProjectViewHeaderActions.tsx b/web/app/pages/Project/View/components/ProjectViewHeaderActions.tsx
index 90aba2620..d5683a362 100644
--- a/web/app/pages/Project/View/components/ProjectViewHeaderActions.tsx
+++ b/web/app/pages/Project/View/components/ProjectViewHeaderActions.tsx
@@ -17,7 +17,7 @@ import Dropdown from '~/ui/Dropdown'
import { Text } from '~/ui/Text'
import { trackCustom } from '~/utils/analytics'
-import { ProjectView } from '../interfaces/traffic'
+import { Filter, ProjectView } from '../interfaces/traffic'
import {
splitProjectViewFiltersByTab,
supportsProjectViewSegments,
@@ -57,6 +57,14 @@ const isAddViewItem = (item: ProjectViewMenuItem): item is AddViewItem =>
const isEmptyViewItem = (item: ProjectViewMenuItem): item is EmptyViewItem =>
'notClickable' in item
+const getFilterSearchParamKey = (filter: Filter) => {
+ if (filter.isContains) {
+ return filter.isExclusive ? `^${filter.column}` : `~${filter.column}`
+ }
+
+ return filter.isExclusive ? `!${filter.column}` : filter.column
+}
+
const iconButtonClassName =
'rounded-md p-1 hover:bg-gray-50 hover:text-gray-900 dark:hover:bg-slate-900 dark:hover:text-slate-200'
@@ -279,12 +287,34 @@ const ProjectViewHeaderActions = ({
return
}
- const newParams = hasSupportedFilters
- ? getFiltersUrlParams(filters, supported, true, searchParams)
- : new URLSearchParams(searchParams)
+ let newParams = new URLSearchParams(searchParams)
+ const supportedFilterKeys = new Set(
+ supported.map(getFilterSearchParamKey),
+ )
+
+ filters.forEach((filter) => {
+ const key = getFilterSearchParamKey(filter)
+
+ if (!supportedFilterKeys.has(key)) {
+ newParams.delete(key)
+ }
+ })
+
+ newParams.delete('metrics')
+
+ if (hasSupportedFilters) {
+ newParams = getFiltersUrlParams(
+ filters,
+ supported,
+ true,
+ newParams,
+ )
+ }
if (hasTrafficMetrics) {
newParams.set('metrics', JSON.stringify(item.customEvents))
+ } else {
+ newParams.delete('metrics')
}
setSearchParams(newParams)