Custom Events are not tracked by default - you have to configure them on your site to be sent to Plausible. See examples and learn more in
Goal Trigger
- <.custom_events_tab tabs={@tabs} />
- <.pageviews_tab tabs={@tabs} />
+ <.custom_events_tab selected?={@selected_tab == "custom_events"} myself={@myself} />
+ <.pageviews_tab selected?={@selected_tab == "pageviews"} myself={@myself} />
"""
end
@@ -241,11 +246,14 @@ defmodule PlausibleWeb.Live.GoalSettings.Form do
class={[
"w-1/2 text-center py-2 border-r dark:border-gray-500",
"cursor-pointer",
- @tabs.custom_events && "shadow-inner font-bold bg-indigo-600 text-white",
- !@tabs.custom_events && "dark:text-gray-100 text-gray-800"
+ @selected? && "shadow-inner font-bold bg-indigo-600 text-white",
+ !@selected? && "dark:text-gray-100 text-gray-800"
]}
id="event-tab"
+ x-on:click="tabSelectionInProgress = true"
phx-click="switch-tab"
+ phx-value-tab="custom_events"
+ phx-target={@myself}
>
Custom Event
@@ -257,35 +265,32 @@ defmodule PlausibleWeb.Live.GoalSettings.Form do
Pageview
"""
end
- def handle_info({:selection_made, %{submit_value: _prop}}, socket) do
- {:noreply, socket}
- end
-
- def handle_event("switch-tab", _params, socket) do
- {:noreply,
- assign(socket,
- tabs: %{
- custom_events: !socket.assigns.tabs.custom_events,
- pageviews: !socket.assigns.tabs.pageviews
- }
- )}
+ def handle_event("switch-tab", %{"tab" => tab}, socket) do
+ {:noreply, assign(socket, selected_tab: tab)}
end
def handle_event("save-goal", %{"goal" => goal}, socket) do
case Plausible.Goals.create(socket.assigns.site, goal) do
{:ok, goal} ->
- send(socket.assigns.rendered_by, {:goal_added, Map.put(goal, :funnels, [])})
+ socket =
+ goal
+ |> Map.put(:funnels, [])
+ |> socket.assigns.on_save_goal.(socket)
+
{:noreply, socket}
{:error, %Ecto.Changeset{} = changeset} ->
@@ -293,11 +298,6 @@ defmodule PlausibleWeb.Live.GoalSettings.Form do
end
end
- def handle_event("cancel-add-goal", _value, socket) do
- send(socket.assigns.rendered_by, :cancel_add_goal)
- {:noreply, socket}
- end
-
def suggest_page_paths(input, _options, site) do
query = Plausible.Stats.Query.from(site, %{})
diff --git a/lib/plausible_web/live/goal_settings/list.ex b/lib/plausible_web/live/goal_settings/list.ex
index f57fe9183..6dd47a0fb 100644
--- a/lib/plausible_web/live/goal_settings/list.ex
+++ b/lib/plausible_web/live/goal_settings/list.ex
@@ -2,9 +2,11 @@ defmodule PlausibleWeb.Live.GoalSettings.List do
@moduledoc """
Phoenix LiveComponent module that renders a list of goals
"""
- use Phoenix.LiveComponent
+ use Phoenix.LiveComponent, global_prefixes: ~w(x-)
use Phoenix.HTML
+ alias PlausibleWeb.Live.Components.Modal
+
attr(:goals, :list, required: true)
attr(:domain, :string, required: true)
attr(:filter_text, :string)
@@ -38,7 +40,11 @@ defmodule PlausibleWeb.Live.GoalSettings.List do
diff --git a/lib/plausible_web/live/props_settings/form.ex b/lib/plausible_web/live/props_settings/form.ex
index a1cc47d6a..b0f750b8b 100644
--- a/lib/plausible_web/live/props_settings/form.ex
+++ b/lib/plausible_web/live/props_settings/form.ex
@@ -113,10 +113,6 @@ defmodule PlausibleWeb.Live.PropsSettings.Form do
{:noreply, assign(socket, prop_key_options_count: count)}
end
- def handle_info({:selection_made, %{submit_value: _prop}}, socket) do
- {:noreply, socket}
- end
-
def handle_event("allow-prop", %{"prop" => prop}, socket) do
case Plausible.Props.allow(socket.assigns.site, prop) do
{:ok, site} ->
diff --git a/test/plausible_web/live/goal_settings/form_test.exs b/test/plausible_web/live/goal_settings/form_test.exs
index 287df7387..8621d8247 100644
--- a/test/plausible_web/live/goal_settings/form_test.exs
+++ b/test/plausible_web/live/goal_settings/form_test.exs
@@ -21,15 +21,6 @@ defmodule PlausibleWeb.Live.GoalSettings.FormTest do
event_tab = lv |> element(~s/a#event-tab/) |> render_click()
assert event_tab =~ "Event Name"
end
-
- test "escape closes the form", %{conn: conn, site: site} do
- {parent, lv} = get_liveview(conn, site, with_parent?: true)
- html = render(parent)
- assert html =~ "Goal Trigger"
- render_keydown(lv, "cancel-add-goal")
- html = render(parent)
- refute html =~ "Goal Trigger"
- end
end
describe "Goal submission" do
@@ -40,15 +31,17 @@ defmodule PlausibleWeb.Live.GoalSettings.FormTest do
lv = get_liveview(conn, site)
html = render(lv)
- [event_name, currency_display, currency_submit] = find(html, "input")
+ [event_name, currency_display, currency_submit] = find(html, "#goals-form input")
assert name_of(event_name) == "goal[event_name]"
assert name_of(currency_display) == "display-currency_input"
assert name_of(currency_submit) == "goal[currency]"
- html = lv |> element(~s/a#pageview-tab/) |> render_click()
+ lv |> element(~s/a#pageview-tab/) |> render_click()
+
+ html = render(lv)
- [page_path_display, page_path] = find(html, "input")
+ [page_path_display, page_path] = find(html, "#goals-form input")
assert name_of(page_path_display) == "display-page_path_input"
assert name_of(page_path) == "goal[page_path]"
end
@@ -58,20 +51,23 @@ defmodule PlausibleWeb.Live.GoalSettings.FormTest do
lv = get_liveview(conn, site)
html = render(lv)
- [event_name] = find(html, "input")
+ [event_name] = find(html, "#goals-form input")
assert name_of(event_name) == "goal[event_name]"
- html = lv |> element(~s/a#pageview-tab/) |> render_click()
+ lv |> element(~s/a#pageview-tab/) |> render_click()
+
+ html = render(lv)
- [page_path_display, page_path] = find(html, "input")
+ [page_path_display, page_path] = find(html, "#goals-form input")
assert name_of(page_path_display) == "display-page_path_input"
assert name_of(page_path) == "goal[page_path]"
end
test "renders error on empty submission", %{conn: conn, site: site} do
lv = get_liveview(conn, site)
- html = lv |> element("form") |> render_submit()
+ lv |> element("#goals-form form") |> render_submit()
+ html = render(lv)
assert html =~ "this field is required and cannot be blank"
pageview_tab = lv |> element(~s/a#pageview-tab/) |> render_click()
@@ -79,35 +75,40 @@ defmodule PlausibleWeb.Live.GoalSettings.FormTest do
end
test "creates a custom event", %{conn: conn, site: site} do
- {parent, lv} = get_liveview(conn, site, with_parent?: true)
- refute render(parent) =~ "SampleCustomEvent"
- lv |> element("form") |> render_submit(%{goal: %{event_name: "SampleCustomEvent"}})
- parent_html = render(parent)
- assert parent_html =~ "SampleCustomEvent"
- assert parent_html =~ "Custom Event"
+ lv = get_liveview(conn, site)
+ refute render(lv) =~ "SampleCustomEvent"
+
+ lv
+ |> element("#goals-form form")
+ |> render_submit(%{goal: %{event_name: "SampleCustomEvent"}})
+
+ html = render(lv)
+ assert html =~ "SampleCustomEvent"
+ assert html =~ "Custom Event"
end
@tag :full_build_only
test "creates a revenue goal", %{conn: conn, site: site} do
- {parent, lv} = get_liveview(conn, site, with_parent?: true)
- refute render(parent) =~ "SampleRevenueGoal"
+ lv = get_liveview(conn, site)
+ refute render(lv) =~ "SampleRevenueGoal"
lv
- |> element("form")
+ |> element("#goals-form form")
|> render_submit(%{goal: %{event_name: "SampleRevenueGoal", currency: "EUR"}})
- parent_html = render(parent)
- assert parent_html =~ "SampleRevenueGoal (EUR)"
- assert parent_html =~ "Revenue Goal"
+ html = render(lv)
+
+ assert html =~ "SampleRevenueGoal (EUR)"
+ assert html =~ "Revenue Goal"
end
test "creates a pageview goal", %{conn: conn, site: site} do
- {parent, lv} = get_liveview(conn, site, with_parent?: true)
- refute render(parent) =~ "Visit /page/**"
- lv |> element("form") |> render_submit(%{goal: %{page_path: "/page/**"}})
- parent_html = render(parent)
- assert parent_html =~ "Visit /page/**"
- assert parent_html =~ "Pageview"
+ lv = get_liveview(conn, site)
+ refute render(lv) =~ "Visit /page/**"
+ lv |> element("#goals-form form") |> render_submit(%{goal: %{page_path: "/page/**"}})
+ html = render(lv)
+ assert html =~ "Visit /page/**"
+ assert html =~ "Pageview"
end
end
@@ -129,13 +130,6 @@ defmodule PlausibleWeb.Live.GoalSettings.FormTest do
refute element_exists?(html, ~s/a[phx-value-display-value="PLN - Polish Zloty"]/)
assert element_exists?(html, ~s/a[phx-value-display-value="EUR - Euro"]/)
-
- lv
- |> element("#dropdown-currency_input-option-1 a")
- |> render_click()
-
- # make sure combo's {:selection_made, ...} message is received
- render(lv)
end
test "pageview combo works", %{conn: conn, site: site} do
@@ -186,16 +180,10 @@ defmodule PlausibleWeb.Live.GoalSettings.FormTest do
{:ok, [g1, g2, g3]}
end
- defp get_liveview(conn, site, opts \\ []) do
+ defp get_liveview(conn, site) do
conn = assign(conn, :live_module, PlausibleWeb.Live.GoalSettings)
{:ok, lv, _html} = live(conn, "/#{site.domain}/settings/goals")
- lv |> element(~s/button[phx-click="add-goal"]/) |> render_click()
- assert form_view = find_live_child(lv, "goals-form")
- if opts[:with_parent?] do
- {lv, form_view}
- else
- form_view
- end
+ lv
end
end
diff --git a/test/plausible_web/live/goal_settings_test.exs b/test/plausible_web/live/goal_settings_test.exs
index 448ffec6a..99e51b1ed 100644
--- a/test/plausible_web/live/goal_settings_test.exs
+++ b/test/plausible_web/live/goal_settings_test.exs
@@ -57,7 +57,10 @@ defmodule PlausibleWeb.Live.GoalSettingsTest do
test "add goal button is rendered", %{conn: conn, site: site} do
conn = get(conn, "/#{site.domain}/settings/goals")
resp = html_response(conn, 200)
- assert element_exists?(resp, ~s/button[phx-click="add-goal"]/)
+ assert element_exists?(resp, ~s/button#add-goal-button[x-data]/)
+ attr = text_of_attr(resp, ~s/button#add-goal-button/, "x-on:click")
+ assert attr =~ "open-modal"
+ assert attr =~ "goals-form-modal"
end
test "search goals input is rendered", %{conn: conn, site: site} do
@@ -135,23 +138,22 @@ defmodule PlausibleWeb.Live.GoalSettingsTest do
refute html =~ "No goals found for this site. Please refine or"
end
- test "clicking Add Goal button renders the form view", %{conn: conn, site: site} do
+ test "Add Goal form view is rendered immediately, though hidden", %{conn: conn, site: site} do
{:ok, _goals} = setup_goals(site)
- lv = get_liveview(conn, site)
- html = lv |> element(~s/button[phx-click="add-goal"]/) |> render_click()
+ {_, html} = get_liveview(conn, site, with_html?: true)
assert html =~ "Add Goal for #{site.domain}"
assert element_exists?(
html,
- ~s/div#goals-form form[phx-submit="save-goal"][phx-click-away="cancel-add-goal"]/
+ ~s/div#goals-form form[phx-submit="save-goal"]/
)
end
end
defp setup_goals(site) do
{:ok, g1} = Plausible.Goals.create(site, %{"page_path" => "/go/to/blog/**"})
- {:ok, g2} = Plausible.Goals.create(site, %{"event_name" => "Signup"})
+ {:ok, g2} = Plausible.Goals.create(site, %{"event_name" => "Register"})
{:ok, g3} = Plausible.Goals.create(site, %{"event_name" => "Purchase", "currency" => "EUR"})
{:ok, [g1, g2, g3]}
end