Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Add CreateFunnel component and integrate into FunnelsPage

Bill Yang7d754b381d05
diff --git a/client/src/app/[site]/funnels/components/CreateFunnel.tsx b/client/src/app/[site]/funnels/components/CreateFunnel.tsx
index 54db8c7fd..b3c913986 100644
--- a/client/src/app/[site]/funnels/components/CreateFunnel.tsx
+++ b/client/src/app/[site]/funnels/components/CreateFunnel.tsx
@@ -1,3 +1,217 @@
+"use client";
+
+import { useState } from "react";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import {
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+} from "@/components/ui/select";
+import { Plus, Trash2 } from "lucide-react";
+import { Time } from "@/components/DateSelector/types";
+import { DateTime } from "luxon";
+import { useGetFunnel, FunnelStep } from "@/api/analytics/useGetFunnel";
+import { Funnel } from "./Funnel";
+
export function CreateFunnel() {
- return <div>CreateFunnel</div>;
+ // Initial date state - last 30 days
+ const [time, setTime] = useState<Time>({
+ mode: "range",
+ startDate: DateTime.now().minus({ days: 30 }).toISODate(),
+ endDate: DateTime.now().toISODate(),
+ wellKnown: "Last 30 days",
+ });
+
+ // Funnel steps state
+ const [steps, setSteps] = useState<FunnelStep[]>([
+ { type: "page", value: "/", name: "Homepage" },
+ { type: "page", value: "", name: "" },
+ ]);
+
+ // Funnel analysis mutation
+ const {
+ mutate: analyzeFunnel,
+ data,
+ isError,
+ error,
+ isPending,
+ } = useGetFunnel();
+
+ // Handle adding a new step
+ const addStep = () => {
+ setSteps([...steps, { type: "page", value: "", name: "" }]);
+ };
+
+ // Handle removing a step
+ const removeStep = (index: number) => {
+ if (steps.length <= 2) return; // Maintain at least 2 steps
+ const newSteps = [...steps];
+ newSteps.splice(index, 1);
+ setSteps(newSteps);
+ };
+
+ // Handle step input changes
+ const updateStep = (
+ index: number,
+ field: keyof FunnelStep,
+ value: string
+ ) => {
+ const newSteps = [...steps];
+ newSteps[index] = { ...newSteps[index], [field]: value };
+ setSteps(newSteps);
+ };
+
+ // Handle step type changes
+ const updateStepType = (index: number, type: "page" | "event") => {
+ const newSteps = [...steps];
+ newSteps[index] = { ...newSteps[index], type };
+ setSteps(newSteps);
+ };
+
+ // Handle form submission
+ const handleSubmit = () => {
+ // Validate steps have values
+ const hasEmptySteps = steps.some((step) => !step.value);
+ if (hasEmptySteps) {
+ alert("All steps must have values");
+ return;
+ }
+
+ // Get timezone and dates
+ const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+ let startDate = "",
+ endDate = "";
+
+ if (time.mode === "range") {
+ startDate = time.startDate;
+ endDate = time.endDate;
+ } else if (time.mode === "day") {
+ startDate = time.day;
+ endDate = time.day;
+ } else if (time.mode === "week") {
+ startDate = time.week;
+ const endDateValue = DateTime.fromISO(time.week)
+ .plus({ days: 6 })
+ .toISODate();
+ endDate = endDateValue || DateTime.now().toISODate();
+ } else if (time.mode === "month") {
+ startDate = time.month;
+ const endDateValue = DateTime.fromISO(time.month)
+ .endOf("month")
+ .toISODate();
+ endDate = endDateValue || DateTime.now().toISODate();
+ } else if (time.mode === "year") {
+ startDate = time.year;
+ const endDateValue = DateTime.fromISO(time.year)
+ .endOf("year")
+ .toISODate();
+ endDate = endDateValue || DateTime.now().toISODate();
+ } else {
+ // Fall back to last 30 days for all-time
+ startDate = DateTime.now().minus({ days: 30 }).toISODate();
+ endDate = DateTime.now().toISODate();
+ }
+
+ // Create funnel analysis
+ analyzeFunnel({
+ steps,
+ startDate,
+ endDate,
+ timezone,
+ });
+ };
+
+ return (
+ <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
+ {/* Left side: Funnel configuration form */}
+ <Card>
+ <CardHeader>
+ <CardTitle>Create Funnel</CardTitle>
+ </CardHeader>
+ <CardContent>
+ <div className="space-y-4">
+ {steps.map((step, index) => (
+ <div key={index} className="flex flex-col space-y-2">
+ <div className="flex items-center gap-2">
+ <div className="flex-shrink-0 w-6 h-6 rounded-full bg-neutral-800 flex items-center justify-center text-xs">
+ {index + 1}
+ </div>
+ <Select
+ value={step.type}
+ onValueChange={(value) =>
+ updateStepType(index, value as "page" | "event")
+ }
+ >
+ <SelectTrigger className="w-[120px]">
+ <SelectValue placeholder="Type" />
+ </SelectTrigger>
+ <SelectContent>
+ <SelectItem value="page">Page Path</SelectItem>
+ <SelectItem value="event">Event</SelectItem>
+ </SelectContent>
+ </Select>
+
+ <div className="flex-grow flex gap-2">
+ <Input
+ placeholder={
+ step.type === "page"
+ ? "Path (e.g. /pricing)"
+ : "Event name"
+ }
+ value={step.value}
+ onChange={(e) =>
+ updateStep(index, "value", e.target.value)
+ }
+ />
+ <Input
+ placeholder="Label (optional)"
+ value={step.name || ""}
+ onChange={(e) =>
+ updateStep(index, "name", e.target.value)
+ }
+ />
+ </div>
+
+ <Button
+ variant="ghost"
+ size="sm"
+ onClick={() => removeStep(index)}
+ disabled={steps.length <= 2}
+ >
+ <Trash2 className="h-4 w-4" />
+ </Button>
+ </div>
+ </div>
+ ))}
+
+ <Button variant="outline" onClick={addStep} className="w-full mt-2">
+ <Plus className="mr-2 h-4 w-4" /> Add Step
+ </Button>
+
+ <Button
+ onClick={handleSubmit}
+ className="w-full mt-4"
+ disabled={isPending}
+ >
+ {isPending ? "Analyzing..." : "Analyze Funnel"}
+ </Button>
+ </div>
+ </CardContent>
+ </Card>
+
+ {/* Right side: Funnel visualization */}
+ <Funnel
+ data={data}
+ isError={isError}
+ error={error}
+ isPending={isPending}
+ time={time}
+ setTime={setTime}
+ />
+ </div>
+ );
}
diff --git a/client/src/app/[site]/funnels/components/Funnel.tsx b/client/src/app/[site]/funnels/components/Funnel.tsx
new file mode 100644
index 000000000..2c30e86bf
--- /dev/null
+++ b/client/src/app/[site]/funnels/components/Funnel.tsx
@@ -0,0 +1,182 @@
+"use client";
+
+import { DateSelector } from "@/components/DateSelector/DateSelector";
+import { Time } from "@/components/DateSelector/types";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { FunnelResponse } from "@/api/analytics/useGetFunnel";
+import { ArrowRight, Clock } from "lucide-react";
+
+export type FunnelChartData = {
+ stepName: string;
+ visitors: number;
+ conversionRate: number;
+ dropoffRate: number;
+ stepNumber: number;
+};
+
+interface FunnelProps {
+ data?: { data: FunnelResponse[] };
+ isError: boolean;
+ error: unknown;
+ isPending: boolean;
+ time: Time;
+ setTime: (time: Time) => void;
+}
+
+export function Funnel({
+ data,
+ isError,
+ error,
+ isPending,
+ time,
+ setTime,
+}: FunnelProps) {
+ // Prepare chart data
+ const chartData =
+ data?.data.map((step) => ({
+ stepName: step.step_name,
+ visitors: step.visitors,
+ conversionRate: step.conversion_rate,
+ dropoffRate: step.dropoff_rate,
+ stepNumber: step.step_number,
+ })) || [];
+
+ // Get first and last data points for total conversion metrics
+ const firstStep = chartData[0];
+ const lastStep = chartData[chartData.length - 1];
+ const totalConversionRate = lastStep?.conversionRate || 0;
+
+ const maxBarHeight = 333;
+
+ return (
+ <Card>
+ <CardHeader className="flex flex-row items-center justify-between">
+ <CardTitle>Funnel Analysis</CardTitle>
+ <div className="flex items-center gap-2">
+ <DateSelector time={time} setTime={setTime} />
+ </div>
+ </CardHeader>
+ <CardContent>
+ {isError ? (
+ <div className="h-[400px] flex items-center justify-center">
+ <div className="text-red-500">
+ Error:{" "}
+ {error instanceof Error
+ ? error.message
+ : "Failed to analyze funnel"}
+ </div>
+ </div>
+ ) : data?.data && chartData.length > 0 ? (
+ <div className="space-y-4">
+ {/* Chart grid and background */}
+ <div className="relative h-[350px]">
+ {/* Grid lines */}
+ <div className="absolute inset-0 flex flex-col justify-between pointer-events-none">
+ {[100, 80, 60, 40, 20, 0].map((value) => (
+ <div
+ key={value}
+ className="w-full border-b border-neutral-200 dark:border-neutral-800 flex items-center"
+ >
+ <span className="text-xs text-neutral-500 pr-2">
+ {value}%
+ </span>
+ </div>
+ ))}
+ </div>
+
+ {/* Bars container */}
+ <div className="absolute inset-0 pt-6 flex items-end ml-8">
+ {chartData.map((step, index) => {
+ // Calculate pixel height of the bar based on proportion of visitors
+ const ratio = firstStep?.visitors
+ ? step.visitors / firstStep.visitors
+ : 0;
+ const barHeight = Math.max(ratio * maxBarHeight, 0);
+
+ return (
+ <div
+ key={step.stepNumber}
+ className="flex-1 flex flex-col items-center px-2"
+ >
+ <div
+ className="w-full bg-accent-400/70 rounded-lg"
+ style={{ height: `${barHeight}px` }}
+ ></div>
+ </div>
+ );
+ })}
+ </div>
+ </div>
+
+ {/* Step details */}
+ <div className="grid grid-cols-3 gap-0 ml-8">
+ {chartData.map((step, index) => {
+ // For step 2+, calculate the number of users who dropped off
+ const prevStep = index > 0 ? chartData[index - 1] : null;
+ const droppedUsers = prevStep
+ ? prevStep.visitors - step.visitors
+ : 0;
+ const dropoffPercent = prevStep
+ ? (droppedUsers / prevStep.visitors) * 100
+ : 0;
+
+ return (
+ <div
+ key={step.stepNumber}
+ className="bg-neutral-50 dark:bg-neutral-900 rounded-md p-1 relative pl-3 border-l border-l-neutral-800 first:border-l-0"
+ >
+ <div className="font-medium flex items-center gap-2">
+ {step.stepName}
+ </div>
+
+ {/* Entering users */}
+ <div className="mt-3">
+ <div className="flex items-center text-green-600 dark:text-green-500">
+ <ArrowRight className="w-4 h-4 mr-2" />
+ <div>
+ <span className="font-medium">
+ {step.visitors.toLocaleString()}
+ </span>{" "}
+ <span className="text-neutral-500 text-sm">
+ {index === 0
+ ? ` (100%)`
+ : ` (${step.conversionRate.toFixed(2)}%)`}
+ </span>
+ </div>
+ </div>
+
+ {/* Dropped off users - only for steps after the first */}
+ {index > 0 && (
+ <div className="flex items-center text-orange-500 mt-1">
+ <div className="w-4 h-4 mr-2 flex items-center justify-center">
+ ↘
+ </div>
+ <div>
+ <span className="font-medium">
+ {droppedUsers.toLocaleString()}
+ </span>{" "}
+ <span className="text-neutral-500 text-sm">
+ ({dropoffPercent.toFixed(2)}%)
+ </span>
+ </div>
+ </div>
+ )}
+ </div>
+ </div>
+ );
+ })}
+ </div>
+ </div>
+ ) : (
+ <div className="h-[400px] flex items-center justify-center">
+ <div className="text-neutral-400 text-sm">
+ {isPending
+ ? "Analyzing funnel..."
+ : "Configure your funnel steps and click 'Analyze Funnel'"}
+ </div>
+ </div>
+ )}
+ </CardContent>
+ </Card>
+ );
+}
diff --git a/client/src/app/[site]/funnels/page.tsx b/client/src/app/[site]/funnels/page.tsx
index cf20e2d2d..6920fd0c4 100644
--- a/client/src/app/[site]/funnels/page.tsx
+++ b/client/src/app/[site]/funnels/page.tsx
@@ -1,3 +1,9 @@
+import { CreateFunnel } from "./components/CreateFunnel";
+
export default function FunnelsPage() {
- return <div>Funnels</div>;
+ return (
+ <div>
+ <CreateFunnel />
+ </div>
+ );
}
diff --git a/client/src/components/DateSelector/DateSelector.tsx b/client/src/components/DateSelector/DateSelector.tsx
index 0e71bbd43..23141dc91 100644
--- a/client/src/components/DateSelector/DateSelector.tsx
+++ b/client/src/components/DateSelector/DateSelector.tsx
@@ -7,9 +7,9 @@ import {
DropdownMenuSeparator,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu";
+import { Calendar } from "lucide-react";
import { DateTime } from "luxon";
import { CustomDateRangePicker } from "./CustomDateRangePicker";
-import { Calendar, Calendar1 } from "lucide-react";
import { Time } from "./types";
const getLabel = (time: Time) => {
diff --git a/server/src/api/getFunnel.ts b/server/src/api/getFunnel.ts
index 5521426a0..dae3e1b7f 100644
--- a/server/src/api/getFunnel.ts
+++ b/server/src/api/getFunnel.ts
@@ -66,7 +66,7 @@ export async function getFunnel(
}
});
- // Build the funnel query
+ // Build the funnel query - first part to calculate visitors at each step
const query = `
WITH
-- Get all user actions in the time period
@@ -113,35 +113,43 @@ export async function getFunnel(
)
.join("")}
- -- Final results
- SELECT
- step_number,
- step_name,
- visitors,
- round(visitors * 100.0 / first_step, 2) as conversion_rate,
- round((1 - (visitors / prev_step)) * 100.0, 2) as dropoff_rate
- FROM (
+ -- Calculate visitor count for each step
+ , StepCounts AS (
${steps
.map(
(step, index) => `
- SELECT
- ${index + 1} as step_number,
- '${step.name || step.value}' as step_name,
- count(DISTINCT user_id) as visitors,
- FIRST_VALUE(count(DISTINCT user_id)) OVER (ORDER BY ${
- index + 1
- }) as first_step,
- LAG(count(DISTINCT user_id), 1, count(DISTINCT user_id)) OVER (ORDER BY ${
- index + 1
- }) as prev_step
- FROM Step${index + 1}
- `
+ SELECT
+ ${index + 1} as step_number,
+ '${step.name || step.value}' as step_name,
+ count(DISTINCT user_id) as visitors
+ FROM Step${index + 1}
+ `
)
.join("\nUNION ALL\n")}
)
- ORDER BY step_number
+
+ -- Final results with calculated conversion and dropoff rates
+ SELECT
+ s1.step_number,
+ s1.step_name,
+ s1.visitors as visitors,
+ round(s1.visitors * 100.0 / first_step.visitors, 2) as conversion_rate,
+ CASE
+ WHEN s1.step_number = 1 THEN 0
+ ELSE round((1 - (s1.visitors / prev_step.visitors)) * 100.0, 2)
+ END as dropoff_rate
+ FROM StepCounts s1
+ CROSS JOIN (SELECT visitors FROM StepCounts WHERE step_number = 1) as first_step
+ LEFT JOIN (
+ SELECT step_number + 1 as next_step_number, visitors
+ FROM StepCounts
+ WHERE step_number < ${steps.length}
+ ) as prev_step ON s1.step_number = prev_step.next_step_number
+ ORDER BY s1.step_number
`;
+ console.info(query);
+
// Execute the query
const result = await clickhouse.query({
query,
diff --git a/server/src/index.ts b/server/src/index.ts
index ffeb2130a..12706eec4 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -136,7 +136,7 @@ server.get("/session/:sessionId", getSession);
server.get("/user/:userId/sessions", getUserSessions);
server.get("/user/info/:siteId/:userId", getUserInfo);
server.get("/live-session-locations/:siteId", getLiveSessionLocations);
-server.get("/funnel/:site", getFunnel);
+server.post("/funnel/:site", getFunnel);
// Administrative
server.post("/add-site", addSite);