diff --git a/web/src/user_group_edit_members.ts b/web/src/user_group_edit_members.ts index 4bf12cbcb2..c6560ddf26 100644 --- a/web/src/user_group_edit_members.ts +++ b/web/src/user_group_edit_members.ts @@ -3,10 +3,10 @@ import $ from "jquery"; import assert from "minimalistic-assert"; import * as z from "zod/mini"; +import render_membership_banner from "../templates/components/membership_banner.hbs"; import render_leave_user_group_modal from "../templates/confirm_dialog/confirm_unsubscribe_private_stream.hbs"; import render_user_group_member_list_entry from "../templates/stream_settings/stream_member_list_entry.hbs"; import render_user_group_members_table from "../templates/user_group_settings/user_group_members_table.hbs"; -import render_user_group_membership_request_result from "../templates/user_group_settings/user_group_membership_request_result.hbs"; import render_user_group_subgroup_entry from "../templates/user_group_settings/user_group_subgroup_entry.hbs"; import * as add_group_members_pill from "./add_group_members_pill.ts"; @@ -242,10 +242,13 @@ function show_user_group_membership_request_error_result(error_message: string): const $user_group_subscription_req_result_elem = $( ".user_group_subscription_request_result", ).expectOne(); - const html = render_user_group_membership_request_result({ + const rendered_error_message = render_membership_banner({ + intent: "danger", error_message, }); - scroll_util.get_content_element($user_group_subscription_req_result_elem).html(html); + scroll_util + .get_content_element($user_group_subscription_req_result_elem) + .html(rendered_error_message); } function show_user_group_membership_request_success_result({ @@ -298,7 +301,8 @@ function show_user_group_membership_request_success_result({ const $user_group_subscription_req_result_elem = $( ".user_group_subscription_request_result", ).expectOne(); - const html = render_user_group_membership_request_result({ + const rendered_success_banner = render_membership_banner({ + intent: "success", addition_success_messages, newly_added_member_count, already_added_member_count, @@ -311,7 +315,9 @@ function show_user_group_membership_request_success_result({ ignored_deactivated_users_count, ignored_deactivated_member_count, }); - scroll_util.get_content_element($user_group_subscription_req_result_elem).html(html); + scroll_util + .get_content_element($user_group_subscription_req_result_elem) + .html(rendered_success_banner); } export function edit_user_group_membership({ diff --git a/web/templates/components/membership_banner.hbs b/web/templates/components/membership_banner.hbs new file mode 100644 index 0000000000..d95f83ecbf --- /dev/null +++ b/web/templates/components/membership_banner.hbs @@ -0,0 +1,4 @@ +{{#> banner .}} + {{> ../user_group_settings/user_group_membership_request_result .}} +{{/banner}} + diff --git a/web/templates/user_group_settings/user_group_members.hbs b/web/templates/user_group_settings/user_group_members.hbs index e7d8df70ed..377fdd34c4 100644 --- a/web/templates/user_group_settings/user_group_members.hbs +++ b/web/templates/user_group_settings/user_group_members.hbs @@ -5,7 +5,7 @@

{{t "Add members" }}

-
+
{{> add_members_form .}} diff --git a/web/templates/user_group_settings/user_group_membership_request_result.hbs b/web/templates/user_group_settings/user_group_membership_request_result.hbs index 35a0d45507..1786870df3 100644 --- a/web/templates/user_group_settings/user_group_membership_request_result.hbs +++ b/web/templates/user_group_settings/user_group_membership_request_result.hbs @@ -1,71 +1,59 @@ {{#if error_message}} - + {{error_message}} {{else}} - + {{/if}} + {{#if already_added_member_count}} + {{t "Already a member:"}} + {{#if (and already_added_user_count already_added_subgroups_count)}} + {{t "{already_added_user_count, plural, one {# user} other {# users}} and {already_added_subgroups_count, plural, one {# group.} other {# groups.}}"}} + {{else if already_added_user_count}} + {{t "{already_added_user_count, plural, one {# user.} other {# users.}}"}} + {{else if already_added_subgroups_count}} + {{t "{already_added_subgroups_count, plural, one {# group.} other {# groups.}}"}} + {{/if}} + {{/if}} + {{#if ignored_deactivated_member_count}} + {{t "Ignored deactivated:"}} + {{#if (and ignored_deactivated_users_count ignored_deactivated_groups_count)}} + {{t "{ignored_deactivated_users_count, plural, one {# user} other {# users}} and {ignored_deactivated_groups_count, plural, one {# group.} other {# groups.}}"}} + {{else if ignored_deactivated_users_count}} + {{t "{ignored_deactivated_users_count, plural, one {# user.} other {# users.}}"}} + {{else if ignored_deactivated_groups_count}} + {{t "{ignored_deactivated_groups_count, plural, one {# group.} other {# groups.}}"}} + {{/if}} + {{/if}} + {{/if}} + {{/if}} {{/if}}