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

stream_mentions: Update compose banner text when @-stream restricted.

Browse Source 
We simplify the banner message by replacing the
"stream wildcard mentions" text with `"@stream mentions`,
`"@-all mentions"`, or `"@-everyone mentions"` text.
This commit is contained in:
Prakhar Pratyush
2023-11-22 00:42:13 +05:30
committed by Tim Abbott
parent a2e6d6c7c4
commit 31a731469d
3 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
web/src/compose_validate.js
View File

@@ -5,6 +5,7 @@ import render_compose_banner from "../templates/compose_banner/compose_banner.hb
import render_not_subscribed_warning from "../templates/compose_banner/not_subscribed_warning.hbs"; import render_not_subscribed_warning from "../templates/compose_banner/not_subscribed_warning.hbs";
import render_private_stream_warning from "../templates/compose_banner/private_stream_warning.hbs"; import render_private_stream_warning from "../templates/compose_banner/private_stream_warning.hbs";
import render_stream_wildcard_warning from "../templates/compose_banner/stream_wildcard_warning.hbs"; import render_stream_wildcard_warning from "../templates/compose_banner/stream_wildcard_warning.hbs";
import render_wildcard_mention_not_allowed_error from "../templates/compose_banner/wildcard_mention_not_allowed_error.hbs";
import render_compose_limit_indicator from "../templates/compose_limit_indicator.hbs"; import render_compose_limit_indicator from "../templates/compose_limit_indicator.hbs";
import * as channel from "./channel"; import * as channel from "./channel";
@@ -446,14 +447,12 @@ export function validate_stream_message_mentions(opts) {
subscriber_count > stream_wildcard_mention_large_stream_threshold subscriber_count > stream_wildcard_mention_large_stream_threshold
) { ) {
if (!stream_wildcard_mention_allowed_in_large_stream()) { if (!stream_wildcard_mention_allowed_in_large_stream()) {
compose_banner.show_error_message( const new_row = render_wildcard_mention_not_allowed_error({
$t({ banner_type: compose_banner.ERROR,
defaultMessage: classname: compose_banner.CLASSNAMES.wildcards_not_allowed,
"You do not have permission to use stream wildcard mentions in this stream.", stream_wildcard_mention: opts.stream_wildcard_mention,
}), });
compose_banner.CLASSNAMES.wildcards_not_allowed, compose_banner.append_compose_banner_to_banner_list(new_row, opts.$banner_container);
opts.$banner_container,
);
return false; return false;
} }

5
web/templates/compose_banner/wildcard_mention_not_allowed_error.hbs Normal file
View File

@@ -0,0 +1,5 @@
{{#> compose_banner }}
<p class="banner_message">
{{#tr}}You do not have permission to use <b>@{stream_wildcard_mention}</b> mentions in this stream.{{/tr}}
</p>
{{/compose_banner}}

10
web/tests/compose_validate.test.js
View File

@@ -431,15 +431,9 @@ test_ui("validate_stream_message", ({override_rewire, mock_template}) => {
assert.ok(stream_wildcard_warning_rendered); assert.ok(stream_wildcard_warning_rendered);
let wildcards_not_allowed_rendered = false; let wildcards_not_allowed_rendered = false;
mock_template("compose_banner/compose_banner.hbs", false, (data) => { mock_template("compose_banner/wildcard_mention_not_allowed_error.hbs", false, (data) => {
assert.equal(data.classname, compose_banner.CLASSNAMES.wildcards_not_allowed); assert.equal(data.classname, compose_banner.CLASSNAMES.wildcards_not_allowed);
assert.equal( assert.equal(data.stream_wildcard_mention, "all");
data.banner_text,
$t({
defaultMessage:
"You do not have permission to use stream wildcard mentions in this stream.",
}),
);
wildcards_not_allowed_rendered = true; wildcards_not_allowed_rendered = true;
}); });
override_rewire( override_rewire(