Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Updated empty states across settings (#5874)
Sanne de Vriesb8d64e2eff1e
diff --git a/extra/lib/plausible_web/live/funnel_settings.ex b/extra/lib/plausible_web/live/funnel_settings.exindex 99ea3189db..85ed95994f 100644--- a/extra/lib/plausible_web/live/funnel_settings.ex+++ b/extra/lib/plausible_web/live/funnel_settings.ex@@ -50,40 +50,61 @@ defmodule PlausibleWeb.Live.FunnelSettings do<div id="funnel-settings-main"><.flash_messages flash={@flash} />- <%= if @setup_funnel? do %>- {live_render(- @socket,- PlausibleWeb.Live.FunnelSettings.Form,- id: "funnels-form",- session: %{- "domain" => @domain,- "funnel_id" => @funnel_id- }- )}- <% end %>- <div :if={@goal_count >= Funnel.min_steps()}>- <.live_component- module={PlausibleWeb.Live.FunnelSettings.List}- id="funnels-list"- funnels={@displayed_funnels}- filter_text={@filter_text}- />- </div>-- <div :if={@goal_count < Funnel.min_steps()} class="flex flex-col items-center">- <h1 class="mt-4 text-center">- Ready to dig into user flows?- </h1>- <p class="mt-4 mb-6 max-w-lg text-sm text-gray-500 dark:text-gray-400 leading-5 text-center">- Set up a few goals first (e.g. <b>"Signup"</b>, <b>"Visit /"</b>, or <b>"Scroll 50% on /blog/*"</b>) and return here to build your first funnel!- </p>- <.button_link- class="mb-2"- href={PlausibleWeb.Router.Helpers.site_path(@socket, :settings_goals, @domain)}+ <.tile+ docs="funnel-analysis"+ feature_mod={Plausible.Billing.Feature.Funnels}+ feature_toggle?={true}+ show_content?={!Plausible.Billing.Feature.Funnels.opted_out?(@site)}+ site={@site}+ current_user={@current_user}+ current_team={@current_team}+ >+ <:title>+ Funnels+ </:title>+ <:subtitle :if={Enum.count(@all_funnels) > 0}>+ Compose goals into funnels to track user flows and conversion rates.+ </:subtitle>+ <%= if @setup_funnel? do %>+ {live_render(+ @socket,+ PlausibleWeb.Live.FunnelSettings.Form,+ id: "funnels-form",+ session: %{+ "domain" => @domain,+ "funnel_id" => @funnel_id+ }+ )}+ <% end %>+ <div :if={@goal_count >= Funnel.min_steps()}>+ <.live_component+ module={PlausibleWeb.Live.FunnelSettings.List}+ id="funnels-list"+ funnels={@displayed_funnels}+ filter_text={@filter_text}+ />+ </div>++ <div+ :if={@goal_count < Funnel.min_steps()}+ class="flex flex-col items-center justify-center pt-5 pb-6 max-w-md mx-auto">- Set up goals →- </.button_link>- </div>+ <h3 class="text-center text-base font-medium text-gray-900 dark:text-gray-100 leading-7">+ Ready to dig into user flows?+ </h3>+ <p class="text-center text-sm mt-1 text-gray-500 dark:text-gray-400 leading-5 text-pretty">+ Set up a few goals like <.highlighted>Signup</.highlighted>, <.highlighted>Visit /</.highlighted>, or+ <.highlighted>Scroll 50% on /blog/*</.highlighted>+ first, then return here to build your first funnel.+ </p>+ <.button_link+ class="mt-4"+ href={PlausibleWeb.Router.Helpers.site_path(@socket, :settings_goals, @domain)}+ >+ Set up goals →+ </.button_link>+ </div>+ </.tile></div>"""end@@ -147,4 +168,8 @@ defmodule PlausibleWeb.Live.FunnelSettings dodef handle_info(:cancel_setup_funnel, socket) do{:noreply, assign(socket, setup_funnel?: false, funnel_id: nil)}end++ def handle_info({:feature_toggled, flash_msg, updated_site}, socket) do+ {:noreply, assign(put_flash(socket, :success, flash_msg), site: updated_site)}+ endenddiff --git a/extra/lib/plausible_web/live/funnel_settings/list.ex b/extra/lib/plausible_web/live/funnel_settings/list.exindex 0087569116..e4c4e64255 100644--- a/extra/lib/plausible_web/live/funnel_settings/list.ex+++ b/extra/lib/plausible_web/live/funnel_settings/list.ex@@ -10,13 +10,17 @@ defmodule PlausibleWeb.Live.FunnelSettings.List douse PlausibleWeb, :live_componentdef render(assigns) do+ assigns = assign(assigns, :searching?, String.trim(assigns.filter_text) != "")+~H"""<div>- <.filter_bar filter_text={@filter_text} placeholder="Search Funnels">- <.button id="add-funnel-button" phx-click="add-funnel" mt?={false}>- Add funnel- </.button>- </.filter_bar>+ <%= if @searching? or Enum.count(@funnels) > 0 do %>+ <.filter_bar filter_text={@filter_text} placeholder="Search Funnels">+ <.button id="add-funnel-button" phx-click="add-funnel" mt?={false}>+ Add funnel+ </.button>+ </.filter_bar>+ <% end %><%= if Enum.count(@funnels) > 0 do %><.table rows={@funnels}>@@ -42,19 +46,44 @@ defmodule PlausibleWeb.Live.FunnelSettings.List do</:tbody></.table><% else %>- <p class="mt-12 mb-8 text-sm text-center">- <span :if={String.trim(@filter_text) != ""}>- No funnels found for this site. Please refine or- <.styled_link phx-click="reset-filter-text" id="reset-filter-hint">- reset your search.- </.styled_link>- </span>- <span :if={String.trim(@filter_text) == "" && Enum.empty?(@funnels)}>- No funnels configured for this site.- </span>- </p>+ <.no_search_results :if={@searching?} />+ <.empty_state :if={not @searching?} /><% end %></div>"""end++ defp no_search_results(assigns) do+ ~H"""+ <p class="mt-12 mb-8 text-sm text-center">+ No funnels found for this site. Please refine or+ <.styled_link phx-click="reset-filter-text" id="reset-filter-hint">+ reset your search.+ </.styled_link>+ </p>+ """+ end++ defp empty_state(assigns) do+ ~H"""+ <div class="flex flex-col items-center justify-center pt-5 pb-6 max-w-md mx-auto">+ <h3 class="text-center text-base font-medium text-gray-900 dark:text-gray-100 leading-7">+ Create your first funnel+ </h3>+ <p class="text-center text-sm mt-1 text-gray-500 dark:text-gray-400 leading-5 text-pretty">+ Compose goals into funnels to track user flows and conversion rates.+ <.styled_link href="https://plausible.io/docs/funnel-analysis" target="_blank">+ Learn more+ </.styled_link>+ </p>+ <.button+ id="add-funnel-button"+ phx-click="add-funnel"+ class="mt-4"+ >+ Add funnel+ </.button>+ </div>+ """+ endenddiff --git a/lib/plausible_web/components/billing/billing.ex b/lib/plausible_web/components/billing/billing.exindex db45f3472c..a55c80d193 100644--- a/lib/plausible_web/components/billing/billing.ex+++ b/lib/plausible_web/components/billing/billing.ex@@ -7,7 +7,8 @@ defmodule PlausibleWeb.Components.Billing dorequire Plausible.Billing.Subscription.Statusalias Plausible.Billing.{Subscription, Subscriptions, Plan, Plans, EnterprisePlan}- attr :current_role, :atom, required: true+ attr :site, Plausible.Site, required: false, default: nil+ attr :current_user, Plausible.Auth.User, required: trueattr :current_team, :any, required: trueattr :locked?, :boolean, required: trueslot :inner_block, required: true@@ -35,7 +36,7 @@ defmodule PlausibleWeb.Components.Billing doclass="max-w-sm sm:max-w-md mb-2 text-sm text-gray-600 dark:text-gray-100/60 leading-normal text-center">To access this feature,- <.upgrade_call_to_action current_role={@current_role} current_team={@current_team} />+ <.upgrade_call_to_action current_user={@current_user} current_team={@current_team} /></span></div></div>@@ -357,8 +358,23 @@ defmodule PlausibleWeb.Components.Billing dodefp change_plan_or_upgrade_text(_subscription), do: "Change plan"def upgrade_call_to_action(assigns) do+ user = assigns.current_user+ site = assigns[:site]team = Plausible.Teams.with_subscription(assigns.current_team)+ current_role =+ if site do+ case Plausible.Teams.Memberships.site_role(site, user) do+ {:ok, {_, site_role}} -> site_role+ _ -> nil+ end+ else+ if team do+ {:ok, team_role} = Plausible.Teams.Memberships.team_role(team, user)+ team_role+ end+ end+upgrade_assistance_required? =case Plans.get_subscription_plan(team && team.subscription) do%Plan{kind: :business} -> true@@ -367,7 +383,7 @@ defmodule PlausibleWeb.Components.Billing doendcond do- not is_nil(assigns.current_role) and assigns.current_role not in [:owner, :billing] ->+ not is_nil(current_role) and current_role not in [:owner, :billing] ->~H"ask your team owner to upgrade their subscription."upgrade_assistance_required? ->diff --git a/lib/plausible_web/components/billing/notice.ex b/lib/plausible_web/components/billing/notice.exindex 090795add3..491eaff930 100644--- a/lib/plausible_web/components/billing/notice.ex+++ b/lib/plausible_web/components/billing/notice.ex@@ -64,7 +64,7 @@ defmodule PlausibleWeb.Components.Billing.Notice doendattr(:current_team, :any, required: true)- attr(:current_role, :atom, required: true)+ attr(:current_user, :atom, required: true)attr(:limit, :integer, required: true)attr(:resource, :string, required: true)attr(:rest, :global)@@ -75,7 +75,7 @@ defmodule PlausibleWeb.Components.Billing.Notice do{account_label(@current_team)} is limited to {pretty_print_resource_limit(@limit, @resource)}. To increase this limit,<PlausibleWeb.Components.Billing.upgrade_call_to_actioncurrent_team={@current_team}- current_role={@current_role}+ current_user={@current_user}/>.</.notice>"""diff --git a/lib/plausible_web/components/generic.ex b/lib/plausible_web/components/generic.exindex f781b3755a..5c33964133 100644--- a/lib/plausible_web/components/generic.ex+++ b/lib/plausible_web/components/generic.ex@@ -485,10 +485,11 @@ defmodule PlausibleWeb.Components.Generic doslot :subtitle, required: falseattr :feature_mod, :atom, default: nilattr :feature_toggle?, :boolean, default: false- attr :current_role, :atom, default: nilattr :current_team, :any, default: nil- attr :site, :any- attr :conn, :any+ attr :current_user, :any, default: nil+ attr :site, :any, default: nil+ attr :conn, :any, default: nil+ attr :show_content?, :boolean, default: truedef tile(assigns) do~H"""@@ -502,20 +503,24 @@ defmodule PlausibleWeb.Components.Generic do<div :if={@subtitle != []} class="text-sm mt-px text-gray-500 dark:text-gray-400 leading-5">{render_slot(@subtitle)}</div>- <PlausibleWeb.Components.Site.Feature.toggle++ <.live_component:if={@feature_toggle?}- feature_mod={@feature_mod}+ module={PlausibleWeb.Components.Site.Feature.ToggleLive}+ id={"feature-toggle-#{@site.id}-#{@feature_mod}"}site={@site}- conn={@conn}+ feature_mod={@feature_mod}+ current_user={@current_user}/></header>- <div class="border-b dark:border-gray-700 mx-6"></div>- <div class="relative">+ <div class={["border-b dark:border-gray-700 mx-6", if(not @show_content?, do: "hidden")]}></div>+ <div class={["relative", if(not @show_content?, do: "hidden")]}><%= if @feature_mod do %><PlausibleWeb.Components.Billing.feature_gatelocked?={@feature_mod.check_availability(@current_team) != :ok}- current_role={@current_role}+ current_user={@current_user}current_team={@current_team}+ site={@site}><div class="p-6 pb-14">{render_slot(@inner_block)}@@ -1125,6 +1130,16 @@ defmodule PlausibleWeb.Components.Generic do"""end+ slot :inner_block, required: true++ def highlighted(assigns) do+ ~H"""+ <span class="font-medium text-indigo-600 dark:text-gray-100">+ {render_slot(@inner_block)}+ </span>+ """+ end+def settings_badge(%{type: :new} = assigns) do~H"""<span class="inline-block ml-2 bg-indigo-100 text-indigo-600 text-xs font-semibold py-1 px-2 rounded-md">diff --git a/lib/plausible_web/components/site/feature.ex b/lib/plausible_web/components/site/feature.exdeleted file mode 100644index 4976f9f93c..0000000000--- a/lib/plausible_web/components/site/feature.ex+++ /dev/null@@ -1,44 +0,0 @@-defmodule PlausibleWeb.Components.Site.Feature do- @moduledoc """- Phoenix Component for rendering a user-facing feature toggle- capable of flipping booleans in `Plausible.Site` via the `toggle_feature` controller action.- """- use PlausibleWeb, :view-- attr(:site, Plausible.Site, required: true)- attr(:feature_mod, :atom, required: true, values: Plausible.Billing.Feature.list())- attr(:conn, Plug.Conn, required: true)- attr(:class, :any, default: nil)- slot(:inner_block)-- def toggle(assigns) do- assigns =- assigns- |> assign(:current_setting, assigns.feature_mod.enabled?(assigns.site))- |> assign(:disabled?, assigns.feature_mod.check_availability(assigns.site.team) !== :ok)-- ~H"""- <div class="mt-4">- <.form- action={target(@site, @feature_mod.toggle_field(), @conn, !@current_setting)}- method="put"- for={nil}- class={@class}- >- <.toggle_submit set_to={@current_setting} disabled?={@disabled?}>- Show {String.downcase(@feature_mod.display_name())} in the dashboard- </.toggle_submit>- </.form>-- <div :if={@current_setting}>- {render_slot(@inner_block)}- </div>- </div>- """- end-- def target(site, setting, conn, set_to) when is_boolean(set_to) do- r = conn.request_path- Routes.site_path(conn, :update_feature_visibility, site.domain, setting, r: r, set: set_to)- end-enddiff --git a/lib/plausible_web/components/site/toggle_live.ex b/lib/plausible_web/components/site/toggle_live.exnew file mode 100644index 0000000000..2ede2f90c0--- /dev/null+++ b/lib/plausible_web/components/site/toggle_live.ex@@ -0,0 +1,90 @@+defmodule PlausibleWeb.Components.Site.Feature.ToggleLive do+ @moduledoc """+ LiveComponent for rendering a user-facing feature toggle in LiveView contexts.+ Instead of using form submission, this component messages itself to handle toggles.+ """+ use PlausibleWeb, :live_component++ def update(assigns, socket) do+ site = Plausible.Repo.preload(assigns.site, :team)+ current_setting = assigns.feature_mod.enabled?(site)+ disabled? = assigns.feature_mod.check_availability(site.team) !== :ok++ {:ok,+ socket+ |> assign(assigns)+ |> assign(:site, site)+ |> assign(:current_setting, current_setting)+ |> assign(:disabled?, disabled?)}+ end++ attr :site, Plausible.Site, required: true+ attr :feature_mod, :atom, required: true+ attr :current_user, Plausible.Auth.User, required: true++ def render(assigns) do+ ~H"""+ <div class="mt-4" id={"feature-#{@feature_mod.name()}-toggle"}>+ <div class="my-2 flex items-center">+ <button+ type="button"+ phx-click="toggle"+ phx-target={@myself}+ class={[+ "relative inline-flex flex-shrink-0 h-6 w-11 border-2 border-transparent rounded-full transition-colors ease-in-out duration-200",+ if(@current_setting, do: "bg-indigo-600", else: "bg-gray-200 dark:bg-gray-600"),+ if(@disabled?, do: "cursor-not-allowed")+ ]}+ disabled={@disabled?}+ >+ <span+ aria-hidden="true"+ class={[+ "inline-block size-5 rounded-full bg-white shadow transform transition ease-in-out duration-200",+ if(@current_setting, do: "translate-x-5", else: "translate-x-0")+ ]}+ />+ </button>++ <span class={[+ "ml-2 font-medium leading-5 text-sm",+ if(@disabled?,+ do: "text-gray-500 dark:text-gray-400",+ else: "text-gray-900 dark:text-gray-100"+ )+ ]}>+ Show in dashboard+ </span>+ </div>+ </div>+ """+ end++ def handle_event("toggle", _params, socket) do+ site = socket.assigns.site+ feature_mod = socket.assigns.feature_mod+ current_user = socket.assigns.current_user++ case feature_mod.toggle(site, current_user) do+ {:ok, updated_site} ->+ new_setting = Map.fetch!(updated_site, feature_mod.toggle_field())++ message =+ if new_setting do+ "#{feature_mod.display_name()} are now visible again on your dashboard"+ else+ "#{feature_mod.display_name()} are now hidden from your dashboard"+ end++ send(self(), {:feature_toggled, message, updated_site})++ socket =+ assign(socket, site: updated_site, current_setting: feature_mod.enabled?(updated_site))++ {:noreply, socket}++ {:error, _} ->+ {:noreply, socket}+ end+ end+enddiff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.exindex 8f9e1f67f2..c5909bbbc2 100644--- a/lib/plausible_web/controllers/site_controller.ex+++ b/lib/plausible_web/controllers/site_controller.ex@@ -91,42 +91,6 @@ defmodule PlausibleWeb.SiteController doendend- def update_feature_visibility(conn, %{- "setting" => setting,- "r" => "/" <> _ = redirect_path,- "set" => value- })- when setting in ~w[conversions_enabled funnels_enabled props_enabled] and- value in ["true", "false"] do- site = conn.assigns[:site]- toggle_field = String.to_existing_atom(setting)-- feature_mod =- Enum.find(Plausible.Billing.Feature.list(), &(&1.toggle_field() == toggle_field))-- case feature_mod.toggle(site, conn.assigns.current_user, override: value == "true") do- {:ok, updated_site} ->- message =- if Map.fetch!(updated_site, toggle_field) do- "#{feature_mod.display_name()} are now visible again on your dashboard"- else- "#{feature_mod.display_name()} are now hidden from your dashboard"- end-- conn- |> put_flash(:success, message)- |> redirect(to: redirect_path)-- {:error, _} ->- conn- |> put_flash(- :error,- "Something went wrong. Failed to toggle #{feature_mod.display_name()} on your dashboard."- )- |> redirect(to: redirect_path)- end- end-def settings(conn, %{"domain" => domain}) doredirect(conn, to: Routes.site_path(conn, :settings_general, domain))enddiff --git a/lib/plausible_web/live/goal_settings.ex b/lib/plausible_web/live/goal_settings.exindex 91a8c5340a..8e8212b3f1 100644--- a/lib/plausible_web/live/goal_settings.ex+++ b/lib/plausible_web/live/goal_settings.ex@@ -21,14 +21,6 @@ defmodule PlausibleWeb.Live.GoalSettings doinclude_consolidated?: true)end)- |> assign_new(:site_role, fn %{site: site, current_user: current_user} ->- if Plausible.Auth.is_super_admin?(current_user) do- :super_admin- else- {:ok, {_, role}} = Plausible.Teams.Memberships.site_role(site, current_user)- role- end- end)|> assign_new(:all_goals, fn %{site: site} ->Goals.for_site(site, preload_funnels?: true)end)@@ -62,41 +54,63 @@ defmodule PlausibleWeb.Live.GoalSettings do<div id="goal-settings-main"><.flash_messages flash={@flash} />- <.live_component :let={modal_unique_id} module={Modal} preload?={false} id="goals-form-modal">+ <.tile+ docs="goal-conversions"+ feature_mod={Plausible.Billing.Feature.Goals}+ feature_toggle?={true}+ show_content?={!Plausible.Billing.Feature.Goals.opted_out?(@site)}+ site={@site}+ current_user={@current_user}+ >+ <:title>+ Goals+ </:title>+ <:subtitle :if={Enum.count(@all_goals) > 0}>+ <p>+ Define actions that you want your users to take, like visiting a certain page, submitting a form, etc.+ </p>+ <p :if={ee?() and Plausible.Sites.regular?(@site)} data-test-id="setup-funnels-cta">+ You can also+ <.styled_link href={Routes.site_path(@socket, :settings_funnels, @domain)}>+ compose goals into funnels.+ </.styled_link>+ </p>+ </:subtitle>+ <.live_component :let={modal_unique_id} module={Modal} preload?={false} id="goals-form-modal">+ <.live_component+ module={PlausibleWeb.Live.GoalSettings.Form}+ id={"goals-form-#{modal_unique_id}"}+ context_unique_id={modal_unique_id}+ event_name_options={@event_name_options}+ domain={@domain}+ site={@site}+ current_user={@current_user}+ site_team={@site_team}+ existing_goals={@all_goals}+ goal={@form_goal}+ on_save_goal={+ fn goal, socket ->+ send(self(), {:goal_added, goal})+ Modal.close(socket, "goals-form-modal")+ end+ }+ on_autoconfigure={+ fn socket ->+ send(self(), :autoconfigure)+ Modal.close(socket, "goals-form-modal")+ end+ }+ />+ </.live_component><.live_component- module={PlausibleWeb.Live.GoalSettings.Form}- id={"goals-form-#{modal_unique_id}"}- context_unique_id={modal_unique_id}- event_name_options={@event_name_options}+ module={PlausibleWeb.Live.GoalSettings.List}+ id="goals-list"+ goals={@displayed_goals}domain={@domain}+ filter_text={@filter_text}site={@site}- current_user={@current_user}- site_role={@site_role}- site_team={@site_team}- existing_goals={@all_goals}- goal={@form_goal}- on_save_goal={- fn goal, socket ->- send(self(), {:goal_added, goal})- Modal.close(socket, "goals-form-modal")- end- }- on_autoconfigure={- fn socket ->- send(self(), :autoconfigure)- Modal.close(socket, "goals-form-modal")- end- }/>- </.live_component>- <.live_component- module={PlausibleWeb.Live.GoalSettings.List}- id="goals-list"- goals={@displayed_goals}- domain={@domain}- filter_text={@filter_text}- site={@site}- />+ </.tile></div>"""end@@ -194,4 +208,8 @@ defmodule PlausibleWeb.Live.GoalSettings do{:noreply, socket}end++ def handle_info({:feature_toggled, flash_msg, updated_site}, socket) do+ {:noreply, assign(put_flash(socket, :success, flash_msg), site: updated_site)}+ endenddiff --git a/lib/plausible_web/live/goal_settings/form.ex b/lib/plausible_web/live/goal_settings/form.exindex 3abcaf53d6..1871bf0cc3 100644--- a/lib/plausible_web/live/goal_settings/form.ex+++ b/lib/plausible_web/live/goal_settings/form.ex@@ -35,7 +35,6 @@ defmodule PlausibleWeb.Live.GoalSettings.Form doevent_name_options_count: length(assigns.event_name_options),event_name_options: Enum.map(assigns.event_name_options, &{&1, &1}),current_user: assigns.current_user,- site_role: assigns.site_role,site_team: assigns.site_team,domain: assigns.domain,selected_tab: selected_tab,@@ -72,7 +71,7 @@ defmodule PlausibleWeb.Live.GoalSettings.Form do:if={@selected_tab == "custom_events"}f={f}suffix={@context_unique_id}- site_role={@site_role}+ current_user={@current_user}site_team={@site_team}site={@site}goal={@goal}@@ -122,7 +121,7 @@ defmodule PlausibleWeb.Live.GoalSettings.Form dox-show="!tabSelectionInProgress"f={f}suffix={suffix(@context_unique_id, @tab_sequence_id)}- site_role={@site_role}+ current_user={@current_user}site_team={@site_team}site={@site}existing_goals={@existing_goals}@@ -319,7 +318,7 @@ defmodule PlausibleWeb.Live.GoalSettings.Form doattr(:f, Phoenix.HTML.Form)attr(:site, Plausible.Site)- attr(:site_role, :atom)+ attr(:current_user, Plausible.Auth.User)attr(:site_team, Plausible.Teams.Team)attr(:suffix, :string)attr(:existing_goals, :list)@@ -382,7 +381,7 @@ defmodule PlausibleWeb.Live.GoalSettings.Form do<.revenue_goal_settingsf={@f}site={@site}- site_role={@site_role}+ current_user={@current_user}site_team={@site_team}has_access_to_revenue_goals?={@has_access_to_revenue_goals?}goal={@goal}@@ -595,7 +594,7 @@ defmodule PlausibleWeb.Live.GoalSettings.Form do<div class="text-xs">To get access to this feature<PlausibleWeb.Components.Billing.upgrade_call_to_action- current_role={@site_role}+ current_user={@current_user}current_team={@site_team}/>.</div>diff --git a/lib/plausible_web/live/goal_settings/list.ex b/lib/plausible_web/live/goal_settings/list.exindex 1153c95994..f8edabcf66 100644--- a/lib/plausible_web/live/goal_settings/list.ex+++ b/lib/plausible_web/live/goal_settings/list.ex@@ -12,21 +12,27 @@ defmodule PlausibleWeb.Live.GoalSettings.List dodef render(assigns) dorevenue_goals_enabled? = Plausible.Billing.Feature.RevenueGoals.enabled?(assigns.site)- assigns = assign(assigns, revenue_goals_enabled?: revenue_goals_enabled?)++ assigns =+ assigns+ |> assign(:revenue_goals_enabled?, revenue_goals_enabled?)+ |> assign(:searching?, String.trim(assigns.filter_text) != "")~H"""<div>- <.filter_bar filter_text={@filter_text} placeholder="Search Goals">- <.button- id="add-goal-button"- phx-click="add-goal"- mt?={false}- x-data- x-on:click={Modal.JS.preopen("goals-form-modal")}- >- Add goal- </.button>- </.filter_bar>+ <%= if @searching? or Enum.count(@goals) > 0 do %>+ <.filter_bar filter_text={@filter_text} placeholder="Search Goals">+ <.button+ id="add-goal-button"+ phx-click="add-goal"+ mt?={false}+ x-data+ x-on:click={Modal.JS.preopen("goals-form-modal")}+ >+ Add goal+ </.button>+ </.filter_bar>+ <% end %><%= if Enum.count(@goals) > 0 do %><.table rows={@goals}>@@ -89,22 +95,49 @@ defmodule PlausibleWeb.Live.GoalSettings.List do</:tbody></.table><% else %>- <p class="mt-12 mb-8 text-center text-sm">- <span :if={String.trim(@filter_text) != ""}>- No goals found for this site. Please refine or- <.styled_link phx-click="reset-filter-text" id="reset-filter-hint">- reset your search.- </.styled_link>- </span>- <span :if={String.trim(@filter_text) == "" && Enum.empty?(@goals)}>- No goals configured for this site.- </span>- </p>+ <.no_search_results :if={@searching?} />+ <.empty_state :if={not @searching?} /><% end %></div>"""end+ defp no_search_results(assigns) do+ ~H"""+ <p class="mt-12 mb-8 text-center text-sm">+ No goals found for this site. Please refine or+ <.styled_link phx-click="reset-filter-text" id="reset-filter-hint">+ reset your search.+ </.styled_link>+ </p>+ """+ end++ defp empty_state(assigns) do+ ~H"""+ <div class="flex flex-col items-center justify-center pt-5 pb-6 max-w-md mx-auto">+ <h3 class="text-center text-base font-medium text-gray-900 dark:text-gray-100 leading-7">+ Create your first goal+ </h3>+ <p class="text-center text-sm mt-1 text-gray-500 dark:text-gray-400 leading-5 text-pretty">+ Define actions that you want your users to take, like visiting a certain page, submitting a form, etc.+ <.styled_link href="https://plausible.io/docs/goal-conversions" target="_blank">+ Learn more+ </.styled_link>+ </p>+ <.button+ id="add-goal-button"+ phx-click="add-goal"+ x-data+ x-on:click={Modal.JS.preopen("goals-form-modal")}+ class="mt-4"+ >+ Add goal+ </.button>+ </div>+ """+ end+defp page_scroll_description(goal) docase pageview_description(goal) do"" -> "Scroll > #{goal.scroll_threshold}"diff --git a/lib/plausible_web/live/imports_exports_settings.ex b/lib/plausible_web/live/imports_exports_settings.exindex 1559cd9f13..945e5b1bf7 100644--- a/lib/plausible_web/live/imports_exports_settings.ex+++ b/lib/plausible_web/live/imports_exports_settings.ex@@ -74,97 +74,134 @@ defmodule PlausibleWeb.Live.ImportsExportsSettings do{@import_warning}</.notice>- <div class="flex gap-x-4">- <.button_link- theme="secondary"- href={Plausible.Google.API.import_authorize_url(@site.id)}- disabled={@import_in_progress? or @at_maximum?}- mt?={false}- >- Import from- <img- src="/images/icon/google_analytics_logo.svg"- alt="Google Analytics import"- class="h-6 w-12 -my-1"- />- </.button_link>- <.button_link- disabled={@import_in_progress? or @at_maximum?}- href={"/#{URI.encode_www_form(@site.domain)}/settings/import"}- mt?={false}- >- Import from CSV- </.button_link>- </div>-- <p :if={Enum.empty?(@site_imports)} class="text-center text-sm mt-8 mb-12">- There are no imports yet for this site.- </p>-- <div class="mt-6">- <.table :if={not Enum.empty?(@site_imports)} rows={@site_imports}>- <:thead>- <.th>Import</.th>- <.th hide_on_mobile>Date Range</.th>- <.th hide_on_mobile>- <div class="text-right">Pageviews</div>- </.th>- <.th invisible>Actions</.th>- </:thead>-- <:tbody :let={entry}>- <.td max_width="max-w-40">- <div class="flex items-center gap-x-2 truncate">- <div class="w-5" title={notice_message(entry.tooltip)}>- <Heroicons.clock- :if={entry.live_status == SiteImport.pending()}- class="block size-5 text-indigo-600 dark:text-green-600"- />- <.spinner- :if={entry.live_status == SiteImport.importing()}- class="block size-5 text-indigo-600 dark:text-green-600"- />- <Heroicons.check- :if={entry.live_status == SiteImport.completed()}- class="block size-5 text-indigo-600 dark:text-green-600"- />- <Heroicons.exclamation_triangle- :if={entry.live_status == SiteImport.failed()}- class="block size-5 text-red-700 dark:text-red-500"- />- </div>- <div- class="max-w-sm"- title={"#{Plausible.Imported.SiteImport.label(entry.site_import)} created at #{format_date(entry.site_import.inserted_at)}"}- >- {Plausible.Imported.SiteImport.label(entry.site_import)}- </div>- </div>- </.td>-- <.td hide_on_mobile>- {format_date(entry.site_import.start_date)} - {format_date(entry.site_import.end_date)}- </.td>-- <.td>- <div class="text-right">- {if entry.live_status == SiteImport.completed(),- do:- PlausibleWeb.StatsView.large_number_format(- pageview_count(entry.site_import, @pageview_counts)- )}- </div>- </.td>- <.td actions>- <.delete_button- href={"/#{URI.encode_www_form(@site.domain)}/settings/forget-import/#{entry.site_import.id}"}- method="delete"- data-confirm="Are you sure you want to delete this import?"+ <.tile docs="google-analytics-import">+ <:title>+ Import data+ </:title>+ <:subtitle :if={not Enum.empty?(@site_imports)}>+ Import data from external sources. Up to {Plausible.Imported.max_complete_imports()} imports are allowed at a time.+ </:subtitle>+ <%= if Enum.empty?(@site_imports) do %>+ <div class="flex flex-col items-center justify-center pt-5 pb-6 max-w-md mx-auto">+ <h3 class="text-center text-base font-medium text-gray-900 dark:text-gray-100 leading-7">+ Import your first data+ </h3>+ <p class="text-center text-sm mt-1 text-gray-500 dark:text-gray-400 leading-5 text-pretty">+ Import data from external sources. Up to {Plausible.Imported.max_complete_imports()} imports are allowed at a time.+ </p>+ <div class="flex gap-x-4 mt-4">+ <.button_link+ theme="secondary"+ href={Plausible.Google.API.import_authorize_url(@site.id)}+ disabled={@import_in_progress? or @at_maximum?}+ mt?={false}+ >+ Import from+ <img+ src="/images/icon/google_analytics_logo.svg"+ alt="Google Analytics import"+ class="h-6 w-12 -my-1"+ />+ </.button_link>+ <.button_link+ disabled={@import_in_progress? or @at_maximum?}+ href={"/#{URI.encode_www_form(@site.domain)}/settings/import"}+ mt?={false}+ >+ Import from CSV+ </.button_link>+ </div>+ </div>+ <% else %>+ <div class="flex gap-x-4">+ <.button_link+ theme="secondary"+ href={Plausible.Google.API.import_authorize_url(@site.id)}+ disabled={@import_in_progress? or @at_maximum?}+ mt?={false}+ >+ Import from+ <img+ src="/images/icon/google_analytics_logo.svg"+ alt="Google Analytics import"+ class="h-6 w-12 -my-1"/>- </.td>- </:tbody>- </.table>- </div>+ </.button_link>+ <.button_link+ disabled={@import_in_progress? or @at_maximum?}+ href={"/#{URI.encode_www_form(@site.domain)}/settings/import"}+ mt?={false}+ >+ Import from CSV+ </.button_link>+ </div>++ <div class="mt-6">+ <.table rows={@site_imports}>+ <:thead>+ <.th>Import</.th>+ <.th hide_on_mobile>Date Range</.th>+ <.th hide_on_mobile>+ <div class="text-right">Pageviews</div>+ </.th>+ <.th invisible>Actions</.th>+ </:thead>++ <:tbody :let={entry}>+ <.td max_width="max-w-40">+ <div class="flex items-center gap-x-2 truncate">+ <div class="w-5" title={notice_message(entry.tooltip)}>+ <Heroicons.clock+ :if={entry.live_status == SiteImport.pending()}+ class="block size-5 text-indigo-600 dark:text-green-600"+ />+ <.spinner+ :if={entry.live_status == SiteImport.importing()}+ class="block size-5 text-indigo-600 dark:text-green-600"+ />+ <Heroicons.check+ :if={entry.live_status == SiteImport.completed()}+ class="block size-5 text-indigo-600 dark:text-green-600"+ />+ <Heroicons.exclamation_triangle+ :if={entry.live_status == SiteImport.failed()}+ class="block size-5 text-red-700 dark:text-red-500"+ />+ </div>+ <div+ class="max-w-sm"+ title={"#{Plausible.Imported.SiteImport.label(entry.site_import)} created at #{format_date(entry.site_import.inserted_at)}"}+ >+ {Plausible.Imported.SiteImport.label(entry.site_import)}+ </div>+ </div>+ </.td>++ <.td hide_on_mobile>+ {format_date(entry.site_import.start_date)} - {format_date(entry.site_import.end_date)}+ </.td>++ <.td>+ <div class="text-right">+ {if entry.live_status == SiteImport.completed(),+ do:+ PlausibleWeb.StatsView.large_number_format(+ pageview_count(entry.site_import, @pageview_counts)+ )}+ </div>+ </.td>+ <.td actions>+ <.delete_button+ href={"/#{URI.encode_www_form(@site.domain)}/settings/forget-import/#{entry.site_import.id}"}+ method="delete"+ data-confirm="Are you sure you want to delete this import?"+ />+ </.td>+ </:tbody>+ </.table>+ </div>+ <% end %>+ </.tile>"""enddiff --git a/lib/plausible_web/live/plugins/api/settings.ex b/lib/plausible_web/live/plugins/api/settings.exindex 04659818fe..5f8af6a3cc 100644--- a/lib/plausible_web/live/plugins/api/settings.ex+++ b/lib/plausible_web/live/plugins/api/settings.ex@@ -50,14 +50,29 @@ defmodule PlausibleWeb.Live.Plugins.API.Settings do)}<% end %>- <div>+ <%= if Enum.empty?(@displayed_tokens) do %>+ <div class="flex flex-col items-center justify-center pt-5 pb-6 max-w-md mx-auto">+ <h3 class="text-center text-base font-medium text-gray-900 dark:text-gray-100 leading-7">+ Create your first plugin token+ </h3>+ <p class="text-center text-sm mt-1 text-gray-500 dark:text-gray-400 leading-5 text-pretty">+ Control plugin access by creating tokens for third-party integrations.+ </p>+ <.button+ phx-click="create-token"+ class="mt-4"+ >+ New plugin token+ </.button>+ </div>+ <% else %><.filter_bar filtering_enabled?={false}><.button phx-click="create-token" mt?={false}>Create plugin token</.button></.filter_bar>- <.table :if={not Enum.empty?(@displayed_tokens)} rows={@displayed_tokens}>+ <.table rows={@displayed_tokens}><:thead><.th>Description</.th><.th hide_on_mobile>Hint</.th>@@ -86,7 +101,7 @@ defmodule PlausibleWeb.Live.Plugins.API.Settings do</.td></:tbody></.table>- </div>+ <% end %></div>"""enddiff --git a/lib/plausible_web/live/props_settings.ex b/lib/plausible_web/live/props_settings.exindex 1a65a9ed78..9377d2a45c 100644--- a/lib/plausible_web/live/props_settings.ex+++ b/lib/plausible_web/live/props_settings.ex@@ -42,26 +42,43 @@ defmodule PlausibleWeb.Live.PropsSettings do~H"""<section id="props-settings-main"><.flash_messages flash={@flash} />- <%= if @add_prop? do %>- {live_render(- @socket,- PlausibleWeb.Live.PropsSettings.Form,- id: "props-form",- session: %{- "domain" => @domain,- "site_id" => @site_id,- "rendered_by" => self()- }- )}- <% end %>-- <.live_component- module={PlausibleWeb.Live.PropsSettings.List}- id="props-list"- props={@displayed_props}- domain={@domain}- filter_text={@filter_text}- />+ <.tile+ docs="custom-props/introduction"+ feature_mod={Plausible.Billing.Feature.Props}+ feature_toggle?={true}+ show_content?={!Plausible.Billing.Feature.Props.opted_out?(@site)}+ site={@site}+ current_user={@current_user}+ current_team={@current_team}+ >+ <:title>+ Custom properties+ </:title>+ <:subtitle :if={Enum.count(@all_props) > 0}>+ Attach custom properties when sending a pageview or an event to+ create custom metrics.+ </:subtitle>+ <%= if @add_prop? do %>+ {live_render(+ @socket,+ PlausibleWeb.Live.PropsSettings.Form,+ id: "props-form",+ session: %{+ "domain" => @domain,+ "site_id" => @site_id,+ "rendered_by" => self()+ }+ )}+ <% end %>++ <.live_component+ module={PlausibleWeb.Live.PropsSettings.List}+ id="props-list"+ props={@displayed_props}+ domain={@domain}+ filter_text={@filter_text}+ />+ </.tile></section>"""end@@ -131,6 +148,10 @@ defmodule PlausibleWeb.Live.PropsSettings do{:noreply, assign(socket, add_prop?: false)}end+ def handle_info({:feature_toggled, flash_msg, updated_site}, socket) do+ {:noreply, assign(put_flash(socket, :success, flash_msg), site: updated_site)}+ end+def handle_info({:props_allowed, props}, socket) when is_list(props) dosocket =socketdiff --git a/lib/plausible_web/live/props_settings/list.ex b/lib/plausible_web/live/props_settings/list.exindex d146716fc1..9192de9c5c 100644--- a/lib/plausible_web/live/props_settings/list.ex+++ b/lib/plausible_web/live/props_settings/list.ex@@ -9,14 +9,19 @@ defmodule PlausibleWeb.Live.PropsSettings.List doattr(:filter_text, :string)def render(assigns) do+ assigns = assign(assigns, :searching?, String.trim(assigns.filter_text) != "")+~H"""<div>- <.filter_bar filter_text={@filter_text} placeholder="Search Properties">- <.button phx-click="add-prop" mt?={false}>- Add property- </.button>- </.filter_bar>- <%= if is_list(@props) && length(@props) > 0 do %>+ <%= if @searching? or Enum.count(@props) > 0 do %>+ <.filter_bar filter_text={@filter_text} placeholder="Search Properties">+ <.button phx-click="add-prop" mt?={false}>+ Add property+ </.button>+ </.filter_bar>+ <% end %>++ <%= if Enum.count(@props) > 0 do %><.table id="allowed-props" rows={Enum.with_index(@props)}><:tbody :let={{prop, index}}><.td id={"prop-#{index}"}><span class="font-medium">{prop}</span></.td>@@ -32,22 +37,47 @@ defmodule PlausibleWeb.Live.PropsSettings.List do</:tbody></.table><% else %>- <p class="mt-12 mb-8 text-center text-sm">- <span :if={String.trim(@filter_text) != ""}>- No properties found for this site. Please refine or- <.styled_link phx-click="reset-filter-text" id="reset-filter-hint">- reset your search.- </.styled_link>- </span>- <span :if={String.trim(@filter_text) == "" && Enum.empty?(@props)}>- No properties configured for this site.- </span>- </p>+ <.no_search_results :if={@searching?} />+ <.empty_state :if={not @searching?} /><% end %></div>"""end+ defp no_search_results(assigns) do+ ~H"""+ <p class="mt-12 mb-8 text-center text-sm">+ No properties found for this site. Please refine or+ <.styled_link phx-click="reset-filter-text" id="reset-filter-hint">+ reset your search.+ </.styled_link>+ </p>+ """+ end++ defp empty_state(assigns) do+ ~H"""+ <div class="flex flex-col items-center justify-center pt-5 pb-6 max-w-md mx-auto">+ <h3 class="text-center text-base font-medium text-gray-900 dark:text-gray-100 leading-7">+ Create a custom property+ </h3>+ <p class="text-center text-sm mt-1 text-gray-500 dark:text-gray-400 leading-5 text-pretty">+ Attach custom properties when sending a pageview or an event to create custom metrics.+ <.styled_link href="https://plausible.io/docs/custom-props/introduction" target="_blank">+ Learn more+ </.styled_link>+ </p>+ <.button+ id="add-property-button"+ phx-click="add-prop"+ class="mt-4"+ >+ Add property+ </.button>+ </div>+ """+ end+defp delete_confirmation_text(prop) do"""Are you sure you want to remove the following property:diff --git a/lib/plausible_web/live/shared_link_settings.ex b/lib/plausible_web/live/shared_link_settings.exindex 3ebf4ea5c3..110d12bcef 100644--- a/lib/plausible_web/live/shared_link_settings.ex+++ b/lib/plausible_web/live/shared_link_settings.ex@@ -41,77 +41,111 @@ defmodule PlausibleWeb.Live.SharedLinkSettings do<div id="shared-link-settings-main"><.flash_messages flash={@flash} />- <.live_component- :let={modal_unique_id}- module={Modal}- preload?={false}- id="shared-links-form-modal"+ <.tile+ docs="shared-links"+ feature_mod={Plausible.Billing.Feature.SharedLinks}+ site={@site}+ current_user={@current_user}+ current_team={@current_team}>+ <:title>+ Shared links+ </:title>+ <:subtitle :if={Enum.count(@shared_links) > 0}>+ Share your stats privately with anyone. Links are unique, secure, and can be password-protected.+ </:subtitle>+<.live_component- module={PlausibleWeb.Live.SharedLinkSettings.Form}- id={"shared-links-form-#{modal_unique_id}"}- context_unique_id={modal_unique_id}- site={@site}- shared_link={@form_shared_link}- on_save_shared_link={- fn shared_link, socket ->- send(self(), {:shared_link_added, shared_link})- Modal.close(socket, "shared-links-form-modal")- end- }- />- </.live_component>-- <.filter_bar filtering_enabled?={false}>- <.button- id="add-shared-link-button"- phx-click="add-shared-link"- mt?={false}- x-data- x-on:click={Modal.JS.preopen("shared-links-form-modal")}+ :let={modal_unique_id}+ module={Modal}+ preload?={false}+ id="shared-links-form-modal">- Add shared link- </.button>- </.filter_bar>-- <p :if={Enum.empty?(@shared_links)} class="mb-8 text-center text-sm">- No shared links configured for this site.- </p>-- <.table rows={@shared_links} id="shared-links-table">- <:thead>- <.th hide_on_mobile>Name</.th>- <.th>Link</.th>- <.th invisible>Actions</.th>- </:thead>- <:tbody :let={link}>- <.td truncate hide_on_mobile>- {link.name}- <Heroicons.lock_closed :if={link.password_hash} class="feather ml-2 mb-0.5" />- <Heroicons.lock_open :if={!link.password_hash} class="feather ml-2 mb-0.5" />- </.td>- <.td>- <.input_with_clipboard- name={link.slug}- id={link.slug}- value={Plausible.Sites.shared_link_url(@site, link)}- />- </.td>- <.td actions>- <.edit_button- class="mt-1"- phx-click="edit-shared-link"- phx-value-slug={link.slug}- />- <.delete_button- class="mt-1"- phx-click="delete-shared-link"- phx-value-slug={link.slug}- data-confirm="Are you sure you want to delete this shared link? The stats will not be accessible with this link anymore."- />- </.td>- </:tbody>- </.table>+ <.live_component+ module={PlausibleWeb.Live.SharedLinkSettings.Form}+ id={"shared-links-form-#{modal_unique_id}"}+ context_unique_id={modal_unique_id}+ site={@site}+ shared_link={@form_shared_link}+ on_save_shared_link={+ fn shared_link, socket ->+ send(self(), {:shared_link_added, shared_link})+ Modal.close(socket, "shared-links-form-modal")+ end+ }+ />+ </.live_component>++ <%= if Enum.empty?(@shared_links) do %>+ <div class="flex flex-col items-center justify-center pt-5 pb-6 max-w-md mx-auto">+ <h3 class="text-center text-base font-medium text-gray-900 dark:text-gray-100 leading-7">+ Create your first shared link+ </h3>+ <p class="text-center text-sm mt-1 text-gray-500 dark:text-gray-400 leading-5 text-pretty">+ Share your stats privately with anyone. Links are unique, secure, and can be password-protected.+ <.styled_link href="https://plausible.io/docs/shared-links" target="_blank">+ Learn more+ </.styled_link>+ </p>+ <.button+ id="add-shared-link-button"+ phx-click="add-shared-link"+ x-data+ x-on:click={Modal.JS.preopen("shared-links-form-modal")}+ class="mt-4"+ >+ Add shared link+ </.button>+ </div>+ <% else %>+ <.filter_bar filtering_enabled?={false}>+ <.button+ id="add-shared-link-button"+ phx-click="add-shared-link"+ mt?={false}+ x-data+ x-on:click={Modal.JS.preopen("shared-links-form-modal")}+ >+ Add shared link+ </.button>+ </.filter_bar>++ <.table rows={@shared_links} id="shared-links-table">+ <:thead>+ <.th hide_on_mobile>Name</.th>+ <.th>Link</.th>+ <.th invisible>Actions</.th>+ </:thead>+ <:tbody :let={link}>+ <.td truncate hide_on_mobile>+ {link.name}+ <Heroicons.lock_closed :if={link.password_hash} class="feather ml-2 mb-0.5" />+ <Heroicons.lock_open :if={!link.password_hash} class="feather ml-2 mb-0.5" />+ </.td>+ <.td>+ <.input_with_clipboard+ name={link.slug}+ id={link.slug}+ value={Plausible.Sites.shared_link_url(@site, link)}+ />+ </.td>+ <.td actions>+ <.edit_button+ class="mt-1"+ phx-click="edit-shared-link"+ phx-value-slug={link.slug}+ />+ <.delete_button+ class="mt-1"+ phx-click="delete-shared-link"+ phx-value-slug={link.slug}+ data-confirm="Are you sure you want to delete this shared link? The stats will not be accessible with this link anymore."+ />+ </.td>+ </:tbody>+ </.table>+ <% end %>+ </.tile></div>"""enddiff --git a/lib/plausible_web/live/shields/country_rules.ex b/lib/plausible_web/live/shields/country_rules.exindex 4fcb753b74..067fafdd04 100644--- a/lib/plausible_web/live/shields/country_rules.ex+++ b/lib/plausible_web/live/shields/country_rules.ex@@ -29,76 +29,103 @@ defmodule PlausibleWeb.Live.Shields.CountryRules do~H"""<div><.settings_tiles>- <.tile docs="excluding">+ <.tile docs="excluding#exclude-visits-by-country"><:title>Country block list</:title>- <:subtitle>Reject incoming traffic from specific countries.</:subtitle>- <.filter_bar- :if={@country_rules_count < Shields.maximum_country_rules()}- filtering_enabled?={false}- >- <.button- id="add-country-rule"- x-data- x-on:click={Modal.JS.open("country-rule-form-modal")}- mt?={false}+ <:subtitle :if={not Enum.empty?(@country_rules)}>+ Reject incoming traffic from specific countries.+ </:subtitle>++ <%= if Enum.empty?(@country_rules) do %>+ <div class="flex flex-col items-center justify-center pt-5 pb-6 max-w-md mx-auto">+ <h3 class="text-center text-base font-medium text-gray-900 dark:text-gray-100 leading-7">+ Block a country+ </h3>+ <p class="text-center text-sm mt-1 text-gray-500 dark:text-gray-400 leading-5 text-pretty">+ Reject incoming traffic from specific countries.+ <.styled_link+ href="https://plausible.io/docs/excluding#exclude-visits-by-country"+ target="_blank"+ >+ Learn more+ </.styled_link>+ </p>+ <.button+ :if={@country_rules_count < Shields.maximum_country_rules()}+ id="add-country-rule"+ x-data+ x-on:click={Modal.JS.open("country-rule-form-modal")}+ class="mt-4"+ >+ Add country+ </.button>+ </div>+ <% else %>+ <.filter_bar+ :if={@country_rules_count < Shields.maximum_country_rules()}+ filtering_enabled?={false}>- Add country- </.button>- </.filter_bar>-- <.notice- :if={@country_rules_count >= Shields.maximum_country_rules()}- class="mt-4"- title="Maximum number of countries reached"- theme={:gray}- >- <p>- You've reached the maximum number of countries you can block ({Shields.maximum_country_rules()}). Please remove one before adding another.- </p>- </.notice>-- <p :if={Enum.empty?(@country_rules)} class="mt-12 mb-8 text-center text-sm">- No country rules configured for this site.- </p>-- <.table :if={not Enum.empty?(@country_rules)} rows={@country_rules}>- <:thead>- <.th>Country</.th>- <.th hide_on_mobile>Status</.th>- <.th invisible>Actions</.th>- </:thead>- <:tbody :let={rule}>- <% country = Location.Country.get_country(rule.country_code) %>- <.td>- <div class="flex items-center">- <span- id={"country-#{rule.id}"}- class="mr-4 cursor-help"- title={"Added at #{format_added_at(rule.inserted_at, @site.timezone)} by #{rule.added_by}"}- >- {country.flag} {country.name}- </span>- </div>- </.td>- <.td hide_on_mobile>- <span :if={rule.action == :deny}>- Blocked- </span>- <span :if={rule.action == :allow}>- Allowed- </span>- </.td>- <.td actions>- <.delete_button- id={"remove-country-rule-#{rule.id}"}- phx-target={@myself}- phx-click="remove-country-rule"- phx-value-rule-id={rule.id}- data-confirm="Are you sure you want to revoke this rule?"- />- </.td>- </:tbody>- </.table>+ <.button+ id="add-country-rule"+ x-data+ x-on:click={Modal.JS.open("country-rule-form-modal")}+ mt?={false}+ >+ Add country+ </.button>+ </.filter_bar>++ <.notice+ :if={@country_rules_count >= Shields.maximum_country_rules()}+ class="mt-4"+ title="Maximum number of countries reached"+ theme={:gray}+ >+ <p>+ You've reached the maximum number of countries you can block ({Shields.maximum_country_rules()}). Please remove one before adding another.+ </p>+ </.notice>++ <div class="mt-6">+ <.table rows={@country_rules}>+ <:thead>+ <.th>Country</.th>+ <.th hide_on_mobile>Status</.th>+ <.th invisible>Actions</.th>+ </:thead>+ <:tbody :let={rule}>+ <% country = Location.Country.get_country(rule.country_code) %>+ <.td>+ <div class="flex items-center">+ <span+ id={"country-#{rule.id}"}+ class="mr-4 cursor-help"+ title={"Added at #{format_added_at(rule.inserted_at, @site.timezone)} by #{rule.added_by}"}+ >+ {country.flag} {country.name}+ </span>+ </div>+ </.td>+ <.td hide_on_mobile>+ <span :if={rule.action == :deny}>+ Blocked+ </span>+ <span :if={rule.action == :allow}>+ Allowed+ </span>+ </.td>+ <.td actions>+ <.delete_button+ id={"remove-country-rule-#{rule.id}"}+ phx-target={@myself}+ phx-click="remove-country-rule"+ phx-value-rule-id={rule.id}+ data-confirm="Are you sure you want to revoke this rule?"+ />+ </.td>+ </:tbody>+ </.table>+ </div>+ <% end %><.live_component :let={modal_unique_id} module={Modal} id="country-rule-form-modal"><.formdiff --git a/lib/plausible_web/live/shields/hostname_rules.ex b/lib/plausible_web/live/shields/hostname_rules.exindex dbb4565bdf..3f355e69e4 100644--- a/lib/plausible_web/live/shields/hostname_rules.ex+++ b/lib/plausible_web/live/shields/hostname_rules.ex@@ -34,85 +34,109 @@ defmodule PlausibleWeb.Live.Shields.HostnameRules do<.settings_tiles><.tile docs="excluding#exclude-visits-by-hostname"><:title>Hostnames allow list</:title>- <:subtitle>Accept incoming traffic only from familiar hostnames.</:subtitle>- <.filter_bar- :if={@hostname_rules_count < Shields.maximum_hostname_rules()}- filtering_enabled?={false}- >- <.button- id="add-hostname-rule"- x-data- x-on:click={Modal.JS.open("hostname-rule-form-modal")}- mt?={false}- >- Add hostname- </.button>- </.filter_bar>+ <:subtitle :if={not Enum.empty?(@hostname_rules)}>+ Accept incoming traffic only from familiar hostnames.+ </:subtitle>- <.notice- :if={@hostname_rules_count >= Shields.maximum_hostname_rules()}- class="mt-4"- title="Maximum number of hostnames reached"- theme={:gray}- >- <p>- You've reached the maximum number of hostnames you can block ({Shields.maximum_hostname_rules()}). Please remove one before adding another.- </p>- </.notice>+ <%= if Enum.empty?(@hostname_rules) do %>+ <div class="flex flex-col items-center justify-center pt-5 pb-6 max-w-md mx-auto">+ <h3 class="text-center text-base font-medium text-gray-900 dark:text-gray-100 leading-7">+ Allow a hostname+ </h3>+ <p class="text-center text-sm mt-1 text-gray-500 dark:text-gray-400 leading-5 text-pretty">+ Accept incoming traffic only from familiar hostnames. Traffic from all hostnames is recorded until you add your first rule.+ <.styled_link+ href="https://plausible.io/docs/excluding#exclude-visits-by-hostname"+ target="_blank"+ >+ Learn more+ </.styled_link>+ </p>+ <.button+ :if={@hostname_rules_count < Shields.maximum_hostname_rules()}+ id="add-hostname-rule"+ x-data+ x-on:click={Modal.JS.open("hostname-rule-form-modal")}+ class="mt-4"+ >+ Add hostname+ </.button>+ </div>+ <% else %>+ <.filter_bar+ :if={@hostname_rules_count < Shields.maximum_hostname_rules()}+ filtering_enabled?={false}+ >+ <.button+ id="add-hostname-rule"+ x-data+ x-on:click={Modal.JS.open("hostname-rule-form-modal")}+ mt?={false}+ >+ Add hostname+ </.button>+ </.filter_bar>- <p :if={Enum.empty?(@hostname_rules)} class="mt-12 mb-8 text-center text-sm">- No hostname rules configured for this site.- <strong>- Traffic from all hostnames is currently accepted.- </strong>- </p>+ <.notice+ :if={@hostname_rules_count >= Shields.maximum_hostname_rules()}+ class="mt-4"+ title="Maximum number of hostnames reached"+ theme={:gray}+ >+ <p>+ You've reached the maximum number of hostnames you can block ({Shields.maximum_hostname_rules()}). Please remove one before adding another.+ </p>+ </.notice>- <.table :if={not Enum.empty?(@hostname_rules)} rows={@hostname_rules}>- <:thead>- <.th>Hostname</.th>- <.th hide_on_mobile>Status</.th>- <.th invisible>Actions</.th>- </:thead>- <:tbody :let={rule}>- <.td>- <div class="flex items-center">- <span- id={"hostname-#{rule.id}"}- class="mr-4 cursor-help text-ellipsis truncate max-w-xs"- title={"Added at #{format_added_at(rule.inserted_at, @site.timezone)} by #{rule.added_by}"}- >- {rule.hostname}- </span>- </div>- </.td>- <.td hide_on_mobile>- <div class="flex items-center">- <span :if={rule.action == :deny}>- Blocked- </span>- <span :if={rule.action == :allow}>- Allowed- </span>- <span- :if={@redundant_rules[rule.id]}- title={"This rule might be redundant because the following rules may match first:\n\n#{Enum.join(@redundant_rules[rule.id], "\n")}"}- class="pl-4 cursor-help"- >- <Heroicons.exclamation_triangle class="h-5 w-5 text-red-800" />- </span>- </div>- </.td>- <.td actions>- <.delete_button- id={"remove-hostname-rule-#{rule.id}"}- phx-target={@myself}- phx-click="remove-hostname-rule"- phx-value-rule-id={rule.id}- data-confirm="Are you sure you want to revoke this rule?"- />- </.td>- </:tbody>- </.table>+ <div class="mt-6">+ <.table rows={@hostname_rules}>+ <:thead>+ <.th>Hostname</.th>+ <.th hide_on_mobile>Status</.th>+ <.th invisible>Actions</.th>+ </:thead>+ <:tbody :let={rule}>+ <.td>+ <div class="flex items-center">+ <span+ id={"hostname-#{rule.id}"}+ class="mr-4 cursor-help text-ellipsis truncate max-w-xs"+ title={"Added at #{format_added_at(rule.inserted_at, @site.timezone)} by #{rule.added_by}"}+ >+ {rule.hostname}+ </span>+ </div>+ </.td>+ <.td hide_on_mobile>+ <div class="flex items-center">+ <span :if={rule.action == :deny}>+ Blocked+ </span>+ <span :if={rule.action == :allow}>+ Allowed+ </span>+ <span+ :if={@redundant_rules[rule.id]}+ title={"This rule might be redundant because the following rules may match first:\n\n#{Enum.join(@redundant_rules[rule.id], "\n")}"}+ class="pl-4 cursor-help"+ >+ <Heroicons.exclamation_triangle class="h-5 w-5 text-red-800" />+ </span>+ </div>+ </.td>+ <.td actions>+ <.delete_button+ id={"remove-hostname-rule-#{rule.id}"}+ phx-target={@myself}+ phx-click="remove-hostname-rule"+ phx-value-rule-id={rule.id}+ data-confirm="Are you sure you want to revoke this rule?"+ />+ </.td>+ </:tbody>+ </.table>+ </div>+ <% end %><.live_component :let={modal_unique_id} module={Modal} id="hostname-rule-form-modal"><.formdiff --git a/lib/plausible_web/live/shields/ip_rules.ex b/lib/plausible_web/live/shields/ip_rules.exindex 850562d976..8e7208b7c6 100644--- a/lib/plausible_web/live/shields/ip_rules.ex+++ b/lib/plausible_web/live/shields/ip_rules.ex@@ -32,88 +32,112 @@ defmodule PlausibleWeb.Live.Shields.IPRules do<.settings_tiles><.tile docs="excluding"><:title>IP block list</:title>- <:subtitle>Reject incoming traffic from specific IP addresses.</:subtitle>- <.filter_bar :if={@ip_rules_count < Shields.maximum_ip_rules()} filtering_enabled?={false}>- <.button- id="add-ip-rule"- x-data- x-on:click={Modal.JS.open("ip-rule-form-modal")}- mt?={false}+ <:subtitle :if={not Enum.empty?(@ip_rules)}>+ Reject incoming traffic from specific IP addresses.+ </:subtitle>++ <%= if Enum.empty?(@ip_rules) do %>+ <div class="flex flex-col items-center justify-center pt-5 pb-6 max-w-md mx-auto">+ <h3 class="text-center text-base font-medium text-gray-900 dark:text-gray-100 leading-7">+ Block an IP address+ </h3>+ <p class="text-center text-sm mt-1 text-gray-500 dark:text-gray-400 leading-5 text-pretty">+ Reject incoming traffic from specific IP addresses.+ <.styled_link href="https://plausible.io/docs/excluding" target="_blank">+ Learn more+ </.styled_link>+ </p>+ <.button+ :if={@ip_rules_count < Shields.maximum_ip_rules()}+ id="add-ip-rule"+ x-data+ x-on:click={Modal.JS.open("ip-rule-form-modal")}+ class="mt-4"+ >+ Add IP address+ </.button>+ </div>+ <% else %>+ <.filter_bar :if={@ip_rules_count < Shields.maximum_ip_rules()} filtering_enabled?={false}>+ <.button+ id="add-ip-rule"+ x-data+ x-on:click={Modal.JS.open("ip-rule-form-modal")}+ mt?={false}+ >+ Add IP address+ </.button>+ </.filter_bar>++ <.notice+ :if={@ip_rules_count >= Shields.maximum_ip_rules()}+ class="mt-4"+ title="Maximum number of addresses reached"+ theme={:gray}>- Add IP address- </.button>- </.filter_bar>-- <.notice- :if={@ip_rules_count >= Shields.maximum_ip_rules()}- class="mt-4"- title="Maximum number of addresses reached"- theme={:gray}- >- <p>- You've reached the maximum number of IP addresses you can block ({Shields.maximum_ip_rules()}). Please remove one before adding another.- </p>- </.notice>-- <p :if={Enum.empty?(@ip_rules)} class="mt-12 mb-8 text-center text-sm">- No IP rules configured for this site.- </p>-- <.table :if={not Enum.empty?(@ip_rules)} rows={@ip_rules}>- <:thead>- <.th>IP address</.th>- <.th hide_on_mobile>Status</.th>- <.th hide_on_mobile>Description</.th>- <.th invisible>Actions</.th>- </:thead>- <:tbody :let={rule}>- <.td max_width="max-w-40">- <div class="flex items-center truncate">- <span- :if={to_string(rule.inet) == @remote_ip}- class="inline-flex items-center gap-x-1.5 rounded-md px-2 mr-2 py-1 text-xs font-medium text-gray-700 dark:text-white ring-1 ring-inset ring-gray-300 dark:ring-gray-700"- >- <svg class="h-1.5 w-1.5 fill-green-400" viewBox="0 0 6 6" aria-hidden="true">- <circle cx="3" cy="3" r="3" />- </svg>- YOU- </span>- <span- id={"inet-#{rule.id}"}- class="cursor-help"- title={"Added at #{format_added_at(rule.inserted_at, @site.timezone)} by #{rule.added_by}"}- >- {rule.inet}- </span>- </div>- </.td>- <.td hide_on_mobile>- <span :if={rule.action == :deny}>- Blocked- </span>- <span :if={rule.action == :allow}>- Allowed- </span>- </.td>- <.td hide_on_mobile truncate>- <span :if={rule.description} title={rule.description}>- {rule.description}- </span>- <span :if={!rule.description} class="text-gray-400 dark:text-gray-600">- --- </span>- </.td>- <.td actions>- <.delete_button- id={"remove-ip-rule-#{rule.id}"}- phx-target={@myself}- phx-click="remove-ip-rule"- phx-value-rule-id={rule.id}- data-confirm="Are you sure you want to revoke this rule?"- />- </.td>- </:tbody>- </.table>+ <p>+ You've reached the maximum number of IP addresses you can block ({Shields.maximum_ip_rules()}). Please remove one before adding another.+ </p>+ </.notice>++ <div class="mt-6">+ <.table rows={@ip_rules}>+ <:thead>+ <.th>IP address</.th>+ <.th hide_on_mobile>Status</.th>+ <.th hide_on_mobile>Description</.th>+ <.th invisible>Actions</.th>+ </:thead>+ <:tbody :let={rule}>+ <.td max_width="max-w-40">+ <div class="flex items-center truncate">+ <span+ :if={to_string(rule.inet) == @remote_ip}+ class="inline-flex items-center gap-x-1.5 rounded-md px-2 mr-2 py-1 text-xs font-medium text-gray-700 dark:text-white ring-1 ring-inset ring-gray-300 dark:ring-gray-700"+ >+ <svg class="h-1.5 w-1.5 fill-green-400" viewBox="0 0 6 6" aria-hidden="true">+ <circle cx="3" cy="3" r="3" />+ </svg>+ YOU+ </span>+ <span+ id={"inet-#{rule.id}"}+ class="cursor-help"+ title={"Added at #{format_added_at(rule.inserted_at, @site.timezone)} by #{rule.added_by}"}+ >+ {rule.inet}+ </span>+ </div>+ </.td>+ <.td hide_on_mobile>+ <span :if={rule.action == :deny}>+ Blocked+ </span>+ <span :if={rule.action == :allow}>+ Allowed+ </span>+ </.td>+ <.td hide_on_mobile truncate>+ <span :if={rule.description} title={rule.description}>+ {rule.description}+ </span>+ <span :if={!rule.description} class="text-gray-400 dark:text-gray-600">+ --+ </span>+ </.td>+ <.td actions>+ <.delete_button+ id={"remove-ip-rule-#{rule.id}"}+ phx-target={@myself}+ phx-click="remove-ip-rule"+ phx-value-rule-id={rule.id}+ data-confirm="Are you sure you want to revoke this rule?"+ />+ </.td>+ </:tbody>+ </.table>+ </div>+ <% end %><.live_component module={Modal} id="ip-rule-form-modal"><.formdiff --git a/lib/plausible_web/live/shields/page_rules.ex b/lib/plausible_web/live/shields/page_rules.exindex 3047fa0c5e..a76af986f6 100644--- a/lib/plausible_web/live/shields/page_rules.ex+++ b/lib/plausible_web/live/shields/page_rules.ex@@ -34,80 +34,107 @@ defmodule PlausibleWeb.Live.Shields.PageRules do<.settings_tiles><.tile docs="top-pages#block-traffic-from-specific-pages-or-sections"><:title>Pages block list</:title>- <:subtitle>Reject incoming traffic for specific pages.</:subtitle>- <.filter_bar- :if={@page_rules_count < Shields.maximum_page_rules()}- filtering_enabled?={false}- >- <.button- id="add-page-rule"- x-data- x-on:click={Modal.JS.open("page-rule-form-modal")}- mt?={false}- >- Add page- </.button>- </.filter_bar>+ <:subtitle :if={not Enum.empty?(@page_rules)}>+ Reject incoming traffic for specific pages.+ </:subtitle>- <.notice- :if={@page_rules_count >= Shields.maximum_page_rules()}- class="mt-4"- title="Maximum number of pages reached"- theme={:gray}- >- <p>- You've reached the maximum number of pages you can block ({Shields.maximum_page_rules()}). Please remove one before adding another.- </p>- </.notice>+ <%= if Enum.empty?(@page_rules) do %>+ <div class="flex flex-col items-center justify-center pt-5 pb-6 max-w-md mx-auto">+ <h3 class="text-center text-base font-medium text-gray-900 dark:text-gray-100 leading-7">+ Block a page+ </h3>+ <p class="text-center text-sm mt-1 text-gray-500 dark:text-gray-400 leading-5 text-pretty">+ Reject incoming traffic for specific pages.+ <.styled_link+ href="https://plausible.io/docs/top-pages#block-traffic-from-specific-pages-or-sections"+ target="_blank"+ >+ Learn more+ </.styled_link>+ </p>+ <.button+ :if={@page_rules_count < Shields.maximum_page_rules()}+ id="add-page-rule"+ x-data+ x-on:click={Modal.JS.open("page-rule-form-modal")}+ class="mt-4"+ >+ Add page+ </.button>+ </div>+ <% else %>+ <.filter_bar+ :if={@page_rules_count < Shields.maximum_page_rules()}+ filtering_enabled?={false}+ >+ <.button+ id="add-page-rule"+ x-data+ x-on:click={Modal.JS.open("page-rule-form-modal")}+ mt?={false}+ >+ Add page+ </.button>+ </.filter_bar>- <p :if={Enum.empty?(@page_rules)} class="mt-12 mb-8 text-center text-sm">- No page rules configured for this site.- </p>+ <.notice+ :if={@page_rules_count >= Shields.maximum_page_rules()}+ class="mt-4"+ title="Maximum number of pages reached"+ theme={:gray}+ >+ <p>+ You've reached the maximum number of pages you can block ({Shields.maximum_page_rules()}). Please remove one before adding another.+ </p>+ </.notice>- <.table :if={not Enum.empty?(@page_rules)} rows={@page_rules}>- <:thead>- <.th>Page</.th>- <.th hide_on_mobile>Status</.th>- <.th invisible>Actions</.th>- </:thead>- <:tbody :let={rule}>- <.td max_width="max-w-40" truncate>- <span- id={"page-#{rule.id}"}- class="mr-4 cursor-help text-ellipsis truncate max-w-xs"- title={"Added at #{format_added_at(rule.inserted_at, @site.timezone)} by #{rule.added_by}"}- >- {rule.page_path}- </span>- </.td>- <.td hide_on_mobile>- <div class="flex items-center">- <span :if={rule.action == :deny}>- Blocked- </span>- <span :if={rule.action == :allow}>- Allowed- </span>- <span- :if={@redundant_rules[rule.id]}- title={"This rule might be redundant because the following rules may match first:\n\n#{Enum.join(@redundant_rules[rule.id], "\n")}"}- class="pl-4 cursor-help"- >- <Heroicons.exclamation_triangle class="h-5 w-5 text-red-800" />- </span>- </div>- </.td>- <.td actions>- <.delete_button- id={"remove-page-rule-#{rule.id}"}- phx-target={@myself}- phx-click="remove-page-rule"- phx-value-rule-id={rule.id}- data-confirm="Are you sure you want to revoke this rule?"- />- </.td>- </:tbody>- </.table>+ <div class="mt-6">+ <.table rows={@page_rules}>+ <:thead>+ <.th>Page</.th>+ <.th hide_on_mobile>Status</.th>+ <.th invisible>Actions</.th>+ </:thead>+ <:tbody :let={rule}>+ <.td max_width="max-w-40" truncate>+ <span+ id={"page-#{rule.id}"}+ class="mr-4 cursor-help text-ellipsis truncate max-w-xs"+ title={"Added at #{format_added_at(rule.inserted_at, @site.timezone)} by #{rule.added_by}"}+ >+ {rule.page_path}+ </span>+ </.td>+ <.td hide_on_mobile>+ <div class="flex items-center">+ <span :if={rule.action == :deny}>+ Blocked+ </span>+ <span :if={rule.action == :allow}>+ Allowed+ </span>+ <span+ :if={@redundant_rules[rule.id]}+ title={"This rule might be redundant because the following rules may match first:\n\n#{Enum.join(@redundant_rules[rule.id], "\n")}"}+ class="pl-4 cursor-help"+ >+ <Heroicons.exclamation_triangle class="h-5 w-5 text-red-800" />+ </span>+ </div>+ </.td>+ <.td actions>+ <.delete_button+ id={"remove-page-rule-#{rule.id}"}+ phx-target={@myself}+ phx-click="remove-page-rule"+ phx-value-rule-id={rule.id}+ data-confirm="Are you sure you want to revoke this rule?"+ />+ </.td>+ </:tbody>+ </.table>+ </div>+ <% end %><.live_component :let={modal_unique_id} module={Modal} id="page-rule-form-modal"><.formdiff --git a/lib/plausible_web/live/sites.ex b/lib/plausible_web/live/sites.exindex 8580d20dcb..d0c7d93fff 100644--- a/lib/plausible_web/live/sites.ex+++ b/lib/plausible_web/live/sites.ex@@ -51,6 +51,34 @@ defmodule PlausibleWeb.Live.Sites doTeams.Users.owns_sites?(current_user, include_pending?: true, only_team: current_team) &&Teams.Billing.check_needs_to_upgrade(current_team)end)+ |> then(fn socket ->+ %{+ sites: sites,+ current_team: current_team,+ has_sites?: has_sites?,+ filter_text: filter_text+ } = socket.assigns++ is_empty_state? =+ not (sites.entries != [] and (Teams.setup?(current_team) or has_sites?)) and+ filter_text == ""++ empty_state_title =+ if Teams.setup?(current_team) do+ "Add your first team site"+ else+ "Add your first personal site"+ end++ empty_state_description =+ "Collect simple, privacy-friendly stats to better understand your audience."++ assign(socket,+ is_empty_state?: is_empty_state?,+ empty_state_title: empty_state_title,+ empty_state_description: empty_state_description+ )+ end){:noreply, socket}end@@ -62,6 +90,7 @@ defmodule PlausibleWeb.Live.Sites do:invitations_map,Enum.map(assigns.invitations, &{&1.invitation.invitation_id, &1}) |> Enum.into(%{}))+ |> assign(:searching?, String.trim(assigns.filter_text) != "")~H"""<.flash_messages flash={@flash} />@@ -87,11 +116,11 @@ defmodule PlausibleWeb.Live.Sites do<PlausibleWeb.Team.Notice.team_invitations team_invitations={@team_invitations} />- <div class="relative z-10 pt-4 flex flex-col sm:flex-row sm:items-center sm:justify-between gap-y-2">- <.search_form :if={@has_sites?} filter_text={@filter_text} uri={@uri} />- <p :if={not @has_sites?} class="dark:text-gray-100">- You don't have any sites yet.- </p>+ <div+ :if={not @is_empty_state?}+ class="relative z-10 pt-4 flex flex-col sm:flex-row sm:items-center sm:justify-between gap-y-2"+ >+ <.search_form filter_text={@filter_text} uri={@uri} /><PrimaDropdown.dropdown:if={@consolidated_view_cta_dismissed?}id="add-site-dropdown"@@ -124,28 +153,43 @@ defmodule PlausibleWeb.Live.Sites do</a></div>- <p :if={@filter_text != "" and @sites.entries == []} class="mt-4 dark:text-gray-100 text-center">- No sites found. Please search for something else.+ <p :if={@searching? and @sites.entries == []} class="mt-4 dark:text-gray-100 text-center">+ No sites found. Try a different search term.</p>-- <p- :if={- @has_sites? and not Teams.setup?(@current_team) and @sites.entries == [] and- @filter_text == ""- }- class="mt-4 dark:text-gray-100 text-center"+ <div+ :if={@is_empty_state?}+ class="flex flex-col items-center justify-center py-8 sm:py-12 max-w-md mx-auto">- You currently have no personal sites. Are you looking for your team’s sites?- <.styled_link href={Routes.auth_path(@socket, :select_team)}>- Go to your team →- </.styled_link>- </p>+ <h3 class="text-center text-base font-medium text-gray-900 dark:text-gray-100 leading-7">+ {@empty_state_title}+ </h3>+ <p class="text-center text-sm mt-1 text-gray-500 dark:text-gray-400 leading-5 text-pretty">+ {@empty_state_description}+ </p>+ <div class="flex flex-col sm:flex-row gap-3 mt-6">+ <.button_link+ href={"/sites/new?flow=#{PlausibleWeb.Flows.provisioning()}"}+ theme="primary"+ mt?={false}+ >+ <Heroicons.plus class="size-4" /> Add website+ </.button_link>+ <.button_link+ :if={not Teams.setup?(@current_team) and @has_sites?}+ href={Routes.auth_path(@socket, :select_team)}+ theme="secondary"+ mt?={false}+ >+ Go to team sites+ </.button_link>+ </div>+ </div><div :if={@has_sites?}><ul class="my-6 grid grid-cols-1 gap-6 sm:grid-cols-2 lg:grid-cols-3"><.consolidated_view_card_cta:if={- @filter_text == "" and+ not @searching? and!@consolidated_view and @no_consolidated_view_reason not in [:no_sites, :unavailable] andnot @consolidated_view_cta_dismissed?}@@ -156,7 +200,7 @@ defmodule PlausibleWeb.Live.Sites do/><.consolidated_view_card:if={- @filter_text == "" and not is_nil(@consolidated_view) and+ not @searching? and not is_nil(@consolidated_view) andconsolidated_view_ok_to_display?(@current_team)}can_manage_consolidated_view?={@can_manage_consolidated_view?}diff --git a/lib/plausible_web/live/team_management.ex b/lib/plausible_web/live/team_management.exindex 1290c14ce7..77b7456196 100644--- a/lib/plausible_web/live/team_management.ex+++ b/lib/plausible_web/live/team_management.ex@@ -43,7 +43,7 @@ defmodule PlausibleWeb.Live.TeamManagement do<PlausibleWeb.Components.Billing.Notice.limit_exceeded:if={@team_members_limit != 0 and at_limit?(@layout, @team_members_limit)}- current_role={@current_team_role}+ current_user={@current_user}current_team={@current_team}limit={@team_members_limit}resource="members"diff --git a/lib/plausible_web/live/team_setup.ex b/lib/plausible_web/live/team_setup.exindex d5a6d5eb61..cf14d8e5d2 100644--- a/lib/plausible_web/live/team_setup.ex+++ b/lib/plausible_web/live/team_setup.ex@@ -75,7 +75,7 @@ defmodule PlausibleWeb.Live.TeamSetup do<div class="relative -mt-8 pt-4 pb-8 px-8"><PlausibleWeb.Components.Billing.feature_gate- current_role={@current_team_role}+ current_user={@current_user}current_team={@current_team}locked?={@locked?}>diff --git a/lib/plausible_web/router.ex b/lib/plausible_web/router.exindex 03c869400e..a5046072e3 100644--- a/lib/plausible_web/router.ex+++ b/lib/plausible_web/router.ex@@ -703,10 +703,6 @@ defmodule PlausibleWeb.Router doget "/:domain/settings/properties", SiteController, :settings_propsget "/:domain/settings/email-reports", SiteController, :settings_email_reports- put "/:domain/settings/features/visibility/:setting",- SiteController,- :update_feature_visibility-put "/:domain/settings", SiteController, :update_settingsget "/:domain/export", StatsController, :csv_exportdiff --git a/lib/plausible_web/templates/settings/api_keys.html.heex b/lib/plausible_web/templates/settings/api_keys.html.heexindex a5540ab9e6..04cd79b67c 100644--- a/lib/plausible_web/templates/settings/api_keys.html.heex+++ b/lib/plausible_web/templates/settings/api_keys.html.heex@@ -1,63 +1,74 @@<.settings_tiles><.tiledocs="stats-api"- current_role={@current_team_role}+ current_user={@current_user}current_team={@current_team}feature_mod={Plausible.Billing.Feature.StatsAPI}><:title><a id="api-keys">API keys</a></:title>- <:subtitle>+ <:subtitle :if={not Enum.empty?(@api_keys)}>Create and manage access.</:subtitle>- <.filter_bar filtering_enabled?={false}>- <.button_link mt?={false} href={Routes.settings_path(@conn, :new_api_key)}>- New API Key- </.button_link>- </.filter_bar>+ <%= if Enum.empty?(@api_keys) do %>+ <div class="flex flex-col items-center justify-center pt-5 pb-6 max-w-md mx-auto">+ <h3 class="text-center text-base font-medium text-gray-900 dark:text-gray-100 leading-7">+ Create your first API key+ </h3>+ <p class="text-center text-sm mt-1 text-gray-500 dark:text-gray-400 leading-5 text-pretty">+ Access your stats through the Plausible API.+ <.styled_link href="https://plausible.io/docs/stats-api">Learn more</.styled_link>+ </p>+ <.button_link href={Routes.settings_path(@conn, :new_api_key)}>+ New API Key+ </.button_link>+ </div>+ <% else %>+ <.filter_bar filtering_enabled?={false}>+ <.button_link mt?={false} href={Routes.settings_path(@conn, :new_api_key)}>+ New API Key+ </.button_link>+ </.filter_bar>- <p :if={Enum.empty?(@api_keys)} class="mb-8 text-center text-sm">- No API keys configured yet.- </p>+ <.table rows={@api_keys}>+ <:thead>+ <.th>+ Name+ </.th>+ <.th hide_on_mobile>+ Key+ </.th>+ <.th :if={ee?()} hide_on_mobile>+ Type+ </.th>+ <.th invisible>+ Actions+ </.th>+ </:thead>- <.table rows={@api_keys}>- <:thead>- <.th>- Name- </.th>- <.th hide_on_mobile>- Key- </.th>- <.th :if={ee?()} hide_on_mobile>- Type- </.th>- <.th invisible>- Actions- </.th>- </:thead>-- <:tbody :let={api_key}>- <.td truncate max_width="max-w-40">- {api_key.name}- </.td>- <.td hide_on_mobile>- {api_key.key_prefix}- {String.duplicate("*", 32 - 6)}- </.td>- <.td :if={ee?()}>- <span :if={api_key.type == "stats_api"}>Stats API</span>- <span :if={api_key.type == "sites_api"}>Sites API</span>- </.td>- <.td actions>- <.delete_button- method="delete"- href={Routes.settings_path(@conn, :delete_api_key, api_key.id)}- data-confirm="Are you sure you want to revoke this key? This action cannot be reversed."- />- </.td>- </:tbody>- </.table>+ <:tbody :let={api_key}>+ <.td truncate max_width="max-w-40">+ {api_key.name}+ </.td>+ <.td hide_on_mobile>+ {api_key.key_prefix}+ {String.duplicate("*", 32 - 6)}+ </.td>+ <.td :if={ee?()}>+ <span :if={api_key.type == "stats_api"}>Stats API</span>+ <span :if={api_key.type == "sites_api"}>Sites API</span>+ </.td>+ <.td actions>+ <.delete_button+ method="delete"+ href={Routes.settings_path(@conn, :delete_api_key, api_key.id)}+ data-confirm="Are you sure you want to revoke this key? This action cannot be reversed."+ />+ </.td>+ </:tbody>+ </.table>+ <% end %></.tile></.settings_tiles>diff --git a/lib/plausible_web/templates/settings/team_general.html.heex b/lib/plausible_web/templates/settings/team_general.html.heexindex 4d77915b79..e4b4e069aa 100644--- a/lib/plausible_web/templates/settings/team_general.html.heex+++ b/lib/plausible_web/templates/settings/team_general.html.heex@@ -28,7 +28,7 @@</.tile><.tiledocs="users-roles#managing-team-member-roles"- current_role={@current_team_role}+ current_user={@current_user}current_team={@current_team}feature_mod={Plausible.Billing.Feature.Teams}>diff --git a/lib/plausible_web/templates/site/membership/invite_member_form.html.heex b/lib/plausible_web/templates/site/membership/invite_member_form.html.heexindex bbb7587be9..0b124747ae 100644--- a/lib/plausible_web/templates/site/membership/invite_member_form.html.heex+++ b/lib/plausible_web/templates/site/membership/invite_member_form.html.heex@@ -12,7 +12,7 @@<.form :let={f} for={@conn} action={Routes.membership_path(@conn, :invite_member, @site.domain)}><PlausibleWeb.Components.Billing.Notice.limit_exceeded:if={Map.get(assigns, :is_at_limit, false)}- current_role={@current_team_role}+ current_user={@current_user}current_team={@site_team}limit={Map.get(assigns, :team_member_limit, 0)}resource="members"diff --git a/lib/plausible_web/templates/site/new.html.heex b/lib/plausible_web/templates/site/new.html.heexindex 5661f50023..abb4ed0bcc 100644--- a/lib/plausible_web/templates/site/new.html.heex+++ b/lib/plausible_web/templates/site/new.html.heex@@ -8,7 +8,7 @@<.form :let={f} for={@changeset} action={@form_submit_url}><PlausibleWeb.Components.Billing.Notice.limit_exceeded:if={@site_limit_exceeded?}- current_role={@current_team_role}+ current_user={@current_user}current_team={@current_team}limit={@site_limit}resource="sites"diff --git a/lib/plausible_web/templates/site/settings_funnels.html.heex b/lib/plausible_web/templates/site/settings_funnels.html.heexindex 6e9a0d13db..38852196ee 100644--- a/lib/plausible_web/templates/site/settings_funnels.html.heex+++ b/lib/plausible_web/templates/site/settings_funnels.html.heex@@ -1,22 +1,7 @@<.settings_tiles>- <.tile- docs="funnel-analysis"- feature_mod={Plausible.Billing.Feature.Funnels}- feature_toggle?={true}- current_role={@site_role}- current_team={@site_team}- site={@site}- conn={@conn}- >- <:title>- Funnels- </:title>- <:subtitle>- Compose goals into funnels- </:subtitle>-+ <div>{live_render(@conn, PlausibleWeb.Live.FunnelSettings,session: %{"site_id" => @site.id, "domain" => @site.domain})}- </.tile>+ </div></.settings_tiles>diff --git a/lib/plausible_web/templates/site/settings_goals.html.heex b/lib/plausible_web/templates/site/settings_goals.html.heexindex 309295d036..452bcba7aa 100644--- a/lib/plausible_web/templates/site/settings_goals.html.heex+++ b/lib/plausible_web/templates/site/settings_goals.html.heex@@ -1,30 +1,7 @@<.settings_tiles>- <.tile- docs="goal-conversions"- feature_mod={Plausible.Billing.Feature.Goals}- feature_toggle?={true}- site={@site}- conn={@conn}- >- <:title>- Goals- </:title>- <:subtitle>- <p>- Define actions that you want your users to take, like visiting a certain page, submitting a form, etc.- </p>- <p :if={ee?() and Plausible.Sites.regular?(@site)} data-test-id="setup-funnels-cta">- You can also- <.styled_link href={Routes.site_path(@conn, :settings_funnels, @site.domain)}>- compose goals into funnels.- </.styled_link>- </p>- </:subtitle>-- <div :if={Plausible.Billing.Feature.Goals.enabled?(@site)}>- {live_render(@conn, PlausibleWeb.Live.GoalSettings,- session: %{"site_id" => @site.id, "domain" => @site.domain}- )}- </div>- </.tile>+ <div>+ {live_render(@conn, PlausibleWeb.Live.GoalSettings,+ session: %{"site_id" => @site.id, "domain" => @site.domain}+ )}+ </div></.settings_tiles>diff --git a/lib/plausible_web/templates/site/settings_imports_exports.html.heex b/lib/plausible_web/templates/site/settings_imports_exports.html.heexindex a4bd115993..3b88c05e62 100644--- a/lib/plausible_web/templates/site/settings_imports_exports.html.heex+++ b/lib/plausible_web/templates/site/settings_imports_exports.html.heex@@ -1,20 +1,9 @@-<.settings_tiles docs="google-analytics-import">- <.tile>- <:title>- Import data- </:title>- <:subtitle>- Import existing data from external sources.- Pick one of the options below to start a new import. <br />- A maximum of {Plausible.Imported.max_complete_imports()} imports at any time is allowed.- </:subtitle>-- {live_render(@conn, PlausibleWeb.Live.ImportsExportsSettings,- session: %{"domain" => @site.domain}- )}- </.tile>+<.settings_tiles>+ {live_render(@conn, PlausibleWeb.Live.ImportsExportsSettings,+ session: %{"domain" => @site.domain}+ )}- <.tile>+ <.tile docs="export-stats"><:title>Export data</:title>diff --git a/lib/plausible_web/templates/site/settings_integrations.html.heex b/lib/plausible_web/templates/site/settings_integrations.html.heexindex f987fd542a..49e5594a13 100644--- a/lib/plausible_web/templates/site/settings_integrations.html.heex+++ b/lib/plausible_web/templates/site/settings_integrations.html.heex@@ -156,7 +156,7 @@<:title>Plugin tokens</:title>- <:subtitle>+ <:subtitle :if={@has_plugins_tokens?}>Control plugin access.</:subtitle>diff --git a/lib/plausible_web/templates/site/settings_people.html.heex b/lib/plausible_web/templates/site/settings_people.html.heexindex 9b06476a68..cdfc2a37dc 100644--- a/lib/plausible_web/templates/site/settings_people.html.heex+++ b/lib/plausible_web/templates/site/settings_people.html.heex@@ -8,7 +8,7 @@docs="users-roles"feature_mod={Plausible.Billing.Feature.Teams}site={@site}- current_role={@site_role}+ current_user={@current_user}current_team={@site_team}conn={@conn}>diff --git a/lib/plausible_web/templates/site/settings_props.html.heex b/lib/plausible_web/templates/site/settings_props.html.heexindex c80ab73374..8d63b28c77 100644--- a/lib/plausible_web/templates/site/settings_props.html.heex+++ b/lib/plausible_web/templates/site/settings_props.html.heex@@ -1,24 +1,8 @@<.settings_tiles>- <.tile- docs="custom-props/introduction"- feature_mod={Plausible.Billing.Feature.Props}- feature_toggle?={true}- site={@site}- current_role={@site_role}- current_team={@site_team}- conn={@conn}- >- <:title>- Custom properties- </:title>- <:subtitle>- Attach custom properties when sending a pageview or an event to- create custom metrics.- </:subtitle>-+ <div>{live_render(@conn, PlausibleWeb.Live.PropsSettings,id: "props-form",session: %{"site_id" => @site.id, "domain" => @site.domain})}- </.tile>+ </div></.settings_tiles>diff --git a/lib/plausible_web/templates/site/settings_visibility.html.heex b/lib/plausible_web/templates/site/settings_visibility.html.heexindex 05bc17b596..cf1cd9c861 100644--- a/lib/plausible_web/templates/site/settings_visibility.html.heex+++ b/lib/plausible_web/templates/site/settings_visibility.html.heex@@ -27,33 +27,17 @@</.form></.tile>- <.tile- docs="shared-links"- feature_mod={Plausible.Billing.Feature.SharedLinks}- site={@site}- current_role={@site_role}- current_team={@site_team}- conn={@conn}- >- <:title>- Shared links- </:title>- <:subtitle>- You can share your stats privately by generating a shared link. The links are impossible to guess and you can add password protection for extra security.- </:subtitle>-- <div :if={Plausible.Billing.Feature.SharedLinks.enabled?(@site)}>- {live_render(@conn, PlausibleWeb.Live.SharedLinkSettings,- session: %{"site_id" => @site.id, "domain" => @site.domain}- )}- </div>- </.tile>+ <div :if={Plausible.Billing.Feature.SharedLinks.enabled?(@site)}>+ {live_render(@conn, PlausibleWeb.Live.SharedLinkSettings,+ session: %{"site_id" => @site.id, "domain" => @site.domain}+ )}+ </div><.tiledocs="embed-dashboard"feature_mod={Plausible.Billing.Feature.SharedLinks}site={@site}- current_role={@site_role}+ current_user={@current_user}current_team={@site_team}conn={@conn}>diff --git a/test/plausible_web/components/billing/billing_test.exs b/test/plausible_web/components/billing/billing_test.exsindex fff310ebb9..dd5154644b 100644--- a/test/plausible_web/components/billing/billing_test.exs+++ b/test/plausible_web/components/billing/billing_test.exs@@ -11,7 +11,7 @@ defmodule PlausibleWeb.Components.BillingTest dotest "renders a blur overlay if the feature is locked", %{user: user} dohtml =%{- current_role: :owner,+ current_user: user,current_team: user |> subscribe_to_growth_plan() |> team_of(),locked?: true}@@ -22,10 +22,10 @@ defmodule PlausibleWeb.Components.BillingTest doassert text_of_element(html, "#feature-gate-overlay") =~ "Upgrade to unlock"end- test "renders a blur overlay for a teamless account" do+ test "renders a blur overlay for a teamless account", %{user: user} dohtml =%{- current_role: nil,+ current_user: user,current_team: nil,locked?: true}@@ -39,7 +39,7 @@ defmodule PlausibleWeb.Components.BillingTest dotest "does not render a blur overlay if feature access is granted", %{user: user} dohtml =%{- current_role: :owner,+ current_user: user,current_team: user |> subscribe_to_business_plan() |> team_of(),locked?: false}@@ -52,7 +52,7 @@ defmodule PlausibleWeb.Components.BillingTest dotest "renders upgrade cta linking to the upgrade page if user role is :owner", %{user: user} dohtml =%{- current_role: :owner,+ current_user: user,current_team: user |> subscribe_to_growth_plan() |> team_of(),locked?: true}@@ -62,10 +62,13 @@ defmodule PlausibleWeb.Components.BillingTest doendtest "renders upgrade cta linking to the upgrade page if user role is :billing", %{user: user} do+ team = user |> subscribe_to_growth_plan() |> team_of()+ billing = add_member(team, role: :billing)+html =%{- current_role: :billing,- current_team: user |> subscribe_to_growth_plan() |> team_of(),+ current_user: billing,+ current_team: team,locked?: true}|> render_feature_gate()@@ -77,10 +80,13 @@ defmodule PlausibleWeb.Components.BillingTest do%{user: user} do+ team = user |> subscribe_to_growth_plan() |> team_of()+ editor = add_member(team, role: :editor)+html =%{- current_role: :editor,- current_team: user |> subscribe_to_growth_plan() |> team_of(),+ current_user: editor,+ current_team: team,locked?: true}|> render_feature_gate()diff --git a/test/plausible_web/components/billing/notice_test.exs b/test/plausible_web/components/billing/notice_test.exsindex cdf9dc63ba..a6d13ee995 100644--- a/test/plausible_web/components/billing/notice_test.exs+++ b/test/plausible_web/components/billing/notice_test.exs@@ -5,12 +5,12 @@ defmodule PlausibleWeb.Components.Billing.NoticeTest doalias PlausibleWeb.Components.Billing.Noticetest "limit_exceeded/1 when user is on growth displays upgrade link" do- me = new_user() |> subscribe_to_growth_plan()- team = team_of(me)+ user = new_user() |> subscribe_to_growth_plan()+ team = team_of(user)rendered =render_component(&Notice.limit_exceeded/1,- current_role: :owner,+ current_user: user,current_team: team,limit: 10,resource: "users"@@ -22,12 +22,12 @@ defmodule PlausibleWeb.Components.Billing.NoticeTest doendtest "limit_exceeded/1 prints resource in singular case when limit is 1" do- me = new_user() |> subscribe_to_growth_plan()+ user = new_user() |> subscribe_to_growth_plan()rendered =render_component(&Notice.limit_exceeded/1,- current_role: :owner,- current_team: team_of(me),+ current_user: user,+ current_team: team_of(user),limit: 1,resource: "users")@@ -38,13 +38,14 @@ defmodule PlausibleWeb.Components.Billing.NoticeTest doendtest "limit_exceeded/1 when current team role is non-owner" do- me = new_user() |> subscribe_to_growth_plan()- my_team = team_of(me) |> Plausible.Teams.complete_setup()+ user = new_user() |> subscribe_to_growth_plan()+ team = team_of(user) |> Plausible.Teams.complete_setup()+ editor = add_member(team, role: :editor)rendered =render_component(&Notice.limit_exceeded/1,- current_role: :editor,- current_team: my_team,+ current_user: editor,+ current_team: team,limit: 10,resource: "users")@@ -55,12 +56,12 @@ defmodule PlausibleWeb.Components.Billing.NoticeTest do@tag :ee_onlytest "limit_exceeded/1 when user is on trial displays upgrade link" do- me = new_user(trial_expiry_date: Date.utc_today())+ user = new_user(trial_expiry_date: Date.utc_today())rendered =render_component(&Notice.limit_exceeded/1,- current_role: :owner,- current_team: team_of(me),+ current_user: user,+ current_team: team_of(user),limit: 10,resource: "users")@@ -72,12 +73,12 @@ defmodule PlausibleWeb.Components.Billing.NoticeTest do@tag :ee_onlytest "limit_exceeded/1 when user is on an enterprise plan displays support email" do- me = new_user() |> subscribe_to_enterprise_plan()+ user = new_user() |> subscribe_to_enterprise_plan()rendered =render_component(&Notice.limit_exceeded/1,- current_role: :owner,- current_team: team_of(me),+ current_user: user,+ current_team: team_of(user),limit: 10,resource: "users")@@ -90,12 +91,12 @@ defmodule PlausibleWeb.Components.Billing.NoticeTest do@tag :ee_onlytest "limit_exceeded/1 when user is on a business plan displays support email" do- me = new_user() |> subscribe_to_business_plan()- team = team_of(me)+ user = new_user() |> subscribe_to_business_plan()+ team = team_of(user)rendered =render_component(&Notice.limit_exceeded/1,- current_role: :owner,+ current_user: user,current_team: team,limit: 10,resource: "users"diff --git a/test/plausible_web/controllers/site_controller_test.exs b/test/plausible_web/controllers/site_controller_test.exsindex aa28867508..9ff1561f02 100644--- a/test/plausible_web/controllers/site_controller_test.exs+++ b/test/plausible_web/controllers/site_controller_test.exs@@ -57,9 +57,77 @@ defmodule PlausibleWeb.SiteControllerTest dodescribe "GET /sites" dosetup [:create_user, :log_in]- test "shows empty screen if no sites", %{conn: conn} do+ test "shows personal sites empty state when there are no sites at all", %{conn: conn} doconn = get(conn, "/sites")- assert html_response(conn, 200) =~ "You don't have any sites yet"+ resp = html_response(conn, 200)++ assert resp =~ "Add your first personal site"+ assert resp =~ "Collect simple, privacy-friendly stats to better understand your audience."+ refute resp =~ "Go to team sites"+ end++ test "shows team sites empty state when team is setup and there are no sites at all", %{+ conn: conn,+ user: user+ } do+ {:ok, team} = Teams.get_or_create(user)+ team = Teams.complete_setup(team)+ conn = set_current_team(conn, team)++ conn = get(conn, "/sites")+ resp = html_response(conn, 200)++ assert resp =~ "Add your first team site"+ assert resp =~ "Collect simple, privacy-friendly stats to better understand your audience."+ refute resp =~ "Go to team sites"+ end++ test "shows team sites empty state when team is setup but has no team sites, and user has personal sites",+ %{conn: conn, user: user} do+ _personal_site = new_site(owner: user)++ other_user = new_user()+ {:ok, other_team} = Teams.get_or_create(other_user)+ other_team = Teams.complete_setup(other_team)+ add_member(other_team, user: user, role: :admin)+ conn = set_current_team(conn, other_team)++ conn = get(conn, "/sites")+ resp = html_response(conn, 200)++ assert resp =~ "Add your first team site"+ assert resp =~ "Collect simple, privacy-friendly stats to better understand your audience."+ refute resp =~ "Go to team sites"+ end++ test "shows personal sites empty state when there are team sites but no personal sites", %{+ conn: conn,+ user: user+ } do+ {:ok, team} = Teams.get_or_create(user)+ team = Teams.complete_setup(team)+ _team_site = new_site(team: team)++ conn = get(conn, "/sites")+ resp = html_response(conn, 200)++ assert resp =~ "Add your first personal site"+ assert resp =~ "Collect simple, privacy-friendly stats to better understand your audience."+ assert resp =~ "Go to team sites"+ end++ test "shows empty search state when filter returns no results but there are sites", %{+ conn: conn,+ user: user+ } do+ _site = new_site(domain: "example.com", owner: user)++ conn = get(conn, "/sites", filter_text: "nonexistent")+ resp = html_response(conn, 200)++ assert resp =~ "No sites found. Try a different search term."+ refute resp =~ "Add your first"+ refute resp =~ "Go to team sites"endtest "lists all of your sites with last 24h visitors (defaulting to 0 on first mount)", %{@@ -195,7 +263,7 @@ defmodule PlausibleWeb.SiteControllerTest doresp = html_response(conn, 200)refute resp =~ "second.example.com"- assert html_response(conn, 200) =~ "No sites found. Please search for something else."+ assert html_response(conn, 200) =~ "No sites found. Try a different search term."refute html_response(conn, 200) =~ "You don't have any sites yet."end@@ -776,7 +844,7 @@ defmodule PlausibleWeb.SiteControllerTest doconn = get(conn, "/#{site.domain}/settings/visibility")resp = html_response(conn, 200)- assert resp =~ "No shared links configured for this site"+ assert resp =~ "Create your first shared link"endtest "does not render shared links with special names", %{conn: conn, site: site} do@@ -990,7 +1058,7 @@ defmodule PlausibleWeb.SiteControllerTest doassert element_exists?(resp, ~s|a[href^="https://accounts.google.com/o/oauth2/"]|)assert(resp =~ "Import data")- assert resp =~ "There are no imports yet"+ assert resp =~ "Import your first data"assert resp =~ "Export data"end@@ -1258,123 +1326,6 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "PUT /:domain/settings/features/visibility/:setting" do- def query_conn_with_some_url(context) do- {:ok, Map.put(context, :conn_with_url, get(context.conn, "/some_parent_path"))}- end-- setup [:create_user, :log_in, :query_conn_with_some_url]-- for {title, setting} <- %{- "Goals" => :conversions_enabled,- "Funnels" => :funnels_enabled,- "Custom Properties" => :props_enabled- } do- test "can toggle #{title} with admin access", %{- user: user,- conn: conn0,- conn_with_url: conn_with_url- } do- site = new_site()- add_guest(site, user: user, role: :editor)-- conn =- put(- conn0,- PlausibleWeb.Components.Site.Feature.target(- site,- unquote(setting),- conn_with_url,- false- )- )-- assert Phoenix.Flash.get(conn.assigns.flash, :success) ==- "#{unquote(title)} are now hidden from your dashboard"-- assert redirected_to(conn, 302) =~ "/some_parent_path"-- assert %{unquote(setting) => false} = Plausible.Sites.get_by_domain(site.domain)-- conn =- put(- conn0,- PlausibleWeb.Components.Site.Feature.target(- site,- unquote(setting),- conn_with_url,- true- )- )-- assert Phoenix.Flash.get(conn.assigns.flash, :success) ==- "#{unquote(title)} are now visible again on your dashboard"-- assert redirected_to(conn, 302) =~ "/some_parent_path"-- assert %{unquote(setting) => true} = Plausible.Sites.get_by_domain(site.domain)- end- end-- for {title, setting} <- %{- "Goals" => :conversions_enabled,- "Funnels" => :funnels_enabled,- "Properties" => :props_enabled- } do- test "cannot toggle #{title} with viewer access", %{- user: user,- conn: conn0,- conn_with_url: conn_with_url- } do- site = new_site()- add_guest(site, user: user, role: :viewer)-- conn =- put(- conn0,- PlausibleWeb.Components.Site.Feature.target(- site,- unquote(setting),- conn_with_url,- false- )- )-- assert conn.status == 404- assert conn.halted- end- end-- test "setting feature visibility is idempotent", %{- user: user,- conn: conn0,- conn_with_url: conn_with_url- } do- site = new_site()- add_guest(site, user: user, role: :editor)-- setting = :funnels_enabled-- conn =- put(- conn0,- PlausibleWeb.Components.Site.Feature.target(site, setting, conn_with_url, false)- )-- assert %{^setting => false} = Plausible.Sites.get_by_domain(site.domain)- assert redirected_to(conn, 302) =~ "/some_parent_path"-- conn =- put(- conn0,- PlausibleWeb.Components.Site.Feature.target(site, setting, conn_with_url, false)- )-- assert %{^setting => false} = Plausible.Sites.get_by_domain(site.domain)- assert redirected_to(conn, 302) =~ "/some_parent_path"- end- end-describe "POST /sites/:domain/weekly-report/enable" dosetup [:create_user, :log_in, :create_site]diff --git a/test/plausible_web/live/funnel_settings_test.exs b/test/plausible_web/live/funnel_settings_test.exsindex f3142b0618..baf3444722 100644--- a/test/plausible_web/live/funnel_settings_test.exs+++ b/test/plausible_web/live/funnel_settings_test.exs@@ -38,7 +38,7 @@ defmodule PlausibleWeb.Live.FunnelSettingsTest doendtest "search funnels input is rendered", %{conn: conn, site: site} do- setup_goals(site)+ {:ok, _} = setup_funnels(site)conn = get(conn, "/#{site.domain}/settings/funnels")resp = html_response(conn, 200)assert element_exists?(resp, ~s/input[type="text"]#filter-text/)@@ -77,7 +77,7 @@ defmodule PlausibleWeb.Live.FunnelSettingsTest doconn = get(conn, "/#{site.domain}/settings/funnels")doc = conn |> html_response(200)- assert text(doc) =~ "Set up a few goals first"+ assert text(doc) =~ "Set up a few goals"add_goals_path = Routes.site_path(conn, :settings_goals, site.domain)assert element_exists?(doc, ~s/a[href="#{add_goals_path}"]/)@@ -90,6 +90,16 @@ defmodule PlausibleWeb.Live.FunnelSettingsTest dodescribe "FunnelSettings live view" dosetup [:create_user, :log_in, :create_site]+ test "allows dashboard toggle", %{conn: conn, site: site} do+ lv = get_liveview(conn, site)+ lv |> element("#feature-funnels-toggle button") |> render_click()+ assert render(lv) =~ "Funnels are now hidden from your dashboard"+ assert Plausible.Billing.Feature.Funnels.opted_out?(Plausible.Repo.reload!(site))+ lv |> element("#feature-funnels-toggle button") |> render_click()+ assert render(lv) =~ "Funnels are now visible again on your dashboard"+ refute Plausible.Billing.Feature.Funnels.opted_out?(Plausible.Repo.reload!(site))+ end+test "allows list filtering / search", %{conn: conn, site: site} do{:ok, _} = setup_funnels(site, ["Funnel One", "Search Me"]){lv, html} = get_liveview(conn, site, with_html?: true)diff --git a/test/plausible_web/live/goal_settings_test.exs b/test/plausible_web/live/goal_settings_test.exsindex aa4d6a6fe7..d869c544ff 100644--- a/test/plausible_web/live/goal_settings_test.exs+++ b/test/plausible_web/live/goal_settings_test.exs@@ -76,7 +76,7 @@ defmodule PlausibleWeb.Live.GoalSettingsTest dotest "if no goals are present, a proper info is displayed", %{conn: conn, site: site} doconn = get(conn, "/#{site.domain}/settings/goals")resp = html_response(conn, 200)- assert resp =~ "No goals configured for this site"+ assert resp =~ "Create your first goal"endtest "if goals are present, no info about missing goals is displayed", %{@@ -86,7 +86,7 @@ defmodule PlausibleWeb.Live.GoalSettingsTest do{:ok, _goals} = setup_goals(site)conn = get(conn, "/#{site.domain}/settings/goals")resp = html_response(conn, 200)- refute resp =~ "No goals configured for this site"+ refute resp =~ "Create your first goal"endtest "add goal button is rendered", %{conn: conn, site: site} do@@ -96,6 +96,7 @@ defmodule PlausibleWeb.Live.GoalSettingsTest doendtest "search goals input is rendered", %{conn: conn, site: site} do+ {:ok, _goals} = setup_goals(site)conn = get(conn, "/#{site.domain}/settings/goals")resp = html_response(conn, 200)assert element_exists?(resp, ~s/input[type="text"]#filter-text/)@@ -119,7 +120,7 @@ defmodule PlausibleWeb.Live.GoalSettingsTest doassert resp = html_response(conn, 200)assert resp =~ "Define actions that you want your users to take"- assert resp =~ "No goals configured for this site"+ assert resp =~ "Create your first goal"assert element_exists?(resp, ~s|a[href="https://plausible.io/docs/goal-conversions"]|)end@@ -151,6 +152,16 @@ defmodule PlausibleWeb.Live.GoalSettingsTest dodescribe "GoalSettings live view" dosetup [:create_user, :log_in, :create_site]+ test "allows dashboard toggle", %{conn: conn, site: site} do+ lv = get_liveview(conn, site)+ lv |> element("#feature-goals-toggle button") |> render_click()+ assert render(lv) =~ "Goals are now hidden from your dashboard"+ assert Plausible.Billing.Feature.Goals.opted_out?(Plausible.Repo.reload!(site))+ lv |> element("#feature-goals-toggle button") |> render_click()+ assert render(lv) =~ "Goals are now visible again on your dashboard"+ refute Plausible.Billing.Feature.Goals.opted_out?(Plausible.Repo.reload!(site))+ end+test "allows goal deletion", %{conn: conn, site: site} do{:ok, [g1, g2 | _]} = setup_goals(site){lv, html} = get_liveview(conn, site, with_html?: true)diff --git a/test/plausible_web/live/props_settings_test.exs b/test/plausible_web/live/props_settings_test.exsindex dd1e5df04d..d90fdffe69 100644--- a/test/plausible_web/live/props_settings_test.exs+++ b/test/plausible_web/live/props_settings_test.exs@@ -75,7 +75,7 @@ defmodule PlausibleWeb.Live.PropsSettingsTest dotest "if no props are allowed, a proper info is displayed", %{conn: conn, site: site} doconn = get(conn, "/#{site.domain}/settings/properties")resp = html_response(conn, 200)- assert resp =~ "No properties configured for this site"+ assert resp =~ "Create a custom property"endtest "if props are enabled, no info about missing props is displayed", %{@@ -85,7 +85,7 @@ defmodule PlausibleWeb.Live.PropsSettingsTest do{:ok, site} = Plausible.Props.allow(site, ["amount", "logged_in", "is_customer"])conn = get(conn, "/#{site.domain}/settings/properties")resp = html_response(conn, 200)- refute resp =~ "No properties configured for this site"+ refute resp =~ "Create a custom property"endtest "add property button is rendered", %{conn: conn, site: site} do@@ -95,6 +95,7 @@ defmodule PlausibleWeb.Live.PropsSettingsTest doendtest "search props input is rendered", %{conn: conn, site: site} do+ {:ok, site} = Plausible.Props.allow(site, ["amount", "logged_in", "is_customer"])conn = get(conn, "/#{site.domain}/settings/properties")resp = html_response(conn, 200)assert element_exists?(resp, ~s/input[type="text"]#filter-text/)@@ -142,13 +143,16 @@ defmodule PlausibleWeb.Live.PropsSettingsTest do} doconn = get(conn, "/#{consolidated_view.domain}/settings/properties")resp = html_response(conn, 200)- assert resp =~ "No properties configured for this site"+ assert resp =~ "Create a custom property"endtest "add property button and search input are rendered", %{conn: conn,consolidated_view: consolidated_view} do+ {:ok, consolidated_view} =+ Plausible.Props.allow(consolidated_view, ["amount", "logged_in", "is_customer"])+conn = get(conn, "/#{consolidated_view.domain}/settings/properties")resp = html_response(conn, 200)assert element_exists?(resp, ~s/button[phx-click="add-prop"]/)@@ -158,19 +162,19 @@ defmodule PlausibleWeb.Live.PropsSettingsTest doendend- # validating input- # clicking suggestions fills out input- # adding props- # error when reached props limit- # clearserror when fixed input- # removal- # removal shows confirmation- # allow existing props: shows/hides- # after adding all suggestions no allow existing props-describe "PropsSettings live view" dosetup [:create_user, :log_in, :create_site]+ test "allows dashboard toggle", %{conn: conn, site: site} do+ lv = get_liveview(conn, site)+ lv |> element("#feature-props-toggle button") |> render_click()+ assert render(lv) =~ "Custom Properties are now hidden from your dashboard"+ assert Plausible.Billing.Feature.Props.opted_out?(Plausible.Repo.reload!(site))+ lv |> element("#feature-props-toggle button") |> render_click()+ assert render(lv) =~ "Custom Properties are now visible again on your dashboard"+ refute Plausible.Billing.Feature.Props.opted_out?(Plausible.Repo.reload!(site))+ end+test "allows prop removal", %{conn: conn, site: site} do{:ok, site} = Plausible.Props.allow(site, ["amount", "logged_in"]){lv, html} = get_liveview(conn, site, with_html?: true)@@ -222,6 +226,7 @@ defmodule PlausibleWeb.Live.PropsSettingsTest doendtest "allows resetting filter text via no match link", %{conn: conn, site: site} do+ {:ok, site} = Plausible.Props.allow(site, ["amount", "logged_in", "is_customer"])lv = get_liveview(conn, site)html = type_into_search(lv, "Definitely this is not going to render any matches")diff --git a/test/plausible_web/live/shared_link_settings_test.exs b/test/plausible_web/live/shared_link_settings_test.exsindex 8e79d95f7a..3841b4f75d 100644--- a/test/plausible_web/live/shared_link_settings_test.exs+++ b/test/plausible_web/live/shared_link_settings_test.exs@@ -101,7 +101,7 @@ defmodule PlausibleWeb.Live.SharedLinkSettingsTest dolv = get_liveview(conn, session)html = render(lv)- assert html =~ "No shared links configured for this site"+ assert html =~ "Create your first shared link"endenddiff --git a/test/plausible_web/live/shields/countries_test.exs b/test/plausible_web/live/shields/countries_test.exsindex ecd98da8db..f097508932 100644--- a/test/plausible_web/live/shields/countries_test.exs+++ b/test/plausible_web/live/shields/countries_test.exs@@ -13,7 +13,7 @@ defmodule PlausibleWeb.Live.Shields.CountriesTest doconn = get(conn, "/#{site.domain}/settings/shields/countries")resp = html_response(conn, 200)- assert resp =~ "No country rules configured for this site"+ assert resp =~ "Block a country"assert resp =~ "Country block list"enddiff --git a/test/plausible_web/live/shields/hostnames_test.exs b/test/plausible_web/live/shields/hostnames_test.exsindex 497162bbaa..22c150dc8f 100644--- a/test/plausible_web/live/shields/hostnames_test.exs+++ b/test/plausible_web/live/shields/hostnames_test.exs@@ -13,9 +13,9 @@ defmodule PlausibleWeb.Live.Shields.HostnamesTest doconn = get(conn, "/#{site.domain}/settings/shields/hostnames")resp = html_response(conn, 200)- assert resp =~ "No hostname rules configured for this site"+ assert resp =~ "Allow a hostname"assert resp =~ "Hostnames allow list"- assert resp =~ "Traffic from all hostnames is currently accepted."+ assert resp =~ "Traffic from all hostnames is recorded until you add your first rule"endtest "lists hostname rules with remove actions", %{conn: conn, site: site} dodiff --git a/test/plausible_web/live/shields/ip_addresses_test.exs b/test/plausible_web/live/shields/ip_addresses_test.exsindex f5c960ff7f..2e044c5122 100644--- a/test/plausible_web/live/shields/ip_addresses_test.exs+++ b/test/plausible_web/live/shields/ip_addresses_test.exs@@ -13,7 +13,7 @@ defmodule PlausibleWeb.Live.Shields.IPAddressesTest doconn = get(conn, "/#{site.domain}/settings/shields/ip_addresses")resp = html_response(conn, 200)- assert resp =~ "No IP rules configured for this site"+ assert resp =~ "Block an IP address"assert resp =~ "IP block list"enddiff --git a/test/plausible_web/live/shields/pages_test.exs b/test/plausible_web/live/shields/pages_test.exsindex a97c774f9e..acc5d3eb31 100644--- a/test/plausible_web/live/shields/pages_test.exs+++ b/test/plausible_web/live/shields/pages_test.exs@@ -13,7 +13,7 @@ defmodule PlausibleWeb.Live.Shields.PagesTest doconn = get(conn, "/#{site.domain}/settings/shields/pages")resp = html_response(conn, 200)- assert resp =~ "No page rules configured for this site"+ assert resp =~ "Block a page"assert resp =~ "Pages block list"enddiff --git a/test/plausible_web/live/sites_test.exs b/test/plausible_web/live/sites_test.exsindex a07dcba034..afb14d696c 100644--- a/test/plausible_web/live/sites_test.exs+++ b/test/plausible_web/live/sites_test.exs@@ -14,10 +14,10 @@ defmodule PlausibleWeb.Live.SitesTest do{:ok, _lv, html} = live(conn, "/sites")text = text(html)+assert text =~ "My personal sites"- assert text =~ "You don't have any sites yet"- refute text =~ "You currently have no personal sites"- refute text =~ "Go to your team"+ assert text =~ "Add your first personal site"+ refute text =~ "Go to team sites"endtest "renders team switcher link, if on personal sites with other teams available", %{@@ -33,8 +33,8 @@ defmodule PlausibleWeb.Live.SitesTest doassert text =~ "My personal sites"refute text =~ "You don't have any sites yet"- assert text =~ "You currently have no personal sites"- assert text =~ "Go to your team"+ assert text =~ "Add your first personal site"+ assert text =~ "Go to team sites"endtest "renders settings link when current team is set", %{user: user, conn: conn} do