Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Fix pagination is Sites CRM (#4242)
Adrian Gruntkowskifc2078228716
diff --git a/lib/plausible/site/admin.ex b/lib/plausible/site/admin.exindex e6c593e845..022bb0d90f 100644--- a/lib/plausible/site/admin.ex+++ b/lib/plausible/site/admin.ex@@ -17,8 +17,7 @@ defmodule Plausible.SiteAdmin dodef custom_index_query(_conn, _schema, query) dofrom(r in query,inner_join: o in assoc(r, :owner),- inner_join: m in assoc(r, :memberships),- preload: [owner: o, memberships: {m, :user}]+ preload: [owner: o, memberships: :user])enddiff --git a/test/plausible/site/admin_test.exs b/test/plausible/site/admin_test.exsindex 939b2a628b..45deac9cfc 100644--- a/test/plausible/site/admin_test.exs+++ b/test/plausible/site/admin_test.exs@@ -7,7 +7,11 @@ defmodule Plausible.Site.AdminTest dosetup doadmin_user = insert(:user)- conn = %Plug.Conn{assigns: %{current_user: admin_user}}++ conn =+ %Plug.Conn{assigns: %{current_user: admin_user}}+ |> Plug.Conn.fetch_query_params()+transfer_action = Plausible.SiteAdmin.list_actions(conn)[:transfer_ownership][:action]transfer_direct_action =diff --git a/test/plausible_web/controllers/admin_controller_test.exs b/test/plausible_web/controllers/admin_controller_test.exsindex 218c0cb280..2985320c08 100644--- a/test/plausible_web/controllers/admin_controller_test.exs+++ b/test/plausible_web/controllers/admin_controller_test.exs@@ -27,6 +27,39 @@ defmodule PlausibleWeb.AdminControllerTest doendend+ describe "GET /crm/sites/site" do+ setup [:create_user, :log_in]++ @tag :ee_only+ test "pagination works correctly when multiple memberships per site present", %{+ conn: conn,+ user: user+ } do+ patch_env(:super_admin_user_ids, [user.id])++ s1 = insert(:site)+ insert_list(3, :site_membership, site: s1)+ s2 = insert(:site)+ insert_list(3, :site_membership, site: s2)+ s3 = insert(:site)+ insert_list(3, :site_membership, site: s3)++ conn1 = get(conn, "/crm/sites/site", %{"limit" => "2"})+ page1_html = html_response(conn1, 200)++ assert page1_html =~ s1.domain+ assert page1_html =~ s2.domain+ refute page1_html =~ s3.domain++ conn2 = get(conn, "/crm/sites/site", %{"page" => "2", "limit" => "2"})+ page2_html = html_response(conn2, 200)++ refute page2_html =~ s1.domain+ refute page2_html =~ s2.domain+ assert page2_html =~ s3.domain+ end+ end+describe "POST /crm/sites/site/:site_id" dosetup [:create_user, :log_in]