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
Merge branch 'dev' into jajaja
Mike Cao87449ece9e92
diff --cc db/postgresql/schema.prismaindex c297f4c43,2535f4963..39dac240e--- a/db/postgresql/schema.prisma+++ b/db/postgresql/schema.prisma@@@ -239,13 -236,13 +239,13 @@@ model Report}model Segment {- id String @id() @unique() @map("segment_id") @db.Uuid- websiteId String @map("website_id") @db.Uuid- type String @db.VarChar(200)- name String @db.VarChar(200)- filters Json- createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6)- updatedAt DateTime? @updatedAt @map("updated_at") @db.Timestamptz(6)+ id String @id() @unique() @map("segment_id") @db.Uuid+ websiteId String @map("website_id") @db.Uuid+ type String @db.VarChar(200)+ name String @db.VarChar(200)- parameters Json++ parameters Json+ createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6)+ updatedAt DateTime? @updatedAt @map("updated_at") @db.Timestamptz(6)website Website @relation(fields: [websiteId], references: [id])diff --cc src/app/(main)/settings/SettingsLayout.tsxindex 6d00a6ff0,08dcc3eb1..4110820e8--- a/src/app/(main)/settings/SettingsLayout.tsx+++ b/src/app/(main)/settings/SettingsLayout.tsx@@@ -14,38 -9,17 +14,33 @@@ export function SettingsLayout({ childrconst items = [{- key: 'websites',- label: formatMessage(labels.websites),- url: '/settings/websites',+ id: 'profile',+ label: formatMessage(labels.profile),+ url: '/settings/profile',},- { key: 'teams', label: formatMessage(labels.teams), url: '/settings/teams' },+ { id: 'teams', label: formatMessage(labels.teams), url: '/settings/teams' },user.isAdmin && {- key: 'users',- label: formatMessage(labels.users),- url: '/settings/users',+ id: 'websites',+ label: formatMessage(labels.websites),+ url: '/settings/websites',},- user.isAdmin && {- id: 'users',- label: formatMessage(labels.users),- url: '/settings/users',- },].filter(n => n);- return <MenuLayout items={items}>{children}</MenuLayout>;+ const value = items.find(({ url }) => pathname.includes(url))?.id;++ return (+ <PageBody>+ <Column gap="6">+ <PageHeader title={formatMessage(labels.settings)} />+ <Grid columns="160px 1fr" gap>+ <Column>+ <SideMenu items={items} selectedKey={value} />+ </Column>+ <Column>+ <Panel>{children}</Panel>+ </Column>+ </Grid>+ </Column>+ </PageBody>+ );}diff --cc src/app/api/realtime/[websiteId]/route.tsindex f86bfcccf,7f9c1a9a2..f78688c3e--- a/src/app/api/realtime/[websiteId]/route.ts+++ b/src/app/api/realtime/[websiteId]/route.ts@@@ -21,14 -22,9 +21,14 @@@ export async function GETreturn unauthorized();}- const filters = await getQueryFilters({- const startDate = subMinutes(startOfMinute(new Date()), REALTIME_RANGE);++ const filters = getQueryFilters({+ ...query,+ websiteId,+ startAt: subMinutes(startOfMinute(new Date()), REALTIME_RANGE).getTime(),+ endAt: Date.now(),+ });- const data = await getRealtimeData(websiteId, { startDate, timezone });+ const data = await getRealtimeData(websiteId, filters);return json(data);}diff --cc src/app/api/users/[userId]/usage/route.tsindex 677e0bd7a,e6ff217d6..466d97e56--- a/src/app/api/users/[userId]/usage/route.ts+++ b/src/app/api/users/[userId]/usage/route.ts@@@ -22,7 -22,10 +22,7 @@@ export async function GET(request: Requ}const { userId } = await params;- const filters = await getQueryFilters(query);- const { startAt, endAt } = query;-- const startDate = new Date(+startAt);- const endDate = new Date(+endAt);++ const filters = getQueryFilters(query);const websites = await getAllUserWebsitesIncludingTeamOwner(userId);diff --cc src/app/api/websites/[websiteId]/event-data/events/route.tsindex eb9842072,aec7b4713..6b8196096--- a/src/app/api/websites/[websiteId]/event-data/events/route.ts+++ b/src/app/api/websites/[websiteId]/event-data/events/route.ts@@@ -25,11 -26,12 +25,11 @@@ export async function GETreturn unauthorized();}- const startDate = new Date(+startAt);- const endDate = new Date(+endAt);+ const { event } = query;- const filters = await getQueryFilters(query);++ const filters = getQueryFilters(query);const data = await getEventDataEvents(websiteId, {- startDate,- endDate,+ ...filters,event,});diff --cc src/app/api/websites/[websiteId]/event-data/fields/route.tsindex 34aa61626,60101e45c..9448c7489--- a/src/app/api/websites/[websiteId]/event-data/fields/route.ts+++ b/src/app/api/websites/[websiteId]/event-data/fields/route.ts@@@ -25,9 -26,13 +25,9 @@@ export async function GETreturn unauthorized();}- const filters = await getQueryFilters(query);- const startDate = new Date(+startAt);- const endDate = new Date(+endAt);++ const filters = getQueryFilters(query);- const data = await getEventDataFields(websiteId, {- startDate,- endDate,- });+ const data = await getEventDataFields(websiteId, filters);return json(data);}diff --cc src/app/api/websites/[websiteId]/event-data/properties/route.tsindex ad39e37aa,fe085f74e..918d51a2a--- a/src/app/api/websites/[websiteId]/event-data/properties/route.ts+++ b/src/app/api/websites/[websiteId]/event-data/properties/route.ts@@@ -26,10 -27,10 +26,10 @@@ export async function GETreturn unauthorized();}- const startDate = new Date(+startAt);- const endDate = new Date(+endAt);+ const { propertyName } = query;- const filters = await getQueryFilters(query);++ const filters = getQueryFilters(query);- const data = await getEventDataProperties(websiteId, { startDate, endDate, propertyName });+ const data = await getEventDataProperties(websiteId, { ...filters, propertyName });return json(data);}diff --cc src/app/api/websites/[websiteId]/event-data/stats/route.tsindex 79dd00594,6928aa1e6..ffc57f969--- a/src/app/api/websites/[websiteId]/event-data/stats/route.ts+++ b/src/app/api/websites/[websiteId]/event-data/stats/route.ts@@@ -26,9 -27,10 +26,9 @@@ export async function GETreturn unauthorized();}- const filters = await getQueryFilters(query);- const startDate = new Date(+startAt);- const endDate = new Date(+endAt);++ const filters = getQueryFilters(query);- const data = await getEventDataStats(websiteId, { startDate, endDate });+ const data = await getEventDataStats(websiteId, filters);return json(data);}diff --cc src/app/api/websites/[websiteId]/event-data/values/route.tsindex 1eab63b51,2a912439c..9377c4a46--- a/src/app/api/websites/[websiteId]/event-data/values/route.ts+++ b/src/app/api/websites/[websiteId]/event-data/values/route.ts@@@ -27,11 -28,12 +27,11 @@@ export async function GETreturn unauthorized();}- const startDate = new Date(+startAt);- const endDate = new Date(+endAt);+ const { eventName, propertyName } = query;- const filters = await getQueryFilters(query);++ const filters = getQueryFilters(query);const data = await getEventDataValues(websiteId, {- startDate,- endDate,+ ...filters,eventName,propertyName,});diff --cc src/app/api/websites/[websiteId]/events/route.tsindex 0bf6f72c0,66eaba2c0..1db9be97b--- a/src/app/api/websites/[websiteId]/events/route.ts+++ b/src/app/api/websites/[websiteId]/events/route.ts@@@ -27,9 -28,10 +27,9 @@@ export async function GETreturn unauthorized();}- const filters = await getQueryFilters(query);- const startDate = new Date(+startAt);- const endDate = new Date(+endAt);++ const filters = getQueryFilters(query);- const data = await getWebsiteEvents(websiteId, { startDate, endDate }, query);+ const data = await getWebsiteEvents(websiteId, filters);return json(data);}diff --cc src/app/api/websites/[websiteId]/session-data/properties/route.tsindex bdc7c53c4,a6d9e2a4a..f38ec5565--- a/src/app/api/websites/[websiteId]/session-data/properties/route.ts+++ b/src/app/api/websites/[websiteId]/session-data/properties/route.ts@@@ -20,9 -20,8 +20,9 @@@ export async function GETreturn error();}- const { startAt, endAt, propertyName } = query;const { websiteId } = await params;+ const { propertyName } = query;- const filters = await getQueryFilters(query);++ const filters = getQueryFilters(query);if (!(await canViewWebsite(auth, websiteId))) {return unauthorized();diff --cc src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.tsindex 5daf2dfbb,aac40c38f..c15d1135f--- a/src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.ts+++ b/src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.ts@@@ -25,9 -26,10 +25,9 @@@ export async function GETreturn unauthorized();}- const filters = await getQueryFilters(query);- const startDate = new Date(+startAt);- const endDate = new Date(+endAt);++ const filters = getQueryFilters(query);- const data = await getSessionActivity(websiteId, sessionId, startDate, endDate);+ const data = await getSessionActivity(websiteId, sessionId, filters);return json(data);}diff --cc src/app/api/websites/[websiteId]/sessions/weekly/route.tsindex 757e9da3a,20be378d7..fb0eb1db9--- a/src/app/api/websites/[websiteId]/sessions/weekly/route.ts+++ b/src/app/api/websites/[websiteId]/sessions/weekly/route.ts@@@ -28,9 -29,10 +28,9 @@@ export async function GETreturn unauthorized();}- const filters = await getQueryFilters(query);- const startDate = new Date(+startAt);- const endDate = new Date(+endAt);++ const filters = getQueryFilters(query);- const data = await getWebsiteSessionsWeekly(websiteId, { startDate, endDate, timezone });+ const data = await getWebsiteSessionsWeekly(websiteId, filters);return json(data);}diff --cc src/app/api/websites/[websiteId]/values/route.tsindex 290e0db85,561c62fe3..8e5a88ac6--- a/src/app/api/websites/[websiteId]/values/route.ts+++ b/src/app/api/websites/[websiteId]/values/route.ts@@@ -1,9 -1,9 +1,10 @@@- import { z } from 'zod';import { canViewWebsite } from '@/lib/auth';- import { EVENT_COLUMNS, FILTER_COLUMNS, SESSION_COLUMNS } from '@/lib/constants';- import { getValues } from '@/queries';- import { parseRequest, getQueryFilters } from '@/lib/request';+ import { EVENT_COLUMNS, FILTER_COLUMNS, FILTER_GROUPS, SESSION_COLUMNS } from '@/lib/constants';-import { getRequestDateRange, parseRequest } from '@/lib/request';++import { getQueryFilters, parseRequest } from '@/lib/request';import { badRequest, json, unauthorized } from '@/lib/response';+ import { getWebsiteSegments, getValues } from '@/queries';+ import { z } from 'zod';++import { dateRangeParams, searchParams } from '@/lib/schema';export async function GET(request: Request,@@@ -11,9 -11,9 +12,8 @@@) {const schema = z.object({type: z.string(),-- startAt: z.coerce.number().int(),-- endAt: z.coerce.number().int(),-- search: z.string().optional(),++ ...dateRangeParams,++ ...searchParams,});const { auth, query, error } = await parseRequest(request, schema);@@@ -23,19 -23,24 +23,25 @@@}const { websiteId } = await params;- const { type } = query;- const { type, search } = query;- const { startDate, endDate } = await getRequestDateRange(query);if (!(await canViewWebsite(auth, websiteId))) {return unauthorized();}- if (!SESSION_COLUMNS.includes(type) && !EVENT_COLUMNS.includes(type)) {++ const { type } = query;+++ if (!SESSION_COLUMNS.includes(type) && !EVENT_COLUMNS.includes(type) && !FILTER_GROUPS[type]) {return badRequest('Invalid type.');}- const filters = await getQueryFilters(query);+ let values;- const values = await getValues(websiteId, FILTER_COLUMNS[type], { ...filters });+ if (FILTER_GROUPS[type]) {+ values = (await getWebsiteSegments(websiteId, type)).map(segment => ({ value: segment.name }));+ } else {- values = await getValues(websiteId, FILTER_COLUMNS[type], startDate, endDate, search);++ const filters = getQueryFilters(query);++ values = await getValues(websiteId, FILTER_COLUMNS[type], filters);+ }return json(values.filter(n => n).sort());}diff --cc src/components/common/LinkButton.tsxindex 69a025d19,3aa2a76a0..ca1baccbc--- a/src/components/common/LinkButton.tsx+++ b/src/components/common/LinkButton.tsx@@@ -11,28 -12,19 +11,21 @@@ export interface LinkButtonProps extendchildren?: ReactNode;}-export function LinkButton({ href, className, variant, scroll = true, children }: LinkButtonProps) {+export function LinkButton({+ href,+ variant,+ scroll = true,+ target,+ children,- isDisabled,+ ...props+}: LinkButtonProps) {const { dir } = useLocale();return (- <Button {...props} variant={variant} isDisabled={isDisabled} asChild>- <Link- href={href}- dir={dir}- scroll={scroll}- target={target}- style={{ pointerEvents: isDisabled ? 'none' : undefined }}- >- <Link- className={classNames(styles.button, className, { [styles[variant]]: true })}- href={href}- dir={dir}- scroll={scroll}- >- {children}- </Link>++ <Button {...props} variant={variant} asChild>++ <Link href={href} dir={dir} scroll={scroll} target={target}>+ {children}+ </Link>+ </Button>);}--export default LinkButton;diff --cc src/components/hooks/useFields.tsindex 5a3bc89be,08b5b1652..f48b2ddaa--- a/src/components/hooks/useFields.ts+++ b/src/components/hooks/useFields.ts@@@ -4,10 -4,12 +4,13 @@@ export function useFields()const { formatMessage, labels } = useMessages();const fields = [+ { name: 'path', type: 'string', label: formatMessage(labels.path) },+ // { name: 'cohort', type: 'string', label: formatMessage(labels.cohort) },+ // { name: 'segment', type: 'string', label: formatMessage(labels.segment) },+ { name: 'url', type: 'string', label: formatMessage(labels.url) },{ name: 'title', type: 'string', label: formatMessage(labels.pageTitle) },{ name: 'referrer', type: 'string', label: formatMessage(labels.referrer) },- { name: 'query', type: 'string', label: formatMessage(labels.query) },+ //{ name: 'query', type: 'string', label: formatMessage(labels.query) },{ name: 'browser', type: 'string', label: formatMessage(labels.browser) },{ name: 'os', type: 'string', label: formatMessage(labels.os) },{ name: 'device', type: 'string', label: formatMessage(labels.device) },diff --cc src/components/messages.tsindex 4f2115330,03f0a7dc3..6eaf743a6--- a/src/components/messages.ts+++ b/src/components/messages.ts@@@ -319,18 -314,6 +323,17 @@@ export const labels = defineMessages(paidVideo: { id: 'label.paid-video', defaultMessage: 'Paid video' },grouped: { id: 'label.grouped', defaultMessage: 'Grouped' },other: { id: 'label.other', defaultMessage: 'Other' },+ boards: { id: 'label.boards', defaultMessage: 'Boards' },+ apply: { id: 'label.apply', defaultMessage: 'Apply' },+ links: { id: 'label.links', defaultMessage: 'Links' },+ pixels: { id: 'label.pixels', defaultMessage: 'Pixels' },+ addBoard: { id: 'label.add-board', defaultMessage: 'Add board' },- cohort: { id: 'label.cohort', defaultMessage: 'Cohort' },+ maximize: { id: 'label.maximize', defaultMessage: 'Maximize' },+ remaining: { id: 'label.remaining', defaultMessage: 'Remaining' },+ conversion: { id: 'label.conversion', defaultMessage: 'Conversion' },+ firstClick: { id: 'label.first-click', defaultMessage: 'First click' },+ lastClick: { id: 'label.last-click', defaultMessage: 'Last click' },+ online: { id: 'label.online', defaultMessage: 'Online' },});export const messages = defineMessages({diff --cc src/lib/clickhouse.tsindex 698b32789,062952d75..1b608cfcb--- a/src/lib/clickhouse.ts+++ b/src/lib/clickhouse.ts@@@ -87,7 -89,22 +87,22 @@@ function mapFilter(column: string, oper}}+ function mapCohortFilter(column: string, operator: string, value: string) {+ switch (operator) {+ case OPERATORS.equals:+ return `${column} = '${value}'`;+ case OPERATORS.notEquals:+ return `${column} != '${value}'`;+ case OPERATORS.contains:+ return `positionCaseInsensitive(${column}, '${value}') > 0`;+ case OPERATORS.doesNotContain:+ return `positionCaseInsensitive(${column}, '${value}') = 0`;+ default:+ return '';+ }+ }+-function getFilterQuery(filters: QueryFilters = {}, options: QueryOptions = {}) {+function getFilterQuery(filters: Record<string, any>, options: QueryOptions = {}) {const query = filtersToArray(filters, options).reduce((arr, { name, column, operator }) => {if (column) {arr.push(`and ${mapFilter(column, operator, name)}`);@@@ -103,7 -120,43 +118,43 @@@return query.join('\n');}+ function getCohortQuery(websiteId: string, filters: QueryFilters = {}, options: QueryOptions = {}) {+ const query = filtersToArray(filters, options).reduce(+ (arr, { name, column, operator, value }) => {+ if (column) {+ arr.push(+ `${arr.length === 0 ? 'where' : 'and'} ${mapCohortFilter(column, operator, value)}`,+ );++ if (name === 'referrer') {+ arr.push(`and referrer_domain != hostname`);+ }+ }++ return arr;+ },+ [],+ );++ if (query.length > 0) {+ // add website and date range filters+ query.push(`and website_id = '${websiteId}'`);+ query.push(+ `and created_at between parseDateTimeBestEffort('${filters.startDate}') and parseDateTimeBestEffort('${filters.endDate}')`,+ );++ return `join+ (select distinct session_id+ from website_event+ ${query.join('\n')}) cohort+ on cohort.session_id = website_event.session_id+ `;+ }++ return '';+ }+-function getDateQuery(filters: QueryFilters = {}) {+function getDateQuery(filters: Record<string, any>) {const { startDate, endDate, timezone } = filters;if (startDate) {@@@ -140,7 -192,12 +191,8 @@@ function parseFilters(filters: Record<sreturn {filterQuery: getFilterQuery(filters, options),dateQuery: getDateQuery(filters),- params: {- ...getFilterParams(filters),- websiteId,- startDate: maxDate(filters.startDate, new Date(website?.resetAt)),- },- cohortQuery: getCohortQuery(websiteId, filters?.cohort),+ queryParams: getQueryParams(filters),++ cohortQuery: getCohortQuery(filters?.cohort),};}diff --cc src/lib/constants.tsindex 35c269fd0,39ecbc088..aa91ea4f4--- a/src/lib/constants.ts+++ b/src/lib/constants.ts@@@ -46,11 -44,16 +46,16 @@@ export const SESSION_COLUMNS ='country','city','region',- 'host',+ 'hostname',];+ export const FILTER_GROUPS = {+ segment: 'segment',+ cohort: 'cohort',+ };+export const FILTER_COLUMNS = {- url: 'url_path',+ path: 'url_path',entry: 'url_path',exit: 'url_path',referrer: 'referrer_domain',diff --cc src/lib/prisma.tsindex 00baea120,273d63fa9..cc184b6a5--- a/src/lib/prisma.ts+++ b/src/lib/prisma.ts@@@ -104,28 -155,80 +104,83 @@@ function mapFilter(column: string, oper}}+ function mapCohortFilter(column: string, operator: string, value: string) {+ const db = getDatabaseType();+ const like = db === POSTGRESQL ? 'ilike' : 'like';++ switch (operator) {+ case OPERATORS.equals:+ return `${column} = '${value}'`;+ case OPERATORS.notEquals:+ return `${column} != '${value}'`;+ case OPERATORS.contains:+ return `${column} ${like} '${value}'`;+ case OPERATORS.doesNotContain:+ return `${column} not ${like} '${value}'`;+ default:+ return '';+ }+ }+-function getFilterQuery(filters: QueryFilters = {}, options: QueryOptions = {}): string {- const query = filtersToArray(filters, options).reduce((arr, { name, column, operator }) => {- if (column) {- arr.push(`and ${mapFilter(column, operator, name)}`);+function getFilterQuery(filters: Record<string, any>, options: QueryOptions = {}): string {+ const query = filtersToArray(filters, options).reduce(+ (arr, { name, column, operator, prefix = '' }) => {+ if (column) {+ arr.push(`and ${mapFilter(`${prefix}${column}`, operator, name)}`);- if (name === 'referrer') {- arr.push(- `and (website_event.referrer_domain != website_event.hostname or website_event.referrer_domain is null)`,- );+ if (name === 'referrer') {+ arr.push(+ `and (website_event.referrer_domain != website_event.hostname or website_event.referrer_domain is null)`,+ );+ }}- }- return arr;- }, []);+ return arr;+ },+ [],+ );return query.join('\n');}+ function getCohortQuery(websiteId: string, filters: QueryFilters = {}, options: QueryOptions = {}) {+ const query = filtersToArray(filters, options).reduce(+ (arr, { name, column, operator, value }) => {+ if (column) {+ arr.push(+ `${arr.length === 0 ? 'where' : 'and'} ${mapCohortFilter(column, operator, value)}`,+ );++ if (name === 'referrer') {+ arr.push(`and referrer_domain != hostname`);+ }+ }++ return arr;+ },+ [],+ );++ if (query.length > 0) {+ // add website and date range filters+ query.push(`and website_event.website_id = '${websiteId}'`);+ query.push(+ `and website_event.created_at between '${filters.startDate}'::timestamptz and '${filters.endDate}'::timestamptz`,+ );++ return `join+ (select distinct website_event.session_id+ from website_event+ join session on session.session_id = website_event.session_id+ ${query.join('\n')}) cohort+ on cohort.session_id = website_event.session_id+ `;+ }++ return '';+ }+-function getDateQuery(filters: QueryFilters = {}) {+function getDateQuery(filters: Record<string, any>) {const { startDate, endDate } = filters;if (startDate) {@@@ -162,9 -267,14 +217,10 @@@ function parseFilters(filters: Record<soptions?.joinSession || joinSession? `inner join session on website_event.session_id = session.session_id`: '',- filterQuery: getFilterQuery(filters, options),dateQuery: getDateQuery(filters),- params: {- ...getFilterParams(filters),- websiteId,- startDate: maxDate(filters.startDate, website?.resetAt),- },- cohortQuery: getCohortQuery(websiteId, filters?.cohort),+ filterQuery: getFilterQuery(filters, options),+ queryParams: getQueryParams(filters),++ cohortQuery: getCohortQuery(filters?.cohort),};}diff --cc src/lib/request.tsindex ef5d1d90d,b75ea1ba1..b0df42a38--- a/src/lib/request.ts+++ b/src/lib/request.ts@@@ -1,10 -1,17 +1,11 @@@-import { z, ZodSchema } from 'zod';-import { FILTER_COLUMNS, FILTER_GROUPS } from '@/lib/constants';+import { z } from 'zod/v4';- import { FILTER_COLUMNS, DEFAULT_PAGE_SIZE } from '@/lib/constants';++import { FILTER_COLUMNS, DEFAULT_PAGE_SIZE, FILTER_GROUPS } from '@/lib/constants';import { badRequest, unauthorized } from '@/lib/response';-import { getAllowedUnits, getMinimumUnit } from '@/lib/date';+import { getAllowedUnits, getMinimumUnit, maxDate } from '@/lib/date';import { checkAuth } from '@/lib/auth';-import { getWebsiteSegment, getWebsiteDateRange } from '@/queries';--export async function getJsonBody(request: Request) {- try {- return await request.clone().json();- } catch {- return undefined;- }-}+import { fetchWebsite } from '@/lib/load';+import { QueryFilters } from '@/lib/types';++import { getWebsiteSegment } from '@/queries';export async function parseRequest(request: Request,@@@ -65,39 -85,28 +66,53 @@@ export function getRequestDateRange(que};}- export function getRequestFilters(query: Record<string, any>) {- return Object.keys(FILTER_COLUMNS).reduce((obj, key) => {+ export async function getRequestFilters(query: Record<string, any>, websiteId?: string) {+ const result: Record<string, any> = {};++ for (const key of Object.keys(FILTER_COLUMNS)) {const value = query[key];+ if (value !== undefined) {+ result[key] = value;+ }+ }+ for (const key of Object.keys(FILTER_GROUPS)) {+ const value = query[key];if (value !== undefined) {- obj[key] = value;+ const segment = await getWebsiteSegment(websiteId, key, value);+ if (key === 'segment') {+ // merge filters into result+ Object.assign(result, segment.parameters);+ } else {+ result[key] = segment.parameters;+ }}+ }- return obj;- }, {});+ return result;}++export async function setWebsiteDate(websiteId: string, data: Record<string, any>) {+ const website = await fetchWebsite(websiteId);++ if (website) {+ data.startDate = maxDate(data.startDate, new Date(website?.resetAt));+ }++ return data;+}++export function getQueryFilters(params: Record<string, any>): QueryFilters {+ const dateRange = getRequestDateRange(params);+ const filters = getRequestFilters(params);++ return {+ ...dateRange,+ ...filters,+ page: params?.page,+ pageSize: params?.page ? params?.pageSize || DEFAULT_PAGE_SIZE : undefined,+ orderBy: params?.orderBy,+ sortDescending: params?.sortDescending,+ search: params?.search,+ };+}diff --cc src/lib/schema.tsindex 85a05dd66,47be0fb01..d44da1f99--- a/src/lib/schema.ts+++ b/src/lib/schema.ts@@@ -32,15 -14,13 +32,17 @@@ export const filterParams =region: z.string().optional(),city: z.string().optional(),tag: z.string().optional(),- host: z.string().optional(),+ hostname: z.string().optional(),language: z.string().optional(),event: z.string().optional(),+ segment: z.string().optional(),+ cohort: z.string().optional(),};+export const searchParams = {+ search: z.string().optional(),+};+export const pagingParams = {page: z.coerce.number().int().positive().optional(),pageSize: z.coerce.number().int().positive().optional(),@@@ -71,204 -54,27 +73,206 @@@ export const urlOrPathParam = z.string(},);+export const fieldsParam = z.enum([+ 'path',+ 'referrer',+ 'title',+ 'query',+ 'os',+ 'browser',+ 'device',+ 'country',+ 'region',+ 'city',+ 'tag',+ 'hostname',+ 'language',+]);+export const reportTypeParam = z.enum([+ 'attribution',+ 'breakdown','funnel',- 'insights',- 'retention',- 'utm',- 'goals',+ 'goal','journey',+ 'retention','revenue',- 'attribution',+ 'utm',]);-export const reportParms = {- websiteId: z.string().uuid(),- dateRange: z.object({+export const dateRangeSchema = z.object({ ...dateRangeParams }).superRefine((data, ctx) => {+ const hasTimestamps = data.startAt !== undefined && data.endAt !== undefined;+ const hasDates = data.startDate !== undefined && data.endDate !== undefined;++ if (!hasTimestamps && !hasDates) {+ ctx.addIssue({+ code: z.ZodIssueCode.custom,+ message: 'You must provide either startAt & endAt or startDate & endDate.',+ });+ }++ if (hasTimestamps && hasDates) {+ ctx.addIssue({+ code: z.ZodIssueCode.custom,+ message: 'Provide either startAt & endAt or startDate & endDate, not both.',+ });+ }++ if (data.startAt !== undefined && data.endAt === undefined) {+ ctx.addIssue({+ code: z.ZodIssueCode.custom,+ message: 'If you provide startAt, you must also provide endAt.',+ path: ['endAt'],+ });+ }++ if (data.endAt !== undefined && data.startAt === undefined) {+ ctx.addIssue({+ code: z.ZodIssueCode.custom,+ message: 'If you provide endAt, you must also provide startAt.',+ path: ['startAt'],+ });+ }++ if (data.startDate !== undefined && data.endDate === undefined) {+ ctx.addIssue({+ code: z.ZodIssueCode.custom,+ message: 'If you provide startDate, you must also provide endDate.',+ path: ['endDate'],+ });+ }++ if (data.endDate !== undefined && data.startDate === undefined) {+ ctx.addIssue({+ code: z.ZodIssueCode.custom,+ message: 'If you provide endDate, you must also provide startDate.',+ path: ['startDate'],+ });+ }+});++export const goalReportSchema = z.object({+ type: z.literal('goal'),+ parameters: z+ .object({+ startDate: z.coerce.date(),+ endDate: z.coerce.date(),+ type: z.string(),+ value: z.string(),+ operator: z.enum(['count', 'sum', 'average']).optional(),+ property: z.string().optional(),+ })+ .refine(data => {+ if (data['type'] === 'event' && data['property']) {+ return data['operator'] && data['property'];+ }+ return true;+ }),+});++export const funnelReportSchema = z.object({+ type: z.literal('funnel'),+ parameters: z.object({startDate: z.coerce.date(),endDate: z.coerce.date(),- num: z.coerce.number().optional(),- offset: z.coerce.number().optional(),- unit: z.string().optional(),- value: z.string().optional(),+ window: z.coerce.number().positive(),+ steps: z+ .array(+ z.object({+ type: z.enum(['page', 'event']),+ value: z.string(),+ }),+ )+ .min(2)+ .max(8),}),-};+});++export const journeyReportSchema = z.object({+ type: z.literal('journey'),+ parameters: z.object({+ startDate: z.coerce.date(),+ endDate: z.coerce.date(),+ steps: z.coerce.number().min(2).max(7),+ startStep: z.string().optional(),+ endStep: z.string().optional(),+ }),+});++export const retentionReportSchema = z.object({+ type: z.literal('retention'),+ parameters: z.object({+ startDate: z.coerce.date(),+ endDate: z.coerce.date(),+ timezone: z.string().optional(),+ }),+});++export const utmReportSchema = z.object({+ type: z.literal('utm'),+ parameters: z.object({+ startDate: z.coerce.date(),+ endDate: z.coerce.date(),+ }),+});++export const revenueReportSchema = z.object({+ type: z.literal('revenue'),+ parameters: z.object({+ startDate: z.coerce.date(),+ endDate: z.coerce.date(),+ timezone: z.string().optional(),+ currency: z.string(),+ }),+});++export const attributionReportSchema = z.object({+ type: z.literal('attribution'),+ parameters: z.object({+ startDate: z.coerce.date(),+ endDate: z.coerce.date(),+ model: z.enum(['first-click', 'last-click']),+ type: z.enum(['page', 'event']),+ step: z.string(),+ currency: z.string().optional(),+ }),+});++export const breakdownReportSchema = z.object({+ type: z.literal('breakdown'),+ parameters: z.object({+ startDate: z.coerce.date(),+ endDate: z.coerce.date(),+ fields: z.array(fieldsParam),+ }),+});++export const reportBaseSchema = z.object({+ websiteId: z.string().uuid(),+ type: reportTypeParam,+ name: z.string().max(200),+ description: z.string().max(500).optional(),+});++export const reportTypeSchema = z.discriminatedUnion('type', [+ goalReportSchema,+ funnelReportSchema,+ journeyReportSchema,+ retentionReportSchema,+ utmReportSchema,+ revenueReportSchema,+ attributionReportSchema,+ breakdownReportSchema,+]);++export const reportSchema = z.intersection(reportBaseSchema, reportTypeSchema);++export const reportResultSchema = z.intersection(+ z.object({+ websiteId: z.string().uuid(),+ filters: z.object({ ...filterParams }),+ }),+ reportTypeSchema,+);++ export const segmentTypeParam = z.enum(['segment', 'cohort']);diff --cc src/queries/sql/events/getEventDataFields.tsindex 8f3a88c3c,9c3d5eac7..91f9771e2--- a/src/queries/sql/events/getEventDataFields.ts+++ b/src/queries/sql/events/getEventDataFields.ts@@@ -12,7 -14,7 +12,7 @@@ export async function getEventDataFieldasync function relationalQuery(websiteId: string, filters: QueryFilters) {const { rawQuery, parseFilters, getDateSQL } = prisma;- const { filterQuery, queryParams } = parseFilters(filters);- const { filterQuery, cohortQuery, params } = await parseFilters(websiteId, filters);++ const { filterQuery, cohortQuery, queryParams } = parseFilters(filters);return rawQuery(`@@@ -43,7 -48,7 +46,7 @@@ async function clickhouseQueryfilters: QueryFilters,): Promise<{ propertyName: string; dataType: number; propertyValue: string; total: number }[]> {const { rawQuery, parseFilters } = clickhouse;- const { filterQuery, queryParams } = parseFilters(filters);- const { filterQuery, cohortQuery, params } = await parseFilters(websiteId, filters);++ const { filterQuery, cohortQuery, queryParams } = parseFilters(filters);return rawQuery(`diff --cc src/queries/sql/events/getEventDataProperties.tsindex 9577b40c0,23ed220c1..90b17774d--- a/src/queries/sql/events/getEventDataProperties.ts+++ b/src/queries/sql/events/getEventDataProperties.ts@@@ -17,7 -17,7 +17,7 @@@ async function relationalQueryfilters: QueryFilters & { propertyName?: string },) {const { rawQuery, parseFilters } = prisma;- const { filterQuery, queryParams } = parseFilters(filters, {- const { filterQuery, cohortQuery, params } = await parseFilters(websiteId, filters, {++ const { filterQuery, cohortQuery, queryParams } = parseFilters(filters, {columns: { propertyName: 'data_key' },});@@@ -45,7 -48,7 +48,7 @@@ async function clickhouseQueryfilters: QueryFilters & { propertyName?: string },): Promise<{ eventName: string; propertyName: string; total: number }[]> {const { rawQuery, parseFilters } = clickhouse;- const { filterQuery, queryParams } = parseFilters(filters, {- const { filterQuery, cohortQuery, params } = await parseFilters(websiteId, filters, {++ const { filterQuery, cohortQuery, queryParams } = parseFilters(filters, {columns: { propertyName: 'data_key' },});diff --cc src/queries/sql/events/getEventDataStats.tsindex a597096ad,8151f76a7..01b5db342--- a/src/queries/sql/events/getEventDataStats.ts+++ b/src/queries/sql/events/getEventDataStats.ts@@@ -18,7 -18,7 +18,7 @@@ export async function getEventDataStatsasync function relationalQuery(websiteId: string, filters: QueryFilters) {const { rawQuery, parseFilters } = prisma;- const { filterQuery, queryParams } = parseFilters({ ...filters, websiteId });- const { filterQuery, cohortQuery, params } = await parseFilters(websiteId, filters);++ const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId });return rawQuery(`@@@ -47,7 -51,7 +51,7 @@@ async function clickhouseQueryfilters: QueryFilters,): Promise<{ events: number; properties: number; records: number }[]> {const { rawQuery, parseFilters } = clickhouse;- const { filterQuery, queryParams } = parseFilters({ ...filters, websiteId });- const { filterQuery, cohortQuery, params } = await parseFilters(websiteId, filters);++ const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId });return rawQuery(`diff --cc src/queries/sql/events/getEventDataValues.tsindex 3ccf53a02,60898fad9..1c30617ca--- a/src/queries/sql/events/getEventDataValues.ts+++ b/src/queries/sql/events/getEventDataValues.ts@@@ -1,12 -1,7 +1,12 @@@import prisma from '@/lib/prisma';import clickhouse from '@/lib/clickhouse';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';-import { QueryFilters, WebsiteEventData } from '@/lib/types';+import { QueryFilters } from '@/lib/types';+- export interface WebsiteEventData {++interface WebsiteEventData {+ value: string;+ total: number;+}export async function getEventDataValues(...args: [@@@ -25,7 -20,7 +25,7 @@@ async function relationalQueryfilters: QueryFilters & { eventName?: string; propertyName?: string },) {const { rawQuery, parseFilters, getDateSQL } = prisma;- const { filterQuery, queryParams } = parseFilters({ ...filters, websiteId });- const { filterQuery, cohortQuery, params } = await parseFilters(websiteId, filters);++ const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId });return rawQuery(`@@@ -56,7 -54,7 +59,7 @@@ async function clickhouseQueryfilters: QueryFilters & { eventName?: string; propertyName?: string },): Promise<{ value: string; total: number }[]> {const { rawQuery, parseFilters } = clickhouse;- const { filterQuery, queryParams } = parseFilters({ ...filters, websiteId });- const { filterQuery, cohortQuery, params } = await parseFilters(websiteId, filters);++ const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId });return rawQuery(`diff --cc src/queries/sql/events/getEventMetrics.tsindex 0f1d4a44e,42dc8862d..0e078ff13--- a/src/queries/sql/events/getEventMetrics.ts+++ b/src/queries/sql/events/getEventMetrics.ts@@@ -22,9 -16,8 +22,8 @@@ export async function getEventMetricsasync function relationalQuery(websiteId: string, filters: QueryFilters) {const { timezone = 'utc', unit = 'day' } = filters;const { rawQuery, getDateSQL, parseFilters } = prisma;- const { filterQuery, joinSessionQuery, queryParams } = parseFilters({- const { filterQuery, cohortQuery, joinSession, params } = await parseFilters(websiteId, {++ const { filterQuery, joinSessionQuery, cohortQuery, queryParams } = parseFilters({...filters,- websiteId,eventType: EVENT_TYPE.customEvent,});@@@ -35,7 -28,8 +34,8 @@@${getDateSQL('website_event.created_at', unit, timezone)} t,count(*) yfrom website_event+ ${joinSessionQuery}+ ${cohortQuery}- ${joinSession}where website_event.website_id = {{websiteId::uuid}}and website_event.created_at between {{startDate}} and {{endDate}}and event_type = {{eventType}}@@@ -50,12 -44,11 +50,12 @@@async function clickhouseQuery(websiteId: string,filters: QueryFilters,-): Promise<{ x: string; t: string; y: number }[]> {+): Promise<WebsiteEventMetricData[]> {const { timezone = 'UTC', unit = 'day' } = filters;const { rawQuery, getDateSQL, parseFilters } = clickhouse;- const { filterQuery, queryParams } = parseFilters({- const { filterQuery, cohortQuery, params } = await parseFilters(websiteId, {++ const { filterQuery, cohortQuery, queryParams } = parseFilters({...filters,+ websiteId,eventType: EVENT_TYPE.customEvent,});diff --cc src/queries/sql/events/getWebsiteEvents.tsindex 284f93353,0cbc6ac6f..c7e2af17e--- a/src/queries/sql/events/getWebsiteEvents.ts+++ b/src/queries/sql/events/getWebsiteEvents.ts@@@ -10,18 -12,15 +10,18 @@@ export function getWebsiteEvents(...arg});}-async function relationalQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {+async function relationalQuery(websiteId: string, filters: QueryFilters) {const { pagedRawQuery, parseFilters } = prisma;- const { search } = pageParams;- const { filterQuery, cohortQuery, params } = await parseFilters(websiteId, {+ const { search } = filters;- const { filterQuery, dateQuery, queryParams } = parseFilters({++ const { filterQuery, dateQuery, cohortQuery, queryParams } = parseFilters({...filters,+ websiteId,});- const db = getDatabaseType();- const like = db === POSTGRESQL ? 'ilike' : 'like';+ const searchQuery = filters.search+ ? `and ((event_name ilike {{search}} and event_type = 2)+ or (url_path ilike {{search}} and event_type = 1))`+ : '';return pagedRawQuery(`@@@ -39,30 -38,29 +39,31 @@@event_type as "eventType",event_name as "eventName"from website_event+ ${cohortQuery}where website_id = {{websiteId::uuid}}- and created_at between {{startDate}} and {{endDate}}+ ${dateQuery}${filterQuery}- ${- search- ? `and ((event_name ${like} {{search}} and event_type = 2)- or (url_path ${like} {{search}} and event_type = 1))`- : ''- }+ ${searchQuery}order by created_at desc`,- { ...params, search: `%${search}%` },- pageParams,+ { ...queryParams, search: `%${search}%` },+ filters,);}-async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {- const { pagedQuery, parseFilters } = clickhouse;- const { params, dateQuery, filterQuery, cohortQuery } = await parseFilters(websiteId, filters);- const { search } = pageParams;+async function clickhouseQuery(websiteId: string, filters: QueryFilters) {+ const { pagedRawQuery, parseFilters } = clickhouse;- const { queryParams, dateQuery, filterQuery } = parseFilters({++ const { queryParams, dateQuery, cohortQuery, filterQuery } = parseFilters({+ ...filters,+ websiteId,+ });- return pagedQuery(+ const searchQuery = filters.search+ ? `and ((positionCaseInsensitive(event_name, {search:String}) > 0 and event_type = 2)+ or (positionCaseInsensitive(url_path, {search:String}) > 0 and event_type = 1))`+ : '';++ return pagedRawQuery(`selectevent_id as id,diff --cc src/queries/sql/getChannelMetrics.tsindex 57722bf32,25f866d4e..051a21178--- a/src/queries/sql/getChannelMetrics.ts+++ b/src/queries/sql/getChannelMetrics.ts@@@ -12,7 -12,7 +12,7 @@@ export async function getChannelMetricsasync function relationalQuery(websiteId: string, filters: QueryFilters) {const { rawQuery, parseFilters } = prisma;- const { queryParams, filterQuery, dateQuery } = parseFilters(filters);- const { params, filterQuery, cohortQuery, dateQuery } = await parseFilters(websiteId, filters);++ const { queryParams, filterQuery, cohortQuery, dateQuery } = parseFilters(filters);return rawQuery(`@@@ -36,7 -37,7 +37,7 @@@ async function clickhouseQueryfilters: QueryFilters,): Promise<{ x: string; y: number }[]> {const { rawQuery, parseFilters } = clickhouse;- const { queryParams, filterQuery, dateQuery } = parseFilters(filters);- const { params, filterQuery, cohortQuery, dateQuery } = await parseFilters(websiteId, filters);++ const { queryParams, filterQuery, cohortQuery, dateQuery } = parseFilters(filters);const sql = `selectdiff --cc src/queries/sql/getRealtimeActivity.tsindex 65192672a,8892732ac..d53cab6bd--- a/src/queries/sql/getRealtimeActivity.ts+++ b/src/queries/sql/getRealtimeActivity.ts@@@ -12,7 -12,7 +12,7 @@@ export async function getRealtimeActiviasync function relationalQuery(websiteId: string, filters: QueryFilters) {const { rawQuery, parseFilters } = prisma;- const { queryParams, filterQuery, dateQuery } = parseFilters(filters);- const { params, filterQuery, cohortQuery, dateQuery } = await parseFilters(websiteId, filters);++ const { queryParams, filterQuery, cohortQuery, dateQuery } = parseFilters(filters);return rawQuery(`@@@ -41,7 -42,7 +42,10 @@@async function clickhouseQuery(websiteId: string, filters: QueryFilters): Promise<{ x: number }> {const { rawQuery, parseFilters } = clickhouse;- const { queryParams, filterQuery, dateQuery } = parseFilters(filters);- const { params, filterQuery, cohortQuery, dateQuery } = await parseFilters(websiteId, filters);++ const { queryParams, filterQuery, cohortQuery, dateQuery } = parseFilters({++ ...filters,++ websiteId,++ });return rawQuery(`@@@ -62,6 -64,6 +67,6 @@@order by createdAt desclimit 100`,- { ...filters, ...queryParams },- params,++ queryParams,);}diff --cc src/queries/sql/getWebsiteStats.tsindex 77d88dbc1,6933d3f7a..faad96f7a--- a/src/queries/sql/getWebsiteStats.ts+++ b/src/queries/sql/getWebsiteStats.ts@@@ -25,11 -19,12 +25,11 @@@ export async function getWebsiteStatsasync function relationalQuery(websiteId: string,filters: QueryFilters,-): Promise<- { pageviews: number; visitors: number; visits: number; bounces: number; totaltime: number }[]-> {+): Promise<WebsiteStatsData[]> {const { getTimestampDiffSQL, parseFilters, rawQuery } = prisma;- const { filterQuery, joinSessionQuery, queryParams } = parseFilters({- const { filterQuery, cohortQuery, joinSession, params } = await parseFilters(websiteId, {++ const { filterQuery, joinSessionQuery, cohortQuery, queryParams } = parseFilters({...filters,+ websiteId,eventType: EVENT_TYPE.pageView,});@@@ -49,7 -44,8 +49,8 @@@min(website_event.created_at) as "min_time",max(website_event.created_at) as "max_time"from website_event+ ${joinSessionQuery}+ ${cohortQuery}- ${joinSession}where website_event.website_id = {{websiteId::uuid}}and website_event.created_at between {{startDate}} and {{endDate}}and event_type = {{eventType}}@@@ -64,11 -60,12 +65,11 @@@async function clickhouseQuery(websiteId: string,filters: QueryFilters,-): Promise<- { pageviews: number; visitors: number; visits: number; bounces: number; totaltime: number }[]-> {+): Promise<WebsiteStatsData[]> {const { rawQuery, parseFilters } = clickhouse;- const { filterQuery, queryParams } = parseFilters({- const { filterQuery, cohortQuery, params } = await parseFilters(websiteId, {++ const { filterQuery, cohortQuery, queryParams } = parseFilters({...filters,+ websiteId,eventType: EVENT_TYPE.pageView,});diff --cc src/queries/sql/pageviews/getPageviewMetrics.tsindex 86f8bc0c6,72586eb79..8134f0063--- a/src/queries/sql/pageviews/getPageviewMetrics.ts+++ b/src/queries/sql/pageviews/getPageviewMetrics.ts@@@ -26,21 -21,20 +26,21 @@@ export async function getPageviewMetricasync function relationalQuery(websiteId: string,- type: string,+ parameters: PageviewMetricsParameters,filters: QueryFilters,- limit: number | string = 500,- offset: number | string = 0,-) {+): Promise<PageviewMetricsData[]> {+ const { type, limit = 500, offset = 0 } = parameters;const column = FILTER_COLUMNS[type] || type;const { rawQuery, parseFilters } = prisma;- const { filterQuery, joinSessionQuery, queryParams } = parseFilters(- const { filterQuery, cohortQuery, joinSession, params } = await parseFilters(- websiteId,++ const { filterQuery, joinSessionQuery, cohortQuery, queryParams } = parseFilters({...filters,+ websiteId,eventType: column === 'event_name' ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,},- { joinSession: SESSION_COLUMNS.includes(type) || column === 'referrer_domain' },+ {+ joinSession: SESSION_COLUMNS.includes(type) || column === 'referrer_domain',+ },);let entryExitQuery = '';@@@ -74,7 -68,8 +74,8 @@@select ${column} x,${column === 'referrer_domain' ? 'count(distinct website_event.session_id)' : 'count(*)'} as yfrom website_event+ ${joinSessionQuery}+ ${cohortQuery}- ${joinSession}${entryExitQuery}where website_event.website_id = {{websiteId::uuid}}and website_event.created_at between {{startDate}} and {{endDate}}@@@ -92,15 -87,15 +93,15 @@@async function clickhouseQuery(websiteId: string,- type: string,+ parameters: PageviewMetricsParameters,filters: QueryFilters,- ): Promise<PageviewMetricsData[]> {- limit: number | string = 500,- offset: number | string = 0,+ ): Promise<{ x: string; y: number }[]> {+ const { type, limit = 500, offset = 0 } = parameters;const column = FILTER_COLUMNS[type] || type;const { rawQuery, parseFilters } = clickhouse;- const { filterQuery, queryParams } = parseFilters({- const { filterQuery, cohortQuery, params } = await parseFilters(websiteId, {++ const { filterQuery, cohortQuery, queryParams } = parseFilters({...filters,+ websiteId,eventType: column === 'event_name' ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,});@@@ -170,7 -166,8 +171,8 @@@${column === 'referrer_domain' ? 'uniq(s)' : 'count(*)'} as yfrom (select ${columnQuery} as t- from website_event_stats_hourly website_event+ from website_event_stats_hourly as website_event+ ${cohortQuery}where website_id = {websiteId:UUID}and created_at between {startDate:DateTime64} and {endDate:DateTime64}and event_type = {eventType:UInt32}diff --cc src/queries/sql/pageviews/getPageviewStats.tsindex 953352d77,e3bfe1583..7ef51137a--- a/src/queries/sql/pageviews/getPageviewStats.ts+++ b/src/queries/sql/pageviews/getPageviewStats.ts@@@ -14,9 -14,8 +14,9 @@@ export async function getPageviewStats(async function relationalQuery(websiteId: string, filters: QueryFilters) {const { timezone = 'utc', unit = 'day' } = filters;const { getDateSQL, parseFilters, rawQuery } = prisma;- const { filterQuery, joinSessionQuery, queryParams } = parseFilters({- const { filterQuery, cohortQuery, joinSession, params } = await parseFilters(websiteId, {++ const { filterQuery, cohortQuery, joinSessionQuery, queryParams } = parseFilters({...filters,+ websiteId,eventType: EVENT_TYPE.pageView,});@@@ -26,7 -25,8 +26,8 @@@${getDateSQL('website_event.created_at', unit, timezone)} x,count(*) yfrom website_event+ ${joinSessionQuery}+ ${cohortQuery}- ${joinSession}where website_event.website_id = {{websiteId::uuid}}and website_event.created_at between {{startDate}} and {{endDate}}and event_type = {{eventType}}@@@ -44,9 -44,8 +45,9 @@@ async function clickhouseQuery): Promise<{ x: string; y: number }[]> {const { timezone = 'utc', unit = 'day' } = filters;const { parseFilters, rawQuery, getDateSQL } = clickhouse;- const { filterQuery, queryParams } = parseFilters({- const { filterQuery, cohortQuery, params } = await parseFilters(websiteId, {++ const { filterQuery, cohortQuery, queryParams } = parseFilters({...filters,+ websiteId,eventType: EVENT_TYPE.pageView,});@@@ -78,8 -78,9 +80,9 @@@from (select${getDateSQL('website_event.created_at', unit, timezone)} as t,- sum(views)as y+ sum(views) as yfrom website_event_stats_hourly website_event+ ${cohortQuery}where website_id = {websiteId:UUID}and created_at between {startDate:DateTime64} and {endDate:DateTime64}and event_type = {eventType:UInt32}diff --cc src/queries/sql/reports/getBreakdown.tsindex 7785da44a,f4adc5bff..a39c49eff--- a/src/queries/sql/reports/getBreakdown.ts+++ b/src/queries/sql/reports/getBreakdown.ts@@@ -26,17 -15,19 +26,17 @@@ export async function getBreakdownasync function relationalQuery(websiteId: string,- fields: { name: string; type?: string }[],+ parameters: BreakdownParameters,filters: QueryFilters,-): Promise<- {- x: string;- y: number;- }[]-> {+): Promise<BreakdownData[]> {const { getTimestampDiffSQL, parseFilters, rawQuery } = prisma;- const { filterQuery, cohortQuery, joinSession, params } = await parseFilters(- websiteId,+ const { startDate, endDate, fields } = parameters;- const { filterQuery, joinSessionQuery, queryParams } = parseFilters(++ const { filterQuery, joinSessionQuery, cohortQuery, queryParams } = parseFilters({...filters,+ websiteId,+ startDate,+ endDate,eventType: EVENT_TYPE.pageView,},{@@@ -62,7 -53,8 +62,8 @@@min(website_event.created_at) as "min_time",max(website_event.created_at) as "max_time"from website_event+ ${cohortQuery}- ${joinSession}+ ${joinSessionQuery}where website_event.website_id = {{websiteId::uuid}}and website_event.created_at between {{startDate}} and {{endDate}}and event_type = {{eventType}}@@@ -80,16 -72,17 +81,16 @@@async function clickhouseQuery(websiteId: string,- fields: { name: string; type?: string }[],+ parameters: BreakdownParameters,filters: QueryFilters,-): Promise<- {- x: string;- y: number;- }[]-> {+): Promise<BreakdownData[]> {const { parseFilters, rawQuery } = clickhouse;- const { filterQuery, cohortQuery, params } = await parseFilters(websiteId, {+ const { startDate, endDate, fields } = parameters;- const { filterQuery, queryParams } = parseFilters({++ const { filterQuery, cohortQuery, queryParams } = parseFilters({...filters,+ websiteId,+ startDate,+ endDate,eventType: EVENT_TYPE.pageView,});diff --cc src/queries/sql/sessions/getSessionDataProperties.tsindex 13a68fa43,2d9de8061..c0f1a0daf--- a/src/queries/sql/sessions/getSessionDataProperties.ts+++ b/src/queries/sql/sessions/getSessionDataProperties.ts@@@ -17,7 -17,7 +17,7 @@@ async function relationalQueryfilters: QueryFilters & { propertyName?: string },) {const { rawQuery, parseFilters } = prisma;- const { filterQuery, queryParams } = parseFilters(filters, {- const { filterQuery, cohortQuery, params } = await parseFilters(websiteId, filters, {++ const { filterQuery, cohortQuery, queryParams } = parseFilters(filters, {columns: { propertyName: 'data_key' },});@@@ -45,7 -46,7 +46,7 @@@ async function clickhouseQueryfilters: QueryFilters & { propertyName?: string },): Promise<{ propertyName: string; total: number }[]> {const { rawQuery, parseFilters } = clickhouse;- const { filterQuery, queryParams } = parseFilters(filters, {- const { filterQuery, cohortQuery, params } = await parseFilters(websiteId, filters, {++ const { filterQuery, cohortQuery, queryParams } = parseFilters(filters, {columns: { propertyName: 'data_key' },});diff --cc src/queries/sql/sessions/getSessionDataValues.tsindex 6d530b694,1171a427d..57792136b--- a/src/queries/sql/sessions/getSessionDataValues.ts+++ b/src/queries/sql/sessions/getSessionDataValues.ts@@@ -17,7 -17,7 +17,7 @@@ async function relationalQueryfilters: QueryFilters & { propertyName?: string },) {const { rawQuery, parseFilters, getDateSQL } = prisma;- const { filterQuery, queryParams } = parseFilters(filters);- const { filterQuery, cohortQuery, params } = await parseFilters(websiteId, filters);++ const { filterQuery, cohortQuery, queryParams } = parseFilters(filters);return rawQuery(`@@@ -48,7 -49,7 +49,7 @@@ async function clickhouseQueryfilters: QueryFilters & { propertyName?: string },): Promise<{ propertyName: string; dataType: number; propertyValue: string; total: number }[]> {const { rawQuery, parseFilters } = clickhouse;- const { filterQuery, queryParams } = parseFilters(filters);- const { filterQuery, cohortQuery, params } = await parseFilters(websiteId, filters);++ const { filterQuery, cohortQuery, queryParams } = parseFilters(filters);return rawQuery(`diff --cc src/queries/sql/sessions/getSessionMetrics.tsindex ca0a8c2f7,8a317574a..285eaa7f4--- a/src/queries/sql/sessions/getSessionMetrics.ts+++ b/src/queries/sql/sessions/getSessionMetrics.ts@@@ -21,16 -21,17 +21,16 @@@ export async function getSessionMetricsasync function relationalQuery(websiteId: string,- type: string,+ parameters: SessionMetricsParameters,filters: QueryFilters,- limit: number | string = 500,- offset: number | string = 0,) {+ const { type, limit = 500, offset = 0 } = parameters;const column = FILTER_COLUMNS[type] || type;const { parseFilters, rawQuery } = prisma;- const { filterQuery, joinSessionQuery, queryParams } = parseFilters(- const { filterQuery, cohortQuery, joinSession, params } = await parseFilters(- websiteId,++ const { filterQuery, joinSessionQuery, cohortQuery, queryParams } = parseFilters({...filters,+ websiteId,eventType: EVENT_TYPE.pageView,},{@@@ -46,7 -47,8 +46,8 @@@count(distinct website_event.session_id) y${includeCountry ? ', country' : ''}from website_event+ ${cohortQuery}- ${joinSession}+ ${joinSessionQuery}where website_event.website_id = {{websiteId::uuid}}and website_event.created_at between {{startDate}} and {{endDate}}and website_event.event_type = {{eventType}}@@@ -63,15 -65,15 +64,15 @@@async function clickhouseQuery(websiteId: string,- type: string,+ parameters: SessionMetricsParameters,filters: QueryFilters,- limit: number | string = 500,- offset: number | string = 0,): Promise<{ x: string; y: number }[]> {+ const { type, limit = 500, offset = 0 } = parameters;const column = FILTER_COLUMNS[type] || type;const { parseFilters, rawQuery } = clickhouse;- const { filterQuery, queryParams } = parseFilters({- const { filterQuery, cohortQuery, params } = await parseFilters(websiteId, {++ const { filterQuery, cohortQuery, queryParams } = parseFilters({...filters,+ websiteId,eventType: EVENT_TYPE.pageView,});const includeCountry = column === 'city' || column === 'region';diff --cc src/queries/sql/sessions/getSessionStats.tsindex bb3ff03d6,0468f96cc..9911a235e--- a/src/queries/sql/sessions/getSessionStats.ts+++ b/src/queries/sql/sessions/getSessionStats.ts@@@ -14,9 -14,8 +14,9 @@@ export async function getSessionStats(.async function relationalQuery(websiteId: string, filters: QueryFilters) {const { timezone = 'utc', unit = 'day' } = filters;const { getDateSQL, parseFilters, rawQuery } = prisma;- const { filterQuery, joinSessionQuery, queryParams } = parseFilters({- const { filterQuery, cohortQuery, joinSession, params } = await parseFilters(websiteId, {++ const { filterQuery, joinSessionQuery, cohortQuery, queryParams } = parseFilters({...filters,+ websiteId,eventType: EVENT_TYPE.pageView,});@@@ -26,7 -25,8 +26,8 @@@${getDateSQL('website_event.created_at', unit, timezone)} x,count(distinct website_event.session_id) yfrom website_event+ ${joinSessionQuery}+ ${cohortQuery}- ${joinSession}where website_event.website_id = {{websiteId::uuid}}and website_event.created_at between {{startDate}} and {{endDate}}and event_type = {{eventType}}@@@ -44,9 -44,8 +45,9 @@@ async function clickhouseQuery): Promise<{ x: string; y: number }[]> {const { timezone = 'utc', unit = 'day' } = filters;const { parseFilters, rawQuery, getDateSQL } = clickhouse;- const { filterQuery, queryParams } = parseFilters({- const { filterQuery, cohortQuery, params } = await parseFilters(websiteId, {++ const { filterQuery, cohortQuery, queryParams } = parseFilters({...filters,+ websiteId,eventType: EVENT_TYPE.pageView,});diff --cc src/queries/sql/sessions/getWebsiteSessionStats.tsindex 5e4d2721c,695cec6c7..0f4c17973--- a/src/queries/sql/sessions/getWebsiteSessionStats.ts+++ b/src/queries/sql/sessions/getWebsiteSessionStats.ts@@@ -23,9 -17,13 +23,9 @@@ export async function getWebsiteSessionasync function relationalQuery(websiteId: string,filters: QueryFilters,-): Promise<- { pageviews: number; visitors: number; visits: number; countries: number; events: number }[]-> {+): Promise<WebsiteSessionStatsData[]> {const { parseFilters, rawQuery } = prisma;- const { filterQuery, queryParams } = parseFilters({ ...filters, websiteId });- const { filterQuery, cohortQuery, params } = await parseFilters(websiteId, {- ...filters,- });++ const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId });return rawQuery(`@@@ -48,9 -47,13 +49,9 @@@async function clickhouseQuery(websiteId: string,filters: QueryFilters,-): Promise<- { pageviews: number; visitors: number; visits: number; countries: number; events: number }[]-> {+): Promise<WebsiteSessionStatsData[]> {const { rawQuery, parseFilters } = clickhouse;- const { filterQuery, queryParams } = parseFilters({ ...filters, websiteId });- const { filterQuery, cohortQuery, params } = await parseFilters(websiteId, {- ...filters,- });++ const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId });return rawQuery(`diff --cc src/queries/sql/sessions/getWebsiteSessions.tsindex be118cc60,8f99df2d5..57dba14ec--- a/src/queries/sql/sessions/getWebsiteSessions.ts+++ b/src/queries/sql/sessions/getWebsiteSessions.ts@@@ -10,16 -12,15 +10,16 @@@ export async function getWebsiteSession});}-async function relationalQuery(websiteId: string, filters: QueryFilters, pageParams: PageParams) {+async function relationalQuery(websiteId: string, filters: QueryFilters) {const { pagedRawQuery, parseFilters } = prisma;- const { search } = pageParams;- const { filterQuery, cohortQuery, params } = await parseFilters(websiteId, {+ const { search } = filters;- const { filterQuery, dateQuery, queryParams } = parseFilters({++ const { filterQuery, dateQuery, cohortQuery, queryParams } = parseFilters({...filters,+ websiteId,+ search: search ? `%${search}%` : undefined,});- const db = getDatabaseType();- const like = db === POSTGRESQL ? 'ilike' : 'like';+ const searchQuery = search ? `and session.distinct_id ilike {{search}}` : '';return pagedRawQuery(`@@@ -41,11 -42,20 +41,12 @@@sum(case when website_event.event_type = 1 then 1 else 0 end) as "views",max(website_event.created_at) as "createdAt"from website_event+ ${cohortQuery}join session on session.session_id = website_event.session_idwhere website_event.website_id = {{websiteId::uuid}}- and website_event.created_at between {{startDate}} and {{endDate}}+ ${dateQuery}${filterQuery}- ${- search- ? `and (distinct_id ${like} {{search}}- or city ${like} {{search}}- or browser ${like} {{search}}- or os ${like} {{search}}- or device ${like} {{search}})`- : ''- }+ ${searchQuery}group by session.session_id,session.website_id,website_event.hostname,@@@ -64,17 -74,12 +65,17 @@@);}-async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {- const { pagedQuery, parseFilters, getDateStringSQL } = clickhouse;- const { params, dateQuery, filterQuery, cohortQuery } = await parseFilters(websiteId, filters);- const { search } = pageParams;+async function clickhouseQuery(websiteId: string, filters: QueryFilters) {+ const { pagedRawQuery, parseFilters, getDateStringSQL } = clickhouse;+ const { search } = filters;- const { filterQuery, dateQuery, queryParams } = parseFilters({++ const { filterQuery, dateQuery, cohortQuery, queryParams } = parseFilters({+ ...filters,+ websiteId,+ });- return pagedQuery(+ const searchQuery = search ? `and positionCaseInsensitive(distinct_id, {search:String}) > 0` : '';++ return pagedRawQuery(`selectsession_id as id,