From 68c891609bb2ef3fc7e83b2ddc23b62a3f4d7958 Mon Sep 17 00:00:00 2001
From: Ted Johansson <ted@discourse.org>
Date: Fri, 15 Sep 2023 17:21:03 +0800
Subject: [PATCH] FIX: Add back missing 'delete spammer' flag option (#23605)

---
 .../discourse/app/components/modal/flag.hbs         |  2 +-
 .../discourse/app/components/modal/flag.js          |  4 ++++
 .../discourse/tests/acceptance/flag-post-test.js    | 13 +++++++++++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/modal/flag.hbs b/app/assets/javascripts/discourse/app/components/modal/flag.hbs
index 3539960ebe4..8fc67e7dc97 100644
--- a/app/assets/javascripts/discourse/app/components/modal/flag.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/flag.hbs
@@ -68,7 +68,7 @@
 
     {{#if this.showDeleteSpammer}}
       <DButton
-        class="btn-danger"
+        class="btn-danger delete-spammer"
         @action={{this.deleteSpammer}}
         @disabled={{not this.submitEnabled}}
         @icon="exclamation-triangle"
diff --git a/app/assets/javascripts/discourse/app/components/modal/flag.js b/app/assets/javascripts/discourse/app/components/modal/flag.js
index 47e90d46960..4f1b3b00aac 100644
--- a/app/assets/javascripts/discourse/app/components/modal/flag.js
+++ b/app/assets/javascripts/discourse/app/components/modal/flag.js
@@ -67,6 +67,10 @@ export default class Flag extends Component {
     );
   }
 
+  get showDeleteSpammer() {
+    return this.spammerDetails?.canDelete && this.selected?.name_key === "spam";
+  }
+
   get submitLabel() {
     if (this.selected?.is_custom_flag) {
       return this.args.model.flagTarget.customSubmitLabel();
diff --git a/app/assets/javascripts/discourse/tests/acceptance/flag-post-test.js b/app/assets/javascripts/discourse/tests/acceptance/flag-post-test.js
index 918ad39475a..3f0c8c88289 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/flag-post-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/flag-post-test.js
@@ -26,7 +26,7 @@ async function pressEnter(element, modifier) {
 }
 
 acceptance("flagging", function (needs) {
-  needs.user();
+  needs.user({ admin: true });
   needs.pretender((server, helper) => {
     server.get("/u/uwe_keim.json", () => {
       return helper.response(userFixtures["/u/charlie.json"]);
@@ -53,7 +53,8 @@ acceptance("flagging", function (needs) {
         public_admission: false,
         allow_membership_requests: true,
         membership_request_template: "Please add me",
-        full_name: null,
+        can_be_deleted: true,
+        can_delete_all_posts: true,
       });
     });
     server.get("/admin/users/5.json", () => {
@@ -129,6 +130,14 @@ acceptance("flagging", function (needs) {
     assert.ok(!exists(".modal-body"));
   });
 
+  test("Can delete spammer from spam", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await openFlagModal();
+    await click("#radio_spam");
+
+    assert.ok(exists(".delete-spammer"));
+  });
+
   test("Gets dismissable warning from canceling incomplete silence from take action", async function (assert) {
     await visit("/t/internationalization-localization/280");
     await openFlagModal();