From 2df67fbad90b2bb33b79c9cb5a90efc6507fc600 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 11 Feb 2025 11:27:13 -0800
Subject: [PATCH] Fixed reports loading the wrong dates.

---
 src/components/hooks/queries/useReport.ts       | 13 ++++++-------
 src/queries/sql/pageviews/getPageviewMetrics.ts |  4 +---
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/components/hooks/queries/useReport.ts b/src/components/hooks/queries/useReport.ts
index f7d2a1a0..45aea19c 100644
--- a/src/components/hooks/queries/useReport.ts
+++ b/src/components/hooks/queries/useReport.ts
@@ -3,6 +3,7 @@ import { useCallback, useEffect, useState } from 'react';
 import { useApi } from '../useApi';
 import { useTimezone } from '../useTimezone';
 import { useMessages } from '../useMessages';
+import { parseDateRange } from '@/lib/date';
 
 export function useReport(
   reportId: string,
@@ -24,14 +25,12 @@ export function useReport(
     const data: any = await get(`/reports/${id}`);
 
     const { dateRange } = data?.parameters || {};
-    const { startDate, endDate } = dateRange || {};
 
-    if (startDate && endDate) {
-      dateRange.startDate = new Date(startDate);
-      dateRange.endDate = new Date(endDate);
-    }
-
-    data.parameters = { ...defaultParameters?.parameters, ...data.parameters };
+    data.parameters = {
+      ...defaultParameters?.parameters,
+      ...data.parameters,
+      dateRange: parseDateRange(dateRange.value),
+    };
 
     setReport(data);
   };
diff --git a/src/queries/sql/pageviews/getPageviewMetrics.ts b/src/queries/sql/pageviews/getPageviewMetrics.ts
index fa4c4fa7..f7604298 100644
--- a/src/queries/sql/pageviews/getPageviewMetrics.ts
+++ b/src/queries/sql/pageviews/getPageviewMetrics.ts
@@ -32,7 +32,6 @@ async function relationalQuery(
     websiteId,
     {
       ...filters,
-      eventType: column === 'event_name' ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
     },
     { joinSession: SESSION_COLUMNS.includes(type) },
   );
@@ -54,7 +53,6 @@ async function relationalQuery(
         from website_event
         where website_event.website_id = {{websiteId::uuid}}
           and website_event.created_at between {{startDate}} and {{endDate}}
-          and event_type = {{eventType}}
         group by visit_id
       ) x
       on x.visit_id = website_event.visit_id
@@ -103,7 +101,7 @@ async function clickhouseQuery(
     let entryExitQuery = '';
 
     if (column === 'referrer_domain') {
-      excludeDomain = `and referrer_domain != hostname and hostname != '' and referrer_domain != ''`;
+      excludeDomain = `and referrer_domain != hostname and hostname != ''`;
     }
 
     if (type === 'entry' || type === 'exit') {