📈 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: unresponsive custom metrics
Blue Mousee3b30aa32b51
diff --git a/backend/apps/cloud/src/analytics/analytics.service.ts b/backend/apps/cloud/src/analytics/analytics.service.tsindex f076a80a8..f3a443d20 100644--- a/backend/apps/cloud/src/analytics/analytics.service.ts+++ b/backend/apps/cloud/src/analytics/analytics.service.ts@@ -1945,12 +1945,17 @@ export class AnalyticsService {// For 'all' period, we use month time bucket for chartif (includeChart) {const allTimeChartBucket = TimeBucketType.MONTH+ const { diff: allDiff } = await this.calculateTimeBucketForAllTime(+ pid,+ 'analytics',+ )const { groupFrom: allFrom, groupTo: allTo } = this.getGroupFromTo(undefined,undefined,allTimeChartBucket,'all',safeTimezone,+ allDiff,)const chartData = await this.getSimplifiedChartData(pid,@@ -6280,27 +6285,28 @@ export class AnalyticsService {let periodFormattedlet periodSubtracted- if (period !== 'all') {- if (from && to) {- // diff may be 0 (when selecting data for 1 day), so let's make it 1 to grab some data for the prev day as well- const diff = dayjs(to).diff(dayjs(from), 'days') || 1-- now = to- periodFormatted = from- periodSubtracted = dayjs(from)- .subtract(diff, 'days')- .format('YYYY-MM-DD HH:mm:ss')- } else {- const amountToSubtract = parseInt(period, 10)- const unit = _replace(period, /[0-9]/g, '') as dayjs.ManipulateType-- now = dayjs.utc().format('YYYY-MM-DD HH:mm:ss')- const periodRaw = dayjs.utc().subtract(amountToSubtract, unit)- periodFormatted = periodRaw.format('YYYY-MM-DD HH:mm:ss')- periodSubtracted = periodRaw- .subtract(amountToSubtract, unit)- .format('YYYY-MM-DD HH:mm:ss')- }+ if (period === 'all') {+ now = dayjs.utc().format('YYYY-MM-DD HH:mm:ss')+ periodFormatted = '1970-01-01 00:00:00'+ periodSubtracted = '1970-01-01 00:00:00'+ } else if (from && to) {+ const diff = dayjs(to).diff(dayjs(from), 'days') || 1++ now = to+ periodFormatted = from+ periodSubtracted = dayjs(from)+ .subtract(diff, 'days')+ .format('YYYY-MM-DD HH:mm:ss')+ } else {+ const amountToSubtract = parseInt(period, 10)+ const unit = _replace(period, /[0-9]/g, '') as dayjs.ManipulateType++ now = dayjs.utc().format('YYYY-MM-DD HH:mm:ss')+ const periodRaw = dayjs.utc().subtract(amountToSubtract, unit)+ periodFormatted = periodRaw.format('YYYY-MM-DD HH:mm:ss')+ periodSubtracted = periodRaw+ .subtract(amountToSubtract, unit)+ .format('YYYY-MM-DD HH:mm:ss')}const params = {diff --git a/backend/apps/community/src/analytics/analytics.service.ts b/backend/apps/community/src/analytics/analytics.service.tsindex 752b21c97..8c10b44c5 100644--- a/backend/apps/community/src/analytics/analytics.service.ts+++ b/backend/apps/community/src/analytics/analytics.service.ts@@ -1626,12 +1626,17 @@ export class AnalyticsService {// For 'all' period, we use month time bucket for chartif (includeChart) {const allTimeChartBucket = TimeBucketType.MONTH+ const { diff: allDiff } = await this.calculateTimeBucketForAllTime(+ pid,+ 'analytics',+ )const { groupFrom: allFrom, groupTo: allTo } = this.getGroupFromTo(undefined,undefined,allTimeChartBucket,'all',safeTimezone,+ allDiff,)const chartData = await this.getSimplifiedChartData(pid,@@ -5092,27 +5097,28 @@ export class AnalyticsService {let periodFormattedlet periodSubtracted- if (period !== 'all') {- if (from && to) {- // diff may be 0 (when selecting data for 1 day), so let's make it 1 to grab some data for the prev day as well- const diff = dayjs(to).diff(dayjs(from), 'days') || 1-- now = to- periodFormatted = from- periodSubtracted = dayjs(from)- .subtract(diff, 'days')- .format('YYYY-MM-DD HH:mm:ss')- } else {- const amountToSubtract = parseInt(period, 10)- const unit = _replace(period, /[0-9]/g, '') as dayjs.ManipulateType-- now = dayjs.utc().format('YYYY-MM-DD HH:mm:ss')- const periodRaw = dayjs.utc().subtract(amountToSubtract, unit)- periodFormatted = periodRaw.format('YYYY-MM-DD HH:mm:ss')- periodSubtracted = periodRaw- .subtract(amountToSubtract, unit)- .format('YYYY-MM-DD HH:mm:ss')- }+ if (period === 'all') {+ now = dayjs.utc().format('YYYY-MM-DD HH:mm:ss')+ periodFormatted = '1970-01-01 00:00:00'+ periodSubtracted = '1970-01-01 00:00:00'+ } else if (from && to) {+ const diff = dayjs(to).diff(dayjs(from), 'days') || 1++ now = to+ periodFormatted = from+ periodSubtracted = dayjs(from)+ .subtract(diff, 'days')+ .format('YYYY-MM-DD HH:mm:ss')+ } else {+ const amountToSubtract = parseInt(period, 10)+ const unit = _replace(period, /[0-9]/g, '') as dayjs.ManipulateType++ now = dayjs.utc().format('YYYY-MM-DD HH:mm:ss')+ const periodRaw = dayjs.utc().subtract(amountToSubtract, unit)+ periodFormatted = periodRaw.format('YYYY-MM-DD HH:mm:ss')+ periodSubtracted = periodRaw+ .subtract(amountToSubtract, unit)+ .format('YYYY-MM-DD HH:mm:ss')}const params = {diff --git a/web/app/api/api.server.ts b/web/app/api/api.server.tsindex f075750e2..e621f725f 100644--- a/web/app/api/api.server.ts+++ b/web/app/api/api.server.ts@@ -745,6 +745,7 @@ export interface AnalyticsParams {timezone: stringmode?: 'periodical' | 'cumulative'password?: string+ metrics?: string}function serializeFiltersForUrl(filters: AnalyticsFilter[]): string {@@ -765,6 +766,7 @@ export async function getProjectDataServer(if (params.to) queryParams.append('to', params.to)if (params.timezone) queryParams.append('timezone', params.timezone)if (params.mode) queryParams.append('mode', params.mode)+ if (params.metrics) queryParams.append('metrics', params.metrics)const headers: Record<string, string> = {}if (params.password) {diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsxindex f07b92747..8dda6497e 100644--- a/web/app/pages/Project/View/ViewProject.tsx+++ b/web/app/pages/Project/View/ViewProject.tsx@@ -342,9 +342,15 @@ const ViewProjectContent = () => {[CHART_METRICS_MAPPING.customEvents]: false,[CHART_METRICS_MAPPING.revenue]: false,} as Record<keyof typeof CHART_METRICS_MAPPING, boolean>)- const [customMetrics, setCustomMetrics] = useState<ProjectViewCustomEvent[]>(- [],- )+ const customMetrics = useMemo<ProjectViewCustomEvent[]>(() => {+ const raw = searchParams.get('metrics')+ if (!raw) return []+ try {+ return JSON.parse(raw)+ } catch {+ return []+ }+ }, [searchParams])const filters = useMemo<Filter[]>(() => {return parseFilters(searchParams)}, [searchParams])@@ -810,34 +816,41 @@ const ViewProjectContent = () => {setActivePeriodCompare(periodPairsCompare[0].period)}, [periodPairsCompare])- const onCustomMetric = (metrics: ProjectViewCustomEvent[]) => {- if (activeTab !== PROJECT_TABS.traffic) {- return- }-- setCustomMetrics(metrics)- }-- const onRemoveCustomMetric = (metricId: ProjectViewCustomEvent['id']) => {- if (activeTab !== PROJECT_TABS.traffic) {- return- }+ const onRemoveCustomMetric = useCallback(+ (metricId: ProjectViewCustomEvent['id']) => {+ if (activeTab !== PROJECT_TABS.traffic) {+ return+ }- const newMetrics = _filter(- customMetrics,- (metric) => metric.id !== metricId,- )+ const newMetrics = _filter(+ customMetrics,+ (metric) => metric.id !== metricId,+ )- setCustomMetrics(newMetrics)- }+ setSearchParams((prev) => {+ const next = new URLSearchParams(prev)+ if (newMetrics.length > 0) {+ next.set('metrics', JSON.stringify(newMetrics))+ } else {+ next.delete('metrics')+ }+ return next+ })+ },+ [activeTab, customMetrics, setSearchParams],+ )- const resetCustomMetrics = () => {+ const resetCustomMetrics = useCallback(() => {if (activeTab !== PROJECT_TABS.traffic) {return}- setCustomMetrics([])- }+ setSearchParams((prev) => {+ const next = new URLSearchParams(prev)+ next.delete('metrics')+ return next+ })+ }, [activeTab, setSearchParams])const setDashboardTab = useCallback((key: keyof typeof PROJECT_TABS) => {@@ -1515,7 +1528,6 @@ const ViewProjectContent = () => {loadProjectViews={loadProjectViews}setProjectViewToUpdate={setProjectViewToUpdate}setIsAddAViewOpened={setIsAddAViewOpened}- onCustomMetric={onCustomMetric}/>) : null}{activeTab === PROJECT_TABS.performance ? (diff --git a/web/app/pages/Project/tabs/Traffic/CustomMetrics.tsx b/web/app/pages/Project/tabs/Traffic/CustomMetrics.tsxindex 82d2da111..7ea6d05be 100644--- a/web/app/pages/Project/tabs/Traffic/CustomMetrics.tsx+++ b/web/app/pages/Project/tabs/Traffic/CustomMetrics.tsx@@ -4,6 +4,8 @@ import _map from 'lodash/map'import { memo, useMemo } from 'react'import { useTranslation } from 'react-i18next'+import { cn } from '~/utils/generic'+import { ProjectViewCustomEvent } from '../../View/interfaces/traffic'interface CustomMetricProps {@@ -49,12 +51,12 @@ const CustomMetric = ({ metric, onRemove }: CustomMetricProps) => {}, [t, metric])return (- <span className='m-1 inline-flex items-center rounded-md bg-gray-50 py-0.5 pr-1 pl-2.5 text-sm font-medium text-gray-800 dark:bg-slate-900 dark:text-gray-50'>+ <span className='m-1 inline-flex items-center rounded-md border border-gray-200 bg-white py-0.5 pr-1 pl-2.5 text-sm font-medium text-gray-700 dark:border-slate-700/60 dark:bg-slate-900/60 dark:text-gray-200'>{displayValue}<buttononClick={onRemove}type='button'- className='ml-0.5 inline-flex h-4 w-4 shrink-0 items-center justify-center rounded-full text-gray-800 hover:bg-gray-300 hover:text-gray-900 focus:bg-gray-300 focus:text-gray-900 focus:outline-hidden dark:bg-slate-900 dark:text-gray-50 dark:hover:bg-gray-800 dark:hover:text-gray-300 dark:focus:bg-gray-800 dark:focus:text-gray-300'+ className='ml-0.5 inline-flex h-4 w-4 shrink-0 items-center justify-center rounded-full text-gray-500 hover:bg-gray-100 hover:text-gray-700 focus:bg-gray-100 focus:text-gray-700 focus:outline-hidden dark:text-gray-400 dark:hover:bg-slate-800 dark:hover:text-gray-200 dark:focus:bg-slate-700 dark:focus:text-gray-200'title={t('project.removeFilter')}aria-label={t('project.removeFilter')}>@@ -75,21 +77,30 @@ interface FiltersProps {metrics: ProjectViewCustomEvent[]onRemoveMetric: (id: ProjectViewCustomEvent['id']) => voidresetMetrics: () => void+ className?: string}const CustomMetrics = ({metrics,onRemoveMetric,resetMetrics,+ className,}: FiltersProps) => {+ const { t } = useTranslation('common')+if (_isEmpty(metrics)) {return null}return (- <div className='mt-2 flex items-center justify-between rounded-md border border-gray-300 bg-slate-200 p-1 dark:border-slate-800/50 dark:bg-slate-900/25'>- <div className='flex items-center'>- <ScalesIcon className='box-content size-6 shrink-0 px-1 text-gray-700 dark:text-gray-200' />+ <div+ className={cn(+ 'flex items-center justify-between rounded-lg border border-gray-200 bg-white px-2 py-1 dark:border-slate-800/60 dark:bg-slate-900/25',+ className,+ )}+ >+ <div className='flex min-w-0 flex-1 items-center gap-1'>+ <ScalesIcon className='size-5 shrink-0 text-gray-500 dark:text-gray-400' /><div className='flex flex-wrap'>{_map(metrics, (metric) => (<CustomMetric@@ -102,10 +113,15 @@ const CustomMetrics = ({))}</div></div>- <XIcon- className='box-content size-6 shrink-0 cursor-pointer px-1 text-gray-800 hover:text-gray-600 dark:text-gray-200 dark:hover:text-gray-300'+ <button+ type='button'+ title={t('project.resetFilters')}+ aria-label={t('project.resetFilters')}onClick={resetMetrics}- />+ className='shrink-0'+ >+ <XIcon className='size-5 cursor-pointer rounded-md p-0.5 text-gray-500 transition-colors hover:bg-gray-100 hover:text-gray-700 dark:text-gray-400 dark:hover:bg-slate-800 dark:hover:text-gray-200' />+ </button></div>)}diff --git a/web/app/pages/Project/tabs/Traffic/TrafficHeaderActions.tsx b/web/app/pages/Project/tabs/Traffic/TrafficHeaderActions.tsxindex 0aff59385..cee690f76 100644--- a/web/app/pages/Project/tabs/Traffic/TrafficHeaderActions.tsx+++ b/web/app/pages/Project/tabs/Traffic/TrafficHeaderActions.tsx@@ -18,11 +18,7 @@ import { Text } from '~/ui/Text'import { trackCustom } from '~/utils/analytics'import { getFiltersUrlParams } from '../../View/components/SearchFilters'-import {- Filter,- ProjectView,- ProjectViewCustomEvent,-} from '../../View/interfaces/traffic'+import { Filter, ProjectView } from '../../View/interfaces/traffic'interface ExportType {label: string@@ -36,7 +32,6 @@ interface TrafficHeaderActionsProps {loadProjectViews: (forced?: boolean) => voidsetProjectViewToUpdate: (view: ProjectView | undefined) => voidsetIsAddAViewOpened: (value: boolean) => void- onCustomMetric: (metrics: ProjectViewCustomEvent[]) => voidfilters: Filter[]allowedToManage: booleandataLoading: boolean@@ -52,7 +47,6 @@ const TrafficHeaderActions = ({loadProjectViews,setProjectViewToUpdate,setIsAddAViewOpened,- onCustomMetric,filters,allowedToManage,dataLoading,@@ -182,18 +176,19 @@ const TrafficHeaderActions = ({return}- if (item.filters && !_isEmpty(item.filters)) {- const newUrlParams = getFiltersUrlParams(- filters,- item.filters,- true,- searchParams,- )- setSearchParams(newUrlParams)- }+ const hasFilters = item.filters && !_isEmpty(item.filters)+ const hasMetrics = item.customEvents && !_isEmpty(item.customEvents)++ if (hasFilters || hasMetrics) {+ let newParams = hasFilters+ ? getFiltersUrlParams(filters, item.filters!, true, searchParams)+ : new URLSearchParams(searchParams)++ if (hasMetrics) {+ newParams.set('metrics', JSON.stringify(item.customEvents))+ }- if (item.customEvents && !_isEmpty(item.customEvents)) {- onCustomMetric(item.customEvents)+ setSearchParams(newParams)}}}chevron='mini'diff --git a/web/app/pages/Project/tabs/Traffic/TrafficView.tsx b/web/app/pages/Project/tabs/Traffic/TrafficView.tsxindex 46cf6d26f..c7cb9a1ea 100644--- a/web/app/pages/Project/tabs/Traffic/TrafficView.tsx+++ b/web/app/pages/Project/tabs/Traffic/TrafficView.tsx@@ -132,7 +132,6 @@ interface TrafficViewProps {loadProjectViews: (forced?: boolean) => voidsetProjectViewToUpdate: (view: ProjectView | undefined) => voidsetIsAddAViewOpened: (value: boolean) => void- onCustomMetric: (metrics: ProjectViewCustomEvent[]) => void}interface DeferredTrafficData {@@ -252,7 +251,6 @@ const TrafficViewInner = ({loadProjectViews,setProjectViewToUpdate,setIsAddAViewOpened,- onCustomMetric,deferredData,}: TrafficViewInnerProps) => {const { id, project, allowedToManage } = useCurrentProject()@@ -902,7 +900,6 @@ const TrafficViewInner = ({loadProjectViews={loadProjectViews}setProjectViewToUpdate={setProjectViewToUpdate}setIsAddAViewOpened={setIsAddAViewOpened}- onCustomMetric={onCustomMetric}filters={filters}allowedToManage={allowedToManage}dataLoading={dataLoading}@@ -967,6 +964,12 @@ const TrafficViewInner = ({{!isPanelsDataEmpty ? (<Filters className='mb-3' tnMapping={tnMapping} />) : null}+ <CustomMetrics+ className='mb-3'+ metrics={customMetrics}+ onRemoveMetric={(metricId) => onRemoveCustomMetric(metricId)}+ resetMetrics={resetCustomMetrics}+ /><div className='relative overflow-hidden rounded-lg border border-gray-200 bg-white p-4 dark:border-slate-800/60 dark:bg-slate-900/25'><div className='mb-3 flex w-full items-center justify-end gap-1 lg:absolute lg:top-2 lg:right-2 lg:mb-0 lg:w-auto lg:justify-normal'><Dropdown@@ -1114,11 +1117,6 @@ const TrafficViewInner = ({</div>) : null}</div>- <CustomMetrics- metrics={customMetrics}- onRemoveMetric={(metricId) => onRemoveCustomMetric(metricId)}- resetMetrics={resetCustomMetrics}- /><div className='mt-3 grid grid-cols-1 gap-3 sm:grid-cols-2'>{!_isEmpty(panelsData.types)? _map(TRAFFIC_PANELS_ORDER, (type: string) => {diff --git a/web/app/routes/projects.$id.tsx b/web/app/routes/projects.$id.tsxindex 2a156f2a1..f2abddb91 100644--- a/web/app/routes/projects.$id.tsx+++ b/web/app/routes/projects.$id.tsx@@ -349,6 +349,9 @@ export async function loader({ request, params }: LoaderFunctionArgs) {? customEventsParam.split(',').filter(Boolean): []+ // Segment custom metrics (JSON-encoded ProjectViewCustomEvent[])+ const metricsParam = url.searchParams.get('metrics') || undefined+const analyticsParams = {timeBucket,period,@@ -357,6 +360,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {to: to || undefined,timezone,password: password || undefined,+ metrics: metricsParam,}// Initialize deferred data promises