Skip to content

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

Rollup (#978)

Goldflag99a52950640d
diff --git a/client/messages/cs.json b/client/messages/cs.json
index abe45aba8..1c9cefa76 100644
--- a/client/messages/cs.json
+++ b/client/messages/cs.json
@@ -694,6 +694,7 @@
"MNKvNt": "Chyba při odesílání kódu",
"Dfc9/a": "Pamatuješ si heslo?",
"SQJto2": "Přihlásit se",
+ "n9e0j6": "",
"LAwI3R": "Jméno nemůže být prázdné",
"RQCAMr": "Nepodařilo se aktualizovat jméno",
"EKMIm1": "Jméno úspěšně aktualizováno",
@@ -1044,6 +1045,7 @@
"pq9Eeh": "Vstupní stránka:",
"CHR+o1": "Zobrazeno {shown} z {total} událostí",
"ZIstZx": "Stránka {page}",
+ "BDAoYD": "",
"FitPPb": "Upravit štítky",
"48r+p0": "Načítám výjimky zemí...",
"KsWJL5": "Výjimky zemí",
diff --git a/client/messages/de.json b/client/messages/de.json
index 19695cdcd..c04e5c7d6 100644
--- a/client/messages/de.json
+++ b/client/messages/de.json
@@ -694,6 +694,7 @@
"MNKvNt": "Fehler beim Senden des Codes",
"Dfc9/a": "Passwort erinnert?",
"SQJto2": "Anmelden",
+ "n9e0j6": "",
"LAwI3R": "Name darf nicht leer sein",
"RQCAMr": "Name konnte nicht aktualisiert werden",
"EKMIm1": "Name erfolgreich aktualisiert",
@@ -1044,6 +1045,7 @@
"pq9Eeh": "Einstiegsseite:",
"CHR+o1": "Zeige {shown} von {total} Events",
"ZIstZx": "Seite {page}",
+ "BDAoYD": "",
"FitPPb": "Tags bearbeiten",
"48r+p0": "Länderausschlüsse werden geladen...",
"KsWJL5": "Länderausschlüsse",
diff --git a/client/messages/en.json b/client/messages/en.json
index 9d812c365..866905777 100644
--- a/client/messages/en.json
+++ b/client/messages/en.json
@@ -694,6 +694,7 @@
"MNKvNt": "Error Sending Code",
"Dfc9/a": "Remember your password?",
"SQJto2": "Sign in",
+ "n9e0j6": "Select at least one site to view rollup analytics.",
"LAwI3R": "Name cannot be empty",
"RQCAMr": "Failed to update name",
"EKMIm1": "Name updated successfully",
@@ -1044,6 +1045,7 @@
"pq9Eeh": "Entry Page:",
"CHR+o1": "Showing {shown} of {total} events",
"ZIstZx": "Page {page}",
+ "BDAoYD": "Rollup",
"FitPPb": "Edit Tags",
"48r+p0": "Loading country exclusions...",
"KsWJL5": "Country Exclusions",
diff --git a/client/messages/es.json b/client/messages/es.json
index edd1ddf76..1535fcdd1 100644
--- a/client/messages/es.json
+++ b/client/messages/es.json
@@ -694,6 +694,7 @@
"MNKvNt": "Error al enviar el código",
"Dfc9/a": "¿Recuerdas tu contraseña?",
"SQJto2": "Iniciar sesión",
+ "n9e0j6": "",
"LAwI3R": "El nombre no puede estar vacío",
"RQCAMr": "Error al actualizar el nombre",
"EKMIm1": "Nombre actualizado correctamente",
@@ -1044,6 +1045,7 @@
"pq9Eeh": "Página de entrada:",
"CHR+o1": "Mostrando {shown} de {total} eventos",
"ZIstZx": "Página {page}",
+ "BDAoYD": "",
"FitPPb": "Editar etiquetas",
"48r+p0": "Cargando exclusiones de países...",
"KsWJL5": "Exclusiones de países",
diff --git a/client/messages/fr.json b/client/messages/fr.json
index 7f57fb43f..5d771aba6 100644
--- a/client/messages/fr.json
+++ b/client/messages/fr.json
@@ -694,6 +694,7 @@
"MNKvNt": "Erreur lors de l'envoi du code",
"Dfc9/a": "Vous vous souvenez de votre mot de passe ?",
"SQJto2": "Se connecter",
+ "n9e0j6": "",
"LAwI3R": "Le nom ne peut pas être vide",
"RQCAMr": "Échec de la mise à jour du nom",
"EKMIm1": "Nom mis à jour avec succès",
@@ -1044,6 +1045,7 @@
"pq9Eeh": "Page d'entrée :",
"CHR+o1": "Affichage de {shown} sur {total} événements",
"ZIstZx": "Page {page}",
+ "BDAoYD": "",
"FitPPb": "Modifier les tags",
"48r+p0": "Chargement des exclusions de pays...",
"KsWJL5": "Exclusions de pays",
diff --git a/client/messages/it.json b/client/messages/it.json
index ccf0272a7..6818f86e5 100644
--- a/client/messages/it.json
+++ b/client/messages/it.json
@@ -694,6 +694,7 @@
"MNKvNt": "Errore durante l'Invio del Codice",
"Dfc9/a": "Ricordi la tua password?",
"SQJto2": "Accedi",
+ "n9e0j6": "",
"LAwI3R": "Il nome non può essere vuoto",
"RQCAMr": "Impossibile aggiornare il nome",
"EKMIm1": "Nome aggiornato con successo",
@@ -1044,6 +1045,7 @@
"pq9Eeh": "Pagina di Ingresso:",
"CHR+o1": "Mostrando {shown} di {total} eventi",
"ZIstZx": "Pagina {page}",
+ "BDAoYD": "",
"FitPPb": "Modifica Tag",
"48r+p0": "Caricamento esclusioni paesi...",
"KsWJL5": "Esclusioni Paesi",
diff --git a/client/messages/ja.json b/client/messages/ja.json
index 7050b3eaa..f5adf7ec9 100644
--- a/client/messages/ja.json
+++ b/client/messages/ja.json
@@ -694,6 +694,7 @@
"MNKvNt": "コード送信エラー",
"Dfc9/a": "パスワードを覚えていますか?",
"SQJto2": "サインイン",
+ "n9e0j6": "",
"LAwI3R": "名前を空にすることはできません",
"RQCAMr": "名前の更新に失敗しました",
"EKMIm1": "名前を更新しました",
@@ -1044,6 +1045,7 @@
"pq9Eeh": "入口ページ:",
"CHR+o1": "{total}件中{shown}件のイベントを表示",
"ZIstZx": "{page}ページ",
+ "BDAoYD": "",
"FitPPb": "タグを編集",
"48r+p0": "国除外を読み込み中...",
"KsWJL5": "国除外",
diff --git a/client/messages/ko.json b/client/messages/ko.json
index 4cc39aa1e..419583188 100644
--- a/client/messages/ko.json
+++ b/client/messages/ko.json
@@ -694,6 +694,7 @@
"MNKvNt": "코드 전송 오류",
"Dfc9/a": "비밀번호를 기억하시나요?",
"SQJto2": "로그인",
+ "n9e0j6": "",
"LAwI3R": "이름은 비워둘 수 없습니다",
"RQCAMr": "이름 업데이트에 실패했습니다",
"EKMIm1": "이름이 성공적으로 업데이트되었습니다",
@@ -1044,6 +1045,7 @@
"pq9Eeh": "진입 페이지:",
"CHR+o1": "{total}개 중 {shown}개 이벤트 표시",
"ZIstZx": "{page} 페이지",
+ "BDAoYD": "",
"FitPPb": "태그 편집",
"48r+p0": "국가 제외 목록 로딩 중...",
"KsWJL5": "국가 제외",
diff --git a/client/messages/pl.json b/client/messages/pl.json
index a3493d3b9..31e03cfe6 100644
--- a/client/messages/pl.json
+++ b/client/messages/pl.json
@@ -694,6 +694,7 @@
"MNKvNt": "Błąd wysyłania kodu",
"Dfc9/a": "Pamiętasz hasło?",
"SQJto2": "Zaloguj się",
+ "n9e0j6": "",
"LAwI3R": "Nazwa nie może być pusta",
"RQCAMr": "Nie udało się zaktualizować nazwy",
"EKMIm1": "Nazwa zaktualizowana pomyślnie",
@@ -1044,6 +1045,7 @@
"pq9Eeh": "Strona wejściowa:",
"CHR+o1": "Wyświetlanie {shown} z {total} zdarzeń",
"ZIstZx": "Strona {page}",
+ "BDAoYD": "",
"FitPPb": "Edytuj tagi",
"48r+p0": "Ładowanie wykluczeń krajów...",
"KsWJL5": "Wykluczenia krajów",
diff --git a/client/messages/pt.json b/client/messages/pt.json
index 9fc67e468..a8c29b0d1 100644
--- a/client/messages/pt.json
+++ b/client/messages/pt.json
@@ -694,6 +694,7 @@
"MNKvNt": "Erro ao Enviar Código",
"Dfc9/a": "Lembra da sua senha?",
"SQJto2": "Entrar",
+ "n9e0j6": "",
"LAwI3R": "O nome não pode estar vazio",
"RQCAMr": "Falha ao atualizar nome",
"EKMIm1": "Nome atualizado com sucesso",
@@ -1044,6 +1045,7 @@
"pq9Eeh": "Página de Entrada:",
"CHR+o1": "Mostrando {shown} de {total} eventos",
"ZIstZx": "Página {page}",
+ "BDAoYD": "",
"FitPPb": "Editar Tags",
"48r+p0": "Carregando exclusões de país...",
"KsWJL5": "Exclusões de País",
diff --git a/client/messages/zh.json b/client/messages/zh.json
index 0ee30a936..2596cc6ba 100644
--- a/client/messages/zh.json
+++ b/client/messages/zh.json
@@ -694,6 +694,7 @@
"MNKvNt": "发送验证码时出错",
"Dfc9/a": "还记得密码吗?",
"SQJto2": "登录",
+ "n9e0j6": "",
"LAwI3R": "姓名不能为空",
"RQCAMr": "更新姓名失败",
"EKMIm1": "姓名更新成功",
@@ -1044,6 +1045,7 @@
"pq9Eeh": "入口页面:",
"CHR+o1": "显示第 {shown} 条,共 {total} 条事件",
"ZIstZx": "第 {page} 页",
+ "BDAoYD": "",
"FitPPb": "编辑标签",
"48r+p0": "正在加载国家/地区排除项...",
"KsWJL5": "国家/地区排除",
diff --git a/client/src/app/[site]/performance/components/PercentileSelector.tsx b/client/src/app/[site]/performance/components/PercentileSelector.tsx
index 8cb7c0169..0b826f83e 100644
--- a/client/src/app/[site]/performance/components/PercentileSelector.tsx
+++ b/client/src/app/[site]/performance/components/PercentileSelector.tsx
@@ -1,6 +1,6 @@
"use client";
-import { cn } from "@/lib/utils";
+import { ToggleChip } from "@/components/ToggleChip";
import { PercentileLevel, usePerformanceStore } from "../performanceStore";
const PERCENTILE_OPTIONS: {
@@ -19,28 +19,15 @@ export function PercentileSelector() {
return (
<div className="flex items-center space-x-2">
- {PERCENTILE_OPTIONS.map(option => {
- const isSelected = selectedPercentile === option.value;
-
- return (
- <button
- key={option.value}
- onClick={() => setSelectedPercentile(option.value)}
- className={cn(
- "flex items-center space-x-1.5 px-2 py-1 rounded text-xs font-medium transition-all",
- isSelected
- ? "bg-neutral-200 dark:bg-neutral-800 text-neutral-900 dark:text-white"
- : "bg-neutral-100 dark:bg-neutral-900 text-neutral-600 dark:text-neutral-500 hover:text-neutral-700 dark:hover:text-neutral-400"
- )}
- >
- <div
- className={cn("w-3 h-3 rounded-sm transition-opacity", isSelected ? "opacity-100" : "opacity-30")}
- style={{ backgroundColor: option.color }}
- />
- <span>{option.label}</span>
- </button>
- );
- })}
+ {PERCENTILE_OPTIONS.map(option => (
+ <ToggleChip
+ key={option.value}
+ isSelected={selectedPercentile === option.value}
+ onClick={() => setSelectedPercentile(option.value)}
+ swatchColor={option.color}
+ label={option.label}
+ />
+ ))}
</div>
);
}
diff --git a/client/src/app/[site]/performance/components/PerformanceChart.tsx b/client/src/app/[site]/performance/components/PerformanceChart.tsx
index 96bff0a7e..6079e2617 100644
--- a/client/src/app/[site]/performance/components/PerformanceChart.tsx
+++ b/client/src/app/[site]/performance/components/PerformanceChart.tsx
@@ -11,6 +11,7 @@ import Link from "next/link";
import { useState } from "react";
import { useGetPerformanceTimeSeries } from "../../../../api/analytics/hooks/performance/useGetPerformanceTimeSeries";
import { BucketSelection } from "../../../../components/BucketSelection";
+import { ToggleChip } from "../../../../components/ToggleChip";
import { RybbitLogo, RybbitTextLogo } from "../../../../components/RybbitLogo";
import { authClient } from "../../../../lib/auth";
import { formatChartDateTime, hour12, userLocale } from "../../../../lib/dateTimeUtils";
@@ -209,30 +210,19 @@ export function PerformanceChart() {
<div className="flex items-center space-x-2">
{(["P50", "P75", "P90", "P99"] as const).map(percentile => {
const colors = {
- P50: "hsl(var(--indigo-100))", // light blue
- P75: "hsl(var(--indigo-300))", // medium blue
- P90: "hsl(var(--indigo-400))", // blue
- P99: "hsl(var(--indigo-500))", // dark blue
+ P50: "hsl(var(--indigo-100))",
+ P75: "hsl(var(--indigo-300))",
+ P90: "hsl(var(--indigo-400))",
+ P99: "hsl(var(--indigo-500))",
};
- const isVisible = visiblePercentiles.has(percentile);
-
return (
- <button
+ <ToggleChip
key={percentile}
+ isSelected={visiblePercentiles.has(percentile)}
onClick={() => togglePercentile(percentile)}
- className={cn(
- "flex items-center space-x-1.5 px-2 py-1 rounded text-xs font-medium transition-all",
- isVisible
- ? "bg-neutral-150 dark:bg-neutral-800 text-neutral-900 dark:text-white"
- : "bg-neutral-50 dark:bg-neutral-900 text-neutral-600 dark:text-neutral-500 hover:text-neutral-700 dark:hover:text-neutral-400"
- )}
- >
- <div
- className={cn("w-3 h-3 rounded-sm transition-opacity", isVisible ? "opacity-100" : "opacity-30")}
- style={{ backgroundColor: colors[percentile] }}
- />
- <span>{percentile}</span>
- </button>
+ swatchColor={colors[percentile]}
+ label={percentile}
+ />
);
})}
</div>
diff --git a/client/src/app/rollup/components/MainSection/Chart.tsx b/client/src/app/rollup/components/MainSection/Chart.tsx
new file mode 100644
index 000000000..eba61e0dc
--- /dev/null
+++ b/client/src/app/rollup/components/MainSection/Chart.tsx
@@ -0,0 +1,290 @@
+"use client";
+import { TimeBucket } from "@rybbit/shared";
+import { ResponsiveBar } from "@nivo/bar";
+import { useWindowSize } from "@uidotdev/usehooks";
+import { DateTime } from "luxon";
+import { useState } from "react";
+import { createPortal } from "react-dom";
+import { ChartTooltip } from "@/components/charts/ChartTooltip";
+import { Time } from "@/components/DateSelector/types";
+import { formatChartDateTime, hour12, userLocale } from "@/lib/dateTimeUtils";
+import { useNivoTheme } from "@/lib/nivo";
+import { getTimezone, StatType } from "@/lib/store";
+import { formatSecondsAsMinutesAndSeconds, formatter } from "@/lib/utils";
+import { RollupSeries } from "../../hooks/useRollupBucketed";
+
+const SITE_COLORS = [
+ "hsla(217, 75%, 60%, 0.85)",
+ "hsla(142, 65%, 48%, 0.85)",
+ "hsla(24, 80%, 60%, 0.85)",
+ "hsla(280, 62%, 62%, 0.85)",
+ "hsla(190, 78%, 52%, 0.85)",
+ "hsla(340, 70%, 62%, 0.85)",
+ "hsla(48, 80%, 55%, 0.85)",
+ "hsla(160, 58%, 48%, 0.85)",
+ "hsla(0, 70%, 65%, 0.85)",
+ "hsla(258, 72%, 70%, 0.85)",
+ "hsla(80, 58%, 52%, 0.85)",
+ "hsla(210, 58%, 58%, 0.85)",
+ "hsla(12, 75%, 58%, 0.85)",
+ "hsla(170, 62%, 44%, 0.85)",
+ "hsla(300, 60%, 65%, 0.85)",
+ "hsla(60, 70%, 52%, 0.85)",
+ "hsla(230, 70%, 70%, 0.85)",
+ "hsla(110, 52%, 52%, 0.85)",
+ "hsla(35, 75%, 52%, 0.85)",
+ "hsla(320, 58%, 58%, 0.85)",
+ "hsla(180, 70%, 48%, 0.85)",
+ "hsla(265, 58%, 58%, 0.85)",
+ "hsla(95, 62%, 44%, 0.85)",
+ "hsla(15, 62%, 68%, 0.85)",
+ "hsla(200, 75%, 65%, 0.85)",
+ "hsla(135, 52%, 60%, 0.85)",
+ "hsla(355, 62%, 55%, 0.85)",
+ "hsla(245, 70%, 62%, 0.85)",
+ "hsla(70, 70%, 60%, 0.85)",
+ "hsla(290, 70%, 55%, 0.85)",
+];
+
+// Assign colors by position in the canonical site list so that no two sites
+// in view ever collide as long as there are at most SITE_COLORS.length sites.
+export function buildSiteColorMap(siteIds: number[]): Map<number, string> {
+ const map = new Map<number, string>();
+ siteIds.forEach((id, i) => {
+ map.set(id, SITE_COLORS[i % SITE_COLORS.length]);
+ });
+ return map;
+}
+
+const FALLBACK_COLOR = SITE_COLORS[0];
+
+// Stats that are sums across sites get stacked bars; weighted-average stats
+// get grouped (side-by-side) bars since stacking averages is misleading.
+const ADDITIVE_STATS: StatType[] = ["pageviews", "sessions", "users"];
+
+const formatTooltipValue = (value: number, selectedStat: StatType): string => {
+ if (selectedStat === "bounce_rate") return `${value.toFixed(1)}%`;
+ if (selectedStat === "session_duration")
+ return formatSecondsAsMinutesAndSeconds(value);
+ return value.toLocaleString();
+};
+
+type SiteMeta = {
+ siteId: number;
+ name: string;
+ domain: string;
+};
+
+export function Chart({
+ series,
+ siteMetaById,
+ siteColorMap,
+ selectedStat,
+ bucket,
+ time,
+}: {
+ series: RollupSeries[];
+ siteMetaById: Map<number, SiteMeta>;
+ siteColorMap: Map<number, string>;
+ selectedStat: StatType;
+ bucket: TimeBucket;
+ time: Time;
+}) {
+ const { width } = useWindowSize();
+ const nivoTheme = useNivoTheme();
+ const timezone = getTimezone();
+ const maxTicks = Math.max(1, Math.round((width ?? Infinity) / 75));
+
+ // Each site becomes a stacked/grouped key in every time-bucket row.
+ const labelForSeries = (s: RollupSeries) => {
+ const meta = siteMetaById.get(s.siteId);
+ return meta?.name || meta?.domain || `Site ${s.siteId}`;
+ };
+
+ const keys = series.map(labelForSeries);
+ const colors = series.map(
+ (s) => siteColorMap.get(s.siteId) ?? FALLBACK_COLOR
+ );
+
+ // Pivot series → one row per time bucket with a value per site key.
+ const buckets = new Map<string, Record<string, string | number>>();
+ series.forEach((s) => {
+ const key = labelForSeries(s);
+ s.data.forEach((point) => {
+ const ts = DateTime.fromSQL(point.time, { zone: timezone }).toUTC();
+ if (ts > DateTime.now()) return;
+ const timeStr = ts.toFormat("yyyy-MM-dd HH:mm:ss");
+ let row = buckets.get(timeStr);
+ if (!row) {
+ row = { time: timeStr };
+ keys.forEach((k) => {
+ row![k] = 0;
+ });
+ buckets.set(timeStr, row);
+ }
+ row[key] = point[selectedStat];
+ });
+ });
+
+ const chartData = Array.from(buckets.values()).sort((a, b) =>
+ String(a.time).localeCompare(String(b.time))
+ );
+
+ const groupMode: "grouped" | "stacked" = ADDITIVE_STATS.includes(selectedStat)
+ ? "stacked"
+ : "grouped";
+
+ const tickStep = Math.max(1, Math.ceil(chartData.length / maxTicks));
+
+ // Tooltip state — we render our own via a portal so it isn't clipped by the
+ // surrounding Card's overflow-hidden, and so it can show every site for the
+ // hovered time bucket rather than just the bar under the cursor.
+ const colorByKey = new Map(keys.map((k, i) => [k, colors[i]]));
+ const [hover, setHover] = useState<{
+ indexValue: string;
+ x: number;
+ y: number;
+ } | null>(null);
+
+ const hoverRow = hover
+ ? chartData.find((d) => d.time === hover.indexValue)
+ : undefined;
+
+ const hoverEntries = hoverRow
+ ? keys
+ .map((k) => ({
+ key: k,
+ value: Number(hoverRow[k] ?? 0),
+ color: colorByKey.get(k) ?? FALLBACK_COLOR,
+ }))
+ .sort((a, b) => b.value - a.value)
+ : [];
+
+ const tooltipWidth = 240;
+ const tooltipOffset = 14;
+ const viewportW = typeof window !== "undefined" ? window.innerWidth : 0;
+ const tooltipLeft = hover
+ ? Math.min(hover.x + tooltipOffset, viewportW - tooltipWidth - 8)
+ : 0;
+
+ return (
+ <>
+ <div
+ className="w-full h-full"
+ onMouseMove={(e) =>
+ setHover((prev) =>
+ prev
+ ? { ...prev, x: e.clientX, y: e.clientY }
+ : prev
+ )
+ }
+ onMouseLeave={() => setHover(null)}
+ >
+ <ResponsiveBar
+ data={chartData}
+ keys={keys}
+ indexBy="time"
+ groupMode={groupMode}
+ theme={nivoTheme}
+ margin={{ top: 10, right: 15, bottom: 30, left: 40 }}
+ padding={0.2}
+ innerPadding={groupMode === "grouped" ? 1 : 0}
+ valueScale={{ type: "linear" }}
+ indexScale={{ type: "band", round: true }}
+ colors={colors}
+ enableGridX={false}
+ enableGridY={true}
+ enableLabel={false}
+ borderRadius={1}
+ animate={false}
+ axisTop={null}
+ axisRight={null}
+ axisBottom={{
+ tickSize: 5,
+ tickPadding: 10,
+ tickRotation: 0,
+ format: (value: string) => {
+ const idx = chartData.findIndex((d) => d.time === value);
+ if (idx === -1 || idx % tickStep !== 0) return "";
+ const dt = DateTime.fromFormat(value, "yyyy-MM-dd HH:mm:ss", {
+ zone: "utc",
+ })
+ .setZone(getTimezone())
+ .setLocale(userLocale);
+ if (time.mode === "past-minutes") {
+ if (time.pastMinutesStart < 1440)
+ return dt.toFormat(hour12 ? "h:mm" : "HH:mm");
+ return dt.toFormat(hour12 ? "ha" : "HH:mm");
+ }
+ if (time.mode === "day")
+ return dt.toFormat(hour12 ? "ha" : "HH:mm");
+ return dt.toFormat(hour12 ? "MMM d" : "dd MMM");
+ },
+ }}
+ axisLeft={{
+ tickSize: 5,
+ tickPadding: 10,
+ tickRotation: 0,
+ format: formatter,
+ }}
+ onMouseEnter={(datum, event) =>
+ setHover({
+ indexValue: String(datum.indexValue),
+ x: event.clientX,
+ y: event.clientY,
+ })
+ }
+ onMouseLeave={() => setHover(null)}
+ tooltip={() => <></>}
+ />
+ </div>
+ {hover && hoverRow && typeof document !== "undefined" &&
+ createPortal(
+ <div
+ style={{
+ position: "fixed",
+ left: tooltipLeft,
+ top: hover.y + tooltipOffset,
+ width: tooltipWidth,
+ pointerEvents: "none",
+ zIndex: 9999,
+ }}
+ >
+ <ChartTooltip>
+ <div className="text-xs font-medium px-2 pt-1.5 pb-1 text-neutral-400">
+ {formatChartDateTime(
+ DateTime.fromFormat(
+ hover.indexValue,
+ "yyyy-MM-dd HH:mm:ss",
+ { zone: "utc" }
+ ).setZone(getTimezone()),
+ bucket
+ )}
+ </div>
+ <div className="w-full h-px bg-neutral-100 dark:bg-neutral-750" />
+ <div className="m-2 flex flex-col gap-1">
+ {hoverEntries.map((e) => (
+ <div
+ key={e.key}
+ className="flex justify-between text-sm gap-3"
+ >
+ <div className="flex items-center gap-2 min-w-0">
+ <div
+ className="w-1 h-3 rounded-[3px] shrink-0"
+ style={{ backgroundColor: e.color }}
+ />
+ <span className="truncate">{e.key}</span>
+ </div>
+ <div className="shrink-0">
+ {formatTooltipValue(e.value, selectedStat)}
+ </div>
+ </div>
+ ))}
+ </div>
+ </ChartTooltip>
+ </div>,
+ document.body
+ )}
+ </>
+ );
+}
diff --git a/client/src/app/rollup/components/MainSection/MainSection.tsx b/client/src/app/rollup/components/MainSection/MainSection.tsx
new file mode 100644
index 000000000..069595f64
--- /dev/null
+++ b/client/src/app/rollup/components/MainSection/MainSection.tsx
@@ -0,0 +1,236 @@
+"use client";
+import NumberFlow from "@number-flow/react";
+import { useExtracted } from "next-intl";
+import { useMemo } from "react";
+import { GetSitesFromOrgResponse } from "@/api/admin/endpoints/sites";
+import { BucketSelection } from "@/components/BucketSelection";
+import { Card, CardContent, CardLoader } from "@/components/ui/card";
+import { Skeleton } from "@/components/ui/skeleton";
+import { cn, formatSecondsAsMinutesAndSeconds } from "@/lib/utils";
+import { StatType, useStore } from "@/lib/store";
+import { useRollupBucketed } from "../../hooks/useRollupBucketed";
+import { Chart } from "./Chart";
+
+type SiteRow = GetSitesFromOrgResponse["sites"][number];
+
+const Stat = ({
+ title,
+ id,
+ value,
+ valueFormatter,
+ isLoading,
+ decimals,
+ postfix,
+}: {
+ title: string;
+ id: StatType;
+ value: number;
+ valueFormatter?: (value: number) => string;
+ isLoading: boolean;
+ decimals?: number;
+ postfix?: string;
+}) => {
+ const { selectedStat, setSelectedStat } = useStore();
+ return (
+ <div
+ className={cn(
+ "flex flex-col cursor-pointer border-r border-neutral-100 dark:border-neutral-800 last:border-r-0 text-nowrap",
+ selectedStat === id && "bg-neutral-0 dark:bg-neutral-850"
+ )}
+ onClick={() => setSelectedStat(id)}
+ >
+ <div className="flex flex-col px-3 py-2">
+ <div className="text-xs font-medium text-muted-foreground">{title}</div>
+ <div className="text-2xl font-medium flex gap-2 items-center">
+ {isLoading ? (
+ <Skeleton className="w-[60px] h-9 rounded-md" />
+ ) : valueFormatter ? (
+ <span>{valueFormatter(value)}</span>
+ ) : (
+ <span>
+ <NumberFlow
+ respectMotionPreference={false}
+ value={decimals ? Number(value.toFixed(decimals)) : value}
+ format={{ notation: "compact" }}
+ />
+ {postfix && <span>{postfix}</span>}
+ </span>
+ )}
+ </div>
+ </div>
+ </div>
+ );
+};
+
+export function MainSection({
+ siteIds,
+ sites,
+ siteColorMap,
+}: {
+ siteIds: number[];
+ sites: SiteRow[];
+ siteColorMap: Map<number, string>;
+}) {
+ const t = useExtracted();
+ const { selectedStat, bucket, time } = useStore();
+
+ const { series, isFetching, isLoading } = useRollupBucketed({
+ siteIds,
+ bucket,
+ });
+
+ const siteMetaById = useMemo(() => {
+ const m = new Map<
+ number,
+ { siteId: number; name: string; domain: string }
+ >();
+ for (const s of sites) {
+ m.set(s.siteId, { siteId: s.siteId, name: s.name, domain: s.domain });
+ }
+ return m;
+ }, [sites]);
+
+ // Aggregate totals across all sites and time buckets.
+ const totals = useMemo(() => {
+ let pageviews = 0;
+ let sessions = 0;
+ let users = 0;
+ let weightedBounce = 0;
+ let weightedDuration = 0;
+ let weightedPagesPerSession = 0;
+ for (const s of series) {
+ for (const b of s.data) {
+ pageviews += b.pageviews;
+ sessions += b.sessions;
+ users += b.users;
+ weightedBounce += b.bounce_rate * b.sessions;
+ weightedDuration += b.session_duration * b.sessions;
+ weightedPagesPerSession += b.pages_per_session * b.sessions;
+ }
+ }
+ return {
+ pageviews,
+ sessions,
+ users,
+ bounce_rate: sessions ? weightedBounce / sessions : 0,
+ session_duration: sessions ? weightedDuration / sessions : 0,
+ pages_per_session: sessions ? weightedPagesPerSession / sessions : 0,
+ };
+ }, [series]);
+
+ const getSelectedStatLabel = () => {
+ switch (selectedStat) {
+ case "pageviews":
+ return t("Pageviews");
+ case "sessions":
+ return t("Sessions");
+ case "pages_per_session":
+ return t("Pages per Session");
+ case "bounce_rate":
+ return t("Bounce Rate");
+ case "session_duration":
+ return t("Session Duration");
+ case "users":
+ return t("Users");
+ default:
+ return selectedStat;
+ }
+ };
+
+ return (
+ <>
+ <Card>
+ <CardContent className="p-0 w-full">
+ <div className="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-6 gap-0 items-center">
+ <Stat
+ title={t("Unique Users")}
+ id="users"
+ value={totals.users}
+ isLoading={isLoading}
+ />
+ <Stat
+ title={t("Sessions")}
+ id="sessions"
+ value={totals.sessions}
+ isLoading={isLoading}
+ />
+ <Stat
+ title={t("Pageviews")}
+ id="pageviews"
+ value={totals.pageviews}
+ isLoading={isLoading}
+ />
+ <Stat
+ title={t("Pages per Session")}
+ id="pages_per_session"
+ value={totals.pages_per_session}
+ decimals={1}
+ isLoading={isLoading}
+ />
+ <Stat
+ title={t("Bounce Rate")}
+ id="bounce_rate"
+ value={totals.bounce_rate}
+ postfix="%"
+ decimals={1}
+ isLoading={isLoading}
+ />
+ <Stat
+ title={t("Session Duration")}
+ id="session_duration"
+ value={totals.session_duration}
+ valueFormatter={formatSecondsAsMinutesAndSeconds}
+ isLoading={isLoading}
+ />
+ </div>
+ </CardContent>
+ {isFetching && <CardLoader />}
+ </Card>
+
+ <Card>
+ {isFetching && <CardLoader />}
+ <CardContent className="p-2 md:p-4 py-3 w-full">
+ <div className="flex items-center justify-between px-2 md:px-0">
+ <span className="text-sm text-neutral-700 dark:text-neutral-200">
+ {getSelectedStatLabel()}
+ </span>
+ <BucketSelection />
+ </div>
+ <div className="h-[200px] md:h-[290px] relative">
+ <Chart
+ series={series}
+ siteMetaById={siteMetaById}
+ siteColorMap={siteColorMap}
+ selectedStat={selectedStat}
+ bucket={bucket}
+ time={time}
+ />
+ </div>
+ {series.length > 0 && (
+ <div className="flex flex-wrap gap-x-4 gap-y-1 px-2 md:px-0 pt-2">
+ {series.map((s) => {
+ const meta = siteMetaById.get(s.siteId);
+ return (
+ <div
+ key={s.siteId}
+ className="flex items-center gap-2 text-xs text-neutral-700 dark:text-neutral-300"
+ >
+ <div
+ className="w-2 h-2 rounded-sm"
+ style={{
+ backgroundColor: siteColorMap.get(s.siteId) ?? "",
+ }}
+ />
+ <span className="truncate max-w-[180px]">
+ {meta?.name || meta?.domain || `Site ${s.siteId}`}
+ </span>
+ </div>
+ );
+ })}
+ </div>
+ )}
+ </CardContent>
+ </Card>
+ </>
+ );
+}
diff --git a/client/src/app/rollup/components/RollupTopBar.tsx b/client/src/app/rollup/components/RollupTopBar.tsx
new file mode 100644
index 000000000..467442773
--- /dev/null
+++ b/client/src/app/rollup/components/RollupTopBar.tsx
@@ -0,0 +1,53 @@
+"use client";
+import { ChevronLeft, ChevronRight } from "lucide-react";
+import { Team } from "@/api/admin/endpoints/teams";
+import { DateSelector } from "@/components/DateSelector/DateSelector";
+import { TeamSelector } from "@/components/TeamSelector";
+import { Button } from "@/components/ui/button";
+import { canGoForward, goBack, goForward, useStore } from "@/lib/store";
+
+export function RollupTopBar({
+ teams,
+ selectedTeamFilter,
+ onSelectedTeamFilterChange,
+}: {
+ teams: Team[];
+ selectedTeamFilter: string;
+ onSelectedTeamFilterChange: (value: string) => void;
+}) {
+ const { time, setTime } = useStore();
+
+ return (
+ <div className="flex flex-wrap gap-2 justify-between items-center">
+ <TeamSelector
+ teams={teams}
+ value={selectedTeamFilter}
+ onValueChange={onSelectedTeamFilterChange}
+ canCreateTeam={false}
+ />
+ <div className="flex items-center gap-2">
+ <DateSelector time={time} setTime={setTime} />
+ <div className="flex items-center">
+ <Button
+ variant="secondary"
+ size="icon"
+ onClick={goBack}
+ disabled={time.mode === "past-minutes"}
+ className="rounded-r-none h-8 w-8"
+ >
+ <ChevronLeft />
+ </Button>
+ <Button
+ variant="secondary"
+ size="icon"
+ onClick={goForward}
+ disabled={!canGoForward(time)}
+ className="rounded-l-none -ml-px h-8 w-8"
+ >
+ <ChevronRight />
+ </Button>
+ </div>
+ </div>
+ </div>
+ );
+}
diff --git a/client/src/app/rollup/components/SiteToggleStrip.tsx b/client/src/app/rollup/components/SiteToggleStrip.tsx
new file mode 100644
index 000000000..15f9b9b91
--- /dev/null
+++ b/client/src/app/rollup/components/SiteToggleStrip.tsx
@@ -0,0 +1,45 @@
+"use client";
+import { GetSitesFromOrgResponse } from "@/api/admin/endpoints/sites";
+import { ToggleChip } from "@/components/ToggleChip";
+
+type SiteRow = GetSitesFromOrgResponse["sites"][number];
+
+export function SiteToggleStrip({
+ sites,
+ selectedSiteIds,
+ siteColorMap,
+ onSelectedSiteIdsChange,
+}: {
+ sites: SiteRow[];
+ selectedSiteIds: number[];
+ siteColorMap: Map<number, string>;
+ onSelectedSiteIdsChange: (ids: number[]) => void;
+}) {
+ const selected = new Set(selectedSiteIds);
+
+ const toggle = (siteId: number) => {
+ if (selected.has(siteId)) {
+ onSelectedSiteIdsChange(selectedSiteIds.filter((id) => id !== siteId));
+ } else {
+ onSelectedSiteIdsChange([...selectedSiteIds, siteId]);
+ }
+ };
+
+ return (
+ <div className="flex flex-wrap items-center gap-2">
+ {sites.map((site) => (
+ <ToggleChip
+ key={site.siteId}
+ isSelected={selected.has(site.siteId)}
+ onClick={() => toggle(site.siteId)}
+ swatchColor={siteColorMap.get(site.siteId) ?? ""}
+ label={
+ <span className="truncate max-w-[180px]">
+ {site.name || site.domain}
+ </span>
+ }
+ />
+ ))}
+ </div>
+ );
+}
diff --git a/client/src/app/rollup/components/sections/Countries.tsx b/client/src/app/rollup/components/sections/Countries.tsx
new file mode 100644
index 000000000..c38cb6e8e
--- /dev/null
+++ b/client/src/app/rollup/components/sections/Countries.tsx
@@ -0,0 +1,184 @@
+"use client";
+import { ChevronRight, Expand, Globe } from "lucide-react";
+import { useExtracted } from "next-intl";
+import { useState } from "react";
+import { CountryFlag } from "@/app/[site]/components/shared/icons/CountryFlag";
+import {
+ Tabs,
+ TabsContent,
+ TabsList,
+ TabsTrigger,
+} from "@/components/ui/basic-tabs";
+import { Button } from "@/components/ui/button";
+import { Card, CardContent } from "@/components/ui/card";
+import { useSubdivisions } from "@/lib/geo";
+import { getCountryName, getLanguageName } from "@/lib/utils";
+import { RollupSection } from "./RollupSection";
+
+type Tab = "countries" | "regions" | "cities" | "languages" | "timezones";
+
+function getCountryCity(value: string) {
+ if (value.split("-").length === 2) {
+ const [country, city] = value.split("-");
+ return { country, region: "", city };
+ }
+ const [country, region, city] = value.split("-");
+ return { country, region, city };
+}
+
+const getCountryFromLanguage = (languageCode: string): string | null => {
+ if (languageCode.includes("-")) {
+ const [_, region] = languageCode.split("-");
+ return region;
+ }
+ return null;
+};
+
+export function Countries({ siteIds }: { siteIds: number[] }) {
+ const [tab, setTab] = useState<Tab>("countries");
+ const [expanded, setExpanded] = useState(false);
+ const t = useExtracted();
+ const close = () => setExpanded(false);
+ const { data: subdivisions } = useSubdivisions();
+
+ return (
+ <Card className="h-[405px]">
+ <CardContent className="mt-2">
+ <Tabs
+ defaultValue="countries"
+ value={tab}
+ onValueChange={(value) => setTab(value as Tab)}
+ >
+ <div className="flex flex-row gap-2 justify-between items-center">
+ <TabsList>
+ <TabsTrigger value="countries">{t("Countries")}</TabsTrigger>
+ <TabsTrigger value="regions">{t("Regions")}</TabsTrigger>
+ <TabsTrigger value="cities">{t("Cities")}</TabsTrigger>
+ <TabsTrigger value="languages">{t("Languages")}</TabsTrigger>
+ <TabsTrigger value="timezones">{t("Timezones")}</TabsTrigger>
+ </TabsList>
+ <div className="w-7">
+ <Button size="smIcon" onClick={() => setExpanded(!expanded)}>
+ <Expand className="w-4 h-4" />
+ </Button>
+ </div>
+ </div>
+ <TabsContent value="countries">
+ <RollupSection
+ siteIds={siteIds}
+ filterParameter="country"
+ title={t("Countries")}
+ getKey={(e) => e.value}
+ getValue={(e) => e.value}
+ getFilterLabel={(e) => getCountryName(e.value) || ""}
+ getLabel={(e) => (
+ <div className="flex gap-2 items-center">
+ <CountryFlag country={e.value} />
+ {getCountryName(e.value) || t("Unknown")}
+ </div>
+ )}
+ expanded={expanded}
+ close={close}
+ />
+ </TabsContent>
+ <TabsContent value="regions">
+ <RollupSection
+ siteIds={siteIds}
+ filterParameter="region"
+ title={t("Regions")}
+ getKey={(e) => e.value}
+ getValue={(e) => e.value}
+ getFilterLabel={(e) => {
+ const region = subdivisions?.features.find(
+ (f) => f.properties.iso_3166_2 === e.value
+ )?.properties;
+ return region?.name ?? "";
+ }}
+ getLabel={(e) => {
+ if (!e.value) return t("Unknown");
+ const region = subdivisions?.features.find(
+ (f) => f.properties.iso_3166_2 === e.value
+ )?.properties;
+ const countryCode = e.value.split("-")[0];
+ return (
+ <div className="flex gap-2 items-center">
+ <CountryFlag country={countryCode} />
+ {countryCode}
+ <ChevronRight className="w-4 h-4 mx-[-4px]" />
+ {region?.name ?? e.value.slice(3)}
+ </div>
+ );
+ }}
+ expanded={expanded}
+ close={close}
+ />
+ </TabsContent>
+ <TabsContent value="cities">
+ <RollupSection
+ siteIds={siteIds}
+ filterParameter="city"
+ title={t("Cities")}
+ getKey={(e) => e.value}
+ getValue={(e) => e.value}
+ getLabel={(e) => {
+ if (!e.value || e.value === "-") return t("Unknown");
+ const { country, region, city } = getCountryCity(e.value) ?? {};
+ const region_ = subdivisions?.features.find(
+ (f) => f.properties.iso_3166_2 === `${country}-${region}`
+ )?.properties;
+ return (
+ <div className="flex gap-2 items-center">
+ <CountryFlag country={country} />
+ {country}
+ {region_?.name && (
+ <ChevronRight className="w-4 h-4 mx-[-4px]" />
+ )}
+ {region_?.name}
+ {city && <ChevronRight className="w-4 h-4 mx-[-4px]" />}
+ {city}
+ </div>
+ );
+ }}
+ expanded={expanded}
+ close={close}
+ />
+ </TabsContent>
+ <TabsContent value="languages">
+ <RollupSection
+ siteIds={siteIds}
+ filterParameter="language"
+ title={t("Languages")}
+ getKey={(e) => e.value}
+ getValue={(e) => e.value}
+ getFilterLabel={(e) => getLanguageName(e.value) || ""}
+ getLabel={(e) => (
+ <div className="flex gap-2 items-center">
+ {getCountryFromLanguage(e.value) ? (
+ <CountryFlag country={getCountryFromLanguage(e.value)!} />
+ ) : (
+ <Globe className="w-5 h-5" />
+ )}
+ {getLanguageName(e.value) || e.value || t("Unknown")}
+ </div>
+ )}
+ expanded={expanded}
+ close={close}
+ />
+ </TabsContent>
+ <TabsContent value="timezones">
+ <RollupSection
+ siteIds={siteIds}
+ filterParameter="timezone"
+ title={t("Timezones")}
+ getKey={(e) => e.value}
+ getValue={(e) => e.value}
+ getLabel={(e) => e.value || t("Unknown")}
+ expanded={expanded}
+ close={close}
+ />
+ </TabsContent>
+ </Tabs>
+ </CardContent>
+ </Card>
+ );
+}
diff --git a/client/src/app/rollup/components/sections/Devices.tsx b/client/src/app/rollup/components/sections/Devices.tsx
new file mode 100644
index 000000000..5ac6757be
--- /dev/null
+++ b/client/src/app/rollup/components/sections/Devices.tsx
@@ -0,0 +1,118 @@
+"use client";
+import { Expand } from "lucide-react";
+import { useExtracted } from "next-intl";
+import { useState } from "react";
+import { Browser } from "@/app/[site]/components/shared/icons/Browser";
+import { DeviceIcon } from "@/app/[site]/components/shared/icons/Device";
+import { OperatingSystem } from "@/app/[site]/components/shared/icons/OperatingSystem";
+import {
+ Tabs,
+ TabsContent,
+ TabsList,
+ TabsTrigger,
+} from "@/components/ui/basic-tabs";
+import { Button } from "@/components/ui/button";
+import { Card, CardContent } from "@/components/ui/card";
+import { RollupSection } from "./RollupSection";
+
+type Tab = "browsers" | "devices" | "os" | "dimensions";
+
+export function Devices({ siteIds }: { siteIds: number[] }) {
+ const [tab, setTab] = useState<Tab>("browsers");
+ const [expanded, setExpanded] = useState(false);
+ const t = useExtracted();
+ const close = () => setExpanded(false);
+
+ return (
+ <Card className="h-[405px]">
+ <CardContent className="mt-2">
+ <Tabs
+ defaultValue="browsers"
+ value={tab}
+ onValueChange={(value) => setTab(value as Tab)}
+ >
+ <div className="flex flex-row gap-2 justify-between items-center">
+ <div className="overflow-x-auto">
+ <TabsList>
+ <TabsTrigger value="browsers">{t("Browsers")}</TabsTrigger>
+ <TabsTrigger value="devices">{t("Devices")}</TabsTrigger>
+ <TabsTrigger value="os">{t("Operating Systems")}</TabsTrigger>
+ <TabsTrigger value="dimensions">
+ {t("Screen Dimensions")}
+ </TabsTrigger>
+ </TabsList>
+ </div>
+ <div className="w-7">
+ <Button size="smIcon" onClick={() => setExpanded(!expanded)}>
+ <Expand className="w-4 h-4" />
+ </Button>
+ </div>
+ </div>
+ <TabsContent value="browsers">
+ <RollupSection
+ siteIds={siteIds}
+ filterParameter="browser"
+ title={t("Browsers")}
+ getKey={(e) => e.value}
+ getValue={(e) => e.value}
+ getLabel={(e) => (
+ <div className="flex gap-2 items-center">
+ <Browser browser={e.value} />
+ {e.value || t("Other")}
+ </div>
+ )}
+ expanded={expanded}
+ close={close}
+ />
+ </TabsContent>
+ <TabsContent value="devices">
+ <RollupSection
+ siteIds={siteIds}
+ filterParameter="device_type"
+ title={t("Devices")}
+ getKey={(e) => e.value}
+ getValue={(e) => e.value}
+ getLabel={(e) => (
+ <div className="flex gap-2 items-center">
+ <DeviceIcon deviceType={e.value || ""} size={16} />
+ {e.value || t("Other")}
+ </div>
+ )}
+ expanded={expanded}
+ close={close}
+ />
+ </TabsContent>
+ <TabsContent value="os">
+ <RollupSection
+ siteIds={siteIds}
+ filterParameter="operating_system"
+ title={t("Operating Systems")}
+ getKey={(e) => e.value}
+ getValue={(e) => e.value}
+ getLabel={(e) => (
+ <div className="flex gap-2 items-center">
+ <OperatingSystem os={e.value || "Other"} />
+ {e.value || t("Other")}
+ </div>
+ )}
+ expanded={expanded}
+ close={close}
+ />
+ </TabsContent>
+ <TabsContent value="dimensions">
+ <RollupSection
+ siteIds={siteIds}
+ filterParameter="dimensions"
+ title={t("Screen Dimensions")}
+ getKey={(e) => e.value}
+ getValue={(e) => e.value}
+ getLabel={(e) => e.value || t("Other")}
+ expanded={expanded}
+ close={close}
+ />
+ </TabsContent>
+ </Tabs>
+ </CardContent>
+ </Card>
+ );
+}
diff --git a/client/src/app/rollup/components/sections/Referrers.tsx b/client/src/app/rollup/components/sections/Referrers.tsx
new file mode 100644
index 000000000..2b4cea0f3
--- /dev/null
+++ b/client/src/app/rollup/components/sections/Referrers.tsx
@@ -0,0 +1,192 @@
+"use client";
+import { Expand } from "lucide-react";
+import { useExtracted } from "next-intl";
+import { useState } from "react";
+import { ChannelIcon } from "@/components/Channel";
+import { Favicon } from "@/components/Favicon";
+import {
+ Tabs,
+ TabsContent,
+ TabsList,
+ TabsTrigger,
+} from "@/components/ui/basic-tabs";
+import { Button } from "@/components/ui/button";
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
+import { Card, CardContent } from "@/components/ui/card";
+import { RollupSection } from "./RollupSection";
+
+type Tab =
+ | "referrers"
+ | "channels"
+ | "utm_source"
+ | "utm_medium"
+ | "utm_campaign"
+ | "utm_term"
+ | "utm_content";
+
+export function Referrers({ siteIds }: { siteIds: number[] }) {
+ const [tab, setTab] = useState<Tab>("referrers");
+ const [expanded, setExpanded] = useState(false);
+ const t = useExtracted();
+ const close = () => setExpanded(false);
+
+ return (
+ <Card className="h-[405px]">
+ <CardContent className="mt-2">
+ <Tabs
+ defaultValue="referrers"
+ value={tab}
+ onValueChange={(value) => setTab(value as Tab)}
+ >
+ <div className="flex flex-row gap-2 justify-between items-center">
+ <div className="overflow-x-auto">
+ <TabsList>
+ <TabsTrigger value="referrers">{t("Referrers")}</TabsTrigger>
+ <TabsTrigger value="channels">{t("Channels")}</TabsTrigger>
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild unstyled>
+ <div
+ className={`inline-flex items-center justify-center whitespace-nowrap border-b-2 py-1 text-sm font-medium transition-all cursor-pointer ${
+ tab.startsWith("utm_")
+ ? "border-neutral-950 text-neutral-950 dark:border-neutral-100 dark:text-neutral-50"
+ : "border-transparent text-neutral-600 dark:text-neutral-400"
+ }`}
+ >
+ {tab === "utm_source" && t("Source")}
+ {tab === "utm_medium" && t("Medium")}
+ {tab === "utm_campaign" && t("Campaign")}
+ {tab === "utm_term" && t("Term")}
+ {tab === "utm_content" && t("Content")}
+ {!tab.startsWith("utm_") && t("UTM")}
+ </div>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="start">
+ <DropdownMenuItem onClick={() => setTab("utm_source")}>
+ {t("Source")}
+ </DropdownMenuItem>
+ <DropdownMenuItem onClick={() => setTab("utm_medium")}>
+ {t("Medium")}
+ </DropdownMenuItem>
+ <DropdownMenuItem onClick={() => setTab("utm_campaign")}>
+ {t("Campaign")}
+ </DropdownMenuItem>
+ <DropdownMenuItem onClick={() => setTab("utm_term")}>
+ {t("Term")}
+ </DropdownMenuItem>
+ <DropdownMenuItem onClick={() => setTab("utm_content")}>
+ {t("Content")}
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ </TabsList>
+ </div>
+ <div className="w-7">
+ <Button size="smIcon" onClick={() => setExpanded(!expanded)}>
+ <Expand className="w-4 h-4" />
+ </Button>
+ </div>
+ </div>
+ <TabsContent value="referrers">
+ <RollupSection
+ siteIds={siteIds}
+ filterParameter="referrer"
+ title={t("Referrers")}
+ getKey={(e) => e.value}
+ getValue={(e) => e.value}
+ getLink={(e) => `https://${e.value}`}
+ getLabel={(e) => (
+ <div className="flex items-center">
+ <Favicon domain={e.value} className="w-4 mr-2" />
+ {e.value ? e.value : t("Direct")}
+ </div>
+ )}
+ expanded={expanded}
+ close={close}
+ />
+ </TabsContent>
+ <TabsContent value="channels">
+ <RollupSection
+ siteIds={siteIds}
+ filterParameter="channel"
+ title={t("Channels")}
+ getKey={(e) => e.value}
+ getValue={(e) => e.value}
+ getLabel={(e) => (
+ <div className="flex items-center gap-2">
+ <ChannelIcon channel={e.value} /> {e.value}
+ </div>
+ )}
+ expanded={expanded}
+ close={close}
+ />
+ </TabsContent>
+ <TabsContent value="utm_source">
+ <RollupSection
+ siteIds={siteIds}
+ filterParameter="utm_source"
+ title={t("UTM Source")}
+ getKey={(e) => e.value}
+ getValue={(e) => e.value}
+ getLabel={(e) => e.value}
+ expanded={expanded}
+ close={close}
+ />
+ </TabsContent>
+ <TabsContent value="utm_medium">
+ <RollupSection
+ siteIds={siteIds}
+ filterParameter="utm_medium"
+ title={t("UTM Medium")}
+ getKey={(e) => e.value}
+ getValue={(e) => e.value}
+ getLabel={(e) => e.value}
+ expanded={expanded}
+ close={close}
+ />
+ </TabsContent>
+ <TabsContent value="utm_campaign">
+ <RollupSection
+ siteIds={siteIds}
+ filterParameter="utm_campaign"
+ title={t("UTM Campaign")}
+ getKey={(e) => e.value}
+ getValue={(e) => e.value}
+ getLabel={(e) => e.value}
+ expanded={expanded}
+ close={close}
+ />
+ </TabsContent>
+ <TabsContent value="utm_content">
+ <RollupSection
+ siteIds={siteIds}
+ filterParameter="utm_content"
+ title={t("UTM Content")}
+ getKey={(e) => e.value}
+ getValue={(e) => e.value}
+ getLabel={(e) => e.value}
+ expanded={expanded}
+ close={close}
+ />
+ </TabsContent>
+ <TabsContent value="utm_term">
+ <RollupSection
+ siteIds={siteIds}
+ filterParameter="utm_term"
+ title={t("UTM Term")}
+ getKey={(e) => e.value}
+ getValue={(e) => e.value}
+ getLabel={(e) => e.value}
+ expanded={expanded}
+ close={close}
+ />
+ </TabsContent>
+ </Tabs>
+ </CardContent>
+ </Card>
+ );
+}
diff --git a/client/src/app/rollup/components/sections/RollupSection.tsx b/client/src/app/rollup/components/sections/RollupSection.tsx
new file mode 100644
index 000000000..3ecf57a9f
--- /dev/null
+++ b/client/src/app/rollup/components/sections/RollupSection.tsx
@@ -0,0 +1,135 @@
+"use client";
+import { FilterParameter } from "@rybbit/shared";
+import NumberFlow from "@number-flow/react";
+import { Info, SquareArrowOutUpRight } from "lucide-react";
+import { useExtracted } from "next-intl";
+import { ReactNode } from "react";
+import { ErrorState } from "@/components/ErrorState";
+import { CardLoader } from "@/components/ui/card";
+import { ScrollArea } from "@/components/ui/scroll-area";
+import { round } from "lodash";
+import { StandardSkeleton } from "@/app/[site]/components/shared/StandardSection/Skeleton";
+import { MetricResponse } from "@/api/analytics/endpoints";
+import { useRollupMetric } from "../../hooks/useRollupMetric";
+import { RollupSectionDialog } from "./RollupSectionDialog";
+
+export function RollupSection({
+ title,
+ filterParameter,
+ siteIds,
+ getKey,
+ getLabel,
+ getValue,
+ getFilterLabel,
+ getLink,
+ countLabel,
+ expanded,
+ close,
+}: {
+ title: string;
+ filterParameter: FilterParameter;
+ siteIds: number[];
+ getKey: (item: MetricResponse) => string;
+ getLabel: (item: MetricResponse) => ReactNode;
+ getValue: (item: MetricResponse) => string;
+ getFilterLabel?: (item: MetricResponse) => string;
+ getLink?: (item: MetricResponse) => string;
+ countLabel?: string;
+ expanded: boolean;
+ close: () => void;
+}) {
+ const t = useExtracted();
+ const { data, isLoading, isFetching, error } = useRollupMetric({
+ siteIds,
+ parameter: filterParameter,
+ limit: 100,
+ });
+
+ const items = data;
+ const ratio = items[0]?.percentage ? 100 / items[0].percentage : 1;
+
+ return (
+ <>
+ {isFetching && (
+ <div className="absolute top-[-8px] left-0 w-full h-full">
+ <CardLoader />
+ </div>
+ )}
+ <div className="flex flex-row gap-2 justify-between pr-1 text-xs text-neutral-600 dark:text-neutral-400 mb-2">
+ <div>{title}</div>
+ <div>{countLabel || t("Sessions")}</div>
+ </div>
+ <ScrollArea className="h-[314px]">
+ <div className="flex flex-col gap-2 overflow-x-hidden">
+ {isLoading ? (
+ <StandardSkeleton />
+ ) : error ? (
+ <ErrorState
+ title={t("Failed to load data")}
+ message={error.message}
+ />
+ ) : items.length === 0 ? (
+ <div className="text-neutral-600 dark:text-neutral-300 w-full text-center mt-6 flex flex-row gap-2 items-center justify-center">
+ <Info className="w-5 h-5" />
+ {t("No Data")}
+ </div>
+ ) : (
+ items.map((item) => (
+ <div
+ key={getKey(item)}
+ className="relative h-6 flex items-center group"
+ >
+ <div
+ className="absolute inset-0 bg-dataviz py-2 opacity-25 rounded-md"
+ style={{ width: `${item.percentage * ratio}%` }}
+ />
+ <div className="z-10 mx-2 flex justify-between items-center text-xs w-full gap-2">
+ <div className="flex items-center gap-1 min-w-0 flex-1">
+ <span className="truncate">{getLabel(item)}</span>
+ {getLink && (
+ <a
+ href={getLink(item)}
+ rel="noopener noreferrer"
+ target="_blank"
+ onClick={(e) => e.stopPropagation()}
+ className="shrink-0"
+ >
+ <SquareArrowOutUpRight
+ className="ml-0.5 w-3.5 h-3.5 text-neutral-600 hover:text-neutral-900 dark:text-neutral-300 dark:hover:text-neutral-100"
+ strokeWidth={3}
+ />
+ </a>
+ )}
+ </div>
+ <div className="text-xs flex gap-2 shrink-0">
+ <div className="hidden group-hover:block text-neutral-600 dark:text-neutral-400">
+ {round(item.percentage, 1)}%
+ </div>
+ <NumberFlow
+ respectMotionPreference={false}
+ value={item.count}
+ format={{ notation: "compact" }}
+ />
+ </div>
+ </div>
+ </div>
+ ))
+ )}
+ </div>
+ </ScrollArea>
+ {expanded && (
+ <RollupSectionDialog
+ title={title}
+ filterParameter={filterParameter}
+ siteIds={siteIds}
+ getLabel={getLabel}
+ getValue={getValue}
+ getFilterLabel={getFilterLabel}
+ getLink={getLink}
+ expanded={expanded}
+ close={close}
+ />
+ )}
+ </>
+ );
+}
diff --git a/client/src/app/rollup/components/sections/RollupSectionDialog.tsx b/client/src/app/rollup/components/sections/RollupSectionDialog.tsx
new file mode 100644
index 000000000..1261f37f6
--- /dev/null
+++ b/client/src/app/rollup/components/sections/RollupSectionDialog.tsx
@@ -0,0 +1,263 @@
+"use client";
+import { FilterParameter } from "@rybbit/shared";
+import {
+ ColumnDef,
+ createColumnHelper,
+ flexRender,
+ getCoreRowModel,
+ getSortedRowModel,
+ SortingState,
+ useReactTable,
+} from "@tanstack/react-table";
+import { useDebounce } from "@uidotdev/usehooks";
+import { Loader2, SquareArrowOutUpRight } from "lucide-react";
+import { useExtracted } from "next-intl";
+import { ReactNode, useMemo, useState } from "react";
+import { MetricResponse } from "@/api/analytics/endpoints";
+import { Input } from "@/components/ui/input";
+import {
+ ResponsiveDialog,
+ ResponsiveDialogContent,
+ ResponsiveDialogHeader,
+ ResponsiveDialogTitle,
+} from "@/components/ui/responsive-dialog";
+import { TableSortIndicator } from "@/components/ui/table";
+import { cn, formatSecondsAsMinutesAndSeconds } from "@/lib/utils";
+import { useRollupMetric } from "../../hooks/useRollupMetric";
+
+const columnHelper = createColumnHelper<MetricResponse>();
+
+export function RollupSectionDialog({
+ title,
+ filterParameter,
+ siteIds,
+ getLabel,
+ getValue,
+ getFilterLabel,
+ getLink,
+ expanded,
+ close,
+}: {
+ title: string;
+ filterParameter: FilterParameter;
+ siteIds: number[];
+ getLabel: (item: MetricResponse) => ReactNode;
+ getValue: (item: MetricResponse) => string;
+ getFilterLabel?: (item: MetricResponse) => string;
+ getLink?: (item: MetricResponse) => string;
+ expanded: boolean;
+ close: () => void;
+}) {
+ const t = useExtracted();
+ const { data, isLoading } = useRollupMetric({
+ siteIds,
+ parameter: filterParameter,
+ limit: 1000,
+ });
+
+ const [searchTerm, setSearchTerm] = useState("");
+ const debouncedSearchTerm = useDebounce(searchTerm, 200);
+ const [sorting, setSorting] = useState<SortingState>([
+ { id: "count", desc: true },
+ ]);
+
+ const filteredData = useMemo(() => {
+ if (!data) return [];
+ const labelFn = getFilterLabel || getValue;
+ const term = debouncedSearchTerm.toLowerCase();
+ if (!term) return data;
+ return data.filter((item) => String(labelFn(item)).toLowerCase().includes(term));
+ }, [data, getFilterLabel, getValue, debouncedSearchTerm]);
+
+ const columns = useMemo(() => {
+ const cols = [
+ columnHelper.accessor("value", {
+ header: title,
+ cell: ({ row }) => (
+ <div className="flex flex-row gap-1 items-center text-left">
+ {getLabel(row.original)}
+ {getLink && (
+ <a
+ rel="noopener noreferrer"
+ href={getLink(row.original)}
+ target="_blank"
+ onClick={(e) => e.stopPropagation()}
+ >
+ <SquareArrowOutUpRight
+ className="ml-0.5 w-3.5 h-3.5 text-neutral-600 hover:text-neutral-900 dark:text-neutral-300 dark:hover:text-neutral-100"
+ strokeWidth={3}
+ />
+ </a>
+ )}
+ </div>
+ ),
+ }),
+ columnHelper.accessor("count", {
+ header: t("Sessions"),
+ cell: (info) => (
+ <div className="flex flex-row gap-1 items-center sm:justify-end">
+ {info.getValue().toLocaleString()}
+ </div>
+ ),
+ }),
+ columnHelper.accessor("percentage", {
+ header: t("Session %"),
+ cell: (info) => (
+ <div className="flex flex-row gap-1 items-center sm:justify-end">
+ {info.getValue().toFixed(1)}%
+ </div>
+ ),
+ }),
+ ];
+
+ if (filteredData.length > 0) {
+ const sample = filteredData[0];
+ if (sample.pageviews !== undefined) {
+ cols.push(
+ columnHelper.accessor("pageviews", {
+ header: t("Pageviews"),
+ cell: (info) => (
+ <div className="flex flex-row gap-1 items-center sm:justify-end">
+ {info.getValue()?.toLocaleString()}
+ </div>
+ ),
+ }) satisfies ColumnDef<MetricResponse, number | undefined>
+ );
+ }
+ if (sample.time_on_page_seconds !== undefined) {
+ cols.push(
+ columnHelper.accessor("time_on_page_seconds", {
+ header: t("Duration"),
+ cell: (info) => (
+ <div className="text-right">
+ {formatSecondsAsMinutesAndSeconds(
+ Math.round(info.getValue() ?? 0)
+ )}
+ </div>
+ ),
+ }) satisfies ColumnDef<MetricResponse, number | undefined>
+ );
+ }
+ if (sample.bounce_rate !== undefined) {
+ cols.push(
+ columnHelper.accessor("bounce_rate", {
+ header: t("Bounce Rate"),
+ cell: (info) => (
+ <div className="flex flex-row gap-1 items-center sm:justify-end">
+ {info.getValue()?.toFixed(1)}%
+ </div>
+ ),
+ }) satisfies ColumnDef<MetricResponse, number | undefined>
+ );
+ }
+ }
+
+ return cols;
+ }, [filteredData, title, getLabel, getLink, t]);
+
+ const table = useReactTable({
+ data: filteredData,
+ columns,
+ getCoreRowModel: getCoreRowModel(),
+ getSortedRowModel: getSortedRowModel(),
+ state: { sorting },
+ onSortingChange: setSorting,
+ manualSorting: false,
+ sortDescFirst: true,
+ });
+
+ if (isLoading) {
+ return (
+ <ResponsiveDialog open={expanded} onOpenChange={close}>
+ <ResponsiveDialogContent className="max-w-[1000px] w-[calc(100vw-2rem)] p-2 sm:p-4">
+ <div className="flex justify-center items-center h-40">
+ <Loader2 className="h-8 w-8 animate-spin text-neutral-600 dark:text-neutral-400" />
+ </div>
+ </ResponsiveDialogContent>
+ </ResponsiveDialog>
+ );
+ }
+
+ return (
+ <ResponsiveDialog open={expanded} onOpenChange={close}>
+ <ResponsiveDialogContent className="max-w-[1000px] w-screen max-h-[1000px] h-[calc(100vh-2rem)] p-2 sm:p-4 flex flex-col gap-2">
+ <ResponsiveDialogHeader>
+ <ResponsiveDialogTitle>{title}</ResponsiveDialogTitle>
+ </ResponsiveDialogHeader>
+ <Input
+ type="text"
+ placeholder={t("Filter {count} items...", {
+ count: String(data.length),
+ })}
+ className="bg-white dark:bg-neutral-900 border-neutral-200 dark:border-neutral-700 text-xs"
+ value={searchTerm}
+ inputSize="sm"
+ onChange={(e) => setSearchTerm(e.target.value)}
+ />
+ <div className="max-h-[85vh] overflow-auto relative overflow-x-auto">
+ <table className="w-full text-xs text-left min-w-max">
+ <thead className="sticky top-0 z-10 bg-neutral-100 dark:bg-neutral-850 [&_tr]:border-b-0">
+ {table.getHeaderGroups().map((headerGroup) => (
+ <tr key={headerGroup.id} className="border-b-0">
+ {headerGroup.headers.map((header, index) => (
+ <th
+ key={header.id}
+ className={cn(
+ "h-8 px-2 text-left align-middle font-medium text-neutral-500 dark:text-neutral-400 first:rounded-l-lg last:rounded-r-lg",
+ "font-medium whitespace-nowrap cursor-pointer select-none",
+ index === 0 ? "text-left" : "text-right"
+ )}
+ onClick={header.column.getToggleSortingHandler()}
+ >
+ <div
+ className={cn(
+ "flex items-center gap-1",
+ index !== 0 && "justify-end"
+ )}
+ >
+ {header.isPlaceholder
+ ? null
+ : flexRender(
+ header.column.columnDef.header,
+ header.getContext()
+ )}
+ <TableSortIndicator
+ sortDirection={header.column.getIsSorted()}
+ />
+ </div>
+ </th>
+ ))}
+ </tr>
+ ))}
+ </thead>
+ <tbody className="[&_tr:last-child]:border-0 bg-white dark:bg-neutral-900">
+ {table.getRowModel().rows.map((row) => (
+ <tr
+ key={row.id}
+ className="border-b border-b-neutral-100 dark:border-b-neutral-800"
+ >
+ {row.getVisibleCells().map((cell, cellIndex) => (
+ <td
+ key={cell.id}
+ className={cn(
+ "p-2 align-middle relative",
+ cellIndex !== 0 && "text-right"
+ )}
+ >
+ <span className="relative z-0">
+ {flexRender(
+ cell.column.columnDef.cell,
+ cell.getContext()
+ )}
+ </span>
+ </td>
+ ))}
+ </tr>
+ ))}
+ </tbody>
+ </table>
+ </div>
+ </ResponsiveDialogContent>
+ </ResponsiveDialog>
+ );
+}
diff --git a/client/src/app/rollup/hooks/useRollupBucketed.ts b/client/src/app/rollup/hooks/useRollupBucketed.ts
new file mode 100644
index 000000000..e2709aa10
--- /dev/null
+++ b/client/src/app/rollup/hooks/useRollupBucketed.ts
@@ -0,0 +1,57 @@
+import { TimeBucket } from "@rybbit/shared";
+import { useQueries } from "@tanstack/react-query";
+import {
+ fetchOverviewBucketed,
+ GetOverviewBucketedResponse,
+} from "@/api/analytics/endpoints";
+import { buildApiParams } from "@/api/utils";
+import { useStore } from "@/lib/store";
+
+export type RollupSeries = {
+ siteId: number;
+ data: GetOverviewBucketedResponse;
+};
+
+export type UseRollupBucketedResult = {
+ series: RollupSeries[];
+ isLoading: boolean;
+ isFetching: boolean;
+ error: Error | null;
+};
+
+export function useRollupBucketed({
+ siteIds,
+ bucket,
+}: {
+ siteIds: number[];
+ bucket: TimeBucket;
+}): UseRollupBucketedResult {
+ const { time, filters, timezone } = useStore();
+ const params = buildApiParams(time, { filters });
+
+ const queries = useQueries({
+ queries: siteIds.map((siteId) => ({
+ queryKey: [
+ "rollup-overview-bucketed",
+ siteId,
+ time,
+ bucket,
+ filters,
+ timezone,
+ ],
+ queryFn: () => fetchOverviewBucketed(siteId, { ...params, bucket }),
+ staleTime: 60_000,
+ })),
+ });
+
+ const series: RollupSeries[] = queries
+ .map((q, i) => ({ siteId: siteIds[i], data: q.data }))
+ .filter((s): s is RollupSeries => Array.isArray(s.data));
+
+ return {
+ series,
+ isLoading: queries.some((q) => q.isLoading),
+ isFetching: queries.some((q) => q.isFetching),
+ error: (queries.find((q) => q.error)?.error as Error) ?? null,
+ };
+}
diff --git a/client/src/app/rollup/hooks/useRollupMetric.ts b/client/src/app/rollup/hooks/useRollupMetric.ts
new file mode 100644
index 000000000..3a75caf1d
--- /dev/null
+++ b/client/src/app/rollup/hooks/useRollupMetric.ts
@@ -0,0 +1,143 @@
+import { FilterParameter } from "@rybbit/shared";
+import { useQueries } from "@tanstack/react-query";
+import { useMemo } from "react";
+import { fetchMetric, MetricResponse } from "@/api/analytics/endpoints";
+import { buildApiParams } from "@/api/utils";
+import { useStore } from "@/lib/store";
+
+export type RollupMetricRow = MetricResponse;
+
+export type UseRollupMetricResult = {
+ data: RollupMetricRow[];
+ isLoading: boolean;
+ isFetching: boolean;
+ error: Error | null;
+};
+
+export function useRollupMetric({
+ siteIds,
+ parameter,
+ limit = 100,
+}: {
+ siteIds: number[];
+ parameter: FilterParameter;
+ limit?: number;
+}): UseRollupMetricResult {
+ const { time, filters, timezone } = useStore();
+ const params = buildApiParams(time, { filters });
+
+ const queries = useQueries({
+ queries: siteIds.map((siteId) => ({
+ queryKey: [
+ "rollup-metric",
+ parameter,
+ siteId,
+ time,
+ filters,
+ limit,
+ timezone,
+ ],
+ queryFn: () =>
+ fetchMetric(siteId, { ...params, parameter, limit, page: 1 }),
+ staleTime: 60_000,
+ })),
+ });
+
+ const merged = useMemo(() => {
+ // Per-value accumulator. Sums sessions/pageviews and tracks weighted-sum
+ // numerators + denominators for averages so we can recompute correctly
+ // across sites at the end (rather than keeping the first site's value).
+ type Acc = {
+ value: string;
+ title?: string;
+ hostname?: string;
+ count: number;
+ pageviews: number;
+ hasPageviews: boolean;
+ bounceNum: number; // sum of bounce_rate * count, only where reported
+ bounceDenom: number; // sum of count over rows that reported bounce
+ durationNum: number; // sum of time_on_page * weight (pageviews or count)
+ durationDenom: number; // sum of those weights
+ };
+
+ const accByValue = new Map<string, Acc>();
+ let totalCount = 0;
+ let totalPageviews = 0;
+
+ for (const q of queries) {
+ const rows = q.data?.data;
+ if (!rows) continue;
+ for (const row of rows) {
+ totalCount += row.count;
+ if (row.pageviews !== undefined) totalPageviews += row.pageviews;
+
+ let acc = accByValue.get(row.value);
+ if (!acc) {
+ acc = {
+ value: row.value,
+ title: row.title,
+ hostname: row.hostname,
+ count: 0,
+ pageviews: 0,
+ hasPageviews: false,
+ bounceNum: 0,
+ bounceDenom: 0,
+ durationNum: 0,
+ durationDenom: 0,
+ };
+ accByValue.set(row.value, acc);
+ }
+
+ acc.count += row.count;
+
+ if (row.pageviews !== undefined) {
+ acc.pageviews += row.pageviews;
+ acc.hasPageviews = true;
+ }
+
+ if (row.bounce_rate !== undefined) {
+ acc.bounceNum += row.bounce_rate * row.count;
+ acc.bounceDenom += row.count;
+ }
+
+ if (row.time_on_page_seconds !== undefined) {
+ const weight = row.pageviews ?? row.count;
+ acc.durationNum += row.time_on_page_seconds * weight;
+ acc.durationDenom += weight;
+ }
+ }
+ }
+
+ const rows: RollupMetricRow[] = Array.from(accByValue.values()).map((a) => {
+ const out: RollupMetricRow = {
+ value: a.value,
+ title: a.title,
+ hostname: a.hostname,
+ count: a.count,
+ percentage: totalCount > 0 ? (a.count / totalCount) * 100 : 0,
+ };
+ if (a.hasPageviews) {
+ out.pageviews = a.pageviews;
+ out.pageviews_percentage =
+ totalPageviews > 0 ? (a.pageviews / totalPageviews) * 100 : 0;
+ }
+ if (a.bounceDenom > 0) {
+ out.bounce_rate = a.bounceNum / a.bounceDenom;
+ }
+ if (a.durationDenom > 0) {
+ out.time_on_page_seconds = a.durationNum / a.durationDenom;
+ }
+ return out;
+ });
+
+ rows.sort((a, b) => b.count - a.count);
+ return rows;
+ }, [queries.map((q) => q.dataUpdatedAt).join(",")]);
+
+ return {
+ data: merged,
+ isLoading: queries.some((q) => q.isLoading),
+ isFetching: queries.some((q) => q.isFetching),
+ error: (queries.find((q) => q.error)?.error as Error) ?? null,
+ };
+}
diff --git a/client/src/app/rollup/page.tsx b/client/src/app/rollup/page.tsx
new file mode 100644
index 000000000..5019a7968
--- /dev/null
+++ b/client/src/app/rollup/page.tsx
@@ -0,0 +1,142 @@
+"use client";
+import { useWindowSize } from "@uidotdev/usehooks";
+import { useExtracted } from "next-intl";
+import { ReactNode, useEffect, useMemo, useState } from "react";
+import { useUserOrganizations } from "@/api/admin/hooks/useOrganizations";
+import { useGetSitesFromOrg } from "@/api/admin/hooks/useSites";
+import { useTeams } from "@/api/admin/hooks/useTeams";
+import { AppSidebar } from "@/components/AppSidebar";
+import { NavigationSidebar } from "@/components/sidebar/NavigationSidebar";
+import { StandardPage } from "@/components/StandardPage";
+import { Card } from "@/components/ui/card";
+import { useInView } from "@/hooks/useInView";
+import { useSetPageTitle } from "@/hooks/useSetPageTitle";
+import { authClient } from "@/lib/auth";
+import { buildSiteColorMap } from "./components/MainSection/Chart";
+import { MainSection } from "./components/MainSection/MainSection";
+import { RollupTopBar } from "./components/RollupTopBar";
+import { SiteToggleStrip } from "./components/SiteToggleStrip";
+import { Countries } from "./components/sections/Countries";
+import { Devices } from "./components/sections/Devices";
+import { Referrers } from "./components/sections/Referrers";
+
+function LazySection({
+ children,
+ height = "405px",
+}: {
+ children: ReactNode;
+ height?: string;
+}) {
+ const { ref, isInView } = useInView({
+ persistVisibility: true,
+ rootMargin: "100px 0px",
+ });
+ return (
+ <div ref={ref} style={{ minHeight: isInView ? undefined : height }}>
+ {isInView ? children : null}
+ </div>
+ );
+}
+
+export default function RollupPage() {
+ const t = useExtracted();
+ useSetPageTitle("Rollup");
+ const { width } = useWindowSize();
+ const isDesktop = width !== null && width >= 768;
+
+ const { data: activeOrganization } = authClient.useActiveOrganization();
+ const { data: sitesData } = useGetSitesFromOrg(activeOrganization?.id);
+ const { data: teamsData } = useTeams(activeOrganization?.id);
+ useUserOrganizations(); // ensure org list is loaded for header consistency
+
+ const allSites = useMemo(() => sitesData?.sites ?? [], [sitesData]);
+ const teams = teamsData?.teams || [];
+
+ const [selectedTeamFilter, setSelectedTeamFilter] = useState<string>("all");
+ const [selectedSiteIds, setSelectedSiteIds] = useState<number[] | null>(null);
+
+ const filteredSites = useMemo(() => {
+ return allSites.filter((site) => {
+ if (selectedTeamFilter === "all") return true;
+ if (selectedTeamFilter === "unassigned") {
+ return !site.teams || site.teams.length === 0;
+ }
+ return (
+ site.teams?.some((team) => team.id === selectedTeamFilter) || false
+ );
+ });
+ }, [allSites, selectedTeamFilter]);
+
+ // Default selected sites = all filtered sites (until user picks explicitly).
+ // When the team filter narrows the list, prune the explicit selection too.
+ useEffect(() => {
+ if (selectedSiteIds === null) return;
+ const allowed = new Set(filteredSites.map((s) => s.siteId));
+ const pruned = selectedSiteIds.filter((id) => allowed.has(id));
+ if (pruned.length !== selectedSiteIds.length) {
+ setSelectedSiteIds(pruned);
+ }
+ }, [filteredSites, selectedSiteIds]);
+
+ const effectiveSiteIds =
+ selectedSiteIds ?? filteredSites.map((s) => s.siteId);
+
+ // Color assignment is by position in filteredSites so no two sites in view
+ // collide as long as count <= palette size.
+ const siteColorMap = useMemo(
+ () => buildSiteColorMap(filteredSites.map((s) => s.siteId)),
+ [filteredSites]
+ );
+
+ const content = (
+ <div className="p-2 md:p-4 max-w-[1100px] mx-auto space-y-3">
+ <RollupTopBar
+ teams={teams}
+ selectedTeamFilter={selectedTeamFilter}
+ onSelectedTeamFilterChange={setSelectedTeamFilter}
+ />
+ <SiteToggleStrip
+ sites={filteredSites}
+ selectedSiteIds={effectiveSiteIds}
+ siteColorMap={siteColorMap}
+ onSelectedSiteIdsChange={setSelectedSiteIds}
+ />
+ {effectiveSiteIds.length === 0 ? (
+ <Card className="p-6 text-center text-sm text-neutral-500 dark:text-neutral-400">
+ {t("Select at least one site to view rollup analytics.")}
+ </Card>
+ ) : (
+ <>
+ <MainSection
+ siteIds={effectiveSiteIds}
+ sites={filteredSites}
+ siteColorMap={siteColorMap}
+ />
+ <div className="grid grid-cols-1 lg:grid-cols-2 gap-3 mt-3">
+ <LazySection>
+ <Referrers siteIds={effectiveSiteIds} />
+ </LazySection>
+ <LazySection>
+ <Devices siteIds={effectiveSiteIds} />
+ </LazySection>
+ <LazySection>
+ <Countries siteIds={effectiveSiteIds} />
+ </LazySection>
+ </div>
+ </>
+ )}
+ </div>
+ );
+
+ if (!isDesktop) {
+ return <StandardPage>{content}</StandardPage>;
+ }
+
+ return (
+ <div className="flex h-full">
+ <AppSidebar />
+ <NavigationSidebar />
+ <StandardPage showSidebar={false}>{content}</StandardPage>
+ </div>
+ );
+}
diff --git a/client/src/components/EventTypeFilter.tsx b/client/src/components/EventTypeFilter.tsx
index a404badd1..d9e341313 100644
--- a/client/src/components/EventTypeFilter.tsx
+++ b/client/src/components/EventTypeFilter.tsx
@@ -5,6 +5,7 @@ import { useMemo } from "react";
import { cn } from "@/lib/utils";
import { EVENT_TYPE_CONFIG, EventType } from "@/lib/events";
import { EventTypeIcon } from "./EventIcons";
+import { ToggleChip } from "./ToggleChip";
interface EventTypeFilterProps {
visibleTypes: Set<string>;
@@ -46,38 +47,32 @@ export function EventTypeFilter({
const count = counts[option.value] || 0;
return (
- <button
+ <ToggleChip
key={option.value}
+ isSelected={isSelected}
onClick={() => onToggle(option.value)}
- className={cn(
- "flex items-center space-x-1.5 px-2 py-1 rounded text-xs font-medium transition-all whitespace-nowrap",
- isSelected
- ? "bg-neutral-100 dark:bg-neutral-800 text-neutral-900 dark:text-white"
- : "bg-neutral-50 dark:bg-neutral-900 text-neutral-600 dark:text-neutral-500 hover:text-neutral-700 dark:hover:text-neutral-400"
- )}
- >
- <div
- className={cn(
- "transition-opacity",
- isSelected ? "opacity-100" : "opacity-30"
- )}
- >
- <EventTypeIcon type={option.value as EventType} className="h-3 w-3" />
- </div>
- <span>{translatedLabels[option.label] || option.label}</span>
- {count > 0 && (
- <span
- className={cn(
- "ml-1 px-1.5 py-0.5 rounded-full text-[10px] leading-none",
- isSelected
- ? "bg-neutral-200 dark:bg-neutral-700 text-neutral-700 dark:text-neutral-300"
- : "bg-neutral-100 dark:bg-neutral-800 text-neutral-500 dark:text-neutral-500"
- )}
- >
- {count}
- </span>
- )}
- </button>
+ indicator={
+ <EventTypeIcon
+ type={option.value as EventType}
+ className="h-3 w-3"
+ />
+ }
+ label={translatedLabels[option.label] || option.label}
+ rightAdornment={
+ count > 0 ? (
+ <span
+ className={cn(
+ "ml-1 px-1.5 py-0.5 rounded-full text-[10px] leading-none",
+ isSelected
+ ? "bg-neutral-200 dark:bg-neutral-700 text-neutral-700 dark:text-neutral-300"
+ : "bg-neutral-100 dark:bg-neutral-800 text-neutral-500 dark:text-neutral-500"
+ )}
+ >
+ {count}
+ </span>
+ ) : null
+ }
+ />
);
})}
</div>
diff --git a/client/src/components/ToggleChip.tsx b/client/src/components/ToggleChip.tsx
new file mode 100644
index 000000000..1b83b3b46
--- /dev/null
+++ b/client/src/components/ToggleChip.tsx
@@ -0,0 +1,62 @@
+"use client";
+import { ReactNode } from "react";
+import { cn } from "@/lib/utils";
+
+export interface ToggleChipProps {
+ isSelected: boolean;
+ onClick: () => void;
+ label: ReactNode;
+ // Convenience for the standard 12×12 rounded color swatch.
+ swatchColor?: string;
+ // Use indicator for arbitrary leading content (e.g. an icon). Takes
+ // precedence over swatchColor.
+ indicator?: ReactNode;
+ rightAdornment?: ReactNode;
+ className?: string;
+}
+
+export function ToggleChip({
+ isSelected,
+ onClick,
+ label,
+ swatchColor,
+ indicator,
+ rightAdornment,
+ className,
+}: ToggleChipProps) {
+ const indicatorNode =
+ indicator ??
+ (swatchColor !== undefined ? (
+ <div
+ className="w-3 h-3 rounded-sm"
+ style={{ backgroundColor: swatchColor }}
+ />
+ ) : null);
+
+ return (
+ <button
+ type="button"
+ onClick={onClick}
+ className={cn(
+ "flex items-center space-x-1.5 px-2 py-1 rounded text-xs font-medium transition-all whitespace-nowrap",
+ isSelected
+ ? "bg-neutral-150 dark:bg-neutral-800 text-neutral-900 dark:text-white"
+ : "bg-neutral-50 dark:bg-neutral-900 text-neutral-600 dark:text-neutral-500 hover:text-neutral-700 dark:hover:text-neutral-400",
+ className
+ )}
+ >
+ {indicatorNode && (
+ <div
+ className={cn(
+ "transition-opacity",
+ isSelected ? "opacity-100" : "opacity-30"
+ )}
+ >
+ {indicatorNode}
+ </div>
+ )}
+ <span>{label}</span>
+ {rightAdornment}
+ </button>
+ );
+}
diff --git a/client/src/components/sidebar/NavigationSidebar.tsx b/client/src/components/sidebar/NavigationSidebar.tsx
index 4e93e4d78..114c89a8f 100644
--- a/client/src/components/sidebar/NavigationSidebar.tsx
+++ b/client/src/components/sidebar/NavigationSidebar.tsx
@@ -1,5 +1,5 @@
"use client";
-import { Building2, CreditCard, LayoutGrid, UserCircle, Users } from "lucide-react";
+import { AppWindow, Building2, Combine, CreditCard, UserCircle, Users } from "lucide-react";
import { useExtracted } from "next-intl";
import { usePathname } from "next/navigation";
import { useUserOrganizations } from "../../api/admin/hooks/useOrganizations";
@@ -30,7 +30,13 @@ export function NavigationSidebar() {
label={t("Properties")}
active={pathname === "/"}
href="/"
- icon={<LayoutGrid className="w-4 h-4" />}
+ icon={<AppWindow className="w-4 h-4" />}
+ />
+ <Sidebar.Item
+ label={t("Rollup")}
+ active={pathname.startsWith("/rollup")}
+ href="/rollup"
+ icon={<Combine className="w-4 h-4" />}
/>
<Sidebar.Item
label={t("Account")}
diff --git a/client/src/proxy.ts b/client/src/proxy.ts
index a001f4f0c..56108845b 100644
--- a/client/src/proxy.ts
+++ b/client/src/proxy.ts
@@ -39,6 +39,7 @@ export async function proxy(request: NextRequest) {
"account",
"uptime",
"settings",
+ "rollup",
"as",
"_next",
"api",