DEV: update yes/no confirmation dialogs (#18181)

app/assets/javascripts/admin/addon/components/admin-web-hook-event.js

@@ -2,15 +2,16 @@ import { ensureJSON, plainJSON, prettyJSON } from "discourse/lib/formatter";
 import Component from "@ember/component";
 import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
-import bootbox from "bootbox";
 import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
+import { inject as service } from "@ember/service";
 
 export default Component.extend({
   tagName: "li",
   expandDetails: null,
   expandDetailsRequestKey: "request",
   expandDetailsResponseKey: "response",
+  dialog: service(),
 
   @discourseComputed("model.status")
   statusColorClasses(status) {
@@ -52,25 +53,21 @@ export default Component.extend({
 
   actions: {
     redeliver() {
-      return bootbox.confirm(
-        I18n.t("admin.web_hooks.events.redeliver_confirm"),
-        I18n.t("no_value"),
-        I18n.t("yes_value"),
-        (result) => {
-          if (result) {
-            ajax(
-              `/admin/api/web_hooks/${this.get(
-                "model.web_hook_id"
-              )}/events/${this.get("model.id")}/redeliver`,
-              { type: "POST" }
-            )
-              .then((json) => {
-                this.set("model", json.web_hook_event);
-              })
-              .catch(popupAjaxError);
-          }
-        }
-      );
+      return this.dialog.yesNoConfirm({
+        message: I18n.t("admin.web_hooks.events.redeliver_confirm"),
+        didConfirm: () => {
+          return ajax(
+            `/admin/api/web_hooks/${this.get(
+              "model.web_hook_id"
+            )}/events/${this.get("model.id")}/redeliver`,
+            { type: "POST" }
+          )
+            .then((json) => {
+              this.set("model", json.web_hook_event);
+            })
+            .catch(popupAjaxError);
+        },
+      });
     },
 
     toggleRequest() {

app/assets/javascripts/admin/addon/components/email-styles-editor.js

@@ -1,10 +1,11 @@
 import Component from "@ember/component";
 import I18n from "I18n";
-import bootbox from "bootbox";
 import discourseComputed from "discourse-common/utils/decorators";
 import { reads } from "@ember/object/computed";
+import { inject as service } from "@ember/service";
 
 export default Component.extend({
+  dialog: service(),
   editorId: reads("fieldName"),
 
   @discourseComputed("fieldName")
@@ -33,22 +34,18 @@ export default Component.extend({
 
   actions: {
     reset() {
-      bootbox.confirm(
-        I18n.t("admin.customize.email_style.reset_confirm", {
+      this.dialog.yesNoConfirm({
+        message: I18n.t("admin.customize.email_style.reset_confirm", {
           fieldName: I18n.t(`admin.customize.email_style.${this.fieldName}`),
         }),
-        I18n.t("no_value"),
-        I18n.t("yes_value"),
-        (result) => {
-          if (result) {
-            this.styles.setField(
-              this.fieldName,
-              this.styles.get(`default_${this.fieldName}`)
-            );
-            this.notifyPropertyChange("editorContents");
-          }
-        }
-      );
+        didConfirm: () => {
+          this.styles.setField(
+            this.fieldName,
+            this.styles.get(`default_${this.fieldName}`)
+          );
+          this.notifyPropertyChange("editorContents");
+        },
+      });
     },
     save() {
       this.attrs.save();

app/assets/javascripts/admin/addon/components/ip-lookup.js

@@ -3,13 +3,15 @@ import Component from "@ember/component";
 import EmberObject from "@ember/object";
 import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
-import bootbox from "bootbox";
 import copyText from "discourse/lib/copy-text";
 import discourseComputed from "discourse-common/utils/decorators";
 import discourseLater from "discourse-common/lib/later";
+import { inject as service } from "@ember/service";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Component.extend({
   classNames: ["ip-lookup"],
+  dialog: service(),
 
   @discourseComputed("other_accounts.length", "totalOthersWithSameIP")
   otherAccountsToDelete(otherAccountsLength, totalOthersWithSameIP) {
@@ -89,29 +91,27 @@ export default Component.extend({
     },
 
     deleteOtherAccounts() {
-      bootbox.confirm(
-        I18n.t("ip_lookup.confirm_delete_other_accounts"),
-        I18n.t("no_value"),
-        I18n.t("yes_value"),
-        (confirmed) => {
-          if (confirmed) {
-            this.setProperties({
-              other_accounts: null,
-              otherAccountsLoading: true,
-              totalOthersWithSameIP: null,
-            });
+      this.dialog.yesNoConfirm({
+        message: I18n.t("ip_lookup.confirm_delete_other_accounts"),
+        didConfirm: () => {
+          this.setProperties({
+            other_accounts: null,
+            otherAccountsLoading: true,
+            totalOthersWithSameIP: null,
+          });
 
-            ajax("/admin/users/delete-others-with-same-ip.json", {
-              type: "DELETE",
-              data: {
-                ip: this.ip,
-                exclude: this.userId,
-                order: "trust_level DESC",
-              },
-            }).then(() => this.send("lookup"));
-          }
-        }
-      );
+          ajax("/admin/users/delete-others-with-same-ip.json", {
+            type: "DELETE",
+            data: {
+              ip: this.ip,
+              exclude: this.userId,
+              order: "trust_level DESC",
+            },
+          })
+            .catch(popupAjaxError)
+            .finally(this.send("lookup"));
+        },
+      });
     },
   },
 });