🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Replay update (#766)
Bill Yangd5cc6af8ae1f
diff --git a/client/src/api/analytics/endpoints/sessions.ts b/client/src/api/analytics/endpoints/sessions.tsindex 9e7e192dc..ab5380d3f 100644--- a/client/src/api/analytics/endpoints/sessions.ts+++ b/client/src/api/analytics/endpoints/sessions.ts@@ -40,6 +40,7 @@ export type GetSessionsResponse = {ip: string;lat: number;lon: number;+ has_replay: number;}[];// Session details typediff --git a/client/src/app/[site]/replay/components/ReplayCard.tsx b/client/src/app/[site]/replay/components/ReplayCard.tsxindex 18154a688..aa71623fb 100644--- a/client/src/app/[site]/replay/components/ReplayCard.tsx+++ b/client/src/app/[site]/replay/components/ReplayCard.tsx@@ -25,7 +25,7 @@ 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 { useReplayStore } from "@/components/replay/replayStore";interface SessionReplayListItem {session_id: string;@@ -82,8 +82,7 @@ export function ReplayCard({ replay }: { replay: SessionReplayListItem }) {return (<divclassName={cn(- "bg-white dark:bg-neutral-900 border-b border-neutral-100 dark:border-neutral-800 p-3 hover:bg-neutral-50 dark:hover:bg-neutral-800/80 transition-colors cursor-pointer w-[200px] group relative",- // "bg-neutral-900 border border-neutral-800 rounded-lg p-3 hover:bg-neutral-800/50 transition-colors cursor-pointer",+ "border-b border-neutral-100 dark:border-neutral-800 p-3 hover:bg-neutral-50 dark:hover:bg-neutral-800/80 transition-colors cursor-pointer w-[200px] group relative",sessionId === replay.session_id && "bg-neutral-100 dark:bg-neutral-800/80")}onClick={() => {@@ -182,7 +181,7 @@ export function ReplayCard({ replay }: { replay: SessionReplayListItem }) {export function ReplayCardSkeleton() {return (- <div className="bg-white dark:bg-neutral-900 border-b border-neutral-100 dark:border-neutral-800 p-3 hover:bg-neutral-50 dark:hover:bg-neutral-800/80 transition-colors">+ <div className="border-b border-neutral-100 dark:border-neutral-800 p-3 hover:bg-neutral-50 dark:hover:bg-neutral-800/80 transition-colors">{/* Time and duration row */}<div className="flex items-center gap-2 mb-1"><Skeleton className="h-3 w-16" />diff --git a/client/src/app/[site]/replay/components/ReplayList.tsx b/client/src/app/[site]/replay/components/ReplayList.tsxindex 3eb65f79e..91edf2952 100644--- a/client/src/app/[site]/replay/components/ReplayList.tsx+++ b/client/src/app/[site]/replay/components/ReplayList.tsx@@ -5,7 +5,7 @@ import { NothingFound } from "../../../../components/NothingFound";import { ReplayCard, ReplayCardSkeleton } from "./ReplayCard";import { useGetSessionReplays } from "../../../../api/analytics/hooks/sessionReplay/useGetSessionReplays";import { SessionReplayListItem } from "../../../../api/analytics/endpoints";-import { useReplayStore } from "./replayStore";+import { useReplayStore } from "@/components/replay/replayStore";import { ScrollArea } from "../../../../components/ui/scroll-area";import { Input } from "../../../../components/ui/input";@@ -63,7 +63,7 @@ export function ReplayList() {</div></div><div className="rounded-lg border border-neutral-100 dark:border-neutral-800 flex flex-col">- <ScrollArea className="h-[calc(100vh-178px)]">+ <ScrollArea className="h-[calc(100vh-130px)] rounded-lg">{isLoading ? (Array.from({ length: 20 }).map((_, index) => <ReplayCardSkeleton key={`loading-${index}`} />)) : flattenedData.length === 0 ? (diff --git a/client/src/app/[site]/replay/page.tsx b/client/src/app/[site]/replay/page.tsxindex 4ceb9bc7d..cf0202635 100644--- a/client/src/app/[site]/replay/page.tsx+++ b/client/src/app/[site]/replay/page.tsx@@ -1,6 +1,6 @@"use client";-import { useMeasure } from "@uidotdev/usehooks";+import { useMeasure, useWindowSize } from "@uidotdev/usehooks";import { useGetSessionReplays } from "../../../api/analytics/hooks/sessionReplay/useGetSessionReplays";import { DisabledOverlay } from "../../../components/DisabledOverlay";import { useSetPageTitle } from "../../../hooks/useSetPageTitle";@@ -8,10 +8,10 @@ import { SESSION_REPLAY_PAGE_FILTERS } from "../../../lib/filterGroups";import { SubHeader } from "../components/SubHeader/SubHeader";import { EnableSessionReplay } from "./components/EnableSessionReplay";import { ReplayList } from "./components/ReplayList";-import { ReplayPlayer } from "./components/player/ReplayPlayer";+import { ReplayPlayer } from "@/components/replay/player/ReplayPlayer";import { NothingFound } from "../../../components/NothingFound";-import { ReplayBreadcrumbs } from "./components/ReplayBreadcrumbs";-import { useReplayStore } from "./components/replayStore";+import { ReplayBreadcrumbs } from "@/components/replay/ReplayBreadcrumbs";+import { useReplayStore } from "@/components/replay/replayStore";import { Video } from "lucide-react";export default function SessionReplayPage() {@@ -23,11 +23,12 @@ export default function SessionReplayPage() {const hasNoReplays = !isLoading && !data?.pages[0].data?.length;- const [ref, { height: resolvedHeight, width: resolvedWidth }] = useMeasure();+ const [ref, { width: resolvedWidth }] = useMeasure();+ const { height: windowHeight } = useWindowSize();return (<DisabledOverlay message="Replay" featurePath="replay" requiredPlan="pro">- <div className="p-2 md:p-4 max-w-[2000px] mx-auto flex flex-col gap-1 overflow-y-hidden">+ <div className="p-2 md:p-4 max-w-[2000px] mx-auto flex flex-col gap-1 h-dvh overflow-hidden"><SubHeader availableFilters={SESSION_REPLAY_PAGE_FILTERS} /><EnableSessionReplay />{hasNoReplays ? (@@ -37,12 +38,14 @@ export default function SessionReplayPage() {description={"Replays will appear here once session replay is enabled."}/>) : (- <div className="grid grid-cols-[200px_1fr_300px] gap-3">+ <div className="grid grid-cols-[200px_1fr_300px] gap-3 flex-1 min-h-0"><ReplayList />- <div ref={ref} className="w-[calc(min(100vw, 2000px)-780px)]">- {resolvedWidth && resolvedHeight && <ReplayPlayer width={resolvedWidth} height={resolvedHeight - 1} />}+ <div ref={ref} className="w-[calc(min(100vw, 2000px)-780px)] h-full overflow-hidden">+ {resolvedWidth && windowHeight && <ReplayPlayer width={resolvedWidth} height={windowHeight - 76} />}+ </div>+ <div className="h-[calc(100vh-133px)]">+ <ReplayBreadcrumbs /></div>- <ReplayBreadcrumbs /></div>)}</div>diff --git a/client/src/app/[site]/user/[userId]/components/Calendar.tsx b/client/src/app/[site]/user/[userId]/components/Calendar.tsxindex 6cdb0465d..5b19c553b 100644--- a/client/src/app/[site]/user/[userId]/components/Calendar.tsx+++ b/client/src/app/[site]/user/[userId]/components/Calendar.tsx@@ -39,7 +39,7 @@ export const VisitCalendar = ({ sessionCount }: { sessionCount: UserSessionCount? ["#10452A", "#006D32", "#3E9058", "#3CD456"]: ["#9be9a8", "#40c463", "#30a14e", "#216e39"]}- margin={{ top: 20, right: 0, bottom: 0, left: 0 }}+ margin={{ top: 20, right: 20, bottom: 0, left: -10 }}dayBorderWidth={2}daySpacing={3}dayBorderColor="rgba(0, 0, 0, 0)"diff --git a/client/src/components/DisabledOverlay.tsx b/client/src/components/DisabledOverlay.tsxindex a124b0878..328d0e22d 100644--- a/client/src/components/DisabledOverlay.tsx+++ b/client/src/components/DisabledOverlay.tsx@@ -171,7 +171,7 @@ export const DisabledOverlay: React.FC<DisabledOverlayProps> = ({};}, [disabled, overlayRemoved, blur]);- if (!disabled || data?.user?.role === "admin" || globalThis.location.hostname === DEMO_HOSTNAME) {+ if (!disabled || data?.user?.role === "admin" || globalThis?.location?.hostname === DEMO_HOSTNAME) {return <>{children}</>;}diff --git a/client/src/components/Sessions/ReplayDrawer.tsx b/client/src/components/Sessions/ReplayDrawer.tsxnew file mode 100644index 000000000..2f603c952--- /dev/null+++ b/client/src/components/Sessions/ReplayDrawer.tsx@@ -0,0 +1,91 @@+"use client";++import { useEffect, useRef, useState } from "react";+import { Drawer, DrawerContent, DrawerTitle } from "@/components/ui/drawer";+import { ReplayPlayer } from "@/components/replay/player/ReplayPlayer";+import { useReplayStore } from "@/components/replay/replayStore";+import { ReplayBreadcrumbs } from "@/components/replay/ReplayBreadcrumbs";+import { VisuallyHidden } from "@radix-ui/react-visually-hidden";++interface ReplayDrawerProps {+ sessionId: string;+ open: boolean;+ onOpenChange: (open: boolean) => void;+}++export function ReplayDrawer({ sessionId, open, onOpenChange }: ReplayDrawerProps) {+ const { setSessionId, resetPlayerState } = useReplayStore();+ const containerRef = useRef<HTMLDivElement>(null);+ const [dimensions, setDimensions] = useState({ width: 0, height: 0 });++ // Set sessionId in store when drawer opens+ useEffect(() => {+ if (open && sessionId) {+ setSessionId(sessionId);+ }+ }, [open, sessionId, setSessionId]);++ // Reset player state when drawer closes+ useEffect(() => {+ if (!open) {+ resetPlayerState();+ }+ }, [open, resetPlayerState]);++ // Measure container dimensions using getBoundingClientRect for more reliable sizing+ useEffect(() => {+ if (!open) return;++ const measureDimensions = () => {+ if (containerRef.current) {+ const rect = containerRef.current.getBoundingClientRect();+ if (rect.width > 0 && rect.height > 0) {+ setDimensions({ width: rect.width, height: rect.height });+ }+ }+ };++ // Measure after a short delay to ensure drawer animation has completed+ const timeoutId = setTimeout(measureDimensions, 100);++ // Also set up resize observer for window resizes+ const resizeObserver = new ResizeObserver(() => {+ measureDimensions();+ });++ if (containerRef.current) {+ resizeObserver.observe(containerRef.current);+ }++ window.addEventListener("resize", measureDimensions);++ return () => {+ clearTimeout(timeoutId);+ resizeObserver.disconnect();+ window.removeEventListener("resize", measureDimensions);+ };+ }, [open]);++ return (+ <Drawer open={open} onOpenChange={onOpenChange}>+ <VisuallyHidden>+ <DrawerTitle>Session Replay</DrawerTitle>+ </VisuallyHidden>+ <DrawerContent className="h-[90vh]">+ <div className="flex gap-2 p-2 h-[97%]">+ {/* Player */}+ <div ref={containerRef} className="relative flex-1" style={{ height: "calc(90vh - 40px)" }}>+ {dimensions.width > 0 && dimensions.height > 0 && (+ <ReplayPlayer width={dimensions.width} height={dimensions.height} isDrawer={true} />+ )}+ </div>++ {/* Timeline sidebar */}+ <div className="w-[300px] hidden lg:block h-[calc(90vh - 40px)]">+ <ReplayBreadcrumbs />+ </div>+ </div>+ </DrawerContent>+ </Drawer>+ );+}diff --git a/client/src/components/Sessions/SessionCard.tsx b/client/src/components/Sessions/SessionCard.tsxindex 69f69fba6..bd5441da3 100644--- a/client/src/components/Sessions/SessionCard.tsx+++ b/client/src/components/Sessions/SessionCard.tsx@@ -1,6 +1,6 @@import { Skeleton } from "@/components/ui/skeleton";import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";-import { ArrowRight, ChevronDown, ChevronRight } from "lucide-react";+import { ArrowRight, ChevronDown, ChevronRight, Video } from "lucide-react";import { DateTime } from "luxon";import { memo, useState } from "react";import { GetSessionsResponse } from "../../api/analytics/endpoints";@@ -18,6 +18,7 @@ import {} from "../TooltipIcons/TooltipIcons";import { Badge } from "../ui/badge";import { SessionDetails } from "./SessionDetails";+import { ReplayDrawer } from "./ReplayDrawer";interface SessionCardProps {session: GetSessionsResponse[number];@@ -37,6 +38,7 @@ function truncatePath(path: string, maxLength: number = 32) {export function SessionCard({ session, onClick, userId, expandedByDefault }: SessionCardProps) {const [expanded, setExpanded] = useState(expandedByDefault || false);+ const [replayDrawerOpen, setReplayDrawerOpen] = useState(false);// Calculate session duration in minutesconst start = DateTime.fromSQL(session.session_start);const end = DateTime.fromSQL(session.session_end);@@ -84,6 +86,22 @@ export function SessionCard({ session, onClick, userId, expandedByDefault }: Sesscreen_width={session.screen_width}screen_height={session.screen_height}/>+ {session.has_replay === 1 && (+ <Tooltip>+ <TooltipTrigger asChild>+ <Badge+ variant="success"+ onClick={e => {+ e.stopPropagation();+ setReplayDrawerOpen(true);+ }}+ >+ <Video className="w-4 h-4" />+ </Badge>+ </TooltipTrigger>+ <TooltipContent>Watch Session Replay</TooltipContent>+ </Tooltip>+ )}<Tooltip><TooltipTrigger asChild><Badge className="flex items-center gap-1 bg-neutral-100 dark:bg-neutral-800 text-neutral-600 dark:text-neutral-300">@@ -102,6 +120,7 @@ export function SessionCard({ session, onClick, userId, expandedByDefault }: Ses</TooltipTrigger><TooltipContent>Events</TooltipContent></Tooltip>+<Channel channel={session.channel} referrer={session.referrer} /></div>@@ -160,6 +179,11 @@ export function SessionCard({ session, onClick, userId, expandedByDefault }: Ses{/* Expanded content using SessionDetails component */}{expanded && <SessionDetails session={session} userId={userId} />}++ {/* Replay Drawer */}+ {session.has_replay === 1 && (+ <ReplayDrawer sessionId={session.session_id} open={replayDrawerOpen} onOpenChange={setReplayDrawerOpen} />+ )}</div>);}diff --git a/client/src/app/[site]/replay/components/ReplayBreadcrumbs.tsx b/client/src/components/replay/ReplayBreadcrumbs.tsxsimilarity index 53%rename from client/src/app/[site]/replay/components/ReplayBreadcrumbs.tsxrename to client/src/components/replay/ReplayBreadcrumbs.tsxindex d1ec4e8f1..c99c5533e 100644--- a/client/src/app/[site]/replay/components/ReplayBreadcrumbs.tsx+++ b/client/src/components/replay/ReplayBreadcrumbs.tsx@@ -28,12 +28,12 @@ import { DateTime, Duration } from "luxon";import Link from "next/link";import { useParams } from "next/navigation";import { useMemo } from "react";-import { useGetSessionReplayEvents } from "../../../../api/analytics/hooks/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, getUserDisplayName } from "../../../../lib/utils";+import { useGetSessionReplayEvents } from "@/api/analytics/hooks/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, getUserDisplayName } from "@/lib/utils";import { useReplayStore } from "./replayStore";// Event type mapping based on rrweb event types@@ -67,6 +67,87 @@ const INCREMENTAL_TYPES = {15: "Adopted Style Sheet",};+const getEventDescription = (event: any) => {+ const eventTypeStr = String(event.type);+ const eventInfo = EVENT_TYPE_INFO[eventTypeStr as keyof typeof EVENT_TYPE_INFO] || {+ name: `Unknown (${eventTypeStr})`,+ icon: Globe,+ color: "text-neutral-400",+ };++ // For incremental snapshots, get more detail+ if (eventTypeStr === "3" && event.data?.source !== undefined) {+ const incrementalType = INCREMENTAL_TYPES[event.data.source as keyof typeof INCREMENTAL_TYPES] || "Unknown";+ return `${incrementalType}`;+ }++ // For meta events, show URL if available+ if (eventTypeStr === "4" && event.data?.href) {+ const url = event.data.href;+ try {+ const urlObj = new URL(url);+ return urlObj.pathname;+ } catch {+ return url;+ }+ }++ return eventInfo.name;+};++const getEventIcon = (event: any) => {+ const eventTypeStr = String(event.type);+ const eventInfo = EVENT_TYPE_INFO[eventTypeStr as keyof typeof EVENT_TYPE_INFO];++ // Special icons for specific incremental snapshot types+ if (eventTypeStr === "3" && event.data?.source !== undefined) {+ switch (event.data.source) {+ case 0:+ return FileEdit; // Mutation+ case 1:+ return Mouse; // Mouse Move+ case 2:+ return MousePointerClick; // Mouse Interaction+ case 3:+ return ScrollText; // Scroll+ case 4:+ return Maximize2; // Viewport Resize+ case 5:+ return Keyboard; // Input+ case 6:+ return Smartphone; // Touch Move+ case 7:+ return Play; // Media Interaction+ case 8:+ return Palette; // Style Sheet Rule+ case 9:+ return Brush; // Canvas Mutation+ case 10:+ return Type; // Font+ case 11:+ return Terminal; // Log+ case 12:+ return Move; // Drag+ case 13:+ return PaintBucket; // Style Declaration+ case 14:+ return TextSelect; // Selection+ case 15:+ return FileCode; // Adopted Style Sheet+ default:+ return MousePointer; // Fallback+ }+ }++ return eventInfo?.icon || Globe;+};++const getEventColor = (event: any) => {+ const eventTypeStr = String(event.type);+ const eventInfo = EVENT_TYPE_INFO[eventTypeStr as keyof typeof EVENT_TYPE_INFO];+ return eventInfo?.color || "text-neutral-400";+};+export function ReplayBreadcrumbs() {const params = useParams();const siteId = Number(params.site);@@ -147,90 +228,9 @@ export function ReplayBreadcrumbs() {setCurrentTime(timeInSeconds);};- const getEventDescription = (event: any) => {- const eventTypeStr = String(event.type);- const eventInfo = EVENT_TYPE_INFO[eventTypeStr as keyof typeof EVENT_TYPE_INFO] || {- name: `Unknown (${eventTypeStr})`,- icon: Globe,- color: "text-neutral-400",- };-- // For incremental snapshots, get more detail- if (eventTypeStr === "3" && event.data?.source !== undefined) {- const incrementalType = INCREMENTAL_TYPES[event.data.source as keyof typeof INCREMENTAL_TYPES] || "Unknown";- return `${incrementalType}`;- }-- // For meta events, show URL if available- if (eventTypeStr === "4" && event.data?.href) {- const url = event.data.href;- try {- const urlObj = new URL(url);- return urlObj.pathname;- } catch {- return url;- }- }-- return eventInfo.name;- };-- const getEventIcon = (event: any) => {- const eventTypeStr = String(event.type);- const eventInfo = EVENT_TYPE_INFO[eventTypeStr as keyof typeof EVENT_TYPE_INFO];-- // Special icons for specific incremental snapshot types- if (eventTypeStr === "3" && event.data?.source !== undefined) {- switch (event.data.source) {- case 0:- return FileEdit; // Mutation- case 1:- return Mouse; // Mouse Move- case 2:- return MousePointerClick; // Mouse Interaction- case 3:- return ScrollText; // Scroll- case 4:- return Maximize2; // Viewport Resize- case 5:- return Keyboard; // Input- case 6:- return Smartphone; // Touch Move- case 7:- return Play; // Media Interaction- case 8:- return Palette; // Style Sheet Rule- case 9:- return Brush; // Canvas Mutation- case 10:- return Type; // Font- case 11:- return Terminal; // Log- case 12:- return Move; // Drag- case 13:- return PaintBucket; // Style Declaration- case 14:- return TextSelect; // Selection- case 15:- return FileCode; // Adopted Style Sheet- default:- return MousePointer; // Fallback- }- }-- return eventInfo?.icon || Globe;- };-- const getEventColor = (event: any) => {- const eventTypeStr = String(event.type);- const eventInfo = EVENT_TYPE_INFO[eventTypeStr as keyof typeof EVENT_TYPE_INFO];- return eventInfo?.color || "text-neutral-400";- };-if (isLoading || !data?.events) {return (- <div className="rounded-lg border border-neutral-100 dark:border-neutral-800 p-4 flex items-center justify-center h-[calc(100vh-120px)]">+ <div className="rounded-lg border border-neutral-100 dark:border-neutral-800 p-4 flex items-center justify-center h-full"><Loader2 className="w-6 h-6 animate-spin text-neutral-600 dark:text-neutral-400" /></div>);@@ -261,7 +261,7 @@ export function ReplayBreadcrumbs() {: `/${siteId}/user/${data.metadata.user_id}`;return (- <div className="flex flex-col gap-2">+ <div className="flex flex-col gap-2 h-full"><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@@ -278,54 +278,52 @@ export function ReplayBreadcrumbs() {<Button size="sm">View User</Button></Link></div>- <div className="rounded-lg border border-neutral-100 dark:border-neutral-800 flex flex-col">- <div className="p-2 border-b border-neutral-100 dark:border-neutral-800 bg-white dark:bg-neutral-900 text-xs text-neutral-600 dark:text-neutral-400">+ <div className="rounded-lg border border-neutral-100 dark:border-neutral-800 flex flex-col h-full bg-white dark:bg-neutral-900">+ <div className="p-2 border-b border-neutral-100 dark:border-neutral-800 text-xs text-neutral-600 dark:text-neutral-400 shrink-0">{data.events.length} events captured ({groupedEvents.length} groups)</div>- <ScrollArea className="h-[calc(100vh-215px)]">- <div className="flex flex-col">- {groupedEvents.map((group, index) => {- const firstEvent = group.events[0];- const Icon = getEventIcon(firstEvent);- const color = getEventColor(firstEvent);- const description = getGroupDescription(group);- const startTimeMs = getTime(group.startTime);- const endTimeMs = getTime(group.endTime);- const durationMs = endTimeMs - startTimeMs;-- return (- <div- key={`${group.startTime}-${index}`}- className={cn(- "p-2 border-b border-neutral-100 dark:border-neutral-800 bg-white dark:bg-neutral-900",- "hover:bg-neutral-50 dark:hover:bg-neutral-800/80 transition-colors cursor-pointer",- "flex items-center gap-2 group"- )}- onClick={() => handleGroupClick(group)}- >- <div className="text-xs text-neutral-600 dark:text-neutral-400 w-10">- {Duration.fromMillis(startTimeMs).toFormat("mm:ss")}- </div>- <Icon className={cn("w-4 h-4 shrink-0", color)} />- <div className="flex-1 min-w-0">- <div className="text-xs text-neutral-900 dark:text-neutral-200 font-medium truncate">- {description}- </div>- {group.count > 1 && durationMs > 0 && (- <div className="text-xs text-neutral-500 dark:text-neutral-500 mt-0.5">- {Duration.fromMillis(durationMs).toFormat("s.SSS")}s duration- </div>- )}+ <ScrollArea className="flex-1 rounded-lg">+ {groupedEvents.map((group, index) => {+ const firstEvent = group.events[0];+ const Icon = getEventIcon(firstEvent);+ const color = getEventColor(firstEvent);+ const description = getGroupDescription(group);+ const startTimeMs = getTime(group.startTime);+ const endTimeMs = getTime(group.endTime);+ const durationMs = endTimeMs - startTimeMs;++ return (+ <div+ key={`${group.startTime}-${index}`}+ className={cn(+ "p-2 border-b border-neutral-100 dark:border-neutral-800 bg-white dark:bg-neutral-900",+ "hover:bg-neutral-50 dark:hover:bg-neutral-800/80 transition-colors cursor-pointer",+ "flex items-center gap-2 group"+ )}+ onClick={() => handleGroupClick(group)}+ >+ <div className="text-xs text-neutral-600 dark:text-neutral-400 w-10">+ {Duration.fromMillis(startTimeMs).toFormat("mm:ss")}+ </div>+ <Icon className={cn("w-4 h-4 shrink-0", color)} />+ <div className="flex-1 min-w-0">+ <div className="text-xs text-neutral-900 dark:text-neutral-200 font-medium truncate">+ {description}</div>- {group.count > 5 && (- <div className="text-xs text-neutral-700 dark:text-neutral-500 bg-neutral-100 dark:bg-neutral-800 px-1.5 py-0.5 rounded">- {group.count}+ {group.count > 1 && durationMs > 0 && (+ <div className="text-xs text-neutral-500 dark:text-neutral-500 mt-0.5">+ {Duration.fromMillis(durationMs).toFormat("s.SSS")}s duration</div>)}</div>- );- })}- </div>+ {group.count > 5 && (+ <div className="text-xs text-neutral-700 dark:text-neutral-500 bg-neutral-100 dark:bg-neutral-800 px-1.5 py-0.5 rounded">+ {group.count}+ </div>+ )}+ </div>+ );+ })}</ScrollArea></div></div>diff --git a/client/src/app/[site]/replay/components/player/ReplayPlayer.tsx b/client/src/components/replay/player/ReplayPlayer.tsxsimilarity index 76%rename from client/src/app/[site]/replay/components/player/ReplayPlayer.tsxrename to client/src/components/replay/player/ReplayPlayer.tsxindex 090b40c44..065d67707 100644--- a/client/src/app/[site]/replay/components/player/ReplayPlayer.tsx+++ b/client/src/components/replay/player/ReplayPlayer.tsx@@ -1,8 +1,8 @@import { useParams } from "next/navigation";import { useEffect } from "react";import "rrweb-player/dist/style.css";-import { useGetSessionReplayEvents } from "../../../../../api/analytics/hooks/sessionReplay/useGetSessionReplayEvents";-import { ThreeDotLoader } from "../../../../../components/Loaders";+import { useGetSessionReplayEvents } from "@/api/analytics/hooks/sessionReplay/useGetSessionReplayEvents";+import { ThreeDotLoader } from "@/components/Loaders";import { useReplayStore } from "../replayStore";import { useActivityPeriods } from "./hooks/useActivityPeriods";import { useReplayKeyboardShortcuts } from "./hooks/useReplayKeyboardShortcuts";@@ -11,7 +11,7 @@ import { ReplayPlayerCore } from "./ReplayPlayerCore";import { SKIP_SECONDS } from "./utils/replayUtils";import { ReplayPlayerTopbar } from "./ReplayPlayerTopbar";-export function ReplayPlayer({ width, height }: { width: number; height: number }) {+export function ReplayPlayer({ width, height, isDrawer }: { width: number; height: number; isDrawer?: boolean }) {const params = useParams();const siteId = Number(params.site);const {@@ -22,9 +22,7 @@ export function ReplayPlayer({ width, height }: { width: number; height: numbercurrentTime,setCurrentTime,duration,- playbackSpeed,setPlaybackSpeed,- activityPeriods,resetPlayerState,} = useReplayStore();@@ -97,30 +95,29 @@ export function ReplayPlayer({ width, height }: { width: number; height: number);}- if (isLoading || !data) {- return (- <div className="bg-black h-full flex items-center justify-center">- <ThreeDotLoader className="w-full" />- </div>- );- }-return (- <div className="flex flex-col overflow-hidden" style={{ width: width, height: height }}>+ <div+ className="bg-black flex flex-col justify-between overflow-hidden rounded-lg"+ style={{ width: width, height: height }}+ ><ReplayPlayerTopbar />- <ReplayPlayerCore data={data} width={width} height={height} onPlayPause={handlePlayPause} isPlaying={isPlaying} />-+ {isLoading || !data ? (+ <ThreeDotLoader className="w-full" />+ ) : (+ <ReplayPlayerCore+ data={data}+ width={width}+ height={height}+ onPlayPause={handlePlayPause}+ isPlaying={isPlaying}+ />+ )}<ReplayPlayerControls- player={player}- isPlaying={isPlaying}- currentTime={currentTime}- duration={duration}- playbackSpeed={playbackSpeed}- activityPeriods={activityPeriods}events={data?.events || []}onPlayPause={handlePlayPause}onSliderChange={handleSliderChange}onSpeedChange={handleSpeedChange}+ isDrawer={isDrawer}/></div>);diff --git a/client/src/app/[site]/replay/components/player/ReplayPlayerControls.tsx b/client/src/components/replay/player/ReplayPlayerControls.tsxsimilarity index 67%rename from client/src/app/[site]/replay/components/player/ReplayPlayerControls.tsxrename to client/src/components/replay/player/ReplayPlayerControls.tsxindex 6d9730435..a7e44a397 100644--- a/client/src/app/[site]/replay/components/player/ReplayPlayerControls.tsx+++ b/client/src/components/replay/player/ReplayPlayerControls.tsx@@ -1,34 +1,31 @@-import { Pause, Play } from "lucide-react";-import { ActivitySlider } from "../../../../../components/ui/activity-slider";-import { Button } from "../../../../../components/ui/button";-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "../../../../../components/ui/select";+import { ActivitySlider } from "@/components/ui/activity-slider";+import { Button } from "@/components/ui/button";+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";+import { Skeleton } from "@/components/ui/skeleton";+import { Maximize2, Pause, Play } from "lucide-react";+import { useState } from "react";+import { ReplayDrawer } from "../../Sessions/ReplayDrawer";+import { useReplayStore } from "../replayStore";import { formatTime, PLAYBACK_SPEEDS } from "./utils/replayUtils";interface ReplayPlayerControlsProps {- player: any;- isPlaying: boolean;- currentTime: number;- duration: number;- playbackSpeed: string;- activityPeriods: { start: number; end: number }[];events: any[];onPlayPause: () => void;onSliderChange: (value: number[]) => void;onSpeedChange: (speed: string) => void;+ isDrawer?: boolean;}export function ReplayPlayerControls({- player,- isPlaying,- currentTime,- duration,- playbackSpeed,- activityPeriods,events,onPlayPause,onSliderChange,onSpeedChange,+ isDrawer,}: ReplayPlayerControlsProps) {+ const { sessionId, player, isPlaying, currentTime, duration, playbackSpeed, activityPeriods } = useReplayStore();+ const [replayDrawerOpen, setReplayDrawerOpen] = useState(false);+return (<div className="border border-neutral-100 dark:border-neutral-800 p-2 pb-3 bg-white dark:bg-neutral-900 rounded-b-lg pt-6"><div className="flex items-center">@@ -67,6 +64,12 @@ export function ReplayPlayerControls({))}</SelectContent></Select>+ {!isDrawer && (+ <Button variant="ghost" size="smIcon" onClick={() => setReplayDrawerOpen(true)}>+ <Maximize2 className="w-4 h-4" />+ </Button>+ )}+ <ReplayDrawer sessionId={sessionId} open={replayDrawerOpen} onOpenChange={setReplayDrawerOpen} /></div></div>);diff --git a/client/src/app/[site]/replay/components/player/ReplayPlayerCore.tsx b/client/src/components/replay/player/ReplayPlayerCore.tsxsimilarity index 100%rename from client/src/app/[site]/replay/components/player/ReplayPlayerCore.tsxrename to client/src/components/replay/player/ReplayPlayerCore.tsxdiff --git a/client/src/app/[site]/replay/components/player/ReplayPlayerOverlay.tsx b/client/src/components/replay/player/ReplayPlayerOverlay.tsxsimilarity index 100%rename from client/src/app/[site]/replay/components/player/ReplayPlayerOverlay.tsxrename to client/src/components/replay/player/ReplayPlayerOverlay.tsxdiff --git a/client/src/app/[site]/replay/components/player/ReplayPlayerTopbar.tsx b/client/src/components/replay/player/ReplayPlayerTopbar.tsxsimilarity index 85%rename from client/src/app/[site]/replay/components/player/ReplayPlayerTopbar.tsxrename to client/src/components/replay/player/ReplayPlayerTopbar.tsxindex 40e2d9885..1cda1ff5b 100644--- a/client/src/app/[site]/replay/components/player/ReplayPlayerTopbar.tsx+++ b/client/src/components/replay/player/ReplayPlayerTopbar.tsx@@ -1,13 +1,13 @@import Link from "next/link";import { useParams } from "next/navigation";import { useMemo } from "react";-import { useGetSessionReplayEvents } from "../../../../../api/analytics/hooks/sessionReplay/useGetSessionReplayEvents";+import { useGetSessionReplayEvents } from "@/api/analytics/hooks/sessionReplay/useGetSessionReplayEvents";import {BrowserTooltipIcon,CountryFlagTooltipIcon,DeviceTypeTooltipIcon,OperatingSystemTooltipIcon,-} from "../../../../../components/TooltipIcons/TooltipIcons";+} from "@/components/TooltipIcons/TooltipIcons";import { useReplayStore } from "../replayStore";export function ReplayPlayerTopbar() {@@ -17,9 +17,36 @@ export function ReplayPlayerTopbar() {const { data } = useGetSessionReplayEvents(siteId, sessionId);- if (!data?.metadata) {+ const { metadata } = data ?? {};+ const screenDimensions = `${metadata?.screen_width} × ${metadata?.screen_height}`;++ const pageViewEvents = useMemo(() => {+ return data?.events?.filter(event => event.type === 4);+ }, [data?.events]);++ // Get the current page URL based on the replay currentTime+ const pageUrl = useMemo(() => {+ if (!pageViewEvents || currentTime === 0) {+ return metadata?.page_url;+ }++ let currentUrl = metadata?.page_url;+ const firstTimestamp = pageViewEvents[0].timestamp;++ // Find the most recent Meta event (type 4) with href before currentTime+ for (const event of pageViewEvents) {+ if (event.timestamp - firstTimestamp > currentTime) break;+ if (event.data?.href) {+ currentUrl = event.data.href;+ }+ }++ return currentUrl;+ }, [pageViewEvents, currentTime, metadata?.page_url]);++ if (!pageUrl || !metadata) {return (- <div className="border border-neutral-200 dark:border-neutral-800 bg-neutral-50 dark:bg-neutral-900 px-2 py-2 rounded-t-lg overflow-hidden">+ <div className="border border-neutral-100 dark:border-neutral-800 bg-white dark:bg-neutral-900 px-2 py-2 rounded-t-lg overflow-hidden"><div className="flex items-center justify-between min-w-0"><div className="flex items-center gap-2 min-w-0 flex-1"><div className="h-4 w-32 bg-neutral-150 dark:bg-neutral-700 rounded animate-pulse" />@@ -32,9 +59,6 @@ export function ReplayPlayerTopbar() {);}- const { metadata } = data;- const screenDimensions = `${metadata.screen_width} × ${metadata.screen_height}`;-// Extract pathname from full URL for displayconst getDisplayPath = (url: string): string => {try {@@ -45,30 +69,6 @@ export function ReplayPlayerTopbar() {}};- const pageViewEvents = useMemo(() => {- return data?.events?.filter(event => event.type === 4);- }, [data?.events]);-- // Get the current page URL based on the replay currentTime- const pageUrl = useMemo(() => {- if (!pageViewEvents || currentTime === 0) {- return metadata.page_url;- }-- let currentUrl = metadata.page_url;- const firstTimestamp = pageViewEvents[0].timestamp;-- // Find the most recent Meta event (type 4) with href before currentTime- for (const event of pageViewEvents) {- if (event.timestamp - firstTimestamp > currentTime) break;- if (event.data?.href) {- currentUrl = event.data.href;- }- }-- return currentUrl;- }, [pageViewEvents, currentTime, metadata.page_url]);-return (<div className="border border-neutral-100 dark:border-neutral-800 bg-white dark:bg-neutral-900 px-2 py-2 rounded-t-lg overflow-hidden"><div className="flex items-center justify-between min-w-0">diff --git a/client/src/app/[site]/replay/components/player/hooks/useActivityPeriods.ts b/client/src/components/replay/player/hooks/useActivityPeriods.tssimilarity index 100%rename from client/src/app/[site]/replay/components/player/hooks/useActivityPeriods.tsrename to client/src/components/replay/player/hooks/useActivityPeriods.tsdiff --git a/client/src/app/[site]/replay/components/player/hooks/useReplayKeyboardShortcuts.ts b/client/src/components/replay/player/hooks/useReplayKeyboardShortcuts.tssimilarity index 100%rename from client/src/app/[site]/replay/components/player/hooks/useReplayKeyboardShortcuts.tsrename to client/src/components/replay/player/hooks/useReplayKeyboardShortcuts.tsdiff --git a/client/src/app/[site]/replay/components/player/hooks/useReplayPlayer.ts b/client/src/components/replay/player/hooks/useReplayPlayer.tssimilarity index 100%rename from client/src/app/[site]/replay/components/player/hooks/useReplayPlayer.tsrename to client/src/components/replay/player/hooks/useReplayPlayer.tsdiff --git a/client/src/app/[site]/replay/components/player/utils/replayUtils.ts b/client/src/components/replay/player/utils/replayUtils.tssimilarity index 100%rename from client/src/app/[site]/replay/components/player/utils/replayUtils.tsrename to client/src/components/replay/player/utils/replayUtils.tsdiff --git a/client/src/app/[site]/replay/components/replayStore.ts b/client/src/components/replay/replayStore.tssimilarity index 100%rename from client/src/app/[site]/replay/components/replayStore.tsrename to client/src/components/replay/replayStore.tsdiff --git a/client/src/components/ui/drawer.tsx b/client/src/components/ui/drawer.tsxindex f88832d89..88bf00365 100644--- a/client/src/components/ui/drawer.tsx+++ b/client/src/components/ui/drawer.tsx@@ -43,7 +43,7 @@ function DrawerContent({ className, children, ...props }: React.ComponentProps<tclassName={cn("group/drawer-content bg-background fixed z-50 flex h-auto flex-col","data-[vaul-drawer-direction=top]:inset-x-0 data-[vaul-drawer-direction=top]:top-0 data-[vaul-drawer-direction=top]:mb-24 data-[vaul-drawer-direction=top]:max-h-[80vh] data-[vaul-drawer-direction=top]:rounded-b-lg data-[vaul-drawer-direction=top]:border-b",- "data-[vaul-drawer-direction=bottom]:inset-x-0 data-[vaul-drawer-direction=bottom]:bottom-0 data-[vaul-drawer-direction=bottom]:mt-24 data-[vaul-drawer-direction=bottom]:max-h-[80vh] data-[vaul-drawer-direction=bottom]:rounded-t-lg data-[vaul-drawer-direction=bottom]:border-t",+ "data-[vaul-drawer-direction=bottom]:inset-x-0 data-[vaul-drawer-direction=bottom]:bottom-0 data-[vaul-drawer-direction=bottom]:mt-24 data-[vaul-drawer-direction=bottom]:max-h-[95vh] data-[vaul-drawer-direction=bottom]:rounded-t-lg data-[vaul-drawer-direction=bottom]:border-t","data-[vaul-drawer-direction=right]:inset-y-0 data-[vaul-drawer-direction=right]:right-0 data-[vaul-drawer-direction=right]:w-3/4 data-[vaul-drawer-direction=right]:border-l data-[vaul-drawer-direction=right]:sm:max-w-sm","data-[vaul-drawer-direction=left]:inset-y-0 data-[vaul-drawer-direction=left]:left-0 data-[vaul-drawer-direction=left]:w-3/4 data-[vaul-drawer-direction=left]:border-r data-[vaul-drawer-direction=left]:sm:max-w-sm",classNamediff --git a/server/src/api/analytics/getSessions.ts b/server/src/api/analytics/getSessions.tsindex a287deba0..27f981af5 100644--- a/server/src/api/analytics/getSessions.ts+++ b/server/src/api/analytics/getSessions.ts@@ -42,6 +42,7 @@ export type GetSessionsResponse = {ip: string;lat: number;lon: number;+ has_replay: number;}[];export interface GetSessionsRequest {@@ -118,12 +119,21 @@ export async function getSessions(req: FastifyRequest<GetSessionsRequest>, res:GROUP BYsession_idORDER BY session_end DESC+ ),+ ReplaySessions AS (+ SELECT DISTINCT session_id+ FROM session_replay_metadata+ FINAL+ WHERE site_id = {siteId:Int32}+ AND event_count >= 2)SELECT- *- FROM AggregatedSessions+ a.*,+ if(r.session_id != '', 1, 0) AS has_replay+ FROM AggregatedSessions a+ LEFT JOIN ReplaySessions r ON a.session_id = r.session_idWHERE 1 = 1 ${filterStatement}- ${filterIdentified ? "AND identified_user_id != ''" : ""}+ ${filterIdentified ? "AND a.identified_user_id != ''" : ""}LIMIT {limit:Int32} OFFSET {offset:Int32}`;diff --git a/server/src/services/replay/sessionReplayQueryService.ts b/server/src/services/replay/sessionReplayQueryService.tsindex 594747f53..2fdafc00b 100644--- a/server/src/services/replay/sessionReplayQueryService.ts+++ b/server/src/services/replay/sessionReplayQueryService.ts@@ -133,7 +133,7 @@ export class SessionReplayQueryService {const metadata = metadataResults[0];if (!metadata) {- throw new Error("Session replay not found");+ throw new Error("Session replay not found for session " + sessionId);}// Get events