🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Update event display name handling and enhance translation support
Bill Yang05e157b0c30c
diff --git a/client/messages/cs.json b/client/messages/cs.jsonindex c8a2675bc..29ff01334 100644--- a/client/messages/cs.json+++ b/client/messages/cs.json@@ -1262,5 +1262,15 @@"5YSWst": "Skript je nainstalován a funguje správně.","EIQFLe": "Tag skriptu nalezen, ale nespouští se","+x0BAO": "Skript nebyl detekován",- "rOpS8J": "Rybbit v{latest} je k dispozici (máš v{current})"+ "rOpS8J": "Rybbit v{latest} je k dispozici (máš v{current})",+ "Z3IDkP": "",+ "ausAKx": "",+ "gK3VmA": "",+ "KUJ7WS": "",+ "LyJrRs": "",+ "Rf6GA/": "",+ "QOaR8l": "",+ "IQ5tZg": "",+ "+B+qvw": "",+ "vDpLV2": ""}diff --git a/client/messages/de.json b/client/messages/de.jsonindex 04c3ef6f8..b02b43f33 100644--- a/client/messages/de.json+++ b/client/messages/de.json@@ -1262,5 +1262,15 @@"5YSWst": "Skript ist installiert und läuft korrekt.","EIQFLe": "Script-Tag gefunden, wird aber nicht ausgeführt","+x0BAO": "Skript nicht erkannt",- "rOpS8J": "Rybbit v{latest} ist verfügbar (Sie verwenden v{current})"+ "rOpS8J": "Rybbit v{latest} ist verfügbar (Sie verwenden v{current})",+ "Z3IDkP": "",+ "ausAKx": "",+ "gK3VmA": "",+ "KUJ7WS": "",+ "LyJrRs": "",+ "Rf6GA/": "",+ "QOaR8l": "",+ "IQ5tZg": "",+ "+B+qvw": "",+ "vDpLV2": ""}diff --git a/client/messages/en.json b/client/messages/en.jsonindex a01ad212a..eaa28f1ca 100644--- a/client/messages/en.json+++ b/client/messages/en.json@@ -1262,5 +1262,15 @@"5YSWst": "Script is installed and running correctly.","EIQFLe": "Script tag found but not executing","+x0BAO": "Script not detected",- "rOpS8J": "Rybbit v{latest} is available (you're on v{current})"+ "rOpS8J": "Rybbit v{latest} is available (you're on v{current})",+ "Z3IDkP": "Outbound Click",+ "ausAKx": "Clicked button with text \"{text}\"",+ "gK3VmA": "Clicked button",+ "KUJ7WS": "Copied text",+ "LyJrRs": "Copied \"{text}\"",+ "Rf6GA/": "Submitted form \"{name}\"",+ "QOaR8l": "Submitted form to \"{action}\"",+ "IQ5tZg": "Submitted form",+ "+B+qvw": "Changed {type}input \"{name}\"",+ "vDpLV2": "Changed {type}input"}diff --git a/client/messages/es.json b/client/messages/es.jsonindex 448b0c28d..020ecae93 100644--- a/client/messages/es.json+++ b/client/messages/es.json@@ -1262,5 +1262,15 @@"5YSWst": "El script está instalado y funcionando correctamente.","EIQFLe": "Etiqueta de script encontrada pero no se está ejecutando","+x0BAO": "Script no detectado",- "rOpS8J": "Rybbit v{latest} está disponible (estás en v{current})"+ "rOpS8J": "Rybbit v{latest} está disponible (estás en v{current})",+ "Z3IDkP": "",+ "ausAKx": "",+ "gK3VmA": "",+ "KUJ7WS": "",+ "LyJrRs": "",+ "Rf6GA/": "",+ "QOaR8l": "",+ "IQ5tZg": "",+ "+B+qvw": "",+ "vDpLV2": ""}diff --git a/client/messages/fr.json b/client/messages/fr.jsonindex 42ffce6e3..704738af0 100644--- a/client/messages/fr.json+++ b/client/messages/fr.json@@ -1262,5 +1262,15 @@"5YSWst": "Le script est installé et fonctionne correctement.","EIQFLe": "Balise script trouvée mais ne s'exécute pas","+x0BAO": "Script non détecté",- "rOpS8J": "Rybbit v{latest} est disponible (vous utilisez v{current})"+ "rOpS8J": "Rybbit v{latest} est disponible (vous utilisez v{current})",+ "Z3IDkP": "",+ "ausAKx": "",+ "gK3VmA": "",+ "KUJ7WS": "",+ "LyJrRs": "",+ "Rf6GA/": "",+ "QOaR8l": "",+ "IQ5tZg": "",+ "+B+qvw": "",+ "vDpLV2": ""}diff --git a/client/messages/it.json b/client/messages/it.jsonindex c27150460..7be490f9e 100644--- a/client/messages/it.json+++ b/client/messages/it.json@@ -1262,5 +1262,15 @@"5YSWst": "Lo script è installato e funzionante correttamente.","EIQFLe": "Tag script trovato ma non in esecuzione","+x0BAO": "Script non rilevato",- "rOpS8J": "Rybbit v{latest} è disponibile (sei sulla v{current})"+ "rOpS8J": "Rybbit v{latest} è disponibile (sei sulla v{current})",+ "Z3IDkP": "",+ "ausAKx": "",+ "gK3VmA": "",+ "KUJ7WS": "",+ "LyJrRs": "",+ "Rf6GA/": "",+ "QOaR8l": "",+ "IQ5tZg": "",+ "+B+qvw": "",+ "vDpLV2": ""}diff --git a/client/messages/ja.json b/client/messages/ja.jsonindex 98a789bcb..43c97a038 100644--- a/client/messages/ja.json+++ b/client/messages/ja.json@@ -1262,5 +1262,15 @@"5YSWst": "スクリプトは正常にインストールされ、実行されています。","EIQFLe": "スクリプトタグは見つかりましたが、実行されていません","+x0BAO": "スクリプトが検出されません",- "rOpS8J": "Rybbit v{latest}が利用可能です(現在v{current})"+ "rOpS8J": "Rybbit v{latest}が利用可能です(現在v{current})",+ "Z3IDkP": "",+ "ausAKx": "",+ "gK3VmA": "",+ "KUJ7WS": "",+ "LyJrRs": "",+ "Rf6GA/": "",+ "QOaR8l": "",+ "IQ5tZg": "",+ "+B+qvw": "",+ "vDpLV2": ""}diff --git a/client/messages/ko.json b/client/messages/ko.jsonindex 3f306d794..e6f04b830 100644--- a/client/messages/ko.json+++ b/client/messages/ko.json@@ -1262,5 +1262,15 @@"5YSWst": "스크립트가 설치되어 올바르게 실행 중입니다.","EIQFLe": "스크립트 태그는 발견되었지만 실행되지 않고 있습니다","+x0BAO": "스크립트가 감지되지 않음",- "rOpS8J": "Rybbit v{latest}를 사용할 수 있습니다 (현재 v{current})"+ "rOpS8J": "Rybbit v{latest}를 사용할 수 있습니다 (현재 v{current})",+ "Z3IDkP": "",+ "ausAKx": "",+ "gK3VmA": "",+ "KUJ7WS": "",+ "LyJrRs": "",+ "Rf6GA/": "",+ "QOaR8l": "",+ "IQ5tZg": "",+ "+B+qvw": "",+ "vDpLV2": ""}diff --git a/client/messages/pl.json b/client/messages/pl.jsonindex 626e8916a..6ede83a51 100644--- a/client/messages/pl.json+++ b/client/messages/pl.json@@ -1262,5 +1262,15 @@"5YSWst": "Skrypt jest zainstalowany i działa poprawnie.","EIQFLe": "Znaleziono tag skryptu, ale nie jest wykonywany","+x0BAO": "Skrypt nie wykryty",- "rOpS8J": "Rybbit v{latest} jest dostępny (masz v{current})"+ "rOpS8J": "Rybbit v{latest} jest dostępny (masz v{current})",+ "Z3IDkP": "",+ "ausAKx": "",+ "gK3VmA": "",+ "KUJ7WS": "",+ "LyJrRs": "",+ "Rf6GA/": "",+ "QOaR8l": "",+ "IQ5tZg": "",+ "+B+qvw": "",+ "vDpLV2": ""}diff --git a/client/messages/pt.json b/client/messages/pt.jsonindex e0cb2791d..bd20317dc 100644--- a/client/messages/pt.json+++ b/client/messages/pt.json@@ -1262,5 +1262,15 @@"5YSWst": "Script está instalado e funcionando corretamente.","EIQFLe": "Tag de script encontrada mas não executando","+x0BAO": "Script não detectado",- "rOpS8J": "Rybbit v{latest} está disponível (você está na v{current})"+ "rOpS8J": "Rybbit v{latest} está disponível (você está na v{current})",+ "Z3IDkP": "",+ "ausAKx": "",+ "gK3VmA": "",+ "KUJ7WS": "",+ "LyJrRs": "",+ "Rf6GA/": "",+ "QOaR8l": "",+ "IQ5tZg": "",+ "+B+qvw": "",+ "vDpLV2": ""}diff --git a/client/messages/uk.json b/client/messages/uk.jsonindex 06fc93230..df7a2f7be 100644--- a/client/messages/uk.json+++ b/client/messages/uk.json@@ -1262,5 +1262,15 @@"5YSWst": "Скрипт встановлено та він працює коректно.","EIQFLe": "Тег скрипта знайдено, але він не виконується","+x0BAO": "Скрипт не виявлено",- "rOpS8J": "Доступна версія Rybbit v{latest} (у вас v{current})"+ "rOpS8J": "Доступна версія Rybbit v{latest} (у вас v{current})",+ "Z3IDkP": "",+ "ausAKx": "",+ "gK3VmA": "",+ "KUJ7WS": "",+ "LyJrRs": "",+ "Rf6GA/": "",+ "QOaR8l": "",+ "IQ5tZg": "",+ "+B+qvw": "",+ "vDpLV2": ""}diff --git a/client/messages/zh.json b/client/messages/zh.jsonindex f5507c28b..0f1bbe827 100644--- a/client/messages/zh.json+++ b/client/messages/zh.json@@ -1262,5 +1262,15 @@"5YSWst": "脚本已安装并正常运行。","EIQFLe": "找到了脚本标签,但未执行","+x0BAO": "未检测到脚本",- "rOpS8J": "Rybbit v{latest} 现已发布(您当前使用的是 v{current})"+ "rOpS8J": "Rybbit v{latest} 现已发布(您当前使用的是 v{current})",+ "Z3IDkP": "",+ "ausAKx": "",+ "gK3VmA": "",+ "KUJ7WS": "",+ "LyJrRs": "",+ "Rf6GA/": "",+ "QOaR8l": "",+ "IQ5tZg": "",+ "+B+qvw": "",+ "vDpLV2": ""}diff --git a/client/src/app/[site]/events/components/EventLog/EventRow.tsx b/client/src/app/[site]/events/components/EventLog/EventRow.tsxindex 29d9b44a8..9d6db72d6 100644--- a/client/src/app/[site]/events/components/EventLog/EventRow.tsx+++ b/client/src/app/[site]/events/components/EventLog/EventRow.tsx@@ -8,6 +8,7 @@ import { Avatar } from "../../../../../components/Avatar";import { EventTypeIcon } from "../../../../../components/EventIcons";import { Tooltip, TooltipContent, TooltipTrigger } from "../../../../../components/ui/tooltip";import { useDateTimeFormat } from "../../../../../hooks/useDateTimeFormat";+import { useEventDisplayName } from "../../../../../lib/events";import { getTimezone } from "../../../../../lib/store";import { getCountryName, getUserDisplayName, truncateString } from "../../../../../lib/utils";import { Browser } from "../../../components/shared/icons/Browser";@@ -24,6 +25,7 @@ interface EventRowProps {export function EventRow({ event, site, onClick }: EventRowProps) {const t = useExtracted();+ const getEventDisplayName = useEventDisplayName();const { locale, hour12, formatRelative } = useDateTimeFormat();const eventProperties = parseEventProperties(event);const eventTime = DateTime.fromSQL(event.timestamp, { zone: "utc" })@@ -32,7 +34,7 @@ export function EventRow({ event, site, onClick }: EventRowProps) {const pagePath = buildEventPath(event);const pageUrl = `https://${event.hostname}${pagePath}`;const isPageview = event.type === "pageview";- const eventData = isPageview ? null : getMainData(event, eventProperties, t);+ const eventData = isPageview ? null : getMainData(event, eventProperties, getEventDisplayName, t);const userProfileId = event.identified_user_id || event.user_id;const displayName = getUserDisplayName({identified_user_id: event.identified_user_id || undefined,diff --git a/client/src/app/[site]/events/components/EventLog/eventLogUtils.tsx b/client/src/app/[site]/events/components/EventLog/eventLogUtils.tsxindex 0fef3e8ce..f9eb9cd15 100644--- a/client/src/app/[site]/events/components/EventLog/eventLogUtils.tsx+++ b/client/src/app/[site]/events/components/EventLog/eventLogUtils.tsx@@ -1,7 +1,7 @@"use client";import { Event } from "../../../../../api/analytics/endpoints";-import { EVENT_TYPE_CONFIG, TranslationFunction, getEventDisplayName } from "../../../../../lib/events";+import { EVENT_TYPE_CONFIG, EventDisplayNameFormatter, TranslationFunction } from "../../../../../lib/events";export function getEventKey(event: Event) {return `${event.timestamp}-${event.session_id}-${event.user_id}-${event.type}-${event.event_name ?? ""}-${event.pathname}`;@@ -27,7 +27,12 @@ export function buildEventPath(event: Event) {return `${event.pathname}${event.querystring ? `${event.querystring}` : ""}`;}-export function getMainData(event: Event, props: Record<string, any>, t?: TranslationFunction) {+export function getMainData(+ event: Event,+ props: Record<string, any>,+ getEventDisplayName: EventDisplayNameFormatter,+ t?: TranslationFunction+) {const isPageview = event.type === "pageview";const isOutbound = event.type === "outbound";const isButtonClick = event.type === "button_click";@@ -51,7 +56,7 @@ export function getMainData(event: Event, props: Record<string, any>, t?: Translif (isButtonClick || isCopy || isFormSubmit || isInputChange) {return {- label: getEventDisplayName({ type: event.type, event_name: event.event_name, props }, t),+ label: getEventDisplayName({ type: event.type, event_name: event.event_name, props }),};}diff --git a/client/src/app/[site]/main/components/MainSection/Chart.tsx b/client/src/app/[site]/main/components/MainSection/Chart.tsxindex 7115769d9..0648c760f 100644--- a/client/src/app/[site]/main/components/MainSection/Chart.tsx+++ b/client/src/app/[site]/main/components/MainSection/Chart.tsx@@ -148,6 +148,45 @@ const formatXTick = (return dt.toFormat(hour12 ? "MMM d" : "dd MMM");};+const isSameTime = (a: Time, b: Time): boolean => {+ if (a.mode !== b.mode) return false;++ switch (a.mode) {+ case "day":+ return b.mode === "day" && a.day === b.day && a.wellKnown === b.wellKnown;+ case "range":+ return (+ b.mode === "range" &&+ a.startDate === b.startDate &&+ a.endDate === b.endDate &&+ a.startTime === b.startTime &&+ a.endTime === b.endTime &&+ a.wellKnown === b.wellKnown+ );+ case "week":+ return (+ b.mode === "week" && a.week === b.week && a.wellKnown === b.wellKnown+ );+ case "month":+ return (+ b.mode === "month" && a.month === b.month && a.wellKnown === b.wellKnown+ );+ case "year":+ return (+ b.mode === "year" && a.year === b.year && a.wellKnown === b.wellKnown+ );+ case "all-time":+ return b.mode === "all-time" && a.wellKnown === b.wellKnown;+ case "past-minutes":+ return (+ b.mode === "past-minutes" &&+ a.pastMinutesStart === b.pastMinutesStart &&+ a.pastMinutesEnd === b.pastMinutesEnd &&+ a.wellKnown === b.wellKnown+ );+ }+};+export function Chart({data,previousData,@@ -453,6 +492,19 @@ export function Chart({currentX: number;moved: boolean;} | null>(null);+ const dragZoomRestoreRef = useRef<{+ before: Time;+ after: Time;+ bucket: TimeBucket;+ } | null>(null);++ useEffect(() => {+ const dragZoom = dragZoomRestoreRef.current;+ if (!dragZoom) return;+ if (!isSameTime(time, dragZoom.after) || bucket !== dragZoom.bucket) {+ dragZoomRestoreRef.current = null;+ }+ }, [bucket, time]);// Snap drag positions the same way hover does: to the nearest visible// current bucket, so the committed selection matches the crosshair.@@ -524,9 +576,11 @@ export function Chart({const startDate = startBucket.toISODate();const endDate = endBucket.toISODate();if (!startDate || !endDate) return;+ const nextTime: Time = { mode: "range", startDate, endDate };+ dragZoomRestoreRef.current = { before: time, after: nextTime, bucket };// Pass changeBucket=false so dragging within e.g. an all-time/day// view doesn't auto-switch to week/month for shorter ranges.- setTime({ mode: "range", startDate, endDate }, false);+ setTime(nextTime, false);return;}@@ -534,16 +588,15 @@ export function Chart({const startDate = startBucket.toISODate();const endDate = endExclusive.toISODate();if (startDate && endDate) {- setTime(- {- mode: "range",- startDate,- endDate,- startTime: startBucket.toFormat("HH:mm:ss"),- endTime: endExclusive.toFormat("HH:mm:ss"),- },- false- );+ const nextTime: Time = {+ mode: "range",+ startDate,+ endDate,+ startTime: startBucket.toFormat("HH:mm:ss"),+ endTime: endExclusive.toFormat("HH:mm:ss"),+ };+ dragZoomRestoreRef.current = { before: time, after: nextTime, bucket };+ setTime(nextTime, false);}};@@ -551,6 +604,17 @@ export function Chart({window.addEventListener("mouseup", onUp);};+ const handleDoubleClick = (e: React.MouseEvent<SVGRectElement>) => {+ const dragZoom = dragZoomRestoreRef.current;+ if (!dragZoom) return;+ if (!isSameTime(time, dragZoom.after) || bucket !== dragZoom.bucket) return;++ e.preventDefault();+ setHover(null);+ dragZoomRestoreRef.current = null;+ setTime(dragZoom.before, false);+ };+const tooltipWidth = 220;const tooltipOffset = 14;const viewportW = typeof window !== "undefined" ? window.innerWidth : 0;@@ -802,6 +866,7 @@ export function Chart({fill="transparent"style={{ cursor: dragEnabled ? "crosshair" : "default" }}onMouseDown={handleMouseDown}+ onDoubleClick={handleDoubleClick}onMouseMove={handleMouseMove}onMouseLeave={handleMouseLeave}/>diff --git a/client/src/components/Sessions/SessionDetails/PageviewItem.tsx b/client/src/components/Sessions/SessionDetails/PageviewItem.tsxindex dcc0637f3..eb3ea4745 100644--- a/client/src/components/Sessions/SessionDetails/PageviewItem.tsx+++ b/client/src/components/Sessions/SessionDetails/PageviewItem.tsx@@ -7,7 +7,7 @@ import Link from "next/link";import { useExtracted } from "next-intl";import { SessionEvent } from "../../../api/analytics/endpoints";-import { getEventDisplayName, PROPS_TO_HIDE } from "../../../lib/events";+import { PROPS_TO_HIDE, useEventDisplayName } from "../../../lib/events";import { useDateTimeFormat } from "../../../hooks/useDateTimeFormat";import { formatDuration } from "../../../lib/dateTimeUtils";import { cn } from "../../../lib/utils";@@ -170,6 +170,7 @@ export function PageviewItem({highlightedEventTimestamp,}: PageviewItemProps) {const t = useExtracted();+ const getEventDisplayName = useEventDisplayName();const { hour12 } = useDateTimeFormat();const isPageview = item.type === "pageview";const isOutbound = item.type === "outbound";@@ -265,7 +266,7 @@ export function PageviewItem({</div></Link>) : (- <div className="text-sm truncate">{getEventDisplayName(item, t)}</div>+ <div className="text-sm truncate">{getEventDisplayName(item)}</div>)}</div>diff --git a/client/src/lib/events.ts b/client/src/lib/events.tsindex 0d7c3d94c..9e8864f1e 100644--- a/client/src/lib/events.ts+++ b/client/src/lib/events.ts@@ -2,6 +2,9 @@// Event Types and Configuration// ============================================================================+import { useCallback } from "react";+import { useExtracted } from "next-intl";+export type TranslationFunction = (key: string, values?: Record<string, string>) => string;export type EventType =@@ -42,44 +45,44 @@ export interface EventLike {props?: Record<string, any>;}-// Helper to generate display name for auto-captured events-export function getEventDisplayName(item: EventLike, t?: TranslationFunction): string {- if (item.event_name) return item.event_name;+export type EventDisplayNameFormatter = (item: EventLike) => string;- const translate = (key: string, values?: Record<string, string>) => {- const translated = t ? t(key, values) : key;- if (!values) return translated;+// Hook to generate display names for auto-captured events.+// Keep translation calls literal so next-intl can extract and compile them.+export function useEventDisplayName(): EventDisplayNameFormatter {+ const t = useExtracted();- return Object.entries(values).reduce(- (result, [placeholder, value]) => result.replaceAll(`{${placeholder}}`, () => value),- translated- );- };+ return useCallback(+ (item: EventLike): string => {+ if (item.event_name) return item.event_name;- switch (item.type) {- case "outbound":- return translate("Outbound Click");- case "button_click":- if (item.props?.text) return translate("Clicked button with text \"{text}\"", { text: item.props.text });- return translate("Clicked button");- case "copy": {- if (!item.props?.text) return translate("Copied text");- const text = String(item.props.text);- return translate("Copied \"{text}\"", { text: `${text.substring(0, 50)}${text.length > 50 ? "..." : ""}` });- }- case "form_submit":- if (item.props?.formId) return translate("Submitted form \"{name}\"", { name: item.props.formId });- if (item.props?.formName) return translate("Submitted form \"{name}\"", { name: item.props.formName });- if (item.props?.formAction) return translate("Submitted form to \"{action}\"", { action: item.props.formAction });- return translate("Submitted form");- case "input_change": {- const inputType = item.props?.inputType ? `${item.props.inputType} ` : "";- if (item.props?.inputName) return translate("Changed {type}input \"{name}\"", { type: inputType, name: item.props.inputName });- return translate("Changed {type}input", { type: inputType });- }- default:- return translate("Event");- }+ switch (item.type) {+ case "outbound":+ return t("Outbound Click");+ case "button_click":+ if (item.props?.text) return t("Clicked button with text \"{text}\"", { text: String(item.props.text) });+ return t("Clicked button");+ case "copy": {+ if (!item.props?.text) return t("Copied text");+ const text = String(item.props.text);+ return t("Copied \"{text}\"", { text: `${text.substring(0, 50)}${text.length > 50 ? "..." : ""}` });+ }+ case "form_submit":+ if (item.props?.formId) return t("Submitted form \"{name}\"", { name: String(item.props.formId) });+ if (item.props?.formName) return t("Submitted form \"{name}\"", { name: String(item.props.formName) });+ if (item.props?.formAction) return t("Submitted form to \"{action}\"", { action: String(item.props.formAction) });+ return t("Submitted form");+ case "input_change": {+ const inputType = item.props?.inputType ? `${item.props.inputType} ` : "";+ if (item.props?.inputName) return t("Changed {type}input \"{name}\"", { type: inputType, name: String(item.props.inputName) });+ return t("Changed {type}input", { type: inputType });+ }+ default:+ return t("Event");+ }+ },+ [t]+ );}// Props to hide from badges (already shown in event name or redundant)