Skip to content

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

Refactor user session data structure and update session handling components

Bill Yang3af05f795c67
diff --git a/client/src/api/analytics/userSessions.ts b/client/src/api/analytics/userSessions.ts
index b3812fa23..23231c964 100644
--- a/client/src/api/analytics/userSessions.ts
+++ b/client/src/api/analytics/userSessions.ts
@@ -42,7 +42,7 @@ export function useGetUserSessions(userId: string) {
});
}
-type GetSessionsResponse = {
+export type GetSessionsResponse = {
session_id: string;
user_id: string;
country: string;
@@ -52,8 +52,11 @@ type GetSessionsResponse = {
browser: string;
operating_system: string;
referrer: string;
- last_pageview_timestamp: string;
+ session_end: string;
+ session_start: string;
pageviews: number;
+ entry_page: string;
+ exit_page: string;
}[];
export function useGetSessionsInfinite() {
diff --git a/client/src/app/[site]/sessions/components/SessionCard.tsx b/client/src/app/[site]/sessions/components/SessionCard.tsx
new file mode 100644
index 000000000..750aea4a3
--- /dev/null
+++ b/client/src/app/[site]/sessions/components/SessionCard.tsx
@@ -0,0 +1,267 @@
+import { useState } from "react";
+import { DateTime } from "luxon";
+import { useRouter } from "next/navigation";
+import { Browser } from "../../components/shared/icons/Browser";
+import { CountryFlag } from "../../components/shared/icons/CountryFlag";
+import { OperatingSystem } from "../../components/shared/icons/OperatingSystem";
+import { getCountryName } from "../../../../lib/utils";
+import {
+ Laptop,
+ Smartphone,
+ ChevronDown,
+ ChevronRight,
+ ArrowRight,
+ Clock,
+} from "lucide-react";
+import Avatar from "boring-avatars";
+import { GetSessionsResponse } from "../../../../api/analytics/userSessions";
+import { Skeleton } from "@/components/ui/skeleton";
+import {
+ Tooltip,
+ TooltipContent,
+ TooltipProvider,
+ TooltipTrigger,
+} from "@/components/ui/tooltip";
+
+interface SessionCardProps {
+ session: GetSessionsResponse[number];
+ onClick?: () => void;
+}
+
+// DeviceIcon component for displaying mobile/desktop icons
+function DeviceIcon({ deviceType }: { deviceType: string }) {
+ const type = deviceType.toLowerCase();
+
+ if (type.includes("mobile") || type.includes("tablet")) {
+ return <Smartphone className="w-4 h-4" />;
+ }
+
+ return <Laptop className="w-4 h-4" />;
+}
+
+// Function to truncate path for display
+function truncatePath(path: string, maxLength: number = 32) {
+ if (!path) return "-";
+ if (path.length <= maxLength) return path;
+
+ // Keep the beginning of the path with ellipsis
+ return `${path.substring(0, maxLength)}...`;
+}
+
+export function SessionCard({ session, onClick }: SessionCardProps) {
+ const [expanded, setExpanded] = useState(false);
+ const router = useRouter();
+
+ // Calculate session duration in minutes
+ const start = DateTime.fromSQL(session.session_start);
+ const end = DateTime.fromSQL(session.session_end);
+ const duration = end.diff(start, ["minutes", "seconds"]);
+ const durationFormatted = `${Math.floor(duration.minutes)}m ${Math.floor(
+ duration.seconds
+ )}s`;
+
+ // Truncate user ID to first 8 characters
+ const truncatedUserId = session.user_id.substring(0, 8);
+
+ const handleCardClick = () => {
+ if (onClick) {
+ onClick();
+ } else {
+ setExpanded(!expanded);
+ }
+ };
+
+ return (
+ <div
+ className="mb-3 rounded-lg bg-neutral-900 border border-neutral-800 overflow-hidden"
+ onClick={handleCardClick}
+ >
+ <div className="p-3 cursor-pointer">
+ <div className="flex items-center gap-2">
+ {/* Avatar and User ID */}
+ <div className="flex items-center gap-2">
+ <Avatar
+ name={session.user_id}
+ colors={["#2c2b4b", "#a75293", "#9c7a9d", "#9ddacb", "#f8dcb4"]}
+ variant="beam"
+ size={24}
+ />
+ <span className="text-xs font-mono text-gray-400">
+ {truncatedUserId}
+ </span>
+ </div>
+
+ {/* Icons section */}
+ <div className="flex space-x-2 items-center ml-3">
+ {/* Country */}
+ {session.country && (
+ <TooltipProvider>
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <div className="flex items-center">
+ <CountryFlag country={session.country} />
+ </div>
+ </TooltipTrigger>
+ <TooltipContent>
+ <p>{getCountryName(session.country)}</p>
+ </TooltipContent>
+ </Tooltip>
+ </TooltipProvider>
+ )}
+
+ {/* Browser */}
+ <TooltipProvider>
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <div>
+ <Browser browser={session.browser || "Unknown"} />
+ </div>
+ </TooltipTrigger>
+ <TooltipContent>
+ <p>{session.browser || "Unknown browser"}</p>
+ </TooltipContent>
+ </Tooltip>
+ </TooltipProvider>
+
+ {/* OS */}
+ <TooltipProvider>
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <div>
+ <OperatingSystem os={session.operating_system || ""} />
+ </div>
+ </TooltipTrigger>
+ <TooltipContent>
+ <p>{session.operating_system || "Unknown OS"}</p>
+ </TooltipContent>
+ </Tooltip>
+ </TooltipProvider>
+
+ {/* Device Type */}
+ <TooltipProvider>
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <div>
+ <DeviceIcon deviceType={session.device_type || ""} />
+ </div>
+ </TooltipTrigger>
+ <TooltipContent>
+ <p>{session.device_type || "Unknown device"}</p>
+ </TooltipContent>
+ </Tooltip>
+ </TooltipProvider>
+ </div>
+
+ {/* Pages section with tooltips for long paths */}
+ <div className="flex items-center ml-3 flex-1 min-w-0">
+ <TooltipProvider>
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <span className="text-xs text-gray-400 truncate max-w-[200px] inline-block">
+ {truncatePath(session.entry_page)}
+ </span>
+ </TooltipTrigger>
+ <TooltipContent>
+ <p>{session.entry_page || "-"}</p>
+ </TooltipContent>
+ </Tooltip>
+ </TooltipProvider>
+
+ <ArrowRight className="mx-2 w-3 h-3 flex-shrink-0 text-gray-400" />
+
+ <TooltipProvider>
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <span className="text-xs text-gray-400 truncate max-w-[200px] inline-block">
+ {truncatePath(session.exit_page)}
+ </span>
+ </TooltipTrigger>
+ <TooltipContent>
+ <p>{session.exit_page || "-"}</p>
+ </TooltipContent>
+ </Tooltip>
+ </TooltipProvider>
+ </div>
+
+ {/* Time information */}
+ <div className="flex items-center gap-2 ml-3">
+ <TooltipProvider>
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <div className="flex items-center gap-1 text-xs text-gray-400">
+ <Clock className="w-3 h-3" />
+ <span>{durationFormatted}</span>
+ </div>
+ </TooltipTrigger>
+ <TooltipContent>
+ <p>
+ {DateTime.fromSQL(session.session_start).toFormat(
+ "MMM d, h:mm a"
+ )}
+ </p>
+ </TooltipContent>
+ </Tooltip>
+ </TooltipProvider>
+ </div>
+
+ {/* Expand/Collapse icon */}
+ <div className="ml-3 flex-shrink-0">
+ {expanded ? (
+ <ChevronDown className="w-4 h-4 text-gray-400" />
+ ) : (
+ <ChevronRight className="w-4 h-4 text-gray-400" />
+ )}
+ </div>
+ </div>
+ </div>
+
+ {/* Expanded content - to be implemented later */}
+ {expanded && (
+ <div className="px-4 pb-4 bg-neutral-850 border-t border-neutral-800">
+ {/* This will be implemented later */}
+ </div>
+ )}
+ </div>
+ );
+}
+
+export function SessionCardSkeleton() {
+ return (
+ <div className="mb-3 rounded-lg bg-neutral-900 border border-neutral-800 p-3">
+ <div className="flex items-center">
+ {/* Avatar and User ID */}
+ <div className="flex items-center gap-2 min-w-[110px]">
+ <Skeleton className="h-6 w-6 rounded-full" />
+ <Skeleton className="h-3 w-16" />
+ </div>
+
+ {/* Icons */}
+ <div className="flex space-x-2 items-center ml-3">
+ <Skeleton className="h-4 w-4" />
+ <Skeleton className="h-4 w-4" />
+ <Skeleton className="h-4 w-4" />
+ <Skeleton className="h-4 w-4" />
+ </div>
+
+ {/* Entry/Exit paths */}
+ <div className="flex items-center ml-3 flex-1 min-w-0">
+ <Skeleton className="h-3 w-20" />
+ <div className="mx-2">
+ <Skeleton className="h-3 w-3" />
+ </div>
+ <Skeleton className="h-3 w-20" />
+ </div>
+
+ {/* Time */}
+ <div className="ml-3">
+ <Skeleton className="h-3 w-16" />
+ </div>
+
+ {/* Expand icon */}
+ <div className="ml-3 flex-shrink-0">
+ <Skeleton className="h-4 w-4" />
+ </div>
+ </div>
+ </div>
+ );
+}
diff --git a/client/src/app/[site]/sessions/components/SessionsList.tsx b/client/src/app/[site]/sessions/components/SessionsList.tsx
new file mode 100644
index 000000000..47f7a7003
--- /dev/null
+++ b/client/src/app/[site]/sessions/components/SessionsList.tsx
@@ -0,0 +1,91 @@
+import { useEffect, useRef } from "react";
+import { useParams, useRouter } from "next/navigation";
+import { GetSessionsResponse } from "../../../../api/analytics/userSessions";
+import { SessionCard, SessionCardSkeleton } from "./SessionCard";
+
+interface SessionsListProps {
+ data: GetSessionsResponse;
+ isLoading: boolean;
+ fetchNextPage: () => void;
+ hasNextPage: boolean | undefined;
+ isFetchingNextPage: boolean;
+}
+
+export default function SessionsList({
+ data,
+ isLoading,
+ fetchNextPage,
+ hasNextPage,
+ isFetchingNextPage,
+}: SessionsListProps) {
+ const { site } = useParams();
+ const router = useRouter();
+
+ // Reference for the scroll container
+ const containerRef = useRef<HTMLDivElement>(null);
+
+ // Handle navigation to user details page
+ const handleSessionClick = (userId: string) => {
+ router.push(`/${site}/user/${userId}`);
+ };
+
+ // Infinite scroll implementation
+ useEffect(() => {
+ const handleScroll = () => {
+ if (!containerRef.current) return;
+
+ const { scrollHeight, scrollTop, clientHeight } = containerRef.current;
+
+ // Load more when user scrolls to bottom (with a 200px buffer)
+ if (
+ scrollHeight - scrollTop - clientHeight < 200 &&
+ !isFetchingNextPage &&
+ hasNextPage
+ ) {
+ fetchNextPage();
+ }
+ };
+
+ const container = containerRef.current;
+ if (container) {
+ container.addEventListener("scroll", handleScroll);
+ return () => {
+ container.removeEventListener("scroll", handleScroll);
+ };
+ }
+ }, [fetchNextPage, hasNextPage, isFetchingNextPage]);
+
+ return (
+ <div
+ ref={containerRef}
+ className="overflow-auto pr-2"
+ style={{ height: "calc(100vh - 200px)" }}
+ >
+ {isLoading ? (
+ // Show skeleton cards while loading
+ Array.from({ length: 10 }).map((_, index) => (
+ <SessionCardSkeleton key={`skeleton-${index}`} />
+ ))
+ ) : data.length === 0 ? (
+ <div className="flex justify-center py-8 text-gray-400">
+ No sessions found
+ </div>
+ ) : (
+ // Render session cards with more robust key generation
+ data.map((session, index) => (
+ <SessionCard
+ key={`${index}`}
+ session={session}
+ onClick={() => handleSessionClick(session.user_id)}
+ />
+ ))
+ )}
+
+ {isFetchingNextPage && (
+ <div className="py-4">
+ <SessionCardSkeleton key="loading-more" />
+ </div>
+ )}
+ </div>
+ );
+}
diff --git a/client/src/app/[site]/sessions/components/SessionsTable.tsx b/client/src/app/[site]/sessions/components/SessionsTable.tsx
index 54da24b80..07af00c37 100644
--- a/client/src/app/[site]/sessions/components/SessionsTable.tsx
+++ b/client/src/app/[site]/sessions/components/SessionsTable.tsx
@@ -13,23 +13,10 @@ import { getCountryName } from "../../../../lib/utils";
import { Browser } from "../../components/shared/icons/Browser";
import { CountryFlag } from "../../components/shared/icons/CountryFlag";
import { OperatingSystem } from "../../components/shared/icons/OperatingSystem";
-
-type Session = {
- session_id: string;
- user_id: string;
- country: string;
- iso_3166_2: string;
- language: string;
- device_type: string;
- browser: string;
- operating_system: string;
- referrer: string;
- last_pageview_timestamp: string;
- pageviews: number;
-};
+import { GetSessionsResponse } from "../../../../api/analytics/userSessions";
interface SessionsTableProps {
- data: Session[];
+ data: GetSessionsResponse;
isLoading: boolean;
fetchNextPage: () => void;
hasNextPage: boolean | undefined;
@@ -90,7 +77,7 @@ export default function SessionsTable({
}, [fetchNextPage, hasNextPage, isFetchingNextPage]);
// Column definition
- const columnHelper = createColumnHelper<Session>();
+ const columnHelper = createColumnHelper<GetSessionsResponse[number]>();
const columns = useMemo(
() => [
@@ -108,7 +95,7 @@ export default function SessionsTable({
);
},
}),
- columnHelper.accessor("last_pageview_timestamp", {
+ columnHelper.accessor("session_end", {
header: "Last Seen",
cell: (info) => {
return DateTime.fromSQL(info.getValue()).toFormat(
diff --git a/client/src/app/[site]/sessions/page.tsx b/client/src/app/[site]/sessions/page.tsx
index 47d723c54..23b064699 100644
--- a/client/src/app/[site]/sessions/page.tsx
+++ b/client/src/app/[site]/sessions/page.tsx
@@ -1,9 +1,9 @@
"use client";
import { useMemo } from "react";
-import SessionsTable from "./components/SessionsTable";
import { SubHeader } from "../components/SubHeader/SubHeader";
import { useGetSessionsInfinite } from "../../../api/analytics/userSessions";
+import SessionsList from "./components/SessionsList";
export default function SessionsPage() {
const {
@@ -26,7 +26,7 @@ export default function SessionsPage() {
return (
<div>
<SubHeader />
- <SessionsTable
+ <SessionsList
data={flattenedData}
isLoading={isLoading}
fetchNextPage={fetchNextPage}
diff --git a/server/src/api/getOverview.ts b/server/src/api/getOverview.ts
index 694d550f2..009c522d3 100644
--- a/server/src/api/getOverview.ts
+++ b/server/src/api/getOverview.ts
@@ -34,14 +34,8 @@ const getQuery = ({
}) => {
const filterStatement = getFilterStatement(filters);
- // Define the time condition based on past24Hours flag
- const timeCondition = past24Hours
- ? `AND timestamp >= toTimeZone(now('${timezone}'), 'UTC') - INTERVAL 1 DAY
- AND timestamp < toTimeZone(now('${timezone}'), 'UTC')`
- : getTimeStatement(startDate, endDate, timezone);
-
- // Single query template with parameterized time condition
- return `SELECT
+ if (past24Hours) {
+ return `SELECT
session_stats.sessions,
session_stats.pages_per_session,
session_stats.bounce_rate * 100 AS bounce_rate,
@@ -68,7 +62,8 @@ const getQuery = ({
WHERE
site_id = ${site}
${filterStatement}
- ${timeCondition}
+ AND timestamp >= toTimeZone(now('${timezone}'), 'UTC') - INTERVAL 1 DAY
+ AND timestamp < toTimeZone(now('${timezone}'), 'UTC')
GROUP BY session_id
)
) AS session_stats
@@ -76,13 +71,61 @@ const getQuery = ({
(
-- Page-level and user-level metrics
SELECT
- COUNT(CASE WHEN type = 'pageview' THEN 1 END) AS pageviews,
- COUNT(DISTINCT CASE WHEN type = 'pageview' THEN user_id END) AS users
+ COUNT(*) AS pageviews,
+ COUNT(DISTINCT user_id) AS users
FROM pageviews
WHERE
site_id = ${site}
${filterStatement}
- ${timeCondition}
+ AND timestamp >= toTimeZone(now('${timezone}'), 'UTC') - INTERVAL 1 DAY
+ AND timestamp < toTimeZone(now('${timezone}'), 'UTC')
+ AND type = 'pageview'
+ ) AS page_stats`;
+ }
+
+ return `SELECT
+ session_stats.sessions,
+ session_stats.pages_per_session,
+ session_stats.bounce_rate * 100 AS bounce_rate,
+ session_stats.session_duration,
+ page_stats.pageviews,
+ page_stats.users
+ FROM
+ (
+ -- Session-level metrics
+ SELECT
+ COUNT() AS sessions,
+ AVG(pages_in_session) AS pages_per_session,
+ sumIf(1, pages_in_session = 1) / COUNT() AS bounce_rate,
+ AVG(end_time - start_time) AS session_duration
+ FROM
+ (
+ -- One row per session
+ SELECT
+ session_id,
+ MIN(timestamp) AS start_time,
+ MAX(timestamp) AS end_time,
+ COUNT(CASE WHEN type = 'pageview' THEN 1 END) AS pages_in_session
+ FROM pageviews
+ WHERE
+ site_id = ${site}
+ ${filterStatement}
+ ${getTimeStatement(startDate, endDate, timezone)}
+ GROUP BY session_id
+ )
+ ) AS session_stats
+ CROSS JOIN
+ (
+ -- Page-level and user-level metrics
+ SELECT
+ COUNT(*) AS pageviews,
+ COUNT(DISTINCT user_id) AS users
+ FROM pageviews
+ WHERE
+ site_id = ${site}
+ ${filterStatement}
+ ${getTimeStatement(startDate, endDate, timezone)}
+ AND type = 'pageview'
) AS page_stats`;
};
diff --git a/server/src/api/getSessions.ts b/server/src/api/getSessions.ts
index 16ea6bdc5..c64120934 100644
--- a/server/src/api/getSessions.ts
+++ b/server/src/api/getSessions.ts
@@ -7,7 +7,7 @@ import {
} from "./utils.js";
import { getUserHasAccessToSite } from "../lib/auth-utils.js";
-type GetSessionsResponse = {
+export type GetSessionsResponse = {
session_id: string;
user_id: string;
country: string;
@@ -17,7 +17,10 @@ type GetSessionsResponse = {
browser: string;
operating_system: string;
referrer: string;
- last_pageview_timestamp: string;
+ session_end: string;
+ session_start: string;
+ entry_page: string;
+ exit_page: string;
pageviews: number;
}[];
@@ -29,6 +32,7 @@ export interface GetSessionsRequest {
site: string;
filters: string;
page: number;
+ userId?: string;
};
}
@@ -36,7 +40,8 @@ export async function getSessions(
req: FastifyRequest<GetSessionsRequest>,
res: FastifyReply
) {
- const { startDate, endDate, timezone, site, filters, page } = req.query;
+ const { startDate, endDate, timezone, site, filters, page, userId } =
+ req.query;
const userHasAccessToSite = await getUserHasAccessToSite(req, site);
if (!userHasAccessToSite) {
return res.status(403).send({ error: "Forbidden" });
@@ -55,14 +60,17 @@ SELECT
browser,
operating_system,
referrer,
- MAX(timestamp) AS last_pageview_timestamp,
- COUNT(*) AS pageviews
+ MAX(timestamp) AS session_end,
+ MIN(timestamp) AS session_start,
+ argMinIf(pathname, timestamp, type = 'pageview') AS entry_page,
+ argMaxIf(pathname, timestamp, type = 'pageview') AS exit_page,
+ countIf(type = 'pageview') AS pageviews
FROM pageviews
WHERE
site_id = ${site}
+ ${userId ? ` AND user_id = '${userId}'` : ""}
${filterStatement}
${getTimeStatement(startDate, endDate, timezone)}
- AND type = 'pageview'
GROUP BY
session_id,
user_id,
@@ -73,7 +81,7 @@ GROUP BY
device_type,
operating_system,
referrer
-ORDER BY last_pageview_timestamp DESC
+ORDER BY session_start DESC
LIMIT 100 OFFSET ${(page - 1) * 100}
`;
diff --git a/server/src/api/getUserSessions.ts b/server/src/api/getUserSessions.ts
index 520ff155c..6fcb95eb9 100644
--- a/server/src/api/getUserSessions.ts
+++ b/server/src/api/getUserSessions.ts
@@ -78,7 +78,8 @@ SELECT
browser,
operating_system,
device_type,
- country
+ country,
+ iso_3166_2
FROM pageviews
WHERE
site_id = ${site}