🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Enhance journey data handling and update user page components
Bill Yangb70b17198258
diff --git a/.gitignore b/.gitignoreindex 2dd8a3ee7..4af8aead9 100644--- a/.gitignore+++ b/.gitignore@@ -47,6 +47,8 @@ coverage/.claude/+.codex/+.agents/.deepsec/diff --git a/client/src/api/analytics/hooks/useGetJourneys.ts b/client/src/api/analytics/hooks/useGetJourneys.tsindex f25c113d8..b8ed98d34 100644--- a/client/src/api/analytics/hooks/useGetJourneys.ts+++ b/client/src/api/analytics/hooks/useGetJourneys.ts@@ -1,3 +1,4 @@+import { Filter } from "@rybbit/shared";import { useQuery } from "@tanstack/react-query";import { Time } from "../../../components/DateSelector/types";import { JOURNEY_PAGE_FILTERS } from "../../../lib/filterGroups";@@ -12,15 +13,18 @@ export interface JourneyParams {time: Time;limit?: number;stepFilters?: Record<number, string>;+ // Merged with the store filters (e.g. scoping journeys to a single user)+ additionalFilters?: Filter[];}-export const useJourneys = ({ siteId, steps = 3, time, limit = 100, stepFilters }: JourneyParams) => {+export const useJourneys = ({ siteId, steps = 3, time, limit = 100, stepFilters, additionalFilters }: JourneyParams) => {const { timezone } = useStore();const filteredFilters = getFilteredFilters(JOURNEY_PAGE_FILTERS);- const params = buildApiParams(time, { filters: filteredFilters });+ const combinedFilters = additionalFilters?.length ? [...filteredFilters, ...additionalFilters] : filteredFilters;+ const params = buildApiParams(time, { filters: combinedFilters });return useQuery<JourneysResponse>({- queryKey: ["journeys", siteId, steps, time, limit, filteredFilters, stepFilters, timezone],+ queryKey: ["journeys", siteId, steps, time, limit, combinedFilters, stepFilters, timezone],queryFn: () =>fetchJourneys(siteId!, {...params,diff --git a/client/src/app/[site]/user/[userId]/components/UserJourneys.tsx b/client/src/app/[site]/user/[userId]/components/UserJourneys.tsxnew file mode 100644index 000000000..52e6ef387--- /dev/null+++ b/client/src/app/[site]/user/[userId]/components/UserJourneys.tsx@@ -0,0 +1,76 @@+"use client";++import { useState } from "react";+import { useExtracted } from "next-intl";+import { useGetSite } from "../../../../../api/admin/hooks/useSites";+import { useJourneys } from "../../../../../api/analytics/hooks/useGetJourneys";+import { Card, CardContent } from "../../../../../components/ui/card";+import { Slider } from "../../../../../components/ui/slider";+import { useStore } from "../../../../../lib/store";+import { SankeyDiagram } from "../../../journeys/components/SankeyDiagram";++const MAX_JOURNEYS = 50;++export function UserJourneys({ userId }: { userId: string }) {+ const t = useExtracted();+ const [steps, setSteps] = useState<number>(3);++ const { data: siteMetadata } = useGetSite();+ const { time } = useStore();++ const { data, isLoading, error } = useJourneys({+ siteId: siteMetadata?.siteId,+ steps,+ time,+ limit: MAX_JOURNEYS,+ additionalFilters: [{ parameter: "user_id", value: [userId], type: "equals" }],+ });++ const journeys = data?.journeys ?? [];++ return (+ <Card>+ <CardContent className="mt-2">+ <div className="flex items-center justify-between gap-4 mb-3">+ <h3 className="text-sm font-medium text-neutral-700 dark:text-neutral-200">{t("Journeys")}</h3>+ <div className="flex items-center gap-3 w-[160px]">+ <span className="text-sm text-neutral-600 dark:text-neutral-300 whitespace-nowrap">+ {t("{steps} steps", { steps: String(steps) })}+ </span>+ <Slider+ value={[steps]}+ onValueChange={([value]) => setSteps(value)}+ min={2}+ max={6}+ step={1}+ className="flex-1"+ />+ </div>+ </div>+ <div className="relative min-h-[80px]">+ {isLoading && (+ <div className="absolute inset-0 bg-white/30 dark:bg-neutral-900/30 backdrop-blur-sm z-10 flex items-center justify-center">+ <div className="flex flex-col items-center gap-2">+ <div className="h-8 w-8 rounded-full border-2 border-accent-400 border-t-transparent animate-spin"></div>+ <span className="text-sm text-neutral-600 dark:text-neutral-300">{t("Loading journey data...")}</span>+ </div>+ </div>+ )}+ {journeys.length > 0 && siteMetadata?.domain ? (+ <SankeyDiagram journeys={journeys} steps={steps} maxJourneys={MAX_JOURNEYS} domain={siteMetadata.domain} />+ ) : null}+ {error && (+ <p className="text-sm text-neutral-500 dark:text-neutral-400 py-4">+ {t("Failed to load journey data. Please try again.")}+ </p>+ )}+ {journeys.length === 0 && !isLoading && !error && (+ <p className="text-sm text-neutral-500 dark:text-neutral-400 py-4">+ {t("No journey data found for the selected criteria.")}+ </p>+ )}+ </div>+ </CardContent>+ </Card>+ );+}diff --git a/client/src/app/[site]/user/[userId]/page.tsx b/client/src/app/[site]/user/[userId]/page.tsxindex 009052a96..a07438795 100644--- a/client/src/app/[site]/user/[userId]/page.tsx+++ b/client/src/app/[site]/user/[userId]/page.tsx@@ -33,6 +33,7 @@ import { Skeleton } from "../../../../components/ui/skeleton";import { Avatar, generateName } from "../../../../components/Avatar";import { Badge } from "../../../../components/ui/badge";import { IdentifiedBadge } from "../../../../components/IdentifiedBadge";+import { UserJourneys } from "./components/UserJourneys";import { UserTopPages } from "./components/UserTopPages";const LIMIT = 25;@@ -189,6 +190,7 @@ export default function UserPage() {{/* Right Content - Sessions */}<div className="flex-1 min-w-0 space-y-4"><UserTopPages userId={userId} />+ <UserJourneys userId={userId} /><SessionsListsessions={sessions}isLoading={isLoadingSessions}