📈 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
Separate line charts for custom events and errors; CE support
Blue Mouse148c13896243
diff --git a/backend/apps/cloud/src/analytics/analytics.service.ts b/backend/apps/cloud/src/analytics/analytics.service.tsindex bf0eac89a..8f40ee439 100644--- a/backend/apps/cloud/src/analytics/analytics.service.ts+++ b/backend/apps/cloud/src/analytics/analytics.service.ts@@ -2169,6 +2169,24 @@ export class AnalyticsService {}}+ extractCountsForSessionChart(+ result: any[],+ xShifted: string[],+ countFieldName: string,+ ): number[] {+ const counts = Array(xShifted.length).fill(0)++ for (let row = 0; row < _size(result); ++row) {+ const dateString = this.generateDateString(result[row])+ const index = xShifted.indexOf(dateString)++ if (index !== -1) {+ counts[index] = result[row][countFieldName] || 0+ }+ }+ return counts+ }+extractCustomEventsChartData(queryResult, x: string[]): any {const result = {}@@ -2311,8 +2329,6 @@ export class AnalyticsService {count() as pageviewsFROM (SELECT- pid,- psid,${timeBucketFunc}(toTimeZone(created, '${safeTimezone}')) as tz_createdFROM analyticsPREWHERE pid = {pid:FixedString(12)}@@ -2326,6 +2342,60 @@ export class AnalyticsService {return baseQuery}+ generateSessionCustomEventsAggregationQuery(+ timeBucket: TimeBucketType,+ filtersQuery: string,+ safeTimezone: string,+ ): string {+ const timeBucketFunc = timeBucketConversion[timeBucket]+ const [selector, groupBy] = this.getGroupSubquery(timeBucket)+ const tzFromDate = `toTimeZone(parseDateTimeBestEffort({groupFrom:String}), '${safeTimezone}')`+ const tzToDate = `toTimeZone(parseDateTimeBestEffort({groupTo:String}), '${safeTimezone}')`++ return `+ SELECT+ ${selector},+ count() as customEventsCount+ FROM (+ SELECT+ ${timeBucketFunc}(toTimeZone(created, '${safeTimezone}')) as tz_created+ FROM customEV+ PREWHERE pid = {pid:FixedString(12)}+ WHERE created BETWEEN ${tzFromDate} AND ${tzToDate}+ ${filtersQuery}+ ) as subquery+ GROUP BY ${groupBy}+ ORDER BY ${groupBy}+ `+ }++ generateSessionErrorsAggregationQuery(+ timeBucket: TimeBucketType,+ filtersQuery: string,+ safeTimezone: string,+ ): string {+ const timeBucketFunc = timeBucketConversion[timeBucket]+ const [selector, groupBy] = this.getGroupSubquery(timeBucket)+ const tzFromDate = `toTimeZone(parseDateTimeBestEffort({groupFrom:String}), '${safeTimezone}')`+ const tzToDate = `toTimeZone(parseDateTimeBestEffort({groupTo:String}), '${safeTimezone}')`++ return `+ SELECT+ ${selector},+ count() as errorsCount+ FROM (+ SELECT+ ${timeBucketFunc}(toTimeZone(created, '${safeTimezone}')) as tz_created+ FROM errors+ PREWHERE pid = {pid:FixedString(12)}+ WHERE created BETWEEN ${tzFromDate} AND ${tzToDate}+ ${filtersQuery}+ ) as subquery+ GROUP BY ${groupBy}+ ORDER BY ${groupBy}+ `+ }+generateCustomEventsAggregationQuery(timeBucket: TimeBucketType,filtersQuery: string,@@ -2720,26 +2790,82 @@ export class AnalyticsService {): Promise<object | void> {const { xShifted } = this.generateXAxis(timeBucket, from, to, safeTimezone)- const query = this.generateSessionAggregationQuery(+ const pageviewsQuery = this.generateSessionAggregationQuery(+ timeBucket,+ filtersQuery,+ safeTimezone,+ )+ const customEventsQuery = this.generateSessionCustomEventsAggregationQuery(+ timeBucket,+ filtersQuery,+ safeTimezone,+ )+ const errorsQuery = this.generateSessionErrorsAggregationQuery(timeBucket,filtersQuery,safeTimezone,)- const { data } = await clickhouse- .query({- query,- query_params: paramsData.params,- })- .then(resultSet => resultSet.json<TrafficCHResponse>())+ const [pageviewsData, customEventsData, errorsData] = await Promise.all([+ clickhouse+ .query({+ query: pageviewsQuery,+ query_params: paramsData.params,+ })+ .then(resultSet => resultSet.json<any>()),+ clickhouse+ .query({+ query: customEventsQuery,+ query_params: paramsData.params,+ })+ .then(resultSet => resultSet.json<any>()),+ clickhouse+ .query({+ query: errorsQuery,+ query_params: paramsData.params,+ })+ .then(resultSet => resultSet.json<any>()),+ ])- const { visits } = this.extractChartData(data, xShifted)+ const pageviews = this.extractCountsForSessionChart(+ pageviewsData.data,+ xShifted,+ 'pageviews',+ )+ const customEvents = this.extractCountsForSessionChart(+ customEventsData.data,+ xShifted,+ 'customEventsCount',+ )+ const errors = this.extractCountsForSessionChart(+ errorsData.data,+ xShifted,+ 'errorsCount',+ )++ const chartOutput: {+ x: string[]+ pageviews?: number[]+ customEvents?: number[]+ errors?: number[]+ } = {+ x: xShifted,+ }++ if (_some(pageviews, count => count > 0)) {+ chartOutput.pageviews = pageviews+ }++ if (_some(customEvents, count => count > 0)) {+ chartOutput.customEvents = customEvents+ }++ if (_some(errors, count => count > 0)) {+ chartOutput.errors = errors+ }return Promise.resolve({- chart: {- x: xShifted,- visits,- },+ chart: chartOutput,})}@@ -3481,7 +3607,8 @@ export class AnalyticsService {LEFT ARRAY JOIN meta.key, meta.valueWHEREpid = {pid:FixedString(12)}- AND CAST(analytics.psid AS String) = {psid:String} AND analytics.psid IS NOT NULL+ AND analytics.psid IS NOT NULL+ AND CAST(analytics.psid AS String) = {psid:String}GROUP BY type, value, created, pid, psidUNION ALL@@ -3497,7 +3624,8 @@ export class AnalyticsService {LEFT ARRAY JOIN meta.key, meta.valueWHEREpid = {pid:FixedString(12)}- AND CAST(customEV.psid AS String) = {psid:String} AND customEV.psid IS NOT NULL+ AND customEV.psid IS NOT NULL+ AND CAST(customEV.psid AS String) = {psid:String}GROUP BY type, value, created, pid, psidUNION ALL@@ -3509,8 +3637,8 @@ export class AnalyticsService {pid,psid,[- tuple('message', COALESCE(errors.message, '')),- tuple('lineno', CAST(COALESCE(errors.lineno, 0), 'String')),+ tuple('message', COALESCE(errors.message, '')),+ tuple('lineno', CAST(COALESCE(errors.lineno, 0), 'String')),tuple('colno', CAST(COALESCE(errors.colno, 0), 'String')),tuple('filename', COALESCE(errors.filename, ''))] AS metadata@@ -3537,7 +3665,7 @@ export class AnalyticsService {FROM analyticsWHEREpid = {pid:FixedString(12)}- AND psid = {psid:String}+ AND CAST(psid, 'String') = {psid:String}ORDER BY created ASCLIMIT 1;`@@ -3548,7 +3676,7 @@ export class AnalyticsService {FROM session_durationsWHEREpid = {pid:FixedString(12)}- AND psid = {psid:String}+ AND CAST(psid, 'String') = {psid:String}`const paramsData = {@@ -3594,7 +3722,7 @@ export class AnalyticsService {FROM analyticsWHEREpid = {pid:FixedString(12)}- AND psid = {psid:String}+ AND CAST(psid, 'String') = {psid:String}LIMIT 1;`@@ -3633,7 +3761,7 @@ export class AnalyticsService {timeBucket,from,to,- 'AND psid = {psid:String}',+ "AND CAST(psid, 'String') = {psid:String}",{params: {...paramsData.params,@@ -3682,12 +3810,6 @@ export class AnalyticsService {customEVFilterApplied = false,): Promise<object | void> {const primaryEventsTable = customEVFilterApplied ? 'customEV' : 'analytics'- const safeFiltersQuery =- filtersQuery &&- !filtersQuery.trim().startsWith('AND') &&- !filtersQuery.trim().startsWith('OR')- ? `AND ${filtersQuery}`- : filtersQueryconst primaryEventsSubquery = `SELECT@@ -3702,7 +3824,7 @@ export class AnalyticsService {${primaryEventsTable}.pid = {pid:FixedString(12)}AND ${primaryEventsTable}.psid IS NOT NULLAND ${primaryEventsTable}.created BETWEEN {groupFrom:String} AND {groupTo:String}- ${safeFiltersQuery}+ ${filtersQuery}`const query = `@@ -3750,7 +3872,7 @@ export class AnalyticsService {),session_duration_agg AS (SELECT- CAST(psid AS String) AS psidCasted,+ CAST(psid, 'String') AS psidCasted,pid,avg(duration) as avg_durationFROM session_durationsdiff --git a/backend/apps/community/src/analytics/analytics.controller.ts b/backend/apps/community/src/analytics/analytics.controller.tsindex 088bc5508..2008eedda 100644--- a/backend/apps/community/src/analytics/analytics.controller.ts+++ b/backend/apps/community/src/analytics/analytics.controller.ts@@ -1401,6 +1401,14 @@ export class AnalyticsController {await this.analyticsService.validate(errorDTO, origin, ip)+ const [, psid] = await this.analyticsService.generateAndStoreSessionId(+ errorDTO.pid,+ userAgent,+ ip,+ )++ await this.analyticsService.processInteractionSD(psid, errorDTO.pid)+const { city, region, country } = getGeoDetails(ip, errorDTO.tz)const { deviceType, browserName, browserVersion, osName, osVersion } =@@ -1409,6 +1417,7 @@ export class AnalyticsController {const { name, message, lineno, colno, filename } = errorDTOconst transformed = errorEventTransformer(+ psid,this.analyticsService.getErrorID(errorDTO),errorDTO.pid,this.analyticsService.getHostFromOrigin(headers.origin),diff --git a/backend/apps/community/src/analytics/analytics.service.ts b/backend/apps/community/src/analytics/analytics.service.tsindex 5e1da148e..0a1975982 100644--- a/backend/apps/community/src/analytics/analytics.service.ts+++ b/backend/apps/community/src/analytics/analytics.service.ts@@ -1967,6 +1967,24 @@ export class AnalyticsService {}}+ extractCountsForSessionChart(+ result: any[],+ xShifted: string[],+ countFieldName: string,+ ): number[] {+ const counts = Array(xShifted.length).fill(0)++ for (let row = 0; row < _size(result); ++row) {+ const dateString = this.generateDateString(result[row])+ const index = xShifted.indexOf(dateString)++ if (index !== -1) {+ counts[index] = result[row][countFieldName] || 0+ }+ }+ return counts+ }+extractCustomEventsChartData(queryResult, x: string[]): any {const result = {}@@ -2109,8 +2127,6 @@ export class AnalyticsService {count() as pageviewsFROM (SELECT- pid,- psid,${timeBucketFunc}(toTimeZone(created, '${safeTimezone}')) as tz_createdFROM analyticsPREWHERE pid = {pid:FixedString(12)}@@ -2124,6 +2140,60 @@ export class AnalyticsService {return baseQuery}+ generateSessionCustomEventsAggregationQuery(+ timeBucket: TimeBucketType,+ filtersQuery: string,+ safeTimezone: string,+ ): string {+ const timeBucketFunc = timeBucketConversion[timeBucket]+ const [selector, groupBy] = this.getGroupSubquery(timeBucket)+ const tzFromDate = `toTimeZone(parseDateTimeBestEffort({groupFrom:String}), '${safeTimezone}')`+ const tzToDate = `toTimeZone(parseDateTimeBestEffort({groupTo:String}), '${safeTimezone}')`++ return `+ SELECT+ ${selector},+ count() as customEventsCount+ FROM (+ SELECT+ ${timeBucketFunc}(toTimeZone(created, '${safeTimezone}')) as tz_created+ FROM customEV+ PREWHERE pid = {pid:FixedString(12)}+ WHERE created BETWEEN ${tzFromDate} AND ${tzToDate}+ ${filtersQuery}+ ) as subquery+ GROUP BY ${groupBy}+ ORDER BY ${groupBy}+ `+ }++ generateSessionErrorsAggregationQuery(+ timeBucket: TimeBucketType,+ filtersQuery: string,+ safeTimezone: string,+ ): string {+ const timeBucketFunc = timeBucketConversion[timeBucket]+ const [selector, groupBy] = this.getGroupSubquery(timeBucket)+ const tzFromDate = `toTimeZone(parseDateTimeBestEffort({groupFrom:String}), '${safeTimezone}')`+ const tzToDate = `toTimeZone(parseDateTimeBestEffort({groupTo:String}), '${safeTimezone}')`++ return `+ SELECT+ ${selector},+ count() as errorsCount+ FROM (+ SELECT+ ${timeBucketFunc}(toTimeZone(created, '${safeTimezone}')) as tz_created+ FROM errors+ PREWHERE pid = {pid:FixedString(12)}+ WHERE created BETWEEN ${tzFromDate} AND ${tzToDate}+ ${filtersQuery}+ ) as subquery+ GROUP BY ${groupBy}+ ORDER BY ${groupBy}+ `+ }+generateCustomEventsAggregationQuery(timeBucket: TimeBucketType,filtersQuery: string,@@ -2528,26 +2598,82 @@ export class AnalyticsService {): Promise<object | void> {const { xShifted } = this.generateXAxis(timeBucket, from, to, safeTimezone)- const query = this.generateSessionAggregationQuery(+ const pageviewsQuery = this.generateSessionAggregationQuery(+ timeBucket,+ filtersQuery,+ safeTimezone,+ )+ const customEventsQuery = this.generateSessionCustomEventsAggregationQuery(+ timeBucket,+ filtersQuery,+ safeTimezone,+ )+ const errorsQuery = this.generateSessionErrorsAggregationQuery(timeBucket,filtersQuery,safeTimezone,)- const { data } = await clickhouse- .query({- query,- query_params: paramsData.params,- })- .then(resultSet => resultSet.json<TrafficCHResponse>())+ const [pageviewsData, customEventsData, errorsData] = await Promise.all([+ clickhouse+ .query({+ query: pageviewsQuery,+ query_params: paramsData.params,+ })+ .then(resultSet => resultSet.json<any>()),+ clickhouse+ .query({+ query: customEventsQuery,+ query_params: paramsData.params,+ })+ .then(resultSet => resultSet.json<any>()),+ clickhouse+ .query({+ query: errorsQuery,+ query_params: paramsData.params,+ })+ .then(resultSet => resultSet.json<any>()),+ ])++ const pageviews = this.extractCountsForSessionChart(+ pageviewsData.data,+ xShifted,+ 'pageviews',+ )+ const customEvents = this.extractCountsForSessionChart(+ customEventsData.data,+ xShifted,+ 'customEventsCount',+ )+ const errors = this.extractCountsForSessionChart(+ errorsData.data,+ xShifted,+ 'errorsCount',+ )- const { visits } = this.extractChartData(data, xShifted)+ const chartOutput: {+ x: string[]+ pageviews?: number[]+ customEvents?: number[]+ errors?: number[]+ } = {+ x: xShifted,+ }++ if (_some(pageviews, count => count > 0)) {+ chartOutput.pageviews = pageviews+ }++ if (_some(customEvents, count => count > 0)) {+ chartOutput.customEvents = customEvents+ }++ if (_some(errors, count => count > 0)) {+ chartOutput.errors = errors+ }return Promise.resolve({- chart: {- x: xShifted,- visits,- },+ chart: chartOutput,})}@@ -3168,7 +3294,8 @@ export class AnalyticsService {LEFT ARRAY JOIN meta.key, meta.valueWHEREpid = {pid:FixedString(12)}- AND psid = {psid:String}+ AND analytics.psid IS NOT NULL+ AND CAST(analytics.psid AS String) = {psid:String}GROUP BY type, value, created, pid, psidUNION ALL@@ -3184,8 +3311,30 @@ export class AnalyticsService {LEFT ARRAY JOIN meta.key, meta.valueWHEREpid = {pid:FixedString(12)}- AND psid = {psid:String}+ AND customEV.psid IS NOT NULL+ AND CAST(customEV.psid AS String) = {psid:String}GROUP BY type, value, created, pid, psid++ UNION ALL++ SELECT+ 'error' AS type,+ errors.name AS value,+ toTimeZone(errors.created, '${safeTimezone}') AS created,+ pid,+ psid,+ [+ tuple('message', COALESCE(errors.message, '')),+ tuple('lineno', CAST(COALESCE(errors.lineno, 0), 'String')),+ tuple('colno', CAST(COALESCE(errors.colno, 0), 'String')),+ tuple('filename', COALESCE(errors.filename, ''))+ ] AS metadata+ FROM errors+ WHERE+ pid = {pid:FixedString(12)}+ AND errors.psid IS NOT NULL+ AND CAST(errors.psid AS String) = {psid:String}+ GROUP BY type, value, created, pid, psid, errors.message, errors.lineno, errors.colno, errors.filename)SELECT@@ -3203,7 +3352,7 @@ export class AnalyticsService {FROM analyticsWHEREpid = {pid:FixedString(12)}- AND psid = {psid:String}+ AND CAST(psid, 'String') = {psid:String}ORDER BY created ASCLIMIT 1;`@@ -3214,7 +3363,7 @@ export class AnalyticsService {FROM session_durationsWHEREpid = {pid:FixedString(12)}- AND psid = {psid:String}+ AND CAST(psid, 'String') = {psid:String}`const paramsData = {@@ -3260,7 +3409,7 @@ export class AnalyticsService {FROM analyticsWHEREpid = {pid:FixedString(12)}- AND psid = {psid:String}+ AND CAST(psid, 'String') = {psid:String}LIMIT 1;`@@ -3299,7 +3448,7 @@ export class AnalyticsService {timeBucket,from,to,- 'AND psid = {psid:String}',+ "AND CAST(psid, 'String') = {psid:String}",{params: {...paramsData.params,@@ -3347,55 +3496,95 @@ export class AnalyticsService {skip = 0,customEVFilterApplied = false,): Promise<object | void> {- const analyticsSubquery = `- SELECT- CAST(psid, 'String') AS psidCasted,- cc,- os,- br,- toTimeZone(analytics.created, '${safeTimezone}') AS created- FROM analytics- WHERE- pid = {pid:FixedString(12)}- AND psid IS NOT NULL- AND analytics.created BETWEEN {groupFrom:String} AND {groupTo:String}- ${filtersQuery}- `+ const primaryEventsTable = customEVFilterApplied ? 'customEV' : 'analytics'- const customEVSubquery = `+ const primaryEventsSubquery = `SELECT- CAST(psid, 'String') AS psidCasted,- cc,- os,- br,- toTimeZone(customEV.created, '${safeTimezone}') AS created- FROM customEV+ CAST(${primaryEventsTable}.psid, 'String') AS psidCasted,+ ${primaryEventsTable}.pid,+ ${primaryEventsTable}.cc,+ ${primaryEventsTable}.os,+ ${primaryEventsTable}.br,+ toTimeZone(${primaryEventsTable}.created, '${safeTimezone}') AS created_for_grouping+ FROM ${primaryEventsTable}WHERE- pid = {pid:FixedString(12)}- AND psid IS NOT NULL- AND customEV.created BETWEEN {groupFrom:String} AND {groupTo:String}- ${filtersQuery}+ ${primaryEventsTable}.pid = {pid:FixedString(12)}+ AND ${primaryEventsTable}.psid IS NOT NULL+ AND ${primaryEventsTable}.created BETWEEN {groupFrom:String} AND {groupTo:String}+ ${filtersQuery}`const query = `+ WITH distinct_sessions_filtered AS (+ SELECT+ psidCasted,+ pid,+ any(cc) AS cc,+ any(os) AS os,+ any(br) AS br,+ min(created_for_grouping) AS sessionStart,+ max(created_for_grouping) AS lastActivity+ FROM (${primaryEventsSubquery}) AS primary_events+ GROUP BY psidCasted, pid+ ),+ pageview_counts AS (+ SELECT+ CAST(psid, 'String') AS psidCasted,+ pid,+ count() as count+ FROM analytics+ WHERE pid = {pid:FixedString(12)} AND psid IS NOT NULL+ AND created BETWEEN {groupFrom:String} AND {groupTo:String}+ GROUP BY psidCasted, pid+ ),+ event_counts AS (+ SELECT+ CAST(psid, 'String') AS psidCasted,+ pid,+ count() as count+ FROM customEV+ WHERE pid = {pid:FixedString(12)} AND psid IS NOT NULL+ AND created BETWEEN {groupFrom:String} AND {groupTo:String}+ GROUP BY psidCasted, pid+ ),+ error_counts AS (+ SELECT+ CAST(psid, 'String') AS psidCasted,+ pid,+ count() as count+ FROM errors+ WHERE pid = {pid:FixedString(12)} AND psid IS NOT NULL+ AND created BETWEEN {groupFrom:String} AND {groupTo:String}+ GROUP BY psidCasted, pid+ ),+ session_duration_agg AS (+ SELECT+ CAST(psid, 'String') AS psidCasted,+ pid,+ avg(duration) as avg_duration+ FROM session_durations+ WHERE pid = {pid:FixedString(12)}+ GROUP BY psidCasted, pid+ )SELECT- events.psidCasted AS psid,- any(events.cc) AS cc,- any(events.os) AS os,- any(events.br) AS br,- count() AS pageviews,- min(events.created) AS sessionStart,- max(events.created) AS lastActivity,- if(dateDiff('second', max(events.created), now()) < ${LIVE_SESSION_THRESHOLD_SECONDS}, 1, 0) AS isLive,- avg(durations.duration) AS sdur- FROM- (- ${customEVFilterApplied ? customEVSubquery : analyticsSubquery}- ) AS events- LEFT JOIN session_durations AS durations- ON events.psidCasted = CAST(durations.psid, 'String') AND durations.pid = {pid:FixedString(12)}- GROUP BY events.psidCasted- ORDER BY sessionStart DESC+ dsf.psidCasted AS psid,+ dsf.cc,+ dsf.os,+ dsf.br,+ COALESCE(pc.count, 0) AS pageviews,+ COALESCE(ec.count, 0) AS customEvents,+ COALESCE(errc.count, 0) AS errors,+ dsf.sessionStart,+ dsf.lastActivity,+ if(dateDiff('second', dsf.lastActivity, now()) < ${LIVE_SESSION_THRESHOLD_SECONDS}, 1, 0) AS isLive,+ sda.avg_duration AS sdur+ FROM distinct_sessions_filtered dsf+ LEFT JOIN pageview_counts pc ON dsf.psidCasted = pc.psidCasted AND dsf.pid = pc.pid+ LEFT JOIN event_counts ec ON dsf.psidCasted = ec.psidCasted AND dsf.pid = ec.pid+ LEFT JOIN error_counts errc ON dsf.psidCasted = errc.psidCasted AND dsf.pid = errc.pid+ LEFT JOIN session_duration_agg sda ON dsf.psidCasted = sda.psidCasted AND dsf.pid = sda.pid+ WHERE dsf.psidCasted IS NOT NULL+ ORDER BY dsf.sessionStart DESCLIMIT ${take}OFFSET ${skip}`diff --git a/backend/apps/community/src/analytics/utils/transformers.ts b/backend/apps/community/src/analytics/utils/transformers.tsindex 196814330..fe426bddc 100644--- a/backend/apps/community/src/analytics/utils/transformers.ts+++ b/backend/apps/community/src/analytics/utils/transformers.ts@@ -120,6 +120,7 @@ export const customEventTransformer = (}export const errorEventTransformer = (+ psid: string,eid: string,pid: string,host: string | null,@@ -140,6 +141,7 @@ export const errorEventTransformer = (filename: string | null,) => {return {+ psid,eid,pid,host: host || null,diff --git a/web/app/pages/Project/View/ViewProject.helpers.tsx b/web/app/pages/Project/View/ViewProject.helpers.tsxindex b84b27afc..ea5972635 100644--- a/web/app/pages/Project/View/ViewProject.helpers.tsx+++ b/web/app/pages/Project/View/ViewProject.helpers.tsx@@ -751,7 +751,14 @@ const getSettings = (// function to get the settings and data for the session inspector chartconst getSettingsSession = (- chart: any,+ chartInput:+ | {+ x: string[]+ pageviews?: number[]+ customEvents?: number[]+ errors?: number[]+ }+ | undefined,timeBucket: string,timeFormat: string,rotateXAxis: boolean,@@ -759,25 +766,37 @@ const getSettingsSession = (onZoom?: (domain: [Date, Date]) => void,onresized?: () => void,): ChartOptions => {- const xAxisSize = _size(chart.x)+ const chartData = chartInput || { x: [] } // Default to an empty chart structure if undefined+ const xAxisSize = _size(chartData.x)++ const columns: any[] = [['x', ..._map(chartData.x, (el) => dayjs(el).toDate())]]+ const dataTypes: Record<string, any> = {}+ const dataColors: Record<string, string> = {}++ if (chartData.pageviews && !_isEmpty(chartData.pageviews)) {+ columns.push(['pageviews', ...chartData.pageviews])+ dataTypes.pageviews = chartType === chartTypes.line ? area() : bar()+ dataColors.pageviews = '#D97706'+ }- const columns = getColumns(chart, { views: true })+ if (chartData.customEvents && !_isEmpty(chartData.customEvents)) {+ columns.push(['customEvents', ...chartData.customEvents])+ dataTypes.customEvents = chartType === chartTypes.line ? area() : bar()+ dataColors.customEvents = '#0d9488'+ }++ if (chartData.errors && !_isEmpty(chartData.errors)) {+ columns.push(['errors', ...chartData.errors])+ dataTypes.errors = chartType === chartTypes.line ? area() : bar()+ dataColors.errors = '#dc2626'+ }return {data: {x: 'x',columns,- types: {- total: chartType === chartTypes.line ? area() : bar(),- },- colors: {- total: '#D97706',- totalCompare: 'rgba(217, 119, 6, 0.4)',- },- axes: {- bounce: 'y2',- sessionDuration: 'y2',- },+ types: dataTypes,+ colors: dataColors,},zoom: {enabled: zoom(),@@ -819,6 +838,9 @@ const getSettingsSession = (},tooltip: {contents: (item: any, _: any, __: any, color: any) => {+ if (!item || _isEmpty(item) || !item[0]) {+ return ''+ }return `<ul class='font-mono tracking-tighter bg-gray-50 dark:text-gray-50 dark:bg-slate-800 rounded-md ring-1 ring-black/10 px-3 py-1'><li class='font-semibold'>${timeFormat === TimeFormat['24-hour']@@ -827,22 +849,6 @@ const getSettingsSession = (}</li><hr class='border-gray-200 dark:border-gray-600' />${_map(item, (el: { id: string; index: number; name: string; value: string; x: Date }) => {- if (el.id === 'sessionDuration') {- return `- <li class='flex justify-between'>- <div class='flex justify-items-start'>- <div class='w-3 h-3 rounded-xs mt-1.5 mr-2' style=background-color:${color(el.id)}></div>- <span>${el.name}</span>- </div>- <span class='pl-4'>${getStringFromTime(getTimeFromSeconds(el.value))}</span>- </li>- `- }-- if (el.id === 'trendlineUnique' || el.id === 'trendlineTotal') {- return ''- }-return `<li class='flex justify-between'><div class='flex justify-items-start'>@@ -852,7 +858,7 @@ const getSettingsSession = (<span class='pl-4'>${el.value}</span></li>`- }).join('')}`+ }).join('')}</ul>`},},point:@@ -873,7 +879,7 @@ const getSettingsSession = (r: 3,},},- hide: ['uniqueCompare', 'totalCompare', 'bounceCompare', 'sessionDurationCompare'],+ hide: [], // No series hidden by default for session chart},area: {linearGradient: true,diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsxindex 8797a3e42..7b11c7bea 100644--- a/web/app/pages/Project/View/ViewProject.tsx+++ b/web/app/pages/Project/View/ViewProject.tsx@@ -840,6 +840,9 @@ const ViewProject = () => {() => ({unique: t('project.unique'),total: t('project.total'),+ pageviews: t('project.pageviews'),+ customEvents: t('project.customEvents'),+ errors: t('project.errors'),bounce: `${t('dashboard.bounceRate')} (%)`,viewsPerUnique: t('dashboard.viewsPerUnique'),trendlineTotal: t('project.trendlineTotal'),diff --git a/web/app/pages/Project/View/components/SessionChart.tsx b/web/app/pages/Project/View/components/SessionChart.tsxindex 6fd291060..fd4d437d7 100644--- a/web/app/pages/Project/View/components/SessionChart.tsx+++ b/web/app/pages/Project/View/components/SessionChart.tsx@@ -6,7 +6,9 @@ import { getSettingsSession } from '../ViewProject.helpers'interface SessionChartProps {chart?: {x: string[]- visits: number[]+ pageviews?: number[]+ customEvents?: number[]+ errors?: number[]}timeBucket?: stringtimeFormat: stringdiff --git a/web/public/locales/en.json b/web/public/locales/en.jsonindex 9c5dfddbd..82a13c0e6 100644--- a/web/public/locales/en.json+++ b/web/public/locales/en.json@@ -977,6 +977,9 @@"unique": "Unique visitors","results": "Results","total": "Total page views",+ "pageviews": "Pageviews",+ "customEvents": "Custom events",+ "errors": "Errors","thisHour": "This hour","all": "All time","today": "Today",@@ -1317,8 +1320,6 @@"slogan": "The best apps need the best services.","description": "Swetrix is a powerful analytics platform that respects user privacy.","madeInHostedIn": "Made in <0></0> / <1></1>, hosted in <2></2>",- "ukraine": "Ukraine",- "eu": "European Union","support": "Support","company": "Company","legal": "Support & Legal",@@ -1342,6 +1343,6 @@"open": "Open startup","about": "About us","features": "Features",- "imprint": "Imprint"+ "imprint": "Legal notice"}}