Skip to content

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

Refactor SessionsPage and remove SessionsList component for simplified session display

Bill Yang9d4ae2437308
diff --git a/client/src/api/analytics/userSessions.ts b/client/src/api/analytics/userSessions.ts
index cc1215e02..85f60448b 100644
--- a/client/src/api/analytics/userSessions.ts
+++ b/client/src/api/analytics/userSessions.ts
@@ -61,12 +61,12 @@ export type GetSessionsResponse = {
exit_page: string;
}[];
-export function useGetSessionsInfinite() {
+export function useGetSessionsInfinite(userId?: string) {
const { time, site, filters } = useStore();
const { startDate, endDate } = getStartAndEndDate(time);
return useInfiniteQuery<APIResponse<GetSessionsResponse>>({
- queryKey: ["sessions-infinite", time, site, filters],
+ queryKey: ["sessions-infinite", time, site, filters, userId],
queryFn: ({ pageParam = 1 }) => {
const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
return authedFetch(`${BACKEND_URL}/sessions`, {
@@ -76,6 +76,7 @@ export function useGetSessionsInfinite() {
site,
filters,
page: pageParam,
+ userId,
}).then((res) => res.json());
},
initialPageParam: 1,
diff --git a/client/src/app/[site]/sessions/page.tsx b/client/src/app/[site]/sessions/page.tsx
index 23b064699..f2390b215 100644
--- a/client/src/app/[site]/sessions/page.tsx
+++ b/client/src/app/[site]/sessions/page.tsx
@@ -1,38 +1,13 @@
"use client";
-import { useMemo } from "react";
import { SubHeader } from "../components/SubHeader/SubHeader";
-import { useGetSessionsInfinite } from "../../../api/analytics/userSessions";
-import SessionsList from "./components/SessionsList";
+import SessionsList from "../../../components/Sessions/SessionsList";
export default function SessionsPage() {
- const {
- data,
- isLoading,
- error,
- fetchNextPage,
- hasNextPage,
- isFetchingNextPage,
- } = useGetSessionsInfinite();
-
- // Combine all pages of data
- const flattenedData = useMemo(() => {
- if (!data) return [];
- return data.pages.flatMap((page) => page.data || []);
- }, [data]);
-
- if (error) return <div>Error: {(error as Error).message}</div>;
-
return (
<div>
<SubHeader />
- <SessionsList
- data={flattenedData}
- isLoading={isLoading}
- fetchNextPage={fetchNextPage}
- hasNextPage={hasNextPage}
- isFetchingNextPage={isFetchingNextPage}
- />
+ <SessionsList />
</div>
);
}
diff --git a/client/src/app/[site]/sessions/components/SessionCard.tsx b/client/src/components/Sessions/SessionCard.tsx
similarity index 95%
rename from client/src/app/[site]/sessions/components/SessionCard.tsx
rename to client/src/components/Sessions/SessionCard.tsx
index a19124ddb..498e25d57 100644
--- a/client/src/app/[site]/sessions/components/SessionCard.tsx
+++ b/client/src/components/Sessions/SessionCard.tsx
@@ -1,9 +1,9 @@
import { memo, useState } from "react";
import { DateTime } from "luxon";
-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 { Browser } from "../../app/[site]/components/shared/icons/Browser";
+import { CountryFlag } from "../../app/[site]/components/shared/icons/CountryFlag";
+import { OperatingSystem } from "../../app/[site]/components/shared/icons/OperatingSystem";
+import { getCountryName } from "../../lib/utils";
import {
Laptop,
Smartphone,
@@ -15,7 +15,7 @@ import {
MousePointerClick,
} from "lucide-react";
import Avatar from "boring-avatars";
-import { GetSessionsResponse } from "../../../../api/analytics/userSessions";
+import { GetSessionsResponse } from "../../api/analytics/userSessions";
import { Skeleton } from "@/components/ui/skeleton";
import {
Tooltip,
@@ -23,7 +23,7 @@ import {
TooltipTrigger,
} from "@/components/ui/tooltip";
import { SessionDetails } from "./SessionDetails";
-import { Badge } from "../../../../components/ui/badge";
+import { Badge } from "../ui/badge";
interface SessionCardProps {
session: GetSessionsResponse[number];
@@ -248,7 +248,7 @@ export const SessionCardSkeleton = memo(() => {
};
// Create multiple skeletons for a realistic loading state
- const skeletons = Array.from({ length: 5 }).map((_, index) => (
+ const skeletons = Array.from({ length: 10 }).map((_, index) => (
<div
className="mb-3 rounded-lg bg-neutral-900 border border-neutral-800 overflow-hidden"
key={index}
diff --git a/client/src/app/[site]/sessions/components/SessionDetails.tsx b/client/src/components/Sessions/SessionDetails.tsx
similarity index 98%
rename from client/src/app/[site]/sessions/components/SessionDetails.tsx
rename to client/src/components/Sessions/SessionDetails.tsx
index a3942691e..e6607a2c6 100644
--- a/client/src/app/[site]/sessions/components/SessionDetails.tsx
+++ b/client/src/components/Sessions/SessionDetails.tsx
@@ -1,8 +1,8 @@
import { DateTime } from "luxon";
-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 { Browser } from "../../app/[site]/components/shared/icons/Browser";
+import { CountryFlag } from "../../app/[site]/components/shared/icons/CountryFlag";
+import { OperatingSystem } from "../../app/[site]/components/shared/icons/OperatingSystem";
+import { getCountryName } from "../../lib/utils";
import {
MonitorSmartphone,
Clock,
@@ -15,7 +15,7 @@ import {
useGetSessionDetails,
PageviewEvent,
GetSessionsResponse,
-} from "../../../../api/analytics/userSessions";
+} from "../../api/analytics/userSessions";
import { Skeleton } from "@/components/ui/skeleton";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
import { Badge } from "@/components/ui/badge";
@@ -23,7 +23,7 @@ import { Alert, AlertDescription } from "@/components/ui/alert";
import Link from "next/link";
import CopyText from "@/components/CopyText";
import { memo } from "react";
-import { Button } from "../../../../components/ui/button";
+import { Button } from "../ui/button";
import { useParams } from "next/navigation";
// Component to display a single pageview or event
diff --git a/client/src/app/[site]/sessions/components/SessionsList.tsx b/client/src/components/Sessions/SessionsList.tsx
similarity index 61%
rename from client/src/app/[site]/sessions/components/SessionsList.tsx
rename to client/src/components/Sessions/SessionsList.tsx
index 68fa3d645..a339676eb 100644
--- a/client/src/app/[site]/sessions/components/SessionsList.tsx
+++ b/client/src/components/Sessions/SessionsList.tsx
@@ -1,24 +1,23 @@
-import { useEffect, useRef } from "react";
-import { useParams } from "next/navigation";
-import { GetSessionsResponse } from "../../../../api/analytics/userSessions";
+import { useEffect, useMemo, useRef } from "react";
+import { useGetSessionsInfinite } 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({ userId }: { userId?: string }) {
+ // Get sessions data with infinite loading
+ const {
+ data,
+ isLoading,
+ error,
+ fetchNextPage,
+ hasNextPage,
+ isFetchingNextPage,
+ } = useGetSessionsInfinite(userId);
-export default function SessionsList({
- data,
- isLoading,
- fetchNextPage,
- hasNextPage,
- isFetchingNextPage,
-}: SessionsListProps) {
- const { site } = useParams();
+ // Combine all pages of data
+ const flattenedData = useMemo(() => {
+ if (!data) return [];
+ return data.pages.flatMap((page) => page.data || []);
+ }, [data]);
// Reference for the scroll container
const containerRef = useRef<HTMLDivElement>(null);
@@ -49,6 +48,11 @@ export default function SessionsList({
}
}, [fetchNextPage, hasNextPage, isFetchingNextPage]);
+ if (error)
+ return (
+ <div className="text-red-500 p-4">Error: {(error as Error).message}</div>
+ );
+
return (
<div
ref={containerRef}
@@ -57,17 +61,18 @@ export default function SessionsList({
>
{isLoading ? (
// Show skeleton cards while loading
- Array.from({ length: 30 }).map((_, index) => (
- <SessionCardSkeleton key={`skeleton-${index}`} />
- ))
- ) : data.length === 0 ? (
+ <SessionCardSkeleton />
+ ) : flattenedData.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} />
+ flattenedData.map((session, index) => (
+ <SessionCard
+ key={`${session.session_id}-${index}`}
+ session={session}
+ />
))
)}