From e3558284659fb2b40ee6661a2555bf36ad9ccacf Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Mon, 22 Nov 2021 10:42:51 +0200 Subject: [PATCH] Remove pageview filter by default --- lib/plausible/stats/filters.ex | 6 ------ lib/plausible/stats/query.ex | 1 - .../controllers/CSVs/30d-filter-goal/browsers.csv | 2 +- .../controllers/CSVs/30d-filter-goal/devices.csv | 2 +- .../CSVs/30d-filter-goal/entry_pages.csv | 2 +- .../CSVs/30d-filter-goal/exit_pages.csv | 2 +- .../CSVs/30d-filter-goal/operating_systems.csv | 2 +- .../controllers/CSVs/30d-filter-goal/pages.csv | 2 +- .../controllers/CSVs/30d/browsers.csv | 2 +- .../plausible_web/controllers/CSVs/30d/devices.csv | 2 +- .../controllers/CSVs/30d/entry_pages.csv | 2 +- .../controllers/CSVs/30d/exit_pages.csv | 2 +- .../controllers/CSVs/30d/operating_systems.csv | 2 +- test/plausible_web/controllers/CSVs/30d/pages.csv | 2 +- .../controllers/CSVs/30d/visitors.csv | 2 +- .../plausible_web/controllers/CSVs/6m/browsers.csv | 2 +- test/plausible_web/controllers/CSVs/6m/devices.csv | 2 +- .../controllers/CSVs/6m/entry_pages.csv | 2 +- .../controllers/CSVs/6m/exit_pages.csv | 2 +- .../controllers/CSVs/6m/operating_systems.csv | 2 +- test/plausible_web/controllers/CSVs/6m/pages.csv | 2 +- .../plausible_web/controllers/CSVs/6m/visitors.csv | 2 +- .../api/stats_controller/conversions_test.exs | 14 +++++++------- .../api/stats_controller/main_graph_test.exs | 4 ++-- 24 files changed, 29 insertions(+), 36 deletions(-) diff --git a/lib/plausible/stats/filters.ex b/lib/plausible/stats/filters.ex index c6e28c118..7e16273d1 100644 --- a/lib/plausible/stats/filters.ex +++ b/lib/plausible/stats/filters.ex @@ -60,12 +60,6 @@ defmodule Plausible.Stats.Filters do end end) - new_filters = - case new_filters["event:goal"] do - nil -> Map.put(new_filters, "event:name", {:is, "pageview"}) - _ -> new_filters - end - %Plausible.Stats.Query{query | filters: new_filters} end diff --git a/lib/plausible/stats/query.ex b/lib/plausible/stats/query.ex index 272254a29..38d902013 100644 --- a/lib/plausible/stats/query.ex +++ b/lib/plausible/stats/query.ex @@ -192,7 +192,6 @@ defmodule Plausible.Stats.Query do query.filters |> Map.drop(props) |> Map.delete("event:goal") - |> Map.put("event:name", {:is, "pageview"}) %__MODULE__{query | filters: new_filters} end diff --git a/test/plausible_web/controllers/CSVs/30d-filter-goal/browsers.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/browsers.csv index 2859d8c87..292175e17 100644 --- a/test/plausible_web/controllers/CSVs/30d-filter-goal/browsers.csv +++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/browsers.csv @@ -1,2 +1,2 @@ name,conversions,conversion_rate -,1,100.0 +,1,50.0 diff --git a/test/plausible_web/controllers/CSVs/30d-filter-goal/devices.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/devices.csv index 2fe40d9de..64f760da4 100644 --- a/test/plausible_web/controllers/CSVs/30d-filter-goal/devices.csv +++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/devices.csv @@ -1,2 +1,2 @@ name,conversions,conversion_rate -,1,33.3 +,1,25.0 diff --git a/test/plausible_web/controllers/CSVs/30d-filter-goal/entry_pages.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/entry_pages.csv index 4d92a7a07..f2471bfe9 100644 --- a/test/plausible_web/controllers/CSVs/30d-filter-goal/entry_pages.csv +++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/entry_pages.csv @@ -1,2 +1,2 @@ name,conversions,conversion_rate -/,1,33.3 +/,1,25.0 diff --git a/test/plausible_web/controllers/CSVs/30d-filter-goal/exit_pages.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/exit_pages.csv index bfd053fbd..4d92a7a07 100644 --- a/test/plausible_web/controllers/CSVs/30d-filter-goal/exit_pages.csv +++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/exit_pages.csv @@ -1,2 +1,2 @@ name,conversions,conversion_rate -/,1,50.0 +/,1,33.3 diff --git a/test/plausible_web/controllers/CSVs/30d-filter-goal/operating_systems.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/operating_systems.csv index 2fe40d9de..64f760da4 100644 --- a/test/plausible_web/controllers/CSVs/30d-filter-goal/operating_systems.csv +++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/operating_systems.csv @@ -1,2 +1,2 @@ name,conversions,conversion_rate -,1,33.3 +,1,25.0 diff --git a/test/plausible_web/controllers/CSVs/30d-filter-goal/pages.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/pages.csv index 4d92a7a07..f2471bfe9 100644 --- a/test/plausible_web/controllers/CSVs/30d-filter-goal/pages.csv +++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/pages.csv @@ -1,2 +1,2 @@ name,conversions,conversion_rate -/,1,33.3 +/,1,25.0 diff --git a/test/plausible_web/controllers/CSVs/30d/browsers.csv b/test/plausible_web/controllers/CSVs/30d/browsers.csv index a8b183d70..b09641f47 100644 --- a/test/plausible_web/controllers/CSVs/30d/browsers.csv +++ b/test/plausible_web/controllers/CSVs/30d/browsers.csv @@ -1,3 +1,3 @@ name,visitors ABrowserName,2 -,1 +,2 diff --git a/test/plausible_web/controllers/CSVs/30d/devices.csv b/test/plausible_web/controllers/CSVs/30d/devices.csv index 6e6be88bc..259a48cdd 100644 --- a/test/plausible_web/controllers/CSVs/30d/devices.csv +++ b/test/plausible_web/controllers/CSVs/30d/devices.csv @@ -1,2 +1,2 @@ name,visitors -,3 +,4 diff --git a/test/plausible_web/controllers/CSVs/30d/entry_pages.csv b/test/plausible_web/controllers/CSVs/30d/entry_pages.csv index 8953831ae..016868c18 100644 --- a/test/plausible_web/controllers/CSVs/30d/entry_pages.csv +++ b/test/plausible_web/controllers/CSVs/30d/entry_pages.csv @@ -1,2 +1,2 @@ name,unique_entrances,total_entrances,visit_duration -/,3,3,20 +/,4,4,15 diff --git a/test/plausible_web/controllers/CSVs/30d/exit_pages.csv b/test/plausible_web/controllers/CSVs/30d/exit_pages.csv index 53df3c521..9c4fc1875 100644 --- a/test/plausible_web/controllers/CSVs/30d/exit_pages.csv +++ b/test/plausible_web/controllers/CSVs/30d/exit_pages.csv @@ -1,3 +1,3 @@ name,unique_exits,total_exits,exit_rate -/,2,2,66.0 +/,3,3,100.0 /some-other-page,1,1,100.0 diff --git a/test/plausible_web/controllers/CSVs/30d/operating_systems.csv b/test/plausible_web/controllers/CSVs/30d/operating_systems.csv index 6e6be88bc..259a48cdd 100644 --- a/test/plausible_web/controllers/CSVs/30d/operating_systems.csv +++ b/test/plausible_web/controllers/CSVs/30d/operating_systems.csv @@ -1,2 +1,2 @@ name,visitors -,3 +,4 diff --git a/test/plausible_web/controllers/CSVs/30d/pages.csv b/test/plausible_web/controllers/CSVs/30d/pages.csv index 89301a946..dc8d9adb4 100644 --- a/test/plausible_web/controllers/CSVs/30d/pages.csv +++ b/test/plausible_web/controllers/CSVs/30d/pages.csv @@ -1,3 +1,3 @@ name,visitors,bounce_rate,time_on_page -/,3,67, +/,4,75, /some-other-page,1,,60.0 diff --git a/test/plausible_web/controllers/CSVs/30d/visitors.csv b/test/plausible_web/controllers/CSVs/30d/visitors.csv index c37687562..df94365f9 100644 --- a/test/plausible_web/controllers/CSVs/30d/visitors.csv +++ b/test/plausible_web/controllers/CSVs/30d/visitors.csv @@ -28,5 +28,5 @@ date,visitors,pageviews,bounce_rate,visit_duration 2021-10-16,0,0,, 2021-10-17,0,0,, 2021-10-18,0,0,, -2021-10-19,1,1,100,0 +2021-10-19,2,1,100,0 2021-10-20,1,2,0,60 diff --git a/test/plausible_web/controllers/CSVs/6m/browsers.csv b/test/plausible_web/controllers/CSVs/6m/browsers.csv index 6d9c5d6fa..f2719de78 100644 --- a/test/plausible_web/controllers/CSVs/6m/browsers.csv +++ b/test/plausible_web/controllers/CSVs/6m/browsers.csv @@ -1,3 +1,3 @@ name,visitors ABrowserName,3 -,1 +,2 diff --git a/test/plausible_web/controllers/CSVs/6m/devices.csv b/test/plausible_web/controllers/CSVs/6m/devices.csv index 259a48cdd..6d03d7369 100644 --- a/test/plausible_web/controllers/CSVs/6m/devices.csv +++ b/test/plausible_web/controllers/CSVs/6m/devices.csv @@ -1,2 +1,2 @@ name,visitors -,4 +,5 diff --git a/test/plausible_web/controllers/CSVs/6m/entry_pages.csv b/test/plausible_web/controllers/CSVs/6m/entry_pages.csv index 016868c18..63a95b447 100644 --- a/test/plausible_web/controllers/CSVs/6m/entry_pages.csv +++ b/test/plausible_web/controllers/CSVs/6m/entry_pages.csv @@ -1,2 +1,2 @@ name,unique_entrances,total_entrances,visit_duration -/,4,4,15 +/,5,5,12 diff --git a/test/plausible_web/controllers/CSVs/6m/exit_pages.csv b/test/plausible_web/controllers/CSVs/6m/exit_pages.csv index d31eb5564..037f89fb6 100644 --- a/test/plausible_web/controllers/CSVs/6m/exit_pages.csv +++ b/test/plausible_web/controllers/CSVs/6m/exit_pages.csv @@ -1,3 +1,3 @@ name,unique_exits,total_exits,exit_rate -/,3,3,75.0 +/,4,4,100.0 /some-other-page,1,1,100.0 diff --git a/test/plausible_web/controllers/CSVs/6m/operating_systems.csv b/test/plausible_web/controllers/CSVs/6m/operating_systems.csv index 259a48cdd..6d03d7369 100644 --- a/test/plausible_web/controllers/CSVs/6m/operating_systems.csv +++ b/test/plausible_web/controllers/CSVs/6m/operating_systems.csv @@ -1,2 +1,2 @@ name,visitors -,4 +,5 diff --git a/test/plausible_web/controllers/CSVs/6m/pages.csv b/test/plausible_web/controllers/CSVs/6m/pages.csv index dc8d9adb4..33187b985 100644 --- a/test/plausible_web/controllers/CSVs/6m/pages.csv +++ b/test/plausible_web/controllers/CSVs/6m/pages.csv @@ -1,3 +1,3 @@ name,visitors,bounce_rate,time_on_page -/,4,75, +/,5,80, /some-other-page,1,,60.0 diff --git a/test/plausible_web/controllers/CSVs/6m/visitors.csv b/test/plausible_web/controllers/CSVs/6m/visitors.csv index f1209362c..ed3d3b5e7 100644 --- a/test/plausible_web/controllers/CSVs/6m/visitors.csv +++ b/test/plausible_web/controllers/CSVs/6m/visitors.csv @@ -4,4 +4,4 @@ date,visitors,pageviews,bounce_rate,visit_duration 2021-07-01,0,0,, 2021-08-01,0,0,, 2021-09-01,1,1,100,0 -2021-10-01,2,3,67,20 +2021-10-01,3,3,67,20 diff --git a/test/plausible_web/controllers/api/stats_controller/conversions_test.exs b/test/plausible_web/controllers/api/stats_controller/conversions_test.exs index 6c30eeb8b..7c513b377 100644 --- a/test/plausible_web/controllers/api/stats_controller/conversions_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/conversions_test.exs @@ -38,14 +38,14 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do "unique_conversions" => 2, "total_conversions" => 3, "prop_names" => nil, - "conversion_rate" => 50 + "conversion_rate" => 33.3 }, %{ "name" => "Visit /register", "unique_conversions" => 2, "total_conversions" => 2, "prop_names" => nil, - "conversion_rate" => 50 + "conversion_rate" => 33.3 } ] end @@ -81,7 +81,7 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do "unique_conversions" => 2, "total_conversions" => 2, "prop_names" => ["variant"], - "conversion_rate" => 50 + "conversion_rate" => 33.3 } ] end @@ -115,13 +115,13 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do "unique_conversions" => 2, "name" => "B", "total_conversions" => 2, - "conversion_rate" => 66.7 + "conversion_rate" => 33.3 }, %{ "unique_conversions" => 1, "name" => "A", "total_conversions" => 1, - "conversion_rate" => 33.3 + "conversion_rate" => 16.7 } ] end @@ -151,13 +151,13 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do "unique_conversions" => 2, "name" => "(none)", "total_conversions" => 2, - "conversion_rate" => 66.7 + "conversion_rate" => 33.3 }, %{ "unique_conversions" => 1, "name" => "A", "total_conversions" => 1, - "conversion_rate" => 33.3 + "conversion_rate" => 16.7 } ] end diff --git a/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs b/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs index ad4d0bba8..68d44fd7c 100644 --- a/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs @@ -253,7 +253,7 @@ defmodule PlausibleWeb.Api.StatsController.MainGraphTest do ) res = json_response(conn, 200) - assert %{"name" => "Unique visitors", "value" => 2, "change" => 100} in res["top_stats"] + assert %{"name" => "Unique visitors", "value" => 3, "change" => 100} in res["top_stats"] end test "returns converted visitors", %{conn: conn, site: site} do @@ -294,7 +294,7 @@ defmodule PlausibleWeb.Api.StatsController.MainGraphTest do res = json_response(conn, 200) - assert %{"name" => "Conversion rate", "value" => 50.0, "change" => 100} in res["top_stats"] + assert %{"name" => "Conversion rate", "value" => 33.3, "change" => 100} in res["top_stats"] end end