Skip to content

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

Add session replay feature to admin site data and update Sites component to display it. Enhance invoice status handling in InvoicesCard component with a dedicated function for better readability. Update translations for multiple languages to include new status labels and ensure consistency across the application.

Bill Yangc69b00e50c6c
diff --git a/client/messages/cs.json b/client/messages/cs.json
index 5d928b9b1..398ead7ac 100644
--- a/client/messages/cs.json
+++ b/client/messages/cs.json
@@ -576,6 +576,8 @@
"viXE32": "Soukromý",
"6hdNA5": "Události (24h)",
"J4r/Gi": "Události (30d)",
+ "Zh+5A6": "",
+ "OvzONl": "",
"C2EM7h": "E-mail vlastníka",
"sEqhTf": "Nepodařilo se načíst data webů. Zkus to prosím později.",
"r9Y1x6": "Hledej podle domény nebo emailu vlastníka...",
@@ -1166,10 +1168,5 @@
"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})",
- "raz91s": "Zaplaceno",
- "N7QE9K": "Otevřená",
- "6VtPnS": "Zrušená",
- "T6S3Fn": "Nevymahatelná",
- "fS4iqP": "Koncept"
+ "rOpS8J": "Rybbit v{latest} je k dispozici (máš v{current})"
}
diff --git a/client/messages/de.json b/client/messages/de.json
index 5ca91d100..e46453f90 100644
--- a/client/messages/de.json
+++ b/client/messages/de.json
@@ -576,6 +576,8 @@
"viXE32": "Privat",
"6hdNA5": "Events (24h)",
"J4r/Gi": "Events (30d)",
+ "Zh+5A6": "",
+ "OvzONl": "",
"C2EM7h": "Inhaber-E-Mail",
"sEqhTf": "Website-Daten konnten nicht geladen werden. Bitte versuchen Sie es später erneut.",
"r9Y1x6": "Nach Domain oder Inhaber-E-Mail suchen...",
@@ -1166,10 +1168,5 @@
"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})",
- "raz91s": "Bezahlt",
- "N7QE9K": "Offen",
- "6VtPnS": "Storniert",
- "T6S3Fn": "Uneinbringlich",
- "fS4iqP": "Entwurf"
+ "rOpS8J": "Rybbit v{latest} ist verfügbar (Sie verwenden v{current})"
}
diff --git a/client/messages/en.json b/client/messages/en.json
index a791728d7..e6a362970 100644
--- a/client/messages/en.json
+++ b/client/messages/en.json
@@ -576,6 +576,8 @@
"viXE32": "Private",
"6hdNA5": "Events (24h)",
"J4r/Gi": "Events (30d)",
+ "Zh+5A6": "On",
+ "OvzONl": "Off",
"C2EM7h": "Owner Email",
"sEqhTf": "Failed to load sites data. Please try again later.",
"r9Y1x6": "Search by domain or owner email...",
@@ -1166,10 +1168,5 @@
"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})",
- "raz91s": "Paid",
- "N7QE9K": "Open",
- "6VtPnS": "Void",
- "T6S3Fn": "Uncollectible",
- "fS4iqP": "Draft"
+ "rOpS8J": "Rybbit v{latest} is available (you're on v{current})"
}
diff --git a/client/messages/es.json b/client/messages/es.json
index 48bf9a981..8b4b9c9ec 100644
--- a/client/messages/es.json
+++ b/client/messages/es.json
@@ -576,6 +576,8 @@
"viXE32": "Privado",
"6hdNA5": "Eventos (24h)",
"J4r/Gi": "Eventos (30d)",
+ "Zh+5A6": "",
+ "OvzONl": "",
"C2EM7h": "Correo del propietario",
"sEqhTf": "Error al cargar los datos de sitios. Inténtalo de nuevo más tarde.",
"r9Y1x6": "Buscar por dominio o correo del propietario...",
@@ -1166,10 +1168,5 @@
"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})",
- "raz91s": "Pagado",
- "N7QE9K": "Abierto",
- "6VtPnS": "Anulado",
- "T6S3Fn": "Incobrable",
- "fS4iqP": "Borrador"
+ "rOpS8J": "Rybbit v{latest} está disponible (estás en v{current})"
}
diff --git a/client/messages/fr.json b/client/messages/fr.json
index d6177b981..850d728dd 100644
--- a/client/messages/fr.json
+++ b/client/messages/fr.json
@@ -576,6 +576,8 @@
"viXE32": "Privé",
"6hdNA5": "Événements (24h)",
"J4r/Gi": "Événements (30j)",
+ "Zh+5A6": "",
+ "OvzONl": "",
"C2EM7h": "E-mail du propriétaire",
"sEqhTf": "Échec du chargement des données de sites. Veuillez réessayer plus tard.",
"r9Y1x6": "Rechercher par domaine ou e-mail du propriétaire...",
@@ -1166,10 +1168,5 @@
"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})",
- "raz91s": "Payé",
- "N7QE9K": "Ouvert",
- "6VtPnS": "Annulé",
- "T6S3Fn": "Irrécouvrable",
- "fS4iqP": "Brouillon"
+ "rOpS8J": "Rybbit v{latest} est disponible (vous utilisez v{current})"
}
diff --git a/client/messages/it.json b/client/messages/it.json
index 5c5d4b1d0..259dcf85e 100644
--- a/client/messages/it.json
+++ b/client/messages/it.json
@@ -576,6 +576,8 @@
"viXE32": "Privato",
"6hdNA5": "Eventi (24h)",
"J4r/Gi": "Eventi (30g)",
+ "Zh+5A6": "",
+ "OvzONl": "",
"C2EM7h": "Email Proprietario",
"sEqhTf": "Impossibile caricare i dati dei siti. Riprova più tardi.",
"r9Y1x6": "Cerca per dominio o email proprietario...",
@@ -1166,10 +1168,5 @@
"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})",
- "raz91s": "Pagato",
- "N7QE9K": "Aperto",
- "6VtPnS": "Annullato",
- "T6S3Fn": "Inesigibile",
- "fS4iqP": "Bozza"
+ "rOpS8J": "Rybbit v{latest} è disponibile (sei sulla v{current})"
}
diff --git a/client/messages/ja.json b/client/messages/ja.json
index 46f2b87d1..dc0fa6394 100644
--- a/client/messages/ja.json
+++ b/client/messages/ja.json
@@ -576,6 +576,8 @@
"viXE32": "非公開",
"6hdNA5": "イベント(24時間)",
"J4r/Gi": "イベント(30日間)",
+ "Zh+5A6": "",
+ "OvzONl": "",
"C2EM7h": "オーナーメール",
"sEqhTf": "サイトデータの読み込みに失敗しました。後でもう一度お試しください。",
"r9Y1x6": "ドメインまたはオーナーメールで検索...",
@@ -1166,10 +1168,5 @@
"5YSWst": "スクリプトは正常にインストールされ、実行されています。",
"EIQFLe": "スクリプトタグは見つかりましたが、実行されていません",
"+x0BAO": "スクリプトが検出されません",
- "rOpS8J": "Rybbit v{latest}が利用可能です(現在v{current})",
- "raz91s": "支払い済み",
- "N7QE9K": "未払い",
- "6VtPnS": "無効",
- "T6S3Fn": "回収不能",
- "fS4iqP": "下書き"
+ "rOpS8J": "Rybbit v{latest}が利用可能です(現在v{current})"
}
diff --git a/client/messages/ko.json b/client/messages/ko.json
index fd7f02bad..1f01b0293 100644
--- a/client/messages/ko.json
+++ b/client/messages/ko.json
@@ -576,6 +576,8 @@
"viXE32": "비공개",
"6hdNA5": "이벤트 (24시간)",
"J4r/Gi": "이벤트 (30일)",
+ "Zh+5A6": "",
+ "OvzONl": "",
"C2EM7h": "소유자 이메일",
"sEqhTf": "사이트 데이터를 로드하지 못했습니다. 나중에 다시 시도해 주세요.",
"r9Y1x6": "도메인 또는 소유자 이메일로 검색...",
@@ -1166,10 +1168,5 @@
"5YSWst": "스크립트가 설치되어 올바르게 실행 중입니다.",
"EIQFLe": "스크립트 태그는 발견되었지만 실행되지 않고 있습니다",
"+x0BAO": "스크립트가 감지되지 않음",
- "rOpS8J": "Rybbit v{latest}를 사용할 수 있습니다 (현재 v{current})",
- "raz91s": "결제 완료",
- "N7QE9K": "미결제",
- "6VtPnS": "무효",
- "T6S3Fn": "회수 불가",
- "fS4iqP": "초안"
+ "rOpS8J": "Rybbit v{latest}를 사용할 수 있습니다 (현재 v{current})"
}
diff --git a/client/messages/pl.json b/client/messages/pl.json
index 27385d0d4..a15aed0a9 100644
--- a/client/messages/pl.json
+++ b/client/messages/pl.json
@@ -576,6 +576,8 @@
"viXE32": "Prywatna",
"6hdNA5": "Zdarzenia (24h)",
"J4r/Gi": "Zdarzenia (30d)",
+ "Zh+5A6": "",
+ "OvzONl": "",
"C2EM7h": "E-mail właściciela",
"sEqhTf": "Nie udało się załadować danych stron. Spróbuj ponownie później.",
"r9Y1x6": "Szukaj po domenie lub e-mailu właściciela...",
@@ -1166,10 +1168,5 @@
"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})",
- "raz91s": "Opłacone",
- "N7QE9K": "Otwarte",
- "6VtPnS": "Anulowane",
- "T6S3Fn": "Nieściągalne",
- "fS4iqP": "Szkic"
+ "rOpS8J": "Rybbit v{latest} jest dostępny (masz v{current})"
}
diff --git a/client/messages/pt.json b/client/messages/pt.json
index 5114a516e..1f0cb4b41 100644
--- a/client/messages/pt.json
+++ b/client/messages/pt.json
@@ -576,6 +576,8 @@
"viXE32": "Privado",
"6hdNA5": "Eventos (24h)",
"J4r/Gi": "Eventos (30d)",
+ "Zh+5A6": "",
+ "OvzONl": "",
"C2EM7h": "Email do Proprietário",
"sEqhTf": "Falha ao carregar dados de sites. Por favor, tente novamente mais tarde.",
"r9Y1x6": "Pesquisar por domínio ou email do proprietário...",
@@ -1166,10 +1168,5 @@
"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})",
- "raz91s": "Pago",
- "N7QE9K": "Aberto",
- "6VtPnS": "Anulado",
- "T6S3Fn": "Incobrável",
- "fS4iqP": "Rascunho"
+ "rOpS8J": "Rybbit v{latest} está disponível (você está na v{current})"
}
diff --git a/client/messages/zh.json b/client/messages/zh.json
index 4535aa526..95799b583 100644
--- a/client/messages/zh.json
+++ b/client/messages/zh.json
@@ -576,6 +576,8 @@
"viXE32": "私有",
"6hdNA5": "事件 (24小时)",
"J4r/Gi": "事件 (30天)",
+ "Zh+5A6": "",
+ "OvzONl": "",
"C2EM7h": "所有者电子邮件",
"sEqhTf": "加载网站数据失败。请稍后重试。",
"r9Y1x6": "按域名或所有者电子邮件搜索...",
@@ -1166,10 +1168,5 @@
"5YSWst": "脚本已安装并正常运行。",
"EIQFLe": "找到了脚本标签,但未执行",
"+x0BAO": "未检测到脚本",
- "rOpS8J": "Rybbit v{latest} 现已发布(您当前使用的是 v{current})",
- "raz91s": "已付款",
- "N7QE9K": "未付款",
- "6VtPnS": "已作废",
- "T6S3Fn": "无法收回",
- "fS4iqP": "草稿"
+ "rOpS8J": "Rybbit v{latest} 现已发布(您当前使用的是 v{current})"
}
diff --git a/client/src/api/admin/endpoints/adminSites.ts b/client/src/api/admin/endpoints/adminSites.ts
index c6f832db6..d9d5bbddf 100644
--- a/client/src/api/admin/endpoints/adminSites.ts
+++ b/client/src/api/admin/endpoints/adminSites.ts
@@ -9,6 +9,7 @@ export interface AdminSiteData {
eventsLast30Days: number;
goalsCount: number;
funnelsCount: number;
+ sessionReplay: boolean;
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.tsx
index 27ad46c80..e633c0df6 100644
--- a/client/src/app/admin/components/sites/Sites.tsx
+++ b/client/src/app/admin/components/sites/Sites.tsx
@@ -111,6 +111,13 @@ export function Sites() {
header: ({ column }) => <SortableHeader column={column}>{t("Funnels")}</SortableHeader>,
cell: ({ row }) => <div>{row.getValue("funnelsCount")}</div>,
},
+ {
+ accessorKey: "sessionReplay",
+ header: ({ column }) => <SortableHeader column={column}>{t("Replay")}</SortableHeader>,
+ cell: ({ row }) => (
+ <div>{row.getValue("sessionReplay") ? <Badge>{t("On")}</Badge> : <Badge variant="outline">{t("Off")}</Badge>}</div>
+ ),
+ },
{
id: "subscription",
header: ({ column }) => <SortableHeader column={column}>{t("Subscription")}</SortableHeader>,
@@ -210,6 +217,9 @@ export function Sites() {
<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/client/src/components/subscription/components/InvoicesCard.tsx b/client/src/components/subscription/components/InvoicesCard.tsx
index 81c1d38a8..c7c2e6b64 100644
--- a/client/src/components/subscription/components/InvoicesCard.tsx
+++ b/client/src/components/subscription/components/InvoicesCard.tsx
@@ -55,13 +55,22 @@ const statusVariants: Record<string, "success" | "warning" | "secondary" | "dest
draft: "secondary",
};
-const statusLabels: Record<string, string> = {
- paid: "Paid",
- open: "Open",
- void: "Void",
- uncollectible: "Uncollectible",
- draft: "Draft",
-};
+function getStatusLabel(status: string | null, t: (key: string) => string): string {
+ switch (status) {
+ case "paid":
+ return t("Paid");
+ case "open":
+ return t("Open");
+ case "void":
+ return t("Void");
+ case "uncollectible":
+ return t("Uncollectible");
+ case "draft":
+ return t("Draft");
+ default:
+ return status ?? "";
+ }
+}
export function InvoicesCard() {
const t = useExtracted();
@@ -94,7 +103,7 @@ export function InvoicesCard() {
<td className="py-2.5 pr-4">{formatDate(invoice.created, locale)}</td>
<td className="py-2.5 pr-4">
<Badge variant={statusVariants[invoice.status ?? ""] ?? "secondary"}>
- {t(statusLabels[invoice.status ?? ""] ?? invoice.status ?? "")}
+ {getStatusLabel(invoice.status, t)}
</Badge>
</td>
<td className="py-2.5 pr-4 text-right">{formatCurrency(invoice.amountPaid || invoice.amountDue, invoice.currency, locale)}</td>
diff --git a/server/src/api/admin/getAdminSites.ts b/server/src/api/admin/getAdminSites.ts
index 148c92fe8..9d4b1a6b4 100644
--- a/server/src/api/admin/getAdminSites.ts
+++ b/server/src/api/admin/getAdminSites.ts
@@ -134,6 +134,7 @@ export async function getAdminSites(request: FastifyRequest, reply: FastifyReply
eventsLast30Days: siteEventMap30d.get(site.siteId) || 0,
goalsCount: siteGoalCountMap.get(site.siteId) || 0,
funnelsCount: siteFunnelCountMap.get(site.siteId) || 0,
+ sessionReplay: site.sessionReplay ?? false,
organizationOwnerEmail: site.organizationId ? orgOwnerMap.get(site.organizationId) : null,
subscription: {
planName: subscription?.planName || "free",