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
Tracking improvements (#4392)
RobertJoonas37014c86a817
diff --git a/assets/js/dashboard/filters.js b/assets/js/dashboard/filters.jsindex cca858b704..84657adfe7 100644--- a/assets/js/dashboard/filters.js+++ b/assets/js/dashboard/filters.js@@ -236,7 +236,7 @@ function Filters({ history }) {}function trackFilterMenu() {- window.plausible && window.plausible('Filter Menu: Open', { u: `${window.location.protocol}//${window.location.hostname}/:dashboard` })+ window.trackCustomEvent('Filter Menu: Open')}function renderDropDown() {diff --git a/assets/js/liveview/live_socket.js b/assets/js/liveview/live_socket.jsindex ed287267f7..9e7ea0f4b1 100644--- a/assets/js/liveview/live_socket.js+++ b/assets/js/liveview/live_socket.js@@ -9,13 +9,12 @@ if (csrfToken && websocketUrl) {let Hooks = {}Hooks.Metrics = {mounted() {- this.handleEvent("send-metrics", ({ event_name, params }) => {+ this.handleEvent("send-metrics", ({event_name}) => {const afterMetrics = () => {- this.pushEvent("send-metrics-after", {event_name, params})+ this.pushEvent("send-metrics-after", {event_name})}setTimeout(afterMetrics, 5000)- params.callback = afterMetrics- window.plausible(event_name, params)+ window.trackCustomEvent(event_name, {callback: afterMetrics})})}}diff --git a/lib/plausible_web/live/register_form.ex b/lib/plausible_web/live/register_form.exindex 111ae687b8..637e05bb96 100644--- a/lib/plausible_web/live/register_form.ex+++ b/lib/plausible_web/live/register_form.ex@@ -309,20 +309,8 @@ defmodule PlausibleWeb.Live.RegisterForm docase Repo.insert(user) do{:ok, _user} ->on_ee do- metrics_params =- if socket.assigns.invitation do- %{- event_name: "Signup via invitation",- params: %{- url:- Path.join(PlausibleWeb.Endpoint.url(), "/register/invitation/:invitation_id")- }- }- else- %{event_name: "Signup", params: %{}}- end-- {:noreply, push_event(socket, "send-metrics", metrics_params)}+ 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)}enddiff --git a/lib/plausible_web/templates/layout/_tracking.html.heex b/lib/plausible_web/templates/layout/_tracking.html.heexindex d5451dc751..208a7bc11c 100644--- a/lib/plausible_web/templates/layout/_tracking.html.heex+++ b/lib/plausible_web/templates/layout/_tracking.html.heex@@ -16,14 +16,22 @@const pageUrl = window.location.href<% end %>- plausible('pageview', {- u: pageUrl,- props: {- logged_in: <%= is_map(@conn.assigns[:current_user]) %>,- theme: '<%= if @conn.assigns[:current_user], do: @conn.assigns[:current_user].theme, else: "system" %>',- browser_language: navigator.language || navigator.userLanguage- }- })+ const props = {+ logged_in: <%= is_map(@conn.assigns[:current_user]) %>,+ browser_language: navigator.language || navigator.userLanguage+ }++ <%= if @conn.assigns[:current_user] do %>+ props.theme = '<%= @conn.assigns[:current_user].theme %>'+ <% end %>++ const defaultEventOptions = {u: pageUrl, props: props}++ window.trackCustomEvent = function(event_name, options) {+ plausible(event_name, {...defaultEventOptions, ...options})+ }++ plausible('pageview', defaultEventOptions)</script><% end %><% end %>diff --git a/test/plausible_web/live/register_form_test.exs b/test/plausible_web/live/register_form_test.exsindex 2fa35a8ec2..24e92db491 100644--- a/test/plausible_web/live/register_form_test.exs+++ b/test/plausible_web/live/register_form_test.exs@@ -64,7 +64,7 @@ defmodule PlausibleWeb.Live.RegisterFormTest dohtml = lv |> element("form") |> render_submit()on_ee do- assert_push_event(lv, "send-metrics", %{event_name: "Signup", params: %{}})+ assert_push_event(lv, "send-metrics", %{event_name: "Signup"})endassert [@@ -162,7 +162,7 @@ defmodule PlausibleWeb.Live.RegisterFormTest dohtml = lv |> element("form") |> render_submit()on_ee do- assert_push_event(lv, "send-metrics", %{event_name: "Signup via invitation", params: %{}})+ assert_push_event(lv, "send-metrics", %{event_name: "Signup via invitation"})endassert [