watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 04:37:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Updated expanded view. Some style fixes.

Browse source
This commit is contained in:
Mike Cao 2025-08-23 03:05:21 -07:00
parent c8fe93dd9d
commit 08f9adaddf
13 changed files with 164 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/queries/sql/events/getEventMetrics.ts
View file

@ -4,21 +4,21 @@ import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
import prisma from '@/lib/prisma';
import { QueryFilters } from '@/lib/types';
export interface WebsiteEventMetricParameters {
export interface EventMetricParameters {
type: string;
limit?: string;
offset?: string;
}
export interface WebsiteEventMetricData {
export interface EventMetricData {
x: string;
t: string;
y: number;
}
export async function getEventMetrics(
...args: [websiteId: string, parameters: WebsiteEventMetricParameters, filters: QueryFilters]
): Promise<WebsiteEventMetricData[]> {
...args: [websiteId: string, parameters: EventMetricParameters, filters: QueryFilters]
): Promise<EventMetricData[]> {
return runQuery({
[PRISMA]: () => relationalQuery(...args),
[CLICKHOUSE]: () => clickhouseQuery(...args),
@ -27,7 +27,7 @@ export async function getEventMetrics(
async function relationalQuery(
websiteId: string,
parameters: WebsiteEventMetricParameters,
parameters: EventMetricParameters,
filters: QueryFilters,
) {
const { type, limit = 500, offset = 0 } = parameters;
@ -63,9 +63,9 @@ async function relationalQuery(
async function clickhouseQuery(
websiteId: string,
parameters: WebsiteEventMetricParameters,
parameters: EventMetricParameters,
filters: QueryFilters,
): Promise<WebsiteEventMetricData[]> {
): Promise<EventMetricData[]> {
const { type, limit = 500, offset = 0 } = parameters;
const column = FILTER_COLUMNS[type] || type;
const { rawQuery, parseFilters } = clickhouse;

2
src/queries/sql/pageviews/getPageviewExpandedMetrics.ts
View file

@ -111,7 +111,7 @@ async function clickhouseQuery(
if (column === 'referrer_domain') {
excludeDomain = `and referrer_domain != hostname and referrer_domain != ''`;
if (type === 'grouped') {
if (type === 'domain') {
column = toClickHouseGroupedReferrer(GROUPED_DOMAINS);
}
}