🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Enhance filtering functionality in UsersPage, SessionCard, and TooltipIcons components
Bill Yang3f0f0f96de89
diff --git a/client/src/app/[site]/users/page.tsx b/client/src/app/[site]/users/page.tsxindex 4bbb9ddc7..44485ed02 100644--- a/client/src/app/[site]/users/page.tsx+++ b/client/src/app/[site]/users/page.tsx@@ -9,7 +9,7 @@ import {SortingState,useReactTable,} from "@tanstack/react-table";-import { getTimezone } from "@/lib/store";+import { addFilter, getTimezone } from "@/lib/store";import { ArrowDown, ArrowUp, ArrowUpDown, Monitor, Smartphone, Tablet } from "lucide-react";import { DateTime } from "luxon";import Link from "next/link";@@ -31,6 +31,7 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "../../../components/ui/import { Info } from "lucide-react";import { useSetPageTitle } from "../../../hooks/useSetPageTitle";import { USER_PAGE_FILTERS } from "../../../lib/filterGroups";+import { FilterParameter } from "@rybbit/shared";import { getCountryName, getUserDisplayName } from "../../../lib/utils";import { Browser } from "../components/shared/icons/Browser";import { CountryFlag } from "../components/shared/icons/CountryFlag";@@ -40,6 +41,17 @@ import { SubHeader } from "../components/SubHeader/SubHeader";// Set up column helperconst columnHelper = createColumnHelper<UsersResponse>();+// Helper to add filter on click+const handleFilterClick = (e: React.MouseEvent, parameter: FilterParameter, value: string | undefined) => {+ e.stopPropagation();+ if (!value) return;+ addFilter({+ parameter,+ value: [value],+ type: "equals",+ });+};+// Create a reusable sort header componentconst SortHeader = ({ column, children }: any) => {const isSorted = column.getIsSorted();@@ -132,17 +144,21 @@ export default function UsersPage() {columnHelper.accessor("country", {header: "Country",cell: info => {+ const country = info.getValue();return (- <div className="flex items-center gap-2 whitespace-nowrap">+ <div+ className="flex items-center gap-2 whitespace-nowrap cursor-pointer hover:opacity-70"+ onClick={e => handleFilterClick(e, "country", country)}+ ><Tooltip><TooltipTrigger asChild>- <CountryFlag country={info.getValue() || ""} />+ <CountryFlag country={country || ""} /></TooltipTrigger><TooltipContent>- <p>{info.getValue() ? getCountryName(info.getValue()) : "Unknown"}</p>+ <p>{country ? getCountryName(country) : "Unknown"}</p></TooltipContent></Tooltip>- {info.row.original.city || info.row.original.region || getCountryName(info.getValue())}+ {info.row.original.city || info.row.original.region || getCountryName(country)}</div>);},@@ -157,7 +173,10 @@ export default function UsersPage() {if (domain) {const displayName = getDisplayName(domain);return (- <div className="flex items-center gap-2">+ <div+ className="flex items-center gap-2 cursor-pointer hover:opacity-70"+ onClick={e => handleFilterClick(e, "channel", channel)}+ ><Favicon domain={domain} className="w-4 h-4" /><span>{displayName}</span></div>@@ -165,7 +184,10 @@ export default function UsersPage() {}return (- <div className="flex items-center gap-2">+ <div+ className="flex items-center gap-2 cursor-pointer hover:opacity-70"+ onClick={e => handleFilterClick(e, "channel", channel)}+ ><ChannelIcon channel={channel} /><span>{channel}</span></div>@@ -174,28 +196,43 @@ export default function UsersPage() {}),columnHelper.accessor("browser", {header: "Browser",- cell: info => (- <div className="flex items-center gap-2 whitespace-nowrap">- <Browser browser={info.getValue() || "Unknown"} />- {info.getValue() || "Unknown"}- </div>- ),+ cell: info => {+ const browser = info.getValue();+ return (+ <div+ className="flex items-center gap-2 whitespace-nowrap cursor-pointer hover:opacity-70"+ onClick={e => handleFilterClick(e, "browser", browser)}+ >+ <Browser browser={browser || "Unknown"} />+ {browser || "Unknown"}+ </div>+ );+ },}),columnHelper.accessor("operating_system", {header: "OS",- cell: info => (- <div className="flex items-center gap-2 whitespace-nowrap">- <OperatingSystem os={info.getValue() || ""} />- {info.getValue() || "Unknown"}- </div>- ),+ cell: info => {+ const os = info.getValue();+ return (+ <div+ className="flex items-center gap-2 whitespace-nowrap cursor-pointer hover:opacity-70"+ onClick={e => handleFilterClick(e, "operating_system", os)}+ >+ <OperatingSystem os={os || ""} />+ {os || "Unknown"}+ </div>+ );+ },}),columnHelper.accessor("device_type", {header: "Device",cell: info => {const deviceType = info.getValue();return (- <div className="flex items-center gap-2 whitespace-nowrap">+ <div+ className="flex items-center gap-2 whitespace-nowrap cursor-pointer hover:opacity-70"+ onClick={e => handleFilterClick(e, "device_type", deviceType)}+ >{deviceType === "Desktop" && <Monitor className="w-4 h-4" />}{deviceType === "Mobile" && <Smartphone className="w-4 h-4" />}{deviceType === "Tablet" && <Tablet className="w-4 h-4" />}diff --git a/client/src/components/Channel.tsx b/client/src/components/Channel.tsxindex bf0858a04..f34226f43 100644--- a/client/src/components/Channel.tsx+++ b/client/src/components/Channel.tsx@@ -134,13 +134,24 @@ export const extractDomain = (url: string): string | null => {}};-export function Channel({ channel, referrer }: { channel: string; referrer: string }) {+export function Channel({+ channel,+ referrer,+ onClick,+}: {+ channel: string;+ referrer: string;+ onClick?: (e: React.MouseEvent) => void;+}) {const domain = extractDomain(referrer);if (domain) {const displayName = getDisplayName(domain);return (- <Badge className="flex items-center gap-1 bg-neutral-100 dark:bg-neutral-800 text-neutral-600 dark:text-neutral-300">+ <Badge+ className={`flex items-center gap-1 bg-neutral-100 dark:bg-neutral-800 text-neutral-600 dark:text-neutral-300 ${onClick ? "cursor-pointer hover:opacity-70" : ""}`}+ onClick={onClick}+ ><Favicon domain={domain} className="w-4 h-4" /><span>{displayName}</span></Badge>@@ -148,7 +159,10 @@ export function Channel({ channel, referrer }: { channel: string; referrer: stri}return (- <Badge className="flex items-center gap-1 bg-neutral-100 dark:bg-neutral-800 text-neutral-600 dark:text-neutral-300">+ <Badge+ className={`flex items-center gap-1 bg-neutral-100 dark:bg-neutral-800 text-neutral-600 dark:text-neutral-300 ${onClick ? "cursor-pointer hover:opacity-70" : ""}`}+ onClick={onClick}+ ><ChannelIcon channel={channel} /><span>{channel}</span></Badge>diff --git a/client/src/components/Sessions/SessionCard.tsx b/client/src/components/Sessions/SessionCard.tsxindex 53377491f..7d9198087 100644--- a/client/src/components/Sessions/SessionCard.tsx+++ b/client/src/components/Sessions/SessionCard.tsx@@ -1,9 +1,10 @@import { Skeleton } from "@/components/ui/skeleton";import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";-import { getTimezone } from "@/lib/store";+import { addFilter, getTimezone } from "@/lib/store";import { ArrowRight, ChevronDown, ChevronRight, Video } from "lucide-react";import { DateTime } from "luxon";-import { memo, useState } from "react";+import { FilterParameter } from "@rybbit/shared";+import { memo, useCallback, useState } from "react";import { GetSessionsResponse } from "../../api/analytics/endpoints";import { formatShortDuration, hour12, userLocale } from "../../lib/dateTimeUtils";import { cn, formatter, getUserDisplayName, truncateString } from "../../lib/utils";@@ -45,6 +46,19 @@ export function SessionCard({ session, onClick, userId, expandedByDefault }: Ses}};+ const handleFilterClick = useCallback(+ (e: React.MouseEvent, parameter: FilterParameter, value: string | undefined) => {+ e.stopPropagation();+ if (!value) return;+ addFilter({+ parameter,+ value: [value],+ type: "equals",+ });+ },+ []+ );+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}>@@ -76,17 +90,28 @@ export function SessionCard({ session, onClick, userId, expandedByDefault }: Ses{/* 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} />+ <CountryFlagTooltipIcon+ country={session.country}+ city={session.city}+ region={session.region}+ onClick={e => handleFilterClick(e, "country", session.country)}+ />)}- <BrowserTooltipIcon browser={session.browser || "Unknown"} browser_version={session.browser_version} />+ <BrowserTooltipIcon+ browser={session.browser || "Unknown"}+ browser_version={session.browser_version}+ onClick={e => handleFilterClick(e, "browser", session.browser)}+ /><OperatingSystemTooltipIconoperating_system={session.operating_system || ""}operating_system_version={session.operating_system_version}+ onClick={e => handleFilterClick(e, "operating_system", session.operating_system)}/><DeviceTypeTooltipIcondevice_type={session.device_type || ""}screen_width={session.screen_width}screen_height={session.screen_height}+ onClick={e => handleFilterClick(e, "device_type", session.device_type)}/>{session.has_replay === 1 && (<Tooltip>@@ -122,7 +147,11 @@ export function SessionCard({ session, onClick, userId, expandedByDefault }: Ses</TooltipTrigger><TooltipContent>Events</TooltipContent></Tooltip>- <Channel channel={session.channel} referrer={session.referrer} />+ <Channel+ channel={session.channel}+ referrer={session.referrer}+ onClick={e => handleFilterClick(e, "channel", session.channel)}+ /></div></div>@@ -145,17 +174,28 @@ export function SessionCard({ session, onClick, userId, expandedByDefault }: Ses{/* Icons section */}<div className="flex space-x-2 items-center">{session.country && (- <CountryFlagTooltipIcon country={session.country} city={session.city} region={session.region} />+ <CountryFlagTooltipIcon+ country={session.country}+ city={session.city}+ region={session.region}+ onClick={e => handleFilterClick(e, "country", session.country)}+ />)}- <BrowserTooltipIcon browser={session.browser || "Unknown"} browser_version={session.browser_version} />+ <BrowserTooltipIcon+ browser={session.browser || "Unknown"}+ browser_version={session.browser_version}+ onClick={e => handleFilterClick(e, "browser", session.browser)}+ /><OperatingSystemTooltipIconoperating_system={session.operating_system || ""}operating_system_version={session.operating_system_version}+ onClick={e => handleFilterClick(e, "operating_system", session.operating_system)}/><DeviceTypeTooltipIcondevice_type={session.device_type || ""}screen_width={session.screen_width}screen_height={session.screen_height}+ onClick={e => handleFilterClick(e, "device_type", session.device_type)}/>{session.has_replay === 1 && (<Tooltip>@@ -191,14 +231,21 @@ export function SessionCard({ session, onClick, userId, expandedByDefault }: Ses</TooltipTrigger><TooltipContent>Events</TooltipContent></Tooltip>- <Channel channel={session.channel} referrer={session.referrer} />+ <Channel+ channel={session.channel}+ referrer={session.referrer}+ onClick={e => handleFilterClick(e, "channel", session.channel)}+ /></div>{/* Pages section with tooltips for long paths */}<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">+ <span+ className="text-xs text-neutral-500 dark:text-neutral-400 truncate max-w-[200px] inline-block cursor-pointer hover:opacity-70"+ onClick={e => handleFilterClick(e, "entry_page", session.entry_page)}+ >{truncateString(session.entry_page, 32)}</span></TooltipTrigger>@@ -211,7 +258,10 @@ export function SessionCard({ session, onClick, userId, expandedByDefault }: Ses<Tooltip><TooltipTrigger asChild>- <span className="text-xs text-neutral-500 dark:text-neutral-400 truncate max-w-[200px] inline-block">+ <span+ className="text-xs text-neutral-500 dark:text-neutral-400 truncate max-w-[200px] inline-block cursor-pointer hover:opacity-70"+ onClick={e => handleFilterClick(e, "exit_page", session.exit_page)}+ >{truncateString(session.exit_page, 32)}</span></TooltipTrigger>diff --git a/client/src/components/TooltipIcons/TooltipIcons.tsx b/client/src/components/TooltipIcons/TooltipIcons.tsxindex 6e13317b8..eb570d5be 100644--- a/client/src/components/TooltipIcons/TooltipIcons.tsx+++ b/client/src/components/TooltipIcons/TooltipIcons.tsx@@ -22,11 +22,13 @@ export function CountryFlagTooltipIcon({city,region,className,+ onClick,}: {country: string;city: string;region: string;className?: string;+ onClick?: (e: React.MouseEvent) => void;}) {const getFullLocation = <T extends { country: string; city: string; region: string }>(session: T) => {let location = "";@@ -45,7 +47,10 @@ export function CountryFlagTooltipIcon({return (<Tooltip><TooltipTrigger asChild>- <div className="flex items-center">+ <div+ className={`flex items-center ${onClick ? "cursor-pointer hover:opacity-70" : ""}`}+ onClick={onClick}+ ><CountryFlag country={country} className={className} /></div></TooltipTrigger>@@ -60,15 +65,20 @@ export function BrowserTooltipIcon({browser,browser_version,size = 16,+ onClick,}: {browser: string;browser_version?: string;size?: number;+ onClick?: (e: React.MouseEvent) => void;}) {return (<Tooltip><TooltipTrigger asChild>- <div className="shrink-0">+ <div+ className={`shrink-0 ${onClick ? "cursor-pointer hover:opacity-70" : ""}`}+ onClick={onClick}+ ><Browser browser={browser || "Unknown"} size={size} /></div></TooltipTrigger>@@ -86,15 +96,20 @@ export function OperatingSystemTooltipIcon({operating_system,operating_system_version,size = 16,+ onClick,}: {operating_system: string;operating_system_version?: string;size?: number;+ onClick?: (e: React.MouseEvent) => void;}) {return (<Tooltip><TooltipTrigger asChild>- <div className="shrink-0">+ <div+ className={`shrink-0 ${onClick ? "cursor-pointer hover:opacity-70" : ""}`}+ onClick={onClick}+ ><OperatingSystem os={operating_system || ""} size={size} /></div></TooltipTrigger>@@ -113,16 +128,21 @@ export function DeviceTypeTooltipIcon({screen_width,screen_height,size = 18,+ onClick,}: {device_type: string;screen_width?: number;screen_height?: number;size?: number;+ onClick?: (e: React.MouseEvent) => void;}) {return (<Tooltip><TooltipTrigger asChild>- <div>+ <div+ className={onClick ? "cursor-pointer hover:opacity-70" : ""}+ onClick={onClick}+ ><DeviceIcon deviceType={device_type || ""} size={size} /></div></TooltipTrigger>