🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Enhance suggestion options with count property for improved display
Bill Yang58621e37d951
diff --git a/client/src/app/[site]/experiments/components/CreateExperimentWizard.tsx b/client/src/app/[site]/experiments/components/CreateExperimentWizard.tsxindex 3d9bc7d4f..66aee2e3f 100644--- a/client/src/app/[site]/experiments/components/CreateExperimentWizard.tsx+++ b/client/src/app/[site]/experiments/components/CreateExperimentWizard.tsx@@ -369,10 +369,12 @@ export function CreateExperimentWizard({const pathSuggestions: SuggestionOption[] = (pathsData?.data || []).map(item => ({value: item.value,label: item.value,+ count: item.count,}));const eventSuggestions: SuggestionOption[] = (eventsData?.data || []).map(item => ({value: item.value,label: item.value,+ count: item.count,}));const selectedGoal =goals.find(goal => String(goal.goalId) === form.existingGoalId) ||diff --git a/client/src/app/[site]/funnels/components/FunnelForm.tsx b/client/src/app/[site]/funnels/components/FunnelForm.tsxindex 26a4fea26..642a871b5 100644--- a/client/src/app/[site]/funnels/components/FunnelForm.tsx+++ b/client/src/app/[site]/funnels/components/FunnelForm.tsx@@ -133,17 +133,17 @@ export function FunnelForm({// Transform data into SuggestionOption formatconst pathSuggestions: SuggestionOption[] = useMemo(- () => pathsData?.data?.map(item => ({ value: item.value, label: item.value })) || [],+ () => pathsData?.data?.map(item => ({ value: item.value, label: item.value, count: item.count })) || [],[pathsData]);const eventSuggestions: SuggestionOption[] = useMemo(- () => eventsData?.data?.map(item => ({ value: item.value, label: item.value })) || [],+ () => eventsData?.data?.map(item => ({ value: item.value, label: item.value, count: item.count })) || [],[eventsData]);const hostnameSuggestions: SuggestionOption[] = useMemo(- () => hostnamesData?.data?.map(item => ({ value: item.value, label: item.value })) || [],+ () => hostnamesData?.data?.map(item => ({ value: item.value, label: item.value, count: item.count })) || [],[hostnamesData]);@@ -155,8 +155,8 @@ export function FunnelForm({const autocaptureValuesByType = useAutocaptureValuesByType(enabledAutocaptureTypes);const stepSuggestions: Record<FunnelStepType, SuggestionOption[]> = useMemo(() => {- const toSuggestions = (values?: { value: string }[]): SuggestionOption[] =>- values?.map(item => ({ value: item.value, label: item.value })) || [];+ const toSuggestions = (values?: { value: string; count: number }[]): SuggestionOption[] =>+ values?.map(item => ({ value: item.value, label: item.value, count: item.count })) || [];return {page: pathSuggestions,diff --git a/client/src/app/[site]/goals/components/GoalFormModal.tsx b/client/src/app/[site]/goals/components/GoalFormModal.tsxindex 41dfe5ff2..7b4500590 100644--- a/client/src/app/[site]/goals/components/GoalFormModal.tsx+++ b/client/src/app/[site]/goals/components/GoalFormModal.tsx@@ -294,12 +294,14 @@ export default function GoalFormModal({pathsData?.data?.map(item => ({value: item.value,label: item.value,+ count: item.count,})) || [];const eventSuggestions: SuggestionOption[] =eventsData?.data?.map(item => ({value: item.value,label: item.value,+ count: item.count,})) || [];// Reinitialize useProperties when goal changes or modal opens@@ -369,6 +371,7 @@ export default function GoalFormModal({autocaptureValuesData?.map(item => ({value: item.value,label: item.value,+ count: item.count,})) || [];// Handle form submissiondiff --git a/client/src/app/[site]/journeys/page.tsx b/client/src/app/[site]/journeys/page.tsxindex 78215d55f..3086f9749 100644--- a/client/src/app/[site]/journeys/page.tsx+++ b/client/src/app/[site]/journeys/page.tsx@@ -39,6 +39,7 @@ export default function JourneysPage() {pathsData?.data?.map(item => ({value: item.value,label: item.value,+ count: item.count,})) ?? [];const { data, isLoading, error } = useJourneys({diff --git a/client/src/components/ui/input-with-suggestions.tsx b/client/src/components/ui/input-with-suggestions.tsxindex 25d9956f9..93ea39123 100644--- a/client/src/components/ui/input-with-suggestions.tsx+++ b/client/src/components/ui/input-with-suggestions.tsx@@ -1,12 +1,14 @@"use client";import { Input } from "@/components/ui/input";+import { formatter } from "@/lib/utils";import * as React from "react";import { createPortal } from "react-dom";export interface SuggestionOption {value: string;label?: string;+ count?: number;}interface InputWithSuggestionsProps extends React.InputHTMLAttributes<HTMLInputElement> {@@ -144,11 +146,16 @@ export const InputWithSuggestions = React.forwardRef<HTMLInputElement, InputWith{filteredSuggestions.map(suggestion => (<divkey={suggestion.value}- className="relative cursor-pointer mx-1 p-2 text-sm hover:bg-neutral-100 dark:hover:bg-neutral-800 rounded-md"+ className="relative flex cursor-pointer items-center justify-between gap-2 mx-1 p-2 text-sm hover:bg-neutral-100 dark:hover:bg-neutral-800 rounded-md"onMouseDown={e => e.preventDefault()}onClick={() => handleSuggestionClick(String(suggestion.value))}>- {suggestion.label || suggestion.value}+ <span className="truncate">{suggestion.label || suggestion.value}</span>+ {suggestion.count !== undefined && (+ <span className="shrink-0 text-xs tabular-nums text-neutral-400 dark:text-neutral-500">+ {formatter(suggestion.count)}+ </span>+ )}</div>))}</div>,