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: Do not show "role:" prefix for system groups.

Browse Source 
Instead of showing the actual names like "role:everyone",
"role:moderators", etc. for system groups, we show
"Everyone", "Moderators", etc. for system user group in
pills, typeaheads and popovers.

Though system groups are not shown in typeahead as of
this commit, we update the typeahead code as well to
not conside "role:" prefix while matching with the
query as we would soon show system groups in typeahead
when we would add new UI for group-based settings.

Previously, only "role:everyone" group was shown as
"Everyone" in popover and pills but for other system
groups their original names for shown and this commit
changes that behavior to be same for all system groups.

The original display_name field for
settings_config.system_user_groups_list objects, which
was used for dropdown widgets, is also renamed so that
we can use display_name field for the names to be used
in other places.
This commit is contained in:
Sahil Batra
2024-09-02 19:35:45 +05:30
committed by Tim Abbott
parent 2fff124ec9
commit def78ddf09
7 changed files with 55 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
web/src/user_groups.ts
View File

@@ -440,7 +440,7 @@ export function get_realm_user_groups_for_dropdown_list_widget(
const display_name = settings_config.system_user_groups_list.find(
(system_group) => system_group.name === group.name,
)!.display_name;
)!.dropdown_option_name;
return {
name: get_display_name_for_system_group_option(setting_name, display_name),
@@ -449,14 +449,14 @@ export function get_realm_user_groups_for_dropdown_list_widget(
});
}
// 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
// `role:everyone` to be `Everyone` instead of
// `Admins, moderators, members and guests` from `settings_config`.
// Right now, we only change the name for `role:everyone`, that's why
// we don't store the values in a structured way like
// `settings_config` yet.
export function get_display_group_name(user_group: UserGroup): string {
return user_group.name === "role:everyone" ? $t({defaultMessage: "Everyone"}) : user_group.name;
export function get_display_group_name(group_name: string): string {
const group = settings_config.system_user_groups_list.find(
(system_group) => system_group.name === group_name,
);
if (group === undefined) {
return group_name;
}
return group.display_name;
}