From b7e1d902f42ee17782c748c9c0b558e0557745ee Mon Sep 17 00:00:00 2001 From: Francis Cao Date: Tue, 12 May 2026 16:44:12 -0700 Subject: [PATCH] seperate revenue queries for better api/performance. Fix realtime css/ui issues. --- .../[websiteId]/(reports)/revenue/Revenue.tsx | 233 ++++--------- .../(reports)/revenue}/RevenueChart.tsx | 0 .../(reports)/revenue/RevenueMetricsBar.tsx | 88 +++++ .../(reports)/revenue/RevenueMetricsTable.tsx | 73 +++++ .../revenue/RevenueSessionsDataTable.tsx | 28 ++ .../[websiteId]/realtime/RealtimeHeader.tsx | 11 +- .../[websiteId]/realtime/RealtimeLog.tsx | 34 +- src/app/api/reports/revenue/route.ts | 55 +++- .../[websiteId]/revenue/chart/route.ts | 37 +++ .../[websiteId]/revenue/metrics/route.ts | 48 +++ .../[websiteId]/revenue/stats/route.ts | 44 +++ src/components/hooks/index.ts | 3 + .../hooks/queries/useRevenueChartQuery.ts | 46 +++ .../hooks/queries/useRevenueMetricsQuery.ts | 46 +++ .../hooks/queries/useRevenueStatsQuery.ts | 51 +++ .../{getRevenue.ts => getRevenueChart.ts} | 2 +- src/queries/sql/reports/getRevenueMetrics.ts | 309 +++++++++--------- src/queries/sql/reports/getRevenueStats.ts | 2 +- 18 files changed, 755 insertions(+), 355 deletions(-) rename src/{components/metrics => app/(main)/websites/[websiteId]/(reports)/revenue}/RevenueChart.tsx (100%) create mode 100644 src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenueMetricsBar.tsx create mode 100644 src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenueMetricsTable.tsx create mode 100644 src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenueSessionsDataTable.tsx create mode 100644 src/app/api/websites/[websiteId]/revenue/chart/route.ts create mode 100644 src/app/api/websites/[websiteId]/revenue/metrics/route.ts create mode 100644 src/app/api/websites/[websiteId]/revenue/stats/route.ts create mode 100644 src/components/hooks/queries/useRevenueChartQuery.ts create mode 100644 src/components/hooks/queries/useRevenueMetricsQuery.ts create mode 100644 src/components/hooks/queries/useRevenueStatsQuery.ts rename src/queries/sql/reports/{getRevenue.ts => getRevenueChart.ts} (98%) diff --git a/src/app/(main)/websites/[websiteId]/(reports)/revenue/Revenue.tsx b/src/app/(main)/websites/[websiteId]/(reports)/revenue/Revenue.tsx index e8892ad74..13dd2e5d4 100644 --- a/src/app/(main)/websites/[websiteId]/(reports)/revenue/Revenue.tsx +++ b/src/app/(main)/websites/[websiteId]/(reports)/revenue/Revenue.tsx @@ -1,6 +1,5 @@ import { Column, Grid, Heading, ListItem, Row, Select, Tab, TabList, TabPanel, Tabs } from '@umami/react-zen'; import { useMemo, useState } from 'react'; -import { DataGrid } from '@/components/common/DataGrid'; import { GridRow } from '@/components/common/GridRow'; import { LoadingPanel } from '@/components/common/LoadingPanel'; import { Panel } from '@/components/common/Panel'; @@ -8,43 +7,21 @@ import { useDateRange, useMessages, useNavigation, - useResultQuery, - useRevenueSessionsQuery, + useRevenueChartQuery, + useRevenueStatsQuery, } from '@/components/hooks'; import { CurrencySelect } from '@/components/input/CurrencySelect'; -import { ListTable } from '@/components/metrics/ListTable'; -import { MetricCard } from '@/components/metrics/MetricCard'; -import { MetricLabel } from '@/components/metrics/MetricLabel'; -import { MetricsBar } from '@/components/metrics/MetricsBar'; -import { RevenueChart } from '@/components/metrics/RevenueChart'; import { CURRENCY_CONFIG, DEFAULT_CURRENCY } from '@/lib/constants'; -import { formatLongCurrency, formatLongNumber } from '@/lib/format'; import { getItem, setItem } from '@/lib/storage'; import { SessionModal } from '../../sessions/SessionModal'; -import { SessionsTable } from '../../sessions/SessionsTable'; +import { RevenueChart } from './RevenueChart'; +import { RevenueMetricsBar } from './RevenueMetricsBar'; +import { RevenueMetricsTable } from './RevenueMetricsTable'; +import { RevenueSessionsDataTable } from './RevenueSessionsDataTable'; -function RevenueSessionsDataTable({ - websiteId, - currency, -}: { - websiteId: string; - currency: string; -}) { - const { updateParams } = useNavigation(); - const queryResult = useRevenueSessionsQuery(websiteId, currency); - - return ( - - {({ data }) => ( - updateParams({ session: row.id })} - /> - )} - - ); -} +type RevenueChartMode = 'period' | 'cumulative'; +type SourceTab = 'referrer' | 'channel'; +type LocationTab = 'country' | 'region'; export interface RevenueProps { websiteId: string; @@ -53,9 +30,9 @@ export interface RevenueProps { unit: string; } -type RevenueChartMode = 'period' | 'cumulative'; - export function Revenue({ websiteId, startDate, endDate, unit }: RevenueProps) { + const [sourceTab, setSourceTab] = useState('referrer'); + const [locationTab, setLocationTab] = useState('country'); const [currency, setCurrency] = useState( getItem(CURRENCY_CONFIG) || process.env.defaultCurrency || DEFAULT_CURRENCY, ); @@ -77,100 +54,29 @@ export function Revenue({ websiteId, startDate, endDate, unit }: RevenueProps) { }; const { t, labels } = useMessages(); - const { compare, isAllTime } = useDateRange(); - const { data, error, isLoading } = useResultQuery('revenue', { - websiteId, - startDate, - endDate, - currency, - compare, - }); - - const metrics = useMemo(() => { - if (!data) return []; - - const { sum, count, average, unique_count, arpu, comparison } = data.total; - - return [ - { - value: sum, - label: t(labels.total), - change: comparison ? sum - comparison.sum : 0, - formatValue: (n: number) => formatLongCurrency(n, currency), - }, - { - value: average, - label: t(labels.aov), - tooltip: ( - <> -
Average Order Value
-
(Total Revenue / Orders)
- - ), - change: comparison ? average - comparison.average : 0, - formatValue: (n: number) => formatLongCurrency(n, currency), - }, - { - value: arpu, - label: t(labels.arpu), - tooltip: ( - <> -
Average Revenue Per User
-
(Total Revenue / All Sessions)
- - ), - change: comparison ? arpu - (comparison.arpu ?? 0) : 0, - formatValue: (n: number) => formatLongCurrency(n, currency), - }, - { - value: count, - label: t(labels.orders), - change: comparison ? count - comparison.count : 0, - formatValue: formatLongNumber, - }, - { - value: unique_count, - label: t(labels.uniqueCustomers), - change: comparison ? unique_count - comparison.unique_count : 0, - formatValue: formatLongNumber, - }, - ] as any; - }, [ - data, - currency, - t, - labels.total, - labels.aov, - labels.arpu, - labels.orders, - labels.uniqueCustomers, - ]); - - const renderLabel = (type: string) => (data: any) => ; + const { compare } = useDateRange(); + const chartQuery = useRevenueChartQuery(websiteId, currency); + const statsQuery = useRevenueStatsQuery({ websiteId, currency, compare }); + const data = useMemo( + () => + chartQuery.data && statsQuery.data + ? { chart: chartQuery.data.chart, total: statsQuery.data } + : null, + [chartQuery.data, statsQuery.data], + ); + const error = chartQuery.error || statsQuery.error; + const isFetching = chartQuery.isFetching || statsQuery.isFetching; + const isLoading = chartQuery.isLoading || statsQuery.isLoading; return ( - + {data && ( - - {metrics?.map(({ label, value, change, formatValue, tooltip }) => { - return ( - - ); - })} - +