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
Fix breakdown comparisons breaking after pagination (#4951)
Karl-Aksel Puulmann50eef62c3fc9
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex b742672843..c7e7673b20 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -24,6 +24,7 @@ All notable changes to this project will be documented in this file.- Fix typo on login screen- Fix Direct / None details modal not opening- Fix year over year comparisons being offset by a day for leap years+- Breakdown modals now display correct comparison values instead of 0 after pagination## v2.1.4 - 2024-10-08diff --git a/lib/plausible/stats/comparisons.ex b/lib/plausible/stats/comparisons.exindex 959218afe2..dff2129317 100644--- a/lib/plausible/stats/comparisons.ex+++ b/lib/plausible/stats/comparisons.ex@@ -75,11 +75,15 @@ defmodule Plausible.Stats.Comparisons dodefp add_query_filters(query, []), do: querydefp add_query_filters(query, [filter]) do- Query.add_filter(query, [:ignore_in_totals_query, filter])+ query+ |> Query.add_filter([:ignore_in_totals_query, filter])+ |> Query.set(pagination: nil)enddefp add_query_filters(query, filters) do- Query.add_filter(query, [:ignore_in_totals_query, [:or, filters]])+ query+ |> Query.add_filter([:ignore_in_totals_query, [:or, filters]])+ |> Query.set(pagination: nil)enddefp build_comparison_filter(%{dimensions: dimension_labels}, query) dodiff --git a/test/plausible_web/controllers/api/external_stats_controller/query_comparisons_test.exs b/test/plausible_web/controllers/api/external_stats_controller/query_comparisons_test.exsindex 9280aa8d1e..226659297b 100644--- a/test/plausible_web/controllers/api/external_stats_controller/query_comparisons_test.exs+++ b/test/plausible_web/controllers/api/external_stats_controller/query_comparisons_test.exs@@ -125,7 +125,10 @@ defmodule PlausibleWeb.Api.ExternalStatsController.QueryComparisonsTest dobuild(:pageview, browser: "Chrome", timestamp: ~N[2021-01-01 00:00:00]),build(:pageview, browser: "Chrome", timestamp: ~N[2021-01-07 00:00:00]),build(:pageview, browser: "Chrome", timestamp: ~N[2021-01-07 00:00:00]),- build(:pageview, browser: "Firefox", timestamp: ~N[2021-01-07 00:00:00])+ build(:pageview, browser: "Chrome", timestamp: ~N[2021-01-07 00:00:00]),+ build(:pageview, browser: "Firefox", timestamp: ~N[2021-01-07 00:00:00]),+ build(:pageview, browser: "Firefox", timestamp: ~N[2021-01-07 00:00:00]),+ build(:pageview, browser: "Safari", timestamp: ~N[2021-01-08 00:00:00])])conn =@@ -143,20 +146,44 @@ defmodule PlausibleWeb.Api.ExternalStatsController.QueryComparisonsTest doassert json_response(conn, 200)["results"] == [%{"dimensions" => ["Chrome"],- "metrics" => [2, 66.7],+ "metrics" => [3, 50.0],"comparison" => %{"dimensions" => ["Chrome"],"metrics" => [1, 12.5],- "change" => [100, 434]+ "change" => [200, 300]}},%{"dimensions" => ["Firefox"],- "metrics" => [1, 33.3],+ "metrics" => [2, 33.3],"comparison" => %{"dimensions" => ["Firefox"],"metrics" => [4, 50.0],- "change" => [-75, -33]+ "change" => [-50, -33]+ }+ }+ ]++ conn2 =+ post(conn, "/api/v2/query-internal-test", %{+ "site_id" => site.domain,+ "metrics" => ["visitors", "percentage"],+ "date_range" => ["2021-01-07", "2021-01-13"],+ "dimensions" => ["visit:browser"],+ "include" => %{+ "comparisons" => %{"mode" => "previous_period"}+ },+ "pagination" => %{"limit" => 2, "offset" => 2}+ })++ assert json_response(conn2, 200)["results"] == [+ %{+ "dimensions" => ["Safari"],+ "metrics" => [1, 16.7],+ "comparison" => %{+ "dimensions" => ["Safari"],+ "metrics" => [3, 37.5],+ "change" => [-67, -55]}}]