📈 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!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
fix: respect filters in error sessions drawer
Blue Mouse03df4aa2d9da
diff --git a/backend/apps/cloud/src/analytics/analytics.controller.ts b/backend/apps/cloud/src/analytics/analytics.controller.tsindex a694f0a69..d4faf5480 100644--- a/backend/apps/cloud/src/analytics/analytics.controller.ts+++ b/backend/apps/cloud/src/analytics/analytics.controller.ts@@ -2452,7 +2452,16 @@ export class AnalyticsController {@CurrentUserId() uid: string,@Headers() headers: { 'x-password'?: string },) {- const { pid, eid, period, from, to, timeBucket } = data+ const {+ pid,+ eid,+ period,+ from,+ to,+ timeBucket,+ filters,+ timezone = DEFAULT_TIMEZONE,+ } = dataawait this.analyticsService.checkProjectAccess(pid,@@ -2476,6 +2485,12 @@ export class AnalyticsController {'GET /analytics/error-sessions',)+ const [filtersQuery, filtersParams] = this.analyticsService.getFiltersQuery(+ filters,+ DataType.ERRORS,+ true,+ )+let newTimeBucket = timeBucketlet diff@@ -2489,7 +2504,7 @@ export class AnalyticsController {diff = res.diff}- const safeTimezone = this.analyticsService.getSafeTimezone(DEFAULT_TIMEZONE)+ const safeTimezone = this.analyticsService.getSafeTimezone(timezone)const { groupFromUTC, groupToUTC } = this.analyticsService.getGroupFromTo(from,to,@@ -2506,6 +2521,8 @@ export class AnalyticsController {groupToUTC,take,skip,+ filtersQuery,+ filtersParams,)}diff --git a/backend/apps/cloud/src/analytics/analytics.service.ts b/backend/apps/cloud/src/analytics/analytics.service.tsindex 5c9d9797f..a1567f316 100644--- a/backend/apps/cloud/src/analytics/analytics.service.ts+++ b/backend/apps/cloud/src/analytics/analytics.service.ts@@ -6411,6 +6411,8 @@ export class AnalyticsService {groupTo: string,take: number = 10,skip: number = 0,+ filtersQuery = '',+ filtersParams: Record<string, unknown> = {},): Promise<{ sessions: any[]; total: number }> {const queryCount = `SELECT count(DISTINCT psid) as total@@ -6419,6 +6421,7 @@ export class AnalyticsService {AND type = 'error'AND eid = {eid:FixedString(32)}AND created BETWEEN {groupFrom:String} AND {groupTo:String}+ ${filtersQuery}`const querySessions = `@@ -6444,6 +6447,7 @@ export class AnalyticsService {AND type = 'error'AND eid = {eid:FixedString(32)}AND created BETWEEN {groupFrom:String} AND {groupTo:String}+ ${filtersQuery}GROUP BY pid, psid) AS errorsLEFT JOIN (@@ -6474,7 +6478,15 @@ export class AnalyticsService {OFFSET {skip:UInt32}`- const params = { pid, eid, groupFrom, groupTo, take, skip }+ const params = {+ pid,+ eid,+ groupFrom,+ groupTo,+ take,+ skip,+ ...filtersParams,+ }const [countResult, sessionsResult] = await Promise.all([clickhousediff --git a/backend/apps/cloud/src/analytics/dto/get-error.dto.ts b/backend/apps/cloud/src/analytics/dto/get-error.dto.tsindex 102475697..373640bfd 100644--- a/backend/apps/cloud/src/analytics/dto/get-error.dto.ts+++ b/backend/apps/cloud/src/analytics/dto/get-error.dto.ts@@ -8,6 +8,7 @@ export class GetErrorDto extends PickType(GetDataDto, ['timeBucket','from','to',+ 'filters','timezone',] as const) {@ApiProperty()diff --git a/backend/apps/community/src/analytics/analytics.controller.ts b/backend/apps/community/src/analytics/analytics.controller.tsindex ea77b551e..da5d31d97 100644--- a/backend/apps/community/src/analytics/analytics.controller.ts+++ b/backend/apps/community/src/analytics/analytics.controller.ts@@ -2275,7 +2275,16 @@ export class AnalyticsController {@CurrentUserId() uid: string,@Headers() headers: { 'x-password'?: string },) {- const { pid, eid, period, from, to, timeBucket } = data+ const {+ pid,+ eid,+ period,+ from,+ to,+ timeBucket,+ filters,+ timezone = DEFAULT_TIMEZONE,+ } = dataawait this.analyticsService.checkProjectAccess(pid,@@ -2297,6 +2306,12 @@ export class AnalyticsController {'GET /analytics/error-sessions',)+ const [filtersQuery, filtersParams] = this.analyticsService.getFiltersQuery(+ filters,+ DataType.ERRORS,+ true,+ )+let newTimeBucket = timeBucketlet diff@@ -2310,7 +2325,7 @@ export class AnalyticsController {diff = res.diff}- const safeTimezone = this.analyticsService.getSafeTimezone(DEFAULT_TIMEZONE)+ const safeTimezone = this.analyticsService.getSafeTimezone(timezone)const { groupFromUTC, groupToUTC } = this.analyticsService.getGroupFromTo(from,to,@@ -2327,6 +2342,8 @@ export class AnalyticsController {groupToUTC,take,skip,+ filtersQuery,+ filtersParams,)}diff --git a/backend/apps/community/src/analytics/analytics.service.ts b/backend/apps/community/src/analytics/analytics.service.tsindex 01b058f4f..dedecfffc 100644--- a/backend/apps/community/src/analytics/analytics.service.ts+++ b/backend/apps/community/src/analytics/analytics.service.ts@@ -5354,6 +5354,8 @@ export class AnalyticsService {groupTo: string,take: number = 10,skip: number = 0,+ filtersQuery = '',+ filtersParams: Record<string, unknown> = {},): Promise<{ sessions: any[]; total: number }> {const queryCount = `SELECT count(DISTINCT psid) as total@@ -5363,6 +5365,7 @@ export class AnalyticsService {AND eid = {eid:FixedString(32)}AND psid IS NOT NULLAND created BETWEEN {groupFrom:String} AND {groupTo:String}+ ${filtersQuery}`const querySessions = `@@ -5381,13 +5384,22 @@ export class AnalyticsService {AND errors.eid = {eid:FixedString(32)}AND errors.psid IS NOT NULLAND errors.created BETWEEN {groupFrom:String} AND {groupTo:String}+ ${filtersQuery}GROUP BY errors.psidORDER BY lastErrorAt DESCLIMIT {take:UInt32}OFFSET {skip:UInt32}`- const params = { pid, eid, groupFrom, groupTo, take, skip }+ const params = {+ pid,+ eid,+ groupFrom,+ groupTo,+ take,+ skip,+ ...filtersParams,+ }const [countResult, sessionsResult] = await Promise.all([clickhousediff --git a/backend/apps/community/src/analytics/dto/get-error.dto.ts b/backend/apps/community/src/analytics/dto/get-error.dto.tsindex 102475697..373640bfd 100644--- a/backend/apps/community/src/analytics/dto/get-error.dto.ts+++ b/backend/apps/community/src/analytics/dto/get-error.dto.ts@@ -8,6 +8,7 @@ export class GetErrorDto extends PickType(GetDataDto, ['timeBucket','from','to',+ 'filters','timezone',] as const) {@ApiProperty()diff --git a/web/app/api/api.server.ts b/web/app/api/api.server.tsindex 45bc1f553..9fa611e04 100644--- a/web/app/api/api.server.ts+++ b/web/app/api/api.server.ts@@ -2073,6 +2073,8 @@ export async function getErrorSessionsServer(period?: stringfrom?: stringto?: string+ filters?: AnalyticsFilter[]+ timezone?: stringtake?: numberskip?: numberpassword?: string@@ -2085,8 +2087,10 @@ export async function getErrorSessionsServer(queryParams.append('period', params.period || '7d')queryParams.append('take', String(params.take || 10))queryParams.append('skip', String(params.skip || 0))+ queryParams.append('filters', serializeFiltersForUrl(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) {diff --git a/web/app/pages/Project/View/utils/chartPoint.ts b/web/app/pages/Project/View/utils/chartPoint.tsindex 2fea2f155..302fcb9f9 100644--- a/web/app/pages/Project/View/utils/chartPoint.ts+++ b/web/app/pages/Project/View/utils/chartPoint.ts@@ -7,6 +7,14 @@ dayjs.extend(timezonePlugin)export type ChartDataPointClick = (d: { x: Date; index: number }) => void+type EventRectsGroup = SVGElement & {+ __clickHandlers?: {+ mousemove: (e: MouseEvent) => void+ mouseleave: () => void+ click: (e: MouseEvent) => void+ }+}+const getClosestCircle = (circles: NodeListOf<SVGElement>,mouseX: number,@@ -35,20 +43,35 @@ export const attachDataPointClickHandlers = (columns: any[],onDataPointClick?: ChartDataPointClick,) => {- if (!onDataPointClick || !chartInstance?.$) return+ if (!chartInstance?.$) returnconst svg = chartInstance.$.svg?.node() as SVGSVGElement | null | undefinedif (!svg) return- const eventRectsGroup = svg.querySelector('.bb-event-rects') as- | (SVGElement & {- __clickAttached?: boolean- })- | null- if (!eventRectsGroup || eventRectsGroup.__clickAttached) return- eventRectsGroup.__clickAttached = true+ const eventRectsGroup = svg.querySelector(+ '.bb-event-rects',+ ) as EventRectsGroup | null+ if (!eventRectsGroup) return++ if (eventRectsGroup.__clickHandlers) {+ eventRectsGroup.removeEventListener(+ 'mousemove',+ eventRectsGroup.__clickHandlers.mousemove,+ )+ eventRectsGroup.removeEventListener(+ 'mouseleave',+ eventRectsGroup.__clickHandlers.mouseleave,+ )+ eventRectsGroup.removeEventListener(+ 'click',+ eventRectsGroup.__clickHandlers.click,+ )+ delete eventRectsGroup.__clickHandlers+ }- eventRectsGroup.addEventListener('mousemove', (e: MouseEvent) => {+ if (!onDataPointClick) return++ const handleMouseMove = (e: MouseEvent) => {const groupRect = eventRectsGroup.getBoundingClientRect()const mouseX = e.clientX - groupRect.leftconst mouseY = e.clientY - groupRect.top@@ -63,16 +86,16 @@ export const attachDataPointClickHandlers = (c.classList.remove('is-direct-hover')}})- })+ }- eventRectsGroup.addEventListener('mouseleave', () => {+ const handleMouseLeave = () => {const circles = svg.querySelectorAll<SVGElement>('.bb-circle')circles.forEach((c) => {c.classList.remove('is-direct-hover')})- })+ }- eventRectsGroup.addEventListener('click', (e: MouseEvent) => {+ const handleClick = (e: MouseEvent) => {const target = e.target as SVGRectElementif (!target?.classList?.contains('bb-event-rect')) return@@ -94,7 +117,16 @@ export const attachDataPointClickHandlers = (if (!xValues || index >= xValues.length) returnonDataPointClick({ x: xValues[index], index })- })+ }++ eventRectsGroup.addEventListener('mousemove', handleMouseMove)+ eventRectsGroup.addEventListener('mouseleave', handleMouseLeave)+ eventRectsGroup.addEventListener('click', handleClick)+ eventRectsGroup.__clickHandlers = {+ mousemove: handleMouseMove,+ mouseleave: handleMouseLeave,+ click: handleClick,+ }}export const getChartPointWindow = ({diff --git a/web/app/pages/Project/tabs/Traffic/SessionsDrawer.tsx b/web/app/pages/Project/tabs/Traffic/SessionsDrawer.tsxindex 78075d430..880e38cb2 100644--- a/web/app/pages/Project/tabs/Traffic/SessionsDrawer.tsx+++ b/web/app/pages/Project/tabs/Traffic/SessionsDrawer.tsx@@ -1,7 +1,13 @@-import { XIcon, UsersIcon, WarningCircleIcon } from '@phosphor-icons/react'+import {+ XIcon,+ UsersIcon,+ WarningCircleIcon,+ CaretRightIcon,+} from '@phosphor-icons/react'import _map from 'lodash/map'import { useCallback, useEffect, useMemo, useRef, useState } from 'react'import { useTranslation } from 'react-i18next'+import { useLocation } from 'react-router'import type {SessionsResponse,@@ -22,8 +28,14 @@ import {} from '~/ui/Drawer'import Loader from '~/ui/Loader'import Spin from '~/ui/icons/Spin'+import { Link } from '~/ui/Link'+import { Text } from '~/ui/Text'+import Flag from '~/ui/Flag'+import { useTheme } from '~/providers/ThemeProvider'+import { getRelativeDateIfPossible } from '~/utils/date'import { Session } from '../Sessions/Sessions'+import { BrowserIcon, OSIcon } from '../SharedIcons'const SESSIONS_TAKE = 30@@ -33,6 +45,8 @@ type SessionsPageResult =| GoalSessionsResponse| ErrorSessionsResponse+type DrawerSession = SessionType | ErrorAffectedSession+async function fetchSessionsPage(action: string,projectId: string,@@ -68,25 +82,10 @@ async function fetchSessionsPage(return result.data}-const mapErrorSession = (session: ErrorAffectedSession): SessionType => ({- psid: session.psid,- cc: session.cc,- os: session.os,- br: session.br,- pageviews: 0,- customEvents: 0,- errors: session.errorCount,- created: session.firstErrorAt,- isLive: 0,- sdur: 0,- sessionStart: session.firstErrorAt,- lastActivity: session.lastErrorAt,- profileId: session.profileId,- isIdentified: 0,- isFirstSession: 0,-})--const getResultSessions = (result: SessionsPageResult): SessionType[] => {+const mapErrorSession = (session: ErrorAffectedSession): ErrorAffectedSession =>+ session++const getResultSessions = (result: SessionsPageResult): DrawerSession[] => {if ('total' in result) {return result.sessions.map(mapErrorSession)}@@ -94,6 +93,95 @@ const getResultSessions = (result: SessionsPageResult): SessionType[] => {return result.sessions}+const isErrorAffectedSession = (+ session: DrawerSession,+): session is ErrorAffectedSession => 'errorCount' in session++const ErrorSession = ({ session }: { session: ErrorAffectedSession }) => {+ const {+ t,+ i18n: { language },+ } = useTranslation('common')+ const { theme } = useTheme()+ const location = useLocation()++ const lastErrorAt = useMemo(() => {+ return getRelativeDateIfPossible(session.lastErrorAt, language)+ }, [session.lastErrorAt, language])++ const params = new URLSearchParams(location.search)+ params.delete('eid')+ params.set('psid', session.psid)+ params.set('tab', 'sessions')++ return (+ <li className='mb-2'>+ <Link+ to={{ search: params.toString() }}+ className='block rounded-lg outline-none focus-visible:ring-2 focus-visible:ring-slate-900 dark:focus-visible:ring-slate-300'+ >+ <div className='relative flex cursor-pointer items-center justify-between gap-x-4 overflow-hidden rounded-lg border border-gray-200 bg-gray-50 px-4 py-3 transition-colors hover:bg-gray-200/70 sm:px-5 dark:border-slate-800/60 dark:bg-slate-900/25 dark:hover:bg-slate-900/60'>+ <div className='flex min-w-0 flex-1 items-center gap-x-3.5'>+ <div className='flex h-8 w-8 shrink-0 items-center justify-center rounded-full bg-gray-100 ring-1 ring-gray-200/50 dark:bg-slate-800 dark:ring-slate-700/50'>+ <Text size='xs' weight='medium' colour='secondary'>+ ?+ </Text>+ </div>+ <div className='flex min-w-0 flex-1 flex-col justify-center gap-2'>+ <div className='flex min-w-0 items-center gap-2'>+ <Text size='sm' weight='semibold' truncate>+ {session.profileId || t('project.unknownUser')}+ </Text>+ </div>+ <div className='flex flex-wrap items-center gap-x-3 gap-y-2'>+ <div className='flex items-center gap-1.5'>+ <div className='flex h-[22px] w-[22px] items-center justify-center rounded bg-gray-100/80 ring-1 ring-gray-200/50 dark:bg-slate-800/80 dark:ring-slate-700/50'>+ {session.cc ? (+ <Flag+ country={session.cc}+ size={14}+ className='rounded-[2px]'+ aria-hidden='true'+ />+ ) : (+ <span className='inline-block h-3.5 w-3.5 rounded-[2px] bg-gray-200 dark:bg-slate-700' />+ )}+ </div>+ <div className='flex h-[22px] w-[22px] items-center justify-center rounded bg-gray-100/80 ring-1 ring-gray-200/50 dark:bg-slate-800/80 dark:ring-slate-700/50'>+ <OSIcon+ os={session.os}+ theme={theme}+ className='size-3.5'+ />+ </div>+ <div className='flex h-[22px] w-[22px] items-center justify-center rounded bg-gray-100/80 ring-1 ring-gray-200/50 dark:bg-slate-800/80 dark:ring-slate-700/50'>+ <BrowserIcon browser={session.br} className='size-3.5' />+ </div>+ </div>+ <div className='h-3 w-px bg-gray-200 dark:bg-slate-700' />+ <Text+ as='span'+ size='xs'+ colour='secondary'+ weight='medium'+ className='tabular-nums'+ >+ {lastErrorAt || t('project.unknown')} · {session.errorCount}{' '}+ {t('project.occurrences').toLowerCase()}+ </Text>+ </div>+ </div>+ </div>+ <CaretRightIcon+ className='size-4 shrink-0 text-gray-400'+ aria-hidden='true'+ />+ </div>+ </Link>+ </li>+ )+}+interface SessionsDrawerProps {isOpen: booleanonClose: () => void@@ -138,7 +226,7 @@ export const SessionsDrawer = ({const isFunnelMode = !!(funnelId && funnelStep)const isGoalMode = !!goalIdconst isErrorMode = !!errorId- const [sessions, setSessions] = useState<SessionType[]>([])+ const [sessions, setSessions] = useState<DrawerSession[]>([])const [skip, setSkip] = useState(0)const [hasMore, setHasMore] = useState(true)const [resultTotalCount, setResultTotalCount] = useState<number | null>(null)@@ -199,6 +287,7 @@ export const SessionsDrawer = ({from,to,timezone,+ filters: stableFilters,take: SESSIONS_TAKE,skip: currentSkip,},@@ -422,13 +511,17 @@ export const SessionsDrawer = ({) : (<><ul>- {_map(sessions, (session) => (- <Session- key={session.psid}- session={session}- timeFormat={timeFormat}- />- ))}+ {_map(sessions, (session) =>+ isErrorAffectedSession(session) ? (+ <ErrorSession key={session.psid} session={session} />+ ) : (+ <Session+ key={session.psid}+ session={session}+ timeFormat={timeFormat}+ />+ ),+ )}</ul>{hasMore ? (<divdiff --git a/web/app/routes/api.analytics.ts b/web/app/routes/api.analytics.tsindex 2fc68f57f..e93cef568 100644--- a/web/app/routes/api.analytics.ts+++ b/web/app/routes/api.analytics.ts@@ -744,6 +744,8 @@ export async function action({ request }: ActionFunctionArgs) {period: params.period,from: formatDateForBackend(params.from),to: formatDateForBackend(params.to),+ filters: params.filters,+ timezone: params.timezone,take: params.take,skip: params.skip,password: password || undefined,