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
Use consistent "last 30 days until now" date range for funnel form queries (#6827)
Adrian Gruntkowski38676cd17315
diff --git a/extra/lib/plausible_web/live/funnel_settings/form.ex b/extra/lib/plausible_web/live/funnel_settings/form.exindex ac02043fec..d357413dfc 100644--- a/extra/lib/plausible_web/live/funnel_settings/form.ex+++ b/extra/lib/plausible_web/live/funnel_settings/form.ex@@ -381,7 +381,7 @@ defmodule PlausibleWeb.Live.FunnelSettings.Form doquery =QueryBuilder.build!(site,metrics: [:pageviews],- input_date_range: {:last_n_days, 30}+ input_date_range: query_date_range()){goals_for_query, other_goals} =@@ -619,12 +619,18 @@ defmodule PlausibleWeb.Live.FunnelSettings.Form doquery =QueryBuilder.build!(site,metrics: [:pageviews],- input_date_range: :month+ input_date_range: query_date_range()){:ok, {definition, query}}end+ defp query_date_range() do+ now = DateTime.utc_now()+ thirty_days_ago = DateTime.add(now, -30, :day)+ {:datetime_range, thirty_days_ago, now}+ end+defp prepare_socket(socket, site, funnel_id) when is_integer(funnel_id) dofunnel = Funnels.get(site.id, funnel_id)steps = Funnel.goals(funnel)diff --git a/test/plausible_web/live/funnel_settings_test.exs b/test/plausible_web/live/funnel_settings_test.exsindex c64548d2f5..19eee616d2 100644--- a/test/plausible_web/live/funnel_settings_test.exs+++ b/test/plausible_web/live/funnel_settings_test.exs@@ -374,16 +374,20 @@ defmodule PlausibleWeb.Live.FunnelSettingsTest dots = NaiveDateTime.utc_now() |> NaiveDateTime.truncate(:second)populate_stats(site, [- build(:pageview, pathname: "/go/to/blog/foo", user_id: 123, timestamp: ts),+ build(:pageview,+ pathname: "/go/to/blog/foo",+ user_id: 123,+ timestamp: NaiveDateTime.add(ts, -2, :second)+ ),build(:pageview,pathname: "/intervention",user_id: 123,- timestamp: NaiveDateTime.add(ts, 1, :second)+ timestamp: NaiveDateTime.add(ts, -1, :second)),build(:event,name: "Signup",user_id: 123,- timestamp: NaiveDateTime.add(ts, 2, :second)+ timestamp: ts)])@@ -424,11 +428,15 @@ defmodule PlausibleWeb.Live.FunnelSettingsTest dots = NaiveDateTime.utc_now() |> NaiveDateTime.truncate(:second)populate_stats(site, [- build(:pageview, pathname: "/go/to/blog/foo", user_id: 123, timestamp: ts),+ build(:pageview,+ pathname: "/go/to/blog/foo",+ user_id: 123,+ timestamp: NaiveDateTime.add(ts, -2, :second)+ ),build(:event,name: "Purchase",user_id: 123,- timestamp: NaiveDateTime.add(ts, 2, :second)+ timestamp: ts)])