OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.
fix: metric chart total count
Carl-Gerhard Lindesvärd84fd5ce22fd0
diff --git a/apps/start/src/components/charts/chart-tooltip.tsx b/apps/start/src/components/charts/chart-tooltip.tsxindex 70e0a3c75..b9e12da52 100644--- a/apps/start/src/components/charts/chart-tooltip.tsx+++ b/apps/start/src/components/charts/chart-tooltip.tsx@@ -2,6 +2,34 @@ import { createContext, useContext as useBaseContext } from 'react';import { Tooltip as RechartsTooltip, type TooltipProps } from 'recharts';+export const ChartTooltipContainer = ({+ children,+}: { children: React.ReactNode }) => {+ return (+ <div className="min-w-[180px] col gap-2 rounded-xl border bg-background/80 p-3 shadow-xl backdrop-blur-sm">+ {children}+ </div>+ );+};++export const ChartTooltipHeader = ({+ children,+}: { children: React.ReactNode }) => {+ return <div className="flex justify-between gap-8">{children}</div>;+};++export const ChartTooltipItem = ({+ children,+ color,+}: { children: React.ReactNode; color: string }) => {+ return (+ <div className="flex gap-2">+ <div className="w-[3px] rounded-full" style={{ background: color }} />+ <div className="col flex-1 gap-1">{children}</div>+ </div>+ );+};+export function createChartTooltip<PropsFromTooltip,PropsFromContext extends Record<string, unknown>,@@ -31,9 +59,9 @@ export function createChartTooltip<}return (- <div className="flex min-w-[180px] flex-col gap-2 rounded-xl border bg-background/80 p-3 shadow-xl backdrop-blur-sm">+ <ChartTooltipContainer><Tooltip data={data} context={context} {...tooltip} />- </div>+ </ChartTooltipContainer>);};diff --git a/apps/start/src/components/overview/overview-metric-card.tsx b/apps/start/src/components/overview/overview-metric-card.tsxindex 99b43a315..e2d31fba1 100644--- a/apps/start/src/components/overview/overview-metric-card.tsx+++ b/apps/start/src/components/overview/overview-metric-card.tsx@@ -1,10 +1,17 @@import { fancyMinutes, useNumber } from '@/hooks/use-numer-formatter';import { cn } from '@/utils/cn';import AutoSizer from 'react-virtualized-auto-sizer';-import { Area, AreaChart } from 'recharts';+import { Area, AreaChart, Tooltip } from 'recharts';import { formatDate, timeAgo } from '@/utils/date';+import { getChartColor } from '@/utils/theme';import { getPreviousMetric } from '@openpanel/common';+import { useState } from 'react';+import {+ ChartTooltipContainer,+ ChartTooltipHeader,+ ChartTooltipItem,+} from '../charts/chart-tooltip';import {PreviousDiffIndicatorPure,getDiffIndicator,@@ -41,6 +48,7 @@ export function OverviewMetricCard({inverted = false,isLoading = false,}: MetricCardProps) {+ const [value, setValue] = useState(metric.current);const number = useNumber();const { current, previous } = metric;@@ -79,7 +87,7 @@ export function OverviewMetricCard({<span>{label}:{' '}<span className="font-semibold">- {renderValue(current, 'ml-1 font-light text-xl', false)}+ {renderValue(value, 'ml-1 font-light text-xl', false)}</span></span>}@@ -97,7 +105,7 @@ export function OverviewMetricCard({<div className={cn('group relative p-4')}><divclassName={cn(- 'pointer-events-none absolute -left-1 -right-1 bottom-0 top-0 z-0 opacity-50 transition-opacity duration-300 group-hover:opacity-100',+ 'absolute -left-1 -right-1 bottom-0 top-0 z-0 opacity-50 transition-opacity duration-300 group-hover:opacity-100',)}><AutoSizer>@@ -107,6 +115,11 @@ export function OverviewMetricCard({height={height / 4}data={data}style={{ marginTop: (height / 4) * 3 }}+ onMouseMove={(event) => {+ setValue(+ event.activePayload?.[0]?.payload?.current ?? current,+ );+ }}><defs><linearGradient@@ -128,6 +141,7 @@ export function OverviewMetricCard({/></linearGradient></defs>+ <Tooltip content={() => null} /><AreadataKey={'current'}type="step"diff --git a/apps/start/src/components/report-chart/area/chart.tsx b/apps/start/src/components/report-chart/area/chart.tsxindex 283e96212..08d174f90 100644--- a/apps/start/src/components/report-chart/area/chart.tsx+++ b/apps/start/src/components/report-chart/area/chart.tsx@@ -8,7 +8,7 @@ import { getChartColor } from '@/utils/theme';import { useQuery } from '@tanstack/react-query';import { isSameDay, isSameHour, isSameMonth, isSameWeek } from 'date-fns';import { last } from 'ramda';-import React, { useCallback } from 'react';+import { useCallback } from 'react';import {Area,CartesianGrid,@@ -25,7 +25,6 @@ import {import { useDashedStroke } from '@/hooks/use-dashed-stroke';import { useXAxisProps, useYAxisProps } from '../common/axis';-import { SolidToDashedGradient } from '../common/linear-gradient';import { ReportChartTooltip } from '../common/report-chart-tooltip';import { ReportTable } from '../common/report-table';import { SerieIcon } from '../common/serie-icon';diff --git a/apps/start/src/components/report-chart/bar/chart.tsx b/apps/start/src/components/report-chart/bar/chart.tsxindex b85cc0e50..db3901fdf 100644--- a/apps/start/src/components/report-chart/bar/chart.tsx+++ b/apps/start/src/components/report-chart/bar/chart.tsx@@ -35,7 +35,9 @@ export function Chart({ data }: Props) {() => (isEditMode ? data.series : data.series.slice(0, limit || 10)),[data, isEditMode, limit],);- const maxCount = Math.max(...series.map((serie) => serie.metrics[metric]));+ const maxCount = Math.max(+ ...series.map((serie) => serie.metrics[metric] ?? 0),+ );const tableColumns = [{diff --git a/apps/start/src/components/report-chart/common/report-chart-tooltip.tsx b/apps/start/src/components/report-chart/common/report-chart-tooltip.tsxindex 513ecc3f3..97f19eaf5 100644--- a/apps/start/src/components/report-chart/common/report-chart-tooltip.tsx+++ b/apps/start/src/components/report-chart/common/report-chart-tooltip.tsx@@ -3,7 +3,11 @@ import { useNumber } from '@/hooks/use-numer-formatter';import type { IRechartPayloadItem } from '@/hooks/use-rechart-data-model';import React from 'react';-import { createChartTooltip } from '@/components/charts/chart-tooltip';+import {+ ChartTooltipHeader,+ ChartTooltipItem,+ createChartTooltip,+} from '@/components/charts/chart-tooltip';import type { RouterOutputs } from '@/trpc/client';import type { IInterval } from '@openpanel/validation';import {@@ -88,37 +92,31 @@ export const ReportChartTooltip = createChartTooltip<Data, Context>(const hidden = sorted.slice(limit);return (- <div className="flex min-w-[180px] flex-col gap-2">+ <>{visible.map((item, index) => (<React.Fragment key={item.id}>{index === 0 && item.date && (- <div className="flex justify-between gap-8">+ <ChartTooltipHeader><div>{formatDate(new Date(item.date))}</div>- </div>+ </ChartTooltipHeader>)}- <div className="flex gap-2">- <div- className="w-[3px] rounded-full"- style={{ background: item.color }}- />- <div className="col flex-1 gap-1">- <div className="flex items-center gap-1">- <SerieIcon name={item.names} />- <SerieName name={item.names} />- </div>- <div className="flex justify-between gap-8 font-mono font-medium">- <div className="row gap-1">- {number.formatWithUnit(item.count, unit)}- {!!item.previous && (- <span className="text-muted-foreground">- ({number.formatWithUnit(item.previous.value, unit)})- </span>- )}- </div>- <PreviousDiffIndicator {...item.previous} />+ <ChartTooltipItem color={item.color}>+ <div className="flex items-center gap-1">+ <SerieIcon name={item.names} />+ <SerieName name={item.names} />+ </div>+ <div className="flex justify-between gap-8 font-mono font-medium">+ <div className="row gap-1">+ {number.formatWithUnit(item.count, unit)}+ {!!item.previous && (+ <span className="text-muted-foreground">+ ({number.formatWithUnit(item.previous.value, unit)})+ </span>+ )}</div>+ <PreviousDiffIndicator {...item.previous} /></div>- </div>+ </ChartTooltipItem></React.Fragment>))}{hidden.length > 0 && (@@ -142,7 +140,7 @@ export const ReportChartTooltip = createChartTooltip<Data, Context>())}</>)}- </div>+ </>);},);diff --git a/apps/start/src/components/report-chart/map/chart.tsx b/apps/start/src/components/report-chart/map/chart.tsxindex 45c0d81f5..18d3932f2 100644--- a/apps/start/src/components/report-chart/map/chart.tsx+++ b/apps/start/src/components/report-chart/map/chart.tsx@@ -22,7 +22,7 @@ export function Chart({ data }: Props) {() =>series.map((s) => ({country: s.names[0]?.toLowerCase() ?? '',- value: s.metrics[metric],+ value: s.metrics[metric] ?? 0,})),[series, metric],);diff --git a/apps/start/src/components/report-chart/metric/chart.tsx b/apps/start/src/components/report-chart/metric/chart.tsxindex 9079c6375..823210c6e 100644--- a/apps/start/src/components/report-chart/metric/chart.tsx+++ b/apps/start/src/components/report-chart/metric/chart.tsx@@ -12,7 +12,7 @@ interface Props {export function Chart({ data }: Props) {const {isEditMode,- report: { metric, unit },+ report: { unit },} = useReportChartContext();const { series } = useVisibleSeries(data, isEditMode ? 20 : 4);return (@@ -27,7 +27,7 @@ export function Chart({ data }: Props) {<MetricCardkey={serie.id}serie={serie}- metric={metric}+ metric={'count'}unit={unit}/>);diff --git a/apps/start/src/components/report-chart/metric/metric-card.tsx b/apps/start/src/components/report-chart/metric/metric-card.tsxindex 6a6dc94dd..0fffd9924 100644--- a/apps/start/src/components/report-chart/metric/metric-card.tsx+++ b/apps/start/src/components/report-chart/metric/metric-card.tsx@@ -2,10 +2,17 @@ import { fancyMinutes, useNumber } from '@/hooks/use-numer-formatter';import type { IChartData } from '@/trpc/client';import { cn } from '@/utils/cn';import AutoSizer from 'react-virtualized-auto-sizer';-import { Area, AreaChart } from 'recharts';+import { Area, AreaChart, Tooltip } from 'recharts';import type { IChartMetric } from '@openpanel/validation';+import {+ ChartTooltipContainer,+ ChartTooltipHeader,+ ChartTooltipItem,+} from '@/components/charts/chart-tooltip';+import { formatDate } from '@/utils/date';+import { getChartColor } from '@/utils/theme';import {PreviousDiffIndicator,getDiffIndicator,@@ -20,6 +27,27 @@ interface MetricCardProps {unit?: string;}+const TooltipContent = (props: { payload?: any[] }) => {+ const number = useNumber();+ return (+ <ChartTooltipContainer>+ {props.payload?.map((item) => {+ const { date, count } = item.payload;+ return (+ <div key={item.id} className="col gap-2">+ <ChartTooltipHeader>+ <div>{formatDate(new Date(date))}</div>+ </ChartTooltipHeader>+ <ChartTooltipItem color={getChartColor(0)}>+ <div>{number.format(count)}</div>+ </ChartTooltipItem>+ </div>+ );+ })}+ </ChartTooltipContainer>+ );+};+export function MetricCard({serie,color: _color,@@ -32,7 +60,11 @@ export function MetricCard({} = useReportChartContext();const number = useNumber();- const renderValue = (value: number, unitClassName?: string) => {+ const renderValue = (value: number | undefined, unitClassName?: string) => {+ if (!value) {+ return <div className="text-muted-foreground">N/A</div>;+ }+if (unit === 'min') {return <>{fancyMinutes(value)}</>;}@@ -62,7 +94,7 @@ export function MetricCard({><divclassName={cn(- 'pointer-events-none absolute -left-1 -right-1 bottom-0 top-0 z-0 opacity-50 transition-opacity duration-300 group-hover:opacity-100',+ 'absolute -left-1 -right-1 bottom-0 top-0 z-0 opacity-100 transition-opacity duration-300 group-hover:opacity-100',)}><AutoSizer>@@ -89,6 +121,7 @@ export function MetricCard({/></linearGradient></defs>+ <Tooltip content={TooltipContent} /><AreadataKey="count"type="step"diff --git a/apps/start/src/components/report-chart/pie/chart.tsx b/apps/start/src/components/report-chart/pie/chart.tsxindex ad7b1054b..d75ada3fd 100644--- a/apps/start/src/components/report-chart/pie/chart.tsx+++ b/apps/start/src/components/report-chart/pie/chart.tsx@@ -7,6 +7,11 @@ import { truncate } from '@/utils/truncate';import { Fragment } from 'react';import { Cell, Pie, PieChart, ResponsiveContainer, Tooltip } from 'recharts';+import {+ ChartTooltipContainer,+ ChartTooltipHeader,+ ChartTooltipItem,+} from '@/components/charts/chart-tooltip';import { useNumber } from '@/hooks/use-numer-formatter';import { formatDate } from '@/utils/date';import { AXIS_FONT_PROPS } from '../common/axis';@@ -24,43 +29,37 @@ interface Props {const PieTooltip = (props: { payload?: any[] }) => {const number = useNumber();return (- <div className="bg-background/80 p-2 rounded-md backdrop-blur-md border min-w-[180px]">+ <ChartTooltipContainer>{props.payload?.map((serie, index) => {const item = serie.payload;return (<Fragment key={item.id}>{index === 0 && item.date && (- <div className="flex justify-between gap-8">+ <ChartTooltipHeader><div>{formatDate(new Date(item.date))}</div>- </div>+ </ChartTooltipHeader>)}- <div className="flex gap-2">- <div- className="w-[3px] rounded-full"- style={{ background: item.color }}- />- <div className="col flex-1 gap-1">- <div className="flex items-center gap-1">- <SerieIcon name={item.name} />- <SerieName name={item.names} className="font-medium" />- </div>- <div className="flex justify-between gap-8 font-mono font-medium">- <div className="row gap-1">- {number.formatWithUnit(item.count)}- {!!item.previous && (- <span className="text-muted-foreground">- ({number.formatWithUnit(item.previous.sum.value)})- </span>- )}- </div>- <PreviousDiffIndicator {...item.previous?.sum} />+ <ChartTooltipItem color={item.color}>+ <div className="flex items-center gap-1">+ <SerieIcon name={item.name} />+ <SerieName name={item.names} className="font-medium" />+ </div>+ <div className="flex justify-between gap-8 font-mono font-medium">+ <div className="row gap-1">+ {number.formatWithUnit(item.count)}+ {!!item.previous && (+ <span className="text-muted-foreground">+ ({number.formatWithUnit(item.previous.sum.value)})+ </span>+ )}</div>+ <PreviousDiffIndicator {...item.previous?.sum} /></div>- </div>+ </ChartTooltipItem></Fragment>);})}- </div>+ </ChartTooltipContainer>);};diff --git a/packages/common/src/group-by-labels.ts b/packages/common/src/group-by-labels.tsindex 32da93bee..d8dadbb16 100644--- a/packages/common/src/group-by-labels.ts+++ b/packages/common/src/group-by-labels.ts@@ -4,12 +4,14 @@ export interface ISerieDataItem {label_2?: string | null | undefined;label_3?: string | null | undefined;count: number;+ total_count?: number;date: string;}interface GroupedDataPoint {date: string;count: number;+ total_count?: number;}interface GroupedResult {@@ -45,6 +47,7 @@ export function groupByLabels(data: ISerieDataItem[]): GroupedResult[] {group.data.push({date: row.date,count: row.count,+ total_count: row.total_count,});});@@ -63,7 +66,7 @@ export function groupByLabels(data: ISerieDataItem[]): GroupedResult[] {// This will ensure that all dates are present in the data arraydata: Array.from(timestamps).map((date) => {const dataPoint = group.data.find((dp) => dp.date === date);- return dataPoint || { date, count: 0 };+ return dataPoint || { date, count: 0, total_count: 0 };}),};});diff --git a/packages/constants/index.ts b/packages/constants/index.tsindex 998cb3a30..6d331626d 100644--- a/packages/constants/index.ts+++ b/packages/constants/index.ts@@ -180,6 +180,7 @@ export const deprecated_timeRanges = {};export const metrics = {+ count: 'count',sum: 'sum',average: 'average',min: 'min',diff --git a/packages/db/src/services/chart.service.ts b/packages/db/src/services/chart.service.tsindex 9deca5d3c..39b98dbb4 100644--- a/packages/db/src/services/chart.service.ts+++ b/packages/db/src/services/chart.service.ts@@ -62,6 +62,7 @@ export function getChartSql({projectId,limit,timezone,+ chartType,}: IGetChartDataInput & { timezone: string }) {const {sb,@@ -209,6 +210,17 @@ export function getChartSql({return sql;}+ // Add total unique count for user segment using a scalar subquery+ if (event.segment === 'user') {+ const totalUniqueSubquery = `(+ SELECT ${sb.select.count}+ FROM ${sb.from}+ ${getJoins()}+ ${getWhere()}+ )`;+ sb.select.total_unique_count = `${totalUniqueSubquery} as total_count`;+ }+const sql = `${getSelect()} ${getFrom()} ${getJoins()} ${getWhere()} ${getGroupBy()} ${getOrderBy()} ${getFill()}`;console.log('-- Report --');console.log(sql.replaceAll(/[\n\r]/g, ' '));diff --git a/packages/db/src/services/overview.service.ts b/packages/db/src/services/overview.service.tsindex 38ef8cc7d..ef43378c9 100644--- a/packages/db/src/services/overview.service.ts+++ b/packages/db/src/services/overview.service.ts@@ -83,62 +83,12 @@ export type IGetTopGenericInput = z.infer<typeof zGetTopGenericInput> & {};export class OverviewService {- private pendingQueries: Map<string, Promise<number | null>> = new Map();-constructor(private client: typeof ch) {}isPageFilter(filters: IChartEventFilter[]) {return filters.some((filter) => filter.name === 'path' && filter.value);}- getTotalSessions({- projectId,- startDate,- endDate,- filters,- timezone,- }: {- projectId: string;- startDate: string;- endDate: string;- filters: IChartEventFilter[];- timezone: string;- }) {- const where = this.getRawWhereClause('sessions', filters);- const key = `total_sessions_${projectId}_${startDate}_${endDate}_${JSON.stringify(filters)}`;-- // Check if there's already a pending query for this key- const pendingQuery = this.pendingQueries.get(key);- if (pendingQuery) {- return pendingQuery.then((res) => res ?? 0);- }-- // Create new query promise and store it- const queryPromise = getCache(key, 15, async () => {- try {- const result = await clix(this.client, timezone)- .select<{- total_sessions: number;- }>(['sum(sign) as total_sessions'])- .from(TABLE_NAMES.sessions, true)- .where('project_id', '=', projectId)- .where('created_at', 'BETWEEN', [- clix.datetime(startDate, 'toDateTime'),- clix.datetime(endDate, 'toDateTime'),- ])- .rawWhere(where)- .having('sum(sign)', '>', 0)- .execute();- return result?.[0]?.total_sessions ?? 0;- } catch (error) {- return 0;- }- });-- this.pendingQueries.set(key, queryPromise);- return queryPromise;- }-getMetrics({projectId,filters,@@ -483,14 +433,6 @@ export class OverviewService {.orderBy('sessions', 'DESC').limit(limit);- const totalSessions = await this.getTotalSessions({- projectId,- startDate,- endDate,- filters,- timezone,- });-return mainQuery.execute();}@@ -556,14 +498,6 @@ export class OverviewService {);}- const totalSessions = await this.getTotalSessions({- projectId,- startDate,- endDate,- filters,- timezone,- });-return mainQuery.execute();}@@ -666,16 +600,7 @@ export class OverviewService {mainQuery.rawWhere(this.getRawWhereClause('sessions', filters));}- const [res, totalSessions] = await Promise.all([- mainQuery.execute(),- this.getTotalSessions({- projectId,- startDate,- endDate,- filters,- timezone,- }),- ]);+ const res = await mainQuery.execute();return res;}diff --git a/packages/trpc/src/routers/chart.helpers.ts b/packages/trpc/src/routers/chart.helpers.tsindex 09a40f839..788f6e13d 100644--- a/packages/trpc/src/routers/chart.helpers.ts+++ b/packages/trpc/src/routers/chart.helpers.ts@@ -4,7 +4,6 @@ import sqlstring from 'sqlstring';import type { ISerieDataItem } from '@openpanel/common';import {- DateTime,average,getPreviousMetric,groupByLabels,@@ -226,39 +225,32 @@ export async function getChartSerie(payload: IGetChartDataInput,timezone: string,) {- async function getSeries() {- const result = await chQuery<ISerieDataItem>(- getChartSql({ ...payload, timezone }),+ let result = await chQuery<ISerieDataItem>(+ getChartSql({ ...payload, timezone }),+ {+ session_timezone: timezone,+ },+ );++ if (result.length === 0 && payload.breakdowns.length > 0) {+ result = await chQuery<ISerieDataItem>(+ getChartSql({+ ...payload,+ breakdowns: [],+ timezone,+ }),{session_timezone: timezone,},);-- if (result.length === 0 && payload.breakdowns.length > 0) {- return await chQuery<ISerieDataItem>(- getChartSql({- ...payload,- breakdowns: [],- timezone,- }),- {- session_timezone: timezone,- },- );- }- return result;}- return getSeries()- .then(groupByLabels)- .then((series) => {- return series.map((serie) => {- return {- ...serie,- event: payload.event,- };- });- });+ return groupByLabels(result).map((serie) => {+ return {+ ...serie,+ event: payload.event,+ };+ });}export type IGetChartSerie = Awaited<ReturnType<typeof getChartSeries>>[number];@@ -339,6 +331,7 @@ export async function getChart(input: IChartInput) {average: round(average(serie.data.map((item) => item.count)), 2),min: min(serie.data.map((item) => item.count)),max: max(serie.data.map((item) => item.count)),+ count: serie.data[0]?.total_count, // We can grab any since all are the same};const event = {id: serie.event.id,@@ -388,6 +381,10 @@ export async function getChart(input: IChartInput) {? max(previousSerie?.data.map((item) => item.count)): null,),+ count: getPreviousMetric(+ metrics.count ?? 0,+ previousSerie?.data[0]?.total_count ?? null,+ ),},}: {}),@@ -409,6 +406,7 @@ export async function getChart(input: IChartInput) {average: 0,min: 0,max: 0,+ count: undefined,},};@@ -420,7 +418,7 @@ export async function getChart(input: IChartInput) {const sumB = b.data.reduce((acc, item) => acc + (item.count ?? 0), 0);return sumB - sumA;}- return b.metrics[input.metric] - a.metrics[input.metric];+ return (b.metrics[input.metric] ?? 0) - (a.metrics[input.metric] ?? 0);}).slice(offset, limit ? offset + limit : series.length);@@ -456,6 +454,7 @@ export async function getChart(input: IChartInput) {final.metrics.max,max(final.series.map((item) => item.metrics.previous?.max?.value ?? 0)),),+ count: undefined,};}diff --git a/packages/trpc/src/routers/report.ts b/packages/trpc/src/routers/report.tsindex 723803eab..d4ae4cefc 100644--- a/packages/trpc/src/routers/report.ts+++ b/packages/trpc/src/routers/report.ts@@ -56,7 +56,7 @@ export const reportRouter = createTRPCRouter({previous: report.previous ?? false,unit: report.unit,criteria: report.criteria,- metric: report.metric,+ metric: report.metric === 'count' ? 'sum' : report.metric,funnelGroup: report.funnelGroup,funnelWindow: report.funnelWindow,},@@ -101,7 +101,7 @@ export const reportRouter = createTRPCRouter({previous: report.previous ?? false,unit: report.unit,criteria: report.criteria,- metric: report.metric,+ metric: report.metric === 'count' ? 'sum' : report.metric,funnelGroup: report.funnelGroup,funnelWindow: report.funnelWindow,},diff --git a/packages/validation/src/types.validation.ts b/packages/validation/src/types.validation.tsindex 612a07420..2c348dca4 100644--- a/packages/validation/src/types.validation.ts+++ b/packages/validation/src/types.validation.ts@@ -61,11 +61,13 @@ export type Metrics = {average: number;min: number;max: number;+ count: number | undefined;previous?: {sum: PreviousValue;average: PreviousValue;min: PreviousValue;max: PreviousValue;+ count: PreviousValue;};};