Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Move hostname filter appending to Breakdown module (#3998)
hq139fdbb3a672a
diff --git a/lib/plausible/stats/breakdown.ex b/lib/plausible/stats/breakdown.exindex 110966c884..3b5976d224 100644--- a/lib/plausible/stats/breakdown.ex+++ b/lib/plausible/stats/breakdown.ex@@ -195,6 +195,7 @@ defmodule Plausible.Stats.Breakdown doenddef breakdown(site, query, property, metrics, pagination, opts) do+ query = maybe_update_breakdown_filters(property, query)if !Keyword.get(opts, :skip_tracing), do: trace(query, property, metrics)metrics_to_select = Util.maybe_add_visitors_metric(metrics) -- @computed_metrics@@ -212,6 +213,32 @@ defmodule Plausible.Stats.Breakdown doendend+ defp maybe_update_breakdown_filters("visit:source", query) do+ update_hostname(query, "visit:entry_page_hostname")+ end++ defp maybe_update_breakdown_filters("visit:entry_page", query) do+ update_hostname(query, "visit:entry_page_hostname")+ end++ defp maybe_update_breakdown_filters("visit:exit_page", query) do+ update_hostname(query, "visit:exit_page_hostname")+ end++ defp maybe_update_breakdown_filters(_, query) do+ query+ end++ defp update_hostname(query, visit_prop) do+ case query.filters["event:hostname"] do+ nil ->+ query++ some ->+ Plausible.Stats.Query.put_filter(query, visit_prop, some)+ end+ end+# Backwards compatibilitydefp breakdown_table(%Query{experimental_reduced_joins?: false}, _, _), do: :sessiondiff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.exindex 1a5735c8aa..3d90f84e30 100644--- a/lib/plausible_web/controllers/api/stats_controller.ex+++ b/lib/plausible_web/controllers/api/stats_controller.ex@@ -458,13 +458,6 @@ defmodule PlausibleWeb.Api.StatsController doquery = Query.from(site, params)pagination = parse_pagination(params)- query =- if query.filters["event:hostname"] do- Query.put_filter(query, "visit:entry_page_hostname", query.filters["event:hostname"])- else- query- end-extra_metrics =if params["detailed"], do: [:bounce_rate, :visit_duration], else: []@@ -770,13 +763,6 @@ defmodule PlausibleWeb.Api.StatsController dopagination = parse_pagination(params)metrics = breakdown_metrics(query, [:visits, :visit_duration])- query =- if query.filters["event:hostname"] do- Query.put_filter(query, "visit:entry_page_hostname", query.filters["event:hostname"])- else- query- end-entry_pages =Stats.breakdown(site, query, "visit:entry_page", metrics, pagination)|> transform_keys(%{entry_page: :name})@@ -807,13 +793,6 @@ defmodule PlausibleWeb.Api.StatsController do{limit, page} = parse_pagination(params)metrics = breakdown_metrics(query, [:visits])- query =- if query.filters["event:hostname"] do- Query.put_filter(query, "visit:exit_page_hostname", query.filters["event:hostname"])- else- query- end-exit_pages =Stats.breakdown(site, query, "visit:exit_page", metrics, {limit, page})|> add_exit_rate(site, query, limit)