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!

Fix types

Blue Mouseb54023471ccd
diff --git a/web/app/lib/models/Entry.ts b/web/app/lib/models/Entry.ts
index 85faea4b6..c8c6250ac 100644
--- a/web/app/lib/models/Entry.ts
+++ b/web/app/lib/models/Entry.ts
@@ -1,5 +1,5 @@
export interface Entry {
- name: string
+ name: string | null
count: number
cc?: string
rgc?: string
diff --git a/web/app/pages/Project/View/Panels.tsx b/web/app/pages/Project/View/Panels.tsx
index ca5fd33d9..da0691545 100644
--- a/web/app/pages/Project/View/Panels.tsx
+++ b/web/app/pages/Project/View/Panels.tsx
@@ -266,7 +266,7 @@ interface MetadataProps {
filters: Filter[]
getCustomEventMetadata: (event: string) => Promise<any>
getPropertyMetadata: (property: string) => Promise<any>
- getFilterLink: (column: string, value: string) => LinkProps['to']
+ getFilterLink: (column: string, value: string | null) => LinkProps['to']
onTabChange: (tab: string) => void
activeTabId: string
}
@@ -280,7 +280,7 @@ interface SortRows {
interface KVTableContainerProps {
data: any
uniques: number
- onClick: (key: string, value: string) => void
+ onClick: (key: string, value: string | null) => void
displayKeyAsHeader?: boolean
}
@@ -624,7 +624,7 @@ const Metadata = ({
})
}
- const _getFilterLink = (column: string | null, value: string) => {
+ const _getFilterLink = (column: string | null, value: string | null) => {
if (activeTabId === 'ce') {
return getFilterLink('ev' + (column ? `:key:${column}` : ''), value)
}
@@ -861,7 +861,7 @@ interface PanelProps {
icon: any
id: string
hideFilters?: boolean
- getFilterLink?: (column: string, value: string) => LinkProps['to']
+ getFilterLink?: (column: string, value: string | null) => LinkProps['to']
tabs?: Array<
| {
id: string
@@ -876,7 +876,7 @@ interface PanelProps {
activeTabId?: string
customRenderer?: () => React.ReactNode
versionData?: { [key: string]: Entry[] }
- getVersionFilterLink?: (parent: string, version: string) => LinkProps['to']
+ getVersionFilterLink?: (parent: string | null, version: string | null) => LinkProps['to']
valuesHeaderName?: string
highlightColour?: 'blue' | 'red' | 'orange'
// When true, rows are non-interactive (no filter link/navigation)
@@ -1129,7 +1129,7 @@ const DetailsTable = ({
},
)}
onClick={() => {
- if (disableRowClick || entryName === null) return
+ if (disableRowClick) return
const link = getFilterLink(id, entryName)
if (link) {
navigate(link)
@@ -1236,7 +1236,7 @@ const Panel = ({
const { t } = useTranslation('common')
const total = useMemo(() => _reduce(data, (prev, curr) => prev + curr.count, 0), [data])
const [detailsOpened, setDetailsOpened] = useState(false)
- const [expandedItems, setExpandedItems] = useState<Set<string>>(new Set())
+ const [expandedItems, setExpandedItems] = useState<Set<string | null>>(new Set())
const tnMapping = typeNameMapping(t)
@@ -1245,7 +1245,7 @@ const Panel = ({
return _slice(orderedData, 0, ENTRIES_PER_PANEL)
}, [data])
- const toggleExpanded = (itemName: string) => {
+ const toggleExpanded = (itemName: string | null) => {
setExpandedItems((prev) => {
const newSet = new Set(prev)
if (newSet.has(itemName)) {
@@ -1295,9 +1295,9 @@ const Panel = ({
const valueData = valueMapper(count)
const hasVersionsForItem = hasVersions(entryName)
const isExpanded = expandedItems.has(entryName)
- const versions = versionData?.[entryName] || []
+ const versions = entryName ? versionData?.[entryName] || [] : []
- const link = entryName === null ? undefined : getFilterLink(id, entryName)
+ const link = getFilterLink(id, entryName)
return (
<div key={`${id}-${entryName}-${Object.values(rest).join('-')}`} className='space-y-0.5'>
@@ -1475,7 +1475,7 @@ const Panel = ({
valueMapper={valueMapper}
capitalize={capitalize || false}
linkContent={linkContent || false}
- getFilterLink={disableRowClick ? () => '' : (getFilterLink as (id: string, name: string) => string)}
+ getFilterLink={disableRowClick ? () => '' : (getFilterLink as (id: string, name: string | null) => string)}
disableRowClick={disableRowClick}
hidePercentageInDetails={hidePercentageInDetails}
detailsExtraColumns={detailsExtraColumns}
diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsx
index 35707229e..004e10b50 100644
--- a/web/app/pages/Project/View/ViewProject.tsx
+++ b/web/app/pages/Project/View/ViewProject.tsx
@@ -737,17 +737,17 @@ const ViewProjectContent = () => {
}))
}
- const getVersionFilterLink = (parent: string, version: string, panelType: 'br' | 'os') => {
+ const getVersionFilterLink = (parent: string | null, version: string | null, panelType: 'br' | 'os') => {
const filterParams = new URLSearchParams(searchParams.toString())
if (panelType === 'br') {
// Apply both browser and browser version filters together
- filterParams.set('br', parent)
- filterParams.set('brv', version)
+ filterParams.set('br', parent ?? 'null')
+ filterParams.set('brv', version ?? 'null')
} else if (panelType === 'os') {
// Apply both OS and OS version filters together
- filterParams.set('os', parent)
- filterParams.set('osv', version)
+ filterParams.set('os', parent ?? 'null')
+ filterParams.set('osv', version ?? 'null')
}
return `?${filterParams.toString()}`
@@ -2451,20 +2451,20 @@ const ViewProjectContent = () => {
return daysDiff > 1
}, [period, dateRange, isTouchDevice])
- const getFilterLink = (column: string, value: string): LinkProps['to'] => {
+ const getFilterLink = (column: string, value: string | null): LinkProps['to'] => {
const isFilterActive = filters.findIndex((filter) => filter.column === column && filter.filter === value) >= 0
const newSearchParams = new URLSearchParams(searchParams.toString())
let searchString = ''
if (isFilterActive) {
- newSearchParams.delete(column, value)
- newSearchParams.delete(`!${column}`, value)
- newSearchParams.delete(`~${column}`, value)
- newSearchParams.delete(`^${column}`, value)
+ newSearchParams.delete(column, value ?? 'null')
+ newSearchParams.delete(`!${column}`, value ?? 'null')
+ newSearchParams.delete(`~${column}`, value ?? 'null')
+ newSearchParams.delete(`^${column}`, value ?? 'null')
searchString = newSearchParams.toString()
} else {
- newSearchParams.append(column, value)
+ newSearchParams.append(column, value ?? 'null')
searchString = newSearchParams.toString()
}
@@ -3959,10 +3959,13 @@ const ViewProjectContent = () => {
key={panelsActiveTabs.source}
icon={panelIconMapping.ref}
id={panelsActiveTabs.source}
- getFilterLink={(column: string, value: string) => {
+ getFilterLink={(column: string, value: string | null) => {
if (panelsActiveTabs.source === 'ref') {
// If grouped by name/domain (no refn filter active) -> filter by refn
- return getFilterLink(hasRefNameFilter ? 'ref' : 'refn', value)
+ return getFilterLink(
+ hasRefNameFilter || value === null ? 'ref' : 'refn',
+ value,
+ )
}
return getFilterLink(column, value)
}}
diff --git a/web/app/utils/generic.ts b/web/app/utils/generic.ts
index d1bfbaf16..e38afc4ce 100644
--- a/web/app/utils/generic.ts
+++ b/web/app/utils/generic.ts
@@ -131,7 +131,9 @@ const displayNamesPolyfill = {
of: (name: string) => name,
}
-export const getLocaleDisplayName = (locale: string, language: string): string => {
+export const getLocaleDisplayName = (locale: string | null, language: string): string => {
+ if (!locale) return ''
+
const languageNames = Intl.DisplayNames
? new Intl.DisplayNames([language], { type: 'language' })
: displayNamesPolyfill
diff --git a/web/app/utils/referrers.ts b/web/app/utils/referrers.ts
index d2d8a2740..5ec7842a8 100644
--- a/web/app/utils/referrers.ts
+++ b/web/app/utils/referrers.ts
@@ -1,3 +1,5 @@
+import type { Entry } from '~/lib/models/Entry'
+
import MAP from '../referrers.map.json'
type ReferrerMapping = {
@@ -46,8 +48,9 @@ const matchByMap = (host: string): string | null => {
return null
}
-const getCanonicalRefGroup = (refValue: string | null | undefined): { key: string; name: string } | null => {
+const getCanonicalRefGroup = (refValue: string | null): { key: string; name: string } | null => {
const value = (refValue || '').trim()
+
// If a non-http(s) scheme is present, keep as-is (do not group)
const scheme = value.match(/^([a-z][a-z0-9+.-]*):/i)?.[1]
if (scheme && !/^https?$/i.test(scheme)) {
@@ -62,36 +65,27 @@ const getCanonicalRefGroup = (refValue: string | null | undefined): { key: strin
return { key: plainHost, name: plainHost }
}
-type Entry = { name: string | null; count: number; [k: string]: any }
-
-// Group a list of ref entries by canonical name or hostname.
export const groupRefEntries = (entries: Entry[]): Entry[] => {
- const acc = new Map<string, number>()
+ const acc = new Map<string | null, number>()
+
for (const e of entries) {
- if (e.name === null) {
- acc.set('null', (acc.get('null') || 0) + e.count)
- continue
- }
const group = getCanonicalRefGroup(e.name)
const key = group?.key || e.name
acc.set(key, (acc.get(key) || 0) + e.count)
}
- // Convert map to Entry[]
+
const list: Entry[] = []
+
for (const [key, count] of acc.entries()) {
- if (key === 'null') {
- list.push({ name: null, count })
- } else {
- list.push({ name: key, count })
- }
+ list.push({ name: key, count })
}
- // Sort desc by count
+
return list.sort((a, b) => b.count - a.count)
}
-// Best-effort favicon host derivation for a ref row value (URL, host or mapped group name)
-export const getFaviconHost = (value: string | null | undefined): string | null => {
+export const getFaviconHost = (value: string | null): string | null => {
if (!value) return null
+
// 1) Direct URL -> hostname
try {
const urlObj = new URL(value)
@@ -99,9 +93,11 @@ export const getFaviconHost = (value: string | null | undefined): string | null
} catch {
// not a URL
}
+
// 2) Try to extract hostname from non-URL strings
const hostFromValue = extractHostname(value)
if (hostFromValue) return hostFromValue
+
// 3) If value is a mapped referrer group name, use the first domain-like pattern
const mapping = REFERRER_MAP.find((m) => value.toLowerCase() === m.name.toLowerCase())
if (!mapping) return null