From f50fb44146b105bec4e07f3739267bde94428b21 Mon Sep 17 00:00:00 2001 From: Adrian Gruntkowski Date: Wed, 25 Oct 2023 10:12:52 +0200 Subject: [PATCH] Move paginator helpers to the top core namespace --- lib/plausible/{plugins/api => }/pagination.ex | 5 ++--- lib/plausible/plugins/api/goals.ex | 2 +- lib/plausible/plugins/api/shared_links.ex | 2 +- lib/plausible_web/live/sites.ex | 2 +- test/plausible/{plugins/api => }/pagination_test.exs | 4 ++-- 5 files changed, 7 insertions(+), 8 deletions(-) rename lib/plausible/{plugins/api => }/pagination.ex (86%) rename test/plausible/{plugins/api => }/pagination_test.exs (95%) diff --git a/lib/plausible/plugins/api/pagination.ex b/lib/plausible/pagination.ex similarity index 86% rename from lib/plausible/plugins/api/pagination.ex rename to lib/plausible/pagination.ex index e5398ac81..d70db7a3d 100644 --- a/lib/plausible/plugins/api/pagination.ex +++ b/lib/plausible/pagination.ex @@ -1,7 +1,6 @@ -defmodule Plausible.Plugins.API.Pagination do +defmodule Plausible.Pagination do @moduledoc """ - Cursor-based pagination for the Plugins API. - Can be moved to another namespace in case used elsewhere. + Cursor-based pagination. """ @limit 10 diff --git a/lib/plausible/plugins/api/goals.ex b/lib/plausible/plugins/api/goals.ex index 3a6b128f0..a5746323f 100644 --- a/lib/plausible/plugins/api/goals.ex +++ b/lib/plausible/plugins/api/goals.ex @@ -5,7 +5,7 @@ defmodule Plausible.Plugins.API.Goals do """ import Ecto.Query - import Plausible.Plugins.API.Pagination + import Plausible.Pagination alias Plausible.Repo alias PlausibleWeb.Plugins.API.Schemas.Goal.CreateRequest diff --git a/lib/plausible/plugins/api/shared_links.ex b/lib/plausible/plugins/api/shared_links.ex index d9f33cd3b..b1f964748 100644 --- a/lib/plausible/plugins/api/shared_links.ex +++ b/lib/plausible/plugins/api/shared_links.ex @@ -4,7 +4,7 @@ defmodule Plausible.Plugins.API.SharedLinks do All high level Shared Links operations should be implemented here. """ import Ecto.Query - import Plausible.Plugins.API.Pagination + import Plausible.Pagination alias Plausible.Repo diff --git a/lib/plausible_web/live/sites.ex b/lib/plausible_web/live/sites.ex index 3f098d2ea..93fea5b66 100644 --- a/lib/plausible_web/live/sites.ex +++ b/lib/plausible_web/live/sites.ex @@ -411,7 +411,7 @@ defmodule PlausibleWeb.Live.Sites do 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) + Sites.list(user, params, exclude_ids: excluded_site_ids, filter_by_domain: filter_text) end) |> assign_fn.(:visitors, fn %{sites: sites, invitations: invitations} -> Plausible.Stats.Clickhouse.last_24h_visitors( diff --git a/test/plausible/plugins/api/pagination_test.exs b/test/plausible/pagination_test.exs similarity index 95% rename from test/plausible/plugins/api/pagination_test.exs rename to test/plausible/pagination_test.exs index ef233ca21..0d55b7e9b 100644 --- a/test/plausible/plugins/api/pagination_test.exs +++ b/test/plausible/pagination_test.exs @@ -1,7 +1,7 @@ -defmodule Plausible.Plugins.API.PaginationTest do +defmodule Plausible.PaginationTest do use Plausible.DataCase, async: true - alias Plausible.Plugins.API.Pagination + alias Plausible.Pagination import Ecto.Query setup do