pull/2859/head
Adam Rutkowski 4 years ago
parent 637d7ec548
commit b4d8a6ab38

@ -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

@ -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

@ -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

@ -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"
) %>
<div :if={String.trim(@form[:name].value) != ""} id="steps-builder">
<%= label(f, "Funnel Steps",
class: "mt-6 block text-sm font-medium text-gray-700 dark:text-gray-300"
) %>
<.live_component
:for={step_number <- 1..@step_count}
submit_name="funnel[steps][][goal_id]"
module={PlausibleWeb.Live.FunnelSettings.InputPicker}
id={"step-#{step_number}"}
options={Enum.map(@goals, fn goal -> {goal.id, Plausible.Goal.display_name(goal)} 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)}
/>
<a
:if={@step_count < 5}
class="underline text-indigo-600 text-sm cursor-pointer mt-6"
phx-click="add-step"
phx-target={@myself}
>
+ Add another step
</a>
<div class="mt-6">
<button type="submit" class="button mt-6">Save</button>
<button
type="button"
class="inline-block mt-4 ml-2 px-4 py-2 border border-gray-300 dark:border-gray-500 text-sm leading-5 font-medium rounded-md text-red-700 bg-white dark:bg-gray-800 hover:text-red-500 dark:hover:text-red-400 focus:outline-none focus:border-blue-300 focus:ring active:text-red-800 active:bg-gray-50 transition ease-in-out duration-150 "
phx-click="cancel_add_funnel"
<a
:if={@step_count < 5}
class="underline text-indigo-600 text-sm cursor-pointer mt-6"
phx-click="add-step"
phx-target={@myself}
>
Cancel
</button>
+ Add another step
</a>
<div class="mt-6">
<button type="submit" class="button mt-6">Save</button>
<button
type="button"
class="inline-block mt-4 ml-2 px-4 py-2 border border-gray-300 dark:border-gray-500 text-sm leading-5 font-medium rounded-md text-red-700 bg-white dark:bg-gray-800 hover:text-red-500 dark:hover:text-red-400 focus:outline-none focus:border-blue-300 focus:ring active:text-red-800 active:bg-gray-50 transition ease-in-out duration-150 "
phx-click="cancel_add_funnel"
>
Cancel
</button>
</div>
</div>
</.form>
</div>
@ -66,15 +75,28 @@ defmodule PlausibleWeb.Live.FunnelSettings.Form do
def input(assigns) do
~H"""
<input
autofocus
type="text"
id={@field.id}
name={@field.name}
value={@field.value}
phx-debounce="300"
class="focus:ring-indigo-500 focus:border-indigo-500 dark:bg-gray-900 dark:text-gray-300 block w-full rounded-md sm:text-sm border-gray-300 dark:border-gray-500"
/>
<div phx-feedback-for={@field.name}>
<input
autocomplete="off"
autofocus
type="text"
id={@field.id}
name={@field.name}
value={@field.value}
phx-debounce="300"
class="focus:ring-indigo-500 focus:border-indigo-500 dark:bg-gray-900 dark:text-gray-300 block w-full rounded-md sm:text-sm border-gray-300 dark:border-gray-500"
/>
<.error :for={{msg, _} <- @field.errors}>Funnel name <%= msg %></.error>
</div>
"""
end
def error(assigns) do
~H"""
<div class="mt-2 text-sm text-red-600">
<%= render_slot(@inner_block) %>
</div>
"""
end
@ -88,10 +110,36 @@ defmodule PlausibleWeb.Live.FunnelSettings.Form do
end
end
def handle_event(event, value, socket) do
IO.inspect(event, label: :event)
IO.inspect(value, label: :value)
[_ | except_first] = socket.assigns.goals
{:noreply, assign(socket, goals: except_first)}
def handle_event("validate", %{"funnel" => params}, socket) do
changeset =
Plausible.Funnels.create_changeset(
socket.assigns.site,
params["name"],
params["steps"] || []
)
|> Map.put(:action, :insert)
{:noreply, assign(socket, form: to_form(changeset))}
end
def handle_event("save", %{"funnel" => params}, %{assigns: %{site: site}} = socket) do
IO.inspect(:saving)
case Plausible.Funnels.create(site, params["name"], params["steps"]) do
{:ok, funnel} ->
send(self(), {:funnel_saved, funnel})
{:noreply, socket}
{:error, changeset} ->
IO.inspect(changeset)
IO.inspect(to_form(changeset))
Ecto.Changeset.traverse_errors(changeset, fn thing ->
IO.inspect(thing)
end)
{:noreply, assign(socket, form: to_form(changeset))}
end
end
end

@ -21,6 +21,7 @@ defmodule PlausibleWeb.Live.FunnelSettings.InputPicker do
attr(:placeholder, :string, default: "Select option or search by typing")
attr(:id, :any, default: nil)
attr(:options, :list, required: true)
attr(:submit_name, :string, required: true)
def render(assigns) do
~H"""
@ -34,11 +35,11 @@ defmodule PlausibleWeb.Live.FunnelSettings.InputPicker do
type="text"
autocomplete="off"
id={@id}
name={"display-#{@id}"}
placeholder={@placeholder}
phx-keyup="keypress"
phx-focus={open_dropdown(@id)}
phx-target={@myself}
name={"display-#{@id}"}
value={@display_value}
class="border-none py-1 px-1 p-0 w-full inline-block rounded-md focus:outline-none focus:ring-0 text-sm"
style="background-color: inherit;"
@ -46,7 +47,7 @@ defmodule PlausibleWeb.Live.FunnelSettings.InputPicker do
<.dropdown_anchor id={@id} />
<input type="hidden" name={@id} value={@submit_value} />
<input type="hidden" name={@submit_name} value={@submit_value} />
</div>
</div>
@ -263,12 +264,6 @@ defmodule PlausibleWeb.Live.FunnelSettings.InputPicker do
end
end
def handle_event(event, payload, socket) do
IO.inspect(event, label: :event)
IO.inspect(payload, label: :payload)
{:noreply, socket}
end
defp do_select(socket, submit_value, display_value) do
id = socket.assigns.id

Loading…
Cancel
Save