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 wildcard pathname regex used for funnel steps and prev step exclusion (#6343)
Adrian Gruntkowski2bf621832b85
diff --git a/extra/lib/plausible/stats/exploration.ex b/extra/lib/plausible/stats/exploration.exindex 5dc9296e67..287499953d 100644--- a/extra/lib/plausible/stats/exploration.ex+++ b/extra/lib/plausible/stats/exploration.ex@@ -705,7 +705,7 @@ defmodule Plausible.Stats.Exploration dodefp wildcard_pattern(pathname) when is_binary(pathname) doescaped = Regex.escape(pathname)- "^#{escaped}(/.+)?$"+ "^#{escaped}(/.*)?$"enddefp maybe_search(query, search_term) dodiff --git a/test/plausible/stats/exploration_test.exs b/test/plausible/stats/exploration_test.exsindex 79d18b7f44..16746f8663 100644--- a/test/plausible/stats/exploration_test.exs+++ b/test/plausible/stats/exploration_test.exs@@ -283,6 +283,67 @@ defmodule Plausible.Stats.ExplorationTest doassert step2.conversion_rate == "50"assert step2.conversion_rate_step == "50"end++ test "handles wildcard step properly" do+ journey = [+ %Exploration.Journey.Step{+ name: "pageview",+ pathname: "/sites",+ includes_subpaths: true,+ subpaths_count: 2,+ is_goal: true+ },+ %Exploration.Journey.Step{name: "pageview", pathname: "/dashboard"}+ ]++ site = new_site()+ now = DateTime.utc_now()++ populate_stats(site, [+ build(:pageview,+ user_id: 123,+ pathname: "/sites",+ timestamp: DateTime.shift(now, minute: -50)+ ),+ build(:pageview,+ user_id: 123,+ pathname: "/dashboard",+ timestamp: DateTime.shift(now, minute: -40)+ ),+ build(:pageview,+ user_id: 124,+ pathname: "/sites/settings",+ timestamp: DateTime.shift(now, minute: -50)+ ),+ build(:pageview,+ user_id: 125,+ pathname: "/sites-are-cool",+ timestamp: DateTime.shift(now, minute: -50)+ ),+ build(:pageview,+ user_id: 126,+ pathname: "/sites/",+ timestamp: DateTime.shift(now, minute: -50)+ )+ ])++ query = QueryBuilder.build!(site, input_date_range: :all)++ assert {:ok, [step1, step2]} = Exploration.journey_funnel(query, journey)++ assert step1.step.pathname == "/sites"+ assert step1.visitors == 3+ assert step1.dropoff == 0+ assert step1.dropoff_percentage == "0"+ assert step1.conversion_rate == "100"+ assert step1.conversion_rate_step == "0"+ assert step2.step.pathname == "/dashboard"+ assert step2.visitors == 1+ assert step2.dropoff == 2+ assert step2.dropoff_percentage == "66.67"+ assert step2.conversion_rate == "33.33"+ assert step2.conversion_rate_step == "33.33"+ endenddescribe "interesting_funnel" do