fix: landing, timezone in queries, etc

Author: izadoesdev

apps/api/src/query/builders/summary.ts

@@ -87,7 +87,8 @@ export const SummaryBuilders: Record<string, SimpleQueryConfig> = {
   },
 
   events_by_date: {
-    customSql: (websiteId: string, startDate: string, endDate: string, filters?: Filter[], granularity?: TimeUnit) => {
+    customSql: (websiteId: string, startDate: string, endDate: string, filters?: Filter[], granularity?: TimeUnit, limit?: number, offset?: number, timezone?: string) => {
+      const tz = timezone || 'UTC';
       const isHourly = granularity === 'hour' || granularity === 'hourly';
 
       if (isHourly) {
@@ -102,7 +103,7 @@ export const SummaryBuilders: Record<string, SimpleQueryConfig> = {
                 session_details AS (
                   SELECT
                     session_id,
-                    toStartOfHour(MIN(time)) as session_start_hour,
+                    toStartOfHour(toTimeZone(MIN(time), {timezone:String})) as session_start_hour,
                     countIf(event_name = 'screen_view') as page_count,
                     dateDiff('second', MIN(time), MAX(time)) as duration
                   FROM analytics.events
@@ -123,7 +124,7 @@ export const SummaryBuilders: Record<string, SimpleQueryConfig> = {
                 ),
                 hourly_event_metrics AS (
                   SELECT
-                    toStartOfHour(time) as event_hour,
+                    toStartOfHour(toTimeZone(time, {timezone:String})) as event_hour,
                     countIf(event_name = 'screen_view') as pageviews,
                     count(distinct anonymous_id) as unique_visitors
                   FROM analytics.events
@@ -158,6 +159,7 @@ export const SummaryBuilders: Record<string, SimpleQueryConfig> = {
             websiteId,
             startDate,
             endDate,
+            timezone: tz,
           }
         };
       }
@@ -173,7 +175,7 @@ export const SummaryBuilders: Record<string, SimpleQueryConfig> = {
                 session_details AS (
                   SELECT
                     session_id,
-                    toDate(MIN(time)) as session_start_date,
+                    toDate(toTimeZone(MIN(time), {timezone:String})) as session_start_date,
                     countIf(event_name = 'screen_view') as page_count,
                     dateDiff('second', MIN(time), MAX(time)) as duration
                   FROM analytics.events
@@ -194,7 +196,7 @@ export const SummaryBuilders: Record<string, SimpleQueryConfig> = {
                 ),
                 daily_event_metrics AS (
                   SELECT
-                    toDate(time) as event_date,
+                    toDate(toTimeZone(time, {timezone:String})) as event_date,
                     countIf(event_name = 'screen_view') as pageviews,
                     count(distinct anonymous_id) as unique_visitors
                   FROM analytics.events
@@ -229,6 +231,7 @@ export const SummaryBuilders: Record<string, SimpleQueryConfig> = {
           websiteId,
           startDate,
           endDate,
+          timezone: tz,
         }
       };
     },

apps/api/src/query/index.ts

@@ -20,27 +20,27 @@ const QuerySchema = z.object({
     offset: z.number().min(0).optional()
 });
 
-export const executeQuery = async (request: QueryRequest, websiteDomain?: string | null) => {
+export const executeQuery = async (request: QueryRequest, websiteDomain?: string | null, timezone?: string) => {
     const validated = QuerySchema.parse(request);
 
     const config = QueryBuilders[validated.type];
     if (!config) {
         throw new Error(`Unknown query type: ${validated.type}`);
     }
 
-    const builder = new SimpleQueryBuilder(config, validated, websiteDomain);
+    const builder = new SimpleQueryBuilder(config, { ...validated, timezone: timezone ?? validated.timezone }, websiteDomain);
     return await builder.execute();
 };
 
-export const compileQuery = (request: QueryRequest, websiteDomain?: string | null) => {
+export const compileQuery = (request: QueryRequest, websiteDomain?: string | null, timezone?: string) => {
     const validated = QuerySchema.parse(request);
 
     const config = QueryBuilders[validated.type];
     if (!config) {
         throw new Error(`Unknown query type: ${validated.type}`);
     }
 
-    const builder = new SimpleQueryBuilder(config, validated, websiteDomain);
+    const builder = new SimpleQueryBuilder(config, { ...validated, timezone: timezone ?? validated.timezone }, websiteDomain);
     return builder.compile();
 };
 

apps/api/src/query/simple-builder.ts

@@ -65,7 +65,8 @@ export class SimpleQueryBuilder {
                 this.request.filters,
                 this.request.timeUnit,
                 this.request.limit,
-                this.request.offset
+                this.request.offset,
+                this.request.timezone
             );
 
             if (typeof result === 'string') {

apps/api/src/query/types.ts

@@ -49,7 +49,8 @@ export interface SimpleQueryConfig {
         filters?: Filter[],
         granularity?: TimeUnit,
         limit?: number,
-        offset?: number
+        offset?: number,
+        timezone?: string
     ) => string | { sql: string; params: Record<string, unknown> };
     appendEndOfDayToTo?: boolean; // If true (default), append ' 23:59:59' to 'to' value. If false, use 'to' as-is.
 }
@@ -65,6 +66,7 @@ export interface QueryRequest {
     orderBy?: string;
     limit?: number;
     offset?: number;
+    timezone?: string;
 }
 
 export interface CompiledQuery {

apps/api/src/routes/query.ts

@@ -243,10 +243,11 @@ async function executeDynamicQuery(request: any, queryParams: any) {
                     timeUnit: getTimeUnit(request.granularity),
                     filters: request.filters || [],
                     limit: request.limit || 100,
-                    offset: request.page ? (request.page - 1) * (request.limit || 100) : 0
+                    offset: request.page ? (request.page - 1) * (request.limit || 100) : 0,
+                    timezone: queryParams.timezone
                 };
 
-                const data = await executeQuery(queryRequest, websiteDomain);
+                const data = await executeQuery(queryRequest, websiteDomain, queryParams.timezone);
 
                 return {
                     parameter,

apps/docs/components/landing/hero.tsx

@@ -77,7 +77,6 @@ export default function Hero() {
 										handleFullscreen();
 									}
 								}}
-								aria-label="View demo dashboard fullscreen"
 							>
 								<iframe
 									ref={iframeRef}