From 8d92509f71e065642d9f723f928e54afd2b9d554 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Mon, 19 Aug 2024 10:53:31 -0700
Subject: [PATCH] Fixed queries.

---
 .../sessions/[sessionId]/SessionActivity.module.css  |  6 +++++-
 .../sessions/[sessionId]/SessionActivity.tsx         |  2 +-
 src/queries/analytics/events/getWebsiteEvents.ts     |  3 +--
 src/queries/analytics/getWebsiteStats.ts             | 12 ++++++++----
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.module.css b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.module.css
index bcc6868d..b49230c7 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.module.css
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.module.css
@@ -12,7 +12,11 @@
 
 .time {
   color: var(--font-color200);
-  width: 120px;
+  width: 150px;
+}
+
+.value {
+  white-space: nowrap;
 }
 
 .header {
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
index 66393493..187205e9 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
@@ -42,7 +42,7 @@ export function SessionActivity({
                 </StatusLight>
               </div>
               <Icon>{eventName ? <Icons.Bolt /> : <Icons.Eye />}</Icon>
-              <div>{eventName || urlPath}</div>
+              <div className={styles.value}>{eventName || urlPath}</div>
             </div>
           </>
         );
diff --git a/src/queries/analytics/events/getWebsiteEvents.ts b/src/queries/analytics/events/getWebsiteEvents.ts
index 9304d69e..e558c609 100644
--- a/src/queries/analytics/events/getWebsiteEvents.ts
+++ b/src/queries/analytics/events/getWebsiteEvents.ts
@@ -17,12 +17,11 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, pagePar
   const { query } = pageParams;
 
   const where = {
-    ...filters,
     id: websiteId,
     ...prisma.getSearchParameters(query, [{ eventName: 'contains' }, { urlPath: 'contains' }]),
   };
 
-  return pagedQuery('website_event', { where }, pageParams);
+  return pagedQuery('WebsiteEvent', { where }, pageParams);
 }
 
 async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
diff --git a/src/queries/analytics/getWebsiteStats.ts b/src/queries/analytics/getWebsiteStats.ts
index c35aea06..17bf0c8d 100644
--- a/src/queries/analytics/getWebsiteStats.ts
+++ b/src/queries/analytics/getWebsiteStats.ts
@@ -22,9 +22,13 @@ async function relationalQuery(
   { pageviews: number; visitors: number; visits: number; bounces: number; totaltime: number }[]
 > {
   const { getTimestampDiffSQL, parseFilters, rawQuery } = prisma;
-  const { filterQuery, joinSession, params } = await parseFilters(websiteId, {
-    ...filters,
-  });
+  const { filterQuery, joinSession, params } = await parseFilters(
+    websiteId,
+    {
+      ...filters,
+    },
+    { joinSession: true },
+  );
 
   return rawQuery(
     `
@@ -34,7 +38,7 @@ async function relationalQuery(
       count(distinct t.visit_id) as "visits",
       count(distinct t.country) as "countries",
       sum(case when t.c = 1 then 1 else 0 end) as "bounces",
-      sum(${getTimestampDiffSQL('t.min_time', 't.max_time')}) as "totaltime",
+      sum(${getTimestampDiffSQL('t.min_time', 't.max_time')}) as "totaltime"
     from (
       select
         website_event.session_id,