diff --git a/assets/js/dashboard/stats/modals/referrers.js b/assets/js/dashboard/stats/modals/referrers.js index 4dab26161..053fa8792 100644 --- a/assets/js/dashboard/stats/modals/referrers.js +++ b/assets/js/dashboard/stats/modals/referrers.js @@ -44,6 +44,7 @@ class ReferrersModal extends React.Component { return ( + { referrer.name } {numberFormatter(referrer.count)} diff --git a/assets/js/dashboard/stats/referrers.js b/assets/js/dashboard/stats/referrers.js index a35db8c6c..e2d43dec1 100644 --- a/assets/js/dashboard/stats/referrers.js +++ b/assets/js/dashboard/stats/referrers.js @@ -39,7 +39,10 @@ export default class Referrers extends React.Component {
- { referrer.name } + + + { referrer.name } +
{numberFormatter(referrer.count)}
diff --git a/lib/plausible/stats/stats.ex b/lib/plausible/stats/stats.ex index 0011acb08..e8f838978 100644 --- a/lib/plausible/stats/stats.ex +++ b/lib/plausible/stats/stats.ex @@ -154,22 +154,26 @@ defmodule Plausible.Stats do def top_referrers_for_goal(site, query, limit \\ 5) do Repo.all(from e in base_query(site, query), - select: %{name: e.initial_referrer_source, count: count(e.user_id, :distinct)}, + select: %{name: e.initial_referrer_source, url: min(e.initial_referrer), count: count(e.user_id, :distinct)}, group_by: e.initial_referrer_source, where: not is_nil(e.initial_referrer_source), - order_by: [desc: 2], + order_by: [desc: 3], limit: ^limit - ) + ) |> Enum.map(fn ref -> + Map.update(ref, :url, nil, fn url -> url && URI.parse("http://" <> url).host end) + end) end def top_referrers(site, query, limit \\ 5, include \\ []) do referrers = Repo.all(from e in base_query(site, query), - select: %{name: e.referrer_source, count: count(e.user_id, :distinct)}, + select: %{name: e.referrer_source, url: min(e.referrer), count: count(e.user_id, :distinct)}, group_by: e.referrer_source, where: not is_nil(e.referrer_source), - order_by: [desc: 2], + order_by: [desc: 3], limit: ^limit - ) + ) |> Enum.map(fn ref -> + Map.update(ref, :url, nil, fn url -> url && URI.parse("http://" <> url).host end) + end) if "bounce_rate" in include do bounce_rates = bounce_rates_by_referrer_source(site, query, Enum.map(referrers, fn ref -> ref[:name] end)) diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.ex index 005318d6b..0bdaf182f 100644 --- a/lib/plausible_web/controllers/api/stats_controller.ex +++ b/lib/plausible_web/controllers/api/stats_controller.ex @@ -77,7 +77,7 @@ defmodule PlausibleWeb.Api.StatsController do site = conn.assigns[:site] query = Stats.Query.from(site.timezone, params) - json(conn, Stats.top_referrers_for_goal(site, query, params["limit"] || 5)) + json(conn, Stats.top_referrers_for_goal(site, query, params["limit"] || 9)) end @google_api Application.fetch_env!(:plausible, :google_api) 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 0e2857734..7c9196429 100644 --- a/test/plausible_web/controllers/api/stats_controller/referrers_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/referrers_test.exs @@ -14,8 +14,8 @@ defmodule PlausibleWeb.Api.StatsController.ReferrersTest do conn = get(conn, "/api/stats/#{site.domain}/referrers?period=day&date=2019-01-01") assert json_response(conn, 200) == [ - %{"name" => "Google", "count" => 2}, - %{"name" => "Bing", "count" => 1}, + %{"name" => "Google", "count" => 2, "url" => nil}, + %{"name" => "Bing", "count" => 1, "url" => nil}, ] end @@ -30,8 +30,8 @@ defmodule PlausibleWeb.Api.StatsController.ReferrersTest do conn = get(conn, "/api/stats/#{site.domain}/referrers?period=day&date=2019-01-01&include=bounce_rate") assert json_response(conn, 200) == [ - %{"name" => "Google", "count" => 2, "bounce_rate" => 50}, - %{"name" => "Bing", "count" => 1, "bounce_rate" => nil}, + %{"name" => "Google", "count" => 2, "bounce_rate" => 50, "url" => nil}, + %{"name" => "Bing", "count" => 1, "bounce_rate" => nil, "url" => nil}, ] end end @@ -48,7 +48,7 @@ defmodule PlausibleWeb.Api.StatsController.ReferrersTest do conn = get(conn, "/api/stats/#{site.domain}/goal/referrers?period=day&date=2019-01-01&filters=#{filters}") assert json_response(conn, 200) == [ - %{"name" => "Google", "count" => 2}, + %{"name" => "Google", "count" => 2, "url" => nil}, ] end @@ -61,7 +61,7 @@ defmodule PlausibleWeb.Api.StatsController.ReferrersTest do conn = get(conn, "/api/stats/#{site.domain}/goal/referrers?period=day&date=2019-01-01&filters=#{filters}") assert json_response(conn, 200) == [ - %{"name" => "Google", "count" => 2}, + %{"name" => "Google", "count" => 2, "url" => nil}, ] end end