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 Cao45c9ea9c2243
diff --cc package.jsonindex 3c0e38108,4e775a593..f58b58c0c--- a/package.json+++ b/package.json@@@ -107,15 -100,15 +107,18 @@@"is-localhost-ip": "^1.4.0","isbot": "^5.1.16","jsonwebtoken": "^9.0.2",+ "jszip": "^3.10.1","kafkajs": "^2.1.0",- "maxmind": "^4.3.24",+ "lucide-react": "^0.517.0",+ "maxmind": "^4.3.27","md5": "^2.3.0",- "next": "15.3.3",+ "next": "15.4.3","node-fetch": "^3.2.8","npm-run-all": "^4.1.5",+ "papaparse": "^5.5.3",+ "prisma": "6.7.0",+ "pg": "^8.16.3",+ "prisma": "6.12.0","pure-rand": "^6.1.0","react": "^19.0.0","react-basics": "^0.126.0",diff --cc pnpm-lock.yamlindex 8adb2d247,6f5e4bef0..b865e7a37--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@@ -140,12 -131,12 +143,15 @@@ importersnpm-run-all:specifier: ^4.1.5version: 4.1.5+ papaparse:+ specifier: ^5.5.3+ version: 5.5.3+ pg:+ specifier: ^8.16.3+ version: 8.16.3prisma:- specifier: 6.7.0- version: 6.7.0([email protected])+ specifier: 6.12.0+ version: 6.12.0([email protected])pure-rand:specifier: ^6.1.0version: 6.1.0@@@ -4215,10 -4047,9 +4221,13 @@@ packagesresolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}engines: {node: '>= 4'}+ resolution: {integrity: sha512-gJzzk+PQNznz8ysRrC0aOkBNVRBDtE1n53IqyqEf3PXrYwomFs5q4pGMizBMJF+ykh03insJ27hB8gSrD2Hn8A==}+ engines: {node: '>= 4'}++ resolution: {integrity: sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==}+resolution: {integrity: sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==}@@@ -5267,9 -5107,12 +5285,15 @@@resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}engines: {node: '>=6'}+ resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==}++ resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==}++ resolution: {integrity: sha512-5QvjGxYVjxO59MGU2lHVYpRWBBtKHnlIAcSe1uNFCkkptUh63NFRj0FJQm7nR67puEruUci/ZkjmEFrjCAyP4A==}+resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}engines: {node: '>=6'}@@@ -11712,8 -11025,8 +11751,10 @@@ snapshots+ [email protected]: {}++ [email protected]: {}+@@@ -12961,8 -12279,10 +13015,12 @@@+ [email protected]: {}++ [email protected]: {}++ [email protected]: {}+dependencies:callsites: 3.1.0@@@ -13514,13 -12787,18 +13572,15 @@@ansi-styles: 5.2.0react-is: 18.3.1dependencies:- '@prisma/config': 6.7.0- '@prisma/engines': 6.7.0+ '@prisma/config': 6.12.0+ '@prisma/engines': 6.12.0optionalDependencies:- fsevents: 2.3.3typescript: 5.8.3- transitivePeerDependencies:- - supports-color+ [email protected]: {}+diff --cc src/app/(main)/websites/[websiteId]/events/EventsPage.tsxindex 7e4ef98a7,46970b518..6af76a91d--- a/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx+++ b/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx@@@ -1,53 -1,52 +1,61 @@@'use client';-import WebsiteHeader from '../WebsiteHeader';-import EventsDataTable from './EventsDataTable';-import EventsMetricsBar from './EventsMetricsBar';-import EventsChart from '@/components/metrics/EventsChart';-import { GridRow } from '@/components/layout/Grid';-import EventsTable from '@/components/metrics/EventsTable';+import { TabList, Tab, Tabs, TabPanel, Column } from '@umami/react-zen';+import { EventsTable } from '@/components/metrics/EventsTable';- import { useState } from 'react';++import { useState, Key } from 'react';+import { EventsDataTable } from './EventsDataTable';+import { Panel } from '@/components/common/Panel';+import { EventsChart } from '@/components/metrics/EventsChart';import { useMessages } from '@/components/hooks';-import { Item, Tabs } from 'react-basics';-import { useState } from 'react';-import EventProperties from './EventProperties';+import { EventProperties } from './EventProperties';+import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';+ import { getItem, setItem } from '@/lib/storage';+-export default function EventsPage({ websiteId }) {++const KEY_NAME = 'umami.events.tab';++export function EventsPage({ websiteId }) {const [label, setLabel] = useState(null);- const [tab, setTab] = useState('activity');- const [tab, setTab] = useState(getItem('eventTab') || 'activity');++ const [tab, setTab] = useState(getItem(KEY_NAME) || 'activity');const { formatMessage, labels } = useMessages();const handleLabelClick = (value: string) => {setLabel(value !== label ? value : '');};- const onSelect = (value: 'activity' | 'properties') => {- setItem('eventTab', value);++ const handleSelect = (value: Key) => {++ setItem(KEY_NAME, value);+ setTab(value);+ };+return (- <>- <WebsiteHeader websiteId={websiteId} />- <EventsMetricsBar websiteId={websiteId} />- <GridRow columns="two-one">- <EventsChart websiteId={websiteId} focusLabel={label} />- <EventsTable- websiteId={websiteId}- type="event"- title={formatMessage(labels.events)}- metric={formatMessage(labels.actions)}- onLabelClick={handleLabelClick}- />- </GridRow>- <div>- <Tabs selectedKey={tab} onSelect={onSelect} style={{ marginBottom: 30 }}>- <Item key="activity">{formatMessage(labels.activity)}</Item>- <Item key="properties">{formatMessage(labels.properties)}</Item>+ <Column gap="3">+ <WebsiteControls websiteId={websiteId} />+ <Panel>- <Tabs selectedKey={tab} onSelectionChange={(value: any) => setTab(value)}>++ <Tabs selectedKey={tab} onSelectionChange={key => handleSelect(key)}>+ <TabList>+ <Tab id="activity">{formatMessage(labels.activity)}</Tab>+ <Tab id="chart">{formatMessage(labels.chart)}</Tab>+ <Tab id="properties">{formatMessage(labels.properties)}</Tab>+ </TabList>+ <TabPanel id="activity">+ <EventsDataTable websiteId={websiteId} />+ </TabPanel>+ <TabPanel id="chart">+ <Column gap="6">+ <EventsChart websiteId={websiteId} focusLabel={label} />+ <EventsTable+ websiteId={websiteId}+ type="event"+ title={formatMessage(labels.events)}+ metric={formatMessage(labels.actions)}+ onLabelClick={handleLabelClick}+ />+ </Column>+ </TabPanel>+ <TabPanel id="properties">+ <EventProperties websiteId={websiteId} />+ </TabPanel></Tabs>- {tab === 'activity' && <EventsDataTable websiteId={websiteId} />}- {tab === 'properties' && <EventProperties websiteId={websiteId} />}- </div>- </>+ </Panel>+ </Column>);}diff --cc src/app/api/websites/[websiteId]/events/series/route.tsindex 9c33bd176,a30741c6e..f85f24a52--- a/src/app/api/websites/[websiteId]/events/series/route.ts+++ b/src/app/api/websites/[websiteId]/events/series/route.ts@@@ -29,9 -31,15 +29,9 @@@ export async function GETreturn unauthorized();}- const filters = {- ...(await getRequestFilters(query)),- startDate,- endDate,- timezone,- unit,- };+ const filters = await getQueryFilters(query, websiteId);- const data = await getEventMetrics(websiteId, filters);+ const data = await getEventStats(websiteId, filters);return json(data);}diff --cc src/app/api/websites/[websiteId]/export/route.tsindex 000000000,534fd2298..ab9fdd126mode 000000,100644..100644--- a/src/app/api/websites/[websiteId]/export/route.ts+++ b/src/app/api/websites/[websiteId]/export/route.ts@@@ -1,0 -1,73 +1,64 @@@+ import { z } from 'zod';+ import JSZip from 'jszip';+ import Papa from 'papaparse';-import { getRequestFilters, parseRequest } from '@/lib/request';++import { getQueryFilters, parseRequest } from '@/lib/request';+ import { unauthorized, json } from '@/lib/response';+ import { canViewWebsite } from '@/lib/auth';-import { pagingParams } from '@/lib/schema';++import { pagingParams, dateRangeParams } from '@/lib/schema';+ import { getEventMetrics, getPageviewMetrics, getSessionMetrics } from '@/queries';++ export async function GET(+ request: Request,+ { params }: { params: Promise<{ websiteId: string }> },+ ) {+ const schema = z.object({- startAt: z.coerce.number().int(),- endAt: z.coerce.number().int(),++ ...dateRangeParams,+ ...pagingParams,+ });++ const { auth, query, error } = await parseRequest(request, schema);++ if (error) {+ return error();+ }++ const { websiteId } = await params;- const { startAt, endAt } = query;++ if (!(await canViewWebsite(auth, websiteId))) {+ return unauthorized();+ }+- const startDate = new Date(+startAt);- const endDate = new Date(+endAt);-- const filters = {- ...(await getRequestFilters(query)),- startDate,- endDate,- };++ const filters = await getQueryFilters(query, websiteId);++ const [events, pages, referrers, browsers, os, devices, countries] = await Promise.all([- getEventMetrics(websiteId, 'event', filters),- getPageviewMetrics(websiteId, 'url', filters),- getPageviewMetrics(websiteId, 'referrer', filters),- getSessionMetrics(websiteId, 'browser', filters),- getSessionMetrics(websiteId, 'os', filters),- getSessionMetrics(websiteId, 'device', filters),- getSessionMetrics(websiteId, 'country', filters),++ getEventMetrics(websiteId, { type: 'event' }, filters),++ getPageviewMetrics(websiteId, { type: 'path' }, filters),++ getPageviewMetrics(websiteId, { type: 'referrer' }, filters),++ getSessionMetrics(websiteId, { type: 'browser' }, filters),++ getSessionMetrics(websiteId, { type: 'os' }, filters),++ getSessionMetrics(websiteId, { type: 'device' }, filters),++ getSessionMetrics(websiteId, { type: 'country' }, filters),+ ]);++ const zip = new JSZip();++ const parse = (data: any) => {+ return Papa.unparse(data, {+ header: true,+ skipEmptyLines: true,+ });+ };++ zip.file('events.csv', parse(events));+ zip.file('pages.csv', parse(pages));+ zip.file('referrers.csv', parse(referrers));+ zip.file('browsers.csv', parse(browsers));+ zip.file('os.csv', parse(os));+ zip.file('devices.csv', parse(devices));+ zip.file('countries.csv', parse(countries));++ const content = await zip.generateAsync({ type: 'nodebuffer' });+ const base64 = content.toString('base64');++ return json({ zip: base64 });+ }diff --cc src/app/api/websites/[websiteId]/metrics/route.tsindex c576ff26b,488f85fcd..317b38da4--- a/src/app/api/websites/[websiteId]/metrics/route.ts+++ b/src/app/api/websites/[websiteId]/metrics/route.ts@@@ -11,10 -13,15 +11,15 @@@ importVIDEO_DOMAINS,PAID_AD_PARAMS,} from '@/lib/constants';-import { getRequestFilters, getRequestDateRange, parseRequest } from '@/lib/request';+import { parseRequest, getQueryFilters } from '@/lib/request';import { json, unauthorized, badRequest } from '@/lib/response';- import { getPageviewMetrics, getSessionMetrics, getChannelMetrics } from '@/queries';+ import {++ getEventMetrics,+ getPageviewMetrics,+ getSessionMetrics,- getEventMetrics,+ getChannelMetrics,+ } from '@/queries';-import { filterParams } from '@/lib/schema';+import { dateRangeParams, filterParams, searchParams } from '@/lib/schema';export async function GET(request: Request,@@@ -71,7 -90,13 +76,13 @@@}if (EVENT_COLUMNS.includes(type)) {- const data = await getPageviewMetrics(websiteId, { type, limit, offset }, filters);+ let data;++ if (type === 'event') {- data = await getEventMetrics(websiteId, type, filters, limit, offset);++ data = await getEventMetrics(websiteId, { type, limit, offset }, filters);+ } else {- data = await getPageviewMetrics(websiteId, type, filters, limit, offset);++ data = await getPageviewMetrics(websiteId, { type, limit, offset }, filters);+ }return json(data);}diff --cc src/components/declarations.d.tsindex 4bce9eec8,ca55157ba..000000000deleted file mode 100644,100644--- a/src/components/declarations.d.ts+++ /dev/null@@@ -1,5 -1,4 +1,0 @@@--declare module '*.css';--declare module '*.svg';--declare module '*.json';- declare module 'react-simple-maps';--declare module 'uuid';diff --cc src/components/input/DownloadButton.tsxindex 000000000,9a0e79943..795db8dc6mode 000000,100644..100644--- a/src/components/input/DownloadButton.tsx+++ b/src/components/input/DownloadButton.tsx@@@ -1,0 -1,41 +1,42 @@@+ import Papa from 'papaparse';-import { Button, Icon, TooltipPopup } from 'react-basics';-import Icons from '@/components/icons';++import { Button, Icon, TooltipTrigger, Tooltip } from '@umami/react-zen';++import { Download } from '@/components/icons';+ import { useMessages } from '@/components/hooks';++ export function DownloadButton({+ filename = 'data',+ data,+ }: {+ filename?: string;+ data?: any;+ onClick?: () => void;+ }) {+ const { formatMessage, labels } = useMessages();++ const handleClick = async () => {+ downloadCsv(`${filename}.csv`, Papa.unparse(data));+ };++ return (- <TooltipPopup label={formatMessage(labels.download)} position="top">- <Button variant="quiet" onClick={handleClick} disabled={!data}>++ <TooltipTrigger delay={0}>++ <Button variant="quiet" onClick={handleClick} isDisabled={!data}>+ <Icon>- <Icons.Download />++ <Download />+ </Icon>+ </Button>- </TooltipPopup>++ <Tooltip>{formatMessage(labels.download)}</Tooltip>++ </TooltipTrigger>+ );+ }++ function downloadCsv(filename: string, data: any) {+ const blob = new Blob([data], { type: 'text/csv' });+ const url = URL.createObjectURL(blob);++ const a = document.createElement('a');+ a.href = url;+ a.download = filename;+ a.click();++ URL.revokeObjectURL(url);+ }diff --cc src/components/input/ExportButton.tsxindex 000000000,2b17a6299..76f63e2c7mode 000000,100644..100644--- a/src/components/input/ExportButton.tsx+++ b/src/components/input/ExportButton.tsx@@@ -1,0 -1,47 +1,64 @@@+ import { useState } from 'react';-import { Icon, TooltipPopup, LoadingButton } from 'react-basics';-import Icons from '@/components/icons';++import { Icon, Tooltip, TooltipTrigger, LoadingButton } from '@umami/react-zen';++import { Download } from '@/components/icons';+ import { useMessages, useApi } from '@/components/hooks';-import { useFilterParams } from '@/components/hooks/useFilterParams';+ import { useSearchParams } from 'next/navigation';++import { useDateParameters } from '@/components/hooks/useDateParameters';++import { useFilterParameters } from '@/components/hooks/useFilterParameters';++ export function ExportButton({ websiteId }: { websiteId: string }) {+ const { formatMessage, labels } = useMessages();+ const [isLoading, setIsLoading] = useState(false);- const params = useFilterParams(websiteId);++ const date = useDateParameters(websiteId);++ const filters = useFilterParameters();+ const searchParams = useSearchParams();+ const { get } = useApi();++ const handleClick = async () => {+ setIsLoading(true);+- const { zip } = await get(`/websites/${websiteId}/export`, { ...params, ...searchParams });++ const { zip } = await get(`/websites/${websiteId}/export`, {++ ...date,++ ...filters,++ ...searchParams,++ format: 'json',++ });+- const binary = atob(zip);- const bytes = new Uint8Array(binary.length);- for (let i = 0; i < binary.length; i++) {- bytes[i] = binary.charCodeAt(i);- }-- const blob = new Blob([bytes], { type: 'application/zip' });- const url = URL.createObjectURL(blob);-- const a = document.createElement('a');- a.href = url;- a.download = 'download.zip';- a.click();- URL.revokeObjectURL(url);++ await loadZip(zip);++ setIsLoading(false);+ };++ return (- <TooltipPopup label={formatMessage(labels.download)} position="top">- <LoadingButton variant="quiet" isLoading={isLoading} onClick={handleClick}>++ <TooltipTrigger delay={0}>++ <LoadingButton++ variant="quiet"++ showText={!isLoading}++ isLoading={isLoading}++ onClick={handleClick}++ >+ <Icon>- <Icons.Download />++ <Download />+ </Icon>+ </LoadingButton>- </TooltipPopup>++ <Tooltip>{formatMessage(labels.download)}</Tooltip>++ </TooltipTrigger>+ );+ }++++async function loadZip(zip: string) {++ const binary = atob(zip);++ const bytes = new Uint8Array(binary.length);++ for (let i = 0; i < binary.length; i++) {++ bytes[i] = binary.charCodeAt(i);++ }++++ const blob = new Blob([bytes], { type: 'application/zip' });++ const url = URL.createObjectURL(blob);++++ const a = document.createElement('a');++ a.href = url;++ a.download = 'download.zip';++ a.click();++ URL.revokeObjectURL(url);++}diff --cc src/components/input/WebsiteDateFilter.tsxindex e78bcd8dc,97beaf129..4737517a3--- a/src/components/input/WebsiteDateFilter.tsx+++ b/src/components/input/WebsiteDateFilter.tsx@@@ -1,17 -1,10 +1,18 @@@-import { useDateRange, useLocale } from '@/components/hooks';+import {+ Button,+ Icon,+ Row,+ Text,+ Select,+ ListItem,+ TooltipTrigger,+ Tooltip,+} from '@umami/react-zen';import { isAfter } from 'date-fns';-import { getOffsetDateRange } from '@/lib/date';-import { Button, Icon, Icons } from 'react-basics';-import DateFilter from './DateFilter';-import styles from './WebsiteDateFilter.module.css';-import { DateRange } from '@/lib/types';+import { Chevron, Close, Compare } from '@/components/icons';+import { useDateRange, useMessages, useNavigation } from '@/components/hooks';+import { DateFilter } from './DateFilter';++import { ExportButton } from '@/components/input/ExportButton';export function WebsiteDateFilter({websiteId,@@@ -74,33 -33,27 +75,34 @@@value={value}startDate={startDate}endDate={endDate}- offset={offset}onChange={handleChange}showAllTime={showAllTime}+ renderDate={+offset !== 0}/>- {value !== 'all' && !value.startsWith('range') && (- <div className={styles.buttons}>- <Button onClick={() => handleIncrement(-1)}>- <Icon rotate={dir === 'rtl' ? 270 : 90}>- <Icons.ChevronDown />- </Icon>- </Button>- <Button onClick={() => handleIncrement(1)} disabled={disableForward}>- <Icon rotate={dir === 'rtl' ? 90 : 270}>- <Icons.ChevronDown />- </Icon>+ {!isAllTime && compare && (+ <Row alignItems="center" gap>+ <Text weight="bold">VS</Text>+ <Row width="200px">+ <Select+ value={compare}+ onChange={handleSelect}+ popoverProps={{ style: { width: 200 } }}+ >+ <ListItem id="prev">{formatMessage(labels.previousPeriod)}</ListItem>+ <ListItem id="yoy">{formatMessage(labels.previousYear)}</ListItem>+ </Select>+ </Row>+ </Row>+ )}+ {!isAllTime && allowCompare && (+ <TooltipTrigger delay={0}>+ <Button variant="quiet" onPress={handleCompare}>+ <Icon fillColor>{compare ? <Close /> : <Compare />}</Icon></Button>- </div>+ <Tooltip>{formatMessage(compare ? labels.cancel : labels.compareDates)}</Tooltip>++ <ExportButton websiteId={websiteId} />+ </TooltipTrigger>)}- </div>+ </Row>);}--export default WebsiteDateFilter;diff --cc src/components/input/WebsiteSelect.tsxindex 3b5bd6691,8a7e4ac08..18a1e4a74--- a/src/components/input/WebsiteSelect.tsx+++ b/src/components/input/WebsiteSelect.tsx@@@ -1,7 -1,8 +1,7 @@@-import { useState, Key } from 'react';-import { Dropdown, Item } from 'react-basics';-import { useWebsite, useWebsites, useMessages } from '@/components/hooks';-import Empty from '@/components/common/Empty';-import styles from './WebsiteSelect.module.css';+import { useState } from 'react';- import { Select, SelectProps, ListItem } from '@umami/react-zen';++import { Select, SelectProps, ListItem, Text } from '@umami/react-zen';+import { useUserWebsitesQuery, useWebsiteQuery, useNavigation } from '@/components/hooks';+import { ButtonProps } from 'react-basics';export function WebsiteSelect({websiteId,@@@ -27,20 -39,22 +27,24 @@@};return (- <Dropdown- menuProps={{ className: styles.dropdown }}- items={queryResult?.result?.data as any[]}- value={selectedId as string}- renderValue={renderValue}- renderEmpty={renderEmpty}- onChange={handleSelect}- alignment="end"- placeholder={formatMessage(labels.selectWebsite)}+ <Select+ {...props}+ placeholder=""+ items={data?.['data'] || []}+ value={websiteId}+ isLoading={isLoading}+ buttonProps={buttonProps}allowSearch={true}+ searchValue={search}onSearch={handleSearch}- isLoading={queryResult.query.isLoading}+ onChange={handleSelect}- renderValue={() => website?.name}++ renderValue={() => (++ <Text truncate style={{ maxWidth: 160 }}>++ {website?.name}++ </Text>++ )}>- {({ id, name }) => <Item key={id}>{name}</Item>}- </Dropdown>+ {({ id, name }: any) => <ListItem key={id}>{name}</ListItem>}+ </Select>);}--export default WebsiteSelect;diff --cc src/components/messages.tsindex d6d5a87a9,27086b49d..e0e8413e5--- a/src/components/messages.ts+++ b/src/components/messages.ts@@@ -323,24 -314,9 +323,25 @@@ 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' },+ 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' },+ preferences: { id: 'label.preferences', defaultMessage: 'Preferences' },+ location: { id: 'label.location', defaultMessage: 'Location' },chart: { id: 'label.chart', defaultMessage: 'Chart' },table: { id: 'label.table', defaultMessage: 'Table' },+ download: { id: 'label.download', defaultMessage: 'Download' },+ traffic: { id: 'label.traffic', defaultMessage: 'Traffic' },+ behavior: { id: 'label.behavior', defaultMessage: 'Behavior' },+ growth: { id: 'label.growth', defaultMessage: 'Growth' },});export const messages = defineMessages({diff --cc src/components/metrics/MetricsTable.tsxindex 45b6c9c53,39ba712d6..c229b00cd--- a/src/components/metrics/MetricsTable.tsx+++ b/src/components/metrics/MetricsTable.tsx@@@ -1,12 -1,21 +1,13 @@@- import { ReactNode, useEffect, useMemo, useState } from 'react';+ import { ReactNode, useMemo, useState } from 'react';-import { Loading, Icon, Text, SearchField } from 'react-basics';-import classNames from 'classnames';-import ErrorMessage from '@/components/common/ErrorMessage';-import LinkButton from '@/components/common/LinkButton';+import { Icon, Text, SearchField, Row, Column } from '@umami/react-zen';+import { LinkButton } from '@/components/common/LinkButton';import { DEFAULT_ANIMATION_DURATION } from '@/lib/constants';import { percentFilter } from '@/lib/filters';-import {- useNavigation,- useWebsiteMetrics,- useMessages,- useLocale,- useFormat,-} from '@/components/hooks';-import Icons from '@/components/icons';-import ListTable, { ListTableProps } from './ListTable';-import styles from './MetricsTable.module.css';+import { useNavigation, useWebsiteMetricsQuery, useMessages, useFormat } from '@/components/hooks';+import { Arrow } from '@/components/icons';+import { ListTable, ListTableProps } from './ListTable';+import { LoadingPanel } from '@/components/common/LoadingPanel';+ import { DownloadButton } from '@/components/input/DownloadButton';export interface MetricsTableProps extends ListTableProps {websiteId: string;@@@ -86,33 -94,40 +85,28 @@@ export function MetricsTable(return [];}, [data, dataFilter, search, limit, formatValue, type]);- useEffect(() => {- if (data) {- onDataLoad?.(data);- }- }, [data]);-return (- <div className={classNames(styles.container, className)}>- {error && <ErrorMessage />}- <div className={styles.actions}>- {allowSearch && (- <SearchField- className={styles.search}- value={search}- onSearch={setSearch}- delay={300}- autoFocus={true}- />- )}- <div className={styles.buttons}>- {children}- {allowDownload && <DownloadButton filename={type} data={filteredData} />}- </div>- </div>- {data && !error && (- <ListTable {...(props as ListTableProps)} data={filteredData} className={className} />- )}- {!data && isLoading && !isFetched && <Loading icon="dots" />}- <div className={styles.footer}>- {showMore && data && !error && limit && (- <LinkButton href={renderUrl({ view: type })} variant="quiet">- <Text>{formatMessage(labels.more)}</Text>- <Icon size="sm" rotate={dir === 'rtl' ? 180 : 0}>- <Icons.ArrowRight />- </Icon>- </LinkButton>- )}- </div>- </div>+ <Column gap="3" justifyContent="space-between">+ <LoadingPanel data={data} isFetching={isFetching} isLoading={isLoading} error={error} gap>+ <Row alignItems="center" justifyContent="space-between">+ {allowSearch && <SearchField value={search} onSearch={setSearch} delay={300} />}- {children}++ <Row>++ {children}++ {allowDownload && <DownloadButton filename={type} data={filteredData} />}++ </Row>+ </Row>- {data && (- <ListTable {...(props as ListTableProps)} data={filteredData} className={className} />- )}++ {data && <ListTable {...(props as ListTableProps)} data={filteredData} />}+ <Row justifyContent="center">+ {showMore && data && !error && limit && (+ <LinkButton href={updateParams({ view: type })} variant="quiet">+ <Text>{formatMessage(labels.more)}</Text>+ <Icon size="sm">+ <Arrow />+ </Icon>+ </LinkButton>+ )}+ </Row>+ </LoadingPanel>+ </Column>);}--export default MetricsTable;diff --cc src/declaration.d.tsindex 8c1820bb9,7dff68b86..6982f5b40--- a/src/declaration.d.ts+++ b/src/declaration.d.ts@@@ -1,10 -1,6 +1,16 @@@++declare module '*.css';++declare module '*.svg';++declare module '*.json';declare module 'bcryptjs';declare module 'chartjs-adapter-date-fns';declare module 'cors';+declare module 'date-fns-tz';declare module 'debug';+declare module 'fs-extra';declare module 'jsonwebtoken';declare module 'md5';++declare module 'papaparse';+declare module 'prettier';++declare module 'react-simple-maps';+declare module 'semver';++declare module 'uuid';diff --cc src/lib/clickhouse.tsindex 1b608cfcb,062952d75..1670546e3--- a/src/lib/clickhouse.ts+++ b/src/lib/clickhouse.ts@@@ -227,8 -232,8 +227,7 @@@ async function rawQuery<T = unknown>params: Record<string, unknown> = {},): Promise<T> {if (process.env.LOG_QUERY) {-- log('QUERY:\n', query);-- log('PARAMETERS:\n', params);++ log({ query, params });}await connect();diff --cc src/queries/sql/events/getEventMetrics.tsindex 06c141ba9,b028d7594..73af22789--- a/src/queries/sql/events/getEventMetrics.ts+++ b/src/queries/sql/events/getEventMetrics.ts@@@ -4,96 -4,87 +4,92 @@@ import { CLICKHOUSE, PRISMA, runQueryimport prisma from '@/lib/prisma';import { QueryFilters } from '@/lib/types';++export interface WebsiteEventMetricParameters {++ type: string;++ limit?: string;++ offset?: string;++}+++export interface WebsiteEventMetricData {+ x: string;+ t: string;+ y: number;+}+export async function getEventMetrics(- ...args: [websiteId: string, filters: QueryFilters]- ...args: [- websiteId: string,- type: string,- filters: QueryFilters,- limit?: number | string,- offset?: number | string,- ]-) {++ ...args: [websiteId: string, parameters: WebsiteEventMetricParameters, filters: QueryFilters]+): Promise<WebsiteEventMetricData[]> {return runQuery({[PRISMA]: () => relationalQuery(...args),[CLICKHOUSE]: () => clickhouseQuery(...args),});}- async function relationalQuery(websiteId: string, filters: QueryFilters) {- const { timezone = 'utc', unit = 'day' } = filters;- const { rawQuery, getDateSQL, parseFilters } = prisma;- const { filterQuery, joinSessionQuery, cohortQuery, queryParams } = parseFilters({- ...filters,- eventType: EVENT_TYPE.customEvent,- });+ async function relationalQuery(+ websiteId: string,- type: string,++ parameters: WebsiteEventMetricParameters,+ filters: QueryFilters,- limit: number | string = 500,- offset: number | string = 0,+ ) {++ const { type, limit = 500, offset = 0 } = parameters;+ const column = FILTER_COLUMNS[type] || type;+ const { rawQuery, parseFilters } = prisma;- const { filterQuery, cohortQuery, joinSession, params } = await parseFilters(- websiteId,++ const { filterQuery, cohortQuery, joinSessionQuery, queryParams } = parseFilters(+ {+ ...filters,++ websiteId,+ eventType: EVENT_TYPE.customEvent,+ },+ { joinSession: SESSION_COLUMNS.includes(type) },+ );return rawQuery(`- select- event_name x,- ${getDateSQL('website_event.created_at', unit, timezone)} t,- count(*) y+ select ${column} x,+ count(*) as yfrom website_event- ${joinSessionQuery}${cohortQuery}- ${joinSession}++ ${joinSessionQuery}where website_event.website_id = {{websiteId::uuid}}and website_event.created_at between {{startDate}} and {{endDate}}and event_type = {{eventType}}${filterQuery}- group by 1, 2- order by 2+ group by 1+ order by 2 desc+ limit ${limit}+ offset ${offset}`,- params,+ queryParams,);}async function clickhouseQuery(websiteId: string,- type: string,++ parameters: WebsiteEventMetricParameters,filters: QueryFilters,- limit: number | string = 500,- offset: number | string = 0,-): Promise<{ x: string; y: number }[]> {+): Promise<WebsiteEventMetricData[]> {- const { timezone = 'UTC', unit = 'day' } = filters;- const { rawQuery, getDateSQL, parseFilters } = clickhouse;++ const { type, limit = 500, offset = 0 } = parameters;+ const column = FILTER_COLUMNS[type] || type;+ const { rawQuery, parseFilters } = clickhouse;- const { filterQuery, cohortQuery, params } = await parseFilters(websiteId, {+ const { filterQuery, cohortQuery, queryParams } = parseFilters({...filters,+ websiteId,eventType: EVENT_TYPE.customEvent,});- let sql = '';-- if (filterQuery || cohortQuery) {- sql = `- select- event_name x,- ${getDateSQL('created_at', unit, timezone)} t,- count(*) y- from website_event- ${cohortQuery}- where website_id = {websiteId:UUID}- and created_at between {startDate:DateTime64} and {endDate:DateTime64}- and event_type = {eventType:UInt32}- ${filterQuery}- group by x, t- order by t- `;- } else {- sql = `- select- event_name x,- ${getDateSQL('created_at', unit, timezone)} t,- count(*) y- from (- select arrayJoin(event_name) as event_name,- created_at- from website_event_stats_hourly as website_event- where website_id = {websiteId:UUID}- and created_at between {startDate:DateTime64} and {endDate:DateTime64}- and event_type = {eventType:UInt32}- ) as g- group by x, t- order by t- `;- }-- return rawQuery(sql, queryParams);+ return rawQuery(- `select ${column} x,- count(*) as y- from website_event- ${cohortQuery}- where website_id = {websiteId:UUID}- and created_at between {startDate:DateTime64} and {endDate:DateTime64}- and event_type = {eventType:UInt32}- ${filterQuery}- group by x- order by y desc- limit ${limit}- offset ${offset}++ `select ${column} x,++ count(*) as y++ from website_event++ ${cohortQuery}++ where website_id = {websiteId:UUID}++ and created_at between {startDate:DateTime64} and {endDate:DateTime64}++ and event_type = {eventType:UInt32}++ ${filterQuery}++ group by x++ order by y desc++ limit ${limit}++ offset ${offset}+ `,- params,++ queryParams,+ );}diff --cc src/queries/sql/events/getEventStats.tsindex 000000000,56f313635..ad6b155d5mode 000000,100644..100644--- a/src/queries/sql/events/getEventStats.ts+++ b/src/queries/sql/events/getEventStats.ts@@@ -1,0 -1,92 +1,100 @@@+ import clickhouse from '@/lib/clickhouse';+ import { EVENT_TYPE } from '@/lib/constants';+ import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';+ import prisma from '@/lib/prisma';-import { QueryFilters, WebsiteEventMetric } from '@/lib/types';++import { QueryFilters } from '@/lib/types';++++interface WebsiteEventMetric {++ x: string;++ t: string;++ y: number;++}++ export async function getEventStats(+ ...args: [websiteId: string, filters: QueryFilters]+ ): Promise<WebsiteEventMetric[]> {+ return runQuery({+ [PRISMA]: () => relationalQuery(...args),+ [CLICKHOUSE]: () => clickhouseQuery(...args),+ });+ }++ async function relationalQuery(websiteId: string, filters: QueryFilters) {+ const { timezone = 'utc', unit = 'day' } = filters;+ const { rawQuery, getDateSQL, parseFilters } = prisma;- const { filterQuery, cohortQuery, joinSession, params } = await parseFilters(websiteId, {++ const { filterQuery, cohortQuery, joinSessionQuery, queryParams } = parseFilters({+ ...filters,++ websiteId,+ eventType: EVENT_TYPE.customEvent,+ });++ return rawQuery(+ `+ select+ event_name x,+ ${getDateSQL('website_event.created_at', unit, timezone)} t,+ count(*) y+ 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}}+ ${filterQuery}+ group by 1, 2+ order by 2+ `,- params,++ queryParams,+ );+ }++ async function clickhouseQuery(+ websiteId: string,+ filters: QueryFilters,+ ): Promise<{ x: string; t: string; y: number }[]> {+ const { timezone = 'UTC', unit = 'day' } = filters;+ const { rawQuery, getDateSQL, parseFilters } = clickhouse;- const { filterQuery, cohortQuery, params } = await parseFilters(websiteId, {++ const { filterQuery, cohortQuery, queryParams } = parseFilters({+ ...filters,++ websiteId,+ eventType: EVENT_TYPE.customEvent,+ });++ let sql = '';++ if (filterQuery || cohortQuery) {+ sql = `+ select+ event_name x,+ ${getDateSQL('created_at', unit, timezone)} t,+ count(*) y+ from website_event+ ${cohortQuery}+ where website_id = {websiteId:UUID}+ and created_at between {startDate:DateTime64} and {endDate:DateTime64}+ and event_type = {eventType:UInt32}+ ${filterQuery}+ group by x, t+ order by t+ `;+ } else {+ sql = `+ select+ event_name x,+ ${getDateSQL('created_at', unit, timezone)} t,+ count(*) y+ from (+ select arrayJoin(event_name) as event_name,+ created_at+ from website_event_stats_hourly website_event+ where website_id = {websiteId:UUID}+ and created_at between {startDate:DateTime64} and {endDate:DateTime64}+ and event_type = {eventType:UInt32}+ ) as g+ group by x, t+ order by t+ `;+ }+- return rawQuery(sql, params);++ return rawQuery(sql, queryParams);+ }diff --cc src/queries/sql/sessions/getSessionMetrics.tsindex 7e2393cf9,8a317574a..559623102--- a/src/queries/sql/sessions/getSessionMetrics.ts+++ b/src/queries/sql/sessions/getSessionMetrics.ts@@@ -4,14 -4,14 +4,14 @@@ import { CLICKHOUSE, PRISMA, runQueryimport prisma from '@/lib/prisma';import { QueryFilters } from '@/lib/types';+export interface SessionMetricsParameters {+ type: string;- limit: number | string;- offset: number | string;++ limit?: number | string;++ offset?: number | string;+}+export async function getSessionMetrics(- ...args: [- websiteId: string,- type: string,- filters: QueryFilters,- limit?: number | string,- offset?: number | string,- ]+ ...args: [websiteId: string, parameters: SessionMetricsParameters, filters: QueryFilters]) {return runQuery({[PRISMA]: () => relationalQuery(...args),