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 perfomance errors with filters

kruzhambus563c3d4ff62c
diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsx
index eb282c506..e950208eb 100644
--- a/web/app/pages/Project/View/ViewProject.tsx
+++ b/web/app/pages/Project/View/ViewProject.tsx
@@ -2244,13 +2244,13 @@ const ViewProject = ({
let filtersToUpdate: IFilter[] = []
if (activeTab === PROJECT_TABS.performance) {
- filtersToUpdate = updateFilterState(navigate, filtersPerf, setFiltersPerf, columnPerf, filter, isExclusive)
+ filtersToUpdate = updateFilterState(navigate, filtersPerf, setFiltersPerf, columnPerf, column, filter, isExclusive)
} else if (activeTab === PROJECT_TABS.sessions) {
- filtersToUpdate = updateFilterState(navigate, filtersSessions, setFiltersSessions, columnSessions, filter, isExclusive)
+ filtersToUpdate = updateFilterState(navigate, filtersSessions, setFiltersSessions, columnSessions, column, filter, isExclusive)
} else if (activeTab === PROJECT_TABS.errors) {
- filtersToUpdate = updateFilterState(navigate, filtersErrors, setFiltersErrors, columnErrors, filter, isExclusive)
+ filtersToUpdate = updateFilterState(navigate, filtersErrors, setFiltersErrors, columnErrors, column, filter, isExclusive)
} else if (activeTab === PROJECT_TABS.traffic) {
- filtersToUpdate = updateFilterState(navigate, filters, setFilters, column, filter, isExclusive)
+ filtersToUpdate = updateFilterState(navigate, filters, setFilters, column, column, filter, isExclusive)
}
resetSessions()
diff --git a/web/app/pages/Project/View/utils/filters.tsx b/web/app/pages/Project/View/utils/filters.tsx
index 4f64e1fe2..d0ecc4984 100644
--- a/web/app/pages/Project/View/utils/filters.tsx
+++ b/web/app/pages/Project/View/utils/filters.tsx
@@ -78,9 +78,8 @@ export const isFilterValid = (filter: string, checkDynamicFilters = false) => {
return false
}
-
export const applyFilters = (items: IFilter[], suffix: string, url: URL, override: boolean): IFilter[] => {
- const filtersToSet: IFilter[] = []
+ const filtersToLoad: IFilter[] = []
items.forEach((item) => {
if (!item.filter) return
@@ -94,9 +93,9 @@ export const applyFilters = (items: IFilter[], suffix: string, url: URL, overrid
filters.forEach((filter) => url.searchParams.append(columnSuffix, filter))
}
- filtersToSet.push(item)
+ filtersToLoad.push(item)
})
- return filtersToSet
+ return filtersToLoad
}
export const handleNavigationParams = (
@@ -120,6 +119,7 @@ export const updateFilterState = (
filters: IFilter[],
newFiltersStateSetter: React.Dispatch<React.SetStateAction<IFilter[]>>,
column: string,
+ columnSuffix: string,
filter: any,
isExclusive: boolean,
) => {
@@ -133,7 +133,7 @@ export const updateFilterState = (
updatedFilters = filters.filter((_, index) => index !== existingFilterIndex)
url.searchParams.delete(column)
} else {
- updatedFilters = [...filters, { column, filter, isExclusive }]
+ updatedFilters = [...filters, { column: columnSuffix, filter, isExclusive }]
url.searchParams.append(column, filter)
}
diff --git a/web/app/redux/reducers/ui/cache.ts b/web/app/redux/reducers/ui/cache.ts
index 393918b41..070b11b8e 100644
--- a/web/app/redux/reducers/ui/cache.ts
+++ b/web/app/redux/reducers/ui/cache.ts
@@ -11,7 +11,7 @@ import {
isBrowser,
} from 'redux/constants'
import { IUserFlow } from 'redux/models/IUserFlow'
-import { filterInvalidViewPrefs } from 'pages/Project/View/ViewProject.helpers'
+import { filterInvalidViewPrefs } from 'pages/Project/View/utils/filters'
const getInitialViewPrefs = (LS_VIEW: string) => {
if (!isBrowser) {