Skip to content

πŸ“ˆ Open source, privacy-first web analytics β€” a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

Merge branch 'main' into feature/v2-analytics-api

Blue Mouseca883b6b2a97
diff --cc web/app/api/api.server.ts
index 0494c1933,e05458f62..70c0dcc6d
--- a/web/app/api/api.server.ts
+++ b/web/app/api/api.server.ts
@@@ -882,6 -1104,102 +884,56 @@@ export interface GoalSessionsResponse
skip: number
}
-export async function getFunnelSessionsServer(
- request: Request,
- pid: string,
- params: {
- period: string
- from?: string
- to?: string
- timezone?: string
- funnelId?: string
- step: number
- take?: number
- skip?: number
- password?: string
- filters?: AnalyticsFilter[]
- dropoff?: boolean
- },
-): Promise<ServerFetchResult<FunnelSessionsResponse>> {
- const step = Math.max(1, Math.floor(Number(params.step) || 1))
- const take = Math.min(150, Math.max(1, Math.floor(Number(params.take) || 30)))
- const skip = Math.max(0, Math.floor(Number(params.skip) || 0))
-
- const queryParams = new URLSearchParams()
- queryParams.append('pid', pid)
- queryParams.append('period', params.period)
- queryParams.append('step', String(step))
- queryParams.append('take', String(take))
- queryParams.append('skip', String(skip))
- queryParams.append('filters', JSON.stringify(params.filters || []))
- if (params.funnelId) queryParams.append('funnelId', params.funnelId)
- if (params.from) queryParams.append('from', params.from)
- if (params.to) queryParams.append('to', params.to)
- if (params.timezone) queryParams.append('timezone', params.timezone)
- if (params.dropoff) queryParams.append('dropoff', 'true')
-
- const headers: Record<string, string> = {}
- if (params.password) {
- headers['x-password'] = params.password
- }
-
- return serverFetch<FunnelSessionsResponse>(
- request,
- `log/funnel-sessions?${queryParams.toString()}`,
- { headers },
- )
-}
-
+ export interface JourneySessionsResponse {
+ sessions: Session[]
+ take: number
+ skip: number
+ }
+
+ export async function getJourneySessionsServer(
+ request: Request,
+ pid: string,
+ params: {
+ period: string
+ from?: string
+ to?: string
+ timezone?: string
+ step: number
+ page: string
+ take?: number
+ skip?: number
+ password?: string
+ filters?: AnalyticsFilter[]
+ },
+ ): Promise<ServerFetchResult<JourneySessionsResponse>> {
+ const step = Math.min(10, Math.max(1, Math.floor(Number(params.step) || 1)))
+ const take = Math.min(150, Math.max(1, Math.floor(Number(params.take) || 30)))
+ const skip = Math.max(0, Math.floor(Number(params.skip) || 0))
+
+ const queryParams = new URLSearchParams()
+ queryParams.append('pid', pid)
+ queryParams.append('period', params.period)
+ queryParams.append('step', String(step))
+ queryParams.append('page', params.page)
+ queryParams.append('take', String(take))
+ queryParams.append('skip', String(skip))
+ queryParams.append('filters', JSON.stringify(params.filters || []))
+ if (params.from) queryParams.append('from', params.from)
+ if (params.to) queryParams.append('to', params.to)
+ if (params.timezone) queryParams.append('timezone', params.timezone)
+
+ const headers: Record<string, string> = {}
+ if (params.password) {
+ headers['x-password'] = params.password
+ }
+
+ return serverFetch<JourneySessionsResponse>(
+ request,
+ `log/journey-sessions?${queryParams.toString()}`,
+ { headers },
+ )
+ }
+
export async function getGoalSessionsServer(
request: Request,
goalId: string,
diff --cc web/app/hooks/useAnalyticsProxy.ts
index e28d88afb,65ad2c0e7..eadfb8cde
--- a/web/app/hooks/useAnalyticsProxy.ts
+++ b/web/app/hooks/useAnalyticsProxy.ts
@@@ -14,9 -17,19 +14,10 @@@ import type
Goal,
GoalsResponse,
FeatureFlagsResponse,
- ProfilesResponse,
- ProfileDetailsResponse,
- ProfileSessionsResponse,
- VersionFilter,
- CustomEventsMetadataResponse,
- PropertyMetadataResponse,
- ErrorSessionsResponse,
LiveStats,
- LiveVisitorInfo,
BotProtectionStats,
BotProtectionPeriod,
- ProjectDataCustomEventsResponse,
+ JourneysResponse,
GSCDashboardResponse,
RevenueStatus,
RevenueDataResponse,
@@@ -619,6 -982,70 +620,44 @@@ export function useBotProtectionStatsPr
return { fetchBotProtectionStats }
}
-export function useProjectDataCustomEventsProxy() {
- const fetchCustomEvents = useCallback(
- async (
- projectId: string,
- customEvents: string[],
- params: ClientAnalyticsParams = {},
- ): Promise<ProjectDataCustomEventsResponse | null> => {
- try {
- const result = await postAnalytics<ProjectDataCustomEventsResponse>({
- action: 'getProjectDataCustomEvents',
- projectId,
- customEvents,
- params,
- })
- return result.data
- } catch (err) {
- console.error('[useProjectDataCustomEventsProxy] Error:', err)
- throw err
- }
- },
- [],
- )
-
- return { fetchCustomEvents }
-}
-
+ export function useJourneysProxy() {
+ const [data, setData] = useState<JourneysResponse | null>(null)
+ const [error, setError] = useState<string | null>(null)
+ const [isLoading, setIsLoading] = useState(false)
+
+ const fetchJourneys = useCallback(
+ async (
+ projectId: string,
+ params: ClientAnalyticsParams & {
+ steps?: number
+ journeys?: number
+ } = {},
+ ) => {
+ setIsLoading(true)
+ setError(null)
+
+ try {
+ const result = await postAnalytics<JourneysResponse>({
+ action: 'getJourneys',
+ projectId,
+ params,
+ })
+ setData(result.data)
+ setError(result.error)
+ return result.data
+ } catch (err) {
+ setError(err instanceof Error ? err.message : 'Unknown error')
+ return null
+ } finally {
+ setIsLoading(false)
+ }
+ },
+ [],
+ )
+
+ return { fetchJourneys, data, error, isLoading }
+ }
+
export function useGSCDashboardProxy() {
const [data, setData] = useState<GSCDashboardResponse | null>(null)
const [error, setError] = useState<string | null>(null)
diff --cc web/app/pages/Project/View/ViewProject.tsx
index 157517877,01a03d3a6..4934271b1
--- a/web/app/pages/Project/View/ViewProject.tsx
+++ b/web/app/pages/Project/View/ViewProject.tsx
@@@ -193,6 -198,14 +195,7 @@@ interface RefreshTriggersContextType
goalsRefreshTrigger: number
experimentsRefreshTrigger: number
featureFlagsRefreshTrigger: number
- sessionsRefreshTrigger: number
- errorsRefreshTrigger: number
- performanceRefreshTrigger: number
- trafficRefreshTrigger: number
- funnelsRefreshTrigger: number
+ journeysRefreshTrigger: number
- profilesRefreshTrigger: number
replaysRefreshTrigger: number
seoRefreshTrigger: number
}
@@@ -255,6 -268,14 +258,7 @@@ const defaultRefreshTriggersContext: Re
goalsRefreshTrigger: 0,
experimentsRefreshTrigger: 0,
featureFlagsRefreshTrigger: 0,
- sessionsRefreshTrigger: 0,
- errorsRefreshTrigger: 0,
- performanceRefreshTrigger: 0,
- trafficRefreshTrigger: 0,
- funnelsRefreshTrigger: 0,
+ journeysRefreshTrigger: 0,
- profilesRefreshTrigger: 0,
replaysRefreshTrigger: 0,
seoRefreshTrigger: 0,
}
@@@ -340,8 -361,28 +344,9 @@@ const ViewProjectContent = () =>
const [experimentsRefreshTrigger, setExperimentsRefreshTrigger] = useState(0)
const [featureFlagsRefreshTrigger, setFeatureFlagsRefreshTrigger] =
useState(0)
- const [sessionsRefreshTrigger, setSessionsRefreshTrigger] = useState(0)
- const [errorsRefreshTrigger, setErrorsRefreshTrigger] = useState(0)
- const [performanceRefreshTrigger, setPerformanceRefreshTrigger] = useState(0)
- const [trafficRefreshTrigger, setTrafficRefreshTrigger] = useState(0)
- const [funnelsRefreshTrigger, setFunnelsRefreshTrigger] = useState(0)
+ const [journeysRefreshTrigger, setJourneysRefreshTrigger] = useState(0)
- const [profilesRefreshTrigger, setProfilesRefreshTrigger] = useState(0)
const [replaysRefreshTrigger, setReplaysRefreshTrigger] = useState(0)
const [seoRefreshTrigger, setSeoRefreshTrigger] = useState(0)
- const [activeChartMetrics] = useState<
- Record<keyof typeof CHART_METRICS_MAPPING, boolean>
- >({
- [CHART_METRICS_MAPPING.unique]: true,
- [CHART_METRICS_MAPPING.views]: false,
- [CHART_METRICS_MAPPING.sessionDuration]: false,
- [CHART_METRICS_MAPPING.bounce]: false,
- [CHART_METRICS_MAPPING.viewsPerUnique]: false,
- [CHART_METRICS_MAPPING.trendlines]: false,
- [CHART_METRICS_MAPPING.cumulativeMode]: false,
- [CHART_METRICS_MAPPING.customEvents]: false,
- [CHART_METRICS_MAPPING.revenue]: false,
- } as Record<keyof typeof CHART_METRICS_MAPPING, boolean>)
const customMetrics = useMemo<ProjectViewCustomEvent[]>(() => {
const raw = searchParams.get('metrics')
if (!raw) return []
@@@ -874,60 -926,76 +884,65 @@@
[dataLoading, searchParams, setSearchParams],
)
+ // Tabs fully served by the v2 per-dimension API: refresh = invalidate queries
+ const V2_TABS = useMemo(
+ () =>
+ new Set<keyof typeof PROJECT_TABS>([
+ PROJECT_TABS.traffic,
+ PROJECT_TABS.performance,
+ PROJECT_TABS.sessions,
+ PROJECT_TABS.errors,
+ PROJECT_TABS.funnels,
+ PROJECT_TABS.profiles,
+ PROJECT_TABS.captcha,
+ ]),
+ [],
+ )
+
const refreshStats = useCallback(
async (_isManual = true) => {
- if (!authLoading && !dataLoading) {
- if (activeTab === PROJECT_TABS.funnels) {
- setFunnelsRefreshTrigger((prev) => prev + 1)
- return
- }
-
- if (activeTab === PROJECT_TABS.journeys) {
- setJourneysRefreshTrigger((prev) => prev + 1)
- return
- }
-
- if (activeTab === PROJECT_TABS.profiles) {
- setProfilesRefreshTrigger((prev) => prev + 1)
- return
- }
-
- if (activeTab === PROJECT_TABS.captcha) {
- setCaptchaRefreshTrigger((prev) => prev + 1)
- return
- }
-
- if (activeTab === PROJECT_TABS.goals) {
- setGoalsRefreshTrigger((prev) => prev + 1)
- return
- }
-
- if (activeTab === PROJECT_TABS.experiments) {
- setExperimentsRefreshTrigger((prev) => prev + 1)
- return
- }
+ if (authLoading || dataLoading) {
+ return
+ }
- if (activeTab === PROJECT_TABS.featureFlags) {
- setFeatureFlagsRefreshTrigger((prev) => prev + 1)
- return
- }
+ if (V2_TABS.has(activeTab)) {
+ await queryClient.invalidateQueries({ queryKey: ['v2', id] })
+ return
+ }
- if (activeTab === PROJECT_TABS.sessions) {
- setSessionsRefreshTrigger((prev) => prev + 1)
- return
- }
++ if (activeTab === PROJECT_TABS.journeys) {
++ setJourneysRefreshTrigger((prev) => prev + 1)
++ return
++ }
+
- if (activeTab === PROJECT_TABS.replays) {
- setReplaysRefreshTrigger((prev) => prev + 1)
- return
- }
+ if (activeTab === PROJECT_TABS.goals) {
+ setGoalsRefreshTrigger((prev) => prev + 1)
+ return
+ }
- if (activeTab === PROJECT_TABS.errors) {
- setErrorsRefreshTrigger((prev) => prev + 1)
- return
- }
+ if (activeTab === PROJECT_TABS.experiments) {
+ setExperimentsRefreshTrigger((prev) => prev + 1)
+ return
+ }
- if (activeTab === PROJECT_TABS.performance) {
- setPerformanceRefreshTrigger((prev) => prev + 1)
- return
- }
+ if (activeTab === PROJECT_TABS.featureFlags) {
+ setFeatureFlagsRefreshTrigger((prev) => prev + 1)
+ return
+ }
- if (activeTab === PROJECT_TABS.traffic) {
- setTrafficRefreshTrigger((prev) => prev + 1)
- return
- }
+ if (activeTab === PROJECT_TABS.replays) {
+ setReplaysRefreshTrigger((prev) => prev + 1)
+ return
+ }
- if (activeTab === PROJECT_TABS.seo) {
- setSeoRefreshTrigger((prev) => prev + 1)
- return
- }
+ if (activeTab === PROJECT_TABS.seo) {
+ // The SEO tab mixes GSC data (trigger-driven) with v2 referral data
+ await queryClient.invalidateQueries({ queryKey: ['v2', id] })
+ setSeoRefreshTrigger((prev) => prev + 1)
+ return
}
},
- [authLoading, dataLoading, activeTab],
+ [authLoading, dataLoading, activeTab, queryClient, id, V2_TABS],
)
useEffect(() => {
@@@ -1263,6 -1328,14 +1278,7 @@@
goalsRefreshTrigger,
experimentsRefreshTrigger,
featureFlagsRefreshTrigger,
- sessionsRefreshTrigger,
- errorsRefreshTrigger,
- performanceRefreshTrigger,
- trafficRefreshTrigger,
- funnelsRefreshTrigger,
+ journeysRefreshTrigger,
- profilesRefreshTrigger,
replaysRefreshTrigger,
seoRefreshTrigger,
}),
@@@ -1270,6 -1343,14 +1286,7 @@@
goalsRefreshTrigger,
experimentsRefreshTrigger,
featureFlagsRefreshTrigger,
- sessionsRefreshTrigger,
- errorsRefreshTrigger,
- performanceRefreshTrigger,
- trafficRefreshTrigger,
- funnelsRefreshTrigger,
+ journeysRefreshTrigger,
- profilesRefreshTrigger,
replaysRefreshTrigger,
seoRefreshTrigger,
],
diff --cc web/app/pages/Project/tabs/Journeys/JourneysView.tsx
index 000000000,ad2f42a0e..997e00f55
mode 000000,100644..100644
--- a/web/app/pages/Project/tabs/Journeys/JourneysView.tsx
+++ b/web/app/pages/Project/tabs/Journeys/JourneysView.tsx
@@@ -1,0 -1,494 +1,496 @@@
+ import { ResponsiveSankey } from '@nivo/sankey'
+ import { PathIcon } from '@phosphor-icons/react'
+ import _isEmpty from 'lodash/isEmpty'
+ import { useEffect, useMemo, useState } from 'react'
+ import { useTranslation } from 'react-i18next'
+ import { toast } from 'sonner'
+
+ import type { JourneysResponse } from '~/api/api.server'
+ import { useJourneysProxy } from '~/hooks/useAnalyticsProxy'
+ import DashboardHeader from '~/pages/Project/View/components/DashboardHeader'
+ import Filters from '~/pages/Project/View/components/Filters'
+ import ProjectViewHeaderActions from '~/pages/Project/View/components/ProjectViewHeaderActions'
+ import TabErrorBoundary from '~/pages/Project/View/components/TabErrorBoundary'
+ import {
+ useViewProjectContext,
+ useRefreshTriggers,
+ } from '~/pages/Project/View/ViewProject'
+ import { useCurrentProject } from '~/providers/CurrentProjectProvider'
+ import { useTheme } from '~/providers/ThemeProvider'
+ import Loader from '~/ui/Loader'
+ import LoadingBar from '~/ui/LoadingBar'
+ import { Text } from '~/ui/Text'
++import { v2FilterToLegacy } from '~/utils/analyticsUrl'
+
+ import { SessionsDrawer } from '../Traffic/SessionsDrawer'
+ import { getFormatDate } from '../../View/ViewProject.helpers'
+
+ const MIN_STEPS = 2
+ const MAX_STEPS = 10
+ const MIN_JOURNEYS = 5
+ const MAX_JOURNEYS = 100
+ const DEFAULT_STEPS = 3
+ const DEFAULT_JOURNEYS = 20
+
+ const NODE_COLOURS = [
+ '#2563eb',
+ '#0d9488',
+ '#7c3aed',
+ '#db2777',
+ '#ea580c',
+ '#65a30d',
+ '#0891b2',
+ '#c026d3',
+ '#4f46e5',
+ '#b45309',
+ ]
+
+ interface SankeyNodeMeta {
+ page: string
+ step: number
+ sessions: number
+ }
+
+ interface JourneysViewProps {
+ tnMapping: Record<string, string>
+ }
+
+ const truncatePath = (path: string, maxLength = 24) => {
+ if (path.length <= maxLength) {
+ return path
+ }
+
+ return `${path.slice(0, maxLength - 1)}…`
+ }
+
+ const JourneysView = ({ tnMapping }: JourneysViewProps) => {
+ const { dateRange, period, timezone, timeFormat, filters } =
+ useViewProjectContext()
+ const { journeysRefreshTrigger } = useRefreshTriggers()
+ const { id } = useCurrentProject()
+ const { theme } = useTheme()
+ const { t } = useTranslation('common')
+
+ const [steps, setSteps] = useState(DEFAULT_STEPS)
+ const [journeysCount, setJourneysCount] = useState(DEFAULT_JOURNEYS)
+ const [debouncedParams, setDebouncedParams] = useState({
+ steps: DEFAULT_STEPS,
+ journeys: DEFAULT_JOURNEYS,
+ })
+ const [isLoading, setIsLoading] = useState<boolean | null>(null)
+ const [journeysData, setJourneysData] = useState<JourneysResponse | null>(
+ null,
+ )
+ const [sessionsDrawer, setSessionsDrawer] = useState<{
+ step: number
+ page: string
+ sessions: number
+ } | null>(null)
+
+ const { fetchJourneys } = useJourneysProxy()
+
+ const [from, to] = useMemo(() => {
+ if (!dateRange) {
+ return [undefined, undefined]
+ }
+
+ return [getFormatDate(dateRange[0]), getFormatDate(dateRange[1])]
+ }, [dateRange])
+
+ useEffect(() => {
+ const timer = setTimeout(() => {
+ setDebouncedParams({ steps, journeys: journeysCount })
+ }, 300)
+
+ return () => clearTimeout(timer)
+ }, [steps, journeysCount])
+
+ useEffect(() => {
+ let cancelled = false
+
+ const load = async () => {
+ setIsLoading(true)
+
+ try {
+ const result = await fetchJourneys(id, {
+ period,
- filters,
++ // the journeys endpoint is still v1 β€” convert filters at the boundary
++ filters: filters.map(v2FilterToLegacy),
+ from,
+ to,
+ timezone,
+ steps: debouncedParams.steps,
+ journeys: debouncedParams.journeys,
+ })
+
+ if (!cancelled && result) {
+ setJourneysData(result)
+ }
+ } catch (error: any) {
+ if (!cancelled) {
+ toast.error(
+ typeof error === 'string'
+ ? error
+ : t('apiNotifications.somethingWentWrong'),
+ )
+ }
+ } finally {
+ if (!cancelled) {
+ setIsLoading(false)
+ }
+ }
+ }
+
+ load()
+
+ return () => {
+ cancelled = true
+ }
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [
+ id,
+ period,
+ from,
+ to,
+ timezone,
+ filters,
+ debouncedParams,
+ journeysRefreshTrigger,
+ ])
+
+ const { sankeyData, nodeMeta, maxColumnNodes } = useMemo(() => {
+ const meta = new Map<string, SankeyNodeMeta>()
+
+ if (_isEmpty(journeysData?.journeys)) {
+ return { sankeyData: null, nodeMeta: meta, maxColumnNodes: 0 }
+ }
+
+ const nodeSessions = new Map<string, SankeyNodeMeta>()
+ const links = new Map<
+ string,
+ { source: string; target: string; value: number }
+ >()
+
+ for (const { path, value } of journeysData!.journeys) {
+ path.forEach((page, index) => {
+ const nodeId = `${index}:${page}`
+ const node = nodeSessions.get(nodeId)
+
+ if (node) {
+ node.sessions += value
+ } else {
+ nodeSessions.set(nodeId, { page, step: index, sessions: value })
+ }
+
+ if (index < path.length - 1) {
+ const target = `${index + 1}:${path[index + 1]}`
+ const linkId = `${nodeId}β†’${target}`
+ const link = links.get(linkId)
+
+ if (link) {
+ link.value += value
+ } else {
+ links.set(linkId, { source: nodeId, target, value })
+ }
+ }
+ })
+ }
+
+ if (links.size === 0) {
+ return { sankeyData: null, nodeMeta: meta, maxColumnNodes: 0 }
+ }
+
+ // Nivo requires every node to participate in at least one link,
+ // so nodes are derived from links (journeys that end early simply taper off)
+ const linkedNodeIds = new Set<string>()
+
+ for (const link of links.values()) {
+ linkedNodeIds.add(link.source)
+ linkedNodeIds.add(link.target)
+ }
+
+ const columnCounts = new Map<number, number>()
+ const nodes: { id: string }[] = []
+
+ for (const nodeId of linkedNodeIds) {
+ const node = nodeSessions.get(nodeId)!
+ meta.set(nodeId, node)
+ nodes.push({ id: nodeId })
+ columnCounts.set(node.step, (columnCounts.get(node.step) || 0) + 1)
+ }
+
+ return {
+ sankeyData: { nodes, links: Array.from(links.values()) },
+ nodeMeta: meta,
+ maxColumnNodes: Math.max(...columnCounts.values()),
+ }
+ }, [journeysData])
+
+ const chartHeight = useMemo(
+ () => Math.min(1000, Math.max(440, maxColumnNodes * 56)),
+ [maxColumnNodes],
+ )
+
+ const totalSessions = journeysData?.totalSessions || 0
+
+ const nodeColour = (nodeId: string) => {
+ const node = nodeMeta.get(nodeId)
+ return NODE_COLOURS[(node?.step ?? 0) % NODE_COLOURS.length]
+ }
+
+ const renderNodeTooltip = (nodeId: string) => {
+ const node = nodeMeta.get(nodeId)
+
+ if (!node) {
+ return null
+ }
+
+ const percentage =
+ totalSessions > 0
+ ? Math.round((node.sessions / totalSessions) * 10000) / 100
+ : 0
+
+ return (
+ <div className='w-max max-w-xs rounded-lg bg-gray-50 px-3 py-2.5 text-xs shadow-lg ring-1 ring-black/10 md:max-w-md md:text-sm dark:bg-slate-900 dark:ring-white/10'>
+ <p className='font-semibold break-all text-gray-900 dark:text-gray-50'>
+ {node.page}
+ </p>
+ <p className='mt-1 text-gray-700 dark:text-gray-300'>
+ {t('project.journeys.stepX', { x: node.step + 1 })} Β·{' '}
+ {t('project.journeys.xSessions', {
+ x: node.sessions.toLocaleString(),
+ })}
+ </p>
+ <p className='text-gray-700 dark:text-gray-300'>
+ {t('project.journeys.percentOfSessions', { x: percentage })}
+ </p>
+ <p className='mt-1.5 text-gray-500 dark:text-gray-400'>
+ {t('project.journeys.clickToInspect')}
+ </p>
+ </div>
+ )
+ }
+
+ const renderLinkTooltip = (
+ sourceId: string,
+ targetId: string,
+ value: number,
+ ) => {
+ const source = nodeMeta.get(sourceId)
+ const target = nodeMeta.get(targetId)
+
+ if (!source || !target) {
+ return null
+ }
+
+ const percentage =
+ source.sessions > 0
+ ? Math.round((value / source.sessions) * 10000) / 100
+ : 0
+
+ return (
+ <div className='w-max max-w-xs rounded-lg bg-gray-50 px-3 py-2.5 text-xs shadow-lg ring-1 ring-black/10 md:max-w-md md:text-sm dark:bg-slate-900 dark:ring-white/10'>
+ <p className='font-semibold break-all text-gray-900 dark:text-gray-50'>
+ {source.page} β†’ {target.page}
+ </p>
+ <p className='mt-1 text-gray-700 dark:text-gray-300'>
+ {t('project.journeys.xSessions', { x: value.toLocaleString() })}
+ </p>
+ <p className='text-gray-700 dark:text-gray-300'>
+ {t('project.journeys.percentContinued', { x: percentage })}
+ </p>
+ </div>
+ )
+ }
+
+ const sliders = (
+ <div className='mb-3 flex flex-wrap items-center gap-x-8 gap-y-3'>
+ <div className='flex items-center gap-3'>
+ <Text
+ as='span'
+ size='sm'
+ weight='medium'
+ className='whitespace-nowrap tabular-nums'
+ >
+ {t('project.journeys.xSteps', { x: steps })}
+ </Text>
+ <input
+ type='range'
+ aria-label={t('project.journeys.stepsSliderLabel')}
+ min={MIN_STEPS}
+ max={MAX_STEPS}
+ value={steps}
+ onChange={(e) => setSteps(Number(e.target.value))}
+ className='w-36 sm:w-44'
+ />
+ </div>
+ <div className='flex items-center gap-3'>
+ <Text
+ as='span'
+ size='sm'
+ weight='medium'
+ className='whitespace-nowrap tabular-nums'
+ >
+ {t('project.journeys.xJourneys', { x: journeysCount })}
+ </Text>
+ <input
+ type='range'
+ aria-label={t('project.journeys.journeysSliderLabel')}
+ min={MIN_JOURNEYS}
+ max={MAX_JOURNEYS}
+ step={5}
+ value={journeysCount}
+ onChange={(e) => setJourneysCount(Number(e.target.value))}
+ className='w-36 sm:w-44'
+ />
+ </div>
+ </div>
+ )
+
+ return (
+ <TabErrorBoundary
+ titleKey='dashboard.failedToLoadJourneys'
+ resetKey={`journeys:${journeysRefreshTrigger}`}
+ >
+ <DashboardHeader
+ showLiveVisitors
+ hideTimeBucket
+ rightContent={<ProjectViewHeaderActions tnMapping={tnMapping} />}
+ />
+ <Filters className='mb-3' tnMapping={tnMapping} />
+ {isLoading && journeysData ? <LoadingBar /> : null}
+
+ {isLoading === null || (isLoading && !journeysData) ? (
+ <Loader />
+ ) : (
+ <>
+ {sliders}
+ {sankeyData ? (
+ // nivo hardcodes z-index 10 on its tooltip wrapper, while the sticky
+ // sidebar and dashboard header sit at z-20 β€” lift just the tooltip above them
+ <div
+ style={{ height: chartHeight }}
+ className="[&_div[style*='z-index']]:z-30!"
+ >
+ <ResponsiveSankey
+ data={sankeyData}
+ margin={{ top: 8, right: 8, bottom: 8, left: 8 }}
+ align='start'
+ colors={(node: any) => nodeColour(node.id)}
+ nodeOpacity={1}
+ nodeHoverOthersOpacity={0.35}
+ nodeThickness={14}
+ nodeSpacing={22}
+ nodeBorderWidth={0}
+ nodeBorderRadius={3}
+ linkOpacity={theme === 'dark' ? 0.35 : 0.25}
+ linkHoverOpacity={0.6}
+ linkHoverOthersOpacity={0.1}
+ linkContract={2}
+ enableLinkGradient
+ label={(node: any) => {
+ const meta = nodeMeta.get(node.id)
+
+ if (!meta) {
+ return node.id
+ }
+
+ // hide labels of tiny nodes to reduce clutter, they are still hoverable
+ if (
+ totalSessions > 0 &&
+ meta.sessions / totalSessions < 0.015
+ ) {
+ return ''
+ }
+
+ return truncatePath(meta.page)
+ }}
+ labelPosition='inside'
+ labelOrientation='horizontal'
+ labelPadding={10}
+ labelTextColor={theme === 'dark' ? '#e2e8f0' : '#334155'}
+ theme={{
+ labels: {
+ text: {
+ fontSize: 13,
+ fontWeight: 500,
+ fontFamily: 'inherit',
+ },
+ },
+ }}
+ nodeTooltip={({ node }: any) => renderNodeTooltip(node.id)}
+ linkTooltip={({ link }: any) =>
+ renderLinkTooltip(link.source.id, link.target.id, link.value)
+ }
+ onClick={(data: any) => {
+ // links (source/target present) are not clickable, only nodes are
+ if (data?.source || !data?.id) {
+ return
+ }
+
+ const node = nodeMeta.get(data.id)
+
+ if (!node) {
+ return
+ }
+
+ setSessionsDrawer({
+ step: node.step + 1,
+ page: node.page,
+ sessions: node.sessions,
+ })
+ }}
+ />
+ </div>
+ ) : (
+ <div className='mx-auto w-full max-w-2xl py-16 text-center'>
+ <div className='mx-auto mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-900'>
+ <PathIcon className='size-7 text-gray-700 dark:text-gray-200' />
+ </div>
+ <Text
+ as='h3'
+ size='xl'
+ weight='medium'
+ className='tracking-tight'
+ >
+ {t('dashboard.journeys')}
+ </Text>
+ <Text
+ as='p'
+ size='sm'
+ colour='secondary'
+ className='mx-auto mt-2 max-w-md whitespace-pre-wrap'
+ >
+ {t('project.journeys.noData')}
+ </Text>
+ </div>
+ )}
+ </>
+ )}
+
+ <SessionsDrawer
+ isOpen={!!sessionsDrawer}
+ onClose={() => setSessionsDrawer(null)}
+ label={
+ sessionsDrawer
+ ? `${sessionsDrawer.page} Β· ${t('project.journeys.stepX', {
+ x: sessionsDrawer.step,
+ })}`
+ : ''
+ }
+ projectId={id}
+ timezone={timezone}
+ timeFormat={timeFormat}
+ period={period}
+ from={from}
+ to={to}
+ filters={filters}
+ journeyStep={sessionsDrawer?.step}
+ journeyPage={sessionsDrawer?.page}
+ totalCount={sessionsDrawer?.sessions}
+ />
+ </TabErrorBoundary>
+ )
+ }
+
+ export default JourneysView
diff --cc web/app/pages/Project/tabs/Traffic/SessionsDrawer.tsx
index c008ce9cb,c35ed3181..fa87a8a1e
--- a/web/app/pages/Project/tabs/Traffic/SessionsDrawer.tsx
+++ b/web/app/pages/Project/tabs/Traffic/SessionsDrawer.tsx
@@@ -27,6 -34,6 +27,7 @@@ import { Link } from '~/ui/Link
import { Text } from '~/ui/Text'
import Flag from '~/ui/Flag'
import { useTheme } from '~/providers/ThemeProvider'
++import { v2FilterToLegacy } from '~/utils/analyticsUrl'
import { getRelativeDateIfPossible } from '~/utils/date'
import { Session } from '../Sessions/Sessions'
@@@ -49,20 -50,8 +50,21 @@@ interface ErrorAffectedSession
type DrawerSession = SessionType | ErrorAffectedSession
-async function fetchSessionsPage(
- action: string,
+/**
- * Goal sessions have no v2 endpoint yet, so they still go through the v1
- * analytics proxy. The response uses v1 short keys - map them to the v2
++ * Goal and journey sessions have no v2 endpoint yet, so they still go through
++ * the v1 analytics proxy. The response uses v1 short keys - map them to the v2
+ * readable keys the shared <Session /> renderer expects.
+ */
+const mapV1SessionKeys = (session: Record<string, any>): SessionType =>
+ ({
+ ...session,
+ country: session.country ?? session.cc ?? null,
+ browser: session.browser ?? session.br ?? null,
+ duration: session.duration ?? session.sdur,
+ }) as SessionType
+
- async function fetchGoalSessionsPage(
++async function fetchProxySessionsPage(
++ action: 'getGoalSessions' | 'getJourneySessions',
projectId: string,
params: Record<string, unknown>,
signal?: AbortSignal,
@@@ -71,8 -61,9 +73,8 @@@
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({
- action: 'getGoalSessions',
+ action,
projectId,
- ...rootParams,
params,
}),
signal,
@@@ -277,21 -279,26 +284,40 @@@ export const SessionsDrawer = (
},
signal,
)
+ newSessions = result.data as unknown as SessionType[]
+ } else if (isErrorMode) {
+ const result = await v2api.getErrorSessions(
+ projectId,
+ errorId!,
+ {
+ ...commonParams,
+ limit: SESSIONS_TAKE,
+ offset: currentSkip,
+ },
+ signal,
+ )
+ newSessions = result.data as unknown as ErrorAffectedSession[]
+ } else if (isJourneyMode) {
- result = await fetchSessionsPage(
++ newSessions = await fetchProxySessionsPage(
+ 'getJourneySessions',
+ projectId,
+ {
+ period,
+ from,
+ to,
+ timezone,
+ step: journeyStep,
+ page: journeyPage,
- filters: stableFilters,
++ // the journey-sessions endpoint is still v1 β€” convert at the boundary
++ filters: stableFilters.map(v2FilterToLegacy),
+ take: SESSIONS_TAKE,
+ skip: currentSkip,
+ },
+ signal,
+ )
} else if (isGoalMode) {
- newSessions = await fetchGoalSessionsPage(
- result = await fetchSessionsPage(
++ newSessions = await fetchProxySessionsPage(
+ 'getGoalSessions',
projectId,
{
period,
diff --cc web/app/routes/api.analytics.ts
index d2d560c00,3ba7585d7..1fc23b09a
--- a/web/app/routes/api.analytics.ts
+++ b/web/app/routes/api.analytics.ts
@@@ -21,8 -25,20 +21,10 @@@ import
getProjectServer,
getFiltersServer,
getDataDeletionPreviewServer,
- getErrorsFiltersServer,
- getVersionFiltersServer,
- getCustomEventsMetadataServer,
- getPropertyMetadataServer,
- getErrorSessionsServer,
getLiveVisitorsServer,
- getLiveVisitorsInfoServer,
getBotProtectionStatsServer,
- getProjectDataCustomEventsServer,
+ getJourneysServer,
+ getJourneySessionsServer,
getGSCKeywordsServer,
getGSCDashboardServer,
getGSCDetailsServer,
@@@ -44,10 -64,21 +46,12 @@@
type Goal,
type GoalsResponse,
type FeatureFlagsResponse,
- type ProfilesResponse,
- type ProfileDetailsResponse,
- type ProfileSessionsResponse,
type Project,
- type VersionFilter,
- type CustomEventsMetadataResponse,
- type PropertyMetadataResponse,
- type ErrorSessionsResponse,
type LiveStats,
- type LiveVisitorInfo,
type BotProtectionStats,
type BotProtectionPeriod,
- type ProjectDataCustomEventsResponse,
+ type JourneysResponse,
+ type JourneySessionsResponse,
type GSCKeywordsResponse,
type GSCDashboardResponse,
type GSCDetailsResponse,
@@@ -90,8 -124,20 +94,10 @@@ interface ProxyRequest
| 'getProject'
| 'getFilters'
| 'getDataDeletionPreview'
- | 'getErrorsFilters'
- | 'getVersionFilters'
- | 'getCustomEventsMetadata'
- | 'getPropertyMetadata'
- | 'getErrorSessions'
| 'getLiveVisitors'
- | 'getLiveVisitorsInfo'
| 'getBotProtectionStats'
- | 'getProjectDataCustomEvents'
+ | 'getJourneys'
+ | 'getJourneySessions'
| 'getGSCKeywords'
| 'getGSCDashboard'
| 'getGSCDetails'
@@@ -116,10 -170,17 +122,13 @@@
filters?: AnalyticsFilter[]
take?: number
skip?: number
- options?: Record<string, unknown>
resultFilter?: string
search?: string
- profileType?: 'all' | 'anonymous' | 'identified'
page?: string
query?: string
- funnelId?: string
+ step?: number
+ steps?: number
+ journeys?: number
- dropoff?: boolean
goalId?: string
sessionEvent?: 'traffic' | 'performance' | 'error'
}
@@@ -556,6 -926,75 +565,50 @@@ export async function action({ request
})
}
- case 'getProjectDataCustomEvents': {
- const result = await getProjectDataCustomEventsServer(
- request,
- projectId,
- {
- timeBucket: params.timeBucket,
- period: params.period,
- filters: params.filters,
- from: formatDateForBackend(params.from),
- to: formatDateForBackend(params.to),
- timezone: params.timezone,
- customEvents: body.customEvents,
- password: password || undefined,
- },
- )
- return data<ProxyResponse<ProjectDataCustomEventsResponse>>({
- data: result.data,
- error: result.error
- ? Array.isArray(result.error)
- ? result.error.join(', ')
- : result.error
- : null,
- })
- }
-
+ case 'getJourneys': {
+ const result = await getJourneysServer(request, projectId, {
+ period: params.period,
+ filters: params.filters,
+ from: formatDateForBackend(params.from),
+ to: formatDateForBackend(params.to),
+ timezone: params.timezone,
+ steps: params.steps,
+ journeys: params.journeys,
+ password: password || undefined,
+ })
+ return data<ProxyResponse<JourneysResponse>>({
+ data: result.data,
+ error: result.error
+ ? Array.isArray(result.error)
+ ? result.error.join(', ')
+ : result.error
+ : null,
+ })
+ }
+
+ case 'getJourneySessions': {
+ const result = await getJourneySessionsServer(request, projectId, {
+ period: analyticsParams.period,
+ from: analyticsParams.from,
+ to: analyticsParams.to,
+ timezone: analyticsParams.timezone,
+ step: params.step ?? 1,
+ page: params.page ?? '',
+ take: params.take,
+ skip: params.skip,
+ password: analyticsParams.password,
+ filters: params.filters || [],
+ })
+ return data<ProxyResponse<JourneySessionsResponse>>({
+ data: result.data,
+ error: result.error
+ ? Array.isArray(result.error)
+ ? result.error.join(', ')
+ : result.error
+ : null,
+ })
+ }
+
case 'getGSCKeywords': {
const result = await getGSCKeywordsServer(request, projectId, {
period: params.period,