Skip to content

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

Enhance SessionDetails component with user navigation and layout improvements

Bill Yangbb0b73f53b8d
diff --git a/client/src/app/[site]/sessions/components/SessionDetails.tsx b/client/src/app/[site]/sessions/components/SessionDetails.tsx
index a6111d106..a3942691e 100644
--- a/client/src/app/[site]/sessions/components/SessionDetails.tsx
+++ b/client/src/app/[site]/sessions/components/SessionDetails.tsx
@@ -8,6 +8,7 @@ import {
Clock,
FileText,
MousePointerClick,
+ ArrowRight,
} from "lucide-react";
import Avatar from "boring-avatars";
import {
@@ -22,6 +23,8 @@ 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 { useParams } from "next/navigation";
// Component to display a single pageview or event
function PageviewItem({
@@ -223,6 +226,7 @@ export function SessionDetails({ session }: SessionDetailsProps) {
isLoading,
error,
} = useGetSessionDetails(session.session_id);
+ const { site } = useParams();
// Calculate session duration for the details section
const getDurationFormatted = () => {
@@ -251,10 +255,17 @@ export function SessionDetails({ session }: SessionDetailsProps) {
</Alert>
) : sessionDetails?.data ? (
<Tabs defaultValue="timeline" className="mt-4">
- <TabsList className="bg-neutral-800">
- <TabsTrigger value="timeline">Timeline</TabsTrigger>
- <TabsTrigger value="info">Session Info</TabsTrigger>
- </TabsList>
+ <div className="flex justify-between items-center mb-6">
+ <TabsList className="bg-neutral-800">
+ <TabsTrigger value="timeline">Timeline</TabsTrigger>
+ <TabsTrigger value="info">Session Info</TabsTrigger>
+ </TabsList>
+ <Link href={`/${site}/user/${sessionDetails.data.session.user_id}`}>
+ <Button variant={"accent"}>
+ View User <ArrowRight className="w-4 h-4" />
+ </Button>
+ </Link>
+ </div>
<TabsContent value="timeline" className="mt-4">
<div className="mb-3">
diff --git a/server/src/api/getSessions.ts b/server/src/api/getSessions.ts
index 433a18b85..ff06608bb 100644
--- a/server/src/api/getSessions.ts
+++ b/server/src/api/getSessions.ts
@@ -55,13 +55,13 @@ export async function getSessions(
SELECT
session_id,
user_id,
- country,
- iso_3166_2,
- language,
- device_type,
- browser,
- operating_system,
- argMin(referrer, timestamp),
+ argMax(country, timestamp) AS country,
+ argMax(iso_3166_2, timestamp) AS iso_3166_2,
+ argMax(language, timestamp) AS language,
+ argMax(device_type, timestamp) AS device_type,
+ argMax(browser, timestamp) AS browser,
+ argMax(operating_system, timestamp) AS operating_system,
+ argMin(referrer, timestamp) AS referrer,
MAX(timestamp) AS session_end,
MIN(timestamp) AS session_start,
dateDiff('second', MIN(timestamp), MAX(timestamp)) AS session_duration,
@@ -77,14 +77,7 @@ WHERE
${getTimeStatement(startDate, endDate, timezone)}
GROUP BY
session_id,
- user_id,
- browser,
- country,
- iso_3166_2,
- language,
- device_type,
- operating_system
-
+ user_id
ORDER BY session_end DESC
LIMIT 100 OFFSET ${(page - 1) * 100}
`;