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

2022-09-14 11:06:56 -04:00
parent 04e433d286
commit 86ecb6c58b
30 changed files with 506 additions and 617 deletions
@@ -3,11 +3,13 @@ import { alias, equal } from "@ember/object/computed";
 import { i18n, setting } from "discourse/lib/computed";
 import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
-import bootbox from "bootbox";
+
 import discourseComputed from "discourse-common/utils/decorators";
+import { inject as service } from "@ember/service";

 export default Controller.extend({
  adminBackups: controller(),
+  dialog: service(),
  status: alias("adminBackups.model"),
  uploadLabel: i18n("admin.backups.upload.label"),
  backupLocation: setting("backup_location"),
@@ -27,17 +29,13 @@ export default Controller.extend({
  actions: {
    toggleReadOnlyMode() {
      if (!this.site.get("isReadOnly")) {
-        bootbox.confirm(
-          I18n.t("admin.backups.read_only.enable.confirm"),
-          I18n.t("no_value"),
-          I18n.t("yes_value"),
-          (confirmed) => {
-            if (confirmed) {
-              this.set("currentUser.hideReadOnlyAlert", true);
-              this._toggleReadOnlyMode(true);
-            }
-          }
-        );
+        this.dialog.yesNoConfirm({
+          message: I18n.t("admin.backups.read_only.enable.confirm"),
+          didConfirm: () => {
+            this.set("currentUser.hideReadOnlyAlert", true);
+            this._toggleReadOnlyMode(true);
+          },
+        });
      } else {
        this._toggleReadOnlyMode(false);
      }
@@ -46,7 +44,7 @@ export default Controller.extend({
    download(backup) {
      const link = backup.get("filename");
      ajax(`/admin/backups/${link}`, { type: "PUT" }).then(() =>
-        bootbox.alert(I18n.t("admin.backups.operations.download.alert"))
+        this.dialog.alert(I18n.t("admin.backups.operations.download.alert"))
      );
    },
  },
@@ -1,7 +1,7 @@
 import Controller, { inject as controller } from "@ember/controller";
 import { observes } from "discourse-common/utils/decorators";
 import I18n from "I18n";
-import bootbox from "bootbox";
+
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { next } from "@ember/runloop";
@@ -18,6 +18,7 @@ export default class AdminBadgesShowController extends Controller.extend(
  bufferedProperty("model")
 ) {
  @service router;
+  @service dialog;
  @controller adminBadges;

  @tracked saving = false;
@@ -216,23 +217,19 @@ export default class AdminBadgesShowController extends Controller.extend(
      return;
    }

-    return bootbox.confirm(
-      I18n.t("admin.badges.delete_confirm"),
-      I18n.t("no_value"),
-      I18n.t("yes_value"),
-      (result) => {
-        if (result) {
-          model
-            .destroy()
-            .then(() => {
-              adminBadges.removeObject(model);
-              this.transitionToRoute("adminBadges.index");
-            })
-            .catch(() => {
-              bootbox.alert(I18n.t("generic_error"));
-            });
-        }
-      }
-    );
+    return this.dialog.yesNoConfirm({
+      message: I18n.t("admin.badges.delete_confirm"),
+      didConfirm: () => {
+        model
+          .destroy()
+          .then(() => {
+            adminBadges.removeObject(model);
+            this.transitionToRoute("adminBadges.index");
+          })
+          .catch(() => {
+            this.dialog.alert(I18n.t("generic_error"));
+          });
+      },
+    });
  }
 }
@@ -1,11 +1,12 @@
 import Controller from "@ember/controller";
 import I18n from "I18n";
-import bootbox from "bootbox";
 import discourseLater from "discourse-common/lib/later";
 import { action, computed } from "@ember/object";
 import { clipboardCopy } from "discourse/lib/utilities";
+import { inject as service } from "@ember/service";

 export default class AdminCustomizeColorsShowController extends Controller {
+  @service dialog;
  onlyOverridden = false;

  @computed("model.colors.[]", "onlyOverridden")
@@ -73,18 +74,14 @@ export default class AdminCustomizeColorsShowController extends Controller {

  @action
  destroy() {
-    return bootbox.confirm(
-      I18n.t("admin.customize.colors.delete_confirm"),
-      I18n.t("no_value"),
-      I18n.t("yes_value"),
-      (result) => {
-        if (result) {
-          this.model.destroy().then(() => {
-            this.allColors.removeObject(this.model);
-            this.replaceRoute("adminCustomize.colors");
-          });
-        }
-      }
-    );
+    return this.dialog.yesNoConfirm({
+      message: I18n.t("admin.customize.colors.delete_confirm"),
+      didConfirm: () => {
+        return this.model.destroy().then(() => {
+          this.allColors.removeObject(this.model);
+          this.replaceRoute("adminCustomize.colors");
+        });
+      },
+    });
  }
 }
@@ -16,10 +16,12 @@ import { makeArray } from "discourse-common/lib/helpers";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import showModal from "discourse/lib/show-modal";
 import { url } from "discourse/lib/computed";
+import { inject as service } from "@ember/service";

 const THEME_UPLOAD_VAR = 2;

 export default Controller.extend({
+  dialog: service(),
  downloadUrl: url("model.id", "/admin/customize/themes/%@/export"),
  previewUrl: url("model.id", "/admin/themes/%@/preview"),
  addButtonDisabled: empty("selectedChildThemeId"),
@@ -345,16 +347,10 @@ export default Controller.extend({
    },

    removeUpload(upload) {
-      return bootbox.confirm(
-        I18n.t("admin.customize.theme.delete_upload_confirm"),
-        I18n.t("no_value"),
-        I18n.t("yes_value"),
-        (result) => {
-          if (result) {
-            this.model.removeField(upload);
-          }
-        }
-      );
+      return this.dialog.yesNoConfirm({
+        message: I18n.t("admin.customize.theme.delete_upload_confirm"),
+        didConfirm: () => this.model.removeField(upload),
+      });
    },

    removeChildTheme(theme) {
@@ -364,23 +360,19 @@ export default Controller.extend({
    },

    destroy() {
-      return bootbox.confirm(
-        I18n.t("admin.customize.delete_confirm", {
+      return this.dialog.yesNoConfirm({
+        message: I18n.t("admin.customize.delete_confirm", {
          theme_name: this.get("model.name"),
        }),
-        I18n.t("no_value"),
-        I18n.t("yes_value"),
-        (result) => {
-          if (result) {
-            const model = this.model;
-            model.setProperties({ recentlyInstalled: false });
-            model.destroyRecord().then(() => {
-              this.allThemes.removeObject(model);
-              this.transitionToRoute("adminCustomizeThemes");
-            });
-          }
-        }
-      );
+        didConfirm: () => {
+          const model = this.model;
+          model.setProperties({ recentlyInstalled: false });
+          model.destroyRecord().then(() => {
+            this.allThemes.removeObject(model);
+            this.transitionToRoute("adminCustomizeThemes");
+          });
+        },
+      });
    },

    switchType() {
@@ -398,16 +390,10 @@ export default Controller.extend({
        });
      }

-      bootbox.confirm(
+      return this.dialog.yesNoConfirm({
        message,
-        I18n.t("no_value"),
-        I18n.t("yes_value"),
-        (result) => {
-          if (result) {
-            this.commitSwitchType();
-          }
-        }
-      );
+        didConfirm: () => this.commitSwitchType(),
+      });
    },

    enableComponent() {
@@ -2,13 +2,14 @@ import Controller from "@ember/controller";
 import I18n from "I18n";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 import ScreenedIpAddress from "admin/models/screened-ip-address";
-import bootbox from "bootbox";
 import discourseDebounce from "discourse-common/lib/debounce";
 import { exportEntity } from "discourse/lib/export-csv";
 import { observes } from "discourse-common/utils/decorators";
 import { outputExportResult } from "discourse/lib/export-result";
+import { inject as service } from "@ember/service";

 export default Controller.extend({
+  dialog: service(),
  loading: false,
  filter: null,
  savedIpAddress: null,
@@ -59,13 +60,13 @@ export default Controller.extend({
        .then(() => this.set("savedIpAddress", null))
        .catch((e) => {
          if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
-            bootbox.alert(
+            this.dialog.alert(
              I18n.t("generic_error_with_reason", {
                error: e.jqXHR.responseJSON.errors.join(". "),
              })
            );
          } else {
-            bootbox.alert(I18n.t("generic_error"));
+            this.dialog.alert(I18n.t("generic_error"));
          }
          if (wasEditing) {
            record.set("editing", true);
@@ -74,33 +75,29 @@ export default Controller.extend({
    },

    destroy(record) {
-      return bootbox.confirm(
-        I18n.t("admin.logs.screened_ips.delete_confirm", {
+      return this.dialog.yesNoConfirm({
+        message: I18n.t("admin.logs.screened_ips.delete_confirm", {
          ip_address: record.get("ip_address"),
        }),
-        I18n.t("no_value"),
-        I18n.t("yes_value"),
-        (result) => {
-          if (result) {
-            record
-              .destroy()
-              .then((deleted) => {
-                if (deleted) {
-                  this.model.removeObject(record);
-                } else {
-                  bootbox.alert(I18n.t("generic_error"));
-                }
-              })
-              .catch((e) => {
-                bootbox.alert(
-                  I18n.t("generic_error_with_reason", {
-                    error: `http: ${e.status} - ${e.body}`,
-                  })
-                );
-              });
-          }
-        }
-      );
+        didConfirm: () => {
+          return record
+            .destroy()
+            .then((deleted) => {
+              if (deleted) {
+                this.model.removeObject(record);
+              } else {
+                this.dialog.alert(I18n.t("generic_error"));
+              }
+            })
+            .catch((e) => {
+              this.dialog.alert(
+                I18n.t("generic_error_with_reason", {
+                  error: `http: ${e.status} - ${e.body}`,
+                })
+              );
+            });
+        },
+      });
    },

    recordAdded(arg) {
@@ -2,12 +2,13 @@ import Controller from "@ember/controller";
 import I18n from "I18n";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 import Permalink from "admin/models/permalink";
-import bootbox from "bootbox";
 import discourseDebounce from "discourse-common/lib/debounce";
 import { observes } from "discourse-common/utils/decorators";
 import { clipboardCopy } from "discourse/lib/utilities";
+import { inject as service } from "@ember/service";

 export default Controller.extend({
+  dialog: service(),
  loading: false,
  filter: null,

@@ -34,27 +35,23 @@ export default Controller.extend({
    },

    destroy(record) {
-      return bootbox.confirm(
-        I18n.t("admin.permalink.delete_confirm"),
-        I18n.t("no_value"),
-        I18n.t("yes_value"),
-        (result) => {
-          if (result) {
-            record.destroy().then(
-              (deleted) => {
-                if (deleted) {
-                  this.model.removeObject(record);
-                } else {
-                  bootbox.alert(I18n.t("generic_error"));
-                }
-              },
-              function () {
-                bootbox.alert(I18n.t("generic_error"));
+      return this.dialog.yesNoConfirm({
+        message: I18n.t("admin.permalink.delete_confirm"),
+        didConfirm: () => {
+          return record.destroy().then(
+            (deleted) => {
+              if (deleted) {
+                this.model.removeObject(record);
+              } else {
+                this.dialog.alert(I18n.t("generic_error"));
              }
-            );
-          }
-        }
-      );
+            },
+            function () {
+              this.dialog.alert(I18n.t("generic_error"));
+            }
+          );
+        },
+      });
    },
  },
 });
@@ -2,13 +2,14 @@ import Controller, { inject as controller } from "@ember/controller";
 import { alias, sort } from "@ember/object/computed";
 import GrantBadgeController from "discourse/mixins/grant-badge-controller";
 import I18n from "I18n";
-import bootbox from "bootbox";
 import discourseComputed from "discourse-common/utils/decorators";
 import { next } from "@ember/runloop";
 import { popupAjaxError } from "discourse/lib/ajax-error";
+import { inject as service } from "@ember/service";

 export default Controller.extend(GrantBadgeController, {
  adminUser: controller(),
+  dialog: service(),
  user: alias("adminUser.model"),
  userBadges: alias("model"),
  allBadges: alias("badges"),
@@ -90,18 +91,14 @@ export default Controller.extend(GrantBadgeController, {
    },

    revokeBadge(userBadge) {
-      return bootbox.confirm(
-        I18n.t("admin.badges.revoke_confirm"),
-        I18n.t("no_value"),
-        I18n.t("yes_value"),
-        (result) => {
-          if (result) {
-            userBadge.revoke().then(() => {
-              this.model.removeObject(userBadge);
-            });
-          }
-        }
-      );
+      return this.dialog.yesNoConfirm({
+        message: I18n.t("admin.badges.revoke_confirm"),
+        didConfirm: () => {
+          return userBadge.revoke().then(() => {
+            this.model.removeObject(userBadge);
+          });
+        },
+      });
    },
  },
 });
@@ -2,16 +2,17 @@ import Controller, { inject as controller } from "@ember/controller";
 import I18n from "I18n";
 import WatchedWord from "admin/models/watched-word";
 import { ajax } from "discourse/lib/ajax";
-import bootbox from "bootbox";
 import discourseComputed from "discourse-common/utils/decorators";
 import { fmt } from "discourse/lib/computed";
 import { or } from "@ember/object/computed";
 import { schedule } from "@ember/runloop";
 import showModal from "discourse/lib/show-modal";
+import { inject as service } from "@ember/service";

 export default Controller.extend({
  adminWatchedWords: controller(),
  actionNameKey: null,
+  dialog: service(),
  downloadLink: fmt(
    "actionNameKey",
    "/admin/customize/watched_words/action/%@/download"
@@ -93,25 +94,21 @@ export default Controller.extend({

    clearAll() {
      const actionKey = this.actionNameKey;
-      bootbox.confirm(
-        I18n.t("admin.watched_words.clear_all_confirm", {
+      this.dialog.yesNoConfirm({
+        message: I18n.t("admin.watched_words.clear_all_confirm", {
          action: I18n.t("admin.watched_words.actions." + actionKey),
        }),
-        I18n.t("no_value"),
-        I18n.t("yes_value"),
-        (result) => {
-          if (result) {
-            ajax(`/admin/customize/watched_words/action/${actionKey}.json`, {
-              type: "DELETE",
-            }).then(() => {
-              const action = this.findAction(actionKey);
-              if (action) {
-                action.set("words", []);
-              }
-            });
-          }
-        }
-      );
+        didConfirm: () => {
+          ajax(`/admin/customize/watched_words/action/${actionKey}.json`, {
+            type: "DELETE",
+          }).then(() => {
+            const action = this.findAction(actionKey);
+            if (action) {
+              action.set("words", []);
+            }
+          });
+        },
+      });
    },
  },
 });
@@ -2,15 +2,16 @@ import Controller, { inject as controller } from "@ember/controller";
 import EmberObject from "@ember/object";
 import I18n from "I18n";
 import { alias } from "@ember/object/computed";
-import bootbox from "bootbox";
 import discourseComputed from "discourse-common/utils/decorators";
 import { extractDomainFromUrl } from "discourse/lib/utilities";
 import { isAbsoluteURL } from "discourse-common/lib/get-url";
 import { isEmpty } from "@ember/utils";
 import { popupAjaxError } from "discourse/lib/ajax-error";
+import { inject as service } from "@ember/service";

 export default Controller.extend({
  adminWebHooks: controller(),
+  dialog: service(),
  eventTypes: alias("adminWebHooks.eventTypes"),
  defaultEventTypes: alias("adminWebHooks.defaultEventTypes"),
  contentTypes: alias("adminWebHooks.contentTypes"),
@@ -113,39 +114,28 @@ export default Controller.extend({
        domain.match(/127\.\d+\.\d+\.\d+/) ||
        isAbsoluteURL(url)
      ) {
-        return bootbox.confirm(
-          I18n.t("admin.web_hooks.warn_local_payload_url"),
-          I18n.t("no_value"),
-          I18n.t("yes_value"),
-          (result) => {
-            if (result) {
-              return saveWebHook();
-            }
-          }
-        );
+        return this.dialog.yesNoConfirm({
+          message: I18n.t("admin.web_hooks.warn_local_payload_url"),
+          didConfirm: () => saveWebHook(),
+        });
      }

      return saveWebHook();
    },

    destroy() {
-      return bootbox.confirm(
-        I18n.t("admin.web_hooks.delete_confirm"),
-        I18n.t("no_value"),
-        I18n.t("yes_value"),
-        (result) => {
-          if (result) {
-            const model = this.model;
-            model
-              .destroyRecord()
-              .then(() => {
-                this.adminWebHooks.get("model").removeObject(model);
-                this.transitionToRoute("adminWebHooks");
-              })
-              .catch(popupAjaxError);
-          }
-        }
-      );
+      return this.dialog.yesNoConfirm({
+        message: I18n.t("admin.web_hooks.delete_confirm"),
+        didConfirm: () => {
+          this.model
+            .destroyRecord()
+            .then(() => {
+              this.adminWebHooks.get("model").removeObject(this.model);
+              this.transitionToRoute("adminWebHooks");
+            })
+            .catch(popupAjaxError);
+        },
+      });
    },
  },
 });
@@ -1,30 +1,29 @@
 import Controller from "@ember/controller";
 import I18n from "I18n";
-import bootbox from "bootbox";
 import { popupAjaxError } from "discourse/lib/ajax-error";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";

 export default Controller.extend({
-  actions: {
-    destroy(webhook) {
-      return bootbox.confirm(
-        I18n.t("admin.web_hooks.delete_confirm"),
-        I18n.t("no_value"),
-        I18n.t("yes_value"),
-        (result) => {
-          if (result) {
-            webhook
-              .destroyRecord()
-              .then(() => {
-                this.model.removeObject(webhook);
-              })
-              .catch(popupAjaxError);
-          }
-        }
-      );
-    },
+  dialog: service(),

-    loadMore() {
-      this.model.loadMore();
-    },
+  @action
+  destroy(webhook) {
+    return this.dialog.yesNoConfirm({
+      message: I18n.t("admin.web_hooks.delete_confirm"),
+      didConfirm: () => {
+        webhook
+          .destroyRecord()
+          .then(() => {
+            this.model.removeObject(webhook);
+          })
+          .catch(popupAjaxError);
+      },
+    });
+  },
+
+  @action
+  loadMore() {
+    this.model.loadMore();
  },
 });