paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-22 07:21:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

settings: Show confirmation modal when deactivating bot.

Browse Source 
We now show confirmation modal when deactivating bot from
personal settings section. Since we have added deactivate
option in the bot-edit modal opened from admin settins page
and we would replace the modal opened from personal settings
with that modal, it would be good to show the modal consistently.

This commit also moves confirm_bot_deactivation function from
settings_users.js to settings_bots.js to avoid cyclic dependencies.
This commit is contained in:
Sahil Batra
2022-07-24 15:11:58 +05:30
committed by Tim Abbott
parent f9a5c39908
commit 59fd88928f
2 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
static/js/settings_bots.js
View File

@@ -1,6 +1,7 @@
import ClipboardJS from "clipboard"; import ClipboardJS from "clipboard";
import $ from "jquery"; import $ from "jquery";
import render_settings_deactivation_bot_modal from "../templates/confirm_dialog/confirm_deactivate_bot.hbs";
import render_bot_avatar_row from "../templates/settings/bot_avatar_row.hbs"; import render_bot_avatar_row from "../templates/settings/bot_avatar_row.hbs";
import render_edit_bot from "../templates/settings/edit_bot.hbs"; import render_edit_bot from "../templates/settings/edit_bot.hbs";
import render_edit_bot_form from "../templates/settings/edit_bot_form.hbs"; import render_edit_bot_form from "../templates/settings/edit_bot_form.hbs";
@@ -223,6 +224,20 @@ export function update_bot_permissions_ui() {
} }
} }
export function confirm_bot_deactivation(bot_id, handle_confirm, loading_spinner) {
const bot = people.get_by_user_id(bot_id);
const html_body = render_settings_deactivation_bot_modal();
dialog_widget.launch({
html_heading: $t_html({defaultMessage: "Deactivate {name}?"}, {name: bot.full_name}),
help_link: "/help/deactivate-or-reactivate-a-bot",
html_body,
html_submit_button: $t_html({defaultMessage: "Deactivate"}),
on_click: handle_confirm,
loading_spinner,
});
}
export function show_edit_bot_info_modal(user_id, from_user_info_popover) { export function show_edit_bot_info_modal(user_id, from_user_info_popover) {
const bot = people.get_by_user_id(user_id); const bot = people.get_by_user_id(user_id);
@@ -458,18 +473,19 @@ export function set_up() {
$("#active_bots_list").on("click", "button.deactivate_bot", (e) => { $("#active_bots_list").on("click", "button.deactivate_bot", (e) => {
const bot_id = Number.parseInt($(e.currentTarget).attr("data-user-id"), 10); const bot_id = Number.parseInt($(e.currentTarget).attr("data-user-id"), 10);
channel.del({ function handle_confirm() {
url: "/json/bots/" + encodeURIComponent(bot_id), const url = "/json/bots/" + encodeURIComponent(bot_id);
success() { const opts = {
success_continuation() {
const $row = $(e.currentTarget).closest("li"); const $row = $(e.currentTarget).closest("li");
$row.hide("slow", () => { $row.hide("slow", () => {
$row.remove(); $row.remove();
}); });
}, },
error(xhr) { };
bot_error(bot_id, xhr); dialog_widget.submit_api_request(channel.del, url, {}, opts);
}, }
}); confirm_bot_deactivation(bot_id, handle_confirm, true);
}); });
$("#inactive_bots_list").on("click", "button.reactivate_bot", (e) => { $("#inactive_bots_list").on("click", "button.reactivate_bot", (e) => {

17
static/js/settings_users.js
View File

@@ -1,6 +1,5 @@
import $ from "jquery"; import $ from "jquery";
import render_settings_deactivation_bot_modal from "../templates/confirm_dialog/confirm_deactivate_bot.hbs";
import render_settings_deactivation_user_modal from "../templates/confirm_dialog/confirm_deactivate_user.hbs"; import render_settings_deactivation_user_modal from "../templates/confirm_dialog/confirm_deactivate_user.hbs";
import render_settings_reactivation_user_modal from "../templates/confirm_dialog/confirm_reactivate_user.hbs"; import render_settings_reactivation_user_modal from "../templates/confirm_dialog/confirm_reactivate_user.hbs";
import render_admin_human_form from "../templates/settings/admin_human_form.hbs"; import render_admin_human_form from "../templates/settings/admin_human_form.hbs";
@@ -486,20 +485,6 @@ function handle_deactivation($tbody) {
}); });
} }
function confirm_bot_deactivation(bot_id, handle_confirm, loading_spinner) {
const bot = people.get_by_user_id(bot_id);
const html_body = render_settings_deactivation_bot_modal();
dialog_widget.launch({
html_heading: $t_html({defaultMessage: "Deactivate {name}?"}, {name: bot.full_name}),
help_link: "/help/deactivate-or-reactivate-a-bot",
html_body,
html_submit_button: $t_html({defaultMessage: "Deactivate"}),
on_click: handle_confirm,
loading_spinner,
});
}
function handle_bot_deactivation($tbody) { function handle_bot_deactivation($tbody) {
$tbody.on("click", ".deactivate", (e) => { $tbody.on("click", ".deactivate", (e) => {
e.preventDefault(); e.preventDefault();
@@ -514,7 +499,7 @@ function handle_bot_deactivation($tbody) {
dialog_widget.submit_api_request(channel.del, url); dialog_widget.submit_api_request(channel.del, url);
} }
confirm_bot_deactivation(bot_id, handle_confirm, true); settings_bots.confirm_bot_deactivation(bot_id, handle_confirm, true);
}); });
} }