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.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
fix monthly and all time charts
Francis Caob1caf6edb702
diff --git a/src/components/charts/BarChart.tsx b/src/components/charts/BarChart.tsxindex b96812210..7a8dcbed8 100644--- a/src/components/charts/BarChart.tsx+++ b/src/components/charts/BarChart.tsx@@ -36,7 +36,7 @@ export function BarChart(props: BarChartProps) {x: {type: XAxisType,stacked: true,- min: minDate,+ min: unit === 'minute' ? minDate : '',max: maxDate,time: {unit,diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.tsindex 332d07275..5502b5bab 100644--- a/src/lib/clickhouse.ts+++ b/src/lib/clickhouse.ts@@ -63,9 +63,9 @@ function getDateStringSQL(data: any, unit: string = 'utc', timezone?: string) {function getDateSQL(field: string, unit: string, timezone?: string) {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') {diff --git a/src/queries/analytics/pageviews/getPageviewStats.ts b/src/queries/analytics/pageviews/getPageviewStats.tsindex 2230da91d..48b82000a 100644--- a/src/queries/analytics/pageviews/getPageviewStats.ts+++ b/src/queries/analytics/pageviews/getPageviewStats.ts@@ -42,7 +42,7 @@ async function clickhouseQuery(filters: QueryFilters,): Promise<{ x: string; y: number }[]> {const { timezone = 'utc', unit = 'day' } = filters;- const { parseFilters, rawQuery } = clickhouse;+ const { parseFilters, rawQuery, getDateSQL } = clickhouse;const { filterQuery, params } = await parseFilters(websiteId, {...filters,eventType: EVENT_TYPE.pageView,@@ -57,7 +57,7 @@ async function clickhouseQuery(g.y as yfrom (select- date_trunc('${unit}', created_at, '${timezone}') as t,+ ${getDateSQL('website_event.created_at', unit, timezone)} as t,count(*) as yfrom website_eventwhere website_id = {websiteId:UUID}@@ -75,7 +75,7 @@ async function clickhouseQuery(g.y as yfrom (select- date_trunc('${unit}', created_at, '${timezone}') as t,+ ${getDateSQL('website_event.created_at', unit, timezone)} as t,sum(views)as yfrom website_event_stats_hourly website_eventwhere website_id = {websiteId:UUID}diff --git a/src/queries/analytics/sessions/getSessionStats.ts b/src/queries/analytics/sessions/getSessionStats.tsindex bddebcec1..212f15e9b 100644--- a/src/queries/analytics/sessions/getSessionStats.ts+++ b/src/queries/analytics/sessions/getSessionStats.ts@@ -42,7 +42,7 @@ async function clickhouseQuery(filters: QueryFilters,): Promise<{ x: string; y: number }[]> {const { timezone = 'utc', unit = 'day' } = filters;- const { parseFilters, rawQuery } = clickhouse;+ const { parseFilters, rawQuery, getDateSQL } = clickhouse;const { filterQuery, params } = await parseFilters(websiteId, {...filters,eventType: EVENT_TYPE.pageView,@@ -53,11 +53,11 @@ async function clickhouseQuery(if (EVENT_COLUMNS.some(item => Object.keys(filters).includes(item)) || unit === 'minute') {sql = `select- g.t as x,+ g.t as x,g.y as yfrom (select- date_trunc('${unit}', created_at, '${timezone}') as t,+ ${getDateSQL('website_event.created_at', unit, timezone)} as t,count(distinct session_id) as yfrom website_eventwhere website_id = {websiteId:UUID}@@ -71,11 +71,11 @@ async function clickhouseQuery(} else {sql = `select- g.t as x,+ g.t as x,g.y as yfrom (select- date_trunc('${unit}', created_at, '${timezone}') as t,+ ${getDateSQL('website_event.created_at', unit, timezone)} as t,uniq(session_id) as yfrom website_event_stats_hourly website_eventwhere website_id = {websiteId:UUID}