Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Remove pageview filter by default

Uku Tahte3558284659f
diff --git a/lib/plausible/stats/filters.ex b/lib/plausible/stats/filters.ex
index c6e28c1183..7e16273d10 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 272254a29c..38d9020130 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 2859d8c876..292175e172 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 2fe40d9de4..64f760da40 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 4d92a7a078..f2471bfe9d 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 bfd053fbd6..4d92a7a078 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 2fe40d9de4..64f760da40 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 4d92a7a078..f2471bfe9d 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 a8b183d707..b09641f477 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 6e6be88bce..259a48cdd4 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 8953831ae4..016868c186 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 53df3c5210..9c4fc18759 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 6e6be88bce..259a48cdd4 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 89301a9461..dc8d9adb4f 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 c376875623..df94365f9b 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 6d9c5d6fa5..f2719de785 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 259a48cdd4..6d03d7369b 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 016868c186..63a95b447a 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 d31eb55649..037f89fb6d 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 259a48cdd4..6d03d7369b 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 dc8d9adb4f..33187b985b 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 f1209362cc..ed3d3b5e70 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 6c30eeb8bb..7c513b377a 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 ad4d0bba88..68d44fd7c5 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