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 `added_by` not saving on adding country rules (#3835)
hq1f1b6a672d45d
diff --git a/lib/plausible_web/live/shields/country_rules.ex b/lib/plausible_web/live/shields/country_rules.exindex 895b49d3e0..4b3c8533df 100644--- a/lib/plausible_web/live/shields/country_rules.ex+++ b/lib/plausible_web/live/shields/country_rules.ex@@ -176,7 +176,8 @@ defmodule PlausibleWeb.Live.Shields.CountryRules docase Shields.add_country_rule(socket.assigns.site.id,- Map.put(params, "added_by", "#{user.name} <#{user.email}>")+ params,+ added_by: user) do{:ok, rule} ->country_rules = [rule | socket.assigns.country_rules]diff --git a/test/plausible_web/live/shields/countries_test.exs b/test/plausible_web/live/shields/countries_test.exsindex bd9a319442..7495dc0519 100644--- a/test/plausible_web/live/shields/countries_test.exs+++ b/test/plausible_web/live/shields/countries_test.exs@@ -83,7 +83,7 @@ defmodule PlausibleWeb.Live.Shields.CountriesTest doassert submit_button(html, ~s/form[phx-submit="save-country-rule"]/)end- test "submitting a valid country saves it", %{conn: conn, site: site} do+ test "submitting a valid country saves it", %{conn: conn, site: site, user: user} dolv = get_liveview(conn, site)lv@@ -96,7 +96,14 @@ defmodule PlausibleWeb.Live.Shields.CountriesTest doassert html =~ "Estonia"- assert [%{country_code: "EE"}] = Shields.list_country_rules(site)+ added_by = "#{user.name} <#{user.email}>"++ assert [%{id: id, country_code: "EE", added_by: ^added_by}] =+ Shields.list_country_rules(site)++ tooltip = text_of_attr(html, "#country-#{id}", "title")+ assert tooltip =~ "Added at #{Date.utc_today()}"+ assert tooltip =~ "by #{added_by}"endtest "clicking Remove deletes the rule", %{conn: conn, site: site} do