Skip to content

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

UX: confirm before deleting a Data Explorer query (#44760)

David Battersbyab25b2bca700
diff --git a/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/edit.gjs b/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/edit.gjs
index 4e134f965b6..3f7d66445d7 100644
--- a/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/edit.gjs
+++ b/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/edit.gjs
@@ -257,7 +257,7 @@ export default class QueriesEdit extends Component {
{{else if this.showDestroyQuery}}
<DButton
class="btn-danger"
- @action={{@controller.destroyQuery}}
+ @action={{@controller.confirmDestroyQuery}}
@disabled={{@controller.actionsBusy}}
@icon="trash-can"
@label="explorer.delete"
diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/controllers/admin-plugins/show/explorer/edit.js b/plugins/discourse-data-explorer/assets/javascripts/discourse/controllers/admin-plugins/show/explorer/edit.js
index e68e17f877c..0f5db16f953 100644
--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/controllers/admin-plugins/show/explorer/edit.js
+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/controllers/admin-plugins/show/explorer/edit.js
@@ -25,6 +25,7 @@ const DASHBOARD_REPORT_SOURCE = "data_explorer_query";
export default class PluginsExplorerController extends Controller {
@service modal;
+ @service dialog;
@service appEvents;
@service siteSettings;
@service messageBus;
@@ -478,6 +479,14 @@ export default class PluginsExplorerController extends Controller {
}
}
+ @action
+ confirmDestroyQuery() {
+ this.dialog.deleteConfirm({
+ message: i18n("explorer.delete_confirm"),
+ didConfirm: () => this.destroyQuery(),
+ });
+ }
+
@action
async destroyQuery() {
try {
diff --git a/plugins/discourse-data-explorer/config/locales/client.en.yml b/plugins/discourse-data-explorer/config/locales/client.en.yml
index 6146bd68aa8..80860f896ed 100644
--- a/plugins/discourse-data-explorer/config/locales/client.en.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.en.yml
@@ -108,6 +108,7 @@ en:
run: "Run"
undo: "Discard changes"
delete: "Delete"
+ delete_confirm: "Are you sure you want to delete this query?"
recover: "Undelete query"
dashboard:
add: "Add to dashboard"
diff --git a/plugins/discourse-data-explorer/test/javascripts/acceptance/run-query-test.js b/plugins/discourse-data-explorer/test/javascripts/acceptance/run-query-test.js
index 3485988339f..fe95004c473 100644
--- a/plugins/discourse-data-explorer/test/javascripts/acceptance/run-query-test.js
+++ b/plugins/discourse-data-explorer/test/javascripts/acceptance/run-query-test.js
@@ -40,11 +40,13 @@ acceptance("Run Query", function (needs) {
let updateParams;
let query2Tags;
+ let query2Deletes;
needs.hooks.beforeEach(() => {
sinon.stub(window, "open");
updateParams = null;
query2Tags = ["custom", "existing"];
+ query2Deletes = 0;
});
needs.hooks.afterEach(() => {
@@ -309,6 +311,11 @@ acceptance("Run Query", function (needs) {
}
);
+ server.delete("/admin/plugins/discourse-data-explorer/queries/2", () => {
+ query2Deletes += 1;
+ return helper.response({ success: true, errors: [] });
+ });
+
server.get("/session/csrf.json", function () {
return helper.response({
csrf: "mgk906YLagHo2gOgM1ddYjAN4hQolBdJCqlY6jYzAYs= ",
@@ -500,6 +507,33 @@ acceptance("Run Query", function (needs) {
);
});
+ test("deleting a query asks for confirmation first", async function (assert) {
+ await visit("/admin/plugins/discourse-data-explorer/queries/2");
+
+ await click(".query-action-bar__right .btn-danger");
+
+ assert
+ .dom(".dialog-body")
+ .hasText(i18n("explorer.delete_confirm"), "the confirmation is shown");
+ assert.strictEqual(query2Deletes, 0, "opening the dialog does not delete");
+
+ await click(".dialog-footer .btn-default");
+
+ assert.dom(".dialog-body").doesNotExist("cancelling closes the dialog");
+ assert.strictEqual(query2Deletes, 0, "cancelling does not delete");
+
+ await click(".query-action-bar__right .btn-danger");
+ await click(".dialog-footer .btn-danger");
+
+ assert.strictEqual(query2Deletes, 1, "confirming deletes the query");
+ assert
+ .dom(".query-action-bar__right .btn-danger")
+ .doesNotExist("the delete button is gone after deleting");
+ assert
+ .dom(".query-action-bar__right")
+ .includesText(i18n("explorer.recover"), "the undelete button is offered");
+ });
+
test("adds a new tag while editing a query", async function (assert) {
await visit("/admin/plugins/discourse-data-explorer/queries/2");