🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
feat: include hostname in pages metric for multi-domain sites (#895)
LuRy9934b97166c6
diff --git a/client/src/api/analytics/endpoints/overview.ts b/client/src/api/analytics/endpoints/overview.tsindex 0f85c1595..a23c53ae3 100644--- a/client/src/api/analytics/endpoints/overview.ts+++ b/client/src/api/analytics/endpoints/overview.ts@@ -33,6 +33,7 @@ export type GetOverviewBucketedResponse = {export type MetricResponse = {value: string;title?: string;+ hostname?: string;count: number;percentage: number;pageviews?: number;diff --git a/client/src/app/[site]/main/components/sections/Pages.tsx b/client/src/app/[site]/main/components/sections/Pages.tsxindex 80a6c3fb9..01119203b 100644--- a/client/src/app/[site]/main/components/sections/Pages.tsx+++ b/client/src/app/[site]/main/components/sections/Pages.tsx@@ -49,7 +49,10 @@ export function Pages() {getValue={e => e.value}getKey={e => e.value}getLabel={e => truncateString(e.value, 50) || t("Other")}- getLink={e => `https://${siteMetadata?.domain}${e.value}`}+ getLink={e => {+ const host = e.hostname || siteMetadata?.domain;+ return host ? `https://${host}${e.value}` : "#";+ }}expanded={expanded}close={close}/>@@ -77,7 +80,10 @@ export function Pages() {getValue={e => e.value}getKey={e => e.value}getLabel={e => e.value || t("Other")}- getLink={e => `https://${siteMetadata?.domain}${e.value}`}+ getLink={e => {+ const host = e.hostname || siteMetadata?.domain;+ return host ? `https://${host}${e.value}` : "#";+ }}expanded={expanded}close={close}/>@@ -89,7 +95,10 @@ export function Pages() {getValue={e => e.value}getKey={e => e.value}getLabel={e => e.value || t("Other")}- getLink={e => `https://${siteMetadata?.domain}${e.value}`}+ getLink={e => {+ const host = e.hostname || siteMetadata?.domain;+ return host ? `https://${host}${e.value}` : "#";+ }}expanded={expanded}close={close}/>diff --git a/client/src/app/[site]/pages/components/PageListItem.tsx b/client/src/app/[site]/pages/components/PageListItem.tsxindex 561602ca5..512919a2a 100644--- a/client/src/app/[site]/pages/components/PageListItem.tsx+++ b/client/src/app/[site]/pages/components/PageListItem.tsx@@ -71,7 +71,11 @@ export function PageListItem({ pageData, isLoading = false }: PageListItemProps)const isLoadingTrafficData = isPastMinutesMode ? isLoadingPastMinutes : isLoadingRegular;// External URL for the page- const pageUrl = siteMetadata?.domain ? `https://${siteMetadata.domain}${pageData.value}` : "";+ const pageUrl = pageData.hostname+ ? `https://${pageData.hostname}${pageData.value}`+ : siteMetadata?.domain+ ? `https://${siteMetadata.domain}${pageData.value}`+ : "";// Fetch page metadata using TanStack Queryconst { data: metadata, isLoading: isLoadingMetadata, isError: isMetadataError } = usePageMetadata(pageUrl);diff --git a/client/src/app/[site]/user/[userId]/components/UserTopPages.tsx b/client/src/app/[site]/user/[userId]/components/UserTopPages.tsxindex ce577f139..0bcc38384 100644--- a/client/src/app/[site]/user/[userId]/components/UserTopPages.tsx+++ b/client/src/app/[site]/user/[userId]/components/UserTopPages.tsx@@ -34,7 +34,10 @@ export function UserTopPages({ userId }: { userId: string }) {getValue={e => e.value}getKey={e => e.value}getLabel={e => truncateString(e.value, 50) || "Other"}- getLink={e => `https://${siteMetadata?.domain}${e.value}`}+ getLink={e => {+ const host = e.hostname || siteMetadata?.domain;+ return host ? `https://${host}${e.value}` : "#";+ }}expanded={false}close={close}customFilters={[{ parameter: "user_id", value: [userId], type: "equals" }]}@@ -51,7 +54,10 @@ export function UserTopPages({ userId }: { userId: string }) {getValue={e => e.value}getKey={e => e.value}getLabel={e => truncateString(e.value, 50) || "Other"}- getLink={e => `https://${siteMetadata?.domain}${e.value}`}+ getLink={e => {+ const host = e.hostname || siteMetadata?.domain;+ return host ? `https://${host}${e.value}` : "#";+ }}expanded={false}close={close}customFilters={[{ parameter: "user_id", value: [userId], type: "equals" }]}diff --git a/server/src/api/analytics/getMetric.ts b/server/src/api/analytics/getMetric.tsindex 56d875444..4dada6b52 100644--- a/server/src/api/analytics/getMetric.ts+++ b/server/src/api/analytics/getMetric.ts@@ -20,6 +20,8 @@ type GetMetricResponse = {value: string;// title is only used for pathnametitle?: string;+ // hostname from ClickHouse events data+ hostname?: string;// count means sessions where this page was the entry/exitcount: number;percentage: number;@@ -35,6 +37,7 @@ type MetricItem = {value: string;title?: string;pathname?: string;+ hostname?: string;count: number;percentage: number;pageviews?: number;@@ -209,6 +212,7 @@ const getQuery = (request: FastifyRequest<GetMetricRequest>, isCountQuery: booleSELECTsession_id,pathname,+ hostname,timestamp,pageviews_in_session,leadInFrame(timestamp) OVER (PARTITION BY session_id ORDER BY timestamp ROWS BETWEEN CURRENT ROW AND 1 FOLLOWING) as next_timestamp,@@ -219,6 +223,7 @@ const getQuery = (request: FastifyRequest<GetMetricRequest>, isCountQuery: booleSELECTsession_id,pathname,+ hostname,timestamp,next_timestamp,row_num,@@ -234,6 +239,7 @@ const getQuery = (request: FastifyRequest<GetMetricRequest>, isCountQuery: boolePathStats AS (SELECTpathname,+ anyHeavy(hostname) as top_hostname,count(DISTINCT session_id) as unique_sessions,count() as visits,avg(if(time_diff_seconds < 0, 0, if(time_diff_seconds > 1800, 1800, time_diff_seconds))) as avg_time_on_page_seconds,@@ -255,6 +261,7 @@ const getQuery = (request: FastifyRequest<GetMetricRequest>, isCountQuery: booleWITH ${baseCteQuery}SELECTpathname as value,+ top_hostname as hostname,unique_sessions as count,round((unique_sessions / sum(unique_sessions) OVER ()) * 100, 2) as percentage,visits as pageviews,@@ -284,6 +291,7 @@ const getQuery = (request: FastifyRequest<GetMetricRequest>, isCountQuery: booleSELECTe.session_id,e.pathname,+ e.hostname,e.timestamp,spc.pageviews_in_session,leadInFrame(e.timestamp) OVER (PARTITION BY e.session_id ORDER BY e.timestamp ROWS BETWEEN CURRENT ROW AND 1 FOLLOWING) as next_timestamp@@ -299,6 +307,7 @@ const getQuery = (request: FastifyRequest<GetMetricRequest>, isCountQuery: booleSELECTsession_id,pathname,+ hostname,timestamp,next_timestamp,pageviews_in_session,@@ -308,6 +317,7 @@ const getQuery = (request: FastifyRequest<GetMetricRequest>, isCountQuery: boolePathStats AS (SELECTpathname,+ anyHeavy(hostname) as top_hostname,count() as visits,count(DISTINCT session_id) as unique_sessions,avg(if(time_diff_seconds < 0, 0, if(time_diff_seconds > 1800, 1800, time_diff_seconds))) as avg_time_on_page_seconds,@@ -326,6 +336,7 @@ const getQuery = (request: FastifyRequest<GetMetricRequest>, isCountQuery: booleWITH ${baseCteQuery}SELECTpathname as value,+ top_hostname as hostname,unique_sessions as count,round((unique_sessions / sum(unique_sessions) OVER ()) * 100, 2) as percentage,visits as pageviews,