mirror of
https://github.com/zulip/zulip.git
synced 2025-11-07 07:23:22 +00:00
page_params: Split out state data for current user.
For spectators, the chunk of page_params that originates from do_events_register isn’t assigned until ui_init.js. That means the TypeScript type of page_params is mostly a lie during module load time: reading a parameter too early silently results in undefined rather than the declared type, with unpredictable results later on. We want to make such an early read into an immediate runtime error, for both users and spectators consistently, and pave the way for runtime validation of the page_params type. As a first step, split out the subset of fields that pertain to the current user. Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
committed by
Tim Abbott
parent
fd2ad130f9
commit
e96ede0ef6
@@ -10,7 +10,6 @@ import {buddy_list} from "./buddy_list";
|
||||
import * as compose_state from "./compose_state";
|
||||
import * as message_live_update from "./message_live_update";
|
||||
import * as narrow_state from "./narrow_state";
|
||||
import {page_params} from "./page_params";
|
||||
import * as people from "./people";
|
||||
import * as pm_list from "./pm_list";
|
||||
import * as settings from "./settings";
|
||||
@@ -22,6 +21,7 @@ import * as settings_profile_fields from "./settings_profile_fields";
|
||||
import * as settings_realm_user_settings_defaults from "./settings_realm_user_settings_defaults";
|
||||
import * as settings_streams from "./settings_streams";
|
||||
import * as settings_users from "./settings_users";
|
||||
import {current_user} from "./state_data";
|
||||
import * as stream_events from "./stream_events";
|
||||
|
||||
export const update_person = function update(person) {
|
||||
@@ -40,7 +40,7 @@ export const update_person = function update(person) {
|
||||
compose_state.update_email(user_id, new_email);
|
||||
|
||||
if (people.is_my_user_id(person.user_id)) {
|
||||
page_params.email = new_email;
|
||||
current_user.email = new_email;
|
||||
}
|
||||
|
||||
people.update_email(user_id, new_email);
|
||||
@@ -51,7 +51,7 @@ export const update_person = function update(person) {
|
||||
person_obj.delivery_email = delivery_email;
|
||||
if (people.is_my_user_id(person.user_id)) {
|
||||
settings_account.update_email(delivery_email);
|
||||
page_params.delivery_email = delivery_email;
|
||||
current_user.delivery_email = delivery_email;
|
||||
settings_account.hide_confirm_email_banner();
|
||||
}
|
||||
}
|
||||
@@ -64,7 +64,7 @@ export const update_person = function update(person) {
|
||||
message_live_update.update_user_full_name(person.user_id, person.full_name);
|
||||
pm_list.update_private_messages();
|
||||
if (people.is_my_user_id(person.user_id)) {
|
||||
page_params.full_name = person.full_name;
|
||||
current_user.full_name = person.full_name;
|
||||
settings_account.update_full_name(person.full_name);
|
||||
}
|
||||
}
|
||||
@@ -78,14 +78,14 @@ export const update_person = function update(person) {
|
||||
person_obj.is_moderator = person.role === settings_config.user_role_values.moderator.code;
|
||||
settings_users.update_user_data(person.user_id, person);
|
||||
|
||||
if (people.is_my_user_id(person.user_id) && page_params.is_owner !== person_obj.is_owner) {
|
||||
page_params.is_owner = person_obj.is_owner;
|
||||
if (people.is_my_user_id(person.user_id) && current_user.is_owner !== person_obj.is_owner) {
|
||||
current_user.is_owner = person_obj.is_owner;
|
||||
settings_org.maybe_disable_widgets();
|
||||
settings.update_lock_icon_in_sidebar();
|
||||
}
|
||||
|
||||
if (people.is_my_user_id(person.user_id) && page_params.is_admin !== person_obj.is_admin) {
|
||||
page_params.is_admin = person_obj.is_admin;
|
||||
if (people.is_my_user_id(person.user_id) && current_user.is_admin !== person_obj.is_admin) {
|
||||
current_user.is_admin = person_obj.is_admin;
|
||||
settings_linkifiers.maybe_disable_widgets();
|
||||
settings_org.maybe_disable_widgets();
|
||||
settings_profile_fields.maybe_disable_widgets();
|
||||
@@ -97,16 +97,16 @@ export const update_person = function update(person) {
|
||||
|
||||
if (
|
||||
people.is_my_user_id(person.user_id) &&
|
||||
page_params.is_moderator !== person_obj.is_moderator
|
||||
current_user.is_moderator !== person_obj.is_moderator
|
||||
) {
|
||||
page_params.is_moderator = person_obj.is_moderator;
|
||||
current_user.is_moderator = person_obj.is_moderator;
|
||||
}
|
||||
}
|
||||
|
||||
if (Object.hasOwn(person, "is_billing_admin")) {
|
||||
person_obj.is_billing_admin = person.is_billing_admin;
|
||||
if (people.is_my_user_id(person.user_id)) {
|
||||
page_params.is_billing_admin = person_obj.is_billing_admin;
|
||||
current_user.is_billing_admin = person_obj.is_billing_admin;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -116,9 +116,9 @@ export const update_person = function update(person) {
|
||||
person_obj.avatar_version = person.avatar_version;
|
||||
|
||||
if (people.is_my_user_id(person.user_id)) {
|
||||
page_params.avatar_source = person.avatar_source;
|
||||
page_params.avatar_url = url;
|
||||
page_params.avatar_url_medium = person.avatar_url_medium;
|
||||
current_user.avatar_source = person.avatar_source;
|
||||
current_user.avatar_url = url;
|
||||
current_user.avatar_url_medium = person.avatar_url_medium;
|
||||
$("#user-avatar-upload-widget .image-block").attr("src", person.avatar_url_medium);
|
||||
$("#personal-menu .header-button-avatar").attr("src", `${person.avatar_url_medium}`);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user