- <.live_component id="embedded_liveview_flash" module={PlausibleWeb.Live.Flash} flash={@flash} />
+ <.flash_messages flash={@flash} />
<%= if @add_goal? do %>
<%= live_render(
@socket,
@@ -89,13 +90,12 @@ defmodule PlausibleWeb.Live.GoalSettings do
:ok ->
socket =
socket
- |> put_flash(:success, "Goal deleted successfully")
+ |> put_live_flash(:success, "Goal deleted successfully")
|> assign(
all_goals: Enum.reject(socket.assigns.all_goals, &(&1.id == goal_id)),
displayed_goals: Enum.reject(socket.assigns.displayed_goals, &(&1.id == goal_id))
)
- Process.send_after(self(), :clear_flash, 5000)
{:noreply, socket}
_ ->
@@ -116,12 +116,8 @@ defmodule PlausibleWeb.Live.GoalSettings do
all_goals: [goal | socket.assigns.all_goals],
displayed_goals: [goal | socket.assigns.all_goals]
)
- |> put_flash(:success, "Goal saved successfully")
+ |> put_live_flash(:success, "Goal saved successfully")
{:noreply, socket}
end
-
- def handle_info(:clear_flash, socket) do
- {:noreply, clear_flash(socket)}
- end
end
diff --git a/lib/plausible_web/live/plugins/api/settings.ex b/lib/plausible_web/live/plugins/api/settings.ex
index 7f48382db..82b287ddd 100644
--- a/lib/plausible_web/live/plugins/api/settings.ex
+++ b/lib/plausible_web/live/plugins/api/settings.ex
@@ -4,6 +4,7 @@ defmodule PlausibleWeb.Live.Plugins.API.Settings do
"""
use Phoenix.LiveView
use Phoenix.HTML
+ use PlausibleWeb.Live.Flash
alias Plausible.Sites
alias Plausible.Plugins.API.Tokens
@@ -33,7 +34,7 @@ defmodule PlausibleWeb.Live.Plugins.API.Settings do
def render(assigns) do
~H"""
- <.live_component id="embedded_liveview_flash" module={PlausibleWeb.Live.Flash} flash={@flash} />
+ <.flash_messages flash={@flash} />
<%= if @add_token? do %>
<%= live_render(
@@ -139,9 +140,7 @@ defmodule PlausibleWeb.Live.Plugins.API.Settings do
def handle_info({:token_added, token}, socket) do
displayed_tokens = [token | socket.assigns.displayed_tokens]
- socket = put_flash(socket, :success, "Plugins API Token created successfully")
-
- Process.send_after(self(), :clear_flash, 5000)
+ socket = put_live_flash(socket, :success, "Plugins API Token created successfully")
{:noreply,
assign(socket,
@@ -150,8 +149,4 @@ defmodule PlausibleWeb.Live.Plugins.API.Settings do
token_description: ""
)}
end
-
- def handle_info(:clear_flash, socket) do
- {:noreply, clear_flash(socket)}
- end
end
diff --git a/lib/plausible_web/live/props_settings.ex b/lib/plausible_web/live/props_settings.ex
index 7c6d54360..d48c6fee3 100644
--- a/lib/plausible_web/live/props_settings.ex
+++ b/lib/plausible_web/live/props_settings.ex
@@ -5,6 +5,8 @@ defmodule PlausibleWeb.Live.PropsSettings do
use Phoenix.LiveView
use Phoenix.HTML
+ use PlausibleWeb.Live.Flash
+
alias PlausibleWeb.Live.Components.ComboBox
def mount(
@@ -37,7 +39,7 @@ defmodule PlausibleWeb.Live.PropsSettings do
def render(assigns) do
~H"""
- <.live_component id="embedded_liveview_flash" module={PlausibleWeb.Live.Flash} flash={@flash} />
+ <.flash_messages flash={@flash} />
<%= if @add_prop? do %>
<%= live_render(
@socket,
@@ -105,14 +107,13 @@ defmodule PlausibleWeb.Live.PropsSettings do
socket =
socket
- |> put_flash(:success, "Property removed successfully")
+ |> put_live_flash(:success, "Property removed successfully")
|> assign(
all_props: Enum.reject(socket.assigns.all_props, &(&1 == prop)),
displayed_props: Enum.reject(socket.assigns.displayed_props, &(&1 == prop)),
site: site
)
- Process.send_after(self(), :clear_flash, 5000)
{:noreply, socket}
end
@@ -139,7 +140,7 @@ defmodule PlausibleWeb.Live.PropsSettings do
displayed_props: props,
site: %{socket.assigns.site | allowed_event_props: props}
)
- |> put_flash(:success, "Properties added successfully")
+ |> put_live_flash(:success, "Properties added successfully")
{:noreply, socket}
end
@@ -160,15 +161,11 @@ defmodule PlausibleWeb.Live.PropsSettings do
displayed_props: allowed_event_props,
site: %{site | allowed_event_props: allowed_event_props}
)
- |> put_flash(:success, "Property added successfully")
+ |> put_live_flash(:success, "Property added successfully")
{:noreply, socket}
end
- def handle_info(:clear_flash, socket) do
- {:noreply, clear_flash(socket)}
- end
-
defp new_form(site) do
to_form(Plausible.Props.allow_changeset(site, []))
end
diff --git a/lib/plausible_web/live/sites.ex b/lib/plausible_web/live/sites.ex
index 6afb50514..975c4056f 100644
--- a/lib/plausible_web/live/sites.ex
+++ b/lib/plausible_web/live/sites.ex
@@ -4,6 +4,8 @@ defmodule PlausibleWeb.Live.Sites do
"""
use Phoenix.LiveView
+ use PlausibleWeb.Live.Flash
+
alias Phoenix.LiveView.JS
use Phoenix.HTML
@@ -59,7 +61,7 @@ defmodule PlausibleWeb.Live.Sites do
assigns = assign(assigns, :invitations, invitations)
~H"""
- <.live_component id="embedded_liveview_flash" module={PlausibleWeb.Live.Flash} flash={@flash} />
+ <.flash_messages flash={@flash} />
Enum.into(%{}) |> Jason.encode!}}"}
x-on:keydown.escape.window="invitationOpen = false"
@@ -593,7 +595,7 @@ defmodule PlausibleWeb.Live.Sites do
end
socket
- |> put_flash(:success, flash_message)
+ |> put_live_flash(:success, flash_message)
|> load_sites()
|> push_event("js-exec", %{
to: "#site-card-#{hash_domain(site.domain)}",
@@ -606,20 +608,14 @@ defmodule PlausibleWeb.Live.Sites do
"Please unpin one of your pinned sites to make room for new pins"
socket
- |> put_flash(:error, flash_message)
+ |> put_live_flash(:error, flash_message)
|> push_event("js-exec", %{
to: "#site-card-#{hash_domain(site.domain)}",
attr: "data-pin-failed"
})
end
- if flash_timer = socket.assigns[:flash_timer] do
- Process.cancel_timer(flash_timer)
- end
-
- flash_timer = Process.send_after(self(), :clear_flash, 5000)
-
- {:noreply, assign(socket, :flash_timer, flash_timer)}
+ {:noreply, socket}
else
Sentry.capture_message("Attempting to toggle pin for invalid domain.",
extra: %{domain: domain, user: socket.assigns.user.id}
@@ -655,10 +651,6 @@ defmodule PlausibleWeb.Live.Sites do
{:noreply, socket}
end
- def handle_info(:clear_flash, socket) do
- {:noreply, clear_flash(socket)}
- end
-
defp load_sites(%{assigns: assigns} = socket) do
sites =
Sites.list_with_invitations(assigns.user, assigns.params,