discourse/discourse-chat-integration
1
0
Fork 0
mirror of https://github.com/discourse/discourse-chat-integration.git synced 2025-07-06 22:02:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Replace bootbox confirm dialog (#142)

Browse Source
This commit is contained in:
Jan Cernik 2022-10-27 10:16:00 -03:00 committed by GitHub
parent 5047583d95
commit 7b8a1a3960
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
assets/javascripts/admin/components/channel-details.js
View File

@ -1,26 +1,23 @@
import Component from "@ember/component"; import Component from "@ember/component";
import { popupAjaxError } from "discourse/lib/ajax-error"; import { popupAjaxError } from "discourse/lib/ajax-error";
import I18n from "I18n"; import I18n from "I18n";
import bootbox from "bootbox"; import { inject as service } from "@ember/service";
export default Component.extend({ export default Component.extend({
dialog: service(),
classNames: ["channel-details"], classNames: ["channel-details"],
actions: { actions: {
deleteChannel(channel) { deleteChannel(channel) {
bootbox.confirm( this.dialog.deleteConfirm({
I18n.t("chat_integration.channel_delete_confirm"), message: I18n.t("chat_integration.channel_delete_confirm"),
I18n.t("no_value"), didConfirm: () => {
I18n.t("yes_value"), return channel
(result) => { .destroyRecord()
if (result) { .then(() => this.refresh())
channel .catch(popupAjaxError);
.destroyRecord() },
.then(() => this.refresh()) });
.catch(popupAjaxError);
}
}
);
}, },
editRule(rule) { editRule(rule) {

6
test/javascripts/acceptance/chat-integration-test.js
View File

@ -205,10 +205,10 @@ acceptance("Chat Integration", function (needs) {
); );
await click(".channel-header .delete-channel"); await click(".channel-header .delete-channel");
assert.ok(exists("div.bootbox"), "modal is displayed"); assert.ok(exists("div.dialog-content"), "modal is displayed");
await click("div.bootbox .btn-primary"); await click("div.dialog-content .btn-danger");
assert.notOk(exists("div.bootbox"), "modal has closed"); assert.notOk(exists("div.dialog-content"), "modal has closed");
}); });
test("Delete rule works", async function (assert) { test("Delete rule works", async function (assert) {