diff --git a/assets/js/dashboard/stats/modals/pages.js b/assets/js/dashboard/stats/modals/pages.js index 503f98d63..1830127bb 100644 --- a/assets/js/dashboard/stats/modals/pages.js +++ b/assets/js/dashboard/stats/modals/pages.js @@ -9,16 +9,23 @@ import {parseQuery} from '../../query' class PagesModal extends React.Component { constructor(props) { super(props) - this.state = {loading: true} + this.state = { + loading: true, + query: parseQuery(props.location.search, props.site) + } } componentDidMount() { - const query = parseQuery(this.props.location.search, this.props.site) + const include = this.showBounceRate() ? 'bounce_rate' : null - api.get(`/api/stats/${this.props.site.domain}/pages`, query, {limit: 100, include: 'bounce_rate'}) + api.get(`/api/stats/${this.props.site.domain}/pages`, this.state.query, {limit: 100, include: include}) .then((res) => this.setState({loading: false, pages: res})) } + showBounceRate() { + return !this.state.query.filters.goal + } + formatBounceRate(page) { if (page.bounce_rate) { return page.bounce_rate + '%' @@ -32,7 +39,7 @@ class PagesModal extends React.Component { {page.name} {numberFormatter(page.count)} - {this.formatBounceRate(page)} + {this.showBounceRate() && {this.formatBounceRate(page)} } ) } @@ -56,7 +63,7 @@ class PagesModal extends React.Component { Page url Pageviews - Bounce rate + {this.showBounceRate() && Bounce rate} diff --git a/assets/js/dashboard/stats/modals/referrer-drilldown.js b/assets/js/dashboard/stats/modals/referrer-drilldown.js index 2d4e5a959..8ddb06851 100644 --- a/assets/js/dashboard/stats/modals/referrer-drilldown.js +++ b/assets/js/dashboard/stats/modals/referrer-drilldown.js @@ -16,10 +16,16 @@ class ReferrerDrilldownModal extends React.Component { } componentDidMount() { - api.get(`/api/stats/${this.props.site.domain}/referrers/${this.props.match.params.referrer}`, this.state.query, {limit: 100, include: 'bounce_rate'}) + const include = this.showBounceRate() ? 'bounce_rate' : null + + api.get(`/api/stats/${this.props.site.domain}/referrers/${this.props.match.params.referrer}`, this.state.query, {limit: 100, include: include}) .then((res) => this.setState({loading: false, referrers: res.referrers, totalVisitors: res.total_visitors})) } + showBounceRate() { + return !this.state.query.filters.goal + } + formatBounceRate(ref) { if (ref.bounce_rate) { return ref.bounce_rate + '%' @@ -35,7 +41,7 @@ class ReferrerDrilldownModal extends React.Component { { referrer.name } {numberFormatter(referrer.count)} - {this.formatBounceRate(referrer)} + {this.showBounceRate() && {this.formatBounceRate(referrer)} } ) } @@ -70,7 +76,7 @@ class ReferrerDrilldownModal extends React.Component { Referrer Visitors - Bounce rate + {this.showBounceRate() && Bounce rate}