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
Track installation method with form `onsubmit` instead of classes (#6514)
Adrian Gruntkowskic14e88764fb6
diff --git a/assets/js/liveview/live_socket.js b/assets/js/liveview/live_socket.jsindex 7df1ef9984..2379bb596e 100644--- a/assets/js/liveview/live_socket.js+++ b/assets/js/liveview/live_socket.js@@ -17,14 +17,6 @@ let csrfToken = document.querySelector("meta[name='csrf-token']")let websocketUrl = document.querySelector("meta[name='websocket-url']")if (csrfToken && websocketUrl) {let Hooks = { Modal, Dropdown }- Hooks.Metrics = {- mounted() {- this.handleEvent('send-metrics', ({ event_name }) => {- window.plausible(event_name)- this.pushEvent('send-metrics-after', { event_name })- })- }- }let Uploaders = {}Uploaders.S3 = function (entries, onViewError) {entries.forEach((entry) => {diff --git a/lib/plausible_web/live/installation.ex b/lib/plausible_web/live/installation.exindex 4e865013b9..fd961e1a54 100644--- a/lib/plausible_web/live/installation.ex+++ b/lib/plausible_web/live/installation.ex@@ -152,7 +152,12 @@ defmodule PlausibleWeb.Live.Installation do/><% end %>- <.form for={@tracker_script_configuration_form.result} phx-submit="submit" class="mt-4">+ <.form+ for={@tracker_script_configuration_form.result}+ phx-submit="submit"+ class="mt-4"+ onsubmit={install_method_event(@installation_type.result, recommended_installation_type)}+ ><.inputtype="hidden"field={@tracker_script_configuration_form.result[:installation_type]}@@ -179,13 +184,7 @@ defmodule PlausibleWeb.Live.Installation do<.buttontype="submit"- class={- "w-full mt-8 " <>- install_method_event_classes(- @installation_type.result,- recommended_installation_type- )- }+ class="w-full mt-8">{verify_cta(@installation_type.result)}</.button>@@ -211,22 +210,27 @@ defmodule PlausibleWeb.Live.Installation dodefp verify_cta("gtm"), do: "Verify Tag Manager installation"defp verify_cta("npm"), do: "Verify NPM installation"- defp install_method_event_classes(installation_type, recommended) do- method = installation_method_label(installation_type)- match = if installation_type == recommended, do: "true", else: "false"-- Enum.join(- [- "plausible-event-name=Site+installation+method",- "plausible-event-method=#{method}",- "plausible-event-recommended_match=#{match}"- ],- " "- )- end+ on_ee do+ defp install_method_event(installation_type, recommended) do+ method = installation_method_label(installation_type)+ match = if installation_type == recommended, do: "true", else: "false"++ opts =+ Jason.encode!(%{+ "props" => %{+ "method" => method,+ "recommended_match" => match+ }+ })- defp installation_method_label("manual"), do: "script"- defp installation_method_label(other), do: other+ "window.plausible('Site installation method', #{opts})"+ end++ defp installation_method_label("manual"), do: "script"+ defp installation_method_label(other), do: other+ else+ defp install_method_event(_, _), do: ""+ endon_ee dodefp detect_recommended_installation_type(flow, site) dodiff --git a/lib/plausible_web/live/register_form.ex b/lib/plausible_web/live/register_form.exindex 6d882e92ca..3ee6c13334 100644--- a/lib/plausible_web/live/register_form.ex+++ b/lib/plausible_web/live/register_form.ex@@ -90,6 +90,7 @@ defmodule PlausibleWeb.Live.RegisterForm doid="register-form"class="flex flex-col gap-y-6"action={Routes.auth_path(@socket, :login)}+ onsubmit={form_submit_event(@invitation)}phx-hook="Metrics"phx-change="validate"phx-submit="register"@@ -180,6 +181,14 @@ defmodule PlausibleWeb.Live.RegisterForm do"""end+ on_ee do+ defp form_submit_event(invitation) do+ "window.plausible('Signup#{if invitation, do: " via invitation"}')"+ end+ else+ defp form_submit_event(_), do: ""+ end+defp name_input(assigns) do~H"""<div class="flex flex-col gap-y-2">@@ -275,10 +284,6 @@ defmodule PlausibleWeb.Live.RegisterForm doendend- def handle_event("send-metrics-after", _params, socket) do- {:noreply, assign(socket, trigger_submit: true)}- end-defp add_user(socket, user, opts \\ []) doresult =Repo.transaction(fn ->@@ -289,12 +294,7 @@ defmodule PlausibleWeb.Live.RegisterForm do{:ok, _user} ->socket = assign(socket, disable_submit: true)- on_ee do- event_name = "Signup#{if socket.assigns.invitation, do: " via invitation"}"- {:noreply, push_event(socket, "send-metrics", %{event_name: event_name})}- else- {:noreply, assign(socket, trigger_submit: true)}- end+ {:noreply, assign(socket, trigger_submit: true)}{:error, changeset} ->{:noreply,diff --git a/test/plausible_web/live/register_form_test.exs b/test/plausible_web/live/register_form_test.exsindex 3aee16fdef..7563b9ab76 100644--- a/test/plausible_web/live/register_form_test.exs+++ b/test/plausible_web/live/register_form_test.exs@@ -56,10 +56,6 @@ defmodule PlausibleWeb.Live.RegisterFormTest dohtml = lv |> element("form") |> render_submit()- on_ee do- assert_push_event(lv, "send-metrics", %{event_name: "Signup"})- end-assert [csrf_input,action_input,@@ -98,16 +94,6 @@ defmodule PlausibleWeb.Live.RegisterFormTest dorefute Repo.one(User)end-- test "pushing send-metrics-after event submits the form", %{conn: conn} do- lv = get_liveview(conn, "/register")-- refute render(lv) =~ ~s|phx-trigger-action=""|-- render_hook(lv, "send-metrics-after", %{event_name: "Signup", params: %{}})-- assert render(lv) =~ ~s|phx-trigger-action=""|- endenddescribe "/register/invitation/:invitation_id" do@@ -131,10 +117,6 @@ defmodule PlausibleWeb.Live.RegisterFormTest dohtml = lv |> element("form") |> render_submit()- on_ee do- assert_push_event(lv, "send-metrics", %{event_name: "Signup via invitation"})- end-assert [csrf_input,action_input,@@ -176,10 +158,6 @@ defmodule PlausibleWeb.Live.RegisterFormTest dohtml = lv |> element("form") |> render_submit()- on_ee do- assert_push_event(lv, "send-metrics", %{event_name: "Signup via invitation"})- end-assert [csrf_input,action_input,@@ -267,19 +245,6 @@ defmodule PlausibleWeb.Live.RegisterFormTest dorefute Repo.get_by(User, email: "[email protected]")end-- test "pushing send-metrics-after event submits the form", %{- conn: conn,- guest_invitation: guest_invitation- } do- lv = get_liveview(conn, "/register/invitation/#{guest_invitation.invitation_id}")-- refute render(lv) =~ ~s|phx-trigger-action=""|-- render_hook(lv, "send-metrics-after", %{event_name: "Signup via invitation", params: %{}})-- assert render(lv) =~ ~s|phx-trigger-action=""|- endenddefp get_liveview(conn, url) do