Skip to content

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

UX: refactor user delete button to dropdown (#39413)

Krisd7de03d0b508
diff --git a/app/assets/stylesheets/admin/users.scss b/app/assets/stylesheets/admin/users.scss
index e1fa2ff179f..5cdbfbf3bdd 100644
--- a/app/assets/stylesheets/admin/users.scss
+++ b/app/assets/stylesheets/admin/users.scss
@@ -249,3 +249,11 @@
margin: 5px 5px 0 0;
}
}
+
+.admin-user__danger-controls {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: flex-end;
+ width: 100%;
+ gap: var(--space-2);
+}
diff --git a/app/assets/stylesheets/common/base/dialog.scss b/app/assets/stylesheets/common/base/dialog.scss
index d064191e390..801630e44dd 100644
--- a/app/assets/stylesheets/common/base/dialog.scss
+++ b/app/assets/stylesheets/common/base/dialog.scss
@@ -66,7 +66,7 @@
display: flex;
padding: 10px 15px;
border-bottom: 1px solid var(--content-border-color);
- align-items: center;
+ align-items: start;
h3 {
font-size: var(--font-up-3);
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index d7d0c2911fc..e4d166474ba 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -174,15 +174,11 @@
width: 100%;
border-top: 1px solid var(--content-border-color);
- .btn {
- padding: 4px 12px;
- }
-
dl {
margin: 0;
padding: 0.5em 0;
- div {
+ > div {
display: inline-flex;
align-items: baseline;
margin: 4px 0;
@@ -222,6 +218,12 @@
}
}
+ .btn-delete-user {
+ .select-kit-body {
+ font-size: var(--font-up-1);
+ }
+ }
+
.details {
background: rgb(var(--secondary-rgb), 0.8);
border-bottom: 1px solid var(--content-border-color);
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index bb26e97e6ac..d7cc72ef993 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -8727,8 +8727,10 @@ en:
other: "Can't delete all posts because the user has more than %{count} posts. (delete_all_posts_max)"
delete_confirm_title: "Are you sure you want to delete this user? This is permanent!"
delete_confirm: "It is generally preferable to anonymize users rather than deleting them, to avoid removing content from existing discussions."
- delete_and_block: "Delete user and block their email and IP address"
+ delete_and_block: "Delete and block user"
+ delete_and_block_description: "Delete the user and block their email and IP address."
delete_dont_block: "Delete user"
+ delete_dont_block_description: "Delete the user without blocking."
deleting_user: "Deleting user…"
deleted: "The user was deleted."
delete_failed: "There was an error deleting that user. Make sure all posts are deleted before trying to delete the user."
diff --git a/frontend/discourse/admin/controllers/admin-user/index.js b/frontend/discourse/admin/controllers/admin-user/index.js
index 394cbe4dd96..ec2d967bc99 100644
--- a/frontend/discourse/admin/controllers/admin-user/index.js
+++ b/frontend/discourse/admin/controllers/admin-user/index.js
@@ -432,13 +432,31 @@ export default class AdminUserIndexController extends Controller {
.catch(popupAjaxError);
}
+ get deleteUserOptions() {
+ return [
+ {
+ id: "delete_dont_block",
+ label: i18n("admin.user.delete_dont_block"),
+ description: i18n("admin.user.delete_dont_block_description"),
+ icon: "trash-can",
+ },
+ {
+ id: "delete_and_block",
+ label: i18n("admin.user.delete_and_block"),
+ description: i18n("admin.user.delete_and_block_description"),
+ icon: "ban",
+ },
+ ];
+ }
+
@action
- destroyUser() {
+ destroyUser(optionId) {
+ const block = optionId === "delete_and_block";
const postCount = this.get("model.post_count");
const maxPostCount = this.siteSettings.delete_all_posts_max;
const location = document.location.pathname;
- const performDestroy = (block) => {
+ const performDestroy = () => {
this.dialog.notice(i18n("admin.user.deleting_user"));
let formData = { context: location };
if (block) {
@@ -467,30 +485,15 @@ export default class AdminUserIndexController extends Controller {
});
};
- this.dialog.alert({
+ this.dialog.deleteConfirm({
title: i18n("admin.user.delete_confirm_title"),
message: i18n("admin.user.delete_confirm"),
- class: "delete-user-modal",
- buttons: [
- {
- label: i18n("admin.user.delete_dont_block"),
- class: "btn-danger delete-dont-block",
- action: () => {
- return performDestroy(false);
- },
- },
- {
- icon: "triangle-exclamation",
- label: i18n("admin.user.delete_and_block"),
- class: "btn-danger delete-and-block",
- action: () => {
- return performDestroy(true);
- },
- },
- {
- label: i18n("composer.cancel"),
- },
- ],
+ class: `delete-user-modal ${
+ block ? "delete-and-block" : "delete-dont-block"
+ }`,
+ confirmButtonLabel: `admin.user.${optionId}`,
+ confirmButtonIcon: block ? "triangle-exclamation" : "trash-can",
+ didConfirm: performDestroy,
});
}
diff --git a/frontend/discourse/admin/templates/admin-user/index.gjs b/frontend/discourse/admin/templates/admin-user/index.gjs
index 17351d57d07..da933079bc7 100644
--- a/frontend/discourse/admin/templates/admin-user/index.gjs
+++ b/frontend/discourse/admin/templates/admin-user/index.gjs
@@ -17,6 +17,7 @@ import i18nYesNo from "discourse/helpers/i18n-yes-no";
import lazyHash from "discourse/helpers/lazy-hash";
import routeAction from "discourse/helpers/route-action";
import ComboBox from "discourse/select-kit/components/combo-box";
+import DropdownSelectBox from "discourse/select-kit/components/dropdown-select-box";
import GroupChooser from "discourse/select-kit/components/group-chooser";
import { and, gt, not } from "discourse/truth-helpers";
import { i18n } from "discourse-i18n";
@@ -959,7 +960,7 @@ export default <template>
<section>
<hr />
- <div class="pull-right">
+ <div class="admin-user__danger-controls">
{{#if @controller.model.active}}
{{#if @controller.model.can_impersonate}}
<DButton
@@ -983,11 +984,18 @@ export default <template>
{{/if}}
{{#if @controller.model.canBeDeleted}}
- <DButton
- @label="admin.user.delete"
- @icon="trash-can"
- @action={{@controller.destroyUser}}
- class="btn-danger btn-user-delete"
+ <DropdownSelectBox
+ @nameProperty="label"
+ @content={{@controller.deleteUserOptions}}
+ @onChange={{@controller.destroyUser}}
+ @options={{hash
+ icon="trash-can"
+ showCaret=true
+ translatedNone=(i18n "admin.user.delete")
+ customStyle=true
+ btnCustomClasses="btn-danger"
+ }}
+ class="btn-user-delete"
/>
{{/if}}
@@ -1002,8 +1010,6 @@ export default <template>
</div>
{{#if @controller.deleteExplanation}}
- <div class="clearfix"></div>
- <br />
<div class="pull-right">
{{icon "triangle-exclamation"}}
<span class="delete-explanation">
diff --git a/frontend/discourse/app/controllers/user.js b/frontend/discourse/app/controllers/user.js
index aa9e2a6bb3c..a33b51bcc27 100644
--- a/frontend/discourse/app/controllers/user.js
+++ b/frontend/discourse/app/controllers/user.js
@@ -318,12 +318,30 @@ export default class UserController extends Controller {
this.toggleProperty("forceExpand");
}
+ get adminDeleteOptions() {
+ return [
+ {
+ id: "delete_dont_block",
+ label: i18n("admin.user.delete_dont_block"),
+ description: i18n("admin.user.delete_dont_block_description"),
+ icon: "trash-can",
+ },
+ {
+ id: "delete_and_block",
+ label: i18n("admin.user.delete_and_block"),
+ description: i18n("admin.user.delete_and_block_description"),
+ icon: "ban",
+ },
+ ];
+ }
+
@action
- adminDelete() {
+ adminDelete(optionId) {
+ const block = optionId === "delete_and_block";
const userId = this.get("model.id");
const location = document.location.pathname;
- const performDestroy = (block) => {
+ const performDestroy = () => {
this.dialog.notice(i18n("admin.user.deleting_user"));
let formData = { context: location };
if (block) {
@@ -345,30 +363,15 @@ export default class UserController extends Controller {
.catch(() => this.dialog.alert(i18n("admin.user.delete_failed")));
};
- this.dialog.alert({
+ this.dialog.deleteConfirm({
title: i18n("admin.user.delete_confirm_title"),
message: i18n("admin.user.delete_confirm"),
- class: "delete-user-modal",
- buttons: [
- {
- label: i18n("admin.user.delete_dont_block"),
- class: "btn-danger delete-dont-block",
- action: () => {
- return performDestroy(false);
- },
- },
- {
- icon: "triangle-exclamation",
- label: i18n("admin.user.delete_and_block"),
- class: "btn-danger delete-and-block",
- action: () => {
- return performDestroy(true);
- },
- },
- {
- label: i18n("composer.cancel"),
- },
- ],
+ class: `delete-user-modal ${
+ block ? "delete-and-block" : "delete-dont-block"
+ }`,
+ confirmButtonLabel: `admin.user.${optionId}`,
+ confirmButtonIcon: block ? "triangle-exclamation" : "trash-can",
+ didConfirm: performDestroy,
});
}
diff --git a/frontend/discourse/app/templates/user.gjs b/frontend/discourse/app/templates/user.gjs
index 2c0ba0373a1..6fd7b6c7b39 100644
--- a/frontend/discourse/app/templates/user.gjs
+++ b/frontend/discourse/app/templates/user.gjs
@@ -480,6 +480,7 @@ export default <template>
@canCheckEmails={{@controller.canCheckEmails}}
@canDeleteUser={{@controller.canDeleteUser}}
@adminDelete={{@controller.adminDelete}}
+ @adminDeleteOptions={{@controller.adminDeleteOptions}}
/>
</div>
</section>
diff --git a/frontend/discourse/app/templates/user/collapsed-info.gjs b/frontend/discourse/app/templates/user/collapsed-info.gjs
index 1efe265ec99..e9e00c53d3e 100644
--- a/frontend/discourse/app/templates/user/collapsed-info.gjs
+++ b/frontend/discourse/app/templates/user/collapsed-info.gjs
@@ -5,6 +5,7 @@ import PluginOutlet from "discourse/components/plugin-outlet";
import ageWithTooltip from "discourse/helpers/age-with-tooltip";
import lazyHash from "discourse/helpers/lazy-hash";
import routeAction from "discourse/helpers/route-action";
+import DropdownSelectBox from "discourse/select-kit/components/dropdown-select-box";
import { i18n } from "discourse-i18n";
const CollapsedInfo = <template>
@@ -67,7 +68,7 @@ const CollapsedInfo = <template>
@action={{fn (routeAction "checkEmail") @model}}
@icon="envelope"
@label="admin.users.check_email.text"
- class="btn-primary"
+ class="btn-small btn-primary"
/>
{{/if}}
</dd>
@@ -95,12 +96,21 @@ const CollapsedInfo = <template>
{{/if}}
{{#if @canDeleteUser}}
- <div class="pull-right"><DButton
- @action={{@adminDelete}}
- @icon="triangle-exclamation"
- @label="user.admin_delete"
- class="btn-danger btn-delete-user"
- /></div>
+ <div class="pull-right">
+ <DropdownSelectBox
+ @nameProperty="label"
+ @content={{@adminDeleteOptions}}
+ @onChange={{@adminDelete}}
+ @options={{hash
+ icon="triangle-exclamation"
+ showCaret=true
+ translatedNone=(i18n "user.admin_delete")
+ customStyle=true
+ btnCustomClasses="btn-danger"
+ }}
+ class="btn-small btn-delete-user"
+ />
+ </div>
{{/if}}
<PluginOutlet
diff --git a/frontend/discourse/tests/acceptance/admin-user-index-test.js b/frontend/discourse/tests/acceptance/admin-user-index-test.js
index eaa7a55a152..733c0663e0e 100644
--- a/frontend/discourse/tests/acceptance/admin-user-index-test.js
+++ b/frontend/discourse/tests/acceptance/admin-user-index-test.js
@@ -340,21 +340,32 @@ acceptance("Admin - User Index", function (needs) {
test("delete user - delete without blocking works as expected", async function (assert) {
await visit("/admin/users/5/user5");
- await click(".btn-user-delete");
+
+ const dropdown = selectKit(".btn-user-delete");
+ await dropdown.expand();
+ await dropdown.selectRowByValue("delete_dont_block");
assert
.dom("#dialog-title")
.hasText(i18n("admin.user.delete_confirm_title"), "dialog has a title");
- await click(".dialog-footer .delete-dont-block");
+ await click(
+ ".delete-user-modal.delete-dont-block .dialog-footer .btn-danger"
+ );
assert.false(deleteAndBlock, "user does not get blocked");
});
test("delete user - delete and block works as expected", async function (assert) {
await visit("/admin/users/5/user5");
- await click(".btn-user-delete");
- await click(".dialog-footer .delete-and-block");
+
+ const dropdown = selectKit(".btn-user-delete");
+ await dropdown.expand();
+ await dropdown.selectRowByValue("delete_and_block");
+
+ await click(
+ ".delete-user-modal.delete-and-block .dialog-footer .btn-danger"
+ );
assert.true(deleteAndBlock, "user does get blocked");
});
diff --git a/frontend/discourse/tests/acceptance/user-profile-summary-test.js b/frontend/discourse/tests/acceptance/user-profile-summary-test.js
index e6f57839f1c..005bcbc6a53 100644
--- a/frontend/discourse/tests/acceptance/user-profile-summary-test.js
+++ b/frontend/discourse/tests/acceptance/user-profile-summary-test.js
@@ -3,6 +3,7 @@ import { test } from "qunit";
import { cloneJSON } from "discourse/lib/object";
import userFixtures from "discourse/tests/fixtures/user-fixtures";
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
import { i18n } from "discourse-i18n";
let deleteAndBlock;
@@ -169,21 +170,32 @@ acceptance("User Profile - Summary - Admin", function (needs) {
test("Delete only action", async function (assert) {
await visit("/u/charlie/summary");
- await click(".btn-delete-user");
- await click(".dialog-footer .delete-dont-block");
- assert.false(deleteAndBlock, "first button does not block user");
+ const dropdown = selectKit(".btn-delete-user");
+ await dropdown.expand();
+ await dropdown.selectRowByValue("delete_dont_block");
+
+ await click(
+ ".delete-user-modal.delete-dont-block .dialog-footer .btn-danger"
+ );
+
+ assert.false(deleteAndBlock, "first option does not block user");
});
test("Delete and block", async function (assert) {
await visit("/u/charlie/summary");
- await click(".btn-delete-user");
+
+ const dropdown = selectKit(".btn-delete-user");
+ await dropdown.expand();
+ await dropdown.selectRowByValue("delete_and_block");
assert
.dom("#dialog-title")
.hasText(i18n("admin.user.delete_confirm_title"), "dialog has a title");
- await click(".dialog-footer .delete-and-block");
- assert.true(deleteAndBlock, "second button also block user");
+ await click(
+ ".delete-user-modal.delete-and-block .dialog-footer .btn-danger"
+ );
+ assert.true(deleteAndBlock, "second option also blocks user");
});
});