diff --git a/lib/plausible/goal/schema.ex b/lib/plausible/goal/schema.ex index b2e902fd6..3d57082dc 100644 --- a/lib/plausible/goal/schema.ex +++ b/lib/plausible/goal/schema.ex @@ -21,12 +21,13 @@ defmodule Plausible.Goal do import Ecto.Changeset schema "goals" do - field :event_name, :string - field :page_path, :string + field(:event_name, :string) + field(:page_path, :string) + field(:currency, Ecto.Enum, values: Money.Currency.known_current_currencies()) - field :currency, Ecto.Enum, values: Money.Currency.known_current_currencies() + many_to_many(:funnels, Plausible.Funnel, join_through: Plausible.Funnel.Step) - belongs_to :site, Plausible.Site + belongs_to(:site, Plausible.Site) timestamps() end diff --git a/lib/plausible/goals.ex b/lib/plausible/goals.ex index 69c13c776..41e4fd4a4 100644 --- a/lib/plausible/goals.ex +++ b/lib/plausible/goals.ex @@ -49,7 +49,7 @@ defmodule Plausible.Goals do def find_or_create(_, %{"goal_type" => "page"}), do: {:missing, "page_path"} - def for_site(site) do + def for_site(site, opts \\ []) do query = from(g in Goal, inner_join: assoc(g, :site), @@ -58,6 +58,17 @@ defmodule Plausible.Goals do preload: [:site] ) + query = + if opts[:preload_funnels?] do + from(g in query, + left_join: assoc(g, :funnels), + group_by: g.id, + preload: [:funnels] + ) + else + query + end + query |> Repo.all() |> Enum.map(&maybe_trim/1) @@ -77,18 +88,22 @@ defmodule Plausible.Goals do end def belongs_to_funnels?(goal_id) do - Repo.exists?(from fs in Plausible.Funnel.Step, where: fs.goal_id == ^goal_id) + Repo.exists?(from(fs in Plausible.Funnel.Step, where: fs.goal_id == ^goal_id)) end def delete(id, site) do - case Repo.delete_all( - from(g in Goal, - where: g.id == ^id, - where: g.site_id == ^site.id - ) - ) do - {1, _} -> :ok - {0, _} -> {:error, :not_found} + if not belongs_to_funnels?(id) do + case Repo.delete_all( + from(g in Goal, + where: g.id == ^id, + where: g.site_id == ^site.id + ) + ) do + {1, _} -> :ok + {0, _} -> {:error, :not_found} + end + else + raise "Implement me" end end diff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.ex index 154c1bed2..d4dbae306 100644 --- a/lib/plausible_web/controllers/site_controller.ex +++ b/lib/plausible_web/controllers/site_controller.ex @@ -3,18 +3,21 @@ defmodule PlausibleWeb.SiteController do use Plausible.Repo alias Plausible.{Sites, Goals} - plug PlausibleWeb.RequireAccountPlug + plug(PlausibleWeb.RequireAccountPlug) - plug PlausibleWeb.AuthorizeSiteAccess, - [:owner, :admin, :super_admin] when action not in [:index, :new, :create_site] + plug( + PlausibleWeb.AuthorizeSiteAccess, + [:owner, :admin, :super_admin] when action not in [:index, :new, :create_site] + ) def index(conn, params) do user = conn.assigns[:current_user] invitations = Repo.all( - from i in Plausible.Auth.Invitation, + from(i in Plausible.Auth.Invitation, where: i.email == ^user.email + ) ) |> Repo.preload(:site) @@ -109,10 +112,11 @@ defmodule PlausibleWeb.SiteController do is_first_site = !Repo.exists?( - from sm in Plausible.Site.Membership, + from(sm in Plausible.Site.Membership, where: sm.user_id == ^user.id and sm.site_id != ^site.id + ) ) conn @@ -212,7 +216,7 @@ defmodule PlausibleWeb.SiteController do def settings_visibility(conn, _params) do site = conn.assigns[:site] |> Repo.preload(:custom_domain) - shared_links = Repo.all(from l in Plausible.Site.SharedLink, where: l.site_id == ^site.id) + shared_links = Repo.all(from(l in Plausible.Site.SharedLink, where: l.site_id == ^site.id)) conn |> assign(:skip_plausible_tracking, true) @@ -225,7 +229,7 @@ defmodule PlausibleWeb.SiteController do def settings_goals(conn, _params) do site = conn.assigns[:site] |> Repo.preload(:custom_domain) - goals = Goals.for_site(site) + goals = Goals.for_site(site, preload_funnels?: true) conn |> assign(:skip_plausible_tracking, true) @@ -420,7 +424,7 @@ defmodule PlausibleWeb.SiteController do def disable_weekly_report(conn, _params) do site = conn.assigns[:site] - Repo.delete_all(from wr in Plausible.Site.WeeklyReport, where: wr.site_id == ^site.id) + Repo.delete_all(from(wr in Plausible.Site.WeeklyReport, where: wr.site_id == ^site.id)) conn |> put_flash(:success, "You will not receive weekly email reports going forward") @@ -470,7 +474,7 @@ defmodule PlausibleWeb.SiteController do def disable_monthly_report(conn, _params) do site = conn.assigns[:site] - Repo.delete_all(from mr in Plausible.Site.MonthlyReport, where: mr.site_id == ^site.id) + Repo.delete_all(from(mr in Plausible.Site.MonthlyReport, where: mr.site_id == ^site.id)) conn |> put_flash(:success, "You will not receive monthly email reports going forward") @@ -530,7 +534,7 @@ defmodule PlausibleWeb.SiteController do def disable_spike_notification(conn, _params) do site = conn.assigns[:site] - Repo.delete_all(from mr in Plausible.Site.SpikeNotification, where: mr.site_id == ^site.id) + Repo.delete_all(from(mr in Plausible.Site.SpikeNotification, where: mr.site_id == ^site.id)) conn |> put_flash(:success, "Spike notification disabled") @@ -646,9 +650,10 @@ defmodule PlausibleWeb.SiteController do site_id = site.id case Repo.delete_all( - from l in Plausible.Site.SharedLink, + from(l in Plausible.Site.SharedLink, where: l.slug == ^slug, where: l.site_id == ^site_id + ) ) do {1, _} -> conn @@ -667,9 +672,10 @@ defmodule PlausibleWeb.SiteController do site_id = site.id case Repo.delete_all( - from d in Plausible.Site.CustomDomain, + from(d in Plausible.Site.CustomDomain, where: d.site_id == ^site_id, where: d.id == ^domain_id + ) ) do {1, _} -> conn diff --git a/lib/plausible_web/templates/site/settings_goals.html.eex b/lib/plausible_web/templates/site/settings_goals.html.eex index be68f79b3..56fe05630 100644 --- a/lib/plausible_web/templates/site/settings_goals.html.eex +++ b/lib/plausible_web/templates/site/settings_goals.html.eex @@ -13,24 +13,23 @@