Implement basic search capability

pull/3463/head
Adrian Gruntkowski 3 years ago
parent d7274d4975
commit 0918492d48

@ -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()) ::

@ -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)

@ -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
<h2 class="text-2xl font-bold leading-7 text-gray-900 dark:text-gray-100 sm:text-3xl sm:leading-9 sm:truncate flex-shrink-0">
My Sites
</h2>
<a href="/sites/new" class="button my-2 sm:my-0 w-auto">+ Add Website</a>
</div>
<.search_form filter_text={@filter_text} />
<ul class="my-6 grid grid-cols-1 gap-6 sm:grid-cols-2 lg:grid-cols-3">
<%= if Enum.empty?(@sites.entries ++ @invitations) do %>
<p class="dark:text-gray-100">You don't have any sites yet</p>
@ -329,6 +323,44 @@ defmodule PlausibleWeb.Live.Sites do
"""
end
attr :filter_text, :string, default: ""
def search_form(assigns) do
~H"""
<div class="border-t border-gray-200 pt-4 sm:flex sm:items-center sm:justify-between">
<form id="filter-form" phx-change="filter">
<div class="text-gray-800 text-sm inline-flex items-center">
<div class="relative rounded-md shadow-sm flex">
<div class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3">
<Heroicons.magnifying_glass class="feather mr-1 dark:text-gray-300" />
</div>
<input
type="text"
name="filter-text"
id="filter-text"
class="pl-8 shadow-sm dark:bg-gray-900 dark:text-gray-300 focus:ring-indigo-500 focus:border-indigo-500 block w-full sm:text-sm border-gray-300 dark:border-gray-500 rounded-md dark:bg-gray-800"
placeholder="Search Sites"
value={@filter_text}
/>
</div>
<Heroicons.backspace
:if={String.trim(@filter_text) != ""}
class="feather ml-2 cursor-pointer hover:text-red-500 dark:text-gray-300 dark:hover:text-red-500"
phx-click="reset-filter-text"
id="reset-filter"
/>
</div>
</form>
<div class="mt-4 flex sm:ml-4 sm:mt-0">
<a href="/sites/new" class="button">
+ Add Website
</a>
</div>
</div>
"""
end
def favicon(assigns) do
src = "/favicon/sources/#{assigns.domain}"
assigns = assign(assigns, :src, src)
@ -337,4 +369,52 @@ defmodule PlausibleWeb.Live.Sites do
<img src={@src} class="w-4 h-4 flex-shrink-0 mt-px" />
"""
end
def handle_event("filter", %{"filter-text" => filter_text}, socket) do
socket =
socket
|> assign(:filter_text, filter_text)
|> load_sites(force_refresh?: true)
{:noreply, socket}
end
def handle_event("reset-filter-text", _params, socket) do
socket =
socket
|> assign(:filter_text, "")
|> load_sites(force_refresh?: true)
{:noreply, socket}
end
defp load_sites(socket, opts \\ []) do
assign_fn =
if Keyword.get(opts, :force_refresh?, false) do
fn socket, param, value_fn ->
assign(socket, param, value_fn.(socket.assigns))
end
else
&assign_new/3
end
socket
|> assign_fn.(:invitations, fn %{filter_text: filter_text, user: user} ->
Invitations.list_for_email(user.email, filter_by_domain: filter_text)
end)
|> assign_fn.(:sites, fn %{
user: user,
params: params,
invitations: invitations,
filter_text: filter_text
} ->
excluded_site_ids = Enum.map(invitations, & &1.site_id)
Sites.list(user, params, excluded_ids: excluded_site_ids, filter_by_domain: filter_text)
end)
|> assign_fn.(:visitors, fn %{sites: sites, invitations: invitations} ->
Plausible.Stats.Clickhouse.last_24h_visitors(
sites.entries ++ Enum.map(invitations, & &1.site)
)
end)
end
end

Loading…
Cancel
Save