Skip to content

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

Use Sites.Index on /sites (#6143)

Adam Rutkowskid34b683198b0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3633eed60d..2042f5df75 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ All notable changes to this project will be documented in this file.
### Changed
- Keybind hints are hidden on smaller screens
+- Site index is sortable alphanumerically and by traffic
### Fixed
diff --git a/assets/css/app.css b/assets/css/app.css
index 7ac73a4967..bdff468035 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -103,6 +103,7 @@
/* Set v3 default ring behavior */
--default-ring-width: 2px;
--default-ring-color: var(--color-indigo-500);
+ --animate-pulse: pulse 1.5s cubic-bezier(0.4, 0, 0.6, 1) infinite;
}
@media print {
@@ -128,7 +129,7 @@
}
.button {
- @apply inline-flex justify-center px-3.5 py-2 text-sm font-medium text-white bg-indigo-600 border border-transparent rounded-md leading-5 transition hover:bg-indigo-700;
+ @apply inline-flex justify-center px-3.5 py-2.5 text-sm font-medium text-white bg-indigo-600 border border-transparent rounded-md leading-5 transition hover:bg-indigo-700;
}
.button[disabled] {
diff --git a/extra/lib/plausible_web/live/customer_support/team/components/sites.ex b/extra/lib/plausible_web/live/customer_support/team/components/sites.ex
index bd12326f99..920457cff4 100644
--- a/extra/lib/plausible_web/live/customer_support/team/components/sites.ex
+++ b/extra/lib/plausible_web/live/customer_support/team/components/sites.ex
@@ -22,7 +22,8 @@ defmodule PlausibleWeb.CustomerSupport.Team.Components.Sites do
Index.build(owner, team: team, sort_by: :traffic, sort_direction: :desc)
end)
- page = Index.paginate(socket.assigns.index_state, tab_params["page"], @page_size)
+ page =
+ Index.paginate(socket.assigns.index_state, page: tab_params["page"], page_size: @page_size)
sites = fetch_sites(page.entries)
@@ -66,7 +67,7 @@ defmodule PlausibleWeb.CustomerSupport.Team.Components.Sites do
end
new_state = Index.sort(current_state, sort_by: sort_by, sort_direction: sort_direction)
- page = Index.paginate(new_state, 1, @page_size)
+ page = Index.paginate(new_state, page: 1, page_size: @page_size)
sites = fetch_sites(page.entries)
hourly_stats = build_hourly_stats(sites, socket)
@@ -108,7 +109,7 @@ defmodule PlausibleWeb.CustomerSupport.Team.Components.Sites do
<.th invisible>Dashboard</.th>
<th
scope="col"
- class="px-6 first:pl-0 last:pr-0 py-3 text-left text-sm font-semibold cursor-pointer select-none"
+ class="max-w-40 px-6 first:pl-0 last:pr-0 py-3 text-left text-sm font-semibold cursor-pointer select-none"
phx-click="sort"
phx-value-by="traffic"
phx-target={@myself}
@@ -129,6 +130,10 @@ defmodule PlausibleWeb.CustomerSupport.Team.Components.Sites do
class="cursor-pointer flex block items-center"
>
{site.domain}
+
+ <span :if={@index_state.pins[site.id]}>
+ <PlausibleWeb.Components.Icons.pin_icon class="w-4 ml-2" filled={true} />
+ </span>
</.styled_link>
</div>
</.td>
@@ -150,7 +155,7 @@ defmodule PlausibleWeb.CustomerSupport.Team.Components.Sites do
Settings
</.styled_link>
</.td>
- <.td>
+ <.td max_width="max-w-40">
<span class="h-[24px] text-indigo-500">
<PlausibleWeb.Live.Components.Visitors.chart
:if={is_map(@hourly_stats[site.domain])}
diff --git a/lib/plausible/repo.ex b/lib/plausible/repo.ex
index 220ca5f73c..6a3e17c987 100644
--- a/lib/plausible/repo.ex
+++ b/lib/plausible/repo.ex
@@ -3,8 +3,6 @@ defmodule Plausible.Repo do
otp_app: :plausible,
adapter: Ecto.Adapters.Postgres
- use Scrivener, page_size: 24
-
use Plausible.Audit.Repo
defmacro __using__(_) do
diff --git a/lib/plausible/sites.ex b/lib/plausible/sites.ex
index 1fc5660cf8..af057e81d2 100644
--- a/lib/plausible/sites.ex
+++ b/lib/plausible/sites.ex
@@ -134,7 +134,7 @@ defmodule Plausible.Sites do
)
end
- defdelegate list(user, pagination_params, opts \\ []), to: Plausible.Teams.Sites
+ defdelegate get_for_user_by_ids(user, site_ids, opts \\ []), to: Plausible.Teams.Sites
def list_people(site) do
owner_memberships =
diff --git a/lib/plausible/sites/index.ex b/lib/plausible/sites/index.ex
index 06d2962e83..943c8f6966 100644
--- a/lib/plausible/sites/index.ex
+++ b/lib/plausible/sites/index.ex
@@ -13,15 +13,22 @@ defmodule Plausible.Sites.Index do
alias Plausible.Teams
alias Plausible.Teams.Sites
+ def sort_direction_values, do: [:asc, :desc]
+ def sort_by_values, do: [:traffic, :alnum]
+
@type sort_by() :: :alnum | :traffic
@type sort_direction() :: :asc | :desc
- @type list_opt() ::
- {:filter_by_domain, String.t()}
- | {:team, Teams.Team.t() | nil}
+ @type index_option() ::
+ {:team, Teams.Team.t() | nil}
| {:sort_by, sort_by()}
| {:sort_direction, sort_direction()}
+ @type pagination_option() ::
+ {:page, pos_integer() | String.t() | nil}
+ | {:page_size, pos_integer() | String.t() | nil}
+ | {:filter_by_domain, String.t() | nil}
+
defmodule Page do
@moduledoc """
A single page of results, drop-in replacement for Scrivener.Page
@@ -46,7 +53,7 @@ defmodule Plausible.Sites.Index do
@type t() :: %__MODULE__{
user: Auth.User.t(),
- opts: %{filter_by_domain: String.t() | nil, team: Plausible.Teams.Team.t() | nil},
+ opts: %{team: Plausible.Teams.Team.t() | nil},
ordered_ids: [pos_integer()],
pins: %{pos_integer() => NaiveDateTime.t() | nil},
domains: %{pos_integer() => String.t()},
@@ -71,21 +78,28 @@ defmodule Plausible.Sites.Index do
@doc """
Builds an `Index.State` for `user` by running all necessary queries
"""
- @spec build(Auth.User.t(), [list_opt()]) :: State.t()
- def build(user, opts \\ []) do
+ @spec build(Auth.User.t(), [index_option()] | map()) :: State.t()
+ def build(user, opts \\ [])
+
+ def build(user, %{__struct__: _} = opts) do
+ build(user, Map.from_struct(opts))
+ end
+
+ def build(user, opts) when is_map(opts) do
+ build(user, Keyword.new(opts))
+ end
+
+ def build(user, opts) do
sort_by = Keyword.get(opts, :sort_by, :alnum)
sort_direction = Keyword.get(opts, :sort_direction, :asc)
- # Fetch the full unfiltered set for the team; domain filtering is applied
- # locally from here on so filter/2 never needs to hit the database.
- site_ids = fetch_site_ids(user, Keyword.delete(opts, :filter_by_domain))
+ site_ids = fetch_site_ids(user, opts)
pins = fetch_pins(user, site_ids)
domains = fetch_domains(site_ids)
%State{
user: user,
opts: %{
- filter_by_domain: Keyword.get(opts, :filter_by_domain),
team: Keyword.get(opts, :team)
},
ordered_ids: site_ids,
@@ -100,14 +114,22 @@ defmodule Plausible.Sites.Index do
@spec paginate(
State.t(),
- page :: pos_integer() | String.t() | nil,
- page_size :: pos_integer() | String.t() | nil
+ [pagination_option()]
) :: Page.t()
- def paginate(%State{ordered_ids: ordered_ids} = state, raw_page_number, raw_page_size) do
- page_number = cast_int(raw_page_number, min: 1, max: :unlimited, default: 1)
- page_size = cast_int(raw_page_size, min: 1, max: 100, default: 24)
+ def paginate(%State{ordered_ids: ordered_ids} = state, opts \\ []) do
+ page_number =
+ opts
+ |> Keyword.get(:page)
+ |> cast_int(min: 1, max: :unlimited, default: 1)
+
+ page_size =
+ opts
+ |> Keyword.get(:page_size)
+ |> cast_int(min: 1, max: 100, default: 24)
+
+ filter_by_domain = Keyword.get(opts, :filter_by_domain)
- filtered_ids = apply_domain_filter(ordered_ids, state.domains, state.opts.filter_by_domain)
+ filtered_ids = apply_domain_filter(ordered_ids, state.domains, filter_by_domain)
total_entries = length(filtered_ids)
total_pages = max(1, ceil(total_entries / page_size))
@@ -150,12 +172,16 @@ defmodule Plausible.Sites.Index do
%State{state | pins: new_pins, ordered_ids: new_ordered_ids}
end
- @spec update_state(State.t(), :filter_by_domain, String.t() | nil) :: State.t()
- def update_state(%State{} = state, :filter_by_domain, value) do
- %State{state | opts: %{state.opts | filter_by_domain: value}}
+ @spec sort(State.t(), [index_option()] | map()) :: State.t()
+
+ def sort(user, %{__struct__: _} = opts) do
+ sort(user, Map.from_struct(opts))
+ end
+
+ def sort(user, opts) when is_map(opts) do
+ sort(user, Keyword.new(opts))
end
- @spec sort(State.t(), [list_opt()]) :: State.t()
def sort(%State{} = state, opts) do
sort_by = Keyword.get(opts, :sort_by, state.sort_by)
sort_direction = Keyword.get(opts, :sort_direction, state.sort_direction)
@@ -246,18 +272,17 @@ defmodule Plausible.Sites.Index do
pinned ++ Enum.reverse(unpinned)
end
- @spec fetch_site_ids(Auth.User.t(), [list_opt()]) :: [pos_integer()]
+ @spec fetch_site_ids(Auth.User.t(), [index_option()]) :: [pos_integer()]
def fetch_site_ids(user, opts \\ []) do
team = Keyword.get(opts, :team)
- domain_filter = Keyword.get(opts, :filter_by_domain)
- from(u in subquery(Sites.accessible_by(user, team)),
- inner_join: s in ^Site.regular(),
- on: u.site_id == s.id,
- select: s.id
+ Repo.all(
+ from(u in subquery(Sites.accessible_by(user, team)),
+ inner_join: s in ^Site.regular(),
+ on: u.site_id == s.id,
+ select: s.id
+ )
)
- |> maybe_filter_by_domain_on_site(domain_filter)
- |> Repo.all()
end
@spec traffic_for_site_ids([pos_integer()]) :: [{pos_integer(), non_neg_integer()}]
@@ -370,13 +395,6 @@ defmodule Plausible.Sites.Index do
end)
end
- defp maybe_filter_by_domain_on_site(query, domain)
- when byte_size(domain) >= 1 and byte_size(domain) <= 64 do
- from([_u, s] in query, where: ilike(s.domain, ^"%#{domain}%"))
- end
-
- defp maybe_filter_by_domain_on_site(query, _), do: query
-
defp cast_int(value, min: min, max: max, default: default) when is_binary(value) do
case Integer.parse(value) do
{int, ""} when int >= min and int <= max -> int
diff --git a/lib/plausible/sites/index/user_preference.ex b/lib/plausible/sites/index/user_preference.ex
new file mode 100644
index 0000000000..53b2d832d4
--- /dev/null
+++ b/lib/plausible/sites/index/user_preference.ex
@@ -0,0 +1,25 @@
+defmodule Plausible.Sites.Index.UserPreference do
+ @moduledoc """
+ User preference persistence schema for the sites index
+ """
+
+ use Ecto.Schema
+ import Ecto.Changeset
+ alias Plausible.Sites.Index
+
+ @primary_key false
+ embedded_schema do
+ field :sort_by, Ecto.Enum, values: Index.sort_by_values(), default: :traffic
+ field :sort_direction, Ecto.Enum, values: Index.sort_direction_values(), default: :desc
+ end
+
+ def changeset(struct \\ %__MODULE__{}, attrs) do
+ cast(struct, attrs, [:sort_by, :sort_direction])
+ end
+
+ def new(attrs) do
+ attrs |> changeset() |> apply_changes()
+ end
+
+ def default(), do: %__MODULE__{}
+end
diff --git a/lib/plausible/teams/memberships.ex b/lib/plausible/teams/memberships.ex
index 8478f7c1a6..26460c8af3 100644
--- a/lib/plausible/teams/memberships.ex
+++ b/lib/plausible/teams/memberships.ex
@@ -233,8 +233,7 @@ defmodule Plausible.Teams.Memberships do
|> Teams.Memberships.UserPreference.changeset(%{option => value})
|> Repo.insert!(
conflict_target: [:team_membership_id],
- on_conflict:
- from(p in Teams.Memberships.UserPreference, update: [set: [{^option, ^value}]]),
+ on_conflict: {:replace, [option, :updated_at]},
returning: true
)
end
diff --git a/lib/plausible/teams/memberships/user_preference.ex b/lib/plausible/teams/memberships/user_preference.ex
index 2996fcc1c0..18a5b88e07 100644
--- a/lib/plausible/teams/memberships/user_preference.ex
+++ b/lib/plausible/teams/memberships/user_preference.ex
@@ -8,10 +8,11 @@ defmodule Plausible.Teams.Memberships.UserPreference do
@type t() :: %__MODULE__{}
- @options [:consolidated_view_cta_dismissed]
+ @options [:consolidated_view_cta_dismissed, :sort_index_options]
schema "team_membership_user_preferences" do
field :consolidated_view_cta_dismissed, :boolean, default: false
+ embeds_one :sort_index_options, Plausible.Sites.Index.UserPreference, on_replace: :update
belongs_to :team_membership, Plausible.Teams.Membership
@@ -22,7 +23,8 @@ defmodule Plausible.Teams.Memberships.UserPreference do
def changeset(team_membership, attrs \\ %{}) do
%__MODULE__{}
- |> cast(attrs, @options)
+ |> cast(attrs, [:consolidated_view_cta_dismissed])
+ |> cast_embed(:sort_index_options)
|> put_assoc(:team_membership, team_membership)
end
end
diff --git a/lib/plausible/teams/sites.ex b/lib/plausible/teams/sites.ex
index 1aabfc20c6..1f09baa1c3 100644
--- a/lib/plausible/teams/sites.ex
+++ b/lib/plausible/teams/sites.ex
@@ -12,104 +12,6 @@ defmodule Plausible.Teams.Sites do
@role_type Plausible.Teams.Invitation.__schema__(:type, :role)
- @spec list(Auth.User.t(), map(), [list_opt()]) :: Scrivener.Page.t()
- def list(user, pagination_params, opts \\ []) do
- domain_filter = Keyword.get(opts, :filter_by_domain)
- team = Keyword.get(opts, :team)
-
- all_query =
- if Teams.setup?(team) do
- from(tm in Teams.Membership,
- inner_join: t in assoc(tm, :team),
- inner_join: s in assoc(t, :sites),
- where: tm.user_id == ^user.id and tm.role != :guest,
- where: tm.team_id == ^team.id,
- select: %{site_id: s.id, entry_type: "site", role: tm.role}
- )
- else
- my_team_query =
- from(tm in Teams.Membership,
- inner_join: t in assoc(tm, :team),
- inner_join: s in assoc(t, :sites),
- where: tm.user_id == ^user.id and tm.role != :guest,
- where: tm.is_autocreated == true,
- where: t.setup_complete == false,
- select: %{site_id: s.id, entry_type: "site", role: tm.role}
- )
-
- guest_membership_query =
- from tm in Teams.Membership,
- inner_join: gm in assoc(tm, :guest_memberships),
- inner_join: s in assoc(gm, :site),
- where: tm.user_id == ^user.id and tm.role == :guest,
- select: %{
- site_id: s.id,
- entry_type: "site",
- role:
- fragment(
- """
- CASE
- WHEN ? = 'editor' THEN 'admin'
- ELSE ?
- END
- """,
- gm.role,
- gm.role
- )
- }
-
- from s in my_team_query,
- union_all: ^guest_membership_query
- end
-
- from(u in subquery(all_query),
- inner_join: s in ^Plausible.Site.regular(),
- on: u.site_id == s.id,
- as: :site,
- left_join: up in Site.UserPreference,
- on: up.site_id == s.id and up.user_id == ^user.id,
- select: %{
- s
- | entry_type:
- selected_as(
- fragment(
- """
- CASE
- WHEN ? IS NOT NULL THEN 'pinned_site'
- ELSE ?
- END
- """,
- up.pinned_at,
- u.entry_type
- ),
- :entry_type
- ),
- pinned_at: selected_as(up.pinned_at, :pinned_at),
- memberships: [
- %{
- role: type(u.role, ^@role_type),
- site_id: s.id,
- site: s
- }
- ]
- },
- order_by: [
- asc: selected_as(:entry_type),
- desc: selected_as(:pinned_at),
- asc: s.domain
- ]
- )
- |> maybe_filter_by_domain(domain_filter)
- |> Repo.paginate(pagination_params)
- end
-
- defp maybe_filter_by_domain(query, domain)
- when byte_size(domain) >= 1 and byte_size(domain) <= 64 do
- where(query, [site: s], ilike(s.domain, ^"%#{domain}%"))
- end
-
- defp maybe_filter_by_domain(query, _), do: query
-
@spec accessible_by(Auth.User.t(), Teams.Team.t() | nil) :: Ecto.Query.t()
def accessible_by(user, team) do
if Teams.setup?(team) do
@@ -155,4 +57,38 @@ defmodule Plausible.Teams.Sites do
from(s in my_team_query, union_all: ^guest_membership_query)
end
end
+
+ @spec get_for_user_by_ids(Auth.User.t(), [pos_integer()], [list_opt()]) :: [Site.t()]
+ def get_for_user_by_ids(_user, [], _opts), do: []
+
+ def get_for_user_by_ids(user, site_ids, opts) do
+ team = Keyword.get(opts, :team)
+
+ rows =
+ from(u in subquery(accessible_by(user, team)),
+ inner_join: s in ^Plausible.Site.regular(),
+ on: u.site_id == s.id,
+ left_join: up in Site.UserPreference,
+ on: up.site_id == s.id and up.user_id == ^user.id,
+ where: s.id in ^site_ids,
+ select:
+ {s.id,
+ %{
+ s
+ | pinned_at: selected_as(up.pinned_at, :pinned_at),
+ memberships: [
+ %{
+ role: type(u.role, ^@role_type),
+ site_id: s.id,
+ site: s
+ }
+ ]
+ }}
+ )
+ |> Repo.all()
+ |> Map.new()
+
+ # Restore the caller-supplied order
+ Enum.flat_map(site_ids, fn id -> List.wrap(Map.get(rows, id)) end)
+ end
end
diff --git a/lib/plausible_web/components/generic.ex b/lib/plausible_web/components/generic.ex
index 55e2ff9874..1406d2e94d 100644
--- a/lib/plausible_web/components/generic.ex
+++ b/lib/plausible_web/components/generic.ex
@@ -35,7 +35,7 @@ defmodule PlausibleWeb.Components.Generic do
@button_themes %{
"primary" =>
- "bg-indigo-600 text-white hover:bg-indigo-700 focus-visible:outline-indigo-600 disabled:bg-indigo-400/60 disabled:dark:bg-indigo-600/30 disabled:dark:text-white/35",
+ "border border-indigo-600 bg-indigo-600 text-white hover:bg-indigo-700 focus-visible:outline-indigo-600 disabled:bg-indigo-400/60 disabled:dark:bg-indigo-600/30 disabled:dark:text-white/35",
"secondary" =>
"border border-gray-300 dark:border-gray-700 bg-white dark:bg-gray-700 text-gray-800 dark:text-gray-100 hover:bg-gray-50 hover:text-gray-900 dark:hover:bg-gray-600 dark:hover:border-gray-600 dark:hover:text-white disabled:text-gray-700/40 dark:disabled:text-gray-500 dark:disabled:bg-gray-800 dark:disabled:border-gray-800",
"yellow" =>
@@ -1188,7 +1188,7 @@ defmodule PlausibleWeb.Components.Generic do
type="text"
name="filter-text"
id="filter-text"
- class="w-full max-w-80 pl-8 text-sm dark:bg-gray-750 dark:text-gray-300 focus:ring-indigo-500 focus:border-indigo-500 block border-gray-300 dark:border-gray-750 rounded-md dark:placeholder:text-gray-400 focus:outline-none focus:ring-3 focus:ring-indigo-500/20 dark:focus:ring-indigo-500/25 focus:border-indigo-500"
+ class="w-full max-w-80 pl-8 pr-3.5 py-2.5 text-sm dark:bg-gray-750 dark:text-gray-300 focus:ring-indigo-500 focus:border-indigo-500 block border-gray-300 dark:border-gray-750 rounded-md dark:placeholder:text-gray-400 focus:outline-none focus:ring-3 focus:ring-indigo-500/20 dark:focus:ring-indigo-500/25 focus:border-indigo-500"
placeholder="Press / to search"
x-ref="filter_text"
phx-debounce={200}
diff --git a/lib/plausible_web/components/icons.ex b/lib/plausible_web/components/icons.ex
index 5ac42a70fa..2ce11f0581 100644
--- a/lib/plausible_web/components/icons.ex
+++ b/lib/plausible_web/components/icons.ex
@@ -4,6 +4,26 @@ defmodule PlausibleWeb.Components.Icons do
"""
use Phoenix.Component
+ attr(:rest, :global)
+ attr(:filled, :boolean, default: false)
+
+ def pin_icon(assigns) do
+ ~H"""
+ <svg
+ xmlns="http://www.w3.org/2000/svg"
+ viewBox="0 0 24 24"
+ fill={if @filled, do: "currentColor", else: "none"}
+ stroke="currentColor"
+ stroke-linecap="round"
+ stroke-linejoin="round"
+ stroke-width="1.5"
+ {@rest}
+ >
+ <path d="m4 20 4.5-4.5-.196.196M14.314 21.005l-5.657-5.657L3 9.69l1.228-1.228a3 3 0 0 1 3.579-.501l.58.322 7.34-5.664 5.658 5.657-5.665 7.34.323.581a3 3 0 0 1-.501 3.578l-1.228 1.229Z" />
+ </svg>
+ """
+ end
+
attr :class, :any, default: []
def external_link_icon(assigns) do
diff --git a/lib/plausible_web/components/prima_dropdown.ex b/lib/plausible_web/components/prima_dropdown.ex
index 763bd40385..659a6f6d2c 100644
--- a/lib/plausible_web/components/prima_dropdown.ex
+++ b/lib/plausible_web/components/prima_dropdown.ex
@@ -5,8 +5,48 @@ defmodule PlausibleWeb.Components.PrimaDropdown do
@dropdown_item_icon_base_class "text-gray-600 dark:text-gray-400 group-hover/item:text-gray-900 group-data-focus/item:text-gray-900 dark:group-hover/item:text-gray-100 dark:group-data-focus/item:text-gray-100"
+ @trigger_button_base_class "whitespace-nowrap truncate inline-flex items-center justify-between gap-x-2 text-sm font-medium rounded-md cursor-pointer disabled:cursor-not-allowed"
+
+ @trigger_button_themes %{
+ "primary" =>
+ "border border-indigo-600 bg-indigo-600 text-white hover:bg-indigo-700 focus-visible:outline-indigo-600 disabled:bg-indigo-400/60 disabled:dark:bg-indigo-600/30 disabled:dark:text-white/35",
+ "secondary" =>
+ "border border-gray-300 dark:border-gray-700 bg-white dark:bg-gray-700 text-gray-800 dark:text-gray-100 hover:border-gray-400/60 hover:text-gray-900 dark:hover:border-gray-500 dark:hover:text-white disabled:text-gray-700/40 dark:disabled:text-gray-500 dark:disabled:bg-gray-800 dark:disabled:border-gray-800",
+ "ghost" =>
+ "text-gray-700 dark:text-gray-300 hover:text-gray-900 dark:hover:text-gray-100 disabled:text-gray-500 disabled:dark:text-gray-600"
+ }
+
+ @trigger_button_sizes %{
+ "sm" => "px-3 py-2",
+ "md" => "px-3.5 py-2.5"
+ }
+
defdelegate dropdown(assigns), to: Prima.Dropdown
- defdelegate dropdown_trigger(assigns), to: Prima.Dropdown
+
+ attr(:id, :string, required: true)
+ attr(:theme, :string, default: "secondary")
+ attr(:size, :string, default: "md")
+ attr(:class, :string, default: "")
+ attr(:rest, :global)
+ slot(:inner_block, required: true)
+
+ def dropdown_trigger(assigns) do
+ assigns =
+ assign(assigns,
+ computed_class: [
+ @trigger_button_base_class,
+ @trigger_button_sizes[assigns.size],
+ @trigger_button_themes[assigns.theme],
+ assigns.class
+ ]
+ )
+
+ ~H"""
+ <Dropdown.dropdown_trigger id={@id} class={@computed_class} {@rest}>
+ {render_slot(@inner_block)}
+ </Dropdown.dropdown_trigger>
+ """
+ end
attr(:id, :string, required: true)
slot(:inner_block, required: true)
@@ -18,6 +58,7 @@ defmodule PlausibleWeb.Components.PrimaDropdown do
<Dropdown.dropdown_menu
id={@id}
placement="bottom-end"
+ match_trigger_width={true}
class="bg-white rounded-md shadow-lg ring-1 ring-black/5 focus:outline-none p-1.5 dark:bg-gray-800"
>
{render_slot(@inner_block)}
diff --git a/lib/plausible_web/controllers/api/internal_controller.ex b/lib/plausible_web/controllers/api/internal_controller.ex
index c34b4fb51b..bcd0f42c0d 100644
--- a/lib/plausible_web/controllers/api/internal_controller.ex
+++ b/lib/plausible_web/controllers/api/internal_controller.ex
@@ -1,8 +1,10 @@
defmodule PlausibleWeb.Api.InternalController do
use PlausibleWeb, :controller
use Plausible.Repo
+ import Ecto.Query
alias Plausible.{Sites, Auth}
alias Plausible.Auth.User
+ alias Plausible.Teams
def sites(conn, _params) do
current_user = conn.assigns[:current_user]
@@ -56,7 +58,23 @@ defmodule PlausibleWeb.Api.InternalController do
end
defp sites_for(user, team) do
- pagination = Sites.list(user, %{page_size: 9}, team: team)
- Enum.map(pagination.entries, &%{domain: &1.domain})
+ from(u in subquery(Teams.Sites.accessible_by(user, team)),
+ inner_join: s in ^Plausible.Site.regular(),
+ on: u.site_id == s.id,
+ left_join: up in Plausible.Site.UserPreference,
+ on: up.site_id == s.id and up.user_id == ^user.id,
+ select: %{domain: s.domain},
+ order_by: [
+ asc:
+ fragment(
+ "CASE WHEN ? IS NOT NULL THEN 'pinned_site' ELSE 'site' END",
+ up.pinned_at
+ ),
+ desc: up.pinned_at,
+ asc: s.domain
+ ],
+ limit: 9
+ )
+ |> Repo.all()
end
end
diff --git a/lib/plausible_web/live/components/pagination.ex b/lib/plausible_web/live/components/pagination.ex
index 8142d02b7b..5cace68ad4 100644
--- a/lib/plausible_web/live/components/pagination.ex
+++ b/lib/plausible_web/live/components/pagination.ex
@@ -45,12 +45,22 @@ defmodule PlausibleWeb.Live.Components.Pagination do
{active?, uri} =
case {assigns.type, assigns.page_number, assigns.total_pages} do
{:next, n, total} when n < total ->
- params = URI.decode_query(assigns.uri.query, %{"page" => n + 1})
- {true, %{assigns.uri | query: URI.encode_query(params)}}
+ query =
+ (assigns.uri.query || "")
+ |> URI.decode_query()
+ |> Map.put("page", n + 1)
+ |> URI.encode_query()
+
+ {true, %{assigns.uri | query: query}}
{:prev, n, _total} when n > 1 ->
- params = URI.decode_query(assigns.uri.query, %{"page" => n - 1})
- {true, %{assigns.uri | query: URI.encode_query(params)}}
+ query =
+ (assigns.uri.query || "")
+ |> URI.decode_query()
+ |> Map.put("page", n - 1)
+ |> URI.encode_query()
+
+ {true, %{assigns.uri | query: query}}
{_, _, _} ->
{false, nil}
diff --git a/lib/plausible_web/live/goal_settings/list.ex b/lib/plausible_web/live/goal_settings/list.ex
index 2720b1ccc1..2b3f6924ce 100644
--- a/lib/plausible_web/live/goal_settings/list.ex
+++ b/lib/plausible_web/live/goal_settings/list.ex
@@ -24,7 +24,7 @@ defmodule PlausibleWeb.Live.GoalSettings.List do
<%= if @searching? or Enum.count(@goals) > 0 do %>
<.filter_bar filter_text={@filter_text} placeholder="Search Goals">
<PrimaDropdown.dropdown id="add-goal-dropdown">
- <PrimaDropdown.dropdown_trigger as={&button/1} id="add-goal-dropdown-trigger" mt?={false}>
+ <PrimaDropdown.dropdown_trigger id="add-goal-dropdown-trigger" theme="primary">
Add goal <Heroicons.chevron_down mini class="size-4 mt-0.5" />
</PrimaDropdown.dropdown_trigger>
@@ -169,9 +169,8 @@ defmodule PlausibleWeb.Live.GoalSettings.List do
</p>
<PrimaDropdown.dropdown id="add-goal-dropdown-empty" class="mt-4">
<PrimaDropdown.dropdown_trigger
- as={&button/1}
id="add-goal-dropdown-empty-trigger"
- mt?={false}
+ theme="primary"
>
Add goal <Heroicons.chevron_down mini class="size-4 mt-0.5" />
</PrimaDropdown.dropdown_trigger>
diff --git a/lib/plausible_web/live/sites.ex b/lib/plausible_web/live/sites.ex
index 9942005d7c..16174aaedd 100644
--- a/lib/plausible_web/live/sites.ex
+++ b/lib/plausible_web/live/sites.ex
@@ -9,6 +9,7 @@ defmodule PlausibleWeb.Live.Sites do
require Logger
alias Plausible.Sites
+ alias Plausible.Sites.Index
alias Plausible.Teams
alias PlausibleWeb.Components.PrimaDropdown
@@ -17,28 +18,48 @@ defmodule PlausibleWeb.Live.Sites do
team = socket.assigns.current_team
user = socket.assigns.current_user
- uri =
- ("/sites?" <> URI.encode_query(Map.take(params, ["filter_text"])))
- |> URI.new!()
+ uri_params = sanitize_uri_params(params)
+ filter_text = uri_params["filter_text"] || ""
+
+ index_options =
+ params
+ |> get_index_options(user, team)
+ |> Map.put(:team, team)
+
+ index_state = Index.build(user, index_options)
socket =
socket
- |> assign(:uri, uri)
|> assign(:sparklines, %{})
- |> assign(:filter_text, String.trim(params["filter_text"] || ""))
+ |> assign(:index_state, index_state)
|> assign(init_consolidated_view_assigns(user, team))
|> assign(:team_invitations, [])
|> assign(:site_invitations, [])
|> assign(:site_ownership_invitations, [])
+ |> assign(:filter_text, filter_text)
+ |> assign(:uri_params, uri_params)
{:ok, socket}
end
def handle_params(params, _uri, socket) do
+ uri_params = sanitize_uri_params(params)
+
+ sort_opts =
+ Index.UserPreference.new(%{
+ sort_by: uri_params["sort_by"] || socket.assigns.index_state.sort_by,
+ sort_direction: uri_params["sort_direction"] || socket.assigns.index_state.sort_direction
+ })
+
socket =
socket
- |> assign(:params, params)
- |> load_sites()
+ |> assign(:uri_params, uri_params)
+ |> assign(:filter_text, uri_params["filter_text"] || "")
+ |> assign(
+ :index_state,
+ Index.sort(socket.assigns.index_state, sort_opts)
+ )
+ |> load_page()
|> load_invitations()
|> assign_new(:has_sites?, fn %{current_user: current_user} ->
Teams.Users.has_sites?(current_user, include_pending?: true)
@@ -84,11 +105,11 @@ defmodule PlausibleWeb.Live.Sites do
end
def render(assigns) do
- assigns = assign(assigns, :searching?, String.trim(assigns.filter_text) != "")
+ assigns = assign(assigns, :searching?, assigns.filter_text != "")
~H"""
<.flash_messages flash={@flash} />
- <div class="container pt-6">
+ <div class="group/sort container pt-6">
<PlausibleWeb.Live.Components.Visitors.gradient_defs />
<.upgrade_nag_screen :if={
@needs_to_upgrade == {:needs_to_upgrade, :no_active_trial_or_subscription}
@@ -112,41 +133,45 @@ defmodule PlausibleWeb.Live.Sites do
: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"
- >
- <PrimaDropdown.dropdown_trigger as={&button/1} id="add-site-dropdown-trigger" mt?={false}>
- <Heroicons.plus class="size-4" /> Add
- <Heroicons.chevron_down mini class="size-4 mt-0.5" />
- </PrimaDropdown.dropdown_trigger>
-
- <PrimaDropdown.dropdown_menu id="add-site-dropdown-menu">
- <PrimaDropdown.dropdown_item
- as={&link/1}
- id="add-site-dropdown-menuitem-1"
- href={Routes.site_path(@socket, :new, %{flow: PlausibleWeb.Flows.provisioning()})}
- >
- <Heroicons.plus class={PrimaDropdown.dropdown_item_icon_class()} /> Add website
- </PrimaDropdown.dropdown_item>
- <PrimaDropdown.dropdown_item
- id="add-site-dropdown-menuitem-2"
- phx-click="consolidated-view-cta-restore"
- >
- <Heroicons.plus class={PrimaDropdown.dropdown_item_icon_class()} />
- Add consolidated view
- </PrimaDropdown.dropdown_item>
- </PrimaDropdown.dropdown_menu>
- </PrimaDropdown.dropdown>
-
- <a
- :if={!@consolidated_view_cta_dismissed?}
- href={"/sites/new?flow=#{PlausibleWeb.Flows.provisioning()}"}
- class="whitespace-nowrap truncate inline-flex items-center justify-center gap-x-2 max-w-fit font-medium rounded-md px-3.5 py-2.5 text-sm cursor-pointer disabled:cursor-not-allowed bg-indigo-600 text-white hover:bg-indigo-700 focus-visible:outline-indigo-600 disabled:bg-indigo-400/60 disabled:dark:bg-indigo-600/30 disabled:dark:text-white/35"
- >
- <Heroicons.plus class="size-4" /> Add website
- </a>
+ <.search_form filter_text={@filter_text} />
+ <div class="flex items-center gap-x-2">
+ <.sort_dropdown index_state={@index_state} />
+
+ <PrimaDropdown.dropdown
+ :if={@consolidated_view_cta_dismissed?}
+ id="add-site-dropdown"
+ >
+ <PrimaDropdown.dropdown_trigger id="add-site-dropdown-trigger" theme="primary">
+ <Heroicons.plus class="size-4" /> Add
+ <Heroicons.chevron_down mini class="size-4 mt-0.5" />
+ </PrimaDropdown.dropdown_trigger>
+
+ <PrimaDropdown.dropdown_menu id="add-site-dropdown-menu">
+ <PrimaDropdown.dropdown_item
+ as={&link/1}
+ id="add-site-dropdown-menuitem-1"
+ href={Routes.site_path(@socket, :new, %{flow: PlausibleWeb.Flows.provisioning()})}
+ >
+ <Heroicons.plus class={PrimaDropdown.dropdown_item_icon_class()} /> Add website
+ </PrimaDropdown.dropdown_item>
+ <PrimaDropdown.dropdown_item
+ id="add-site-dropdown-menuitem-2"
+ phx-click="consolidated-view-cta-restore"
+ >
+ <Heroicons.plus class={PrimaDropdown.dropdown_item_icon_class()} />
+ Add consolidated view
+ </PrimaDropdown.dropdown_item>
+ </PrimaDropdown.dropdown_menu>
+ </PrimaDropdown.dropdown>
+
+ <.button_link
+ :if={!@consolidated_view_cta_dismissed?}
+ href={"/sites/new?flow=#{PlausibleWeb.Flows.provisioning()}"}
+ mt?={false}
+ >
+ <Heroicons.plus class="size-4" /> Add website
+ </.button_link>
+ </div>
</div>
<div class="flex flex-col gap-y-4 my-4">
@@ -222,11 +247,15 @@ defmodule PlausibleWeb.Live.Sites do
<.pagination
:if={@sites.total_pages > 1}
id="sites-pagination"
- uri={@uri}
+ uri={URI.new!(Routes.site_path(@socket, :index, @uri_params))}
page_number={@sites.page_number}
total_pages={@sites.total_pages}
>
- Total of <span class="font-medium">{@sites.total_entries}</span> sites
+ Total of
+ <span class="font-medium">
+ {PlausibleWeb.TextHelpers.number_format(@sites.total_entries)}
+ </span>
+ sites. Page {@sites.page_number} of {@sites.total_pages}
</.pagination>
</div>
</div>
@@ -386,8 +415,8 @@ defmodule PlausibleWeb.Live.Sites do
class="relative row-span-2"
>
<.unstyled_link
- href={"/#{URI.encode_www_form(@consolidated_view.domain)}"}
- class="flex flex-col justify-between gap-6 h-full bg-white p-6 dark:bg-gray-900 rounded-md shadow-sm cursor-pointer hover:shadow-lg transition-shadow duration-150"
+ href={Routes.stats_path(PlausibleWeb.Endpoint, :stats, @consolidated_view.domain, [])}
+ class="flex flex-col justify-between gap-6 h-full bg-white p-6 dark:bg-gray-900 rounded-md shadow-sm cursor-pointer 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">
@@ -485,7 +514,7 @@ defmodule PlausibleWeb.Live.Sites do
def site(assigns) do
~H"""
<li
- class="group relative"
+ class="group relative 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={
@@ -501,7 +530,10 @@ defmodule PlausibleWeb.Live.Sites do
)
}
>
- <.unstyled_link href={"/#{URI.encode_www_form(@site.domain)}"} class="block">
+ <.unstyled_link
+ href={Routes.stats_path(PlausibleWeb.Endpoint, :stats, @site.domain, [])}
+ 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-6 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} />
@@ -529,81 +561,83 @@ defmodule PlausibleWeb.Live.Sites do
assigns = assign(assigns, %{dropdown_id: "site-#{assigns[:site].domain}-dropdown"})
~H"""
- <PrimaDropdown.dropdown id={@dropdown_id}>
- <PrimaDropdown.dropdown_trigger
- id={"#{@dropdown_id}-trigger"}
- as={&button/1}
- mt?={false}
- theme="icon"
+ <div class="flex items-center">
+ <button
+ :if={@site.pinned_at}
+ data-test-id="site-card-pin-icon"
+ 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}
+ class="cursor-pointer p-1"
>
- <Heroicons.ellipsis_vertical class="size-5" />
- </PrimaDropdown.dropdown_trigger>
+ <PlausibleWeb.Components.Icons.pin_icon
+ filled={true}
+ class="size-4.5 pb-px shrink-0 text-indigo-600 dark:text-indigo-500"
+ />
+ </button>
- <PrimaDropdown.dropdown_menu id={"#{@dropdown_id}-menu"}>
- <PrimaDropdown.dropdown_item
- :if={@can_manage?}
- id={"#{@dropdown_id}-item-1"}
- as={&link/1}
- href={Routes.site_path(PlausibleWeb.Endpoint, :settings_general, @site.domain)}
- >
- <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"}
- 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}
- >
- <.icon_pin
- :if={@site.pinned_at}
- filled={true}
- class={PrimaDropdown.dropdown_item_icon_class()}
- />
- <.icon_pin
- class={PrimaDropdown.dropdown_item_icon_class()}
- />
- {if @site.pinned_at, do: "Unpin site", else: "Pin site"}
- </PrimaDropdown.dropdown_item>
-
- <PrimaDropdown.dropdown_item
- :if={Application.get_env(:plausible, :environment) == "dev" and Sites.regular?(@site)}
- id={"#{@dropdown_id}-item-3"}
- phx-click="delete-site"
- phx-value-domain={@site.domain}
+ <PrimaDropdown.dropdown id={@dropdown_id}>
+ <PrimaDropdown.dropdown_trigger
+ id={"#{@dropdown_id}-trigger"}
+ theme="ghost"
+ class="!px-2.5"
>
- <Heroicons.trash class="size-4 text-red-600" /> [DEV ONLY] Quick delete
- </PrimaDropdown.dropdown_item>
- </PrimaDropdown.dropdown_menu>
- </PrimaDropdown.dropdown>
- """
- end
-
- attr(:rest, :global)
- attr(:filled, :boolean, default: false)
-
- def icon_pin(assigns) do
- ~H"""
- <svg
- xmlns="http://www.w3.org/2000/svg"
- viewBox="0 0 24 24"
- fill={if @filled, do: "currentColor", else: "none"}
- stroke="currentColor"
- stroke-linecap="round"
- stroke-linejoin="round"
- stroke-width="1.5"
- {@rest}
- >
- <path d="m4 20 4.5-4.5-.196.196M14.314 21.005l-5.657-5.657L3 9.69l1.228-1.228a3 3 0 0 1 3.579-.501l.58.322 7.34-5.664 5.658 5.657-5.665 7.34.323.581a3 3 0 0 1-.501 3.578l-1.228 1.229Z" />
- </svg>
+ <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={Routes.site_path(PlausibleWeb.Endpoint, :settings_general, @site.domain)}
+ >
+ <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_item
+ :if={Application.get_env(:plausible, :environment) == "dev" and Sites.regular?(@site)}
+ id={"#{@dropdown_id}-item-3"}
+ phx-click="delete-site"
+ phx-value-domain={@site.domain}
+ >
+ <Heroicons.trash class="size-4 text-red-600" /> [DEV ONLY] Quick delete
+ </PrimaDropdown.dropdown_item>
+ </PrimaDropdown.dropdown_menu>
+ </PrimaDropdown.dropdown>
+ </div>
"""
end
@@ -684,7 +718,6 @@ defmodule PlausibleWeb.Live.Sites do
end
attr(:filter_text, :string, default: "")
- attr(:uri, URI, required: true)
def search_form(assigns) do
~H"""
@@ -692,6 +725,54 @@ defmodule PlausibleWeb.Live.Sites do
"""
end
+ @sort_options [
+ {"Most visitors", Index.UserPreference.default()},
+ {"Fewest visitors", Index.UserPreference.new(%{sort_by: :traffic, sort_direction: :asc})},
+ {"Name A-Z", Index.UserPreference.new(%{sort_by: :alnum, sort_direction: :asc})},
+ {"Name Z-A", Index.UserPreference.new(%{sort_by: :alnum, sort_direction: :desc})}
+ ]
+
+ def sort_dropdown(assigns) do
+ current_label =
+ Enum.find_value(@sort_options, fn {label,
+ %Index.UserPreference{
+ sort_by: sort_by,
+ sort_direction: sort_direction
+ }} ->
+ if sort_by == assigns.index_state.sort_by and
+ sort_direction == assigns.index_state.sort_direction,
+ do: label
+ end)
+
+ assigns = assign(assigns, sort_options: @sort_options, current_sort_label: current_label)
+
+ ~H"""
+ <PrimaDropdown.dropdown id="sort-dropdown">
+ <PrimaDropdown.dropdown_trigger
+ id="sort-dropdown-trigger"
+ class="min-w-40 group-has-[[data-sort-trigger].phx-click-loading]/sort:text-gray-800/50 group-has-[[data-sort-trigger].phx-click-loading]/sort:hover:text-gray-800/50 group-has-[[data-sort-trigger].phx-click-loading]/sort:dark:text-gray-100/50 group-has-[[data-sort-trigger].phx-click-loading]/sort:dark:hover:text-gray-100/50 group-has-[[data-sort-trigger].phx-click-loading]/sort:pointer-events-none"
+ >
+ {@current_sort_label}
+ <Heroicons.chevron_down mini class="size-4 mt-0.5" />
+ </PrimaDropdown.dropdown_trigger>
+ <PrimaDropdown.dropdown_menu id="sort-dropdown-menu">
+ <%= for {label, %Index.UserPreference{sort_by: sort_by, sort_direction: direction}} <- @sort_options do %>
+ <PrimaDropdown.dropdown_item
+ id={"sort-dropdown-item-#{sort_by}-#{direction}"}
+ class="min-w-40"
+ phx-click="set-sort"
+ phx-value-sort_by={sort_by}
+ phx-value-sort_direction={direction}
+ data-sort-trigger
+ >
+ {label}
+ </PrimaDropdown.dropdown_item>
+ <% end %>
+ </PrimaDropdown.dropdown_menu>
+ </PrimaDropdown.dropdown>
+ """
+ end
+
def favicon(assigns) do
src = "/favicon/sources/#{assigns.domain}"
assigns = assign(assigns, :src, src)
@@ -738,7 +819,8 @@ defmodule PlausibleWeb.Live.Sites do
socket
|> put_live_flash(:success, flash_message)
- |> load_sites()
+ |> refresh_index_pins()
+ |> load_page()
|> push_event("js-exec", %{
to: "#site-card-#{hash_domain(site.domain)}",
attr: "data-pin-toggled"
@@ -793,6 +875,17 @@ defmodule PlausibleWeb.Live.Sites do
{:noreply, socket}
end
+ def handle_event("set-sort", params, socket) do
+ {sort_by, sort_direction} = {params["sort_by"], params["sort_direction"]}
+
+ socket =
+ socket
+ |> reset_pagination()
+ |> set_sort(sort_by, sort_direction)
+
+ {:noreply, socket}
+ end
+
on_ee do
def handle_event("consolidated-view-cta-dismiss", _, socket) do
:ok =
@@ -815,7 +908,7 @@ defmodule PlausibleWeb.Live.Sites do
end
end
- defp load_invitations(%{assigns: %{params: %{"page" => page}}} = socket) when page != "1" do
+ defp load_invitations(%{assigns: %{uri_params: %{"page" => page}}} = socket) when page != "1" do
socket
end
@@ -831,16 +924,22 @@ defmodule PlausibleWeb.Live.Sites do
|> assign(:site_ownership_invitations, site_transfers)
end
- defp load_sites(%{assigns: assigns} = socket) do
- sites =
- Sites.list(assigns.current_user, assigns.params,
- filter_by_domain: assigns.filter_text,
- team: assigns.current_team
+ defp load_page(%{assigns: assigns} = socket) do
+ page =
+ Index.paginate(assigns.index_state,
+ page: assigns.uri_params["page"],
+ page_size: assigns.uri_params["page_size"],
+ filter_by_domain: assigns.filter_text
)
+ site_entries =
+ Sites.get_for_user_by_ids(assigns.current_user, page.entries, team: assigns.current_team)
+
+ sites = %{page | entries: site_entries}
+
sparklines =
if connected?(socket) do
- Plausible.Stats.Sparkline.parallel_overview(sites.entries)
+ Plausible.Stats.Sparkline.parallel_overview(site_entries)
else
%{}
end
@@ -858,6 +957,10 @@ defmodule PlausibleWeb.Live.Sites do
)
end
+ defp refresh_index_pins(socket) do
+ assign(socket, :index_state, Index.refresh_pins(socket.assigns.index_state))
+ end
+
on_ee do
defdelegate ensure_can_take_ownership(site, team), to: Teams.Invitations
else
@@ -865,37 +968,37 @@ defmodule PlausibleWeb.Live.Sites do
end
defp set_filter_text(socket, filter_text) do
- filter_text = String.trim(filter_text)
- uri = socket.assigns.uri
-
- uri_params =
- uri.query
- |> URI.decode_query()
- |> Map.put("filter_text", filter_text)
- |> URI.encode_query()
-
- uri = %{uri | query: uri_params}
+ trimmed = String.trim(filter_text)
+ uri_params = Map.put(socket.assigns.uri_params, "filter_text", trimmed)
socket
- |> assign(:filter_text, filter_text)
- |> assign(:uri, uri)
- |> push_patch(to: URI.to_string(uri), replace: true)
+ |> assign(:uri_params, uri_params)
+ |> assign(:filter_text, trimmed)
+ |> push_patch(to: Routes.site_path(socket, :index, uri_params), replace: true)
end
defp reset_pagination(socket) do
- pagination_fields = ["page"]
- uri = socket.assigns.uri
+ assign(socket,
+ uri_params: Map.drop(socket.assigns.uri_params, ["page"])
+ )
+ end
+ defp set_sort(socket, sort_by, sort_direction) do
uri_params =
- uri.query
- |> URI.decode_query()
- |> Map.drop(pagination_fields)
- |> URI.encode_query()
-
- assign(socket,
- uri: %{uri | query: uri_params},
- params: Map.drop(socket.assigns.params, pagination_fields)
+ socket.assigns.uri_params
+ |> Map.put("sort_by", sort_by)
+ |> Map.put("sort_direction", sort_direction)
+
+ save_sort_preference(
+ socket.assigns.current_user,
+ socket.assigns.current_team,
+ sort_by,
+ sort_direction
)
+
+ socket
+ |> assign(:uri_params, uri_params)
+ |> push_patch(to: Routes.site_path(socket, :index, uri_params), replace: true)
end
defp hash_domain(domain) do
@@ -954,4 +1057,48 @@ defmodule PlausibleWeb.Live.Sites do
defp load_consolidated_sparkline(_consolidated_view), do: nil
end
+
+ defp get_index_options(params, user, team) do
+ case {params["sort_by"], params["sort_direction"]} do
+ {nil, nil} ->
+ load_sort_preference(user, team)
+
+ {sort_by, sort_direction} ->
+ Index.UserPreference.new(%{sort_by: sort_by, sort_direction: sort_direction})
+ end
+ end
+
+ defp load_sort_preference(_user, nil), do: Index.UserPreference.default()
+
+ defp load_sort_preference(user, team) do
+ with {:ok, membership} <- Teams.Memberships.get_team_membership(team, user),
+ %Index.UserPreference{sort_by: sort_by} = preference
+ when not is_nil(sort_by) <-
+ Teams.Memberships.get_preference(membership, :sort_index_options) do
+ preference
+ else
+ _ -> Index.UserPreference.default()
+ end
+ end
+
+ defp save_sort_preference(_user, nil, _sort_by, _sort_direction), do: :ok
+
+ defp save_sort_preference(user, team, sort_by, sort_direction) do
+ with {:ok, membership} <- Teams.Memberships.get_team_membership(team, user) do
+ Teams.Memberships.set_preference(membership, :sort_index_options, %{
+ sort_by: sort_by,
+ sort_direction: sort_direction
+ })
+ end
+
+ :ok
+ end
+
+ defp sanitize_uri_params(params) do
+ params
+ |> Map.take(["filter_text", "sort_by", "sort_direction", "page", "page_size"])
+ |> Enum.into(%{}, fn {param_name, param_value} ->
+ {param_name, if(is_binary(param_value), do: String.trim(param_value))}
+ end)
+ end
end
diff --git a/mix.exs b/mix.exs
index 06121eb12b..93b8995700 100644
--- a/mix.exs
+++ b/mix.exs
@@ -125,7 +125,7 @@ defmodule Plausible.MixProject do
{:phoenix_live_view, "~> 1.1.17"},
{:php_serializer, "~> 2.0"},
{:plug, "~> 1.13", override: true},
- {:prima, "~> 0.2.5"},
+ {:prima, "~> 0.2.6"},
{:plug_cowboy, "~> 2.3"},
{:polymorphic_embed, "~> 5.0"},
{:postgrex, "~> 0.21.1"},
@@ -150,7 +150,6 @@ defmodule Plausible.MixProject do
{:open_api_spex, "~> 3.22.1"},
{:joken, "~> 2.5"},
{:paginator, git: "https://github.com/duffelhq/paginator.git"},
- {:scrivener_ecto, "~> 3.1"},
{:esbuild, "~> 0.7", runtime: Mix.env() in [:dev, :ce_dev]},
{:tailwind, "~> 0.4.0", runtime: Mix.env() in [:dev, :ce_dev]},
{:ex_json_logger, "~> 1.4.0"},
diff --git a/mix.lock b/mix.lock
index b260e56773..82c9aa5c2d 100644
--- a/mix.lock
+++ b/mix.lock
@@ -120,24 +120,24 @@
"parent": {:hex, :parent, "0.12.1", "495c4386f06de0df492e0a7a7199c10323a55e9e933b27222060dd86dccd6d62", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "2ab589ef1f37bfcedbfb5ecfbab93354972fb7391201b8907a866dadd20b39d1"},
"parse_trans": {:hex, :parse_trans, "3.4.1", "6e6aa8167cb44cc8f39441d05193be6e6f4e7c2946cb2759f015f8c56b76e5ff", [:rebar3], [], "hexpm", "620a406ce75dada827b82e453c19cf06776be266f5a67cff34e1ef2cbb60e49a"},
"peep": {:hex, :peep, "3.4.2", "49d4ca116d994779351959dfee971fb2c7d6506f1821374f3cc4fd39a3d3fadb", [:mix], [{:nimble_options, "~> 1.1", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:plug, "~> 1.16", [hex: :plug, repo: "hexpm", optional: true]}, {:telemetry_metrics, "~> 1.0", [hex: :telemetry_metrics, repo: "hexpm", optional: false]}], "hexpm", "cae224b09e224bf5584f5375108becf71e2288572a099a122e66735289cd33f4"},
- "phoenix": {:hex, :phoenix, "1.8.3", "49ac5e485083cb1495a905e47eb554277bdd9c65ccb4fc5100306b350151aa95", [:mix], [{:bandit, "~> 1.0", [hex: :bandit, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.7", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.5.3", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "36169f95cc2e155b78be93d9590acc3f462f1e5438db06e6248613f27c80caec"},
+ "phoenix": {:hex, :phoenix, "1.8.5", "919db335247e6d4891764dc3063415b0d2457641c5f9b3751b5df03d8e20bbcf", [:mix], [{:bandit, "~> 1.0", [hex: :bandit, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.7", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.5.3", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "83b2bb125127e02e9f475c8e3e92736325b5b01b0b9b05407bcb4083b7a32485"},
"phoenix_bakery": {:hex, :phoenix_bakery, "0.1.2", "ca57673caea1a98f1cc763f94032796a015774d27eaa3ce5feef172195470452", [:mix], [{:brotli, "~> 0.3.0", [hex: :brotli, repo: "hexpm", optional: true]}, {:ezstd, "~> 1.0", [hex: :ezstd, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "45cc8cecc5c3002b922447c16389761718c07c360432328b04680034e893ea5b"},
"phoenix_ecto": {:hex, :phoenix_ecto, "4.7.0", "75c4b9dfb3efdc42aec2bd5f8bccd978aca0651dbcbc7a3f362ea5d9d43153c6", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.1", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.16 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}], "hexpm", "1d75011e4254cb4ddf823e81823a9629559a1be93b4321a6a5f11a5306fbf4cc"},
"phoenix_html": {:hex, :phoenix_html, "4.3.0", "d3577a5df4b6954cd7890c84d955c470b5310bb49647f0a114a6eeecc850f7ad", [:mix], [], "hexpm", "3eaa290a78bab0f075f791a46a981bbe769d94bc776869f4f3063a14f30497ad"},
"phoenix_html_helpers": {:hex, :phoenix_html_helpers, "1.0.1", "7eed85c52eff80a179391036931791ee5d2f713d76a81d0d2c6ebafe1e11e5ec", [:mix], [{:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "cffd2385d1fa4f78b04432df69ab8da63dc5cf63e07b713a4dcf36a3740e3090"},
"phoenix_live_reload": {:hex, :phoenix_live_reload, "1.6.1", "05df733a09887a005ed0d69a7fc619d376aea2730bf64ce52ac51ce716cc1ef0", [:mix], [{:file_system, "~> 0.2.10 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "74273843d5a6e4fef0bbc17599f33e3ec63f08e69215623a0cd91eea4288e5a0"},
- "phoenix_live_view": {:hex, :phoenix_live_view, "1.1.22", "9b3c985bfe38e82668594a8ce90008548f30b9f23b718ebaea4701710ce9006f", [:mix], [{:igniter, ">= 0.6.16 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:lazy_html, "~> 0.1.0", [hex: :lazy_html, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0 or ~> 1.8.0-rc", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.3 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.15", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "e1395d5622d8bf02113cb58183589b3da6f1751af235768816e90cc3ec5f1188"},
+ "phoenix_live_view": {:hex, :phoenix_live_view, "1.1.27", "9afcab28b0c82afdc51044e661bcd5b8de53d242593d34c964a37710b40a42af", [:mix], [{:igniter, ">= 0.6.16 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:lazy_html, "~> 0.1.0", [hex: :lazy_html, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0 or ~> 1.8.0-rc", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.3 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.15", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "415735d0b2c612c9104108b35654e977626a0cb346711e1e4f1ed16e3c827ede"},
"phoenix_pubsub": {:hex, :phoenix_pubsub, "2.2.0", "ff3a5616e1bed6804de7773b92cbccfc0b0f473faf1f63d7daf1206c7aeaaa6f", [:mix], [], "hexpm", "adc313a5bf7136039f63cfd9668fde73bba0765e0614cba80c06ac9460ff3e96"},
"phoenix_storybook": {:hex, :phoenix_storybook, "0.9.3", "4f94e731d4c40d4dd7d1eddf7d5c6914366da7d78552dc565b222e4036d0d76f", [:mix], [{:earmark, "~> 1.4", [hex: :earmark, repo: "hexpm", optional: false]}, {:jason, "~> 1.3", [hex: :jason, repo: "hexpm", optional: true]}, {:makeup_eex, "~> 2.0.2", [hex: :makeup_eex, repo: "hexpm", optional: false]}, {:makeup_html, "~> 0.2.0", [hex: :makeup_html, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.8.1", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html_helpers, "~> 1.0", [hex: :phoenix_html_helpers, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 1.1.0", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}], "hexpm", "4c8658b756fd8238f7e8e4343a0f12bdb91d4eba592b1c4e8118b37b6fd43e4b"},
"phoenix_template": {:hex, :phoenix_template, "1.0.4", "e2092c132f3b5e5b2d49c96695342eb36d0ed514c5b252a77048d5969330d639", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "2c0c81f0e5c6753faf5cca2f229c9709919aba34fab866d3bc05060c9c444206"},
"phoenix_view": {:hex, :phoenix_view, "2.0.4", "b45c9d9cf15b3a1af5fb555c674b525391b6a1fe975f040fb4d913397b31abf4", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}], "hexpm", "4e992022ce14f31fe57335db27a28154afcc94e9983266835bb3040243eb620b"},
"php_serializer": {:hex, :php_serializer, "2.0.0", "b43f31aca22ed7321f32da2b94fe2ddf9b6739a965cb51541969119e572e821d", [:mix], [], "hexpm", "61e402e99d9062c0225a3f4fcf7e43b4cba1b8654944c0e7c139c3ca9de481da"},
"plug": {:hex, :plug, "1.19.1", "09bac17ae7a001a68ae393658aa23c7e38782be5c5c00c80be82901262c394c0", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "560a0017a8f6d5d30146916862aaf9300b7280063651dd7e532b8be168511e62"},
- "plug_cowboy": {:hex, :plug_cowboy, "2.7.5", "261f21b67aea8162239b2d6d3b4c31efde4daa22a20d80b19c2c0f21b34b270e", [:mix], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowboy_telemetry, "~> 0.3", [hex: :cowboy_telemetry, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "20884bf58a90ff5a5663420f5d2c368e9e15ed1ad5e911daf0916ea3c57f77ac"},
+ "plug_cowboy": {:hex, :plug_cowboy, "2.8.0", "07789e9c03539ee51bb14a07839cc95aa96999fd8846ebfd28c97f0b50c7b612", [:mix], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowboy_telemetry, "~> 0.3", [hex: :cowboy_telemetry, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "9cbfaaf17463334ca31aed38ea7e08a68ee37cabc077b1e9be6d2fb68e0171d0"},
"plug_crypto": {:hex, :plug_crypto, "1.2.5", "918772575e48e81e455818229bf719d4ab4181fcbf7f85b68a35620f78d89ced", [:mix], [], "hexpm", "26549a1d6345e2172eb1c233866756ae44a9609bd33ee6f99147ab3fd87fd842"},
"polymorphic_embed": {:hex, :polymorphic_embed, "5.0.3", "37444e0af941026a2c29b0539b6471bdd6737a6492a19264bf2bb0118e3ac242", [:mix], [{:attrs, "~> 0.6", [hex: :attrs, repo: "hexpm", optional: false]}, {:ecto, "~> 3.12", [hex: :ecto, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.1", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_html_helpers, "~> 1.0", [hex: :phoenix_html_helpers, repo: "hexpm", optional: true]}, {:phoenix_live_view, "~> 0.20 or ~> 1.0", [hex: :phoenix_live_view, repo: "hexpm", optional: true]}], "hexpm", "2fed44f57abf0a0fc7642e0eb0807a55b65de1562712cc0620772cbbb80e49c1"},
"postgrex": {:hex, :postgrex, "0.21.1", "2c5cc830ec11e7a0067dd4d623c049b3ef807e9507a424985b8dcf921224cd88", [:mix], [{:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "27d8d21c103c3cc68851b533ff99eef353e6a0ff98dc444ea751de43eb48bdac"},
- "prima": {:hex, :prima, "0.2.5", "4e7eb4ce13d87d476f52a297955cc2eeeeaa1f59fa703c5d7c77357e0689fa6c", [:mix], [{:esbuild, "~> 0.7", [hex: :esbuild, repo: "hexpm", optional: false]}, {:phoenix, ">= 1.7.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.2", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 1.1", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}], "hexpm", "b9426774f91501e853b314acc8b0cc4a76b92c370d6fbd79abe98d7cb4d91b4d"},
+ "prima": {:hex, :prima, "0.2.6", "a40993d108760a711c2da183cff20234497e977f6155aad1ee5e17a3b00a46b6", [:mix], [{:esbuild, "~> 0.7", [hex: :esbuild, repo: "hexpm", optional: false]}, {:phoenix, ">= 1.7.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.2", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 1.1", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}], "hexpm", "00ec378bd7b0c58d58043e59581f9aa5ba35a0d5031e011e36c449d3a0b7418c"},
"prom_ex": {:hex, :prom_ex, "1.11.0", "1f6d67f2dead92224cb4f59beb3e4d319257c5728d9638b4a5e8ceb51a4f9c7e", [:mix], [{:absinthe, ">= 1.7.0", [hex: :absinthe, repo: "hexpm", optional: true]}, {:broadway, ">= 1.1.0", [hex: :broadway, repo: "hexpm", optional: true]}, {:ecto, ">= 3.11.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:finch, "~> 0.18", [hex: :finch, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:oban, ">= 2.10.0", [hex: :oban, repo: "hexpm", optional: true]}, {:octo_fetch, "~> 0.4", [hex: :octo_fetch, repo: "hexpm", optional: false]}, {:peep, "~> 3.0", [hex: :peep, repo: "hexpm", optional: false]}, {:phoenix, ">= 1.7.0", [hex: :phoenix, repo: "hexpm", optional: true]}, {:phoenix_live_view, ">= 0.20.0", [hex: :phoenix_live_view, repo: "hexpm", optional: true]}, {:plug, ">= 1.16.0", [hex: :plug, repo: "hexpm", optional: true]}, {:plug_cowboy, ">= 2.6.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:telemetry, ">= 1.0.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:telemetry_metrics, "~> 1.0", [hex: :telemetry_metrics, repo: "hexpm", optional: false]}, {:telemetry_metrics_prometheus_core, "~> 1.2", [hex: :telemetry_metrics_prometheus_core, repo: "hexpm", optional: false]}, {:telemetry_poller, "~> 1.1", [hex: :telemetry_poller, repo: "hexpm", optional: false]}], "hexpm", "76b074bc3730f0802978a7eb5c7091a65473eaaf07e99ec9e933138dcc327805"},
"public_suffix": {:git, "https://github.com/axelson/publicsuffix-elixir", "fa40c243d4b5d8598b90cff268bc4e33f3bb63f1", []},
"ranch": {:hex, :ranch, "1.8.1", "208169e65292ac5d333d6cdbad49388c1ae198136e4697ae2f474697140f201c", [:make, :rebar3], [], "hexpm", "aed58910f4e21deea992a67bf51632b6d60114895eb03bb392bb733064594dd0"},
@@ -147,8 +147,6 @@
"req": {:hex, :req, "0.5.16", "99ba6a36b014458e52a8b9a0543bfa752cb0344b2a9d756651db1281d4ba4450", [:mix], [{:brotli, "~> 0.3.1", [hex: :brotli, repo: "hexpm", optional: true]}, {:ezstd, "~> 1.0", [hex: :ezstd, repo: "hexpm", optional: true]}, {:finch, "~> 0.17", [hex: :finch, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mime, "~> 2.0.6 or ~> 2.1", [hex: :mime, repo: "hexpm", optional: false]}, {:nimble_csv, "~> 1.0", [hex: :nimble_csv, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "974a7a27982b9b791df84e8f6687d21483795882a7840e8309abdbe08bb06f09"},
"rustler_precompiled": {:hex, :rustler_precompiled, "0.7.3", "42cb9449785cd86c87453e39afdd27a0bdfa5c77a4ec5dc5ce45112e06b9f89b", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:rustler, "~> 0.23", [hex: :rustler, repo: "hexpm", optional: true]}], "hexpm", "cbc4b3777682e5f6f43ed39b0e0b4a42dccde8053aba91b4514e8f5ff9a5ac6d"},
"saxy": {:hex, :saxy, "1.6.0", "02cb4e9bd045f25ac0c70fae8164754878327ee393c338a090288210b02317ee", [:mix], [], "hexpm", "ef42eb4ac983ca77d650fbdb68368b26570f6cc5895f0faa04d34a6f384abad3"},
- "scrivener": {:hex, :scrivener, "2.7.2", "1d913c965ec352650a7f864ad7fd8d80462f76a32f33d57d1e48bc5e9d40aba2", [:mix], [], "hexpm", "7866a0ec4d40274efbee1db8bead13a995ea4926ecd8203345af8f90d2b620d9"},
- "scrivener_ecto": {:hex, :scrivener_ecto, "3.1.0", "6e0fcfcabd289b1afe2f2be93db363030716c84ec0ff91fad9054fc6465bd2ee", [:mix], [{:ecto, "~> 3.12", [hex: :ecto, repo: "hexpm", optional: false]}, {:scrivener, "~> 2.4", [hex: :scrivener, repo: "hexpm", optional: false]}], "hexpm", "86b721669c2718e8569bcc2573650ad749d5eada5f5bee41c9e260e7201fddf6"},
"sentry": {:hex, :sentry, "11.0.4", "60371c96cefd247e0fc98840bba2648f64f19aa0b8db8e938f5a98421f55b619", [:mix], [{:hackney, "~> 1.8", [hex: :hackney, repo: "hexpm", optional: true]}, {:igniter, "~> 0.5", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_options, "~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:nimble_ownership, "~> 0.3.0 or ~> 1.0", [hex: :nimble_ownership, repo: "hexpm", optional: false]}, {:opentelemetry, ">= 0.0.0", [hex: :opentelemetry, repo: "hexpm", optional: true]}, {:opentelemetry_api, ">= 0.0.0", [hex: :opentelemetry_api, repo: "hexpm", optional: true]}, {:opentelemetry_exporter, ">= 0.0.0", [hex: :opentelemetry_exporter, repo: "hexpm", optional: true]}, {:opentelemetry_semantic_conventions, ">= 0.0.0", [hex: :opentelemetry_semantic_conventions, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6", [hex: :phoenix, repo: "hexpm", optional: true]}, {:phoenix_live_view, "~> 0.20 or ~> 1.0", [hex: :phoenix_live_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.6", [hex: :plug, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "feaafc284dc204c82aadaddc884227aeaa3480decb274d30e184b9d41a700c66"},
"simple_saml": {:hex, :simple_saml, "1.2.0", "d875939e21cd73cdb3f747e701e4d2d5f0f4e35610d37df50629087454fa43f9", [:mix], [{:simple_xml, "~> 1.3", [hex: :simple_xml, repo: "hexpm", optional: false]}, {:x509, "~> 0.9.0", [hex: :x509, repo: "hexpm", optional: false]}], "hexpm", "24663665e53a91bfc38359ed9f26f575a389bde9fc94ec369f9f2259046feaf0"},
"simple_xml": {:hex, :simple_xml, "1.3.2", "84b892527b5183748694583a658c729c84bb89fc8ac650d7025ebc2c49e74018", [:mix], [{:saxy, "~> 1.5", [hex: :saxy, repo: "hexpm", optional: false]}, {:x509, "~> 0.9.0", [hex: :x509, repo: "hexpm", optional: false]}], "hexpm", "8c15fa49955a8c82b50f3053617e8a4cd771fcd0a502d660e56993c38ac86ca5"},
@@ -157,7 +155,7 @@
"ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.7", "354c321cf377240c7b8716899e182ce4890c5938111a1296add3ec74cf1715df", [:make, :mix, :rebar3], [], "hexpm", "fe4c190e8f37401d30167c8c405eda19469f34577987c76dde613e838bbc67f8"},
"sweet_xml": {:hex, :sweet_xml, "0.7.5", "803a563113981aaac202a1dbd39771562d0ad31004ddbfc9b5090bdcd5605277", [:mix], [], "hexpm", "193b28a9b12891cae351d81a0cead165ffe67df1b73fe5866d10629f4faefb12"},
"tailwind": {:hex, :tailwind, "0.4.1", "e7bcc222fe96a1e55f948e76d13dd84a1a7653fb051d2a167135db3b4b08d3e9", [:mix], [], "hexpm", "6249d4f9819052911120dbdbe9e532e6bd64ea23476056adb7f730aa25c220d1"},
- "telemetry": {:hex, :telemetry, "1.3.0", "fedebbae410d715cf8e7062c96a1ef32ec22e764197f70cda73d82778d61e7a2", [:rebar3], [], "hexpm", "7015fc8919dbe63764f4b4b87a95b7c0996bd539e0d499be6ec9d7f3875b79e6"},
+ "telemetry": {:hex, :telemetry, "1.4.1", "ab6de178e2b29b58e8256b92b382ea3f590a47152ca3651ea857a6cae05ac423", [:rebar3], [], "hexpm", "2172e05a27531d3d31dd9782841065c50dd5c3c7699d95266b2edd54c2dafa1c"},
"telemetry_metrics": {:hex, :telemetry_metrics, "1.1.0", "5bd5f3b5637e0abea0426b947e3ce5dd304f8b3bc6617039e2b5a008adc02f8f", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "e7b79e8ddfde70adb6db8a6623d1778ec66401f366e9a8f5dd0955c56bc8ce67"},
"telemetry_metrics_prometheus_core": {:hex, :telemetry_metrics_prometheus_core, "1.2.1", "c9755987d7b959b557084e6990990cb96a50d6482c683fb9622a63837f3cd3d8", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:telemetry_metrics, "~> 0.6 or ~> 1.0", [hex: :telemetry_metrics, repo: "hexpm", optional: false]}], "hexpm", "5e2c599da4983c4f88a33e9571f1458bf98b0cf6ba930f1dc3a6e8cf45d5afb6"},
"telemetry_poller": {:hex, :telemetry_poller, "1.3.0", "d5c46420126b5ac2d72bc6580fb4f537d35e851cc0f8dbd571acf6d6e10f5ec7", [:rebar3], [{:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "51f18bed7128544a50f75897db9974436ea9bfba560420b646af27a9a9b35211"},
diff --git a/test/plausible/sites/index_test.exs b/test/plausible/sites/index_test.exs
index 0d49e813ca..bb53a57f12 100644
--- a/test/plausible/sites/index_test.exs
+++ b/test/plausible/sites/index_test.exs
@@ -58,16 +58,6 @@ defmodule Plausible.Sites.IndexTest do
refute site1.id in ids
end
- test "filters by domain substring" do
- user = new_user()
- site_a = new_site(owner: user, domain: "alpha.example.com")
- site_b = new_site(owner: user, domain: "beta.example.com")
-
- ids = Index.fetch_site_ids(user, filter_by_domain: "alpha")
- assert site_a.id in ids
- refute site_b.id in ids
- end
-
test "non-setup team: own sites and guest sites both included" do
user = new_user()
own_site = new_site(owner: user)
@@ -390,31 +380,16 @@ defmodule Plausible.Sites.IndexTest do
assert state.sort_direction == :asc
end
- test "stores filter_by_domain and team in opts map" do
+ test "stores team in opts map" do
user = new_user()
other_user = new_user()
team_site = new_site(owner: other_user)
team = Plausible.Teams.complete_setup(team_site.team)
add_member(team_site.team, user: user, role: :admin)
- state = Index.build(user, filter_by_domain: "example", team: team)
-
- assert state.opts == %{filter_by_domain: "example", team: team}
- end
-
- test "filter_by_domain is respected at paginate time" do
- user = new_user()
- site_a = new_site(owner: user, domain: "alpha.example.com")
- _site_b = new_site(owner: user, domain: "beta.example.com")
-
- state = Index.build(user, filter_by_domain: "alpha")
-
- assert length(state.ordered_ids) == 2
- assert state.opts.filter_by_domain == "alpha"
+ state = Index.build(user, team: team)
- page = Index.paginate(state, 1, 24)
- assert page.entries == [site_a.id]
- assert page.total_entries == 1
+ assert state.opts == %{team: team}
end
test "scopes to setup team" do
@@ -462,13 +437,13 @@ defmodule Plausible.Sites.IndexTest do
end
end
- describe "paginate/3" do
+ describe "paginate/2" do
test "returns a Page of site IDs" do
user = new_user()
site = new_site(owner: user)
state = Index.build(user)
- page = Index.paginate(state, 1, 24)
+ page = Index.paginate(state, page: 1, page_size: 24)
assert %Index.Page{} = page
assert page.entries == [site.id]
@@ -480,7 +455,7 @@ defmodule Plausible.Sites.IndexTest do
test "returns empty page when user has no sites" do
user = new_user()
state = Index.build(user)
- page = Index.paginate(state, 1, 24)
+ page = Index.paginate(state, page: 1, page_size: 24)
assert page.entries == []
assert page.total_entries == 0
@@ -493,10 +468,10 @@ defmodule Plausible.Sites.IndexTest do
state = Index.build(user, sort_by: :alnum, sort_direction: :asc)
- page1 = Index.paginate(state, 1, 3)
- page2 = Index.paginate(state, 2, 3)
- page3 = Index.paginate(state, 3, 3)
- page4 = Index.paginate(state, 4, 3)
+ page1 = Index.paginate(state, page: 1, page_size: 3)
+ page2 = Index.paginate(state, page: 2, page_size: 3)
+ page3 = Index.paginate(state, page: 3, page_size: 3)
+ page4 = Index.paginate(state, page: 4, page_size: 3)
assert page1.total_entries == 10
assert page1.total_pages == 4
@@ -516,11 +491,11 @@ defmodule Plausible.Sites.IndexTest do
site_a = new_site(owner: user, domain: "a.example.com")
state_asc = Index.build(user, sort_by: :alnum, sort_direction: :asc)
- page_asc = Index.paginate(state_asc, 1, 24)
+ page_asc = Index.paginate(state_asc, page: 1, page_size: 24)
assert page_asc.entries == [site_a.id, site_z.id]
state_desc = Index.build(user, sort_by: :alnum, sort_direction: :desc)
- page_desc = Index.paginate(state_desc, 1, 24)
+ page_desc = Index.paginate(state_desc, page: 1, page_size: 24)
assert page_desc.entries == [site_z.id, site_a.id]
end
@@ -529,7 +504,7 @@ defmodule Plausible.Sites.IndexTest do
_site = new_site(owner: user)
state = Index.build(user)
- page = Index.paginate(state, 999, 24)
+ page = Index.paginate(state, page: 999, page_size: 24)
assert page.page_number == 1
assert length(page.entries) == 1
@@ -541,7 +516,7 @@ defmodule Plausible.Sites.IndexTest do
site_b = new_site(owner: user, domain: "b.example.com")
state = Index.build(user, sort_by: :alnum, sort_direction: :asc)
- page = Index.paginate(state, 1, 100)
+ page = Index.paginate(state, page: 1, page_size: 100)
assert page.total_pages == 1
assert page.entries == [site_a.id, site_b.id]
@@ -553,8 +528,8 @@ defmodule Plausible.Sites.IndexTest do
state = Index.build(user)
- page1 = Index.paginate(state, "1", "3")
- page2 = Index.paginate(state, "2", "3")
+ page1 = Index.paginate(state, page: "1", page_size: "3")
+ page2 = Index.paginate(state, page: "2", page_size: "3")
assert page1.total_entries == 5
assert page1.total_pages == 2
@@ -569,9 +544,9 @@ defmodule Plausible.Sites.IndexTest do
state = Index.build(user)
- assert Index.paginate(state, "abc", 24).page_number == 1
- assert Index.paginate(state, "0", 24).page_number == 1
- assert Index.paginate(state, nil, 24).page_number == 1
+ assert Index.paginate(state, page: "abc", page_size: 24).page_number == 1
+ assert Index.paginate(state, page: "0", page_size: 24).page_number == 1
+ assert Index.paginate(state, page: nil, page_size: 24).page_number == 1
end
test "page_size out of range falls back to default of 24" do
@@ -580,8 +555,8 @@ defmodule Plausible.Sites.IndexTest do
state = Index.build(user)
- assert Index.paginate(state, 1, "0").page_size == 24
- assert Index.paginate(state, 1, "101").page_size == 24
+ assert Index.paginate(state, page: 1, page_size: "0").page_size == 24
+ assert Index.paginate(state, page: 1, page_size: "101").page_size == 24
end
test "nil page and page_size fall back to defaults (page 1, page_size 24)" do
@@ -589,11 +564,25 @@ defmodule Plausible.Sites.IndexTest do
for _ <- 1..5, do: new_site(owner: user)
state = Index.build(user)
- page = Index.paginate(state, nil, nil)
+ page = Index.paginate(state, page: nil, page_size: nil)
assert page.page_number == 1
assert page.page_size == 24
end
+
+ test "filter_by_domain is respected at paginate time" do
+ user = new_user()
+ site_a = new_site(owner: user, domain: "alpha.example.com")
+ _site_b = new_site(owner: user, domain: "beta.example.com")
+
+ state = Index.build(user)
+
+ assert length(state.ordered_ids) == 2
+
+ page = Index.paginate(state, page: 1, page_size: 24, filter_by_domain: "alpha")
+ assert page.entries == [site_a.id]
+ assert page.total_entries == 1
+ end
end
describe "refresh_pins/1" do
@@ -710,168 +699,6 @@ defmodule Plausible.Sites.IndexTest do
end
end
- describe "update_state/3" do
- test "returns a new State with updated filter_by_domain" do
- user = new_user()
- _site = new_site(owner: user)
-
- state = Index.build(user)
- new_state = Index.update_state(state, :filter_by_domain, "example")
-
- assert %State{} = new_state
- assert new_state.opts.filter_by_domain == "example"
- end
-
- test "does not hit the database - ordered_ids is unchanged" do
- user = new_user()
- _site_a = new_site(owner: user, domain: "alpha.example.com")
- _site_b = new_site(owner: user, domain: "beta.example.com")
-
- state = Index.build(user)
- assert length(state.ordered_ids) == 2
-
- new_state = Index.update_state(state, :filter_by_domain, "alpha")
-
- # full list preserved in state
- assert new_state.ordered_ids == state.ordered_ids
- end
-
- test "paginate/3 reflects the new filter" do
- user = new_user()
- site_a = new_site(owner: user, domain: "alpha.example.com")
- _site_b = new_site(owner: user, domain: "beta.example.com")
-
- page =
- user
- |> Index.build()
- |> Index.update_state(:filter_by_domain, "alpha")
- |> Index.paginate(1, 24)
-
- assert page.entries == [site_a.id]
- assert page.total_entries == 1
- end
-
- test "filter is case-insensitive" do
- user = new_user()
- site = new_site(owner: user, domain: "Alpha.example.com")
-
- page =
- user
- |> Index.build()
- |> Index.update_state(:filter_by_domain, "ALPHA")
- |> Index.paginate(1, 24)
-
- assert page.entries == [site.id]
- end
-
- test "nil filter clears the filter and returns all sites" do
- user = new_user()
- site_a = new_site(owner: user, domain: "alpha.example.com")
- site_b = new_site(owner: user, domain: "beta.example.com")
-
- page =
- user
- |> Index.build()
- |> Index.update_state(:filter_by_domain, "alpha")
- |> Index.update_state(:filter_by_domain, nil)
- |> Index.paginate(1, 24)
-
- assert length(page.entries) == 2
- assert site_a.id in page.entries
- assert site_b.id in page.entries
- end
-
- test "empty string filter clears the filter and returns all sites" do
- user = new_user()
- _site_a = new_site(owner: user, domain: "alpha.example.com")
- _site_b = new_site(owner: user, domain: "beta.example.com")
-
- page =
- user
- |> Index.build()
- |> Index.update_state(:filter_by_domain, "alpha")
- |> Index.update_state(:filter_by_domain, "")
- |> Index.paginate(1, 24)
-
- assert page.total_entries == 2
- end
-
- test "filter returns empty page when no sites match" do
- user = new_user()
- _site = new_site(owner: user, domain: "alpha.example.com")
-
- page =
- user
- |> Index.build()
- |> Index.update_state(:filter_by_domain, "zzz-no-match")
- |> Index.paginate(1, 24)
-
- assert page.entries == []
- assert page.total_entries == 0
- end
-
- test "filter preserves sort order within results" do
- user = new_user()
- site_az = new_site(owner: user, domain: "az.test.com")
- site_aa = new_site(owner: user, domain: "aa.test.com")
- _site_b = new_site(owner: user, domain: "other.com")
-
- page =
- user
- |> Index.build(sort_by: :alnum, sort_direction: :asc)
- |> Index.update_state(:filter_by_domain, ".test.")
- |> Index.paginate(1, 24)
-
- assert page.entries == [site_aa.id, site_az.id]
- end
-
- test "changing filter does not require re-sorting - traffic map is preserved" do
- user = new_user()
- site_a = new_site(owner: user, domain: "alpha.example.com")
- site_b = new_site(owner: user, domain: "beta.example.com")
-
- now = NaiveDateTime.utc_now()
-
- populate_stats(site_a, [
- build(:pageview, timestamp: NaiveDateTime.add(now, -2, :hour), user_id: 1)
- ])
-
- state = Index.build(user, sort_by: :traffic, sort_direction: :desc)
- original_traffic = state.traffic
-
- populate_stats(site_a, [
- build(:pageview, timestamp: NaiveDateTime.add(now, -1, :hour), user_id: 1)
- ])
-
- new_state = Index.update_state(state, :filter_by_domain, "beta")
-
- assert new_state.traffic == original_traffic
-
- page = Index.paginate(new_state, 1, 24)
- assert page.entries == [site_b.id]
- end
-
- test "filter applied to build opts is applied consistently with update_state/3" do
- user = new_user()
- site_a = new_site(owner: user, domain: "alpha.example.com")
- _site_b = new_site(owner: user, domain: "beta.example.com")
-
- page_via_build =
- user
- |> Index.build(filter_by_domain: "alpha")
- |> Index.paginate(1, 24)
-
- page_via_update =
- user
- |> Index.build()
- |> Index.update_state(:filter_by_domain, "alpha")
- |> Index.paginate(1, 24)
-
- assert page_via_build.entries == [site_a.id]
- assert page_via_update.entries == [site_a.id]
- end
- end
-
describe "sort/2" do
test "alnum asc -> desc flips order, no traffic map, no extra queries" do
user = new_user()
@@ -983,5 +810,19 @@ defmodule Plausible.Sites.IndexTest do
assert new_state.pins == state.pins
assert new_state.ordered_ids == [site.id]
end
+
+ test "accepts struct for opts" do
+ user = new_user()
+ site = new_site(owner: user)
+
+ state = Index.build(user)
+
+ new_state =
+ Index.sort(state, Index.UserPreference.new(%{sort_by: :alnum, sort_direction: :asc}))
+
+ assert new_state.sort_by == :alnum
+ assert new_state.sort_direction == :asc
+ assert new_state.ordered_ids == [site.id]
+ end
end
end
diff --git a/test/plausible/sites_test.exs b/test/plausible/sites_test.exs
index 97ca545f57..4c7715840e 100644
--- a/test/plausible/sites_test.exs
+++ b/test/plausible/sites_test.exs
@@ -268,634 +268,4 @@ defmodule Plausible.SitesTest do
assert Sites.get_for_user!(user, domain, include_consolidated?: true)
end
end
-
- describe "list/3" do
- test "returns empty when there are no sites" do
- user = new_user()
- _rogue_site = new_site()
-
- assert %{
- entries: [],
- page_size: 24,
- page_number: 1,
- total_entries: 0,
- total_pages: 1
- } = Sites.list(user, %{})
-
- assert %{
- entries: [],
- page_size: 24,
- page_number: 1,
- total_entries: 0,
- total_pages: 1
- } = Plausible.Teams.Sites.list(user, %{})
- end
-
- test "lists guest sites when no current team set (no invitations)" do
- user1 = new_user()
- user2 = new_user()
- user4 = new_user()
-
- # owned site on a setup team
- site1 = new_site(owner: user1, domain: "own.example.com")
-
- Plausible.Teams.complete_setup(site1.team)
-
- # excluded
- new_site(owner: user1, domain: "consolidated.example.com", consolidated: true)
-
- # guest site access
- site2 = new_site(owner: user2, domain: "guest.example.com")
- add_guest(site2, user: user1, role: :editor)
-
- # other team site access
- site3 = new_site(domain: "team.example.com", owner: user4)
- add_member(site3.team, user: user1, role: :editor)
-
- assert %{
- entries: [
- %{domain: "guest.example.com"}
- ]
- } =
- Sites.list(user1, %{})
- end
-
- test "lists guest sites and team sites when current team set but not setup (no invitations)" do
- user1 = new_user()
- user2 = new_user()
- user4 = new_user()
-
- # owned site on a personal team
- site1 = new_site(owner: user1, domain: "own.example.com")
-
- # guest site access
- site2 = new_site(owner: user2, domain: "guest.example.com")
- add_guest(site2, user: user1, role: :editor)
-
- # other team site access
- site3 = new_site(domain: "team.example.com", owner: user4)
- add_member(site3.team, user: user1, role: :editor)
-
- # excluded
- new_site(owner: user1, domain: "consolidated.example.com", consolidated: true)
-
- assert %{
- entries: [
- %{domain: "guest.example.com"},
- %{domain: "own.example.com"}
- ]
- } =
- Sites.list(user1, %{}, team: site1.team)
- end
-
- test "lists team sites when current team set and setup (no invitations)" do
- user1 = new_user()
- user2 = new_user()
- user4 = new_user()
-
- # owned site on a personal team
- new_site(owner: user1, domain: "own.example.com")
-
- # guest site access
- site2 = new_site(owner: user2, domain: "guest.example.com")
- add_guest(site2, user: user1, role: :editor)
-
- # other team site access
- site3 = new_site(domain: "team.example.com", owner: user4)
- team3 = Plausible.Teams.complete_setup(site3.team)
- add_member(site3.team, user: user1, role: :admin)
-
- # excluded
- new_site(owner: user1, domain: "consolidated.example.com", consolidated: true)
-
- assert %{
- entries: [
- %{domain: "team.example.com"}
- ]
- } =
- Sites.list(user1, %{}, team: team3)
- end
-
- test "shows pinned site for user without team with guest membership (no invitation)" do
- owner = new_user()
- pending_owner = new_user()
- site = new_site(owner: owner, domain: "one.example.com")
- add_guest(site, user: pending_owner, role: :editor)
-
- # transfer no longer shown
- invite_transfer(site, pending_owner, inviter: owner)
-
- {:ok, _} = Sites.toggle_pin(pending_owner, site)
-
- # excluded
- new_site(owner: owner, domain: "consolidated.example.com", consolidated: true)
- new_site(owner: pending_owner, domain: "consolidated2.example.com", consolidated: true)
-
- assert %{
- entries: [
- %{domain: "one.example.com", entry_type: "pinned_site"}
- ]
- } =
- Sites.list(pending_owner, %{})
- end
-
- test "shows site for user without team with guest membership (no invitation)" do
- owner = new_user()
- pending_owner = new_user()
- site = new_site(owner: owner, domain: "one.example.com")
- add_guest(site, user: pending_owner, role: :editor)
-
- assert %{
- entries: [
- %{domain: "one.example.com", entry_type: "site"}
- ]
- } =
- Sites.list(pending_owner, %{})
- end
-
- test "shows site for user with personal team with guest membership (no invitation)" do
- owner = new_user()
- pending_owner = new_user() |> subscribe_to_growth_plan()
- pending_team = team_of(pending_owner)
- site = new_site(owner: owner, domain: "one.example.com")
- add_guest(site, user: pending_owner, role: :editor)
-
- assert %{
- entries: [
- %{domain: "one.example.com", entry_type: "site"}
- ]
- } =
- Sites.list(pending_owner, %{}, team: pending_team)
- end
-
- test "does not show site for user with setup team with guest membership (no invitation)" do
- owner = new_user()
- pending_owner = new_user() |> subscribe_to_growth_plan()
-
- pending_team =
- pending_owner
- |> team_of()
- |> Plausible.Teams.complete_setup()
-
- site = new_site(owner: owner, domain: "one.example.com")
- add_guest(site, user: pending_owner, role: :editor)
-
- assert %{
- entries: []
- } =
- Sites.list(pending_owner, %{}, team: pending_team)
- end
-
- test "does not show transfer for user with site in their personal team" do
- pending_owner = new_user() |> subscribe_to_growth_plan()
- pending_team = team_of(pending_owner)
- _site = new_site(owner: pending_owner, domain: "one.example.com")
-
- assert %{
- entries: [
- %{domain: "one.example.com", entry_type: "site"}
- ]
- } =
- Sites.list(pending_owner, %{}, team: pending_team)
- end
-
- test "does not show transfer for user with site in their setup team" do
- pending_owner = new_user() |> subscribe_to_growth_plan()
- pending_team = team_of(pending_owner)
- _site = new_site(owner: pending_owner, domain: "one.example.com")
-
- pending_team = Plausible.Teams.complete_setup(pending_team)
-
- assert %{
- entries: [
- %{domain: "one.example.com", entry_type: "site"}
- ]
- } =
- Sites.list(pending_owner, %{}, team: pending_team)
- end
-
- test "pinned site doesn't matter with membership revoked (no active invitations)" do
- user1 = new_user(email: "[email protected]")
- _user2 = new_user(email: "[email protected]")
-
- new_site(owner: user1, domain: "one.example.com")
- site2 = new_site(domain: "two.example.com")
-
- user1 = site2 |> add_guest(user: user1, role: :viewer)
-
- {:ok, _} = Sites.toggle_pin(user1, site2)
-
- revoke_membership(site2, user1)
-
- assert %{entries: [%{domain: "one.example.com"}]} = Sites.list(user1, %{})
- assert %{entries: [%{domain: "one.example.com"}]} = Sites.list(user1, %{})
-
- assert %{entries: [%{domain: "one.example.com"}]} = Plausible.Teams.Sites.list(user1, %{})
-
- assert %{entries: [%{domain: "one.example.com"}]} =
- Plausible.Teams.Sites.list(user1, %{})
- end
-
- test "pinned site (no invitation shown)" do
- user1 = new_user(email: "[email protected]")
-
- site1 = new_site(domain: "one.example.com", owner: user1)
-
- {:ok, _} = Sites.toggle_pin(user1, site1)
-
- assert %{entries: [%{domain: "one.example.com"}]} = Sites.list(user1, %{})
-
- assert %{
- entries: [
- %{domain: "one.example.com", entry_type: "pinned_site"}
- ]
- } =
- Sites.list(user1, %{})
-
- assert %{entries: [%{domain: "one.example.com"}]} = Plausible.Teams.Sites.list(user1, %{})
-
- assert %{entries: [%{domain: "one.example.com"}]} =
- Plausible.Teams.Sites.list(user1, %{})
- end
-
- test "pinned site after invitation revoked (no invitation shown)" do
- user1 = new_user(email: "[email protected]")
- user2 = new_user(email: "[email protected]")
-
- site1 = new_site(domain: "one.example.com", owner: user2)
-
- add_guest(site1, user: user1, role: :editor)
- {:ok, _} = Sites.toggle_pin(user1, site1)
- revoke_membership(site1, user1)
-
- assert %{entries: []} = Sites.list(user1, %{})
-
- assert %{entries: []} = Plausible.Teams.Sites.list(user1, %{})
-
- assert %{entries: []} =
- Plausible.Teams.Sites.list(user1, %{})
- end
-
- test "puts pinned sites first, sites last (no invitations)" do
- user1 = new_user()
- user2 = new_user()
-
- site1 = new_site(owner: user1, domain: "one.example.com")
- site2 = new_site(owner: user2, domain: "two.example.com")
- site3 = new_site(domain: "three.example.com")
- site4 = new_site(domain: "four.example.com")
-
- # excluded
- new_site(owner: user1, domain: "consolidated1.example.com", consolidated: true)
- new_site(owner: user2, domain: "consolidated2.example.com", consolidated: true)
-
- add_guest(site3, user: user1, role: :viewer)
- add_guest(site4, user: user1, role: :editor)
-
- {:ok, _} = Sites.toggle_pin(user1, site3)
- {:ok, _pin_to_ignore} = Sites.toggle_pin(user2, site2)
-
- site1_id = site1.id
- site3_id = site3.id
- site4_id = site4.id
-
- assert %{
- entries: [
- %{id: ^site3_id, entry_type: "pinned_site"},
- %{id: ^site4_id, entry_type: "site"},
- %{id: ^site1_id, entry_type: "site"}
- ]
- } = Sites.list(user1, %{})
-
- assert %{
- entries: [
- %{id: ^site3_id, entry_type: "pinned_site"},
- %{id: ^site4_id, entry_type: "site"},
- %{id: ^site1_id, entry_type: "site"}
- ]
- } = Sites.list(user1, %{})
- end
-
- test "pinned sites are ordered according to the time they were pinned at (no invitations)" do
- user1 = new_user()
- user2 = new_user()
- user3 = new_user()
-
- site1 = new_site(owner: user1, domain: "one.example.com")
- site2 = new_site(owner: user2, domain: "two.example.com")
- site3 = new_site(domain: "three.example.com")
- site4 = new_site(domain: "four.example.com")
- site5 = new_site(owner: user3, domain: "five.example.com")
-
- # invitations no longer shown
- invite_guest(site2, user1, role: :editor, inviter: user2)
- add_guest(site3, user: user1, role: :viewer)
- add_guest(site4, user: user1, role: :editor)
-
- invite_transfer(site5, user1, inviter: user3)
-
- {:ok, _} = Sites.toggle_pin(user1, site3)
-
- site1_id = site1.id
- site3_id = site3.id
- site4_id = site4.id
-
- Sites.set_option(user1, site1, :pinned_at, ~N[2023-10-22 12:00:00])
- {:ok, _} = Sites.toggle_pin(user1, site3)
-
- assert %{
- entries: [
- %{id: ^site3_id, entry_type: "pinned_site"},
- %{id: ^site1_id, entry_type: "pinned_site"},
- %{id: ^site4_id, entry_type: "site"}
- ]
- } = Sites.list(user1, %{})
-
- assert %{
- entries: [
- %{id: ^site3_id, entry_type: "pinned_site"},
- %{id: ^site1_id, entry_type: "pinned_site"},
- %{id: ^site4_id, entry_type: "site"}
- ]
- } = Sites.list(user1, %{})
- end
-
- test "filters by domain (no invitations)" do
- user1 = new_user()
-
- site1 = new_site(owner: user1, domain: "first.example.com")
- _site2 = new_site(owner: user1, domain: "another.example.com")
- new_site(owner: user1, domain: "consolidated.example.com", consolidated: true)
-
- site1_id = site1.id
-
- assert %{
- entries: [
- %{id: ^site1_id}
- ]
- } = Sites.list(user1, %{}, filter_by_domain: "first")
-
- assert %{
- entries: [
- %{id: ^site1_id}
- ]
- } = Sites.list(user1, %{}, filter_by_domain: "first")
- end
-
- test "scopes by team when provided (no invitations)" do
- user1 = new_user()
-
- site1 = new_site(owner: user1, domain: "first.example.com")
- site4 = new_site(domain: "zzzsitefromanotherteam.com")
-
- team4 = Plausible.Teams.complete_setup(site4.team)
- add_member(team4, user: user1, role: :admin)
-
- assert_matches %{
- entries: [
- %{id: ^site1.id}
- ]
- } = Sites.list(user1, %{})
-
- assert_matches %{
- entries: [
- %{id: ^site1.id}
- ]
- } = Sites.list(user1, %{})
-
- assert_matches %{
- entries: [
- %{id: ^site4.id}
- ]
- } = Sites.list(user1, %{}, team: team4)
-
- assert_matches %{
- entries: [
- %{id: ^site4.id}
- ]
- } = Sites.list(user1, %{}, team: team4)
- end
-
- test "handles pagination correctly (no invitations)" do
- user1 = new_user()
-
- site1 = new_site(owner: user1, domain: "one.example.com")
- site3 = new_site(domain: "three.example.com")
- site4 = new_site(domain: "four.example.com")
-
- add_guest(site3, user: user1, role: :viewer)
- add_guest(site4, user: user1, role: :editor)
-
- {:ok, _} = Sites.toggle_pin(user1, site3)
-
- site1_id = site1.id
- site3_id = site3.id
- site4_id = site4.id
-
- assert %{
- entries: [%{id: ^site3_id}, %{id: ^site4_id}],
- page_number: 1,
- page_size: 2,
- total_entries: 3,
- total_pages: 2
- } = Sites.list(user1, %{"page_size" => 2})
-
- assert %{
- entries: [%{id: ^site1_id}],
- page_number: 2,
- page_size: 2,
- total_entries: 3,
- total_pages: 2
- } = Sites.list(user1, %{"page_size" => 2, "page" => 2})
-
- assert %{
- entries: [%{id: ^site3_id}, %{id: ^site4_id}, %{id: ^site1_id}],
- page_number: 1,
- page_size: 3,
- total_entries: 3,
- total_pages: 1
- } = Sites.list(user1, %{"page_size" => 3})
- end
- end
-
- describe "set_option/4" do
- test "allows setting option multiple times" do
- user = new_user()
- site = new_site(owner: user)
-
- assert prefs =
- %{pinned_at: %NaiveDateTime{}} =
- Sites.set_option(user, site, :pinned_at, NaiveDateTime.utc_now())
-
- prefs = Repo.reload!(prefs)
- assert prefs.site_id == site.id
- assert prefs.user_id == user.id
- assert prefs.pinned_at
-
- assert prefs =
- %{pinned_at: nil} = Sites.set_option(user, site, :pinned_at, nil)
-
- prefs = Repo.reload!(prefs)
- assert prefs.site_id == site.id
- assert prefs.user_id == user.id
- refute prefs.pinned_at
-
- assert prefs =
- %{pinned_at: %NaiveDateTime{}} =
- Sites.set_option(user, site, :pinned_at, NaiveDateTime.utc_now())
-
- prefs = Repo.reload!(prefs)
- assert prefs.site_id == site.id
- assert prefs.user_id == user.id
- assert prefs.pinned_at
- end
-
- test "raises on invalid option" do
- user = new_user()
- site = new_site(owner: user)
-
- assert_raise FunctionClauseError, fn ->
- Sites.set_option(user, site, :invalid, false)
- end
- end
-
- test "raises on invalid site/user combination" do
- user = insert(:user)
- site = insert(:site)
-
- assert_raise Ecto.NoResultsError, fn ->
- Sites.set_option(user, site, :pinned_at, nil)
- end
- end
- end
-
- describe "toggle_pin/2" do
- test "allows pinning and unpinning site" do
- user = new_user()
- site = new_site(owner: user)
-
- site = %{site | pinned_at: nil}
- assert {:ok, prefs} = Sites.toggle_pin(user, site)
- assert prefs = %{pinned_at: %NaiveDateTime{}} = prefs
- prefs = Repo.reload!(prefs)
- assert prefs.site_id == site.id
- assert prefs.user_id == user.id
- assert prefs.pinned_at
-
- site = %{site | pinned_at: NaiveDateTime.utc_now()}
- assert {:ok, prefs} = Sites.toggle_pin(user, site)
- assert %{pinned_at: nil} = prefs
- prefs = Repo.reload!(prefs)
- assert prefs.site_id == site.id
- assert prefs.user_id == user.id
- refute prefs.pinned_at
-
- site = %{site | pinned_at: nil}
- assert {:ok, prefs} = Sites.toggle_pin(user, site)
- assert %{pinned_at: %NaiveDateTime{}} = prefs
- prefs = Repo.reload!(prefs)
- assert prefs.site_id == site.id
- assert prefs.user_id == user.id
- assert prefs.pinned_at
- end
-
- test "handles multiple guest memberships with same team properly (regression)" do
- user = new_user()
- owner = new_user()
- site1 = new_site(owner: owner)
- site2 = new_site(owner: owner)
- add_guest(site1, user: user, role: :viewer)
- add_guest(site2, user: user, role: :viewer)
-
- assert {:ok, prefs} = Sites.toggle_pin(user, site1)
- assert prefs.site_id == site1.id
- assert prefs.user_id == user.id
- assert prefs.pinned_at
- end
-
- test "returns error when pins limit hit" do
- user = new_user()
-
- for _ <- 1..9 do
- site = new_site(owner: user)
- assert {:ok, _} = Sites.toggle_pin(user, site)
- end
-
- site = new_site(owner: user)
-
- assert {:error, :too_many_pins} = Sites.toggle_pin(user, site)
- end
- end
-
- describe "get_by_domain/2" do
- test "returns site when found with regular site" do
- site = new_site(domain: "example.com")
-
- assert %{domain: "example.com"} = Sites.get_by_domain("example.com")
- assert site.id == Sites.get_by_domain("example.com").id
- end
-
- test "returns nil when site not found" do
- refute Sites.get_by_domain("nonexistent.com")
- end
-
- test "excludes consolidated sites by default" do
- _regular_site = new_site(domain: "regular.com")
- _consolidated_site = new_site(domain: "consolidated.com", consolidated: true)
-
- assert Sites.get_by_domain("regular.com")
- refute Sites.get_by_domain("consolidated.com")
- end
-
- test "includes consolidated sites when explicitly requested" do
- _regular_site = new_site(domain: "regular.com")
- _consolidated_site = new_site(domain: "consolidated.com", consolidated: true)
-
- assert Sites.get_by_domain("regular.com", include_consolidated?: true)
- assert Sites.get_by_domain("consolidated.com", include_consolidated?: true)
- end
- end
-
- describe "predicates for site.consolidated" do
- on_ee do
- test "regular?/1" do
- assert Sites.regular?(%Plausible.Site{consolidated: false})
- refute Sites.regular?(%Plausible.Site{consolidated: true})
- end
-
- test "consolidated?/1" do
- assert Sites.consolidated?(%Plausible.Site{consolidated: true})
- refute Sites.consolidated?(%Plausible.Site{consolidated: false})
- end
- else
- test "all sites are regular on CE" do
- assert Sites.regular?(%Plausible.Site{})
- refute Sites.consolidated?(%Plausible.Site{})
- end
- end
- end
-
- describe "shared_link_url/2" do
- test "contains base URL and slug" do
- site = new_site(domain: "example.com/deep/path")
- link = insert(:shared_link, site: site)
-
- # base url in tests is http://localhost:8000, in prod, it's https://plausible.io
- assert "http://localhost:8000/share/example.com%2Fdeep%2Fpath?auth=" <> slug =
- Sites.shared_link_url(site, link)
-
- # we assume slug is URL safe
- assert ^slug = link.slug
- end
-
- test "doesn't share the same domain formatting with public dashboard links" do
- site = new_site(domain: "a-café.fr")
- link = insert(:shared_link, site: site)
-
- assert "http://localhost:8000/a-café.fr" = PlausibleWeb.StatsView.pretty_stats_url(site)
-
- assert "http://localhost:8000/share/a-caf%C3%A9.fr?" <> _q =
- Sites.shared_link_url(site, link)
- end
- end
end
diff --git a/test/plausible_web/live/sites_test.exs b/test/plausible_web/live/sites_test.exs
index 526d2bcf94..989947c034 100644
--- a/test/plausible_web/live/sites_test.exs
+++ b/test/plausible_web/live/sites_test.exs
@@ -588,7 +588,8 @@ 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/button[phx-value-domain="#{site.domain}"][data-test-id="ellipsis-menu-pin-item"]/
html =
lv
@@ -639,6 +640,278 @@ 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
+ site = new_site(owner: user)
+ assert {:ok, _} = Plausible.Sites.toggle_pin(user, site)
+
+ {:ok, _lv, html} = live(conn, "/sites")
+
+ assert element_exists?(
+ html,
+ ~s/li[data-domain="#{site.domain}"] [data-test-id="site-card-pin-icon"]/
+ )
+ end
+
+ test "pin icon is not shown 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?(
+ 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
+ )
+ end
+ end
+
+ describe "sort widget" do
+ test "renders sort widget with default 'Most visitors' label", %{conn: conn, user: user} do
+ new_site(owner: user)
+
+ {:ok, _lv, html} = live(conn, "/sites")
+
+ assert text(find(html, "#sort-dropdown-trigger")) =~ "Most visitors"
+ end
+
+ test "sort widget shows all four options", %{conn: conn, user: user} do
+ new_site(owner: user)
+
+ {:ok, _lv, html} = live(conn, "/sites")
+
+ assert html =~ "Most visitors"
+ assert html =~ "Fewest visitors"
+ assert html =~ "Name A-Z"
+ assert html =~ "Name Z-A"
+
+ assert find(html, "#sort-dropdown-item-traffic-desc")
+ assert find(html, "#sort-dropdown-item-traffic-asc")
+ assert find(html, "#sort-dropdown-item-alnum-desc")
+ assert find(html, "#sort-dropdown-item-alnum-asc")
+ end
+
+ test "clicking a sort option updates the active label", %{conn: conn, user: user} do
+ new_site(owner: user)
+
+ {:ok, lv, _html} = live(conn, "/sites")
+
+ lv
+ |> element(~s|[id="sort-dropdown-item-alnum-asc"]|)
+ |> render_click()
+
+ html = render(lv)
+
+ assert text(find(html, "#sort-dropdown-trigger")) =~ "Name A-Z"
+ end
+
+ test "invalid sort_by param is sanitized to traffic", %{conn: conn, user: user} do
+ new_site(owner: user)
+
+ {:ok, _lv, html} = live(conn, "/sites?sort_by=invalid&sort_direction=desc")
+
+ assert text(find(html, "#sort-dropdown-trigger")) =~ "Most visitors"
+ end
+
+ test "invalid sort_direction param is sanitized to desc", %{conn: conn, user: user} do
+ new_site(owner: user)
+
+ {:ok, _lv, html} = live(conn, "/sites?sort_by=alnum&sort_direction=invalid")
+
+ assert text(find(html, "#sort-dropdown-trigger")) =~ "Name Z-A"
+ end
+
+ test "Name A-Z sort orders sites alphabetically ascending", %{conn: conn, user: user} do
+ new_site(domain: "zebra.example.com", owner: user)
+ new_site(domain: "apple.example.com", owner: user)
+ new_site(domain: "mango.example.com", owner: user)
+
+ {:ok, _lv, html} = live(conn, "/sites?sort_by=alnum&sort_direction=asc")
+
+ domains = find(html, "li[data-domain] h3") |> text()
+
+ assert domains == "apple.example.com mango.example.com zebra.example.com"
+ end
+
+ test "Name Z-A sort orders sites alphabetically descending", %{conn: conn, user: user} do
+ new_site(domain: "zebra.example.com", owner: user)
+ new_site(domain: "apple.example.com", owner: user)
+ new_site(domain: "mango.example.com", owner: user)
+
+ {:ok, _lv, html} = live(conn, "/sites?sort_by=alnum&sort_direction=desc")
+
+ domains = find(html, "li[data-domain] h3") |> text()
+
+ assert domains == "zebra.example.com mango.example.com apple.example.com"
+ end
+
+ test "Most visitors sort orders sites by traffic", %{
+ conn: conn,
+ user: user
+ } do
+ high = new_site(domain: "high.example.com", owner: user)
+ mid = new_site(domain: "mid.example.com", owner: user)
+ low = new_site(domain: "low.example.com", owner: user)
+
+ populate_stats(high, [build(:pageview), build(:pageview), build(:pageview)])
+ populate_stats(mid, [build(:pageview)])
+
+ {:ok, _lv, html} = live(conn, "/sites?sort_by=traffic&sort_direction=desc")
+
+ domains = find(html, "li[data-domain] h3") |> text()
+
+ assert domains == "#{high.domain} #{mid.domain} #{low.domain}"
+ end
+
+ test "Fewest visitors sort orders by traffic", %{
+ conn: conn,
+ user: user
+ } do
+ low = new_site(domain: "low.example.com", owner: user)
+ mid = new_site(domain: "mid.example.com", owner: user)
+ high = new_site(domain: "high.example.com", owner: user)
+
+ populate_stats(high, [build(:pageview), build(:pageview), build(:pageview)])
+ populate_stats(mid, [build(:pageview)])
+
+ {:ok, _lv, html} = live(conn, "/sites?sort_by=traffic&sort_direction=asc")
+
+ domains = find(html, "li[data-domain] h3") |> text()
+
+ assert domains == "#{low.domain} #{mid.domain} #{high.domain}"
+ end
+
+ test "switching sort resets to page 1", %{conn: conn, user: user} do
+ for _ <- 1..3, do: new_site(owner: user)
+
+ {:ok, lv, html} = live(conn, "/sites?page_size=2&page=2&sort_by=alnum&sort_direction=asc")
+
+ assert html =~ "page=1"
+
+ lv
+ |> element(~s|[id="sort-dropdown-item-alnum-desc"]|)
+ |> render_click()
+
+ html = render(lv)
+
+ refute html =~ "page=1"
+ end
+
+ test "selecting a sort option persists the preference to the database", %{
+ conn: conn,
+ user: user
+ } do
+ new_site(owner: user)
+
+ {:ok, lv, _html} = live(conn, "/sites")
+
+ lv
+ |> element(~s|[id="sort-dropdown-item-alnum-asc"]|)
+ |> render_click()
+
+ {:ok, team} = Plausible.Teams.get_by_owner(user)
+ {:ok, membership} = Plausible.Teams.Memberships.get_team_membership(team, user)
+
+ assert Plausible.Teams.Memberships.get_preference(membership, :sort_index_options) ==
+ %Plausible.Sites.Index.UserPreference{
+ sort_by: :alnum,
+ sort_direction: :asc
+ }
+ end
+
+ test "selecting a sort option for a guest won't persist the preference", %{
+ conn: conn,
+ user: user
+ } do
+ site = new_site(owner: user)
+ viewer_guest = add_guest(site, role: :viewer, user: new_user())
+
+ {:ok, conn: conn} = log_in(%{user: viewer_guest, conn: conn})
+
+ {:ok, lv, html} = live(conn, "/sites")
+
+ assert html =~ site.domain
+
+ lv
+ |> element(~s|[id="sort-dropdown-item-alnum-asc"]|)
+ |> render_click()
+
+ {:ok, membership} =
+ Plausible.Teams.Memberships.get_team_membership(team_of(user), viewer_guest)
+
+ assert Plausible.Teams.Memberships.get_preference(membership, :sort_index_options) == nil
+ end
+
+ test "saved sort preference is applied on next visit when no URL params", %{
+ conn: conn,
+ user: user
+ } do
+ new_site(owner: user)
+
+ {:ok, team} = Plausible.Teams.get_by_owner(user)
+ {:ok, membership} = Plausible.Teams.Memberships.get_team_membership(team, user)
+
+ Plausible.Teams.Memberships.set_preference(membership, :sort_index_options, %{
+ sort_by: :alnum,
+ sort_direction: :desc
+ })
+
+ {:ok, _lv, html} = live(conn, "/sites")
+
+ assert text(find(html, "#sort-dropdown-trigger")) =~ "Name Z-A"
+ end
+
+ test "URL sort params take precedence over saved preference", %{conn: conn, user: user} do
+ new_site(owner: user)
+
+ {:ok, team} = Plausible.Teams.get_by_owner(user)
+ {:ok, membership} = Plausible.Teams.Memberships.get_team_membership(team, user)
+
+ Plausible.Teams.Memberships.set_preference(membership, :sort_index_options, %{
+ "sort_by" => "alnum",
+ "sort_direction" => "asc"
+ })
+
+ {:ok, _lv, html} = live(conn, "/sites?sort_by=traffic&sort_direction=desc")
+
+ assert text(find(html, "#sort-dropdown-trigger")) =~ "Most visitors"
+ end
end
defp type_into_input(lv, id, text) do