OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.
improve funnels
Carl-Gerhard Lindesvärd5b6c67714e57
diff --git a/apps/dashboard/package.json b/apps/dashboard/package.jsonindex 530515f67..b5fb8baf9 100644--- a/apps/dashboard/package.json+++ b/apps/dashboard/package.json@@ -45,6 +45,7 @@"@radix-ui/react-tooltip": "^1.0.7","@reduxjs/toolkit": "^1.9.7","@t3-oss/env-nextjs": "^0.7.3",+ "@tailwindcss/container-queries": "^0.1.1","@tanstack/react-query": "^4.36.1","@tanstack/react-table": "^8.11.8","@trpc/client": "^10.45.1",diff --git a/apps/dashboard/src/app/layout.tsx b/apps/dashboard/src/app/layout.tsxindex bc43df5ac..8f3ff0ec9 100644--- a/apps/dashboard/src/app/layout.tsx+++ b/apps/dashboard/src/app/layout.tsx@@ -25,7 +25,7 @@ export default function RootLayout({return (<html lang="en" suppressHydrationWarning><body- className={cn('grainy min-h-screen bg-slate-100 font-sans antialiased')}+ className={cn('grainy min-h-screen bg-secondary font-sans antialiased')}><NextTopLoadershowSpinner={false}diff --git a/apps/dashboard/src/components/report/chart/ReportBarChart.tsx b/apps/dashboard/src/components/report/chart/ReportBarChart.tsxindex ca51a9002..7bb5b958f 100644--- a/apps/dashboard/src/components/report/chart/ReportBarChart.tsx+++ b/apps/dashboard/src/components/report/chart/ReportBarChart.tsx@@ -61,8 +61,8 @@ export function ReportBarChart({ data }: ReportBarChartProps) {</div><Progresscolor={getChartColor(index)}- className={cn('w-1/2', editMode ? 'h-5' : 'h-2')}value={(serie.metrics.sum / maxCount) * 100}+ size={editMode ? 'lg' : 'sm'}/></div></div>diff --git a/apps/dashboard/src/components/report/chart/SerieIcon.tsx b/apps/dashboard/src/components/report/chart/SerieIcon.tsxindex 9b3ca76da..c06edff25 100644--- a/apps/dashboard/src/components/report/chart/SerieIcon.tsx+++ b/apps/dashboard/src/components/report/chart/SerieIcon.tsx@@ -1,5 +1,4 @@import { useMemo } from 'react';-import { Tooltiper } from '@/components/ui/tooltip';import type { LucideIcon, LucideProps } from 'lucide-react';import {ActivityIcon,@@ -82,10 +81,8 @@ export function SerieIcon({ name, ...props }: SerieIconProps) {}, [name]);return Icon ? (- <Tooltiper asChild content={name!}>- <div className="[&_a]:![&_a]:!h-4 relative h-4 flex-shrink-0 [&_svg]:!rounded-[2px]">- <Icon size={16} {...props} />- </div>- </Tooltiper>+ <div className="[&_a]:![&_a]:!h-4 relative h-4 flex-shrink-0 [&_svg]:!rounded-[2px]">+ <Icon size={16} {...props} />+ </div>) : null;}diff --git a/apps/dashboard/src/components/report/chart/index.tsx b/apps/dashboard/src/components/report/chart/index.tsxindex 090fd72e4..a32f5f077 100644--- a/apps/dashboard/src/components/report/chart/index.tsx+++ b/apps/dashboard/src/components/report/chart/index.tsx@@ -1,8 +1,5 @@'use client';-import { Alert, AlertDescription, AlertTitle } from '@/components/ui/alert';-import { TriangleIcon } from 'lucide-react';-import type { IChartInput } from '@openpanel/validation';import { Funnel } from '../funnel';@@ -15,18 +12,7 @@ export const ChartSwitch = withChartProivder(function ChartSwitch(props: ReportChartProps) {if (props.chartType === 'funnel') {- return (- <>- <Alert>- <TriangleIcon className="h-4 w-4" />- <AlertTitle>Keep in mind</AlertTitle>- <AlertDescription>- Funnel chart is still experimental and might not work as expected.- </AlertDescription>- </Alert>- <Funnel {...props} />- </>- );+ return <Funnel {...props} />;}return <Chart {...props} />;diff --git a/apps/dashboard/src/components/report/funnel/Funnel.old.tsx b/apps/dashboard/src/components/report/funnel/Funnel.old.tsxnew file mode 100644index 000000000..7f50d4f98--- /dev/null+++ b/apps/dashboard/src/components/report/funnel/Funnel.old.tsx@@ -0,0 +1,174 @@+'use client';++import {+ Carousel,+ CarouselContent,+ CarouselItem,+ CarouselNext,+ CarouselPrevious,+} from '@/components/ui/carousel';+import type { RouterOutputs } from '@/trpc/client';+import { cn } from '@/utils/cn';+import { round } from '@/utils/math';+import { ArrowRightIcon } from 'lucide-react';++import { useChartContext } from '../chart/ChartProvider';++function FunnelChart({ from, to }: { from: number; to: number }) {+ const fromY = 100 - from;+ const toY = 100 - to;+ const steps = [+ `M0,${fromY}`,+ 'L0,100',+ 'L100,100',+ `L100,${toY}`,+ `L0,${fromY}`,+ ];+ return (+ <svg viewBox="0 0 100 100">+ <defs>+ <linearGradient+ id="blue"+ x1="50"+ y1="100"+ x2="50"+ y2="0"+ gradientUnits="userSpaceOnUse"+ >+ {/* bottom */}+ <stop offset="0%" stop-color="#2564eb" />+ {/* top */}+ <stop offset="100%" stop-color="#2564eb" />+ </linearGradient>+ <linearGradient+ id="red"+ x1="50"+ y1="100"+ x2="50"+ y2="0"+ gradientUnits="userSpaceOnUse"+ >+ {/* bottom */}+ <stop offset="0%" stop-color="#f87171" />+ {/* top */}+ <stop offset="100%" stop-color="#fca5a5" />+ </linearGradient>+ </defs>+ <rect+ x="0"+ y={fromY}+ width="100"+ height="100"+ fill="url(#red)"+ fillOpacity={0.2}+ />+ <path d={steps.join(' ')} fill="url(#blue)" />+ </svg>+ );+}++function getDropoffColor(value: number) {+ if (value > 80) {+ return 'text-red-600';+ }+ if (value > 50) {+ return 'text-orange-600';+ }+ if (value > 30) {+ return 'text-yellow-600';+ }+ return 'text-green-600';+}++export function FunnelSteps({+ current: { steps, totalSessions },+}: RouterOutputs['chart']['funnel']) {+ const { editMode } = useChartContext();+ return (+ <Carousel className="w-full" opts={{ loop: false, dragFree: true }}>+ <CarouselContent>+ <CarouselItem className={'flex-[0_0_0] pl-3'} />+ {steps.map((step, index, list) => {+ const finalStep = index === list.length - 1;+ return (+ <CarouselItem+ className={cn(+ 'max-w-full flex-[0_0_250px] p-0 px-1',+ editMode && 'flex-[0_0_320px]'+ )}+ key={step.event.id}+ >+ <div className="card divide-y divide-border bg-background">+ <div className="p-4">+ <p className="text-muted-foreground">Step {index + 1}</p>+ <h3 className="font-bold">+ {step.event.displayName || step.event.name}+ </h3>+ </div>+ <div className="relative aspect-square">+ <FunnelChart from={step.prevPercent} to={step.percent} />+ <div className="absolute left-0 right-0 top-0 flex flex-col bg-background/40 p-4">+ <div className="font-medium uppercase text-muted-foreground">+ Sessions+ </div>+ <div className="flex items-center text-3xl font-bold uppercase">+ <span className="text-muted-foreground">+ {step.before}+ </span>+ <ArrowRightIcon size={16} className="mx-2" />+ <span>{step.current}</span>+ </div>+ {index !== 0 && (+ <>+ <div className="text-muted-foreground">+ {step.current} of {totalSessions} (+ {round(step.percent, 1)}%)+ </div>+ </>+ )}+ </div>+ </div>+ {finalStep ? (+ <div className={cn('flex flex-col items-center p-4')}>+ <div className="text-xs font-medium uppercase">+ Conversion+ </div>+ <div+ className={cn(+ 'text-3xl font-bold uppercase',+ getDropoffColor(step.dropoff.percent)+ )}+ >+ {round(step.percent, 1)}%+ </div>+ <div className="mt-0 text-sm font-medium uppercase text-muted-foreground">+ Converted {step.current} of {totalSessions} sessions+ </div>+ </div>+ ) : (+ <div className={cn('flex flex-col items-center p-4')}>+ <div className="text-xs font-medium uppercase">Dropoff</div>+ <div+ className={cn(+ 'text-3xl font-bold uppercase',+ getDropoffColor(step.dropoff.percent)+ )}+ >+ {round(step.dropoff.percent, 1)}%+ </div>+ <div className="mt-0 text-sm font-medium uppercase text-muted-foreground">+ Lost {step.dropoff.count} sessions+ </div>+ </div>+ )}+ </div>+ </CarouselItem>+ );+ })}+ <CarouselItem className={'flex-[0_0_0px] pl-3'} />+ </CarouselContent>+ <CarouselPrevious />+ <CarouselNext />+ </Carousel>+ );+}diff --git a/apps/dashboard/src/components/report/funnel/Funnel.tsx b/apps/dashboard/src/components/report/funnel/Funnel.tsxindex 295798ee6..5a96ce8e4 100644--- a/apps/dashboard/src/components/report/funnel/Funnel.tsx+++ b/apps/dashboard/src/components/report/funnel/Funnel.tsx@@ -1,175 +1,225 @@'use client';-import {- Carousel,- CarouselContent,- CarouselItem,- CarouselNext,- CarouselPrevious,-} from '@/components/ui/carousel';+import { ColorSquare } from '@/components/color-square';+import { AutoSizer } from '@/components/react-virtualized-auto-sizer';+import { Progress } from '@/components/ui/progress';+import { Widget, WidgetBody } from '@/components/widget';+import { pushModal } from '@/modals';+import { useSelector } from '@/redux';import type { RouterOutputs } from '@/trpc/client';import { cn } from '@/utils/cn';import { round } from '@/utils/math';-import { ArrowRight, ArrowRightIcon } from 'lucide-react';+import { getChartColor } from '@/utils/theme';+import { AlertCircleIcon } from 'lucide-react';+import { last } from 'ramda';+import { Cell, Pie, PieChart } from 'recharts';++import type { IChartInput } from '@openpanel/validation';import { useChartContext } from '../chart/ChartProvider';-function FunnelChart({ from, to }: { from: number; to: number }) {- const fromY = 100 - from;- const toY = 100 - to;- const steps = [- `M0,${fromY}`,- 'L0,100',- 'L100,100',- `L100,${toY}`,- `L0,${fromY}`,- ];+const findMostDropoffs = (+ steps: RouterOutputs['chart']['funnel']['current']['steps']+) => {+ return steps.reduce((acc, step) => {+ if (step.dropoffCount > acc.dropoffCount) {+ return step;+ }+ return acc;+ });+};++function InsightCard({+ title,+ children,+}: {+ title: string;+ children: React.ReactNode;+}) {return (- <svg viewBox="0 0 100 100">- <defs>- <linearGradient- id="blue"- x1="50"- y1="100"- x2="50"- y2="0"- gradientUnits="userSpaceOnUse"- >- {/* bottom */}- <stop offset="0%" stop-color="#2564eb" />- {/* top */}- <stop offset="100%" stop-color="#2564eb" />- </linearGradient>- <linearGradient- id="red"- x1="50"- y1="100"- x2="50"- y2="0"- gradientUnits="userSpaceOnUse"- >- {/* bottom */}- <stop offset="0%" stop-color="#f87171" />- {/* top */}- <stop offset="100%" stop-color="#fca5a5" />- </linearGradient>- </defs>- <rect- x="0"- y={fromY}- width="100"- height="100"- fill="url(#red)"- fillOpacity={0.2}- />- <path d={steps.join(' ')} fill="url(#blue)" />- </svg>+ <div className="flex flex-col rounded-lg border border-border p-4 py-3">+ <span className="text-sm">{title}</span>+ <div className="whitespace-nowrap text-lg">{children}</div>+ </div>);}-function getDropoffColor(value: number) {- if (value > 80) {- return 'text-red-600';- }- if (value > 50) {- return 'text-orange-600';- }- if (value > 30) {- return 'text-yellow-600';- }- return 'text-green-600';-}+type Props = RouterOutputs['chart']['funnel'] & {+ input: IChartInput;+};export function FunnelSteps({- steps,- totalSessions,-}: RouterOutputs['chart']['funnel']) {+ current: { steps, totalSessions },+ previous,+ input,+}: Props) {const { editMode } = useChartContext();- return (- <Carousel className="w-full" opts={{ loop: false, dragFree: true }}>- <CarouselContent>- <CarouselItem className={'flex-[0_0_0] pl-3'} />- {steps.map((step, index, list) => {- const finalStep = index === list.length - 1;+ const mostDropoffs = findMostDropoffs(steps);+ const lastStep = last(steps)!;+ const prevLastStep = last(previous.steps)!;+ const hasIncreased = lastStep.percent > prevLastStep.percent;+ const withWidget = (children: React.ReactNode) => {+ if (editMode) {+ return (+ <div className="p-4">+ <Widget>+ <WidgetBody>{children}</WidgetBody>+ </Widget>+ </div>+ );+ }++ return children;+ };++ return withWidget(+ <div className="flex flex-col gap-4 @container">+ <div+ className={cn(+ 'rounded-lg border border-border',+ !editMode && 'border-0 p-0'+ )}+ >+ <div className="flex items-center gap-8 p-4">+ <div className="hidden shrink-0 @xl:block @xl:w-36">+ <AutoSizer disableHeight>+ {({ width }) => {+ const height = width;+ return (+ <div className="relative" style={{ width, height }}>+ <PieChart width={width} height={height}>+ <Pie+ data={[+ {+ value: lastStep.percent,+ label: 'Conversion',+ },+ {+ value: 100 - lastStep.percent,+ label: 'Dropoff',+ },+ ]}+ innerRadius={height / 3}+ outerRadius={height / 2 - 10}+ isAnimationActive={true}+ nameKey="label"+ dataKey="value"+ >+ <Cell strokeWidth={0} className="fill-blue-600" />+ <Cell strokeWidth={0} className="fill-slate-200" />+ </Pie>+ </PieChart>+ <div+ className="absolute inset-0 flex items-center justify-center font-mono font-bold"+ style={{+ fontSize: width / 6,+ }}+ >+ <div>{round(lastStep.percent, 2)}%</div>+ </div>+ </div>+ );+ }}+ </AutoSizer>+ </div>+ <div>+ <div className="mb-1 text-xl font-semibold">Insights</div>+ <div className="flex flex-wrap gap-4">+ <InsightCard title="Converted">+ <span className="font-bold">{lastStep.count}</span>+ <span className="mx-2 text-muted-foreground">of</span>+ <span className="text-muted-foreground">{totalSessions}</span>+ </InsightCard>+ <InsightCard+ title={hasIncreased ? 'Trending up' : 'Trending down'}+ >+ <span className="font-bold">{round(lastStep.percent, 2)}%</span>+ <span className="mx-2 text-muted-foreground">compared to</span>+ <span className="text-muted-foreground">+ {round(prevLastStep.percent, 2)}%+ </span>+ </InsightCard>+ <InsightCard title={'Most dropoffs'}>+ <span className="font-bold">+ {mostDropoffs.event.displayName}+ </span>+ <span className="mx-2 text-muted-foreground">lost</span>+ <span className="text-muted-foreground">+ {mostDropoffs.dropoffCount} sessions+ </span>+ </InsightCard>+ </div>+ </div>+ </div>+ </div>+ <div className="flex flex-col gap-1 divide-y">+ {steps.map((step, index) => {+ const percent = (step.count / totalSessions) * 100;+ const isMostDropoffs = mostDropoffs.event.id === step.event.id;return (- <CarouselItem- className={cn(- 'max-w-full flex-[0_0_250px] p-0 px-1',- editMode && 'flex-[0_0_320px]'- )}+ <divkey={step.event.id}+ className="flex flex-col gap-4 px-4 py-4 @2xl:flex-row @2xl:px-8">- <div className="card divide-y divide-border bg-background">- <div className="p-4">- <p className="text-muted-foreground">Step {index + 1}</p>- <h3 className="font-bold">- {step.event.displayName || step.event.name}- </h3>+ <div className="relative flex flex-1 flex-col gap-2 pl-8">+ <ColorSquare className="absolute left-0 top-0.5">+ {step.event.id}+ </ColorSquare>+ <div className="font-semibold capitalize">+ {step.event.displayName.replace(/_/g, ' ')}</div>- <div className="relative aspect-square">- <FunnelChart from={step.prevPercent} to={step.percent} />- <div className="absolute left-0 right-0 top-0 flex flex-col bg-background/40 p-4">- <div className="font-medium uppercase text-muted-foreground">- Sessions- </div>- <div className="flex items-center text-3xl font-bold uppercase">- <span className="text-muted-foreground">- {step.before}- </span>- <ArrowRightIcon size={16} className="mx-2" />- <span>{step.current}</span>- </div>- {index !== 0 && (- <>- <div className="text-muted-foreground">- {step.current} of {totalSessions} (- {round(step.percent, 1)}%)- </div>- </>- )}+ <div className="flex items-center gap-4 text-sm">+ <div className="flex flex-col">+ <span className="text-xs text-muted-foreground">+ Total:+ </span>+ <span className="font-semibold">{step.previousCount}</span></div>- </div>- {finalStep ? (- <div className={cn('flex flex-col items-center p-4')}>- <div className="text-xs font-medium uppercase">- Conversion- </div>- <div+ <div className="flex flex-col">+ <span className="text-xs text-muted-foreground">+ Dropoff:+ </span>+ <spanclassName={cn(- 'text-3xl font-bold uppercase',- getDropoffColor(step.dropoff.percent)+ 'flex items-center gap-1 font-semibold',+ isMostDropoffs && 'text-red-600')}>- {round(step.percent, 1)}%- </div>- <div className="mt-0 text-sm font-medium uppercase text-muted-foreground">- Converted {step.current} of {totalSessions} sessions- </div>+ {isMostDropoffs && <AlertCircleIcon size={14} />}+ {step.dropoffCount}+ </span></div>- ) : (- <div className={cn('flex flex-col items-center p-4')}>- <div className="text-xs font-medium uppercase">Dropoff</div>- <div- className={cn(- 'text-3xl font-bold uppercase',- getDropoffColor(step.dropoff.percent)- )}- >- {round(step.dropoff.percent, 1)}%- </div>- <div className="mt-0 text-sm font-medium uppercase text-muted-foreground">- Lost {step.dropoff.count} sessions+ <div className="flex flex-col">+ <span className="text-xs text-muted-foreground">+ Current:+ </span>+ <div>+ <span className="font-semibold">{step.count}</span>+ <button+ className="ml-2 underline"+ onClick={() =>+ pushModal('FunnelStepDetails', {+ ...input,+ step: index + 1,+ })+ }+ >+ Inspect+ </button></div></div>- )}+ </div></div>- </CarouselItem>+ <Progress+ size="lg"+ className="w-full @2xl:w-1/2"+ color={getChartColor(index)}+ value={percent}+ />+ </div>);})}- <CarouselItem className={'flex-[0_0_0px] pl-3'} />- </CarouselContent>- <CarouselPrevious />- <CarouselNext />- </Carousel>+ </div>+ </div>);}diff --git a/apps/dashboard/src/components/report/funnel/index.tsx b/apps/dashboard/src/components/report/funnel/index.tsxindex 0bb4a8a25..e3d4f4fe6 100644--- a/apps/dashboard/src/components/report/funnel/index.tsx+++ b/apps/dashboard/src/components/report/funnel/index.tsx@@ -19,35 +19,33 @@ export const Funnel = withChartProivder(function Chart({range,projectId,}: ReportChartProps) {- const [data] = api.chart.funnel.useSuspenseQuery(- {- events,- name,- range,- projectId,- lineType: 'monotone',- interval: 'day',- chartType: 'funnel',- breakdowns: [],- startDate: null,- endDate: null,- previous: false,- formula: undefined,- unit: undefined,- metric: 'sum',- },- {- keepPreviousData: true,- }- );+ const input: IChartInput = {+ events,+ name,+ range,+ projectId,+ lineType: 'monotone',+ interval: 'day',+ chartType: 'funnel',+ breakdowns: [],+ startDate: null,+ endDate: null,+ previous: false,+ formula: undefined,+ unit: undefined,+ metric: 'sum',+ };+ const [data] = api.chart.funnel.useSuspenseQuery(input, {+ keepPreviousData: true,+ });- if (data.steps.length === 0) {+ if (data.current.steps.length === 0) {return <ChartEmpty />;}return (- <div className="-mx-4">- <FunnelSteps {...data} />+ <div className="-m-4">+ <FunnelSteps {...data} input={input} /></div>);});diff --git a/apps/dashboard/src/components/ui/progress.tsx b/apps/dashboard/src/components/ui/progress.tsxindex 77bd3f92a..a8efe21a9 100644--- a/apps/dashboard/src/components/ui/progress.tsx+++ b/apps/dashboard/src/components/ui/progress.tsx@@ -1,28 +1,37 @@import * as React from 'react';import { cn } from '@/utils/cn';+import { round } from '@/utils/math';import * as ProgressPrimitive from '@radix-ui/react-progress';const Progress = React.forwardRef<React.ElementRef<typeof ProgressPrimitive.Root>,React.ComponentPropsWithoutRef<typeof ProgressPrimitive.Root> & {color: string;+ size?: 'sm' | 'default' | 'lg';}->(({ className, value, color, ...props }, ref) => (+>(({ className, value, color, size = 'default', ...props }, ref) => (<ProgressPrimitive.Rootref={ref}className={cn(- 'relative h-4 w-full overflow-hidden rounded-full bg-secondary',+ 'relative h-4 w-full min-w-16 overflow-hidden rounded bg-slate-200 shadow-sm',+ size == 'sm' && 'h-2',+ size == 'lg' && 'h-8',className)}{...props}><ProgressPrimitive.Indicator- className={'h-full w-full flex-1 bg-primary transition-all'}+ className={'h-full w-full flex-1 rounded bg-primary transition-all'}style={{transform: `translateX(-${100 - (value || 0)}%)`,background: color,}}/>+ {value && size != 'sm' && (+ <div className="z-5 absolute bottom-0 top-0 flex items-center px-2 text-xs font-semibold">+ <div>{round(value, 2)}%</div>+ </div>+ )}</ProgressPrimitive.Root>));Progress.displayName = ProgressPrimitive.Root.displayName;diff --git a/apps/dashboard/src/components/widget-table.tsx b/apps/dashboard/src/components/widget-table.tsxindex eecaeaefa..a2757101c 100644--- a/apps/dashboard/src/components/widget-table.tsx+++ b/apps/dashboard/src/components/widget-table.tsx@@ -18,7 +18,7 @@ export function WidgetTable<T>({}: Props<T>) {return (<table className={cn('w-full', className)}>- <thead className="border-b border-border bg-slate-50 text-sm text-slate-500 [&_th:last-child]:text-right [&_th]:whitespace-nowrap [&_th]:p-4 [&_th]:py-2 [&_th]:text-left [&_th]:font-medium">+ <thead className="sticky top-0 z-50 border-b border-border bg-slate-50 text-sm text-slate-500 [&_th:last-child]:text-right [&_th]:whitespace-nowrap [&_th]:p-4 [&_th]:py-2 [&_th]:text-left [&_th]:font-medium"><tr>{columns.map((column) => (<th key={column.name}>{column.name}</th>diff --git a/apps/dashboard/src/modals/FunnelStepDetails.tsx b/apps/dashboard/src/modals/FunnelStepDetails.tsxnew file mode 100644index 000000000..d8978638b--- /dev/null+++ b/apps/dashboard/src/modals/FunnelStepDetails.tsx@@ -0,0 +1,104 @@+'use client';++import { useEffect, useRef, useState } from 'react';+import { ListPropertiesIcon } from '@/components/events/list-properties-icon';+import { Pagination } from '@/components/pagination';+import { ProfileAvatar } from '@/components/profiles/profile-avatar';+import { DialogContent } from '@/components/ui/dialog';+import { ScrollArea } from '@/components/ui/scroll-area';+import { Tooltiper } from '@/components/ui/tooltip';+import { WidgetTable } from '@/components/widget-table';+import { useAppParams } from '@/hooks/useAppParams';+import { api } from '@/trpc/client';+import { getProfileName } from '@/utils/getters';+import Link from 'next/link';+import { usePathname } from 'next/navigation';++import type { IChartInput } from '@openpanel/validation';++import { popModal } from '.';+import { ModalHeader } from './Modal/Container';++interface Props extends IChartInput {+ step: number;+}++function usePrevious(value: any) {+ const ref = useRef();+ useEffect(() => {+ ref.current = value;+ });+ return ref.current;+}++export default function FunnelStepDetails(props: Props) {+ const [data] = api.chart.funnelStep.useSuspenseQuery(props);+ const pathname = usePathname();+ const prev = usePrevious(pathname);+ const { organizationSlug, projectId } = useAppParams();+ const [page, setPage] = useState(0);++ useEffect(() => {+ if (prev && prev !== pathname) {+ popModal();+ }+ }, [pathname]);++ return (+ <DialogContent className="p-0">+ <div className="p-4">+ <ModalHeader title="Profiles"></ModalHeader>+ <Pagination+ count={data.length}+ take={50}+ cursor={page}+ setCursor={setPage}+ />+ </div>+ <ScrollArea className="max-h-[60vh]">+ <WidgetTable+ data={data.slice(page * 50, page * 50 + 50)}+ keyExtractor={(item) => item.id}+ columns={[+ {+ name: 'Name',+ render(profile) {+ return (+ <Link+ prefetch={false}+ href={`/${organizationSlug}/${projectId}/profiles/${profile.id}`}+ className="flex items-center gap-2 font-medium"+ >+ <ProfileAvatar size="sm" {...profile} />+ {getProfileName(profile)}+ </Link>+ );+ },+ },+ {+ name: '',+ render(profile) {+ return <ListPropertiesIcon {...profile.properties} />;+ },+ },+ {+ name: 'Last seen',+ render(profile) {+ return (+ <Tooltiper+ asChild+ content={profile.createdAt.toLocaleString()}+ >+ <div className="text-sm text-muted-foreground">+ {profile.createdAt.toLocaleTimeString()}+ </div>+ </Tooltiper>+ );+ },+ },+ ]}+ />+ </ScrollArea>+ </DialogContent>+ );+}diff --git a/apps/dashboard/src/modals/index.tsx b/apps/dashboard/src/modals/index.tsxindex f80fc0bc0..2442ed4be 100644--- a/apps/dashboard/src/modals/index.tsx+++ b/apps/dashboard/src/modals/index.tsx@@ -56,6 +56,9 @@ const modals = {VerifyEmail: dynamic(() => import('./VerifyEmail'), {loading: Loading,}),+ FunnelStepDetails: dynamic(() => import('./FunnelStepDetails'), {+ loading: Loading,+ }),};export const { pushModal, popModal, popAllModals, ModalProvider } =diff --git a/apps/dashboard/src/trpc/api/routers/chart.helpers.ts b/apps/dashboard/src/trpc/api/routers/chart.helpers.tsindex 867d4b0d2..830ddddfe 100644--- a/apps/dashboard/src/trpc/api/routers/chart.helpers.ts+++ b/apps/dashboard/src/trpc/api/routers/chart.helpers.ts@@ -12,6 +12,8 @@ import {formatClickhouseDate,getChartSql,getEventFiltersWhereClause,+ getProfiles,+ transformProfile,} from '@openpanel/db';import type {IChartEvent,@@ -183,7 +185,6 @@ export function withFormula(const scope = {[serie.event.id]: item?.count ?? 0,};-const count = mathjs.parse(formula).compile()@@ -418,8 +419,17 @@ export function getChartPrevStartEndDate({};}-export async function getFunnelData({ projectId, ...payload }: IChartInput) {- const { startDate, endDate } = getChartStartEndDate(payload);+const ONE_DAY_IN_SECONDS = 60 * 60 * 24;++export async function getFunnelData({+ projectId,+ startDate,+ endDate,+ ...payload+}: IChartInput) {+ if (!startDate || !endDate) {+ throw new Error('startDate and endDate are required');+ }if (payload.events.length === 0) {return {@@ -437,9 +447,13 @@ export async function getFunnelData({ projectId, ...payload }: IChartInput) {const innerSql = `SELECTsession_id,- windowFunnel(6048000000000000,'strict_increase')(toUnixTimestamp(created_at), ${funnels.join(', ')}) AS level+ windowFunnel(${ONE_DAY_IN_SECONDS})(toUnixTimestamp(created_at), ${funnels.join(', ')}) AS levelFROM events- WHERE (project_id = ${escape(projectId)} AND created_at >= '${formatClickhouseDate(startDate)}') AND (created_at <= '${formatClickhouseDate(endDate)}')+ WHERE+ project_id = ${escape(projectId)} AND+ created_at >= '${formatClickhouseDate(startDate)}' AND+ created_at <= '${formatClickhouseDate(endDate)}' AND+ name IN (${payload.events.map((event) => escape(event.name)).join(', ')})GROUP BY session_id`;const sql = `SELECT level, count() AS count FROM (${innerSql}) GROUP BY level ORDER BY level DESC`;@@ -491,31 +505,29 @@ export async function getFunnelData({ projectId, ...payload }: IChartInput) {.reduce((acc, item, index, list) => {const prev = list[index - 1] ?? { count: totalSessions };+ const event = payload.events[item.level - 1]!;return [...acc,{- event: payload.events[item.level - 1]!,- before: prev.count,- current: item.count,- dropoff: {- count: prev.count - item.count,- percent: 100 - (item.count / prev.count) * 100,+ event: {+ ...event,+ displayName: event.displayName ?? event.name,},+ count: item.count,percent: (item.count / totalSessions) * 100,- prevPercent: (prev.count / totalSessions) * 100,+ dropoffCount: prev.count - item.count,+ dropoffPercent: 100 - (item.count / prev.count) * 100,+ previousCount: prev.count,},];},[] as {- event: IChartEvent;- before: number;- current: number;- dropoff: {- count: number;- percent: number;- };+ event: IChartEvent & { displayName: string };+ count: number;percent: number;- prevPercent: number;+ dropoffCount: number;+ dropoffPercent: number;+ previousCount: number;}[]);@@ -525,6 +537,63 @@ export async function getFunnelData({ projectId, ...payload }: IChartInput) {};}+export async function getFunnelStep({+ projectId,+ startDate,+ endDate,+ step,+ ...payload+}: IChartInput & {+ step: number;+}) {+ if (!startDate || !endDate) {+ throw new Error('startDate and endDate are required');+ }++ if (payload.events.length === 0) {+ throw new Error('no events selected');+ }++ const funnels = payload.events.map((event) => {+ const { sb, getWhere } = createSqlBuilder();+ sb.where = getEventFiltersWhereClause(event.filters);+ sb.where.name = `name = ${escape(event.name)}`;+ return getWhere().replace('WHERE ', '');+ });++ const innerSql = `SELECT+ session_id,+ windowFunnel(${ONE_DAY_IN_SECONDS})(toUnixTimestamp(created_at), ${funnels.join(', ')}) AS level+ FROM events+ WHERE+ project_id = ${escape(projectId)} AND+ created_at >= '${formatClickhouseDate(startDate)}' AND+ created_at <= '${formatClickhouseDate(endDate)}' AND+ name IN (${payload.events.map((event) => escape(event.name)).join(', ')})+ GROUP BY session_id`;++ const profileIdsQuery = `WITH sessions AS (${innerSql})+ SELECT+ DISTINCT e.profile_id as id+ FROM sessions s+ JOIN events e ON s.session_id = e.session_id+ WHERE+ s.level = ${step} AND+ e.project_id = ${escape(projectId)} AND+ e.created_at >= '${formatClickhouseDate(startDate)}' AND+ e.created_at <= '${formatClickhouseDate(endDate)}' AND+ name IN (${payload.events.map((event) => escape(event.name)).join(', ')})+ ORDER BY e.created_at DESC+ LIMIT 500+ `;++ const res = await chQuery<{+ id: string;+ }>(profileIdsQuery);++ return getProfiles({ ids: res.map((r) => r.id) });+}+export async function getSeriesFromEvents(input: IChartInput) {const { startDate, endDate } =input.startDate && input.endDatediff --git a/apps/dashboard/src/trpc/api/routers/chart.ts b/apps/dashboard/src/trpc/api/routers/chart.tsindex d5756083a..3e3a923ff 100644--- a/apps/dashboard/src/trpc/api/routers/chart.ts+++ b/apps/dashboard/src/trpc/api/routers/chart.ts@@ -16,6 +16,7 @@ import {getChartPrevStartEndDate,getChartStartEndDate,getFunnelData,+ getFunnelStep,getSeriesFromEvents,} from './chart.helpers';@@ -150,9 +151,34 @@ export const chartRouter = createTRPCRouter({}),funnel: publicProcedure.input(zChartInput).query(async ({ input }) => {- return getFunnelData(input);+ const currentPeriod = getChartStartEndDate(input);+ const previousPeriod = getChartPrevStartEndDate({+ range: input.range,+ ...currentPeriod,+ });++ const [current, previous] = await Promise.all([+ getFunnelData({ ...input, ...currentPeriod }),+ getFunnelData({ ...input, ...previousPeriod }),+ ]);++ return {+ current,+ previous,+ };}),+ funnelStep: publicProcedure+ .input(+ zChartInput.extend({+ step: z.number(),+ })+ )+ .query(async ({ input }) => {+ const currentPeriod = getChartStartEndDate(input);+ return getFunnelStep({ ...input, ...currentPeriod });+ }),+// TODO: Make this privatechart: publicProcedure.input(zChartInput).query(async ({ input }) => {const currentPeriod = getChartStartEndDate(input);@@ -189,7 +215,10 @@ export const chartRouter = createTRPCRouter({return {name: serie.name,- event: serie.event,+ event: {+ ...serie.event,+ displayName: serie.event.displayName ?? serie.event.name,+ },metrics: {...metrics,previous: {diff --git a/apps/dashboard/tailwind.config.js b/apps/dashboard/tailwind.config.jsindex 223b31990..44e39dae4 100644--- a/apps/dashboard/tailwind.config.js+++ b/apps/dashboard/tailwind.config.js@@ -155,7 +155,10 @@ const config = {},},},- plugins: [require('tailwindcss-animate')],+ plugins: [+ require('@tailwindcss/container-queries'),+ require('tailwindcss-animate'),+ ],};export default config;diff --git a/packages/db/src/services/profile.service.ts b/packages/db/src/services/profile.service.tsindex 5cfa16f34..050eb9d60 100644--- a/packages/db/src/services/profile.service.ts+++ b/packages/db/src/services/profile.service.ts@@ -122,8 +122,7 @@ export async function getProfilesByExternalId(${getProfileSelectFields()}FROM profilesGROUP BY id- HAVING project_id = ${escape(projectId)} AND external_id = ${escape(externalId)}- `+ HAVING project_id = ${escape(projectId)} AND external_id = ${escape(externalId)}`);return data.map(transformProfile);@@ -169,7 +168,7 @@ export interface IServiceUpsertProfile {properties?: Record<string, unknown>;}-function transformProfile({+export function transformProfile({max_created_at,first_name,last_name,diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 238c6717e..3efae285f 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -225,6 +225,9 @@ importers:'@t3-oss/env-nextjs':specifier: ^0.7.3version: 0.7.3([email protected])([email protected])+ '@tailwindcss/container-queries':+ specifier: ^0.1.1+ version: 0.1.1([email protected])'@tanstack/react-query':specifier: ^4.36.1version: 4.36.1([email protected])([email protected])@@ -6879,6 +6882,14 @@ packages:zod: 3.22.4dev: false+ /@tailwindcss/[email protected]([email protected]):+ resolution: {integrity: sha512-p18dswChx6WnTSaJCSGx6lTmrGzNNvm2FtXmiO6AuA1V4U5REyoqwmT6kgAsIMdjo07QdAfYXHJ4hnMtfHzWgA==}+ peerDependencies:+ tailwindcss: '>=3.2.0'+ dependencies:+ tailwindcss: 3.4.1+ dev: false+/@tailwindcss/[email protected]([email protected]):resolution: {integrity: sha512-Pe8BuPJQJd3FfRnm6H0ulKIGoMEQS+Vq01R6M5aCrFB/ccR/shT+0kXLjouGC1gFLm9hopTFN+DMP0pfwRWzPw==}peerDependencies:@@ -14825,22 +14836,6 @@ packages:camelcase-css: 2.0.1postcss: 8.4.35- resolution: {integrity: sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==}- engines: {node: '>= 14'}- peerDependencies:- postcss: '>=8.0.9'- ts-node: '>=9.0.0'- peerDependenciesMeta:- postcss:- optional: true- ts-node:- optional: true- dependencies:- lilconfig: 3.1.0- yaml: 2.3.4- dev: true-resolution: {integrity: sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==}engines: {node: '>= 14'}@@ -17141,7 +17136,7 @@ packages:execa: 5.1.1globby: 11.1.0joycon: 3.1.1- postcss-load-config: 4.0.2+ postcss-load-config: 4.0.2([email protected])resolve-from: 5.0.0rollup: 4.12.0source-map: 0.8.0-beta.0