Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Add distinct ID to filters/expanded metrics. Closes #3861
Francis Cao7bb30443a8db
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteExpandedMenu.tsx b/src/app/(main)/websites/[websiteId]/WebsiteExpandedMenu.tsxindex 29c3954f2..4bac4ff6f 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteExpandedMenu.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteExpandedMenu.tsx@@ -169,6 +169,12 @@ export function WebsiteExpandedMenu({path: updateParams({ view: 'hostname' }),icon: <Network />,},+ {+ id: 'distinctId',+ label: formatMessage(labels.distinctId),+ path: updateParams({ view: 'distinctId' }),+ icon: <Tag />,+ },{id: 'tag',label: formatMessage(labels.tag),diff --git a/src/app/(main)/websites/[websiteId]/compare/CompareTables.tsx b/src/app/(main)/websites/[websiteId]/compare/CompareTables.tsxindex 13c05160a..4daf17fc6 100644--- a/src/app/(main)/websites/[websiteId]/compare/CompareTables.tsx+++ b/src/app/(main)/websites/[websiteId]/compare/CompareTables.tsx@@ -93,6 +93,11 @@ export function CompareTables({ websiteId }: { websiteId: string }) {label: formatMessage(labels.hostname),path: renderPath('hostname'),},+ {+ id: 'distinctId',+ label: formatMessage(labels.distinctId),+ path: renderPath('distinctId'),+ },{id: 'tag',label: formatMessage(labels.tags),diff --git a/src/components/hooks/useFields.ts b/src/components/hooks/useFields.tsindex 22a1dcf30..039b71573 100644--- a/src/components/hooks/useFields.ts+++ b/src/components/hooks/useFields.ts@@ -15,6 +15,7 @@ export function useFields() {{ name: 'region', type: 'string', label: formatMessage(labels.region) },{ name: 'city', type: 'string', label: formatMessage(labels.city) },{ name: 'hostname', type: 'string', label: formatMessage(labels.hostname) },+ { name: 'distinctId', type: 'string', label: formatMessage(labels.distinctId) },{ name: 'tag', type: 'string', label: formatMessage(labels.tag) },{ name: 'event', type: 'string', label: formatMessage(labels.event) },];diff --git a/src/components/hooks/useFilterParameters.ts b/src/components/hooks/useFilterParameters.tsindex 540321203..c141a3be8 100644--- a/src/components/hooks/useFilterParameters.ts+++ b/src/components/hooks/useFilterParameters.ts@@ -18,6 +18,7 @@ export function useFilterParameters() {event,tag,hostname,+ distinctId,page,pageSize,search,@@ -42,6 +43,7 @@ export function useFilterParameters() {event,tag,hostname,+ distinctId,search,segment,cohort,@@ -61,6 +63,7 @@ export function useFilterParameters() {event,tag,hostname,+ distinctId,page,pageSize,search,diff --git a/src/components/input/FilterEditForm.tsx b/src/components/input/FilterEditForm.tsxindex 44f43844a..9221e3a2a 100644--- a/src/components/input/FilterEditForm.tsx+++ b/src/components/input/FilterEditForm.tsx@@ -61,7 +61,9 @@ export function FilterEditForm({ websiteId, onChange, onClose }: FilterEditFormPwebsiteId={websiteId}value={currentFilters}onChange={setCurrentFilters}- exclude={excludeFilters ? ['path', 'title', 'hostname', 'tag', 'event'] : []}+ exclude={+ excludeFilters ? ['path', 'title', 'hostname', 'distinctId', 'tag', 'event'] : []+ }/></TabPanel><TabPanel id="segments">diff --git a/src/lib/constants.ts b/src/lib/constants.tsindex bfc80a136..3da177c00 100644--- a/src/lib/constants.ts+++ b/src/lib/constants.ts@@ -55,6 +55,7 @@ export const SESSION_COLUMNS = ['country','city','region',+ 'distinctId',];export const SEGMENT_TYPES = {@@ -69,6 +70,7 @@ export const FILTER_COLUMNS = {referrer: 'referrer_domain',domain: 'referrer_domain',hostname: 'hostname',+ distinctId: 'distinct_id',title: 'page_title',query: 'url_query',os: 'os',diff --git a/src/lib/schema.ts b/src/lib/schema.tsindex 247a89ae6..a3c56a0f1 100644--- a/src/lib/schema.ts+++ b/src/lib/schema.ts@@ -36,6 +36,7 @@ export const filterParams = {city: z.string().optional(),tag: z.string().optional(),hostname: z.string().optional(),+ distinctId: z.string().optional(),language: z.string().optional(),event: z.string().optional(),segment: z.uuid().optional(),@@ -89,6 +90,7 @@ export const fieldsParam = z.enum(['city','tag','hostname',+ 'distinctId','language','event',]);diff --git a/src/queries/sql/events/getEventExpandedMetrics.ts b/src/queries/sql/events/getEventExpandedMetrics.tsindex dec444e8e..86bda8509 100644--- a/src/queries/sql/events/getEventExpandedMetrics.ts+++ b/src/queries/sql/events/getEventExpandedMetrics.ts@@ -72,6 +72,7 @@ async function relationalQuery(${filterQuery}group by name, website_event.session_id, website_event.visit_id) as t+ where name != ''group by nameorder by visitors desc, visits desclimit ${limit}diff --git a/src/queries/sql/sessions/getSessionExpandedMetrics.ts b/src/queries/sql/sessions/getSessionExpandedMetrics.tsindex c8d20d84b..6b85cd452 100644--- a/src/queries/sql/sessions/getSessionExpandedMetrics.ts+++ b/src/queries/sql/sessions/getSessionExpandedMetrics.ts@@ -82,6 +82,7 @@ async function relationalQuery(group by name, website_event.session_id, website_event.visit_id${includeCountry ? ', country' : ''}) as t+ where name != ''group by name${includeCountry ? ', country' : ''}order by visitors desc, visits desc