Zulip server and web application. Open-source team chat that helps teams stay productive and focused.
compose: Clarify warning when linking to a private channel.
Sairam Bisoyib466f0c9918c
diff --git a/web/src/compose_validate.ts b/web/src/compose_validate.tsindex 542f117d8f7..8524ee7a03e 100644--- a/web/src/compose_validate.ts+++ b/web/src/compose_validate.ts@@ -296,10 +296,12 @@ export async function warn_if_private_stream_is_linked();if (!existing_stream_warnings.includes(linked_stream.stream_id)) {+ const audience_channel = stream_data.get_sub_by_id(stream_id)!;const new_row_html = render_private_stream_warning({stream_id: linked_stream.stream_id,banner_type: compose_banner.WARNING,channel_name: linked_stream.name,+ audience_channel_name: audience_channel.name,classname: compose_banner.CLASSNAMES.private_stream_warning,});compose_banner.append_compose_banner_to_banner_list($(new_row_html), $banner_container);diff --git a/web/templates/compose_banner/private_stream_warning.hbs b/web/templates/compose_banner/private_stream_warning.hbsindex 5a24d83e4bc..c409be092bf 100644--- a/web/templates/compose_banner/private_stream_warning.hbs+++ b/web/templates/compose_banner/private_stream_warning.hbs@@ -1,5 +1,9 @@{{#> compose_banner . }}<p class="banner_message">- {{#tr}}Warning: <strong>#{channel_name}</strong> is a private channel.{{/tr}}+ {{#tr}}+ Warning: Not all subscribers of <z-audience-channel></z-audience-channel> can view <z-channel></z-channel>, a private channel.+ {{#*inline "z-audience-channel"}}<strong>#{{audience_channel_name}}</strong>{{/inline}}+ {{#*inline "z-channel"}}<strong>#{{channel_name}}</strong>{{/inline}}+ {{/tr}}</p>{{/compose_banner}}diff --git a/web/tests/compose_validate.test.cjs b/web/tests/compose_validate.test.cjsindex 58cc25a188c..836bfaf8223 100644--- a/web/tests/compose_validate.test.cjs+++ b/web/tests/compose_validate.test.cjs@@ -617,7 +617,8 @@ test_ui("warn_if_private_stream_is_linked", async ({mock_template}) => {let banner_rendered = false;mock_template("compose_banner/private_stream_warning.hbs", false, (data) => {assert.equal(data.classname, compose_banner.CLASSNAMES.private_stream_warning);- assert.equal(data.channel_name, "Denmark");+ assert.equal(data.channel_name, "secret");+ assert.equal(data.audience_channel_name, "Denmark");banner_rendered = true;return "<banner-stub>";});@@ -644,7 +645,7 @@ test_ui("warn_if_private_stream_is_linked", async ({mock_template}) => {compose_state.set_selected_recipient_id(denmark.stream_id);const secret_stream = {invite_only: true,- name: "Denmark",+ name: "secret",stream_id: 22,};stream_data.add_sub_for_tests(secret_stream);