Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Fixed reports loading the wrong dates.

Mike Cao2df67fbad90b
diff --git a/src/components/hooks/queries/useReport.ts b/src/components/hooks/queries/useReport.ts
index f7d2a1a0c..45aea19cf 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 fa4c4fa71..f76042988 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') {