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 Sentry error in filter suggestions (#5741)
Uku Taht07c727048106
diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.exindex 325b364f8d..468eebb177 100644--- a/lib/plausible_web/controllers/api/stats_controller.ex+++ b/lib/plausible_web/controllers/api/stats_controller.ex@@ -1428,13 +1428,20 @@ defmodule PlausibleWeb.Api.StatsController dodef filter_suggestions(conn, params) dosite = conn.assigns[:site]+ search_query = params["q"]- query = Query.from(site, params, debug_metadata(conn))+ if is_nil(search_query) do+ conn+ |> put_status(:bad_request)+ |> json(%{"error" => "Search parameter 'q' is required"})+ else+ query = Query.from(site, params, debug_metadata(conn))- json(- conn,- Stats.filter_suggestions(site, query, params["filter_name"], params["q"])- )+ json(+ conn,+ Stats.filter_suggestions(site, query, params["filter_name"], search_query)+ )+ endenddef custom_prop_value_filter_suggestions(conn, %{"prop_key" => prop_key} = params) dodiff --git a/test/plausible_web/controllers/api/stats_controller/suggestions_test.exs b/test/plausible_web/controllers/api/stats_controller/suggestions_test.exsindex 252ae879b9..e05ffd3d1a 100644--- a/test/plausible_web/controllers/api/stats_controller/suggestions_test.exs+++ b/test/plausible_web/controllers/api/stats_controller/suggestions_test.exs@@ -4,7 +4,7 @@ defmodule PlausibleWeb.Api.StatsController.SuggestionsTest dodescribe "GET /api/stats/:domain/suggestions/:filter_name" dosetup [:create_user, :log_in, :create_site]- test "returns suggestions for pages without a query", %{conn: conn, site: site} do+ test "returns suggestions for pages with empty query", %{conn: conn, site: site} dopopulate_stats(site, [build(:pageview, timestamp: ~N[2019-01-01 23:00:00], pathname: "/"),build(:pageview, timestamp: ~N[2019-01-01 23:00:00], pathname: "/register"),@@ -12,7 +12,8 @@ defmodule PlausibleWeb.Api.StatsController.SuggestionsTest dobuild(:pageview, timestamp: ~N[2019-01-01 23:00:01], pathname: "/irrelevant")])- conn = get(conn, "/api/stats/#{site.domain}/suggestions/page?period=month&date=2019-01-01")+ conn =+ get(conn, "/api/stats/#{site.domain}/suggestions/page?period=month&date=2019-01-01&q=")assert json_response(conn, 200) == [%{"label" => "/", "value" => "/"},@@ -83,7 +84,7 @@ defmodule PlausibleWeb.Api.StatsController.SuggestionsTest do])conn =- get(conn, "/api/stats/#{site.domain}/suggestions/source?period=month&date=2019-01-01")+ get(conn, "/api/stats/#{site.domain}/suggestions/source?period=month&date=2019-01-01&q=")assert json_response(conn, 200) == [%{"label" => "Direct / None", "value" => "Direct / None"},@@ -103,7 +104,7 @@ defmodule PlausibleWeb.Api.StatsController.SuggestionsTest do])conn =- get(conn, "/api/stats/#{site.domain}/suggestions/channel?period=month&date=2019-01-01")+ get(conn, "/api/stats/#{site.domain}/suggestions/channel?period=month&date=2019-01-01&q=")assert json_response(conn, 200) == [%{"label" => "Organic Search", "value" => "Organic Search"},@@ -181,6 +182,26 @@ defmodule PlausibleWeb.Api.StatsController.SuggestionsTest doassert json_response(conn, 200) == []end+ test "returns 400 for nil query parameter", %{conn: conn, site: site} do+ populate_stats(site, [+ build(:pageview,+ timestamp: ~N[2019-01-01 23:00:01],+ pathname: "/",+ country_code: "US"+ )+ ])++ conn =+ get(+ conn,+ "/api/stats/#{site.domain}/suggestions/country?period=month&date=2019-01-01"+ )++ assert json_response(conn, 400) == %{+ "error" => "Search parameter 'q' is required"+ }+ end+test "returns suggestions for screen sizes", %{conn: conn, site: site} dopopulate_stats(site, [build(:pageview,@@ -191,7 +212,7 @@ defmodule PlausibleWeb.Api.StatsController.SuggestionsTest do])conn =- get(conn, "/api/stats/#{site.domain}/suggestions/screen?period=month&date=2019-01-01")+ get(conn, "/api/stats/#{site.domain}/suggestions/screen?period=month&date=2019-01-01&q=")assert json_response(conn, 200) == [%{"value" => "Desktop", "label" => "Desktop"}]end@@ -206,7 +227,7 @@ defmodule PlausibleWeb.Api.StatsController.SuggestionsTest do])conn =- get(conn, "/api/stats/#{site.domain}/suggestions/browser?period=month&date=2019-01-01")+ get(conn, "/api/stats/#{site.domain}/suggestions/browser?period=month&date=2019-01-01&q=")assert json_response(conn, 200) == [%{"label" => "Chrome", "value" => "Chrome"}]end@@ -225,7 +246,7 @@ defmodule PlausibleWeb.Api.StatsController.SuggestionsTest doconn =get(conn,- "/api/stats/#{site.domain}/suggestions/browser_version?period=month&date=2019-01-01&filters=#{filters}"+ "/api/stats/#{site.domain}/suggestions/browser_version?period=month&date=2019-01-01&filters=#{filters}&q=")assert json_response(conn, 200) == [%{"value" => "78.0", "label" => "78.0"}]@@ -236,7 +257,7 @@ defmodule PlausibleWeb.Api.StatsController.SuggestionsTest dobuild(:pageview, timestamp: ~N[2019-01-01 00:00:00], operating_system: "Mac")])- conn = get(conn, "/api/stats/#{site.domain}/suggestions/os?period=month&date=2019-01-01")+ conn = get(conn, "/api/stats/#{site.domain}/suggestions/os?period=month&date=2019-01-01&q=")assert json_response(conn, 200) == [%{"value" => "Mac", "label" => "Mac"}]end@@ -255,7 +276,7 @@ defmodule PlausibleWeb.Api.StatsController.SuggestionsTest doconn =get(conn,- "/api/stats/#{site.domain}/suggestions/os_version?period=month&date=2019-01-01&filters=#{filters}"+ "/api/stats/#{site.domain}/suggestions/os_version?period=month&date=2019-01-01&filters=#{filters}&q=")assert json_response(conn, 200) == [%{"label" => "10.15", "value" => "10.15"}]@@ -387,7 +408,10 @@ defmodule PlausibleWeb.Api.StatsController.SuggestionsTest do])conn =- get(conn, "/api/stats/#{site.domain}/suggestions/referrer?period=month&date=2019-01-01")+ get(+ conn,+ "/api/stats/#{site.domain}/suggestions/referrer?period=month&date=2019-01-01&q="+ )assert json_response(conn, 200) == [%{"value" => "10words.com/page1", "label" => "10words.com/page1"}@@ -433,7 +457,7 @@ defmodule PlausibleWeb.Api.StatsController.SuggestionsTest do])conn =- get(conn, "/api/stats/#{site.domain}/suggestions/prop_key?period=day&date=2022-01-01")+ get(conn, "/api/stats/#{site.domain}/suggestions/prop_key?period=day&date=2022-01-01&q=")assert json_response(conn, 200) == [%{"label" => "author", "value" => "author"},@@ -518,7 +542,7 @@ defmodule PlausibleWeb.Api.StatsController.SuggestionsTest doconn =get(conn,- "/api/stats/#{site.domain}/suggestions/prop_key?period=day&date=2022-01-01&filters=#{filters}"+ "/api/stats/#{site.domain}/suggestions/prop_key?period=day&date=2022-01-01&filters=#{filters}&q=")assert json_response(conn, 200) == [@@ -552,7 +576,7 @@ defmodule PlausibleWeb.Api.StatsController.SuggestionsTest do])conn =- get(conn, "/api/stats/#{site.domain}/suggestions/prop_key?period=day&date=2022-01-01")+ get(conn, "/api/stats/#{site.domain}/suggestions/prop_key?period=day&date=2022-01-01&q=")assert json_response(conn, 200) == [%{"label" => "author", "value" => "author"}@@ -583,7 +607,7 @@ defmodule PlausibleWeb.Api.StatsController.SuggestionsTest do])conn =- get(conn, "/api/stats/#{site.domain}/suggestions/prop_key?period=day&date=2022-01-01")+ get(conn, "/api/stats/#{site.domain}/suggestions/prop_key?period=day&date=2022-01-01&q=")suggestions = json_response(conn, 200)assert %{"label" => "author", "value" => "author"} in suggestions@@ -1121,7 +1145,7 @@ defmodule PlausibleWeb.Api.StatsController.SuggestionsTest dokey_conn =get(conn,- "/api/stats/#{site.domain}/suggestions/prop_key?period=day&date=2022-01-01&with_imported=true"+ "/api/stats/#{site.domain}/suggestions/prop_key?period=day&date=2022-01-01&with_imported=true&q=")assert json_response(key_conn, 200) == [%{"label" => "url", "value" => "url"}]