Skip to content

Commit 05e3235

Browse files
committed
pages/entry-pages/exit-pages v2
1 parent 3e03624 commit 05e3235

9 files changed

Lines changed: 389 additions & 352 deletions

File tree

assets/js/dashboard/router.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import Dashboard from './index'
1111
import SourcesModal from './stats/modals/sources'
1212
import ReferrersDrilldownModal from './stats/modals/referrer-drilldown'
1313
import GoogleKeywordsModal from './stats/modals/google-keywords'
14-
import PagesModal from './stats/modals/pages'
15-
import EntryPagesModal from './stats/modals/entry-pages'
16-
import ExitPagesModal from './stats/modals/exit-pages'
14+
import { PagesDetails } from './stats/pages/pages'
15+
import { EntryPagesDetails } from './stats/pages/entry-pages'
16+
import { ExitPagesDetails } from './stats/pages/exit-pages'
1717
import LocationsModal from './stats/modals/locations-modal'
1818
import BrowsersModal from './stats/modals/devices/browsers-modal'
1919
import BrowserVersionsModal from './stats/modals/devices/browser-versions-modal'
@@ -101,17 +101,17 @@ export const referrersGoogleRoute = {
101101

102102
export const topPagesRoute = {
103103
path: 'pages',
104-
element: <PagesModal />
104+
element: <PagesDetails />
105105
}
106106

107107
export const entryPagesRoute = {
108108
path: 'entry-pages',
109-
element: <EntryPagesModal />
109+
element: <EntryPagesDetails />
110110
}
111111

112112
export const exitPagesRoute = {
113113
path: 'exit-pages',
114-
element: <ExitPagesModal />
114+
element: <ExitPagesDetails />
115115
}
116116

117117
export const countriesRoute = {

assets/js/dashboard/stats/breakdowns.tsx

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,3 +148,60 @@ export function extractMetricValue(
148148
: null
149149
return { metricIndex, value, comparison }
150150
}
151+
152+
const DEFAULT_DETAILED_METRICS = [
153+
'visitors',
154+
'percentage',
155+
'bounce_rate',
156+
'visit_duration'
157+
] as Metric[]
158+
159+
export const getBreakdownMetrics = ({
160+
hasConversionGoalFilter,
161+
isRealtime,
162+
isDetailed = false,
163+
isRevenueAvailable = false,
164+
detailedMetrics = DEFAULT_DETAILED_METRICS
165+
}: {
166+
hasConversionGoalFilter: boolean
167+
isRealtime: boolean
168+
isDetailed?: boolean
169+
isRevenueAvailable?: boolean
170+
detailedMetrics?: Metric[]
171+
}): Metric[] => {
172+
if (hasConversionGoalFilter && isDetailed && isRevenueAvailable) {
173+
return [
174+
'total_visitors',
175+
'visitors',
176+
'group_conversion_rate',
177+
'total_revenue',
178+
'average_revenue'
179+
]
180+
}
181+
if (hasConversionGoalFilter && isDetailed) {
182+
return ['total_visitors', 'visitors', 'group_conversion_rate']
183+
}
184+
if (hasConversionGoalFilter) {
185+
return ['visitors', 'group_conversion_rate']
186+
}
187+
if (isRealtime) {
188+
return ['visitors', 'percentage']
189+
}
190+
if (isDetailed) {
191+
return detailedMetrics
192+
}
193+
return ['visitors', 'percentage']
194+
}
195+
196+
export function addDimensionSearchFilter(
197+
statsQuery: StatsQuery,
198+
dimension: string,
199+
search: string
200+
) {
201+
return addFilter(statsQuery, [
202+
'contains',
203+
dimension,
204+
[search],
205+
{ case_sensitive: false }
206+
] as ApiFilter)
207+
}

assets/js/dashboard/stats/modals/entry-pages.js

Lines changed: 0 additions & 102 deletions
This file was deleted.

assets/js/dashboard/stats/modals/exit-pages.js

Lines changed: 0 additions & 105 deletions
This file was deleted.

0 commit comments

Comments
 (0)