Skip to content

Show revenue data in all breakdowns #5767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Show revenue data in all breakdowns #5767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d1c044
Include revenue data for all detailed API responses except entry/exit…
zoldar Sep 30, 2025
386620e
Expose revenue data in all brakdown modals except entry/exit pages
zoldar Sep 30, 2025
7a47f53
Add revenue metrics to breakdown response only on EE
zoldar Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/js/dashboard/stats/modals/devices/browser-versions-modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function BrowserVersionsModal() {
<Modal>
<BreakdownModal
reportInfo={reportInfo}
metrics={chooseMetrics(query)}
metrics={chooseMetrics(query, site)}
getFilterInfo={getFilterInfo}
addSearchFilter={addSearchFilter}
renderIcon={renderIcon}
Expand Down
2 changes: 1 addition & 1 deletion assets/js/dashboard/stats/modals/devices/browsers-modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function BrowsersModal() {
<Modal>
<BreakdownModal
reportInfo={reportInfo}
metrics={chooseMetrics(query)}
metrics={chooseMetrics(query, site)}
getFilterInfo={getFilterInfo}
addSearchFilter={addSearchFilter}
renderIcon={renderIcon}
Expand Down
12 changes: 9 additions & 3 deletions assets/js/dashboard/stats/modals/devices/choose-metrics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,24 @@ import {
hasConversionGoalFilter,
isRealTimeDashboard
} from '../../../util/filters'
import { revenueAvailable } from '../../../query'
import * as metrics from '../../reports/metrics'

export default function chooseMetrics(query) {
export default function chooseMetrics(query, site) {
/*global BUILD_EXTRA*/
const showRevenueMetrics = BUILD_EXTRA && revenueAvailable(query, site)

if (hasConversionGoalFilter(query)) {
return [
metrics.createTotalVisitors(),
metrics.createVisitors({
renderLabel: (_query) => 'Conversions',
width: 'w-28'
}),
metrics.createConversionRate()
]
metrics.createConversionRate(),
showRevenueMetrics && metrics.createTotalRevenue(),
showRevenueMetrics && metrics.createAverageRevenue()
].filter((metric) => !!metric)
}

if (isRealTimeDashboard(query)) {
Expand Down
2 changes: 1 addition & 1 deletion assets/js/dashboard/stats/modals/devices/operating-system-versions-modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function OperatingSystemVersionsModal() {
<Modal>
<BreakdownModal
reportInfo={reportInfo}
metrics={chooseMetrics(query)}
metrics={chooseMetrics(query, site)}
getFilterInfo={getFilterInfo}
addSearchFilter={addSearchFilter}
renderIcon={renderIcon}
Expand Down
2 changes: 1 addition & 1 deletion assets/js/dashboard/stats/modals/devices/operating-systems-modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function OperatingSystemsModal() {
<Modal>
<BreakdownModal
reportInfo={reportInfo}
metrics={chooseMetrics(query)}
metrics={chooseMetrics(query, site)}
getFilterInfo={getFilterInfo}
addSearchFilter={addSearchFilter}
renderIcon={renderIcon}
Expand Down
2 changes: 1 addition & 1 deletion assets/js/dashboard/stats/modals/devices/screen-sizes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function ScreenSizesModal() {
<Modal>
<BreakdownModal
reportInfo={reportInfo}
metrics={chooseMetrics(query)}
metrics={chooseMetrics(query, site)}
getFilterInfo={getFilterInfo}
searchEnabled={false}
renderIcon={renderIcon}
Expand Down
11 changes: 8 additions & 3 deletions assets/js/dashboard/stats/modals/locations-modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import * as metrics from '../reports/metrics'
import * as url from '../../util/url'
import { useQueryContext } from '../../query-context'
import { useSiteContext } from '../../site-context'
import { addFilter } from '../../query'
import { addFilter, revenueAvailable } from '../../query'
import { SortDirection } from '../../hooks/use-order-by'

const VIEWS = {
Expand Down Expand Up @@ -38,6 +38,9 @@ function LocationsModal({ currentView }) {
const { query } = useQueryContext()
const site = useSiteContext()

/*global BUILD_EXTRA*/
const showRevenueMetrics = BUILD_EXTRA && revenueAvailable(query, site)

let reportInfo = VIEWS[currentView]
reportInfo = {
...reportInfo,
Expand Down Expand Up @@ -75,8 +78,10 @@ function LocationsModal({ currentView }) {
renderLabel: (_query) => 'Conversions',
width: 'w-28'
}),
metrics.createConversionRate()
]
metrics.createConversionRate(),
showRevenueMetrics && metrics.createTotalRevenue(),
showRevenueMetrics && metrics.createAverageRevenue()
].filter((metric) => !!metric)
}

if (query.period === 'realtime') {
Expand Down
11 changes: 8 additions & 3 deletions assets/js/dashboard/stats/modals/pages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
hasConversionGoalFilter,
isRealTimeDashboard
} from '../../util/filters'
import { addFilter } from '../../query'
import { addFilter, revenueAvailable } from '../../query'
import BreakdownModal from './breakdown-modal'
import * as metrics from '../reports/metrics'
import * as url from '../../util/url'
Expand All @@ -16,6 +16,9 @@ function PagesModal() {
const { query } = useQueryContext()
const site = useSiteContext()

/*global BUILD_EXTRA*/
const showRevenueMetrics = BUILD_EXTRA && revenueAvailable(query, site)

const reportInfo = {
title: 'Top Pages',
dimension: 'page',
Expand Down Expand Up @@ -54,8 +57,10 @@ function PagesModal() {
renderLabel: (_query) => 'Conversions',
width: 'w-28'
}),
metrics.createConversionRate()
]
metrics.createConversionRate(),
showRevenueMetrics && metrics.createTotalRevenue(),
showRevenueMetrics && metrics.createAverageRevenue()
].filter((metric) => !!metric)
}

if (isRealTimeDashboard(query)) {
Expand Down
11 changes: 8 additions & 3 deletions assets/js/dashboard/stats/modals/referrer-drilldown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
import BreakdownModal from './breakdown-modal'
import * as metrics from '../reports/metrics'
import * as url from '../../util/url'
import { addFilter } from '../../query'
import { addFilter, revenueAvailable } from '../../query'
import { useQueryContext } from '../../query-context'
import { useSiteContext } from '../../site-context'
import { SortDirection } from '../../hooks/use-order-by'
Expand All @@ -19,6 +19,9 @@ function ReferrerDrilldownModal() {
const { query } = useQueryContext()
const site = useSiteContext()

/*global BUILD_EXTRA*/
const showRevenueMetrics = BUILD_EXTRA && revenueAvailable(query, site)

const reportInfo = {
title: 'Referrer Drilldown',
dimension: 'referrer',
Expand Down Expand Up @@ -60,8 +63,10 @@ function ReferrerDrilldownModal() {
renderLabel: (_query) => 'Conversions',
width: 'w-28'
}),
metrics.createConversionRate()
]
metrics.createConversionRate(),
showRevenueMetrics && metrics.createTotalRevenue(),
showRevenueMetrics && metrics.createAverageRevenue()
].filter((metric) => !!metric)
}

if (isRealTimeDashboard(query)) {
Expand Down
11 changes: 8 additions & 3 deletions assets/js/dashboard/stats/modals/sources.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
import BreakdownModal from './breakdown-modal'
import * as metrics from '../reports/metrics'
import * as url from '../../util/url'
import { addFilter } from '../../query'
import { addFilter, revenueAvailable } from '../../query'
import { useQueryContext } from '../../query-context'
import { useSiteContext } from '../../site-context'
import { SortDirection } from '../../hooks/use-order-by'
Expand Down Expand Up @@ -91,6 +91,9 @@ function SourcesModal({ currentView }) {
const { query } = useQueryContext()
const site = useSiteContext()

/*global BUILD_EXTRA*/
const showRevenueMetrics = BUILD_EXTRA && revenueAvailable(query, site)

let reportInfo = VIEWS[currentView].info
reportInfo = {
...reportInfo,
Expand Down Expand Up @@ -127,8 +130,10 @@ function SourcesModal({ currentView }) {
renderLabel: (_query) => 'Conversions',
width: 'w-28'
}),
metrics.createConversionRate()
]
metrics.createConversionRate(),
showRevenueMetrics && metrics.createTotalRevenue(),
showRevenueMetrics && metrics.createAverageRevenue()
].filter((metric) => !!metric)
}

if (isRealTimeDashboard(query)) {
Expand Down
Loading
Loading