clean-up event/event-data endpoints. fix for expanded view for mobile

src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx

@@ -18,7 +18,13 @@ export function WebsiteExpandedView({
   } = useNavigation();
 
   return (
-    <Grid columns={{ xs: '1fr', md: 'auto 1fr' }} gap="6" height="100%" overflow="hidden">
+    <Grid
+      columns={{ xs: '1fr', md: 'auto 1fr' }}
+      gap="6"
+      height="100%"
+      overflowX="auto"
+      minWidth="500px"
+    >
       <Column
         display={{ xs: 'none', md: 'flex' }}
         gap="6"

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

@@ -19,7 +19,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const data = await getEventData(eventId);
+  const data = await getEventData(websiteId, eventId);
 
   return json(data);
 }

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

@@ -3,6 +3,7 @@ import { getQueryFilters, parseRequest } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
 import { canViewWebsite } from '@/permissions';
 import { getEventDataEvents } from '@/queries/sql/events/getEventDataEvents';
+import { filterParams } from '@/lib/schema';
 
 export async function GET(
   request: Request,
@@ -12,6 +13,7 @@ export async function GET(
     startAt: z.coerce.number().int(),
     endAt: z.coerce.number().int(),
     event: z.string().optional(),
+    ...filterParams,
   });
   const { auth, query, error } = await parseRequest(request, schema);
 

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

@@ -1,16 +1,17 @@
-import { z } from 'zod';
 import { getQueryFilters, parseRequest } from '@/lib/request';
-import { unauthorized, json } from '@/lib/response';
+import { json, unauthorized } from '@/lib/response';
+import { filterParams, pagingParams, searchParams } from '@/lib/schema';
 import { canViewWebsite } from '@/permissions';
-import { dateRangeParams, pagingParams, filterParams, searchParams } from '@/lib/schema';
 import { getWebsiteEvents } from '@/queries/sql';
+import { z } from 'zod';
 
 export async function GET(
   request: Request,
   { params }: { params: Promise<{ websiteId: string }> },
 ) {
   const schema = z.object({
-    ...dateRangeParams,
+    startAt: z.coerce.number().optional(),
+    endAt: z.coerce.number().optional(),
     ...filterParams,
     ...pagingParams,
     ...searchParams,

src/components/hooks/queries/useWebsiteEventsQuery.ts

@@ -15,14 +15,20 @@ export function useWebsiteEventsQuery(
   options?: ReactQueryOptions,
 ) {
   const { get } = useApi();
-  const date = useDateParameters();
+  const { startAt, endAt, unit, timezone } = useDateParameters();
   const filters = useFilterParameters();
 
   return usePagedQuery({
-    queryKey: ['websites:events', { websiteId, ...date, ...filters, ...params }],
+    queryKey: [
+      'websites:events',
+      { websiteId, startAt, endAt, unit, timezone, ...filters, ...params },
+    ],
     queryFn: pageParams =>
       get(`/websites/${websiteId}/events`, {
-        ...date,
+        startAt,
+        endAt,
+        unit,
+        timezone,
         ...filters,
         ...pageParams,
         eventType: EVENT_TYPES[params.view],

src/components/hooks/queries/useWebsiteEventsSeriesQuery.ts

@@ -5,12 +5,13 @@ import { ReactQueryOptions } from '@/lib/types';
 
 export function useWebsiteEventsSeriesQuery(websiteId: string, options?: ReactQueryOptions) {
   const { get, useQuery } = useApi();
-  const date = useDateParameters();
+  const { startAt, endAt, unit, timezone } = useDateParameters();
   const filters = useFilterParameters();
 
   return useQuery({
-    queryKey: ['websites:events:series', { websiteId, ...date, ...filters }],
-    queryFn: () => get(`/websites/${websiteId}/events/series`, { ...date, ...filters }),
+    queryKey: ['websites:events:series', { websiteId, startAt, endAt, unit, timezone, ...filters }],
+    queryFn: () =>
+      get(`/websites/${websiteId}/events/series`, { startAt, endAt, unit, timezone, ...filters }),
     enabled: !!websiteId,
     ...options,
   });

src/queries/sql/events/getEventData.ts

@@ -5,14 +5,16 @@ import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
 
 const FUNCTION_NAME = 'getEventData';
 
-export async function getEventData(...args: [eventId: string]): Promise<EventData[]> {
+export async function getEventData(
+  ...args: [websiteId: string, eventId: string]
+): Promise<EventData[]> {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
   });
 }
 
-async function relationalQuery(eventId: string) {
+async function relationalQuery(websiteId: string, eventId: string) {
   const { rawQuery } = prisma;
 
   return rawQuery(
@@ -29,14 +31,15 @@ async function relationalQuery(eventId: string) {
        data_type as dataType,
        created_at as createdAt
     from event_data
-    where event_id = {{eventId::uuid}}
+    website_id = {{websiteId::uuid}}
+      event_id = {{eventId::uuid}}
     `,
-    { eventId },
+    { websiteId, eventId },
     FUNCTION_NAME,
   );
 }
 
-async function clickhouseQuery(eventId: string): Promise<EventData[]> {
+async function clickhouseQuery(websiteId: string, eventId: string): Promise<EventData[]> {
   const { rawQuery } = clickhouse;
 
   return rawQuery(
@@ -53,9 +56,10 @@ async function clickhouseQuery(eventId: string): Promise<EventData[]> {
         data_type as dataType,
         created_at as createdAt
       from event_data
-      where event_id = {eventId:UUID}
+      where website_id = {websiteId:UUID} 
+        and event_id = {eventId:UUID}
     `,
-    { eventId },
+    { websiteId, eventId },
     FUNCTION_NAME,
   );
 }

src/queries/sql/events/getEventDataEvents.ts

@@ -25,7 +25,10 @@ export async function getEventDataEvents(
 async function relationalQuery(websiteId: string, filters: QueryFilters) {
   const { rawQuery, parseFilters } = prisma;
   const { event } = filters;
-  const { queryParams } = parseFilters(filters);
+  const { queryParams } = parseFilters({
+    ...filters,
+    websiteId,
+  });
 
   if (event) {
     return rawQuery(
@@ -75,7 +78,10 @@ async function clickhouseQuery(
 ): Promise<{ eventName: string; propertyName: string; dataType: number; total: number }[]> {
   const { rawQuery, parseFilters } = clickhouse;
   const { event } = filters;
-  const { queryParams } = parseFilters(filters);
+  const { queryParams } = parseFilters({
+    ...filters,
+    websiteId,
+  });
 
   if (event) {
     return rawQuery(