🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor OutboundLinksList and EditFunnel components for improved clarity and functionality
Bill Yang16a987de3c64
diff --git a/client/src/app/[site]/events/components/OutboundLinksList.tsx b/client/src/app/[site]/events/components/OutboundLinksList.tsxindex fcb0309b4..e1f26a997 100644--- a/client/src/app/[site]/events/components/OutboundLinksList.tsx+++ b/client/src/app/[site]/events/components/OutboundLinksList.tsx@@ -1,12 +1,12 @@"use client";import NumberFlow from "@number-flow/react";-import { ExternalLink, Info } from "lucide-react";+import { Info } from "lucide-react";import { DateTime } from "luxon";import { memo } from "react";import { OutboundLink } from "../../../../api/analytics/events/useGetOutboundLinks";-import { cn } from "../../../../lib/utils";import { Favicon } from "../../../../components/Favicon";+import { cn } from "../../../../lib/utils";// Skeleton component for OutboundLinksListconst OutboundLinksListSkeleton = memo(({ size = "small" }: { size?: "small" | "large" }) => {diff --git a/client/src/app/[site]/funnels/components/EditFunnel.tsx b/client/src/app/[site]/funnels/components/EditFunnel.tsxindex e05c39c26..551ba0b06 100644--- a/client/src/app/[site]/funnels/components/EditFunnel.tsx+++ b/client/src/app/[site]/funnels/components/EditFunnel.tsx@@ -1,14 +1,10 @@"use client";-import { FunnelStep, useGetFunnel, useSaveFunnel } from "../../../../api/analytics/funnels/useGetFunnel";-import { SavedFunnel } from "../../../../api/analytics/funnels/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 { Filter } from "@rybbit/shared";+import { FunnelStep, useGetFunnel, useSaveFunnel } from "../../../../api/analytics/funnels/useGetFunnel";+import { SavedFunnel } from "../../../../api/analytics/funnels/useGetFunnels";import { FunnelForm } from "./FunnelForm";interface EditFunnelDialogProps {@@ -18,25 +14,12 @@ interface EditFunnelDialogProps {}export function EditFunnelDialog({ funnel, isOpen, onClose }: EditFunnelDialogProps) {- // Time state - initialized from funnel configuration- 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 - initialized from funnelconst [steps, setSteps] = useState<FunnelStep[]>(funnel.steps);- // Funnel filters state - initialized from funnel- const [filters, setFilters] = useState<Filter[]>(funnel.filters || []);-// Funnel name - initialized from funnelconst [name, setName] = useState(funnel.name);- const { startDate, endDate } = getStartAndEndDate(time);-// Funnel analysis queryconst {data,@@ -46,9 +29,6 @@ export function EditFunnelDialog({ funnel, isOpen, onClose }: EditFunnelDialogPr} = useGetFunnel({steps,- startDate,- endDate,- filters,},true);@@ -81,43 +61,12 @@ export function EditFunnelDialog({ funnel, isOpen, onClose }: EditFunnelDialogPrreturn;}- // 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();- }-// Update funnel with the report IDsaveFunnel({steps,- startDate,- endDate,name,reportId: funnel.id,- filters: filters.length > 0 ? filters : undefined,},{onSuccess: () => {@@ -152,10 +101,6 @@ export function EditFunnelDialog({ funnel, isOpen, onClose }: EditFunnelDialogPrsetName={setName}steps={steps}setSteps={setSteps}- time={time}- setTime={setTime}- filters={filters}- setFilters={setFilters}onSave={handleUpdateFunnel}onCancel={onClose}onQuery={handleQueryFunnel}