mirror of
https://github.com/zulip/zulip.git
synced 2025-11-05 22:43:42 +00:00
This commit basically updates the frontend code to directly use delivery_email field instead of functions like show_email or email_for_user_settings at places where we want to show email. We can do this change since we recently updated the server code to always pass "delivery_email" code in the user objects with its value being null if the real email is not accessible. Showing email or "hidden" or nothing at various places in UI like in users list, subscriber list, user profile popover and modal is same as before. Major points - - Removed show_email and email_for_user_settings functions since we directly use delivery_email field now as explained above. - While sorting by emails in the users list, users with real emails hidden are always shown in last when sorting alphabetically and at the top when sorting reverse alphabetically. Also, those users with real emails hidden, are sorted by name among themselves. As we did before, we do not allow sorting by email when all emails are hidden. - There is no change in typeahead behavior at this point. We either hide the email completely or show the real or fake email based on user level setting. - Added code to handle delivery_email events and appropriately add/remove delivery_email field from person objects.
117 lines
4.0 KiB
JavaScript
117 lines
4.0 KiB
JavaScript
import $ from "jquery";
|
|
|
|
import render_new_stream_user from "../templates/stream_settings/new_stream_user.hbs";
|
|
import render_new_stream_users from "../templates/stream_settings/new_stream_users.hbs";
|
|
|
|
import * as add_subscribers_pill from "./add_subscribers_pill";
|
|
import * as ListWidget from "./list_widget";
|
|
import {page_params} from "./page_params";
|
|
import * as people from "./people";
|
|
import * as stream_create_subscribers_data from "./stream_create_subscribers_data";
|
|
|
|
let pill_widget;
|
|
let all_users_list_widget;
|
|
|
|
export function get_principals() {
|
|
return stream_create_subscribers_data.get_principals();
|
|
}
|
|
|
|
function redraw_subscriber_list() {
|
|
all_users_list_widget.replace_list_data(stream_create_subscribers_data.sorted_user_ids());
|
|
}
|
|
|
|
function add_user_ids(user_ids) {
|
|
stream_create_subscribers_data.add_user_ids(user_ids);
|
|
redraw_subscriber_list();
|
|
}
|
|
|
|
function add_all_users() {
|
|
const user_ids = stream_create_subscribers_data.get_all_user_ids();
|
|
add_user_ids(user_ids);
|
|
}
|
|
|
|
function remove_user_ids(user_ids) {
|
|
stream_create_subscribers_data.remove_user_ids(user_ids);
|
|
redraw_subscriber_list();
|
|
}
|
|
|
|
function build_pill_widget({$parent_container}) {
|
|
const $pill_container = $parent_container.find(".pill-container");
|
|
const get_potential_subscribers = stream_create_subscribers_data.get_potential_subscribers;
|
|
|
|
pill_widget = add_subscribers_pill.create({$pill_container, get_potential_subscribers});
|
|
}
|
|
|
|
export function create_handlers($container) {
|
|
$container.on("click", ".add_all_users_to_stream", (e) => {
|
|
e.preventDefault();
|
|
add_all_users();
|
|
$(".add-user-list-filter").trigger("focus");
|
|
});
|
|
|
|
$container.on("click", ".remove_potential_subscriber", (e) => {
|
|
e.preventDefault();
|
|
const $elem = $(e.target);
|
|
const user_id = Number.parseInt($elem.attr("data-user-id"), 10);
|
|
remove_user_ids([user_id]);
|
|
});
|
|
|
|
function add_users({pill_user_ids}) {
|
|
add_user_ids(pill_user_ids);
|
|
pill_widget.clear();
|
|
}
|
|
|
|
add_subscribers_pill.set_up_handlers({
|
|
get_pill_widget: () => pill_widget,
|
|
$parent_container: $container,
|
|
pill_selector: ".add_subscribers_container .input",
|
|
button_selector: ".add_subscribers_container button.add-subscriber-button",
|
|
action: add_users,
|
|
});
|
|
}
|
|
|
|
export function build_widgets() {
|
|
const $add_people_container = $("#people_to_add");
|
|
$add_people_container.html(render_new_stream_users({}));
|
|
|
|
const $simplebar_container = $add_people_container.find(".subscriber_list_container");
|
|
|
|
build_pill_widget({$parent_container: $add_people_container});
|
|
|
|
stream_create_subscribers_data.initialize_with_current_user();
|
|
const current_user_id = page_params.user_id;
|
|
|
|
all_users_list_widget = ListWidget.create($("#create_stream_subscribers"), [current_user_id], {
|
|
name: "new_stream_add_users",
|
|
$parent_container: $add_people_container,
|
|
modifier(user_id) {
|
|
const user = people.get_by_user_id(user_id);
|
|
const item = {
|
|
email: user.delivery_email,
|
|
user_id,
|
|
full_name: user.full_name,
|
|
is_current_user: user_id === current_user_id,
|
|
disabled: stream_create_subscribers_data.must_be_subscribed(user_id),
|
|
};
|
|
return render_new_stream_user(item);
|
|
},
|
|
filter: {
|
|
$element: $("#people_to_add .add-user-list-filter"),
|
|
predicate(user_id, search_term) {
|
|
const user = people.get_by_user_id(user_id);
|
|
return people.build_person_matcher(search_term)(user);
|
|
},
|
|
},
|
|
$simplebar_container,
|
|
html_selector(user_id) {
|
|
const user = people.get_by_user_id(user_id);
|
|
return $(`#${CSS.escape("user_checkbox_" + user.user_id)}`);
|
|
},
|
|
});
|
|
}
|
|
|
|
export function add_user_id_to_new_stream(user_id) {
|
|
// This is only used by puppeteer tests.
|
|
add_user_ids([user_id]);
|
|
}
|