Minor rework

lib/plausible/funnels.ex

@@ -32,7 +32,6 @@ defmodule Plausible.Funnels do
         where: f.site_id == ^site_id,
         select: %{name: f.name, id: f.id}
     )
-    |> IO.inspect(label: :listing_funnels)
   end
 
   def get(%Plausible.Site{id: site_id}, by) do
@@ -72,11 +71,11 @@ defmodule Plausible.Funnels do
         select: {f.step, count(1)},
         group_by: f.step
 
-    funnel_result =
+    steps =
-      ClickhouseRepo.all(query)
+      query
+      |> ClickhouseRepo.all()
       |> Enum.into(%{})
-
+      |> backfill_steps(funnel)
-    steps = update_step_defaults(funnel, funnel_result)
 
     %{
       name: funnel.name,
@@ -123,23 +122,20 @@ defmodule Plausible.Funnels do
     )
   end
 
-  defp update_step_defaults(funnel, funnel_result) do
+  defp backfill_steps(funnel_result, funnel) do
     max_step = Enum.max_by(funnel.steps, & &1.step_order).step_order
 
-    funnel.steps
+    funnel
+    |> Map.fetch!(:steps)
     |> Enum.map(fn step ->
-      label = Plausible.Goal.display_name(step.goal)
-
       visitors_total =
         Enum.reduce(step.step_order..max_step, 0, fn step_order, acc ->
-          visitors = Map.get(funnel_result, step_order, 0)
+          acc + Map.get(funnel_result, step_order, 0)
-
-          acc + visitors
         end)
 
       %{
         visitors: visitors_total,
-        label: label
+        label: Plausible.Goal.display_name(step.goal)
       }
     end)
   end

lib/plausible_web/controllers/site_controller.ex

@@ -258,10 +258,7 @@ defmodule PlausibleWeb.SiteController do
     sanitized_params =
       ["step_1", "step_2", "step_3", "step_4", "step_5"]
       |> Enum.map(&params[&1])
-      |> Enum.filter(fn
+      |> Enum.reject(fn v == "")
-        "" -> false
-        goal_id -> true
-      end)
       |> Enum.map(fn goal_id -> %{id: String.to_integer(goal_id)} end)
       |> IO.inspect(label: :params)
 

lib/plausible_web/controllers/stats_controller.ex

@@ -293,6 +293,7 @@ defmodule PlausibleWeb.StatsController do
         |> render("stats.html",
           site: shared_link.site,
           has_goals: Sites.has_goals?(shared_link.site),
+          funnels: nil,
           stats_start_date: shared_link.site.stats_start_date,
           native_stats_start_date: NaiveDateTime.to_date(shared_link.site.native_stats_start_at),
           title: "Plausible · " <> shared_link.site.domain,

test/plausible/funnels_test.exs

@@ -57,7 +57,7 @@ defmodule Plausible.FunnelsTest do
   end
 
   test "a goal can only appear once in a funnel", %{goals: [g1 | _], site: site} do
-    {:error, changeset} =
+    {:error, _changeset} =
       Funnels.create(
         site,
         "Lorem ipsum",