🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor FunnelForm and JourneysPage components for improved functionality and user experience
Bill Yang40b4b499268a
diff --git a/client/src/app/[site]/funnels/components/FunnelForm.tsx b/client/src/app/[site]/funnels/components/FunnelForm.tsxindex e530d53c6..788224bcc 100644--- a/client/src/app/[site]/funnels/components/FunnelForm.tsx+++ b/client/src/app/[site]/funnels/components/FunnelForm.tsx@@ -1,9 +1,8 @@-import { cn } from "@/lib/utils";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 { cn } from "@/lib/utils";import { Reorder } from "framer-motion";import { ChevronDown, ChevronUp, GripVertical, Plus, Save, Trash2, X } from "lucide-react";import { useState } from "react";diff --git a/client/src/app/[site]/journeys/page.tsx b/client/src/app/[site]/journeys/page.tsxindex 0e80fb3af..954243ba1 100644--- a/client/src/app/[site]/journeys/page.tsx+++ b/client/src/app/[site]/journeys/page.tsx@@ -2,11 +2,15 @@import { useJourneys } from "@/api/analytics/hooks/useGetJourneys";import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";-import { Input } from "@/components/ui/input";+import {+ InputWithSuggestions,+ SuggestionOption,+} from "@/components/ui/input-with-suggestions";import { Slider } from "@/components/ui/slider";import { AlertCircle } from "lucide-react";import { useState } from "react";import { useGetSite } from "../../../api/admin/hooks/useSites";+import { useMetric } from "../../../api/analytics/hooks/useGetMetric";import { DisabledOverlay } from "../../../components/DisabledOverlay";import { useSetPageTitle } from "../../../hooks/useSetPageTitle";import { timeZone } from "../../../lib/dateTimeUtils";@@ -25,6 +29,19 @@ export default function JourneysPage() {const { data: siteMetadata } = useGetSite();const { time } = useStore();+ // Fetch path suggestions+ const { data: pathsData } = useMetric({+ parameter: "pathname",+ limit: 1000,+ useFilters: false,+ });++ const pathSuggestions: SuggestionOption[] =+ pathsData?.data?.map((item) => ({+ value: item.value,+ label: item.value,+ })) ?? [];+const { data, isLoading, error } = useJourneys({siteId: siteMetadata?.siteId,steps,@@ -79,17 +96,17 @@ export default function JourneysPage() {{Array.from({ length: steps }, (_, i) => (<divkey={i}- className="flex-1 h-10 bg-neutral-200 dark:bg-neutral-800 flex items-center text-neutral-900 dark:text-white text-sm relative px-3"+ className="flex-1 h-10 bg-neutral-100 dark:bg-neutral-800 flex items-center text-neutral-900 dark:text-white text-sm relative px-3"style={{clipPath: "polygon(0 0, 10px 50%, 0 100%, calc(100% - 10px) 100%, 100% 50%, calc(100% - 10px) 0)",}}><span className="ml-2 whitespace-nowrap text-neutral-700 dark:text-neutral-200">Step {i + 1}</span>- <Input- inputSize="sm"+ <InputWithSuggestions+ suggestions={pathSuggestions}placeholder="Path filter"value={stepFilters[i] || ""}- onChange={e => {+ onChange={(e) => {const newFilters = { ...stepFilters };if (e.target.value) {newFilters[i] = e.target.value;