paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-23 04:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

stream_subscription: Use banner template to render messages.

Browse Source 
Signed-off-by: apoorvapendse <apoorvavpendse@gmail.com>
This commit is contained in:
apoorvapendse
2025-07-25 20:42:26 +05:30
committed by Tim Abbott
parent 818a3365af
commit c6a64b3c1d
4 changed files with 53 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
web/src/stream_edit_subscribers.ts
View File

@@ -3,11 +3,11 @@ import $ from "jquery";
import assert from "minimalistic-assert";
import * as z from "zod/mini";
import render_subscription_banner from "../templates/components/subscription_banner.hbs";
import render_unsubscribe_private_stream_modal from "../templates/confirm_dialog/confirm_unsubscribe_private_stream.hbs";
import render_inline_decorated_channel_name from "../templates/inline_decorated_channel_name.hbs";
import render_stream_member_list_entry from "../templates/stream_settings/stream_member_list_entry.hbs";
import render_stream_members_table from "../templates/stream_settings/stream_members_table.hbs";
import render_stream_subscription_request_result from "../templates/stream_settings/stream_subscription_request_result.hbs";
import * as add_subscribers_pill from "./add_subscribers_pill.ts";
import * as blueslip from "./blueslip.ts";
@@ -115,10 +115,13 @@ function show_stream_subscription_request_error_result(error_message: string): v
const $stream_subscription_req_result_elem = $(
".stream_subscription_request_result",
).expectOne();
const html = render_stream_subscription_request_result({
const rendered_error_banner = render_subscription_banner({
error_message,
intent: "danger",
});
scroll_util.get_content_element($stream_subscription_req_result_elem).html(html);
scroll_util
.get_content_element($stream_subscription_req_result_elem)
.html(rendered_error_banner);
}
function show_stream_subscription_request_success_result({
@@ -149,7 +152,8 @@ function show_stream_subscription_request_success_result({
ignored_deactivated_users,
);
}
const html = render_stream_subscription_request_result({
const rendered_success_banner = render_subscription_banner({
intent: "success",
subscribe_success_messages,
subscribed_users,
already_subscribed_users,
@@ -159,7 +163,9 @@ function show_stream_subscription_request_success_result({
ignored_deactivated_users,
ignored_deactivated_users_count,
});
scroll_util.get_content_element($stream_subscription_req_result_elem).html(html);
scroll_util
.get_content_element($stream_subscription_req_result_elem)
.html(rendered_success_banner);
}
function update_notification_choice_checkbox(added_user_count: number): void {

4
web/templates/components/subscription_banner.hbs Normal file
View File

@@ -0,0 +1,4 @@
{{#> banner .}}
{{> ../stream_settings/stream_subscription_request_result .}}
{{/banner}}

2
web/templates/stream_settings/stream_members.hbs
View File

@@ -5,7 +5,7 @@
</h4>
<div class="subscriber_list_settings">
<div class="subscriber_list_add float-left">
<div class="stream_subscription_request_result"></div>
<div class="stream_subscription_request_result banner-wrapper"></div>
{{> add_subscribers_form .}}
</div>
<div class="clear-float"></div>

86
web/templates/stream_settings/stream_subscription_request_result.hbs
View File

@@ -1,52 +1,40 @@
{{#if error_message}}
<div class="banner-wrapper">
<div class="banner banner-danger">
<span class="banner-label">
{{error_message}}
</span>
</div>
</div>
{{error_message}}
{{else}}
<div class="banner-wrapper">
<div class="banner banner-success">
<span class="banner-label">
{{!-- We want to show ignored deactivated users message even when there are
no new subscribers --}}
{{#if (and (eq subscribed_users_count 0) (eq ignored_deactivated_users_count 0))}}
{{t "All users were already subscribed."}}
{{else}}
{{#if (not is_total_subscriber_more_than_five) }}
{{#if subscribed_users}}
{{t "Subscribed:" }} {{{subscribe_success_messages.subscribed_users_message_html}}}.
{{/if}}
{{#if already_subscribed_users}}
{{t "Already a subscriber:" }} {{{subscribe_success_messages.already_subscribed_users_message_html}}}.
{{/if}}
{{#if ignored_deactivated_users}}
{{t "Ignored deactivated users:" }} {{{subscribe_success_messages.ignored_deactivated_users_message_html}}}.
{{/if}}
{{else}}
{{#if subscribed_users}}
{{t "{subscribed_users_count, plural,
one {Subscribed: {subscribed_users_count} user.}
other {Subscribed: {subscribed_users_count} users.}
}"}}
{{/if}}
{{#if already_subscribed_users}}
{{t "{already_subscribed_users_count, plural,
one {Already subscribed: {already_subscribed_users_count} user.}
other {Already subscribed: {already_subscribed_users_count} users.}
}"}}
{{/if}}
{{#if ignored_deactivated_users}}
{{t "{ignored_deactivated_users_count, plural,
one {Ignored deactivated: {ignored_deactivated_users_count} user.}
other {Ignored deactivated: {ignored_deactivated_users_count} users.}
}"}}
{{/if}}
{{/if}}
{{/if}}
</span>
</div>
</div>
{{!-- We want to show ignored deactivated users message even when there are
no new subscribers --}}
{{#if (and (eq subscribed_users_count 0) (eq ignored_deactivated_users_count 0))}}
{{t "All users were already subscribed."}}
{{else}}
{{#if (not is_total_subscriber_more_than_five) }}
{{#if subscribed_users}}
{{t "Subscribed:" }} {{{subscribe_success_messages.subscribed_users_message_html}}}.
{{/if}}
{{#if already_subscribed_users}}
{{t "Already a subscriber:" }} {{{subscribe_success_messages.already_subscribed_users_message_html}}}.
{{/if}}
{{#if ignored_deactivated_users}}
{{t "Ignored deactivated users:" }} {{{subscribe_success_messages.ignored_deactivated_users_message_html}}}.
{{/if}}
{{else}}
{{#if subscribed_users}}
{{t "{subscribed_users_count, plural,
one {Subscribed: {subscribed_users_count} user.}
other {Subscribed: {subscribed_users_count} users.}
}"}}
{{/if}}
{{#if already_subscribed_users}}
{{t "{already_subscribed_users_count, plural,
one {Already subscribed: {already_subscribed_users_count} user.}
other {Already subscribed: {already_subscribed_users_count} users.}
}"}}
{{/if}}
{{#if ignored_deactivated_users}}
{{t "{ignored_deactivated_users_count, plural,
one {Ignored deactivated: {ignored_deactivated_users_count} user.}
other {Ignored deactivated: {ignored_deactivated_users_count} users.}
}"}}
{{/if}}
{{/if}}
{{/if}}
{{/if}}