Skip to content

A platform for community discussion. Free, open, simple.

PERF: Avoid extra requests after the last page of admin users

Régis Hanol243d964396f6
diff --git a/frontend/discourse/admin/controllers/admin-users-list/show.js b/frontend/discourse/admin/controllers/admin-users-list/show.js
index 71e15273470..d9c47c2ca7d 100644
--- a/frontend/discourse/admin/controllers/admin-users-list/show.js
+++ b/frontend/discourse/admin/controllers/admin-users-list/show.js
@@ -14,6 +14,7 @@ import DiscourseURL, { applyQueryParams } from "discourse/lib/url";
import { i18n } from "discourse-i18n";
const MAX_BULK_SELECT_LIMIT = 100;
+const USERS_PER_PAGE = 100;
export default class AdminUsersListShowController extends Controller {
@service modal;
@@ -314,7 +315,7 @@ export default class AdminUsersListShowController extends Controller {
})
.then((result) => {
this.#results[page] = result;
- if (result.length === 0) {
+ if (result.length < USERS_PER_PAGE) {
this.#canLoadMore = false;
}
})
diff --git a/frontend/discourse/tests/acceptance/admin-users-list-test.js b/frontend/discourse/tests/acceptance/admin-users-list-test.js
index 25223a6a4fe..512ca9e0c93 100644
--- a/frontend/discourse/tests/acceptance/admin-users-list-test.js
+++ b/frontend/discourse/tests/acceptance/admin-users-list-test.js
@@ -1,6 +1,11 @@
import { click, currentURL, fillIn, visit } from "@ember/test-helpers";
import { test } from "qunit";
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import stubIntersectionObserver from "discourse/tests/helpers/stub-intersection-observer";
+import {
+ disableLoadMoreObserver,
+ enableLoadMoreObserver,
+} from "discourse/ui-kit/d-load-more";
import { i18n } from "discourse-i18n";
acceptance("Admin - Users List", function (needs) {
@@ -221,6 +226,69 @@ acceptance("Admin - Users List - email permissions", function (needs) {
});
});
+acceptance("Admin - Users List - pagination", function (needs) {
+ needs.user();
+
+ let lastRequest;
+ let requestCount;
+ let users;
+
+ needs.pretender((server, helper) => {
+ requestCount = 0;
+ users = [{ id: 2, username: "sam" }];
+ server.get("/admin/users/list/active.json", (request) => {
+ requestCount++;
+ lastRequest = request.queryParams;
+ return helper.response(users);
+ });
+ });
+
+ test("loads more users only after a full page", async function (assert) {
+ enableLoadMoreObserver();
+ const observations = stubIntersectionObserver();
+ const scrollToBottom = () =>
+ observations
+ .findLast(({ element }) =>
+ element.matches(".users-list-container > .load-more-sentinel")
+ )
+ .trigger();
+
+ try {
+ await visit("/admin/users/list/active");
+ await scrollToBottom();
+
+ assert.strictEqual(requestCount, 1, "fetches the complete list once");
+
+ const pageSize = 100;
+ users = Array.from({ length: pageSize }, (_, index) => ({
+ id: index + 1,
+ username: `user${index + 1}`,
+ }));
+ await click(
+ ".users-list .directory-table__column-header--username.sortable"
+ );
+
+ users = [{ id: pageSize + 1, username: "lastuser" }];
+ await scrollToBottom();
+
+ assert.strictEqual(
+ lastRequest.page,
+ "2",
+ "loads the next page after a full page"
+ );
+ assert
+ .dom(".users-list .user")
+ .exists({ count: pageSize + 1 }, "appends the remaining user");
+
+ await scrollToBottom();
+
+ assert.strictEqual(requestCount, 3, "stops after the final short page");
+ } finally {
+ disableLoadMoreObserver();
+ }
+ });
+});
+
acceptance("Admin - Users List - bulk search", function (needs) {
needs.user();