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

user groups: Enabled sorting of subscribers.

Browse Source 
The new `#groups` overlay does not allow sorting of subscribers.
This commit adds support for sorting of subscribers.
This commit is contained in:
Ujjawal Modi
2023-03-03 00:27:52 +05:30
committed by Tim Abbott
parent bfa8a2438b
commit 18059e132d
4 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
web/src/user_group_create_members.js
View File

@@ -7,6 +7,7 @@ import * as add_subscribers_pill from "./add_subscribers_pill";
import * as ListWidget from "./list_widget"; import * as ListWidget from "./list_widget";
import {page_params} from "./page_params"; import {page_params} from "./page_params";
import * as people from "./people"; import * as people from "./people";
import * as settings_users from "./settings_users";
import * as user_group_create_members_data from "./user_group_create_members_data"; import * as user_group_create_members_data from "./user_group_create_members_data";
let pill_widget; let pill_widget;
@@ -92,26 +93,28 @@ export function build_widgets() {
all_users_list_widget = ListWidget.create($("#create_user_group_members"), [current_user_id], { all_users_list_widget = ListWidget.create($("#create_user_group_members"), [current_user_id], {
name: "new_user_group_add_users", name: "new_user_group_add_users",
$parent_container: $add_people_container, $parent_container: $add_people_container,
modifier(user_id) { get_item: people.get_by_user_id,
const user = people.get_by_user_id(user_id); sort_fields: {
email: settings_users.sort_email,
id: settings_users.sort_user_id,
},
modifier(user) {
const item = { const item = {
email: user.delivery_email, email: user.delivery_email,
user_id, user_id: user.user_id,
full_name: user.full_name, full_name: user.full_name,
is_current_user: user_id === current_user_id, is_current_user: user.user_id === current_user_id,
}; };
return render_new_user_group_user(item); return render_new_user_group_user(item);
}, },
filter: { filter: {
$element: $("#people_to_add_in_group .add-user-list-filter"), $element: $("#people_to_add_in_group .add-user-list-filter"),
predicate(user_id, search_term) { predicate(user, search_term) {
const user = people.get_by_user_id(user_id);
return people.build_person_matcher(search_term)(user); return people.build_person_matcher(search_term)(user);
}, },
}, },
$simplebar_container, $simplebar_container,
html_selector(user_id) { html_selector(user) {
const user = people.get_by_user_id(user_id);
return $(`#${CSS.escape("user_checkbox_" + user.user_id)}`); return $(`#${CSS.escape("user_checkbox_" + user.user_id)}`);
}, },
}); });

6
web/src/user_group_edit_members.js
View File

@@ -13,6 +13,7 @@ import {$t, $t_html} from "./i18n";
import * as ListWidget from "./list_widget"; import * as ListWidget from "./list_widget";
import {page_params} from "./page_params"; import {page_params} from "./page_params";
import * as people from "./people"; import * as people from "./people";
import * as settings_users from "./settings_users";
import * as ui from "./ui"; import * as ui from "./ui";
import * as user_group_edit from "./user_group_edit"; import * as user_group_edit from "./user_group_edit";
import * as user_groups from "./user_groups"; import * as user_groups from "./user_groups";
@@ -65,6 +66,11 @@ function make_list_widget({$parent_container, name, user_ids}) {
return ListWidget.create($list_container, users, { return ListWidget.create($list_container, users, {
name, name,
$parent_container,
sort_fields: {
email: settings_users.sort_email,
id: settings_users.sort_user_id,
},
modifier(item) { modifier(item) {
return format_member_list_elem(item); return format_member_list_elem(item);
}, },

6
web/templates/user_group_settings/new_user_group_users.hbs
View File

@@ -16,9 +16,9 @@
<div class="member_list_container" data-simplebar> <div class="member_list_container" data-simplebar>
<table class="member-list table table-striped"> <table class="member-list table table-striped">
<thead class="table-sticky-headers"> <thead class="table-sticky-headers">
<th>{{t "Name" }}</th> <th data-sort="alphabetic" data-sort-prop="full_name">{{t "Name" }}</th>
<th>{{t "Email" }}</th> <th data-sort="email">{{t "Email" }}</th>
<th>{{t "User ID" }}</th> <th data-sort="id">{{t "User ID" }}</th>
<th>{{t "Action" }}</th> <th>{{t "Action" }}</th>
</thead> </thead>
<tbody id="create_user_group_members" class="member_table"></tbody> <tbody id="create_user_group_members" class="member_table"></tbody>

6
web/templates/user_group_settings/user_group_members.hbs
View File

@@ -20,9 +20,9 @@
<div class="member_list_loading_indicator"></div> <div class="member_list_loading_indicator"></div>
<table class="member-list table table-striped"> <table class="member-list table table-striped">
<thead class="table-sticky-headers"> <thead class="table-sticky-headers">
<th>{{t "Name" }}</th> <th data-sort="alphabetic" data-sort-prop="full_name">{{t "Name" }}</th>
<th>{{t "Email" }}</th> <th data-sort="email">{{t "Email" }}</th>
<th>{{t "User ID" }}</th> <th data-sort="id">{{t "User ID" }}</th>
<th class="actions" {{#unless can_edit}}style="display:none"{{/unless}}>{{t "Actions" }}</th> <th class="actions" {{#unless can_edit}}style="display:none"{{/unless}}>{{t "Actions" }}</th>
</thead> </thead>
<tbody class="member_table"></tbody> <tbody class="member_table"></tbody>