From ff11b3f26d494cd67255e48621d0d98bf7d764ab Mon Sep 17 00:00:00 2001 From: hq1 Date: Wed, 28 Jun 2023 13:20:19 +0200 Subject: [PATCH] Bugfix: funnel deletion (#3090) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Somewhere along the way of rebasing the feature, the integration tests for deletion were lost. j/k they were never written 🤡 --- lib/plausible_web/live/funnel_settings.ex | 7 ++- .../live/funnel_settings/list.ex | 1 + .../funnel_settings/funnel_settings_test.exs | 57 ++++++++++++++++--- 3 files changed, 55 insertions(+), 10 deletions(-) diff --git a/lib/plausible_web/live/funnel_settings.ex b/lib/plausible_web/live/funnel_settings.ex index 5aef5bcb4..4e7ae6280 100644 --- a/lib/plausible_web/live/funnel_settings.ex +++ b/lib/plausible_web/live/funnel_settings.ex @@ -80,11 +80,14 @@ defmodule PlausibleWeb.Live.FunnelSettings do end def handle_event("delete-funnel", %{"funnel-id" => id}, socket) do + site = + Sites.get_for_user!(socket.assigns.current_user_id, socket.assigns.domain, [:owner, :admin]) + id = String.to_integer(id) - :ok = Funnels.delete(socket.assigns.site, id) + :ok = Funnels.delete(site, id) socket = put_flash(socket, :success, "Funnel deleted successfully") Process.send_after(self(), :clear_flash, 5000) - {:noreply, assign(socket, funnels: Funnels.list(socket.assigns.site))} + {:noreply, assign(socket, funnels: Enum.reject(socket.assigns.funnels, &(&1.id == id)))} end def handle_info({:funnel_saved, funnel}, socket) do diff --git a/lib/plausible_web/live/funnel_settings/list.ex b/lib/plausible_web/live/funnel_settings/list.ex index e25713ffd..56cc9b505 100644 --- a/lib/plausible_web/live/funnel_settings/list.ex +++ b/lib/plausible_web/live/funnel_settings/list.ex @@ -25,6 +25,7 @@ defmodule PlausibleWeb.Live.FunnelSettings.List do