A platform for community discussion. Free, open, simple.
FIX: Preserve admin user filters when sorting and resetting
Régis Hanoled476c74a122
diff --git a/frontend/discourse/admin/controllers/admin-users-list/show.js b/frontend/discourse/admin/controllers/admin-users-list/show.jsindex ece475443ad..71e15273470 100644--- a/frontend/discourse/admin/controllers/admin-users-list/show.js+++ b/frontend/discourse/admin/controllers/admin-users-list/show.js@@ -10,13 +10,14 @@ import CanCheckEmailsHelper from "discourse/lib/can-check-emails-helper";import discourseDebounce from "discourse/lib/debounce";import { bind } from "discourse/lib/decorators";import { INPUT_DELAY } from "discourse/lib/environment";-import DiscourseURL from "discourse/lib/url";+import DiscourseURL, { applyQueryParams } from "discourse/lib/url";import { i18n } from "discourse-i18n";const MAX_BULK_SELECT_LIMIT = 100;export default class AdminUsersListShowController extends Controller {@service modal;+ @service router;@service toasts;@tracked bulkSelect = false;@@ -119,11 +120,13 @@ export default class AdminUsersListShowController extends Controller {onResetFilters() {this.listFilter = null;this.activation = null;- // `filter` is owned by the filter controls; drop the remaining params here- const url = new URL(window.location.href);- url.searchParams.delete("username");- url.searchParams.delete("activation");- DiscourseURL.replaceState(url.pathname + url.search);+ DiscourseURL.replaceState(+ applyQueryParams(this.router.currentURL, {+ username: null,+ filter: null,+ activation: null,+ })+ );this.resetFilters();}@@ -144,22 +147,17 @@ export default class AdminUsersListShowController extends Controller {@actionupdateOrder(field, asc) {- this.setProperties({- order: field,- asc,- });+ this.order = field;+ this.asc = asc;+ DiscourseURL.replaceState(+ applyQueryParams(this.router.currentURL, { order: field, asc })+ );+ this.resetFilters();}@actiononActivationChange(value) {this.activation = value === "all" ? null : value;- const url = new URL(window.location.href);- if (this.activation) {- url.searchParams.set("activation", this.activation);- } else {- url.searchParams.delete("activation");- }- DiscourseURL.replaceState(url.pathname + url.search);this.resetFilters();}diff --git a/frontend/discourse/admin/routes/admin-users-list/show.js b/frontend/discourse/admin/routes/admin-users-list/show.jsindex 59d73b64fd0..088237860de 100644--- a/frontend/discourse/admin/routes/admin-users-list/show.js+++ b/frontend/discourse/admin/routes/admin-users-list/show.js@@ -2,8 +2,6 @@ import DiscourseRoute from "discourse/routes/discourse";export default class AdminUsersListShowRoute extends DiscourseRoute {queryParams = {- order: { refreshModel: true },- asc: { refreshModel: true },username: { refreshModel: true },};diff --git a/frontend/discourse/admin/templates/admin-users-list/show.gjs b/frontend/discourse/admin/templates/admin-users-list/show.gjsindex a6572a6f014..c5753b8d246 100644--- a/frontend/discourse/admin/templates/admin-users-list/show.gjs+++ b/frontend/discourse/admin/templates/admin-users-list/show.gjs@@ -61,6 +61,10 @@ export default <template><DFilterControls@array={{@controller.users}}+ @dropdownFilterQueryParam={{if+ @controller.showActivationFilter+ "activation"+ }}@dropdownOptions={{if@controller.showActivationFilterACTIVATION_FILTER_OPTIONSdiff --git a/frontend/discourse/tests/acceptance/admin-users-list-test.js b/frontend/discourse/tests/acceptance/admin-users-list-test.jsindex e725a1d8675..25223a6a4fe 100644--- a/frontend/discourse/tests/acceptance/admin-users-list-test.js+++ b/frontend/discourse/tests/acceptance/admin-users-list-test.js@@ -182,6 +182,22 @@ acceptance("Admin - Users List", function (needs) {assert.dom(".users-list .user:nth-child(1) .username").includesText("notactivated");+ assert.true(+ currentURL().includes("activation=not_activated"),+ "stores the activation filter in the URL"+ );++ await visit(+ "/admin/users/list/new?username=sam&activation=not_activated&order=username"+ );+ await click(".d-filter-controls__reset");++ assert.dom(".users-list .user").exists({ count: 2 }, "reloads all users");+ assert.strictEqual(+ currentURL(),+ "/admin/users/list/new?order=username",+ "clears both legacy search and activation while preserving sorting"+ );});});@@ -254,6 +270,25 @@ acceptance("Admin - Users List - bulk search", function (needs) {.dom(".d-filter-controls__input").isFocused("keeps focus while the URL updates");+ for (let clickCount = 0; clickCount < 2; clickCount++) {+ await click(+ ".users-list .directory-table__column-header--username.sortable"+ );++ assert.strictEqual(+ lastFilter,+ "sam,bob",+ "sorting preserves the typed search"+ );+ assert+ .dom(".d-filter-controls__input")+ .hasValue("sam,bob", "keeps the typed search visible");+ assert.true(+ decodeURIComponent(currentURL()).includes("filter=sam,bob"),+ "sorting preserves the search URL"+ );+ }+await fillIn(".d-filter-controls__input", "");assert.false(