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

settings: Improve success feedback for deleting alert words

Browse Source 
We add the alert word that was removed to the banner text, and also
reorder a bit for clearer UI.

Fixes #22813
This commit is contained in:
Ujjawal Modi
2022-11-21 02:42:05 +05:30
committed by Tim Abbott
parent 9b40bf804c
commit 23f2d44c6d
4 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
frontend_tests/node_tests/alert_words_ui.js
View File

@@ -86,7 +86,10 @@ run_test("remove_alert_word", ({override_rewire}) => {
// test success // test success
success_func(); success_func();
assert.ok($alert_word_status.hasClass("alert-success")); assert.ok($alert_word_status.hasClass("alert-success"));
assert.equal($alert_word_status_text.text(), "translated: Alert word removed successfully!"); assert.equal(
$alert_word_status_text.text(),
`translated: Alert word "translated: zot" removed successfully!`,
);
assert.ok($alert_word_status.visible()); assert.ok($alert_word_status.visible());
}); });

2
frontend_tests/puppeteer_tests/settings.ts
View File

@@ -322,7 +322,7 @@ async function delete_alert_word(page: Page, word: string): Promise<void> {
async function test_alert_word_deletion(page: Page, word: string): Promise<void> { async function test_alert_word_deletion(page: Page, word: string): Promise<void> {
await delete_alert_word(page, word); await delete_alert_word(page, word);
const status_text = await get_alert_words_status_text(page); const status_text = await get_alert_words_status_text(page);
assert.strictEqual(status_text, "Alert word removed successfully!"); assert.strictEqual(status_text, `Alert word "${word}" removed successfully!`);
await close_alert_words_status(page); await close_alert_words_status(page);
} }

5
static/js/alert_words_ui.js
View File

@@ -70,7 +70,10 @@ function remove_alert_word(alert_word) {
data: {alert_words: JSON.stringify(words_to_be_removed)}, data: {alert_words: JSON.stringify(words_to_be_removed)},
success() { success() {
update_alert_word_status( update_alert_word_status(
$t({defaultMessage: "Alert word removed successfully!"}), $t(
{defaultMessage: `Alert word "{alert_word}" removed successfully!`},
{alert_word},
),
false, false,
); );
}, },

12
static/templates/settings/alert_word_settings.hbs
View File

@@ -4,12 +4,6 @@
{{t "Alert words allow you to be notified as if you were @-mentioned when certain words or phrases are used in Zulip. Alert words are not case sensitive."}} {{t "Alert words allow you to be notified as if you were @-mentioned when certain words or phrases are used in Zulip. Alert words are not case sensitive."}}
</p> </p>
</form> </form>
<div class="alert" id="alert_word_status" role="alert">
<button type="button" class="close close-alert-word-status" aria-label="{{t 'Close' }}">
<span aria-hidden="true">&times;</span>
</button>
<span class="alert_word_status_text"></span>
</div>
<button class="button rounded sea-green" id="open-add-alert-word-modal" type="button"> <button class="button rounded sea-green" id="open-add-alert-word-modal" type="button">
{{t 'Add alert word'}} {{t 'Add alert word'}}
</button> </button>
@@ -17,6 +11,12 @@
<div class="settings_panel_list_header"> <div class="settings_panel_list_header">
<h3>{{t "Alert words"}}</h3> <h3>{{t "Alert words"}}</h3>
</div> </div>
<div class="alert" id="alert_word_status" role="alert">
<button type="button" class="close close-alert-word-status" aria-label="{{t 'Close' }}">
<span aria-hidden="true">&times;</span>
</button>
<span class="alert_word_status_text"></span>
</div>
<div class="progressive-table-wrapper" data-simplebar> <div class="progressive-table-wrapper" data-simplebar>
<table class="table table-condensed table-striped wrapped-table"> <table class="table table-condensed table-striped wrapped-table">
<thead class="table-sticky-headers"> <thead class="table-sticky-headers">