Skip to content

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

UX: Default the staff user list to human accounts

Régis Hanol501d9a428dcf
diff --git a/app/models/user.rb b/app/models/user.rb
index a7783dd9efa..6956fdf6785 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -285,6 +285,8 @@ class User < ActiveRecord::Base
)
end
+ scope :bot_users, -> { where("users.id <= 0") }
+
scope :human_users,
->(allowed_bot_user_ids: nil) do
if allowed_bot_user_ids.present?
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index d60742fdb66..1f4ec3d5394 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -9987,6 +9987,10 @@ en:
all: "All users"
activated: "Activated"
not_activated: "Not activated"
+ account_type_filter:
+ human: "Human accounts"
+ bot: "Bot accounts"
+ all: "All accounts"
approved: "Approved?"
titles:
active: "Active users"
diff --git a/frontend/discourse/admin/controllers/admin-users-list/show.js b/frontend/discourse/admin/controllers/admin-users-list/show.js
index d9c47c2ca7d..90b6a5e96ce 100644
--- a/frontend/discourse/admin/controllers/admin-users-list/show.js
+++ b/frontend/discourse/admin/controllers/admin-users-list/show.js
@@ -5,6 +5,7 @@ import { trackedArray } from "@ember/reactive/collections";
import { service } from "@ember/service";
import BulkUserDeleteConfirmation from "discourse/admin/components/bulk-user-delete-confirmation";
import BulkUserSuspendConfirmation from "discourse/admin/components/bulk-user-suspend-confirmation";
+import { USER_ACCOUNT_TYPES } from "discourse/admin/lib/user-account-types";
import AdminUser from "discourse/admin/models/admin-user";
import CanCheckEmailsHelper from "discourse/lib/can-check-emails-helper";
import discourseDebounce from "discourse/lib/debounce";
@@ -25,6 +26,7 @@ export default class AdminUsersListShowController extends Controller {
@tracked displayBulkActions = false;
@tracked bulkSelectedUsersMap = {};
+ @tracked accountType = USER_ACCOUNT_TYPES.HUMAN;
@tracked activation = null;
@tracked refreshing = false;
@tracked listFilter = null;
@@ -79,6 +81,10 @@ export default class AdminUsersListShowController extends Controller {
return this.query === "suspended";
}
+ get showAccountTypeFilter() {
+ return this.query === "staff";
+ }
+
get showActivationFilter() {
return this.query === "new";
}
@@ -88,7 +94,9 @@ export default class AdminUsersListShowController extends Controller {
!this.refreshing &&
this.users.length === 0 &&
!this.listFilter &&
- !this.activation
+ !this.activation &&
+ (!this.showAccountTypeFilter ||
+ this.accountType === USER_ACCOUNT_TYPES.HUMAN)
);
}
@@ -121,11 +129,13 @@ export default class AdminUsersListShowController extends Controller {
onResetFilters() {
this.listFilter = null;
this.activation = null;
+ this.accountType = USER_ACCOUNT_TYPES.HUMAN;
DiscourseURL.replaceState(
applyQueryParams(this.router.currentURL, {
username: null,
filter: null,
activation: null,
+ account_type: null,
})
);
this.resetFilters();
@@ -156,6 +166,12 @@ export default class AdminUsersListShowController extends Controller {
this.resetFilters();
}
+ @action
+ onAccountTypeChange(value) {
+ this.accountType = value;
+ this.resetFilters();
+ }
+
@action
onActivationChange(value) {
this.activation = value === "all" ? null : value;
@@ -311,6 +327,7 @@ export default class AdminUsersListShowController extends Controller {
order: this.order,
asc: this.asc,
activation: this.activation,
+ account_type: this.showAccountTypeFilter ? this.accountType : undefined,
page,
})
.then((result) => {
diff --git a/frontend/discourse/admin/lib/user-account-types.js b/frontend/discourse/admin/lib/user-account-types.js
new file mode 100644
index 00000000000..5525216ef73
--- /dev/null
+++ b/frontend/discourse/admin/lib/user-account-types.js
@@ -0,0 +1,5 @@
+export const USER_ACCOUNT_TYPES = {
+ HUMAN: "human",
+ BOT: "bot",
+ ALL: "all",
+};
diff --git a/frontend/discourse/admin/routes/admin-users-list/show.js b/frontend/discourse/admin/routes/admin-users-list/show.js
index 088237860de..e67d5c8cfcc 100644
--- a/frontend/discourse/admin/routes/admin-users-list/show.js
+++ b/frontend/discourse/admin/routes/admin-users-list/show.js
@@ -1,3 +1,4 @@
+import { USER_ACCOUNT_TYPES } from "discourse/admin/lib/user-account-types";
import DiscourseRoute from "discourse/routes/discourse";
export default class AdminUsersListShowRoute extends DiscourseRoute {
@@ -11,6 +12,7 @@ export default class AdminUsersListShowRoute extends DiscourseRoute {
const query = transition.to.params.filter;
const { queryParams } = transition.to;
const filter = queryParams.filter ?? queryParams.username;
+ const accountType = queryParams.account_type;
controller.setProperties({
order: queryParams.order,
@@ -18,6 +20,11 @@ export default class AdminUsersListShowRoute extends DiscourseRoute {
listFilter: filter,
initialFilter: filter,
query,
+ accountType:
+ query === "staff" &&
+ Object.values(USER_ACCOUNT_TYPES).includes(accountType)
+ ? accountType
+ : USER_ACCOUNT_TYPES.HUMAN,
activation: query === "new" ? queryParams.activation : null,
bulkSelectedUsersMap: {},
displayBulkActions: false,
diff --git a/frontend/discourse/admin/templates/admin-users-list/show.gjs b/frontend/discourse/admin/templates/admin-users-list/show.gjs
index c5753b8d246..cab7e71c8a7 100644
--- a/frontend/discourse/admin/templates/admin-users-list/show.gjs
+++ b/frontend/discourse/admin/templates/admin-users-list/show.gjs
@@ -2,6 +2,7 @@ import { concat, fn, get } from "@ember/helper";
import { on } from "@ember/modifier";
import { LinkTo } from "@ember/routing";
import { trustHTML } from "@ember/template";
+import { USER_ACCOUNT_TYPES } from "discourse/admin/lib/user-account-types";
import PluginOutlet from "discourse/components/plugin-outlet";
import DMenu from "discourse/float-kit/components/d-menu";
import DTooltip from "discourse/float-kit/components/d-tooltip";
@@ -36,6 +37,21 @@ const ACTIVATION_FILTER_OPTIONS = [
},
];
+const ACCOUNT_TYPE_FILTER_OPTIONS = [
+ {
+ value: USER_ACCOUNT_TYPES.HUMAN,
+ label: i18n("admin.users.account_type_filter.human"),
+ },
+ {
+ value: USER_ACCOUNT_TYPES.BOT,
+ label: i18n("admin.users.account_type_filter.bot"),
+ },
+ {
+ value: USER_ACCOUNT_TYPES.ALL,
+ label: i18n("admin.users.account_type_filter.all"),
+ },
+];
+
export default <template>
<DPageSubheader @titleLabel={{@controller.title}}>
<:actions as |actions|>
@@ -61,20 +77,35 @@ export default <template>
<DFilterControls
@array={{@controller.users}}
+ @defaultDropdownValue={{if
+ @controller.showAccountTypeFilter
+ USER_ACCOUNT_TYPES.HUMAN
+ "all"
+ }}
@dropdownFilterQueryParam={{if
- @controller.showActivationFilter
- "activation"
+ @controller.showAccountTypeFilter
+ "account_type"
+ (if @controller.showActivationFilter "activation")
}}
@dropdownOptions={{if
- @controller.showActivationFilter
- ACTIVATION_FILTER_OPTIONS
+ @controller.showAccountTypeFilter
+ ACCOUNT_TYPE_FILTER_OPTIONS
+ (if @controller.showActivationFilter ACTIVATION_FILTER_OPTIONS)
+ }}
+ @dropdownValue={{if
+ @controller.showAccountTypeFilter
+ @controller.accountType
+ (or @controller.activation "all")
}}
- @dropdownValue={{or @controller.activation "all"}}
@initialTextFilter={{@controller.initialFilter}}
@inputPlaceholder={{i18n "search_hint"}}
@loading={{@controller.refreshing}}
@noResultsMessage={{i18n "search.no_results"}}
- @onDropdownFilterChange={{@controller.onActivationChange}}
+ @onDropdownFilterChange={{if
+ @controller.showAccountTypeFilter
+ @controller.onAccountTypeChange
+ @controller.onActivationChange
+ }}
@onResetFilters={{@controller.onResetFilters}}
@onTextFilterChange={{@controller.onListFilterChange}}
@textFilterQueryParam="filter"
diff --git a/frontend/discourse/tests/acceptance/admin-users-list-test.js b/frontend/discourse/tests/acceptance/admin-users-list-test.js
index 512ca9e0c93..dd7c1cd2dd5 100644
--- a/frontend/discourse/tests/acceptance/admin-users-list-test.js
+++ b/frontend/discourse/tests/acceptance/admin-users-list-test.js
@@ -289,6 +289,162 @@ acceptance("Admin - Users List - pagination", function (needs) {
});
});
+acceptance("Admin - Users List - staff account types", function (needs) {
+ needs.user();
+
+ let lastRequest;
+ let requestCount;
+
+ needs.pretender((server, helper) => {
+ requestCount = 0;
+ server.get("/admin/users/list/staff.json", (request) => {
+ requestCount++;
+ lastRequest = request.queryParams;
+ return helper.response(
+ lastRequest.account_type === "bot" && !lastRequest.filter
+ ? []
+ : [{ id: 2, username: "sam" }]
+ );
+ });
+ });
+
+ test("selects account types and resets to human accounts", async function (assert) {
+ await visit("/admin/users/list/staff");
+
+ assert
+ .dom(".d-filter-controls__dropdown")
+ .hasValue("human", "defaults to humans");
+ assert.strictEqual(
+ lastRequest.account_type,
+ "human",
+ "requests human accounts"
+ );
+
+ await fillIn(".d-filter-controls__dropdown", "bot");
+
+ assert.strictEqual(
+ lastRequest.account_type,
+ "bot",
+ "requests bot accounts"
+ );
+ assert.true(
+ currentURL().includes("account_type=bot"),
+ "stores the selection in the URL"
+ );
+ assert
+ .dom(".admin-users-list__no-results")
+ .doesNotExist("does not duplicate the filtered empty state");
+ assert
+ .dom(".d-filter-controls__no-results p")
+ .hasText(i18n("search.no_results"), "shows the standard empty message");
+
+ await fillIn(".d-filter-controls__dropdown", "all");
+
+ assert.strictEqual(
+ lastRequest.account_type,
+ "all",
+ "requests all accounts"
+ );
+
+ await visit(
+ "/admin/users/list/staff?username=sam&filter=sam&account_type=all&order=username"
+ );
+ await click(".d-filter-controls__reset");
+
+ assert
+ .dom(".d-filter-controls__dropdown")
+ .hasValue("human", "restores the default selection");
+ assert.strictEqual(
+ lastRequest.account_type,
+ "human",
+ "reloads human accounts"
+ );
+ assert.strictEqual(
+ currentURL(),
+ "/admin/users/list/staff?order=username",
+ "clears all filter parameters while preserving sorting"
+ );
+
+ await click(
+ ".users-list .directory-table__column-header--username.sortable"
+ );
+
+ assert.strictEqual(
+ lastRequest.account_type,
+ "human",
+ "sorting keeps the default account type"
+ );
+ assert.strictEqual(
+ lastRequest.filter,
+ "",
+ "sorting does not restore the cleared search"
+ );
+ });
+
+ test("restores URL filters, keeps them when sorting, and clears them between tabs", async function (assert) {
+ await visit("/admin/users/list/staff?account_type=bot&filter=sam");
+
+ assert.strictEqual(requestCount, 1, "loads once when entering the route");
+ assert
+ .dom(".d-filter-controls__dropdown")
+ .hasValue("bot", "restores the account type");
+ assert
+ .dom(".d-filter-controls__input")
+ .hasValue("sam", "restores the search");
+
+ for (let clickCount = 1; clickCount <= 4; clickCount++) {
+ await click(
+ ".users-list .directory-table__column-header--username.sortable"
+ );
+
+ assert.strictEqual(
+ requestCount,
+ clickCount + 1,
+ "loads once per sort change"
+ );
+ assert.strictEqual(
+ lastRequest.order,
+ "username",
+ "requests the selected sort"
+ );
+ assert.strictEqual(
+ lastRequest.account_type,
+ "bot",
+ "preserves the account type"
+ );
+ assert.strictEqual(lastRequest.filter, "sam", "preserves the search");
+ assert
+ .dom(".d-filter-controls__input")
+ .hasValue("sam", "keeps the search visible");
+ assert.true(
+ currentURL().includes("filter=sam"),
+ "keeps the search in the URL"
+ );
+ }
+
+ await fillIn(".d-filter-controls__dropdown", "all");
+
+ assert.strictEqual(
+ lastRequest.filter,
+ "sam",
+ "keeps the search when changing account type"
+ );
+
+ await click(".admin-users-tabs__new a");
+
+ assert
+ .dom(".d-filter-controls__dropdown")
+ .hasValue("all", "shows the activation filter");
+
+ await click(".admin-users-tabs__staff a");
+
+ assert
+ .dom(".d-filter-controls__dropdown")
+ .hasValue("human", "returns to human accounts");
+ assert.dom(".d-filter-controls__input").hasValue("", "clears the search");
+ });
+});
+
acceptance("Admin - Users List - bulk search", function (needs) {
needs.user();
diff --git a/lib/admin_user_index_query.rb b/lib/admin_user_index_query.rb
index 75021be004c..1b487fd29a2 100644
--- a/lib/admin_user_index_query.rb
+++ b/lib/admin_user_index_query.rb
@@ -91,6 +91,19 @@ class AdminUserIndexQuery
end
end
+ def filter_by_account_type
+ return unless params[:query] == "staff"
+
+ case params[:account_type]
+ when "all"
+ @query
+ when "bot"
+ @query.bot_users
+ else
+ @query.human_users
+ end
+ end
+
def filter_by_query_classification
case params[:query]
when "staff"
@@ -243,6 +256,7 @@ class AdminUserIndexQuery
def find_users_query
append filter_by_trust
append filter_by_query_classification
+ append filter_by_account_type
append filter_by_activation
append filter_by_ip
append filter_by_same_ip_user
diff --git a/spec/lib/admin_user_index_query_spec.rb b/spec/lib/admin_user_index_query_spec.rb
index 44a2cfba1c0..34852c554a9 100644
--- a/spec/lib/admin_user_index_query_spec.rb
+++ b/spec/lib/admin_user_index_query_spec.rb
@@ -142,6 +142,54 @@ RSpec.describe AdminUserIndexQuery do
end
end
+ describe "staff account types" do
+ fab!(:admin) { Fabricate(:admin, created_at: 2.days.ago) }
+ fab!(:moderator) { Fabricate(:moderator, created_at: 1.day.ago) }
+ fab!(:bot) { Fabricate(:admin, id: -100, created_at: Time.zone.now) }
+ fab!(:user)
+
+ it "defaults missing or unknown account types to human staff before paginating" do
+ query = described_class.new(query: "staff")
+
+ expect(query.find_users).to eq([moderator, admin])
+ expect(
+ described_class.new(query: "staff", account_type: "unknown").find_users,
+ ).to contain_exactly(admin, moderator)
+ expect(query.find_users(1)).to eq([moderator])
+ expect(described_class.new(query: "staff", page: 2).find_users(1)).to eq([admin])
+ end
+
+ it "includes bots and system accounts when selected" do
+ users = described_class.new(query: "staff", account_type: "bot").find_users
+
+ expect(users).to include(bot, Discourse.system_user)
+ expect(users).not_to include(admin, moderator, user)
+ end
+
+ it "includes all staff accounts when selected" do
+ users = described_class.new(query: "staff", account_type: "all").find_users
+
+ expect(users).to include(admin, moderator, bot, Discourse.system_user)
+ expect(users).not_to include(user)
+ end
+
+ it "keeps search and sorting within the selected account type" do
+ query = described_class.new(query: "staff", order: "created", asc: true)
+
+ expect(query.find_users).to eq([admin, moderator])
+ expect(described_class.new(query: "staff", filter: bot.username).find_users).to be_empty
+ expect(
+ described_class.new(query: "staff", account_type: "all", filter: bot.username).find_users,
+ ).to eq([bot])
+ end
+
+ it "leaves other user lists unfiltered" do
+ users = described_class.new(query: "new", account_type: "human").find_users
+
+ expect(users).to include(admin, moderator, bot, user, Discourse.system_user)
+ end
+ end
+
describe "with a moderator" do
fab!(:user) { Fabricate(:user, moderator: true) }
fab!(:user2) { Fabricate(:user, moderator: false) }