paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

user_group_edit: Fix live update of checkmark in left panel.

Browse Source 
This commit adds code to live update the checkmark in left panel
on updating the user's membership even for groups whose membership
is not updated directly but has updated group as its subgroup.
This commit is contained in:
Sahil Batra
2024-12-10 16:54:56 +05:30
committed by Tim Abbott
parent a7fe3c822a
commit ab67b87db3
2 changed files with 50 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
web/src/user_group_edit.ts
View File

@@ -314,40 +314,55 @@ function update_group_membership_button(group_id: number): void {
}
}
function rerender_group_row(group: UserGroup): void {
const $row = row_for_group_id(group.id);
const item = group;
const current_user_id = people.my_current_user_id();
const is_member = user_groups.is_user_in_group(group.id, current_user_id);
const can_join = settings_data.can_join_user_group(item.id);
const can_leave = settings_data.can_leave_user_group(item.id);
const is_direct_member = user_groups.is_direct_member_of(current_user_id, item.id);
const associated_subgroups = user_groups.get_associated_subgroups(item, current_user_id);
const associated_subgroup_names = user_groups.format_group_list(associated_subgroups);
const item_render_data = {
...item,
is_member,
can_join,
can_leave,
is_direct_member,
associated_subgroup_names,
};
const html = render_browse_user_groups_list_item(item_render_data);
const $new_row = $(html);
// TODO: Remove this if/when we just handle "active" when rendering templates.
if ($row.hasClass("active")) {
$new_row.addClass("active");
}
$row.replaceWith($new_row);
}
function update_display_checkmark_on_group_edit(group: UserGroup): void {
if (is_group_already_present(group)) {
const $row = row_for_group_id(group.id);
const tab_key = get_active_data().$tabs.first().attr("data-tab-key");
if (tab_key === "your-groups") {
// There is no need to do anything if "Your groups" tab is
// opened, because the whole list is already redrawn.
return;
}
const item = group;
const is_member = user_groups.is_user_in_group(group.id, people.my_current_user_id());
const can_join = settings_data.can_join_user_group(item.id);
const can_leave = settings_data.can_leave_user_group(item.id);
const is_direct_member = user_groups.is_direct_member_of(
people.my_current_user_id(),
item.id,
);
const associated_subgroups = user_groups.get_associated_subgroups(
item,
people.my_current_user_id(),
);
const associated_subgroup_names = user_groups.format_group_list(associated_subgroups);
const item_render_data = {
...item,
is_member,
can_join,
can_leave,
is_direct_member,
associated_subgroup_names,
};
const html = render_browse_user_groups_list_item(item_render_data);
const $new_row = $(html);
rerender_group_row(group);
// TODO: Remove this if/when we just handle "active" when rendering templates.
if ($row.hasClass("active")) {
$new_row.addClass("active");
const current_user_id = people.my_current_user_id();
const supergroups_of_group = user_groups.get_supergroups_of_user_group(group.id);
for (const supergroup of supergroups_of_group) {
if (user_groups.is_direct_member_of(current_user_id, supergroup.id)) {
continue;
}
$row.replaceWith($new_row);
rerender_group_row(supergroup);
}
}

6
web/src/user_groups.ts
View File

@@ -332,6 +332,12 @@ export function is_subgroup_of_target_group(target_group_id: number, subgroup_id
return recursive_subgroup_ids.has(subgroup_id);
}
export function get_supergroups_of_user_group(group_id: number): UserGroup[] {
return get_realm_user_groups().filter((user_group) =>
is_subgroup_of_target_group(user_group.id, group_id),
);
}
export function get_recursive_group_members(target_user_group: UserGroup): Set<number> {
const members = new Set(target_user_group.members);
const subgroup_ids = get_recursive_subgroups(target_user_group);