From 5c0f770f0f28ccceb57c0fd8e6351bb359eef367 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Mon, 12 Sep 2022 15:45:53 +0200
Subject: [PATCH] DEV: Refactor self-delete dialog (#18180)

Also adds missing test
---
 .../app/controllers/preferences/account.js    | 55 ++++++++++---------
 .../user-preferences-account-test.js          | 38 +++++++++++++
 .../discourse/tests/fixtures/user-fixtures.js |  1 +
 3 files changed, 67 insertions(+), 27 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/tests/acceptance/user-preferences-account-test.js

diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/account.js b/app/assets/javascripts/discourse/app/controllers/preferences/account.js
index c474ed1442..6c3051d452 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/account.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/account.js
@@ -4,14 +4,16 @@ import CanCheckEmails from "discourse/mixins/can-check-emails";
 import Controller from "@ember/controller";
 import EmberObject from "@ember/object";
 import I18n from "I18n";
-import bootbox from "bootbox";
 import discourseComputed from "discourse-common/utils/decorators";
 import { findAll } from "discourse/models/login-method";
+import DiscourseURL from "discourse/lib/url";
 import getURL from "discourse-common/lib/get-url";
-import { iconHTML } from "discourse-common/lib/icon-library";
 import { popupAjaxError } from "discourse/lib/ajax-error";
+import { inject as service } from "@ember/service";
+import { next } from "@ember/runloop";
 
 export default Controller.extend(CanCheckEmails, {
+  dialog: service(),
   init() {
     this._super(...arguments);
 
@@ -168,39 +170,38 @@ export default Controller.extend(CanCheckEmails, {
     },
 
     delete() {
-      this.set("deleting", true);
-      const message = I18n.t("user.delete_account_confirm"),
-        model = this.model,
-        buttons = [
+      this.dialog.alert({
+        message: I18n.t("user.delete_account_confirm"),
+        buttons: [
           {
-            label: I18n.t("cancel"),
-            class: "d-modal-cancel",
-            link: true,
-            callback: () => {
-              this.set("deleting", false);
-            },
-          },
-          {
-            label:
-              iconHTML("exclamation-triangle") + I18n.t("user.delete_account"),
-            class: "btn btn-danger",
-            callback() {
-              model.delete().then(
+            icon: "exclamation-triangle",
+            label: I18n.t("user.delete_account"),
+            class: "btn-danger",
+            action: () => {
+              return this.model.delete().then(
                 () => {
-                  bootbox.alert(
-                    I18n.t("user.deleted_yourself"),
-                    () => (window.location = getURL("/"))
-                  );
+                  next(() => {
+                    this.dialog.alert({
+                      message: I18n.t("user.deleted_yourself"),
+                      didConfirm: () =>
+                        DiscourseURL.redirectAbsolute(getURL("/")),
+                      didCancel: () =>
+                        DiscourseURL.redirectAbsolute(getURL("/")),
+                    });
+                  });
                 },
                 () => {
-                  bootbox.alert(I18n.t("user.delete_yourself_not_allowed"));
+                  this.dialog.alert(I18n.t("user.delete_yourself_not_allowed"));
                   this.set("deleting", false);
                 }
               );
             },
           },
-        ];
-      bootbox.dialog(message, buttons, { classes: "delete-account" });
+          {
+            label: I18n.t("composer.cancel"),
+          },
+        ],
+      });
     },
 
     revokeAccount(account) {
@@ -212,7 +213,7 @@ export default Controller.extend(CanCheckEmails, {
           if (result.success) {
             this.model.associated_accounts.removeObject(account);
           } else {
-            bootbox.alert(result.message);
+            this.dialog.alert(result.message);
           }
         })
         .catch(popupAjaxError)
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-account-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-account-test.js
new file mode 100644
index 0000000000..67ddd63241
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-account-test.js
@@ -0,0 +1,38 @@
+import { acceptance, query } from "discourse/tests/helpers/qunit-helpers";
+import { click, visit } from "@ember/test-helpers";
+import { test } from "qunit";
+import DiscourseURL from "discourse/lib/url";
+import I18n from "I18n";
+import sinon from "sinon";
+
+acceptance("User Profile - Account - Self Delete", function (needs) {
+  needs.user({
+    username: "charlie",
+  });
+
+  needs.pretender((server, helper) => {
+    server.delete("/u/charlie.json", () => helper.response({ success: true }));
+  });
+
+  test("Delete dialog", async function (assert) {
+    sinon.stub(DiscourseURL, "redirectAbsolute");
+
+    await visit("/u/charlie/preferences/account");
+    await click(".delete-account .btn-danger");
+
+    await click(".dialog-footer .btn-danger");
+
+    assert.strictEqual(
+      query(".dialog-body").textContent.trim(),
+      I18n.t("user.deleted_yourself"),
+      "confirmation dialog is shown"
+    );
+
+    await click(".dialog-footer .btn-primary");
+
+    assert.ok(
+      DiscourseURL.redirectAbsolute.calledWith("/"),
+      "redirects to home after deleting"
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js
index 4ed74958a7..471f7c47fc 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js
@@ -2499,6 +2499,7 @@ export default {
       last_posted_at: null,
       last_seen_at: null,
       created_at: "2019-03-06T19:06:20.340Z",
+      can_delete_account: true,
       can_edit: true,
       can_edit_username: true,
       can_edit_email: true,