Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Replace site card ellipsis menu with hover buttons (#6773)

Sanne de Vries598928e7db29
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 152e219cac..a6c2a58a15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,7 @@ All notable changes to this project will be documented in this file.
- Moved tracking options (outbound links, file downloads, form submissions) from the installation page to the general site settings, where they can be toggled without going through the installation flow
- Replaced HCaptcha with Friendly Captcha
- Team names are now limited to 50 characters and cannot contain URLs with an explicit scheme (e.g. `https://`)
+- Replaced the options menu on site cards with individual Settings and Pin/Unpin buttons that appear on hover
### Fixed
diff --git a/lib/plausible_web/components/generic.ex b/lib/plausible_web/components/generic.ex
index 457bc02b4b..c5ad9037fa 100644
--- a/lib/plausible_web/components/generic.ex
+++ b/lib/plausible_web/components/generic.ex
@@ -667,7 +667,7 @@ defmodule PlausibleWeb.Components.Generic do
"sm" => "tooltip-sm"
}
- attr(:sticky?, :boolean, default: true)
+ attr(:hover_only?, :boolean, default: false)
attr(:enabled?, :boolean, default: true)
attr(:centered?, :boolean, default: false)
attr(:interactive?, :boolean, default: true)
@@ -678,9 +678,9 @@ defmodule PlausibleWeb.Components.Generic do
def tooltip(assigns) do
wrapper_data =
- if assigns[:sticky?], do: "{sticky: false, hovered: false}", else: "{hovered: false}"
+ if assigns.hover_only?, do: "{hovered: false}", else: "{sticky: false, hovered: false}"
- show_inner = if assigns[:sticky?], do: "hovered || sticky", else: "hovered"
+ show_inner = if assigns.hover_only?, do: "hovered", else: "hovered || sticky"
base_classes = [
"absolute",
@@ -690,7 +690,8 @@ defmodule PlausibleWeb.Components.Generic do
"z-[1000]",
"sm:max-w-64",
"w-max",
- if(!assigns.interactive?, do: "pointer-events-none")
+ if(!assigns.interactive?, do: "pointer-events-none"),
+ if(assigns.hover_only?, do: "pointer-coarse:hidden")
]
tooltip_position_classes =
@@ -732,7 +733,10 @@ defmodule PlausibleWeb.Components.Generic do
{render_slot(@tooltip_content)}
</div>
</div>
- <div x-on:click="sticky = true; hovered = true" x-on:click.outside="sticky = false">
+ <div
+ x-on:click={!@hover_only? && "sticky = true; hovered = true"}
+ x-on:click.outside={!@hover_only? && "sticky = false"}
+ >
{render_slot(@inner_block)}
</div>
</div>
diff --git a/lib/plausible_web/live/sites.ex b/lib/plausible_web/live/sites.ex
index dc0481ecdc..233b41d110 100644
--- a/lib/plausible_web/live/sites.ex
+++ b/lib/plausible_web/live/sites.ex
@@ -105,7 +105,10 @@ defmodule PlausibleWeb.Live.Sites do
end
def render(assigns) do
- assigns = assign(assigns, :searching?, assigns.filter_text != "")
+ assigns =
+ assigns
+ |> assign(:searching?, assigns.filter_text != "")
+ |> assign(:pinnable?, length(assigns.index_state.ordered_ids) > 1)
~H"""
<.flash_messages flash={@flash} />
@@ -258,6 +261,7 @@ defmodule PlausibleWeb.Live.Sites do
<.site
site={site}
sparkline={Map.get(@sparklines, site.domain, :loading)}
+ pinnable?={@pinnable?}
/>
<% end %>
</ul>
@@ -420,23 +424,33 @@ defmodule PlausibleWeb.Live.Sites do
~H"""
<li
data-test-id="consolidated-view-card"
- class="relative row-span-2"
+ class="group relative isolate row-span-2 has-[[data-card-actions]:hover]:z-10"
>
- <.unstyled_link
- href={stats_path(@consolidated_view.domain)}
- class="flex flex-col justify-between gap-6 h-full bg-white p-5 dark:bg-gray-900 rounded-md shadow-sm cursor-pointer hover:shadow-md transition-shadow duration-150"
- >
+ <div class="flex flex-col justify-between gap-6 h-full bg-white p-5 dark:bg-gray-900 rounded-md shadow-sm hover:shadow-md transition-shadow duration-150">
<div class="flex flex-col flex-1 justify-between gap-y-5">
- <div class="flex flex-col gap-y-2 mb-auto">
- <span class="size-8 sm:size-10 bg-indigo-600 ring-2 ring-inset ring-white/25 dark:ring-white/15 text-white p-1.5 sm:p-2 rounded-lg sm:rounded-xl">
- <.globe_icon />
- </span>
- <h3 class="text-gray-900 font-medium text-md sm:text-lg leading-tight dark:text-gray-100">
- All sites
- </h3>
+ <div class="flex items-start justify-between gap-x-2 mb-auto">
+ <div class="flex flex-col gap-y-2">
+ <span
+ aria-hidden="true"
+ class="size-8 sm:size-10 bg-indigo-600 ring-2 ring-inset ring-white/25 dark:ring-white/15 text-white p-1.5 sm:p-2 rounded-lg sm:rounded-xl"
+ >
+ <.globe_icon />
+ </span>
+ <h3 class="text-gray-900 font-medium text-md leading-tight dark:text-gray-100">
+ <.card_link href={stats_path(@consolidated_view.domain)}>All sites</.card_link>
+ </h3>
+ </div>
+ <div
+ :if={@can_manage_consolidated_view?}
+ data-card-actions
+ class={["relative z-10 -mt-1", reveal_on_hover()]}
+ >
+ <.site_settings_button site={@consolidated_view} />
+ </div>
</div>
<span
:if={is_map(@consolidated_sparkline)}
+ aria-hidden="true"
class="h-[48px] max-w-sm sm:max-w-none text-indigo-500 my-auto"
data-test-id="consolidated-view-chart-loaded"
>
@@ -487,9 +501,6 @@ defmodule PlausibleWeb.Live.Sites do
<div class="w-full h-full dark:bg-gray-750 bg-gray-100 rounded-md"></div>
</div>
</div>
- </.unstyled_link>
- <div :if={@can_manage_consolidated_view?} class="absolute right-1 top-3.5">
- <.ellipsis_menu site={@consolidated_view} can_manage?={true} />
</div>
</li>
"""
@@ -518,6 +529,7 @@ defmodule PlausibleWeb.Live.Sites do
attr(:site, Plausible.Site, required: true)
attr(:sparkline, :map, required: true)
+ attr(:pinnable?, :boolean, default: true)
def site(assigns) do
assigns =
@@ -529,7 +541,7 @@ defmodule PlausibleWeb.Live.Sites do
~H"""
<li
- class="group relative group-has-[[data-sort-trigger].phx-click-loading]/sort:opacity-75"
+ class="group relative isolate has-[[data-card-actions]:hover]:z-10 group-has-[[data-sort-trigger].phx-click-loading]/sort:opacity-75"
id={"site-card-#{hash_domain(@site.domain)}"}
data-domain={@site.domain}
data-pin-toggled={
@@ -545,52 +557,93 @@ defmodule PlausibleWeb.Live.Sites do
)
}
>
- <.unstyled_link
- href={
- stats_path(
- @site.domain,
- if(@needs_verification?,
- do: [verify_installation: true, flow: PlausibleWeb.Flows.provisioning()],
- else: []
- )
- )
- }
- class="block group-has-[.phx-click-loading]/sort:animate-pulse group-has-[.phx-click-loading]/sort:pointer-events-none"
- >
- <div class="col-span-1 flex flex-col gap-y-5 bg-white dark:bg-gray-900 rounded-md shadow-sm p-5 group-hover:shadow-lg cursor-pointer transition duration-100">
- <div class="w-full flex items-center justify-between gap-x-2.5">
- <.favicon domain={@site.domain} />
- <div class="flex-1 w-full">
- <h3
- class="text-gray-900 font-medium text-md sm:text-lg leading-[22px] truncate dark:text-gray-100"
- style="width: calc(100% - 4rem)"
- >
- {@site.domain}
- </h3>
+ <div class="flex flex-col gap-y-5 bg-white dark:bg-gray-900 rounded-md shadow-sm py-4 px-5 group-hover:shadow-lg transition duration-100 group-has-[.phx-click-loading]/sort:animate-pulse group-has-[.phx-click-loading]/sort:pointer-events-none">
+ <div class="flex items-center min-h-8 gap-x-2">
+ <.favicon domain={@site.domain} />
+ <h3 class="flex-1 min-w-0 truncate text-gray-900 font-medium text-md leading-[22px] dark:text-gray-100">
+ <.card_link href={
+ stats_path(
+ @site.domain,
+ if(@needs_verification?,
+ do: [verify_installation: true, flow: PlausibleWeb.Flows.provisioning()],
+ else: []
+ )
+ )
+ }>
+ {@site.domain}
+ </.card_link>
+ </h3>
+ <div data-card-actions class="relative z-10 flex shrink-0 gap-x-1">
+ <div
+ :if={List.first(@site.memberships).role in [:owner, :admin, :editor]}
+ class={reveal_on_hover()}
+ >
+ <.site_settings_button site={@site} />
+ </div>
+ <div :if={@pinnable?} class={[email protected]_at && reveal_on_hover()}>
+ <.pin_button site={@site} />
</div>
</div>
- <.site_stats sparkline={@sparkline} needs_verification?={@needs_verification?} />
</div>
- </.unstyled_link>
-
- <div class="absolute right-1 top-3.5">
- <.ellipsis_menu
- site={@site}
- can_manage?={List.first(@site.memberships).role in [:owner, :admin, :editor]}
- />
+ <.site_stats sparkline={@sparkline} needs_verification?={@needs_verification?} />
</div>
</li>
"""
end
- def ellipsis_menu(assigns) do
- assigns = assign(assigns, %{dropdown_id: "site-#{assigns[:site].domain}-dropdown"})
+ # Touch screens have no hover, so the buttons stay visible there.
+ defp reveal_on_hover do
+ "hidden group-hover:block group-focus-within:block pointer-coarse:block"
+ end
+
+ attr(:href, :string, required: true)
+ slot(:inner_block, required: true)
+ defp card_link(assigns) do
~H"""
- <div class="flex items-center">
- <button
- :if={@site.pinned_at}
- data-test-id="site-card-pin-icon"
+ <.unstyled_link
+ href={@href}
+ class="after:absolute after:inset-0 after:rounded-md focus-visible:ring-0 focus-visible:ring-offset-0 focus-visible:after:ring-2 focus-visible:after:ring-indigo-500"
+ >
+ {render_slot(@inner_block)}
+ </.unstyled_link>
+ """
+ end
+
+ attr(:site, Plausible.Site, required: true)
+
+ defp site_settings_button(assigns) do
+ ~H"""
+ <.tooltip centered?={true} hover_only?={true} interactive?={false}>
+ <:tooltip_content>Site settings</:tooltip_content>
+ <.button_link
+ href={~p"/#{@site.domain}/settings/general"}
+ theme="ghost"
+ size="xs"
+ icon?={true}
+ aria-label="Site settings"
+ >
+ <Heroicons.cog_6_tooth class="size-4.5" />
+ </.button_link>
+ </.tooltip>
+ """
+ end
+
+ attr(:site, Plausible.Site, required: true)
+
+ defp pin_button(assigns) do
+ assigns =
+ assign(assigns, :label, if(assigns.site.pinned_at, do: "Unpin site", else: "Pin site"))
+
+ ~H"""
+ <.tooltip centered?={true} hover_only?={true} interactive?={false}>
+ <:tooltip_content>{@label}</:tooltip_content>
+ <.button
+ theme="ghost"
+ size="xs"
+ icon?={true}
+ aria-label={@label}
+ data-test-id="site-card-pin-button"
phx-click={
JS.hide(
transition: {"duration-500", "opacity-100", "opacity-0"},
@@ -600,62 +653,13 @@ defmodule PlausibleWeb.Live.Sites do
|> JS.push("pin-toggle")
}
phx-value-domain={@site.domain}
- class="cursor-pointer p-1"
>
<PlausibleWeb.Components.Icons.pin_icon
- filled={true}
- class="size-4.5 pb-px shrink-0 text-indigo-600 dark:text-indigo-500"
+ filled={[email protected]_at}
+ class={["size-4.5", @site.pinned_at && "text-indigo-600 dark:text-indigo-500"]}
/>
- </button>
-
- <PrimaDropdown.dropdown id={@dropdown_id}>
- <PrimaDropdown.dropdown_trigger
- id={"#{@dropdown_id}-trigger"}
- theme="link"
- size="sm"
- icon?={true}
- >
- <Heroicons.ellipsis_vertical class="size-5" />
- </PrimaDropdown.dropdown_trigger>
-
- <PrimaDropdown.dropdown_menu id={"#{@dropdown_id}-menu"}>
- <PrimaDropdown.dropdown_item
- :if={@can_manage?}
- id={"#{@dropdown_id}-item-1"}
- as={&link/1}
- href={~p"/#{@site.domain}/settings/general"}
- >
- <Heroicons.cog_6_tooth class={PrimaDropdown.dropdown_item_icon_class()} /> Settings
- </PrimaDropdown.dropdown_item>
-
- <PrimaDropdown.dropdown_item
- :if={Sites.regular?(@site)}
- id={"#{@dropdown_id}-item-2"}
- data-test-id="ellipsis-menu-pin-item"
- phx-click={
- JS.hide(
- transition: {"duration-500", "opacity-100", "opacity-0"},
- to: "#site-card-#{hash_domain(@site.domain)}",
- time: 500
- )
- |> JS.push("pin-toggle")
- }
- phx-value-domain={@site.domain}
- >
- <PlausibleWeb.Components.Icons.pin_icon
- :if={@site.pinned_at}
- filled={true}
- class={PrimaDropdown.dropdown_item_icon_class()}
- />
- <PlausibleWeb.Components.Icons.pin_icon
- class={PrimaDropdown.dropdown_item_icon_class()}
- />
- {if @site.pinned_at, do: "Unpin site", else: "Pin site"}
- </PrimaDropdown.dropdown_item>
- </PrimaDropdown.dropdown_menu>
- </PrimaDropdown.dropdown>
- </div>
+ </.button>
+ </.tooltip>
"""
end
@@ -673,7 +677,7 @@ defmodule PlausibleWeb.Live.Sites do
</div>
<div :if={is_map(@sparkline)}>
<span class="flex flex-col gap-y-5 text-gray-600 dark:text-gray-400 text-sm truncate">
- <span class="h-[48px] max-w-sm sm:max-w-none text-indigo-500">
+ <span aria-hidden="true" class="h-[48px] max-w-sm sm:max-w-none text-indigo-500">
<PlausibleWeb.Live.Components.Visitors.chart
intervals={@sparkline.intervals}
height={80}
@@ -705,8 +709,11 @@ defmodule PlausibleWeb.Live.Sites do
def percentage_change(assigns) do
~H"""
<p class="text-sm text-gray-900 dark:text-gray-100">
+ <span :if={@change > 0} class="sr-only">Up</span>
+ <span :if={@change < 0} class="sr-only">Down</span>
<svg
:if={@change > 0}
+ aria-hidden="true"
xmlns="http://www.w3.org/2000/svg"
fill="currentColor"
viewBox="0 0 24 24"
@@ -721,6 +728,7 @@ defmodule PlausibleWeb.Live.Sites do
</svg>
<svg
:if={@change < 0}
+ aria-hidden="true"
xmlns="http://www.w3.org/2000/svg"
fill="currentColor"
viewBox="0 0 24 24"
@@ -803,8 +811,8 @@ defmodule PlausibleWeb.Live.Sites do
)
~H"""
- <img src={@light_src} alt="" class="shrink-0 size-6 rounded-md dark:hidden" />
- <img src={@dark_src} alt="" class="shrink-0 size-6 rounded-md hidden dark:block" />
+ <img src={@light_src} alt="" class="shrink-0 size-5.5 rounded-md dark:hidden" />
+ <img src={@dark_src} alt="" class="shrink-0 size-5.5 rounded-md hidden dark:block" />
"""
end
diff --git a/test/plausible_web/live/sites_test.exs b/test/plausible_web/live/sites_test.exs
index e78e9fbd58..259c5877bb 100644
--- a/test/plausible_web/live/sites_test.exs
+++ b/test/plausible_web/live/sites_test.exs
@@ -162,7 +162,9 @@ defmodule PlausibleWeb.Live.SitesTest do
site_card = text_of_element(html, "li[data-domain=\"#{site.domain}\"]")
assert site_card =~ "Setup pending"
- dashboard_link_href = text_of_attr(html, "li[data-domain=\"#{site.domain}\"] > a", "href")
+ dashboard_link_href =
+ text_of_attr(html, "li[data-domain=\"#{site.domain}\"] h3 a", "href")
+
assert dashboard_link_href =~ "verify_installation=true"
assert Repo.reload!(site).onboarding_status == :new_site
@@ -179,7 +181,9 @@ defmodule PlausibleWeb.Live.SitesTest do
site_card = text_of_element(html, "li[data-domain=\"#{site.domain}\"]")
refute site_card =~ "Setup pending"
- dashboard_link_href = text_of_attr(html, "li[data-domain=\"#{site.domain}\"] > a", "href")
+ dashboard_link_href =
+ text_of_attr(html, "li[data-domain=\"#{site.domain}\"] h3 a", "href")
+
refute dashboard_link_href =~ "verify_installation=true"
assert Repo.reload!(site).onboarding_status == :first_pageview
@@ -197,7 +201,7 @@ defmodule PlausibleWeb.Live.SitesTest do
refute site_card =~ "Setup pending"
dashboard_link_href =
- text_of_attr(html, "li[data-domain=\"#{site.domain}\"] > a", "href")
+ text_of_attr(html, "li[data-domain=\"#{site.domain}\"] h3 a", "href")
refute dashboard_link_href =~ "verify_installation=true"
end
@@ -212,7 +216,9 @@ defmodule PlausibleWeb.Live.SitesTest do
site_card = text_of_element(html, "li[data-domain=\"#{site.domain}\"]")
refute site_card =~ "Setup pending"
- dashboard_link_href = text_of_attr(html, "li[data-domain=\"#{site.domain}\"] > a", "href")
+ dashboard_link_href =
+ text_of_attr(html, "li[data-domain=\"#{site.domain}\"] h3 a", "href")
+
refute dashboard_link_href =~ "verify_installation=true"
end
end
@@ -237,6 +243,16 @@ defmodule PlausibleWeb.Live.SitesTest do
assert element_exists?(html, ~s|[data-test-id="consolidated-view-card"]|)
assert element_exists?(html, ~s|[data-test-id="consolidated-view-stats-loaded"]|)
assert element_exists?(html, ~s|[data-test-id="consolidated-view-chart-loaded"]|)
+
+ assert element_exists?(
+ html,
+ ~s|[data-test-id="consolidated-view-card"] a[aria-label="Site settings"][href$="/settings/general"]|
+ )
+
+ refute element_exists?(
+ html,
+ ~s|[data-test-id="consolidated-view-card"] [data-test-id="site-card-pin-button"]|
+ )
end
test "consolidated view presents consolidated stats", %{conn: conn, user: user} do
@@ -641,16 +657,62 @@ defmodule PlausibleWeb.Live.SitesTest do
end
end
- describe "pinning" do
- test "renders pin site option when site not pinned", %{conn: conn, user: user} do
+ describe "pin button visibility" do
+ test "is not rendered when the user has one site", %{conn: conn, user: user} do
+ site = new_site(owner: user)
+
+ {:ok, _lv, html} = live(conn, "/sites")
+
+ assert element_exists?(html, ~s/li[data-domain="#{site.domain}"]/)
+ refute element_exists?(html, ~s/[data-test-id="site-card-pin-button"]/)
+ end
+
+ test "is rendered for a site pinned before it became the only one, once another is added",
+ %{conn: conn, user: user} do
site = new_site(owner: user)
+ assert {:ok, _} = Plausible.Sites.toggle_pin(user, site)
{:ok, _lv, html} = live(conn, "/sites")
+ refute element_exists?(html, ~s/[data-test-id="site-card-pin-button"]/)
- assert text_of_element(
+ new_site(owner: user)
+ {:ok, _lv, html} = live(conn, "/sites")
+
+ assert text_of_attr(
html,
- ~s/li[data-domain="#{site.domain}"] button[phx-value-domain]/
- ) == "Pin site"
+ ~s/li[data-domain="#{site.domain}"] [data-test-id="site-card-pin-button"]/,
+ "aria-label"
+ ) == "Unpin site"
+ end
+
+ test "stays rendered when a search matches one of several sites", %{conn: conn, user: user} do
+ site = new_site(owner: user, domain: "unique-match.example.com")
+ new_site(owner: user)
+
+ {:ok, _lv, html} = live(conn, "/sites?filter_text=unique-match")
+
+ assert element_exists?(
+ html,
+ ~s/li[data-domain="#{site.domain}"] [data-test-id="site-card-pin-button"]/
+ )
+ end
+ end
+
+ describe "pinning" do
+ setup %{user: user} do
+ new_site(owner: user)
+ :ok
+ end
+
+ test "renders pin site button when site not pinned", %{conn: conn, user: user} do
+ site = new_site(owner: user)
+
+ {:ok, _lv, html} = live(conn, "/sites")
+
+ button_selector = ~s/li[data-domain="#{site.domain}"] [data-test-id="site-card-pin-button"]/
+
+ assert text_of_attr(html, button_selector, "aria-label") == "Pin site"
+ assert text_of_element(html, "li[data-domain=\"#{site.domain}\"]") =~ "Pin site"
end
test "site state changes when pin toggled", %{conn: conn, user: user} do
@@ -659,7 +721,7 @@ defmodule PlausibleWeb.Live.SitesTest do
{:ok, lv, _html} = live(conn, "/sites")
button_selector =
- ~s/button[phx-value-domain="#{site.domain}"][data-test-id="ellipsis-menu-pin-item"]/
+ ~s/button[phx-value-domain="#{site.domain}"][data-test-id="site-card-pin-button"]/
html =
lv
@@ -668,7 +730,7 @@ defmodule PlausibleWeb.Live.SitesTest do
assert html =~ "Site pinned"
- assert text_of_element(html, button_selector) == "Unpin site"
+ assert text_of_attr(html, button_selector, "aria-label") == "Unpin site"
html =
lv
@@ -677,7 +739,7 @@ defmodule PlausibleWeb.Live.SitesTest do
assert html =~ "Site unpinned"
- assert text_of_element(html, button_selector) == "Pin site"
+ assert text_of_attr(html, button_selector, "aria-label") == "Pin site"
end
test "shows error when pins limit hit", %{conn: conn, user: user} do
@@ -690,7 +752,7 @@ defmodule PlausibleWeb.Live.SitesTest do
{:ok, lv, _html} = live(conn, "/sites")
- button_selector = ~s/li[data-domain="#{site.domain}"] button[phx-value-domain]/
+ button_selector = ~s/li[data-domain="#{site.domain}"] [data-test-id="site-card-pin-button"]/
html =
lv
@@ -711,67 +773,32 @@ defmodule PlausibleWeb.Live.SitesTest do
refute Repo.get_by(Plausible.Site.UserPreference, user_id: user.id, site_id: site.id)
end
- test "pin icon is shown on site card when site is pinned", %{conn: conn, user: user} do
+ test "pin icon is filled on site card when site is pinned", %{conn: conn, user: user} do
site = new_site(owner: user)
assert {:ok, _} = Plausible.Sites.toggle_pin(user, site)
{:ok, _lv, html} = live(conn, "/sites")
- assert element_exists?(
+ assert text_of_attr(
html,
- ~s/li[data-domain="#{site.domain}"] [data-test-id="site-card-pin-icon"]/
- )
+ ~s/li[data-domain="#{site.domain}"] [data-test-id="site-card-pin-button"] svg/,
+ "fill"
+ ) == "currentColor"
end
- test "pin icon is not shown on site card when site is not pinned", %{conn: conn, user: user} do
+ test "pin icon is outlined on site card when site is not pinned", %{conn: conn, user: user} do
site = new_site(owner: user)
{:ok, _lv, html} = live(conn, "/sites")
- refute element_exists?(
- html,
- ~s/li[data-domain="#{site.domain}"] [data-test-id="site-card-pin-icon"]/
- )
- end
-
- test "pin icon appears on site card after pinning", %{conn: conn, user: user} do
- site = new_site(owner: user)
-
- {:ok, lv, _html} = live(conn, "/sites")
-
- button_selector =
- ~s/button[phx-value-domain="#{site.domain}"][data-test-id="ellipsis-menu-pin-item"]/
-
- lv |> element(button_selector) |> render_click()
-
- html = render(lv)
-
- assert element_exists?(
+ assert text_of_attr(
html,
- ~s/li[data-domain="#{site.domain}"] [data-test-id="site-card-pin-icon"]/
- )
- end
-
- test "pin icon disappears from site card after unpinning", %{conn: conn, user: user} do
- site = new_site(owner: user)
- assert {:ok, _} = Plausible.Sites.toggle_pin(user, site)
-
- {:ok, lv, _html} = live(conn, "/sites")
-
- button_selector =
- ~s/[phx-value-domain="#{site.domain}"][data-test-id="site-card-pin-icon"]/
-
- lv |> element(button_selector) |> render_click()
-
- html = render(lv)
-
- refute element_exists?(
- html,
- button_selector
- )
+ ~s/li[data-domain="#{site.domain}"] [data-test-id="site-card-pin-button"] svg/,
+ "fill"
+ ) == "none"
end
- test "billing role member can pin a site via the ellipsis menu", %{conn: conn, user: user} do
+ test "billing role member can pin a site with the pin button", %{conn: conn, user: user} do
site = new_site(owner: user)
team = site.team |> Plausible.Teams.complete_setup()
billing_user = add_member(team, role: :billing)
@@ -781,14 +808,14 @@ defmodule PlausibleWeb.Live.SitesTest do
{:ok, lv, _html} = live(conn, "/sites?__team=#{team.identifier}")
button_selector =
- ~s/button[phx-value-domain="#{site.domain}"][data-test-id="ellipsis-menu-pin-item"]/
+ ~s/button[phx-value-domain="#{site.domain}"][data-test-id="site-card-pin-button"]/
html = lv |> element(button_selector) |> render_click()
assert html =~ "Site pinned"
end
- test "billing role member does not see Settings in the ellipsis menu", %{
+ test "billing role member does not see the site settings button", %{
conn: conn,
user: user
} do
@@ -807,7 +834,7 @@ defmodule PlausibleWeb.Live.SitesTest do
end
end
- describe "ellipsis menu settings visibility" do
+ describe "site settings button visibility" do
@allowed_to_see_settings [:owner, :editor, :admin]
for role <- @allowed_to_see_settings do
test "#{role} can see settings", %{conn: conn, user: user} do