diff --git a/lib/plausible/funnel.ex b/lib/plausible/funnel.ex index 9bf77bcfa..22a62011d 100644 --- a/lib/plausible/funnel.ex +++ b/lib/plausible/funnel.ex @@ -17,6 +17,7 @@ defmodule Plausible.Funnel do def changeset(step, attrs \\ %{}) do step |> cast(attrs, [:step_order, :goal_id]) + |> validate_required([:goal_id, :step_order]) |> unique_constraint(:goal, name: :funnel_steps_goal_id_funnel_id_index ) @@ -38,8 +39,21 @@ defmodule Plausible.Funnel do end def changeset(funnel \\ %__MODULE__{}, attrs \\ %{}) do + step_attrs = + attrs + |> Map.get(:steps, []) + |> Enum.with_index() + |> Enum.map(fn {goal_params, step_order} -> + Map.put(goal_params, "step_order", step_order) + end) + + attrs = Map.replace(attrs, :steps, step_attrs) + funnel |> cast(attrs, [:name]) |> cast_assoc(:steps, with: &Step.changeset/2) + |> unique_constraint(:name, + name: :funnels_name_site_id_index + ) end end diff --git a/lib/plausible/funnels.ex b/lib/plausible/funnels.ex index 8ef0f50f8..d1df1d104 100644 --- a/lib/plausible/funnels.ex +++ b/lib/plausible/funnels.ex @@ -10,23 +10,11 @@ defmodule Plausible.Funnels do import Ecto.Query - def create(site, name, goals) - when is_list(goals) and length(goals) >= @min_funnel_size and - length(goals) <= @max_funnel_size do - steps = - goals - |> Enum.with_index(1) - |> Enum.map(fn {goal, index} -> - %{ - goal_id: goal.id, - step_order: index - } - end) - - %Funnel{ - site_id: site.id - } - |> Funnel.changeset(%{name: name, steps: steps}) + def create(site, name, steps) + when is_list(steps) and length(steps) >= @min_funnel_size and + length(steps) <= @max_funnel_size do + site + |> create_changeset(name, steps) |> Repo.insert() end @@ -34,11 +22,16 @@ defmodule Plausible.Funnels do {:error, :invalid_funnel_size} end + def create_changeset(site, name, steps) do + Funnel.changeset(%Funnel{site_id: site.id}, %{name: name, steps: steps}) + end + def list(%Plausible.Site{id: site_id}) do Repo.all( from(f in Funnel, where: f.site_id == ^site_id, - select: %{name: f.name, id: f.id} + select: %{name: f.name, id: f.id}, + order_by: [desc: :id] ) ) end diff --git a/lib/plausible_web/live/funnel_settings.ex b/lib/plausible_web/live/funnel_settings.ex index 0ccc87957..8b5ae53ae 100644 --- a/lib/plausible_web/live/funnel_settings.ex +++ b/lib/plausible_web/live/funnel_settings.ex @@ -24,7 +24,7 @@ defmodule PlausibleWeb.Live.FunnelSettings do module={PlausibleWeb.Live.FunnelSettings.Form} id="funnelForm" site={@site} - form={to_form(Plausible.Funnel.changeset())} + form={to_form(Plausible.Funnels.create_changeset(@site, "", []))} goals={@goals} /> <% else %> @@ -52,40 +52,15 @@ defmodule PlausibleWeb.Live.FunnelSettings do """ end - def handle_event("save", data, socket) do - site = socket.assigns.site - step_keys = for i <- 1..5, do: "step-#{i}" - - goals = - Map.take(data, step_keys) - |> Enum.reject(fn {_key, value} -> String.trim(value) == "" end) - |> Enum.sort_by(&elem(&1, 0)) - |> Enum.map(&Goals.by_id!(site, String.to_integer(elem(&1, 1)))) - - funnel_name = data["funnel"]["name"] - - {:ok, _funnel} = Plausible.Funnels.create(site, funnel_name, goals) - - funnels = Funnels.list(site) - - {:noreply, assign(socket, add_funnel?: false, funnels: funnels)} - end - def handle_event("add_funnel", _value, socket) do - {:noreply, assign(socket, :add_funnel?, true)} + {:noreply, assign(socket, add_funnel?: true)} end def handle_event("cancel_add_funnel", _value, socket) do - {:noreply, assign(socket, :add_funnel?, false)} - end - - def handle_event("validate", value, socket) do - IO.inspect(value, label: :validate) - {:noreply, socket} + {:noreply, assign(socket, add_funnel?: false)} end - def handle_info(:goal_picked, socket) do - IO.inspect("Picker notified") - {:noreply, socket} + def handle_info({:funnel_saved, funnel}, socket) do + {:noreply, assign(socket, add_funnel?: false, funnels: [funnel | socket.assigns.funnels])} end end diff --git a/lib/plausible_web/live/funnel_settings/form.ex b/lib/plausible_web/live/funnel_settings/form.ex index 21d1227ec..bd32fa5e9 100644 --- a/lib/plausible_web/live/funnel_settings/form.ex +++ b/lib/plausible_web/live/funnel_settings/form.ex @@ -7,7 +7,12 @@ defmodule PlausibleWeb.Live.FunnelSettings.Form do end def update(assigns, socket) do - {:ok, assign(socket, form: assigns.form, goals: assigns.goals)} + {:ok, + assign(socket, + form: assigns.form, + goals: assigns.goals, + site: assigns.site + )} end def render(assigns) do @@ -18,6 +23,7 @@ defmodule PlausibleWeb.Live.FunnelSettings.Form do :let={f} for={@form} phx-change="validate" + phx-target={@myself} phx-submit="save" onkeydown="return event.key != 'Enter';" > @@ -26,35 +32,38 @@ defmodule PlausibleWeb.Live.FunnelSettings.Form do ) %> <.input field={@form[:name]} /> - <%= label(f, "Funnel Steps", - class: "mt-6 block text-sm font-medium text-gray-700 dark:text-gray-300" - ) %> +