🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Enhance funnel functionality and UI components
Bill Yang7db8915a46d7
diff --git a/client/src/api/analytics/useGetFunnel.ts b/client/src/api/analytics/useGetFunnel.tsindex 3bb2c7111..6b2283a23 100644--- a/client/src/api/analytics/useGetFunnel.ts+++ b/client/src/api/analytics/useGetFunnel.ts@@ -2,6 +2,7 @@ import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";import { BACKEND_URL } from "../../lib/const";import { authedFetch } from "../utils";import { useStore, Filter } from "../../lib/store";+import { useDebounce } from "@uidotdev/usehooks";export type FunnelStep = {value: string;@@ -37,20 +38,32 @@ export type FunnelResponse = {/*** Hook for analyzing conversion funnels through a series of steps*/-export function useGetFunnel(config?: FunnelRequest) {+export function useGetFunnel(config?: FunnelRequest, debounce?: boolean) {const { site } = useStore();+ const debouncedConfig = useDebounce(config, 500);++ const configToUse = debounce ? debouncedConfig : config;+return useQuery<{ data: FunnelResponse[] }, Error>({- queryKey: ["funnel", site, config],+ queryKey: [+ "funnel",+ site,+ configToUse?.filters,+ configToUse?.startDate,+ configToUse?.endDate,+ configToUse?.filters,+ configToUse?.steps.map((s) => s.value + s.type),+ ],queryFn: async () => {- if (!config) {+ if (!configToUse) {throw new Error("Funnel configuration is required");}// Add timezone to the requestconst timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;const fullConfig = {- ...config,+ ...configToUse,timezone,};@@ -69,7 +82,7 @@ export function useGetFunnel(config?: FunnelRequest) {return response.json();},- enabled: !!site && !!config,+ enabled: !!site && !!configToUse,});}diff --git a/client/src/app/[site]/components/Header/UsageBanners.tsx b/client/src/app/[site]/components/Header/UsageBanners.tsxindex 07f5e1858..ddc12788b 100644--- a/client/src/app/[site]/components/Header/UsageBanners.tsx+++ b/client/src/app/[site]/components/Header/UsageBanners.tsx@@ -39,7 +39,7 @@ export function UsageBanners() {site.monthlyEventCount > site.eventLimit) {return (- <Alert variant="destructive" className="p-4 m-3">+ <Alert variant="destructive" className="p-4 m-4"><div className="flex items-start space-x-3"><AlertTriangle className="h-5 w-5 mt-0.5" /><div className="flex-1">@@ -78,7 +78,7 @@ export function UsageBanners() {// If approaching limit (>90%), show warning bannerif (isNearLimit) {return (- <Alert className="p-4 bg-amber-50 border-amber-200 dark:bg-amber-900/20 dark:border-amber-800 m-3">+ <Alert className="p-4 bg-amber-50 border-amber-200 dark:bg-amber-900/20 dark:border-amber-800 m-4"><div className="flex items-start space-x-3"><AlertTriangle className="h-5 w-5 mt-0.5 text-amber-500" /><div className="flex-1">diff --git a/client/src/app/[site]/funnels/components/CreateFunnel.tsx b/client/src/app/[site]/funnels/components/CreateFunnel.tsxindex 9fee8ffd9..6064d4c1f 100644--- a/client/src/app/[site]/funnels/components/CreateFunnel.tsx+++ b/client/src/app/[site]/funnels/components/CreateFunnel.tsx@@ -61,7 +61,8 @@ export function CreateFunnelDialog() {startDate,endDate,filters,- }+ },+ true);// Funnel save mutation@@ -158,7 +159,12 @@ export function CreateFunnelDialog() {const handleOpenChange = (open: boolean) => {setOpen(open);if (!open) {- // Reset analysis+ setSteps([+ { type: "page", value: "/", name: "Homepage" },+ { type: "page", value: "", name: "" },+ ]);+ setFilters([]);+ setName("New Funnel");}};@@ -169,7 +175,7 @@ export function CreateFunnelDialog() {<Plus className="w-4 h-4" /> Create Funnel</Button></DialogTrigger>- <DialogContent className="max-w-[80vw]">+ <DialogContent className="max-w-[95vw]"><DialogHeader><DialogTitle>Create Funnel</DialogTitle></DialogHeader>diff --git a/client/src/app/[site]/funnels/components/EditFunnel.tsx b/client/src/app/[site]/funnels/components/EditFunnel.tsxindex 58fc4cd8c..94d1145d9 100644--- a/client/src/app/[site]/funnels/components/EditFunnel.tsx+++ b/client/src/app/[site]/funnels/components/EditFunnel.tsx@@ -1,24 +1,24 @@"use client";-import { useState, useEffect } from "react";-import { Time } from "@/components/DateSelector/types";-import { DateTime } from "luxon";import {- useGetFunnel,FunnelStep,+ useGetFunnel,useSaveFunnel,} from "@/api/analytics/useGetFunnel";import { SavedFunnel } from "@/api/analytics/useGetFunnels";+import { Time } from "@/components/DateSelector/types";import {Dialog,DialogContent,DialogHeader,DialogTitle,} from "@/components/ui/dialog";+import { DateTime } from "luxon";+import { useEffect, useState } from "react";import { toast } from "sonner";import { getStartAndEndDate } from "../../../../api/utils";-import { FunnelForm } from "./FunnelForm";import { Filter } from "../../../../lib/store";+import { FunnelForm } from "./FunnelForm";interface EditFunnelDialogProps {funnel: SavedFunnel;@@ -56,12 +56,15 @@ export function EditFunnelDialog({isError,error,isLoading: isPending,- } = useGetFunnel({- steps,- startDate,- endDate,- filters,- });+ } = useGetFunnel(+ {+ steps,+ startDate,+ endDate,+ filters,+ },+ true+ );// Funnel save mutationconst {@@ -162,7 +165,7 @@ export function EditFunnelDialog({return (<Dialog open={isOpen} onOpenChange={(open) => !open && onClose()}>- <DialogContent className="max-w-[80vw]">+ <DialogContent className="max-w-[95vw]"><DialogHeader><DialogTitle>Edit Funnel</DialogTitle></DialogHeader>diff --git a/client/src/app/[site]/funnels/components/FunnelForm.tsx b/client/src/app/[site]/funnels/components/FunnelForm.tsxindex 996e92253..9d689332d 100644--- a/client/src/app/[site]/funnels/components/FunnelForm.tsx+++ b/client/src/app/[site]/funnels/components/FunnelForm.tsx@@ -1,7 +1,8 @@-import { useState } from "react";+import { FunnelStep } from "@/api/analytics/useGetFunnel";+import { Time } from "@/components/DateSelector/types";import { Button } from "@/components/ui/button";-import { Input } from "@/components/ui/input";import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";+import { Input } from "@/components/ui/input";import {Select,SelectContent,@@ -9,16 +10,12 @@ import {SelectTrigger,SelectValue,} from "@/components/ui/select";-import { Plus, Trash2, Search, Save, ListFilterPlus } from "lucide-react";-import { Time } from "@/components/DateSelector/types";-import { DateTime } from "luxon";-import { FunnelStep, useGetFunnel } from "@/api/analytics/useGetFunnel";-import { Funnel } from "./Funnel";-import { useDebounce } from "@uidotdev/usehooks";-import { getStartAndEndDate } from "../../../../api/utils";-import { ReactNode } from "react";+import { ListFilterPlus, Plus, Save, Trash2 } from "lucide-react";+import { useState } from "react";+import { ThreeDotLoader } from "../../../../components/Loaders";import { Filter } from "../../../../lib/store";import { FilterComponent } from "../../components/shared/Filters/FilterComponent";+import { Funnel } from "./Funnel";interface FunnelFormProps {name: string;@@ -61,20 +58,9 @@ export function FunnelForm({saveError,funnelData,}: FunnelFormProps) {- // Debounce steps and time changes- const debouncedSteps = useDebounce(steps, 300);- const debouncedTime = useDebounce(time, 300);+ console.info(funnelData);const [showFilters, setShowFilters] = useState(filters.length > 0);- const { startDate, endDate } = getStartAndEndDate(debouncedTime);-- // Get error message as string- const getErrorMessage = (err: unknown): string => {- if (err instanceof Error) return err.message;- if (typeof err === "string") return err;- return "An error occurred";- };-// Handle adding a new stepconst addStep = () => {setSteps([...steps, { type: "page", value: "", name: "" }]);@@ -131,9 +117,45 @@ export function FunnelForm({setShowFilters(true);};+ let funnelArea = null;+ if (funnelData?.data && funnelData.data.length) {+ funnelArea = (+ <Funnel+ data={funnelData}+ isError={isError}+ error={error}+ isPending={isPending}+ time={time}+ setTime={setTime}+ />+ );+ }++ if (steps.some((step) => !step.value)) {+ funnelArea = (+ <div className="flex items-center justify-center bg-neutral-50 dark:bg-neutral-900 rounded-lg h-full">+ <div className="text-center p-6">+ <div className="text-lg font-medium mb-2">Funnel Preview</div>+ <p className="text-sm text-neutral-500">+ Configure your funnel steps and click "Query Funnel" to preview+ results+ </p>+ </div>+ </div>+ );+ }++ if (isPending) {+ funnelArea = (+ <div className="flex items-center justify-center bg-neutral-50 dark:bg-neutral-900 rounded-lg h-full">+ <ThreeDotLoader />+ </div>+ );+ }+return (<>- <div className="grid grid-cols-[600px_3fr] gap-6 my-4">+ <div className="grid grid-cols-[550px_3fr] gap-6 my-4">{/* Left side: Funnel configuration form */}<div className="space-y-4"><div>@@ -197,7 +219,7 @@ export function FunnelForm({<Buttonvariant="ghost"- size="sm"+ size="icon"onClick={() => removeStep(index)}disabled={steps.length <= 2}>@@ -250,40 +272,8 @@ export function FunnelForm({</CardContent>)}</Card>-- {/* Query Funnel button on the left side */}- <Button- onClick={onQuery}- disabled={isPending}- className="w-full"- variant="accent"- >- <Search className="mr-2 h-4 w-4" />- {isPending ? "Querying..." : "Query Funnel"}- </Button></div>-- {/* Right side: Funnel visualization (if data exists) */}- {funnelData?.data && funnelData.data.length > 0 ? (- <Funnel- data={funnelData}- isError={isError}- error={error}- isPending={isPending}- time={time}- setTime={setTime}- />- ) : (- <div className="flex items-center justify-center bg-neutral-50 dark:bg-neutral-900 rounded-lg h-full">- <div className="text-center p-6">- <div className="text-lg font-medium mb-2">Funnel Preview</div>- <p className="text-sm text-neutral-500">- Configure your funnel steps and click "Query Funnel" to preview- results- </p>- </div>- </div>- )}+ {funnelArea}</div><div className="flex justify-between items-center">diff --git a/client/src/app/[site]/funnels/components/FunnelRow.tsx b/client/src/app/[site]/funnels/components/FunnelRow.tsxindex fc9ba65d9..036586255 100644--- a/client/src/app/[site]/funnels/components/FunnelRow.tsx+++ b/client/src/app/[site]/funnels/components/FunnelRow.tsx@@ -13,22 +13,21 @@ import {TooltipProvider,TooltipTrigger,} from "@/components/ui/tooltip";-import { useDebounce } from "@uidotdev/usehooks";import {ArrowRight,ChevronDown,ChevronUp,Edit,+ FileText,FilterIcon,- FunnelIcon,- Globe,+ MousePointerClick,Trash2,- ZapIcon,} from "lucide-react";import { DateTime } from "luxon";import { useState } from "react";import { toast } from "sonner";import { getStartAndEndDate } from "../../../../api/utils";+import { ThreeDotLoader } from "../../../../components/Loaders";import { useGetRegionName } from "../../../../lib/geo";import {filterTypeToLabel,@@ -37,7 +36,6 @@ import {} from "../../components/shared/Filters/utils";import { EditFunnelDialog } from "./EditFunnel";import { Funnel } from "./Funnel";-import { ThreeDotLoader } from "../../../../components/Loaders";interface FunnelRowProps {funnel: SavedFunnel;@@ -57,9 +55,7 @@ export function FunnelRow({ funnel }: FunnelRowProps) {wellKnown: "Last 7 days",} as DateRangeMode);- // Debounce time changes- const debouncedTime = useDebounce(time, 300);- const { startDate, endDate } = getStartAndEndDate(debouncedTime);+ const { startDate, endDate } = getStartAndEndDate(time);// Funnel data fetchingconst {@@ -111,7 +107,7 @@ export function FunnelRow({ funnel }: FunnelRowProps) {><div className="mt-1 text-xs text-neutral-400 flex flex-col gap-3">{/* Steps visualization */}- <div className="flex flex-wrap gap-1 max-w-[500px]">+ <div className="flex flex-wrap gap-1"><h3 className="font-medium text-neutral-100 text-base mr-2">{funnel.name}</h3>@@ -125,9 +121,9 @@ export function FunnelRow({ funnel }: FunnelRowProps) {<TooltipTrigger asChild><span className="rounded bg-neutral-100 dark:bg-neutral-800 px-1.5 py-0.5 whitespace-nowrap overflow-hidden text-ellipsis flex items-center cursor-default">{step.type === "page" ? (- <Globe className="h-3 w-3 mr-1 text-blue-400" />+ <FileText className="h-3 w-3 mr-1 text-blue-400" />) : (- <ZapIcon className="h-3 w-3 mr-1 text-amber-400" />+ <MousePointerClick className="h-3 w-3 mr-1 text-amber-400" />)}<span className="max-w-[120px] overflow-hidden text-ellipsis inline-block">{step.name || step.value}