📈 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
Add browser / OS version support
Blue Mouse6d311043d7ff
diff --git a/backend/apps/production/src/analytics/analytics.controller.ts b/backend/apps/production/src/analytics/analytics.controller.tsindex 93c3d73e4..ccff39a8d 100644--- a/backend/apps/production/src/analytics/analytics.controller.ts+++ b/backend/apps/production/src/analytics/analytics.controller.ts@@ -1086,7 +1086,11 @@ export class AnalyticsController {const ua = UAParser(userAgent, extensions)const dv = ua.device.type || 'desktop'const br = ua.browser.name+ const brv = this.analyticsService.extractMajorMinorVersion(+ ua.browser.version,+ )const os = ua.os.name+ const osv = this.analyticsService.extractMajorMinorVersion(ua.os.version)const { name, message, lineno, colno, filename } = errorDTO@@ -1096,7 +1100,9 @@ export class AnalyticsController {errorDTO.pg,dv,br,+ brv,os,+ osv,errorDTO.lc,country,region,@@ -1184,7 +1190,11 @@ export class AnalyticsController {const ua = UAParser(userAgent, extensions)const dv = ua.device.type || 'desktop'const br = ua.browser.name+ const brv = this.analyticsService.extractMajorMinorVersion(+ ua.browser.version,+ )const os = ua.os.name+ const osv = this.analyticsService.extractMajorMinorVersion(ua.os.version)const [, psid] = await this.analyticsService.isUnique(eventsDTO.pid,@@ -1199,7 +1209,9 @@ export class AnalyticsController {eventsDTO.pg,dv,br,+ brv,os,+ osv,eventsDTO.lc,eventsDTO.ref,eventsDTO.so,@@ -1286,7 +1298,11 @@ export class AnalyticsController {const ua = UAParser(userAgent, extensions)const dv = ua.device.type || 'desktop'const br = ua.browser.name+ const brv = this.analyticsService.extractMajorMinorVersion(+ ua.browser.version,+ )const os = ua.os.name+ const osv = this.analyticsService.extractMajorMinorVersion(ua.os.version)const transformed = trafficTransformer(psid,@@ -1295,7 +1311,9 @@ export class AnalyticsController {logDTO.prev,dv,br,+ brv,os,+ osv,logDTO.lc,logDTO.ref,logDTO.so,@@ -1330,6 +1348,7 @@ export class AnalyticsController {logDTO.pg,dv,br,+ brv,country,region,city,@@ -1413,7 +1432,11 @@ export class AnalyticsController {const ua = UAParser(userAgent, extensions)const dv = ua.device.type || 'desktop'const br = ua.browser.name+ const brv = this.analyticsService.extractMajorMinorVersion(+ ua.browser.version,+ )const os = ua.os.name+ const osv = this.analyticsService.extractMajorMinorVersion(ua.os.version)const transformed = trafficTransformer(psid,@@ -1422,7 +1445,9 @@ export class AnalyticsController {null,dv,br,+ brv,os,+ osv,null,null,null,diff --git a/backend/apps/production/src/analytics/analytics.service.ts b/backend/apps/production/src/analytics/analytics.service.tsindex ef02ebaee..9b3dfe18a 100644--- a/backend/apps/production/src/analytics/analytics.service.ts+++ b/backend/apps/production/src/analytics/analytics.service.ts@@ -2766,6 +2766,14 @@ export class AnalyticsService {})}+ extractMajorMinorVersion(version: string): string | null {+ const [major, minor = '0'] = version.split('.')++ if (!major) return null++ return `${major}.${minor}`+ }+extractCaptchaChartData(result, x: string[]): any {const count = Array(x.length).fill(0)diff --git a/backend/apps/production/src/analytics/utils/transformers.ts b/backend/apps/production/src/analytics/utils/transformers.tsindex 95787a1fa..2d213eb4a 100644--- a/backend/apps/production/src/analytics/utils/transformers.ts+++ b/backend/apps/production/src/analytics/utils/transformers.ts@@ -30,7 +30,9 @@ export const trafficTransformer = (prev: string | null,dv: string | null,br: string | null,+ brv: string | null,os: string | null,+ osv: string | null,lc: string | null,ref: string | null,so: string | null,@@ -52,7 +54,9 @@ export const trafficTransformer = (prev: prev || null,dv: dv || null,br: br || null,+ brv: brv || null,os: os || null,+ osv: osv || null,lc: lc || null,ref: ref || null,so: so || null,@@ -77,7 +81,9 @@ export const customEventTransformer = (pg: string | null,dv: string | null,br: string | null,+ brv: string | null,os: string | null,+ osv: string | null,lc: string | null,ref: string | null,so: string | null,@@ -97,7 +103,9 @@ export const customEventTransformer = (pg: pg || null,dv: dv || null,br: br || null,+ brv: brv || null,os: os || null,+ osv: osv || null,lc: lc || null,ref: ref || null,so: so || null,@@ -119,7 +127,9 @@ export const errorEventTransformer = (pg: string | null,dv: string | null,br: string | null,+ brv: string | null,os: string | null,+ osv: string | null,lc: string | null,cc: string | null,rg: string | null,@@ -136,7 +146,9 @@ export const errorEventTransformer = (pg: pg || null,dv: dv || null,br: br || null,+ brv: brv || null,os: os || null,+ osv: osv || null,lc: lc || null,cc: cc || null,rg: rg || null,@@ -155,6 +167,7 @@ export const performanceTransformer = (pg: string | null,dv: string | null,br: string | null,+ brv: string | null,cc: string | null,rg: string | null,ct: string | null,@@ -172,6 +185,7 @@ export const performanceTransformer = (pg: pg || null,dv: dv || null,br: br || null,+ brv: brv || null,cc: cc || null,rg: rg || null,ct: ct || null,diff --git a/backend/apps/production/src/common/constants.ts b/backend/apps/production/src/common/constants.tsindex d16c5a881..31cbcead3 100644--- a/backend/apps/production/src/common/constants.ts+++ b/backend/apps/production/src/common/constants.ts@@ -104,7 +104,9 @@ const TRAFFIC_COLUMNS = ['pg','lc','br',+ 'brv','os',+ 'osv','dv','ref','so',@@ -118,12 +120,23 @@ const UPTIME_COLUMNS = ['region', 'statusCode']const TRAFFIC_METAKEY_COLUMNS = ['tag:key', 'tag:value']-const ERROR_COLUMNS = ['pg', 'dv', 'br', 'os', 'lc', 'cc', 'rg', 'ct']+const ERROR_COLUMNS = [+ 'pg',+ 'dv',+ 'br',+ 'brv',+ 'os',+ 'osv',+ 'lc',+ 'cc',+ 'rg',+ 'ct',+]const ALL_COLUMNS = [...TRAFFIC_COLUMNS, 'ev']const CAPTCHA_COLUMNS = ['cc', 'br', 'os', 'dv']-const PERFORMANCE_COLUMNS = ['cc', 'rg', 'ct', 'pg', 'dv', 'br']+const PERFORMANCE_COLUMNS = ['cc', 'rg', 'ct', 'pg', 'dv', 'br', 'brv']const sentryIgnoreErrors: (string | RegExp)[] = ['BadRequestException',diff --git a/backend/migrations/clickhouse/2024_10_20.js b/backend/migrations/clickhouse/2024_10_20.jsnew file mode 100644index 000000000..666abfeb2--- /dev/null+++ b/backend/migrations/clickhouse/2024_10_20.js@@ -0,0 +1,17 @@+const { queriesRunner, dbName } = require('./setup')++const queries = [+ // Added 'brv' and 'osv' columns (browser version and os version)+ `ALTER TABLE ${dbName}.analytics ADD COLUMN brv Nullable(String) AFTER br`,+ `ALTER TABLE ${dbName}.analytics ADD COLUMN osv Nullable(String) AFTER os`,++ `ALTER TABLE ${dbName}.customEV ADD COLUMN brv Nullable(String) AFTER br`,+ `ALTER TABLE ${dbName}.customEV ADD COLUMN osv Nullable(String) AFTER os`,++ `ALTER TABLE ${dbName}.errors ADD COLUMN brv Nullable(String) AFTER br`,+ `ALTER TABLE ${dbName}.errors ADD COLUMN osv Nullable(String) AFTER os`,++ `ALTER TABLE ${dbName}.performance ADD COLUMN brv Nullable(String) AFTER br`,+]++queriesRunner(queries)diff --git a/backend/migrations/clickhouse/initialise_database.js b/backend/migrations/clickhouse/initialise_database.jsindex df5d1a2dd..a68af848a 100644--- a/backend/migrations/clickhouse/initialise_database.js+++ b/backend/migrations/clickhouse/initialise_database.js@@ -13,7 +13,9 @@ const CLICKHOUSE_INIT_QUERIES = [prev Nullable(String),dv LowCardinality(Nullable(String)),br LowCardinality(Nullable(String)),+ brv Nullable(String),os LowCardinality(Nullable(String)),+ osv Nullable(String),lc LowCardinality(Nullable(String)),ref Nullable(String),so Nullable(String),@@ -46,7 +48,9 @@ const CLICKHOUSE_INIT_QUERIES = [pg Nullable(String),dv LowCardinality(Nullable(String)),br LowCardinality(Nullable(String)),+ brv Nullable(String),os LowCardinality(Nullable(String)),+ osv Nullable(String),lc LowCardinality(Nullable(String)),ref Nullable(String),so Nullable(String),@@ -75,6 +79,7 @@ const CLICKHOUSE_INIT_QUERIES = [pg Nullable(String),dv LowCardinality(Nullable(String)),br LowCardinality(Nullable(String)),+ brv Nullable(String),cc Nullable(FixedString(2)),rg LowCardinality(Nullable(String)),ct Nullable(String),@@ -100,7 +105,9 @@ const CLICKHOUSE_INIT_QUERIES = [pg Nullable(String),dv LowCardinality(Nullable(String)),br LowCardinality(Nullable(String)),+ brv Nullable(String),os LowCardinality(Nullable(String)),+ osv Nullable(String),lc LowCardinality(Nullable(String)),cc LowCardinality(Nullable(FixedString(2))),rg LowCardinality(Nullable(String)),diff --git a/web/app/pages/Project/View/ViewProject.helpers.tsx b/web/app/pages/Project/View/ViewProject.helpers.tsxindex b5404d595..b5945ffb2 100644--- a/web/app/pages/Project/View/ViewProject.helpers.tsx+++ b/web/app/pages/Project/View/ViewProject.helpers.tsx@@ -1647,7 +1647,9 @@ const typeNameMapping = (t: typeof i18next.t) => ({ref: t('project.mapping.ref'),dv: t('project.mapping.dv'),br: t('project.mapping.br'),+ brv: t('project.mapping.brv'),os: t('project.mapping.os'),+ osv: t('project.mapping.osv'),so: t('project.mapping.so'),me: t('project.mapping.me'),ca: t('project.mapping.ca'),diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsxindex 999cfc722..c54e38be3 100644--- a/web/app/pages/Project/View/ViewProject.tsx+++ b/web/app/pages/Project/View/ViewProject.tsx@@ -228,6 +228,8 @@ import AddAViewModal from './components/AddAViewModal'import CustomMetrics from './components/CustomMetrics'import { AIProcessedResponse, AIResponse } from './interfaces/ai'import { useRequiredParams } from 'hooks/useRequiredParams'+import BrowserDropdown from './components/BrowserDropdown'+import OSDropdown from './components/OSDropdown'const SwetrixSDK = require('@swetrix/sdk')const CUSTOM_EV_DROPDOWN_MAX_VISIBLE_LENGTH = 32@@ -698,6 +700,12 @@ const ViewProject = ({// Used to switch between Country, Region and City tabsconst [countryActiveTab, setCountryActiveTab] = useState<'cc' | 'rg' | 'ct'>('cc')+ // Used to switch between Browser and Browser Version tabs+ const [browserActiveTab, setBrowserActiveTab] = useState<'br' | 'brv'>('br')++ // Used to switch between OS and OS Version tabs+ const [osActiveTab, setOsActiveTab] = useState<'os' | 'osv'>('os')+// Used to switch between different UTM tabsconst [utmActiveTab, setUtmActiveTab] = useState<'so' | 'me' | 'ca'>('so')@@ -4687,6 +4695,8 @@ const ViewProject = ({}if (type === 'br') {+ const brPanelName = tnMapping[browserActiveTab]+const rowMapper = (entry: any) => {const { name: entryName } = entry// @ts-ignore@@ -4714,19 +4724,21 @@ const ViewProject = ({return (<PanelprojectPassword={projectPassword}- key={type}+ key={browserActiveTab}icon={panelIcon}- id={type}+ id={browserActiveTab}activeTab={activeTab}onFilter={filterHandler}- name={panelName}- data={activeError.params[type]}+ name={<BrowserDropdown onSelect={setBrowserActiveTab} title={brPanelName} />}+ data={activeError.params[browserActiveTab]}rowMapper={rowMapper}/>)}if (type === 'os') {+ const osPanelName = tnMapping[osActiveTab]+const rowMapper = (entry: any) => {const { name: entryName } = entry// @ts-ignore@@ -4761,13 +4773,13 @@ const ViewProject = ({return (<PanelprojectPassword={projectPassword}- key={type}+ key={osActiveTab}icon={panelIcon}- id={type}+ id={osActiveTab}activeTab={activeTab}onFilter={filterHandler}- name={panelName}- data={activeError.params[type]}+ name={<OSDropdown onSelect={setOsActiveTab} title={osPanelName} />}+ data={activeError.params[osActiveTab]}rowMapper={rowMapper}/>)@@ -4982,6 +4994,8 @@ const ViewProject = ({}if (type === 'br') {+ const brPanelName = tnMapping[browserActiveTab]+const rowMapper = (entry: any) => {const { name: entryName } = entry// @ts-ignore@@ -5009,20 +5023,21 @@ const ViewProject = ({return (<PanelprojectPassword={projectPassword}- key={type}+ key={browserActiveTab}icon={panelIcon}- id={type}+ id={browserActiveTab}activeTab={activeTab}onFilter={filterHandler}- name={panelName}- data={dataSource[type]}- customTabs={customTabs}+ name={<BrowserDropdown onSelect={setBrowserActiveTab} title={brPanelName} />}+ data={dataSource[browserActiveTab]}rowMapper={rowMapper}/>)}if (type === 'os') {+ const osPanelName = tnMapping[osActiveTab]+const rowMapper = (entry: any) => {const { name: entryName } = entry// @ts-ignore@@ -5057,14 +5072,13 @@ const ViewProject = ({return (<PanelprojectPassword={projectPassword}- key={type}+ key={osActiveTab}icon={panelIcon}- id={type}+ id={osActiveTab}activeTab={activeTab}onFilter={filterHandler}- name={panelName}- data={dataSource[type]}- customTabs={customTabs}+ name={<OSDropdown onSelect={setOsActiveTab} title={osPanelName} />}+ data={dataSource[osActiveTab]}rowMapper={rowMapper}/>)@@ -5326,6 +5340,8 @@ const ViewProject = ({}if (type === 'br') {+ const brPanelName = tnMapping[browserActiveTab]+const rowMapper = (entry: any) => {const { name: entryName } = entry// @ts-ignore@@ -5353,16 +5369,13 @@ const ViewProject = ({return (<PanelprojectPassword={projectPassword}- key={type}+ key={browserActiveTab}icon={panelIcon}- id={type}+ id={browserActiveTab}activeTab={activeTab}onFilter={filterHandler}- name={panelName}- data={panelsDataPerf.data[type]}- customTabs={customTabs}- // @ts-ignore- valueMapper={(value) => getStringFromTime(getTimeFromSeconds(value), true)}+ name={<BrowserDropdown onSelect={setBrowserActiveTab} title={brPanelName} />}+ data={panelsDataPerf.data[browserActiveTab]}rowMapper={rowMapper}/>)diff --git a/web/app/pages/Project/View/components/BrowserDropdown.tsx b/web/app/pages/Project/View/components/BrowserDropdown.tsxnew file mode 100644index 000000000..361bbb279--- /dev/null+++ b/web/app/pages/Project/View/components/BrowserDropdown.tsx@@ -0,0 +1,61 @@+import { useState } from 'react'+import _map from 'lodash/map'+import { useTranslation } from 'react-i18next'+import OutsideClickHandler from 'react-outside-click-handler'+import { ChevronDownIcon, ChevronUpIcon, XMarkIcon } from '@heroicons/react/24/outline'++const OPTIONS = [+ {+ label: 'project.mapping.br',+ value: 'br',+ },+ {+ label: 'project.mapping.brv',+ value: 'brv',+ },+] as const++interface BrowserDropdownProps {+ onSelect: (value: (typeof OPTIONS)[number]['value']) => void+ title: string+}++const BrowserDropdown = ({ onSelect, title }: BrowserDropdownProps) => {+ const { t } = useTranslation()+ const [show, setShow] = useState(false)++ const _onSelect = (value: (typeof OPTIONS)[number]['value']) => {+ onSelect(value)+ setShow(false)+ }++ return (+ <OutsideClickHandler onOutsideClick={() => setShow(false)}>+ <span className='cursor-pointer' onClick={() => setShow(!show)}>+ {title} {show ? <ChevronUpIcon className='inline size-4' /> : <ChevronDownIcon className='inline size-4' />}+ </span>+ {show && (+ <div className='top-15 absolute left-5 z-10 mt-2 max-h-[200px] min-w-[250px] overflow-auto rounded-md border border-gray-200 bg-white text-gray-900 shadow-lg dark:border-slate-700/50 dark:bg-slate-900'>+ <div className='flex w-full flex-col p-2'>+ <p className='px-1 text-sm font-semibold text-gray-900 dark:text-gray-50'>{t('project.browserInfo')}</p>+ {_map(OPTIONS, ({ label, value }) => (+ <div+ key={label}+ onClick={() => _onSelect(value)}+ className='flex w-full cursor-pointer flex-row items-center justify-between px-1 py-2 text-sm text-gray-700 hover:bg-gray-200 dark:bg-slate-900 dark:text-gray-200 dark:hover:bg-slate-800'+ >+ <p>{t(label)}</p>+ </div>+ ))}+ </div>+ <XMarkIcon+ className='absolute right-2 top-2 h-5 w-5 cursor-pointer text-gray-900 dark:text-gray-50'+ onClick={() => setShow(!show)}+ />+ </div>+ )}+ </OutsideClickHandler>+ )+}++export default BrowserDropdowndiff --git a/web/app/pages/Project/View/components/OSDropdown.tsx b/web/app/pages/Project/View/components/OSDropdown.tsxnew file mode 100644index 000000000..e76acc035--- /dev/null+++ b/web/app/pages/Project/View/components/OSDropdown.tsx@@ -0,0 +1,61 @@+import { useState } from 'react'+import _map from 'lodash/map'+import { useTranslation } from 'react-i18next'+import OutsideClickHandler from 'react-outside-click-handler'+import { ChevronDownIcon, ChevronUpIcon, XMarkIcon } from '@heroicons/react/24/outline'++const OPTIONS = [+ {+ label: 'project.mapping.os',+ value: 'os',+ },+ {+ label: 'project.mapping.osv',+ value: 'osv',+ },+] as const++interface OSDropdownProps {+ onSelect: (value: (typeof OPTIONS)[number]['value']) => void+ title: string+}++const OSDropdown = ({ onSelect, title }: OSDropdownProps) => {+ const { t } = useTranslation()+ const [show, setShow] = useState(false)++ const _onSelect = (value: (typeof OPTIONS)[number]['value']) => {+ onSelect(value)+ setShow(false)+ }++ return (+ <OutsideClickHandler onOutsideClick={() => setShow(false)}>+ <span className='cursor-pointer' onClick={() => setShow(!show)}>+ {title} {show ? <ChevronUpIcon className='inline size-4' /> : <ChevronDownIcon className='inline size-4' />}+ </span>+ {show && (+ <div className='top-15 absolute left-5 z-10 mt-2 max-h-[200px] min-w-[250px] overflow-auto rounded-md border border-gray-200 bg-white text-gray-900 shadow-lg dark:border-slate-700/50 dark:bg-slate-900'>+ <div className='flex w-full flex-col p-2'>+ <p className='px-1 text-sm font-semibold text-gray-900 dark:text-gray-50'>{t('project.osInfo')}</p>+ {_map(OPTIONS, ({ label, value }) => (+ <div+ key={label}+ onClick={() => _onSelect(value)}+ className='flex w-full cursor-pointer flex-row items-center justify-between px-1 py-2 text-sm text-gray-700 hover:bg-gray-200 dark:bg-slate-900 dark:text-gray-200 dark:hover:bg-slate-800'+ >+ <p>{t(label)}</p>+ </div>+ ))}+ </div>+ <XMarkIcon+ className='absolute right-2 top-2 h-5 w-5 cursor-pointer text-gray-900 dark:text-gray-50'+ onClick={() => setShow(!show)}+ />+ </div>+ )}+ </OutsideClickHandler>+ )+}++export default OSDropdowndiff --git a/web/public/locales/en.json b/web/public/locales/en.jsonindex c7bc7d5fb..bb5371943 100644--- a/web/public/locales/en.json+++ b/web/public/locales/en.json@@ -807,6 +807,8 @@"overrideCurrentlyFilters": "Override currently applied filters","noExist": "The selected project does not exist","geo": "Geolocation",+ "browserInfo": "Browser information",+ "osInfo": "OS information","campaigns": "Campaigns","pageviewX": "<span>Pageview</span> <value>{{x}}</value>","eventX": "<span>Event</span> <value>{{x}}</value>",@@ -859,7 +861,9 @@"ref": "Referrer","dv": "Device type","br": "Browser",+ "brv": "Browser version","os": "OS name",+ "osv": "OS version","so": "UTM Source","me": "UTM Medium","ca": "UTM Campaign",