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 custom property total conversions value not displayed & Export custom properties (#1456)
Matt Colligan3380685d404e
diff --git a/assets/js/dashboard/stats/conversions/prop-breakdown.js b/assets/js/dashboard/stats/conversions/prop-breakdown.jsindex cab4e4a5a9..b9e03f0588 100644--- a/assets/js/dashboard/stats/conversions/prop-breakdown.js+++ b/assets/js/dashboard/stats/conversions/prop-breakdown.js@@ -115,7 +115,8 @@ export default class PropertyBreakdown extends React.Component {return (<div className="flex items-center justify-between my-2" key={value.name}><Bar- count={value.visitors}+ count={value.unique_conversions}+ plot="unique_conversions"all={this.state.breakdown}bg="bg-red-50 dark:bg-gray-500 dark:bg-opacity-15"maxWidthDeduction={this.getBarMaxWidth()}@@ -123,13 +124,13 @@ export default class PropertyBreakdown extends React.Component {{this.renderPropContent(value, query)}</Bar><div className="dark:text-gray-200">- <span className="font-medium inline-block w-20 text-right">{numberFormatter(value.visitors)}</span>+ <span className="font-medium inline-block w-20 text-right">{numberFormatter(value.unique_conversions)}</span>{viewport > MOBILE_UPPER_WIDTH ?(<spanclassName="font-medium inline-block w-20 text-right"- >{numberFormatter(value.total_count)}+ >{numberFormatter(value.total_conversions)}</span>): nulldiff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.exindex 182df67156..4b80d34a71 100644--- a/lib/plausible_web/controllers/api/stats_controller.ex+++ b/lib/plausible_web/controllers/api/stats_controller.ex@@ -611,13 +611,49 @@ defmodule PlausibleWeb.Api.StatsController doStats.breakdown(site, query, prop_name, ["visitors", "events"], pagination)|> transform_keys(%{params["prop_name"] => "name",- "events" => "total_conversions"+ "events" => "total_conversions",+ "visitors" => "unique_conversions"})|> Enum.map(fn prop ->- Map.put(prop, "conversion_rate", calculate_cr(unique_visitors, prop["visitors"]))+ Map.put(+ prop,+ "conversion_rate",+ calculate_cr(unique_visitors, prop["unique_conversions"])+ )+ end)++ if params["csv"] do+ props+ else+ json(conn, props)+ end+ end++ def all_props_breakdown(conn, params) do+ site = conn.assigns[:site]+ query = Query.from(site.timezone, params) |> Filters.add_prefix()++ headers = ["prop", "name", "unique_conversions", "total_conversions"]++ prop_names =+ if query.filters["event:goal"] do+ {_, _, goal} = query.filters["event:goal"]++ Stats.props(site, query)+ |> Map.get(goal, [])+ else+ []+ end++ values =+ prop_names+ |> Enum.map(fn prop ->+ prop_breakdown(conn, Map.put(params, "prop_name", prop))+ |> Enum.map(&Map.put(&1, "prop", prop))end)+ |> Enum.concat()- json(conn, props)+ to_csv(values, headers)enddef current_visitors(conn, _) dodiff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.exindex 4e0469e7cd..0b1c213c26 100644--- a/lib/plausible_web/controllers/stats_controller.ex+++ b/lib/plausible_web/controllers/stats_controller.ex@@ -71,7 +71,8 @@ defmodule PlausibleWeb.StatsController do{'browsers.csv', fn -> Api.StatsController.browsers(conn, params) end},{'operating_systems.csv', fn -> Api.StatsController.operating_systems(conn, params) end},{'devices.csv', fn -> Api.StatsController.screen_sizes(conn, params) end},- {'conversions.csv', fn -> Api.StatsController.conversions(conn, params) end}+ {'conversions.csv', fn -> Api.StatsController.conversions(conn, params) end},+ {'prop_breakdown.csv', fn -> Api.StatsController.all_props_breakdown(conn, params) end}]csvs =diff --git a/test/plausible_web/controllers/CSVs/30d-filtered/browsers.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/browsers.csvsimilarity index 100%rename from test/plausible_web/controllers/CSVs/30d-filtered/browsers.csvrename to test/plausible_web/controllers/CSVs/30d-filter-goal/browsers.csvdiff --git a/test/plausible_web/controllers/CSVs/30d-filtered/conversions.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/conversions.csvsimilarity index 59%rename from test/plausible_web/controllers/CSVs/30d-filtered/conversions.csvrename to test/plausible_web/controllers/CSVs/30d-filter-goal/conversions.csvindex f61d3a75c9..5c3bf52284 100644--- a/test/plausible_web/controllers/CSVs/30d-filtered/conversions.csv+++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/conversions.csv@@ -1,2 +1,2 @@name,unique_conversions,total_conversions-Visit /some-other-page,1,1+Signup,1,1diff --git a/test/plausible_web/controllers/CSVs/30d-filter-goal/countries.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/countries.csvnew file mode 100644index 0000000000..1c8339116e--- /dev/null+++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/countries.csv@@ -0,0 +1 @@+name,visitorsdiff --git a/test/plausible_web/controllers/CSVs/30d-filtered/devices.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/devices.csvsimilarity index 100%rename from test/plausible_web/controllers/CSVs/30d-filtered/devices.csvrename to test/plausible_web/controllers/CSVs/30d-filter-goal/devices.csvdiff --git a/test/plausible_web/controllers/CSVs/30d-filter-goal/entry_pages.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/entry_pages.csvnew file mode 100644index 0000000000..7424efd6d0--- /dev/null+++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/entry_pages.csv@@ -0,0 +1,2 @@+name,unique_entrances,total_entrances,visit_duration+/,1,1,0diff --git a/test/plausible_web/controllers/CSVs/30d-filter-goal/exit_pages.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/exit_pages.csvnew file mode 100644index 0000000000..823941f3d2--- /dev/null+++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/exit_pages.csv@@ -0,0 +1,2 @@+name,unique_exits,total_exits,exit_rate+/,1,1,diff --git a/test/plausible_web/controllers/CSVs/30d-filtered/operating_systems.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/operating_systems.csvsimilarity index 100%rename from test/plausible_web/controllers/CSVs/30d-filtered/operating_systems.csvrename to test/plausible_web/controllers/CSVs/30d-filter-goal/operating_systems.csvdiff --git a/test/plausible_web/controllers/CSVs/30d-filter-goal/pages.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/pages.csvnew file mode 100644index 0000000000..18e11559e0--- /dev/null+++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/pages.csv@@ -0,0 +1,2 @@+name,visitors,bounce_rate,time_on_page+/,1,100,diff --git a/test/plausible_web/controllers/CSVs/30d-filter-goal/prop_breakdown.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/prop_breakdown.csvnew file mode 100644index 0000000000..cc987c30cb--- /dev/null+++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/prop_breakdown.csv@@ -0,0 +1,2 @@+prop,name,unique_conversions,total_conversions+variant,A,1,1diff --git a/test/plausible_web/controllers/CSVs/30d-filtered/sources.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/sources.csvsimilarity index 100%rename from test/plausible_web/controllers/CSVs/30d-filtered/sources.csvrename to test/plausible_web/controllers/CSVs/30d-filter-goal/sources.csvdiff --git a/test/plausible_web/controllers/CSVs/30d-filtered/utm_campaigns.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_campaigns.csvsimilarity index 100%rename from test/plausible_web/controllers/CSVs/30d-filtered/utm_campaigns.csvrename to test/plausible_web/controllers/CSVs/30d-filter-goal/utm_campaigns.csvdiff --git a/test/plausible_web/controllers/CSVs/30d-filtered/utm_mediums.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_mediums.csvsimilarity index 100%rename from test/plausible_web/controllers/CSVs/30d-filtered/utm_mediums.csvrename to test/plausible_web/controllers/CSVs/30d-filter-goal/utm_mediums.csvdiff --git a/test/plausible_web/controllers/CSVs/30d-filtered/utm_sources.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_sources.csvsimilarity index 100%rename from test/plausible_web/controllers/CSVs/30d-filtered/utm_sources.csvrename to test/plausible_web/controllers/CSVs/30d-filter-goal/utm_sources.csvdiff --git a/test/plausible_web/controllers/CSVs/30d-filter-goal/visitors.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/visitors.csvnew file mode 100644index 0000000000..f7e11600a7--- /dev/null+++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/visitors.csv@@ -0,0 +1,32 @@+date,visitors,pageviews,bounce_rate,visit_duration+2021-09-20,0,0,100,0+2021-09-21,0,0,,+2021-09-22,0,0,,+2021-09-23,0,0,,+2021-09-24,0,0,,+2021-09-25,0,0,,+2021-09-26,0,0,,+2021-09-27,0,0,,+2021-09-28,0,0,,+2021-09-29,0,0,,+2021-09-30,0,0,,+2021-10-01,0,0,,+2021-10-02,0,0,,+2021-10-03,0,0,,+2021-10-04,0,0,,+2021-10-05,0,0,,+2021-10-06,0,0,,+2021-10-07,0,0,,+2021-10-08,0,0,,+2021-10-09,0,0,,+2021-10-10,0,0,,+2021-10-11,0,0,,+2021-10-12,0,0,,+2021-10-13,0,0,,+2021-10-14,0,0,,+2021-10-15,0,0,,+2021-10-16,0,0,,+2021-10-17,0,0,,+2021-10-18,0,0,,+2021-10-19,1,0,100,0+2021-10-20,0,0,0,60diff --git a/test/plausible_web/controllers/CSVs/30d-filter-path/browsers.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/browsers.csvnew file mode 100644index 0000000000..7b062ae5bb--- /dev/null+++ b/test/plausible_web/controllers/CSVs/30d-filter-path/browsers.csv@@ -0,0 +1,2 @@+name,visitors+,1diff --git a/test/plausible_web/controllers/CSVs/30d-filter-path/conversions.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/conversions.csvnew file mode 100644index 0000000000..583f280ff6--- /dev/null+++ b/test/plausible_web/controllers/CSVs/30d-filter-path/conversions.csv@@ -0,0 +1 @@+name,unique_conversions,total_conversionsdiff --git a/test/plausible_web/controllers/CSVs/30d-filtered/countries.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/countries.csvsimilarity index 100%rename from test/plausible_web/controllers/CSVs/30d-filtered/countries.csvrename to test/plausible_web/controllers/CSVs/30d-filter-path/countries.csvdiff --git a/test/plausible_web/controllers/CSVs/30d-filter-path/devices.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/devices.csvnew file mode 100644index 0000000000..7b062ae5bb--- /dev/null+++ b/test/plausible_web/controllers/CSVs/30d-filter-path/devices.csv@@ -0,0 +1,2 @@+name,visitors+,1diff --git a/test/plausible_web/controllers/CSVs/30d-filtered/entry_pages.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/entry_pages.csvsimilarity index 100%rename from test/plausible_web/controllers/CSVs/30d-filtered/entry_pages.csvrename to test/plausible_web/controllers/CSVs/30d-filter-path/entry_pages.csvdiff --git a/test/plausible_web/controllers/CSVs/30d-filtered/exit_pages.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/exit_pages.csvsimilarity index 100%rename from test/plausible_web/controllers/CSVs/30d-filtered/exit_pages.csvrename to test/plausible_web/controllers/CSVs/30d-filter-path/exit_pages.csvdiff --git a/test/plausible_web/controllers/CSVs/30d-filter-path/operating_systems.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/operating_systems.csvnew file mode 100644index 0000000000..7b062ae5bb--- /dev/null+++ b/test/plausible_web/controllers/CSVs/30d-filter-path/operating_systems.csv@@ -0,0 +1,2 @@+name,visitors+,1diff --git a/test/plausible_web/controllers/CSVs/30d-filtered/pages.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/pages.csvsimilarity index 100%rename from test/plausible_web/controllers/CSVs/30d-filtered/pages.csvrename to test/plausible_web/controllers/CSVs/30d-filter-path/pages.csvdiff --git a/test/plausible_web/controllers/CSVs/30d-filter-path/prop_breakdown.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/prop_breakdown.csvnew file mode 100644index 0000000000..c31750f137--- /dev/null+++ b/test/plausible_web/controllers/CSVs/30d-filter-path/prop_breakdown.csv@@ -0,0 +1 @@+prop,name,unique_conversions,total_conversionsdiff --git a/test/plausible_web/controllers/CSVs/30d-filter-path/sources.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/sources.csvnew file mode 100644index 0000000000..773a58cf75--- /dev/null+++ b/test/plausible_web/controllers/CSVs/30d-filter-path/sources.csv@@ -0,0 +1 @@+name,visitors,bounce_rate,visit_durationdiff --git a/test/plausible_web/controllers/CSVs/30d-filter-path/utm_campaigns.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/utm_campaigns.csvnew file mode 100644index 0000000000..773a58cf75--- /dev/null+++ b/test/plausible_web/controllers/CSVs/30d-filter-path/utm_campaigns.csv@@ -0,0 +1 @@+name,visitors,bounce_rate,visit_durationdiff --git a/test/plausible_web/controllers/CSVs/30d-filter-path/utm_mediums.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/utm_mediums.csvnew file mode 100644index 0000000000..773a58cf75--- /dev/null+++ b/test/plausible_web/controllers/CSVs/30d-filter-path/utm_mediums.csv@@ -0,0 +1 @@+name,visitors,bounce_rate,visit_durationdiff --git a/test/plausible_web/controllers/CSVs/30d-filter-path/utm_sources.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/utm_sources.csvnew file mode 100644index 0000000000..773a58cf75--- /dev/null+++ b/test/plausible_web/controllers/CSVs/30d-filter-path/utm_sources.csv@@ -0,0 +1 @@+name,visitors,bounce_rate,visit_durationdiff --git a/test/plausible_web/controllers/CSVs/30d-filtered/visitors.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/visitors.csvsimilarity index 100%rename from test/plausible_web/controllers/CSVs/30d-filtered/visitors.csvrename to test/plausible_web/controllers/CSVs/30d-filter-path/visitors.csvdiff --git a/test/plausible_web/controllers/CSVs/30d/conversions.csv b/test/plausible_web/controllers/CSVs/30d/conversions.csvindex f61d3a75c9..5c3bf52284 100644--- a/test/plausible_web/controllers/CSVs/30d/conversions.csv+++ b/test/plausible_web/controllers/CSVs/30d/conversions.csv@@ -1,2 +1,2 @@name,unique_conversions,total_conversions-Visit /some-other-page,1,1+Signup,1,1diff --git a/test/plausible_web/controllers/CSVs/30d/prop_breakdown.csv b/test/plausible_web/controllers/CSVs/30d/prop_breakdown.csvnew file mode 100644index 0000000000..c31750f137--- /dev/null+++ b/test/plausible_web/controllers/CSVs/30d/prop_breakdown.csv@@ -0,0 +1 @@+prop,name,unique_conversions,total_conversionsdiff --git a/test/plausible_web/controllers/CSVs/6m/conversions.csv b/test/plausible_web/controllers/CSVs/6m/conversions.csvindex f61d3a75c9..5c3bf52284 100644--- a/test/plausible_web/controllers/CSVs/6m/conversions.csv+++ b/test/plausible_web/controllers/CSVs/6m/conversions.csv@@ -1,2 +1,2 @@name,unique_conversions,total_conversions-Visit /some-other-page,1,1+Signup,1,1diff --git a/test/plausible_web/controllers/CSVs/6m/prop_breakdown.csv b/test/plausible_web/controllers/CSVs/6m/prop_breakdown.csvnew file mode 100644index 0000000000..c31750f137--- /dev/null+++ b/test/plausible_web/controllers/CSVs/6m/prop_breakdown.csv@@ -0,0 +1 @@+prop,name,unique_conversions,total_conversionsdiff --git a/test/plausible_web/controllers/CSVs/6m/visitors.csv b/test/plausible_web/controllers/CSVs/6m/visitors.csvindex cec87760f4..f1209362cc 100644--- a/test/plausible_web/controllers/CSVs/6m/visitors.csv+++ b/test/plausible_web/controllers/CSVs/6m/visitors.csv@@ -4,4 +4,4 @@ date,visitors,pageviews,bounce_rate,visit_duration2021-07-01,0,0,,2021-08-01,0,0,,2021-09-01,1,1,100,0-2021-10-01,2,3,50,30+2021-10-01,2,3,67,20diff --git a/test/plausible_web/controllers/api/stats_controller/conversions_test.exs b/test/plausible_web/controllers/api/stats_controller/conversions_test.exsindex 4637ba64be..6c30eeb8bb 100644--- a/test/plausible_web/controllers/api/stats_controller/conversions_test.exs+++ b/test/plausible_web/controllers/api/stats_controller/conversions_test.exs@@ -112,13 +112,13 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest doassert json_response(conn, 200) == [%{- "visitors" => 2,+ "unique_conversions" => 2,"name" => "B","total_conversions" => 2,"conversion_rate" => 66.7},%{- "visitors" => 1,+ "unique_conversions" => 1,"name" => "A","total_conversions" => 1,"conversion_rate" => 33.3@@ -148,13 +148,13 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest doassert json_response(conn, 200) == [%{- "visitors" => 2,+ "unique_conversions" => 2,"name" => "(none)","total_conversions" => 2,"conversion_rate" => 66.7},%{- "visitors" => 1,+ "unique_conversions" => 1,"name" => "A","total_conversions" => 1,"conversion_rate" => 33.3@@ -182,7 +182,7 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest doassert json_response(conn, 200) == [%{- "visitors" => 1,+ "unique_conversions" => 1,"name" => "B","total_conversions" => 1,"conversion_rate" => 50.0diff --git a/test/plausible_web/controllers/stats_controller_test.exs b/test/plausible_web/controllers/stats_controller_test.exsindex b488a49680..b7bc91be54 100644--- a/test/plausible_web/controllers/stats_controller_test.exs+++ b/test/plausible_web/controllers/stats_controller_test.exs@@ -83,7 +83,7 @@ defmodule PlausibleWeb.StatsControllerTest dofilters = Jason.encode!(%{page: "/some-other-page"})conn = get(conn, "/#{site.domain}/export?date=2021-10-20&filters=#{filters}")- assert_zip(conn, "30d-filtered")+ assert_zip(conn, "30d-filter-path")endend@@ -140,10 +140,27 @@ defmodule PlausibleWeb.StatsControllerTest docountry_code: "EE",referrer_source: "Google",browser: "ABrowserName"+ ),+ build(:event,+ timestamp: Timex.shift(~N[2021-10-20 12:00:00], days: -1),+ name: "Signup",+ "meta.key": ["variant"],+ "meta.value": ["A"])])- insert(:goal, %{domain: site.domain, page_path: "/some-other-page"})+ insert(:goal, %{domain: site.domain, event_name: "Signup"})+ end++ describe "GET /:website/export - with goal filter" do+ setup [:create_user, :create_new_site, :log_in]++ test "exports goal-filtered data in zipped csvs", %{conn: conn, site: site} do+ populate_exported_stats(site)+ filters = Jason.encode!(%{goal: "Signup"})+ conn = get(conn, "/#{site.domain}/export?date=2021-10-20&filters=#{filters}")+ assert_zip(conn, "30d-filter-goal")+ endenddescribe "GET /share/:slug" do