🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor user identification handling across analytics API and compon… (#740)
Bill Yang2b8475336158
diff --git a/client/src/api/analytics/sessionReplay/useGetSessionReplayEvents.ts b/client/src/api/analytics/sessionReplay/useGetSessionReplayEvents.tsindex 8d9f4c914..d69734a1a 100644--- a/client/src/api/analytics/sessionReplay/useGetSessionReplayEvents.ts+++ b/client/src/api/analytics/sessionReplay/useGetSessionReplayEvents.ts@@ -10,6 +10,8 @@ export interface SessionReplayEvent {export interface SessionReplayMetadata {session_id: string;user_id: string;+ identified_user_id: string;+ traits: Record<string, unknown> | null;start_time: Date;end_time?: Date;duration_ms?: number;diff --git a/client/src/api/analytics/sessionReplay/useGetSessionReplays.ts b/client/src/api/analytics/sessionReplay/useGetSessionReplays.tsindex 8668c42ba..9aa6d33a6 100644--- a/client/src/api/analytics/sessionReplay/useGetSessionReplays.ts+++ b/client/src/api/analytics/sessionReplay/useGetSessionReplays.ts@@ -5,6 +5,8 @@ import { authedFetch, getQueryParams } from "../../utils";export interface SessionReplayListItem {session_id: string;user_id: string;+ identified_user_id: string;+ traits: Record<string, unknown> | null;start_time: string;end_time?: string;duration_ms?: number;diff --git a/client/src/api/analytics/useGetMetric.ts b/client/src/api/analytics/useGetMetric.tsindex cbbfa1c44..cbbd2d6dc 100644--- a/client/src/api/analytics/useGetMetric.ts+++ b/client/src/api/analytics/useGetMetric.ts@@ -9,6 +9,7 @@ import {import { useStore } from "../../lib/store";import { APIResponse } from "../types";import { authedFetch, getQueryParams } from "../utils";+import { Time } from "../../components/DateSelector/types";type PeriodTime = "current" | "previous";@@ -90,6 +91,8 @@ export function usePaginatedMetric({useFilters = true,enabled = true,additionalFilters = [],+ customFilters = [],+ customTime,}: {parameter: FilterParameter;limit?: number;@@ -97,19 +100,21 @@ export function usePaginatedMetric({useFilters?: boolean;enabled?: boolean;additionalFilters?: Filter[];+ customFilters?: Filter[];+ customTime?: Time;}): UseQueryResult<PaginatedResponse> {const { time, site, filters } = useStore();const queryParams = {- ...getQueryParams(time),+ ...getQueryParams(customTime ?? time),parameter,limit,page,- filters: useFilters ? [...filters, ...additionalFilters] : undefined,+ filters: useFilters ? (customFilters.length > 0 ? customFilters : [...filters, ...additionalFilters]) : undefined,};return useQuery({- queryKey: [parameter, time, site, filters, limit, page, additionalFilters],+ queryKey: [parameter, customTime, time, site, filters, limit, page, additionalFilters, customFilters],queryFn: async () => {const response = await authedFetch<{ data: PaginatedResponse }>(`/metric/${site}`, queryParams);return response.data;diff --git a/client/src/api/analytics/useGetUserSessions.ts b/client/src/api/analytics/useGetUserSessions.tsindex abe63be6c..c9d1627f2 100644--- a/client/src/api/analytics/useGetUserSessions.ts+++ b/client/src/api/analytics/useGetUserSessions.ts@@ -7,7 +7,9 @@ import { authedFetch, getQueryParams } from "../utils";export type GetSessionsResponse = {session_id: string;- user_id: string;+ user_id: string; // Device fingerprint+ identified_user_id: string; // Custom user ID when identified, empty string otherwise+ traits: Record<string, unknown> | null;country: string;region: string;city: string;@@ -43,7 +45,12 @@ export type GetSessionsResponse = {lon: number;}[];-export function useGetSessions(userId?: string, page: number = 1, limit: number = 100) {+export function useGetSessions(+ userId?: string,+ page: number = 1,+ limit: number = 100,+ identifiedOnly: boolean = false+) {const { time, site } = useStore();// Get the appropriate time parameters using getQueryParams@@ -52,7 +59,7 @@ export function useGetSessions(userId?: string, page: number = 1, limit: numberconst filteredFilters = getFilteredFilters(SESSION_PAGE_FILTERS);return useQuery<APIResponse<GetSessionsResponse>>({- queryKey: ["sessions", time, site, filteredFilters, userId, page, limit],+ queryKey: ["sessions", time, site, filteredFilters, userId, page, limit, identifiedOnly],queryFn: () => {// Use an object for request parameters so we can conditionally add fieldsconst requestParams: Record<string, any> = {@@ -60,6 +67,7 @@ export function useGetSessions(userId?: string, page: number = 1, limit: numberfilters: filteredFilters,page,limit,+ identified_only: identifiedOnly,};// Add userId if provideddiff --git a/client/src/api/analytics/useGetUsers.ts b/client/src/api/analytics/useGetUsers.tsindex 1c5f39bc7..f7858aff8 100644--- a/client/src/api/analytics/useGetUsers.ts+++ b/client/src/api/analytics/useGetUsers.ts@@ -7,7 +7,9 @@ import { APIResponse } from "../types";import { authedFetch, getQueryParams } from "../utils";export type UsersResponse = {- user_id: string;+ user_id: string; // Device fingerprint+ identified_user_id: string; // Custom user ID when identified, empty string otherwise+ traits: Record<string, unknown> | null;country: string;region: string;city: string;@@ -30,6 +32,7 @@ export interface GetUsersOptions {sortBy: string;sortOrder: string;filters?: Filter[];+ identifiedOnly?: boolean;}export function useGetUsers(options: GetUsersOptions) {@@ -37,7 +40,7 @@ export function useGetUsers(options: GetUsersOptions) {// Get the appropriate time parameters using getQueryParamsconst timeParams = getQueryParams(time);- const { page, pageSize, sortBy, sortOrder } = options;+ const { page, pageSize, sortBy, sortOrder, identifiedOnly = false } = options;const filteredFilters = getFilteredFilters(USER_PAGE_FILTERS);return useQuery<@@ -47,7 +50,7 @@ export function useGetUsers(options: GetUsersOptions) {pageSize: number;}>({- queryKey: ["users", site, time, page, pageSize, sortBy, sortOrder, filteredFilters],+ queryKey: ["users", site, time, page, pageSize, sortBy, sortOrder, filteredFilters, identifiedOnly],queryFn: async () => {// Build request parametersconst requestParams: Record<string, any> = {@@ -57,6 +60,7 @@ export function useGetUsers(options: GetUsersOptions) {page_size: pageSize,sort_by: sortBy,sort_order: sortOrder,+ identified_only: identifiedOnly,};// Add time parameters (getQueryParams handles both past-minutes and regular modes)diff --git a/client/src/api/analytics/userGetInfo.ts b/client/src/api/analytics/userGetInfo.tsindex d7660affd..21315fcac 100644--- a/client/src/api/analytics/userGetInfo.ts+++ b/client/src/api/analytics/userGetInfo.ts@@ -1,9 +1,16 @@import { useQuery } from "@tanstack/react-query";import { authedFetch } from "../utils";+export type LinkedDevice = {+ anonymous_id: string;+ created_at: string;+};+export type UserInfo = {duration: number;sessions: number;+ user_id: string; // Device fingerprint+ identified_user_id: string; // Custom user ID when identified, empty string otherwisecountry: string;region: string;city: string;@@ -20,6 +27,8 @@ export type UserInfo = {pageviews: number;events: number;ip?: string;+ traits: Record<string, unknown> | null;+ linked_devices: LinkedDevice[];};export function useUserInfo(siteId: number, userId: string) {diff --git a/client/src/app/[site]/components/shared/StandardSection/StandardSection.tsx b/client/src/app/[site]/components/shared/StandardSection/StandardSection.tsxindex 75d1cfcde..72c6e4845 100644--- a/client/src/app/[site]/components/shared/StandardSection/StandardSection.tsx+++ b/client/src/app/[site]/components/shared/StandardSection/StandardSection.tsx@@ -1,6 +1,6 @@"use client";-import { FilterParameter } from "@rybbit/shared";+import { Filter, FilterParameter } from "@rybbit/shared";import { Info } from "lucide-react";import Link from "next/link";import { ReactNode } from "react";@@ -12,6 +12,7 @@ import { IS_CLOUD } from "../../../../../lib/const";import { Row } from "./Row";import { StandardSkeleton } from "./Skeleton";import { StandardSectionDialog } from "./StandardSectionDialog";+import { Time } from "../../../../../components/DateSelector/types";const MAX_ITEMS_TO_DISPLAY = 10;@@ -28,6 +29,8 @@ export function StandardSection({close,hasSubrow,getSubrowLabel,+ customFilters,+ customTime,}: {title: string;getKey: (item: MetricResponse) => string;@@ -41,11 +44,15 @@ export function StandardSection({close: () => void;hasSubrow?: boolean;getSubrowLabel?: (item: MetricResponse) => ReactNode;+ customFilters?: Filter[];+ customTime?: Time;}) {const { data, isLoading, isFetching, error, refetch } = usePaginatedMetric({parameter: filterParameter,limit: 100,page: 1,+ customFilters,+ customTime,});const itemsForDisplay = data?.data;diff --git a/client/src/app/[site]/replay/components/ReplayBreadcrumbs.tsx b/client/src/app/[site]/replay/components/ReplayBreadcrumbs.tsxindex 7d0c7d036..3920875bb 100644--- a/client/src/app/[site]/replay/components/ReplayBreadcrumbs.tsx+++ b/client/src/app/[site]/replay/components/ReplayBreadcrumbs.tsx@@ -25,15 +25,16 @@ import {Type,} from "lucide-react";import { Duration } from "luxon";+import Link from "next/link";import { useParams } from "next/navigation";import { useMemo } from "react";import { useGetSessionReplayEvents } from "../../../../api/analytics/sessionReplay/useGetSessionReplayEvents";+import { Avatar } from "../../../../components/Avatar";+import { IdentifiedBadge } from "../../../../components/IdentifiedBadge";+import { Button } from "../../../../components/ui/button";import { ScrollArea } from "../../../../components/ui/scroll-area";-import { cn } from "../../../../lib/utils";+import { cn, getUserDisplayName } from "../../../../lib/utils";import { useReplayStore } from "./replayStore";-import { Avatar, generateName } from "../../../../components/Avatar";-import Link from "next/link";-import { Button } from "../../../../components/ui/button";// Event type mapping based on rrweb event typesconst EVENT_TYPE_INFO = {@@ -253,14 +254,21 @@ export function ReplayBreadcrumbs() {handleEventClick(middleEvent.timestamp);};+ // Calculate display name based on identification status+ const isIdentified = !!data.metadata.identified_user_id;+ const userLink = isIdentified+ ? `/${siteId}/user/${data.metadata.identified_user_id}`+ : `/${siteId}/user/${data.metadata.user_id}`;+return (<div className="flex flex-col gap-2"><div className="rounded-lg border border-neutral-100 dark:border-neutral-800 bg-white dark:bg-neutral-900 flex items-center justify-between gap-2 p-2 text-xs text-neutral-900 dark:text-neutral-200"><div className="flex items-center gap-2"><Avatar id={data.metadata.user_id} size={20} />- {generateName(data.metadata.user_id)}+ <span className="truncate max-w-[120px]">{getUserDisplayName(data.metadata)}</span>+ {isIdentified && <IdentifiedBadge traits={data.metadata.traits} />}</div>- <Link href={`/${siteId}/user/${data.metadata.user_id}`} className="flex items-center gap-2">+ <Link href={userLink} className="flex items-center gap-2"><Button size="sm">View User</Button></Link></div>diff --git a/client/src/app/[site]/replay/components/ReplayCard.tsx b/client/src/app/[site]/replay/components/ReplayCard.tsxindex dddee943e..0b35657bb 100644--- a/client/src/app/[site]/replay/components/ReplayCard.tsx+++ b/client/src/app/[site]/replay/components/ReplayCard.tsx@@ -1,16 +1,15 @@import { Clock, MousePointerClick, Trash2 } from "lucide-react";import { DateTime } from "luxon";-import Link from "next/link";import { useState } from "react";+import { useDeleteSessionReplay } from "../../../../api/analytics/sessionReplay/useDeleteSessionReplay";+import { Avatar } from "../../../../components/Avatar";+import { IdentifiedBadge } from "../../../../components/IdentifiedBadge";import {BrowserTooltipIcon,CountryFlagTooltipIcon,DeviceTypeTooltipIcon,OperatingSystemTooltipIcon,} from "../../../../components/TooltipIcons/TooltipIcons";-import { Badge } from "../../../../components/ui/badge";-import { Skeleton } from "../../../../components/ui/skeleton";-import { Button } from "../../../../components/ui/button";import {AlertDialog,AlertDialogAction,@@ -22,13 +21,17 @@ import {AlertDialogTitle,AlertDialogTrigger,} from "../../../../components/ui/alert-dialog";-import { cn, formatter } from "../../../../lib/utils";+import { Badge } from "../../../../components/ui/badge";+import { Button } from "../../../../components/ui/button";+import { Skeleton } from "../../../../components/ui/skeleton";+import { cn, formatter, getUserDisplayName } from "../../../../lib/utils";import { useReplayStore } from "./replayStore";-import { useDeleteSessionReplay } from "../../../../api/analytics/sessionReplay/useDeleteSessionReplay";interface SessionReplayListItem {session_id: string;user_id: string;+ identified_user_id: string;+ traits: Record<string, unknown> | null;start_time: string;end_time?: string;duration_ms?: number;@@ -87,10 +90,16 @@ export function ReplayCard({ replay }: { replay: SessionReplayListItem }) {setSessionId(replay.session_id);}}>+ {/* User info row */}+ <div className="flex items-center gap-1.5 mb-1.5">+ <Avatar size={16} id={replay.user_id} />+ <span className="text-xs text-neutral-700 dark:text-neutral-200 truncate max-w-[100px]">+ {getUserDisplayName(replay)}+ </span>+ {replay.identified_user_id && <IdentifiedBadge traits={replay.traits} />}+ </div>+<div className="flex items-center gap-2 mb-1">- {/* <div className="text-xs text-neutral-500">- {replay.user_id.slice(0, 12)}...- </div> */}<div className="text-xs text-neutral-600 dark:text-neutral-400">{startTime.toRelative()}</div>{duration && (<div className="flex items-center gap-1 text-neutral-600 dark:text-neutral-400 text-xs">diff --git a/client/src/app/[site]/sessions/page.tsx b/client/src/app/[site]/sessions/page.tsxindex b31f25a9b..3409de094 100644--- a/client/src/app/[site]/sessions/page.tsx+++ b/client/src/app/[site]/sessions/page.tsx@@ -1,20 +1,21 @@"use client";+import { SessionsList } from "@/components/Sessions/SessionsList";import { useState } from "react";import { useGetSessions } from "../../../api/analytics/useGetUserSessions";import { DisabledOverlay } from "../../../components/DisabledOverlay";import { useSetPageTitle } from "../../../hooks/useSetPageTitle";import { SESSION_PAGE_FILTERS } from "../../../lib/filterGroups";import { SubHeader } from "../components/SubHeader/SubHeader";-import { SessionsList } from "@/components/Sessions/SessionsList";const LIMIT = 100;export default function SessionsPage() {useSetPageTitle("Rybbit · Sessions");const [page, setPage] = useState(1);+ const [identifiedOnly, setIdentifiedOnly] = useState(false);- const { data, isLoading } = useGetSessions(undefined, page, LIMIT + 1);+ const { data, isLoading } = useGetSessions(undefined, page, LIMIT + 1, identifiedOnly);const allSessions = data?.data || [];const hasNextPage = allSessions.length > LIMIT;const sessions = allSessions.slice(0, LIMIT);@@ -31,6 +32,8 @@ export default function SessionsPage() {onPageChange={setPage}hasNextPage={hasNextPage}hasPrevPage={hasPrevPage}+ setIdentifiedOnly={setIdentifiedOnly}+ identifiedOnly={identifiedOnly}/></div></DisabledOverlay>diff --git a/client/src/app/[site]/user/[userId]/components/Calendar.tsx b/client/src/app/[site]/user/[userId]/components/Calendar.tsxindex 06c27a510..58e35574e 100644--- a/client/src/app/[site]/user/[userId]/components/Calendar.tsx+++ b/client/src/app/[site]/user/[userId]/components/Calendar.tsx@@ -1,9 +1,10 @@-import { ResponsiveCalendar } from "@nivo/calendar";+import { ResponsiveTimeRange } from "@nivo/calendar";import _ from "lodash";import { DateTime } from "luxon";import { useTheme } from "next-themes";import { UserSessionCountResponse } from "../../../../../api/analytics/useGetUserSessions";import { useNivoTheme } from "../../../../../lib/nivo";+import { ChartTooltip } from "../../../../../components/charts/ChartTooltip";export const VisitCalendar = ({ sessionCount }: { sessionCount: UserSessionCountResponse[] }) => {const { resolvedTheme } = useTheme();@@ -11,7 +12,7 @@ export const VisitCalendar = ({ sessionCount }: { sessionCount: UserSessionCountconst data = sessionCount.map(e => ({value: e.sessions,- day: DateTime.fromSQL(e.date ?? 0)+ day: DateTime.fromSQL(e.date ?? 0, { zone: "utc" }).toLocal().toFormat("y-LL-dd"),}))@@ -23,32 +24,33 @@ export const VisitCalendar = ({ sessionCount }: { sessionCount: UserSessionCountreturn null;}- const numYears = DateTime.fromISO(data[0].day ?? "").year - DateTime.fromISO(data.at(-1)?.day ?? "").year + 1;+ const toDate = DateTime.now().toFormat("y-LL-dd");+ const fromDate = DateTime.now().minus({ days: 120 }).toFormat("y-LL-dd");return (- <div style={{ width: "100%", overflowX: "auto", height: "150px" }}>- <div style={{ minWidth: "600px", height: "100%" }}>- <ResponsiveCalendar- data={data}- theme={nivoTheme}- from={data.at(-1)?.day ?? ""}- to={data[0]?.day}- emptyColor={resolvedTheme === "dark" ? "hsl(var(--neutral-750))" : "hsl(var(--neutral-100))"}- colors={["#10452A", "#006D32", "#3E9058", "#3CD456"]}- margin={{ top: 20, right: 0, bottom: 1, left: 20 }}- monthBorderColor="rgba(0, 0, 0, 0)"- daySpacing={3}- dayBorderColor="rgba(0, 0, 0, 0)"- maxValue={maxValue}- tooltip={({ value, day }) => {- return (- <div className="bg-neutral-150 dark:bg-neutral-900 p-2 rounded-md border border-neutral-300 dark:border-neutral-800 text-sm">- {value} <span className="text-neutral-600 dark:text-neutral-300">session{Number(value) > 1 && "s"} on</span> {day}- </div>- );- }}- />- </div>- </div>+ <ResponsiveTimeRange+ data={data}+ theme={nivoTheme}+ from={fromDate}+ to={toDate}+ emptyColor={resolvedTheme === "dark" ? "hsl(var(--neutral-750))" : "hsl(var(--neutral-100))"}+ colors={["#10452A", "#006D32", "#3E9058", "#3CD456"]}+ margin={{ top: 20, right: 0, bottom: 0, left: 0 }}+ dayBorderWidth={2}+ daySpacing={3}+ dayBorderColor="rgba(0, 0, 0, 0)"+ dayRadius={3}+ weekdayTicks={[]}+ weekdayLegendOffset={0}+ maxValue={maxValue}+ tooltip={({ value, day }) => {+ return (+ <ChartTooltip className="p-2 flex gap-1">+ {value}+ <span className="text-neutral-600 dark:text-neutral-300">session{Number(value) > 1 && "s"} on</span> {day}+ </ChartTooltip>+ );+ }}+ />);};diff --git a/client/src/app/[site]/user/[userId]/components/UserSidebar.tsx b/client/src/app/[site]/user/[userId]/components/UserSidebar.tsxnew file mode 100644index 000000000..b571df95e--- /dev/null+++ b/client/src/app/[site]/user/[userId]/components/UserSidebar.tsx@@ -0,0 +1,307 @@+"use client";++import { Calendar, CalendarCheck, Clock, Files, Globe, Laptop, Monitor, Smartphone, Tablet } from "lucide-react";+import { DateTime } from "luxon";+import { Avatar, generateName } from "../../../../../components/Avatar";+import { Badge } from "../../../../../components/ui/badge";+import { Skeleton } from "../../../../../components/ui/skeleton";+import { IdentifiedBadge } from "../../../../../components/IdentifiedBadge";+import { formatDuration } from "../../../../../lib/dateTimeUtils";+import { getCountryName, getLanguageName } from "../../../../../lib/utils";+import { Browser } from "../../../components/shared/icons/Browser";+import { CountryFlag } from "../../../components/shared/icons/CountryFlag";+import { OperatingSystem } from "../../../components/shared/icons/OperatingSystem";+import { VisitCalendar } from "./Calendar";+import { EventIcon, PageviewIcon } from "../../../../../components/EventIcons";+import { UserInfo } from "../../../../../api/analytics/userGetInfo";+import { UserSessionCountResponse } from "../../../../../api/analytics/useGetUserSessions";++interface UserSidebarProps {+ data: UserInfo | undefined;+ isLoading: boolean;+ sessionCount: UserSessionCountResponse[];+ getRegionName: (region: string) => string;+}++// Reusable card wrapper for sidebar sections+function SidebarCard({ children, className = "" }: { children: React.ReactNode; className?: string }) {+ return (+ <div+ className={`bg-white dark:bg-neutral-900 rounded-lg border border-neutral-100 dark:border-neutral-850 p-4 ${className}`}+ >+ {children}+ </div>+ );+}++// Info row component for consistent styling+function InfoRow({ icon, label, value }: { icon?: React.ReactNode; label: string; value: React.ReactNode }) {+ return (+ <div className="flex items-center justify-between py-1.5 border-b border-neutral-50 dark:border-neutral-850 last:border-0 text-xs">+ <span className="text-neutral-500 dark:text-neutral-400">{label}</span>+ <span className="text-neutral-700 dark:text-neutral-200 flex items-center gap-1.5">+ {icon}+ {value}+ </span>+ </div>+ );+}++// Stat card component+function StatCard({+ icon,+ label,+ value,+ isLoading,+}: {+ icon: React.ReactNode;+ label: string;+ value: React.ReactNode;+ isLoading: boolean;+}) {+ if (isLoading) {+ return (+ <div className="flex flex-col gap-0.5">+ <div className="text-[10px] text-neutral-500 dark:text-neutral-400 flex items-center gap-1 uppercase tracking-wide">+ <Skeleton className="w-3 h-3 rounded" />+ <Skeleton className="h-2.5 w-14 rounded" />+ </div>+ <Skeleton className="h-4 w-16 rounded" />+ </div>+ );+ }+ return (+ <div className="flex flex-col gap-0.5">+ <div className="text-[10px] text-neutral-500 dark:text-neutral-400 flex items-center gap-1 uppercase tracking-wide">+ {icon}+ {label}+ </div>+ <div className="text-sm">{value}</div>+ </div>+ );+}++export function UserSidebar({ data, isLoading, sessionCount, getRegionName }: UserSidebarProps) {+ const isIdentified = !!data?.identified_user_id;++ // Filter custom traits (exclude username, name, email)+ const customTraits = data?.traits+ ? Object.entries(data.traits).filter(([key]) => !["username", "name", "email"].includes(key))+ : [];++ return (+ <div className="w-full lg:w-[300px] md:shrink-0 space-y-3">+ {/* Stats Grid */}+ <SidebarCard>+ <div className="grid grid-cols-2 gap-4">+ <StatCard+ icon={<Files className="w-3 h-3" />}+ label="Sessions"+ value={data?.sessions ?? "—"}+ isLoading={isLoading}+ />+ <StatCard+ icon={<PageviewIcon className="w-3 h-3" />}+ label="Pageviews"+ value={data?.pageviews ?? "—"}+ isLoading={isLoading}+ />+ <StatCard+ icon={<EventIcon className="w-3 h-3" />}+ label="Events"+ value={data?.events ?? "—"}+ isLoading={isLoading}+ />+ <StatCard+ icon={<Clock className="w-3 h-3" />}+ label="Avg Duration"+ value={data?.duration ? formatDuration(data.duration) : "—"}+ isLoading={isLoading}+ />+ <StatCard+ icon={<Calendar className="w-3 h-3" />}+ label="First Seen"+ value={+ data?.first_seen+ ? DateTime.fromSQL(data.first_seen, { zone: "utc" }).toLocal().toLocaleString(DateTime.DATE_MED)+ : "—"+ }+ isLoading={isLoading}+ />+ <StatCard+ icon={<CalendarCheck className="w-3 h-3" />}+ label="Last Seen"+ value={+ data?.last_seen+ ? DateTime.fromSQL(data.last_seen, { zone: "utc" }).toLocal().toLocaleString(DateTime.DATE_MED)+ : "—"+ }+ isLoading={isLoading}+ />+ </div>+ </SidebarCard>++ {/* Location & Device Info */}+ <SidebarCard>+ <h3 className="text-xs font-medium text-neutral-500 dark:text-neutral-400 uppercase tracking-wide mb-2">+ Location & Device+ </h3>+ {isLoading ? (+ <div className="space-y-0">+ {/* Country */}+ <div className="flex items-center justify-between py-1.5 border-b border-neutral-50 dark:border-neutral-850">+ <Skeleton className="h-3 w-14 rounded" />+ <div className="flex items-center gap-1.5">+ <Skeleton className="w-4 h-4 rounded" />+ <Skeleton className="h-3 w-24 rounded" />+ </div>+ </div>+ {/* Region */}+ <div className="flex items-center justify-between py-1.5 border-b border-neutral-50 dark:border-neutral-850">+ <Skeleton className="h-3 w-12 rounded" />+ <Skeleton className="h-3 w-32 rounded" />+ </div>+ {/* Language */}+ <div className="flex items-center justify-between py-1.5 border-b border-neutral-50 dark:border-neutral-850">+ <Skeleton className="h-3 w-16 rounded" />+ <Skeleton className="h-3 w-20 rounded" />+ </div>+ {/* Device */}+ <div className="flex items-center justify-between py-1.5 border-b border-neutral-50 dark:border-neutral-850">+ <Skeleton className="h-3 w-12 rounded" />+ <div className="flex items-center gap-1.5">+ <Skeleton className="w-4 h-4 rounded" />+ <Skeleton className="h-3 w-14 rounded" />+ </div>+ </div>+ {/* Browser */}+ <div className="flex items-center justify-between py-1.5 border-b border-neutral-50 dark:border-neutral-850">+ <Skeleton className="h-3 w-14 rounded" />+ <div className="flex items-center gap-1.5">+ <Skeleton className="w-4 h-4 rounded" />+ <Skeleton className="h-3 w-20 rounded" />+ </div>+ </div>+ {/* OS */}+ <div className="flex items-center justify-between py-1.5 border-b border-neutral-50 dark:border-neutral-850">+ <Skeleton className="h-3 w-8 rounded" />+ <div className="flex items-center gap-1.5">+ <Skeleton className="w-4 h-4 rounded" />+ <Skeleton className="h-3 w-24 rounded" />+ </div>+ </div>+ {/* Screen */}+ <div className="flex items-center justify-between py-1.5">+ <Skeleton className="h-3 w-12 rounded" />+ <Skeleton className="h-3 w-16 rounded" />+ </div>+ </div>+ ) : (+ <div>+ <InfoRow+ icon={<CountryFlag country={data?.country || ""} className="w-4 h-4" />}+ label="Country"+ value={data?.country ? getCountryName(data.country) : "—"}+ />+ <InfoRow+ label="Region"+ value={+ <span className="truncate max-w-[160px] inline-block">+ {data?.region ? getRegionName(data.region) : "—"}+ {data?.city && `, ${data.city}`}+ </span>+ }+ />+ <InfoRow label="Language" value={data?.language ? getLanguageName(data.language) : "—"} />+ <InfoRow+ icon={+ data?.device_type === "Desktop" ? (+ <Monitor className="w-4 h-4" />+ ) : data?.device_type === "Mobile" ? (+ <Smartphone className="w-4 h-4" />+ ) : data?.device_type === "Tablet" ? (+ <Tablet className="w-4 h-4" />+ ) : null+ }+ label="Device"+ value={data?.device_type ?? "—"}+ />+ <InfoRow+ icon={<Browser browser={data?.browser || "Unknown"} size={13} />}+ label="Browser"+ value={data?.browser ? `${data.browser}${data.browser_version ? ` v${data.browser_version}` : ""}` : "—"}+ />+ <InfoRow+ icon={<OperatingSystem os={data?.operating_system || ""} size={13} />}+ label="OS"+ value={+ data?.operating_system+ ? `${data.operating_system}${data.operating_system_version ? ` v${data.operating_system_version}` : ""}`+ : "—"+ }+ />+ <InfoRow+ label="Screen"+ value={data?.screen_width && data?.screen_height ? `${data.screen_width}×${data.screen_height}` : "—"}+ />+ </div>+ )}+ </SidebarCard>++ {/* Activity Calendar */}+ <SidebarCard className="h-[180px]">+ <h3 className="text-xs font-medium text-neutral-500 dark:text-neutral-400 uppercase tracking-wide mb-2">+ Activity Calendar+ </h3>+ <div className="h-[140px]">+ <VisitCalendar sessionCount={sessionCount} />+ </div>+ </SidebarCard>++ {/* User Traits (identified users only) */}+ {isIdentified && customTraits.length > 0 && (+ <SidebarCard>+ <h3 className="text-xs font-medium text-neutral-500 dark:text-neutral-400 uppercase tracking-wide mb-2">+ User Traits+ </h3>+ <div className="space-y-1">+ {customTraits.map(([key, value]) => (+ <div+ key={key}+ className="flex items-center justify-between py-1 border-b border-neutral-50 dark:border-neutral-850 last:border-0 text-xs"+ >+ <span className="text-neutral-500 dark:text-neutral-400 capitalize">{key.replace(/_/g, " ")}</span>+ <span className="text-neutral-700 dark:text-neutral-200 truncate max-w-[160px]">{String(value)}</span>+ </div>+ ))}+ </div>+ </SidebarCard>+ )}++ {/* Linked Devices (identified users only) */}+ {/* {isIdentified && data?.linked_devices && data.linked_devices.length > 0 && (+ <SidebarCard>+ <h3 className="text-xs font-medium text-neutral-500 dark:text-neutral-400 uppercase tracking-wide mb-2 flex items-center gap-1.5">+ <Laptop className="w-3 h-3" />+ Linked Devices ({data.linked_devices.length})+ </h3>+ <div className="space-y-1 max-h-32 overflow-y-auto">+ {data.linked_devices.map(device => (+ <div+ key={device.anonymous_id}+ className="flex items-center justify-between py-1 border-b border-neutral-50 dark:border-neutral-850 last:border-0"+ >+ <span className="text-neutral-600 dark:text-neutral-300 font-mono text-xs truncate max-w-[140px]">+ {device.anonymous_id}+ </span>+ <span className="text-neutral-400 dark:text-neutral-500 text-xs">+ {DateTime.fromISO(device.created_at).toRelative()}+ </span>+ </div>+ ))}+ </div>+ </SidebarCard>+ )} */}+ </div>+ );+}diff --git a/client/src/app/[site]/user/[userId]/components/UserTopPages.tsx b/client/src/app/[site]/user/[userId]/components/UserTopPages.tsxnew file mode 100644index 000000000..24fe89aa9--- /dev/null+++ b/client/src/app/[site]/user/[userId]/components/UserTopPages.tsx@@ -0,0 +1,68 @@+import { useParams } from "next/navigation";+import { useState } from "react";+import { useGetSite } from "../../../../../api/admin/sites";+import { TabsContent, TabsList, TabsTrigger } from "../../../../../components/ui/basic-tabs";+import { Card, CardContent } from "../../../../../components/ui/card";+import { Tabs } from "../../../../../components/ui/tabs";+import { truncateString } from "../../../../../lib/utils";+import { StandardSection } from "../../../components/shared/StandardSection/StandardSection";++type Tab = "pages" | "events";++export function UserTopPages() {+ const { userId } = useParams();+ const [tab, setTab] = useState<Tab>("pages");++ const { data: siteMetadata } = useGetSite();++ return (+ <Card>+ <CardContent className="mt-2">+ <Tabs defaultValue="pages" value={tab} onValueChange={value => setTab(value as Tab)}>+ <div className="flex flex-row gap-2 items-center">+ <TabsList>+ <TabsTrigger value="pages">Top Pages</TabsTrigger>+ </TabsList>+ {/* <TabsList>+ <TabsTrigger value="events">Events</TabsTrigger>+ </TabsList> */}+ </div>+ <TabsContent value="pages">+ <StandardSection+ filterParameter="pathname"+ title="Pages"+ getValue={e => e.value}+ getKey={e => e.value}+ getLabel={e => truncateString(e.value, 50) || "Other"}+ getLink={e => `https://${siteMetadata?.domain}${e.value}`}+ expanded={false}+ close={close}+ customFilters={[{ parameter: "user_id", value: [userId as string], type: "equals" }]}+ customTime={{+ mode: "all-time",+ wellKnown: "all-time",+ }}+ />+ </TabsContent>+ <TabsContent value="events">+ <StandardSection+ filterParameter="pathname"+ title="Pages"+ getValue={e => e.value}+ getKey={e => e.value}+ getLabel={e => truncateString(e.value, 50) || "Other"}+ getLink={e => `https://${siteMetadata?.domain}${e.value}`}+ expanded={false}+ close={close}+ customFilters={[{ parameter: "user_id", value: [userId as string], type: "equals" }]}+ customTime={{+ mode: "all-time",+ wellKnown: "all-time",+ }}+ />+ </TabsContent>+ </Tabs>+ </CardContent>+ </Card>+ );+}diff --git a/client/src/app/[site]/user/[userId]/page.tsx b/client/src/app/[site]/user/[userId]/page.tsxindex 3abd172d4..c5b160832 100644--- a/client/src/app/[site]/user/[userId]/page.tsx+++ b/client/src/app/[site]/user/[userId]/page.tsx@@ -1,53 +1,41 @@"use client";import { SessionsList } from "@/components/Sessions/SessionsList";-import {- ArrowLeft,- Calendar,- CalendarCheck,- Clock,- Eye,- Files,- Monitor,- MousePointerClick,- Smartphone,- Tablet,-} from "lucide-react";-import { DateTime } from "luxon";-import { useParams, useRouter } from "next/navigation";+import Link from "next/link";+import { useParams } from "next/navigation";import { useState } from "react";import { useUserInfo } from "../../../../api/analytics/userGetInfo";import { useGetSessions, useGetUserSessionCount } from "../../../../api/analytics/useGetUserSessions";-import { Avatar, generateName } from "../../../../components/Avatar";-import { Badge } from "../../../../components/ui/badge";-import { Button } from "../../../../components/ui/button";-import { Skeleton } from "../../../../components/ui/skeleton";+import {+ Breadcrumb,+ BreadcrumbItem,+ BreadcrumbLink,+ BreadcrumbList,+ BreadcrumbPage,+ BreadcrumbSeparator,+} from "../../../../components/ui/breadcrumb";import { useSetPageTitle } from "../../../../hooks/useSetPageTitle";-import { formatDuration } from "../../../../lib/dateTimeUtils";import { useGetRegionName } from "../../../../lib/geo";-import { getCountryName, getLanguageName } from "../../../../lib/utils";-import { Browser } from "../../components/shared/icons/Browser";-import { CountryFlag } from "../../components/shared/icons/CountryFlag";-import { OperatingSystem } from "../../components/shared/icons/OperatingSystem";import { MobileSidebar } from "../../components/Sidebar/MobileSidebar";-import { VisitCalendar } from "./components/Calendar";-import { EventIcon, PageviewIcon } from "../../../../components/EventIcons";+import { UserSidebar } from "./components/UserSidebar";+import { Skeleton } from "../../../../components/ui/skeleton";+import { Avatar, generateName } from "../../../../components/Avatar";+import { Badge } from "../../../../components/ui/badge";+import { IdentifiedBadge } from "../../../../components/IdentifiedBadge";+import { UserTopPages } from "./components/UserTopPages";const LIMIT = 25;export default function UserPage() {useSetPageTitle("Rybbit · User");- const router = useRouter();- const { userId } = useParams();- const { site } = useParams();+ const { userId, site } = useParams();const [page, setPage] = useState(1);const { data, isLoading } = useUserInfo(Number(site), userId as string);-const { data: sessionCount } = useGetUserSessionCount(userId as string);-const { data: sessionsData, isLoading: isLoadingSessions } = useGetSessions(userId as string, page, LIMIT + 1);+const allSessions = sessionsData?.data || [];const hasNextPage = allSessions.length > LIMIT;const sessions = allSessions.slice(0, LIMIT);@@ -55,193 +43,85 @@ export default function UserPage() {const { getRegionName } = useGetRegionName();- const handleBackClick = () => {- router.push(`/${site}/users`);- };-- const name = generateName(userId as string);+ const traitsUsername = data?.traits?.username as string | undefined;+ const traitsName = data?.traits?.name as string | undefined;+ const traitsEmail = data?.traits?.email as string | undefined;+ const isIdentified = !!data?.identified_user_id;+ const displayName =+ traitsUsername || traitsName || (isIdentified ? (userId as string) : generateName(userId as string));return (- <div className="p-2 md:p-4 max-w-[1300px] mx-auto space-y-3">- <MobileSidebar />- <Button onClick={handleBackClick} className="w-max" variant="ghost">- <ArrowLeft className="h-4 w-4" />- Back to Users- </Button>- <div className="mb-4">- <h1 className="mb-4 flex items-center justify-between">- <div className="flex items-center gap-4">- <Avatar size={48} id={userId as string} />- <div>- <div className="text-lg font-bold">{name}</div>- <span className="text-neutral-600 dark:text-neutral-300 text-sm">ID: {userId}</span>+ <div className="p-2 md:p-4 max-w-[1200px] mx-auto">+ {/* Header */}+ <div className="flex items-center gap-2 mb-4">+ <MobileSidebar />+ <Breadcrumb>+ <BreadcrumbList>+ <BreadcrumbItem>+ <BreadcrumbLink asChild>+ <Link href={`/${site}/users`}>Users</Link>+ </BreadcrumbLink>+ </BreadcrumbItem>+ <BreadcrumbSeparator />+ <BreadcrumbItem>+ <BreadcrumbPage>{isLoading ? "Loading..." : displayName}</BreadcrumbPage>+ </BreadcrumbItem>+ </BreadcrumbList>+ </Breadcrumb>+ </div>++ <div className="flex items-center gap-4 mb-4">+ <Avatar size={64} id={userId as string} />+ <div className="mt-3 w-full flex gap-2">+ <div>+ <div className="font-semibold text-lg flex items-center gap-2">+ {isLoading ? <Skeleton className="h-6 w-32" /> : displayName}+ {!isLoading && isIdentified && <IdentifiedBadge traits={data?.traits} />}</div>+ {isLoading ? (+ <div className="flex flex-col items-center gap-1 mt-1">+ <Skeleton className="h-4 w-40" />+ <Skeleton className="h-3 w-24" />+ </div>+ ) : (+ <>+ {traitsEmail && <p className="text-neutral-500 dark:text-neutral-400 text-sm mt-0.5">{traitsEmail}</p>}+ <p className="text-neutral-400 dark:text-neutral-500 text-xs font-mono mt-1 truncate">{userId}</p>+ </>+ )}</div>{data?.ip && (- <Badge variant="outline" className="flex gap-1 text-neutral-600 dark:text-neutral-300">- IP: <span className="text-neutral-900 dark:text-neutral-100">{data?.ip}</span>+ <Badge variant="outline" className="mt-3 text-xs">+ IP: {data.ip}</Badge>)}- </h1>- <div className="bg-white dark:bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-100 dark:border-neutral-750 text-sm mb-3">- {isLoading ? (- // Skeleton loading state for user info- <div className="grid grid-cols-1 md:grid-cols-2 gap-2">- <div className="grid grid-cols-[100px_auto] gap-2">- {Array.from({ length: 4 }).map((_, index) => (- <>- <Skeleton key={`label-${index}`} className="h-4 w-16" />- <Skeleton key={`value-${index}`} className="h-4 w-24" />- </>- ))}- </div>- <div className="grid grid-cols-[110px_1fr] gap-2">- {Array.from({ length: 4 }).map((_, index) => (- <>- <Skeleton key={`label2-${index}`} className="h-4 w-20" />- <Skeleton key={`value2-${index}`} className="h-4 w-32" />- </>- ))}- </div>- </div>- ) : (- // Actual user info data- <div className="grid grid-cols-1 md:grid-cols-2 gap-2">- <div className="grid grid-cols-[100px_auto] gap-2">- {/* <span className=" text-neutral-100">User ID:</span>- <CopyText- text={userId as string}- maxLength={24}- className="inline-flex text-neutral-300"- /> */}- <span className="text-neutral-900 dark:text-neutral-100">Country:</span>- <div className="text-neutral-600 dark:text-neutral-300 flex gap-1 items-center">- <CountryFlag country={data?.country || ""} />- {data?.country ? getCountryName(data.country) : "N/A"}- </div>- <span className=" text-neutral-900 dark:text-neutral-100">Region:</span>- <div className="text-neutral-600 dark:text-neutral-300">{data?.region ? getRegionName(data.region) : "N/A"}</div>- <span className=" text-neutral-900 dark:text-neutral-100">City:</span>- <div className="text-neutral-600 dark:text-neutral-300">{data?.city ?? "N/A"}</div>- <span className=" text-neutral-900 dark:text-neutral-100">Language:</span>- <div className="text-neutral-600 dark:text-neutral-300">{data?.language ? getLanguageName(data.language) : "N/A"}</div>- </div>- <div className="grid grid-cols-[110px_1fr] gap-2">- <span className=" text-neutral-900 dark:text-neutral-100">Device Type:</span>- <div className="text-neutral-600 dark:text-neutral-300 flex gap-1 items-center">- {data?.device_type === "Desktop" && <Monitor className="w-4 h-4" />}- {data?.device_type === "Mobile" && <Smartphone className="w-4 h-4" />}- {data?.device_type === "Tablet" && <Tablet className="w-4 h-4" />}- {data?.device_type}- </div>- <span className=" text-neutral-900 dark:text-neutral-100">Browser:</span>- <div className="flex gap-1 text-neutral-600 dark:text-neutral-300 items-center">- <Browser browser={data?.browser || "Unknown"} />- {data?.browser}- {data?.browser_version && <span className="ml-1">v{data?.browser_version}</span>}- </div>- <span className="text-neutral-900 dark:text-neutral-100">OS:</span>- <div className="flex gap-1 text-neutral-600 dark:text-neutral-300 items-center">- <OperatingSystem os={data?.operating_system || ""} />- {data?.operating_system}- {data?.operating_system_version && <span className="ml-1">v{data?.operating_system_version}</span>}- </div>- <span className="text-neutral-900 dark:text-neutral-100">Screen:</span>- <div className="flex gap-1 text-neutral-600 dark:text-neutral-300">- {data?.screen_width} x {data?.screen_height}- </div>- </div>- </div>- )}- </div>- <div className="grid grid-cols-2 sm:grid-cols-3 lg:grid-cols-6 gap-3 justify-between">- {isLoading ? (- // Skeleton loading state- <>- {Array.from({ length: 6 }).map((_, index) => (- <div- key={index}- className="bg-white dark:bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-100 dark:border-neutral-750 flex-grow"- >- <div className="text-xs text-neutral-500 dark:text-neutral-400 flex items-center gap-1">- <Skeleton className="w-4 h-4" />- <Skeleton className="h-3 w-20" />- </div>- <Skeleton className="h-5 w-16" />- </div>- ))}- </>- ) : (- // Actual data- <>- <div className="bg-white dark:bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-100 dark:border-neutral-750 flex-grow">- <div className="text-xs text-neutral-500 dark:text-neutral-400 flex items-center gap-1">- <Clock className="w-4 h-4" />- Avg. Session Duration- </div>- <div className="font-semibold">{data?.duration ? formatDuration(data.duration) : "N/A"}</div>- </div>- <div className="bg-white dark:bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-100 dark:border-neutral-800 flex-grow">- <div className="text-xs text-neutral-500 dark:text-neutral-400 flex items-center gap-1">- <Files className="w-4 h-4" />- Sessions- </div>- <div className="font-semibold">{data?.sessions}</div>- </div>- <div className="bg-white dark:bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-100 dark:border-neutral-800 flex-grow">- <div className="text-xs text-neutral-500 dark:text-neutral-400 flex items-center gap-1">- <PageviewIcon />- Pageviews- </div>- <div className="font-semibold">{data?.pageviews}</div>- </div>- <div className="bg-white dark:bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-100 dark:border-neutral-800 flex-grow">- <div className="text-xs text-neutral-500 dark:text-neutral-400 flex items-center gap-1">- <EventIcon />- Events- </div>- <div className="font-semibold">{data?.events}</div>- </div>- <div className="bg-white dark:bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-100 dark:border-neutral-800 flex-grow">- <div className="text-xs text-neutral-500 dark:text-neutral-400 flex items-center gap-1">- <Calendar className="w-4 h-4" />- First Seen- </div>- <div className="font-semibold">- {DateTime.fromSQL(data?.first_seen ?? "", { zone: "utc" })- .toLocal()- .toLocaleString(DateTime.DATETIME_SHORT)}- </div>- </div>- <div className="bg-white dark:bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-100 dark:border-neutral-800 flex-grow">- <div className="text-xs text-neutral-500 dark:text-neutral-400 flex items-center gap-1">- <CalendarCheck className="w-4 h-4" />- Last Seen- </div>- <div className="font-semibold">- {DateTime.fromSQL(data?.last_seen ?? "", { zone: "utc" })- .toLocal()- .toLocaleString(DateTime.DATETIME_SHORT)}- </div>- </div>- </>- )}</div></div>- <div className="bg-white dark:bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-100 dark:border-neutral-800 h-[150px]">- <VisitCalendar sessionCount={sessionCount?.data ?? []} />- </div>- <h2 className="text-lg font-bold mb-4">Sessions</h2>- <SessionsList- sessions={sessions}- isLoading={isLoadingSessions}- page={page}- onPageChange={setPage}- hasNextPage={hasNextPage}- hasPrevPage={hasPrevPage}- userId={userId as string}- />+ {/* Main two-column layout */}+ <div className="flex flex-col lg:flex-row gap-4">+ {/* Left Sidebar */}+ <UserSidebar+ data={data}+ isLoading={isLoading}+ sessionCount={sessionCount?.data ?? []}+ getRegionName={getRegionName}+ />++ {/* Right Content - Sessions */}+ <div className="flex-1 min-w-0 space-y-4">+ <UserTopPages />+ <SessionsList+ sessions={sessions}+ isLoading={isLoadingSessions}+ page={page}+ onPageChange={setPage}+ hasNextPage={hasNextPage}+ hasPrevPage={hasPrevPage}+ userId={userId as string}+ />+ </div>+ </div></div>);}diff --git a/client/src/app/[site]/users/page.tsx b/client/src/app/[site]/users/page.tsxindex 051d8a182..e380948d0 100644--- a/client/src/app/[site]/users/page.tsx+++ b/client/src/app/[site]/users/page.tsx@@ -15,21 +15,24 @@ import Link from "next/link";import { useParams } from "next/navigation";import { useState } from "react";import { useGetUsers, UsersResponse } from "../../../api/analytics/useGetUsers";-import { Avatar, generateName } from "../../../components/Avatar";+import { Avatar } from "../../../components/Avatar";import { extractDomain, getChannelIcon, getDisplayName } from "../../../components/Channel";import { DisabledOverlay } from "../../../components/DisabledOverlay";+import { ErrorState } from "../../../components/ErrorState";import { Favicon } from "../../../components/Favicon";+import { IdentifiedBadge } from "../../../components/IdentifiedBadge";import { Pagination } from "../../../components/pagination";import { Button } from "../../../components/ui/button";+import { Label } from "../../../components/ui/label";+import { Switch } from "../../../components/ui/switch";import { Tooltip, TooltipContent, TooltipTrigger } from "../../../components/ui/tooltip";import { useSetPageTitle } from "../../../hooks/useSetPageTitle";import { USER_PAGE_FILTERS } from "../../../lib/filterGroups";-import { getCountryName } from "../../../lib/utils";+import { getCountryName, getUserDisplayName } from "../../../lib/utils";import { Browser } from "../components/shared/icons/Browser";import { CountryFlag } from "../components/shared/icons/CountryFlag";import { OperatingSystem } from "../components/shared/icons/OperatingSystem";import { SubHeader } from "../components/SubHeader/SubHeader";-import { ErrorState } from "../../../components/ErrorState";// Set up column helperconst columnHelper = createColumnHelper<UsersResponse>();@@ -69,6 +72,7 @@ export default function UsersPage() {pageSize: 50,});const [sorting, setSorting] = useState<SortingState>([{ id: "last_seen", desc: true }]);+ const [identifiedOnly, setIdentifiedOnly] = useState(false);// Convert page index to 1-based for the APIconst page = pagination.pageIndex + 1;@@ -83,6 +87,7 @@ export default function UsersPage() {pageSize: pagination.pageSize,sortBy,sortOrder,+ identifiedOnly,});// Format relative time with special handling for times less than 1 minute@@ -101,12 +106,23 @@ export default function UsersPage() {const columns = [columnHelper.accessor("user_id", {header: "User",- cell: info => (- <Link href={`/${site}/user/${info.getValue()}`} className="flex items-center gap-2 hover:underline">- <Avatar size={20} id={info.getValue() as string} />- <span className="max-w-24 truncate">{generateName(info.getValue())}</span>- </Link>- ),+ cell: info => {+ const identifiedUserId = info.row.original.identified_user_id;+ const isIdentified = !!info.row.original.identified_user_id;+ // For links: use identified_user_id for identified users, device ID for anonymous+ const linkId = isIdentified ? identifiedUserId : info.getValue();+ const displayName = getUserDisplayName(info.row.original);++ return (+ <Link href={`/${site}/user/${linkId}`} className="flex items-center gap-2">+ <Avatar size={20} id={linkId as string} />+ <span className="max-w-32 truncate hover:underline" title={displayName}>+ {displayName}+ </span>+ {isIdentified && <IdentifiedBadge traits={info.row.original.traits} />}+ </Link>+ );+ },}),columnHelper.accessor("country", {header: "Country",@@ -276,6 +292,12 @@ export default function UsersPage() {<DisabledOverlay message="Users" featurePath="users"><div className="p-2 md:p-4 max-w-[1400px] mx-auto space-y-3"><SubHeader availableFilters={USER_PAGE_FILTERS} />+ <div className="flex items-center justify-end gap-2">+ <Switch id="identified-only" checked={identifiedOnly} onCheckedChange={setIdentifiedOnly} />+ <Label htmlFor="identified-only" className="text-sm text-neutral-600 dark:text-neutral-400 cursor-pointer">+ Identified only+ </Label>+ </div><div className="rounded-md border border-neutral-100 dark:border-neutral-800 bg-white dark:bg-neutral-900"><div className="relative overflow-x-auto"><table className="w-full text-sm text-left">@@ -310,14 +332,18 @@ export default function UsersPage() {))) : table.getRowModel().rows.length === 0 ? (<tr>- <td colSpan={columns.length} className="px-3 py-8 text-center text-neutral-500 dark:text-neutral-400">+ <td+ colSpan={columns.length}+ className="px-3 py-8 text-center text-neutral-500 dark:text-neutral-400"+ >No users found</td></tr>) : (table.getRowModel().rows.map(row => {- const userId = row.original.user_id;- const href = `/${site}/user/${userId}`;+ // Use identified_user_id for identified users, device ID (user_id) for anonymous+ const linkId = row.original.identified_user_id || row.original.user_id;+ const href = `/${site}/user/${linkId}`;return (<tr key={row.id} className="border-b border-neutral-100 dark:border-neutral-800 group">diff --git a/client/src/components/IdentifiedBadge.tsx b/client/src/components/IdentifiedBadge.tsxnew file mode 100644index 000000000..2b5864ec4--- /dev/null+++ b/client/src/components/IdentifiedBadge.tsx@@ -0,0 +1,47 @@+import { Badge } from "./ui/badge";+import { IdCard } from "lucide-react";+import { Tooltip, TooltipContent, TooltipTrigger } from "./ui/tooltip";++interface IdentifiedBadgeProps {+ className?: string;+ traits?: Record<string, unknown> | null;+}++export function IdentifiedBadge({ className, traits }: IdentifiedBadgeProps) {+ // Filter out null/undefined values and format for display+ const traitEntries = traits+ ? Object.entries(traits).filter(([, value]) => value !== null && value !== undefined)+ : [];++ return (+ <Tooltip>+ <TooltipTrigger asChild>+ <Badge variant="success" className={className}>+ <IdCard className="w-3 h-3" />+ </Badge>+ </TooltipTrigger>+ <TooltipContent className="max-w-xs">+ <p className="font-medium mb-1">Identified User</p>+ {traitEntries.length > 0 ? (+ <div className="text-xs space-y-0.5">+ {traitEntries.slice(0, 8).map(([key, value]) => (+ <div key={key} className="flex gap-2">+ <span className="text-neutral-400">{key}:</span>+ <span className="truncate max-w-[180px]">+ {typeof value === "object" ? JSON.stringify(value) : String(value)}+ </span>+ </div>+ ))}+ {traitEntries.length > 8 && (+ <div className="text-neutral-400 text-xs mt-1">+ +{traitEntries.length - 8} more traits+ </div>+ )}+ </div>+ ) : (+ <p className="text-xs text-neutral-400">No traits set</p>+ )}+ </TooltipContent>+ </Tooltip>+ );+}diff --git a/client/src/components/Sessions/SessionCard.tsx b/client/src/components/Sessions/SessionCard.tsxindex 624347d5b..5ed99811b 100644--- a/client/src/components/Sessions/SessionCard.tsx+++ b/client/src/components/Sessions/SessionCard.tsx@@ -4,11 +4,12 @@ import { ArrowRight, ChevronDown, ChevronRight } from "lucide-react";import { DateTime } from "luxon";import { memo, useState } from "react";import { GetSessionsResponse } from "../../api/analytics/useGetUserSessions";-import { formatDuration, hour12, userLocale } from "../../lib/dateTimeUtils";-import { cn, formatter } from "../../lib/utils";-import { Avatar, generateName } from "../Avatar";+import { formatShortDuration, hour12, userLocale } from "../../lib/dateTimeUtils";+import { cn, formatter, getUserDisplayName } from "../../lib/utils";+import { Avatar } from "../Avatar";import { Channel } from "../Channel";import { EventIcon, PageviewIcon } from "../EventIcons";+import { IdentifiedBadge } from "../IdentifiedBadge";import {BrowserTooltipIcon,CountryFlagTooltipIcon,@@ -40,7 +41,7 @@ export function SessionCard({ session, onClick, userId, expandedByDefault }: Sesconst start = DateTime.fromSQL(session.session_start);const end = DateTime.fromSQL(session.session_end);const totalSeconds = Math.floor(end.diff(start).milliseconds / 1000);- const duration = formatDuration(totalSeconds);+ const duration = formatShortDuration(totalSeconds);const handleCardClick = () => {if (onClick) {@@ -50,16 +51,19 @@ export function SessionCard({ session, onClick, userId, expandedByDefault }: Ses}};- const name = generateName(session.user_id);-return (- <div className="rounded-lg bg-white dark:bg-neutral-900 border border-neutral-100 dark:border-neutral-800 overflow-hidden">+ <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">- <div className="hidden md:flex items-center gap-2">- <Avatar size={24} id={session.user_id} />- <span className="text-xs text-neutral-600 dark:text-neutral-200 w-24 truncate">{name}</span>- </div>+ {!userId && (+ <div className="hidden md:flex items-center gap-2">+ <Avatar size={24} id={session.user_id} />+ <span className="text-xs text-neutral-600 dark:text-neutral-200 w-24 truncate">+ {getUserDisplayName(session)}+ </span>+ {!!session.identified_user_id && <IdentifiedBadge traits={session.traits} />}+ </div>+ )}{/* Icons section */}<div className="flex space-x-2 items-center">@@ -156,7 +160,7 @@ export function SessionCard({ session, onClick, userId, expandedByDefault }: Ses);}-export const SessionCardSkeleton = memo(() => {+export const SessionCardSkeleton = memo(({ userId }: { userId?: string }) => {// Function to get a random width class for skeletonsconst getRandomWidth = () => {const widths = ["w-16", "w-20", "w-24", "w-28", "w-32", "w-36", "w-40", "w-44", "w-48"];@@ -178,16 +182,18 @@ export const SessionCardSkeleton = memo(() => {// Create multiple skeletons for a realistic loading stateconst skeletons = Array.from({ length: 25 }).map((_, index) => (<div- className="rounded-lg bg-white dark:bg-neutral-900 border border-neutral-100 dark:border-neutral-800 overflow-hidden"+ className="rounded-lg bg-white dark:bg-neutral-900 border border-neutral-100 dark:border-neutral-850 overflow-hidden"key={index}><div className="p-3"><div className="flex items-center gap-2">{/* Avatar and User ID */}- <div className="hidden md:flex items-center gap-2">- <Skeleton className="h-6 w-6 rounded-full" />- <Skeleton className="h-3 w-24" />- </div>+ {!userId && (+ <div className="hidden md:flex items-center gap-2">+ <Skeleton className="h-6 w-6 rounded-full" />+ <Skeleton className="h-3 w-24" />+ </div>+ )}{/* Icons section - matching actual component structure */}<div className="flex space-x-2 items-center">diff --git a/client/src/components/Sessions/SessionDetails.tsx b/client/src/components/Sessions/SessionDetails.tsxindex f31bed222..d19944b65 100644--- a/client/src/components/Sessions/SessionDetails.tsx+++ b/client/src/components/Sessions/SessionDetails.tsx@@ -20,8 +20,9 @@ import { OperatingSystem } from "../../app/[site]/components/shared/icons/Operatimport { formatDuration, hour12 } from "../../lib/dateTimeUtils";import { useGetRegionName } from "../../lib/geo";import { cn, getCountryName, getLanguageName } from "../../lib/utils";-import { Avatar } from "../Avatar";+import { Avatar, generateName } from "../Avatar";import { EventIcon, PageviewIcon } from "../EventIcons";+import { IdentifiedBadge } from "../IdentifiedBadge";import { Button } from "../ui/button";// Component to display a single pageview or event@@ -309,8 +310,10 @@ export function SessionDetails({ session, userId }: SessionDetailsProps) {const { getRegionName } = useGetRegionName();+ const isIdentified = !!session.identified_user_id;+return (- <div className="px-4 bg-white dark:bg-neutral-900 border-t border-neutral-300 dark:border-neutral-800">+ <div className="px-4 bg-white dark:bg-neutral-900 border-t border-neutral-100 dark:border-neutral-850">{isLoading ? (<SessionDetailsTimelineSkeleton itemCount={session.pageviews + session.events} />) : error ? (@@ -325,7 +328,7 @@ export function SessionDetails({ session, userId }: SessionDetailsProps) {<TabsTrigger value="info">Session Info</TabsTrigger></TabsList>{!userId && (- <Link href={`/${site}/user/${session.user_id}`}>+ <Link href={`/${site}/user/${isIdentified ? session.identified_user_id : session.user_id}`}><Button size={"sm"} variant={"success"}>View User <ArrowRight className="w-4 h-4" /></Button>@@ -388,19 +391,29 @@ export function SessionDetails({ session, userId }: SessionDetailsProps) {<div className="grid grid-cols-1 lg:grid-cols-[auto_auto_auto] gap-8 mb-6">{/* User Information */}<div>- <h4 className="text-sm font-medium mb-3 text-neutral-600 dark:text-neutral-300 border-b border-neutral-300 dark:border-neutral-800 pb-2">+ <h4 className="text-sm font-medium mb-3 text-neutral-600 dark:text-neutral-300 border-b border-neutral-100 dark:border-neutral-800 pb-2">User Information</h4><div className="space-y-3">{sessionDetails?.user_id && (<div className="flex items-center gap-2"><div className="h-10 w-10 bg-neutral-200 dark:bg-neutral-800 rounded-full flex items-center justify-center flex-shrink-0">- <Avatar size={40} id={sessionDetails.user_id} />+ <Avatar size={40} id={isIdentified ? session.identified_user_id : sessionDetails.user_id} /></div><div>+ <div className="text-sm text-neutral-500 dark:text-neutral-400 flex items-center gap-2">+ <span className="font-medium text-neutral-600 dark:text-neutral-300">+ {isIdentified+ ? (session.traits?.username as string) ||+ (session.traits?.name as string) ||+ session.identified_user_id+ : generateName(sessionDetails.user_id)}+ </span>+ {isIdentified && <IdentifiedBadge traits={session.traits} />}+ </div><div className="text-sm text-neutral-500 dark:text-neutral-400 flex items-center"><span className="font-medium text-neutral-600 dark:text-neutral-300">User ID:</span>- <CopyText text={sessionDetails.user_id} maxLength={24} className="inline-flex ml-2" />+ <CopyText text={isIdentified ? session.identified_user_id : sessionDetails.user_id} maxLength={24} className="inline-flex ml-2" /></div><div className="text-sm text-neutral-500 dark:text-neutral-400 flex items-center"><span className="font-medium text-neutral-600 dark:text-neutral-300">Session ID:</span>@@ -413,8 +426,8 @@ export function SessionDetails({ session, userId }: SessionDetailsProps) {<div className="space-y-2">{sessionDetails?.language && (<div className="text-sm flex items-center gap-2">- <span className="font-medium text-neutral-300 min-w-[80px]">Language:</span>- <span className="text-neutral-400">+ <span className="font-medium text-neutral-600 dark:text-neutral-300 min-w-[80px]">Language:</span>+ <span className="text-neutral-500 dark:text-neutral-400">{sessionDetails.language ? getLanguageName(sessionDetails.language) : "N/A"}</span></div>@@ -435,13 +448,13 @@ export function SessionDetails({ session, userId }: SessionDetailsProps) {{sessionDetails?.region && getRegionName(sessionDetails.region) && (<div className="flex items-center gap-2 text-sm"><span className="font-medium text-neutral-600 dark:text-neutral-300 min-w-[80px]">Region:</span>- <span className="text-neutral-400">{getRegionName(sessionDetails.region)}</span>+ <span className="text-neutral-500 dark:text-neutral-400">{getRegionName(sessionDetails.region)}</span></div>)}{sessionDetails?.city && (<div className="flex items-center gap-2 text-sm"><span className="font-medium text-neutral-600 dark:text-neutral-300 min-w-[80px]">City:</span>- <span className="text-neutral-400">{sessionDetails.city}</span>+ <span className="text-neutral-500 dark:text-neutral-400">{sessionDetails.city}</span></div>)}</div>@@ -450,13 +463,13 @@ export function SessionDetails({ session, userId }: SessionDetailsProps) {{/* Device Information */}<div>- <h4 className="text-sm font-medium mb-3 text-neutral-600 dark:text-neutral-300 border-b border-neutral-300 dark:border-neutral-800 pb-2">+ <h4 className="text-sm font-medium mb-3 text-neutral-600 dark:text-neutral-300 border-b border-neutral-100 dark:border-neutral-800 pb-2">Device Information</h4><div className="space-y-3"><div className="flex items-center gap-2 text-sm">- <span className="font-medium text-neutral-300 min-w-[80px]">Device:</span>- <div className="flex items-center gap-1.5 text-neutral-400">+ <span className="font-medium text-neutral-600 dark:text-neutral-300 min-w-[80px]">Device:</span>+ <div className="flex items-center gap-1.5 text-neutral-500 dark:text-neutral-400">{sessionDetails?.device_type === "Desktop" && <Monitor className="w-4 h-4" />}{sessionDetails?.device_type === "Mobile" && <Smartphone className="w-4 h-4" />}{sessionDetails?.device_type === "Tablet" && <Tablet className="w-4 h-4" />}@@ -465,8 +478,8 @@ export function SessionDetails({ session, userId }: SessionDetailsProps) {</div><div className="flex items-center gap-2 text-sm">- <span className="font-medium text-neutral-300 min-w-[80px]">Browser:</span>- <div className="flex items-center gap-1.5 text-neutral-400">+ <span className="font-medium text-neutral-600 dark:text-neutral-300 min-w-[80px]">Browser:</span>+ <div className="flex items-center gap-1.5 text-neutral-500 dark:text-neutral-400"><Browser browser={sessionDetails?.browser || "Unknown"} /><span>{sessionDetails?.browser || "Unknown"}@@ -478,8 +491,8 @@ export function SessionDetails({ session, userId }: SessionDetailsProps) {</div><div className="flex items-center gap-2 text-sm">- <span className="font-medium text-neutral-300 min-w-[80px]">OS:</span>- <div className="flex items-center gap-1.5 text-neutral-400">+ <span className="font-medium text-neutral-600 dark:text-neutral-300 min-w-[80px]">OS:</span>+ <div className="flex items-center gap-1.5 text-neutral-500 dark:text-neutral-400"><OperatingSystem os={sessionDetails?.operating_system || ""} /><span>{sessionDetails?.operating_system || "Unknown"}@@ -492,16 +505,16 @@ export function SessionDetails({ session, userId }: SessionDetailsProps) {{sessionDetails?.screen_width && sessionDetails?.screen_height ? (<div className="flex items-center gap-2 text-sm">- <span className="font-medium text-neutral-300 min-w-[80px]">Screen:</span>- <span className="text-neutral-400">+ <span className="font-medium text-neutral-600 dark:text-neutral-300 min-w-[80px]">Screen:</span>+ <span className="text-neutral-500 dark:text-neutral-400">{sessionDetails.screen_width} × {sessionDetails.screen_height}</span></div>) : null}{sessionDetails?.ip && (<div className="flex items-center gap-2 text-sm">- <span className="font-medium text-neutral-300 min-w-[80px]">IP:</span>- <span className="text-neutral-400">{sessionDetails.ip}</span>+ <span className="font-medium text-neutral-600 dark:text-neutral-300 min-w-[80px]">IP:</span>+ <span className="text-neutral-500 dark:text-neutral-400">{sessionDetails.ip}</span></div>)}</div>@@ -509,27 +522,27 @@ export function SessionDetails({ session, userId }: SessionDetailsProps) {{/* Source Information */}<div>- <h4 className="text-sm font-medium mb-3 text-neutral-600 dark:text-neutral-300 border-b border-neutral-300 dark:border-neutral-800 pb-2">+ <h4 className="text-sm font-medium mb-3 text-neutral-600 dark:text-neutral-300 border-b border-neutral-100 dark:border-neutral-800 pb-2">Source Information</h4><div className="space-y-3"><div className="flex items-center gap-2 text-sm">- <span className="font-medium text-neutral-300 min-w-[80px]">Channel:</span>- <div className="flex items-center gap-1.5 text-neutral-400">+ <span className="font-medium text-neutral-600 dark:text-neutral-300 min-w-[80px]">Channel:</span>+ <div className="flex items-center gap-1.5 text-neutral-500 dark:text-neutral-400"><span>{sessionDetails?.channel || "None"}</span></div></div><div className="flex items-center gap-2 text-sm">- <span className="font-medium text-neutral-300 min-w-[80px]">Referrer:</span>- <div className="flex items-center gap-1.5 text-neutral-400">+ <span className="font-medium text-neutral-600 dark:text-neutral-300 min-w-[80px]">Referrer:</span>+ <div className="flex items-center gap-1.5 text-neutral-500 dark:text-neutral-400"><span>{sessionDetails?.referrer || "None"}</span></div></div><div className="flex items-center gap-2 text-sm">- <span className="font-medium text-neutral-300 min-w-[80px]">Entry Page:</span>- <div className="flex items-center gap-1.5 text-neutral-400">+ <span className="font-medium text-neutral-600 dark:text-neutral-300 min-w-[80px]">Entry Page:</span>+ <div className="flex items-center gap-1.5 text-neutral-500 dark:text-neutral-400"><span>{sessionDetails?.entry_page || "None"}</span></div></div>diff --git a/client/src/components/Sessions/SessionsList.tsx b/client/src/components/Sessions/SessionsList.tsxindex 68662c2df..be6ab06a5 100644--- a/client/src/components/Sessions/SessionsList.tsx+++ b/client/src/components/Sessions/SessionsList.tsx@@ -3,6 +3,8 @@ import { GetSessionsResponse } from "../../api/analytics/useGetUserSessions";import { NothingFound } from "../NothingFound";import { Button } from "../ui/button";import { SessionCard, SessionCardSkeleton } from "./SessionCard";+import { Switch } from "../ui/switch";+import { Label } from "../ui/label";interface SessionsListProps {sessions: GetSessionsResponse;@@ -13,6 +15,8 @@ interface SessionsListProps {hasPrevPage: boolean;emptyMessage?: string;userId?: string;+ identifiedOnly?: boolean;+ setIdentifiedOnly?: (identifiedOnly: boolean) => void;}export function SessionsList({@@ -24,6 +28,8 @@ export function SessionsList({hasPrevPage,emptyMessage = "Try a different date range or filter",userId,+ identifiedOnly,+ setIdentifiedOnly,}: SessionsListProps) {if (sessions.length === 0 && !isLoading) {return (@@ -36,19 +42,29 @@ export function SessionsList({return (<div className="overflow-auto space-y-3">{/* Pagination controls */}- <div className="flex items-center justify-end gap-2">- <Button variant="ghost" size="smIcon" onClick={() => onPageChange(page - 1)} disabled={!hasPrevPage}>- <ChevronLeft className="h-4 w-4" />- </Button>- <span className="text-sm text-neutral-500 dark:text-neutral-400">Page {page}</span>- <Button variant="ghost" size="smIcon" onClick={() => onPageChange(page + 1)} disabled={!hasNextPage}>- <ChevronRight className="h-4 w-4" />- </Button>+ <div className="flex items-center justify-between gap-2">+ {setIdentifiedOnly && (+ <div className="flex items-center justify-end gap-2">+ <Switch id="identified-only" checked={identifiedOnly} onCheckedChange={setIdentifiedOnly} />+ <Label htmlFor="identified-only" className="text-sm text-neutral-600 dark:text-neutral-400 cursor-pointer">+ Identified only+ </Label>+ </div>+ )}+ <div className="flex items-center justify-end gap-2">+ <Button variant="ghost" size="smIcon" onClick={() => onPageChange(page - 1)} disabled={!hasPrevPage}>+ <ChevronLeft className="h-4 w-4" />+ </Button>+ <span className="text-sm text-neutral-500 dark:text-neutral-400">Page {page}</span>+ <Button variant="ghost" size="smIcon" onClick={() => onPageChange(page + 1)} disabled={!hasNextPage}>+ <ChevronRight className="h-4 w-4" />+ </Button>+ </div></div>{/* Session cards */}{isLoading ? (- <SessionCardSkeleton />+ <SessionCardSkeleton userId={userId} />) : (sessions.map((session, index) => (<SessionCard key={`${session.session_id}-${index}`} session={session} userId={userId} />diff --git a/client/src/components/charts/ChartTooltip.tsx b/client/src/components/charts/ChartTooltip.tsxindex f7cfc5126..f770b14d7 100644--- a/client/src/components/charts/ChartTooltip.tsx+++ b/client/src/components/charts/ChartTooltip.tsx@@ -1,12 +1,19 @@import { ReactNode } from "react";+import { cn } from "../../lib/utils";interface ChartTooltipProps {children: ReactNode;+ className?: string;}-export function ChartTooltip({ children }: ChartTooltipProps) {+export function ChartTooltip({ children, className }: ChartTooltipProps) {return (- <div className="text-sm bg-white dark:bg-neutral-850 rounded-lg border border-neutral-100 dark:border-neutral-750 shadow-md">+ <div+ className={cn(+ "text-sm bg-white dark:bg-neutral-850 rounded-lg border border-neutral-100 dark:border-neutral-750 shadow-md",+ className+ )}+ >{children}</div>);diff --git a/client/src/components/ui/breadcrumb.tsx b/client/src/components/ui/breadcrumb.tsxnew file mode 100644index 000000000..ce08888f2--- /dev/null+++ b/client/src/components/ui/breadcrumb.tsx@@ -0,0 +1,92 @@+import * as React from "react";+import { Slot } from "@radix-ui/react-slot";+import { ChevronRight, MoreHorizontal } from "lucide-react";++import { cn } from "@/lib/utils";++function Breadcrumb({ ...props }: React.ComponentProps<"nav">) {+ return <nav aria-label="breadcrumb" data-slot="breadcrumb" {...props} />;+}++function BreadcrumbList({ className, ...props }: React.ComponentProps<"ol">) {+ return (+ <ol+ data-slot="breadcrumb-list"+ className={cn(+ "text-muted-foreground flex flex-wrap items-center gap-1.5 text-sm break-words sm:gap-2.5",+ className+ )}+ {...props}+ />+ );+}++function BreadcrumbItem({ className, ...props }: React.ComponentProps<"li">) {+ return <li data-slot="breadcrumb-item" className={cn("inline-flex items-center gap-1.5", className)} {...props} />;+}++function BreadcrumbLink({+ asChild,+ className,+ ...props+}: React.ComponentProps<"a"> & {+ asChild?: boolean;+}) {+ const Comp = asChild ? Slot : "a";++ return (+ <Comp data-slot="breadcrumb-link" className={cn("hover:text-foreground transition-colors", className)} {...props} />+ );+}++function BreadcrumbPage({ className, ...props }: React.ComponentProps<"span">) {+ return (+ <span+ data-slot="breadcrumb-page"+ role="link"+ aria-disabled="true"+ aria-current="page"+ className={cn("text-foreground font-normal", className)}+ {...props}+ />+ );+}++function BreadcrumbSeparator({ children, className, ...props }: React.ComponentProps<"li">) {+ return (+ <li+ data-slot="breadcrumb-separator"+ role="presentation"+ aria-hidden="true"+ className={cn("[&>svg]:size-3.5", className)}+ {...props}+ >+ {children ?? <ChevronRight />}+ </li>+ );+}++function BreadcrumbEllipsis({ className, ...props }: React.ComponentProps<"span">) {+ return (+ <span+ data-slot="breadcrumb-ellipsis"+ role="presentation"+ aria-hidden="true"+ className={cn("flex size-9 items-center justify-center", className)}+ {...props}+ >+ <MoreHorizontal className="size-4" />+ <span className="sr-only">More</span>+ </span>+ );+}++export {+ Breadcrumb,+ BreadcrumbList,+ BreadcrumbItem,+ BreadcrumbLink,+ BreadcrumbPage,+ BreadcrumbSeparator,+ BreadcrumbEllipsis,+};diff --git a/client/src/hooks/useTrack.ts b/client/src/hooks/useTrack.tsindex eb6dd22b2..bbf7b9c41 100644--- a/client/src/hooks/useTrack.ts+++ b/client/src/hooks/useTrack.ts@@ -23,5 +23,12 @@ export function useTrack() {sites: sites?.sites.map(site => site.domain),});}- }, [user.data?.user?.id, subscription?.planName, isLoading, isPendingActiveOrganization, isPendingSites]);+ }, [+ user.data?.user?.id,+ window?.rybbit,+ subscription?.planName,+ isLoading,+ isPendingActiveOrganization,+ isPendingSites,+ ]);}diff --git a/client/src/lib/utils.ts b/client/src/lib/utils.tsindex d570e37e3..8ac811f42 100644--- a/client/src/lib/utils.ts+++ b/client/src/lib/utils.ts@@ -1,6 +1,7 @@import { clsx, type ClassValue } from "clsx";import { Duration } from "luxon";import { twMerge } from "tailwind-merge";+import { generateName } from "../components/Avatar";import { userLocale } from "./dateTimeUtils";export function cn(...inputs: ClassValue[]) {@@ -91,3 +92,18 @@ export function isValidDomain(domain: string): boolean {const domainRegex = /^(?:https?:\/\/)?(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$/;return domainRegex.test(domain);}++export function getUserDisplayName<+ T extends { identified_user_id?: string; traits?: Record<string, unknown> | null; user_id?: string },+>(data: T) {+ const traitsUsername = data?.traits?.username as string | undefined;+ const traitsName = data?.traits?.name as string | undefined;+ const traitsEmail = data?.traits?.email as string | undefined;+ const isIdentified = !!data?.identified_user_id;+ return (+ traitsUsername ||+ traitsName ||+ traitsEmail ||+ (isIdentified ? (data?.identified_user_id as string) : generateName(data?.user_id as string))+ );+}diff --git a/docs/content/docs/identify-users.mdx b/docs/content/docs/identify-users.mdxnew file mode 100644index 000000000..d3268b1aa--- /dev/null+++ b/docs/content/docs/identify-users.mdx@@ -0,0 +1,161 @@+---+title: Identify Users+description: How to identify and track logged-in users with Rybbit+---++Rybbit allows you to identify logged-in users and associate their activity with a persistent identity across devices and sessions. This enables powerful user-level analytics, including tracking user journeys, understanding retention, and personalizing experiences.++## How It Works++By default, Rybbit assigns an anonymous ID to each visitor based on their device fingerprint. When you call `identify()`, you link this anonymous visitor to a known user ID, allowing you to:++- Track the same user across multiple devices+- Associate pre-login activity with the logged-in user+- Store user metadata (traits) like email, name, and custom fields+- View identified users in your dashboard with their real names++## Special Trait Fields++When identifying users, certain trait fields are treated specially by Rybbit:++| Field | Description |+|-------|-------------|+| `username` | **Primary display name** - Shown in the users list and session cards instead of the user ID |+| `name` | **Fallback display name** - Used if username is not provided |+| `email` | Displayed below the user's name in the dashboard |++You can also include any custom fields you need for segmentation and analysis.++## Limits++- **Traits size**: Maximum 2KB per identify call. Traits are stored as JSON, so keep payloads concise.+- **User ID length**: Maximum 255 characters.++## API Reference++### `window.rybbit.identify(userId, traits?)`++Sets a custom user ID for tracking logged-in users across devices and sessions, with optional user traits (metadata).++- `userId` (String): The unique identifier for the user. This will be stored in localStorage and persist across browser sessions. **Note: Custom user IDs are stored exactly as provided without any hashing or modification.**+- `traits` (Object, Optional): An object containing user metadata like email, name, username, or any custom fields. This data is stored in Rybbit and can be used to identify users in the dashboard. Setting a trait to `null` removes it from the user's profile.++```javascript+// Identify a user when they log in (without traits)+window.rybbit.identify("user_12345");++// Identify a user with traits (recommended)+window.rybbit.identify("user_12345", {+ username: "johndoe", // Primary display name+ name: "John Doe", // Fallback display name+ email: "[email protected]",+ plan: "premium",+ company: "Acme Inc"+});++// All subsequent events and pageviews will be associated with this user ID+```++### `window.rybbit.setTraits(traits)`++Updates the traits for the currently identified user without re-identifying them. Useful for updating user properties after initial identification.++- `traits` (Object): An object containing user metadata. New traits are merged with existing traits. **Setting a trait to `null` removes it from the user's profile.**++```javascript+// Update user traits after they upgrade their plan+window.rybbit.setTraits({+ plan: "enterprise",+ upgraded_at: "2024-01-15"+});++// Remove a trait by setting it to null+window.rybbit.setTraits({+ temporary_flag: null // This trait will be removed+});+```++**Note:** You must call `identify()` before using `setTraits()`. If no user is identified, this will log a warning.++### `window.rybbit.clearUserId()`++Clears the stored user ID. Useful when a user logs out.++```javascript+// Clear user identification when user logs out+window.rybbit.clearUserId();+```++### `window.rybbit.getUserId()`++Returns the currently set user ID, or `null` if none is set.++```javascript+// Check if a user is identified+const currentUserId = window.rybbit.getUserId();+if (currentUserId) {+ console.log('Current user:', currentUserId);+} else {+ console.log('No user identified');+}+```++## Complete Example++Here's a typical workflow for user identification:++```javascript+// When user logs in+function handleLogin(userData) {+ // Set user identification with traits+ window.rybbit.identify(userData.id, {+ username: userData.username,+ name: userData.fullName,+ email: userData.email,+ plan: userData.plan+ });++ // Track login event+ window.rybbit.event("User Login", {+ method: "email"+ });+}++// When user upgrades their plan+function handlePlanUpgrade(newPlan) {+ // Update traits without re-identifying+ window.rybbit.setTraits({+ plan: newPlan,+ upgraded_at: new Date().toISOString()+ });++ // Track upgrade event+ window.rybbit.event("Plan Upgraded", {+ new_plan: newPlan+ });+}++// When user logs out+function handleLogout() {+ // Track logout event+ window.rybbit.event("User Logout");++ // Clear user identification+ window.rybbit.clearUserId();+}++// Check identification status+function checkUserStatus() {+ const userId = window.rybbit.getUserId();+ if (userId) {+ console.log("User is identified:", userId);+ } else {+ console.log("Anonymous user");+ }+}+```++**Related Documentation:**+- [Track Events](/docs/track-events)+- [Behavior Analytics - Users Tab](/docs/behavior-analytics/users)+- [API - Sending Events](/docs/api/sending-events)diff --git a/docs/content/docs/meta.json b/docs/content/docs/meta.jsonindex d1aa5ab37..fd3ea5d14 100644--- a/docs/content/docs/meta.json+++ b/docs/content/docs/meta.json@@ -8,6 +8,7 @@"---Usage---","script","track-events",+ "identify-users","guides","sdks","api",diff --git a/docs/content/docs/track-events.mdx b/docs/content/docs/track-events.mdxindex 7fd65d481..05bfb0e11 100644--- a/docs/content/docs/track-events.mdx+++ b/docs/content/docs/track-events.mdx@@ -1,9 +1,8 @@----title: Track events+title: Track Eventsdescription: How to track custom events with Rybbit----The script exposes a global object `window.rybbit` with functions for manual tracking of events, as well as the ability to track events using data attributes on HTML elements.## Using Data Attributes@@ -15,9 +14,9 @@ You can track custom events by adding data attributes to any HTML element:<button data-rybbit-event="signup_clicked">Sign Up</button><!-- Event with custom properties -->-<button- data-rybbit-event="purchase_click"- data-rybbit-prop-product="premium"+<button+ data-rybbit-event="purchase_click"+ data-rybbit-prop-product="premium"data-rybbit-prop-price="49.99">Buy Now@@ -56,79 +55,6 @@ Tracks a pageview. Useful when `data-track-spa` is set to `"false"` or when youwindow.rybbit.pageview();```-### `window.rybbit.identify(userId)`--Sets a custom user ID for tracking logged-in users across devices and sessions.--* `userId` (String): The unique identifier for the user. This will be stored in localStorage and persist across browser sessions. **Note: Custom user IDs are stored exactly as provided without any hashing or modification.**--```javascript-// Identify a user when they log in-window.rybbit.identify("user_12345");--// All subsequent events and pageviews will be associated with this user ID-```--### `window.rybbit.clearUserId()`--Clears the stored user ID. Useful when a user logs out.--```javascript-// Clear user identification when user logs out-window.rybbit.clearUserId();-```--### `window.rybbit.getUserId()`--Returns the currently set user ID, or `null` if none is set.--```javascript-// Check if a user is identified-const currentUserId = window.rybbit.getUserId();-if (currentUserId) {- console.log('Current user:', currentUserId);-} else {- console.log('No user identified');-}-```--## User Identification Example--Here's a typical workflow for user identification:--```javascript-// When user logs in-function handleLogin(userData) {- // Set user identification- window.rybbit.identify(userData.id);-- // Track login event- window.rybbit.event("User Login", {- method: "email",- plan: userData.plan- });-}--// When user logs out-function handleLogout() {- // Track logout event- window.rybbit.event("User Logout");-- // Clear user identification- window.rybbit.clearUserId();-}--// Check identification status-function checkUserStatus() {- const userId = window.rybbit.getUserId();- if (userId) {- console.log("User is identified:", userId);- } else {- console.log("Anonymous user");- }-}-```-## TypeScript SupportPut this as `rybbit.d.ts` anywhere in your project to avoid having to do `(window as any).rybbit.event()` everywhere.@@ -150,8 +76,15 @@ interface Rybbit {/*** Sets a custom user ID for tracking logged-in users* @param userId The user ID to set (will be stored in localStorage)+ * @param traits Optional user metadata (email, name, custom fields)+ */+ identify: (userId: string, traits?: Record<string, unknown>) => void;++ /**+ * Updates traits for the currently identified user+ * @param traits User metadata to merge with existing traits*/- identify: (userId: string) => void;+ setTraits: (traits: Record<string, unknown>) => void;/*** Clears the stored user ID@@ -196,6 +129,7 @@ See the [API documentation](/docs/api/sending-events) for detailed examples in m---**Related Documentation:**+- [Identify Users](/docs/identify-users)- [Behavior Analytics - Events Tab](/docs/behavior-analytics/events)- [Behavior Analytics - Users Tab](/docs/behavior-analytics/users)- [Behavior Analytics - Sessions Tab](/docs/behavior-analytics/sessions)@@ -203,4 +137,4 @@ See the [API documentation](/docs/api/sending-events) for detailed examples in m- [Product Analytics - Funnels](/docs/product-analytics/funnels_guide)- [API - Sending Events](/docs/api/sending-events)- [Blog: Churn Rate vs Retention Rate](/blog/churn-rate-vs-retention-rate)-- [Web SDK Reference](/docs/sdks/web)\ No newline at end of file+- [Web SDK Reference](/docs/sdks/web)diff --git a/server/src/analytics-script/index.ts b/server/src/analytics-script/index.tsindex 02c04f239..d468ca2b9 100644--- a/server/src/analytics-script/index.ts+++ b/server/src/analytics-script/index.ts@@ -27,6 +27,7 @@ declare global {error: () => {},trackOutbound: () => {},identify: () => {},+ setTraits: () => {},clearUserId: () => {},getUserId: () => null,startSessionReplay: () => {},@@ -147,7 +148,8 @@ declare global {error: (error: Error, properties: ErrorProperties = {}) => tracker.trackError(error, properties),trackOutbound: (url: string, text: string = "", target: string = "_self") =>tracker.trackOutbound(url, text, target),- identify: (userId: string) => tracker.identify(userId),+ identify: (userId: string, traits?: Record<string, unknown>) => tracker.identify(userId, traits),+ setTraits: (traits: Record<string, unknown>) => tracker.setTraits(traits),clearUserId: () => tracker.clearUserId(),getUserId: () => tracker.getUserId(),startSessionReplay: () => tracker.startSessionReplay(),diff --git a/server/src/analytics-script/tracking.ts b/server/src/analytics-script/tracking.tsindex 0eb549afc..b5fa9377f 100644--- a/server/src/analytics-script/tracking.ts+++ b/server/src/analytics-script/tracking.ts@@ -228,7 +228,7 @@ export class Tracker {this.track("error", error.name || "Error", errorProperties);}- identify(userId: string): void {+ identify(userId: string, traits?: Record<string, unknown>): void {if (typeof userId !== "string" || userId.trim() === "") {console.error("User ID must be a non-empty string");return;@@ -241,12 +241,55 @@ export class Tracker {console.warn("Could not persist user ID to localStorage");}+ // Send identify event to server (creates alias and stores traits)+ this.sendIdentifyEvent(this.customUserId, traits, true);+// Update session replay recorder with new user IDif (this.sessionReplayRecorder) {this.sessionReplayRecorder.updateUserId(this.customUserId);}}+ setTraits(traits: Record<string, unknown>): void {+ if (!traits || typeof traits !== "object") {+ console.error("Traits must be an object");+ return;+ }++ const userId = this.customUserId;+ if (!userId) {+ console.warn("Cannot set traits without identifying user first. Call identify() first.");+ return;+ }++ this.sendIdentifyEvent(userId, traits, false);+ }++ private async sendIdentifyEvent(+ userId: string,+ traits?: Record<string, unknown>,+ isNewIdentify: boolean = true+ ): Promise<void> {+ try {+ await fetch(`${this.config.analyticsHost}/identify`, {+ method: "POST",+ headers: {+ "Content-Type": "application/json",+ },+ body: JSON.stringify({+ site_id: this.config.siteId,+ user_id: userId,+ traits: traits,+ is_new_identify: isNewIdentify,+ }),+ mode: "cors",+ keepalive: true,+ });+ } catch (error) {+ console.error("Failed to send identify event:", error);+ }+ }+clearUserId(): void {this.customUserId = null;try {diff --git a/server/src/analytics-script/types.ts b/server/src/analytics-script/types.tsindex bf90b4c00..6df3d1da0 100644--- a/server/src/analytics-script/types.ts+++ b/server/src/analytics-script/types.ts@@ -61,7 +61,8 @@ export interface RybbitAPI {event: (name: string, properties?: Record<string, any>) => void;error: (error: Error, properties?: ErrorProperties) => void;trackOutbound: (url: string, text?: string, target?: string) => void;- identify: (userId: string) => void;+ identify: (userId: string, traits?: Record<string, unknown>) => void;+ setTraits: (traits: Record<string, unknown>) => void;clearUserId: () => void;getUserId: () => string | null;startSessionReplay: () => void;diff --git a/server/src/api/analytics/getRetention.ts b/server/src/api/analytics/getRetention.tsindex e53210303..c198e00e7 100644--- a/server/src/api/analytics/getRetention.ts+++ b/server/src/api/analytics/getRetention.ts@@ -43,17 +43,18 @@ export const getRetention = async (query: `WITH UserFirstPeriod AS (SELECT- user_id,+ -- Use effective user ID: identified_user_id for identified users, user_id for anonymous+ COALESCE(NULLIF(identified_user_id, ''), user_id) AS effective_user_id,${periodFunction}(min(timestamp)${retentionMode === "week" ? ", 1" : ""}) AS cohort_periodFROM eventsWHERE site_id = {siteId:UInt16}-- Use the configurable time rangeAND timestamp >= addDays(today(), -{timeRange:UInt16})- GROUP BY user_id+ GROUP BY effective_user_id),PeriodActivity AS (SELECT DISTINCT- user_id,+ COALESCE(NULLIF(identified_user_id, ''), user_id) AS effective_user_id,${periodFunction}(timestamp${retentionMode === "week" ? ", 1" : ""}) AS activity_periodFROM eventsWHERE site_id = {siteId:UInt16}@@ -64,9 +65,9 @@ CohortRetention AS (SELECTufp.cohort_period,dateDiff('${periodDiffFunc}', ufp.cohort_period, pa.activity_period) AS period_difference,- count(DISTINCT pa.user_id) AS retained_users+ count(DISTINCT pa.effective_user_id) AS retained_usersFROM UserFirstPeriod ufp- JOIN PeriodActivity pa ON ufp.user_id = pa.user_id+ JOIN PeriodActivity pa ON ufp.effective_user_id = pa.effective_user_idWHERE pa.activity_period >= ufp.cohort_periodGROUP BYufp.cohort_period,@@ -75,7 +76,7 @@ CohortRetention AS (CohortSize AS (SELECTcohort_period,- count(DISTINCT user_id) AS total_users+ count(DISTINCT effective_user_id) AS total_usersFROM UserFirstPeriodGROUP BY cohort_period)diff --git a/server/src/api/analytics/getSessions.ts b/server/src/api/analytics/getSessions.tsindex 5ea8b1283..c81881188 100644--- a/server/src/api/analytics/getSessions.ts+++ b/server/src/api/analytics/getSessions.ts@@ -1,11 +1,13 @@import { FastifyReply, FastifyRequest } from "fastify";import { clickhouse } from "../../db/clickhouse/clickhouse.js";-import { getFilterStatement, getTimeStatement, processResults } from "./utils.js";+import { enrichWithTraits, getFilterStatement, getTimeStatement, processResults } from "./utils.js";import { FilterParams } from "@rybbit/shared";export type GetSessionsResponse = {session_id: string;- user_id: string;+ user_id: string; // Device fingerprint+ identified_user_id: string; // Custom user ID when identified, empty string otherwise+ traits: Record<string, unknown> | null;country: string;region: string;city: string;@@ -49,12 +51,14 @@ export interface GetSessionsRequest {limit: number;page: number;user_id?: string;+ identified_only?: string;}>;}export async function getSessions(req: FastifyRequest<GetSessionsRequest>, res: FastifyReply) {- const { filters, page, user_id: userId, limit } = req.query;+ const { filters, page, user_id: userId, limit, identified_only: identifiedOnly = "false" } = req.query;const site = req.params.site;+ const filterIdentified = identifiedOnly === "true";const timeStatement = getTimeStatement(req.query);let filterStatement = getFilterStatement(filters, Number(site), timeStatement);@@ -72,7 +76,8 @@ export async function getSessions(req: FastifyRequest<GetSessionsRequest>, res:WITH AggregatedSessions AS (SELECTsession_id,- user_id,+ argMax(user_id, timestamp) AS user_id,+ argMax(identified_user_id, timestamp) AS identified_user_id,argMax(country, timestamp) AS country,argMax(region, timestamp) AS region,argMax(city, timestamp) AS city,@@ -107,16 +112,17 @@ export async function getSessions(req: FastifyRequest<GetSessionsRequest>, res:FROM eventsWHEREsite_id = {siteId:Int32}- ${userId ? ` AND user_id = {user_id:String}` : ""}+ ${userId ? ` AND (events.user_id = {user_id:String} OR events.identified_user_id = {user_id:String})` : ""}${timeStatement}GROUP BY- session_id,- user_id+ session_idORDER BY session_end DESC)- SELECT *+ SELECT+ *FROM AggregatedSessionsWHERE 1 = 1 ${filterStatement}+ ${filterIdentified ? "AND identified_user_id != ''" : ""}LIMIT {limit:Int32} OFFSET {offset:Int32}`;@@ -132,8 +138,12 @@ export async function getSessions(req: FastifyRequest<GetSessionsRequest>, res:},});- const data = await processResults<GetSessionsResponse[number]>(result);- return res.send({ data });+ const data = await processResults<Omit<GetSessionsResponse[number], "traits">>(result);++ // Enrich with traits from Postgres+ const dataWithTraits = await enrichWithTraits(data, Number(site));++ return res.send({ data: dataWithTraits });} catch (error) {console.error("Generated Query:", query);console.error("Error fetching sessions:", error);diff --git a/server/src/api/analytics/getUserInfo.ts b/server/src/api/analytics/getUserInfo.tsindex 7d76f1e52..bd767efa6 100644--- a/server/src/api/analytics/getUserInfo.ts+++ b/server/src/api/analytics/getUserInfo.ts@@ -1,10 +1,15 @@import { FastifyReply, FastifyRequest } from "fastify";+import { eq, and } from "drizzle-orm";import { clickhouse } from "../../db/clickhouse/clickhouse.js";+import { db } from "../../db/postgres/postgres.js";+import { userProfiles, userAliases } from "../../db/postgres/schema.js";import { processResults } from "./utils.js";interface UserPageviewData {sessions: number;duration: number;+ user_id: string; // Device fingerprint+ identified_user_id: string; // Custom user ID when identifiedcountry: string;region: string;city: string;@@ -23,6 +28,18 @@ interface UserPageviewData {ip: string;}+interface LinkedDevice {+ anonymous_id: string;+ created_at: string;+}++export interface UserInfoResponse {+ data: UserPageviewData & {+ traits: Record<string, unknown> | null;+ linked_devices: LinkedDevice[];+ };+}+export async function getUserInfo(req: FastifyRequest<{Params: {@@ -34,13 +51,18 @@ export async function getUserInfo() {const { userId, site } = req.params;+ const siteId = Number(site);+try {- const queryResult = await clickhouse.query({- query: `+ // Run ClickHouse query and Postgres queries in parallel+ const [queryResult, profileResult, aliasesResult] = await Promise.all([+ clickhouse.query({+ query: `WITH sessions AS (SELECTsession_id,- user_id,+ argMax(user_id, timestamp) AS user_id,+ argMax(identified_user_id, timestamp) AS identified_user_id,argMax(country, timestamp) AS country,argMax(region, timestamp) AS region,argMax(city, timestamp) AS city,@@ -64,17 +86,18 @@ export async function getUserInfo(FROMeventsWHERE- user_id = {userId:String}+ (events.identified_user_id = {userId:String} OR events.user_id = {userId:String})AND site_id = {site:Int32}GROUP BY- session_id,- user_id+ session_idORDER BYsession_end DESC)SELECTCOUNT(DISTINCT session_id) AS sessions,ROUND(avg(session_duration)) AS duration,+ any(user_id) AS user_id,+ any(identified_user_id) AS identified_user_id,any(country) as country,any(region) AS region,any(city) AS city,@@ -94,12 +117,27 @@ export async function getUserInfo(FROMsessions`,- query_params: {- userId,- site,- },- format: "JSONEachRow",- });+ query_params: {+ userId,+ site,+ },+ format: "JSONEachRow",+ }),+ // Get user profile traits from Postgres+ db+ .select()+ .from(userProfiles)+ .where(and(eq(userProfiles.siteId, siteId), eq(userProfiles.userId, userId)))+ .limit(1),+ // Get linked devices (all anonymous IDs for this user) from Postgres+ db+ .select({+ anonymous_id: userAliases.anonymousId,+ created_at: userAliases.createdAt,+ })+ .from(userAliases)+ .where(and(eq(userAliases.siteId, siteId), eq(userAliases.userId, userId))),+ ]);const data = await processResults<UserPageviewData>(queryResult);@@ -110,7 +148,19 @@ export async function getUserInfo(});}- return res.send({ data: data[0] });+ const traits = profileResult[0]?.traits || null;+ const linked_devices = aliasesResult.map((alias) => ({+ anonymous_id: alias.anonymous_id,+ created_at: alias.created_at,+ }));++ return res.send({+ data: {+ ...data[0],+ traits,+ linked_devices,+ },+ });} catch (error) {console.error("Error fetching user info:", error);return res.status(500).send({diff --git a/server/src/api/analytics/getUserSessions.ts b/server/src/api/analytics/getUserSessions.tsindex 16f68676f..c227e8489 100644--- a/server/src/api/analytics/getUserSessions.ts+++ b/server/src/api/analytics/getUserSessions.ts@@ -68,7 +68,7 @@ SELECTFROM eventsWHEREsite_id = {siteId:Int32}- AND user_id = {userId:String}+ AND (events.identified_user_id = {userId:String} OR events.user_id = {userId:String})${filterStatement}${timeStatement}ORDER BY timestamp ASCdiff --git a/server/src/api/analytics/getUsers.ts b/server/src/api/analytics/getUsers.tsindex ff5208321..7d782d820 100644--- a/server/src/api/analytics/getUsers.ts+++ b/server/src/api/analytics/getUsers.ts@@ -1,10 +1,12 @@import { FastifyReply, FastifyRequest } from "fastify";import { clickhouse } from "../../db/clickhouse/clickhouse.js";-import { getFilterStatement, getTimeStatement, processResults } from "./utils.js";+import { enrichWithTraits, getFilterStatement, getTimeStatement, processResults } from "./utils.js";import { FilterParams } from "@rybbit/shared";export type GetUsersResponse = {- user_id: string;+ user_id: string; // Device fingerprint+ identified_user_id: string; // Custom user ID when identified, empty string otherwise+ traits: Record<string, unknown> | null;country: string;region: string;city: string;@@ -29,6 +31,7 @@ export interface GetUsersRequest {page_size?: string;sort_by?: string;sort_order?: string;+ identified_only?: string;}>;}@@ -39,8 +42,10 @@ export async function getUsers(req: FastifyRequest<GetUsersRequest>, res: Fastifpage_size: pageSize = "20",sort_by: sortBy = "last_seen",sort_order: sortOrder = "desc",+ identified_only: identifiedOnly = "false",} = req.query;const site = req.params.site;+ const filterIdentified = identifiedOnly === "true";const pageNum = parseInt(page, 10);const pageSizeNum = parseInt(pageSize, 10);@@ -58,7 +63,10 @@ export async function getUsers(req: FastifyRequest<GetUsersRequest>, res: Fastifconst query = `WITH AggregatedUsers AS (SELECT- user_id,+ -- Group by effective user: identified_user_id for identified users, user_id (device) for anonymous+ COALESCE(NULLIF(events.identified_user_id, ''), events.user_id) AS effective_user_id,+ argMax(user_id, timestamp) AS user_id,+ argMax(identified_user_id, timestamp) AS identified_user_id,argMax(country, timestamp) AS country,argMax(region, timestamp) AS region,argMax(city, timestamp) AS city,@@ -68,7 +76,7 @@ WITH AggregatedUsers AS (argMax(operating_system, timestamp) AS operating_system,argMax(operating_system_version, timestamp) AS operating_system_version,argMax(device_type, timestamp) AS device_type,- argMax(screen_width, timestamp) AS screen_width,+ argMax(screen_width, timestamp) AS screen_width,argMax(screen_height, timestamp) AS screen_height,argMin(referrer, timestamp) AS referrer,argMax(channel, timestamp) AS channel,@@ -83,19 +91,34 @@ WITH AggregatedUsers AS (site_id = {siteId:Int32}${timeStatement}GROUP BY- user_id+ effective_user_id)-SELECT *+SELECT+ *FROM AggregatedUsersWHERE 1 = 1 ${filterStatement}+${filterIdentified ? "AND identified_user_id != ''" : ""}ORDER BY ${actualSortBy} ${actualSortOrder}LIMIT {limit:Int32} OFFSET {offset:Int32}`;// Query to get total count- const countQuery = `+ const countQuery = filterIdentified+ ? `+SELECT count(*) AS total_count+FROM (+ SELECT DISTINCT identified_user_id+ FROM events+ WHERE+ site_id = {siteId:Int32}+ AND identified_user_id != ''+ ${timeStatement}+ ${filterStatement}+)+`+ : `SELECT- count(DISTINCT user_id) AS total_count+ count(DISTINCT COALESCE(NULLIF(events.identified_user_id, ''), events.user_id)) AS total_countFROM eventsWHEREsite_id = {siteId:Int32}@@ -124,12 +147,15 @@ WHERE}),]);- const data = await processResults<GetUsersResponse[number]>(result);+ const data = await processResults<Omit<GetUsersResponse[number], "traits">>(result);const countData = await processResults<{ total_count: number }>(countResult);const totalCount = countData[0]?.total_count || 0;+ // Enrich with traits from Postgres+ const dataWithTraits = await enrichWithTraits(data, Number(site));+return res.send({- data,+ data: dataWithTraits,totalCount,page: pageNum,pageSize: pageSizeNum,diff --git a/server/src/api/analytics/utils.ts b/server/src/api/analytics/utils.tsindex 53f749a83..6f5cb5f5d 100644--- a/server/src/api/analytics/utils.ts+++ b/server/src/api/analytics/utils.ts@@ -1,6 +1,9 @@import { ResultSet } from "@clickhouse/client";import { FilterParams } from "@rybbit/shared";+import { and, eq, inArray } from "drizzle-orm";import SqlString from "sqlstring";+import { db } from "../../db/postgres/postgres.js";+import { userProfiles } from "../../db/postgres/schema.js";import { filterParamSchema, validateFilters, validateTimeStatementParams } from "./query-validation.js";import { FilterParameter, FilterType } from "./types.js";@@ -72,9 +75,13 @@ export async function processResults<T>(results: ResultSet<"JSONEachRow">): Promif (key !== "session_id" &&key !== "user_id" &&+ key !== "identified_user_id" &&+ key !== "effective_user_id" &&row[key] !== null &&row[key] !== undefined &&row[key] !== "" &&+ row[key] !== true &&+ row[key] !== false &&!isNaN(Number(row[key]))) {row[key] = Number(row[key]) as any;@@ -335,3 +342,39 @@ export const bucketIntervalMap = {month: "1 MONTH",year: "1 YEAR",} as const;++/**+ * Enriches data with user traits from Postgres for identified users.+ * This is a shared utility to avoid duplicating the traits fetching logic.+ * Uses identified_user_id to look up traits since that's the custom user ID.+ */+export async function enrichWithTraits<T extends { identified_user_id: string }>(+ data: T[],+ siteId: number+): Promise<Array<T & { traits: Record<string, unknown> | null }>> {+ const identifiedUserIds = [+ ...new Set(data.filter((item) => item.identified_user_id).map((item) => item.identified_user_id)),+ ];++ let traitsMap: Map<string, Record<string, unknown>> = new Map();+ if (identifiedUserIds.length > 0) {+ const profiles = await db+ .select({+ userId: userProfiles.userId,+ traits: userProfiles.traits,+ })+ .from(userProfiles)+ .where(and(eq(userProfiles.siteId, siteId), inArray(userProfiles.userId, identifiedUserIds)));++ traitsMap = new Map(+ profiles.map((p) => [+ p.userId,+ p.traits && typeof p.traits === "object" && !Array.isArray(p.traits)+ ? (p.traits as Record<string, unknown>)+ : {},+ ])+ );+ }++ return data.map((item) => ({ ...item, traits: traitsMap.get(item.identified_user_id) || null }));+}diff --git a/server/src/api/sessionReplay/getSessionReplayEvents.ts b/server/src/api/sessionReplay/getSessionReplayEvents.tsindex 5260de897..43b2fa941 100644--- a/server/src/api/sessionReplay/getSessionReplayEvents.ts+++ b/server/src/api/sessionReplay/getSessionReplayEvents.ts@@ -1,5 +1,6 @@import { FastifyReply, FastifyRequest } from "fastify";import { SessionReplayQueryService } from "../../services/replay/sessionReplayQueryService.js";+import { enrichWithTraits } from "../analytics/utils.js";export async function getSessionReplayEvents(request: FastifyRequest<{@@ -14,7 +15,20 @@ export async function getSessionReplayEvents(const sessionReplayService = new SessionReplayQueryService();const replayData = await sessionReplayService.getSessionReplayEvents(siteId, sessionId);- return reply.send(replayData);+ // The metadata from ClickHouse uses snake_case+ const metadata = replayData.metadata as any;++ // Enrich metadata with user traits+ const metadataWithIdentification = {+ ...metadata,+ identified_user_id: metadata.identified_user_id || "",+ };+ const [enrichedMetadata] = await enrichWithTraits([metadataWithIdentification], siteId);++ return reply.send({+ ...replayData,+ metadata: enrichedMetadata,+ });} catch (error) {console.error("Error fetching session replay events:", error);if (error instanceof Error && error.message === "Session replay not found") {diff --git a/server/src/api/sessionReplay/getSessionReplays.ts b/server/src/api/sessionReplay/getSessionReplays.tsindex 88e2261eb..0aff9446d 100644--- a/server/src/api/sessionReplay/getSessionReplays.ts+++ b/server/src/api/sessionReplay/getSessionReplays.ts@@ -1,6 +1,7 @@import { FastifyReply, FastifyRequest } from "fastify";import { FilterParams } from "@rybbit/shared";import { SessionReplayQueryService } from "../../services/replay/sessionReplayQueryService.js";+import { enrichWithTraits } from "../analytics/utils.js";export async function getSessionReplays(request: FastifyRequest<{@@ -32,7 +33,13 @@ export async function getSessionReplays(filters: filters || "",});- return reply.send({ data: replays });+ // The replays from ClickHouse use snake_case and enrichWithTraits expects that format+ const replaysWithTraits = await enrichWithTraits(+ replays as unknown as Array<{ identified_user_id: string }>,+ siteId+ );++ return reply.send({ data: replaysWithTraits });} catch (error) {console.error("Error fetching session replays:", error);return reply.status(500).send({ error: "Internal server error" });diff --git a/server/src/db/clickhouse/clickhouse.ts b/server/src/db/clickhouse/clickhouse.tsindex 46bcf2f69..60c9b95c6 100644--- a/server/src/db/clickhouse/clickhouse.ts+++ b/server/src/db/clickhouse/clickhouse.ts@@ -58,7 +58,8 @@ export const initializeClickhouse = async () => {ADD COLUMN IF NOT EXISTS fcp Nullable(Float64),ADD COLUMN IF NOT EXISTS ttfb Nullable(Float64),ADD COLUMN IF NOT EXISTS ip Nullable(String),- ADD COLUMN IF NOT EXISTS timezone LowCardinality(String) DEFAULT ''+ ADD COLUMN IF NOT EXISTS timezone LowCardinality(String) DEFAULT '',+ ADD COLUMN IF NOT EXISTS identified_user_id String DEFAULT ''`,});@@ -116,7 +117,8 @@ export const initializeClickhouse = async () => {query: `ALTER TABLE session_replay_eventsADD COLUMN IF NOT EXISTS event_data_key Nullable(String), -- R2 storage key for cloud deployments- ADD COLUMN IF NOT EXISTS batch_index Nullable(UInt16) -- Index within the R2 batch+ ADD COLUMN IF NOT EXISTS batch_index Nullable(UInt16), -- Index within the R2 batch+ ADD COLUMN IF NOT EXISTS identified_user_id String DEFAULT ''`,});@@ -158,6 +160,13 @@ export const initializeClickhouse = async () => {`,});+ await clickhouse.exec({+ query: `+ ALTER TABLE session_replay_metadata+ ADD COLUMN IF NOT EXISTS identified_user_id String DEFAULT ''+ `,+ });+// Create uptime monitor events tableawait clickhouse.exec({query: `diff --git a/server/src/db/postgres/schema.ts b/server/src/db/postgres/schema.tsindex 262ed48e4..4901d01b8 100644--- a/server/src/db/postgres/schema.ts+++ b/server/src/db/postgres/schema.ts@@ -7,6 +7,7 @@ import {integer,jsonb,pgTable,+ primaryKey,real,serial,text,@@ -522,3 +523,40 @@ export const gscConnections = pgTable("gsc_connections", {createdAt: timestamp("created_at", { mode: "string" }).defaultNow().notNull(),updatedAt: timestamp("updated_at", { mode: "string" }).defaultNow().notNull(),});++// User profiles - stores identified user traits (email, name, custom fields)+export const userProfiles = pgTable(+ "user_profiles",+ {+ siteId: integer("site_id")+ .notNull()+ .references(() => sites.siteId, { onDelete: "cascade" }),+ userId: text("user_id").notNull(), // The identified user ID from identify() call+ traits: jsonb("traits").$type<Record<string, unknown>>().default({}),+ createdAt: timestamp("created_at", { mode: "string" }).defaultNow().notNull(),+ updatedAt: timestamp("updated_at", { mode: "string" }).defaultNow().notNull(),+ },+ (table) => [+ primaryKey({ columns: [table.siteId, table.userId] }),+ index("user_profiles_site_idx").on(table.siteId),+ ]+);++// User aliases - maps anonymous IDs to identified users (multi-device support)+export const userAliases = pgTable(+ "user_aliases",+ {+ id: serial("id").primaryKey().notNull(),+ siteId: integer("site_id")+ .notNull()+ .references(() => sites.siteId, { onDelete: "cascade" }),+ anonymousId: text("anonymous_id").notNull(), // Hash of IP+UserAgent (device fingerprint)+ userId: text("user_id").notNull(), // The identified user ID+ createdAt: timestamp("created_at", { mode: "string" }).defaultNow().notNull(),+ },+ (table) => [+ unique("user_aliases_site_anon_unique").on(table.siteId, table.anonymousId),+ index("user_aliases_user_idx").on(table.siteId, table.userId),+ index("user_aliases_anon_idx").on(table.siteId, table.anonymousId),+ ]+);diff --git a/server/src/index.ts b/server/src/index.tsindex 47e87f677..2b4eb0135 100644--- a/server/src/index.ts+++ b/server/src/index.ts@@ -77,6 +77,7 @@ import { auth } from "./lib/auth.js";import { IS_CLOUD } from "./lib/const.js";import { siteConfig } from "./lib/siteConfig.js";import { trackEvent } from "./services/tracker/trackEvent.js";+import { handleIdentify } from "./services/tracker/identifyService.js";// need to import telemetry service here to start itimport { telemetryService } from "./services/telemetryService.js";import { weeklyReportService } from "./services/weekyReports/weeklyReportService.js";@@ -202,7 +203,7 @@ server.register(const PUBLIC_ROUTES: string[] = ["/api/health","/api/track",- "/track",+ "/api/identify","/api/script.js","/api/script-full.js","/api/replay.js",@@ -449,6 +450,9 @@ if (IS_CLOUD) {server.post("/track", trackEvent);server.post("/api/track", trackEvent);+server.post("/identify", handleIdentify);+server.post("/api/identify", handleIdentify);+server.get("/api/health", { logLevel: "silent" }, (_, reply) => reply.send("OK"));const start = async () => {diff --git a/server/src/services/replay/sessionReplayIngestService.ts b/server/src/services/replay/sessionReplayIngestService.tsindex b3df28302..23c329828 100644--- a/server/src/services/replay/sessionReplayIngestService.ts+++ b/server/src/services/replay/sessionReplayIngestService.ts@@ -27,11 +27,20 @@ export class SessionReplayIngestService {): Promise<void> {const { userId: clientUserId, events, metadata } = request;- // Generate user ID server-side if not provided by client- const userId =- clientUserId && clientUserId.trim()- ? clientUserId.trim()- : await userIdService.generateUserId(requestMeta?.ipAddress || "", requestMeta?.userAgent || "", siteId);+ // Always generate device fingerprint (anonymous user ID) server-side+ const deviceFingerprint = await userIdService.generateUserId(+ requestMeta?.ipAddress || "",+ requestMeta?.userAgent || "",+ siteId+ );++ // Check if client provided an identified user ID (different from device fingerprint)+ const trimmedClientUserId = clientUserId?.trim() || "";+ const identifiedUserId =+ trimmedClientUserId && trimmedClientUserId !== deviceFingerprint ? trimmedClientUserId : "";++ // Use device fingerprint as the primary user_id for session tracking+ const userId = deviceFingerprint;// Get or create a session ID from the sessions serviceconst { sessionId } = await sessionsService.updateSession({@@ -66,6 +75,7 @@ export class SessionReplayIngestService {site_id: siteId,session_id: sessionId,user_id: userId,+ identified_user_id: identifiedUserId,timestamp: event.timestamp,event_type: event.type,event_data: "", // Empty string when using R2@@ -83,6 +93,7 @@ export class SessionReplayIngestService {site_id: siteId,session_id: sessionId,user_id: userId,+ identified_user_id: identifiedUserId,timestamp: event.timestamp,event_type: event.type,event_data: serializedData,@@ -108,7 +119,7 @@ export class SessionReplayIngestService {// Update or insert metadataif (metadata) {- await this.updateSessionMetadata(siteId, sessionId, userId, metadata, requestMeta);+ await this.updateSessionMetadata(siteId, sessionId, userId, identifiedUserId, metadata, requestMeta);}}@@ -116,6 +127,7 @@ export class SessionReplayIngestService {siteId: number,sessionId: string,userId: string,+ identifiedUserId: string,metadata: any,requestMeta?: RequestMetadata): Promise<void> {@@ -188,6 +200,7 @@ export class SessionReplayIngestService {site_id: siteId,session_id: sessionId,user_id: userId,+ identified_user_id: identifiedUserId,start_time: DateTime.fromJSDate(startTime).toFormat("yyyy-MM-dd HH:mm:ss"),end_time: endTime ? DateTime.fromJSDate(endTime).toFormat("yyyy-MM-dd HH:mm:ss") : null,duration_ms: durationMs,diff --git a/server/src/services/replay/sessionReplayQueryService.ts b/server/src/services/replay/sessionReplayQueryService.tsindex bf16d3777..fb68d35d6 100644--- a/server/src/services/replay/sessionReplayQueryService.ts+++ b/server/src/services/replay/sessionReplayQueryService.ts@@ -32,7 +32,7 @@ export class SessionReplayQueryService {const queryParams: any = { siteId, limit, offset };if (userId) {- whereConditions.push(`user_id = {userId:String}`);+ whereConditions.push(`(user_id = {userId:String} OR identified_user_id = {userId:String})`);queryParams.userId = userId;}@@ -70,9 +70,10 @@ export class SessionReplayQueryService {}const query = `- SELECT+ SELECTsession_id,user_id,+ identified_user_id,start_time,end_time,duration_ms,diff --git a/server/src/services/tracker/identifyService.ts b/server/src/services/tracker/identifyService.tsnew file mode 100644index 000000000..2e5ae6e3e--- /dev/null+++ b/server/src/services/tracker/identifyService.ts@@ -0,0 +1,159 @@+import { FastifyReply, FastifyRequest } from "fastify";+import { eq, and } from "drizzle-orm";+import { z } from "zod";+import { db } from "../../db/postgres/postgres.js";+import { userProfiles, userAliases } from "../../db/postgres/schema.js";+import { siteConfig } from "../../lib/siteConfig.js";+import { userIdService } from "../userId/userIdService.js";+import { getIpAddress } from "../../utils.js";+import { createServiceLogger } from "../../lib/logger/logger.js";++const logger = createServiceLogger("identify-service");++// Max traits size in bytes (2KB)+const MAX_TRAITS_SIZE = 2048;++// Validation schema for identify requests+const identifyPayloadSchema = z.object({+ site_id: z.string().min(1),+ user_id: z.string().min(1).max(255),+ traits: z+ .record(z.unknown())+ .optional()+ .refine(+ (traits) => {+ if (!traits) return true;+ const size = new TextEncoder().encode(JSON.stringify(traits)).length;+ return size <= MAX_TRAITS_SIZE;+ },+ { message: `Traits must be less than ${MAX_TRAITS_SIZE} bytes (2KB)` }+ ),+ is_new_identify: z.boolean().default(true),+});++export async function handleIdentify(request: FastifyRequest, reply: FastifyReply) {+ try {+ const validationResult = identifyPayloadSchema.safeParse(request.body);++ if (!validationResult.success) {+ return reply.status(400).send({+ success: false,+ error: "Invalid payload",+ details: validationResult.error.flatten(),+ });+ }++ const { site_id, user_id, traits, is_new_identify } = validationResult.data;++ // Get site configuration+ const siteConfiguration = await siteConfig.getConfig(site_id);+ if (!siteConfiguration) {+ return reply.status(404).send({+ success: false,+ error: "Site not found",+ });+ }++ const siteId = siteConfiguration.siteId;++ // Compute anonymous_id from request (same logic as tracking)+ const ipAddress = getIpAddress(request);+ const userAgent = request.headers["user-agent"] || "";+ const anonymousId = await userIdService.generateUserId(ipAddress, userAgent, siteId);++ // Create alias if this is a new identify call (links anonymous_id to user_id)+ if (is_new_identify) {+ try {+ // Check if alias already exists+ const existingAlias = await db+ .select()+ .from(userAliases)+ .where(and(eq(userAliases.siteId, siteId), eq(userAliases.anonymousId, anonymousId)))+ .limit(1);++ if (existingAlias.length === 0) {+ // Create new alias+ await db.insert(userAliases).values({+ siteId,+ anonymousId,+ userId: user_id,+ });++ logger.info({ siteId, anonymousId, userId: user_id }, "Created new user alias");+ } else if (existingAlias[0].userId !== user_id) {+ // Anonymous ID already linked to a different user - log but don't error+ logger.warn(+ {+ siteId,+ anonymousId,+ existingUserId: existingAlias[0].userId,+ newUserId: user_id,+ },+ "Anonymous ID already linked to different user"+ );+ }+ } catch (error) {+ // Handle unique constraint violation gracefully (race condition)+ logger.debug({ siteId, anonymousId, userId: user_id, error }, "Alias may already exist");+ }+ }++ // Update or create user profile with traits+ if (traits && Object.keys(traits).length > 0) {+ try {+ const existingProfile = await db+ .select()+ .from(userProfiles)+ .where(and(eq(userProfiles.siteId, siteId), eq(userProfiles.userId, user_id)))+ .limit(1);++ if (existingProfile.length > 0) {+ // Merge new traits with existing (new traits override old)+ // Traits with null values are removed from the result+ const merged = {+ ...((existingProfile[0].traits as Record<string, unknown>) || {}),+ ...traits,+ };+ const mergedTraits = Object.fromEntries(+ Object.entries(merged).filter(([_, value]) => value !== null)+ );++ await db+ .update(userProfiles)+ .set({+ traits: mergedTraits,+ updatedAt: new Date().toISOString(),+ })+ .where(and(eq(userProfiles.siteId, siteId), eq(userProfiles.userId, user_id)));++ logger.info({ siteId, userId: user_id }, "Updated user profile traits");+ } else {+ // Create new profile (filter out null values)+ const filteredTraits = Object.fromEntries(+ Object.entries(traits).filter(([_, value]) => value !== null)+ );+ await db.insert(userProfiles).values({+ siteId,+ userId: user_id,+ traits: filteredTraits,+ });++ logger.info({ siteId, userId: user_id }, "Created new user profile");+ }+ } catch (error) {+ logger.error({ siteId, userId: user_id, error }, "Error updating user profile");+ // Don't fail the request if profile update fails+ }+ }++ return reply.status(200).send({+ success: true,+ });+ } catch (error) {+ logger.error(error, "Error handling identify");+ return reply.status(500).send({+ success: false,+ error: "Failed to process identify",+ });+ }+}diff --git a/server/src/services/tracker/pageviewQueue.ts b/server/src/services/tracker/pageviewQueue.tsindex ac20e1f76..98617e802 100644--- a/server/src/services/tracker/pageviewQueue.ts+++ b/server/src/services/tracker/pageviewQueue.ts@@ -65,7 +65,9 @@ class PageviewQueue {site_id: pv.site_id,timestamp: DateTime.fromISO(pv.timestamp).toFormat("yyyy-MM-dd HH:mm:ss"),session_id: pv.sessionId,- user_id: pv.userId,+ user_id: pv.userId, // Always the device fingerprint+ anonymous_id: pv.anonymousId,+ identified_user_id: pv.identifiedUserId || "", // Custom user ID when identifiedhostname: pv.hostname || "",pathname: pv.pathname || "",querystring: pv.querystring || "",diff --git a/server/src/services/tracker/utils.ts b/server/src/services/tracker/utils.tsindex 11c5222d4..bc19cf8ec 100644--- a/server/src/services/tracker/utils.ts+++ b/server/src/services/tracker/utils.ts@@ -8,7 +8,9 @@ import { TrackingPayload } from "./types.js";import { SiteConfigData } from "../../lib/siteConfig.js";export type TotalTrackingPayload = TrackingPayload & {- userId: string;+ userId: string; // Always the device fingerprint (same as anonymousId)+ anonymousId: string; // Always the hash of IP+UserAgent (device fingerprint)+ identifiedUserId: string; // Custom user ID when identified, empty string otherwisetimestamp: string;type?: string;event_name?: string;@@ -100,10 +102,16 @@ export async function createBasePayload(// Override IP if provided in payloadconst ipAddress = validatedBody.ip_address || getIpAddress(request);- // Use custom user ID if provided, otherwise generate one- const userId = validatedBody.user_id- ? validatedBody.user_id.trim()- : await userIdService.generateUserId(ipAddress, userAgent, siteConfiguration.siteId);+ // Always compute anonymous_id based on IP+UserAgent (device fingerprint)+ const anonymousId = await userIdService.generateUserId(+ ipAddress,+ userAgent,+ siteConfiguration.siteId+ );++ // userId is always the device fingerprint+ // identifiedUserId is the custom user ID when provided, empty string otherwise+ const identifiedUserId = validatedBody.user_id ? validatedBody.user_id.trim() : "";return {...validatedBody,@@ -120,7 +128,9 @@ export async function createBasePayload(ipAddress: ipAddress,timestamp: new Date().toISOString(),ua: userAgentParser(userAgent),- userId: userId,+ userId: anonymousId, // Always the device fingerprint+ anonymousId: anonymousId,+ identifiedUserId: identifiedUserId, // Custom user ID when identifiedstoreIp: siteConfiguration.trackIp,} as any;}diff --git a/server/src/types/sessionReplay.ts b/server/src/types/sessionReplay.tsindex b92617dc5..ba4b61c03 100644--- a/server/src/types/sessionReplay.ts+++ b/server/src/types/sessionReplay.ts@@ -2,6 +2,7 @@ export interface SessionReplayEvent {siteId: number;sessionId: string;userId: string;+ identifiedUserId?: string;timestamp: Date;eventType: string;eventData: string;@@ -16,6 +17,7 @@ export interface SessionReplayMetadata {siteId: number;sessionId: string;userId: string;+ identifiedUserId?: string;startTime: Date;endTime?: Date;durationMs?: number;@@ -62,6 +64,7 @@ export interface RecordSessionReplayRequest {export interface SessionReplayListItem {sessionId: string;userId: string;+ identifiedUserId?: string;startTime: Date;endTime?: Date;durationMs?: number;