🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Enhance admin site data by adding goals and funnels count. Update the Sites component to display these new metrics, ensuring better visibility of site performance. Adjust API endpoint to retrieve goal and funnel counts from the database.
Bill Yangae4e78ccd9c3
diff --git a/client/messages/cs.json b/client/messages/cs.jsonindex c34485380..73fbcf2a5 100644--- a/client/messages/cs.json+++ b/client/messages/cs.json@@ -194,8 +194,8 @@"Zx7WPP": "Všechny řady událostí skryty","AKRVhS": "Klikni na položku v legendě pro zobrazení","NuhCPH": "Zjisti, jak sledovat události",- "/aq5/F": "Žádné vlastní události nenalezeny","ES6IYH": "Zkus jiný časový rozsah nebo filtr",+ "/aq5/F": "Žádné vlastní události nenalezeny","j7BiRg": "Žádná událost nevybrána.","kF9XUo": "Časové razítko","EwRIOm": "Uživatel",@@ -245,8 +245,8 @@"tHKpoN": "V tomto kroku ve zvoleném období žádné relace neodpadly.","5elgIe": "Chyba:","0hujDo": "Analýza trychtýře selhala",- "gUKiFL": "Nastav kroky trychtýře","cSzyIV": "Analyzuji trychtýř...",+ "gUKiFL": "Nastav kroky trychtýře","XFyfI5": "Celková konverze","AFl3K6": "Konverze z předchozího kroku","s+vZVl": "Náhled trychtýře",diff --git a/client/messages/de.json b/client/messages/de.jsonindex 6cb85f034..83e22a309 100644--- a/client/messages/de.json+++ b/client/messages/de.json@@ -194,8 +194,8 @@"Zx7WPP": "Alle Event-Reihen ausgeblendet","AKRVhS": "Klicken Sie auf ein Legendenelement, um es anzuzeigen","NuhCPH": "Erfahren Sie, wie Sie Events verfolgen",- "/aq5/F": "Keine benutzerdefinierten Events gefunden","ES6IYH": "Versuchen Sie einen anderen Zeitraum oder Filter",+ "/aq5/F": "Keine benutzerdefinierten Events gefunden","j7BiRg": "Kein Event ausgewählt.","kF9XUo": "Zeitstempel","EwRIOm": "Benutzer",@@ -245,8 +245,8 @@"tHKpoN": "Keine Sitzungen wurden vor Erreichen dieses Schritts im ausgewählten Zeitraum abgebrochen.","5elgIe": "Fehler:","0hujDo": "Trichteranalyse fehlgeschlagen",- "gUKiFL": "Konfigurieren Sie Ihre Trichterschritte","cSzyIV": "Trichter wird analysiert...",+ "gUKiFL": "Konfigurieren Sie Ihre Trichterschritte","XFyfI5": "Gesamtkonversion","AFl3K6": "Konversion vom vorherigen Schritt","s+vZVl": "Trichtervorschau",diff --git a/client/messages/en.json b/client/messages/en.jsonindex d3256a3d1..d00da9f27 100644--- a/client/messages/en.json+++ b/client/messages/en.json@@ -194,8 +194,8 @@"Zx7WPP": "All event series hidden","AKRVhS": "Click a legend item to show it","NuhCPH": "Learn how to track events",- "/aq5/F": "No custom events found","ES6IYH": "Try a different date range or filter",+ "/aq5/F": "No custom events found","j7BiRg": "No event selected.","kF9XUo": "Timestamp","EwRIOm": "User",@@ -245,8 +245,8 @@"tHKpoN": "No sessions dropped off before reaching this step in the selected time period.","5elgIe": "Error:","0hujDo": "Failed to analyze funnel",- "gUKiFL": "Configure your funnel steps","cSzyIV": "Analyzing funnel...",+ "gUKiFL": "Configure your funnel steps","XFyfI5": "Overall conversion","AFl3K6": "Conversion from previous step","s+vZVl": "Funnel Preview",diff --git a/client/messages/es.json b/client/messages/es.jsonindex 0ed2ebb95..d57d0a9c4 100644--- a/client/messages/es.json+++ b/client/messages/es.json@@ -194,8 +194,8 @@"Zx7WPP": "Todas las series de eventos ocultas","AKRVhS": "Haz clic en un elemento de la leyenda para mostrarlo","NuhCPH": "Aprende cómo rastrear eventos",- "/aq5/F": "No se encontraron eventos personalizados","ES6IYH": "Prueba un rango de fechas o filtro diferente",+ "/aq5/F": "No se encontraron eventos personalizados","j7BiRg": "Ningún evento seleccionado.","kF9XUo": "Marca de tiempo","EwRIOm": "Usuario",@@ -245,8 +245,8 @@"tHKpoN": "Ninguna sesión abandonó antes de alcanzar este paso en el periodo seleccionado.","5elgIe": "Error:","0hujDo": "Error al analizar el embudo",- "gUKiFL": "Configura los pasos de tu embudo","cSzyIV": "Analizando embudo...",+ "gUKiFL": "Configura los pasos de tu embudo","XFyfI5": "Conversión general","AFl3K6": "Conversión desde el paso anterior","s+vZVl": "Vista previa del embudo",diff --git a/client/messages/fr.json b/client/messages/fr.jsonindex 72f10fa94..15aaeea7d 100644--- a/client/messages/fr.json+++ b/client/messages/fr.json@@ -194,8 +194,8 @@"Zx7WPP": "Toutes les séries d'événements masquées","AKRVhS": "Cliquez sur un élément de la légende pour l'afficher","NuhCPH": "Apprenez à suivre les événements",- "/aq5/F": "Aucun événement personnalisé trouvé","ES6IYH": "Essayez une autre période ou un autre filtre",+ "/aq5/F": "Aucun événement personnalisé trouvé","j7BiRg": "Aucun événement sélectionné.","kF9XUo": "Horodatage","EwRIOm": "Utilisateur",@@ -245,8 +245,8 @@"tHKpoN": "Aucune session n'a abandonné avant d'atteindre cette étape dans la période sélectionnée.","5elgIe": "Erreur :","0hujDo": "Échec de l'analyse de l'entonnoir",- "gUKiFL": "Configurez les étapes de votre entonnoir","cSzyIV": "Analyse de l'entonnoir en cours...",+ "gUKiFL": "Configurez les étapes de votre entonnoir","XFyfI5": "Conversion globale","AFl3K6": "Conversion depuis l'étape précédente","s+vZVl": "Aperçu de l'entonnoir",diff --git a/client/messages/it.json b/client/messages/it.jsonindex a748332d7..48fec204d 100644--- a/client/messages/it.json+++ b/client/messages/it.json@@ -194,8 +194,8 @@"Zx7WPP": "Tutte le serie di eventi nascoste","AKRVhS": "Clicca un elemento della legenda per mostrarlo","NuhCPH": "Scopri come tracciare gli eventi",- "/aq5/F": "Nessun evento personalizzato trovato","ES6IYH": "Prova un intervallo di date diverso o un filtro",+ "/aq5/F": "Nessun evento personalizzato trovato","j7BiRg": "Nessun evento selezionato.","kF9XUo": "Timestamp","EwRIOm": "Utente",@@ -245,8 +245,8 @@"tHKpoN": "Nessuna sessione è stata abbandonata prima di raggiungere questo passaggio nel periodo di tempo selezionato.","5elgIe": "Errore:","0hujDo": "Impossibile analizzare il funnel",- "gUKiFL": "Configura i passaggi del tuo funnel","cSzyIV": "Analisi del funnel in corso...",+ "gUKiFL": "Configura i passaggi del tuo funnel","XFyfI5": "Conversione complessiva","AFl3K6": "Conversione dal passaggio precedente","s+vZVl": "Anteprima Funnel",diff --git a/client/messages/ja.json b/client/messages/ja.jsonindex 04dee23e5..98d8786c4 100644--- a/client/messages/ja.json+++ b/client/messages/ja.json@@ -194,8 +194,8 @@"Zx7WPP": "すべてのイベント系列が非表示です","AKRVhS": "凡例の項目をクリックして表示します","NuhCPH": "イベントのトラッキング方法を学ぶ",- "/aq5/F": "カスタムイベントが見つかりません","ES6IYH": "別の日付範囲またはフィルターをお試しください",+ "/aq5/F": "カスタムイベントが見つかりません","j7BiRg": "イベントが選択されていません。","kF9XUo": "タイムスタンプ","EwRIOm": "ユーザー",@@ -245,8 +245,8 @@"tHKpoN": "選択した期間にこのステップの前に離脱したセッションはありません。","5elgIe": "エラー:","0hujDo": "ファネルの分析に失敗しました",- "gUKiFL": "ファネルのステップを設定","cSzyIV": "ファネルを分析中...",+ "gUKiFL": "ファネルのステップを設定","XFyfI5": "全体のコンバージョン","AFl3K6": "前のステップからのコンバージョン","s+vZVl": "ファネルプレビュー",diff --git a/client/messages/ko.json b/client/messages/ko.jsonindex 482109c69..219e1df71 100644--- a/client/messages/ko.json+++ b/client/messages/ko.json@@ -194,8 +194,8 @@"Zx7WPP": "모든 이벤트 시리즈 숨김","AKRVhS": "범례 항목을 클릭하여 표시","NuhCPH": "이벤트 추적 방법 알아보기",- "/aq5/F": "사용자 정의 이벤트를 찾을 수 없음","ES6IYH": "다른 날짜 범위 또는 필터를 시도하세요",+ "/aq5/F": "사용자 정의 이벤트를 찾을 수 없음","j7BiRg": "이벤트가 선택되지 않았습니다.","kF9XUo": "타임스탬프","EwRIOm": "사용자",@@ -245,8 +245,8 @@"tHKpoN": "선택한 기간에 이 단계 전에 이탈한 세션이 없습니다.","5elgIe": "오류:","0hujDo": "퍼널 분석 실패",- "gUKiFL": "퍼널 단계를 구성하세요","cSzyIV": "퍼널 분석 중...",+ "gUKiFL": "퍼널 단계를 구성하세요","XFyfI5": "전체 전환율","AFl3K6": "이전 단계 대비 전환율","s+vZVl": "퍼널 미리보기",diff --git a/client/messages/pl.json b/client/messages/pl.jsonindex 53a5d59ac..59e2f3dbd 100644--- a/client/messages/pl.json+++ b/client/messages/pl.json@@ -194,8 +194,8 @@"Zx7WPP": "Wszystkie serie zdarzeń ukryte","AKRVhS": "Kliknij element legendy, aby go wyświetlić","NuhCPH": "Dowiedz się, jak śledzić zdarzenia",- "/aq5/F": "Nie znaleziono niestandardowych zdarzeń","ES6IYH": "Spróbuj innego zakresu dat lub filtra",+ "/aq5/F": "Nie znaleziono niestandardowych zdarzeń","j7BiRg": "Nie wybrano zdarzenia.","kF9XUo": "Znacznik czasu","EwRIOm": "Użytkownik",@@ -245,8 +245,8 @@"tHKpoN": "Żadna sesja nie porzuciła przed dotarciem do tego kroku w wybranym okresie.","5elgIe": "Błąd:","0hujDo": "Nie udało się przeanalizować lejka",- "gUKiFL": "Skonfiguruj kroki lejka","cSzyIV": "Analizowanie lejka...",+ "gUKiFL": "Skonfiguruj kroki lejka","XFyfI5": "Ogólna konwersja","AFl3K6": "Konwersja z poprzedniego kroku","s+vZVl": "Podgląd lejka",diff --git a/client/messages/pt.json b/client/messages/pt.jsonindex 62c37fdb4..a02855994 100644--- a/client/messages/pt.json+++ b/client/messages/pt.json@@ -194,8 +194,8 @@"Zx7WPP": "Todas as séries de eventos ocultas","AKRVhS": "Clique em um item da legenda para exibi-lo","NuhCPH": "Saiba como rastrear eventos",- "/aq5/F": "Nenhum evento personalizado encontrado","ES6IYH": "Tente um intervalo de datas diferente ou filtro",+ "/aq5/F": "Nenhum evento personalizado encontrado","j7BiRg": "Nenhum evento selecionado.","kF9XUo": "Data/Hora","EwRIOm": "Usuário",@@ -245,8 +245,8 @@"tHKpoN": "Nenhuma sessão abandonou antes de alcançar esta etapa no período selecionado.","5elgIe": "Erro:","0hujDo": "Falha ao analisar funil",- "gUKiFL": "Configure as etapas do seu funil","cSzyIV": "Analisando funil...",+ "gUKiFL": "Configure as etapas do seu funil","XFyfI5": "Conversão geral","AFl3K6": "Conversão da etapa anterior","s+vZVl": "Pré-visualização do Funil",diff --git a/client/messages/zh.json b/client/messages/zh.jsonindex dedd56b46..c5fc2fc4d 100644--- a/client/messages/zh.json+++ b/client/messages/zh.json@@ -194,8 +194,8 @@"Zx7WPP": "所有事件系列已隐藏","AKRVhS": "点击图例项以显示它","NuhCPH": "了解如何追踪事件",- "/aq5/F": "未找到自定义事件","ES6IYH": "尝试不同的日期范围或过滤器",+ "/aq5/F": "未找到自定义事件","j7BiRg": "未选择事件。","kF9XUo": "时间戳","EwRIOm": "用户",@@ -245,8 +245,8 @@"tHKpoN": "在选定的时间段内,没有会话在到达此步骤之前流失。","5elgIe": "错误:","0hujDo": "分析漏斗失败",- "gUKiFL": "配置您的漏斗步骤","cSzyIV": "正在分析漏斗...",+ "gUKiFL": "配置您的漏斗步骤","XFyfI5": "整体转化率","AFl3K6": "较上一步的转化率","s+vZVl": "漏斗预览",diff --git a/client/src/api/admin/endpoints/adminSites.ts b/client/src/api/admin/endpoints/adminSites.tsindex f66f0d940..c6f832db6 100644--- a/client/src/api/admin/endpoints/adminSites.ts+++ b/client/src/api/admin/endpoints/adminSites.ts@@ -7,6 +7,8 @@ export interface AdminSiteData {public: boolean;eventsLast24Hours: number;eventsLast30Days: number;+ goalsCount: number;+ funnelsCount: number;organizationOwnerEmail: string | null;subscription: {planName: string;diff --git a/client/src/app/admin/components/sites/Sites.tsx b/client/src/app/admin/components/sites/Sites.tsxindex c349cd3a8..27ad46c80 100644--- a/client/src/app/admin/components/sites/Sites.tsx+++ b/client/src/app/admin/components/sites/Sites.tsx@@ -101,6 +101,16 @@ export function Sites() {header: ({ column }) => <SortableHeader column={column}>{t("Events (30d)")}</SortableHeader>,cell: ({ row }) => <div>{formatter(Number(row.getValue("eventsLast30Days")))}</div>,},+ {+ accessorKey: "goalsCount",+ header: ({ column }) => <SortableHeader column={column}>{t("Goals")}</SortableHeader>,+ cell: ({ row }) => <div>{row.getValue("goalsCount")}</div>,+ },+ {+ accessorKey: "funnelsCount",+ header: ({ column }) => <SortableHeader column={column}>{t("Funnels")}</SortableHeader>,+ cell: ({ row }) => <div>{row.getValue("funnelsCount")}</div>,+ },{id: "subscription",header: ({ column }) => <SortableHeader column={column}>{t("Subscription")}</SortableHeader>,@@ -194,6 +204,12 @@ export function Sites() {<TableCell><Skeleton className="h-5 w-16" /></TableCell>+ <TableCell>+ <Skeleton className="h-5 w-12" />+ </TableCell>+ <TableCell>+ <Skeleton className="h-5 w-12" />+ </TableCell><TableCell><Skeleton className="h-5 w-20" /></TableCell>diff --git a/server/src/api/admin/getAdminSites.ts b/server/src/api/admin/getAdminSites.tsindex c27076541..148c92fe8 100644--- a/server/src/api/admin/getAdminSites.ts+++ b/server/src/api/admin/getAdminSites.ts@@ -1,9 +1,9 @@-import { eq } from "drizzle-orm";+import { count, eq } from "drizzle-orm";import { FastifyReply, FastifyRequest } from "fastify";import { DateTime } from "luxon";import { clickhouse } from "../../db/clickhouse/clickhouse.js";import { db } from "../../db/postgres/postgres.js";-import { member, user } from "../../db/postgres/schema.js";+import { goals, funnels, member, user } from "../../db/postgres/schema.js";import { getOrganizationSubscriptions } from "../../services/admin/subscriptionService.js";interface EventCountResult {@@ -96,6 +96,29 @@ export async function getAdminSites(request: FastifyRequest, reply: FastifyReplysiteEventMap30d.set(Number(event.site_id), event.total_events);}+ // Get goal and funnel counts per site+ const goalCounts = await db+ .select({ siteId: goals.siteId, count: count() })+ .from(goals)+ .groupBy(goals.siteId);++ const funnelCounts = await db+ .select({ siteId: funnels.siteId, count: count() })+ .from(funnels)+ .groupBy(funnels.siteId);++ const siteGoalCountMap = new Map<number, number>();+ for (const row of goalCounts) {+ siteGoalCountMap.set(row.siteId, row.count);+ }++ const siteFunnelCountMap = new Map<number, number>();+ for (const row of funnelCounts) {+ if (row.siteId != null) {+ siteFunnelCountMap.set(row.siteId, row.count);+ }+ }+// Combine all dataconst enrichedSites = sitesData.map(site => {const subscription = site.organizationId@@ -109,6 +132,8 @@ export async function getAdminSites(request: FastifyRequest, reply: FastifyReplypublic: site.public,eventsLast24Hours: siteEventMap24h.get(site.siteId) || 0,eventsLast30Days: siteEventMap30d.get(site.siteId) || 0,+ goalsCount: siteGoalCountMap.get(site.siteId) || 0,+ funnelsCount: siteFunnelCountMap.get(site.siteId) || 0,organizationOwnerEmail: site.organizationId ? orgOwnerMap.get(site.organizationId) : null,subscription: {planName: subscription?.planName || "free",