m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-06 01:15:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Mike Cao 2024-08-27 14:01:47 -07:00
commit 1341f449a8
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/charts/BarChart.tsx
View File

@ -36,7 +36,7 @@ export function BarChart(props: BarChartProps) {
x: { x: {
type: XAxisType, type: XAxisType,
stacked: true, stacked: true,
min: minDate, min: unit === 'minute' ? minDate : '',
max: maxDate, max: maxDate,
time: { time: {
unit, unit,

4
src/lib/clickhouse.ts
View File

@ -63,9 +63,9 @@ function getDateStringSQL(data: any, unit: string = 'utc', timezone?: string) {
function getDateSQL(field: string, unit: string, timezone?: string) { function getDateSQL(field: string, unit: string, timezone?: string) {
if (timezone) { if (timezone) {
return `date_trunc('${unit}', ${field}, '${timezone}')`; return `toDateTime(date_trunc('${unit}', ${field}, '${timezone}'), '${timezone}')`;
} }
return `date_trunc('${unit}', ${field})`; return `toDateTime(date_trunc('${unit}', ${field}))`;
} }
function mapFilter(column: string, operator: string, name: string, type: string = 'String') { function mapFilter(column: string, operator: string, name: string, type: string = 'String') {

8
src/queries/analytics/pageviews/getPageviewStats.ts
View File

@ -41,8 +41,8 @@ async function clickhouseQuery(
websiteId: string, websiteId: string,
filters: QueryFilters, filters: QueryFilters,
): Promise<{ x: string; y: number }[]> { ): Promise<{ x: string; y: number }[]> {
const { unit = 'day' } = filters; const { timezone = 'utc', unit = 'day' } = filters;
const { parseFilters, rawQuery } = clickhouse; const { parseFilters, rawQuery, getDateSQL } = clickhouse;
const { filterQuery, params } = await parseFilters(websiteId, { const { filterQuery, params } = await parseFilters(websiteId, {
...filters, ...filters,
eventType: EVENT_TYPE.pageView, eventType: EVENT_TYPE.pageView,
@ -57,7 +57,7 @@ async function clickhouseQuery(
g.y as y g.y as y
from ( from (
select select
date_trunc('${unit}', created_at) as t, ${getDateSQL('website_event.created_at', unit, timezone)} as t,
count(*) as y count(*) as y
from website_event from website_event
where website_id = {websiteId:UUID} where website_id = {websiteId:UUID}
@ -75,7 +75,7 @@ async function clickhouseQuery(
g.y as y g.y as y
from ( from (
select select
date_trunc('${unit}', created_at) as t, ${getDateSQL('website_event.created_at', unit, timezone)} as t,
sum(views)as y sum(views)as y
from website_event_stats_hourly website_event from website_event_stats_hourly website_event
where website_id = {websiteId:UUID} where website_id = {websiteId:UUID}

12
src/queries/analytics/sessions/getSessionStats.ts
View File

@ -41,8 +41,8 @@ async function clickhouseQuery(
websiteId: string, websiteId: string,
filters: QueryFilters, filters: QueryFilters,
): Promise<{ x: string; y: number }[]> { ): Promise<{ x: string; y: number }[]> {
const { unit = 'day' } = filters; const { timezone = 'utc', unit = 'day' } = filters;
const { parseFilters, rawQuery } = clickhouse; const { parseFilters, rawQuery, getDateSQL } = clickhouse;
const { filterQuery, params } = await parseFilters(websiteId, { const { filterQuery, params } = await parseFilters(websiteId, {
...filters, ...filters,
eventType: EVENT_TYPE.pageView, eventType: EVENT_TYPE.pageView,
@ -53,11 +53,11 @@ async function clickhouseQuery(
if (EVENT_COLUMNS.some(item => Object.keys(filters).includes(item)) || unit === 'minute') { if (EVENT_COLUMNS.some(item => Object.keys(filters).includes(item)) || unit === 'minute') {
sql = ` sql = `
select select
g.t as x, g.t as x,
g.y as y g.y as y
from ( from (
select select
date_trunc('${unit}', created_at) as t, ${getDateSQL('website_event.created_at', unit, timezone)} as t,
count(distinct session_id) as y count(distinct session_id) as y
from website_event from website_event
where website_id = {websiteId:UUID} where website_id = {websiteId:UUID}
@ -71,11 +71,11 @@ async function clickhouseQuery(
} else { } else {
sql = ` sql = `
select select
g.t as x, g.t as x,
g.y as y g.y as y
from ( from (
select select
date_trunc('${unit}', created_at) as t, ${getDateSQL('website_event.created_at', unit, timezone)} as t,
uniq(session_id) as y uniq(session_id) as y
from website_event_stats_hourly website_event from website_event_stats_hourly website_event
where website_id = {websiteId:UUID} where website_id = {websiteId:UUID}