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
Lint format files. Updated rng function.
Mike Cao306ca4a43503
diff --git a/package.json b/package.jsonindex a8a017700..9a71fddd3 100644--- a/package.json+++ b/package.json@@ -102,7 +102,6 @@"playwright-core": "^1.60.0","prisma": "^7.8.0","prop-types": "^15.8.1",- "pure-rand": "^8.4.0","react": "^19.2.6","react-aria-components": "^1.17.0","react-dom": "^19.2.6",diff --git a/scripts/check-db.js b/scripts/check-db.jsindex aaa128af5..100cba031 100644--- a/scripts/check-db.js+++ b/scripts/check-db.js@@ -68,7 +68,11 @@ async function checkDatabaseVersion() {async function applyMigration() {if (!process.env.SKIP_DB_MIGRATION) {const directUrl = process.env.DIRECT_DATABASE_URL || process.env.DATABASE_URL;- console.log(execSync('prisma migrate deploy', { env: { ...process.env, DATABASE_URL: directUrl } }).toString());+ console.log(+ execSync('prisma migrate deploy', {+ env: { ...process.env, DATABASE_URL: directUrl },+ }).toString(),+ );success('Database is up to date.');}diff --git a/scripts/download-country-names.js b/scripts/download-country-names.jsindex 474869d44..71cf58691 100644--- a/scripts/download-country-names.js+++ b/scripts/download-country-names.js@@ -1,9 +1,9 @@/* eslint-disable no-console */+import fs from 'node:fs';import https from 'node:https';import path from 'node:path';import chalk from 'chalk';-import fs from 'node:fs';const src = path.resolve(process.cwd(), 'public/intl/messages');const dest = path.resolve(process.cwd(), 'public/intl/country');diff --git a/scripts/download-language-names.js b/scripts/download-language-names.jsindex 17d7aa72e..b10285674 100644--- a/scripts/download-language-names.js+++ b/scripts/download-language-names.js@@ -1,9 +1,9 @@/* eslint-disable no-console */+import fs from 'node:fs';import https from 'node:https';import path from 'node:path';import chalk from 'chalk';-import fs from 'node:fs';const src = path.resolve(process.cwd(), 'public/intl/messages');const dest = path.resolve(process.cwd(), 'public/intl/language');diff --git a/src/app/(collect)/p/[slug]/route.ts b/src/app/(collect)/p/[slug]/route.tsindex 36ba5a892..d7fc24167 100644--- a/src/app/(collect)/p/[slug]/route.ts+++ b/src/app/(collect)/p/[slug]/route.ts@@ -49,7 +49,7 @@ export async function GET(request: Request, { params }: { params: Promise<{ slugpayload: {pixel: pixel.id,url: request.url,- referrer: request.headers.get("referer") || undefined,+ referrer: request.headers.get('referer') || undefined,},};diff --git a/src/app/(collect)/q/[slug]/route.ts b/src/app/(collect)/q/[slug]/route.tsindex f585fc02e..5d4229e90 100644--- a/src/app/(collect)/q/[slug]/route.ts+++ b/src/app/(collect)/q/[slug]/route.ts@@ -47,7 +47,7 @@ export async function GET(request: Request, { params }: { params: Promise<{ slugpayload: {link: link.id,url: request.url,- referrer: request.headers.get("referer") || undefined,+ referrer: request.headers.get('referer') || undefined,},};diff --git a/src/app/(main)/MobileNav.tsx b/src/app/(main)/MobileNav.tsxindex ff54eb75f..1ef458638 100644--- a/src/app/(main)/MobileNav.tsx+++ b/src/app/(main)/MobileNav.tsx@@ -1,7 +1,7 @@import { Column, Grid, Row, Text } from '@umami/react-zen';-import Link from '@/components/common/Link';import { WebsiteNav } from '@/app/(main)/websites/[websiteId]/WebsiteNav';import { IconLabel } from '@/components/common/IconLabel';+import Link from '@/components/common/Link';import { useMessages, useNavigation } from '@/components/hooks';import { Globe, Grid2x2, LayoutDashboard, LinkIcon } from '@/components/icons';import { MobileMenuButton } from '@/components/input/MobileMenuButton';diff --git a/src/app/(main)/SideNav.tsx b/src/app/(main)/SideNav.tsxindex 2f2c27ec4..c44011654 100644--- a/src/app/(main)/SideNav.tsx+++ b/src/app/(main)/SideNav.tsx@@ -1,7 +1,19 @@+import {+ Button,+ type ButtonProps,+ Column,+ Focusable,+ Icon,+ Row,+ Text,+ Tooltip,+ TooltipTrigger,+} from '@umami/react-zen';import { AdminNav } from '@/app/(main)/admin/AdminNav';import { SettingsNav } from '@/app/(main)/settings/SettingsNav';import { WebsiteNav } from '@/app/(main)/websites/[websiteId]/WebsiteNav';import { IconLabel } from '@/components/common/IconLabel';+import Link from '@/components/common/Link';import { useGlobalState, useMessages, useNavigation } from '@/components/hooks';import {Globe,@@ -13,18 +25,6 @@ import {} from '@/components/icons';import { UserButton } from '@/components/input/UserButton';import { Logo } from '@/components/svg';-import {- Button,- type ButtonProps,- Column,- Focusable,- Icon,- Row,- Text,- Tooltip,- TooltipTrigger,-} from '@umami/react-zen';-import Link from '@/components/common/Link';export function SideNav(props: any) {const { t, labels } = useMessages();diff --git a/src/app/(main)/admin/AdminNav.tsx b/src/app/(main)/admin/AdminNav.tsxindex 7df3ff546..f8d8dc51b 100644--- a/src/app/(main)/admin/AdminNav.tsx+++ b/src/app/(main)/admin/AdminNav.tsx@@ -1,9 +1,9 @@+import { Column, Focusable, Row, Tooltip, TooltipTrigger } from '@umami/react-zen';import { IconLabel } from '@/components/common/IconLabel';+import Link from '@/components/common/Link';import { NavMenu } from '@/components/common/NavMenu';import { useMessages, useNavigation } from '@/components/hooks';import { ArrowLeft, Globe, User, Users } from '@/components/icons';-import { Column, Focusable, Row, Tooltip, TooltipTrigger } from '@umami/react-zen';-import Link from '@/components/common/Link';export function AdminNav({ onItemClick }: { onItemClick?: () => void }) {const { t, labels } = useMessages();diff --git a/src/app/(main)/admin/teams/AdminTeamsTable.tsx b/src/app/(main)/admin/teams/AdminTeamsTable.tsxindex 1f7cca5be..24002f2d9 100644--- a/src/app/(main)/admin/teams/AdminTeamsTable.tsx+++ b/src/app/(main)/admin/teams/AdminTeamsTable.tsx@@ -1,7 +1,7 @@import { DataColumn, DataTable, Dialog, Icon, MenuItem, Modal, Row, Text } from '@umami/react-zen';-import Link from '@/components/common/Link';import { useState } from 'react';import { DateDistance } from '@/components/common/DateDistance';+import Link from '@/components/common/Link';import { SortableLabel } from '@/components/common/SortableLabel';import { useMessages } from '@/components/hooks';import { Edit, Trash } from '@/components/icons';@@ -48,7 +48,9 @@ export function AdminTeamsTable({</DataColumn><DataColumnid="created"- label={<SortableLabel label={t(labels.created)} sortKey="createdAt" defaultDirection="desc" />}+ label={+ <SortableLabel label={t(labels.created)} sortKey="createdAt" defaultDirection="desc" />+ }width="160px">{(row: any) => <DateDistance date={new Date(row.createdAt)} />}diff --git a/src/app/(main)/admin/users/UsersTable.tsx b/src/app/(main)/admin/users/UsersTable.tsxindex 299cf3da3..55d46b7c9 100644--- a/src/app/(main)/admin/users/UsersTable.tsx+++ b/src/app/(main)/admin/users/UsersTable.tsx@@ -1,7 +1,7 @@import { DataColumn, DataTable, Icon, MenuItem, Modal, Row, Text } from '@umami/react-zen';-import Link from '@/components/common/Link';import { useState } from 'react';import { DateDistance } from '@/components/common/DateDistance';+import Link from '@/components/common/Link';import { SortableLabel } from '@/components/common/SortableLabel';import { useMessages } from '@/components/hooks';import { Edit, Trash } from '@/components/icons';@@ -40,7 +40,9 @@ export function UsersTable({</DataColumn><DataColumnid="created"- label={<SortableLabel label={t(labels.created)} sortKey="createdAt" defaultDirection="desc" />}+ label={+ <SortableLabel label={t(labels.created)} sortKey="createdAt" defaultDirection="desc" />+ }>{(row: any) => <DateDistance date={new Date(row.createdAt)} />}</DataColumn>diff --git a/src/app/(main)/admin/websites/AdminWebsitesTable.tsx b/src/app/(main)/admin/websites/AdminWebsitesTable.tsxindex edf048120..12698e730 100644--- a/src/app/(main)/admin/websites/AdminWebsitesTable.tsx+++ b/src/app/(main)/admin/websites/AdminWebsitesTable.tsx@@ -1,8 +1,8 @@import { DataColumn, DataTable, Dialog, Icon, MenuItem, Modal, Row, Text } from '@umami/react-zen';-import Link from '@/components/common/Link';import { useState } from 'react';import { WebsiteDeleteForm } from '@/app/(main)/websites/[websiteId]/settings/WebsiteDeleteForm';import { DateDistance } from '@/components/common/DateDistance';+import Link from '@/components/common/Link';import { SortableLabel } from '@/components/common/SortableLabel';import { useMessages } from '@/components/hooks';import { Edit, Trash, Users } from '@/components/icons';@@ -48,7 +48,9 @@ export function AdminWebsitesTable({ data = [], ...props }: { data: any[] }) {</DataColumn><DataColumnid="created"- label={<SortableLabel label={t(labels.created)} sortKey="createdAt" defaultDirection="desc" />}+ label={+ <SortableLabel label={t(labels.created)} sortKey="createdAt" defaultDirection="desc" />+ }width="180px">{(row: any) => <DateDistance date={new Date(row.createdAt)} />}diff --git a/src/app/(main)/boards/BoardEntityBadge.tsx b/src/app/(main)/boards/BoardEntityBadge.tsxindex 31d7081ab..70d4784f8 100644--- a/src/app/(main)/boards/BoardEntityBadge.tsx+++ b/src/app/(main)/boards/BoardEntityBadge.tsx@@ -15,13 +15,7 @@ export function BoardEntityBadge({return (<Row padding borderRadius="full" backgroundColor="surface-base" border gap="2"><Icon>- {type === 'pixel' ? (- <Grid2x2 />- ) : type === 'link' ? (- <Link />- ) : (- <Favicon domain={domain} />- )}+ {type === 'pixel' ? <Grid2x2 /> : type === 'link' ? <Link /> : <Favicon domain={domain} />}</Icon><Text size="sm">{name}</Text></Row>diff --git a/src/app/(main)/boards/BoardProvider.tsx b/src/app/(main)/boards/BoardProvider.tsxindex dc5168424..4ec649520 100644--- a/src/app/(main)/boards/BoardProvider.tsx+++ b/src/app/(main)/boards/BoardProvider.tsx@@ -3,8 +3,8 @@ import { Loading, useToast } from '@umami/react-zen';import { createContext, type ReactNode, useCallback, useEffect, useRef, useState } from 'react';import { v4 as uuid } from 'uuid';import { useApi, useMessages, useModified, useNavigation } from '@/components/hooks';-import { BOARD_TYPES, getBoardType } from '@/lib/boards';import { useBoardQuery } from '@/components/hooks/queries/useBoardQuery';+import { BOARD_TYPES, getBoardType } from '@/lib/boards';import type { Board, BoardParameters } from '@/lib/types';import { getComponentDefinition } from './boardComponentRegistry';diff --git a/src/app/(main)/boards/BoardsTable.tsx b/src/app/(main)/boards/BoardsTable.tsxindex 0465012cc..346e92497 100644--- a/src/app/(main)/boards/BoardsTable.tsx+++ b/src/app/(main)/boards/BoardsTable.tsx@@ -1,6 +1,6 @@import { DataColumn, DataTable, type DataTableProps, Row } from '@umami/react-zen';-import Link from '@/components/common/Link';import { DateDistance } from '@/components/common/DateDistance';+import Link from '@/components/common/Link';import { SortableLabel } from '@/components/common/SortableLabel';import { useMessages, useNavigation } from '@/components/hooks';import { BoardDeleteButton } from './BoardDeleteButton';@@ -23,11 +23,13 @@ export function BoardsTable(props: DataTableProps) {label={<SortableLabel label={t(labels.description)} sortKey="description" />}/><DataColumn id="type" label={<SortableLabel label={t(labels.boardType)} sortKey="type" />}>- {({ type }: any) => type ? type.charAt(0).toUpperCase() + type.slice(1) : ''}+ {({ type }: any) => (type ? type.charAt(0).toUpperCase() + type.slice(1) : '')}</DataColumn><DataColumnid="created"- label={<SortableLabel label={t(labels.created)} sortKey="createdAt" defaultDirection="desc" />}+ label={+ <SortableLabel label={t(labels.created)} sortKey="createdAt" defaultDirection="desc" />+ }width="200px">{(row: any) => <DateDistance date={new Date(row.createdAt)} />}diff --git a/src/app/(main)/boards/[boardId]/BoardComponentSelect.tsx b/src/app/(main)/boards/[boardId]/BoardComponentSelect.tsxindex 3a03ffea0..0e01eee5a 100644--- a/src/app/(main)/boards/[boardId]/BoardComponentSelect.tsx+++ b/src/app/(main)/boards/[boardId]/BoardComponentSelect.tsx@@ -13,7 +13,6 @@ import { useMessages } from '@/components/hooks';import { LinkSelect } from '@/components/input/LinkSelect';import { PixelSelect } from '@/components/input/PixelSelect';import { WebsiteSelect } from '@/components/input/WebsiteSelect';-import type { BoardComponentConfig } from '@/lib/types';import {BOARD_ENTITY_TYPES,type BoardEntityType,@@ -22,6 +21,7 @@ import {isBoardComponentSupported,isOpenBoardType,} from '@/lib/boards';+import type { BoardComponentConfig } from '@/lib/types';import {type ComponentDefinition,type ConfigField,@@ -53,9 +53,7 @@ export function BoardComponentSelect({const [selectedEntityType, setSelectedEntityType] = useState<BoardEntityType>(initialEntity.entityType || boardEntityType || BOARD_ENTITY_TYPES.website,);- const [selectedEntityId, setSelectedEntityId] = useState(- initialEntity.entityId || boardEntityId,- );+ const [selectedEntityId, setSelectedEntityId] = useState(initialEntity.entityId || boardEntityId);const [title, setTitle] = useState('');const [description, setDescription] = useState('');@@ -370,7 +368,11 @@ export function BoardComponentSelect({<Text weight="bold">Preview</Text><Column border="left" paddingLeft="4" height="100%" style={{ minWidth: 0 }}>{hasSelectedEntity && previewConfig && (!needsWebsite || resolvedEntityId) ? (- <BoardComponentRenderer config={previewConfig} websiteId={resolvedEntityId} entityType={resolvedEntityType} />+ <BoardComponentRenderer+ config={previewConfig}+ websiteId={resolvedEntityId}+ entityType={resolvedEntityType}+ />) : (<Column alignItems="center" justifyContent="center" height="100%"><Text color="muted">diff --git a/src/app/(main)/boards/[boardId]/BoardEditColumn.tsx b/src/app/(main)/boards/[boardId]/BoardEditColumn.tsxindex 0a89ea25c..cdc053a43 100644--- a/src/app/(main)/boards/[boardId]/BoardEditColumn.tsx+++ b/src/app/(main)/boards/[boardId]/BoardEditColumn.tsx@@ -1,8 +1,3 @@-import { Panel } from '@/components/common/Panel';-import { useBoard, useMessages, useNavigation } from '@/components/hooks';-import { Pencil, Plus, X } from '@/components/icons';-import { getBoardEntity, getBoardType, getResolvedComponentEntity } from '@/lib/boards';-import type { BoardComponentConfig } from '@/lib/types';import {Box,Button,@@ -15,6 +10,11 @@ import {TooltipTrigger,} from '@umami/react-zen';import { useMemo, useState } from 'react';+import { Panel } from '@/components/common/Panel';+import { useBoard, useMessages, useNavigation } from '@/components/hooks';+import { Pencil, Plus, X } from '@/components/icons';+import { getBoardEntity, getBoardType, getResolvedComponentEntity } from '@/lib/boards';+import type { BoardComponentConfig } from '@/lib/types';import { getComponentDefinition } from '../boardComponentRegistry';import { BoardComponentRenderer } from './BoardComponentRenderer';import { BoardComponentSelect } from './BoardComponentSelect';@@ -48,7 +48,9 @@ export function BoardEditColumn({return null;}- return <BoardComponentRenderer config={component} websiteId={entityId} entityType={entityType} />;+ return (+ <BoardComponentRenderer config={component} websiteId={entityId} entityType={entityType} />+ );}, [component, definition?.requiresWebsite, entityId, entityType]);const handleSelect = (config: BoardComponentConfig) => {@@ -95,9 +97,7 @@ export function BoardEditColumn({><TooltipTrigger delay={0}><Button variant="outline" onPress={() => setShowSelect(true)}>- <Icon size="sm">- {hasComponent ? <Pencil /> : <Plus />}- </Icon>+ <Icon size="sm">{hasComponent ? <Pencil /> : <Plus />}</Icon></Button><Tooltip>{t(hasComponent ? labels.edit : labels.selectComponent)}</Tooltip></TooltipTrigger>diff --git a/src/app/(main)/boards/[boardId]/BoardShareButton.tsx b/src/app/(main)/boards/[boardId]/BoardShareButton.tsxindex 77d6cc609..86c8d05c7 100644--- a/src/app/(main)/boards/[boardId]/BoardShareButton.tsx+++ b/src/app/(main)/boards/[boardId]/BoardShareButton.tsx@@ -1,5 +1,5 @@-import { Share } from '@/components/icons';import { useMessages } from '@/components/hooks';+import { Share } from '@/components/icons';import { DialogButton } from '@/components/input/DialogButton';import { BoardShareDialog } from './BoardShareDialog';@@ -7,12 +7,7 @@ export function BoardShareButton({ boardId }: { boardId: string }) {const { t, labels } = useMessages();return (- <DialogButton- icon={<Share />}- label={t(labels.share)}- title={null}- width="900px"- >+ <DialogButton icon={<Share />} label={t(labels.share)} title={null} width="900px"><BoardShareDialog boardId={boardId} /></DialogButton>);diff --git a/src/app/(main)/boards/[boardId]/BoardShareDialog.tsx b/src/app/(main)/boards/[boardId]/BoardShareDialog.tsxindex ba7a84774..14989a0b4 100644--- a/src/app/(main)/boards/[boardId]/BoardShareDialog.tsx+++ b/src/app/(main)/boards/[boardId]/BoardShareDialog.tsx@@ -1,9 +1,9 @@import { Button, Column, Heading, Row, Text } from '@umami/react-zen';import { useState } from 'react';-import { Plus } from '@/components/icons';-import { LoadingPanel } from '@/components/common/LoadingPanel';import { IconLabel } from '@/components/common/IconLabel';+import { LoadingPanel } from '@/components/common/LoadingPanel';import { useBoardSharesQuery, useMessages } from '@/components/hooks';+import { Plus } from '@/components/icons';import { BoardShareCreateForm } from './BoardShareCreateForm';import { BoardSharesTable } from './BoardSharesTable';@@ -49,9 +49,7 @@ function BoardShareDialogContent({onCancel={() => setIsCreating(false)}/>)}- {hasShares && (- <Text>{t(messages.shareUrl)}</Text>- )}+ {hasShares && <Text>{t(messages.shareUrl)}</Text>}{!showCreateForm &&(hasShares ? (<BoardSharesTable data={shares} />diff --git a/src/app/(main)/boards/[boardId]/BoardSharesTable.tsx b/src/app/(main)/boards/[boardId]/BoardSharesTable.tsxindex c3b30c297..2fb307a20 100644--- a/src/app/(main)/boards/[boardId]/BoardSharesTable.tsx+++ b/src/app/(main)/boards/[boardId]/BoardSharesTable.tsx@@ -1,8 +1,8 @@+import { DataColumn, DataTable, type DataTableProps, Row } from '@umami/react-zen';import { ShareDeleteButton } from '@/app/(main)/websites/[websiteId]/settings/ShareDeleteButton';import { CopyButton } from '@/components/common/CopyButton';import { ExternalLink } from '@/components/common/ExternalLink';import { useConfig, useMessages, useMobile } from '@/components/hooks';-import { DataColumn, DataTable, type DataTableProps, Row } from '@umami/react-zen';import { SimpleShareEditButton } from '@/components/share/SimpleShareEditButton';export function BoardSharesTable(props: DataTableProps) {diff --git a/src/app/(main)/boards/[boardId]/BoardViewHeader.tsx b/src/app/(main)/boards/[boardId]/BoardViewHeader.tsxindex 8533e4534..7c07b7d64 100644--- a/src/app/(main)/boards/[boardId]/BoardViewHeader.tsx+++ b/src/app/(main)/boards/[boardId]/BoardViewHeader.tsx@@ -3,8 +3,8 @@ import { IconLabel } from '@/components/common/IconLabel';import { LinkButton } from '@/components/common/LinkButton';import { PageHeader } from '@/components/common/PageHeader';import { useBoard, useMessages, useNavigation } from '@/components/hooks';-import { getBoardEntity } from '@/lib/boards';import { Edit, LayoutDashboard } from '@/components/icons';+import { getBoardEntity } from '@/lib/boards';import { BoardEntityBadge } from '../BoardEntityBadge';import { useBoardEntityBadgeProps } from '../useBoardEntityBadgeProps';diff --git a/src/app/(main)/boards/[boardId]/edit/BoardEditPage.tsx b/src/app/(main)/boards/[boardId]/edit/BoardEditPage.tsxindex 69c813822..083390be3 100644--- a/src/app/(main)/boards/[boardId]/edit/BoardEditPage.tsx+++ b/src/app/(main)/boards/[boardId]/edit/BoardEditPage.tsx@@ -1,12 +1,12 @@'use client';import { Column } from '@umami/react-zen';-import Link from '@/components/common/Link';-import { BoardEditForm } from '@/app/(main)/boards/BoardEditForm';import { BoardShareDialog } from '@/app/(main)/boards/[boardId]/BoardShareDialog';+import { BoardEditForm } from '@/app/(main)/boards/BoardEditForm';import { IconLabel } from '@/components/common/IconLabel';-import { Panel } from '@/components/common/Panel';+import Link from '@/components/common/Link';import { PageBody } from '@/components/common/PageBody';import { PageHeader } from '@/components/common/PageHeader';+import { Panel } from '@/components/common/Panel';import { useBoardQuery, useMessages, useNavigation } from '@/components/hooks';import { ArrowLeft, LayoutDashboard } from '@/components/icons';@@ -17,12 +17,7 @@ export function BoardEditPage({ boardId }: { boardId: string }) {return (<PageBody>- <Column- margin="2"- width="100%"- maxWidth="800px"- style={{ marginInline: 'auto' }}- >+ <Column margin="2" width="100%" maxWidth="800px" style={{ marginInline: 'auto' }}><><Column marginTop="6"><Link href={renderUrl(`/boards/${boardId}`)}>diff --git a/src/app/(main)/boards/boardComponentRegistry.tsx b/src/app/(main)/boards/boardComponentRegistry.tsxindex 7d9dc9cd5..3607b733a 100644--- a/src/app/(main)/boards/boardComponentRegistry.tsx+++ b/src/app/(main)/boards/boardComponentRegistry.tsx@@ -1,3 +1,4 @@+import type { ComponentType } from 'react';import { TextBlock } from '@/app/(main)/boards/TextBlock';import { LinkMetricsBar } from '@/app/(main)/links/[linkId]/LinkMetricsBar';import { PixelMetricsBar } from '@/app/(main)/pixels/[pixelId]/PixelMetricsBar';@@ -16,7 +17,6 @@ import { EventsChart } from '@/components/metrics/EventsChart';import { MetricsTable } from '@/components/metrics/MetricsTable';import { WeeklyTraffic } from '@/components/metrics/WeeklyTraffic';import { WorldMap } from '@/components/metrics/WorldMap';-import type { ComponentType } from 'react';export interface ConfigField {name: string;diff --git a/src/app/(main)/console/[websiteId]/TestConsolePage.tsx b/src/app/(main)/console/[websiteId]/TestConsolePage.tsxindex e5dcd345a..575685dec 100644--- a/src/app/(main)/console/[websiteId]/TestConsolePage.tsx+++ b/src/app/(main)/console/[websiteId]/TestConsolePage.tsx@@ -1,8 +1,8 @@'use client';import { Button, Column, Grid, Heading } from '@umami/react-zen';-import Link from '@/components/common/Link';import Script from 'next/script';import { WebsiteChart } from '@/app/(main)/websites/[websiteId]/WebsiteChart';+import Link from '@/components/common/Link';import { PageBody } from '@/components/common/PageBody';import { PageHeader } from '@/components/common/PageHeader';import { Panel } from '@/components/common/Panel';diff --git a/src/app/(main)/links/LinkEditButton.tsx b/src/app/(main)/links/LinkEditButton.tsxindex 44598a5db..9c5d23330 100644--- a/src/app/(main)/links/LinkEditButton.tsx+++ b/src/app/(main)/links/LinkEditButton.tsx@@ -1,7 +1,6 @@import { Icon } from '@umami/react-zen';import { LinkButton } from '@/components/common/LinkButton';-import { useNavigation } from '@/components/hooks';-import { useMessages } from '@/components/hooks';+import { useMessages, useNavigation } from '@/components/hooks';import { Edit } from '@/components/icons';export function LinkEditButton({ linkId }: { linkId: string }) {diff --git a/src/app/(main)/links/LinksTable.tsx b/src/app/(main)/links/LinksTable.tsxindex 953adf98d..885e737e3 100644--- a/src/app/(main)/links/LinksTable.tsx+++ b/src/app/(main)/links/LinksTable.tsx@@ -1,7 +1,7 @@import { DataColumn, DataTable, type DataTableProps, Row } from '@umami/react-zen';-import Link from '@/components/common/Link';import { DateDistance } from '@/components/common/DateDistance';import { ExternalLink } from '@/components/common/ExternalLink';+import Link from '@/components/common/Link';import { SortableLabel } from '@/components/common/SortableLabel';import { useMessages, useNavigation, useSlug } from '@/components/hooks';import { LinkDeleteButton } from './LinkDeleteButton';@@ -44,7 +44,9 @@ export function LinksTable({ showActions, ...props }: LinksTableProps) {</DataColumn><DataColumnid="created"- label={<SortableLabel label={t(labels.created)} sortKey="createdAt" defaultDirection="desc" />}+ label={+ <SortableLabel label={t(labels.created)} sortKey="createdAt" defaultDirection="desc" />+ }width="200px">{(row: any) => <DateDistance date={new Date(row.createdAt)} />}diff --git a/src/app/(main)/links/[linkId]/LinkShareForm.tsx b/src/app/(main)/links/[linkId]/LinkShareForm.tsxindex 3486a71ea..a486c6fb0 100644--- a/src/app/(main)/links/[linkId]/LinkShareForm.tsx+++ b/src/app/(main)/links/[linkId]/LinkShareForm.tsx@@ -1,7 +1,7 @@import { Button, Column, Heading, Row, Text } from '@umami/react-zen';import { useState } from 'react';-import { LoadingPanel } from '@/components/common/LoadingPanel';import { IconLabel } from '@/components/common/IconLabel';+import { LoadingPanel } from '@/components/common/LoadingPanel';import { useLinkSharesQuery, useMessages } from '@/components/hooks';import { Plus } from '@/components/icons';import { SimpleShareCreateForm } from '@/components/share/SimpleShareCreateForm';@@ -49,9 +49,7 @@ function LinkShareFormContent({onCancel={() => setIsCreating(false)}/>)}- {hasShares && (- <Text>{t(messages.shareUrl)}</Text>- )}+ {hasShares && <Text>{t(messages.shareUrl)}</Text>}{!showCreateForm &&(hasShares ? (<SimpleSharesTable data={shares} />diff --git a/src/app/(main)/links/[linkId]/edit/LinkEditPage.tsx b/src/app/(main)/links/[linkId]/edit/LinkEditPage.tsxindex c87bec864..013ef02da 100644--- a/src/app/(main)/links/[linkId]/edit/LinkEditPage.tsx+++ b/src/app/(main)/links/[linkId]/edit/LinkEditPage.tsx@@ -1,12 +1,12 @@'use client';import { Column } from '@umami/react-zen';-import Link from '@/components/common/Link';+import { LinkShareForm } from '@/app/(main)/links/[linkId]/LinkShareForm';import { LinkEditForm } from '@/app/(main)/links/LinkEditForm';import { LinkProvider } from '@/app/(main)/links/LinkProvider';-import { LinkShareForm } from '@/app/(main)/links/[linkId]/LinkShareForm';-import { Panel } from '@/components/common/Panel';import { IconLabel } from '@/components/common/IconLabel';+import Link from '@/components/common/Link';import { PageHeader } from '@/components/common/PageHeader';+import { Panel } from '@/components/common/Panel';import { useLink, useMessages, useNavigation } from '@/components/hooks';import { ArrowLeft, Link as LinkIcon } from '@/components/icons';diff --git a/src/app/(main)/pixels/PixelEditButton.tsx b/src/app/(main)/pixels/PixelEditButton.tsxindex 8a8f141d6..d96e8ea21 100644--- a/src/app/(main)/pixels/PixelEditButton.tsx+++ b/src/app/(main)/pixels/PixelEditButton.tsx@@ -1,7 +1,6 @@import { Icon } from '@umami/react-zen';import { LinkButton } from '@/components/common/LinkButton';-import { useNavigation } from '@/components/hooks';-import { useMessages } from '@/components/hooks';+import { useMessages, useNavigation } from '@/components/hooks';import { Edit } from '@/components/icons';export function PixelEditButton({ pixelId }: { pixelId: string }) {diff --git a/src/app/(main)/pixels/PixelsTable.tsx b/src/app/(main)/pixels/PixelsTable.tsxindex 362bffa78..e949603da 100644--- a/src/app/(main)/pixels/PixelsTable.tsx+++ b/src/app/(main)/pixels/PixelsTable.tsx@@ -1,7 +1,7 @@import { DataColumn, DataTable, type DataTableProps, Row } from '@umami/react-zen';-import Link from '@/components/common/Link';import { DateDistance } from '@/components/common/DateDistance';import { ExternalLink } from '@/components/common/ExternalLink';+import Link from '@/components/common/Link';import { SortableLabel } from '@/components/common/SortableLabel';import { useMessages, useNavigation, useSlug } from '@/components/hooks';import { PixelDeleteButton } from './PixelDeleteButton';@@ -35,7 +35,9 @@ export function PixelsTable({ showActions, ...props }: PixelsTableProps) {</DataColumn><DataColumnid="created"- label={<SortableLabel label={t(labels.created)} sortKey="createdAt" defaultDirection="desc" />}+ label={+ <SortableLabel label={t(labels.created)} sortKey="createdAt" defaultDirection="desc" />+ }>{(row: any) => <DateDistance date={new Date(row.createdAt)} />}</DataColumn>diff --git a/src/app/(main)/pixels/[pixelId]/PixelShareForm.tsx b/src/app/(main)/pixels/[pixelId]/PixelShareForm.tsxindex 4c31bbd74..1044cff7a 100644--- a/src/app/(main)/pixels/[pixelId]/PixelShareForm.tsx+++ b/src/app/(main)/pixels/[pixelId]/PixelShareForm.tsx@@ -1,7 +1,7 @@import { Button, Column, Heading, Row, Text } from '@umami/react-zen';import { useState } from 'react';-import { LoadingPanel } from '@/components/common/LoadingPanel';import { IconLabel } from '@/components/common/IconLabel';+import { LoadingPanel } from '@/components/common/LoadingPanel';import { useMessages, usePixelSharesQuery } from '@/components/hooks';import { Plus } from '@/components/icons';import { SimpleShareCreateForm } from '@/components/share/SimpleShareCreateForm';@@ -49,9 +49,7 @@ function PixelShareFormContent({onCancel={() => setIsCreating(false)}/>)}- {hasShares && (- <Text>{t(messages.shareUrl)}</Text>- )}+ {hasShares && <Text>{t(messages.shareUrl)}</Text>}{!showCreateForm &&(hasShares ? (<SimpleSharesTable data={shares} />diff --git a/src/app/(main)/pixels/[pixelId]/edit/PixelEditPage.tsx b/src/app/(main)/pixels/[pixelId]/edit/PixelEditPage.tsxindex d339c756e..04e3ea753 100644--- a/src/app/(main)/pixels/[pixelId]/edit/PixelEditPage.tsx+++ b/src/app/(main)/pixels/[pixelId]/edit/PixelEditPage.tsx@@ -1,12 +1,12 @@'use client';import { Column } from '@umami/react-zen';-import Link from '@/components/common/Link';+import { PixelShareForm } from '@/app/(main)/pixels/[pixelId]/PixelShareForm';import { PixelEditForm } from '@/app/(main)/pixels/PixelEditForm';import { PixelProvider } from '@/app/(main)/pixels/PixelProvider';-import { PixelShareForm } from '@/app/(main)/pixels/[pixelId]/PixelShareForm';-import { Panel } from '@/components/common/Panel';import { IconLabel } from '@/components/common/IconLabel';+import Link from '@/components/common/Link';import { PageHeader } from '@/components/common/PageHeader';+import { Panel } from '@/components/common/Panel';import { useMessages, useNavigation, usePixel } from '@/components/hooks';import { ArrowLeft, Grid2x2 } from '@/components/icons';diff --git a/src/app/(main)/settings/SettingsNav.tsx b/src/app/(main)/settings/SettingsNav.tsxindex 8c97b9d6c..0f8139245 100644--- a/src/app/(main)/settings/SettingsNav.tsx+++ b/src/app/(main)/settings/SettingsNav.tsx@@ -1,6 +1,6 @@import { Column, Focusable, Row, Text, Tooltip, TooltipTrigger } from '@umami/react-zen';-import Link from '@/components/common/Link';import { IconLabel } from '@/components/common/IconLabel';+import Link from '@/components/common/Link';import { useMessages, useNavigation } from '@/components/hooks';import { ArrowLeft, Settings2, UserCircle, Users } from '@/components/icons';diff --git a/src/app/(main)/settings/preferences/ThemeSetting.tsx b/src/app/(main)/settings/preferences/ThemeSetting.tsxindex 091a78e2e..b9938fa92 100644--- a/src/app/(main)/settings/preferences/ThemeSetting.tsx+++ b/src/app/(main)/settings/preferences/ThemeSetting.tsx@@ -4,5 +4,7 @@ import { ThemeModeSelector } from '@/components/input/ThemeModeSelector';export function ThemeSetting() {const { theme, setTheme } = useTheme();- return <ThemeModeSelector value={theme} onChange={value => setTheme(value as 'light' | 'dark')} />;+ return (+ <ThemeModeSelector value={theme} onChange={value => setTheme(value as 'light' | 'dark')} />+ );}diff --git a/src/app/(main)/teams/TeamsDataTable.tsx b/src/app/(main)/teams/TeamsDataTable.tsxindex 6decff1be..a2dbce597 100644--- a/src/app/(main)/teams/TeamsDataTable.tsx+++ b/src/app/(main)/teams/TeamsDataTable.tsx@@ -1,5 +1,5 @@-import Link from '@/components/common/Link';import { DataGrid } from '@/components/common/DataGrid';+import Link from '@/components/common/Link';import { useLoginQuery, useNavigation, useUserTeamsQuery } from '@/components/hooks';import { TeamsTable } from './TeamsTable';diff --git a/src/app/(main)/teams/[teamId]/TeamWebsitesTable.tsx b/src/app/(main)/teams/[teamId]/TeamWebsitesTable.tsxindex e57a10775..b06840d1e 100644--- a/src/app/(main)/teams/[teamId]/TeamWebsitesTable.tsx+++ b/src/app/(main)/teams/[teamId]/TeamWebsitesTable.tsx@@ -1,7 +1,7 @@import { DataColumn, DataTable, Row } from '@umami/react-zen';-import Link from '@/components/common/Link';import { TeamMemberEditButton } from '@/app/(main)/teams/[teamId]/TeamMemberEditButton';import { TeamMemberRemoveButton } from '@/app/(main)/teams/[teamId]/TeamMemberRemoveButton';+import Link from '@/components/common/Link';import { SortableLabel } from '@/components/common/SortableLabel';import { useMessages } from '@/components/hooks';import { ROLES } from '@/lib/constants';diff --git a/src/app/(main)/websites/WebsitesDataTable.tsx b/src/app/(main)/websites/WebsitesDataTable.tsxindex 552784871..28da0e41c 100644--- a/src/app/(main)/websites/WebsitesDataTable.tsx+++ b/src/app/(main)/websites/WebsitesDataTable.tsx@@ -1,6 +1,6 @@import { Icon, Row } from '@umami/react-zen';-import Link from '@/components/common/Link';import { DataGrid } from '@/components/common/DataGrid';+import Link from '@/components/common/Link';import { useLoginQuery, useNavigation, useUserWebsitesQuery } from '@/components/hooks';import { Favicon } from '@/index';import { WebsitesTable } from './WebsitesTable';diff --git a/src/app/(main)/websites/WebsitesTable.tsx b/src/app/(main)/websites/WebsitesTable.tsxindex e1ed4a7d1..5034db68c 100644--- a/src/app/(main)/websites/WebsitesTable.tsx+++ b/src/app/(main)/websites/WebsitesTable.tsx@@ -25,7 +25,9 @@ export function WebsitesTable({ showActions, renderLink, ...props }: WebsitesTab<DataColumn id="domain" label={<SortableLabel label={t(labels.domain)} sortKey="domain" />} /><DataColumnid="created"- label={<SortableLabel label={t(labels.created)} sortKey="createdAt" defaultDirection="desc" />}+ label={+ <SortableLabel label={t(labels.created)} sortKey="createdAt" defaultDirection="desc" />+ }width="200px">{(row: any) => <DateDistance date={new Date(row.createdAt)} />}diff --git a/src/app/(main)/websites/[websiteId]/(reports)/breakdown/BreakdownPage.tsx b/src/app/(main)/websites/[websiteId]/(reports)/breakdown/BreakdownPage.tsxindex 1c3ad7c6d..05b914cea 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/breakdown/BreakdownPage.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/breakdown/BreakdownPage.tsx@@ -6,8 +6,8 @@ import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControimport { Panel } from '@/components/common/Panel';import { useDateRange, useMessages, useResultQuery } from '@/components/hooks';import { ListCheck } from '@/components/icons';-import { DownloadButton } from '@/components/input/DownloadButton';import { DialogButton } from '@/components/input/DialogButton';+import { DownloadButton } from '@/components/input/DownloadButton';import { Breakdown } from './Breakdown';export function BreakdownPage({ websiteId }: { websiteId: string }) {diff --git a/src/app/(main)/websites/[websiteId]/(reports)/funnels/Funnel.tsx b/src/app/(main)/websites/[websiteId]/(reports)/funnels/Funnel.tsxindex 4d599f70d..2525195fd 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/funnels/Funnel.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/funnels/Funnel.tsx@@ -1,3 +1,4 @@+import { Box, Column, Grid, Icon, ProgressBar, Row, Text } from '@umami/react-zen';import { LoadingPanel } from '@/components/common/LoadingPanel';import { useMessages, useNavigation, useOperatorLabels, useResultQuery } from '@/components/hooks';import { File, User } from '@/components/icons';@@ -6,7 +7,6 @@ import { ChangeLabel } from '@/components/metrics/ChangeLabel';import { Lightning } from '@/components/svg';import { formatLongNumber } from '@/lib/format';import type { FunnelResult } from '@/queries/sql/reports/getFunnel';-import { Box, Column, Grid, Icon, ProgressBar, Row, Text } from '@umami/react-zen';import { FunnelEditForm } from './FunnelEditForm';interface FunnelProps {diff --git a/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsx b/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsxindex f8baa5c9e..99cc52bf5 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsx@@ -94,9 +94,7 @@ function StepRow({<ActionSelect /></FormField></Column>- <Column>- {valueField}- </Column>+ <Column>{valueField}</Column><Button onPress={onRemove}><Icon size="sm"><X />diff --git a/src/app/(main)/websites/[websiteId]/(reports)/goals/Goal.tsx b/src/app/(main)/websites/[websiteId]/(reports)/goals/Goal.tsxindex cebefb555..5ed1848e9 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/goals/Goal.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/goals/Goal.tsx@@ -49,7 +49,14 @@ export function Goal({ id, name, type, parameters, websiteId, startDate, endDate</Column>{!isSharePage && (<Column>- <ReportEditButton id={id} name={name} type={type} title={t(labels.goal)} minWidth="400px" minHeight="300px">+ <ReportEditButton+ id={id}+ name={name}+ type={type}+ title={t(labels.goal)}+ minWidth="400px"+ minHeight="300px"+ >{({ close }) => <GoalEditForm id={id} websiteId={websiteId} onClose={close} />}</ReportEditButton></Column>diff --git a/src/app/(main)/websites/[websiteId]/(reports)/heatmaps/Heatmap.tsx b/src/app/(main)/websites/[websiteId]/(reports)/heatmaps/Heatmap.tsxindex 34f03e456..0797c23fe 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/heatmaps/Heatmap.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/heatmaps/Heatmap.tsx@@ -298,7 +298,12 @@ function ClickHeatmapView({</Text></Row>) : (- <Row alignItems="center" justifyContent="space-between" gap className={styles.summaryStats}>+ <Row+ alignItems="center"+ justifyContent="space-between"+ gap+ className={styles.summaryStats}+ ><Text color="muted" className={styles.summaryStat}>{viewport? `${visible.length} positions - ${formatLongNumber(totalClicks)} clicks - viewport ${viewport.width}x${viewport.height}`@@ -329,47 +334,49 @@ function ClickHeatmapView({<EmptyState message="No click data for this page yet." />) : (<>- <div className={styles.snapshotClip}>- {showSnapshot && !snapshotReady && <CanvasLoading />}- {showSnapshot && snapshot?.imageUrl && <SnapshotImage snapshot={snapshot} onReady={handleSnapshotReady} />}- </div>- {showOverlay && (- <div className={styles.overlay}>- {visible.map((point, index) => {- const intensity = Math.min(1, point.count / maxCount);- const desiredSize = 24 + intensity * 36;- const pointWidth = Math.max(overlayPageW, point.pageX);- const pointHeight = Math.max(overlayPageH, point.pageY);- const rawCenterX = (point.pageX / Math.max(1, pointWidth)) * 100;- const rawCenterY = (point.pageY / Math.max(1, pointHeight)) * 100;- const size = desiredSize;- const centerX = Math.max(- CLICK_EDGE_PERCENT,- Math.min(100 - CLICK_EDGE_PERCENT, rawCenterX),- );- const centerY = Math.max(- CLICK_EDGE_PERCENT,- Math.min(100 - CLICK_EDGE_PERCENT, rawCenterY),- );-- return (- <div- key={`${point.pageX}-${point.pageY}-${index}`}- className={styles.dot}- style={{- left: `${centerX}%`,- top: `${centerY}%`,- width: size,- height: size,- transform: 'translate(-50%, -50%)',- opacity: 0.25 + intensity * 0.55,- }}- title={`${point.count} click${point.count === 1 ? '' : 's'}`}- />- );- })}- </div>- )}+ <div className={styles.snapshotClip}>+ {showSnapshot && !snapshotReady && <CanvasLoading />}+ {showSnapshot && snapshot?.imageUrl && (+ <SnapshotImage snapshot={snapshot} onReady={handleSnapshotReady} />+ )}+ </div>+ {showOverlay && (+ <div className={styles.overlay}>+ {visible.map((point, index) => {+ const intensity = Math.min(1, point.count / maxCount);+ const desiredSize = 24 + intensity * 36;+ const pointWidth = Math.max(overlayPageW, point.pageX);+ const pointHeight = Math.max(overlayPageH, point.pageY);+ const rawCenterX = (point.pageX / Math.max(1, pointWidth)) * 100;+ const rawCenterY = (point.pageY / Math.max(1, pointHeight)) * 100;+ const size = desiredSize;+ const centerX = Math.max(+ CLICK_EDGE_PERCENT,+ Math.min(100 - CLICK_EDGE_PERCENT, rawCenterX),+ );+ const centerY = Math.max(+ CLICK_EDGE_PERCENT,+ Math.min(100 - CLICK_EDGE_PERCENT, rawCenterY),+ );++ return (+ <div+ key={`${point.pageX}-${point.pageY}-${index}`}+ className={styles.dot}+ style={{+ left: `${centerX}%`,+ top: `${centerY}%`,+ width: size,+ height: size,+ transform: 'translate(-50%, -50%)',+ opacity: 0.25 + intensity * 0.55,+ }}+ title={`${point.count} click${point.count === 1 ? '' : 's'}`}+ />+ );+ })}+ </div>+ )}</>)}</div>@@ -405,8 +412,14 @@ function ScrollHeatmapView({useEffect(() => {setSnapshotReady(!(showPage && hasSnapshotImage));}, [hasSnapshotImage, showPage, snapshot?.id]);- const { buckets = [], totalSessions = 0, pageW = 0, pageH = 0, viewportW = 0, viewportH = 0 } =- scroll ?? {};+ const {+ buckets = [],+ totalSessions = 0,+ pageW = 0,+ pageH = 0,+ viewportW = 0,+ viewportH = 0,+ } = scroll ?? {};const baseWidth = Math.max(pageW, 1);const baseHeight = Math.max(pageH, 640);const renderWidth = snapshot?.pageW ?? baseWidth;@@ -451,7 +464,12 @@ function ScrollHeatmapView({</Text></Row>) : (- <Row alignItems="center" justifyContent="space-between" gap className={styles.summaryHeader}>+ <Row+ alignItems="center"+ justifyContent="space-between"+ gap+ className={styles.summaryHeader}+ ><Text color="muted" className={styles.summaryStat}>{hasScrollData? `${formatLongNumber(totalSessions)} sessions - page ${pageW}x${pageH}${viewportH ? ` - viewport ${viewportW}x${viewportH}` : ''}`@@ -481,33 +499,38 @@ function ScrollHeatmapView({<EmptyState message="No scroll data for this page yet." />) : (<div className={styles.canvasClip}>- {showSnapshot && !snapshotReady && <CanvasLoading />}- {showSnapshot && snapshot?.imageUrl && <SnapshotImage snapshot={snapshot} onReady={handleSnapshotReady} />}- {showOverlay && (- <div className={styles.overlay}>- {bands.map(band => {- const intensity = band.ratio;- const hue = Math.round(60 - intensity * 60);-- return (- <div- key={band.fromPct}- className={styles.scrollBand}- style={{- top: `${band.fromPct}%`,- height: `${Math.max(0, band.toPct - band.fromPct)}%`,- background: intensity > 0 ? `hsla(${hue}, 90%, 55%, ${0.12 + intensity * 0.45})` : 'none',- }}- title={`${band.toPct}% depth - ${formatLongNumber(band.reached)} sessions reached`}- >- <span className={styles.scrollBandLabel}>- {band.toPct}% depth - {Math.round(intensity * 100)}% reached- </span>- </div>- );- })}- </div>- )}+ {showSnapshot && !snapshotReady && <CanvasLoading />}+ {showSnapshot && snapshot?.imageUrl && (+ <SnapshotImage snapshot={snapshot} onReady={handleSnapshotReady} />+ )}+ {showOverlay && (+ <div className={styles.overlay}>+ {bands.map(band => {+ const intensity = band.ratio;+ const hue = Math.round(60 - intensity * 60);++ return (+ <div+ key={band.fromPct}+ className={styles.scrollBand}+ style={{+ top: `${band.fromPct}%`,+ height: `${Math.max(0, band.toPct - band.fromPct)}%`,+ background:+ intensity > 0+ ? `hsla(${hue}, 90%, 55%, ${0.12 + intensity * 0.45})`+ : 'none',+ }}+ title={`${band.toPct}% depth - ${formatLongNumber(band.reached)} sessions reached`}+ >+ <span className={styles.scrollBandLabel}>+ {band.toPct}% depth - {Math.round(intensity * 100)}% reached+ </span>+ </div>+ );+ })}+ </div>+ )}</div>)}</div>@@ -524,13 +547,7 @@ function ScrollHeatmapView({);}-function SnapshotImage({- snapshot,- onReady,-}: {- snapshot: HeatmapSnapshot;- onReady: () => void;-}) {+function SnapshotImage({ snapshot, onReady }: { snapshot: HeatmapSnapshot; onReady: () => void }) {const [src, setSrc] = useState<string | null>(null);useEffect(() => {diff --git a/src/app/(main)/websites/[websiteId]/(reports)/heatmaps/HeatmapsPage.tsx b/src/app/(main)/websites/[websiteId]/(reports)/heatmaps/HeatmapsPage.tsxindex 7ceb81115..c3b968b46 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/heatmaps/HeatmapsPage.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/heatmaps/HeatmapsPage.tsx@@ -52,7 +52,13 @@ export function HeatmapsPage({ websiteId }: { websiteId: string }) {return (<Column gap><WebsiteControls websiteId={websiteId} />- <Panel minHeight="900px" allowFullscreen minWidth="0" width="100%" style={{ overflow: 'hidden' }}>+ <Panel+ minHeight="900px"+ allowFullscreen+ minWidth="0"+ width="100%"+ style={{ overflow: 'hidden' }}+ ><Column gap="5" minWidth="0" width="100%" paddingTop="2"><Column gap="4" minWidth="0" width="100%">{isPhone ? (@@ -83,9 +89,7 @@ export function HeatmapsPage({ websiteId }: { websiteId: string }) {<HeatmapwebsiteId={websiteId}urlPath={urlPathByMode[mode]}- onUrlPathChange={urlPath =>- setUrlPathByMode(state => ({ ...state, [mode]: urlPath }))- }+ onUrlPathChange={urlPath => setUrlPathByMode(state => ({ ...state, [mode]: urlPath }))}mode={mode}search={search}/>diff --git a/src/app/(main)/websites/[websiteId]/(reports)/retention/Retention.tsx b/src/app/(main)/websites/[websiteId]/(reports)/retention/Retention.tsxindex 89b14080b..127618ad9 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/retention/Retention.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/retention/Retention.tsx@@ -1,6 +1,6 @@import { Column, Grid, Icon, Row, Text } from '@umami/react-zen';-import type { ReactNode } from 'react';import { differenceInCalendarDays } from 'date-fns';+import type { ReactNode } from 'react';import { LoadingPanel } from '@/components/common/LoadingPanel';import { Panel } from '@/components/common/Panel';import { useLocale, useMessages, useResultQuery } from '@/components/hooks';diff --git a/src/app/(main)/websites/[websiteId]/(reports)/revenue/Revenue.tsx b/src/app/(main)/websites/[websiteId]/(reports)/revenue/Revenue.tsxindex 13dd2e5d4..112eedf55 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/revenue/Revenue.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/revenue/Revenue.tsx@@ -1,4 +1,15 @@-import { Column, Grid, Heading, ListItem, Row, Select, Tab, TabList, TabPanel, Tabs } from '@umami/react-zen';+import {+ Column,+ Grid,+ Heading,+ ListItem,+ Row,+ Select,+ Tab,+ TabList,+ TabPanel,+ Tabs,+} from '@umami/react-zen';import { useMemo, useState } from 'react';import { GridRow } from '@/components/common/GridRow';import { LoadingPanel } from '@/components/common/LoadingPanel';diff --git a/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenueMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenueMetricsBar.tsxindex cf9dad1f8..376e8649f 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenueMetricsBar.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenueMetricsBar.tsx@@ -1,9 +1,9 @@import type { ReactNode } from 'react';import { useDateRange, useMessages } from '@/components/hooks';+import type { RevenueStatsData } from '@/components/hooks/queries/useRevenueStatsQuery';import { MetricCard } from '@/components/metrics/MetricCard';import { MetricsBar } from '@/components/metrics/MetricsBar';import { formatLongCurrency, formatLongNumber } from '@/lib/format';-import type { RevenueStatsData } from '@/components/hooks/queries/useRevenueStatsQuery';export interface RevenueMetricsBarProps {data: RevenueStatsData;diff --git a/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenueMetricsTable.tsx b/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenueMetricsTable.tsxindex 40f2f8b64..f593ec536 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenueMetricsTable.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenueMetricsTable.tsx@@ -1,11 +1,7 @@import { Grid } from '@umami/react-zen';import { useMemo } from 'react';import { LoadingPanel } from '@/components/common/LoadingPanel';-import {- useMessages,- useRevenueMetricsQuery,- type RevenueMetricType,-} from '@/components/hooks';+import { type RevenueMetricType, useMessages, useRevenueMetricsQuery } from '@/components/hooks';import { ListTable } from '@/components/metrics/ListTable';import { MetricLabel } from '@/components/metrics/MetricLabel';import { formatLongCurrency } from '@/lib/format';diff --git a/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenueSessionsDataTable.tsx b/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenueSessionsDataTable.tsxindex 61f3801e9..f3120cc1a 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenueSessionsDataTable.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenueSessionsDataTable.tsx@@ -7,10 +7,7 @@ export interface RevenueSessionsDataTableProps {currency: string;}-export function RevenueSessionsDataTable({- websiteId,- currency,-}: RevenueSessionsDataTableProps) {+export function RevenueSessionsDataTable({ websiteId, currency }: RevenueSessionsDataTableProps) {const { updateParams } = useNavigation();const queryResult = useRevenueSessionsQuery(websiteId, currency);diff --git a/src/app/(main)/websites/[websiteId]/WebsiteNav.tsx b/src/app/(main)/websites/[websiteId]/WebsiteNav.tsxindex 9b4e7bded..3f8833838 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteNav.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteNav.tsx@@ -1,6 +1,6 @@import { Column, Focusable, Row, Text, Tooltip, TooltipTrigger } from '@umami/react-zen';-import Link from '@/components/common/Link';import { IconLabel } from '@/components/common/IconLabel';+import Link from '@/components/common/Link';import { useMessages, useNavigation, useWebsiteNavItems } from '@/components/hooks';import { ArrowLeft } from '@/components/icons';diff --git a/src/app/(main)/websites/[websiteId]/cohorts/CohortsTable.tsx b/src/app/(main)/websites/[websiteId]/cohorts/CohortsTable.tsxindex 5641ed40c..d7b9e62d8 100644--- a/src/app/(main)/websites/[websiteId]/cohorts/CohortsTable.tsx+++ b/src/app/(main)/websites/[websiteId]/cohorts/CohortsTable.tsx@@ -1,8 +1,8 @@import { DataColumn, DataTable, type DataTableProps, Row } from '@umami/react-zen';-import Link from '@/components/common/Link';import { CohortDeleteButton } from '@/app/(main)/websites/[websiteId]/cohorts/CohortDeleteButton';import { CohortEditButton } from '@/app/(main)/websites/[websiteId]/cohorts/CohortEditButton';import { DateDistance } from '@/components/common/DateDistance';+import Link from '@/components/common/Link';import { useMessages, useNavigation } from '@/components/hooks';import { filtersObjectToArray } from '@/lib/params';diff --git a/src/app/(main)/websites/[websiteId]/event-data/EventDataPivotTable.tsx b/src/app/(main)/websites/[websiteId]/event-data/EventDataPivotTable.tsxindex 900d5b20e..1ebc7e63e 100644--- a/src/app/(main)/websites/[websiteId]/event-data/EventDataPivotTable.tsx+++ b/src/app/(main)/websites/[websiteId]/event-data/EventDataPivotTable.tsx@@ -7,7 +7,13 @@ import { Empty } from '@/components/common/Empty';import Link from '@/components/common/Link';import { LoadingPanel } from '@/components/common/LoadingPanel';import { Pager } from '@/components/common/Pager';-import { useEventDataPivotQuery, useEventDataPropertiesQuery, useMessages, useMobile, useNavigation } from '@/components/hooks';+import {+ useEventDataPivotQuery,+ useEventDataPropertiesQuery,+ useMessages,+ useMobile,+ useNavigation,+} from '@/components/hooks';import type { EventPropertyFilter } from '@/lib/types';export function EventDataPivotTable({@@ -41,7 +47,15 @@ export function EventDataPivotTable({const tableData = useMemo(() => {if (!pivotQuery.data?.data) return [];return pivotQuery.data.data.map(- (row: { eventId: string; sessionId: string; eventName: string; urlPath: string; createdAt: string; propertyKeys: string[]; propertyValues: string[] }) => {+ (row: {+ eventId: string;+ sessionId: string;+ eventName: string;+ urlPath: string;+ createdAt: string;+ propertyKeys: string[];+ propertyValues: string[];+ }) => {const flat: Record<string, any> = {eventId: row.eventId,sessionId: row.sessionId,@@ -57,10 +71,7 @@ export function EventDataPivotTable({}, [pivotQuery.data]);const tableQuery = useMemo(- () =>- pivotQuery.data- ? { ...pivotQuery.data, data: tableData }- : undefined,+ () => (pivotQuery.data ? { ...pivotQuery.data, data: tableData } : undefined),[pivotQuery.data, tableData],);@@ -110,13 +121,11 @@ export function EventDataPivotTable({</DataColumn></DataTable>) : (- <div style={{ width: '100%', maxWidth: '100%', overflowX: 'auto', overflowY: 'hidden' }}>+ <div+ style={{ width: '100%', maxWidth: '100%', overflowX: 'auto', overflowY: 'hidden' }}+ ><div style={{ width: tableMinWidth, minWidth: tableMinWidth }}>- <DataTable- data={tableQuery?.data}- style={{ width: '100%' }}- displayMode="table"- >+ <DataTable data={tableQuery?.data} style={{ width: '100%' }} displayMode="table"><DataColumn id="session" label={t(labels.session)} width="72px">{(row: any) => (<Link href={updateParams({ session: row.sessionId })}>diff --git a/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsxindex 57688e55c..8e07880bb 100644--- a/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx+++ b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx@@ -10,10 +10,10 @@ import {Row,Text,} from '@umami/react-zen';-import Link from '@/components/common/Link';import { Avatar } from '@/components/common/Avatar';import { DateDistance } from '@/components/common/DateDistance';import { IconLabel } from '@/components/common/IconLabel';+import Link from '@/components/common/Link';import { TypeIcon } from '@/components/common/TypeIcon';import { useFormat, useMessages, useNavigation } from '@/components/hooks';import { Eye, FileText } from '@/components/icons';diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsxindex b97e1bb6b..e5ded892b 100644--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx@@ -9,11 +9,7 @@ export function RealtimeHeader({ data }: { data: any }) {return (<MetricsBar- columns={- isPhone- ? 'repeat(2, minmax(0, 1fr))'- : 'repeat(auto-fit, minmax(160px, 1fr))'- }+ columns={isPhone ? 'repeat(2, minmax(0, 1fr))' : 'repeat(auto-fit, minmax(160px, 1fr))'}><MetricCard label={t(labels.views)} value={totals.views} /><MetricCard label={t(labels.visitors)} value={totals.visitors} />diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsxindex 4dd36b829..8c3b56514 100644--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx@@ -1,3 +1,6 @@+import { Column, Heading, Row, SearchField, Text } from '@umami/react-zen';+import { useMemo, useState } from 'react';+import { List, type RowComponentProps } from 'react-window';import { SessionModal } from '@/app/(main)/websites/[websiteId]/sessions/SessionModal';import { Avatar } from '@/components/common/Avatar';import { Empty } from '@/components/common/Empty';@@ -17,9 +20,6 @@ import { Eye, User } from '@/components/icons';import { FilterButtons } from '@/components/input/FilterButtons';import { Lightning } from '@/components/svg';import { BROWSERS, OS_NAMES } from '@/lib/constants';-import { Column, Heading, Row, SearchField, Text } from '@umami/react-zen';-import { useMemo, useState } from 'react';-import { List, type RowComponentProps } from 'react-window';const TYPE_ALL = 'all';const TYPE_PAGEVIEW = 'pageview';@@ -136,9 +136,7 @@ export function RealtimeLog({ data }: { data: any }) {<Text wrap="nowrap">{getTime(row)}</Text></Row><IconLabel icon={getIcon(row)} style={{ minWidth: 0, flex: 1 }}>- <Text truncate>- {getDetail(row)}- </Text>+ <Text truncate>{getDetail(row)}</Text></IconLabel></Row>);diff --git a/src/app/(main)/websites/[websiteId]/replays/ReplaysPage.tsx b/src/app/(main)/websites/[websiteId]/replays/ReplaysPage.tsxindex f0a607c8b..b34d3fb2f 100644--- a/src/app/(main)/websites/[websiteId]/replays/ReplaysPage.tsx+++ b/src/app/(main)/websites/[websiteId]/replays/ReplaysPage.tsx@@ -1,4 +1,6 @@'use client';+import { Button, Column, Tab, TabList, TabPanel, Tabs } from '@umami/react-zen';+import { type Key, useState } from 'react';import { SessionModal } from '@/app/(main)/websites/[websiteId]/sessions/SessionModal';import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';import { EmptyPlaceholder } from '@/components/common/EmptyPlaceholder';@@ -6,8 +8,6 @@ import { Panel } from '@/components/common/Panel';import { useMessages, useSubscription, useWebsite } from '@/components/hooks';import { Video } from '@/components/icons';import { getItem, setItem } from '@/lib/storage';-import { Button, Column, Tab, TabList, TabPanel, Tabs } from '@umami/react-zen';-import { type Key, useState } from 'react';import { ReplayModal } from './ReplayModal';import { ReplaysDataTable } from './ReplaysDataTable';import { SavedReplaysDataTable } from './SavedReplaysDataTable';diff --git a/src/app/(main)/websites/[websiteId]/replays/ReplaysTable.tsx b/src/app/(main)/websites/[websiteId]/replays/ReplaysTable.tsxindex 33fc7f13c..55dea05a2 100644--- a/src/app/(main)/websites/[websiteId]/replays/ReplaysTable.tsx+++ b/src/app/(main)/websites/[websiteId]/replays/ReplaysTable.tsx@@ -1,8 +1,8 @@import { Button, DataColumn, DataTable, type DataTableProps, Icon } from '@umami/react-zen';import { Play } from 'lucide-react';-import Link from '@/components/common/Link';import { Avatar } from '@/components/common/Avatar';import { DateDistance } from '@/components/common/DateDistance';+import Link from '@/components/common/Link';import { TypeIcon } from '@/components/common/TypeIcon';import { useFormat, useMessages, useNavigation } from '@/components/hooks';diff --git a/src/app/(main)/websites/[websiteId]/replays/[replayId]/ReplayPlayer.tsx b/src/app/(main)/websites/[websiteId]/replays/[replayId]/ReplayPlayer.tsxindex d517043f5..b4c455cb0 100644--- a/src/app/(main)/websites/[websiteId]/replays/[replayId]/ReplayPlayer.tsx+++ b/src/app/(main)/websites/[websiteId]/replays/[replayId]/ReplayPlayer.tsx@@ -1,7 +1,7 @@'use client';-import { useMobile } from '@/components/hooks';import { Column } from '@umami/react-zen';import { useEffect, useRef, useState } from 'react';+import { useMobile } from '@/components/hooks';import 'rrweb-player/dist/style.css';export function ReplayPlayer({ events }: { events: any[] }) {diff --git a/src/app/(main)/websites/[websiteId]/segments/SegmentsTable.tsx b/src/app/(main)/websites/[websiteId]/segments/SegmentsTable.tsxindex 4c9e27e38..e068efaca 100644--- a/src/app/(main)/websites/[websiteId]/segments/SegmentsTable.tsx+++ b/src/app/(main)/websites/[websiteId]/segments/SegmentsTable.tsx@@ -1,8 +1,8 @@import { DataColumn, DataTable, type DataTableProps, Row } from '@umami/react-zen';-import Link from '@/components/common/Link';import { SegmentDeleteButton } from '@/app/(main)/websites/[websiteId]/segments/SegmentDeleteButton';import { SegmentEditButton } from '@/app/(main)/websites/[websiteId]/segments/SegmentEditButton';import { DateDistance } from '@/components/common/DateDistance';+import Link from '@/components/common/Link';import { useMessages, useNavigation } from '@/components/hooks';export function SegmentsTable(props: DataTableProps) {diff --git a/src/app/(main)/websites/[websiteId]/session-data/SessionDataPivotTable.tsx b/src/app/(main)/websites/[websiteId]/session-data/SessionDataPivotTable.tsxindex c7c3716bc..8e3677e7a 100644--- a/src/app/(main)/websites/[websiteId]/session-data/SessionDataPivotTable.tsx+++ b/src/app/(main)/websites/[websiteId]/session-data/SessionDataPivotTable.tsx@@ -37,7 +37,10 @@ export function SessionDataPivotTable({return [];}, [providedPropertyKeys]);- const tableMinWidth = useMemo(() => `${72 + 220 + 180 + propertyKeys.length * 160}px`, [propertyKeys.length]);+ const tableMinWidth = useMemo(+ () => `${72 + 220 + 180 + propertyKeys.length * 160}px`,+ [propertyKeys.length],+ );const tableData = useMemo(() => {if (!pivotQuery.data?.data) return [];@@ -120,7 +123,9 @@ export function SessionDataPivotTable({{isMobile ? (renderTable('cards')) : (- <div style={{ width: '100%', maxWidth: '100%', overflowX: 'auto', overflowY: 'hidden' }}>+ <div+ style={{ width: '100%', maxWidth: '100%', overflowX: 'auto', overflowY: 'hidden' }}+ ><div style={{ width: tableMinWidth, minWidth: tableMinWidth }}>{renderTable('table')}</div>diff --git a/src/app/(main)/websites/[websiteId]/session-data/SessionPropertyChart.tsx b/src/app/(main)/websites/[websiteId]/session-data/SessionPropertyChart.tsxindex 048ac08d7..26ca581e2 100644--- a/src/app/(main)/websites/[websiteId]/session-data/SessionPropertyChart.tsx+++ b/src/app/(main)/websites/[websiteId]/session-data/SessionPropertyChart.tsx@@ -1,12 +1,12 @@'use client';+import { Column, DataColumn, DataTable, Grid, Row, Text } from '@umami/react-zen';+import { useMemo } from 'react';import { DistributionBarChart } from '@/components/charts/DistributionBarChart';import { Empty } from '@/components/common/Empty';import { LoadingPanel } from '@/components/common/LoadingPanel';import { useMessages, useMobile, useSessionDataActivityStatsQuery } from '@/components/hooks';import { formatLongNumber } from '@/lib/format';import type { PropertyFilter } from '@/lib/types';-import { Column, DataColumn, DataTable, Grid, Row, Text } from '@umami/react-zen';-import { useMemo } from 'react';export function SessionPropertyChart({websiteId,diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionModal.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionModal.tsxindex dd9ce4690..26948b241 100644--- a/src/app/(main)/websites/[websiteId]/sessions/SessionModal.tsx+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionModal.tsx@@ -34,7 +34,12 @@ export function SessionModal({ websiteId, ...props }: SessionModalProps) {<Dialog variant="sheet" className="rounded-lg">{({ close }) => (<Column padding="10">- <SessionProfile websiteId={websiteId} sessionId={session} showReplays={!isSharePage} onClose={() => close()} />+ <SessionProfile+ websiteId={websiteId}+ sessionId={session}+ showReplays={!isSharePage}+ onClose={() => close()}+ /></Column>)}</Dialog>diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionProfile.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionProfile.tsxindex 9671c995e..7b05f07d7 100644--- a/src/app/(main)/websites/[websiteId]/sessions/SessionProfile.tsx+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionProfile.tsx@@ -1,7 +1,4 @@'use client';-import { Avatar } from '@/components/common/Avatar';-import { LoadingPanel } from '@/components/common/LoadingPanel';-import { useMessages, useWebsiteSessionQuery } from '@/components/hooks';import {Button,Column,@@ -14,6 +11,9 @@ import {TextField,} from '@umami/react-zen';import { X } from 'lucide-react';+import { Avatar } from '@/components/common/Avatar';+import { LoadingPanel } from '@/components/common/LoadingPanel';+import { useMessages, useWebsiteSessionQuery } from '@/components/hooks';import { SessionActivity } from './SessionActivity';import { SessionData } from './SessionData';import { SessionInfo } from './SessionInfo';diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.tsxindex cfc6d4f76..5e1a7009f 100644--- a/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.tsx+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.tsx@@ -1,15 +1,19 @@import { Column, ComboBox, Grid, Label, ListItem, Row } from '@umami/react-zen';import { useMemo, useState } from 'react';import { LoadingPanel } from '@/components/common/LoadingPanel';-import { useMessages, usePropertyFieldsQuery, useSessionDataPropertiesQuery } from '@/components/hooks';-import { DATA_TYPE } from '@/lib/constants';-import type { PropertyFilter } from '@/lib/types';+import { Panel } from '@/components/common/Panel';+import {+ useMessages,+ usePropertyFieldsQuery,+ useSessionDataPropertiesQuery,+} from '@/components/hooks';import { PropertyChart } from '@/components/property-data/PropertyChart';import { PropertyDateChart } from '@/components/property-data/PropertyDateChart';import { PropertyFilterBar } from '@/components/property-data/PropertyFilterBar';import { PropertyFilterButton } from '@/components/property-data/PropertyFilterButton';import { PropertyNumericChart } from '@/components/property-data/PropertyNumericChart';-import { Panel } from '@/components/common/Panel';+import { DATA_TYPE } from '@/lib/constants';+import type { PropertyFilter } from '@/lib/types';import { SessionDataPivotTable } from '../session-data/SessionDataPivotTable';import { SessionPropertyChart } from '../session-data/SessionPropertyChart';@@ -111,7 +115,9 @@ export function SessionProperties({ websiteId }: { websiteId: string }) {)}</Grid>)}- {propertyName && <PropertyFilterBar filters={propertyFilters} onChange={setPropertyFilters} />}+ {propertyName && (+ <PropertyFilterBar filters={propertyFilters} onChange={setPropertyFilters} />+ )}{propertyName && selectedProperty?.dataType === DATA_TYPE.number && (<PropertyNumericChartsource="session"diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsxindex 7bf6fd2f9..56e5f7243 100644--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx@@ -1,7 +1,7 @@import { DataColumn, DataTable, type DataTableProps } from '@umami/react-zen';-import Link from '@/components/common/Link';import { Avatar } from '@/components/common/Avatar';import { DateDistance } from '@/components/common/DateDistance';+import Link from '@/components/common/Link';import { TypeIcon } from '@/components/common/TypeIcon';import { useFormat, useMessages } from '@/components/hooks';@@ -17,7 +17,11 @@ export function SessionsTable({<DataTable {...props}><DataColumn id="id" label={t(labels.session)} width="100px">{(row: any) => (- <Link href={getSessionHref ? getSessionHref(row) : `/websites/${websiteId}/sessions/${row.id}`}>+ <Link+ href={+ getSessionHref ? getSessionHref(row) : `/websites/${websiteId}/sessions/${row.id}`+ }+ ><Avatar seed={row.id} size={32} /></Link>)}diff --git a/src/app/(main)/websites/[websiteId]/settings/ShareEditForm.tsx b/src/app/(main)/websites/[websiteId]/settings/ShareEditForm.tsxindex 3233a8585..b89e4e222 100644--- a/src/app/(main)/websites/[websiteId]/settings/ShareEditForm.tsx+++ b/src/app/(main)/websites/[websiteId]/settings/ShareEditForm.tsx@@ -137,21 +137,21 @@ export function ShareEditForm({<TextField autoComplete="off" autoFocus={!isEditing} /></FormField><Grid columns={{ base: 'repeat(2, 1fr)', lg: 'repeat(3, 1fr)' }} gap="3">- <FormField label={t(labels.filters)} name="allowFilter">- <Switch- isSelected={watch('allowFilter')}- onChange={value => setValue('allowFilter', value, { shouldDirty: true })}- >- {t(labels.filtersEnabled)}- </Switch>- </FormField>- <FormField label={t(labels.theme)} name="theme">- <ThemeModeSelector- value={watch('theme')}- includeSystem- onChange={value => setValue('theme', value, { shouldDirty: true })}- />- </FormField>+ <FormField label={t(labels.filters)} name="allowFilter">+ <Switch+ isSelected={watch('allowFilter')}+ onChange={value => setValue('allowFilter', value, { shouldDirty: true })}+ >+ {t(labels.filtersEnabled)}+ </Switch>+ </FormField>+ <FormField label={t(labels.theme)} name="theme">+ <ThemeModeSelector+ value={watch('theme')}+ includeSystem+ onChange={value => setValue('theme', value, { shouldDirty: true })}+ />+ </FormField></Grid><ListSeparator /><Grid columns={{ base: 'repeat(2, 1fr)', lg: 'repeat(3, 1fr)' }} gap="3">diff --git a/src/app/(main)/websites/[websiteId]/settings/WebsiteReplaySettings.tsx b/src/app/(main)/websites/[websiteId]/settings/WebsiteReplaySettings.tsxindex d7309affe..128ef106b 100644--- a/src/app/(main)/websites/[websiteId]/settings/WebsiteReplaySettings.tsx+++ b/src/app/(main)/websites/[websiteId]/settings/WebsiteReplaySettings.tsx@@ -93,14 +93,18 @@ export function WebsiteReplaySettings({ websiteId }: { websiteId: string }) {const previous = replayEnabled;setReplayEnabled(value);- await saveRecorderConfig(getNextConfig({ replayEnabled: value }), () => setReplayEnabled(previous));+ await saveRecorderConfig(getNextConfig({ replayEnabled: value }), () =>+ setReplayEnabled(previous),+ );};const handleHeatmapToggle = async (value: boolean) => {const previous = heatmapEnabled;setHeatmapEnabled(value);- await saveRecorderConfig(getNextConfig({ heatmapEnabled: value }), () => setHeatmapEnabled(previous));+ await saveRecorderConfig(getNextConfig({ heatmapEnabled: value }), () =>+ setHeatmapEnabled(previous),+ );};const handleSave = async () => {diff --git a/src/app/(main)/websites/[websiteId]/settings/WebsiteSettingsHeader.tsx b/src/app/(main)/websites/[websiteId]/settings/WebsiteSettingsHeader.tsxindex 42b968b5f..b96d3c6e7 100644--- a/src/app/(main)/websites/[websiteId]/settings/WebsiteSettingsHeader.tsx+++ b/src/app/(main)/websites/[websiteId]/settings/WebsiteSettingsHeader.tsx@@ -1,6 +1,6 @@import { Row } from '@umami/react-zen';-import Link from '@/components/common/Link';import { IconLabel } from '@/components/common/IconLabel';+import Link from '@/components/common/Link';import { PageHeader } from '@/components/common/PageHeader';import { useMessages, useNavigation, useWebsite } from '@/components/hooks';import { ArrowLeft, Globe } from '@/components/icons';diff --git a/src/app/(main)/websites/[websiteId]/settings/WebsiteTrackingCode.tsx b/src/app/(main)/websites/[websiteId]/settings/WebsiteTrackingCode.tsxindex 9deb93f7f..7696161c9 100644--- a/src/app/(main)/websites/[websiteId]/settings/WebsiteTrackingCode.tsx+++ b/src/app/(main)/websites/[websiteId]/settings/WebsiteTrackingCode.tsx@@ -34,7 +34,14 @@ export function WebsiteTrackingCode({<Column gap><Label>{t(labels.trackingCode)}</Label><Text color="muted">{t(messages.trackingCode)}</Text>- <TextField value={code} isReadOnly allowCopy asTextArea resize="none" className="code-textarea" />+ <TextField+ value={code}+ isReadOnly+ allowCopy+ asTextArea+ resize="none"+ className="code-textarea"+ /></Column>);}diff --git a/src/app/api/boards/[boardId]/shares/route.ts b/src/app/api/boards/[boardId]/shares/route.tsindex 46e28e522..023189bd5 100644--- a/src/app/api/boards/[boardId]/shares/route.ts+++ b/src/app/api/boards/[boardId]/shares/route.ts@@ -8,10 +8,7 @@ import { anyObjectParam, filterParams, pagingParams } from '@/lib/schema';import { canUpdateBoard, canViewBoard } from '@/permissions';import { createShare, getSharesByEntityId } from '@/queries/prisma';-export async function GET(- request: Request,- { params }: { params: Promise<{ boardId: string }> },-) {+export async function GET(request: Request, { params }: { params: Promise<{ boardId: string }> }) {const schema = z.object({...filterParams,...pagingParams,@@ -39,10 +36,7 @@ export async function GET(return json(data);}-export async function POST(- request: Request,- { params }: { params: Promise<{ boardId: string }> },-) {+export async function POST(request: Request, { params }: { params: Promise<{ boardId: string }> }) {const schema = z.object({name: z.string().max(200),parameters: anyObjectParam.optional(),diff --git a/src/app/api/dashboard/route.ts b/src/app/api/dashboard/route.tsindex 880057181..130c64e54 100644--- a/src/app/api/dashboard/route.ts+++ b/src/app/api/dashboard/route.ts@@ -1,7 +1,7 @@+import { z } from 'zod';import { parseRequest } from '@/lib/request';import { json, unauthorized } from '@/lib/response';import { createBoard, getBoard, updateBoard } from '@/queries/prisma';-import { z } from 'zod';export async function GET(request: Request) {const { auth, error } = await parseRequest(request);diff --git a/src/app/api/links/[linkId]/shares/route.ts b/src/app/api/links/[linkId]/shares/route.tsindex f596bad85..554dbdd26 100644--- a/src/app/api/links/[linkId]/shares/route.ts+++ b/src/app/api/links/[linkId]/shares/route.ts@@ -8,10 +8,7 @@ import { anyObjectParam, filterParams, pagingParams } from '@/lib/schema';import { canUpdateLink, canViewLink } from '@/permissions';import { createShare, getSharesByEntityId } from '@/queries/prisma';-export async function GET(- request: Request,- { params }: { params: Promise<{ linkId: string }> },-) {+export async function GET(request: Request, { params }: { params: Promise<{ linkId: string }> }) {const schema = z.object({...filterParams,...pagingParams,@@ -39,10 +36,7 @@ export async function GET(return json(data);}-export async function POST(- request: Request,- { params }: { params: Promise<{ linkId: string }> },-) {+export async function POST(request: Request, { params }: { params: Promise<{ linkId: string }> }) {const schema = z.object({name: z.string().max(200),parameters: anyObjectParam.optional(),diff --git a/src/app/api/pixels/[pixelId]/shares/route.ts b/src/app/api/pixels/[pixelId]/shares/route.tsindex a82b8ff7e..9ac539101 100644--- a/src/app/api/pixels/[pixelId]/shares/route.ts+++ b/src/app/api/pixels/[pixelId]/shares/route.ts@@ -8,10 +8,7 @@ import { anyObjectParam, filterParams, pagingParams } from '@/lib/schema';import { canUpdatePixel, canViewPixel } from '@/permissions';import { createShare, getSharesByEntityId } from '@/queries/prisma';-export async function GET(- request: Request,- { params }: { params: Promise<{ pixelId: string }> },-) {+export async function GET(request: Request, { params }: { params: Promise<{ pixelId: string }> }) {const schema = z.object({...filterParams,...pagingParams,@@ -39,10 +36,7 @@ export async function GET(return json(data);}-export async function POST(- request: Request,- { params }: { params: Promise<{ pixelId: string }> },-) {+export async function POST(request: Request, { params }: { params: Promise<{ pixelId: string }> }) {const schema = z.object({name: z.string().max(200),parameters: anyObjectParam.optional(),diff --git a/src/app/api/realtime/[websiteId]/route.ts b/src/app/api/realtime/[websiteId]/route.tsindex da12e9b15..a709d87c3 100644--- a/src/app/api/realtime/[websiteId]/route.ts+++ b/src/app/api/realtime/[websiteId]/route.ts@@ -3,8 +3,8 @@ import { z } from 'zod';import { REALTIME_RANGE } from '@/lib/constants';import { getQueryFilters, parseRequest } from '@/lib/request';import { json, unauthorized } from '@/lib/response';-import { canViewWebsiteSection } from '@/permissions';import { filterParams, timezoneParam, unitParam } from '@/lib/schema';+import { canViewWebsiteSection } from '@/permissions';import { getRealtimeData } from '@/queries/sql';export async function GET(diff --git a/src/app/api/record/route.ts b/src/app/api/record/route.tsindex 91c2282dc..ad304a27c 100644--- a/src/app/api/record/route.ts+++ b/src/app/api/record/route.ts@@ -1,11 +1,11 @@import { isbot } from 'isbot';import { serializeError } from 'serialize-error';import { z } from 'zod';+import { HEATMAP_EVENT_TYPE } from '@/lib/constants';import { secret } from '@/lib/crypto';import { getClientInfo, hasBlockedIp } from '@/lib/detect';import { parseToken } from '@/lib/jwt';import { fetchAccount, fetchTeam } from '@/lib/load';-import { HEATMAP_EVENT_TYPE } from '@/lib/constants';import { getRecorderConfig } from '@/lib/recorder';import { parseRequest } from '@/lib/request';import { badRequest, forbidden, json, serverError } from '@/lib/response';@@ -185,15 +185,15 @@ export async function POST(request: Request) {visitId,eventType: event.type === 'click' ? HEATMAP_EVENT_TYPE.click : HEATMAP_EVENT_TYPE.scroll,nodeId: null,- x: event.type === 'click' ? event.x ?? null : null,- y: event.type === 'click' ? event.y ?? null : null,- pageX: event.type === 'click' ? event.pageX ?? null : null,- pageY: event.type === 'click' ? event.pageY ?? null : null,+ x: event.type === 'click' ? (event.x ?? null) : null,+ y: event.type === 'click' ? (event.y ?? null) : null,+ pageX: event.type === 'click' ? (event.pageX ?? null) : null,+ pageY: event.type === 'click' ? (event.pageY ?? null) : null,pageW: event.pageW ?? null,viewportW: event.viewportW ?? null,viewportH: event.viewportH ?? null,pageH: event.pageH ?? null,- scrollPct: event.type === 'scroll' ? event.scrollPct ?? null : null,+ scrollPct: event.type === 'scroll' ? (event.scrollPct ?? null) : null,urlPath: getUrlPath(event.url),createdAt: new Date(event.timestamp ?? fallbackMs),replayChunkIndex: null,diff --git a/src/app/api/websites/[websiteId]/recorder/route.ts b/src/app/api/websites/[websiteId]/recorder/route.tsindex ef6307055..af8c42183 100644--- a/src/app/api/websites/[websiteId]/recorder/route.ts+++ b/src/app/api/websites/[websiteId]/recorder/route.ts@@ -1,5 +1,5 @@-import { parseRequest } from '@/lib/request';import { getRecorderConfig } from '@/lib/recorder';+import { parseRequest } from '@/lib/request';import { getWebsite } from '@/queries/prisma';export async function GET(diff --git a/src/app/layout.tsx b/src/app/layout.tsxindex 0cd4363b5..d313ba463 100644--- a/src/app/layout.tsx+++ b/src/app/layout.tsx@@ -1,6 +1,6 @@import type { Metadata } from 'next';-import { headers } from 'next/headers';import { Inter } from 'next/font/google';+import { headers } from 'next/headers';import { Suspense } from 'react';import { getBaseUrl } from '@/lib/get-base-url';import { Providers } from './Providers';diff --git a/src/app/share/ShareProvider.tsx b/src/app/share/ShareProvider.tsxindex 806e1347a..790298bc6 100644--- a/src/app/share/ShareProvider.tsx+++ b/src/app/share/ShareProvider.tsx@@ -1,10 +1,10 @@'use client';-import { useShareTokenQuery } from '@/components/hooks';-import { ENTITY_TYPE } from '@/lib/constants';-import type { ShareParameters, WhiteLabel } from '@/lib/types';import { Loading } from '@umami/react-zen';import { usePathname, useRouter } from 'next/navigation';import { createContext, type ReactNode, useEffect } from 'react';+import { useShareTokenQuery } from '@/components/hooks';+import { ENTITY_TYPE } from '@/lib/constants';+import type { ShareParameters, WhiteLabel } from '@/lib/types';export interface ShareData {shareId: string;diff --git a/src/app/share/[slug]/[[...path]]/ShareBranding.tsx b/src/app/share/[slug]/[[...path]]/ShareBranding.tsxindex 89573b288..de45d1d33 100644--- a/src/app/share/[slug]/[[...path]]/ShareBranding.tsx+++ b/src/app/share/[slug]/[[...path]]/ShareBranding.tsx@@ -1,7 +1,7 @@'use client';+import { Icon, Row, Text } from '@umami/react-zen';import { useShare } from '@/components/hooks';import { Logo } from '@/components/svg';-import { Icon, Row, Text } from '@umami/react-zen';const LOGO_SIZE = { sm: 24, md: 32, lg: 40 };const TEXT_SIZE = { sm: 'sm', md: 'base', lg: 'lg' } as const;diff --git a/src/app/share/[slug]/[[...path]]/ShareFooter.tsx b/src/app/share/[slug]/[[...path]]/ShareFooter.tsxindex 69177b34c..2b9e9d542 100644--- a/src/app/share/[slug]/[[...path]]/ShareFooter.tsx+++ b/src/app/share/[slug]/[[...path]]/ShareFooter.tsx@@ -1,6 +1,6 @@'use client';-import { useShare } from '@/components/hooks';import { Column, Row } from '@umami/react-zen';+import { useShare } from '@/components/hooks';import { ShareBranding } from './ShareBranding';export function ShareFooter() {diff --git a/src/app/share/[slug]/[[...path]]/ShareNav.tsx b/src/app/share/[slug]/[[...path]]/ShareNav.tsxindex 66899d256..a747f71b5 100644--- a/src/app/share/[slug]/[[...path]]/ShareNav.tsx+++ b/src/app/share/[slug]/[[...path]]/ShareNav.tsx@@ -1,11 +1,3 @@-import { IconLabel } from '@/components/common/IconLabel';-import { useMessages, useNavigation, useShare } from '@/components/hooks';-import { AlignEndHorizontal, Clock, Eye, PanelLeft, Sheet, Tag, User } from '@/components/icons';-import { LanguageButton } from '@/components/input/LanguageButton';-import { PreferencesButton } from '@/components/input/PreferencesButton';-import { allowShareFilter, excludeShareFilterParam, getShareTheme } from '@/lib/share';-import { Funnel, Gauge, Lightning, Magnet, Money, Network, Path, Target } from '@/components/svg';-import { buildPath } from '@/lib/url';import {Button,Column,@@ -17,7 +9,15 @@ import {Tooltip,TooltipTrigger,} from '@umami/react-zen';+import { IconLabel } from '@/components/common/IconLabel';import Link from '@/components/common/Link';+import { useMessages, useNavigation, useShare } from '@/components/hooks';+import { AlignEndHorizontal, Clock, Eye, PanelLeft, Sheet, Tag, User } from '@/components/icons';+import { LanguageButton } from '@/components/input/LanguageButton';+import { PreferencesButton } from '@/components/input/PreferencesButton';+import { Funnel, Gauge, Lightning, Magnet, Money, Network, Path, Target } from '@/components/svg';+import { allowShareFilter, excludeShareFilterParam, getShareTheme } from '@/lib/share';+import { buildPath } from '@/lib/url';import { ShareBranding } from './ShareBranding';export function ShareNav({diff --git a/src/app/share/[slug]/[[...path]]/SharePage.tsx b/src/app/share/[slug]/[[...path]]/SharePage.tsxindex d6660bd8a..87b76a71c 100644--- a/src/app/share/[slug]/[[...path]]/SharePage.tsx+++ b/src/app/share/[slug]/[[...path]]/SharePage.tsx@@ -1,4 +1,7 @@'use client';+import { Column, Grid, Row, useTheme } from '@umami/react-zen';+import { usePathname, useRouter } from 'next/navigation';+import { useEffect, useState } from 'react';import { BoardViewPage } from '@/app/(main)/boards/[boardId]/BoardViewPage';import { LinkPage } from '@/app/(main)/links/[linkId]/LinkPage';import { PixelPage } from '@/app/(main)/pixels/[pixelId]/PixelPage';@@ -7,10 +10,10 @@ import { BreakdownPage } from '@/app/(main)/websites/[websiteId]/(reports)/breakimport { FunnelsPage } from '@/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelsPage';import { GoalsPage } from '@/app/(main)/websites/[websiteId]/(reports)/goals/GoalsPage';import { JourneysPage } from '@/app/(main)/websites/[websiteId]/(reports)/journeys/JourneysPage';+import { PerformancePage } from '@/app/(main)/websites/[websiteId]/(reports)/performance/PerformancePage';import { RetentionPage } from '@/app/(main)/websites/[websiteId]/(reports)/retention/RetentionPage';import { RevenuePage } from '@/app/(main)/websites/[websiteId]/(reports)/revenue/RevenuePage';import { UTMPage } from '@/app/(main)/websites/[websiteId]/(reports)/utm/UTMPage';-import { PerformancePage } from '@/app/(main)/websites/[websiteId]/(reports)/performance/PerformancePage';import { ComparePage } from '@/app/(main)/websites/[websiteId]/compare/ComparePage';import { EventsPage } from '@/app/(main)/websites/[websiteId]/events/EventsPage';import { RealtimePage } from '@/app/(main)/websites/[websiteId]/realtime/RealtimePage';@@ -23,9 +26,6 @@ import { useShare } from '@/components/hooks';import { MobileMenuButton } from '@/components/input/MobileMenuButton';import { ENTITY_TYPE } from '@/lib/constants';import { getShareTheme } from '@/lib/share';-import { Column, Grid, Row, useTheme } from '@umami/react-zen';-import { usePathname, useRouter } from 'next/navigation';-import { useEffect, useState } from 'react';import { ShareFooter } from './ShareFooter';import { ShareNav } from './ShareNav';diff --git a/src/components/charts/BarChart.tsx b/src/components/charts/BarChart.tsxindex db0cc1b60..9bf3f9fc0 100644--- a/src/components/charts/BarChart.tsx+++ b/src/components/charts/BarChart.tsx@@ -1,3 +1,5 @@+import { useTheme } from '@umami/react-zen';+import { memo, useCallback, useMemo, useState } from 'react';import { Chart, type ChartProps } from '@/components/charts/Chart';import { ChartTooltip } from '@/components/charts/ChartTooltip';import { useLocale } from '@/components/hooks';@@ -5,8 +7,6 @@ import { renderNumberLabels } from '@/lib/charts';import { getThemeColors } from '@/lib/colors';import { DATE_FORMATS, formatDate } from '@/lib/date';import { formatLongCurrency, formatLongNumber } from '@/lib/format';-import { useTheme } from '@umami/react-zen';-import { memo, useCallback, useMemo, useState } from 'react';const MemoChart = memo(Chart);diff --git a/src/components/charts/DistributionBarChart.tsx b/src/components/charts/DistributionBarChart.tsxindex 90a668c83..e315d745c 100644--- a/src/components/charts/DistributionBarChart.tsx+++ b/src/components/charts/DistributionBarChart.tsx@@ -127,31 +127,38 @@ function DistributionBarChartComponent({[chartData.labels, colors, horizontal, stacked],);- const handleTooltip = useCallback(({ tooltip }: { tooltip: any }) => {- const { opacity, labelColors, dataPoints } = tooltip;- const point = dataPoints?.[0];- const nextTooltip = opacity- ? {- title: (point?.label ?? '').toString(),- color: labelColors?.[0]?.backgroundColor,- value: `${formatLongNumber(- Number(horizontal ? point?.raw?.x ?? point?.raw ?? 0 : point?.raw?.y ?? point?.raw ?? 0),- )}${point?.dataset?.label ? ` ${point.dataset.label}` : ''}`,- }- : null;+ const handleTooltip = useCallback(+ ({ tooltip }: { tooltip: any }) => {+ const { opacity, labelColors, dataPoints } = tooltip;+ const point = dataPoints?.[0];+ const nextTooltip = opacity+ ? {+ title: (point?.label ?? '').toString(),+ color: labelColors?.[0]?.backgroundColor,+ value: `${formatLongNumber(+ Number(+ horizontal+ ? (point?.raw?.x ?? point?.raw ?? 0)+ : (point?.raw?.y ?? point?.raw ?? 0),+ ),+ )}${point?.dataset?.label ? ` ${point.dataset.label}` : ''}`,+ }+ : null;- setTooltip(prev => {- if (- prev?.title === nextTooltip?.title &&- prev?.color === nextTooltip?.color &&- prev?.value === nextTooltip?.value- ) {- return prev;- }+ setTooltip(prev => {+ if (+ prev?.title === nextTooltip?.title &&+ prev?.color === nextTooltip?.color &&+ prev?.value === nextTooltip?.value+ ) {+ return prev;+ }- return nextTooltip;- });- }, [horizontal]);+ return nextTooltip;+ });+ },+ [horizontal],+ );return (<>diff --git a/src/components/common/Badge.module.css b/src/components/common/Badge.module.cssindex 216c9c2ae..c3c293141 100644--- a/src/components/common/Badge.module.css+++ b/src/components/common/Badge.module.css@@ -54,29 +54,29 @@background: var(--text-muted);}-:global([data-theme='dark']) .good {+:global([data-theme="dark"]) .good {color: #86efac;background: rgba(22, 163, 74, 0.15);}-:global([data-theme='dark']) .good .dot {+:global([data-theme="dark"]) .good .dot {background: #4ade80;}-:global([data-theme='dark']) .warning {+:global([data-theme="dark"]) .warning {color: #fde047;background: rgba(202, 138, 4, 0.15);}-:global([data-theme='dark']) .warning .dot {+:global([data-theme="dark"]) .warning .dot {background: #facc15;}-:global([data-theme='dark']) .danger {+:global([data-theme="dark"]) .danger {color: #fca5a5;background: rgba(220, 38, 38, 0.15);}-:global([data-theme='dark']) .danger .dot {+:global([data-theme="dark"]) .danger .dot {background: #f87171;}diff --git a/src/components/common/CopyButton.tsx b/src/components/common/CopyButton.tsxindex d393cf77a..f719c229c 100644--- a/src/components/common/CopyButton.tsx+++ b/src/components/common/CopyButton.tsx@@ -2,13 +2,7 @@ import { Button, Icon } from '@umami/react-zen';import { useEffect, useRef, useState } from 'react';import { Check, Copy } from '@/components/icons';-export function CopyButton({- value,- label = 'Copy',-}: {- value: string;- label?: string;-}) {+export function CopyButton({ value, label = 'Copy' }: { value: string; label?: string }) {const [copied, setCopied] = useState(false);const timeoutRef = useRef<number | null>(null);diff --git a/src/components/common/DataGrid.tsx b/src/components/common/DataGrid.tsxindex 3c9974572..f2c1cac99 100644--- a/src/components/common/DataGrid.tsx+++ b/src/components/common/DataGrid.tsx@@ -62,7 +62,7 @@ export function DataGrid({return stored === 'table' || stored === 'cards' ? stored : null;});- const displayMode: DisplayMode | undefined = isMobile ? 'cards' : userDisplayMode ?? undefined;+ const displayMode: DisplayMode | undefined = isMobile ? 'cards' : (userDisplayMode ?? undefined);const handleToggleDisplayMode = () => {const next: DisplayMode = displayMode === 'cards' ? 'table' : 'cards';diff --git a/src/components/common/ExternalLink.tsx b/src/components/common/ExternalLink.tsxindex 89e9e6cba..c5eb4219b 100644--- a/src/components/common/ExternalLink.tsx+++ b/src/components/common/ExternalLink.tsx@@ -1,6 +1,6 @@import { Icon, Row, Text } from '@umami/react-zen';-import Link, { type LinkProps } from '@/components/common/Link';import type { ReactNode } from 'react';+import Link, { type LinkProps } from '@/components/common/Link';import { ExternalLink as LinkIcon } from '@/components/icons';export function ExternalLink({diff --git a/src/components/common/FilterLink.tsx b/src/components/common/FilterLink.tsxindex f124706b9..ad5ea6722 100644--- a/src/components/common/FilterLink.tsx+++ b/src/components/common/FilterLink.tsx@@ -1,6 +1,6 @@import { Icon, Row, Text } from '@umami/react-zen';-import Link from '@/components/common/Link';import { type HTMLAttributes, type ReactNode, useState } from 'react';+import Link from '@/components/common/Link';import { useMessages, useNavigation } from '@/components/hooks';import { ExternalLink } from '@/components/icons';diff --git a/src/components/common/LinkButton.tsx b/src/components/common/LinkButton.tsxindex 826aedcf4..8486d6cf6 100644--- a/src/components/common/LinkButton.tsx+++ b/src/components/common/LinkButton.tsx@@ -1,6 +1,6 @@import { Button, type ButtonProps } from '@umami/react-zen';-import Link from '@/components/common/Link';import type { ReactNode } from 'react';+import Link from '@/components/common/Link';import { useLocale } from '@/components/hooks';export interface LinkButtonProps extends ButtonProps {diff --git a/src/components/common/NavMenu.tsx b/src/components/common/NavMenu.tsxindex 9442b2486..9bdc918a8 100644--- a/src/components/common/NavMenu.tsx+++ b/src/components/common/NavMenu.tsx@@ -1,6 +1,6 @@import { Column, Heading, Row, Text } from '@umami/react-zen';-import Link from '@/components/common/Link';import { IconLabel } from '@/components/common/IconLabel';+import Link from '@/components/common/Link';interface NavMenuData {id: string;diff --git a/src/components/common/Pager.tsx b/src/components/common/Pager.tsxindex f3d72fb47..7522770f8 100644--- a/src/components/common/Pager.tsx+++ b/src/components/common/Pager.tsx@@ -11,13 +11,7 @@ export interface PagerProps {className?: string;}-export function Pager({- page,- pageSize,- count,- isCapped,- onPageChange,-}: PagerProps) {+export function Pager({ page, pageSize, count, isCapped, onPageChange }: PagerProps) {const { t, labels } = useMessages();const maxPage = pageSize && count ? Math.ceil(+count / +pageSize) : 0;const lastPage = page === maxPage;diff --git a/src/components/common/SortableLabel.tsx b/src/components/common/SortableLabel.tsxindex c45550c8c..99ca27691 100644--- a/src/components/common/SortableLabel.tsx+++ b/src/components/common/SortableLabel.tsx@@ -1,9 +1,9 @@'use client';-import type { ReactNode } from 'react';import { Icon } from '@umami/react-zen';-import { ChevronDown, ChevronUp } from '@/components/icons';+import type { ReactNode } from 'react';import { useNavigation } from '@/components/hooks';+import { ChevronDown, ChevronUp } from '@/components/icons';type SortDirection = 'asc' | 'desc';@@ -13,11 +13,7 @@ export interface SortableLabelProps {defaultDirection?: SortDirection;}-export function SortableLabel({- label,- sortKey,- defaultDirection = 'asc',-}: SortableLabelProps) {+export function SortableLabel({ label, sortKey, defaultDirection = 'asc' }: SortableLabelProps) {const { router, query, updateParams } = useNavigation();const isActive = query.orderBy === sortKey;const isDescending = query.sortDescending === 'true';diff --git a/src/components/hooks/index.ts b/src/components/hooks/index.tsindex 925b0a336..2db8d42e7 100644--- a/src/components/hooks/index.ts+++ b/src/components/hooks/index.ts@@ -41,16 +41,16 @@ export * from './queries/useReplaysQuery';export * from './queries/useReportQuery';export * from './queries/useReportsQuery';export * from './queries/useResultQuery';-export * from './queries/useRevenueSessionsQuery';-export * from './queries/useRevenueMetricsQuery';export * from './queries/useRevenueChartQuery';+export * from './queries/useRevenueMetricsQuery';+export * from './queries/useRevenueSessionsQuery';export * from './queries/useRevenueStatsQuery';export * from './queries/useSavedReplaysQuery';export * from './queries/useSessionActivityQuery';-export * from './queries/useSessionDataPropertiesQuery';+export * from './queries/useSessionDataActivityStatsQuery';export * from './queries/useSessionDataPivotQuery';+export * from './queries/useSessionDataPropertiesQuery';export * from './queries/useSessionDataQuery';-export * from './queries/useSessionDataActivityStatsQuery';export * from './queries/useSessionDataValuesQuery';export * from './queries/useSessionReplaysQuery';export * from './queries/useShareTokenQuery';diff --git a/src/components/hooks/queries/useLinkSharesQuery.ts b/src/components/hooks/queries/useLinkSharesQuery.tsindex 990952d05..9245ea65b 100644--- a/src/components/hooks/queries/useLinkSharesQuery.ts+++ b/src/components/hooks/queries/useLinkSharesQuery.ts@@ -3,10 +3,7 @@ import { useApi } from '../useApi';import { useModified } from '../useModified';import { usePagedQuery } from '../usePagedQuery';-export function useLinkSharesQuery(- { linkId }: { linkId: string },- options?: ReactQueryOptions,-) {+export function useLinkSharesQuery({ linkId }: { linkId: string }, options?: ReactQueryOptions) {const { modified } = useModified('shares');const { get } = useApi();diff --git a/src/components/hooks/queries/usePixelSharesQuery.ts b/src/components/hooks/queries/usePixelSharesQuery.tsindex aacd07a7a..3bb8c2486 100644--- a/src/components/hooks/queries/usePixelSharesQuery.ts+++ b/src/components/hooks/queries/usePixelSharesQuery.ts@@ -3,10 +3,7 @@ import { useApi } from '../useApi';import { useModified } from '../useModified';import { usePagedQuery } from '../usePagedQuery';-export function usePixelSharesQuery(- { pixelId }: { pixelId: string },- options?: ReactQueryOptions,-) {+export function usePixelSharesQuery({ pixelId }: { pixelId: string }, options?: ReactQueryOptions) {const { modified } = useModified('shares');const { get } = useApi();diff --git a/src/components/hooks/queries/usePropertyArraySeriesQuery.ts b/src/components/hooks/queries/usePropertyArraySeriesQuery.tsindex fd4b8a42c..da79dfbbd 100644--- a/src/components/hooks/queries/usePropertyArraySeriesQuery.ts+++ b/src/components/hooks/queries/usePropertyArraySeriesQuery.ts@@ -20,7 +20,17 @@ export function usePropertyArraySeriesQuery(return useQuery<EventDataSeriesPoint[]>({queryKey: [`websites:${source}-data:array-series`,- { websiteId, propertyName, eventName, propertyFilters, startAt, endAt, unit, timezone, ...params },+ {+ websiteId,+ propertyName,+ eventName,+ propertyFilters,+ startAt,+ endAt,+ unit,+ timezone,+ ...params,+ },],queryFn: () =>get(diff --git a/src/components/hooks/queries/usePropertyNumericSeriesQuery.ts b/src/components/hooks/queries/usePropertyNumericSeriesQuery.tsindex ffe5b18b7..8dff51742 100644--- a/src/components/hooks/queries/usePropertyNumericSeriesQuery.ts+++ b/src/components/hooks/queries/usePropertyNumericSeriesQuery.ts@@ -21,7 +21,18 @@ export function usePropertyNumericSeriesQuery(return useQuery<any>({queryKey: [`websites:${source}-data:numeric-series`,- { websiteId, propertyName, metric, eventName, propertyFilters, startAt, endAt, unit, timezone, ...params },+ {+ websiteId,+ propertyName,+ metric,+ eventName,+ propertyFilters,+ startAt,+ endAt,+ unit,+ timezone,+ ...params,+ },],queryFn: () =>get(diff --git a/src/components/hooks/queries/usePropertySeriesQuery.ts b/src/components/hooks/queries/usePropertySeriesQuery.tsindex 3df8af796..124e0abc4 100644--- a/src/components/hooks/queries/usePropertySeriesQuery.ts+++ b/src/components/hooks/queries/usePropertySeriesQuery.ts@@ -20,7 +20,17 @@ export function usePropertySeriesQuery(return useQuery<EventDataSeriesPoint[]>({queryKey: [`websites:${source}-data:property-series`,- { websiteId, propertyName, eventName, propertyFilters, startAt, endAt, unit, timezone, ...params },+ {+ websiteId,+ propertyName,+ eventName,+ propertyFilters,+ startAt,+ endAt,+ unit,+ timezone,+ ...params,+ },],queryFn: () =>get(diff --git a/src/components/hooks/queries/usePropertyValuesQuery.ts b/src/components/hooks/queries/usePropertyValuesQuery.tsindex 131620fae..5c0ea227d 100644--- a/src/components/hooks/queries/usePropertyValuesQuery.ts+++ b/src/components/hooks/queries/usePropertyValuesQuery.ts@@ -21,7 +21,18 @@ export function usePropertyValuesQuery(return useQuery<any>({queryKey: [`websites:${source}-data:values`,- { websiteId, propertyName, dataType, eventName, propertyFilters, startAt, endAt, unit, timezone, ...params },+ {+ websiteId,+ propertyName,+ dataType,+ eventName,+ propertyFilters,+ startAt,+ endAt,+ unit,+ timezone,+ ...params,+ },],queryFn: () =>get(diff --git a/src/components/hooks/queries/useRevenueStatsQuery.ts b/src/components/hooks/queries/useRevenueStatsQuery.tsindex 42654889f..5dd638125 100644--- a/src/components/hooks/queries/useRevenueStatsQuery.ts+++ b/src/components/hooks/queries/useRevenueStatsQuery.ts@@ -35,7 +35,10 @@ export function useRevenueStatsQuery(const filters = useFilterParameters({ includePagination: false });return useQuery<RevenueStatsData>({- queryKey: ['websites:revenue:stats', { websiteId, currency, compare, startAt, endAt, ...filters }],+ queryKey: [+ 'websites:revenue:stats',+ { websiteId, currency, compare, startAt, endAt, ...filters },+ ],queryFn: () =>get(`/websites/${websiteId}/revenue/stats`, {currency,diff --git a/src/components/hooks/queries/useSessionDataPropertiesQuery.ts b/src/components/hooks/queries/useSessionDataPropertiesQuery.tsindex 7bd041a0f..275725b49 100644--- a/src/components/hooks/queries/useSessionDataPropertiesQuery.ts+++ b/src/components/hooks/queries/useSessionDataPropertiesQuery.ts@@ -1,6 +1,5 @@-import type { ReactQueryOptions } from '@/lib/types';import { serializePropertyFilters } from '@/lib/params';-import type { PropertyFilter } from '@/lib/types';+import type { PropertyFilter, ReactQueryOptions } from '@/lib/types';import { useApi } from '../useApi';import { useDateParameters } from '../useDateParameters';import { useFilterParameters } from '../useFilterParameters';diff --git a/src/components/hooks/useFilterParameters.ts b/src/components/hooks/useFilterParameters.tsindex b5900d465..c49d1a6bb 100644--- a/src/components/hooks/useFilterParameters.ts+++ b/src/components/hooks/useFilterParameters.ts@@ -3,7 +3,11 @@ import { FILTER_COLUMNS } from '@/lib/constants';import { useShare } from './context/useShare';import { useNavigation } from './useNavigation';-export function useFilterParameters({ includePagination = true }: { includePagination?: boolean } = {}) {+export function useFilterParameters({+ includePagination = true,+}: {+ includePagination?: boolean;+} = {}) {const { query } = useNavigation();const share = useShare();const allowFilter = share?.parameters?.allowFilter !== false;diff --git a/src/components/hooks/useSubscription.ts b/src/components/hooks/useSubscription.tsindex e596b35c5..8e77f5b48 100644--- a/src/components/hooks/useSubscription.ts+++ b/src/components/hooks/useSubscription.ts@@ -27,7 +27,7 @@ export function useSubscription(teamId?: string | null) {const ownSubscription: Subscription = user?.subscription || defaultSubscription;const teamSubscription: Subscription | null = teamId- ? user?.teams?.find((t: any) => t.id === teamId)?.subscription ?? null+ ? (user?.teams?.find((t: any) => t.id === teamId)?.subscription ?? null): null;const subscription: Subscription = teamSubscription || ownSubscription;diff --git a/src/components/input/DialogButton.tsx b/src/components/input/DialogButton.tsxindex 98faf9d5d..76c5903ba 100644--- a/src/components/input/DialogButton.tsx+++ b/src/components/input/DialogButton.tsx@@ -68,7 +68,12 @@ export function DialogButton({if (isOpen !== undefined) {return (- <Modal isOpen={isOpen} onOpenChange={onOpenChange} isDismissable placement={isMobile ? 'fullscreen' : 'center'}>+ <Modal+ isOpen={isOpen}+ onOpenChange={onOpenChange}+ isDismissable+ placement={isMobile ? 'fullscreen' : 'center'}+ >{dialog}</Modal>);@@ -79,9 +84,7 @@ export function DialogButton({<Button {...props}><IconLabel icon={icon} label={label} /></Button>- <Modal placement={isMobile ? 'fullscreen' : 'center'}>- {dialog}- </Modal>+ <Modal placement={isMobile ? 'fullscreen' : 'center'}>{dialog}</Modal></DialogTrigger>);}diff --git a/src/components/input/FilterBar.tsx b/src/components/input/FilterBar.tsxindex d8c121222..4b3c97eb7 100644--- a/src/components/input/FilterBar.tsx+++ b/src/components/input/FilterBar.tsx@@ -163,7 +163,11 @@ const FilterItem = ({ name, label, operator, value, onRemove }) => {theme="dark"><Row alignItems="center" gap="4">- <Row alignItems="center" gap="2" style={{ maxWidth: 'min(500px, calc(100vw - 10rem))', minWidth: 0, overflow: 'hidden' }}>+ <Row+ alignItems="center"+ gap="2"+ style={{ maxWidth: 'min(500px, calc(100vw - 10rem))', minWidth: 0, overflow: 'hidden' }}+ ><Text color="primary" weight="bold">{label}</Text>diff --git a/src/components/input/FilterEditForm.tsx b/src/components/input/FilterEditForm.tsxindex 81c198f97..247a698ca 100644--- a/src/components/input/FilterEditForm.tsx+++ b/src/components/input/FilterEditForm.tsx@@ -115,7 +115,12 @@ export function FilterEditForm({ websiteId, onChange, onClose }: FilterEditFormP</TabPanel></Tabs></Column>- <Row alignItems="center" justifyContent="space-between" gap style={isMobile ? { paddingBottom: '16px' } : undefined}>+ <Row+ alignItems="center"+ justifyContent="space-between"+ gap+ style={isMobile ? { paddingBottom: '16px' } : undefined}+ ><Button onPress={handleReset}>{t(labels.reset)}</Button><Row alignItems="center" justifyContent="flex-end" gridColumn="span 2" gap><Button onPress={onClose}>{t(labels.cancel)}</Button>diff --git a/src/components/input/LookupField.tsx b/src/components/input/LookupField.tsxindex daa95aa0c..ba17f18f4 100644--- a/src/components/input/LookupField.tsx+++ b/src/components/input/LookupField.tsx@@ -1,8 +1,8 @@-import { Empty } from '@/components/common/Empty';-import { useMessages, useWebsiteValuesQuery } from '@/components/hooks';import { ComboBox, type ComboBoxProps, ListItem, Loading, useDebounce } from '@umami/react-zen';import { endOfDay, subMonths } from 'date-fns';import { type SetStateAction, useMemo, useState } from 'react';+import { Empty } from '@/components/common/Empty';+import { useMessages, useWebsiteValuesQuery } from '@/components/hooks';export interface LookupFieldProps extends Omit<ComboBoxProps, 'onChange'> {websiteId: string;diff --git a/src/components/input/ThemeModeSelector.tsx b/src/components/input/ThemeModeSelector.tsxindex ad4d6a920..b90910672 100644--- a/src/components/input/ThemeModeSelector.tsx+++ b/src/components/input/ThemeModeSelector.tsx@@ -1,5 +1,5 @@-import type { ReactNode } from 'react';import { Button, Icon, Row } from '@umami/react-zen';+import type { ReactNode } from 'react';import { Monitor, Moon, Sun } from '@/components/icons';export type ThemeMode = 'light' | 'dark' | 'system';diff --git a/src/components/metrics/ActiveUsers.tsx b/src/components/metrics/ActiveUsers.tsxindex 8f0a68c2a..d08aeaeae 100644--- a/src/components/metrics/ActiveUsers.tsx+++ b/src/components/metrics/ActiveUsers.tsx@@ -42,4 +42,4 @@ export function ActiveUsers({}return <Link href={`/websites/${websiteId}/realtime`}>{content}</Link>;-}\ No newline at end of file+}diff --git a/src/components/metrics/PerformanceCard.module.css b/src/components/metrics/PerformanceCard.module.cssindex 9e0d1f296..bf8399e64 100644--- a/src/components/metrics/PerformanceCard.module.css+++ b/src/components/metrics/PerformanceCard.module.css@@ -9,4 +9,3 @@.card.selected {box-shadow: 0 0 0 1px var(--text-primary);}-diff --git a/src/components/property-data/PropertyChart.tsx b/src/components/property-data/PropertyChart.tsxindex 0700ff1a7..886bd4775 100644--- a/src/components/property-data/PropertyChart.tsx+++ b/src/components/property-data/PropertyChart.tsx@@ -37,7 +37,9 @@ export function PropertyChart({}) {const { t, labels } = useMessages();const { timezone } = useTimezone();- const { dateRange: { startDate, endDate, unit } } = useDateRange({ timezone });+ const {+ dateRange: { startDate, endDate, unit },+ } = useDateRange({ timezone });const { locale, dateLocale } = useLocale();const propertySeriesQuery = usePropertySeriesQuery(source,diff --git a/src/components/property-data/PropertyDateChart.tsx b/src/components/property-data/PropertyDateChart.tsxindex 4eb83d6ea..6d2cc25f2 100644--- a/src/components/property-data/PropertyDateChart.tsx+++ b/src/components/property-data/PropertyDateChart.tsx@@ -5,18 +5,23 @@ import {format,formatDistance,isValid,+ type Locale,startOfDay,startOfMonth,startOfWeek,startOfYear,- type Locale,} from 'date-fns';import { toZonedTime } from 'date-fns-tz';import { type ReactNode, useCallback, useMemo } from 'react';import { BarChart } from '@/components/charts/BarChart';import { PieChart } from '@/components/charts/PieChart';import { LoadingPanel } from '@/components/common/LoadingPanel';-import { useLocale, useMessages, usePropertyDateSeriesQuery, useTimezone } from '@/components/hooks';+import {+ useLocale,+ useMessages,+ usePropertyDateSeriesQuery,+ useTimezone,+} from '@/components/hooks';import type { PropertyDataSource } from '@/components/hooks/queries/usePropertyFieldsQuery';import { ListTable } from '@/components/metrics/ListTable';import { MetricsBar } from '@/components/metrics/MetricsBar';@@ -30,7 +35,11 @@ type DateChartUnit = 'day' | 'week' | 'month' | 'year';type ParsedDateRow = EventDataDateSeriesPoint & { date: Date };function parseDateValue(value: string) {- const normalized = value?.trim().replace(' ', 'T').replace(/Z$/, '').replace(/\.\d+$/, '');+ const normalized = value+ ?.trim()+ .replace(' ', 'T')+ .replace(/Z$/, '')+ .replace(/\.\d+$/, '');const [datePart = '', timePart = '00:00:00'] = normalized.split('T');const [year = 0, month = 1, day = 1] = datePart.split('-').map(Number);const [hour = 0, minute = 0, second = 0] = timePart.split(':').map(Number);@@ -52,9 +61,17 @@ function InsightCard({ label, value, hint }: { label: string; value: string; hinheight="100%"style={{ minWidth: 0 }}>- <Text weight="bold" style={{ overflowWrap: 'anywhere' }}>{label}</Text>- <Text weight="bold" style={{ overflowWrap: 'anywhere' }}>{value}</Text>- {hint && <Text color="muted" style={{ overflowWrap: 'anywhere' }}>{hint}</Text>}+ <Text weight="bold" style={{ overflowWrap: 'anywhere' }}>+ {label}+ </Text>+ <Text weight="bold" style={{ overflowWrap: 'anywhere' }}>+ {value}+ </Text>+ {hint && (+ <Text color="muted" style={{ overflowWrap: 'anywhere' }}>+ {hint}+ </Text>+ )}</Column>);}@@ -98,7 +115,13 @@ export function PropertyDateChart({const { locale, dateLocale } = useLocale();const { timezone } = useTimezone();const { colors } = useMemo(() => getThemeColors(theme), [theme]);- const query = usePropertyDateSeriesQuery(source, websiteId, propertyName, propertyFilters, eventName);+ const query = usePropertyDateSeriesQuery(+ source,+ websiteId,+ propertyName,+ propertyFilters,+ eventName,+ );const rows = useMemo(() => query.data ?? [], [query.data]);const total = useMemo(() => rows.reduce((sum, { y }) => sum + y, 0), [rows]);@@ -119,7 +142,8 @@ export function PropertyDateChart({const minPropertyDate = exactDateRows[0]?.date ?? null;const maxPropertyDate = exactDateRows[exactDateRows.length - 1]?.date ?? null;const chartUnit = useMemo(- () => (minPropertyDate && maxPropertyDate ? getChartUnit(minPropertyDate, maxPropertyDate) : 'day'),+ () =>+ minPropertyDate && maxPropertyDate ? getChartUnit(minPropertyDate, maxPropertyDate) : 'day',[maxPropertyDate, minPropertyDate],);@@ -216,17 +240,28 @@ export function PropertyDateChart({},{} as Record<string, { date: Date; count: number }>,);- return Object.values(dayTotals).sort((a, b) => b.count - a.count || b.date.getTime() - a.date.getTime())[0];+ return Object.values(dayTotals).sort(+ (a, b) => b.count - a.count || b.date.getTime() - a.date.getTime(),+ )[0];}, [exactDateRows, total]);- const topWeekday = useMemo(() => [...weekdayTableData].sort((a, b) => b.count - a.count)[0], [weekdayTableData]);- const weekdayLabels = useMemo(() => weekdayTableData.map(({ label }) => label), [weekdayTableData]);+ const topWeekday = useMemo(+ () => [...weekdayTableData].sort((a, b) => b.count - a.count)[0],+ [weekdayTableData],+ );+ const weekdayLabels = useMemo(+ () => weekdayTableData.map(({ label }) => label),+ [weekdayTableData],+ );const weekdayColorMap = useMemo(() =>- weekdayLabels.reduce((obj, label, index) => {- obj[label] = CHART_COLORS[index % CHART_COLORS.length];- return obj;- }, {} as Record<string, string>),+ weekdayLabels.reduce(+ (obj, label, index) => {+ obj[label] = CHART_COLORS[index % CHART_COLORS.length];+ return obj;+ },+ {} as Record<string, string>,+ ),[weekdayLabels],);@@ -246,27 +281,48 @@ export function PropertyDateChart({return (<Column gap="4">- <LoadingPanel isLoading={query.isLoading} isFetching={query.isFetching} error={query.error} minHeight="100px">+ <LoadingPanel+ isLoading={query.isLoading}+ isFetching={query.isFetching}+ error={query.error}+ minHeight="100px"+ ><MetricsBar padding="2"><InsightCardlabel="Top weekday"value={topWeekday?.label ?? 'None'}- hint={topWeekday ? `${topWeekday.count.toLocaleString(locale)} count - ${Math.round(topWeekday.percent)}%` : undefined}+ hint={+ topWeekday+ ? `${topWeekday.count.toLocaleString(locale)} count - ${Math.round(topWeekday.percent)}%`+ : undefined+ }/><InsightCardlabel="Top date"value={topDateByDay ? formatDate(topDateByDay.date, 'PP', locale) : 'None'}- hint={topDateByDay ? `${topDateByDay.count.toLocaleString(locale)} count - ${Math.round((topDateByDay.count / total) * 100)}%` : undefined}+ hint={+ topDateByDay+ ? `${topDateByDay.count.toLocaleString(locale)} count - ${Math.round((topDateByDay.count / total) * 100)}%`+ : undefined+ }/><InsightCardlabel="Earliest date"value={minPropertyDate ? formatDate(minPropertyDate, 'PP', locale) : 'None'}- hint={minPropertyDate ? formatDistance(minPropertyDate, zonedNow, { addSuffix: true }) : undefined}+ hint={+ minPropertyDate+ ? formatDistance(minPropertyDate, zonedNow, { addSuffix: true })+ : undefined+ }/><InsightCardlabel="Latest date"value={maxPropertyDate ? formatDate(maxPropertyDate, 'PP', locale) : 'None'}- hint={maxPropertyDate ? formatDistance(maxPropertyDate, zonedNow, { addSuffix: true }) : undefined}+ hint={+ maxPropertyDate+ ? formatDistance(maxPropertyDate, zonedNow, { addSuffix: true })+ : undefined+ }/></MetricsBar></LoadingPanel>diff --git a/src/components/property-data/PropertyFilterButton.tsx b/src/components/property-data/PropertyFilterButton.tsxindex b5beb3de6..c8b671886 100644--- a/src/components/property-data/PropertyFilterButton.tsx+++ b/src/components/property-data/PropertyFilterButton.tsx@@ -1,9 +1,9 @@'use client';import { useMessages } from '@/components/hooks';+import type { PropertyDataSource } from '@/components/hooks/queries/usePropertyFieldsQuery';import { ListFilter } from '@/components/icons';import { DialogButton } from '@/components/input/DialogButton';import type { PropertyFilter } from '@/lib/types';-import type { PropertyDataSource } from '@/components/hooks/queries/usePropertyFieldsQuery';import { PropertyFilterEditForm } from './PropertyFilterEditForm';export function PropertyFilterButton({diff --git a/src/components/property-data/PropertyFilterEditForm.tsx b/src/components/property-data/PropertyFilterEditForm.tsxindex 6f5e9bce6..8b3a996eb 100644--- a/src/components/property-data/PropertyFilterEditForm.tsx+++ b/src/components/property-data/PropertyFilterEditForm.tsx@@ -1,13 +1,25 @@'use client';-import { Button, Column, Grid, Icon, List, ListItem, Menu, MenuItem, MenuTrigger, Popover, Row } from '@umami/react-zen';+import {+ Button,+ Column,+ Grid,+ Icon,+ List,+ ListItem,+ Menu,+ MenuItem,+ MenuTrigger,+ Popover,+ Row,+} from '@umami/react-zen';import { format } from 'date-fns';import { useState } from 'react';import { Empty } from '@/components/common/Empty';import { useMessages, useMobile, usePropertyFieldsQuery } from '@/components/hooks';+import type { PropertyDataSource } from '@/components/hooks/queries/usePropertyFieldsQuery';import { Plus } from '@/components/icons';import { DATA_TYPE, OPERATORS } from '@/lib/constants';import type { PropertyFilter } from '@/lib/types';-import type { PropertyDataSource } from '@/components/hooks/queries/usePropertyFieldsQuery';import { PropertyFilterRecord } from './PropertyFilterRecord';export function PropertyFilterEditForm({@@ -76,7 +88,10 @@ export function PropertyFilterEditForm({style={{ maxHeight: 'calc(100vh - 2rem)', overflowY: 'auto' }}>{(fields as any[]).map(field => (- <MenuItem key={`${field.propertyName}:${field.dataType}`} id={field.propertyName}>+ <MenuItem+ key={`${field.propertyName}:${field.dataType}`}+ id={field.propertyName}+ >{field.propertyName}</MenuItem>))}diff --git a/src/components/property-data/PropertyFilterRecord.tsx b/src/components/property-data/PropertyFilterRecord.tsxindex 9a36df9f4..4e2b9c03f 100644--- a/src/components/property-data/PropertyFilterRecord.tsx+++ b/src/components/property-data/PropertyFilterRecord.tsx@@ -1,16 +1,32 @@'use client';-import { Button, Calendar, Column, ComboBox, Dialog, DialogTrigger, Grid, Icon, Label, ListItem, Loading, Popover, Row, Select, TextField } from '@umami/react-zen';+import {+ Button,+ Calendar,+ Column,+ ComboBox,+ Dialog,+ DialogTrigger,+ Grid,+ Icon,+ Label,+ ListItem,+ Loading,+ Popover,+ Row,+ Select,+ TextField,+} from '@umami/react-zen';import { format, parseISO } from 'date-fns';import { useState } from 'react';import { DateDisplay } from '@/components/common/DateDisplay';import { Empty } from '@/components/common/Empty';import { MultiSelect } from '@/components/common/MultiSelect';import { useMessages, usePropertyValuesQuery } from '@/components/hooks';+import type { PropertyDataSource } from '@/components/hooks/queries/usePropertyFieldsQuery';import { X } from '@/components/icons';import { DATA_TYPE, OPERATORS } from '@/lib/constants';import { getMaxSelectableDate } from '@/lib/date';import type { Operator, PropertyFilter } from '@/lib/types';-import type { PropertyDataSource } from '@/components/hooks/queries/usePropertyFieldsQuery';const STRING_OPERATORS: Operator[] = [OPERATORS.equals,@@ -92,19 +108,32 @@ export function PropertyFilterRecord({const operatorLabel = (op: Operator) => {switch (op) {- case OPERATORS.equals: return t(labels.is);- case OPERATORS.notEquals: return t(labels.isNot);- case OPERATORS.contains: return t(labels.contains);- case OPERATORS.doesNotContain: return t(labels.doesNotContain);- case OPERATORS.regex: return t(labels.regexMatch);- case OPERATORS.notRegex: return t(labels.regexNotMatch);- case OPERATORS.greaterThan: return t(labels.greaterThan);- case OPERATORS.lessThan: return t(labels.lessThan);- case OPERATORS.greaterThanEquals: return t(labels.greaterThanEquals);- case OPERATORS.lessThanEquals: return t(labels.lessThanEquals);- case OPERATORS.before: return t(labels.before);- case OPERATORS.after: return t(labels.after);- default: return op;+ case OPERATORS.equals:+ return t(labels.is);+ case OPERATORS.notEquals:+ return t(labels.isNot);+ case OPERATORS.contains:+ return t(labels.contains);+ case OPERATORS.doesNotContain:+ return t(labels.doesNotContain);+ case OPERATORS.regex:+ return t(labels.regexMatch);+ case OPERATORS.notRegex:+ return t(labels.regexNotMatch);+ case OPERATORS.greaterThan:+ return t(labels.greaterThan);+ case OPERATORS.lessThan:+ return t(labels.lessThan);+ case OPERATORS.greaterThanEquals:+ return t(labels.greaterThanEquals);+ case OPERATORS.lessThanEquals:+ return t(labels.lessThanEquals);+ case OPERATORS.before:+ return t(labels.before);+ case OPERATORS.after:+ return t(labels.after);+ default:+ return op;}};@@ -123,7 +152,10 @@ export function PropertyFilterRecord({<Label>{filter.propertyName}</Label><Grid columns="1fr auto" gap><Grid columns={{ base: '1fr', md: '200px 1fr' }} gap>- <Select value={filter.operator} onChange={value => handleOperatorChange(value as Operator)}>+ <Select+ value={filter.operator}+ onChange={value => handleOperatorChange(value as Operator)}+ >{operators.map(op => (<ListItem key={op} id={op}>{operatorLabel(op)}diff --git a/src/components/property-data/PropertyNumericChart.tsx b/src/components/property-data/PropertyNumericChart.tsxindex aad0149a7..9b177ddd6 100644--- a/src/components/property-data/PropertyNumericChart.tsx+++ b/src/components/property-data/PropertyNumericChart.tsx@@ -36,16 +36,44 @@ export function PropertyNumericChart({const { t, labels } = useMessages();const { theme } = useTheme();const { timezone } = useTimezone();- const { dateRange: { startDate, endDate, unit } } = useDateRange({ timezone });+ const {+ dateRange: { startDate, endDate, unit },+ } = useDateRange({ timezone });const { locale, dateLocale } = useLocale();const { colors } = useMemo(() => getThemeColors(theme), [theme]);- const sumQuery = usePropertyNumericSeriesQuery(source, websiteId, propertyName, 'sum', propertyFilters, eventName);- const avgQuery = usePropertyNumericSeriesQuery(source, websiteId, propertyName, 'avg', propertyFilters, eventName);- const statsQuery = usePropertyNumericStatsQuery(source, websiteId, propertyName, propertyFilters, eventName);+ const sumQuery = usePropertyNumericSeriesQuery(+ source,+ websiteId,+ propertyName,+ 'sum',+ propertyFilters,+ eventName,+ );+ const avgQuery = usePropertyNumericSeriesQuery(+ source,+ websiteId,+ propertyName,+ 'avg',+ propertyFilters,+ eventName,+ );+ const statsQuery = usePropertyNumericStatsQuery(+ source,+ websiteId,+ propertyName,+ propertyFilters,+ eventName,+ );- const sumRows = useMemo(() => (sumQuery.data as { t: string; y: number }[] | undefined) ?? [], [sumQuery.data]);- const avgRows = useMemo(() => (avgQuery.data as { t: string; y: number }[] | undefined) ?? [], [avgQuery.data]);+ const sumRows = useMemo(+ () => (sumQuery.data as { t: string; y: number }[] | undefined) ?? [],+ [sumQuery.data],+ );+ const avgRows = useMemo(+ () => (avgQuery.data as { t: string; y: number }[] | undefined) ?? [],+ [avgQuery.data],+ );const stats = statsQuery.data;const chartData: any = useMemo(() => {@@ -85,7 +113,20 @@ export function PropertyNumericChart({},],};- }, [avgQuery.data, avgRows, colors, dateLocale, endDate, labels.average, labels.sum, startDate, sumQuery.data, sumRows, t, unit]);+ }, [+ avgQuery.data,+ avgRows,+ colors,+ dateLocale,+ endDate,+ labels.average,+ labels.sum,+ startDate,+ sumQuery.data,+ sumRows,+ t,+ unit,+ ]);const renderXLabel = useCallback(renderDateLabels(unit, locale), [unit, locale]);@@ -99,11 +140,27 @@ export function PropertyNumericChart({minHeight="100px"><MetricsBar padding="2">- <MetricCard label={t(labels.total)} value={stats?.total ?? 0} formatValue={formatLongNumber} />- <MetricCard label={t(labels.average)} value={stats?.average ?? 0} formatValue={formatLongNumber} />+ <MetricCard+ label={t(labels.total)}+ value={stats?.total ?? 0}+ formatValue={formatLongNumber}+ />+ <MetricCard+ label={t(labels.average)}+ value={stats?.average ?? 0}+ formatValue={formatLongNumber}+ /><MetricCard label="Median" value={stats?.median ?? 0} formatValue={formatLongNumber} />- <MetricCard label={t(labels.max)} value={stats?.max ?? 0} formatValue={formatLongNumber} />- <MetricCard label={t(labels.min)} value={stats?.min ?? 0} formatValue={formatLongNumber} />+ <MetricCard+ label={t(labels.max)}+ value={stats?.max ?? 0}+ formatValue={formatLongNumber}+ />+ <MetricCard+ label={t(labels.min)}+ value={stats?.min ?? 0}+ formatValue={formatLongNumber}+ /></MetricsBar></LoadingPanel><LoadingPaneldiff --git a/src/components/share/SimpleShareEditForm.tsx b/src/components/share/SimpleShareEditForm.tsxindex 6bdcf9300..ddfbda9f8 100644--- a/src/components/share/SimpleShareEditForm.tsx+++ b/src/components/share/SimpleShareEditForm.tsx@@ -100,21 +100,21 @@ export function SimpleShareEditForm({<TextField autoComplete="off" autoFocus /></FormField><Row gap="6">- <FormField label={t(labels.filters)} name="allowFilter">- <Switch- isSelected={watch('allowFilter')}- onChange={value => setValue('allowFilter', value, { shouldDirty: true })}- >- {t(labels.filtersEnabled)}- </Switch>- </FormField>- <FormField label={t(labels.theme)} name="theme">- <ThemeModeSelector- value={watch('theme')}- includeSystem- onChange={value => setValue('theme', value, { shouldDirty: true })}- />- </FormField>+ <FormField label={t(labels.filters)} name="allowFilter">+ <Switch+ isSelected={watch('allowFilter')}+ onChange={value => setValue('allowFilter', value, { shouldDirty: true })}+ >+ {t(labels.filtersEnabled)}+ </Switch>+ </FormField>+ <FormField label={t(labels.theme)} name="theme">+ <ThemeModeSelector+ value={watch('theme')}+ includeSystem+ onChange={value => setValue('theme', value, { shouldDirty: true })}+ />+ </FormField></Row><Row justifyContent="flex-end" paddingTop="3" gap="3">{onClose && (diff --git a/src/components/share/SimpleSharesTable.tsx b/src/components/share/SimpleSharesTable.tsxindex 13313f7b9..7af3e946d 100644--- a/src/components/share/SimpleSharesTable.tsx+++ b/src/components/share/SimpleSharesTable.tsx@@ -1,8 +1,8 @@+import { DataColumn, DataTable, type DataTableProps, Row } from '@umami/react-zen';import { ShareDeleteButton } from '@/app/(main)/websites/[websiteId]/settings/ShareDeleteButton';import { CopyButton } from '@/components/common/CopyButton';import { ExternalLink } from '@/components/common/ExternalLink';import { useConfig, useMessages, useMobile } from '@/components/hooks';-import { DataColumn, DataTable, type DataTableProps, Row } from '@umami/react-zen';import { SimpleShareEditButton } from './SimpleShareEditButton';export function SimpleSharesTable(props: DataTableProps) {diff --git a/src/lib/api-url.test.ts b/src/lib/api-url.test.tsindex 322315b00..be4720295 100644--- a/src/lib/api-url.test.ts+++ b/src/lib/api-url.test.ts@@ -30,8 +30,6 @@ describe('getApiUrl', () => {});test('returns absolute input urls unchanged', () => {- expect(getApiUrl('https://example.com/api/websites')).toBe(- 'https://example.com/api/websites',- );+ expect(getApiUrl('https://example.com/api/websites')).toBe('https://example.com/api/websites');});});diff --git a/src/lib/api-url.ts b/src/lib/api-url.tsindex 8cc790c1b..7d6e9d74d 100644--- a/src/lib/api-url.ts+++ b/src/lib/api-url.ts@@ -3,10 +3,7 @@ type ApiUrlOptions = {basePath?: string;};-const APP_ROUTE_PATTERNS: RegExp[] = [- /^\/auth(\/|$)/,- /^\/config(\/|$)/,-];+const APP_ROUTE_PATTERNS: RegExp[] = [/^\/auth(\/|$)/, /^\/config(\/|$)/];function trimTrailingSlash(value: string) {return value.replace(/\/+$/, '');diff --git a/src/lib/boards.ts b/src/lib/boards.tsindex 77199fb88..c53865584 100644--- a/src/lib/boards.ts+++ b/src/lib/boards.ts@@ -1,5 +1,5 @@-import type { Board, BoardComponentConfig, BoardParameters } from './types';import { isBoardComponentSupportedByEntityType } from './boardComponentCompatibility';+import type { Board, BoardComponentConfig, BoardParameters } from './types';export const BOARD_TYPES = {dashboard: 'dashboard',@@ -72,9 +72,7 @@ export function isOpenBoardType(type?: string) {}export function requiresBoardEntity(type?: string) {- return (- type === BOARD_TYPES.website || type === BOARD_TYPES.pixel || type === BOARD_TYPES.link- );+ return type === BOARD_TYPES.website || type === BOARD_TYPES.pixel || type === BOARD_TYPES.link;}export function getBoardEntity(board?: Pick<Board, 'type' | 'parameters'> | Partial<Board>): {@@ -141,10 +139,7 @@ export function getResolvedComponentEntity(return getComponentEntity(config);}-export function isBoardComponentSupported(- componentType: string,- entityType?: BoardEntityType,-) {+export function isBoardComponentSupported(componentType: string, entityType?: BoardEntityType) {return isBoardComponentSupportedByEntityType(componentType, entityType);}diff --git a/src/lib/generate.ts b/src/lib/generate.tsindex 752c0b609..0d3a0de84 100644--- a/src/lib/generate.ts+++ b/src/lib/generate.ts@@ -1,11 +1,8 @@-import { uniformInt } from 'pure-rand/distribution/uniformInt';-import { xoroshiro128plus } from 'pure-rand/generator/xoroshiro128plus';--const seed = Date.now() ^ (Math.random() * 0x100000000);-const rng = xoroshiro128plus(seed);-export function random(min: number, max: number) {- return uniformInt(rng, min, max);+ const range = max - min + 1;+ const buf = new Uint32Array(1);+ globalThis.crypto.getRandomValues(buf);+ return min + (buf[0] % range);}export function getRandomChars(diff --git a/src/lib/heatmap-r2.ts b/src/lib/heatmap-r2.tsindex 76c8b7343..4da5d06d6 100644--- a/src/lib/heatmap-r2.ts+++ b/src/lib/heatmap-r2.ts@@ -52,11 +52,7 @@ function getClient() {return client;}-export async function putHeatmapSnapshot(- objectKey: string,- imageData: Buffer,- mimeType: string,-) {+export async function putHeatmapSnapshot(objectKey: string, imageData: Buffer, mimeType: string) {await getClient().send(new PutObjectCommand({Bucket: getBucket(),diff --git a/src/lib/params.ts b/src/lib/params.tsindex 50cb6db2d..17341fd53 100644--- a/src/lib/params.ts+++ b/src/lib/params.ts@@ -108,42 +108,44 @@ export function parsePropertyFilters(query: Record<string, any>,prefixes: string[] = ['pf'],): PropertyFilter[] {- return Object.entries(query)- .flatMap(([key, val]) => {- const prefix = getPropertyFilterPrefix(key, prefixes);+ return Object.entries(query).flatMap(([key, val]) => {+ const prefix = getPropertyFilterPrefix(key, prefixes);- if (!prefix) {- return [];- }-- const stringValue = String(val);- const withoutPrefix = key.slice(prefix.length + 1);- const propertyName = withoutPrefix.replace(/\d+$/, ''); // strip trailing index digits- const prefixedDotMatch = stringValue.match(/^(\d+)\.([^.]+)\.(.*)$/);- const untypedDotMatch = stringValue.match(/^([^.]+)\.(.*)$/);- const explicitDataType = prefixedDotMatch ? Number(prefixedDotMatch[1]) : undefined;- const rawOperator = prefixedDotMatch ? prefixedDotMatch[2] : untypedDotMatch?.[1];- const operator = resolveOperator(rawOperator);+ if (!prefix) {+ return [];+ }- if (!operator || (explicitDataType !== undefined && !VALID_EVENT_DATA_TYPES.includes(explicitDataType))) {- return [];- }+ const stringValue = String(val);+ const withoutPrefix = key.slice(prefix.length + 1);+ const propertyName = withoutPrefix.replace(/\d+$/, ''); // strip trailing index digits+ const prefixedDotMatch = stringValue.match(/^(\d+)\.([^.]+)\.(.*)$/);+ const untypedDotMatch = stringValue.match(/^([^.]+)\.(.*)$/);+ const explicitDataType = prefixedDotMatch ? Number(prefixedDotMatch[1]) : undefined;+ const rawOperator = prefixedDotMatch ? prefixedDotMatch[2] : untypedDotMatch?.[1];+ const operator = resolveOperator(rawOperator);++ if (+ !operator ||+ (explicitDataType !== undefined && !VALID_EVENT_DATA_TYPES.includes(explicitDataType))+ ) {+ return [];+ }- const value = prefixedDotMatch ? prefixedDotMatch[3] : untypedDotMatch?.[2];+ const value = prefixedDotMatch ? prefixedDotMatch[3] : untypedDotMatch?.[2];- if (value === undefined) {- return [];- }+ if (value === undefined) {+ return [];+ }- return [- {- propertyName,- dataType: explicitDataType ?? DATA_TYPE.string,- operator,- value,- },- ];- });+ return [+ {+ propertyName,+ dataType: explicitDataType ?? DATA_TYPE.string,+ operator,+ value,+ },+ ];+ });}export function parseEventPropertyFilters(query: Record<string, any>) {@@ -159,7 +161,10 @@ export function serializePropertyFilters(filters.map(f => {const n = counts[f.propertyName] ?? 0;counts[f.propertyName] = n + 1;- return [`${prefix}_${f.propertyName}${n > 0 ? n : ''}`, `${f.dataType}.${f.operator}.${f.value}`];+ return [+ `${prefix}_${f.propertyName}${n > 0 ? n : ''}`,+ `${f.dataType}.${f.operator}.${f.value}`,+ ];}),);}diff --git a/src/lib/request.ts b/src/lib/request.tsindex 87c4872ad..4aa2e8a7a 100644--- a/src/lib/request.ts+++ b/src/lib/request.ts@@ -1,3 +1,5 @@+import { startOfMonth, subMonths } from 'date-fns';+import { z } from 'zod';import { checkAuth } from '@/lib/auth';import { DEFAULT_PAGE_SIZE, FILTER_COLUMNS, OPERATORS } from '@/lib/constants';import { getAllowedUnits, getMinimumUnit, maxDate, parseDateRange } from '@/lib/date';@@ -6,8 +8,6 @@ import { filtersArrayToObject } from '@/lib/params';import { badRequest, unauthorized } from '@/lib/response';import type { QueryFilters } from '@/lib/types';import { getWebsiteSegment } from '@/queries/prisma';-import { startOfMonth, subMonths } from 'date-fns';-import { z } from 'zod';export async function parseRequest(request: Request,diff --git a/src/permissions/link.ts b/src/permissions/link.tsindex f274c7b25..be6eef71a 100644--- a/src/permissions/link.ts+++ b/src/permissions/link.ts@@ -8,7 +8,11 @@ export async function canViewLink({ user, shareToken }: Auth, linkId: string) {return true;}- if (shareToken?.linkId === linkId || shareToken?.websiteId === linkId || shareToken?.linkIds?.includes(linkId)) {+ if (+ shareToken?.linkId === linkId ||+ shareToken?.websiteId === linkId ||+ shareToken?.linkIds?.includes(linkId)+ ) {return true;}diff --git a/src/permissions/pixel.ts b/src/permissions/pixel.tsindex 79b1b5976..061363063 100644--- a/src/permissions/pixel.ts+++ b/src/permissions/pixel.ts@@ -8,7 +8,11 @@ export async function canViewPixel({ user, shareToken }: Auth, pixelId: string)return true;}- if (shareToken?.pixelId === pixelId || shareToken?.websiteId === pixelId || shareToken?.pixelIds?.includes(pixelId)) {+ if (+ shareToken?.pixelId === pixelId ||+ shareToken?.websiteId === pixelId ||+ shareToken?.pixelIds?.includes(pixelId)+ ) {return true;}diff --git a/src/queries/prisma/user.ts b/src/queries/prisma/user.tsindex 905c3f6b2..99bb2f49e 100644--- a/src/queries/prisma/user.ts+++ b/src/queries/prisma/user.ts@@ -130,9 +130,7 @@ export async function deleteUser(userId: string) {const teamIds = teams.map(a => a.id);- const ownedFilter = cloudMode- ? { userId }- : { OR: [{ userId }, { teamId: { in: teamIds } }] };+ const ownedFilter = cloudMode ? { userId } : { OR: [{ userId }, { teamId: { in: teamIds } }] };const [links, pixels, boards] = await Promise.all([client.link.findMany({diff --git a/src/queries/sql/events/getEventData.ts b/src/queries/sql/events/getEventData.tsindex 4a3fac860..ebd0df983 100644--- a/src/queries/sql/events/getEventData.ts+++ b/src/queries/sql/events/getEventData.ts@@ -39,10 +39,9 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {group by website_event.event_id`;- const count = await rawQuery(- `select count(*) as num from (${eventQuery}) t`,- queryParams,- ).then((res: any) => res[0].num);+ const count = await rawQuery(`select count(*) as num from (${eventQuery}) t`, queryParams).then(+ (res: any) => res[0].num,+ );const data = await rawQuery(`@@ -106,10 +105,9 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {group by event_data.event_id`;- const count = await rawQuery(- `select count(*) as num from (${eventQuery}) t`,- queryParams,- ).then((res: any) => res[0].num);+ const count = await rawQuery(`select count(*) as num from (${eventQuery}) t`, queryParams).then(+ (res: any) => res[0].num,+ );const data = await rawQuery(`@@ -149,4 +147,4 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {);return { data, count, page: +page, pageSize: size };-}\ No newline at end of file+}diff --git a/src/queries/sql/heatmap/ensureHeatmapSnapshot.ts b/src/queries/sql/heatmap/ensureHeatmapSnapshot.tsindex a194deb42..54e727e84 100644--- a/src/queries/sql/heatmap/ensureHeatmapSnapshot.ts+++ b/src/queries/sql/heatmap/ensureHeatmapSnapshot.ts@@ -1,9 +1,9 @@import { serializeError } from 'serialize-error';import { getApiUrl } from '@/lib/api-url';import clickhouse from '@/lib/clickhouse';-import prisma from '@/lib/prisma';import { uuid } from '@/lib/crypto';import { getHeatmapSnapshot, putHeatmapSnapshot } from '@/lib/heatmap-r2';+import prisma from '@/lib/prisma';import { getWebsite } from '@/queries/prisma';const SNAPSHOT_STATUS = {@@ -78,7 +78,12 @@ async function measurePage(page: any) {const rootClientWidth = root?.clientWidth || 0;const docClientWidth = doc?.clientWidth || 0;const bodyClientWidth = body?.clientWidth || 0;- const visibleWidth = Math.max(window.innerWidth, rootClientWidth, docClientWidth, bodyClientWidth);+ const visibleWidth = Math.max(+ window.innerWidth,+ rootClientWidth,+ docClientWidth,+ bodyClientWidth,+ );const rootScrollWidth = root?.scrollWidth || 0;const docScrollWidth = doc?.scrollWidth || 0;const bodyScrollWidth = body?.scrollWidth || 0;@@ -299,7 +304,9 @@ async function findClickhouseSnapshot(return null;}- const status = Object.entries(CLICKHOUSE_SNAPSHOT_STATUS).find(([, value]) => value === row.status)?.[0];+ const status = Object.entries(CLICKHOUSE_SNAPSHOT_STATUS).find(+ ([, value]) => value === row.status,+ )?.[0];if (!status) {return null;@@ -325,7 +332,10 @@ function getSnapshotImageUrl(websiteId: string, snapshotId: string) {function mapSnapshot(websiteId: string, row: SnapshotRecord): HeatmapSnapshotImage {return {id: row.id,- imageUrl: row.status === SNAPSHOT_STATUS.ready && row.hasImage ? getSnapshotImageUrl(websiteId, row.id) : null,+ imageUrl:+ row.status === SNAPSHOT_STATUS.ready && row.hasImage+ ? getSnapshotImageUrl(websiteId, row.id)+ : null,status: row.status,mimeType: row.mimeType,pageW: Number(row.pageW),@@ -566,7 +576,12 @@ async function insertClickhouseSnapshotRecord({]);}-function getSnapshotObjectKey(websiteId: string, snapshotId: string, viewportW: number, viewportH: number) {+function getSnapshotObjectKey(+ websiteId: string,+ snapshotId: string,+ viewportW: number,+ viewportH: number,+) {return `${websiteId}/${viewportW}x${viewportH}/${snapshotId}.png`;}@@ -624,7 +639,9 @@ async function captureSnapshot(let dimensions = await measurePage(page);let currentWidth = initialViewportW;let captureWidth =- dimensions.pageW > initialViewportW + 24 ? Math.max(initialViewportW, dimensions.pageW) : initialViewportW;+ dimensions.pageW > initialViewportW + 24+ ? Math.max(initialViewportW, dimensions.pageW)+ : initialViewportW;for (let i = 0; i < 3; i++) {if (captureWidth <= currentWidth) {@@ -684,17 +701,11 @@ export async function ensureHeatmapSnapshot({const updatedAt = existing?.updatedAt ? new Date(existing.updatedAt) : null;const ageMs = updatedAt ? Date.now() - updatedAt.getTime() : Number.POSITIVE_INFINITY;- if (- existing?.status === SNAPSHOT_STATUS.pending &&- ageMs < SNAPSHOT_PENDING_WINDOW_MS- ) {+ if (existing?.status === SNAPSHOT_STATUS.pending && ageMs < SNAPSHOT_PENDING_WINDOW_MS) {return mapSnapshot(websiteId, existing);}- if (- existing?.status === SNAPSHOT_STATUS.failed &&- ageMs < SNAPSHOT_RETRY_DELAY_MS- ) {+ if (existing?.status === SNAPSHOT_STATUS.failed && ageMs < SNAPSHOT_RETRY_DELAY_MS) {return mapSnapshot(websiteId, existing);}@@ -738,10 +749,9 @@ export async function ensureHeatmapSnapshot({try {const capture = await captureSnapshot(captureUrl, viewportW, viewportH, pageW);- const objectKey =- clickhouse.enabled- ? getSnapshotObjectKey(websiteId, snapshotId, viewportW, viewportH)- : null;+ const objectKey = clickhouse.enabled+ ? getSnapshotObjectKey(websiteId, snapshotId, viewportW, viewportH)+ : null;if (objectKey) {await putHeatmapSnapshot(objectKey, capture.imageData, capture.mimeType);@@ -798,9 +808,7 @@ export async function getHeatmapSnapshotImage(snapshotId: string,): Promise<{ mimeType: string; imageData: Buffer } | null> {if (clickhouse.enabled) {- const rows = await clickhouse.rawQuery<- { mimeType: string; objectKey: string }[]- >(+ const rows = await clickhouse.rawQuery<{ mimeType: string; objectKey: string }[]>(`selectmime_type as mimeType,diff --git a/src/queries/sql/heatmap/getHeatmap.ts b/src/queries/sql/heatmap/getHeatmap.tsindex 1e4bd8b34..785956bcd 100644--- a/src/queries/sql/heatmap/getHeatmap.ts+++ b/src/queries/sql/heatmap/getHeatmap.ts@@ -5,8 +5,8 @@ import { filtersObjectToArray } from '@/lib/params';import prisma from '@/lib/prisma';import type { QueryFilters } from '@/lib/types';import {- type HeatmapSnapshotImage,ensureHeatmapSnapshot,+ type HeatmapSnapshotImage,shouldSkipSnapshot,} from './ensureHeatmapSnapshot';@@ -543,15 +543,13 @@ function pickSnapshotViewport(}}- let bestViewport:- | {- width: number;- height: number;- count: number;- maxPageW: number;- maxPageH: number;- }- | null = null;+ let bestViewport: {+ width: number;+ height: number;+ count: number;+ maxPageW: number;+ maxPageH: number;+ } | null = null;for (const bucket of viewportBuckets.values()) {if (!bestViewport || bucket.count > bestViewport.count) {@@ -626,7 +624,9 @@ function getRelationalHeatmapPathFilterContext(filters: QueryFilters) {);const joinedClauses =- filters.match === 'any' ? clauses.filter(Boolean).join('\n or ') : clauses.filter(Boolean).join('\n and ');+ filters.match === 'any'+ ? clauses.filter(Boolean).join('\n or ')+ : clauses.filter(Boolean).join('\n and ');return {filterQuery:@@ -680,7 +680,9 @@ function getClickhouseHeatmapPathFilterContext(filters: QueryFilters) {);const joinedClauses =- filters.match === 'any' ? clauses.filter(Boolean).join('\n or ') : clauses.filter(Boolean).join('\n and ');+ filters.match === 'any'+ ? clauses.filter(Boolean).join('\n or ')+ : clauses.filter(Boolean).join('\n and ');return {filterQuery:diff --git a/src/queries/sql/index.ts b/src/queries/sql/index.tsindex a5bbb4193..bd0196e73 100644--- a/src/queries/sql/index.ts+++ b/src/queries/sql/index.ts@@ -44,14 +44,14 @@ export * from './reports/getUTM';export * from './sessions/createSession';export * from './sessions/getSessionActivity';export * from './sessions/getSessionData';+export * from './sessions/getSessionDataActivityStats';export * from './sessions/getSessionDataArraySeries';export * from './sessions/getSessionDataDateSeries';-export * from './sessions/getSessionDataProperties';-export * from './sessions/getSessionDataPropertySeries';export * from './sessions/getSessionDataNumericSeries';export * from './sessions/getSessionDataNumericStats';export * from './sessions/getSessionDataPivot';-export * from './sessions/getSessionDataActivityStats';+export * from './sessions/getSessionDataProperties';+export * from './sessions/getSessionDataPropertySeries';export * from './sessions/getSessionDataValues';export * from './sessions/getSessionExpandedMetrics';export * from './sessions/getSessionMetrics';diff --git a/src/queries/sql/pageviews/getPageviewExpandedMetrics.ts b/src/queries/sql/pageviews/getPageviewExpandedMetrics.tsindex c1ca8cd0c..2eeeeca5f 100644--- a/src/queries/sql/pageviews/getPageviewExpandedMetrics.ts+++ b/src/queries/sql/pageviews/getPageviewExpandedMetrics.ts@@ -75,13 +75,15 @@ async function relationalQuery(`;}- const selectColumn = type === 'fullPath'- ? `case when website_event.url_query != '' then website_event.url_path || '?' || website_event.url_query else website_event.url_path end`- : column;-- const groupByColumn = type === 'fullPath'- ? `case when website_event.url_query != '' then website_event.url_path || '?' || website_event.url_query else website_event.url_path end`- : column;+ const selectColumn =+ type === 'fullPath'+ ? `case when website_event.url_query != '' then website_event.url_path || '?' || website_event.url_query else website_event.url_path end`+ : column;++ const groupByColumn =+ type === 'fullPath'+ ? `case when website_event.url_query != '' then website_event.url_path || '?' || website_event.url_query else website_event.url_path end`+ : column;return rawQuery(`diff --git a/src/queries/sql/pageviews/getPageviewMetrics.ts b/src/queries/sql/pageviews/getPageviewMetrics.tsindex cfc8d0c7f..8a78cb0d2 100644--- a/src/queries/sql/pageviews/getPageviewMetrics.ts+++ b/src/queries/sql/pageviews/getPageviewMetrics.ts@@ -71,9 +71,10 @@ async function relationalQuery(column = `x.${FILTER_COLUMNS[type] || type}`;}- const selectColumn = type === 'fullPath'- ? `case when website_event.url_query != '' then website_event.url_path || '?' || website_event.url_query else website_event.url_path end`- : column;+ const selectColumn =+ type === 'fullPath'+ ? `case when website_event.url_query != '' then website_event.url_path || '?' || website_event.url_query else website_event.url_path end`+ : column;return rawQuery(`diff --git a/src/queries/sql/sessions/getSessionDataActivityStats.ts b/src/queries/sql/sessions/getSessionDataActivityStats.tsindex 939f437c0..724ba4844 100644--- a/src/queries/sql/sessions/getSessionDataActivityStats.ts+++ b/src/queries/sql/sessions/getSessionDataActivityStats.ts@@ -7,7 +7,12 @@ import type { PropertyFilter, PropertyLeaderboardRow, QueryFilters } from '@/libconst FUNCTION_NAME = 'getSessionDataActivityStats';export async function getSessionDataActivityStats(- ...args: [websiteId: string, propertyName: string, filters: QueryFilters, propertyFilters?: PropertyFilter[]]+ ...args: [+ websiteId: string,+ propertyName: string,+ filters: QueryFilters,+ propertyFilters?: PropertyFilter[],+ ]): Promise<PropertyLeaderboardRow[]> {return runQuery({[PRISMA]: () => relationalQuery(...args),@@ -28,8 +33,12 @@ async function relationalQuery(websiteId,timezone,});- const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(propertyFilters, 'session', timezone);-+ const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(+ propertyFilters,+ 'session',+ timezone,+ );+return rawQuery(`with filtered_sessions as (@@ -110,8 +119,16 @@ async function clickhouseQuery() {const { timezone = 'UTC' } = filters;const { rawQuery, parseFilters, getPropertyFilterQuery } = clickhouse;- const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });- const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(propertyFilters, 'session', timezone);+ const { filterQuery, cohortQuery, queryParams } = parseFilters({+ ...filters,+ websiteId,+ timezone,+ });+ const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(+ propertyFilters,+ 'session',+ timezone,+ );return rawQuery(`diff --git a/src/queries/sql/sessions/getSessionDataArraySeries.ts b/src/queries/sql/sessions/getSessionDataArraySeries.tsindex 89e876d45..840d6b468 100644--- a/src/queries/sql/sessions/getSessionDataArraySeries.ts+++ b/src/queries/sql/sessions/getSessionDataArraySeries.ts@@ -33,7 +33,11 @@ async function relationalQuery(websiteId,timezone,});- const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(propertyFilters, 'session', timezone);+ const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(+ propertyFilters,+ 'session',+ timezone,+ );return rawQuery(`@@ -71,8 +75,16 @@ async function clickhouseQuery(): Promise<EventDataSeriesPoint[]> {const { timezone = 'UTC', unit = 'day' } = filters;const { rawQuery, getDateSQL, parseFilters, getPropertyFilterQuery } = clickhouse;- const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });- const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(propertyFilters, 'session', timezone);+ const { filterQuery, cohortQuery, queryParams } = parseFilters({+ ...filters,+ websiteId,+ timezone,+ });+ const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(+ propertyFilters,+ 'session',+ timezone,+ );return rawQuery(`diff --git a/src/queries/sql/sessions/getSessionDataDateSeries.ts b/src/queries/sql/sessions/getSessionDataDateSeries.tsindex 15b762959..8c17bf929 100644--- a/src/queries/sql/sessions/getSessionDataDateSeries.ts+++ b/src/queries/sql/sessions/getSessionDataDateSeries.ts@@ -33,7 +33,11 @@ async function relationalQuery(websiteId,timezone,});- const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(propertyFilters, 'session', timezone);+ const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(+ propertyFilters,+ 'session',+ timezone,+ );return rawQuery(`@@ -69,8 +73,16 @@ async function clickhouseQuery(): Promise<EventDataDateSeriesPoint[]> {const { timezone = 'UTC' } = filters;const { rawQuery, parseFilters, getDateStringSQL, getPropertyFilterQuery } = clickhouse;- const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });- const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(propertyFilters, 'session', timezone);+ const { filterQuery, cohortQuery, queryParams } = parseFilters({+ ...filters,+ websiteId,+ timezone,+ });+ const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(+ propertyFilters,+ 'session',+ timezone,+ );return rawQuery(`diff --git a/src/queries/sql/sessions/getSessionDataNumericSeries.ts b/src/queries/sql/sessions/getSessionDataNumericSeries.tsindex e74ac8f56..64f74fc25 100644--- a/src/queries/sql/sessions/getSessionDataNumericSeries.ts+++ b/src/queries/sql/sessions/getSessionDataNumericSeries.ts@@ -35,7 +35,11 @@ async function relationalQuery(websiteId,timezone,});- const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(propertyFilters, 'session', timezone);+ const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(+ propertyFilters,+ 'session',+ timezone,+ );const aggSql =metric === 'avg'? 'avg(cast(session_data.number_value as decimal))'@@ -83,8 +87,16 @@ async function clickhouseQuery(): Promise<{ t: string; y: number }[]> {const { timezone = 'UTC', unit = 'day' } = filters;const { rawQuery, getDateSQL, parseFilters, getPropertyFilterQuery } = clickhouse;- const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });- const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(propertyFilters, 'session', timezone);+ const { filterQuery, cohortQuery, queryParams } = parseFilters({+ ...filters,+ websiteId,+ timezone,+ });+ const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(+ propertyFilters,+ 'session',+ timezone,+ );const aggSql =metric === 'avg'? 'avg(session_data.number_value)'diff --git a/src/queries/sql/sessions/getSessionDataNumericStats.ts b/src/queries/sql/sessions/getSessionDataNumericStats.tsindex 7f6ee775f..c7dfdad28 100644--- a/src/queries/sql/sessions/getSessionDataNumericStats.ts+++ b/src/queries/sql/sessions/getSessionDataNumericStats.ts@@ -33,7 +33,11 @@ async function relationalQuery(websiteId,timezone,});- const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(propertyFilters, 'session', timezone);+ const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(+ propertyFilters,+ 'session',+ timezone,+ );return rawQuery(`@@ -75,8 +79,16 @@ async function clickhouseQuery(): Promise<EventDataNumericStats[]> {const { timezone = 'UTC' } = filters;const { rawQuery, parseFilters, getPropertyFilterQuery } = clickhouse;- const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });- const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(propertyFilters, 'session', timezone);+ const { filterQuery, cohortQuery, queryParams } = parseFilters({+ ...filters,+ websiteId,+ timezone,+ });+ const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(+ propertyFilters,+ 'session',+ timezone,+ );return rawQuery(`diff --git a/src/queries/sql/sessions/getSessionDataPivot.ts b/src/queries/sql/sessions/getSessionDataPivot.tsindex 9e9445853..f8e313ba9 100644--- a/src/queries/sql/sessions/getSessionDataPivot.ts+++ b/src/queries/sql/sessions/getSessionDataPivot.ts@@ -128,7 +128,11 @@ async function clickhouseQuery(const { timezone = 'UTC' } = filters;const { pagedRawQuery, parseFilters, getPropertyFilterQuery, getDateStringSQL } = clickhouse;- const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });+ const { filterQuery, cohortQuery, queryParams } = parseFilters({+ ...filters,+ websiteId,+ timezone,+ });const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(propertyFilters,'session',diff --git a/src/queries/sql/sessions/getSessionDataProperties.ts b/src/queries/sql/sessions/getSessionDataProperties.tsindex 38708b116..1d81c7bd0 100644--- a/src/queries/sql/sessions/getSessionDataProperties.ts+++ b/src/queries/sql/sessions/getSessionDataProperties.ts@@ -85,7 +85,11 @@ async function clickhouseQuery(): Promise<{ propertyName: string; dataType: number; total: number }[]> {const { timezone = 'UTC' } = filters;const { rawQuery, parseFilters, getPropertyFilterQuery } = clickhouse;- const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });+ const { filterQuery, cohortQuery, queryParams } = parseFilters({+ ...filters,+ websiteId,+ timezone,+ });const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(propertyFilters,'session',diff --git a/src/queries/sql/sessions/getSessionDataPropertySeries.ts b/src/queries/sql/sessions/getSessionDataPropertySeries.tsindex f66620b1e..f8ba5be1d 100644--- a/src/queries/sql/sessions/getSessionDataPropertySeries.ts+++ b/src/queries/sql/sessions/getSessionDataPropertySeries.ts@@ -33,7 +33,11 @@ async function relationalQuery(websiteId,timezone,});- const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(propertyFilters, 'session', timezone);+ const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(+ propertyFilters,+ 'session',+ timezone,+ );return rawQuery(`@@ -70,8 +74,16 @@ async function clickhouseQuery(): Promise<EventDataSeriesPoint[]> {const { timezone = 'UTC', unit = 'day' } = filters;const { rawQuery, getDateSQL, parseFilters, getPropertyFilterQuery } = clickhouse;- const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });- const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(propertyFilters, 'session', timezone);+ const { filterQuery, cohortQuery, queryParams } = parseFilters({+ ...filters,+ websiteId,+ timezone,+ });+ const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(+ propertyFilters,+ 'session',+ timezone,+ );return rawQuery(`diff --git a/src/store/app.ts b/src/store/app.tsindex 0893c506a..851332e26 100644--- a/src/store/app.ts+++ b/src/store/app.ts@@ -32,10 +32,7 @@ export function setLocale(locale: string) {store.setState({ locale });}-export function setShareData(- share: object | null,- shareToken: { token?: string } | null,-) {+export function setShareData(share: object | null, shareToken: { token?: string } | null) {store.setState({ share, shareToken });}