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: time bucket calculation for custom periods

Blue Mouse189c9cea169b
diff --git a/web/app/lib/constants/index.ts b/web/app/lib/constants/index.ts
index a7c1eed4d..ac6ed986a 100644
--- a/web/app/lib/constants/index.ts
+++ b/web/app/lib/constants/index.ts
@@ -93,8 +93,25 @@ const PERIOD_TO_VALID_TIME_BUCKETS: Record<Period, TimeBucket[]> = {
export const getValidTimeBucket = (
period: Period,
requestedTimeBucket?: string | null,
+ from?: string,
+ to?: string,
): TimeBucket => {
- const validBuckets = PERIOD_TO_VALID_TIME_BUCKETS[period] || ['day']
+ let validBuckets = PERIOD_TO_VALID_TIME_BUCKETS[period] || ['day']
+
+ if ((period === 'custom' || period === 'compare') && from && to) {
+ const days = Math.ceil(
+ Math.abs(new Date(to).getTime() - new Date(from).getTime()) /
+ (1000 * 3600 * 24),
+ )
+
+ for (const entry of timeBucketToDays) {
+ if (entry.lt >= days) {
+ validBuckets = entry.tb
+ break
+ }
+ }
+ }
+
if (
requestedTimeBucket &&
validBuckets.includes(requestedTimeBucket as TimeBucket)
diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsx
index 2e16161a8..f07b92747 100644
--- a/web/app/pages/Project/View/ViewProject.tsx
+++ b/web/app/pages/Project/View/ViewProject.tsx
@@ -426,6 +426,7 @@ const ViewProjectContent = () => {
for (const index in timeBucketToDays) {
if (timeBucketToDays[index].lt >= days) {
tbs = timeBucketToDays[index].tb
+ break
}
}
}
diff --git a/web/app/routes/projects.$id.tsx b/web/app/routes/projects.$id.tsx
index cd8489ae4..f9d52d9db 100644
--- a/web/app/routes/projects.$id.tsx
+++ b/web/app/routes/projects.$id.tsx
@@ -329,8 +329,8 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
const timezone = url.searchParams.get('timezone') || DEFAULT_TIMEZONE
const filters = parseFiltersFromUrl(url.searchParams)
- // Ensure the time bucket is valid for the selected period
- const timeBucket = getValidTimeBucket(period, urlTimeBucket)
+ // Ensure the time bucket is valid for the selected period and date range
+ const timeBucket = getValidTimeBucket(period, urlTimeBucket, from, to)
// Performance-specific params
const measure = url.searchParams.get('measure') || 'median'