paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-15 19:31:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

group-settings: Live update membership status text on subgroup update.

Browse Source 
This commit adds code to live update the membership status text
if subgroups of a group, either the active group or one of the
subgroup of active group.

Fixes #32485.
This commit is contained in:
Sahil Batra
2024-12-03 11:48:15 +05:30
committed by Tim Abbott
parent cbada036a9
commit 9be0eee446
2 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
web/src/user_group_edit.js
View File

@@ -329,16 +329,37 @@ export function handle_subgroup_edit_event(group_id, direct_subgroup_ids) {
}
const group = user_groups.get_user_group_from_id(group_id);
// update members list if currently rendered.
if (is_editing_group(group_id)) {
user_group_edit_members.update_member_list_widget(group);
}
const active_group_id = get_active_data().id;
const current_user_id = people.my_current_user_id();
const subgroups_containing_current_user = direct_subgroup_ids.filter((group_id) =>
user_groups.is_user_in_group(group_id, people.my_current_user_id()),
const current_user_in_any_subgroup = user_groups.is_user_in_any_group(
direct_subgroup_ids,
current_user_id,
);
if (subgroups_containing_current_user.length > 0) {
// update members list if currently rendered.
if (group_id === active_group_id) {
user_group_edit_members.update_member_list_widget(group);
if (
!user_groups.is_direct_member_of(current_user_id, group_id) &&
current_user_in_any_subgroup
) {
update_membership_status_text(group);
}
} else if (
active_group_id !== undefined &&
!user_groups.is_direct_member_of(current_user_id, active_group_id) &&
user_groups.is_subgroup_of_target_group(active_group_id, group_id)
) {
// Membership status text could still need an update
// if updated group is one of the subgroup of the group
// currently opened in right panel.
const active_group = user_groups.get_user_group_from_id(active_group_id);
update_membership_status_text(active_group);
}
if (current_user_in_any_subgroup) {
update_your_groups_list_if_needed(group_id);
update_display_checkmark_on_group_edit(group);
}

13
web/src/user_groups.ts
View File

@@ -434,6 +434,19 @@ export function is_user_in_group(
return false;
}
export function is_user_in_any_group(
user_group_ids: number[],
user_id: number,
direct_member_only = false,
): boolean {
for (const group_id of user_group_ids) {
if (is_user_in_group(group_id, user_id, direct_member_only)) {
return true;
}
}
return false;
}
export function get_associated_subgroups(user_group: UserGroup, user_id: number): UserGroup[] {
const subgroup_ids = get_recursive_subgroups(user_group)!;
if (subgroup_ids === undefined) {