📈 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
Entry / Exit pages support
Blue Mouse568ffc9beb3e
diff --git a/backend/apps/cloud/src/analytics/analytics.service.ts b/backend/apps/cloud/src/analytics/analytics.service.tsindex cea5661d0..a26273ca9 100644--- a/backend/apps/cloud/src/analytics/analytics.service.ts+++ b/backend/apps/cloud/src/analytics/analytics.service.ts@@ -2615,19 +2615,95 @@ export class AnalyticsService {}}+ async getEntryPages(+ subQuery: string,+ paramsData: any,+ ): Promise<{ name: string; count: number }[]> {+ const query = `+ WITH session_first_pages AS (+ SELECT+ psid,+ argMin(pg, created) as entry_page+ ${subQuery}+ GROUP BY psid+ )+ SELECT+ entry_page as name,+ count() as count+ FROM session_first_pages+ WHERE entry_page IS NOT NULL+ GROUP BY entry_page+ ORDER BY count DESC+ `++ const { data } = await clickhouse+ .query({+ query,+ query_params: paramsData.params,+ })+ .then(resultSet => resultSet.json<any>())++ return data || []+ }++ async getExitPages(+ subQuery: string,+ paramsData: any,+ ): Promise<{ name: string; count: number }[]> {+ const query = `+ WITH session_last_pages AS (+ SELECT+ psid,+ argMax(pg, created) as exit_page+ ${subQuery}+ GROUP BY psid+ )+ SELECT+ exit_page as name,+ count() as count+ FROM session_last_pages+ WHERE exit_page IS NOT NULL+ GROUP BY exit_page+ ORDER BY count DESC+ `++ const { data } = await clickhouse+ .query({+ query,+ query_params: paramsData.params,+ })+ .then(resultSet => resultSet.json<any>())++ return data || []+ }+async groupParamsByTimeBucket(subQuery: string,paramsData: any,customEVFilterApplied: boolean,parsedFilters: Array<{ [key: string]: string }>,): Promise<object | void> {- return this.generateParams(- parsedFilters,- subQuery,- customEVFilterApplied,- paramsData,- 'traffic',- )+ const [params, entryPage, exitPage] = await Promise.all([+ this.generateParams(+ parsedFilters,+ subQuery,+ customEVFilterApplied,+ paramsData,+ 'traffic',+ ),+ customEVFilterApplied+ ? Promise.resolve([])+ : this.getEntryPages(subQuery, paramsData),+ customEVFilterApplied+ ? Promise.resolve([])+ : this.getExitPages(subQuery, paramsData),+ ])++ return {+ ...params,+ entryPage,+ exitPage,+ }}async groupChartByTimeBucket(diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsxindex 22cd3209f..b25ca0200 100644--- a/web/app/pages/Project/View/ViewProject.tsx+++ b/web/app/pages/Project/View/ViewProject.tsx@@ -643,7 +643,7 @@ const ViewProject = () => {const [panelsActiveTabs, setPanelsActiveTabs] = useState<{location: 'cc' | 'rg' | 'ct' | 'lc' | 'map'- page: 'pg' | 'host' | 'userFlow'+ page: 'pg' | 'host' | 'userFlow' | 'entryPage' | 'exitPage'device: 'br' | 'os' | 'dv'source: 'ref' | 'so' | 'me' | 'ca' | 'te' | 'co'metadata: 'ce' | 'props'@@ -3980,11 +3980,13 @@ const ViewProject = () => {if (type === 'pg') {const pageTabs = [{ id: 'pg', label: t('project.mapping.pg') },+ { id: 'entryPage', label: t('project.entryPages') },+ { id: 'exitPage', label: t('project.exitPages') },+ { id: 'userFlow', label: t('project.mapping.userFlow') },{id: 'host',label: t('project.mapping.host'),},- { id: 'userFlow', label: t('project.mapping.userFlow') },]return (@@ -4015,7 +4017,7 @@ const ViewProject = () => {onTabChange={(tab) =>setPanelsActiveTabs({...panelsActiveTabs,- page: tab as 'pg' | 'host' | 'userFlow',+ page: tab as 'pg' | 'host' | 'userFlow' | 'entryPage' | 'exitPage',})}activeTabId={panelsActiveTabs.page}diff --git a/web/public/locales/en.json b/web/public/locales/en.jsonindex 89cee4bf9..f384bd70d 100644--- a/web/public/locales/en.json+++ b/web/public/locales/en.json@@ -961,6 +961,8 @@"co": "UTM Content","userFlow": "User flow"},+ "entryPages": "Entry pages",+ "exitPages": "Exit pages","metamapping": {"ev": {"key": "Event key",