From 5be38a57fad9ce1aaad3eb80aeddd2ce2ce68f61 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Fri, 24 Sep 2021 11:03:20 +0200 Subject: [PATCH] Do not return prop names when they are not used --- lib/plausible/stats/props.ex | 4 ---- lib/plausible_web/controllers/api/stats_controller.ex | 7 ++++++- .../controllers/api/stats_controller/conversions_test.exs | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/plausible/stats/props.ex b/lib/plausible/stats/props.ex index 13ff9acca..7f0b2d1c4 100644 --- a/lib/plausible/stats/props.ex +++ b/lib/plausible/stats/props.ex @@ -23,10 +23,6 @@ defmodule Plausible.Stats.Props do end) end else - query = - Plausible.Stats.Query.remove_goal(query) - |> Plausible.Stats.Query.put_filter("event:name", nil) - ClickhouseRepo.all( from e in base_event_query(site, query), inner_lateral_join: meta in fragment("meta as m"), diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.ex index e8d096042..3345f18d2 100644 --- a/lib/plausible_web/controllers/api/stats_controller.ex +++ b/lib/plausible_web/controllers/api/stats_controller.ex @@ -508,7 +508,12 @@ defmodule PlausibleWeb.Api.StatsController do %{"visitors" => %{"value" => total_visitors}} = Stats.aggregate(site, total_q, ["visitors"]) - prop_names = Stats.props(site, query) + prop_names = + if query.filters["event:goal"] do + Stats.props(site, query) + else + %{} + end conversions = Stats.breakdown(site, query, "event:goal", ["visitors", "events"], {100, 1}) 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 bdeb1940a..d0441bed2 100644 --- a/test/plausible_web/controllers/api/stats_controller/conversions_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/conversions_test.exs @@ -37,7 +37,7 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do "name" => "Signup", "count" => 2, "total_count" => 3, - "prop_names" => ["variant"], + "prop_names" => nil, "conversion_rate" => 50 }, %{