🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Implement clone functionality in EditFunnelDialog and FunnelRow components
Bill Yang6299f063334d
diff --git a/client/src/app/[site]/funnels/components/EditFunnel.tsx b/client/src/app/[site]/funnels/components/EditFunnel.tsxindex 551ba0b06..d1ee40845 100644--- a/client/src/app/[site]/funnels/components/EditFunnel.tsx+++ b/client/src/app/[site]/funnels/components/EditFunnel.tsx@@ -11,14 +11,15 @@ interface EditFunnelDialogProps {funnel: SavedFunnel;isOpen: boolean;onClose: () => void;+ isCloneMode?: boolean;}-export function EditFunnelDialog({ funnel, isOpen, onClose }: EditFunnelDialogProps) {+export function EditFunnelDialog({ funnel, isOpen, onClose, isCloneMode = false }: EditFunnelDialogProps) {// Funnel steps state - initialized from funnelconst [steps, setSteps] = useState<FunnelStep[]>(funnel.steps);- // Funnel name - initialized from funnel- const [name, setName] = useState(funnel.name);+ // Funnel name - initialized from funnel, with "(Copy)" suffix for clone mode+ const [name, setName] = useState(isCloneMode ? `${funnel.name} (Copy)` : funnel.name);// Funnel analysis queryconst {@@ -46,7 +47,7 @@ export function EditFunnelDialog({ funnel, isOpen, onClose }: EditFunnelDialogPr}};- // Update funnel+ // Update or clone funnelconst handleUpdateFunnel = () => {// Validate nameif (!name.trim()) {@@ -61,23 +62,23 @@ export function EditFunnelDialog({ funnel, isOpen, onClose }: EditFunnelDialogPrreturn;}- // Update funnel with the report ID+ // Update funnel with the report ID (or create new if cloning)saveFunnel({steps,name,- reportId: funnel.id,+ reportId: isCloneMode ? undefined : funnel.id,},{onSuccess: () => {// Close dialog on successful saveonClose();// Show success message- toast?.success("Funnel updated successfully");+ toast?.success(isCloneMode ? "Funnel cloned successfully" : "Funnel updated successfully");},onError: error => {// Show error but don't close dialog- toast?.error(`Failed to update funnel: ${error.message}`);+ toast?.error(`Failed to ${isCloneMode ? "clone" : "update"} funnel: ${error.message}`);},});@@ -93,7 +94,7 @@ export function EditFunnelDialog({ funnel, isOpen, onClose }: EditFunnelDialogPr<Dialog open={isOpen} onOpenChange={open => !open && onClose()}><DialogContent className="max-w-[95vw]"><DialogHeader>- <DialogTitle>Edit Funnel</DialogTitle>+ <DialogTitle>{isCloneMode ? "Clone Funnel" : "Edit Funnel"}</DialogTitle></DialogHeader><FunnelForm@@ -104,7 +105,7 @@ export function EditFunnelDialog({ funnel, isOpen, onClose }: EditFunnelDialogPronSave={handleUpdateFunnel}onCancel={onClose}onQuery={handleQueryFunnel}- saveButtonText="Update Funnel"+ saveButtonText={isCloneMode ? "Clone Funnel" : "Update Funnel"}isSaving={isSaving}isError={isError}isPending={isPending}diff --git a/client/src/app/[site]/funnels/components/FunnelRow.tsx b/client/src/app/[site]/funnels/components/FunnelRow.tsxindex 43dd44047..71b2225a7 100644--- a/client/src/app/[site]/funnels/components/FunnelRow.tsx+++ b/client/src/app/[site]/funnels/components/FunnelRow.tsx@@ -4,7 +4,7 @@ import { ConfirmationModal } from "@/components/ConfirmationModal";import { Button } from "@/components/ui/button";import { Card } from "@/components/ui/card";import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";-import { ArrowRight, ChevronDown, ChevronUp, Edit, Eye, MousePointerClick, Trash2 } from "lucide-react";+import { ArrowRight, ChevronDown, ChevronUp, Copy, Edit, Eye, MousePointerClick, Trash2 } from "lucide-react";import { useState } from "react";import { toast } from "sonner";import { useDeleteFunnel } from "../../../../api/analytics/funnels/useDeleteFunnel";@@ -24,6 +24,7 @@ export function FunnelRow({ funnel, index }: FunnelRowProps) {const [expanded, setExpanded] = useState(index === 0);const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);const [isEditModalOpen, setIsEditModalOpen] = useState(false);+ const [isCloneModalOpen, setIsCloneModalOpen] = useState(false);// Funnel data fetchingconst {@@ -116,28 +117,55 @@ export function FunnelRow({ funnel, index }: FunnelRowProps) {<div className="flex items-center gap-4"><div className="flex">{/* Edit button */}- <Button- variant="ghost"- size="icon"- onClick={e => {- e.stopPropagation();- setIsEditModalOpen(true);- }}- >- <Edit className="h-4 w-4" />- </Button>+ <Tooltip>+ <TooltipTrigger asChild>+ <Button+ variant="ghost"+ size="icon"+ onClick={e => {+ e.stopPropagation();+ setIsEditModalOpen(true);+ }}+ >+ <Edit className="h-4 w-4" />+ </Button>+ </TooltipTrigger>+ <TooltipContent>Edit Funnel</TooltipContent>+ </Tooltip>++ {/* Clone button */}+ <Tooltip>+ <TooltipTrigger asChild>+ <Button+ variant="ghost"+ size="icon"+ onClick={e => {+ e.stopPropagation();+ setIsCloneModalOpen(true);+ }}+ >+ <Copy className="h-4 w-4" />+ </Button>+ </TooltipTrigger>+ <TooltipContent>Clone Funnel</TooltipContent>+ </Tooltip>{/* Delete button */}- <Button- variant="ghost"- size="icon"- onClick={e => {- e.stopPropagation();- setIsDeleteModalOpen(true);- }}- >- <Trash2 className="h-4 w-4" />- </Button>+ <Tooltip>+ <TooltipTrigger asChild>+ <Button+ variant="ghost"+ size="icon"+ onClick={e => {+ e.stopPropagation();+ setIsDeleteModalOpen(true);+ }}+ >+ <Trash2 className="h-4 w-4" />+ </Button>+ </TooltipTrigger>+ <TooltipContent>Delete Funnel</TooltipContent>+ </Tooltip><Button variant="ghost" size="icon" onClick={handleExpand}>{expanded ? <ChevronUp strokeWidth={3} /> : <ChevronDown strokeWidth={3} />}@@ -182,6 +210,16 @@ export function FunnelRow({ funnel, index }: FunnelRowProps) {{isEditModalOpen && (<EditFunnelDialog funnel={funnel} isOpen={isEditModalOpen} onClose={() => setIsEditModalOpen(false)} />)}++ {/* Clone Funnel Modal */}+ {isCloneModalOpen && (+ <EditFunnelDialog+ funnel={funnel}+ isOpen={isCloneModalOpen}+ onClose={() => setIsCloneModalOpen(false)}+ isCloneMode={true}+ />+ )}</Card>);}diff --git a/client/src/app/[site]/goals/components/GoalCard.tsx b/client/src/app/[site]/goals/components/GoalCard.tsxindex 6b3c0b7cc..f73ba1d0f 100644--- a/client/src/app/[site]/goals/components/GoalCard.tsx+++ b/client/src/app/[site]/goals/components/GoalCard.tsx@@ -113,14 +113,6 @@ export default function GoalCard({ goal, siteId }: GoalCardProps) {</Tooltip>}/>- <Tooltip>- <TooltipTrigger asChild>- <Button onClick={() => setIsDeleteDialogOpen(true)} variant="ghost" size="smIcon">- <Trash2 className="h-4 w-4" />- </Button>- </TooltipTrigger>- <TooltipContent>Delete Goal</TooltipContent>- </Tooltip><GoalFormModalsiteId={siteId}goal={goal}@@ -136,6 +128,14 @@ export default function GoalCard({ goal, siteId }: GoalCardProps) {</Tooltip>}/>+ <Tooltip>+ <TooltipTrigger asChild>+ <Button onClick={() => setIsDeleteDialogOpen(true)} variant="ghost" size="smIcon">+ <Trash2 className="h-4 w-4" />+ </Button>+ </TooltipTrigger>+ <TooltipContent>Delete Goal</TooltipContent>+ </Tooltip></div></div><div className="bg-neutral-700 h-1.5 w-full absolute bottom-0 left-0"></div>