Skip to content

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

Refactor funnel components to streamline data handling and improve user experience

Bill Yang2c6b600a40a7
diff --git a/client/src/api/analytics/funnels/useGetFunnel.ts b/client/src/api/analytics/funnels/useGetFunnel.ts
index 39321b034..09a81ac9c 100644
--- a/client/src/api/analytics/funnels/useGetFunnel.ts
+++ b/client/src/api/analytics/funnels/useGetFunnel.ts
@@ -3,7 +3,7 @@ import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
import { useDebounce } from "@uidotdev/usehooks";
import { timeZone } from "../../../lib/dateTimeUtils";
import { useStore } from "../../../lib/store";
-import { authedFetch } from "../../utils";
+import { authedFetch, getQueryParams } from "../../utils";
export type FunnelStep = {
value: string;
@@ -15,19 +15,13 @@ export type FunnelStep = {
export type FunnelRequest = {
steps: FunnelStep[];
- startDate: string | null;
- endDate: string | null;
name?: string;
- filters?: Filter[];
};
export type SaveFunnelRequest = {
steps: FunnelStep[];
- startDate: string;
- endDate: string;
name: string;
reportId?: number;
- filters?: Filter[];
};
export type FunnelResponse = {
@@ -42,22 +36,16 @@ export type FunnelResponse = {
* Hook for analyzing conversion funnels through a series of steps
*/
export function useGetFunnel(config?: FunnelRequest, debounce?: boolean) {
- const { site } = useStore();
+ const { site, time, filters } = useStore();
const debouncedConfig = useDebounce(config, 500);
+ const queryParams = getQueryParams(time, { filters });
+
const configToUse = debounce ? debouncedConfig : config;
return useQuery<FunnelResponse[], Error>({
- queryKey: [
- "funnel",
- site,
- configToUse?.filters,
- configToUse?.startDate,
- configToUse?.endDate,
- configToUse?.filters,
- configToUse?.steps.map(s => s.value + s.type),
- ],
+ queryKey: ["funnel", site, queryParams, configToUse?.steps.map(s => s.value + s.type)],
queryFn: async () => {
if (!configToUse) {
throw new Error("Funnel configuration is required");
@@ -66,10 +54,9 @@ export function useGetFunnel(config?: FunnelRequest, debounce?: boolean) {
// Add time zone to the request
const fullConfig = {
...configToUse,
- timeZone,
};
try {
- const response = await authedFetch<{ data: FunnelResponse[] }>(`/funnel/${site}`, undefined, {
+ const response = await authedFetch<{ data: FunnelResponse[] }>(`/funnel/${site}`, queryParams, {
method: "POST",
data: fullConfig,
});
diff --git a/client/src/api/analytics/funnels/useGetFunnels.ts b/client/src/api/analytics/funnels/useGetFunnels.ts
index c861879cb..c67f08aec 100644
--- a/client/src/api/analytics/funnels/useGetFunnels.ts
+++ b/client/src/api/analytics/funnels/useGetFunnels.ts
@@ -7,7 +7,6 @@ export interface SavedFunnel {
id: number;
name: string;
steps: FunnelStep[];
- filters?: Filter[];
createdAt: string;
updatedAt: string;
conversionRate: number | null;
diff --git a/client/src/api/analytics/userSessions.ts b/client/src/api/analytics/userSessions.ts
index 2e7d6cad1..30b27e386 100644
--- a/client/src/api/analytics/userSessions.ts
+++ b/client/src/api/analytics/userSessions.ts
@@ -38,7 +38,7 @@ export type GetSessionsResponse = {
}[];
export function useGetSessionsInfinite(userId?: string) {
- const { time, site, filters } = useStore();
+ const { time, site } = useStore();
// Get the appropriate time parameters using getQueryParams
const timeParams = getQueryParams(time);
diff --git a/client/src/app/[site]/funnels/components/CreateFunnel.tsx b/client/src/app/[site]/funnels/components/CreateFunnel.tsx
index 4fa30fb2b..b095ba852 100644
--- a/client/src/app/[site]/funnels/components/CreateFunnel.tsx
+++ b/client/src/app/[site]/funnels/components/CreateFunnel.tsx
@@ -15,28 +15,15 @@ import { Filter } from "@rybbit/shared";
export function CreateFunnelDialog() {
const [open, setOpen] = useState(false);
- // Initial date state - last 7 days
- const [time, setTime] = useState<Time>({
- mode: "range",
- startDate: DateTime.now().minus({ days: 7 }).toISODate(),
- endDate: DateTime.now().toISODate(),
- wellKnown: "Last 7 days",
- });
-
// Funnel steps state
const [steps, setSteps] = useState<FunnelStep[]>([
{ type: "page", value: "/", name: "Homepage" },
{ type: "page", value: "", name: "" },
]);
- // Funnel filters state
- const [filters, setFilters] = useState<Filter[]>([]);
-
// Funnel name
const [name, setName] = useState("New Funnel");
- const { startDate, endDate } = getStartAndEndDate(time);
-
// Funnel analysis query
const {
data,
@@ -48,9 +35,6 @@ export function CreateFunnelDialog() {
? undefined
: {
steps,
- startDate,
- endDate,
- filters,
},
true
);
@@ -83,42 +67,11 @@ export function CreateFunnelDialog() {
return;
}
- // Get dates based on time selection
- 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 7 days for all-time
- startDate = DateTime.now().minus({ days: 7 }).toISODate();
- endDate = DateTime.now().toISODate();
- }
-
// Save funnel directly without analyzing
saveFunnel(
{
steps,
- startDate,
- endDate,
name,
- filters: filters.length > 0 ? filters : undefined,
},
{
onSuccess: () => {
@@ -143,7 +96,6 @@ export function CreateFunnelDialog() {
{ type: "page", value: "/", name: "Homepage" },
{ type: "page", value: "", name: "" },
]);
- setFilters([]);
setName("New Funnel");
}
};
@@ -165,10 +117,6 @@ export function CreateFunnelDialog() {
setName={setName}
steps={steps}
setSteps={setSteps}
- time={time}
- setTime={setTime}
- filters={filters}
- setFilters={setFilters}
onSave={handleSaveFunnel}
onCancel={() => setOpen(false)}
onQuery={handleQueryFunnel}
diff --git a/client/src/app/[site]/funnels/components/Funnel.tsx b/client/src/app/[site]/funnels/components/Funnel.tsx
index cfdb7d6e6..a1db85344 100644
--- a/client/src/app/[site]/funnels/components/Funnel.tsx
+++ b/client/src/app/[site]/funnels/components/Funnel.tsx
@@ -1,7 +1,5 @@
"use client";
-import { DateSelector } from "@/components/DateSelector/DateSelector";
-import { Time } from "@/components/DateSelector/types";
import { round } from "lodash";
import { FunnelResponse } from "../../../../api/analytics/funnels/useGetFunnel";
@@ -18,11 +16,9 @@ interface FunnelProps {
isError: boolean;
error: unknown;
isPending: boolean;
- time: Time;
- setTime: (time: Time) => void;
}
-export function Funnel({ data, isError, error, isPending, time, setTime }: FunnelProps) {
+export function Funnel({ data, isError, error, isPending }: FunnelProps) {
// Prepare chart data
const chartData =
data?.map(step => ({
@@ -64,7 +60,6 @@ export function Funnel({ data, isError, error, isPending, time, setTime }: Funne
<span>Conversion from previous step</span>
</div>
</div>
- <DateSelector time={time} setTime={setTime} pastMinutesEnabled={false} />
</div>
{isError ? (
@@ -86,13 +81,13 @@ export function Funnel({ data, isError, error, isPending, time, setTime }: Funne
const dropoffPercent = prevStep ? (droppedUsers / prevStep.visitors) * 100 : 0;
return (
- <div key={step.stepNumber} className="relative pb-6">
+ <div key={step.stepNumber} className="relative pb-4">
{/* Step number indicator */}
- <div className="flex items-center mb-2">
+ <div className="flex items-center">
<div className="flex-shrink-0 w-6 h-6 rounded-full bg-neutral-800 flex items-center justify-center text-xs mr-2">
{step.stepNumber}
</div>
- <div className="font-medium text-base">{step.stepName}</div>
+ <div className="font-medium text-sm">{step.stepName}</div>
</div>
{/* Bar and metrics */}
@@ -100,7 +95,7 @@ export function Funnel({ data, isError, error, isPending, time, setTime }: Funne
{/* Metrics */}
<div className="flex-shrink-0 min-w-[130px] mr-4">
<div className="flex items-baseline">
- <span className="text-lg font-semibold">{step.visitors.toLocaleString()}</span>
+ <span className="text-base font-semibold">{step.visitors.toLocaleString()}</span>
<span className="text-sm text-neutral-400 ml-1">users</span>
</div>
</div>
@@ -146,7 +141,7 @@ export function Funnel({ data, isError, error, isPending, time, setTime }: Funne
<div className="pl-8 flex">
<div className="min-w-[180px] mr-4">
<div className="flex items-baseline text-orange-500">
- <span className="text-sm font-medium">{droppedUsers.toLocaleString()} dropped</span>
+ <span className="text-xs font-medium">{droppedUsers.toLocaleString()} dropped</span>
{/* <span className="text-sm text-neutral-400 ml-1">
({dropoffPercent.toFixed(2)}%)
</span> */}
diff --git a/client/src/app/[site]/funnels/components/FunnelForm.tsx b/client/src/app/[site]/funnels/components/FunnelForm.tsx
index 93eb2d13b..3bb3a9388 100644
--- a/client/src/app/[site]/funnels/components/FunnelForm.tsx
+++ b/client/src/app/[site]/funnels/components/FunnelForm.tsx
@@ -1,29 +1,22 @@
-import { Time } from "@/components/DateSelector/types";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Input } from "@/components/ui/input";
import { InputWithSuggestions, SuggestionOption } from "@/components/ui/input-with-suggestions";
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
-import { ListFilterPlus, Plus, Save, Trash2 } from "lucide-react";
+import { Plus, Save, Trash2 } from "lucide-react";
import { useState } from "react";
-import { ThreeDotLoader } from "../../../../components/Loaders";
-import { Filter } from "@rybbit/shared";
-import { FilterComponent } from "../../components/shared/Filters/FilterComponent";
-import { Funnel } from "./Funnel";
-import { Switch } from "../../../../components/ui/switch";
-import { Label } from "../../../../components/ui/label";
import { FunnelResponse, FunnelStep } from "../../../../api/analytics/funnels/useGetFunnel";
import { useSingleCol } from "../../../../api/analytics/useSingleCol";
+import { ThreeDotLoader } from "../../../../components/Loaders";
+import { Label } from "../../../../components/ui/label";
+import { Switch } from "../../../../components/ui/switch";
+import { Funnel } from "./Funnel";
interface FunnelFormProps {
name: string;
setName: (name: string) => void;
steps: FunnelStep[];
setSteps: (steps: FunnelStep[]) => void;
- time: Time;
- setTime: (time: Time) => void;
- filters: Filter[];
- setFilters: (filters: Filter[]) => void;
onSave: () => void;
onCancel: () => void;
onQuery: () => void;
@@ -41,10 +34,6 @@ export function FunnelForm({
setName,
steps,
setSteps,
- time,
- setTime,
- filters,
- setFilters,
onSave,
onCancel,
onQuery,
@@ -56,7 +45,6 @@ export function FunnelForm({
saveError,
funnelData,
}: FunnelFormProps) {
- const [showFilters, setShowFilters] = useState(filters.length > 0);
// State to track which event steps have property filtering enabled
const [useProperties, setUseProperties] = useState<boolean[]>(() =>
steps.map(step => !!step.eventPropertyKey && step.eventPropertyValue !== undefined)
@@ -150,36 +138,9 @@ export function FunnelForm({
}
};
- // Handle filter operations
- const updateFilter = (filter: Filter | null, index: number) => {
- if (filter === null) {
- const newFilters = [...filters];
- newFilters.splice(index, 1);
- setFilters(newFilters);
- return;
- }
- const newFilters = [...filters];
- newFilters[index] = filter;
- setFilters(newFilters);
- };
-
- const addFilter = () => {
- setFilters([
- ...filters,
- {
- parameter: "pathname",
- type: "equals",
- value: [],
- },
- ]);
- setShowFilters(true);
- };
-
let funnelArea = null;
if (funnelData && funnelData.length) {
- funnelArea = (
- <Funnel data={funnelData} isError={isError} error={error} isPending={isPending} time={time} setTime={setTime} />
- );
+ funnelArea = <Funnel data={funnelData} isError={isError} error={error} isPending={isPending} />;
}
if (steps.some(step => !step.value)) {
@@ -304,34 +265,6 @@ export function FunnelForm({
))}
</CardContent>
</Card>
-
- {/* Filters Section */}
- <Card className="border border-neutral-200 dark:border-neutral-800">
- <CardHeader className="p-3 flex flex-row justify-between items-center">
- <CardTitle className="text-base">Funnel Filters</CardTitle>
- {!showFilters && (
- <Button variant="outline" size="sm" onClick={addFilter}>
- <ListFilterPlus className="mr-2 h-4 w-4" />
- Add Filters
- </Button>
- )}
- </CardHeader>
- {showFilters && (
- <CardContent className="p-3 space-y-4">
- <div className="flex flex-col gap-2">
- {filters.map((filter, index) => (
- <FilterComponent key={index} filter={filter} index={index} updateFilter={updateFilter} />
- ))}
- </div>
- <div className="flex justify-between">
- <Button variant="ghost" size="sm" onClick={addFilter} className="gap-1">
- <Plus className="w-3 h-3" />
- Add Filter
- </Button>
- </div>
- </CardContent>
- )}
- </Card>
</div>
{funnelArea}
</div>
diff --git a/client/src/app/[site]/funnels/components/FunnelRow.tsx b/client/src/app/[site]/funnels/components/FunnelRow.tsx
index d876aff9d..22ed2f86a 100644
--- a/client/src/app/[site]/funnels/components/FunnelRow.tsx
+++ b/client/src/app/[site]/funnels/components/FunnelRow.tsx
@@ -1,57 +1,28 @@
"use client";
-import { useDeleteFunnel } from "../../../../api/analytics/funnels/useDeleteFunnel";
-import { useGetFunnel } from "../../../../api/analytics/funnels/useGetFunnel";
-import { SavedFunnel } from "../../../../api/analytics/funnels/useGetFunnels";
import { ConfirmationModal } from "@/components/ConfirmationModal";
-import { DateRangeMode, Time } from "@/components/DateSelector/types";
import { Button } from "@/components/ui/button";
import { Card } from "@/components/ui/card";
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
-import {
- ArrowRight,
- ChevronDown,
- ChevronUp,
- Edit,
- FileText,
- FilterIcon,
- MousePointerClick,
- Trash2,
-} from "lucide-react";
-import { DateTime } from "luxon";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
+import { ArrowRight, ChevronDown, ChevronUp, Edit, FileText, MousePointerClick, Trash2 } from "lucide-react";
import { useState } from "react";
import { toast } from "sonner";
-import { getStartAndEndDate } from "../../../../api/utils";
+import { useDeleteFunnel } from "../../../../api/analytics/funnels/useDeleteFunnel";
+import { useGetFunnel } from "../../../../api/analytics/funnels/useGetFunnel";
+import { SavedFunnel } from "../../../../api/analytics/funnels/useGetFunnels";
import { ThreeDotLoader } from "../../../../components/Loaders";
-import { useGetRegionName } from "../../../../lib/geo";
-import { cn } from "../../../../lib/utils";
-import {
- filterTypeToLabel,
- getParameterNameLabel,
- getParameterValueLabel,
-} from "../../components/shared/Filters/utils";
import { EditFunnelDialog } from "./EditFunnel";
import { Funnel } from "./Funnel";
interface FunnelRowProps {
funnel: SavedFunnel;
+ index: number;
}
-export function FunnelRow({ funnel }: FunnelRowProps) {
- const [expanded, setExpanded] = useState(false);
+export function FunnelRow({ funnel, index }: FunnelRowProps) {
+ const [expanded, setExpanded] = useState(index === 0);
const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
const [isEditModalOpen, setIsEditModalOpen] = useState(false);
- const { getRegionName } = useGetRegionName();
-
- // Time state for funnel visualization - default to last 7 days
- const [time, setTime] = useState<Time>({
- mode: "range",
- startDate: DateTime.now().minus({ days: 7 }).toISODate(),
- endDate: DateTime.now().toISODate(),
- wellKnown: "Last 7 days",
- } as DateRangeMode);
-
- const { startDate, endDate } = getStartAndEndDate(time);
// Funnel data fetching
const {
@@ -64,9 +35,6 @@ export function FunnelRow({ funnel }: FunnelRowProps) {
expanded
? {
steps: funnel.steps,
- startDate,
- endDate,
- filters: funnel.filters,
}
: undefined
);
@@ -90,9 +58,6 @@ export function FunnelRow({ funnel }: FunnelRowProps) {
}
};
- // Check if funnel has filters
- const hasFilters = funnel.filters && funnel.filters.length > 0;
-
return (
<Card className="mb-4 overflow-hidden">
{/* Header row (always visible) */}
@@ -144,36 +109,6 @@ export function FunnelRow({ funnel }: FunnelRowProps) {
</div>
))}
</div>
-
- {/* Filters visualization */}
- {hasFilters && (
- <div className="flex items-center gap-1">
- <FilterIcon className="h-3 w-3 text-neutral-400" />
- <div className="flex flex-wrap gap-1">
- {funnel.filters?.map((filter, index) => (
- <span
- key={index}
- 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"
- >
- <span className="text-neutral-300">{getParameterNameLabel(filter.parameter)}</span>
- <span
- className={cn(
- "mx-1",
- filter.type === "not_equals" || filter.type === "not_contains"
- ? "text-red-400"
- : "text-emerald-400"
- )}
- >
- {filterTypeToLabel(filter.type)}
- </span>
- <span className="text-neutral-100 max-w-[100px] overflow-hidden text-ellipsis inline-block">
- {filter.value.length > 0 ? getParameterValueLabel(filter, getRegionName) : "empty"}
- </span>
- </span>
- ))}
- </div>
- </div>
- )}
</div>
</div>
@@ -221,7 +156,7 @@ export function FunnelRow({ funnel }: FunnelRowProps) {
Error loading funnel: {error instanceof Error ? error.message : "Unknown error"}
</div>
) : data && data.length > 0 ? (
- <Funnel data={data} isError={isError} error={error} isPending={isPending} time={time} setTime={setTime} />
+ <Funnel data={data} isError={isError} error={error} isPending={isPending} />
) : (
<div className="text-center p-6 text-neutral-500">No funnel data available</div>
)}
diff --git a/client/src/app/[site]/funnels/page.tsx b/client/src/app/[site]/funnels/page.tsx
index 52b4b8fae..6ac5737e4 100644
--- a/client/src/app/[site]/funnels/page.tsx
+++ b/client/src/app/[site]/funnels/page.tsx
@@ -2,7 +2,7 @@
import { SavedFunnel, useGetFunnels } from "../../../api/analytics/funnels/useGetFunnels";
import { Skeleton } from "@/components/ui/skeleton";
-import { useStore } from "@/lib/store";
+import { GOALS_PAGE_FILTERS, useStore } from "@/lib/store";
import { ArrowRight, FilterIcon, Funnel } from "lucide-react";
import { NothingFound } from "../../../components/NothingFound";
import { CreateFunnelDialog } from "./components/CreateFunnel";
@@ -10,6 +10,7 @@ import { FunnelRow } from "./components/FunnelRow";
import { useSetPageTitle } from "../../../hooks/useSetPageTitle";
import { DisabledOverlay } from "../../../components/DisabledOverlay";
import { MobileSidebar } from "../components/Sidebar/MobileSidebar";
+import { SubHeader } from "../components/SubHeader/SubHeader";
// Skeleton for the funnel row component
const FunnelRowSkeleton = () => (
@@ -85,10 +86,8 @@ export default function FunnelsPage() {
return (
<DisabledOverlay message="Funnels" featurePath="funnels">
<div className="p-2 md:p-4 max-w-[1300px] mx-auto space-y-3">
- <div className="flex justify-between items-center mb-3">
- <div>
- <MobileSidebar />
- </div>
+ <SubHeader availableFilters={GOALS_PAGE_FILTERS} />
+ <div className="flex justify-end">
<CreateFunnelDialog />
</div>
@@ -98,8 +97,8 @@ export default function FunnelsPage() {
</div>
) : funnels?.length ? (
<div className="space-y-4">
- {funnels.map((funnel: SavedFunnel) => (
- <FunnelRow key={funnel.id} funnel={funnel} />
+ {funnels.map((funnel: SavedFunnel, index: number) => (
+ <FunnelRow key={funnel.id} funnel={funnel} index={index} />
))}
</div>
) : (
diff --git a/server/src/api/analytics/funnels/createFunnel.ts b/server/src/api/analytics/funnels/createFunnel.ts
index 109000d10..b56969fbd 100644
--- a/server/src/api/analytics/funnels/createFunnel.ts
+++ b/server/src/api/analytics/funnels/createFunnel.ts
@@ -15,7 +15,6 @@ type Funnel = {
steps: FunnelStep[];
name: string;
reportId?: number; // Optional report ID for updates
- filters?: Filter[]; // Optional filters for the funnel
};
export async function createFunnel(
@@ -27,7 +26,7 @@ export async function createFunnel(
}>,
reply: FastifyReply
) {
- const { steps, name, reportId, filters } = request.body;
+ const { steps, name, reportId } = request.body;
const { site } = request.params;
const userId = request.user?.id;
@@ -70,7 +69,6 @@ export async function createFunnel(
data: {
name,
steps,
- filters,
},
updatedAt: new Date().toISOString(),
})
@@ -90,7 +88,6 @@ export async function createFunnel(
data: {
name,
steps,
- filters,
},
})
.returning({ reportId: funnelsTable.reportId });
diff --git a/server/src/api/analytics/funnels/getFunnel.ts b/server/src/api/analytics/funnels/getFunnel.ts
index 565b56a25..d16e495eb 100644
--- a/server/src/api/analytics/funnels/getFunnel.ts
+++ b/server/src/api/analytics/funnels/getFunnel.ts
@@ -1,10 +1,9 @@
-import { FastifyRequest } from "fastify";
-import { FastifyReply } from "fastify";
+import { FilterParams } from "@rybbit/shared";
+import { FastifyReply, FastifyRequest } from "fastify";
+import SqlString from "sqlstring";
import { clickhouse } from "../../../db/clickhouse/clickhouse.js";
-import { getTimeStatement, processResults, getFilterStatement, patternToRegex } from "../utils.js";
import { getUserHasAccessToSitePublic } from "../../../lib/auth-utils.js";
-import SqlString from "sqlstring";
-import { Filter } from "../types.js";
+import { getFilterStatement, getTimeStatement, patternToRegex, processResults } from "../utils.js";
type FunnelStep = {
value: string;
@@ -16,10 +15,6 @@ type FunnelStep = {
type Funnel = {
steps: FunnelStep[];
- startDate: string;
- endDate: string;
- timeZone: string;
- filters?: Filter[];
};
type FunnelResponse = {
@@ -36,10 +31,11 @@ export async function getFunnel(
Params: {
site: string;
};
+ Querystring: FilterParams<{}>;
}>,
reply: FastifyReply
) {
- const { steps, startDate, endDate, timeZone, filters } = request.body;
+ const { steps } = request.body;
const { site } = request.params;
// Validate request
@@ -47,23 +43,15 @@ export async function getFunnel(
return reply.status(400).send({ error: "At least 2 steps are required for a funnel" });
}
- // Check user access to site
const userHasAccessToSite = await getUserHasAccessToSitePublic(request, site);
if (!userHasAccessToSite) {
return reply.status(403).send({ error: "Forbidden" });
}
- // Build funnel query
try {
- // Create the time statement for the date range
- const timeStatement = getTimeStatement({
- startDate,
- endDate,
- timeZone,
- });
+ const filterStatement = getFilterStatement(request.query.filters);
- // Get filter conditions using the existing utility function
- const filterConditions = filters && filters.length > 0 ? getFilterStatement(JSON.stringify(filters)) : "";
+ const timeStatement = getTimeStatement(request.query);
// Build conditional statements for each step
const stepConditions = steps.map(step => {
@@ -113,7 +101,7 @@ export async function getFunnel(
WHERE
site_id = {siteId:Int32}
${timeStatement}
- ${filterConditions}
+ ${filterStatement}
AND user_id != ''
),
-- Initial step (all users who completed step 1)
diff --git a/server/src/api/analytics/funnels/getFunnels.ts b/server/src/api/analytics/funnels/getFunnels.ts
index 162e3ed8a..3237aefe8 100644
--- a/server/src/api/analytics/funnels/getFunnels.ts
+++ b/server/src/api/analytics/funnels/getFunnels.ts
@@ -35,7 +35,6 @@ export async function getFunnels(
id: record.reportId,
name: data.name || "Unnamed Funnel",
steps: data.steps || [],
- filters: data.filters || [],
configuration: data.configuration || {},
createdAt: record.createdAt,
updatedAt: record.updatedAt,