From d144b6577d0a8abd74e0b53cf38206058debcbbd Mon Sep 17 00:00:00 2001 From: Adam Rutkowski Date: Thu, 18 May 2023 16:51:00 +0200 Subject: [PATCH] wip --- lib/plausible/funnel.ex | 4 +++- lib/plausible_web/live/funnel_settings/form.ex | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/plausible/funnel.ex b/lib/plausible/funnel.ex index 22a62011d..5c24386a9 100644 --- a/lib/plausible/funnel.ex +++ b/lib/plausible/funnel.ex @@ -51,7 +51,9 @@ defmodule Plausible.Funnel do funnel |> cast(attrs, [:name]) - |> cast_assoc(:steps, with: &Step.changeset/2) + |> validate_required([:name]) + |> cast_assoc(:steps, with: &Step.changeset/2, required: true) + |> validate_length(:steps, min: 2, max: 5) |> unique_constraint(:name, name: :funnels_name_site_id_index ) diff --git a/lib/plausible_web/live/funnel_settings/form.ex b/lib/plausible_web/live/funnel_settings/form.ex index bd32fa5e9..d988f5edd 100644 --- a/lib/plausible_web/live/funnel_settings/form.ex +++ b/lib/plausible_web/live/funnel_settings/form.ex @@ -30,9 +30,9 @@ defmodule PlausibleWeb.Live.FunnelSettings.Form do <%= label(f, "Funnel name", class: "block text-sm font-medium text-gray-700 dark:text-gray-300" ) %> - <.input field={@form[:name]} /> + <.input field={f[:name]} /> -
+
<%= label(f, "Funnel Steps", class: "mt-6 block text-sm font-medium text-gray-700 dark:text-gray-300" ) %> @@ -117,7 +117,7 @@ defmodule PlausibleWeb.Live.FunnelSettings.Form do params["name"], params["steps"] || [] ) - |> Map.put(:action, :insert) + |> Map.put(:action, :validate) {:noreply, assign(socket, form: to_form(changeset))} end