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
Updated reports.
Mike Cao01bd21c5b4e2
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx b/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsxindex 572112c5f..5f4ba943a 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx@@ -32,7 +32,7 @@ export function WebsiteFilterButton({return (<DialogTrigger>- <Button variant="quiet">+ <Button variant="outline"><Icon><ListFilter /></Icon>diff --git a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsxindex afc787e73..8c9741897 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx@@ -9,7 +9,7 @@ export function WebsiteHeader() {const website = useWebsite();return (- <PageHeader title={website.name} icon={<Favicon domain={website.domain} />}>+ <PageHeader title={website.name} icon={<Favicon domain={website.domain} />} showBorder={false}><Row alignItems="center" gap><ActiveUsers websiteId={website.id} /><Button>diff --git a/src/app/(main)/websites/[websiteId]/WebsiteLayout.tsx b/src/app/(main)/websites/[websiteId]/WebsiteLayout.tsxindex 36d703359..3a3255bd5 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteLayout.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteLayout.tsx@@ -1,24 +1,18 @@'use client';import { ReactNode } from 'react';-import { Grid, Column } from '@umami/react-zen';+import { Column } from '@umami/react-zen';import { WebsiteProvider } from './WebsiteProvider';-import { WebsiteNav } from '@/app/(main)/websites/[websiteId]/WebsiteNav';import { PageBody } from '@/components/common/PageBody';-import { WebsiteHeader } from '@/app/(main)/websites/[websiteId]/WebsiteHeader';+import { WebsiteHeader } from './WebsiteHeader';+import { WebsiteTabs } from './WebsiteTabs';export function WebsiteLayout({ websiteId, children }: { websiteId: string; children: ReactNode }) {return (<WebsiteProvider websiteId={websiteId}><PageBody>- <Column gap="6">- <WebsiteHeader />- <Grid columns="auto 1fr" justifyContent="center" gap="6" width="100%">- <Column position="sticky" top="20px" alignSelf="flex-start" width="200px">- <WebsiteNav websiteId={websiteId} />- </Column>- <Column>{children}</Column>- </Grid>- </Column>+ <WebsiteHeader />+ <WebsiteTabs />+ <Column>{children}</Column></PageBody></WebsiteProvider>);diff --git a/src/app/(main)/websites/[websiteId]/WebsiteTabs.tsx b/src/app/(main)/websites/[websiteId]/WebsiteTabs.tsxnew file mode 100644index 000000000..4caf1e38b--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/WebsiteTabs.tsx@@ -0,0 +1,64 @@+import { Tabs, TabList, Tab, Icon, Text, Row } from '@umami/react-zen';+import { useWebsite } from '@/components/hooks/useWebsite';+import { useMessages, useNavigation } from '@/components/hooks';+import { Clock, Eye, Lightning, User, ChartPie } from '@/components/icons';++export function WebsiteTabs() {+ const website = useWebsite();+ const { pathname, renderTeamUrl } = useNavigation();+ const { formatMessage, labels } = useMessages();++ const links = [+ {+ id: 'overview',+ label: formatMessage(labels.overview),+ icon: <Eye />,+ path: '',+ },+ {+ id: 'events',+ label: formatMessage(labels.events),+ icon: <Lightning />,+ path: '/events',+ },+ {+ id: 'sessions',+ label: formatMessage(labels.users),+ icon: <User />,+ path: '/sessions',+ },+ {+ id: 'realtime',+ label: formatMessage(labels.realtime),+ icon: <Clock />,+ path: '/realtime',+ },+ {+ id: 'reports',+ label: formatMessage(labels.reports),+ icon: <ChartPie />,+ path: '/reports',+ },+ ];++ const selectedKey = links.find(({ path }) => path && pathname.includes(path))?.id || 'overview';++ return (+ <Row marginBottom="6">+ <Tabs selectedKey={selectedKey}>+ <TabList>+ {links.map(({ id, label, icon, path }) => {+ return (+ <Tab key={id} id={id} href={renderTeamUrl(`/websites/${website.id}${path}`)}>+ <Row alignItems="center" gap>+ <Icon>{icon}</Icon>+ <Text>{label}</Text>+ </Row>+ </Tab>+ );+ })}+ </TabList>+ </Tabs>+ </Row>+ );+}diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeHome.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHome.tsxdeleted file mode 100644index 0946ff1ef..000000000--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeHome.tsx+++ /dev/null@@ -1,31 +0,0 @@-import { useEffect } from 'react';-import { useRouter } from 'next/navigation';-import { PageBody } from '@/components/common/PageBody';-import { SectionHeader } from '@/components/common/SectionHeader';-import { useApi, useMessages } from '@/components/hooks';-import { EmptyPlaceholder } from '@/components/common/EmptyPlaceholder';--export function RealtimeHome() {- const { formatMessage, labels, messages } = useMessages();- const { get, useQuery } = useApi();- const router = useRouter();- const { data, isLoading, error } = useQuery({- queryKey: ['websites:me'],- queryFn: () => get('/me/websites'),- });-- useEffect(() => {- if (data?.length) {- router.push(`realtime/${data[0].id}`);- }- }, [data, router]);-- return (- <PageBody isLoading={isLoading || data?.length > 0} error={error}>- <SectionHeader title={formatMessage(labels.realtime)} />- {data?.length === 0 && (- <EmptyPlaceholder message={formatMessage(messages.noWebsitesConfigured)} />- )}- </PageBody>- );-}diff --git a/src/app/(main)/websites/[websiteId]/reports/ReportsLayout.tsx b/src/app/(main)/websites/[websiteId]/reports/ReportsLayout.tsxnew file mode 100644index 000000000..11b743c17--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/reports/ReportsLayout.tsx@@ -0,0 +1,15 @@+'use client';+import { ReactNode } from 'react';+import { Grid, Column } from '@umami/react-zen';+import { ReportsNav } from './ReportsNav';++export function ReportsLayout({ websiteId, children }: { websiteId: string; children: ReactNode }) {+ return (+ <Grid columns="200px 1fr" gap="6">+ <Column>+ <ReportsNav websiteId={websiteId} />+ </Column>+ <Column minWidth="0">{children}</Column>+ </Grid>+ );+}diff --git a/src/app/(main)/websites/[websiteId]/reports/ReportsNav.tsx b/src/app/(main)/websites/[websiteId]/reports/ReportsNav.tsxnew file mode 100644index 000000000..51b4ed7ac--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/reports/ReportsNav.tsx@@ -0,0 +1,81 @@+import { Row, NavMenu, NavMenuItem, Icon, Text } from '@umami/react-zen';+import { useMessages, useNavigation } from '@/components/hooks';+import { Funnel, Lightbulb, Magnet, Money, Network, Path, Tag, Target } from '@/components/icons';+import Link from 'next/link';++export function ReportsNav({ websiteId }: { websiteId: string }) {+ const { formatMessage, labels } = useMessages();+ const { pathname, renderTeamUrl } = useNavigation();++ const links = [+ {+ id: 'goals',+ label: formatMessage(labels.goals),+ icon: <Target />,+ path: '/goals',+ },+ {+ id: 'funnel',+ label: formatMessage(labels.funnels),+ icon: <Funnel />,+ path: '/funnels',+ },+ {+ id: 'journeys',+ label: formatMessage(labels.journeys),+ icon: <Path />,+ path: '/journeys',+ },+ {+ id: 'retention',+ label: formatMessage(labels.retention),+ icon: <Magnet />,+ path: '/retention',+ },+ {+ id: 'utm',+ label: formatMessage(labels.utm),+ icon: <Tag />,+ path: '/utm',+ },+ {+ id: 'revenue',+ label: formatMessage(labels.revenue),+ icon: <Money />,+ path: '/revenue',+ },+ {+ id: 'attribution',+ label: formatMessage(labels.attribution),+ icon: <Network />,+ path: '/attribution',+ },+ {+ id: 'insights',+ label: formatMessage(labels.insights),+ icon: <Lightbulb />,+ path: '/insights',+ },+ ];++ const selected = links.find(({ path }) => path && pathname.endsWith(path))?.id || 'goals';++ return (+ <NavMenu highlightColor="3">+ {links.map(({ id, label, icon, path }) => {+ const isSelected = selected === id;++ return (+ <Link key={id} href={renderTeamUrl(`/websites/${websiteId}/reports${path}`)}>+ <NavMenuItem isSelected={isSelected}>+ <Row alignItems="center" gap>+ <Icon>{icon}</Icon>+ <Text>{label}</Text>+ </Row>+ </NavMenuItem>+ </Link>+ );+ })}+ </NavMenu>+ );+}diff --git a/src/app/(main)/websites/[websiteId]/goals/Goal.tsx b/src/app/(main)/websites/[websiteId]/reports/attribution/Goal.tsxsimilarity index 100%rename from src/app/(main)/websites/[websiteId]/goals/Goal.tsxrename to src/app/(main)/websites/[websiteId]/reports/attribution/Goal.tsxdiff --git a/src/app/(main)/websites/[websiteId]/goals/GoalAddButton.tsx b/src/app/(main)/websites/[websiteId]/reports/attribution/GoalAddButton.tsxsimilarity index 100%rename from src/app/(main)/websites/[websiteId]/goals/GoalAddButton.tsxrename to src/app/(main)/websites/[websiteId]/reports/attribution/GoalAddButton.tsxdiff --git a/src/app/(main)/websites/[websiteId]/goals/GoalEditForm.tsx b/src/app/(main)/websites/[websiteId]/reports/attribution/GoalEditForm.tsxsimilarity index 100%rename from src/app/(main)/websites/[websiteId]/goals/GoalEditForm.tsxrename to src/app/(main)/websites/[websiteId]/reports/attribution/GoalEditForm.tsxdiff --git a/src/app/(main)/websites/[websiteId]/goals/GoalsPage.tsx b/src/app/(main)/websites/[websiteId]/reports/attribution/GoalsPage.tsxsimilarity index 93%rename from src/app/(main)/websites/[websiteId]/goals/GoalsPage.tsxrename to src/app/(main)/websites/[websiteId]/reports/attribution/GoalsPage.tsxindex b97c0e700..522d984dd 100644--- a/src/app/(main)/websites/[websiteId]/goals/GoalsPage.tsx+++ b/src/app/(main)/websites/[websiteId]/reports/attribution/GoalsPage.tsx@@ -3,7 +3,7 @@ import { Grid, Loading } from '@umami/react-zen';import { SectionHeader } from '@/components/common/SectionHeader';import { Goal } from './Goal';import { GoalAddButton } from './GoalAddButton';-import { WebsiteControls } from '../WebsiteControls';+import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';import { useDateRange, useReportsQuery } from '@/components/hooks';import { LoadingPanel } from '@/components/common/LoadingPanel';import { Panel } from '@/components/common/Panel';diff --git a/src/app/(main)/websites/[websiteId]/goals/page.tsx b/src/app/(main)/websites/[websiteId]/reports/attribution/page.tsxsimilarity index 100%rename from src/app/(main)/websites/[websiteId]/goals/page.tsxrename to src/app/(main)/websites/[websiteId]/reports/attribution/page.tsxdiff --git a/src/app/(main)/websites/[websiteId]/funnels/Funnel.tsx b/src/app/(main)/websites/[websiteId]/reports/funnels/Funnel.tsxsimilarity index 100%rename from src/app/(main)/websites/[websiteId]/funnels/Funnel.tsxrename to src/app/(main)/websites/[websiteId]/reports/funnels/Funnel.tsxdiff --git a/src/app/(main)/websites/[websiteId]/funnels/FunnelAddButton.tsx b/src/app/(main)/websites/[websiteId]/reports/funnels/FunnelAddButton.tsxsimilarity index 100%rename from src/app/(main)/websites/[websiteId]/funnels/FunnelAddButton.tsxrename to src/app/(main)/websites/[websiteId]/reports/funnels/FunnelAddButton.tsxdiff --git a/src/app/(main)/websites/[websiteId]/funnels/FunnelEditForm.tsx b/src/app/(main)/websites/[websiteId]/reports/funnels/FunnelEditForm.tsxsimilarity index 100%rename from src/app/(main)/websites/[websiteId]/funnels/FunnelEditForm.tsxrename to src/app/(main)/websites/[websiteId]/reports/funnels/FunnelEditForm.tsxdiff --git a/src/app/(main)/websites/[websiteId]/funnels/FunnelsPage.tsx b/src/app/(main)/websites/[websiteId]/reports/funnels/FunnelsPage.tsxsimilarity index 85%rename from src/app/(main)/websites/[websiteId]/funnels/FunnelsPage.tsxrename to src/app/(main)/websites/[websiteId]/reports/funnels/FunnelsPage.tsxindex b68fd608a..d887e8e00 100644--- a/src/app/(main)/websites/[websiteId]/funnels/FunnelsPage.tsx+++ b/src/app/(main)/websites/[websiteId]/reports/funnels/FunnelsPage.tsx@@ -1,9 +1,9 @@'use client';-import { Grid, Loading } from '@umami/react-zen';+import { Grid, Column } from '@umami/react-zen';import { SectionHeader } from '@/components/common/SectionHeader';import { Funnel } from './Funnel';import { FunnelAddButton } from './FunnelAddButton';-import { WebsiteControls } from '../WebsiteControls';+import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';import { useDateRange, useReportsQuery } from '@/components/hooks';import { LoadingPanel } from '@/components/common/LoadingPanel';import { Panel } from '@/components/common/Panel';@@ -14,12 +14,8 @@ export function FunnelsPage({ websiteId }: { websiteId: string }) {dateRange: { startDate, endDate },} = useDateRange(websiteId);- if (!result) {- return <Loading position="page" />;- }-return (- <>+ <Column gap><WebsiteControls websiteId={websiteId} /><LoadingPanel isEmpty={!result?.data} isLoading={!result}><SectionHeader>@@ -33,6 +29,6 @@ export function FunnelsPage({ websiteId }: { websiteId: string }) {))}</Grid></LoadingPanel>- </>+ </Column>);}diff --git a/src/app/(main)/websites/[websiteId]/funnels/page.tsx b/src/app/(main)/websites/[websiteId]/reports/funnels/page.tsxsimilarity index 100%rename from src/app/(main)/websites/[websiteId]/funnels/page.tsxrename to src/app/(main)/websites/[websiteId]/reports/funnels/page.tsxdiff --git a/src/app/(main)/websites/[websiteId]/reports/goals/Goal.tsx b/src/app/(main)/websites/[websiteId]/reports/goals/Goal.tsxnew file mode 100644index 000000000..8e2d453a2--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/reports/goals/Goal.tsx@@ -0,0 +1,98 @@+import { Grid, Row, Column, Text, Icon, ProgressBar, Dialog } from '@umami/react-zen';+import { ReportEditButton } from '@/components/input/ReportEditButton';+import { useMessages, useResultQuery } from '@/components/hooks';+import { File, Lightning, User } from '@/components/icons';+import { LoadingPanel } from '@/components/common/LoadingPanel';+import { formatLongNumber } from '@/lib/format';+import { GoalEditForm } from './GoalEditForm';++export interface GoalProps {+ id: string;+ name: string;+ type: string;+ parameters: {+ name: string;+ type: string;+ value: string;+ };+ websiteId: string;+ startDate: Date;+ endDate: Date;+}++export type GoalData = { num: number; total: number };++export function Goal({ id, name, type, parameters, websiteId, startDate, endDate }: GoalProps) {+ const { formatMessage, labels } = useMessages();+ const { data, error, isLoading } = useResultQuery<GoalData>(type, {+ websiteId,+ dateRange: {+ startDate,+ endDate,+ },+ parameters,+ });+ const isPage = parameters?.type === 'page';++ return (+ <LoadingPanel isEmpty={!data} isLoading={isLoading} error={error}>+ <Grid gap>+ <Grid columns="1fr auto" gap>+ <Column gap>+ <Row>+ <Text size="4" weight="bold">+ {name}+ </Text>+ </Row>+ </Column>+ <Column>+ <ReportEditButton id={id} name={name} type={type}>+ {({ close }) => {+ return (+ <Dialog+ title={formatMessage(labels.goal)}+ variant="modal"+ style={{ minHeight: 300, minWidth: 400 }}+ >+ <GoalEditForm id={id} websiteId={websiteId} onClose={close} />+ </Dialog>+ );+ }}+ </ReportEditButton>+ </Column>+ </Grid>+ <Row alignItems="center" justifyContent="space-between" gap>+ <Text color="muted">+ {formatMessage(isPage ? labels.viewedPage : labels.triggeredEvent)}+ </Text>+ <Text color="muted">{formatMessage(labels.conversionRate)}</Text>+ </Row>+ <Row alignItems="center" justifyContent="space-between" gap>+ <Row alignItems="center" gap>+ <Icon>{parameters.type === 'page' ? <File /> : <Lightning />}</Icon>+ <Text>{parameters.value}</Text>+ </Row>+ <Row alignItems="center" gap>+ <Icon>+ <User />+ </Icon>+ <Text title={`${data?.num} / ${data?.total}`}>{`${formatLongNumber(+ data?.num,+ )} / ${formatLongNumber(data?.total)}`}</Text>+ </Row>+ </Row>+ <Row alignItems="center" gap="6">+ <ProgressBar+ value={data?.num || 0}+ minValue={0}+ maxValue={data?.total || 1}+ style={{ width: '100%' }}+ />+ <Text weight="bold" size="7">+ {data?.total ? Math.round((+data?.num / +data?.total) * 100) : '0'}%+ </Text>+ </Row>+ </Grid>+ </LoadingPanel>+ );+}diff --git a/src/app/(main)/websites/[websiteId]/reports/goals/GoalAddButton.tsx b/src/app/(main)/websites/[websiteId]/reports/goals/GoalAddButton.tsxnew file mode 100644index 000000000..cdd7d34a4--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/reports/goals/GoalAddButton.tsx@@ -0,0 +1,28 @@+import { Button, DialogTrigger, Dialog, Icon, Text, Modal } from '@umami/react-zen';+import { useMessages } from '@/components/hooks';+import { GoalEditForm } from './GoalEditForm';+import { Plus } from '@/components/icons';++export function GoalAddButton({ websiteId }: { websiteId: string }) {+ const { formatMessage, labels } = useMessages();++ return (+ <DialogTrigger>+ <Button variant="primary">+ <Icon>+ <Plus />+ </Icon>+ <Text>{formatMessage(labels.goal)}</Text>+ </Button>+ <Modal>+ <Dialog+ variant="modal"+ title={formatMessage(labels.goal)}+ style={{ minHeight: 375, minWidth: 400 }}+ >+ {({ close }) => <GoalEditForm websiteId={websiteId} onClose={close} />}+ </Dialog>+ </Modal>+ </DialogTrigger>+ );+}diff --git a/src/app/(main)/websites/[websiteId]/reports/goals/GoalEditForm.tsx b/src/app/(main)/websites/[websiteId]/reports/goals/GoalEditForm.tsxnew file mode 100644index 000000000..b42545de1--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/reports/goals/GoalEditForm.tsx@@ -0,0 +1,114 @@+import {+ Form,+ FormField,+ TextField,+ Grid,+ FormButtons,+ FormSubmitButton,+ Button,+ RadioGroup,+ Radio,+ Text,+ Icon,+ Loading,+} from '@umami/react-zen';+import { useApi, useMessages, useModified, useReportQuery } from '@/components/hooks';+import { File, Lightning } from '@/components/icons';++export function GoalEditForm({+ id,+ websiteId,+ onSave,+ onClose,+}: {+ id?: string;+ websiteId: string;+ onSave?: () => void;+ onClose?: () => void;+}) {+ const { formatMessage, labels } = useMessages();+ const { touch } = useModified();+ const { post, useMutation } = useApi();+ const { data } = useReportQuery(id);+ const { mutate, error, isPending } = useMutation({+ mutationFn: (params: any) => post(`/reports${id ? `/${id}` : ''}`, params),+ });++ const handleSubmit = async ({ name, ...parameters }) => {+ mutate(+ { ...data, id, name, type: 'goal', websiteId, parameters },+ {+ onSuccess: async () => {+ if (id) touch(`report:${id}`);+ touch('reports:goal');+ onSave?.();+ onClose?.();+ },+ },+ );+ };++ if (id && !data) {+ return <Loading position="page" />;+ }++ const defaultValues = {+ name: data?.name || '',+ type: data?.parameters?.type || 'page',+ value: data?.parameters?.value || '',+ };++ return (+ <Form onSubmit={handleSubmit} error={error?.message} defaultValues={defaultValues}>+ {({ watch }) => {+ const watchType = watch('type');+ return (+ <>+ <FormField+ name="name"+ label={formatMessage(labels.name)}+ rules={{ required: formatMessage(labels.required) }}+ >+ <TextField />+ </FormField>+ <FormField+ name="type"+ label={formatMessage(labels.type)}+ rules={{ required: formatMessage(labels.required) }}+ >+ <RadioGroup orientation="horizontal" variant="box">+ <Grid columns="1fr 1fr" flexGrow={1} gap>+ <Radio value="page">+ <Icon>+ <File />+ </Icon>+ <Text>{formatMessage(labels.page)}</Text>+ </Radio>+ <Radio value="event">+ <Icon>+ <Lightning />+ </Icon>+ <Text>{formatMessage(labels.event)}</Text>+ </Radio>+ </Grid>+ </RadioGroup>+ </FormField>+ <FormField+ name="value"+ label={formatMessage(watchType === 'event' ? labels.eventName : labels.path)}+ rules={{ required: formatMessage(labels.required) }}+ >+ <TextField />+ </FormField>+ <FormButtons>+ <Button onPress={onClose} isDisabled={isPending}>+ {formatMessage(labels.cancel)}+ </Button>+ <FormSubmitButton>{formatMessage(labels.save)}</FormSubmitButton>+ </FormButtons>+ </>+ );+ }}+ </Form>+ );+}diff --git a/src/app/(main)/websites/[websiteId]/reports/goals/GoalsPage.tsx b/src/app/(main)/websites/[websiteId]/reports/goals/GoalsPage.tsxnew file mode 100644index 000000000..3ee32f153--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/reports/goals/GoalsPage.tsx@@ -0,0 +1,34 @@+'use client';+import { Grid, Column } from '@umami/react-zen';+import { SectionHeader } from '@/components/common/SectionHeader';+import { Goal } from './Goal';+import { GoalAddButton } from './GoalAddButton';+import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';+import { useDateRange, useReportsQuery } from '@/components/hooks';+import { LoadingPanel } from '@/components/common/LoadingPanel';+import { Panel } from '@/components/common/Panel';++export function GoalsPage({ websiteId }: { websiteId: string }) {+ const { result } = useReportsQuery({ websiteId, type: 'goal' });+ const {+ dateRange: { startDate, endDate },+ } = useDateRange(websiteId);++ return (+ <Column gap>+ <WebsiteControls websiteId={websiteId} />+ <LoadingPanel isEmpty={!result?.data} isLoading={!result}>+ <SectionHeader>+ <GoalAddButton websiteId={websiteId} />+ </SectionHeader>+ <Grid columns="1fr 1fr" gap>+ {result?.data?.map((report: any) => (+ <Panel key={report.id}>+ <Goal {...report} reportId={report.id} startDate={startDate} endDate={endDate} />+ </Panel>+ ))}+ </Grid>+ </LoadingPanel>+ </Column>+ );+}diff --git a/src/app/(main)/websites/[websiteId]/reports/goals/page.tsx b/src/app/(main)/websites/[websiteId]/reports/goals/page.tsxnew file mode 100644index 000000000..e59b2c7c7--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/reports/goals/page.tsx@@ -0,0 +1,12 @@+import { Metadata } from 'next';+import { GoalsPage } from './GoalsPage';++export default async function ({ params }: { params: Promise<{ websiteId: string }> }) {+ const { websiteId } = await params;++ return <GoalsPage websiteId={websiteId} />;+}++export const metadata: Metadata = {+ title: 'Goals',+};diff --git a/src/app/(main)/websites/[websiteId]/reports/insights/Goal.tsx b/src/app/(main)/websites/[websiteId]/reports/insights/Goal.tsxnew file mode 100644index 000000000..8e2d453a2--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/reports/insights/Goal.tsx@@ -0,0 +1,98 @@+import { Grid, Row, Column, Text, Icon, ProgressBar, Dialog } from '@umami/react-zen';+import { ReportEditButton } from '@/components/input/ReportEditButton';+import { useMessages, useResultQuery } from '@/components/hooks';+import { File, Lightning, User } from '@/components/icons';+import { LoadingPanel } from '@/components/common/LoadingPanel';+import { formatLongNumber } from '@/lib/format';+import { GoalEditForm } from './GoalEditForm';++export interface GoalProps {+ id: string;+ name: string;+ type: string;+ parameters: {+ name: string;+ type: string;+ value: string;+ };+ websiteId: string;+ startDate: Date;+ endDate: Date;+}++export type GoalData = { num: number; total: number };++export function Goal({ id, name, type, parameters, websiteId, startDate, endDate }: GoalProps) {+ const { formatMessage, labels } = useMessages();+ const { data, error, isLoading } = useResultQuery<GoalData>(type, {+ websiteId,+ dateRange: {+ startDate,+ endDate,+ },+ parameters,+ });+ const isPage = parameters?.type === 'page';++ return (+ <LoadingPanel isEmpty={!data} isLoading={isLoading} error={error}>+ <Grid gap>+ <Grid columns="1fr auto" gap>+ <Column gap>+ <Row>+ <Text size="4" weight="bold">+ {name}+ </Text>+ </Row>+ </Column>+ <Column>+ <ReportEditButton id={id} name={name} type={type}>+ {({ close }) => {+ return (+ <Dialog+ title={formatMessage(labels.goal)}+ variant="modal"+ style={{ minHeight: 300, minWidth: 400 }}+ >+ <GoalEditForm id={id} websiteId={websiteId} onClose={close} />+ </Dialog>+ );+ }}+ </ReportEditButton>+ </Column>+ </Grid>+ <Row alignItems="center" justifyContent="space-between" gap>+ <Text color="muted">+ {formatMessage(isPage ? labels.viewedPage : labels.triggeredEvent)}+ </Text>+ <Text color="muted">{formatMessage(labels.conversionRate)}</Text>+ </Row>+ <Row alignItems="center" justifyContent="space-between" gap>+ <Row alignItems="center" gap>+ <Icon>{parameters.type === 'page' ? <File /> : <Lightning />}</Icon>+ <Text>{parameters.value}</Text>+ </Row>+ <Row alignItems="center" gap>+ <Icon>+ <User />+ </Icon>+ <Text title={`${data?.num} / ${data?.total}`}>{`${formatLongNumber(+ data?.num,+ )} / ${formatLongNumber(data?.total)}`}</Text>+ </Row>+ </Row>+ <Row alignItems="center" gap="6">+ <ProgressBar+ value={data?.num || 0}+ minValue={0}+ maxValue={data?.total || 1}+ style={{ width: '100%' }}+ />+ <Text weight="bold" size="7">+ {data?.total ? Math.round((+data?.num / +data?.total) * 100) : '0'}%+ </Text>+ </Row>+ </Grid>+ </LoadingPanel>+ );+}diff --git a/src/app/(main)/websites/[websiteId]/reports/insights/GoalAddButton.tsx b/src/app/(main)/websites/[websiteId]/reports/insights/GoalAddButton.tsxnew file mode 100644index 000000000..cdd7d34a4--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/reports/insights/GoalAddButton.tsx@@ -0,0 +1,28 @@+import { Button, DialogTrigger, Dialog, Icon, Text, Modal } from '@umami/react-zen';+import { useMessages } from '@/components/hooks';+import { GoalEditForm } from './GoalEditForm';+import { Plus } from '@/components/icons';++export function GoalAddButton({ websiteId }: { websiteId: string }) {+ const { formatMessage, labels } = useMessages();++ return (+ <DialogTrigger>+ <Button variant="primary">+ <Icon>+ <Plus />+ </Icon>+ <Text>{formatMessage(labels.goal)}</Text>+ </Button>+ <Modal>+ <Dialog+ variant="modal"+ title={formatMessage(labels.goal)}+ style={{ minHeight: 375, minWidth: 400 }}+ >+ {({ close }) => <GoalEditForm websiteId={websiteId} onClose={close} />}+ </Dialog>+ </Modal>+ </DialogTrigger>+ );+}diff --git a/src/app/(main)/websites/[websiteId]/reports/insights/GoalEditForm.tsx b/src/app/(main)/websites/[websiteId]/reports/insights/GoalEditForm.tsxnew file mode 100644index 000000000..b42545de1--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/reports/insights/GoalEditForm.tsx@@ -0,0 +1,114 @@+import {+ Form,+ FormField,+ TextField,+ Grid,+ FormButtons,+ FormSubmitButton,+ Button,+ RadioGroup,+ Radio,+ Text,+ Icon,+ Loading,+} from '@umami/react-zen';+import { useApi, useMessages, useModified, useReportQuery } from '@/components/hooks';+import { File, Lightning } from '@/components/icons';++export function GoalEditForm({+ id,+ websiteId,+ onSave,+ onClose,+}: {+ id?: string;+ websiteId: string;+ onSave?: () => void;+ onClose?: () => void;+}) {+ const { formatMessage, labels } = useMessages();+ const { touch } = useModified();+ const { post, useMutation } = useApi();+ const { data } = useReportQuery(id);+ const { mutate, error, isPending } = useMutation({+ mutationFn: (params: any) => post(`/reports${id ? `/${id}` : ''}`, params),+ });++ const handleSubmit = async ({ name, ...parameters }) => {+ mutate(+ { ...data, id, name, type: 'goal', websiteId, parameters },+ {+ onSuccess: async () => {+ if (id) touch(`report:${id}`);+ touch('reports:goal');+ onSave?.();+ onClose?.();+ },+ },+ );+ };++ if (id && !data) {+ return <Loading position="page" />;+ }++ const defaultValues = {+ name: data?.name || '',+ type: data?.parameters?.type || 'page',+ value: data?.parameters?.value || '',+ };++ return (+ <Form onSubmit={handleSubmit} error={error?.message} defaultValues={defaultValues}>+ {({ watch }) => {+ const watchType = watch('type');+ return (+ <>+ <FormField+ name="name"+ label={formatMessage(labels.name)}+ rules={{ required: formatMessage(labels.required) }}+ >+ <TextField />+ </FormField>+ <FormField+ name="type"+ label={formatMessage(labels.type)}+ rules={{ required: formatMessage(labels.required) }}+ >+ <RadioGroup orientation="horizontal" variant="box">+ <Grid columns="1fr 1fr" flexGrow={1} gap>+ <Radio value="page">+ <Icon>+ <File />+ </Icon>+ <Text>{formatMessage(labels.page)}</Text>+ </Radio>+ <Radio value="event">+ <Icon>+ <Lightning />+ </Icon>+ <Text>{formatMessage(labels.event)}</Text>+ </Radio>+ </Grid>+ </RadioGroup>+ </FormField>+ <FormField+ name="value"+ label={formatMessage(watchType === 'event' ? labels.eventName : labels.path)}+ rules={{ required: formatMessage(labels.required) }}+ >+ <TextField />+ </FormField>+ <FormButtons>+ <Button onPress={onClose} isDisabled={isPending}>+ {formatMessage(labels.cancel)}+ </Button>+ <FormSubmitButton>{formatMessage(labels.save)}</FormSubmitButton>+ </FormButtons>+ </>+ );+ }}+ </Form>+ );+}diff --git a/src/app/(main)/websites/[websiteId]/reports/insights/GoalsPage.tsx b/src/app/(main)/websites/[websiteId]/reports/insights/GoalsPage.tsxnew file mode 100644index 000000000..522d984dd--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/reports/insights/GoalsPage.tsx@@ -0,0 +1,38 @@+'use client';+import { Grid, Loading } from '@umami/react-zen';+import { SectionHeader } from '@/components/common/SectionHeader';+import { Goal } from './Goal';+import { GoalAddButton } from './GoalAddButton';+import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';+import { useDateRange, useReportsQuery } from '@/components/hooks';+import { LoadingPanel } from '@/components/common/LoadingPanel';+import { Panel } from '@/components/common/Panel';++export function GoalsPage({ websiteId }: { websiteId: string }) {+ const { result } = useReportsQuery({ websiteId, type: 'goal' });+ const {+ dateRange: { startDate, endDate },+ } = useDateRange(websiteId);++ if (!result) {+ return <Loading position="page" />;+ }++ return (+ <>+ <WebsiteControls websiteId={websiteId} />+ <LoadingPanel isEmpty={!result?.data} isLoading={!result}>+ <SectionHeader>+ <GoalAddButton websiteId={websiteId} />+ </SectionHeader>+ <Grid columns="1fr 1fr" gap>+ {result?.data?.map((report: any) => (+ <Panel key={report.id}>+ <Goal {...report} reportId={report.id} startDate={startDate} endDate={endDate} />+ </Panel>+ ))}+ </Grid>+ </LoadingPanel>+ </>+ );+}diff --git a/src/app/(main)/websites/[websiteId]/reports/insights/page.tsx b/src/app/(main)/websites/[websiteId]/reports/insights/page.tsxnew file mode 100644index 000000000..e59b2c7c7--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/reports/insights/page.tsx@@ -0,0 +1,12 @@+import { Metadata } from 'next';+import { GoalsPage } from './GoalsPage';++export default async function ({ params }: { params: Promise<{ websiteId: string }> }) {+ const { websiteId } = await params;++ return <GoalsPage websiteId={websiteId} />;+}++export const metadata: Metadata = {+ title: 'Goals',+};diff --git a/src/app/(main)/websites/[websiteId]/journeys/Journey.module.css b/src/app/(main)/websites/[websiteId]/reports/journeys/Journey.module.csssimilarity index 100%rename from src/app/(main)/websites/[websiteId]/journeys/Journey.module.cssrename to src/app/(main)/websites/[websiteId]/reports/journeys/Journey.module.cssdiff --git a/src/app/(main)/websites/[websiteId]/journeys/Journey.tsx b/src/app/(main)/websites/[websiteId]/reports/journeys/Journey.tsxsimilarity index 99%rename from src/app/(main)/websites/[websiteId]/journeys/Journey.tsxrename to src/app/(main)/websites/[websiteId]/reports/journeys/Journey.tsxindex 8cff32075..72e138ca1 100644--- a/src/app/(main)/websites/[websiteId]/journeys/Journey.tsx+++ b/src/app/(main)/websites/[websiteId]/reports/journeys/Journey.tsx@@ -166,7 +166,7 @@ export function Journey({};return (- <LoadingPanel isEmpty={!data} isLoading={isLoading} error={error}>+ <LoadingPanel isEmpty={!data} isLoading={isLoading} error={error} height="100%"><div className={styles.container}><div className={styles.view}>{columns.map(({ visitorCount, nodes }, columnIndex) => {diff --git a/src/app/(main)/websites/[websiteId]/journeys/JourneysPage.tsx b/src/app/(main)/websites/[websiteId]/reports/journeys/JourneysPage.tsxsimilarity index 98%rename from src/app/(main)/websites/[websiteId]/journeys/JourneysPage.tsxrename to src/app/(main)/websites/[websiteId]/reports/journeys/JourneysPage.tsxindex 93bdf9b15..d75828222 100644--- a/src/app/(main)/websites/[websiteId]/journeys/JourneysPage.tsx+++ b/src/app/(main)/websites/[websiteId]/reports/journeys/JourneysPage.tsx@@ -19,7 +19,7 @@ export function JourneysPage({ websiteId }: { websiteId: string }) {const [endStep, setEndStep] = useState('');return (- <Column gap="6">+ <Column gap><WebsiteControls websiteId={websiteId} /><Grid columns="repeat(3, 1fr)" gap><Selectdiff --git a/src/app/(main)/websites/[websiteId]/journeys/page.tsx b/src/app/(main)/websites/[websiteId]/reports/journeys/page.tsxsimilarity index 100%rename from src/app/(main)/websites/[websiteId]/journeys/page.tsxrename to src/app/(main)/websites/[websiteId]/reports/journeys/page.tsxdiff --git a/src/app/(main)/websites/[websiteId]/reports/layout.tsx b/src/app/(main)/websites/[websiteId]/reports/layout.tsxnew file mode 100644index 000000000..ced1c6844--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/reports/layout.tsx@@ -0,0 +1,21 @@+import { Metadata } from 'next';+import { ReportsLayout } from './ReportsLayout';++export default async function ({+ children,+ params,+}: {+ children: any;+ params: Promise<{ websiteId: string }>;+}) {+ const { websiteId } = await params;++ return <ReportsLayout websiteId={websiteId}>{children}</ReportsLayout>;+}++export const metadata: Metadata = {+ title: {+ template: '%s | Umami',+ default: 'Websites | Umami',+ },+};diff --git a/src/app/(main)/websites/[websiteId]/reports/page.tsx b/src/app/(main)/websites/[websiteId]/reports/page.tsxnew file mode 100644index 000000000..c9916b153--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/reports/page.tsx@@ -0,0 +1,3 @@+import GoalsPage from './goals/page';++export default GoalsPage;diff --git a/src/app/(main)/websites/[websiteId]/reports/retention/Retention.tsx b/src/app/(main)/websites/[websiteId]/reports/retention/Retention.tsxnew file mode 100644index 000000000..55ac6fd94--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/reports/retention/Retention.tsx@@ -0,0 +1,123 @@+import { ReactNode } from 'react';+import { Grid, Row, Column, Text, Loading, Icon } from '@umami/react-zen';+import { Empty } from '@/components/common/Empty';+import { Users } from '@/components/icons';+import { useMessages, useLocale, useResultQuery } from '@/components/hooks';+import { formatDate } from '@/lib/date';+import { formatLongNumber } from '@/lib/format';+import { Panel } from '@/components/common/Panel';+import { LoadingPanel } from '@/components/common/LoadingPanel';++const DAYS = [1, 2, 3, 4, 5, 6, 7, 14, 21, 28];++export interface RetentionProps {+ websiteId: string;+ startDate: Date;+ endDate: Date;+ days?: number[];+}++export function Retention({ websiteId, days = DAYS, startDate, endDate }: RetentionProps) {+ const { formatMessage, labels } = useMessages();+ const { locale } = useLocale();+ const { data, error, isLoading } = useResultQuery<any>('retention', {+ websiteId,+ dateRange: {+ startDate,+ endDate,+ },+ });++ if (isLoading) {+ return <Loading position="page" />;+ }++ if (!data) {+ return <Empty />;+ }++ const rows = data.reduce((arr: any[], row: { date: any; visitors: any; day: any }) => {+ const { date, visitors, day } = row;+ if (day === 0) {+ return arr.concat({+ date,+ visitors,+ records: days+ .reduce((arr, day) => {+ arr[day] = data.find(x => x.date === date && x.day === day);+ return arr;+ }, [])+ .filter(n => n),+ });+ }+ return arr;+ }, []);++ const totalDays = rows.length;++ return (+ <LoadingPanel isEmpty={!data?.length} isLoading={isLoading} error={error}>+ <Panel allowFullscreen height="900px">+ <Column gap="1" width="100%" overflow="auto">+ <Grid+ columns="120px repeat(10, 100px)"+ alignItems="center"+ gap="1"+ height="50px"+ autoFlow="column"+ >+ <Column>+ <Text weight="bold">{formatMessage(labels.cohort)}</Text>+ </Column>+ {days.map(n => (+ <Column key={n}>+ <Text weight="bold" align="center" wrap="nowrap">+ {formatMessage(labels.day)} {n}+ </Text>+ </Column>+ ))}+ </Grid>+ {rows.map(({ date, visitors, records }: any, rowIndex: number) => {+ return (+ <Grid key={rowIndex} columns="120px repeat(10, 100px)" gap="1" autoFlow="column">+ <Column justifyContent="center" gap="1">+ <Text weight="bold">{formatDate(date, 'PP', locale)}</Text>+ <Row alignItems="center" gap>+ <Icon>+ <Users />+ </Icon>+ <Text>{formatLongNumber(visitors)}</Text>+ </Row>+ </Column>+ {days.map(day => {+ if (totalDays - rowIndex < day) {+ return null;+ }+ const percentage = records.filter(a => a.day === day)[0]?.percentage;+ return (+ <Cell key={day}>{percentage ? `${Number(percentage).toFixed(2)}%` : ''}</Cell>+ );+ })}+ </Grid>+ );+ })}+ </Column>+ </Panel>+ </LoadingPanel>+ );+}++const Cell = ({ children }: { children: ReactNode }) => {+ return (+ <Column+ justifyContent="center"+ alignItems="center"+ width="100px"+ height="100px"+ backgroundColor="2"+ borderRadius+ >+ {children}+ </Column>+ );+};diff --git a/src/app/(main)/websites/[websiteId]/retention/RetentionPage.tsx b/src/app/(main)/websites/[websiteId]/reports/retention/RetentionPage.tsxsimilarity index 54%rename from src/app/(main)/websites/[websiteId]/retention/RetentionPage.tsxrename to src/app/(main)/websites/[websiteId]/reports/retention/RetentionPage.tsxindex 346bba5c6..71ffc6fb6 100644--- a/src/app/(main)/websites/[websiteId]/retention/RetentionPage.tsx+++ b/src/app/(main)/websites/[websiteId]/reports/retention/RetentionPage.tsx@@ -1,16 +1,18 @@'use client';import { Column } from '@umami/react-zen';-import { RetentionTable } from './RetentionTable';+import { Retention } from './Retention';import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';-import { Panel } from '@/components/common/Panel';+import { useDateRange } from '@/components/hooks';export function RetentionPage({ websiteId }: { websiteId: string }) {+ const {+ dateRange: { startDate, endDate },+ } = useDateRange(websiteId);+return (<Column gap><WebsiteControls websiteId={websiteId} />- <Panel>- <RetentionTable websiteId={websiteId} />- </Panel>+ <Retention websiteId={websiteId} startDate={startDate} endDate={endDate} /></Column>);}diff --git a/src/app/(main)/websites/[websiteId]/retention/page.tsx b/src/app/(main)/websites/[websiteId]/reports/retention/page.tsxsimilarity index 100%rename from src/app/(main)/websites/[websiteId]/retention/page.tsxrename to src/app/(main)/websites/[websiteId]/reports/retention/page.tsxdiff --git a/src/app/(main)/websites/[websiteId]/reports/revenue/Revenue.tsx b/src/app/(main)/websites/[websiteId]/reports/revenue/Revenue.tsxnew file mode 100644index 000000000..b48ba8976--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/reports/revenue/Revenue.tsx@@ -0,0 +1,200 @@+import { useState } from 'react';+import { Grid, Select, ListItem } from '@umami/react-zen';+import classNames from 'classnames';+import { colord } from 'colord';+import { BarChart } from '@/components/charts/BarChart';+import { PieChart } from '@/components/charts/PieChart';+import { TypeIcon } from '@/components/common/TypeIcon';+import { useCountryNames, useLocale, useMessages, useResultQuery } from '@/components/hooks';+import { ListTable } from '@/components/metrics/ListTable';+import { MetricCard } from '@/components/metrics/MetricCard';+import { MetricsBar } from '@/components/metrics/MetricsBar';+import { renderDateLabels } from '@/lib/charts';+import { CHART_COLORS, CURRENCIES } from '@/lib/constants';+import { formatLongCurrency, formatLongNumber } from '@/lib/format';+import { useCallback, useMemo } from 'react';+import { Panel } from '@/components/common/Panel';+import { Column } from '@umami/react-zen';+import { LoadingPanel } from '@/components/common/LoadingPanel';+import { parseDateRange } from '@/lib/date';++export interface RevenueProps {+ websiteId: string;+ startDate: Date;+ endDate: Date;+}++export function Revenue({ websiteId, startDate, endDate }: RevenueProps) {+ const [currency, setCurrency] = useState('USD');+ const [search, setSearch] = useState('');+ const { formatMessage, labels } = useMessages();+ const { locale } = useLocale();+ const { countryNames } = useCountryNames(locale);+ const { unit } = parseDateRange({ startDate, endDate }, locale);+ const { data, error, isLoading } = useResultQuery<any>('revenue', {+ websiteId,+ dateRange: {+ startDate,+ endDate,+ },+ parameters: {+ currency,+ },+ });+ const isEmpty = !Object.keys(data || {})?.length;++ const renderCountryName = useCallback(+ ({ x: code }) => (+ <span className={classNames(locale)}>+ <TypeIcon type="country" value={code?.toLowerCase()} />+ {countryNames[code]}+ </span>+ ),+ [countryNames, locale],+ );++ const chartData = useMemo(() => {+ if (!data) return [];++ const map = (data.chart as any[]).reduce((obj, { x, t, y }) => {+ if (!obj[x]) {+ obj[x] = [];+ }++ obj[x].push({ x: t, y });++ return obj;+ }, {});++ return {+ datasets: Object.keys(map).map((key, index) => {+ const color = colord(CHART_COLORS[index % CHART_COLORS.length]);+ return {+ label: key,+ data: map[key],+ lineTension: 0,+ backgroundColor: color.alpha(0.6).toRgbString(),+ borderColor: color.alpha(0.7).toRgbString(),+ borderWidth: 1,+ };+ }),+ };+ }, [data]);++ const countryData = useMemo(() => {+ if (!data) return [];++ const labels = data.country.map(({ name }) => name);+ const datasets = [+ {+ data: data.country.map(({ value }) => value),+ backgroundColor: CHART_COLORS,+ borderWidth: 0,+ },+ ];++ return { labels, datasets };+ }, [data]);++ const metricData = useMemo(() => {+ if (!data) return [];++ const { sum, count, unique_count } = data.total;++ return [+ {+ value: sum,+ label: formatMessage(labels.total),+ formatValue: n => formatLongCurrency(n, currency),+ },+ {+ value: count ? sum / count : 0,+ label: formatMessage(labels.average),+ formatValue: n => formatLongCurrency(n, currency),+ },+ {+ value: count,+ label: formatMessage(labels.transactions),+ formatValue: formatLongNumber,+ },+ {+ value: unique_count,+ label: formatMessage(labels.uniqueCustomers),+ formatValue: formatLongNumber,+ },+ ] as any;+ }, [data, locale]);++ return (+ <Column gap>+ <Grid columns="280px" gap>+ <Select+ items={CURRENCIES}+ label={formatMessage(labels.currency)}+ value={currency}+ defaultValue={currency}+ onChange={setCurrency}+ listProps={{ style: { maxHeight: '300px' } }}+ onSearch={setSearch}+ allowSearch+ >+ {CURRENCIES.map(({ id, name }) => {+ if (search && !`${id}${name}`.toLowerCase().includes(search)) {+ return null;+ }++ return (+ <ListItem key={id} id={id}>+ {id} — {name}+ </ListItem>+ );+ }).filter(n => n)}+ </Select>+ </Grid>++ <LoadingPanel isEmpty={isEmpty} isLoading={isLoading} error={error}>+ <Column gap>+ <Panel>+ <MetricsBar isFetched={!!data}>+ {metricData?.map(({ label, value, formatValue }) => {+ return (+ <MetricCard key={label} value={value} label={label} formatValue={formatValue} />+ );+ })}+ </MetricsBar>+ </Panel>+ {data && (+ <>+ <Panel>+ <BarChart+ minDate={startDate}+ maxDate={endDate}+ data={chartData}+ unit={unit}+ stacked={true}+ currency={currency}+ renderXLabel={renderDateLabels(unit, locale)}+ isLoading={isLoading}+ />+ </Panel>+ <Panel>+ <Grid columns="1fr 1fr">+ <ListTable+ metric={formatMessage(labels.country)}+ data={data?.country.map(({ name, value }) => ({+ x: name,+ y: Number(value),+ z: (value / data?.total.sum) * 100,+ }))}+ renderLabel={renderCountryName}+ />+ <PieChart type="doughnut" data={countryData} />+ </Grid>+ </Panel>+ </>+ )}+ </Column>+ </LoadingPanel>+ </Column>+ );+}diff --git a/src/app/(main)/websites/[websiteId]/revenue/RevenuePage.tsx b/src/app/(main)/websites/[websiteId]/reports/revenue/RevenuePage.tsxsimilarity index 56%rename from src/app/(main)/websites/[websiteId]/revenue/RevenuePage.tsxrename to src/app/(main)/websites/[websiteId]/reports/revenue/RevenuePage.tsxindex 0c2a0c6cf..4c5998d5f 100644--- a/src/app/(main)/websites/[websiteId]/revenue/RevenuePage.tsx+++ b/src/app/(main)/websites/[websiteId]/reports/revenue/RevenuePage.tsx@@ -1,13 +1,18 @@'use client';import { Column } from '@umami/react-zen';-import { RevenueView } from './RevenueView';+import { Revenue } from './Revenue';import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';+import { useDateRange } from '@/components/hooks';export function RevenuePage({ websiteId }: { websiteId: string }) {+ const {+ dateRange: { startDate, endDate },+ } = useDateRange(websiteId);+return (<Column gap><WebsiteControls websiteId={websiteId} allowCompare={false} />- <RevenueView websiteId={websiteId} />+ <Revenue websiteId={websiteId} startDate={startDate} endDate={endDate} /></Column>);}diff --git a/src/app/(main)/websites/[websiteId]/revenue/RevenueTable.tsx b/src/app/(main)/websites/[websiteId]/reports/revenue/RevenueTable.tsxsimilarity index 100%rename from src/app/(main)/websites/[websiteId]/revenue/RevenueTable.tsxrename to src/app/(main)/websites/[websiteId]/reports/revenue/RevenueTable.tsxdiff --git a/src/app/(main)/websites/[websiteId]/revenue/page.tsx b/src/app/(main)/websites/[websiteId]/reports/revenue/page.tsxsimilarity index 89%rename from src/app/(main)/websites/[websiteId]/revenue/page.tsxrename to src/app/(main)/websites/[websiteId]/reports/revenue/page.tsxindex 485d3f25b..4bc563318 100644--- a/src/app/(main)/websites/[websiteId]/revenue/page.tsx+++ b/src/app/(main)/websites/[websiteId]/reports/revenue/page.tsx@@ -8,5 +8,5 @@ export default async function ({ params }: { params: Promise<{ websiteId: string}export const metadata: Metadata = {- title: 'Revenue UTM Parameters',+ title: 'Revenue',};diff --git a/src/app/(main)/websites/[websiteId]/reports/utm/UTM.tsx b/src/app/(main)/websites/[websiteId]/reports/utm/UTM.tsxnew file mode 100644index 000000000..02d0b100d--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/reports/utm/UTM.tsx@@ -0,0 +1,81 @@+import { Grid, Column, Heading, Text } from '@umami/react-zen';+import { firstBy } from 'thenby';+import { CHART_COLORS, UTM_PARAMS } from '@/lib/constants';+import { useResultQuery } from '@/components/hooks';+import { PieChart } from '@/components/charts/PieChart';+import { ListTable } from '@/components/metrics/ListTable';+import { useMessages } from '@/components/hooks';+import { Panel } from '@/components/common/Panel';+import { LoadingPanel } from '@/components/common/LoadingPanel';++export interface UTMProps {+ websiteId: string;+ startDate: Date;+ endDate: Date;+}++export function UTM({ websiteId, startDate, endDate }: UTMProps) {+ const { formatMessage, labels } = useMessages();+ const { data, error, isLoading } = useResultQuery<any>('utm', {+ websiteId,+ dateRange: {+ startDate,+ endDate,+ },+ });+ const isEmpty = !Object.keys(data || {})?.length;++ return (+ <LoadingPanel isEmpty={isEmpty} isLoading={isLoading} error={error}>+ <Column gap>+ {UTM_PARAMS.map(param => {+ const items = toArray(data?.[param]);+ const chartData = {+ labels: items.map(({ name }) => name),+ datasets: [+ {+ data: items.map(({ value }) => value),+ backgroundColor: CHART_COLORS,+ borderWidth: 0,+ },+ ],+ };+ const total = items.reduce((sum, { value }) => {+ return +sum + +value;+ }, 0);++ return (+ <Panel key={param}>+ <Grid columns="1fr 1fr">+ <Column>+ <Heading>+ <Text transform="capitalize">{param.replace(/^utm_/, '')}</Text>+ </Heading>+ <ListTable+ metric={formatMessage(labels.views)}+ data={items.map(({ name, value }) => ({+ x: name,+ y: value,+ z: (value / total) * 100,+ }))}+ />+ </Column>+ <Column>+ <PieChart type="doughnut" data={chartData} />+ </Column>+ </Grid>+ </Panel>+ );+ })}+ </Column>+ </LoadingPanel>+ );+}++function toArray(data: { [key: string]: number } = {}) {+ return Object.keys(data)+ .map(key => {+ return { name: key, value: data[key] };+ })+ .sort(firstBy('value', -1));+}diff --git a/src/app/(main)/websites/[websiteId]/utm/UTMPage.tsx b/src/app/(main)/websites/[websiteId]/reports/utm/UTMPage.tsxsimilarity index 57%rename from src/app/(main)/websites/[websiteId]/utm/UTMPage.tsxrename to src/app/(main)/websites/[websiteId]/reports/utm/UTMPage.tsxindex 8fb6cab55..084b73b73 100644--- a/src/app/(main)/websites/[websiteId]/utm/UTMPage.tsx+++ b/src/app/(main)/websites/[websiteId]/reports/utm/UTMPage.tsx@@ -1,13 +1,18 @@'use client';import { Column } from '@umami/react-zen';-import { UTMView } from './UTMView';+import { useDateRange } from '@/components/hooks';+import { UTM } from './UTM';import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';export function UTMPage({ websiteId }: { websiteId: string }) {+ const {+ dateRange: { startDate, endDate },+ } = useDateRange(websiteId);+return (<Column gap><WebsiteControls websiteId={websiteId} allowCompare={false} />- <UTMView websiteId={websiteId} />+ <UTM websiteId={websiteId} startDate={startDate} endDate={endDate} /></Column>);}diff --git a/src/app/(main)/websites/[websiteId]/utm/page.tsx b/src/app/(main)/websites/[websiteId]/reports/utm/page.tsxsimilarity index 100%rename from src/app/(main)/websites/[websiteId]/utm/page.tsxrename to src/app/(main)/websites/[websiteId]/reports/utm/page.tsxdiff --git a/src/app/(main)/websites/[websiteId]/retention/RetentionTable.tsx b/src/app/(main)/websites/[websiteId]/retention/RetentionTable.tsxdeleted file mode 100644index aeecc26ad..000000000--- a/src/app/(main)/websites/[websiteId]/retention/RetentionTable.tsx+++ /dev/null@@ -1,103 +0,0 @@-import { ReactNode } from 'react';-import { Grid, Row, Column, Text, Loading, Icon } from '@umami/react-zen';-import { EmptyPlaceholder } from '@/components/common/EmptyPlaceholder';-import { Users } from '@/components/icons';-import { useMessages, useLocale, useRetentionQuery } from '@/components/hooks';-import { formatDate } from '@/lib/date';-import { formatLongNumber } from '@/lib/format';--const DAYS = [1, 2, 3, 4, 5, 6, 7, 14, 21, 28];--export function RetentionTable({ websiteId, days = DAYS }: { websiteId: string; days?: number[] }) {- const { formatMessage, labels } = useMessages();- const { locale } = useLocale();- const { data: x, isLoading } = useRetentionQuery(websiteId);- const data = x as any;-- if (isLoading) {- return <Loading position="page" />;- }-- if (!data) {- return <EmptyPlaceholder />;- }-- const rows = data.reduce((arr: any[], row: { date: any; visitors: any; day: any }) => {- const { date, visitors, day } = row;- if (day === 0) {- return arr.concat({- date,- visitors,- records: days- .reduce((arr, day) => {- arr[day] = data.find(x => x.date === date && x.day === day);- return arr;- }, [])- .filter(n => n),- });- }- return arr;- }, []);-- const totalDays = rows.length;-- return (- <Column gap="1">- <Grid- columns="120px repeat(auto-fit, 100px)"- alignItems="center"- gap="1"- height="50px"- autoFlow="column"- >- <Column>- <Text weight="bold">{formatMessage(labels.cohort)}</Text>- </Column>- {days.map(n => (- <Column key={n}>- <Text weight="bold" align="center">- {formatMessage(labels.day)} {n}- </Text>- </Column>- ))}- </Grid>- {rows.map(({ date, visitors, records }: any, rowIndex: number) => {- return (- <Grid key={rowIndex} columns="120px repeat(auto-fit, 100px)" gap="1" autoFlow="column">- <Column justifyContent="center" gap="1">- <Text weight="bold">{formatDate(date, 'PP', locale)}</Text>- <Row alignItems="center" gap>- <Icon>- <Users />- </Icon>- <Text>{formatLongNumber(visitors)}</Text>- </Row>- </Column>- {days.map(day => {- if (totalDays - rowIndex < day) {- return null;- }- const percentage = records.filter(a => a.day === day)[0]?.percentage;- return <Cell key={day}>{percentage ? `${Number(percentage).toFixed(2)}%` : ''}</Cell>;- })}- </Grid>- );- })}- </Column>- );-}--const Cell = ({ children }: { children: ReactNode }) => {- return (- <Column- justifyContent="center"- alignItems="center"- width="100px"- height="100px"- backgroundColor="2"- borderRadius- >- {children}- </Column>- );-};diff --git a/src/app/(main)/websites/[websiteId]/revenue/RevenueView.tsx b/src/app/(main)/websites/[websiteId]/revenue/RevenueView.tsxdeleted file mode 100644index 4c19a693c..000000000--- a/src/app/(main)/websites/[websiteId]/revenue/RevenueView.tsx+++ /dev/null@@ -1,169 +0,0 @@-import classNames from 'classnames';-import { colord } from 'colord';-import { BarChart } from '@/components/charts/BarChart';-import { PieChart } from '@/components/charts/PieChart';-import { TypeIcon } from '@/components/common/TypeIcon';-import {- useCountryNames,- useLocale,- useMessages,- useRevenueQuery,- useDateRange,-} from '@/components/hooks';-import { GridRow } from '@/components/common/GridRow';-import { ListTable } from '@/components/metrics/ListTable';-import { MetricCard } from '@/components/metrics/MetricCard';-import { MetricsBar } from '@/components/metrics/MetricsBar';-import { renderDateLabels } from '@/lib/charts';-import { CHART_COLORS } from '@/lib/constants';-import { formatLongCurrency, formatLongNumber } from '@/lib/format';-import { useCallback, useMemo } from 'react';-import { RevenueTable } from './RevenueTable';-import { Panel } from '@/components/common/Panel';-import { Column } from '@umami/react-zen';--export interface RevenueViewProps {- websiteId: string;- isLoading?: boolean;-}--export function RevenueView({ websiteId, isLoading }: RevenueViewProps) {- const { formatMessage, labels } = useMessages();- const { locale } = useLocale();- const { countryNames } = useCountryNames(locale);-- const { data } = useRevenueQuery(websiteId);- const currency = 'USD';- const { dateRange } = useDateRange(websiteId);-- const renderCountryName = useCallback(- ({ x: code }) => (- <span className={classNames(locale)}>- <TypeIcon type="country" value={code?.toLowerCase()} />- {countryNames[code]}- </span>- ),- [countryNames, locale],- );-- const chartData = useMemo(() => {- if (!data) return [];-- const map = (data.chart as any[]).reduce((obj, { x, t, y }) => {- if (!obj[x]) {- obj[x] = [];- }-- obj[x].push({ x: t, y });-- return obj;- }, {});-- return {- datasets: Object.keys(map).map((key, index) => {- const color = colord(CHART_COLORS[index % CHART_COLORS.length]);- return {- label: key,- data: map[key],- lineTension: 0,- backgroundColor: color.alpha(0.6).toRgbString(),- borderColor: color.alpha(0.7).toRgbString(),- borderWidth: 1,- };- }),- };- }, [data]);-- const countryData = useMemo(() => {- if (!data) return [];-- const labels = data.country.map(({ name }) => name);- const datasets = [- {- data: data.country.map(({ value }) => value),- backgroundColor: CHART_COLORS,- borderWidth: 0,- },- ];-- return { labels, datasets };- }, [data]);-- const metricData = useMemo(() => {- if (!data) return [];-- const { sum, count, unique_count } = data.total;-- return [- {- value: sum,- label: formatMessage(labels.total),- formatValue: n => formatLongCurrency(n, currency),- },- {- value: count ? sum / count : 0,- label: formatMessage(labels.average),- formatValue: n => formatLongCurrency(n, currency),- },- {- value: count,- label: formatMessage(labels.transactions),- formatValue: formatLongNumber,- },- {- value: unique_count,- label: formatMessage(labels.uniqueCustomers),- formatValue: formatLongNumber,- },- ] as any;- }, [data, locale]);-- return (- <>- <Column gap>- <Panel>- <MetricsBar isFetched={!!data}>- {metricData?.map(({ label, value, formatValue }) => {- return (- <MetricCard key={label} value={value} label={label} formatValue={formatValue} />- );- })}- </MetricsBar>- </Panel>- {data && (- <>- <Panel>- <BarChart- minDate={dateRange?.startDate}- maxDate={dateRange?.endDate}- data={chartData}- unit={dateRange?.unit}- stacked={true}- currency={currency}- renderXLabel={renderDateLabels(dateRange?.unit, locale)}- isLoading={isLoading}- />- </Panel>- <Panel>- <GridRow layout="two">- <ListTable- metric={formatMessage(labels.country)}- data={data?.country.map(({ name, value }) => ({- x: name,- y: Number(value),- z: (value / data?.total.sum) * 100,- }))}- renderLabel={renderCountryName}- />- <PieChart type="doughnut" data={countryData} />- </GridRow>- </Panel>- </>- )}- <Panel>- <RevenueTable data={data?.table} />- </Panel>- </Column>- </>- );-}diff --git a/src/app/(main)/websites/[websiteId]/utm/UTMView.tsx b/src/app/(main)/websites/[websiteId]/utm/UTMView.tsxdeleted file mode 100644index 8548695e4..000000000--- a/src/app/(main)/websites/[websiteId]/utm/UTMView.tsx+++ /dev/null@@ -1,74 +0,0 @@-import { Column, Heading, Text, Loading } from '@umami/react-zen';-import { firstBy } from 'thenby';-import { CHART_COLORS, UTM_PARAMS } from '@/lib/constants';-import { useUTMQuery } from '@/components/hooks';-import { PieChart } from '@/components/charts/PieChart';-import { ListTable } from '@/components/metrics/ListTable';-import { useMessages } from '@/components/hooks';-import { Panel } from '@/components/common/Panel';-import { GridRow } from '@/components/common/GridRow';--function toArray(data: { [key: string]: number } = {}) {- return Object.keys(data)- .map(key => {- return { name: key, value: data[key] };- })- .sort(firstBy('value', -1));-}--export function UTMView({ websiteId }: { websiteId: string }) {- const { formatMessage, labels } = useMessages();- const { data, isLoading } = useUTMQuery(websiteId);-- if (isLoading) {- return <Loading position="page" />;- }-- if (!data) {- return null;- }-- return (- <Column gap>- {UTM_PARAMS.map(param => {- const items = toArray(data[param]);- const chartData = {- labels: items.map(({ name }) => name),- datasets: [- {- data: items.map(({ value }) => value),- backgroundColor: CHART_COLORS,- borderWidth: 0,- },- ],- };- const total = items.reduce((sum, { value }) => {- return +sum + +value;- }, 0);-- return (- <Panel key={param}>- <GridRow layout="two">- <Column>- <Heading>- <Text transform="capitalize">{param.replace(/^utm_/, '')}</Text>- </Heading>- <ListTable- metric={formatMessage(labels.views)}- data={items.map(({ name, value }) => ({- x: name,- y: value,- z: (value / total) * 100,- }))}- />- </Column>- <Column>- <PieChart type="doughnut" data={chartData} />- </Column>- </GridRow>- </Panel>- );- })}- </Column>- );-}diff --git a/src/app/api/reports/insights/route.ts b/src/app/api/reports/insights/route.tsindex b3569cba6..a49db1fa2 100644--- a/src/app/api/reports/insights/route.ts+++ b/src/app/api/reports/insights/route.ts@@ -1,41 +1,11 @@-import { z } from 'zod';import { canViewWebsite } from '@/lib/auth';import { unauthorized, json } from '@/lib/response';import { parseRequest } from '@/lib/request';import { getInsights } from '@/queries';-import { reportParms } from '@/lib/schema';--function convertFilters(filters: any[]) {- return filters.reduce((obj, filter) => {- obj[filter.name] = filter;-- return obj;- }, {});-}+import { reportResultSchema } from '@/lib/schema';export async function POST(request: Request) {- const schema = z.object({- ...reportParms,- fields: z- .array(- z.object({- name: z.string(),- type: z.string(),- label: z.string(),- }),- )- .min(1),- filters: z.array(- z.object({- name: z.string(),- type: z.string(),- operator: z.string(),- value: z.string(),- }),- ),- });-- const { auth, body, error } = await parseRequest(request, schema);+ const { auth, body, error } = await parseRequest(request, reportResultSchema);if (error) {return error();@@ -60,3 +30,11 @@ export async function POST(request: Request) {return json(data);}++function convertFilters(filters: any[]) {+ return filters.reduce((obj, filter) => {+ obj[filter.name] = filter;++ return obj;+ }, {});+}diff --git a/src/app/api/reports/retention/route.ts b/src/app/api/reports/retention/route.tsindex 83220bb4c..04842121b 100644--- a/src/app/api/reports/retention/route.ts+++ b/src/app/api/reports/retention/route.ts@@ -1,17 +1,11 @@-import { z } from 'zod';import { canViewWebsite } from '@/lib/auth';import { unauthorized, json } from '@/lib/response';import { parseRequest } from '@/lib/request';import { getRetention } from '@/queries';-import { reportParms, timezoneParam } from '@/lib/schema';+import { reportResultSchema } from '@/lib/schema';export async function POST(request: Request) {- const schema = z.object({- ...reportParms,- timezone: timezoneParam,- });-- const { auth, body, error } = await parseRequest(request, schema);+ const { auth, body, error } = await parseRequest(request, reportResultSchema);if (error) {return error();@@ -20,7 +14,6 @@ export async function POST(request: Request) {const {websiteId,dateRange: { startDate, endDate },- timezone,} = body;if (!(await canViewWebsite(auth, websiteId))) {@@ -30,7 +23,6 @@ export async function POST(request: Request) {const data = await getRetention(websiteId, {startDate: new Date(startDate),endDate: new Date(endDate),- timezone,});return json(data);diff --git a/src/app/api/reports/revenue/route.ts b/src/app/api/reports/revenue/route.tsindex 13a34f382..15d7a5fda 100644--- a/src/app/api/reports/revenue/route.ts+++ b/src/app/api/reports/revenue/route.ts@@ -1,40 +1,11 @@-import { z } from 'zod';import { canViewWebsite } from '@/lib/auth';import { unauthorized, json } from '@/lib/response';import { parseRequest } from '@/lib/request';-import { reportParms, timezoneParam } from '@/lib/schema';+import { reportResultSchema } from '@/lib/schema';import { getRevenue } from '@/queries/sql/reports/getRevenue';-import { getRevenueValues } from '@/queries/sql/reports/getRevenueValues';--export async function GET(request: Request) {- const { auth, query, error } = await parseRequest(request);-- if (error) {- return error();- }-- const { websiteId, startDate, endDate } = query;-- if (!(await canViewWebsite(auth, websiteId))) {- return unauthorized();- }-- const data = await getRevenueValues(websiteId, {- startDate: new Date(startDate),- endDate: new Date(endDate),- });-- return json(data);-}export async function POST(request: Request) {- const schema = z.object({- currency: z.string(),- ...reportParms,- timezone: timezoneParam,- });-- const { auth, body, error } = await parseRequest(request, schema);+ const { auth, body, error } = await parseRequest(request, reportResultSchema);if (error) {return error();@@ -43,7 +14,6 @@ export async function POST(request: Request) {const {websiteId,currency,- timezone,dateRange: { startDate, endDate, unit },} = body;@@ -55,7 +25,6 @@ export async function POST(request: Request) {startDate: new Date(startDate),endDate: new Date(endDate),unit,- timezone,currency,});diff --git a/src/app/api/reports/utm/route.ts b/src/app/api/reports/utm/route.tsindex 38e88a6de..36a434adc 100644--- a/src/app/api/reports/utm/route.ts+++ b/src/app/api/reports/utm/route.ts@@ -1,16 +1,11 @@-import { z } from 'zod';import { canViewWebsite } from '@/lib/auth';import { unauthorized, json } from '@/lib/response';import { parseRequest } from '@/lib/request';import { getUTM } from '@/queries';-import { reportParms } from '@/lib/schema';+import { reportResultSchema } from '@/lib/schema';export async function POST(request: Request) {- const schema = z.object({- ...reportParms,- });-- const { auth, body, error } = await parseRequest(request, schema);+ const { auth, body, error } = await parseRequest(request, reportResultSchema);if (error) {return error();@@ -18,7 +13,7 @@ export async function POST(request: Request) {const {websiteId,- dateRange: { startDate, endDate, timezone },+ dateRange: { startDate, endDate },} = body;if (!(await canViewWebsite(auth, websiteId))) {@@ -28,7 +23,6 @@ export async function POST(request: Request) {const data = await getUTM(websiteId, {startDate: new Date(startDate),endDate: new Date(endDate),- timezone,});return json(data);diff --git a/src/app/api/websites/[websiteId]/retention/route.ts b/src/app/api/websites/[websiteId]/retention/route.tsdeleted file mode 100644index 2f8bde18c..000000000--- a/src/app/api/websites/[websiteId]/retention/route.ts+++ /dev/null@@ -1,42 +0,0 @@-import { z } from 'zod';-import { canViewWebsite } from '@/lib/auth';-import { unauthorized, json } from '@/lib/response';-import { getRequestDateRange, parseRequest } from '@/lib/request';-import { getRetention } from '@/queries';-import { filterParams, timezoneParam, unitParam } from '@/lib/schema';--export async function GET(- request: Request,- { params }: { params: Promise<{ websiteId: string }> },-) {- const schema = z.object({- startAt: z.coerce.number().int(),- endAt: z.coerce.number().int(),- unit: unitParam,- timezone: timezoneParam,- ...filterParams,- });-- const { auth, query, error } = await parseRequest(request, schema);-- if (error) {- return error();- }-- const { websiteId } = await params;- const { timezone } = query;-- if (!(await canViewWebsite(auth, websiteId))) {- return unauthorized();- }-- const { startDate, endDate } = await getRequestDateRange(query);-- const data = await getRetention(websiteId, {- startDate,- endDate,- timezone,- });-- return json(data);-}diff --git a/src/app/api/websites/[websiteId]/revenue/route.ts b/src/app/api/websites/[websiteId]/revenue/route.tsdeleted file mode 100644index 11a6e5fc2..000000000--- a/src/app/api/websites/[websiteId]/revenue/route.ts+++ /dev/null@@ -1,67 +0,0 @@-import { z } from 'zod';-import { canViewWebsite } from '@/lib/auth';-import { unauthorized, json } from '@/lib/response';-import { getRequestDateRange, parseRequest } from '@/lib/request';-import { filterParams, unitParam, timezoneParam } from '@/lib/schema';-import { getRevenue } from '@/queries/sql/reports/getRevenue';-import { getRevenueValues } from '@/queries/sql/reports/getRevenueValues';--export async function __GET(request: Request) {- const { auth, query, error } = await parseRequest(request);-- if (error) {- return error();- }-- const { websiteId, startDate, endDate } = query;-- if (!(await canViewWebsite(auth, websiteId))) {- return unauthorized();- }-- const data = await getRevenueValues(websiteId, {- startDate: new Date(startDate),- endDate: new Date(endDate),- });-- return json(data);-}--export async function GET(- request: Request,- { params }: { params: Promise<{ websiteId: string }> },-) {- const schema = z.object({- currency: z.string(),- startAt: z.coerce.number().int(),- endAt: z.coerce.number().int(),- unit: unitParam,- timezone: timezoneParam,- ...filterParams,- });-- const { auth, query, error } = await parseRequest(request, schema);-- if (error) {- return error();- }-- const { websiteId } = await params;- const { currency, timezone, unit } = query;-- if (!(await canViewWebsite(auth, websiteId))) {- return unauthorized();- }-- const { startDate, endDate } = await getRequestDateRange(query);-- const data = await getRevenue(websiteId, {- startDate,- endDate,- unit,- timezone,- currency,- });-- return json(data);-}diff --git a/src/app/api/websites/[websiteId]/utm/route.ts b/src/app/api/websites/[websiteId]/utm/route.tsdeleted file mode 100644index 9cebb1444..000000000--- a/src/app/api/websites/[websiteId]/utm/route.ts+++ /dev/null@@ -1,42 +0,0 @@-import { z } from 'zod';-import { canViewWebsite } from '@/lib/auth';-import { unauthorized, json } from '@/lib/response';-import { getRequestDateRange, parseRequest } from '@/lib/request';-import { getUTM } from '@/queries';-import { filterParams, timezoneParam, unitParam } from '@/lib/schema';--export async function GET(- request: Request,- { params }: { params: Promise<{ websiteId: string }> },-) {- const schema = z.object({- startAt: z.coerce.number().int(),- endAt: z.coerce.number().int(),- unit: unitParam,- timezone: timezoneParam,- ...filterParams,- });-- const { auth, query, error } = await parseRequest(request, schema);-- if (error) {- return error();- }-- const { websiteId } = await params;- const { timezone } = query;-- if (!(await canViewWebsite(auth, websiteId))) {- return unauthorized();- }-- const { startDate, endDate } = await getRequestDateRange(query);-- const data = await getUTM(websiteId, {- startDate,- endDate,- timezone,- });-- return json(data);-}diff --git a/src/components/common/Empty.module.css b/src/components/common/Empty.module.cssdeleted file mode 100644index 3dccb68ed..000000000--- a/src/components/common/Empty.module.css+++ /dev/null@@ -1,12 +0,0 @@-.container {- color: var(--base500);- font-size: var(--font-size-md);- position: relative;- display: flex;- align-items: center;- justify-content: center;- text-align: center;- width: 100%;- height: 100%;- min-height: 70px;-}diff --git a/src/components/common/Empty.tsx b/src/components/common/Empty.tsxindex f1661e2d6..6d84b3e6d 100644--- a/src/components/common/Empty.tsx+++ b/src/components/common/Empty.tsx@@ -1,18 +1,16 @@-import classNames from 'classnames';+import { Row } from '@umami/react-zen';import { useMessages } from '@/components/hooks';-import styles from './Empty.module.css';export interface EmptyProps {message?: string;- className?: string;}-export function Empty({ message, className }: EmptyProps) {+export function Empty({ message }: EmptyProps) {const { formatMessage, messages } = useMessages();return (- <div className={classNames(styles.container, className)}>+ <Row color="muted" alignItems="center" justifyContent="center" width="100%" height="100%">{message || formatMessage(messages.noDataAvailable)}- </div>+ </Row>);}diff --git a/src/components/common/EmptyPlaceholder.tsx b/src/components/common/EmptyPlaceholder.tsxindex e13e02ca8..16f6cb902 100644--- a/src/components/common/EmptyPlaceholder.tsx+++ b/src/components/common/EmptyPlaceholder.tsx@@ -1,19 +1,28 @@import { ReactNode } from 'react';import { Icon, Text, Column } from '@umami/react-zen';-import { Logo } from '@/components/icons';export interface EmptyPlaceholderProps {- message?: string;+ title?: string;+ description?: string;icon?: ReactNode;children?: ReactNode;}-export function EmptyPlaceholder({ message, icon, children }: EmptyPlaceholderProps) {+export function EmptyPlaceholder({ title, description, icon, children }: EmptyPlaceholderProps) {return (<Column alignItems="center" justifyContent="center" gap="5" height="100%" width="100%">- <Icon size="xl">{icon || <Logo />}</Icon>- <Text>{message}</Text>- <div>{children}</div>+ {icon && (+ <Icon color="10" size="xl">+ {icon}+ </Icon>+ )}+ {title && (+ <Text weight="bold" size="4">+ {title}+ </Text>+ )}+ {description && <Text color="muted">{description}</Text>}+ {children}</Column>);}diff --git a/src/components/common/FilterEditForm.tsx b/src/components/common/FilterEditForm.tsxindex c15e6ff06..a8b5d0637 100644--- a/src/components/common/FilterEditForm.tsx+++ b/src/components/common/FilterEditForm.tsx@@ -1,7 +1,8 @@import { useState, Key } from 'react';-import { Grid, Row, Column, Label, List, ListItem, Button, Heading, Text } from '@umami/react-zen';+import { Grid, Row, Column, Label, List, ListItem, Button, Heading } from '@umami/react-zen';import { useFilters, useMessages } from '@/components/hooks';import { FilterRecord } from '@/components/common/FilterRecord';+import { Empty } from '@/components/common/Empty';export interface FilterEditFormProps {websiteId?: string;@@ -11,7 +12,7 @@ export interface FilterEditFormProps {}export function FilterEditForm({ data = [], onChange, onClose }: FilterEditFormProps) {- const { formatMessage, labels } = useMessages();+ const { formatMessage, labels, messages } = useMessages();const [filters, setFilters] = useState(data);const { fields } = useFilters();@@ -72,7 +73,7 @@ export function FilterEditForm({ data = [], onChange, onClose }: FilterEditFormP/>);})}- {!filters.length && <Text align="center">{formatMessage(labels.none)}</Text>}+ {!filters.length && <Empty message={formatMessage(messages.nothingSelected)} />}</Column><Row alignItems="center" justifyContent="flex-end" gridColumn="span 2" gap><Button onPress={onClose}>{formatMessage(labels.cancel)}</Button>diff --git a/src/components/common/LoadingPanel.module.css b/src/components/common/LoadingPanel.module.cssdeleted file mode 100644index 00d6cbb4f..000000000--- a/src/components/common/LoadingPanel.module.css+++ /dev/null@@ -1,16 +0,0 @@-.panel {- display: flex;- flex-direction: column;- position: relative;- flex: 1;- height: 100%;-}--.loading {- position: absolute;- top: 0;- left: 0;- right: 0;- bottom: 0;- margin: auto;-}diff --git a/src/components/common/LoadingPanel.tsx b/src/components/common/LoadingPanel.tsxindex dfb2dabfb..4f5be375c 100644--- a/src/components/common/LoadingPanel.tsx+++ b/src/components/common/LoadingPanel.tsx@@ -1,9 +1,7 @@import { ReactNode } from 'react';-import classNames from 'classnames';-import { Spinner, Dots } from '@umami/react-zen';+import { Spinner, Dots, Column, type ColumnProps } from '@umami/react-zen';import { ErrorMessage } from '@/components/common/ErrorMessage';import { Empty } from '@/components/common/Empty';-import styles from './LoadingPanel.module.css';export function LoadingPanel({error,@@ -12,25 +10,23 @@ export function LoadingPanel({isLoading,loadingIcon = 'dots',renderEmpty = () => <Empty />,- className,children,+ ...props}: {- data?: any;error?: Error;isEmpty?: boolean;isFetched?: boolean;isLoading?: boolean;loadingIcon?: 'dots' | 'spinner';renderEmpty?: () => ReactNode;- className?: string;children: ReactNode;-}) {+} & ColumnProps) {return (- <div className={classNames(styles.panel, className)}>+ <Column {...props}>{isLoading && !isFetched && (loadingIcon === 'dots' ? <Dots /> : <Spinner />)}{error && <ErrorMessage />}{!error && !isLoading && isEmpty && renderEmpty()}{!error && !isLoading && !isEmpty && children}- </div>+ </Column>);}diff --git a/src/components/common/PageBody.tsx b/src/components/common/PageBody.tsxindex 3ccb6058a..638ff610f 100644--- a/src/components/common/PageBody.tsx+++ b/src/components/common/PageBody.tsx@@ -4,7 +4,7 @@ import { AlertBanner, Loading, Column } from '@umami/react-zen';import { useMessages } from '@/components/hooks';export function PageBody({- maxWidth = '1600px',+ maxWidth = '1320px',error,isLoading,children,diff --git a/src/components/common/PageHeader.tsx b/src/components/common/PageHeader.tsxindex 83f9ff7f2..26cf3c542 100644--- a/src/components/common/PageHeader.tsx+++ b/src/components/common/PageHeader.tsx@@ -5,11 +5,13 @@ export function PageHeader({title,description,icon,+ showBorder = true,children,}: {title: string;description?: string;icon?: ReactNode;+ showBorder?: boolean;allowEdit?: boolean;className?: string;children?: ReactNode;@@ -19,7 +21,7 @@ export function PageHeader({justifyContent="space-between"alignItems="center"paddingY="6"- border="bottom"+ border={showBorder ? 'bottom' : undefined}width="100%"><Row alignItems="center" gap="3">diff --git a/src/components/hooks/index.ts b/src/components/hooks/index.tsindex 72d20ccdd..b815a28e4 100644--- a/src/components/hooks/index.ts+++ b/src/components/hooks/index.ts@@ -3,14 +3,11 @@ export * from './queries/useActiveUsersQuery';export * from './queries/useEventDataEventsQuery';export * from './queries/useEventDataPropertiesQuery';export * from './queries/useEventDataValuesQuery';-export * from './queries/useGoalsQuery';export * from './queries/useLoginQuery';export * from './queries/useRealtimeQuery';export * from './queries/useResultQuery';export * from './queries/useReportQuery';export * from './queries/useReportsQuery';-export * from './queries/useRetentionQuery';-export * from './queries/useRevenueQuery';export * from './queries/useSessionActivityQuery';export * from './queries/useSessionDataQuery';export * from './queries/useSessionDataPropertiesQuery';diff --git a/src/components/hooks/queries/useGoalQuery.ts b/src/components/hooks/queries/useGoalQuery.tsdeleted file mode 100644index 5a65b9861..000000000--- a/src/components/hooks/queries/useGoalQuery.ts+++ /dev/null@@ -1,18 +0,0 @@-import { useApi } from '../useApi';-import { usePagedQuery } from '../usePagedQuery';--export function useGoalQuery(- { websiteId, reportId }: { websiteId: string; reportId: string },- params?: { [key: string]: string | number },-) {- const { post } = useApi();-- return usePagedQuery({- queryKey: ['goal', { websiteId, reportId, ...params }],- queryFn: () => {- return post(`/reports/goals`, {- ...params,- });- },- });-}diff --git a/src/components/hooks/queries/useGoalsQuery.ts b/src/components/hooks/queries/useGoalsQuery.tsdeleted file mode 100644index 307353da1..000000000--- a/src/components/hooks/queries/useGoalsQuery.ts+++ /dev/null@@ -1,20 +0,0 @@-import { useApi } from '../useApi';-import { usePagedQuery } from '../usePagedQuery';-import { useModified } from '../useModified';--export function useGoalsQuery(- { websiteId }: { websiteId: string },- params?: { [key: string]: string | number },-) {- const { get } = useApi();- const { modified } = useModified(`goals`);-- return usePagedQuery({- queryKey: ['goals', { websiteId, modified, ...params }],- queryFn: () => {- return get(`/websites/${websiteId}/goals`, {- ...params,- });- },- });-}diff --git a/src/components/hooks/queries/useRetentionQuery.ts b/src/components/hooks/queries/useRetentionQuery.tsdeleted file mode 100644index eadd80202..000000000--- a/src/components/hooks/queries/useRetentionQuery.ts+++ /dev/null@@ -1,20 +0,0 @@-import { useApi } from '../useApi';-import { useFilterParams } from '../useFilterParams';-import { UseQueryOptions } from '@tanstack/react-query';--export function useRetentionQuery(- websiteId: string,- queryParams?: { type: string; limit?: number; search?: string; startAt?: number; endAt?: number },- options?: Omit<UseQueryOptions & { onDataLoad?: (data: any) => void }, 'queryKey' | 'queryFn'>,-) {- const { get, useQuery } = useApi();- const filterParams = useFilterParams(websiteId);-- return useQuery({- queryKey: ['retention', websiteId, { ...filterParams, ...queryParams }],- queryFn: () =>- get(`/websites/${websiteId}/retention`, { websiteId, ...filterParams, ...queryParams }),- enabled: !!websiteId,- ...options,- });-}diff --git a/src/components/hooks/queries/useRevenueQuery.ts b/src/components/hooks/queries/useRevenueQuery.tsdeleted file mode 100644index 34f59f9d2..000000000--- a/src/components/hooks/queries/useRevenueQuery.ts+++ /dev/null@@ -1,39 +0,0 @@-import { useApi } from '../useApi';-import { useFilterParams } from '../useFilterParams';-import { UseQueryOptions } from '@tanstack/react-query';--export interface RevenueData {- chart: any[];- country: any[];- total: {- sum: number;- count: number;- unique_count: number;- };- table: any[];-}--export function useRevenueQuery(- websiteId: string,- queryParams?: { type: string; limit?: number; search?: string; startAt?: number; endAt?: number },- options?: Omit<- UseQueryOptions<RevenueData, Error, RevenueData, any[]> & { onDataLoad?: (data: any) => void },- 'queryKey' | 'queryFn'- >,-) {- const { get, useQuery } = useApi();- const filterParams = useFilterParams(websiteId);- const currency = 'USD';-- return useQuery<RevenueData, Error, RevenueData, any[]>({- queryKey: ['revenue', websiteId, { ...filterParams, ...queryParams }],- queryFn: () =>- get(`/websites/${websiteId}/revenue`, {- currency,- ...filterParams,- ...queryParams,- }),- enabled: !!websiteId,- ...options,- });-}diff --git a/src/components/hooks/queries/useRevenueValuesQuery.ts b/src/components/hooks/queries/useRevenueValuesQuery.tsdeleted file mode 100644index cd29dbbce..000000000--- a/src/components/hooks/queries/useRevenueValuesQuery.ts+++ /dev/null@@ -1,16 +0,0 @@-import { useApi } from '../useApi';--export function useRevenueValuesQuery(websiteId: string, startDate: Date, endDate: Date) {- const { get, useQuery } = useApi();-- return useQuery({- queryKey: ['revenue:values', { websiteId, startDate, endDate }],- queryFn: () =>- get(`/reports/revenue`, {- websiteId,- startDate,- endDate,- }),- enabled: !!(websiteId && startDate && endDate),- });-}diff --git a/src/components/icons.ts b/src/components/icons.tsindex 883ad681e..7d6f4a4c5 100644--- a/src/components/icons.ts+++ b/src/components/icons.ts@@ -2,6 +2,7 @@ export {AlertTriangle as Alert,ArrowRight as Arrow,Calendar,+ ChartPie,ChevronRight as Chevron,Clock,X as Close,diff --git a/src/components/messages.ts b/src/components/messages.tsindex d5d7063ee..2b1b2d7cd 100644--- a/src/components/messages.ts+++ b/src/components/messages.ts@@ -132,6 +132,7 @@ export const labels = defineMessages({selectWebsite: { id: 'label.select-website', defaultMessage: 'Select website' },selectRole: { id: 'label.select-role', defaultMessage: 'Select role' },selectDate: { id: 'label.select-date', defaultMessage: 'Select date' },+ selectFilter: { id: 'label.select-filter', defaultMessage: 'Select filter' },all: { id: 'label.all', defaultMessage: 'All' },session: { id: 'label.session', defaultMessage: 'Session' },sessions: { id: 'label.sessions', defaultMessage: 'Sessions' },@@ -331,6 +332,7 @@ export const messages = defineMessages({noUsers: { id: 'message.no-users', defaultMessage: 'There are no users.' },userDeleted: { id: 'message.user-deleted', defaultMessage: 'User deleted.' },noDataAvailable: { id: 'message.no-data-available', defaultMessage: 'No data available.' },+ nothingSelected: { id: 'message.nothing-selected', defaultMessage: 'Nothing selected.' },confirmReset: {id: 'message.confirm-reset',defaultMessage: 'Are you sure you want to reset {target}?',diff --git a/src/lib/constants.ts b/src/lib/constants.tsindex f3513a5ce..f5a109ec1 100644--- a/src/lib/constants.ts+++ b/src/lib/constants.ts@@ -654,3 +654,56 @@ export const ISO_COUNTRIES = {ZWE: 'ZW',XKX: 'XK',};++export const CURRENCIES = [+ { id: 'USD', name: 'US Dollar' },+ { id: 'EUR', name: 'Euro' },+ { id: 'GBP', name: 'British Pound' },+ { id: 'JPY', name: 'Japanese Yen' },+ { id: 'CNY', name: 'Chinese Renminbi (Yuan)' },+ { id: 'CAD', name: 'Canadian Dollar' },+ { id: 'HKD', name: 'Hong Kong Dollar' },+ { id: 'AUD', name: 'Australian Dollar' },+ { id: 'SGD', name: 'Singapore Dollar' },+ { id: 'CHF', name: 'Swiss Franc' },+ { id: 'SEK', name: 'Swedish Krona' },+ { id: 'PLN', name: 'Polish Złoty' },+ { id: 'NOK', name: 'Norwegian Krone' },+ { id: 'DKK', name: 'Danish Krone' },+ { id: 'NZD', name: 'New Zealand Dollar' },+ { id: 'ZAR', name: 'South African Rand' },+ { id: 'MXN', name: 'Mexican Peso' },+ { id: 'THB', name: 'Thai Baht' },+ { id: 'HUF', name: 'Hungarian Forint' },+ { id: 'MYR', name: 'Malaysian Ringgit' },+ { id: 'INR', name: 'Indian Rupee' },+ { id: 'KRW', name: 'South Korean Won' },+ { id: 'BRL', name: 'Brazilian Real' },+ { id: 'TRY', name: 'Turkish Lira' },+ { id: 'CZK', name: 'Czech Koruna' },+ { id: 'ILS', name: 'Israeli New Shekel' },+ { id: 'RUB', name: 'Russian Ruble' },+ { id: 'AED', name: 'United Arab Emirates Dirham' },+ { id: 'IDR', name: 'Indonesian Rupiah' },+ { id: 'PHP', name: 'Philippine Peso' },+ { id: 'RON', name: 'Romanian Leu' },+ { id: 'COP', name: 'Colombian Peso' },+ { id: 'SAR', name: 'Saudi Riyal' },+ { id: 'ARS', name: 'Argentine Peso' },+ { id: 'VND', name: 'Vietnamese Dong' },+ { id: 'CLP', name: 'Chilean Peso' },+ { id: 'EGP', name: 'Egyptian Pound' },+ { id: 'KWD', name: 'Kuwaiti Dinar' },+ { id: 'PKR', name: 'Pakistani Rupee' },+ { id: 'QAR', name: 'Qatari Riyal' },+ { id: 'BHD', name: 'Bahraini Dinar' },+ { id: 'UAH', name: 'Ukrainian Hryvnia' },+ { id: 'PEN', name: 'Peruvian Sol' },+ { id: 'BDT', name: 'Bangladeshi Taka' },+ { id: 'MAD', name: 'Moroccan Dirham' },+ { id: 'KES', name: 'Kenyan Shilling' },+ { id: 'NGN', name: 'Nigerian Naira' },+ { id: 'TND', name: 'Tunisian Dinar' },+ { id: 'OMR', name: 'Omani Rial' },+ { id: 'GHS', name: 'Ghanaian Cedi' },+];diff --git a/src/lib/schema.ts b/src/lib/schema.tsindex c07efe16e..8361acc85 100644--- a/src/lib/schema.ts+++ b/src/lib/schema.ts@@ -119,6 +119,26 @@ export const journeyReportSchema = z.object({}),});+export const retentionReportSchema = z.object({+ type: z.literal('retention'),+});++export const utmReportSchema = z.object({+ type: z.literal('utm'),+});++export const revenueReportSchema = z.object({+ type: z.literal('revenue'),+});++export const attributionReportSchema = z.object({+ type: z.literal('attribution'),+});++export const insightsReportSchema = z.object({+ type: z.literal('insights'),+});+export const reportBaseSchema = z.object({websiteId: z.string().uuid(),type: reportTypeParam,@@ -130,6 +150,11 @@ export const reportTypeSchema = z.discriminatedUnion('type', [goalReportSchema,funnelReportSchema,journeyReportSchema,+ retentionReportSchema,+ utmReportSchema,+ revenueReportSchema,+ attributionReportSchema,+ insightsReportSchema,]);export const reportSchema = z.intersection(reportBaseSchema, reportTypeSchema);diff --git a/src/queries/sql/reports/getRetention.ts b/src/queries/sql/reports/getRetention.tsindex 23854b607..61d6fc777 100644--- a/src/queries/sql/reports/getRetention.ts+++ b/src/queries/sql/reports/getRetention.ts@@ -2,16 +2,12 @@ import clickhouse from '@/lib/clickhouse';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';-export async function getRetention(- ...args: [- websiteId: string,- filters: {- startDate: Date;- endDate: Date;- timezone?: string;- },- ]-) {+export interface RetentionCriteria {+ startDate: Date;+ endDate: Date;+}++export async function getRetention(...args: [websiteId: string, criteria: RetentionCriteria]) {return runQuery({[PRISMA]: () => relationalQuery(...args),[CLICKHOUSE]: () => clickhouseQuery(...args),@@ -20,11 +16,7 @@ export async function getRetention(async function relationalQuery(websiteId: string,- filters: {- startDate: Date;- endDate: Date;- timezone?: string;- },+ criteria: RetentionCriteria,): Promise<{date: string;@@ -34,7 +26,7 @@ async function relationalQuery(percentage: number;}[]> {- const { startDate, endDate, timezone = 'UTC' } = filters;+ const { startDate, endDate } = criteria;const { getDateSQL, getDayDiffQuery, getCastColumnQuery, rawQuery } = prisma;const unit = 'day';@@ -42,7 +34,7 @@ async function relationalQuery(`WITH cohort_items AS (select session_id,- ${getDateSQL('created_at', unit, timezone)} as cohort_date+ ${getDateSQL('created_at', unit)} as cohort_datefrom sessionwhere website_id = {{websiteId::uuid}}and created_at between {{startDate}} and {{endDate}}@@ -50,7 +42,7 @@ async function relationalQuery(user_activities AS (select distinctw.session_id,- ${getDayDiffQuery(getDateSQL('created_at', unit, timezone), 'c.cohort_date')} as day_number+ ${getDayDiffQuery(getDateSQL('created_at', unit), 'c.cohort_date')} as day_numberfrom website_event wjoin cohort_items con w.session_id = c.session_id@@ -95,11 +87,7 @@ async function relationalQuery(async function clickhouseQuery(websiteId: string,- filters: {- startDate: Date;- endDate: Date;- timezone?: string;- },+ criteria: RetentionCriteria,): Promise<{date: string;@@ -109,7 +97,7 @@ async function clickhouseQuery(percentage: number;}[]> {- const { startDate, endDate, timezone = 'UTC' } = filters;+ const { startDate, endDate } = criteria;const { getDateSQL, rawQuery } = clickhouse;const unit = 'day';@@ -117,7 +105,7 @@ async function clickhouseQuery(`WITH cohort_items AS (select- min(${getDateSQL('created_at', unit, timezone)}) as cohort_date,+ min(${getDateSQL('created_at', unit)}) as cohort_date,session_idfrom website_eventwhere website_id = {websiteId:UUID}@@ -127,7 +115,7 @@ async function clickhouseQuery(user_activities AS (select distinctw.session_id,- (${getDateSQL('created_at', unit, timezone)} - c.cohort_date) / 86400 as day_number+ (${getDateSQL('created_at', unit)} - c.cohort_date) / 86400 as day_numberfrom website_event wjoin cohort_items con w.session_id = c.session_iddiff --git a/src/queries/sql/reports/getRevenue.ts b/src/queries/sql/reports/getRevenue.tsindex f1fb1d73b..a7062f47a 100644--- a/src/queries/sql/reports/getRevenue.ts+++ b/src/queries/sql/reports/getRevenue.ts@@ -2,18 +2,14 @@ import clickhouse from '@/lib/clickhouse';import { CLICKHOUSE, getDatabaseType, POSTGRESQL, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';-export async function getRevenue(- ...args: [- websiteId: string,- criteria: {- startDate: Date;- endDate: Date;- unit: string;- timezone: string;- currency: string;- },- ]-) {+export interface RevenueCriteria {+ startDate: Date;+ endDate: Date;+ unit: string;+ currency: string;+}++export async function getRevenue(...args: [websiteId: string, criteria: RevenueCriteria]) {return runQuery({[PRISMA]: () => relationalQuery(...args),[CLICKHOUSE]: () => clickhouseQuery(...args),@@ -22,13 +18,7 @@ export async function getRevenue(async function relationalQuery(websiteId: string,- criteria: {- startDate: Date;- endDate: Date;- unit: string;- timezone: string;- currency: string;- },+ criteria: RevenueCriteria,): Promise<{chart: { x: string; t: string; y: number }[];country: { name: string; value: number }[];@@ -40,7 +30,7 @@ async function relationalQuery(unique_count: number;}[];}> {- const { startDate, endDate, timezone = 'UTC', unit = 'day', currency } = criteria;+ const { startDate, endDate, unit = 'day', currency } = criteria;const { getDateSQL, rawQuery } = prisma;const db = getDatabaseType();const like = db === POSTGRESQL ? 'ilike' : 'like';@@ -49,7 +39,7 @@ async function relationalQuery(`selectwe.event_name x,- ${getDateSQL('ed.created_at', unit, timezone)} t,+ ${getDateSQL('ed.created_at', unit)} t,sum(coalesce(cast(number_value as decimal(10,2)), cast(string_value as decimal(10,2)))) yfrom event_data edjoin website_event we@@ -67,7 +57,7 @@ async function relationalQuery(group by x, torder by t`,- { websiteId, startDate, endDate, unit, timezone, currency },+ { websiteId, startDate, endDate, unit, currency },);const countryRes = await rawQuery(@@ -140,7 +130,7 @@ async function relationalQuery(group by c.currencyorder by sum desc;`,- { websiteId, startDate, endDate, unit, timezone, currency },+ { websiteId, startDate, endDate, unit, currency },);return { chart: chartRes, country: countryRes, total: totalRes, table: tableRes };@@ -148,13 +138,7 @@ async function relationalQuery(async function clickhouseQuery(websiteId: string,- criteria: {- startDate: Date;- endDate: Date;- unit: string;- timezone: string;- currency: string;- },+ criteria: RevenueCriteria,): Promise<{chart: { x: string; t: string; y: number }[];country: { name: string; value: number }[];@@ -166,7 +150,7 @@ async function clickhouseQuery(unique_count: number;}[];}> {- const { startDate, endDate, timezone = 'UTC', unit = 'day', currency } = criteria;+ const { startDate, endDate, unit = 'day', currency } = criteria;const { getDateSQL, rawQuery } = clickhouse;const chartRes = await rawQuery<@@ -179,7 +163,7 @@ async function clickhouseQuery(`selectevent_name x,- ${getDateSQL('created_at', unit, timezone)} t,+ ${getDateSQL('created_at', unit)} t,sum(coalesce(toDecimal64(number_value, 2), toDecimal64(string_value, 2))) yfrom event_datajoin (select event_id@@ -195,7 +179,7 @@ async function clickhouseQuery(group by x, torder by t`,- { websiteId, startDate, endDate, unit, timezone, currency },+ { websiteId, startDate, endDate, unit, currency },);const countryRes = await rawQuery<@@ -283,7 +267,7 @@ async function clickhouseQuery(group by c.currencyorder by sum desc;`,- { websiteId, startDate, endDate, unit, timezone, currency },+ { websiteId, startDate, endDate, unit, currency },);return { chart: chartRes, country: countryRes, total: totalRes, table: tableRes };diff --git a/src/queries/sql/reports/getRevenueValues.ts b/src/queries/sql/reports/getRevenueValues.tsdeleted file mode 100644index a46bf0bfd..000000000--- a/src/queries/sql/reports/getRevenueValues.ts+++ /dev/null@@ -1,75 +0,0 @@-import prisma from '@/lib/prisma';-import clickhouse from '@/lib/clickhouse';-import { runQuery, CLICKHOUSE, PRISMA, getDatabaseType, POSTGRESQL } from '@/lib/db';--export async function getRevenueValues(- ...args: [- websiteId: string,- criteria: {- startDate: Date;- endDate: Date;- },- ]-) {- return runQuery({- [PRISMA]: () => relationalQuery(...args),- [CLICKHOUSE]: () => clickhouseQuery(...args),- });-}--async function relationalQuery(- websiteId: string,- criteria: {- startDate: Date;- endDate: Date;- },-) {- const { rawQuery } = prisma;- const { startDate, endDate } = criteria;-- const db = getDatabaseType();- const like = db === POSTGRESQL ? 'ilike' : 'like';-- return rawQuery(- `- select distinct string_value as currency- from event_data- where website_id = {{websiteId::uuid}}- and created_at between {{startDate}} and {{endDate}}- and data_key ${like} '%currency%'- order by currency- `,- {- websiteId,- startDate,- endDate,- },- );-}--async function clickhouseQuery(- websiteId: string,- criteria: {- startDate: Date;- endDate: Date;- },-) {- const { rawQuery } = clickhouse;- const { startDate, endDate } = criteria;-- return rawQuery(- `- select distinct string_value as currency- from event_data- where website_id = {websiteId:UUID}- and created_at between {startDate:DateTime64} and {endDate:DateTime64}- and positionCaseInsensitive(data_key, 'currency') > 0- order by currency- `,- {- websiteId,- startDate,- endDate,- },- );-}diff --git a/src/queries/sql/reports/getUTM.ts b/src/queries/sql/reports/getUTM.tsindex 5463815bb..134e14b36 100644--- a/src/queries/sql/reports/getUTM.ts+++ b/src/queries/sql/reports/getUTM.ts@@ -2,31 +2,20 @@ import clickhouse from '@/lib/clickhouse';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';-export async function getUTM(- ...args: [- websiteId: string,- filters: {- startDate: Date;- endDate: Date;- timezone?: string;- },- ]-) {+export interface UTMCriteria {+ startDate: Date;+ endDate: Date;+}++export async function getUTM(...args: [websiteId: string, criteria: UTMCriteria]) {return runQuery({[PRISMA]: () => relationalQuery(...args),[CLICKHOUSE]: () => clickhouseQuery(...args),});}-async function relationalQuery(- websiteId: string,- filters: {- startDate: Date;- endDate: Date;- timezone?: string;- },-) {- const { startDate, endDate } = filters;+async function relationalQuery(websiteId: string, criteria: UTMCriteria) {+ const { startDate, endDate } = criteria;const { rawQuery } = prisma;return rawQuery(@@ -47,15 +36,8 @@ async function relationalQuery().then(result => parseParameters(result as any[]));}-async function clickhouseQuery(- websiteId: string,- filters: {- startDate: Date;- endDate: Date;- timezone?: string;- },-) {- const { startDate, endDate } = filters;+async function clickhouseQuery(websiteId: string, criteria: UTMCriteria) {+ const { startDate, endDate } = criteria;const { rawQuery } = clickhouse;return rawQuery(