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: performance comparison does not work when comparing to periods before project was created

Blue Mouse35592b0b57a0
diff --git a/web/app/api/index.ts b/web/app/api/index.ts
index 2fdf34037..22cc3ed9d 100644
--- a/web/app/api/index.ts
+++ b/web/app/api/index.ts
@@ -447,7 +447,7 @@ export const getPropertyMetadata = (
throw _isEmpty(error.response.data?.message) ? error.response.data : error.response.data.message
})
-export const getProjectCompareData = (
+export const getTrafficCompareData = (
pid: string,
tb: string = 'hour',
period: string = '3d',
@@ -475,6 +475,34 @@ export const getProjectCompareData = (
throw _isEmpty(error.response.data?.message) ? error.response.data : error.response.data.message
})
+export const getPerformanceCompareData = (
+ pid: string,
+ tb: string = 'hour',
+ period: string = '3d',
+ filters: any[] = [],
+ from: string = '',
+ to: string = '',
+ timezone: string = '',
+ measure: string = '',
+ password: string | undefined = '',
+) =>
+ api
+ .get(
+ `log/performance/chart?pid=${pid}&timeBucket=${tb}&period=${period}&filters=${JSON.stringify(
+ filters,
+ )}&from=${from}&to=${to}&timezone=${timezone}&measure=${measure}`,
+ {
+ headers: {
+ 'x-password': password,
+ },
+ },
+ )
+ .then((response) => response.data)
+ .catch((error) => {
+ debug('%s', error)
+ throw _isEmpty(error.response.data?.message) ? error.response.data : error.response.data.message
+ })
+
export const getPerfData = (
pid: string,
tb: string = 'hour',
diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsx
index 88763b904..dc38d1aa9 100644
--- a/web/app/pages/Project/View/ViewProject.tsx
+++ b/web/app/pages/Project/View/ViewProject.tsx
@@ -141,7 +141,8 @@ import {
getLiveVisitors,
getPerfData,
getProjectDataCustomEvents,
- getProjectCompareData,
+ getTrafficCompareData,
+ getPerformanceCompareData,
checkPassword,
getCustomEventsMetadata,
addFunnel,
@@ -1393,7 +1394,7 @@ const ViewProject = ({
dataCompare = cache[id][keyCompare]
} else {
dataCompare =
- (await getProjectCompareData(
+ (await getTrafficCompareData(
id,
timeBucket,
'',
@@ -1981,7 +1982,7 @@ const ViewProject = ({
if (!_isEmpty(cache[id]) && !_isEmpty(cache[id][keyCompare])) {
dataCompare = cache[id][keyCompare]
} else {
- dataCompare = await getPerfData(
+ dataCompare = await getPerformanceCompareData(
id,
timeBucket,
'',