refactor Property components to be resused for both session/event data. Implement session-data screens + filtering. Remove all event-data specific compoenents/queries

This commit is contained in:
Francis Cao committed 2026-04-29 13:11:03 -07:00
1 parent 9da332c489
commit 680a1ca1a2
71 files changed
+2814 -958

No files matched your search

+13 -9
View File
@@ -4,7 +4,7 @@ import { formatInTimeZone } from 'date-fns-tz';
import debug from 'debug';
import { DATA_TYPE, DEFAULT_PAGE_SIZE, FILTER_COLUMNS, OPERATORS } from './constants';
import { filtersObjectToArray } from './params';
import type { EventPropertyFilter, Operator, QueryFilters, QueryOptions } from './types';
import type { Operator, PropertyFilter, QueryFilters, QueryOptions } from './types';
export const CLICKHOUSE_DATE_FORMATS = {
utc: '%Y-%m-%dT%H:%i:%SZ',
@@ -238,8 +238,9 @@ function parseFilters(filters: Record<string, any>, options?: QueryOptions) {
};
}
function getEventPropertyFilterQuery(
filters: EventPropertyFilter[] = [],
function getPropertyFilterQuery(
filters: PropertyFilter[] = [],
propertyType: 'event' | 'session' = 'event',
timezone?: string,
): {
sql: string;
@@ -249,10 +250,13 @@ function getEventPropertyFilterQuery(
const parts: string[] = [];
const params: Record<string, any> = {};
const table = propertyType === 'event' ? 'event_data' : 'session_data final';
const column = propertyType === 'event' ? 'event_id' : 'session_id';
const outerColumn = propertyType === 'event' ? 'event_id' : 'website_event.session_id';
filters.forEach(({ propertyName, dataType, operator, value }, i) => {
const keyParam = `epf_key_${i}`;
const valParam = `epf_val_${i}`;
const keyParam = `pf_key_${i}`;
const valParam = `pf_val_${i}`;
params[keyParam] = propertyName;
let condition: string;
@@ -329,9 +333,9 @@ function getEventPropertyFilterQuery(
}
}
parts.push(`and event_id in (
select event_id
from event_data
parts.push(`and ${outerColumn} in (
select ${column}
from ${table}
where website_id = {websiteId:UUID}
and created_at between {startDate:DateTime64} and {endDate:DateTime64}
and data_key = {${keyParam}:String}
@@ -429,7 +433,7 @@ export default {
getDateSQL,
getSearchSQL,
getFilterQuery,
getEventPropertyFilterQuery,
getPropertyFilterQuery,
getUTCString,
parseFilters,
pagedRawQuery,
+29 -6
View File
@@ -1,5 +1,5 @@
import { DATA_TYPE, FILTER_COLUMNS, OPERATORS } from '@/lib/constants';
import type { EventPropertyFilter, Filter, Operator, QueryFilters, QueryOptions } from '@/lib/types';
import type { Filter, Operator, PropertyFilter, QueryFilters, QueryOptions } from '@/lib/types';
const VALID_OPERATORS: Operator[] = Object.values(OPERATORS);
const VALID_EVENT_DATA_TYPES = Object.values(DATA_TYPE);
@@ -100,12 +100,24 @@ export function filtersArrayToObject(filters: Filter[]) {
}, {});
}
export function parseEventPropertyFilters(query: Record<string, any>): EventPropertyFilter[] {
function getPropertyFilterPrefix(key: string, prefixes: string[]) {
return prefixes.find(prefix => key.startsWith(`${prefix}_`));
}
export function parsePropertyFilters(
query: Record<string, any>,
prefixes: string[] = ['pf'],
): PropertyFilter[] {
return Object.entries(query)
.filter(([key]) => /^epf_/.test(key))
.flatMap(([key, val]) => {
const prefix = getPropertyFilterPrefix(key, prefixes);
if (!prefix) {
return [];
}
const stringValue = String(val);
const withoutPrefix = key.slice(4); // strip "epf_"
const withoutPrefix = key.slice(prefix.length + 1);
const propertyName = withoutPrefix.replace(/\d+$/, ''); // strip trailing index digits
const prefixedDotMatch = stringValue.match(/^(\d+)\.([^.]+)\.(.*)$/);
const untypedDotMatch = stringValue.match(/^([^.]+)\.(.*)$/);
@@ -134,13 +146,24 @@ export function parseEventPropertyFilters(query: Record<string, any>): EventProp
});
}
export function serializeEventPropertyFilters(filters: EventPropertyFilter[]): Record<string, string> {
export function parseEventPropertyFilters(query: Record<string, any>) {
return parsePropertyFilters(query, ['pf']);
}
export function serializePropertyFilters(
filters: PropertyFilter[],
prefix = 'pf',
): Record<string, string> {
const counts: Record<string, number> = {};
return Object.fromEntries(
filters.map(f => {
const n = counts[f.propertyName] ?? 0;
counts[f.propertyName] = n + 1;
return [`epf_${f.propertyName}${n > 0 ? n : ''}`, `${f.dataType}.${f.operator}.${f.value}`];
return [`${prefix}_${f.propertyName}${n > 0 ? n : ''}`, `${f.dataType}.${f.operator}.${f.value}`];
}),
);
}
export function serializeEventPropertyFilters(filters: PropertyFilter[]) {
return serializePropertyFilters(filters, 'pf');
}
+16 -11
View File
@@ -4,7 +4,7 @@ import { readReplicas } from '@prisma/extension-read-replicas';
import debug from 'debug';
import { DATA_TYPE, DEFAULT_PAGE_SIZE, FILTER_COLUMNS, OPERATORS, SESSION_COLUMNS } from './constants';
import { filtersObjectToArray } from './params';
import type { EventPropertyFilter, Operator, QueryFilters, QueryOptions } from './types';
import type { Operator, PropertyFilter, QueryFilters, QueryOptions } from './types';
const log = debug('umami:prisma');
@@ -273,8 +273,9 @@ function parseFilters(filters: Record<string, any>, options?: QueryOptions) {
};
}
function getEventPropertyFilterQuery(
filters: EventPropertyFilter[] = [],
function getPropertyFilterQuery(
filters: PropertyFilter[] = [],
propertyType: 'event' | 'session' = 'event',
timezone?: string,
): {
sql: string;
@@ -284,10 +285,14 @@ function getEventPropertyFilterQuery(
const parts: string[] = [];
const params: Record<string, any> = {};
const table = propertyType === 'event' ? 'event_data' : 'session_data';
const column = propertyType === 'event' ? 'website_event_id' : 'session_id';
const outerColumn =
propertyType === 'event' ? 'website_event.event_id' : 'website_event.session_id';
filters.forEach(({ propertyName, dataType, operator, value }, i) => {
const keyParam = `epf_key_${i}`;
const valParam = `epf_val_${i}`;
const keyParam = `pf_key_${i}`;
const valParam = `pf_val_${i}`;
params[keyParam] = propertyName;
let condition: string;
@@ -346,8 +351,8 @@ function getEventPropertyFilterQuery(
params[valParam] = vals;
condition =
operator === OPERATORS.equals
? `${col} = ANY({{${valParam}::text[]}})`
: `${col} != ALL({{${valParam}::text[]}})`;
? `${col} = ANY({{${valParam}}})`
: `${col} != ALL({{${valParam}}})`;
} else if (REGEX_OPERATORS.includes(operator)) {
if (!value) return;
params[valParam] = value;
@@ -367,9 +372,9 @@ function getEventPropertyFilterQuery(
}
}
parts.push(`and website_event.event_id in (
select website_event_id
from event_data
parts.push(`and ${outerColumn} in (
select ${column}
from ${table}
where website_id = {{websiteId::uuid}}
and created_at between {{startDate}} and {{endDate}}
and data_key = {{${keyParam}}}
@@ -567,7 +572,7 @@ export default {
getDateStringSQL,
getDateWeeklySQL,
getFilterQuery,
getEventPropertyFilterQuery,
getPropertyFilterQuery,
getSearchParameters,
getTimestampDiffSQL,
getSearchSQL,
+1 -1
View File
@@ -32,7 +32,7 @@ export async function parseRequest(
// Re-add dynamic params stripped by Zod schema: suffixed filter params (browser1, os2)
for (const key of Object.keys(rawQuery)) {
if ((/\d+$/.test(key) || /^epf_/.test(key)) && !(key in query)) {
if ((/\d+$/.test(key) || /^pf_/.test(key)) && !(key in query)) {
query[key] = rawQuery[key];
}
}
+28 -1
View File
@@ -30,13 +30,15 @@ export interface Auth {
};
}
export interface EventPropertyFilter {
export interface PropertyFilter {
propertyName: string;
dataType: number;
operator: Operator;
value: string;
}
export type EventPropertyFilter = PropertyFilter;
export interface Filter {
name: string;
operator: Operator;
@@ -79,6 +81,31 @@ export interface EventDataNumericStats {
min: number;
}
export interface SessionDataPivotRow {
sessionId: string;
distinctId: string;
createdAt: string | Date;
propertyKeys: string[];
propertyValues: string[];
}
export interface PropertyCardinalityBucket {
label: string;
count: number;
}
export interface PropertyLeaderboardRow {
label: string;
activity: number;
sessions: number;
visits: number;
views: number;
events: number;
totaltime: number;
newSessions: number;
returningSessions: number;
}
export interface QueryOptions {
joinSession?: boolean;
columns?: Record<string, string>;