From 4fef5676231b6cb7ffcdf5c0a473b94a06ddad71 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Tue, 17 Aug 2021 11:01:00 +0300 Subject: [PATCH] Fix goal filter --- assets/js/dashboard/stats/modals/filter.js | 35 ++++++++++--------- lib/plausible/stats/aggregate.ex | 1 + lib/plausible/stats/base.ex | 18 +++------- lib/plausible/stats/breakdown.ex | 13 ------- lib/plausible/stats/filters.ex | 20 ++++++++--- lib/plausible/stats/query.ex | 12 +++++++ .../controllers/api/stats_controller.ex | 1 + 7 files changed, 53 insertions(+), 47 deletions(-) diff --git a/assets/js/dashboard/stats/modals/filter.js b/assets/js/dashboard/stats/modals/filter.js index 781ef4989..129559238 100644 --- a/assets/js/dashboard/stats/modals/filter.js +++ b/assets/js/dashboard/stats/modals/filter.js @@ -103,14 +103,15 @@ class FilterModal extends React.Component { const { formState } = this.state; const filters = Object.entries(formState).reduce((res, [filterKey, {type, value}]) => { - let finalFilterValue = (type === 'is_not' ? '!' : '') + value.trim() - + let finalFilterValue = value if (filterKey === 'country') { const allCountries = Datamap.prototype.worldTopo.objects.world.geometries; - const selectedCountry = allCountries.find((c) => c.properties.name === finalFilterValue) || { id: finalFilterValue }; + const selectedCountry = allCountries.find((c) => c.properties.name === value) || { id: value }; finalFilterValue = selectedCountry.id } + finalFilterValue = (type === 'is_not' ? '!' : '') + finalFilterValue.trim() + res.push({filter: filterKey, value: finalFilterValue}) return res }, []) @@ -234,19 +235,21 @@ class FilterModal extends React.Component { )} - - {({ active }) => ( - this.setFilterType(filterName, 'is_not')} - className={classNames( - active ? 'bg-gray-100 text-gray-900' : 'text-gray-700', - 'cursor-pointer block px-4 py-2 text-sm' - )} - > - is not - - )} - + { filterName !== 'goal' && ( + + {({ active }) => ( + this.setFilterType(filterName, 'is_not')} + className={classNames( + active ? 'bg-gray-100 text-gray-900' : 'text-gray-700', + 'cursor-pointer block px-4 py-2 text-sm' + )} + > + is not + + )} + + )} diff --git a/lib/plausible/stats/aggregate.ex b/lib/plausible/stats/aggregate.ex index 23ff36f73..3416db8b6 100644 --- a/lib/plausible/stats/aggregate.ex +++ b/lib/plausible/stats/aggregate.ex @@ -56,6 +56,7 @@ defmodule Plausible.Stats.Aggregate do defp aggregate_sessions(_, _, []), do: %{} defp aggregate_sessions(site, query, metrics) do + query = Query.treat_page_filter_as_entry_page(query) q = from(e in query_sessions(site, query), select: %{}) Enum.reduce(metrics, q, &select_session_metric/2) diff --git a/lib/plausible/stats/base.ex b/lib/plausible/stats/base.ex index 38d5eac6c..48d3e0010 100644 --- a/lib/plausible/stats/base.ex +++ b/lib/plausible/stats/base.ex @@ -50,9 +50,6 @@ defmodule Plausible.Stats.Base do nil -> q - - _ -> - raise "Unknown filter type" end q = @@ -60,14 +57,17 @@ defmodule Plausible.Stats.Base do {:is, name} -> from(e in q, where: e.name == ^name) {:member, list} -> from(e in q, where: e.name in ^list) nil -> q - _ -> raise "Unknown filter type" end q = - case goal_type(query) do + case query.filters["visit:goal"] do {:is, :page, path} -> from(e in q, where: e.pathname == ^path) + {:matches, :page, expr} -> + regex = page_regex(expr) + from(e in q, where: fragment("match(?, ?)", e.pathname, ^regex)) + {:is, :event, event} -> from(e in q, where: e.name == ^event) @@ -154,14 +154,6 @@ defmodule Plausible.Stats.Base do defp db_prop_val("utm_campaign", @no_ref), do: "" defp db_prop_val(_, val), do: val - defp goal_type(query) do - case query.filters["visit:goal"] do - {:is, "Visit " <> page} -> {:is, :page, page} - {:is, event} -> {:is, :event, event} - _ -> nil - end - end - defp utc_boundaries(%Query{period: "30m"}, _timezone) do last_datetime = NaiveDateTime.utc_now() |> Timex.shift(seconds: 5) first_datetime = NaiveDateTime.utc_now() |> Timex.shift(minutes: -30) diff --git a/lib/plausible/stats/breakdown.ex b/lib/plausible/stats/breakdown.ex index 66a039bfb..7e66a8eae 100644 --- a/lib/plausible/stats/breakdown.ex +++ b/lib/plausible/stats/breakdown.ex @@ -158,7 +158,6 @@ defmodule Plausible.Stats.Breakdown do defp breakdown_sessions(site, query, property, metrics, {limit, page}) do offset = (page - 1) * limit - query = treat_page_filter_as_entry_page(query) from(s in query_sessions(site, query), order_by: [desc: fragment("uniq(?)", s.user_id), asc: fragment("min(?)", s.start)], @@ -169,21 +168,9 @@ defmodule Plausible.Stats.Breakdown do |> filter_converted_sessions(site, query) |> do_group_by(property) |> select_metrics(metrics) - |> IO.inspect() |> ClickhouseRepo.all() end - defp treat_page_filter_as_entry_page(query) do - case query.filters["event:page"] do - nil -> - query - - filter -> - new_filters = Map.put(query.filters, "visit:entry_page", filter) - %Query{query | filters: new_filters} - end - end - defp filter_converted_sessions(db_query, site, query) do if query.filters["event:name"] || query.filters["event:page"] || query.filters["visit:goal"] do converted_sessions = diff --git a/lib/plausible/stats/filters.ex b/lib/plausible/stats/filters.ex index 7527da540..12c08813a 100644 --- a/lib/plausible/stats/filters.ex +++ b/lib/plausible/stats/filters.ex @@ -34,6 +34,19 @@ defmodule Plausible.Stats.Filters do new_val = Plausible.Stats.CountryName.to_alpha2(filter_val) Map.put(new_filters, "visit:country", {filter_type, new_val}) + name == "goal" -> + filter = + case val do + "Visit " <> page -> + {filter_type, filter_val} = filter_value(name, page) + {filter_type, :page, filter_val} + + event -> + {:is, :event, event} + end + + Map.put(new_filters, "visit:goal", filter) + name in (@visit_props ++ ["goal"]) -> Map.put(new_filters, "visit:" <> name, filter_value(name, val)) @@ -44,9 +57,6 @@ defmodule Plausible.Stats.Filters do Enum.reduce(val, new_filters, fn {prop_key, prop_val}, new_filters -> Map.put(new_filters, "event:props:" <> prop_key, {:is, prop_val}) end) - - true -> - raise "Unknown filter prop" end end) @@ -54,7 +64,7 @@ defmodule Plausible.Stats.Filters do end defp filter_value(key, "!" <> val) do - if String.contains?(key, "page") && String.match?(val, ~r/\*/) do + if String.contains?(key, ["page", "goal"]) && String.match?(val, ~r/\*/) do {:does_not_match, val} else {:is_not, val} @@ -62,7 +72,7 @@ defmodule Plausible.Stats.Filters do end defp filter_value(key, val) do - if String.contains?(key, "page") && String.match?(val, ~r/\*/) do + if String.contains?(key, ["page", "goal"]) && String.match?(val, ~r/\*/) do {:matches, val} else {:is, val} diff --git a/lib/plausible/stats/query.ex b/lib/plausible/stats/query.ex index 2649a426d..97e0d0c3a 100644 --- a/lib/plausible/stats/query.ex +++ b/lib/plausible/stats/query.ex @@ -159,6 +159,18 @@ defmodule Plausible.Stats.Query do } end + def treat_page_filter_as_entry_page(%__MODULE__{filters: %{"visit:entry_page" => _}} = q), do: q + + def treat_page_filter_as_entry_page(query) do + case query.filters["event:page"] do + nil -> + query + + filter -> + put_filter(query, "visit:entry_page", filter) + end + end + defp today(tz) do Timex.now(tz) |> Timex.to_date() end diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.ex index 5cf3544e9..3b221d18b 100644 --- a/lib/plausible_web/controllers/api/stats_controller.ex +++ b/lib/plausible_web/controllers/api/stats_controller.ex @@ -195,6 +195,7 @@ defmodule PlausibleWeb.Api.StatsController do Query.from(site.timezone, params) |> Filters.add_prefix() |> maybe_hide_noref("visit:source", params) + |> Query.treat_page_filter_as_entry_page() pagination = parse_pagination(params)