Skip to content

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

better filters (#817)

Goldflag7bba65921a34
diff --git a/client/src/components/Sessions/SessionCard.tsx b/client/src/components/Sessions/SessionCard.tsx
index 61fadf2bb..53377491f 100644
--- a/client/src/components/Sessions/SessionCard.tsx
+++ b/client/src/components/Sessions/SessionCard.tsx
@@ -48,9 +48,88 @@ export function SessionCard({ session, onClick, userId, expandedByDefault }: Ses
return (
<div className="rounded-lg bg-white dark:bg-neutral-900 border border-neutral-100 dark:border-neutral-850 overflow-hidden">
<div className="p-3 cursor-pointer" onClick={handleCardClick}>
- <div className="flex items-center gap-2">
+ {/* Mobile layout - two rows */}
+ <div className="flex flex-col gap-2 md:hidden">
+ {/* Top row on mobile - User name (left) + Timestamp (right) */}
+ <div className="flex items-center justify-between">
+ <div className="flex items-center gap-2">
+ <Avatar
+ size={24}
+ id={session.user_id}
+ lastActiveTime={DateTime.fromSQL(session.session_end, { zone: "utc" })}
+ />
+ <span className="text-xs text-neutral-600 dark:text-neutral-200 truncate max-w-[150px]">
+ {getUserDisplayName(session)}
+ </span>
+ {!!session.identified_user_id && <IdentifiedBadge traits={session.traits} />}
+ </div>
+ <span className="text-xs text-neutral-500 dark:text-neutral-400">
+ {DateTime.fromSQL(session.session_start, {
+ zone: "utc",
+ })
+ .setLocale(userLocale)
+ .setZone(getTimezone())
+ .toFormat(hour12 ? "MMM d, h:mm a" : "dd MMM, HH:mm")}
+ </span>
+ </div>
+
+ {/* Bottom row on mobile - Icons, badges, channel */}
+ <div className="flex items-center gap-2 flex-wrap">
+ {session.country && (
+ <CountryFlagTooltipIcon country={session.country} city={session.city} region={session.region} />
+ )}
+ <BrowserTooltipIcon browser={session.browser || "Unknown"} browser_version={session.browser_version} />
+ <OperatingSystemTooltipIcon
+ operating_system={session.operating_system || ""}
+ operating_system_version={session.operating_system_version}
+ />
+ <DeviceTypeTooltipIcon
+ device_type={session.device_type || ""}
+ screen_width={session.screen_width}
+ screen_height={session.screen_height}
+ />
+ {session.has_replay === 1 && (
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Badge
+ variant="success"
+ onClick={e => {
+ e.stopPropagation();
+ setReplayDrawerOpen(true);
+ }}
+ >
+ <Video className="w-4 h-4" />
+ </Badge>
+ </TooltipTrigger>
+ <TooltipContent>Watch Session Replay</TooltipContent>
+ </Tooltip>
+ )}
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Badge className="flex items-center gap-1 bg-neutral-100 dark:bg-neutral-800 text-neutral-600 dark:text-neutral-300">
+ <PageviewIcon />
+ <span>{formatter(session.pageviews)}</span>
+ </Badge>
+ </TooltipTrigger>
+ <TooltipContent>Pageviews</TooltipContent>
+ </Tooltip>
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Badge className="flex items-center gap-1 bg-neutral-100 dark:bg-neutral-800 text-neutral-600 dark:text-neutral-300">
+ <EventIcon />
+ <span>{formatter(session.events)}</span>
+ </Badge>
+ </TooltipTrigger>
+ <TooltipContent>Events</TooltipContent>
+ </Tooltip>
+ <Channel channel={session.channel} referrer={session.referrer} />
+ </div>
+ </div>
+
+ {/* Desktop layout - single row */}
+ <div className="hidden md:flex items-center gap-2">
{!userId && (
- <div className="hidden md:flex items-center gap-2">
+ <div className="flex items-center gap-2">
<Avatar
size={24}
id={session.user_id}
@@ -112,12 +191,11 @@ export function SessionCard({ session, onClick, userId, expandedByDefault }: Ses
</TooltipTrigger>
<TooltipContent>Events</TooltipContent>
</Tooltip>
-
<Channel channel={session.channel} referrer={session.referrer} />
</div>
{/* Pages section with tooltips for long paths */}
- <div className="items-center ml-3 flex-1 min-w-0 hidden md:flex">
+ <div className="items-center ml-3 flex-1 min-w-0 flex">
<Tooltip>
<TooltipTrigger asChild>
<span className="text-xs text-neutral-500 dark:text-neutral-400 truncate max-w-[200px] inline-block">
@@ -144,7 +222,6 @@ export function SessionCard({ session, onClick, userId, expandedByDefault }: Ses
</div>
{/* Time information */}
-
<div className="flex items-center gap-1.5 text-xs text-neutral-600 dark:text-neutral-300">
<span className="text-neutral-500 dark:text-neutral-400">
{DateTime.fromSQL(session.session_start, {
@@ -155,11 +232,11 @@ export function SessionCard({ session, onClick, userId, expandedByDefault }: Ses
.toFormat(hour12 ? "MMM d, h:mm a" : "dd MMM, HH:mm")}
</span>
<span className="text-neutral-500 dark:text-neutral-400">•</span>
- <span className="hidden md:block">{duration}</span>
+ <span>{duration}</span>
</div>
{/* Expand/Collapse icon */}
- <div className="ml-2 shrink-0 hidden md:flex">
+ <div className="ml-2 shrink-0">
{expanded ? (
<ChevronDown className="w-4 h-4 text-neutral-500 dark:text-neutral-400" strokeWidth={3} />
) : (
@@ -206,10 +283,34 @@ export const SessionCardSkeleton = memo(({ userId, count }: { userId?: string; c
key={index}
>
<div className="p-3">
- <div className="flex items-center gap-2">
+ {/* Mobile layout - two rows */}
+ <div className="flex flex-col gap-2 md:hidden">
+ {/* Top row - Avatar + name (left) + timestamp (right) */}
+ <div className="flex items-center justify-between">
+ <div className="flex items-center gap-2">
+ <Skeleton className="h-6 w-6 rounded-full" />
+ <Skeleton className="h-3 w-24" />
+ </div>
+ <Skeleton className={cn("h-3", getRandomTimeWidth())} />
+ </div>
+
+ {/* Bottom row - Icons, badges, channel */}
+ <div className="flex items-center gap-2">
+ <Skeleton className="h-4 w-4 rounded-sm" />
+ <Skeleton className="h-4 w-4 rounded-sm" />
+ <Skeleton className="h-4 w-4 rounded-sm" />
+ <Skeleton className="h-4 w-4 rounded-sm" />
+ <Skeleton className="h-[21px] w-12 rounded-sm" />
+ <Skeleton className="h-[21px] w-12 rounded-sm" />
+ <Skeleton className="h-[21px] w-16 rounded-sm" />
+ </div>
+ </div>
+
+ {/* Desktop layout - single row */}
+ <div className="hidden md:flex items-center gap-2">
{/* Avatar and User ID */}
{!userId && (
- <div className="hidden md:flex items-center gap-2">
+ <div className="flex items-center gap-2">
<Skeleton className="h-6 w-6 rounded-full" />
<Skeleton className="h-3 w-24" />
</div>
@@ -231,7 +332,7 @@ export const SessionCardSkeleton = memo(({ userId, count }: { userId?: string; c
</div>
{/* Entry/Exit paths with randomized widths */}
- <div className="items-center ml-3 flex-1 min-w-0 hidden md:flex">
+ <div className="items-center ml-3 flex-1 min-w-0 flex">
<Skeleton className={cn("h-3 max-w-[200px]", getRandomWidth())} />
<ArrowRight className="mx-2 w-3 h-3 shrink-0 text-neutral-500 dark:text-neutral-400 opacity-20" />
<Skeleton className={cn("h-3 max-w-[200px]", getRandomWidth())} />
@@ -241,11 +342,11 @@ export const SessionCardSkeleton = memo(({ userId, count }: { userId?: string; c
<div className="flex items-center gap-1.5">
<Skeleton className={cn("h-3", getRandomTimeWidth())} />
<span className="text-neutral-500 dark:text-neutral-400 opacity-20">•</span>
- <Skeleton className={cn("h-3 hidden md:block", getRandomDurationWidth())} />
+ <Skeleton className={cn("h-3", getRandomDurationWidth())} />
</div>
{/* Expand icon */}
- <div className="ml-2 shrink-0 hidden md:flex">
+ <div className="ml-2 shrink-0">
<Skeleton className="h-4 w-4" />
</div>
</div>
diff --git a/client/src/lib/filterGroups.ts b/client/src/lib/filterGroups.ts
index 4f77f3794..b482887b2 100644
--- a/client/src/lib/filterGroups.ts
+++ b/client/src/lib/filterGroups.ts
@@ -26,7 +26,7 @@ const BASE_FILTERS: FilterParameter[] = [
"lon",
];
-export const SESSION_PAGE_FILTERS: FilterParameter[] = [...BASE_FILTERS, "entry_page", "exit_page", "event_name"];
+export const SESSION_PAGE_FILTERS: FilterParameter[] = [...BASE_FILTERS, "pathname", "entry_page", "exit_page", "event_name"];
export const EVENT_FILTERS: FilterParameter[] = [
...BASE_FILTERS,
diff --git a/server/src/api/analytics/funnels/getFunnelStepSessions.ts b/server/src/api/analytics/funnels/getFunnelStepSessions.ts
index 8f5a98865..18308679b 100644
--- a/server/src/api/analytics/funnels/getFunnelStepSessions.ts
+++ b/server/src/api/analytics/funnels/getFunnelStepSessions.ts
@@ -63,16 +63,17 @@ export async function getFunnelStepSessions(req: FastifyRequest<GetFunnelStepSes
try {
const timeStatement = getTimeStatement(req.query);
- let filterStatement = getFilterStatement(req.query.filters, Number(siteId), timeStatement);
- // Transform filter statement to use extracted UTM columns instead of map access
- // since the CTE already extracts utm_source, utm_medium, etc. as separate columns
- filterStatement = filterStatement
- .replace(/url_parameters\['utm_source'\]/g, "utm_source")
- .replace(/url_parameters\['utm_medium'\]/g, "utm_medium")
- .replace(/url_parameters\['utm_campaign'\]/g, "utm_campaign")
- .replace(/url_parameters\['utm_term'\]/g, "utm_term")
- .replace(/url_parameters\['utm_content'\]/g, "utm_content");
+ // Use fieldMappings since the CTE extracts UTM params as separate columns
+ const filterStatement = getFilterStatement(req.query.filters, Number(siteId), timeStatement, {
+ fieldMappings: {
+ "url_parameters['utm_source']": "utm_source",
+ "url_parameters['utm_medium']": "utm_medium",
+ "url_parameters['utm_campaign']": "utm_campaign",
+ "url_parameters['utm_term']": "utm_term",
+ "url_parameters['utm_content']": "utm_content",
+ },
+ });
// Build conditional statements for each step we need
const stepsToCheck = mode === "reached" ? stepNumber : stepNumber + 1;
diff --git a/server/src/api/analytics/getSessions.ts b/server/src/api/analytics/getSessions.ts
index ec5a68add..e7f97366f 100644
--- a/server/src/api/analytics/getSessions.ts
+++ b/server/src/api/analytics/getSessions.ts
@@ -57,22 +57,29 @@ export interface GetSessionsRequest {
}>;
}
+// Field mappings for the CTE which extracts UTM params as separate columns
+const SESSION_FIELD_MAPPINGS = {
+ "url_parameters['utm_source']": "utm_source",
+ "url_parameters['utm_medium']": "utm_medium",
+ "url_parameters['utm_campaign']": "utm_campaign",
+ "url_parameters['utm_term']": "utm_term",
+ "url_parameters['utm_content']": "utm_content",
+};
+
export async function getSessions(req: FastifyRequest<GetSessionsRequest>, res: FastifyReply) {
const { filters, page = 1, user_id: userId, limit = 100, identified_only: identifiedOnly = "false" } = req.query;
const site = req.params.siteId;
const filterIdentified = identifiedOnly === "true";
const timeStatement = getTimeStatement(req.query);
- let filterStatement = getFilterStatement(filters, Number(site), timeStatement);
- // Transform filter statement to use extracted UTM columns instead of map access
- // since the CTE already extracts utm_source, utm_medium, etc. as separate columns
- filterStatement = filterStatement
- .replace(/url_parameters\['utm_source'\]/g, "utm_source")
- .replace(/url_parameters\['utm_medium'\]/g, "utm_medium")
- .replace(/url_parameters\['utm_campaign'\]/g, "utm_campaign")
- .replace(/url_parameters\['utm_term'\]/g, "utm_term")
- .replace(/url_parameters\['utm_content'\]/g, "utm_content");
+ // Use composable filter options:
+ // - sessionLevelParams: pathname and page_title filter at session level (finds sessions that visited a page)
+ // - fieldMappings: CTE extracts UTM params as separate columns, so we need to map the field names
+ const filterStatement = getFilterStatement(filters, Number(site), timeStatement, {
+ sessionLevelParams: ["event_name", "pathname", "page_title"],
+ fieldMappings: SESSION_FIELD_MAPPINGS,
+ });
const query = `
WITH AggregatedSessions AS (
diff --git a/server/src/api/analytics/utils/getFilterStatement.ts b/server/src/api/analytics/utils/getFilterStatement.ts
index dcb18dc0c..398cc6815 100644
--- a/server/src/api/analytics/utils/getFilterStatement.ts
+++ b/server/src/api/analytics/utils/getFilterStatement.ts
@@ -2,6 +2,19 @@ import SqlString from "sqlstring";
import { filterParamSchema, validateFilters } from "./query-validation.js";
import { FilterParameter, FilterType } from "../types.js";
+// Options for customizing filter behavior
+export interface FilterStatementOptions {
+ // Parameters that should use session-level subqueries (finds sessions containing matching events)
+ // Default: ["event_name"] - entry_page and exit_page are always session-level due to special aggregation
+ sessionLevelParams?: FilterParameter[];
+
+ // Field name mappings for CTEs that extract fields to different column names
+ // e.g., { "url_parameters['utm_source']": "utm_source" }
+ fieldMappings?: Record<string, string>;
+}
+
+const DEFAULT_SESSION_LEVEL_PARAMS: FilterParameter[] = ["event_name"];
+
const filterTypeToOperator = (type: FilterType) => {
switch (type) {
case "equals":
@@ -63,7 +76,12 @@ export const getSqlParam = (parameter: FilterParameter) => {
return filterParamSchema.parse(parameter);
};
-export function getFilterStatement(filters: string, siteId?: number, timeStatement?: string) {
+export function getFilterStatement(
+ filters: string,
+ siteId?: number,
+ timeStatement?: string,
+ options?: FilterStatementOptions
+) {
if (!filters) {
return "";
}
@@ -75,35 +93,44 @@ export function getFilterStatement(filters: string, siteId?: number, timeStateme
return "";
}
+ const sessionLevelParams = options?.sessionLevelParams ?? DEFAULT_SESSION_LEVEL_PARAMS;
const siteIdFilter = siteId ? `site_id = ${siteId}` : "";
// Strip leading "AND " from timeStatement since we'll be constructing WHERE clauses
const timeFilter = timeStatement ? timeStatement.replace(/^AND\s+/i, "").trim() : "";
- return (
+ // Helper to build session-level subquery for a parameter
+ const buildSessionLevelSubquery = (
+ param: FilterParameter,
+ filterType: FilterType,
+ values: (string | number)[],
+ wildcardPrefix: string
+ ): string => {
+ const whereClause = [siteIdFilter, timeFilter].filter(Boolean).join(" AND ");
+ const condition =
+ values.length === 1
+ ? `${param} ${filterTypeToOperator(filterType)} ${SqlString.escape(wildcardPrefix + values[0] + wildcardPrefix)}`
+ : `(${values.map(value => `${param} ${filterTypeToOperator(filterType)} ${SqlString.escape(wildcardPrefix + value + wildcardPrefix)}`).join(" OR ")})`;
+
+ const finalWhere = whereClause ? `WHERE ${whereClause} AND ${condition}` : `WHERE ${condition}`;
+
+ return `session_id IN (
+ SELECT DISTINCT session_id
+ FROM events
+ ${finalWhere}
+ )`;
+ };
+
+ let result =
"AND " +
filtersArray
.map(filter => {
const x = filter.type === "contains" || filter.type === "not_contains" ? "%" : "";
const isNumericParam = filter.parameter === "lat" || filter.parameter === "lon";
- // Handle event_name as a session-level filter
- // This ensures we filter to sessions containing the event, but still count all pageviews in those sessions
- if (filter.parameter === "event_name") {
- const whereClause = [siteIdFilter, timeFilter].filter(Boolean).join(" AND ");
- const eventNameCondition =
- filter.value.length === 1
- ? `event_name ${filterTypeToOperator(filter.type)} ${SqlString.escape(x + filter.value[0] + x)}`
- : `(${filter.value.map(value => `event_name ${filterTypeToOperator(filter.type)} ${SqlString.escape(x + value + x)}`).join(" OR ")})`;
-
- const finalWhere = whereClause
- ? `WHERE ${whereClause} AND ${eventNameCondition}`
- : `WHERE ${eventNameCondition}`;
-
- return `session_id IN (
- SELECT DISTINCT session_id
- FROM events
- ${finalWhere}
- )`;
+ // Handle session-level filters (configurable via options)
+ // This ensures we filter to sessions containing matching events
+ if (sessionLevelParams.includes(filter.parameter)) {
+ return buildSessionLevelSubquery(filter.parameter, filter.type, filter.value, x);
}
if (filter.parameter === "entry_page") {
@@ -272,6 +299,16 @@ export function getFilterStatement(filters: string, siteId?: number, timeStateme
return `(${valuesWithOperator.join(" OR ")})`;
})
- .join(" AND ")
- );
+ .join(" AND ");
+
+ // Apply field mappings if provided (for CTEs that extract fields to different column names)
+ if (options?.fieldMappings) {
+ for (const [from, to] of Object.entries(options.fieldMappings)) {
+ // Escape special regex characters in the 'from' string
+ const escapedFrom = from.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+ result = result.replace(new RegExp(escapedFrom, "g"), to);
+ }
+ }
+
+ return result;
}