mirror of
https://github.com/zulip/zulip.git
synced 2026-07-12 21:04:41 +08:00
b84885184e
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.
260 lines
8.8 KiB
JavaScript
260 lines
8.8 KiB
JavaScript
"use strict";
|
|
|
|
const {strict: assert} = require("assert");
|
|
|
|
const {mock_esm, zrequire} = require("../zjsunit/namespace");
|
|
const {run_test} = require("../zjsunit/test");
|
|
const blueslip = require("../zjsunit/zblueslip");
|
|
const {page_params} = require("../zjsunit/zpage_params");
|
|
|
|
const message_live_update = mock_esm("../../static/js/message_live_update");
|
|
const settings_account = mock_esm("../../static/js/settings_account", {
|
|
update_email() {},
|
|
update_full_name() {},
|
|
update_account_settings_display() {},
|
|
});
|
|
|
|
mock_esm("../../static/js/activity", {
|
|
redraw() {},
|
|
});
|
|
mock_esm("../../static/js/compose", {
|
|
update_email() {},
|
|
});
|
|
mock_esm("../../static/js/narrow_state", {
|
|
update_email() {},
|
|
});
|
|
mock_esm("../../static/js/pm_list", {
|
|
update_private_messages() {},
|
|
});
|
|
mock_esm("../../static/js/settings_linkifiers", {
|
|
maybe_disable_widgets() {},
|
|
});
|
|
mock_esm("../../static/js/settings_org", {
|
|
maybe_disable_widgets() {},
|
|
});
|
|
mock_esm("../../static/js/settings_profile_fields", {
|
|
maybe_disable_widgets() {},
|
|
});
|
|
mock_esm("../../static/js/settings_realm_user_settings_defaults", {
|
|
maybe_disable_widgets() {},
|
|
});
|
|
mock_esm("../../static/js/settings_streams", {
|
|
maybe_disable_widgets() {},
|
|
});
|
|
mock_esm("../../static/js/settings_users", {
|
|
update_user_data() {},
|
|
});
|
|
|
|
page_params.is_admin = true;
|
|
|
|
const people = zrequire("people");
|
|
const settings_config = zrequire("settings_config");
|
|
const user_events = zrequire("user_events");
|
|
|
|
const me = {
|
|
email: "[email protected]",
|
|
user_id: 30,
|
|
full_name: "Me Myself",
|
|
is_admin: true,
|
|
role: settings_config.user_role_values.member.code,
|
|
};
|
|
|
|
function initialize() {
|
|
people.init();
|
|
people.add_active_user(me);
|
|
people.initialize_current_user(me.user_id);
|
|
}
|
|
|
|
initialize();
|
|
|
|
run_test("updates", () => {
|
|
let person;
|
|
|
|
const isaac = {
|
|
email: "[email protected]",
|
|
delivery_email: null,
|
|
user_id: 32,
|
|
full_name: "Isaac Newton",
|
|
};
|
|
people.add_active_user(isaac);
|
|
|
|
user_events.update_person({
|
|
user_id: isaac.user_id,
|
|
role: settings_config.user_role_values.guest.code,
|
|
});
|
|
person = people.get_by_email(isaac.email);
|
|
assert.ok(person.is_guest);
|
|
assert.equal(person.role, settings_config.user_role_values.guest.code);
|
|
user_events.update_person({
|
|
user_id: isaac.user_id,
|
|
role: settings_config.user_role_values.member.code,
|
|
});
|
|
person = people.get_by_email(isaac.email);
|
|
assert.ok(!person.is_guest);
|
|
assert.equal(person.role, settings_config.user_role_values.member.code);
|
|
|
|
user_events.update_person({
|
|
user_id: isaac.user_id,
|
|
role: settings_config.user_role_values.moderator.code,
|
|
});
|
|
person = people.get_by_email(isaac.email);
|
|
assert.equal(person.is_moderator, true);
|
|
assert.equal(person.role, settings_config.user_role_values.moderator.code);
|
|
|
|
user_events.update_person({
|
|
user_id: isaac.user_id,
|
|
role: settings_config.user_role_values.admin.code,
|
|
});
|
|
person = people.get_by_email(isaac.email);
|
|
assert.equal(person.full_name, "Isaac Newton");
|
|
assert.equal(person.is_moderator, false);
|
|
assert.equal(person.is_admin, true);
|
|
assert.equal(person.role, settings_config.user_role_values.admin.code);
|
|
|
|
user_events.update_person({
|
|
user_id: isaac.user_id,
|
|
role: settings_config.user_role_values.owner.code,
|
|
});
|
|
assert.equal(person.is_admin, true);
|
|
assert.equal(person.is_owner, true);
|
|
assert.equal(person.role, settings_config.user_role_values.owner.code);
|
|
|
|
user_events.update_person({user_id: me.user_id, is_billing_admin: true});
|
|
person = people.get_by_email(me.email);
|
|
assert.ok(person.is_billing_admin);
|
|
assert.equal(person.role, settings_config.user_role_values.member.code);
|
|
assert.ok(page_params.is_billing_admin);
|
|
|
|
user_events.update_person({user_id: me.user_id, is_billing_admin: false});
|
|
person = people.get_by_email(me.email);
|
|
assert.equal(person.user_id, me.user_id);
|
|
assert.ok(!person.is_billing_admin);
|
|
assert.equal(person.role, settings_config.user_role_values.member.code);
|
|
assert.ok(!page_params.is_billing_admin);
|
|
|
|
user_events.update_person({user_id: isaac.user_id, is_billing_admin: false});
|
|
person = people.get_by_email(isaac.email);
|
|
assert.equal(person.user_id, isaac.user_id);
|
|
assert.ok(!person.is_billing_admin);
|
|
assert.equal(person.role, settings_config.user_role_values.owner.code);
|
|
assert.ok(!page_params.is_billing_admin);
|
|
|
|
let user_id;
|
|
let full_name;
|
|
message_live_update.update_user_full_name = (user_id_arg, full_name_arg) => {
|
|
user_id = user_id_arg;
|
|
full_name = full_name_arg;
|
|
};
|
|
|
|
user_events.update_person({user_id: isaac.user_id, full_name: "Sir Isaac"});
|
|
person = people.get_by_email(isaac.email);
|
|
assert.equal(person.full_name, "Sir Isaac");
|
|
assert.equal(person.is_admin, true);
|
|
assert.equal(user_id, isaac.user_id);
|
|
assert.equal(full_name, "Sir Isaac");
|
|
|
|
user_events.update_person({
|
|
user_id: me.user_id,
|
|
role: settings_config.user_role_values.member.code,
|
|
});
|
|
assert.ok(!page_params.is_admin);
|
|
|
|
user_events.update_person({user_id: me.user_id, full_name: "Me V2"});
|
|
assert.equal(people.my_full_name(), "Me V2");
|
|
assert.equal(user_id, me.user_id);
|
|
assert.equal(full_name, "Me V2");
|
|
|
|
user_events.update_person({user_id: isaac.user_id, new_email: "[email protected]"});
|
|
person = people.get_by_user_id(isaac.user_id);
|
|
assert.equal(person.email, "[email protected]");
|
|
assert.equal(person.full_name, "Sir Isaac");
|
|
|
|
user_events.update_person({user_id: me.user_id, new_email: "[email protected]"});
|
|
person = people.get_by_user_id(me.user_id);
|
|
assert.equal(person.email, "[email protected]");
|
|
assert.equal(person.full_name, "Me V2");
|
|
|
|
let avatar_url;
|
|
message_live_update.update_avatar = (user_id_arg, avatar_url_arg) => {
|
|
user_id = user_id_arg;
|
|
avatar_url = avatar_url_arg;
|
|
};
|
|
|
|
user_events.update_person({user_id: isaac.user_id, full_name: "Sir Isaac"});
|
|
person = people.get_by_email(isaac.email);
|
|
assert.equal(person.full_name, "Sir Isaac");
|
|
assert.equal(person.is_admin, true);
|
|
assert.equal(user_id, isaac.user_id);
|
|
assert.equal(full_name, "Sir Isaac");
|
|
|
|
person = people.get_by_email(isaac.email);
|
|
assert.equal(person.delivery_email, null);
|
|
user_events.update_person({
|
|
user_id: isaac.user_id,
|
|
delivery_email: "[email protected]",
|
|
});
|
|
person = people.get_by_email(isaac.email);
|
|
assert.equal(person.delivery_email, "[email protected]");
|
|
|
|
user_events.update_person({user_id: isaac.user_id, delivery_email: null});
|
|
person = people.get_by_email(isaac.email);
|
|
assert.equal(person.delivery_email, null);
|
|
|
|
user_events.update_person({user_id: isaac.user_id, avatar_url: "http://gravatar.com/123456"});
|
|
person = people.get_by_email(isaac.email);
|
|
assert.equal(person.full_name, "Sir Isaac");
|
|
assert.equal(user_id, isaac.user_id);
|
|
assert.equal(person.avatar_url, avatar_url);
|
|
|
|
user_events.update_person({user_id: me.user_id, avatar_url: "http://gravatar.com/789456"});
|
|
person = people.get_by_email(me.email);
|
|
assert.equal(person.full_name, "Me V2");
|
|
assert.equal(user_id, me.user_id);
|
|
assert.equal(person.avatar_url, avatar_url);
|
|
|
|
user_events.update_person({user_id: me.user_id, timezone: "UTC"});
|
|
person = people.get_by_email(me.email);
|
|
assert.ok(person.timezone);
|
|
|
|
blueslip.expect("error", "Got update_person event for unexpected user 29");
|
|
blueslip.expect("error", "Unknown user_id in get_by_user_id: 29");
|
|
assert.ok(!user_events.update_person({user_id: 29, full_name: "Sir Isaac Newton"}));
|
|
|
|
me.profile_data = {};
|
|
user_events.update_person({
|
|
user_id: me.user_id,
|
|
custom_profile_field: {id: 3, value: "Value", rendered_value: "<p>Value</p>"},
|
|
});
|
|
person = people.get_by_email(me.email);
|
|
assert.equal(person.profile_data[3].value, "Value");
|
|
assert.equal(person.profile_data[3].rendered_value, "<p>Value</p>");
|
|
|
|
let updated = false;
|
|
settings_account.update_email = (email) => {
|
|
assert.equal(email, "[email protected]");
|
|
updated = true;
|
|
};
|
|
|
|
let confirm_banner_hidden = false;
|
|
settings_account.hide_confirm_email_banner = () => {
|
|
confirm_banner_hidden = true;
|
|
};
|
|
|
|
user_events.update_person({user_id: me.user_id, delivery_email: "[email protected]"});
|
|
assert.ok(updated);
|
|
assert.ok(confirm_banner_hidden);
|
|
|
|
const test_bot = {
|
|
email: "[email protected]",
|
|
user_id: 35,
|
|
full_name: "Test Bot",
|
|
is_bot: true,
|
|
bot_owner_id: isaac.id,
|
|
};
|
|
people.add_active_user(test_bot);
|
|
|
|
user_events.update_person({user_id: test_bot.user_id, bot_owner_id: me.user_id});
|
|
person = people.get_by_email(test_bot.email);
|
|
assert.equal(person.bot_owner_id, me.user_id);
|
|
});
|