diff --git a/assets/js/dashboard/stats/modals/referrer-drilldown.js b/assets/js/dashboard/stats/modals/referrer-drilldown.js index e98b48c6c..5dfa02dff 100644 --- a/assets/js/dashboard/stats/modals/referrer-drilldown.js +++ b/assets/js/dashboard/stats/modals/referrer-drilldown.js @@ -3,7 +3,7 @@ import { Link, withRouter } from 'react-router-dom' import Modal from './modal' import * as api from '../../api' -import numberFormatter from '../../number-formatter' +import numberFormatter, {durationFormatter} from '../../number-formatter' import {parseQuery, toHuman} from '../../query' import {formatFullDate} from '../../date' @@ -21,14 +21,14 @@ class ReferrerDrilldownModal extends React.Component { api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/goal/referrers/${this.props.match.params.referrer}`, this.state.query, {limit: 100}) .then((res) => this.setState({loading: false, referrers: res.referrers, totalVisitors: res.total_visitors})) } else { - const include = this.showBounceRate() ? 'bounce_rate' : null + const include = this.showExtra() ? 'bounce_rate,visit_duration' : null api.get(`/api/stats/${encodeURIComponent(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() { + showExtra() { return this.state.query.period !== 'realtime' && !this.state.query.filters.goal } @@ -40,6 +40,14 @@ class ReferrerDrilldownModal extends React.Component { } } + formatDuration(referrer) { + if (typeof(referrer.visit_duration) === 'number') { + return durationFormatter(referrer.visit_duration) + } else { + return '-' + } + } + renderReferrerName(name) { if (name) { return {name} @@ -88,7 +96,8 @@ class ReferrerDrilldownModal extends React.Component { {numberFormatter(referrer.count)} - {this.showBounceRate() && {this.formatBounceRate(referrer)} } + {this.showExtra() && {this.formatBounceRate(referrer)} } + {this.showExtra() && {this.formatDuration(referrer)} } ) } else { @@ -98,7 +107,8 @@ class ReferrerDrilldownModal extends React.Component { { this.renderReferrerName(referrer.name) } {numberFormatter(referrer.count)} - {this.showBounceRate() && {this.formatBounceRate(referrer)} } + {this.showExtra() && {this.formatBounceRate(referrer)} } + {this.showExtra() && {this.formatDuration(referrer)} } ) } @@ -132,7 +142,8 @@ class ReferrerDrilldownModal extends React.Component { Referrer Visitors - {this.showBounceRate() && Bounce rate} + {this.showExtra() && Bounce rate} + {this.showExtra() && Visit duration} diff --git a/lib/plausible/stats/clickhouse.ex b/lib/plausible/stats/clickhouse.ex index a9e757f1f..90525dd72 100644 --- a/lib/plausible/stats/clickhouse.ex +++ b/lib/plausible/stats/clickhouse.ex @@ -258,15 +258,14 @@ defmodule Plausible.Stats.Clickhouse do def top_referrers(site, query, limit, include) do q = - from(e in base_session_query(site, query), - group_by: e.referrer_source, - where: e.referrer_source != "", + from(s in base_session_query(site, query), + group_by: s.referrer_source, + where: s.referrer_source != "", order_by: [desc: fragment("count")], limit: ^limit ) - q = - if "bounce_rate" in include do + q = if "bounce_rate" in include do from( s in q, select: @@ -279,8 +278,8 @@ defmodule Plausible.Stats.Clickhouse do from( s in q, select: - {fragment("? as name", s.referrer_source), fragment("any(?) as url", s.referrer), - fragment("uniq(user_id) as count")} + {fragment("? as name", s.referrer_source), fragment("any(?) as url", s.referrer), + fragment("uniq(user_id) as count")} ) end @@ -321,27 +320,29 @@ defmodule Plausible.Stats.Clickhouse do end def referrer_drilldown(site, query, referrer, include \\ []) do - referring_urls = - Clickhouse.all( - from e in base_session_query(site, query), - select: {fragment("? as name", e.referrer), fragment("uniq(user_id) as count")}, - group_by: e.referrer, - where: e.referrer_source == ^referrer, - order_by: [desc: fragment("count")], - limit: 100 - ) - - referring_urls = - if "bounce_rate" in include do - bounce_rates = bounce_rates_by_referring_url(site, query) + q = from( + s in base_session_query(site, query), + group_by: s.referrer, + where: s.referrer_source == ^referrer, + order_by: [desc: fragment("count")], + limit: 100 + ) - Enum.map(referring_urls, fn url -> - Map.put(url, "bounce_rate", bounce_rates[url["name"]]) - end) + q = if "bounce_rate" in include do + from( + s in q, + select: + {fragment("? as name", s.referrer), + fragment("uniq(user_id) as count"), + fragment("round(sum(is_bounce * sign) / sum(sign) * 100) as bounce_rate"), + fragment("round(avg(duration * sign)) as visit_duration")} + ) else - referring_urls + from(s in q, select: {fragment("? as name", s.referrer), fragment("uniq(user_id) as count")}) end + referring_urls = Clickhouse.all(q) + if referrer == "Twitter" do urls = Enum.map(referring_urls, & &1["name"]) @@ -379,25 +380,6 @@ defmodule Plausible.Stats.Clickhouse do ) end - defp bounce_rates_by_referring_url(site, query) do - {first_datetime, last_datetime} = utc_boundaries(query, site.timezone) - - Clickhouse.all( - from s in "sessions", - select: - {s.referrer, fragment("count(*) as total"), - fragment("round(sum(is_bounce * sign) / sum(sign) * 100) as bounce_rate")}, - where: s.domain == ^site.domain, - where: s.start >= ^first_datetime and s.start < ^last_datetime, - where: s.referrer != "", - group_by: s.referrer, - order_by: [desc: fragment("total")], - limit: 100 - ) - |> Enum.map(fn row -> {row["referrer"], row["bounce_rate"]} end) - |> Enum.into(%{}) - end - def top_pages(site, %Query{period: "realtime"} = query, limit, _include) do Clickhouse.all( from s in base_session_query(site, query), diff --git a/test/plausible_web/controllers/api/stats_controller/referrers_test.exs b/test/plausible_web/controllers/api/stats_controller/referrers_test.exs index 551b26567..255f93f84 100644 --- a/test/plausible_web/controllers/api/stats_controller/referrers_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/referrers_test.exs @@ -89,17 +89,17 @@ defmodule PlausibleWeb.Api.StatsController.ReferrersTest do } end - test "calculates bounce rate for referrer urls", %{conn: conn, site: site} do + test "calculates bounce rate and visit duration for referrer urls", %{conn: conn, site: site} do conn = get( conn, - "/api/stats/#{site.domain}/referrers/10words?period=day&date=2019-01-01&include=bounce_rate" + "/api/stats/#{site.domain}/referrers/10words?period=day&date=2019-01-01&include=bounce_rate,visit_duration" ) assert json_response(conn, 200) == %{ "total_visitors" => 2, "referrers" => [ - %{"name" => "10words.com/page1", "count" => 2, "bounce_rate" => 50.0} + %{"name" => "10words.com/page1", "count" => 2, "bounce_rate" => 50.0, "visit_duration" => 50.0} ] } end