From fc9cc6474517f482e8b6b73d669976672ee55d11 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Tue, 28 Jul 2020 10:29:47 +0300 Subject: [PATCH] Render external links for referrer drilldown modal --- .../stats/modals/referrer-drilldown.js | 24 +++++++++++++++---- lib/plausible/stats/clickhouse.ex | 6 ++--- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/assets/js/dashboard/stats/modals/referrer-drilldown.js b/assets/js/dashboard/stats/modals/referrer-drilldown.js index 5dfa02dff..b4bb01cc8 100644 --- a/assets/js/dashboard/stats/modals/referrer-drilldown.js +++ b/assets/js/dashboard/stats/modals/referrer-drilldown.js @@ -48,12 +48,26 @@ class ReferrerDrilldownModal extends React.Component { } } + renderExternalLink(name) { + return ( + + + + ) + } + renderReferrerName(name) { - if (name) { - return {name} - } else { - return '(no referrer)' - } + const query = new URLSearchParams(window.location.search) + query.set('referrer', name) + + return ( + + + { name === '' ? '(no referrer)' : name } + + { this.renderExternalLink(name) } + + ) } renderTweet(tweet, index) { diff --git a/lib/plausible/stats/clickhouse.ex b/lib/plausible/stats/clickhouse.ex index 4b21edd47..b23576e4d 100644 --- a/lib/plausible/stats/clickhouse.ex +++ b/lib/plausible/stats/clickhouse.ex @@ -448,7 +448,7 @@ defmodule Plausible.Stats.Clickhouse do def countries(site, query) do Clickhouse.all( - from e in base_session_query(site, query), + from e in base_query(site, query), select: {fragment("? as name", e.country_code), fragment("uniq(user_id) as count")}, group_by: e.country_code, where: e.country_code != "\0\0", @@ -466,7 +466,7 @@ defmodule Plausible.Stats.Clickhouse do def browsers(site, query, limit \\ 5) do Clickhouse.all( - from e in base_session_query(site, query), + from e in base_query(site, query), select: {fragment("? as name", e.browser), fragment("uniq(user_id) as count")}, group_by: e.browser, where: e.browser != "", @@ -478,7 +478,7 @@ defmodule Plausible.Stats.Clickhouse do def operating_systems(site, query, limit \\ 5) do Clickhouse.all( - from e in base_session_query(site, query), + from e in base_query(site, query), select: {fragment("? as name", e.operating_system), fragment("uniq(user_id) as count")}, group_by: e.operating_system, where: e.operating_system != "",