github/umami
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed reports loading the wrong dates.

Browse Source
This commit is contained in:
Mike Cao
2025-02-11 11:27:13 -08:00
parent 8dd526a1ab
commit 2df67fbad9
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/hooks/queries/useReport.ts
View File

@@ -3,6 +3,7 @@ import { useCallback, useEffect, useState } from 'react';
import { useApi } from '../useApi'; import { useApi } from '../useApi';
import { useTimezone } from '../useTimezone'; import { useTimezone } from '../useTimezone';
import { useMessages } from '../useMessages'; import { useMessages } from '../useMessages';
import { parseDateRange } from '@/lib/date';
export function useReport( export function useReport(
reportId: string, reportId: string,
@@ -24,14 +25,12 @@ export function useReport(
const data: any = await get(`/reports/${id}`); const data: any = await get(`/reports/${id}`);
const { dateRange } = data?.parameters || {}; const { dateRange } = data?.parameters || {};
const { startDate, endDate } = dateRange || {};
if (startDate && endDate) { data.parameters = {
dateRange.startDate = new Date(startDate); ...defaultParameters?.parameters,
dateRange.endDate = new Date(endDate); ...data.parameters,
} dateRange: parseDateRange(dateRange.value),
};
data.parameters = { ...defaultParameters?.parameters, ...data.parameters };
setReport(data); setReport(data);
}; };

4
src/queries/sql/pageviews/getPageviewMetrics.ts
View File

@@ -32,7 +32,6 @@ async function relationalQuery(
websiteId, websiteId,
{ {
...filters, ...filters,
eventType: column === 'event_name' ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
}, },
{ joinSession: SESSION_COLUMNS.includes(type) }, { joinSession: SESSION_COLUMNS.includes(type) },
); );
@@ -54,7 +53,6 @@ async function relationalQuery(
from website_event from website_event
where website_event.website_id = {{websiteId::uuid}} where website_event.website_id = {{websiteId::uuid}}
and website_event.created_at between {{startDate}} and {{endDate}} and website_event.created_at between {{startDate}} and {{endDate}}
and event_type = {{eventType}}
group by visit_id group by visit_id
) x ) x
on x.visit_id = website_event.visit_id on x.visit_id = website_event.visit_id
@@ -103,7 +101,7 @@ async function clickhouseQuery(
let entryExitQuery = ''; let entryExitQuery = '';
if (column === 'referrer_domain') { 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') { if (type === 'entry' || type === 'exit') {