Skip to content

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

Rollup: load sites together, snappier toggles, tag + dimension filters (#1224)

Goldflag70693a72a036
diff --git a/client/src/api/analytics/hooks/useGetMetric.ts b/client/src/api/analytics/hooks/useGetMetric.ts
index 53cd61c35..864917a9e 100644
--- a/client/src/api/analytics/hooks/useGetMetric.ts
+++ b/client/src/api/analytics/hooks/useGetMetric.ts
@@ -20,11 +20,13 @@ export function useMetric({
limit = 1000,
periodTime,
useFilters = true,
+ enabled,
}: {
parameter: FilterParameter;
limit?: number;
periodTime?: PeriodTime;
useFilters?: boolean;
+ enabled?: boolean;
}): UseQueryResult<PaginatedResponse> {
return useAnalyticsQuery<PaginatedResponse>({
key: parameter,
@@ -32,6 +34,7 @@ export function useMetric({
periodTime,
doublePastMinutesForPrevious: true,
useFilters,
+ enabled,
params: { parameter, limit },
});
}
diff --git a/client/src/app/[site]/components/SubHeader/Filters/FilterPicker.tsx b/client/src/app/[site]/components/SubHeader/Filters/FilterPicker.tsx
index d4e48780a..66c55ae74 100644
--- a/client/src/app/[site]/components/SubHeader/Filters/FilterPicker.tsx
+++ b/client/src/app/[site]/components/SubHeader/Filters/FilterPicker.tsx
@@ -4,7 +4,6 @@ import { Filter, FilterParameter, FilterType } from "@rybbit/shared";
import { Check, ChevronLeft, ChevronRight, ChevronsUpDown, HelpCircle, Plus } from "lucide-react";
import { useExtracted } from "next-intl";
import { useMemo, useState } from "react";
-import { useMetric } from "../../../../../api/analytics/hooks/useGetMetric";
import { Button } from "../../../../../components/ui/button";
import { Checkbox } from "../../../../../components/ui/checkbox";
import {
@@ -27,6 +26,7 @@ import {
StringOperatorOptions,
} from "./const";
import { useOperatorLabel, useOperatorMenuLabel, useParameterLabel, validateRegex } from "./labels";
+import { useFilterValueOptions } from "./useFilterValueOptions";
function RegexExamples() {
const t = useExtracted();
@@ -86,11 +86,7 @@ function ValueStep({
const needsTextInput = isNumeric || isRegex || isNumericComparison;
const operatorOptions = isNumeric ? NumericOperatorOptions : StringOperatorOptions;
- const { data, isFetching } = useMetric({
- parameter,
- limit: 1000,
- useFilters: false,
- });
+ const { data, isFetching } = useFilterValueOptions(parameter);
const getValueLabel = (val: string | number) => {
if (parameter === "country") return getCountryName(val as string);
diff --git a/client/src/app/[site]/components/SubHeader/Filters/ValuePopover.tsx b/client/src/app/[site]/components/SubHeader/Filters/ValuePopover.tsx
index 4706f35b7..2020bdbf9 100644
--- a/client/src/app/[site]/components/SubHeader/Filters/ValuePopover.tsx
+++ b/client/src/app/[site]/components/SubHeader/Filters/ValuePopover.tsx
@@ -4,7 +4,6 @@ import { Filter } from "@rybbit/shared";
import { HelpCircle, Plus } from "lucide-react";
import { useExtracted } from "next-intl";
import { useMemo, useState } from "react";
-import { useMetric } from "../../../../../api/analytics/hooks/useGetMetric";
import { Checkbox } from "../../../../../components/ui/checkbox";
import {
Command,
@@ -21,6 +20,7 @@ import { useGetRegionName } from "../../../../../lib/geo";
import { cn, getCountryName, getLanguageName } from "../../../../../lib/utils";
import { isNumericParameter } from "./const";
import { validateRegex } from "./labels";
+import { useFilterValueOptions } from "./useFilterValueOptions";
function RegexExamples() {
const t = useExtracted();
@@ -81,11 +81,7 @@ export function ValuePopover({
filter.type === "less_than_or_equal";
const needsTextInput = isNumeric || isRegex || isNumericComparison;
- const { data, isFetching } = useMetric({
- parameter: filter.parameter,
- limit: 1000,
- useFilters: false,
- });
+ const { data, isFetching } = useFilterValueOptions(filter.parameter);
const getValueLabel = (val: string | number) => {
if (filter.parameter === "country") return getCountryName(val as string);
diff --git a/client/src/app/[site]/components/SubHeader/Filters/useFilterValueOptions.ts b/client/src/app/[site]/components/SubHeader/Filters/useFilterValueOptions.ts
new file mode 100644
index 000000000..6bc7c1b05
--- /dev/null
+++ b/client/src/app/[site]/components/SubHeader/Filters/useFilterValueOptions.ts
@@ -0,0 +1,67 @@
+"use client";
+
+import { FilterParameter } from "@rybbit/shared";
+import { useQueries } from "@tanstack/react-query";
+import { createContext, useContext, useMemo } from "react";
+import { buildAnalyticsRequest, fetchAnalytics } from "../../../../../api/analytics/analyticsRequest";
+import { MetricResponse } from "../../../../../api/analytics/endpoints";
+import { useMetric } from "../../../../../api/analytics/hooks/useGetMetric";
+import { useAnalyticsContext } from "../../../../../api/analytics/useAnalyticsQuery";
+
+type ValueOptions = { data: MetricResponse[]; totalCount: number };
+
+/**
+ * Sites whose values the filter picker suggests. Unset (null) means the
+ * store's current site, which is what every site dashboard wants; the rollup
+ * page sets it so suggestions come from all of its sites at once.
+ */
+export const FilterValueSitesContext = createContext<number[] | null>(null);
+
+const SUGGESTION_LIMIT = 1000;
+
+/** Value suggestions for a filter dimension, from one site or several. */
+export function useFilterValueOptions(parameter: FilterParameter): {
+ data: ValueOptions | undefined;
+ isFetching: boolean;
+} {
+ const siteIds = useContext(FilterValueSitesContext);
+
+ const single = useMetric({
+ parameter,
+ limit: SUGGESTION_LIMIT,
+ useFilters: false,
+ enabled: siteIds === null,
+ });
+
+ const { context } = useAnalyticsContext({ useFilters: false });
+ const request = buildAnalyticsRequest(
+ { path: "metric", params: { parameter, limit: SUGGESTION_LIMIT } },
+ context
+ );
+ const queries = useQueries({
+ queries: (siteIds ?? []).map(siteId => ({
+ queryKey: ["filter-value-options", siteId, request.path, request.params],
+ queryFn: () => fetchAnalytics<ValueOptions>(siteId, request),
+ staleTime: 60_000,
+ })),
+ });
+
+ // Site ids too: a new set of not-yet-loaded sites has the same all-zero
+ // timestamps as the last one and must not reuse its merged values.
+ const signature = `${parameter}|${(siteIds ?? []).join(",")}|${queries.map(q => q.dataUpdatedAt).join(",")}`;
+ const merged = useMemo(() => {
+ const counts = new Map<string, MetricResponse>();
+ for (const q of queries) {
+ for (const row of q.data?.data ?? []) {
+ const existing = counts.get(row.value);
+ if (existing) existing.count += row.count;
+ else counts.set(row.value, { ...row });
+ }
+ }
+ const data = Array.from(counts.values()).sort((a, b) => b.count - a.count);
+ return { data, totalCount: data.length };
+ }, [signature]);
+
+ if (siteIds === null) return { data: single.data, isFetching: single.isFetching };
+ return { data: merged, isFetching: queries.some(q => q.isFetching) };
+}
diff --git a/client/src/app/rollup/components/MainSection/Chart.tsx b/client/src/app/rollup/components/MainSection/Chart.tsx
index eba61e0dc..2859fa250 100644
--- a/client/src/app/rollup/components/MainSection/Chart.tsx
+++ b/client/src/app/rollup/components/MainSection/Chart.tsx
@@ -3,7 +3,7 @@ import { TimeBucket } from "@rybbit/shared";
import { ResponsiveBar } from "@nivo/bar";
import { useWindowSize } from "@uidotdev/usehooks";
import { DateTime } from "luxon";
-import { useState } from "react";
+import { useMemo, useState } from "react";
import { createPortal } from "react-dom";
import { ChartTooltip } from "@/components/charts/ChartTooltip";
import { Time } from "@/components/DateSelector/types";
@@ -95,40 +95,49 @@ export function Chart({
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}`;
- };
+ // Each site becomes a stacked/grouped key in every time-bucket row. Pivoting
+ // is memoised: the hover tooltip re-renders this component on every mouse
+ // move, and re-pivoting (and re-laying-out every bar) each time is the lag.
+ // Future buckets are dropped; re-pivot when the minute turns so one that has
+ // become current appears on the next render (hover, refetch), as before.
+ const nowMinute = DateTime.now().startOf("minute").toMillis();
+ const { keys, colors, chartData } = useMemo(() => {
+ 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
- );
+ 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];
+ // Pivot series → one row per time bucket with a value per site key.
+ const now = DateTime.fromMillis(nowMinute).endOf("minute");
+ 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 > 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 chartData = Array.from(buckets.values()).sort((a, b) =>
+ String(a.time).localeCompare(String(b.time))
+ );
+ return { keys, colors, chartData };
+ }, [series, siteMetaById, siteColorMap, selectedStat, timezone, nowMinute]);
const groupMode: "grouped" | "stacked" = ADDITIVE_STATS.includes(selectedStat)
? "stacked"
@@ -160,6 +169,70 @@ export function Chart({
.sort((a, b) => b.value - a.value)
: [];
+ // setHover is stable, so the bars only re-render when the data does.
+ const bars = useMemo(
+ () => (
+ <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={() => <></>}
+ />
+ ),
+ [chartData, keys, colors, groupMode, nivoTheme, tickStep, time]
+ );
+
const tooltipWidth = 240;
const tooltipOffset = 14;
const viewportW = typeof window !== "undefined" ? window.innerWidth : 0;
@@ -180,63 +253,7 @@ export function Chart({
}
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={() => <></>}
- />
+ {bars}
</div>
{hover && hoverRow && typeof document !== "undefined" &&
createPortal(
diff --git a/client/src/app/rollup/components/MainSection/MainSection.tsx b/client/src/app/rollup/components/MainSection/MainSection.tsx
index cfea18a41..eae6f0b06 100644
--- a/client/src/app/rollup/components/MainSection/MainSection.tsx
+++ b/client/src/app/rollup/components/MainSection/MainSection.tsx
@@ -31,7 +31,8 @@ const Stat = ({
decimals?: number;
postfix?: string;
}) => {
- const { selectedStat, setSelectedStat } = useStore();
+ const selectedStat = useStore((state) => state.selectedStat);
+ const setSelectedStat = useStore((state) => state.setSelectedStat);
return (
<div
className={cn(
@@ -75,7 +76,9 @@ export function MainSection({
lite?: boolean;
}) {
const t = useExtracted();
- const { selectedStat, bucket, time } = useStore();
+ const selectedStat = useStore((state) => state.selectedStat);
+ const bucket = useStore((state) => state.bucket);
+ const time = useStore((state) => state.time);
const { series, isFetching, isLoading } = useRollupBucketed({
siteIds,
diff --git a/client/src/app/rollup/components/RollupFilters.tsx b/client/src/app/rollup/components/RollupFilters.tsx
new file mode 100644
index 000000000..4848a6036
--- /dev/null
+++ b/client/src/app/rollup/components/RollupFilters.tsx
@@ -0,0 +1,92 @@
+"use client";
+import { Filter, FilterParameter } from "@rybbit/shared";
+import { ListFilterPlus } from "lucide-react";
+import { useExtracted } from "next-intl";
+import { useRef, useState } from "react";
+import { FilterChip } from "@/app/[site]/components/SubHeader/Filters/FilterChip";
+import { FilterPicker } from "@/app/[site]/components/SubHeader/Filters/FilterPicker";
+import { filterListKeys } from "@/app/[site]/components/SubHeader/Filters/segmentUtils";
+import { FilterValueSitesContext } from "@/app/[site]/components/SubHeader/Filters/useFilterValueOptions";
+import { Button } from "@/components/ui/button";
+import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
+import {
+ addRollupFilter,
+ removeRollupFilter,
+ ROLLUP_FILTER_PARAMETERS,
+ updateRollupFilter,
+ useRollupFilters,
+} from "../lib/rollupFilters";
+
+/**
+ * The site dashboard's filter picker and chips, pointed at the rollup's own
+ * filters and limited to the dimensions this page shows. Value suggestions
+ * come from every selected site. No segments: those are saved per site.
+ */
+export function RollupFilterButton({ siteIds }: { siteIds: number[] }) {
+ const t = useExtracted();
+ const [open, setOpen] = useState(false);
+ const [parameter, setParameter] = useState<FilterParameter | null>(null);
+ const pendingRef = useRef<() => Filter | null>(() => null);
+
+ const resetPicker = () => {
+ pendingRef.current = () => null;
+ setParameter(null);
+ };
+
+ const handleOpenChange = (isOpen: boolean) => {
+ if (!isOpen) {
+ const pending = pendingRef.current();
+ if (pending) addRollupFilter(pending);
+ resetPicker();
+ }
+ setOpen(isOpen);
+ };
+
+ return (
+ <FilterValueSitesContext.Provider value={siteIds}>
+ <Popover open={open} onOpenChange={handleOpenChange}>
+ <PopoverTrigger asChild>
+ <Button size="sm" variant="outline" className="gap-1.5">
+ <ListFilterPlus className="w-4 h-4" />
+ {t("Filter")}
+ </Button>
+ </PopoverTrigger>
+ <PopoverContent className="w-72 p-0" align="start">
+ <FilterPicker
+ availableFilters={ROLLUP_FILTER_PARAMETERS}
+ onCommit={addRollupFilter}
+ onClose={() => {
+ resetPicker();
+ setOpen(false);
+ }}
+ pendingRef={pendingRef}
+ parameter={parameter}
+ setParameter={setParameter}
+ />
+ </PopoverContent>
+ </Popover>
+ </FilterValueSitesContext.Provider>
+ );
+}
+
+export function RollupFilterChips({ siteIds }: { siteIds: number[] }) {
+ const filters = useRollupFilters(state => state.filters);
+ if (filters.length === 0) return null;
+ const keys = filterListKeys(filters);
+
+ return (
+ <FilterValueSitesContext.Provider value={siteIds}>
+ <div className="flex gap-2 flex-wrap">
+ {filters.map((filter, index) => (
+ <FilterChip
+ key={keys[index]}
+ filter={filter}
+ availableFilters={ROLLUP_FILTER_PARAMETERS}
+ onUpdate={next => updateRollupFilter(next, index)}
+ onRemove={() => removeRollupFilter(filter)}
+ />
+ ))}
+ </div>
+ </FilterValueSitesContext.Provider>
+ );
+}
diff --git a/client/src/app/rollup/components/RollupTopBar.tsx b/client/src/app/rollup/components/RollupTopBar.tsx
index 5c1f72864..86e184df2 100644
--- a/client/src/app/rollup/components/RollupTopBar.tsx
+++ b/client/src/app/rollup/components/RollupTopBar.tsx
@@ -1,30 +1,60 @@
"use client";
import { ChevronLeft, ChevronRight } from "lucide-react";
+import { useExtracted } from "next-intl";
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 { MultiSelect } from "@/components/ui/multi-select";
import { canGoBack, canGoForward, goBack, goForward, useStore } from "@/lib/store";
+import { RollupFilterButton } from "./RollupFilters";
export function RollupTopBar({
teams,
selectedTeamFilter,
onSelectedTeamFilterChange,
+ allTags,
+ selectedTags,
+ onSelectedTagsChange,
+ filterSiteIds,
}: {
teams: Team[];
selectedTeamFilter: string;
onSelectedTeamFilterChange: (value: string) => void;
+ allTags: string[];
+ selectedTags: string[];
+ onSelectedTagsChange: (tags: string[]) => void;
+ /** Sites the filter picker suggests values from; omitted in lite mode, which can't filter. */
+ filterSiteIds?: number[];
}) {
- const { time, setTime } = useStore();
+ const t = useExtracted();
+ const time = useStore((state) => state.time);
+ const setTime = useStore((state) => state.setTime);
return (
<div className="flex flex-wrap gap-2 justify-between items-center">
- <TeamSelector
- teams={teams}
- value={selectedTeamFilter}
- onValueChange={onSelectedTeamFilterChange}
- canCreateTeam={false}
- />
+ <div className="flex flex-wrap items-center gap-2">
+ <TeamSelector
+ teams={teams}
+ value={selectedTeamFilter}
+ onValueChange={onSelectedTeamFilterChange}
+ canCreateTeam={false}
+ />
+ {allTags.length > 0 && (
+ <div className="w-[200px]">
+ <MultiSelect
+ options={allTags.map((tag) => ({ value: tag, label: tag }))}
+ value={selectedTags}
+ onValueChange={onSelectedTagsChange}
+ placeholder={t("Filter by tags...")}
+ searchPlaceholder={t("Search tags...")}
+ emptyText={t("No tags found.")}
+ className="border-neutral-150 dark:border-neutral-800"
+ />
+ </div>
+ )}
+ {filterSiteIds && <RollupFilterButton siteIds={filterSiteIds} />}
+ </div>
<div className="flex items-center gap-2">
<DateSelector time={time} setTime={setTime} />
<div className="flex items-center">
diff --git a/client/src/app/rollup/components/sections/RollupSection.tsx b/client/src/app/rollup/components/sections/RollupSection.tsx
index 3dbb701a3..58715415f 100644
--- a/client/src/app/rollup/components/sections/RollupSection.tsx
+++ b/client/src/app/rollup/components/sections/RollupSection.tsx
@@ -10,7 +10,9 @@ import { ScrollArea } from "@/components/ui/scroll-area";
import round from "lodash/round";
import { StandardSkeleton } from "@/app/[site]/components/shared/StandardSection/Skeleton";
import { MetricResponse } from "@/api/analytics/endpoints";
+import { cn } from "@/lib/utils";
import { useRollupMetric } from "../../hooks/useRollupMetric";
+import { toggleRollupFilter } from "../../lib/rollupFilters";
import { RollupSectionDialog } from "./RollupSectionDialog";
export function RollupSection({
@@ -80,7 +82,16 @@ export function RollupSection({
items.map((item) => (
<div
key={getKey(item)}
- className="relative h-6 flex items-center group"
+ className={cn(
+ "relative h-6 flex items-center group",
+ !lite &&
+ "cursor-pointer hover:bg-neutral-150/50 dark:hover:bg-neutral-850 rounded-md"
+ )}
+ onClick={
+ lite
+ ? undefined
+ : () => toggleRollupFilter(filterParameter, getValue(item))
+ }
>
<div
className="absolute inset-0 bg-dataviz py-2 opacity-25 rounded-md"
diff --git a/client/src/app/rollup/hooks/useRollupBucketed.ts b/client/src/app/rollup/hooks/useRollupBucketed.ts
index c592e9bfa..4cd6fadd0 100644
--- a/client/src/app/rollup/hooks/useRollupBucketed.ts
+++ b/client/src/app/rollup/hooks/useRollupBucketed.ts
@@ -1,8 +1,9 @@
import { TimeBucket } from "@rybbit/shared";
import { useQueries } from "@tanstack/react-query";
+import { useMemo } from "react";
import { buildAnalyticsRequest, fetchAnalytics } from "@/api/analytics/analyticsRequest";
import { GetOverviewBucketedResponse } from "@/api/analytics/endpoints";
-import { useAnalyticsContext } from "@/api/analytics/useAnalyticsQuery";
+import { querySignature, useRollupQueryContext, useSettledSnapshot } from "./useRollupQueryContext";
export type RollupSeries = {
siteId: number;
@@ -25,9 +26,7 @@ export function useRollupBucketed({
bucket: TimeBucket;
lite?: boolean;
}): UseRollupBucketedResult {
- // Lite endpoints don't accept filters; drop them so the request and the
- // query key stay clean.
- const { context } = useAnalyticsContext({ useFilters: !lite });
+ const context = useRollupQueryContext(lite);
const request = buildAnalyticsRequest(
{ path: lite ? "overview-bucketed-lite" : "overview/time-series", params: { bucket } },
context
@@ -41,13 +40,19 @@ export function useRollupBucketed({
})),
});
- const series: RollupSeries[] = queries
- .map((q, i) => ({ siteId: siteIds[i], data: q.data }))
- .filter((s): s is RollupSeries => Array.isArray(s.data));
+ const signature = querySignature(siteIds, queries);
+ const series = useMemo(
+ () =>
+ queries
+ .map((q, i) => ({ siteId: siteIds[i], data: q.data }))
+ .filter((s): s is RollupSeries => Array.isArray(s.data)),
+ [signature]
+ );
+ const settled = useSettledSnapshot(series, queries);
return {
- series,
- isLoading: queries.some((q) => q.isLoading),
+ series: settled.data ?? [],
+ isLoading: settled.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
index 13cb214ec..881c7b461 100644
--- a/client/src/app/rollup/hooks/useRollupMetric.ts
+++ b/client/src/app/rollup/hooks/useRollupMetric.ts
@@ -3,7 +3,7 @@ import { useQueries } from "@tanstack/react-query";
import { useMemo } from "react";
import { buildAnalyticsRequest, fetchAnalytics } from "@/api/analytics/analyticsRequest";
import { MetricResponse } from "@/api/analytics/endpoints";
-import { useAnalyticsContext } from "@/api/analytics/useAnalyticsQuery";
+import { querySignature, useRollupQueryContext, useSettledSnapshot } from "./useRollupQueryContext";
export type RollupMetricRow = MetricResponse;
@@ -25,7 +25,7 @@ export function useRollupMetric({
limit?: number;
lite?: boolean;
}): UseRollupMetricResult {
- const { context } = useAnalyticsContext({ useFilters: !lite });
+ const context = useRollupQueryContext(lite);
const request = buildAnalyticsRequest(
{ path: lite ? "metric-lite" : "metric", params: { parameter, limit, page: 1 } },
context
@@ -39,6 +39,7 @@ export function useRollupMetric({
})),
});
+ const signature = querySignature(siteIds, queries);
const merged = useMemo(() => {
// Per-value accumulator. Sums sessions/pageviews and tracks weighted-sum
// numerators + denominators for averages so we can recompute correctly
@@ -128,11 +129,12 @@ export function useRollupMetric({
rows.sort((a, b) => b.count - a.count);
return rows;
- }, [queries.map((q) => q.dataUpdatedAt).join(",")]);
+ }, [signature]);
+ const settled = useSettledSnapshot(merged, queries);
return {
- data: merged,
- isLoading: queries.some((q) => q.isLoading),
+ data: settled.data ?? [],
+ isLoading: settled.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/useRollupOverview.ts b/client/src/app/rollup/hooks/useRollupOverview.ts
index ab9509f53..0cb8386e0 100644
--- a/client/src/app/rollup/hooks/useRollupOverview.ts
+++ b/client/src/app/rollup/hooks/useRollupOverview.ts
@@ -1,7 +1,8 @@
import { useQueries } from "@tanstack/react-query";
+import { useMemo } from "react";
import { buildAnalyticsRequest, fetchAnalytics } from "@/api/analytics/analyticsRequest";
import { GetOverviewResponse } from "@/api/analytics/endpoints";
-import { useAnalyticsContext } from "@/api/analytics/useAnalyticsQuery";
+import { querySignature, useRollupQueryContext, useSettledSnapshot } from "./useRollupQueryContext";
export type RollupOverview = {
siteId: number;
@@ -32,9 +33,7 @@ export function useRollupOverview({
siteIds: number[];
lite?: boolean;
}): UseRollupOverviewResult {
- // Lite endpoints don't accept filters; drop them so the request and the
- // query key stay clean.
- const { context } = useAnalyticsContext({ useFilters: !lite });
+ const context = useRollupQueryContext(lite);
const request = buildAnalyticsRequest({ path: lite ? "overview-lite" : "overview" }, context);
const queries = useQueries({
@@ -45,13 +44,19 @@ export function useRollupOverview({
})),
});
- const overviews: RollupOverview[] = queries
- .map((q, i) => ({ siteId: siteIds[i], data: q.data }))
- .filter((o): o is RollupOverview => !!o.data);
+ const signature = querySignature(siteIds, queries);
+ const overviews = useMemo(
+ () =>
+ queries
+ .map((q, i) => ({ siteId: siteIds[i], data: q.data }))
+ .filter((o): o is RollupOverview => !!o.data),
+ [signature]
+ );
+ const settled = useSettledSnapshot(overviews, queries);
return {
- overviews,
- isLoading: queries.some((q) => q.isLoading),
+ overviews: settled.data ?? [],
+ isLoading: settled.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/useRollupQueryContext.ts b/client/src/app/rollup/hooks/useRollupQueryContext.ts
new file mode 100644
index 000000000..07ca473a5
--- /dev/null
+++ b/client/src/app/rollup/hooks/useRollupQueryContext.ts
@@ -0,0 +1,43 @@
+import { UseQueryResult } from "@tanstack/react-query";
+import { useState } from "react";
+import { AnalyticsContext } from "@/api/analytics/analyticsRequest";
+import { useAnalyticsContext } from "@/api/analytics/useAnalyticsQuery";
+import { useRollupFilters } from "../lib/rollupFilters";
+
+/**
+ * Time window from the main store, filters from the rollup's own store. Lite
+ * endpoints don't accept filters, so they get none and their query keys stay
+ * clean.
+ */
+export function useRollupQueryContext(lite: boolean): AnalyticsContext {
+ const { context } = useAnalyticsContext({ useFilters: false });
+ const filters = useRollupFilters(state => state.filters);
+ return lite || filters.length === 0 ? context : { ...context, filters };
+}
+
+/** Changes whenever the set of queries or any of their results changes. */
+export const querySignature = (siteIds: number[], queries: UseQueryResult[]) =>
+ `${siteIds.join(",")}|${queries.map(q => q.dataUpdatedAt).join(",")}`;
+
+/**
+ * Each site is its own request, so results land one at a time. Rendering them
+ * as they land makes the chart and totals climb site by site. Instead hold the
+ * last fully-settled result until every site in the current set has answered
+ * (including background refetches), then swap it in at once. `value` must be memoised on the query results.
+ */
+export function useSettledSnapshot<T>(
+ value: T,
+ queries: UseQueryResult[]
+): { data: T | undefined; isLoading: boolean } {
+ const hasAllData = queries.every(q => !q.isPending);
+ // Background refetches land one site at a time too, so wait for them as well.
+ const settled = hasAllData && queries.every(q => !q.isFetching);
+ const [snapshot, setSnapshot] = useState<{ value: T } | null>(null);
+ // Cached data that is refetching on mount is still a complete first frame.
+ if ((settled || (hasAllData && snapshot === null)) && snapshot?.value !== value) {
+ setSnapshot({ value });
+ }
+ if (settled) return { data: value, isLoading: false };
+ if (snapshot) return { data: snapshot.value, isLoading: false };
+ return { data: hasAllData ? value : undefined, isLoading: !hasAllData };
+}
diff --git a/client/src/app/rollup/lib/rollupFilters.ts b/client/src/app/rollup/lib/rollupFilters.ts
new file mode 100644
index 000000000..bf1489f50
--- /dev/null
+++ b/client/src/app/rollup/lib/rollupFilters.ts
@@ -0,0 +1,61 @@
+import { Filter, FilterParameter } from "@rybbit/shared";
+import { create } from "zustand";
+
+/**
+ * Dimensions the rollup page can filter by: exactly the ones its sections
+ * break traffic down by. Site-specific dimensions (pages, events, users) mean
+ * nothing across a set of unrelated sites.
+ */
+export const ROLLUP_FILTER_PARAMETERS: FilterParameter[] = [
+ "referrer",
+ "channel",
+ "utm_source",
+ "utm_medium",
+ "utm_campaign",
+ "utm_content",
+ "utm_term",
+ "browser",
+ "device_type",
+ "operating_system",
+ "dimensions",
+ "country",
+ "region",
+ "city",
+ "language",
+ "timezone",
+];
+
+/**
+ * The rollup's own filters. Kept apart from the main store's `filters`, which
+ * belong to whichever site dashboard was open last and would otherwise leak
+ * into the rollup (and back out of it).
+ */
+export const useRollupFilters = create<{ filters: Filter[] }>(() => ({ filters: [] }));
+
+const sameFilter = (a: Filter, b: Filter) => a.parameter === b.parameter && a.type === b.type;
+
+export function addRollupFilter(filter: Filter) {
+ const { filters } = useRollupFilters.getState();
+ const index = filters.findIndex(f => sameFilter(f, filter));
+ useRollupFilters.setState({
+ filters: index === -1 ? [...filters, filter] : filters.map((f, i) => (i === index ? filter : f)),
+ });
+}
+
+export function updateRollupFilter(filter: Filter, index: number) {
+ const { filters } = useRollupFilters.getState();
+ useRollupFilters.setState({ filters: filters.map((f, i) => (i === index ? filter : f)) });
+}
+
+export function removeRollupFilter(filter: Filter) {
+ const { filters } = useRollupFilters.getState();
+ useRollupFilters.setState({ filters: filters.filter(f => f !== filter) });
+}
+
+/** Clicking a breakdown row toggles an "is" filter on that value, like the site dashboard. */
+export function toggleRollupFilter(parameter: FilterParameter, value: string) {
+ const { filters } = useRollupFilters.getState();
+ const found = filters.find(f => f.parameter === parameter && f.value.some(v => v === value));
+ if (found) removeRollupFilter(found);
+ else addRollupFilter({ parameter, type: "equals", value: [value] });
+}
diff --git a/client/src/app/rollup/page.tsx b/client/src/app/rollup/page.tsx
index acfc3866c..51045b861 100644
--- a/client/src/app/rollup/page.tsx
+++ b/client/src/app/rollup/page.tsx
@@ -1,7 +1,7 @@
"use client";
import { useWindowSize } from "@uidotdev/usehooks";
import { useExtracted } from "next-intl";
-import { ReactNode, useEffect, useMemo, useState } from "react";
+import { memo, ReactNode, useDeferredValue, 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";
@@ -15,6 +15,7 @@ import { authClient } from "@/lib/auth";
import { LITE_DASHBOARD } from "@/lib/const";
import { buildSiteColorMap } from "./components/MainSection/Chart";
import { MainSection } from "./components/MainSection/MainSection";
+import { RollupFilterChips } from "./components/RollupFilters";
import { RollupTopBar } from "./components/RollupTopBar";
import { SiteToggleStrip } from "./components/SiteToggleStrip";
import { Countries } from "./components/sections/Countries";
@@ -41,6 +42,63 @@ function LazySection({
);
}
+type SiteRow = NonNullable<ReturnType<typeof useGetSitesFromOrg>["data"]>["sites"][number];
+
+// Everything below the site strip. Memoised and fed a deferred site list so a
+// chip toggle repaints the chip immediately and the charts catch up after.
+const RollupContent = memo(function RollupContent({
+ siteIds,
+ sites,
+ siteColorMap,
+}: {
+ siteIds: number[];
+ sites: SiteRow[];
+ siteColorMap: Map<number, string>;
+}) {
+ const t = useExtracted();
+
+ if (siteIds.length === 0) {
+ return (
+ <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>
+ );
+ }
+
+ if (LITE_DASHBOARD) {
+ return (
+ <>
+ <MainSection siteIds={siteIds} sites={sites} siteColorMap={siteColorMap} lite />
+ <div className="grid grid-cols-1 lg:grid-cols-2 gap-3 mt-3">
+ <LazySection>
+ <PagesLite siteIds={siteIds} />
+ </LazySection>
+ <LazySection>
+ <CountriesLite siteIds={siteIds} />
+ </LazySection>
+ </div>
+ </>
+ );
+ }
+
+ return (
+ <>
+ <MainSection siteIds={siteIds} sites={sites} siteColorMap={siteColorMap} />
+ <div className="grid grid-cols-1 lg:grid-cols-2 gap-3 mt-3">
+ <LazySection>
+ <Referrers siteIds={siteIds} />
+ </LazySection>
+ <LazySection>
+ <Devices siteIds={siteIds} />
+ </LazySection>
+ <LazySection>
+ <Countries siteIds={siteIds} />
+ </LazySection>
+ </div>
+ </>
+ );
+});
+
export default function RollupPage() {
const t = useExtracted();
useSetPageTitle("Rollup");
@@ -56,10 +114,23 @@ export default function RollupPage() {
const teams = teamsData?.teams || [];
const [selectedTeamFilter, setSelectedTeamFilter] = useState<string>("all");
- const [selectedSiteIds, setSelectedSiteIds] = useState<number[] | null>(null);
+ const [selectedTags, setSelectedTags] = useState<string[]>([]);
+ // Track what the user switched OFF rather than on: narrowing by team or tag
+ // then shows every site in the new set, and widening again brings back
+ // exactly what they had.
+ const [hiddenSiteIds, setHiddenSiteIds] = useState<Set<number>>(new Set());
+
+ const allTags = useMemo(
+ () => Array.from(new Set(allSites.flatMap((s) => s.tags ?? []))).toSorted(),
+ [allSites]
+ );
const filteredSites = useMemo(() => {
return allSites.filter((site) => {
+ const matchesTags =
+ selectedTags.length === 0 ||
+ selectedTags.some((tag) => site.tags?.includes(tag));
+ if (!matchesTags) return false;
if (selectedTeamFilter === "all") return true;
if (selectedTeamFilter === "unassigned") {
return !site.teams || site.teams.length === 0;
@@ -68,21 +139,26 @@ export default function RollupPage() {
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]);
+ }, [allSites, selectedTeamFilter, selectedTags]);
+
+ const selectedSiteIds = useMemo(
+ () =>
+ filteredSites
+ .filter((s) => !hiddenSiteIds.has(s.siteId))
+ .map((s) => s.siteId),
+ [filteredSites, hiddenSiteIds]
+ );
+ const deferredSiteIds = useDeferredValue(selectedSiteIds);
- const effectiveSiteIds =
- selectedSiteIds ?? filteredSites.map((s) => s.siteId);
+ const setSelectedSiteIds = (ids: number[]) => {
+ const selected = new Set(ids);
+ const next = new Set(hiddenSiteIds);
+ for (const site of filteredSites) {
+ if (selected.has(site.siteId)) next.delete(site.siteId);
+ else next.add(site.siteId);
+ }
+ setHiddenSiteIds(next);
+ };
// Color assignment is by position in filteredSites so no two sites in view
// collide as long as count <= palette size.
@@ -97,54 +173,23 @@ export default function RollupPage() {
teams={teams}
selectedTeamFilter={selectedTeamFilter}
onSelectedTeamFilterChange={setSelectedTeamFilter}
+ allTags={allTags}
+ selectedTags={selectedTags}
+ onSelectedTagsChange={setSelectedTags}
+ filterSiteIds={LITE_DASHBOARD ? undefined : deferredSiteIds}
/>
+ {!LITE_DASHBOARD && <RollupFilterChips siteIds={deferredSiteIds} />}
<SiteToggleStrip
sites={filteredSites}
- selectedSiteIds={effectiveSiteIds}
+ selectedSiteIds={selectedSiteIds}
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>
- ) : LITE_DASHBOARD ? (
- <>
- <MainSection
- siteIds={effectiveSiteIds}
- sites={filteredSites}
- siteColorMap={siteColorMap}
- lite
- />
- <div className="grid grid-cols-1 lg:grid-cols-2 gap-3 mt-3">
- <LazySection>
- <PagesLite siteIds={effectiveSiteIds} />
- </LazySection>
- <LazySection>
- <CountriesLite siteIds={effectiveSiteIds} />
- </LazySection>
- </div>
- </>
- ) : (
- <>
- <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>
- </>
- )}
+ <RollupContent
+ siteIds={deferredSiteIds}
+ sites={filteredSites}
+ siteColorMap={siteColorMap}
+ />
</div>
);
diff --git a/client/src/lib/nivo.ts b/client/src/lib/nivo.ts
index b4db29df0..6d21327ec 100644
--- a/client/src/lib/nivo.ts
+++ b/client/src/lib/nivo.ts
@@ -2,6 +2,7 @@
import { PartialTheme } from "@nivo/theming";
import { useTheme } from "next-themes";
+import { useMemo } from "react";
export const getNivoTheme = (isDark: boolean = true): PartialTheme => ({
axis: {
@@ -52,5 +53,7 @@ export const getNivoTheme = (isDark: boolean = true): PartialTheme => ({
// Custom hook that automatically uses the resolved theme
export const useNivoTheme = (): PartialTheme => {
const { resolvedTheme } = useTheme();
- return getNivoTheme(resolvedTheme === "dark");
+ const isDark = resolvedTheme === "dark";
+ // Stable per theme so memoised charts don't re-render on every parent render.
+ return useMemo(() => getNivoTheme(isDark), [isDark]);
};