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!

update

kruzhambusa8a3b75b8e85
diff --git a/src/pages/Project/View/ViewProject.container.tsx b/src/pages/Project/View/ViewProject.container.tsx
index acb6d610a..86c99b080 100644
--- a/src/pages/Project/View/ViewProject.container.tsx
+++ b/src/pages/Project/View/ViewProject.container.tsx
@@ -54,8 +54,8 @@ const mapDispatchToProps = (dispatch: AppDispatch) => ({
setProjectCache: (pid: string, data: any, key: string) => {
dispatch(UIActions.setProjectCache({
pid,
- data,
key,
+ data,
}))
},
setProjectViewPrefs: (pid: string, period: string, timeBucket: string, rangeDate?: Date[]) => {
diff --git a/src/pages/Project/View/ViewProject.tsx b/src/pages/Project/View/ViewProject.tsx
index 002bc5b18..b0aedc246 100644
--- a/src/pages/Project/View/ViewProject.tsx
+++ b/src/pages/Project/View/ViewProject.tsx
@@ -576,7 +576,7 @@ const ViewProject = ({
key = getProjectCacheKey(period, timeBucket)
}
- if (!forced && !_isEmpty(cache[id]) && !_isEmpty(cache[id][key])) {
+ if (!forced && !_isEmpty(cache[id]) && !_isEmpty(cache[id][key]) && !_isEmpty(newFilters || filters)) {
data = cache[id][key]
} else {
if (period === 'custom' && dateRange) {
@@ -1297,12 +1297,12 @@ const ViewProject = ({
loadAnalytics()
}
}
- if (areFiltersPerfParsed) {
+ if (areFiltersPerfParsed && areTimeBucketParsed && arePeriodParsed) {
if (activeTab === PROJECT_TABS.performance) {
loadAnalyticsPerf()
}
}
- }, [project, period, forecasedChartData, timeBucket, periodPairs, areFiltersParsed, areTimeBucketParsed, arePeriodParsed, t, activeTab, areFiltersPerfParsed]) // eslint-disable-line
+ }, [project, period, chartType, filters, forecasedChartData, timeBucket, periodPairs, areFiltersParsed, areTimeBucketParsed, arePeriodParsed, t, activeTab, areFiltersPerfParsed]) // eslint-disable-line
useEffect(() => {
if (!_isEmpty(activeChartMetricsCustomEvents)) {
@@ -1560,16 +1560,6 @@ const ViewProject = ({
setChartType(type)
}
- // useEffect to change chart if we change chart type
- useEffect(() => {
- if (activeTab === PROJECT_TABS.performance) {
- loadAnalyticsPerf()
- } else {
- loadAnalytics()
- }
- // eslint-disable-next-line react-hooks/exhaustive-deps
- }, [chartType])
-
// loadAnalytics when compare period change or compare selected
useEffect(() => {
setItem(IS_ACTIVE_COMPARE, JSON.stringify(isActiveCompare))
diff --git a/src/redux/reducers/ui/cache.ts b/src/redux/reducers/ui/cache.ts
index f33f98b39..19993a915 100644
--- a/src/redux/reducers/ui/cache.ts
+++ b/src/redux/reducers/ui/cache.ts
@@ -75,7 +75,9 @@ const cacheSlice = createSlice({
}
},
deleteProjectCache(state, { payload }: PayloadAction<{ pid?: string, period?: string, timeBucket?: string }>) {
- const { pid, period, timeBucket } = payload
+ const {
+ pid, period, timeBucket,
+ } = payload
let key: string
if (period && timeBucket) {
@@ -177,21 +179,6 @@ const cacheSlice = createSlice({
},
}
},
- deleteProjectCachePerf(state, { payload }: PayloadAction<{ pid: string, period: string, timeBucket: string }>) {
- const { pid, period, timeBucket } = payload
- const key = getProjectCacheKey(period, timeBucket)
-
- if (_isEmpty(period) || _isEmpty(timeBucket)) {
- if (_isEmpty(pid)) {
- state.analyticsPerf = {}
- }
- state.analyticsPerf = _filter(state.analyticsPerf, (project) => project !== pid)
- }
- state.analyticsPerf = {
- ...state.analyticsPerf,
- [pid]: _filter(state.analyticsPerf[pid], (ckey) => ckey !== key),
- }
- },
setProjectForecastCache(state, { payload }: PayloadAction<{ pid: string, key: string, data: any }>) {
state.analytics = {
...state.analytics,