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
Make backwards exploration suggestion visitors reflect the current step (#6251)
Adrian Gruntkowskibbeb44cc6d20
diff --git a/lib/plausible/stats/exploration.ex b/lib/plausible/stats/exploration.exindex 802d76a8a9..089db29147 100644--- a/lib/plausible/stats/exploration.ex+++ b/lib/plausible/stats/exploration.ex@@ -82,8 +82,7 @@ defmodule Plausible.Stats.Exploration dostep: %Journey.Step{name: selected_as(field(s, ^next_name), :next_name),pathname: selected_as(field(s, ^next_pathname), :next_pathname)- },- visitors: selected_as(scale_sample(fragment("uniq(?)", s.user_id)), :count)+ }},group_by: [selected_as(:next_name), selected_as(:next_pathname)],order_by: [@@ -93,6 +92,7 @@ defmodule Plausible.Stats.Exploration do],limit: 10)+ |> count_by_direction(query, steps, direction)|> maybe_search(search_term)steps@@ -107,6 +107,38 @@ defmodule Plausible.Stats.Exploration doend)end+ defp count_by_direction(steps_query, _query, steps, direction)+ when steps == [] or direction == :forward do+ from(s in steps_query,+ select_merge: %{+ visitors: selected_as(scale_sample(fragment("uniq(?)", s.user_id)), :count)+ }+ )+ end++ defp count_by_direction(steps_query, query, _steps, :backward) do+ q_steps_first = steps_query(query, 1, :forward)++ q_counts =+ from(fs in subquery(q_steps_first),+ where: fs.name1 != "",+ select: %{+ name: fs.name1,+ pathname: fs.pathname1,+ visitors: scale_sample(fragment("uniq(?)", fs.user_id))+ },+ group_by: [fs.name1, fs.pathname1]+ )++ from(s in steps_query,+ inner_join: c in subquery(q_counts),+ on: c.name == selected_as(:next_name) and c.pathname == selected_as(:next_pathname),+ select_merge: %{+ visitors: selected_as(scale_sample(fragment("any(?)", c.visitors)), :count)+ }+ )+ end+defp journey_funnel_query(query, steps) doq_steps = steps_query(query, length(steps), :forward)diff --git a/test/plausible/stats/exploration_test.exs b/test/plausible/stats/exploration_test.exsindex 0b2d40a02a..e0b2037b5b 100644--- a/test/plausible/stats/exploration_test.exs+++ b/test/plausible/stats/exploration_test.exs@@ -254,9 +254,9 @@ defmodule Plausible.Stats.ExplorationTest doassert {:ok, [next_step1, next_step2]} =Exploration.next_steps(query, journey, "", :backward)- assert next_step1.step.pathname == "/docs"- assert next_step1.visitors == 1- assert next_step2.step.pathname == "/login"+ assert next_step1.step.pathname == "/login"+ assert next_step1.visitors == 2+ assert next_step2.step.pathname == "/docs"assert next_step2.visitors == 1enddiff --git a/test/plausible_web/controllers/api/stats_controller/exploration_test.exs b/test/plausible_web/controllers/api/stats_controller/exploration_test.exsindex 1809eed6bd..40d0d736a1 100644--- a/test/plausible_web/controllers/api/stats_controller/exploration_test.exs+++ b/test/plausible_web/controllers/api/stats_controller/exploration_test.exs@@ -120,9 +120,9 @@ defmodule PlausibleWeb.Api.StatsController.ExplorationTest do|> json_response(200)assert [next_step1, next_step2] = resp- assert next_step1["step"]["pathname"] == "/docs"- assert next_step1["visitors"] == 1- assert next_step2["step"]["pathname"] == "/login"+ assert next_step1["step"]["pathname"] == "/login"+ assert next_step1["visitors"] == 2+ assert next_step2["step"]["pathname"] == "/docs"assert next_step2["visitors"] == 1endend