Fixed editing and navigation issues.

src/app/api/websites/[websiteId]/event-data/events/route.ts

@@ -26,7 +26,7 @@ export async function GET(
   }
 
   const { event } = query;
-  const filters = getQueryFilters(query);
+  const filters = await getQueryFilters(query);
 
   const data = await getEventDataEvents(websiteId, {
     ...filters,

src/app/api/websites/[websiteId]/event-data/fields/route.ts

@@ -25,7 +25,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = getQueryFilters(query);
+  const filters = await getQueryFilters(query);
 
   const data = await getEventDataFields(websiteId, filters);
 

src/app/api/websites/[websiteId]/event-data/properties/route.ts

@@ -27,7 +27,7 @@ export async function GET(
   }
 
   const { propertyName } = query;
-  const filters = getQueryFilters(query);
+  const filters = await getQueryFilters(query);
 
   const data = await getEventDataProperties(websiteId, { ...filters, propertyName });
 

src/app/api/websites/[websiteId]/event-data/stats/route.ts

@@ -26,7 +26,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = getQueryFilters(query);
+  const filters = await getQueryFilters(query);
 
   const data = await getEventDataStats(websiteId, filters);
 

src/app/api/websites/[websiteId]/event-data/values/route.ts

@@ -28,7 +28,7 @@ export async function GET(
   }
 
   const { eventName, propertyName } = query;
-  const filters = getQueryFilters(query);
+  const filters = await getQueryFilters(query);
 
   const data = await getEventDataValues(websiteId, {
     ...filters,

src/app/api/websites/[websiteId]/events/route.ts

@@ -27,7 +27,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = getQueryFilters(query);
+  const filters = await getQueryFilters(query);
 
   const data = await getWebsiteEvents(websiteId, filters);
 

src/app/api/websites/[websiteId]/events/series/route.ts

@@ -29,7 +29,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = await setWebsiteDate(websiteId, getQueryFilters(query));
+  const filters = await setWebsiteDate(websiteId, await getQueryFilters(query));
 
   const data = await getEventMetrics(websiteId, filters);
 

src/app/api/websites/[websiteId]/metrics/route.ts

@@ -11,10 +11,10 @@ import {
   VIDEO_DOMAINS,
   PAID_AD_PARAMS,
 } from '@/lib/constants';
-import { parseRequest, getQueryFilters, setWebsiteDate } from '@/lib/request';
+import { parseRequest, getQueryFilters } from '@/lib/request';
 import { json, unauthorized, badRequest } from '@/lib/response';
 import { getPageviewMetrics, getSessionMetrics, getChannelMetrics } from '@/queries';
-import { filterParams } from '@/lib/schema';
+import { dateRangeParams, filterParams, searchParams } from '@/lib/schema';
 
 export async function GET(
   request: Request,
@@ -22,11 +22,10 @@ export async function GET(
 ) {
   const schema = z.object({
     type: z.string(),
-    startAt: z.coerce.number().int(),
-    endAt: z.coerce.number().int(),
     limit: z.coerce.number().optional(),
     offset: z.coerce.number().optional(),
-    search: z.string().optional(),
+    ...dateRangeParams,
+    ...searchParams,
     ...filterParams,
   });
 
@@ -37,13 +36,13 @@ export async function GET(
   }
 
   const { websiteId } = await params;
-  const { type, limit, offset, search } = query;
 
   if (!(await canViewWebsite(auth, websiteId))) {
     return unauthorized();
   }
 
-  const filters = await setWebsiteDate(websiteId, getQueryFilters(query));
+  const { type, limit, offset, search } = query;
+  const filters = await getQueryFilters(query, websiteId);
 
   if (search) {
     filters[type] = `c.${search}`;

src/app/api/websites/[websiteId]/pageviews/route.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { canViewWebsite } from '@/lib/auth';
-import { getQueryFilters, parseRequest, setWebsiteDate } from '@/lib/request';
+import { getQueryFilters, parseRequest } from '@/lib/request';
 import { dateRangeParams, filterParams } from '@/lib/schema';
 import { getCompareDate } from '@/lib/date';
 import { unauthorized, json } from '@/lib/response';
@@ -27,7 +27,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = await setWebsiteDate(websiteId, getQueryFilters(query));
+  const filters = await getQueryFilters(query, websiteId);
 
   const [pageviews, sessions] = await Promise.all([
     getPageviewStats(websiteId, filters),

src/app/api/websites/[websiteId]/session-data/properties/route.ts

@@ -22,7 +22,7 @@ export async function GET(
 
   const { websiteId } = await params;
   const { propertyName } = query;
-  const filters = getQueryFilters(query);
+  const filters = await getQueryFilters(query);
 
   if (!(await canViewWebsite(auth, websiteId))) {
     return unauthorized();

src/app/api/websites/[websiteId]/session-data/values/route.ts

@@ -22,7 +22,7 @@ export async function GET(
 
   const { propertyName } = query;
   const { websiteId } = await params;
-  const filters = await setWebsiteDate(websiteId, getQueryFilters(query));
+  const filters = await setWebsiteDate(websiteId, await getQueryFilters(query));
 
   if (!(await canViewWebsite(auth, websiteId))) {
     return unauthorized();

src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.ts

@@ -25,7 +25,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = getQueryFilters(query);
+  const filters = await getQueryFilters(query);
 
   const data = await getSessionActivity(websiteId, sessionId, filters);
 

src/app/api/websites/[websiteId]/sessions/route.ts

@@ -27,7 +27,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = await setWebsiteDate(websiteId, getQueryFilters(query));
+  const filters = await setWebsiteDate(websiteId, await getQueryFilters(query));
 
   const data = await getWebsiteSessions(websiteId, filters);
 

src/app/api/websites/[websiteId]/sessions/stats/route.ts

@@ -27,7 +27,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = await setWebsiteDate(websiteId, getQueryFilters(query));
+  const filters = await setWebsiteDate(websiteId, await getQueryFilters(query));
 
   const metrics = await getWebsiteSessionStats(websiteId, filters);
 

src/app/api/websites/[websiteId]/sessions/weekly/route.ts

@@ -28,7 +28,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = getQueryFilters(query);
+  const filters = await getQueryFilters(query);
 
   const data = await getWebsiteSessionsWeekly(websiteId, filters);
 

src/app/api/websites/[websiteId]/stats/route.ts

@@ -1,8 +1,8 @@
 import { z } from 'zod';
-import { parseRequest, getQueryFilters, setWebsiteDate } from '@/lib/request';
+import { parseRequest, getQueryFilters } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
 import { canViewWebsite } from '@/lib/auth';
-import { filterParams } from '@/lib/schema';
+import { dateRangeParams, filterParams } from '@/lib/schema';
 import { getWebsiteStats } from '@/queries';
 import { getCompareDate } from '@/lib/date';
 
@@ -11,9 +11,8 @@ export async function GET(
   { params }: { params: Promise<{ websiteId: string }> },
 ) {
   const schema = z.object({
-    startAt: z.coerce.number().int(),
-    endAt: z.coerce.number().int(),
     compare: z.string().optional(),
+    ...dateRangeParams,
     ...filterParams,
   });
 
@@ -29,7 +28,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = await setWebsiteDate(websiteId, getQueryFilters(query));
+  const filters = await getQueryFilters(query, websiteId);
 
   const data = await getWebsiteStats(websiteId, filters);
 

src/app/api/websites/[websiteId]/values/route.ts

@@ -39,7 +39,7 @@ export async function GET(
   if (FILTER_GROUPS[type]) {
     values = (await getWebsiteSegments(websiteId, type)).map(segment => ({ value: segment.name }));
   } else {
-    const filters = getQueryFilters(query);
+    const filters = await getQueryFilters(query);
     values = await getValues(websiteId, FILTER_COLUMNS[type], filters);
   }