Devices
- { this.renderPill('Size', 'size') }
- { this.renderPill('Browser', 'browser') }
- { this.renderPill('OS', 'os') }
+ {this.renderPill('Size', 'size')}
+ {this.renderPill('Browser', 'browser')}
+ {this.renderPill('OS', 'os')}
- { this.renderContent() }
+ {this.renderContent()}
)
diff --git a/lib/plausible/stats/base.ex b/lib/plausible/stats/base.ex
index 24de1aeb9..c27b102a5 100644
--- a/lib/plausible/stats/base.ex
+++ b/lib/plausible/stats/base.ex
@@ -6,6 +6,7 @@ defmodule Plausible.Stats.Base do
# Ecto typespec has not been updated for this PR: https://github.com/elixir-ecto/ecto/pull/3592
@dialyzer {:nowarn_function, add_sample_hint: 2}
@no_ref "Direct / None"
+ @not_set "(not set)"
def base_event_query(site, query) do
events_q = query_events(site, query)
@@ -391,6 +392,7 @@ defmodule Plausible.Stats.Base do
defp db_prop_val(:utm_campaign, @no_ref), do: ""
defp db_prop_val(:utm_content, @no_ref), do: ""
defp db_prop_val(:utm_term, @no_ref), do: ""
+ defp db_prop_val(_, @not_set), do: ""
defp db_prop_val(_, val), do: val
def utc_boundaries(%Query{period: "realtime"}, _timezone) do
diff --git a/lib/plausible/stats/breakdown.ex b/lib/plausible/stats/breakdown.ex
index 10e4e7385..77842528e 100644
--- a/lib/plausible/stats/breakdown.ex
+++ b/lib/plausible/stats/breakdown.ex
@@ -5,6 +5,7 @@ defmodule Plausible.Stats.Breakdown do
alias Plausible.Stats.Query
alias Plausible.Goals
@no_ref "Direct / None"
+ @not_set "(not set)"
@event_metrics [:visitors, :pageviews, :events]
@session_metrics [:visits, :bounce_rate, :visit_duration]
@@ -512,7 +513,9 @@ defmodule Plausible.Stats.Breakdown do
from(
s in q,
group_by: s.screen_size,
- select_merge: %{device: s.screen_size},
+ select_merge: %{
+ device: fragment("if(empty(?), ?, ?)", s.screen_size, @not_set, s.screen_size)
+ },
order_by: {:asc, s.screen_size}
)
end
@@ -521,7 +524,10 @@ defmodule Plausible.Stats.Breakdown do
from(
s in q,
group_by: s.operating_system,
- select_merge: %{operating_system: s.operating_system},
+ select_merge: %{
+ operating_system:
+ fragment("if(empty(?), ?, ?)", s.operating_system, @not_set, s.operating_system)
+ },
order_by: {:asc, s.operating_system}
)
end
@@ -530,7 +536,15 @@ defmodule Plausible.Stats.Breakdown do
from(
s in q,
group_by: s.operating_system_version,
- select_merge: %{os_version: s.operating_system_version},
+ select_merge: %{
+ os_version:
+ fragment(
+ "if(empty(?), ?, ?)",
+ s.operating_system_version,
+ @not_set,
+ s.operating_system_version
+ )
+ },
order_by: {:asc, s.operating_system_version}
)
end
@@ -539,7 +553,9 @@ defmodule Plausible.Stats.Breakdown do
from(
s in q,
group_by: s.browser,
- select_merge: %{browser: s.browser},
+ select_merge: %{
+ browser: fragment("if(empty(?), ?, ?)", s.browser, @not_set, s.browser)
+ },
order_by: {:asc, s.browser}
)
end
@@ -548,7 +564,10 @@ defmodule Plausible.Stats.Breakdown do
from(
s in q,
group_by: s.browser_version,
- select_merge: %{browser_version: s.browser_version},
+ select_merge: %{
+ browser_version:
+ fragment("if(empty(?), ?, ?)", s.browser_version, @not_set, s.browser_version)
+ },
order_by: {:asc, s.browser_version}
)
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 292175e17..89deb168d 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,50.0
+(not set),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 64f760da4..cd761192e 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,25.0
+(not set),1,25.0
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 64f760da4..cd761192e 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,25.0
+(not set),1,25.0
diff --git a/test/plausible_web/controllers/CSVs/30d-filter-path/browsers.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/browsers.csv
index 7b062ae5b..d7aedd4cc 100644
--- a/test/plausible_web/controllers/CSVs/30d-filter-path/browsers.csv
+++ b/test/plausible_web/controllers/CSVs/30d-filter-path/browsers.csv
@@ -1,2 +1,2 @@
name,visitors
-,1
+(not set),1
diff --git a/test/plausible_web/controllers/CSVs/30d-filter-path/devices.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/devices.csv
index 7b062ae5b..d7aedd4cc 100644
--- a/test/plausible_web/controllers/CSVs/30d-filter-path/devices.csv
+++ b/test/plausible_web/controllers/CSVs/30d-filter-path/devices.csv
@@ -1,2 +1,2 @@
name,visitors
-,1
+(not set),1
diff --git a/test/plausible_web/controllers/CSVs/30d-filter-path/operating_systems.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/operating_systems.csv
index 7b062ae5b..d7aedd4cc 100644
--- a/test/plausible_web/controllers/CSVs/30d-filter-path/operating_systems.csv
+++ b/test/plausible_web/controllers/CSVs/30d-filter-path/operating_systems.csv
@@ -1,2 +1,2 @@
name,visitors
-,1
+(not set),1
diff --git a/test/plausible_web/controllers/CSVs/30d/browsers.csv b/test/plausible_web/controllers/CSVs/30d/browsers.csv
index b09641f47..0065f7b3d 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
-,2
+(not set),2
diff --git a/test/plausible_web/controllers/CSVs/30d/devices.csv b/test/plausible_web/controllers/CSVs/30d/devices.csv
index 259a48cdd..9dc98c387 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
-,4
+(not set),4
diff --git a/test/plausible_web/controllers/CSVs/30d/operating_systems.csv b/test/plausible_web/controllers/CSVs/30d/operating_systems.csv
index 259a48cdd..9dc98c387 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
-,4
+(not set),4
diff --git a/test/plausible_web/controllers/CSVs/6m/browsers.csv b/test/plausible_web/controllers/CSVs/6m/browsers.csv
index f2719de78..10141774c 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
-,2
+(not set),2
diff --git a/test/plausible_web/controllers/CSVs/6m/devices.csv b/test/plausible_web/controllers/CSVs/6m/devices.csv
index 6d03d7369..f574b0d4b 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
-,5
+(not set),5
diff --git a/test/plausible_web/controllers/CSVs/6m/operating_systems.csv b/test/plausible_web/controllers/CSVs/6m/operating_systems.csv
index 6d03d7369..f574b0d4b 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
-,5
+(not set),5
diff --git a/test/plausible_web/controllers/api/stats_controller/browsers_test.exs b/test/plausible_web/controllers/api/stats_controller/browsers_test.exs
index ad318720f..c5f670a83 100644
--- a/test/plausible_web/controllers/api/stats_controller/browsers_test.exs
+++ b/test/plausible_web/controllers/api/stats_controller/browsers_test.exs
@@ -129,6 +129,21 @@ defmodule PlausibleWeb.Api.StatsController.BrowsersTest do
%{"name" => "Firefox", "visitors" => 1, "percentage" => 33}
]
end
+
+ test "returns (not set) when appropriate", %{conn: conn, site: site} do
+ populate_stats(site, [
+ build(:pageview,
+ user_id: 123,
+ browser: ""
+ )
+ ])
+
+ conn = get(conn, "/api/stats/#{site.domain}/browsers?period=day")
+
+ assert json_response(conn, 200) == [
+ %{"name" => "(not set)", "visitors" => 1, "percentage" => 100}
+ ]
+ end
end
describe "GET /api/stats/:domain/browser-versions" do
@@ -155,5 +170,23 @@ defmodule PlausibleWeb.Api.StatsController.BrowsersTest do
%{"name" => "77.0", "visitors" => 1, "percentage" => 33}
]
end
+
+ test "returns results for (not set)", %{conn: conn, site: site} do
+ populate_stats(site, [
+ build(:pageview, browser: "", browser_version: "")
+ ])
+
+ filters = Jason.encode!(%{browser: "(not set)"})
+
+ conn =
+ get(
+ conn,
+ "/api/stats/#{site.domain}/browser-versions?period=day&filters=#{filters}"
+ )
+
+ assert json_response(conn, 200) == [
+ %{"name" => "(not set)", "visitors" => 1, "percentage" => 100}
+ ]
+ end
end
end
diff --git a/test/plausible_web/controllers/api/stats_controller/operating_systems_test.exs b/test/plausible_web/controllers/api/stats_controller/operating_systems_test.exs
index b760b6bc2..2b73636d7 100644
--- a/test/plausible_web/controllers/api/stats_controller/operating_systems_test.exs
+++ b/test/plausible_web/controllers/api/stats_controller/operating_systems_test.exs
@@ -19,6 +19,33 @@ defmodule PlausibleWeb.Api.StatsController.OperatingSystemsTest do
]
end
+ test "returns (not set) when appropriate", %{conn: conn, site: site} do
+ populate_stats(site, [
+ build(:pageview,
+ operating_system: ""
+ ),
+ build(:pageview,
+ operating_system: "Linux"
+ )
+ ])
+
+ conn = get(conn, "/api/stats/#{site.domain}/operating-systems?period=day")
+
+ assert json_response(conn, 200) == [
+ %{"name" => "(not set)", "visitors" => 1, "percentage" => 50},
+ %{"name" => "Linux", "visitors" => 1, "percentage" => 50}
+ ]
+
+ filters = Jason.encode!(%{os: "(not set)"})
+
+ conn =
+ get(conn, "/api/stats/#{site.domain}/operating-systems?period=day&filters=#{filters}")
+
+ assert json_response(conn, 200) == [
+ %{"name" => "(not set)", "visitors" => 1, "percentage" => 100}
+ ]
+ end
+
test "calculates conversion_rate when filtering for goal", %{conn: conn, site: site} do
populate_stats(site, [
build(:pageview, user_id: 1, operating_system: "Mac"),
diff --git a/test/plausible_web/controllers/api/stats_controller/screen_sizes_test.exs b/test/plausible_web/controllers/api/stats_controller/screen_sizes_test.exs
index 7b3ecab52..22f0d837b 100644
--- a/test/plausible_web/controllers/api/stats_controller/screen_sizes_test.exs
+++ b/test/plausible_web/controllers/api/stats_controller/screen_sizes_test.exs
@@ -19,6 +19,33 @@ defmodule PlausibleWeb.Api.StatsController.ScreenSizesTest do
]
end
+ test "returns (not set) when appropriate", %{conn: conn, site: site} do
+ populate_stats(site, [
+ build(:pageview,
+ screen_size: ""
+ ),
+ build(:pageview,
+ screen_size: "Desktop"
+ )
+ ])
+
+ conn = get(conn, "/api/stats/#{site.domain}/screen-sizes?period=day")
+
+ assert json_response(conn, 200) == [
+ %{"name" => "(not set)", "visitors" => 1, "percentage" => 50},
+ %{"name" => "Desktop", "visitors" => 1, "percentage" => 50}
+ ]
+
+ conn = get(conn, "/api/stats/#{site.domain}/screen-sizes?period=day")
+
+ filters = Jason.encode!(%{screen: "(not set)"})
+ conn = get(conn, "/api/stats/#{site.domain}/screen-sizes?period=day&filters=#{filters}")
+
+ assert json_response(conn, 200) == [
+ %{"name" => "(not set)", "visitors" => 1, "percentage" => 100}
+ ]
+ end
+
test "returns screen sizes with :is filter on custom pageview props", %{
conn: conn,
site: site