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

user_groups: Refactor function to get groups to be used for settings.

Browse Source 
This commit refactors the code to get groups to be used for settings
as we would now have two UIs for settings for some time - dropdown
widget and pills, so we can just have a single function which just
returns the valid UserGroup objects and then a separate function to
get the appropriate format to be used for dropdown widgets and pills.
This commit is contained in:
Sahil Batra
2024-08-29 21:39:47 +05:30
committed by Tim Abbott
parent 6482f0c2ea
commit 5fda195eab
1 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
web/src/user_groups.ts
View File

@@ -317,10 +317,10 @@ function get_display_name_for_system_group_option(setting_name: string, name: st
return name;
}
export function get_realm_user_groups_for_dropdown_list_widget(
export function get_realm_user_groups_for_setting(
setting_name: string,
setting_type: "realm" | "stream" | "group",
): UserGroupForDropdownListWidget[] {
): UserGroup[] {
const group_setting_config = group_permission_settings.get_group_permission_setting_config(
setting_name,
setting_type,
@@ -368,10 +368,7 @@ export function get_realm_user_groups_for_dropdown_list_widget(
if (!user_group) {
throw new Error(`Unknown group name: ${group.name}`);
}
return {
name: get_display_name_for_system_group_option(setting_name, group.display_name),
unique_id: user_group.id,
};
return user_group;
});
if (
@@ -381,14 +378,36 @@ export function get_realm_user_groups_for_dropdown_list_widget(
return system_user_groups;
}
const user_groups_excluding_system_groups = get_realm_user_groups().map((group) => ({
name: group.name,
unique_id: group.id,
}));
const user_groups_excluding_system_groups = get_realm_user_groups();
return [...system_user_groups, ...user_groups_excluding_system_groups];
}
export function get_realm_user_groups_for_dropdown_list_widget(
setting_name: string,
setting_type: "realm" | "stream" | "group",
): UserGroupForDropdownListWidget[] {
const allowed_setting_groups = get_realm_user_groups_for_setting(setting_name, setting_type);
return allowed_setting_groups.map((group) => {
if (!group.is_system_group) {
return {
name: group.name,
unique_id: group.id,
};
}
const display_name = settings_config.system_user_groups_list.find(
(system_group) => system_group.name === group.name,
)!.display_name;
return {
name: get_display_name_for_system_group_option(setting_name, display_name),
unique_id: group.id,
};
});
}
// Group name for user-facing display. For settings, we already use
// description strings for system groups. But those description strings
// might not be suitable for every case, e.g. we want the name for