diff --git a/assets/js/app.js b/assets/js/app.js
index 9a684bc3c..14160ad39 100644
--- a/assets/js/app.js
+++ b/assets/js/app.js
@@ -22,6 +22,11 @@ liveSocket.connect()
// >> liveSocket.disableLatencySim()
window.liveSocket = liveSocket
+window.addEventListener(`phx:update-value`, (e) => {
+ let el = document.getElementById(e.detail.id)
+ el.value = e.detail.value
+})
+
const triggers = document.querySelectorAll('[data-dropdown-trigger]')
for (const trigger of triggers) {
diff --git a/lib/plausible_web/live/funnel_settings.ex b/lib/plausible_web/live/funnel_settings.ex
index 0abe10976..16f7913e2 100644
--- a/lib/plausible_web/live/funnel_settings.ex
+++ b/lib/plausible_web/live/funnel_settings.ex
@@ -22,12 +22,27 @@ defmodule PlausibleWeb.Live.FunnelSettings do
<%= if @add_funnel? do %>
<.live_component module={PlausibleWeb.Live.FunnelSettings.Form} id="funnelForm" site={@site} form={to_form(Plausible.Funnel.changeset())} goals={@goals} />
<% else %>
- <.live_component module={PlausibleWeb.Live.FunnelSettings.List} id="funnelsList" funnels={@funnels} site={@site} />
- + Add funnel
+
= 2}>
+ <.live_component module={PlausibleWeb.Live.FunnelSettings.List} id="funnelsList" funnels={@funnels} site={@site} />
+ + Add funnel
+
+
- <.form :let={f} for={@form} phx-change="validate" phx-submit="save">
+ <.form :let={f} for={@form} phx-change="validate" phx-submit="save" onkeydown="return event.key != 'Enter';">
<%= label f, "Funnel name", class: "block text-sm font-medium text-gray-700 dark:text-gray-300" %>
<.input field={@form[:name]} />
<%= label f, "Funnel Steps", class: "mt-6 block text-sm font-medium text-gray-700 dark:text-gray-300" %>
- <%= for _step_number <- 1..@step_count do %>
- <.select goals={@goals} myself={@myself} />
- <% end %>
+ <.live_component
+ :for={step_number <- 1..@step_count}
+ module={PlausibleWeb.Live.FunnelSettings.InputPicker}
+ id={"step-#{step_number}"}
+ options={Enum.map(@goals, fn goal -> {goal.id, Plausible.Goal.display_name(goal)} end)}
+ />
- <%= if @step_count < 5 do %>
-
Add another step
- <% end %>
+
Add another step
-
Save
+
Save
Cancel
@@ -40,26 +41,11 @@ defmodule PlausibleWeb.Live.FunnelSettings.Form do
"""
end
- attr :field, Phoenix.HTML.FormField
+ attr(:field, Phoenix.HTML.FormField)
def input(assigns) do
~H"""
-
- """
- end
-
- attr :goals, :map, required: true
- attr :myself, :any, required: true
-
- def select(assigns) do
- ~H"""
-
- <%= for goal <- @goals do %>
-
- <%= Plausible.Goal.display_name(goal) %>
-
- <% end %>
-
+
"""
end
@@ -80,7 +66,3 @@ defmodule PlausibleWeb.Live.FunnelSettings.Form do
{:noreply, assign(socket, goals: except_first)}
end
end
-
-# goal_options = [{"N/A", ""} | Enum.map(@goals, fn goal -> {Plausible.Goal.display_name(goal), goal.id} end)] %>
-#
-# end
diff --git a/lib/plausible_web/live/funnel_settings/input_picker.ex b/lib/plausible_web/live/funnel_settings/input_picker.ex
new file mode 100644
index 000000000..4f05bd20a
--- /dev/null
+++ b/lib/plausible_web/live/funnel_settings/input_picker.ex
@@ -0,0 +1,180 @@
+defmodule PlausibleWeb.Live.FunnelSettings.InputPicker do
+ use Phoenix.LiveComponent
+
+ attr :placeholder, :string, default: "Select a Goal"
+ attr :id, :any, default: nil
+ attr :options, :list, default: []
+ attr :choices, :list, default: nil
+ attr :show_picker?, :boolean, default: false
+ attr :value, :string, default: ""
+ attr :goal_id, :string, default: ""
+ attr :higlighted, :integer, default: nil
+
+ def render(assigns) do
+ ~H"""
+
+
+
+ <.picker id={"picker-#{@id}"} :if={@show_picker?} options={@options} choices={@choices || @options} target={@myself} higlighted={@higlighted} />
+
+ """
+ end
+
+ attr :id, :any, default: nil
+ attr :options, :list, default: []
+ attr :choices, :list, default: []
+ attr :higlighted, :any
+ attr :target, :any
+
+ def picker(assigns) do
+ ~H"""
+
+ <%= if @choices != [] do %>
+ <%= for {goal_id, goal_name} <- @choices do %>
+ <.li goal_id={goal_id} goal_name={goal_name} target={@target} higlighted={@higlighted}/>
+ <% end %>
+ <% else %>
+ No matches found in the current goals. Try searching for something different.
+ <% end %>
+
+ """
+ end
+
+ attr :higlighted, :any, default: nil
+ attr :goal_name, :string, required: true
+ attr :goal_id, :integer, required: true
+ attr :target, :any
+
+ def li(assigns) do
+ ~H"""
+ <%= if @higlighted == @goal_id do %>
+
+ <%= @goal_name %>
+
+ <% else %>
+
+ <%= @goal_name %>
+
+ <% end %>
+ """
+ end
+
+ def handle_event("selected", %{"goal-name" => goal_name}, socket) do
+ send(self(), :goal_picked)
+ {:noreply, assign(socket, %{show_picker?: false, value: goal_name})}
+ end
+
+ def handle_event("keypress", %{"key" => "ArrowDown"}, socket) do
+ choices = socket.assigns.choices
+ current = socket.assigns.higlighted
+
+ next =
+ Enum.drop_while(choices, fn {id, _} -> id != current end)
+ |> Enum.take(2)
+ |> List.last()
+
+ higlighted =
+ case next do
+ {next_id, _} ->
+ next_id
+
+ nil ->
+ current
+ end
+
+ {:noreply, assign(socket, %{higlighted: higlighted, show_picker?: true})}
+ end
+
+ def handle_event("keypress", %{"key" => "ArrowUp"}, socket) do
+ choices = socket.assigns.choices
+ current = socket.assigns.higlighted
+
+ next =
+ choices
+ |> Enum.reverse()
+ |> Enum.drop_while(fn {id, _} -> id != current end)
+ |> Enum.take(2)
+ |> List.last()
+
+ higlighted =
+ case next do
+ {next_id, _} ->
+ next_id
+
+ nil ->
+ current
+ end
+
+ {:noreply, assign(socket, %{higlighted: higlighted, show_picker?: true})}
+ end
+
+ def handle_event("keypress", %{"key" => "Enter"}, socket) do
+ choices = socket.assigns.choices
+ current = socket.assigns.higlighted
+
+ goal_name =
+ Enum.find_value(choices, fn {id, goal_name} ->
+ if id == current, do: goal_name
+ end)
+
+ socket =
+ socket
+ |> assign(%{show_picker?: false, value: goal_name, higlighted: nil})
+ |> push_event("update-value", %{id: socket.assigns.id, value: goal_name})
+
+ {:noreply, socket}
+ end
+
+ def handle_event("keypress", %{"key" => _other, "value" => typed}, socket) do
+ if String.length(typed) > 0 do
+ choices =
+ Enum.filter(socket.assigns.options, fn {_id, goal_name} ->
+ String.contains?(goal_name, typed) ||
+ String.jaro_distance(String.upcase(goal_name), String.upcase(typed)) > 0.6
+ end)
+ |> Enum.sort_by(fn {_id, goal_name} -> String.jaro_distance(goal_name, typed) end, :desc)
+ |> Enum.take(10)
+
+ first_id =
+ case List.first(choices) do
+ {id, _} -> id
+ nil -> nil
+ end
+
+ {:noreply, assign(socket, %{choices: choices, show_picker?: true, higlighted: first_id})}
+ else
+ {:noreply, socket}
+ end
+ end
+
+ def handle_event("hide-picker", _, socket) do
+ {:noreply, assign(socket, %{show_picker?: false})}
+ end
+
+ def handle_event("show-picker", _, socket) do
+ socket =
+ if socket.assigns[:choices] == [] do
+ assign(socket, %{show_picker?: true, choices: socket.assigns.options})
+ else
+ assign(socket, %{show_picker?: true})
+ end
+
+ {:noreply, socket}
+ end
+
+ def handle_event(event, payload, socket) do
+ IO.inspect(event, label: :event)
+ IO.inspect(payload, label: :payload)
+ {:noreply, socket}
+ end
+end
diff --git a/lib/plausible_web/router.ex b/lib/plausible_web/router.ex
index 9fd95e7ae..8e2bc045e 100644
--- a/lib/plausible_web/router.ex
+++ b/lib/plausible_web/router.ex
@@ -250,7 +250,7 @@ defmodule PlausibleWeb.Router do
get "/:website/settings/funnels", SiteController, :settings_funnels
# post "/:website/settings/funnels", SiteController, :save_funnel
- # live "/:website/settings/funnels", Live.FunnelSettings
+ # live "/:website/settings/funnel2", Live.FunnelSettings
get "/:website/settings/search-console", SiteController, :settings_search_console
get "/:website/settings/email-reports", SiteController, :settings_email_reports
diff --git a/lib/plausible_web/templates/site/settings_goals.html.eex b/lib/plausible_web/templates/site/settings_goals.html.eex
index 9235dd5d2..41531ebd2 100644
--- a/lib/plausible_web/templates/site/settings_goals.html.eex
+++ b/lib/plausible_web/templates/site/settings_goals.html.eex
@@ -23,4 +23,7 @@
<% end %>
<%= link("+ Add goal", to: "/#{URI.encode_www_form(@site.domain)}/goals/new", class: "button mt-6") %>
+ <%= if Enum.count(@goals) >= 2 do %>
+ <%= link("Set up funnels", to: Routes.site_path(@conn, :settings_funnels, @site.domain), class: "button mt-6 ml-2") %>
+ <% end %>
diff --git a/priv/repo/migrations/20230417095029_init_funnels.exs b/priv/repo/migrations/20230417095029_init_funnels.exs
index 99a1ae2ec..f45fe6423 100644
--- a/priv/repo/migrations/20230417095029_init_funnels.exs
+++ b/priv/repo/migrations/20230417095029_init_funnels.exs
@@ -4,12 +4,12 @@ defmodule Plausible.Repo.Migrations.InitFunnels do
def change do
create table(:funnels) do
add :name, :string, null: false
- add :site_id, references(:sites), null: false
+ add :site_id, references(:sites, on_delete: :delete_all), null: false
timestamps()
end
create table(:funnel_steps) do
- add :goal_id, references(:goals), null: false
+ add :goal_id, references(:goals, on_delete: :delete_all), null: false
add :funnel_id, references(:funnels, on_delete: :delete_all), null: false
add :step_order, :integer, null: false
timestamps()