Skip to content

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

Update funnel-related translations and enhance funnel creation UI

Bill Yang1e2520563219
diff --git a/client/messages/cs.json b/client/messages/cs.json
index 85a770a67..fe0292f0a 100644
--- a/client/messages/cs.json
+++ b/client/messages/cs.json
@@ -463,8 +463,6 @@
"jhVKvF": "",
"SBUMrd": "",
"wsKkfk": "",
- "z6IYcX": "Všechny kroky musí mít hodnoty",
- "jm52QG": "Zadej prosím název trychtýře",
"+N7isb": "Trychtýř úspěšně uložen",
"6S3VIt": "Nepodařilo se uložit trychtýř: {message}",
"aWjWtn": "Vytvořit trychtýř",
@@ -491,28 +489,26 @@
"gUKiFL": "Nastav kroky trychtýře",
"XFyfI5": "Celková konverze",
"AFl3K6": "Konverze z předchozího kroku",
- "Y6DkLY": "Cesta (např. /pricing)",
- "OZ7LR+": "",
- "+aHMUx": "",
- "vHXIqS": "",
- "tWsaCv": "",
- "s+vZVl": "Náhled trychtýře",
- "Cf6LHR": "Název trychtýře",
- "TOuHNM": "Zadej název trychtýře",
"+U6ozc": "Typ",
- "Hp/0iW": "Zadej cestu (např. /checkout), ne celou URL.",
"Asi2Jg": "Skrýt pokročilé možnosti",
"lIEejV": "Zobrazit pokročilé možnosti",
+ "Hp/0iW": "Zadej cestu (např. /checkout), ne celou URL.",
"JX99mM": "Hostname (volitelný)",
"snh6R6": "Popisek (volitelný)",
"F1HScC": "Filtrovat podle URL parametru",
"1t1lSU": "Filtrovat podle vlastnosti události",
"cfiGPy": "Nový parametr",
"lqNsts": "Nová vlastnost",
+ "Y6DkLY": "Cesta (např. /pricing)",
+ "OZ7LR+": "",
+ "+aHMUx": "",
+ "vHXIqS": "",
+ "tWsaCv": "",
+ "Cf6LHR": "Název trychtýře",
+ "TOuHNM": "Zadej název trychtýře",
"XmAxo6": "Přidat krok",
"tINfvW": "Použij * pro shodu s jedním segmentem cesty (např. /blog/*) nebo ** pro shodu s více segmenty (např. /docs/**/intro)",
- "ox304v": "Došlo k chybě",
- "KbGBQH": "Při ukládání došlo k chybě",
+ "s+vZVl": "Náhled trychtýře",
"/liMUf": "Trychtýř úspěšně smazán",
"ToO3/h": "",
"753yX5": "Popisek",
diff --git a/client/messages/de.json b/client/messages/de.json
index 7729fd1f1..100ef5186 100644
--- a/client/messages/de.json
+++ b/client/messages/de.json
@@ -463,8 +463,6 @@
"jhVKvF": "Ist nicht gleich",
"SBUMrd": "Feature-Flags filtern",
"wsKkfk": "Noch keine Feature-Flags",
- "z6IYcX": "Alle Schritte müssen Werte haben",
- "jm52QG": "Bitte geben Sie einen Trichternamen ein",
"+N7isb": "Trichter erfolgreich gespeichert",
"6S3VIt": "Trichter konnte nicht gespeichert werden: {message}",
"aWjWtn": "Trichter erstellen",
@@ -491,28 +489,26 @@
"gUKiFL": "Konfigurieren Sie Ihre Trichterschritte",
"XFyfI5": "Gesamtkonversion",
"AFl3K6": "Konversion vom vorherigen Schritt",
- "Y6DkLY": "Pfad (z.B. /pricing)",
- "OZ7LR+": "",
- "+aHMUx": "",
- "vHXIqS": "",
- "tWsaCv": "",
- "s+vZVl": "Trichtervorschau",
- "Cf6LHR": "Trichtername",
- "TOuHNM": "Trichternamen eingeben",
"+U6ozc": "Typ",
- "Hp/0iW": "Geben Sie einen Pfad ein (z.B. /checkout), keine vollständige URL.",
"Asi2Jg": "Erweiterte Optionen ausblenden",
"lIEejV": "Erweiterte Optionen anzeigen",
+ "Hp/0iW": "Geben Sie einen Pfad ein (z.B. /checkout), keine vollständige URL.",
"JX99mM": "Hostname (optional)",
"snh6R6": "Bezeichnung (optional)",
"F1HScC": "Nach URL-Parameter filtern",
"1t1lSU": "Nach Event-Eigenschaft filtern",
"cfiGPy": "Neuer Parameter",
"lqNsts": "Neue Eigenschaft",
+ "Y6DkLY": "Pfad (z.B. /pricing)",
+ "OZ7LR+": "",
+ "+aHMUx": "",
+ "vHXIqS": "",
+ "tWsaCv": "",
+ "Cf6LHR": "Trichtername",
+ "TOuHNM": "Trichternamen eingeben",
"XmAxo6": "Schritt hinzufügen",
"tINfvW": "Verwenden Sie * für ein einzelnes Pfadsegment (z.B. /blog/*) oder ** für mehrere Segmente (z.B. /docs/**/intro)",
- "ox304v": "Ein Fehler ist aufgetreten",
- "KbGBQH": "Beim Speichern ist ein Fehler aufgetreten",
+ "s+vZVl": "Trichtervorschau",
"/liMUf": "Trichter erfolgreich gelöscht",
"ToO3/h": "",
"753yX5": "Bezeichnung",
diff --git a/client/messages/en.json b/client/messages/en.json
index fbb0f36e1..c26e93093 100644
--- a/client/messages/en.json
+++ b/client/messages/en.json
@@ -463,8 +463,6 @@
"jhVKvF": "Does not equal",
"SBUMrd": "Filter feature flags",
"wsKkfk": "No feature flags yet",
- "z6IYcX": "All steps must have values",
- "jm52QG": "Please enter a funnel name",
"+N7isb": "Funnel saved successfully",
"6S3VIt": "Failed to save funnel: {message}",
"aWjWtn": "Create Funnel",
@@ -491,28 +489,26 @@
"gUKiFL": "Configure your funnel steps",
"XFyfI5": "Overall conversion",
"AFl3K6": "Conversion from previous step",
- "Y6DkLY": "Path (e.g. /pricing)",
- "OZ7LR+": "URL pattern (optional)",
- "+aHMUx": "Button text (optional)",
- "vHXIqS": "Form name or ID (optional)",
- "tWsaCv": "Copied text (optional)",
- "s+vZVl": "Funnel Preview",
- "Cf6LHR": "Funnel Name",
- "TOuHNM": "Enter funnel name",
"+U6ozc": "Type",
- "Hp/0iW": "Enter a path (e.g., /checkout), not a full URL.",
"Asi2Jg": "Hide advanced options",
"lIEejV": "Show advanced options",
+ "Hp/0iW": "Enter a path (e.g., /checkout), not a full URL.",
"JX99mM": "Hostname (optional)",
"snh6R6": "Label (optional)",
"F1HScC": "Filter by URL parameter",
"1t1lSU": "Filter by event property",
"cfiGPy": "New Parameter",
"lqNsts": "New Property",
+ "Y6DkLY": "Path (e.g. /pricing)",
+ "OZ7LR+": "URL pattern (optional)",
+ "+aHMUx": "Button text (optional)",
+ "vHXIqS": "Form name or ID (optional)",
+ "tWsaCv": "Copied text (optional)",
+ "Cf6LHR": "Funnel Name",
+ "TOuHNM": "Enter funnel name",
"XmAxo6": "Add Step",
"tINfvW": "Use * to match a single path segment (e.g., /blog/*) or ** to match multiple segments (e.g., /docs/**/intro)",
- "ox304v": "An error occurred",
- "KbGBQH": "An error occurred while saving",
+ "s+vZVl": "Funnel Preview",
"/liMUf": "Funnel deleted successfully",
"ToO3/h": "Any",
"753yX5": "Label",
diff --git a/client/messages/es.json b/client/messages/es.json
index 9024fbd17..66e597c95 100644
--- a/client/messages/es.json
+++ b/client/messages/es.json
@@ -463,8 +463,6 @@
"jhVKvF": "No es igual a",
"SBUMrd": "Filtrar banderas de funcionalidad",
"wsKkfk": "Aún no hay banderas de funcionalidad",
- "z6IYcX": "Todos los pasos deben tener valores",
- "jm52QG": "Por favor, introduce un nombre para el embudo",
"+N7isb": "Embudo guardado correctamente",
"6S3VIt": "Error al guardar el embudo: {message}",
"aWjWtn": "Crear embudo",
@@ -491,28 +489,26 @@
"gUKiFL": "Configura los pasos de tu embudo",
"XFyfI5": "Conversión general",
"AFl3K6": "Conversión desde el paso anterior",
- "Y6DkLY": "Ruta (ej. /precios)",
- "OZ7LR+": "",
- "+aHMUx": "",
- "vHXIqS": "",
- "tWsaCv": "",
- "s+vZVl": "Vista previa del embudo",
- "Cf6LHR": "Nombre del embudo",
- "TOuHNM": "Introduce el nombre del embudo",
"+U6ozc": "Tipo",
- "Hp/0iW": "Introduce una ruta (ej. /pago), no una URL completa.",
"Asi2Jg": "Ocultar opciones avanzadas",
"lIEejV": "Mostrar opciones avanzadas",
+ "Hp/0iW": "Introduce una ruta (ej. /pago), no una URL completa.",
"JX99mM": "Nombre de host (opcional)",
"snh6R6": "Etiqueta (opcional)",
"F1HScC": "Filtrar por parámetro URL",
"1t1lSU": "Filtrar por propiedad de evento",
"cfiGPy": "Nuevo parámetro",
"lqNsts": "Nueva propiedad",
+ "Y6DkLY": "Ruta (ej. /precios)",
+ "OZ7LR+": "",
+ "+aHMUx": "",
+ "vHXIqS": "",
+ "tWsaCv": "",
+ "Cf6LHR": "Nombre del embudo",
+ "TOuHNM": "Introduce el nombre del embudo",
"XmAxo6": "Añadir paso",
"tINfvW": "Usa * para coincidir con un segmento de ruta (ej. /blog/*) o ** para múltiples segmentos (ej. /docs/**/intro)",
- "ox304v": "Ocurrió un error",
- "KbGBQH": "Ocurrió un error al guardar",
+ "s+vZVl": "Vista previa del embudo",
"/liMUf": "Embudo eliminado correctamente",
"ToO3/h": "",
"753yX5": "Etiqueta",
diff --git a/client/messages/fr.json b/client/messages/fr.json
index 7cca15cc0..3d607a3f9 100644
--- a/client/messages/fr.json
+++ b/client/messages/fr.json
@@ -463,8 +463,6 @@
"jhVKvF": "N'est pas égal à",
"SBUMrd": "Filtrer les feature flags",
"wsKkfk": "Aucun feature flag pour l'instant",
- "z6IYcX": "Toutes les étapes doivent avoir des valeurs",
- "jm52QG": "Veuillez saisir un nom d'entonnoir",
"+N7isb": "Entonnoir enregistré avec succès",
"6S3VIt": "Échec de l'enregistrement de l'entonnoir : {message}",
"aWjWtn": "Créer un entonnoir",
@@ -491,28 +489,26 @@
"gUKiFL": "Configurez les étapes de votre entonnoir",
"XFyfI5": "Conversion globale",
"AFl3K6": "Conversion depuis l'étape précédente",
- "Y6DkLY": "Chemin (ex. /pricing)",
- "OZ7LR+": "",
- "+aHMUx": "",
- "vHXIqS": "",
- "tWsaCv": "",
- "s+vZVl": "Aperçu de l'entonnoir",
- "Cf6LHR": "Nom de l'entonnoir",
- "TOuHNM": "Saisir le nom de l'entonnoir",
"+U6ozc": "Écrans",
- "Hp/0iW": "Saisissez un chemin (ex. /checkout), pas une URL complète.",
"Asi2Jg": "Masquer les options avancées",
"lIEejV": "Afficher les options avancées",
+ "Hp/0iW": "Saisissez un chemin (ex. /checkout), pas une URL complète.",
"JX99mM": "Nom d'hôte (facultatif)",
"snh6R6": "Libellé (optionnel)",
"F1HScC": "Filtrer par paramètre URL",
"1t1lSU": "Filtrer par propriété d'événement",
"cfiGPy": "Nouveau paramètre",
"lqNsts": "Nouvelle propriété",
+ "Y6DkLY": "Chemin (ex. /pricing)",
+ "OZ7LR+": "",
+ "+aHMUx": "",
+ "vHXIqS": "",
+ "tWsaCv": "",
+ "Cf6LHR": "Nom de l'entonnoir",
+ "TOuHNM": "Saisir le nom de l'entonnoir",
"XmAxo6": "Ajouter une étape",
"tINfvW": "Utilisez * pour un seul segment de chemin (ex. /blog/*) ou ** pour plusieurs segments (ex. /docs/**/intro)",
- "ox304v": "Une erreur est survenue",
- "KbGBQH": "Une erreur est survenue lors de l'enregistrement",
+ "s+vZVl": "Aperçu de l'entonnoir",
"/liMUf": "Entonnoir supprimé avec succès",
"ToO3/h": "",
"753yX5": "Libellé",
diff --git a/client/messages/it.json b/client/messages/it.json
index b1b83a439..1ad81efad 100644
--- a/client/messages/it.json
+++ b/client/messages/it.json
@@ -463,8 +463,6 @@
"jhVKvF": "Non è uguale a",
"SBUMrd": "Filtra feature flag",
"wsKkfk": "Nessun feature flag ancora",
- "z6IYcX": "Tutti i passaggi devono avere dei valori",
- "jm52QG": "Inserisci il nome di un funnel",
"+N7isb": "Funnel salvato con successo",
"6S3VIt": "Impossibile salvare il funnel: {message}",
"aWjWtn": "Crea Funnel",
@@ -491,28 +489,26 @@
"gUKiFL": "Configura i passaggi del tuo funnel",
"XFyfI5": "Conversione complessiva",
"AFl3K6": "Conversione dal passaggio precedente",
- "Y6DkLY": "Percorso (es. /pricing)",
- "OZ7LR+": "",
- "+aHMUx": "",
- "vHXIqS": "",
- "tWsaCv": "",
- "s+vZVl": "Anteprima Funnel",
- "Cf6LHR": "Nome Funnel",
- "TOuHNM": "Inserisci il nome del funnel",
"+U6ozc": "Tipo",
- "Hp/0iW": "Inserisci un percorso (es. /checkout), non un URL completo.",
"Asi2Jg": "Nascondi opzioni avanzate",
"lIEejV": "Mostra opzioni avanzate",
+ "Hp/0iW": "Inserisci un percorso (es. /checkout), non un URL completo.",
"JX99mM": "Hostname (opzionale)",
"snh6R6": "Etichetta (opzionale)",
"F1HScC": "Filtra per parametro URL",
"1t1lSU": "Filtra per proprietà evento",
"cfiGPy": "Nuovo Parametro",
"lqNsts": "Nuova Proprietà",
+ "Y6DkLY": "Percorso (es. /pricing)",
+ "OZ7LR+": "",
+ "+aHMUx": "",
+ "vHXIqS": "",
+ "tWsaCv": "",
+ "Cf6LHR": "Nome Funnel",
+ "TOuHNM": "Inserisci il nome del funnel",
"XmAxo6": "Aggiungi Passaggio",
"tINfvW": "Usa * per corrispondere a un singolo segmento di percorso (es. /blog/*) o ** per corrispondere a più segmenti (es. /docs/**/intro)",
- "ox304v": "Si è verificato un errore",
- "KbGBQH": "Si è verificato un errore durante il salvataggio",
+ "s+vZVl": "Anteprima Funnel",
"/liMUf": "Funnel eliminato con successo",
"ToO3/h": "",
"753yX5": "Etichetta",
diff --git a/client/messages/ja.json b/client/messages/ja.json
index e83980f6c..f27a1ca61 100644
--- a/client/messages/ja.json
+++ b/client/messages/ja.json
@@ -463,8 +463,6 @@
"jhVKvF": "等しくない",
"SBUMrd": "フィーチャーフラグを絞り込む",
"wsKkfk": "まだフィーチャーフラグがありません",
- "z6IYcX": "すべてのステップに値を入力してください",
- "jm52QG": "ファネル名を入力してください",
"+N7isb": "ファネルを保存しました",
"6S3VIt": "ファネルの保存に失敗しました:{message}",
"aWjWtn": "ファネルを作成",
@@ -491,28 +489,26 @@
"gUKiFL": "ファネルのステップを設定",
"XFyfI5": "全体のコンバージョン",
"AFl3K6": "前のステップからのコンバージョン",
- "Y6DkLY": "パス(例:/pricing)",
- "OZ7LR+": "",
- "+aHMUx": "",
- "vHXIqS": "",
- "tWsaCv": "",
- "s+vZVl": "ファネルプレビュー",
- "Cf6LHR": "ファネル名",
- "TOuHNM": "ファネル名を入力",
"+U6ozc": "タイプ",
- "Hp/0iW": "パスを入力してください(例:/checkout)。完全なURLではありません。",
"Asi2Jg": "詳細オプションを非表示",
"lIEejV": "詳細オプションを表示",
+ "Hp/0iW": "パスを入力してください(例:/checkout)。完全なURLではありません。",
"JX99mM": "ホスト名(任意)",
"snh6R6": "ラベル(任意)",
"F1HScC": "URLパラメータでフィルター",
"1t1lSU": "イベントプロパティでフィルター",
"cfiGPy": "新しいパラメータ",
"lqNsts": "新しいプロパティ",
+ "Y6DkLY": "パス(例:/pricing)",
+ "OZ7LR+": "",
+ "+aHMUx": "",
+ "vHXIqS": "",
+ "tWsaCv": "",
+ "Cf6LHR": "ファネル名",
+ "TOuHNM": "ファネル名を入力",
"XmAxo6": "ステップを追加",
"tINfvW": "*で単一のパスセグメントに一致(例:/blog/*)、**で複数セグメントに一致(例:/docs/**/intro)",
- "ox304v": "エラーが発生しました",
- "KbGBQH": "保存中にエラーが発生しました",
+ "s+vZVl": "ファネルプレビュー",
"/liMUf": "ファネルを削除しました",
"ToO3/h": "",
"753yX5": "ラベル",
diff --git a/client/messages/ko.json b/client/messages/ko.json
index b6000f7fd..2720e1e38 100644
--- a/client/messages/ko.json
+++ b/client/messages/ko.json
@@ -463,8 +463,6 @@
"jhVKvF": "같지 않음",
"SBUMrd": "기능 플래그 필터",
"wsKkfk": "아직 기능 플래그가 없습니다",
- "z6IYcX": "모든 단계에 값이 있어야 합니다",
- "jm52QG": "퍼널 이름을 입력하세요",
"+N7isb": "퍼널이 성공적으로 저장되었습니다",
"6S3VIt": "퍼널 저장 실패: {message}",
"aWjWtn": "퍼널 만들기",
@@ -491,28 +489,26 @@
"gUKiFL": "퍼널 단계를 구성하세요",
"XFyfI5": "전체 전환율",
"AFl3K6": "이전 단계 대비 전환율",
- "Y6DkLY": "경로 (예: /pricing)",
- "OZ7LR+": "",
- "+aHMUx": "",
- "vHXIqS": "",
- "tWsaCv": "",
- "s+vZVl": "퍼널 미리보기",
- "Cf6LHR": "퍼널 이름",
- "TOuHNM": "퍼널 이름 입력",
"+U6ozc": "유형",
- "Hp/0iW": "경로를 입력하세요 (예: /checkout), 전체 URL이 아닙니다.",
"Asi2Jg": "고급 옵션 숨기기",
"lIEejV": "고급 옵션 표시",
+ "Hp/0iW": "경로를 입력하세요 (예: /checkout), 전체 URL이 아닙니다.",
"JX99mM": "호스트명 (선택사항)",
"snh6R6": "라벨 (선택사항)",
"F1HScC": "URL 매개변수로 필터",
"1t1lSU": "이벤트 속성으로 필터",
"cfiGPy": "새 매개변수",
"lqNsts": "새 속성",
+ "Y6DkLY": "경로 (예: /pricing)",
+ "OZ7LR+": "",
+ "+aHMUx": "",
+ "vHXIqS": "",
+ "tWsaCv": "",
+ "Cf6LHR": "퍼널 이름",
+ "TOuHNM": "퍼널 이름 입력",
"XmAxo6": "단계 추가",
"tINfvW": "*를 사용하여 단일 경로 세그먼트를 일치시키거나 (예: /blog/*) **를 사용하여 여러 세그먼트를 일치시킵니다 (예: /docs/**/intro)",
- "ox304v": "오류가 발생했습니다",
- "KbGBQH": "저장 중 오류가 발생했습니다",
+ "s+vZVl": "퍼널 미리보기",
"/liMUf": "퍼널이 성공적으로 삭제되었습니다",
"ToO3/h": "",
"753yX5": "라벨",
diff --git a/client/messages/pl.json b/client/messages/pl.json
index 6bc9ec3e7..8e854fd41 100644
--- a/client/messages/pl.json
+++ b/client/messages/pl.json
@@ -463,8 +463,6 @@
"jhVKvF": "Nie równa się",
"SBUMrd": "Filtruj flagi funkcji",
"wsKkfk": "Brak flag funkcji",
- "z6IYcX": "Wszystkie kroki muszą mieć wartości",
- "jm52QG": "Wprowadź nazwę lejka",
"+N7isb": "Lejek zapisany pomyślnie",
"6S3VIt": "Nie udało się zapisać lejka: {message}",
"aWjWtn": "Utwórz lejek",
@@ -491,28 +489,26 @@
"gUKiFL": "Skonfiguruj kroki lejka",
"XFyfI5": "Ogólna konwersja",
"AFl3K6": "Konwersja z poprzedniego kroku",
- "Y6DkLY": "Ścieżka (np. /pricing)",
- "OZ7LR+": "",
- "+aHMUx": "",
- "vHXIqS": "",
- "tWsaCv": "",
- "s+vZVl": "Podgląd lejka",
- "Cf6LHR": "Nazwa lejka",
- "TOuHNM": "Wprowadź nazwę lejka",
"+U6ozc": "Typ",
- "Hp/0iW": "Wprowadź ścieżkę (np. /checkout), nie pełny URL.",
"Asi2Jg": "Ukryj zaawansowane opcje",
"lIEejV": "Pokaż zaawansowane opcje",
+ "Hp/0iW": "Wprowadź ścieżkę (np. /checkout), nie pełny URL.",
"JX99mM": "Nazwa hosta (opcjonalnie)",
"snh6R6": "Etykieta (opcjonalnie)",
"F1HScC": "Filtruj według parametru URL",
"1t1lSU": "Filtruj według właściwości zdarzenia",
"cfiGPy": "Nowy parametr",
"lqNsts": "Nowa właściwość",
+ "Y6DkLY": "Ścieżka (np. /pricing)",
+ "OZ7LR+": "",
+ "+aHMUx": "",
+ "vHXIqS": "",
+ "tWsaCv": "",
+ "Cf6LHR": "Nazwa lejka",
+ "TOuHNM": "Wprowadź nazwę lejka",
"XmAxo6": "Dodaj krok",
"tINfvW": "Użyj * aby dopasować pojedynczy segment ścieżki (np. /blog/*) lub ** aby dopasować wiele segmentów (np. /docs/**/intro)",
- "ox304v": "Wystąpił błąd",
- "KbGBQH": "Wystąpił błąd podczas zapisywania",
+ "s+vZVl": "Podgląd lejka",
"/liMUf": "Lejek usunięty pomyślnie",
"ToO3/h": "",
"753yX5": "Etykieta",
diff --git a/client/messages/pt.json b/client/messages/pt.json
index 35c54eaa6..edad92d9d 100644
--- a/client/messages/pt.json
+++ b/client/messages/pt.json
@@ -463,8 +463,6 @@
"jhVKvF": "Não é igual a",
"SBUMrd": "Filtrar feature flags",
"wsKkfk": "Nenhuma feature flag ainda",
- "z6IYcX": "Todas as etapas devem ter valores",
- "jm52QG": "Por favor, insira um nome para o funil",
"+N7isb": "Funil salvo com sucesso",
"6S3VIt": "Falha ao salvar funil: {message}",
"aWjWtn": "Criar Funil",
@@ -491,28 +489,26 @@
"gUKiFL": "Configure as etapas do seu funil",
"XFyfI5": "Conversão geral",
"AFl3K6": "Conversão da etapa anterior",
- "Y6DkLY": "Caminho (ex. /pricing)",
- "OZ7LR+": "",
- "+aHMUx": "",
- "vHXIqS": "",
- "tWsaCv": "",
- "s+vZVl": "Pré-visualização do Funil",
- "Cf6LHR": "Nome do Funil",
- "TOuHNM": "Digite o nome do funil",
"+U6ozc": "Tipo",
- "Hp/0iW": "Digite um caminho (ex., /checkout), não uma URL completa.",
"Asi2Jg": "Ocultar opções avançadas",
"lIEejV": "Mostrar opções avançadas",
+ "Hp/0iW": "Digite um caminho (ex., /checkout), não uma URL completa.",
"JX99mM": "Hostname (opcional)",
"snh6R6": "Rótulo (opcional)",
"F1HScC": "Filtrar por parâmetro de URL",
"1t1lSU": "Filtrar por propriedade do evento",
"cfiGPy": "Novo Parâmetro",
"lqNsts": "Nova Propriedade",
+ "Y6DkLY": "Caminho (ex. /pricing)",
+ "OZ7LR+": "",
+ "+aHMUx": "",
+ "vHXIqS": "",
+ "tWsaCv": "",
+ "Cf6LHR": "Nome do Funil",
+ "TOuHNM": "Digite o nome do funil",
"XmAxo6": "Adicionar Etapa",
"tINfvW": "Use * para corresponder a um único segmento de caminho (ex., /blog/*) ou ** para corresponder a múltiplos segmentos (ex., /docs/**/intro)",
- "ox304v": "Ocorreu um erro",
- "KbGBQH": "Ocorreu um erro ao salvar",
+ "s+vZVl": "Pré-visualização do Funil",
"/liMUf": "Funil excluído com sucesso",
"ToO3/h": "",
"753yX5": "Rótulo",
diff --git a/client/messages/uk.json b/client/messages/uk.json
index f0a6391ba..fa3acae6b 100644
--- a/client/messages/uk.json
+++ b/client/messages/uk.json
@@ -463,8 +463,6 @@
"jhVKvF": "",
"SBUMrd": "",
"wsKkfk": "",
- "z6IYcX": "Усі кроки повинні мати значення",
- "jm52QG": "Будь ласка, введіть назву воронки",
"+N7isb": "Воронку успішно збережено",
"6S3VIt": "Не вдалося зберегти воронку: {message}",
"aWjWtn": "Створити воронку",
@@ -491,28 +489,26 @@
"gUKiFL": "Налаштуйте кроки вашої воронки",
"XFyfI5": "Загальна конверсія",
"AFl3K6": "Конверсія з попереднього кроку",
- "Y6DkLY": "Шлях (наприклад, /pricing)",
- "OZ7LR+": "",
- "+aHMUx": "",
- "vHXIqS": "",
- "tWsaCv": "",
- "s+vZVl": "Попередній перегляд воронки",
- "Cf6LHR": "Назва воронки",
- "TOuHNM": "Введіть назву воронки",
"+U6ozc": "Тип",
- "Hp/0iW": "Введіть шлях (наприклад, /checkout), а не повну URL-адресу.",
"Asi2Jg": "Приховати розширені опції",
"lIEejV": "Показати розширені опції",
+ "Hp/0iW": "Введіть шлях (наприклад, /checkout), а не повну URL-адресу.",
"JX99mM": "Ім'я хоста (необов'язково)",
"snh6R6": "Мітка (необов'язково)",
"F1HScC": "Фільтрувати за параметром URL",
"1t1lSU": "Фільтрувати за властивістю події",
"cfiGPy": "Новий параметр",
"lqNsts": "Нова властивість",
+ "Y6DkLY": "Шлях (наприклад, /pricing)",
+ "OZ7LR+": "",
+ "+aHMUx": "",
+ "vHXIqS": "",
+ "tWsaCv": "",
+ "Cf6LHR": "Назва воронки",
+ "TOuHNM": "Введіть назву воронки",
"XmAxo6": "Додати крок",
"tINfvW": "Використовуйте * для збігу з одним сегментом шляху (напр., /blog/*) або ** для збігу з кількома сегментами (напр., /docs/**/intro)",
- "ox304v": "Сталася помилка",
- "KbGBQH": "Сталася помилка під час збереження",
+ "s+vZVl": "Попередній перегляд воронки",
"/liMUf": "Воронку успішно видалено",
"ToO3/h": "",
"753yX5": "Мітка",
diff --git a/client/messages/zh.json b/client/messages/zh.json
index 3f4fcfd5c..ed753bb4b 100644
--- a/client/messages/zh.json
+++ b/client/messages/zh.json
@@ -463,8 +463,6 @@
"jhVKvF": "不等于",
"SBUMrd": "筛选功能标志",
"wsKkfk": "暂无功能标志",
- "z6IYcX": "所有步骤都必须有值",
- "jm52QG": "请输入漏斗名称",
"+N7isb": "漏斗保存成功",
"6S3VIt": "保存漏斗失败:{message}",
"aWjWtn": "创建漏斗",
@@ -491,28 +489,26 @@
"gUKiFL": "配置您的漏斗步骤",
"XFyfI5": "整体转化率",
"AFl3K6": "较上一步的转化率",
- "Y6DkLY": "路径(例如 /pricing)",
- "OZ7LR+": "",
- "+aHMUx": "",
- "vHXIqS": "",
- "tWsaCv": "",
- "s+vZVl": "漏斗预览",
- "Cf6LHR": "漏斗名称",
- "TOuHNM": "输入漏斗名称",
"+U6ozc": "类型",
- "Hp/0iW": "输入一个路径(例如 /checkout),而不是完整的 URL。",
"Asi2Jg": "隐藏高级选项",
"lIEejV": "显示高级选项",
+ "Hp/0iW": "输入一个路径(例如 /checkout),而不是完整的 URL。",
"JX99mM": "主机名(可选)",
"snh6R6": "标签(可选)",
"F1HScC": "按 URL 参数过滤",
"1t1lSU": "按事件属性过滤",
"cfiGPy": "新参数",
"lqNsts": "新属性",
+ "Y6DkLY": "路径(例如 /pricing)",
+ "OZ7LR+": "",
+ "+aHMUx": "",
+ "vHXIqS": "",
+ "tWsaCv": "",
+ "Cf6LHR": "漏斗名称",
+ "TOuHNM": "输入漏斗名称",
"XmAxo6": "添加步骤",
"tINfvW": "使用 * 匹配单个路径段(例如 /blog/*)或使用 ** 匹配多个段(例如 /docs/**/intro)",
- "ox304v": "发生错误",
- "KbGBQH": "保存时发生错误",
+ "s+vZVl": "漏斗预览",
"/liMUf": "漏斗删除成功",
"ToO3/h": "",
"753yX5": "标签",
diff --git a/client/src/api/analytics/hooks/funnels/useGetFunnel.ts b/client/src/api/analytics/hooks/funnels/useGetFunnel.ts
index bcb203927..1ba5aedaa 100644
--- a/client/src/api/analytics/hooks/funnels/useGetFunnel.ts
+++ b/client/src/api/analytics/hooks/funnels/useGetFunnel.ts
@@ -30,6 +30,9 @@ export function useGetFunnel(config?: FunnelRequest, debounce?: boolean) {
name: configToUse.name,
});
},
+ // Keep showing the previous result while a changed configuration refetches,
+ // so the live preview updates in place instead of flashing a loader
+ placeholderData: previousData => previousData,
enabled: !!site && !!configToUse,
});
}
diff --git a/client/src/app/[site]/funnels/components/CreateFunnel.tsx b/client/src/app/[site]/funnels/components/CreateFunnel.tsx
index 5c65e08c5..571fa4e52 100644
--- a/client/src/app/[site]/funnels/components/CreateFunnel.tsx
+++ b/client/src/app/[site]/funnels/components/CreateFunnel.tsx
@@ -2,7 +2,7 @@
import { useExtracted } from "next-intl";
import { Button } from "@/components/ui/button";
-import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog";
+import { Dialog, DialogContentFullScreen, DialogTrigger } from "@/components/ui/dialog";
import { Plus } from "lucide-react";
import { useState } from "react";
import { toast } from "@/components/ui/sonner";
@@ -10,91 +10,56 @@ import { useGetFunnel, useSaveFunnel } from "../../../../api/analytics/hooks/fun
import { FunnelStep, hasIncompleteSteps } from "../../../../api/analytics/endpoints";
import { FunnelForm } from "./FunnelForm";
+const buildDefaultSteps = (): FunnelStep[] => [
+ { type: "page", value: "/", name: "Homepage" },
+ { type: "page", value: "", name: "" },
+];
+
export function CreateFunnelDialog() {
const t = useExtracted();
const [open, setOpen] = useState(false);
// Funnel steps state
- const [steps, setSteps] = useState<FunnelStep[]>([
- { type: "page", value: "/", name: "Homepage" },
- { type: "page", value: "", name: "" },
- ]);
+ const [steps, setSteps] = useState<FunnelStep[]>(buildDefaultSteps);
// Funnel name
const [name, setName] = useState("New Funnel");
- // Funnel analysis query
+ // Funnel analysis query (drives the live preview)
const {
data,
isError,
error,
isLoading: isPending,
- } = useGetFunnel(
- hasIncompleteSteps(steps)
- ? undefined
- : {
- steps,
- },
- true
- );
+ } = useGetFunnel(hasIncompleteSteps(steps) ? undefined : { steps }, true);
// Funnel save mutation
- const { mutate: saveFunnel, isPending: isSaving, error: saveError } = useSaveFunnel();
-
- // Query funnel without saving
- const handleQueryFunnel = () => {
- // Validate steps have values
- const hasEmptySteps = hasIncompleteSteps(steps);
- if (hasEmptySteps) {
- alert(t("All steps must have values"));
- return;
- }
- };
+ const { mutate: saveFunnel, isPending: isSaving } = useSaveFunnel();
- // Save funnel configuration
+ // Save funnel configuration (the save button is disabled while invalid)
const handleSaveFunnel = () => {
- // Validate name
- if (!name.trim()) {
- alert(t("Please enter a funnel name"));
- return;
- }
-
- // Validate steps have values
- const hasEmptySteps = hasIncompleteSteps(steps);
- if (hasEmptySteps) {
- alert(t("All steps must have values"));
- return;
- }
+ if (!name.trim() || hasIncompleteSteps(steps)) return;
- // Save funnel directly without analyzing
saveFunnel(
- {
- steps,
- name,
- },
+ { steps, name },
{
onSuccess: () => {
- // Close dialog on successful save
setOpen(false);
- // Optional: Show success message
toast?.success(t("Funnel saved successfully"));
},
onError: error => {
- // Show error but don't close dialog
+ // Show error but don't close the editor
toast?.error(t("Failed to save funnel: {message}", { message: error.message }));
},
}
);
};
- // Reset form when dialog closes
+ // Reset form when the editor closes
const handleOpenChange = (open: boolean) => {
setOpen(open);
if (!open) {
- setSteps([
- { type: "page", value: "/", name: "Homepage" },
- { type: "page", value: "", name: "" },
- ]);
+ setSteps(buildDefaultSteps());
setName("New Funnel");
}
};
@@ -106,28 +71,29 @@ export function CreateFunnelDialog() {
<Plus className="w-4 h-4" /> {t("Create Funnel")}
</Button>
</DialogTrigger>
- <DialogContent className="max-w-[95vw]">
- <DialogHeader>
- <DialogTitle>{t("Create Funnel")}</DialogTitle>
- </DialogHeader>
-
+ <DialogContentFullScreen
+ aria-describedby={undefined}
+ onOpenAutoFocus={e => {
+ e.preventDefault();
+ document.getElementById("funnel-name-input")?.focus();
+ }}
+ >
<FunnelForm
+ title={t("Create Funnel")}
name={name}
setName={setName}
steps={steps}
setSteps={setSteps}
onSave={handleSaveFunnel}
onCancel={() => setOpen(false)}
- onQuery={handleQueryFunnel}
saveButtonText={t("Save Funnel")}
isSaving={isSaving}
isError={isError}
isPending={isPending}
error={error}
- saveError={saveError}
funnelData={data}
/>
- </DialogContent>
+ </DialogContentFullScreen>
</Dialog>
);
}
diff --git a/client/src/app/[site]/funnels/components/EditFunnel.tsx b/client/src/app/[site]/funnels/components/EditFunnel.tsx
index 66b14cc11..cd8fe8022 100644
--- a/client/src/app/[site]/funnels/components/EditFunnel.tsx
+++ b/client/src/app/[site]/funnels/components/EditFunnel.tsx
@@ -1,8 +1,8 @@
"use client";
import { useExtracted } from "next-intl";
-import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
-import { useEffect, useState } from "react";
+import { Dialog, DialogContentFullScreen } from "@/components/ui/dialog";
+import { useState } from "react";
import { toast } from "@/components/ui/sonner";
import { useGetFunnel, useSaveFunnel } from "../../../../api/analytics/hooks/funnels/useGetFunnel";
import { FunnelStep, hasIncompleteSteps, SavedFunnel } from "../../../../api/analytics/endpoints";
@@ -23,48 +23,21 @@ export function EditFunnelDialog({ funnel, isOpen, onClose, isCloneMode = false
// Funnel name - initialized from funnel, with "(Copy)" suffix for clone mode
const [name, setName] = useState(isCloneMode ? `${funnel.name} (Copy)` : funnel.name);
- // Funnel analysis query
+ // Funnel analysis query (drives the live preview)
const {
data,
isError,
error,
isLoading: isPending,
- } = useGetFunnel(
- {
- steps,
- },
- true
- );
+ } = useGetFunnel(hasIncompleteSteps(steps) ? undefined : { steps }, true);
// Funnel save mutation
- const { mutate: saveFunnel, isPending: isSaving, error: saveError } = useSaveFunnel();
-
- // Query funnel without saving
- const handleQueryFunnel = () => {
- // Validate steps have values
- const hasEmptySteps = hasIncompleteSteps(steps);
- if (hasEmptySteps) {
- alert(t("All steps must have values"));
- return;
- }
- };
+ const { mutate: saveFunnel, isPending: isSaving } = useSaveFunnel();
- // Update or clone funnel
+ // Update or clone funnel (the save button is disabled while invalid)
const handleUpdateFunnel = () => {
- // Validate name
- if (!name.trim()) {
- alert(t("Please enter a funnel name"));
- return;
- }
+ if (!name.trim() || hasIncompleteSteps(steps)) return;
- // Validate steps have values
- const hasEmptySteps = hasIncompleteSteps(steps);
- if (hasEmptySteps) {
- alert(t("All steps must have values"));
- return;
- }
-
- // Update funnel with the report ID (or create new if cloning)
saveFunnel(
{
steps,
@@ -73,49 +46,46 @@ export function EditFunnelDialog({ funnel, isOpen, onClose, isCloneMode = false
},
{
onSuccess: () => {
- // Close dialog on successful save
onClose();
- // Show success message
toast?.success(isCloneMode ? t("Funnel cloned successfully") : t("Funnel updated successfully"));
},
onError: error => {
- // Show error but don't close dialog
- toast?.error(isCloneMode ? t("Failed to clone funnel: {message}", { message: error.message }) : t("Failed to update funnel: {message}", { message: error.message }));
+ // Show error but don't close the editor
+ toast?.error(
+ isCloneMode
+ ? t("Failed to clone funnel: {message}", { message: error.message })
+ : t("Failed to update funnel: {message}", { message: error.message })
+ );
},
}
);
};
- // Load existing funnel data on first render
- useEffect(() => {
- // Pre-load the funnel visualization
- handleQueryFunnel();
- }, []);
-
return (
<Dialog open={isOpen} onOpenChange={open => !open && onClose()}>
- <DialogContent className="max-w-[95vw]">
- <DialogHeader>
- <DialogTitle>{isCloneMode ? t("Clone Funnel") : t("Edit Funnel")}</DialogTitle>
- </DialogHeader>
-
+ <DialogContentFullScreen
+ aria-describedby={undefined}
+ onOpenAutoFocus={e => {
+ e.preventDefault();
+ document.getElementById("funnel-name-input")?.focus();
+ }}
+ >
<FunnelForm
+ title={isCloneMode ? t("Clone Funnel") : t("Edit Funnel")}
name={name}
setName={setName}
steps={steps}
setSteps={setSteps}
onSave={handleUpdateFunnel}
onCancel={onClose}
- onQuery={handleQueryFunnel}
saveButtonText={isCloneMode ? t("Clone Funnel") : t("Update Funnel")}
isSaving={isSaving}
isError={isError}
isPending={isPending}
error={error}
- saveError={saveError}
funnelData={data}
/>
- </DialogContent>
+ </DialogContentFullScreen>
</Dialog>
);
}
diff --git a/client/src/app/[site]/funnels/components/FunnelForm.tsx b/client/src/app/[site]/funnels/components/FunnelForm.tsx
index 642a871b5..f9023e2ca 100644
--- a/client/src/app/[site]/funnels/components/FunnelForm.tsx
+++ b/client/src/app/[site]/funnels/components/FunnelForm.tsx
@@ -1,54 +1,254 @@
import { useExtracted } from "next-intl";
import { Button } from "@/components/ui/button";
+import { DialogTitle } from "@/components/ui/dialog";
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 { Reorder, useDragControls } from "framer-motion";
+import round from "lodash/round";
+import { ChevronDown, ChevronUp, Funnel as FunnelIcon, GripVertical, Plus, Save, Trash2, X } from "lucide-react";
import { useMemo, useState } from "react";
-import { FunnelResponse, FunnelStep, FunnelStepType, hasIncompleteSteps } from "../../../../api/analytics/endpoints";
+import {
+ FunnelResponse,
+ FunnelStep,
+ FunnelStepType,
+ hasIncompleteSteps,
+} from "../../../../api/analytics/endpoints";
import { useAutocaptureValuesByType } from "../../../../api/analytics/hooks/events/useAutocaptureValues";
import { useMetric } from "../../../../api/analytics/hooks/useGetMetric";
import { ThreeDotLoader } from "../../../../components/Loaders";
import { Label } from "../../../../components/ui/label";
import { Switch } from "../../../../components/ui/switch";
-import { isAutocaptureTargetType } from "../../../../lib/events";
+import { EventTypeIcon } from "../../../../components/EventIcons";
+import { isAutocaptureTargetType, targetTypeToEventType } from "../../../../lib/events";
import { Funnel } from "./Funnel";
const URL_PATTERN = /^(https?:\/\/|www\.|[a-zA-Z0-9-]+\.[a-zA-Z]{2,}\/)/i;
+type PropertyFilterDraft = { key: string; value: string };
+
interface FunnelFormProps {
+ title: string;
name: string;
setName: (name: string) => void;
steps: FunnelStep[];
setSteps: (steps: FunnelStep[]) => void;
onSave: () => void;
onCancel: () => void;
- onQuery: () => void;
saveButtonText: string;
isSaving: boolean;
isError: boolean;
isPending: boolean;
error: unknown;
- saveError: unknown;
funnelData?: FunnelResponse[];
}
+interface StepCardProps {
+ id: string;
+ index: number;
+ step: FunnelStep;
+ stepTypeLabels: Record<FunnelStepType, string>;
+ stepValuePlaceholders: Record<FunnelStepType, string>;
+ valueSuggestions: SuggestionOption[];
+ hostnameSuggestions: SuggestionOption[];
+ urlError: boolean;
+ expanded: boolean;
+ usePropertyFilters: boolean;
+ propertyFilters: PropertyFilterDraft[];
+ canRemove: boolean;
+ onTypeChange: (type: FunnelStepType) => void;
+ onFieldChange: (field: keyof FunnelStep, value: string) => void;
+ onToggleExpanded: () => void;
+ onTogglePropertyFilters: (enabled: boolean) => void;
+ onPropertyFiltersChange: (filters: PropertyFilterDraft[], syncToStep: boolean) => void;
+ onRemove: () => void;
+}
+
+function StepCard({
+ id,
+ index,
+ step,
+ stepTypeLabels,
+ stepValuePlaceholders,
+ valueSuggestions,
+ hostnameSuggestions,
+ urlError,
+ expanded,
+ usePropertyFilters,
+ propertyFilters,
+ canRemove,
+ onTypeChange,
+ onFieldChange,
+ onToggleExpanded,
+ onTogglePropertyFilters,
+ onPropertyFiltersChange,
+ onRemove,
+}: StepCardProps) {
+ const t = useExtracted();
+ const dragControls = useDragControls();
+
+ return (
+ <Reorder.Item
+ value={id}
+ dragListener={false}
+ dragControls={dragControls}
+ transition={{ duration: 0 }}
+ dragTransition={{ bounceStiffness: 100000, bounceDamping: 100000 }}
+ className="rounded-lg border border-neutral-200 bg-white p-3 dark:border-neutral-800 dark:bg-neutral-900"
+ >
+ <div className="flex items-center gap-2">
+ <GripVertical
+ aria-hidden
+ className="h-4 w-4 shrink-0 cursor-grab touch-none text-neutral-400 active:cursor-grabbing"
+ onPointerDown={e => {
+ e.preventDefault();
+ dragControls.start(e);
+ }}
+ />
+ <div className="flex h-6 w-6 shrink-0 items-center justify-center rounded-full bg-neutral-100 text-xs dark:bg-neutral-800">
+ {index + 1}
+ </div>
+ <Select value={step.type} onValueChange={value => onTypeChange(value as FunnelStepType)}>
+ <SelectTrigger className="w-[140px]">
+ <SelectValue placeholder={t("Type")} />
+ </SelectTrigger>
+ <SelectContent>
+ {(Object.keys(stepTypeLabels) as FunnelStepType[]).map(type => (
+ <SelectItem key={type} value={type}>
+ <span className="flex items-center gap-2">
+ <EventTypeIcon type={targetTypeToEventType(type)} tooltip={false} className="h-3.5 w-3.5" />
+ {stepTypeLabels[type]}
+ </span>
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
+ <div className="flex-1" />
+ <Button
+ variant="ghost"
+ size="smIcon"
+ onClick={onToggleExpanded}
+ title={expanded ? t("Hide advanced options") : t("Show advanced options")}
+ >
+ {expanded ? <ChevronUp className="h-4 w-4" /> : <ChevronDown className="h-4 w-4" />}
+ </Button>
+ <Button variant="ghost" size="smIcon" onClick={onRemove} disabled={!canRemove} title={t("Remove")}>
+ <Trash2 className="h-4 w-4" />
+ </Button>
+ </div>
+
+ <div className="mt-2">
+ <InputWithSuggestions
+ suggestions={valueSuggestions}
+ placeholder={stepValuePlaceholders[step.type]}
+ value={step.value}
+ className={cn("w-full", urlError && "border-red-500 dark:border-red-500")}
+ onChange={e => onFieldChange("value", e.target.value)}
+ />
+ {urlError && <p className="mt-1 text-xs text-red-500">{t("Enter a path (e.g., /checkout), not a full URL.")}</p>}
+ </div>
+
+ {expanded && (
+ <div className="mt-3 space-y-3 border-t border-neutral-100 pt-3 dark:border-neutral-800">
+ <div className="grid grid-cols-2 gap-2">
+ <InputWithSuggestions
+ suggestions={hostnameSuggestions}
+ placeholder={t("Hostname (optional)")}
+ value={step.hostname || ""}
+ className="w-full"
+ onChange={e => onFieldChange("hostname", e.target.value)}
+ />
+ <Input
+ placeholder={t("Label (optional)")}
+ value={step.name || ""}
+ onChange={e => onFieldChange("name", e.target.value)}
+ />
+ </div>
+
+ <div className="flex items-center gap-2">
+ <Switch
+ checked={usePropertyFilters}
+ onCheckedChange={checked => onTogglePropertyFilters(checked)}
+ id={`use-properties-${index}`}
+ />
+ <Label htmlFor={`use-properties-${index}`}>
+ {step.type === "page" ? t("Filter by URL parameter") : t("Filter by event property")}
+ </Label>
+ </div>
+
+ {usePropertyFilters && (
+ <div className="space-y-2">
+ {propertyFilters.map((filter, filterIndex) => (
+ <div key={filterIndex} className="flex items-start gap-2">
+ <div className="grid flex-1 grid-cols-2 gap-2">
+ <Input
+ placeholder={step.type === "page" ? "e.g., utm_source" : "e.g., plan_type"}
+ value={filter.key}
+ onChange={e => {
+ const rows = [...propertyFilters];
+ rows[filterIndex] = { ...rows[filterIndex], key: e.target.value };
+ onPropertyFiltersChange(rows, true);
+ }}
+ />
+ <Input
+ placeholder={step.type === "page" ? "e.g., adwords" : "e.g., premium"}
+ value={filter.value}
+ onChange={e => {
+ const rows = [...propertyFilters];
+ rows[filterIndex] = { ...rows[filterIndex], value: e.target.value };
+ onPropertyFiltersChange(rows, true);
+ }}
+ />
+ </div>
+ {propertyFilters.length > 1 && (
+ <Button
+ type="button"
+ variant="ghost"
+ size="smIcon"
+ title={t("Remove")}
+ onClick={() => {
+ onPropertyFiltersChange(
+ propertyFilters.filter((_, i) => i !== filterIndex),
+ true
+ );
+ }}
+ >
+ <X className="h-4 w-4" />
+ </Button>
+ )}
+ </div>
+ ))}
+ <Button
+ type="button"
+ variant="outline"
+ size="sm"
+ onClick={() => onPropertyFiltersChange([...propertyFilters, { key: "", value: "" }], false)}
+ >
+ <Plus className="h-4 w-4" />
+ {step.type === "page" ? t("New Parameter") : t("New Property")}
+ </Button>
+ </div>
+ )}
+ </div>
+ )}
+ </Reorder.Item>
+ );
+}
+
export function FunnelForm({
+ title,
name,
setName,
steps,
setSteps,
onSave,
onCancel,
- onQuery,
saveButtonText,
isSaving,
isError,
isPending,
error,
- saveError,
funnelData,
}: FunnelFormProps) {
const t = useExtracted();
@@ -79,7 +279,7 @@ export function FunnelForm({
);
// State for managing multiple property filters per step (store as strings in UI)
- const [stepPropertyFilters, setStepPropertyFilters] = useState<Array<Array<{ key: string; value: string }>>>(() =>
+ const [stepPropertyFilters, setStepPropertyFilters] = useState<PropertyFilterDraft[][]>(() =>
steps.map(
step =>
step.propertyFilters?.map(f => ({ key: f.key, value: String(f.value) })) ||
@@ -112,6 +312,9 @@ export function FunnelForm({
);
const hasUrlErrors = stepUrlErrors.some(Boolean);
+ const hasIncomplete = hasIncompleteSteps(steps);
+ const canSave = !!name.trim() && !hasIncomplete && !hasUrlErrors && !isSaving;
+
// Fetch suggestions for paths, events, and hostnames
const { data: pathsData } = useMetric({
parameter: "pathname",
@@ -265,277 +468,153 @@ export function FunnelForm({
}
};
+ // Update a step's property-filter draft rows; syncToStep is false when adding
+ // an empty row so incomplete filters don't reach the preview query
+ const updateFilterRows = (index: number, rows: PropertyFilterDraft[], syncToStep: boolean) => {
+ const newStepPropertyFilters = [...stepPropertyFilters];
+ newStepPropertyFilters[index] = rows;
+ setStepPropertyFilters(newStepPropertyFilters);
+
+ if (syncToStep) {
+ const newSteps = [...steps];
+ newSteps[index] = { ...newSteps[index], propertyFilters: rows };
+ setSteps(newSteps);
+ }
+ };
+
+ const toggleExpanded = (index: number) => {
+ const newExpandedSteps = [...expandedSteps];
+ newExpandedSteps[index] = !newExpandedSteps[index];
+ setExpandedSteps(newExpandedSteps);
+ };
+
+ const overallConversion =
+ !hasIncomplete && funnelData?.length ? round(funnelData[funnelData.length - 1].conversion_rate, 2) : null;
+
let funnelArea = null;
if (funnelData && funnelData.length) {
funnelArea = <Funnel data={funnelData} isError={isError} error={error} isPending={isPending} steps={steps} />;
+ } else {
+ funnelArea = (
+ <div className="flex flex-1 items-center justify-center py-16">
+ <ThreeDotLoader />
+ </div>
+ );
}
- if (hasIncompleteSteps(steps)) {
+ if (isError) {
funnelArea = (
- <div className="flex items-center justify-center rounded-lg h-full">
- <div className="text-center p-6">
- <div className="text-lg font-medium mb-2">{t("Funnel Preview")}</div>
- <p className="text-sm text-neutral-500">{t("Configure your funnel steps")}</p>
- </div>
+ <div className="flex flex-1 items-center justify-center py-16">
+ <p className="text-sm text-red-500">
+ {t("Error:")} {error instanceof Error ? error.message : t("Failed to analyze funnel")}
+ </p>
</div>
);
}
if (isPending) {
funnelArea = (
- <div className="flex items-center justify-center rounded-lg h-full">
+ <div className="flex flex-1 items-center justify-center py-16">
<ThreeDotLoader />
</div>
);
}
- return (
- <>
- <div className="grid grid-cols-[500px_3fr] gap-6">
- {/* Left side: Funnel configuration form */}
- <div className="space-y-4">
- <div>
- <label className="text-sm font-medium mb-1 block">{t("Funnel Name")}</label>
- <Input value={name} onChange={e => setName(e.target.value)} placeholder={t("Enter funnel name")} />
- </div>
-
- <div className="max-h-[calc(100vh-300px)] overflow-y-auto">
- <Reorder.Group axis="y" values={stepIds} onReorder={handleReorder} className="list-none">
- {stepIds.map((id, index) => {
- const step = steps[index];
- return (
- <Reorder.Item
- key={id}
- value={id}
- transition={{ duration: 0 }}
- dragTransition={{ bounceStiffness: 100000, bounceDamping: 100000 }}
- className={cn(
- "flex flex-col space-y-2 border border-neutral-200 dark:border-neutral-800 p-4 bg-white dark:bg-neutral-900",
- index === 0 && "rounded-t-lg",
- index === steps.length - 1 && "rounded-b-lg",
- index !== 0 && "-mt-px"
- )}
- >
- {/* Top row: Step number, type, value, expand toggle, delete */}
- <div className="flex items-center gap-2">
- <GripVertical className="shrink-0 h-4 w-4 cursor-grab active:cursor-grabbing text-neutral-400" />
- <div className="shrink-0 w-6 h-6 rounded-full border border-neutral-300 dark:border-neutral-700 flex items-center justify-center text-xs">
- {index + 1}
- </div>
- <Select value={step.type} onValueChange={value => updateStepType(index, value as FunnelStepType)}>
- <SelectTrigger className="min-w-[105px] max-w-[105px] border-neutral-300 dark:border-neutral-700">
- <SelectValue placeholder={t("Type")} />
- </SelectTrigger>
- <SelectContent>
- {(Object.keys(stepTypeLabels) as FunnelStepType[]).map(type => (
- <SelectItem key={type} value={type}>
- {stepTypeLabels[type]}
- </SelectItem>
- ))}
- </SelectContent>
- </Select>
- <div className="flex flex-col">
- <InputWithSuggestions
- suggestions={stepSuggestions[step.type]}
- placeholder={stepValuePlaceholders[step.type]}
- value={step.value}
- className={cn(
- "border-neutral-300 dark:border-neutral-700 w-[260px]",
- stepUrlErrors[index] && "border-red-500 dark:border-red-500"
- )}
- onChange={e => updateStep(index, "value", e.target.value)}
- />
- {stepUrlErrors[index] && (
- <p className="text-xs text-red-500 mt-1">
- {t("Enter a path (e.g., /checkout), not a full URL.")}
- </p>
- )}
- </div>
- <div className="flex items-center">
- <Button
- variant="ghost"
- size="smIcon"
- onClick={() => {
- const newExpandedSteps = [...expandedSteps];
- newExpandedSteps[index] = !newExpandedSteps[index];
- setExpandedSteps(newExpandedSteps);
- }}
- title={expandedSteps[index] ? t("Hide advanced options") : t("Show advanced options")}
- >
- {expandedSteps[index] ? (
- <ChevronUp className="h-4 w-4" />
- ) : (
- <ChevronDown className="h-4 w-4" />
- )}
- </Button>
- <Button
- variant="ghost"
- size="smIcon"
- onClick={() => removeStep(index)}
- disabled={steps.length <= 2}
- >
- <Trash2 className="h-4 w-4" />
- </Button>
- </div>
- </div>
-
- {/* Collapsible advanced options */}
- {expandedSteps[index] && (
- <div className="ml-14 space-y-2 pt-2">
- <div className="flex gap-2">
- <InputWithSuggestions
- suggestions={hostnameSuggestions}
- placeholder={t("Hostname (optional)")}
- value={step.hostname || ""}
- className="border-neutral-300 dark:border-neutral-700 w-40"
- onChange={e => updateStep(index, "hostname", e.target.value)}
- />
- <Input
- placeholder={t("Label (optional)")}
- className="border-neutral-300 dark:border-neutral-700 grow"
- value={step.name || ""}
- onChange={e => updateStep(index, "name", e.target.value)}
- />
- </div>
- {/* Property filtering for both page and event steps */}
- <div className="space-y-2">
- <div className="flex items-center space-x-2">
- <Switch
- checked={useProperties[index]}
- onCheckedChange={checked => togglePropertyFiltering(index, checked)}
- id={`use-properties-${index}`}
- />
- <Label htmlFor={`use-properties-${index}`}>
- {step.type === "page" ? t("Filter by URL parameter") : t("Filter by event property")}
- </Label>
- </div>
-
- {useProperties[index] && (
- <div className="space-y-3">
- {stepPropertyFilters[index]?.map((filter, filterIndex) => (
- <div key={filterIndex} className="flex gap-2 items-start">
- <div className="flex-1 grid grid-cols-2 gap-2">
- <Input
- placeholder={step.type === "page" ? "e.g., utm_source" : "e.g., plan_type"}
- className="border-neutral-300 dark:border-neutral-700"
- value={filter.key}
- onChange={e => {
- // Create immutable copies for nested state
- const newStepPropertyFilters = [...stepPropertyFilters];
- const stepFilters = [...newStepPropertyFilters[index]];
- const updatedFilter = { ...stepFilters[filterIndex], key: e.target.value };
- stepFilters[filterIndex] = updatedFilter;
- newStepPropertyFilters[index] = stepFilters;
- setStepPropertyFilters(newStepPropertyFilters);
-
- // Update the step with propertyFilters immutably
- const newSteps = [...steps];
- newSteps[index] = { ...newSteps[index], propertyFilters: stepFilters };
- setSteps(newSteps);
- }}
- />
- <Input
- placeholder={step.type === "page" ? "e.g., adwords" : "e.g., premium"}
- className="border-neutral-300 dark:border-neutral-700"
- value={filter.value}
- onChange={e => {
- // Create immutable copies for nested state
- const newStepPropertyFilters = [...stepPropertyFilters];
- const stepFilters = [...newStepPropertyFilters[index]];
- const updatedFilter = { ...stepFilters[filterIndex], value: e.target.value };
- stepFilters[filterIndex] = updatedFilter;
- newStepPropertyFilters[index] = stepFilters;
- setStepPropertyFilters(newStepPropertyFilters);
-
- // Update the step with propertyFilters immutably
- const newSteps = [...steps];
- newSteps[index] = { ...newSteps[index], propertyFilters: stepFilters };
- setSteps(newSteps);
- }}
- />
- </div>
- {stepPropertyFilters[index].length > 1 && (
- <Button
- type="button"
- variant="ghost"
- size="icon"
- onClick={() => {
- // Create immutable copies for nested state
- const newStepPropertyFilters = [...stepPropertyFilters];
- const stepFilters = newStepPropertyFilters[index].filter(
- (_, i) => i !== filterIndex
- );
- newStepPropertyFilters[index] = stepFilters;
- setStepPropertyFilters(newStepPropertyFilters);
-
- // Update the step with propertyFilters immutably
- const newSteps = [...steps];
- newSteps[index] = { ...newSteps[index], propertyFilters: stepFilters };
- setSteps(newSteps);
- }}
- >
- <X className="h-4 w-4" />
- </Button>
- )}
- </div>
- ))}
- <Button
- type="button"
- variant="outline"
- size="sm"
- onClick={() => {
- const newStepPropertyFilters = [...stepPropertyFilters];
- newStepPropertyFilters[index] = [
- ...newStepPropertyFilters[index],
- { key: "", value: "" },
- ];
- setStepPropertyFilters(newStepPropertyFilters);
- }}
- >
- <Plus className="h-4 w-4" />
- {step.type === "page" ? t("New Parameter") : t("New Property")}
- </Button>
- </div>
- )}
- </div>
- </div>
- )}
- </Reorder.Item>
- );
- })}
- </Reorder.Group>
- <Button onClick={addStep} size="sm" className="mt-2">
- <Plus className="h-4 w-4" /> {t("Add Step")}
- </Button>
- </div>
- </div>
- {funnelArea}
+ if (hasIncomplete) {
+ funnelArea = (
+ <div className="flex flex-1 flex-col items-center justify-center gap-2 py-16 text-center">
+ <FunnelIcon className="h-8 w-8 text-neutral-300 dark:text-neutral-700" />
+ <p className="text-sm text-neutral-500 dark:text-neutral-400">{t("Configure your funnel steps")}</p>
</div>
+ );
+ }
- <div className="flex justify-between items-center">
- <span className="text-xs text-neutral-600 dark:text-neutral-500">
- {t("Use * to match a single path segment (e.g., /blog/*) or ** to match multiple segments (e.g., /docs/**/intro)")}
- </span>
- <div className="text-sm text-red-500">
- {(() => {
- if (isError) {
- return error instanceof Error ? error.message : t("An error occurred");
- } else if (saveError) {
- return saveError instanceof Error ? saveError.message : t("An error occurred while saving");
- }
- return null;
- })()}
- </div>
- <div className="flex gap-2">
+ return (
+ <>
+ {/* Header: title + actions */}
+ <div className="flex h-14 shrink-0 items-center justify-between gap-4 border-b border-neutral-150 px-4 dark:border-neutral-850 md:px-6">
+ <DialogTitle className="min-w-0 truncate text-base font-semibold tracking-tight">{title}</DialogTitle>
+ <div className="flex shrink-0 items-center gap-2">
<Button variant="outline" onClick={onCancel}>
{t("Cancel")}
</Button>
- <Button onClick={onSave} disabled={isSaving || hasUrlErrors} variant="success">
+ <Button onClick={onSave} disabled={!canSave} variant="success">
<Save className="h-4 w-4" />
{isSaving ? t("Saving...") : saveButtonText}
</Button>
</div>
</div>
+
+ {/* Body: builder pane + preview pane, independently scrolling on lg+ */}
+ <div className="min-h-0 flex-1 overflow-y-auto lg:grid lg:grid-cols-[440px_minmax(0,1fr)] lg:grid-rows-[minmax(0,1fr)] lg:overflow-hidden xl:grid-cols-[500px_minmax(0,1fr)]">
+ {/* Builder */}
+ <div className="border-b border-neutral-150 dark:border-neutral-850 lg:overflow-y-auto lg:border-b-0 lg:border-r">
+ <div className="space-y-5 p-4 md:p-5">
+ <div>
+ <label htmlFor="funnel-name-input" className="mb-1.5 block text-sm font-medium">
+ {t("Funnel Name")}
+ </label>
+ <Input
+ id="funnel-name-input"
+ value={name}
+ onChange={e => setName(e.target.value)}
+ placeholder={t("Enter funnel name")}
+ />
+ </div>
+
+ <div className="space-y-2">
+ <Reorder.Group axis="y" values={stepIds} onReorder={handleReorder} className="list-none space-y-2">
+ {stepIds.map((id, index) => (
+ <StepCard
+ key={id}
+ id={id}
+ index={index}
+ step={steps[index]}
+ stepTypeLabels={stepTypeLabels}
+ stepValuePlaceholders={stepValuePlaceholders}
+ valueSuggestions={stepSuggestions[steps[index].type]}
+ hostnameSuggestions={hostnameSuggestions}
+ urlError={stepUrlErrors[index]}
+ expanded={expandedSteps[index]}
+ usePropertyFilters={useProperties[index]}
+ propertyFilters={stepPropertyFilters[index] || []}
+ canRemove={steps.length > 2}
+ onTypeChange={type => updateStepType(index, type)}
+ onFieldChange={(field, value) => updateStep(index, field, value)}
+ onToggleExpanded={() => toggleExpanded(index)}
+ onTogglePropertyFilters={enabled => togglePropertyFiltering(index, enabled)}
+ onPropertyFiltersChange={(rows, syncToStep) => updateFilterRows(index, rows, syncToStep)}
+ onRemove={() => removeStep(index)}
+ />
+ ))}
+ </Reorder.Group>
+ <Button onClick={addStep} variant="outline" className="w-full">
+ <Plus className="h-4 w-4" /> {t("Add Step")}
+ </Button>
+ </div>
+
+ <p className="text-xs leading-relaxed text-neutral-500 dark:text-neutral-400">
+ {t(
+ "Use * to match a single path segment (e.g., /blog/*) or ** to match multiple segments (e.g., /docs/**/intro)"
+ )}
+ </p>
+ </div>
+ </div>
+
+ {/* Preview */}
+ <div className="flex min-h-[320px] flex-col lg:min-h-0 lg:overflow-y-auto">
+ <div className="sticky top-0 z-10 flex h-12 shrink-0 items-center justify-between border-b border-neutral-150 bg-background px-4 dark:border-neutral-850 md:px-6">
+ <span className="text-sm font-medium text-neutral-500 dark:text-neutral-400">{t("Funnel Preview")}</span>
+ {overallConversion !== null && (
+ <div className="flex items-baseline gap-1.5">
+ <span className="text-sm font-semibold tabular-nums">{overallConversion}%</span>
+ <span className="text-xs text-neutral-500 dark:text-neutral-400">{t("Overall conversion")}</span>
+ </div>
+ )}
+ </div>
+ <div className="flex flex-1 flex-col px-4 pb-4 md:px-6">{funnelArea}</div>
+ </div>
+ </div>
</>
);
}
diff --git a/client/src/components/EventIcons.tsx b/client/src/components/EventIcons.tsx
index bf043ce3a..edb6b4c45 100644
--- a/client/src/components/EventIcons.tsx
+++ b/client/src/components/EventIcons.tsx
@@ -35,13 +35,19 @@ const EVENT_TYPE_COLORS: Record<string, string> = Object.fromEntries(
interface EventTypeIconProps {
type: EventType | string;
className?: string;
+ // Disable when the icon sits next to its own label (e.g. select options)
+ tooltip?: boolean;
}
-export function EventTypeIcon({ type, className }: EventTypeIconProps) {
+export function EventTypeIcon({ type, className, tooltip = true }: EventTypeIconProps) {
const t = useExtracted();
const Icon = EVENT_TYPE_ICONS[type as EventType] || MousePointerClick;
const colorClass = EVENT_TYPE_COLORS[type] || "text-amber-400";
+ if (!tooltip) {
+ return <Icon className={cn("h-4 w-4", className, colorClass)} />;
+ }
+
const translatedLabels: Record<string, string> = {
pageview: t("Pageview"),
custom_event: t("Event"),
diff --git a/client/src/components/ui/dialog.tsx b/client/src/components/ui/dialog.tsx
index 92ee4f108..f5bcacf78 100644
--- a/client/src/components/ui/dialog.tsx
+++ b/client/src/components/ui/dialog.tsx
@@ -57,6 +57,27 @@ const DialogContent = React.forwardRef<
));
DialogContent.displayName = DialogPrimitive.Content.displayName;
+// Full-viewport editor surface: no overlay (the content is opaque and covers
+// everything), no padding or close button — callers own the entire layout.
+const DialogContentFullScreen = React.forwardRef<
+ React.ElementRef<typeof DialogPrimitive.Content>,
+ React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content>
+>(({ className, children, ...props }, ref) => (
+ <DialogPortal>
+ <DialogPrimitive.Content
+ ref={ref}
+ className={cn(
+ "fixed inset-0 z-50 flex h-dvh w-screen flex-col bg-background duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 motion-reduce:animate-none",
+ className
+ )}
+ {...props}
+ >
+ {children}
+ </DialogPrimitive.Content>
+ </DialogPortal>
+));
+DialogContentFullScreen.displayName = "DialogContentFullScreen";
+
const DialogHeader = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
<div className={cn("flex flex-col space-y-1.5 text-center sm:text-left", className)} {...props} />
);
@@ -98,6 +119,7 @@ export {
DialogTrigger,
DialogClose,
DialogContent,
+ DialogContentFullScreen,
DialogHeader,
DialogFooter,
DialogTitle,