From 0918492d48674afb1239f45eceec8dfa2e533b8a Mon Sep 17 00:00:00 2001 From: Adrian Gruntkowski Date: Tue, 24 Oct 2023 14:12:04 +0200 Subject: [PATCH] Implement basic search capability --- lib/plausible/site/memberships/invitations.ex | 24 ++++- lib/plausible/sites.ex | 35 +++--- lib/plausible_web/live/sites.ex | 102 ++++++++++++++++-- 3 files changed, 133 insertions(+), 28 deletions(-) diff --git a/lib/plausible/site/memberships/invitations.ex b/lib/plausible/site/memberships/invitations.ex index a1a543668..467233aac 100644 --- a/lib/plausible/site/memberships/invitations.ex +++ b/lib/plausible/site/memberships/invitations.ex @@ -1,18 +1,32 @@ defmodule Plausible.Site.Memberships.Invitations do @moduledoc false - import Ecto.Query, only: [from: 2] + import Ecto.Query, only: [from: 2, where: 3] alias Plausible.Auth alias Plausible.Repo @spec list_for_email(String.t()) :: [Auth.Invitation.t()] - def list_for_email(email) do + def list_for_email(email, opts \\ []) do + domain_filter = Keyword.get(opts, :filter_by_domain) + Repo.all( - from i in Auth.Invitation, - where: i.email == ^email + from(i in Auth.Invitation, + inner_join: s in assoc(i, :site), + where: i.email == ^email, + preload: [site: s] + ) + |> maybe_filter_by_domain(domain_filter) ) - |> Repo.preload(:site) + end + + defp maybe_filter_by_domain(query, domain) + when byte_size(domain) >= 3 and byte_size(domain) <= 64 do + where(query, [_, s], ilike(s.domain, ^"%#{domain}%")) + end + + defp maybe_filter_by_domain(query, _) do + query end @spec find_for_user(String.t(), Auth.User.t()) :: diff --git a/lib/plausible/sites.ex b/lib/plausible/sites.ex index a4be806cc..95634c0dd 100644 --- a/lib/plausible/sites.ex +++ b/lib/plausible/sites.ex @@ -11,23 +11,34 @@ defmodule Plausible.Sites do end @spec list(User.t(), map(), [non_neg_integer()]) :: %{entries: [Site.t()], pagination: map()} - def list(user, pagination_params, exclude_ids \\ []) do - {sites, pagination} = - Repo.paginate( - from(s in Plausible.Site, - join: sm in Plausible.Site.Membership, - on: sm.site_id == s.id, - where: sm.user_id == ^user.id, - where: s.id not in ^exclude_ids, - order_by: s.domain, - preload: [memberships: sm] - ), - pagination_params + def list(user, pagination_params, opts \\ []) do + exclude_ids = Keyword.get(opts, :exclude_ids, []) + domain_filter = Keyword.get(opts, :filter_by_domain) + + sites_query = + from(s in Plausible.Site, + join: sm in Plausible.Site.Membership, + on: sm.site_id == s.id, + where: sm.user_id == ^user.id, + where: s.id not in ^exclude_ids, + order_by: s.domain, + preload: [memberships: sm] ) + |> maybe_filter_by_domain(domain_filter) + + {sites, pagination} = + Repo.paginate(sites_query, pagination_params) %{entries: sites, pagination: pagination} end + defp maybe_filter_by_domain(query, domain) + when byte_size(domain) >= 3 and byte_size(domain) <= 64 do + where(query, [s], ilike(s.domain, ^"%#{domain}%")) + end + + defp maybe_filter_by_domain(query, _), do: query + def create(user, params) do site_changeset = Site.changeset(%Site{}, params) diff --git a/lib/plausible_web/live/sites.ex b/lib/plausible_web/live/sites.ex index 795843ac3..fa053656d 100644 --- a/lib/plausible_web/live/sites.ex +++ b/lib/plausible_web/live/sites.ex @@ -14,17 +14,10 @@ defmodule PlausibleWeb.Live.Sites do def mount(params, %{"current_user_id" => user_id}, socket) do socket = socket + |> assign_new(:filter_text, fn -> "" end) + |> assign_new(:params, fn -> params end) |> assign_new(:user, fn -> Repo.get!(Auth.User, user_id) end) - |> assign_new(:invitations, fn %{user: user} -> - Invitations.list_for_email(user.email) - end) - |> assign_new(:sites, fn %{user: user, invitations: invitations} -> - excluded_site_ids = Enum.map(invitations, & &1.site_id) - Sites.list(user, params, excluded_site_ids) - end) - |> assign_new(:visitors, fn %{sites: sites} -> - Plausible.Stats.Clickhouse.last_24h_visitors(sites.entries) - end) + |> load_sites() |> assign_new(:needs_to_upgrade, fn %{user: user, sites: sites} -> user_owns_sites = Enum.any?(sites.entries, fn site -> List.first(site.memberships).role == :owner end) || @@ -83,9 +76,10 @@ defmodule PlausibleWeb.Live.Sites do

My Sites

- + Add Website + <.search_form filter_text={@filter_text} /> +