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

web: Fix namespace import names.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2023-10-03 11:45:13 -07:00
committed by Anders Kaseorg
parent 4d67bf5605
commit 6e3d6f531f
5 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/server_events_dispatch.js
View File

@@ -57,7 +57,7 @@ import * as settings_profile_fields from "./settings_profile_fields";
import * as settings_realm_domains from "./settings_realm_domains"; import * as settings_realm_domains from "./settings_realm_domains";
import * as settings_realm_user_settings_defaults from "./settings_realm_user_settings_defaults"; import * as settings_realm_user_settings_defaults from "./settings_realm_user_settings_defaults";
import * as settings_streams from "./settings_streams"; import * as settings_streams from "./settings_streams";
import * as settings_user_groups from "./settings_user_groups_legacy"; import * as settings_user_groups_legacy from "./settings_user_groups_legacy";
import * as settings_users from "./settings_users"; import * as settings_users from "./settings_users";
import * as sidebar_ui from "./sidebar_ui"; import * as sidebar_ui from "./sidebar_ui";
import * as starred_messages from "./starred_messages"; import * as starred_messages from "./starred_messages";
@@ -883,7 +883,7 @@ export function dispatch_normal_event(event) {
blueslip.error("Unexpected event type user_group/" + event.op); blueslip.error("Unexpected event type user_group/" + event.op);
break; break;
} }
settings_user_groups.reload(); settings_user_groups_legacy.reload();
break; break;
case "user_status": case "user_status":

6
web/src/settings_sections.js
View File

@@ -15,7 +15,7 @@ import * as settings_playgrounds from "./settings_playgrounds";
import * as settings_profile_fields from "./settings_profile_fields"; 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_realm_user_settings_defaults from "./settings_realm_user_settings_defaults";
import * as settings_streams from "./settings_streams"; import * as settings_streams from "./settings_streams";
import * as settings_user_groups from "./settings_user_groups_legacy"; import * as settings_user_groups_legacy from "./settings_user_groups_legacy";
import * as settings_user_topics from "./settings_user_topics"; import * as settings_user_topics from "./settings_user_topics";
import * as settings_users from "./settings_users"; import * as settings_users from "./settings_users";
@@ -72,7 +72,7 @@ export function initialize() {
load_func_dict.set("linkifier-settings", settings_linkifiers.set_up); load_func_dict.set("linkifier-settings", settings_linkifiers.set_up);
load_func_dict.set("playground-settings", settings_playgrounds.set_up); load_func_dict.set("playground-settings", settings_playgrounds.set_up);
load_func_dict.set("invites-list-admin", settings_invites.set_up); load_func_dict.set("invites-list-admin", settings_invites.set_up);
load_func_dict.set("user-groups-admin", settings_user_groups.set_up); load_func_dict.set("user-groups-admin", settings_user_groups_legacy.set_up);
load_func_dict.set("profile-field-settings", settings_profile_fields.set_up); load_func_dict.set("profile-field-settings", settings_profile_fields.set_up);
load_func_dict.set("data-exports-admin", settings_exports.set_up); load_func_dict.set("data-exports-admin", settings_exports.set_up);
load_func_dict.set( load_func_dict.set(
@@ -112,7 +112,7 @@ export function reset_sections() {
settings_org.reset(); settings_org.reset();
settings_profile_fields.reset(); settings_profile_fields.reset();
settings_streams.reset(); settings_streams.reset();
settings_user_groups.reset(); settings_user_groups_legacy.reset();
settings_user_topics.reset(); settings_user_topics.reset();
settings_muted_users.reset(); settings_muted_users.reset();
alert_words_ui.reset(); alert_words_ui.reset();

4
web/src/stream_color_events.js
View File

@@ -4,7 +4,7 @@ import * as inbox_util from "./inbox_util";
import * as message_lists from "./message_lists"; import * as message_lists from "./message_lists";
import * as message_view_header from "./message_view_header"; import * as message_view_header from "./message_view_header";
import * as overlays from "./overlays"; import * as overlays from "./overlays";
import * as row from "./rows"; import * as rows from "./rows";
import * as stream_color from "./stream_color"; import * as stream_color from "./stream_color";
import * as stream_data from "./stream_data"; import * as stream_data from "./stream_data";
@@ -30,7 +30,7 @@ function update_stream_privacy_color(id, color) {
function update_message_recipient_color(stream_name, color) { function update_message_recipient_color(stream_name, color) {
const recipient_color = stream_color.get_recipient_bar_color(color); const recipient_color = stream_color.get_recipient_bar_color(color);
for (const msg_list of message_lists.all_rendered_message_lists()) { for (const msg_list of message_lists.all_rendered_message_lists()) {
const $table = row.get_table(msg_list.table_name); const $table = rows.get_table(msg_list.table_name);
update_table_message_recipient_stream_color($table, stream_name, recipient_color); update_table_message_recipient_stream_color($table, stream_name, recipient_color);
} }

4
web/src/ui_init.js
View File

@@ -129,7 +129,7 @@ import * as user_group_edit from "./user_group_edit";
import * as user_group_edit_members from "./user_group_edit_members"; import * as user_group_edit_members from "./user_group_edit_members";
import * as user_group_popover from "./user_group_popover"; import * as user_group_popover from "./user_group_popover";
import * as user_groups from "./user_groups"; import * as user_groups from "./user_groups";
import * as user_group_settings_ui from "./user_groups_settings_ui"; import * as user_groups_settings_ui from "./user_groups_settings_ui";
import * as user_profile from "./user_profile"; import * as user_profile from "./user_profile";
import {initialize_user_settings, user_settings} from "./user_settings"; import {initialize_user_settings, user_settings} from "./user_settings";
import * as user_status from "./user_status"; import * as user_status from "./user_status";
@@ -600,7 +600,7 @@ export function initialize_everything() {
user_topics.initialize(user_topics_params); user_topics.initialize(user_topics_params);
muted_users.initialize(muted_users_params); muted_users.initialize(muted_users_params);
stream_settings_ui.initialize(); stream_settings_ui.initialize();
user_group_settings_ui.initialize(); user_groups_settings_ui.initialize();
left_sidebar_navigation_area.initialize(); left_sidebar_navigation_area.initialize();
stream_list.initialize({ stream_list.initialize({
on_stream_click(stream_id, trigger) { on_stream_click(stream_id, trigger) {

26
web/src/user_group_edit.js
View File

@@ -21,7 +21,7 @@ import * as stream_ui_updates from "./stream_ui_updates";
import * as ui_report from "./ui_report"; import * as ui_report from "./ui_report";
import * as user_group_edit_members from "./user_group_edit_members"; import * as user_group_edit_members from "./user_group_edit_members";
import * as user_groups from "./user_groups"; import * as user_groups from "./user_groups";
import * as user_group_settings_ui from "./user_groups_settings_ui"; import * as user_groups_settings_ui from "./user_groups_settings_ui";
export let toggler; export let toggler;
export let select_tab = "group_general_settings"; export let select_tab = "group_general_settings";
@@ -142,15 +142,15 @@ export function handle_member_edit_event(group_id, user_ids) {
// and current user is among the affect users as in that // and current user is among the affect users as in that
// case the group widget list need to be updated and show // case the group widget list need to be updated and show
// or remove the group-row on the left panel accordingly. // or remove the group-row on the left panel accordingly.
const tab_key = user_group_settings_ui.get_active_data().$tabs.first().attr("data-tab-key"); const tab_key = user_groups_settings_ui.get_active_data().$tabs.first().attr("data-tab-key");
if (tab_key === "your-groups" && user_ids.includes(people.my_current_user_id())) { if (tab_key === "your-groups" && user_ids.includes(people.my_current_user_id())) {
user_group_settings_ui.redraw_user_group_list(); user_groups_settings_ui.redraw_user_group_list();
} }
// update display of check-mark. // update display of check-mark.
if (user_group_settings_ui.is_group_already_present(group)) { if (user_groups_settings_ui.is_group_already_present(group)) {
const is_member = user_groups.is_user_in_group(group_id, people.my_current_user_id()); const is_member = user_groups.is_user_in_group(group_id, people.my_current_user_id());
const $sub_unsub_button = user_group_settings_ui const $sub_unsub_button = user_groups_settings_ui
.row_for_group_id(group_id) .row_for_group_id(group_id)
.find(".sub_unsub_button"); .find(".sub_unsub_button");
if (is_member) { if (is_member) {
@@ -219,7 +219,7 @@ export function setup_group_list_tab_hash(tab_key_value) {
We do not update the hash based on tab switches if We do not update the hash based on tab switches if
a group is currently being edited. a group is currently being edited.
*/ */
if (user_group_settings_ui.get_active_data().id !== undefined) { if (user_groups_settings_ui.get_active_data().id !== undefined) {
return; return;
} }
@@ -234,7 +234,7 @@ export function setup_group_list_tab_hash(tab_key_value) {
function open_right_panel_empty() { function open_right_panel_empty() {
$(".group-row.active").removeClass("active"); $(".group-row.active").removeClass("active");
user_group_settings_ui.show_user_group_settings_pane.nothing_selected(); user_groups_settings_ui.show_user_group_settings_pane.nothing_selected();
const tab_key = $(".user-groups-container") const tab_key = $(".user-groups-container")
.find("div.ind-tab.selected") .find("div.ind-tab.selected")
.first() .first()
@@ -246,7 +246,7 @@ export function is_editing_group(desired_group_id) {
if (!overlays.groups_open()) { if (!overlays.groups_open()) {
return false; return false;
} }
return user_group_settings_ui.get_active_data().id === desired_group_id; return user_groups_settings_ui.get_active_data().id === desired_group_id;
} }
export function handle_deleted_group(group_id) { export function handle_deleted_group(group_id) {
@@ -257,13 +257,13 @@ export function handle_deleted_group(group_id) {
if (is_editing_group(group_id)) { if (is_editing_group(group_id)) {
open_right_panel_empty(); open_right_panel_empty();
} }
user_group_settings_ui.redraw_user_group_list(); user_groups_settings_ui.redraw_user_group_list();
} }
export function show_group_settings(group) { export function show_group_settings(group) {
$(".group-row.active").removeClass("active"); $(".group-row.active").removeClass("active");
user_group_settings_ui.show_user_group_settings_pane.settings(group); user_groups_settings_ui.show_user_group_settings_pane.settings(group);
user_group_settings_ui.row_for_group_id(group.id).addClass("active"); user_groups_settings_ui.row_for_group_id(group.id).addClass("active");
setup_group_edit_hash(group); setup_group_edit_hash(group);
setup_group_settings(group); setup_group_settings(group);
} }
@@ -288,7 +288,7 @@ export function initialize() {
const template_data = { const template_data = {
group_name: user_group.name, group_name: user_group.name,
group_description: user_group.description, group_description: user_group.description,
max_user_group_name_length: user_group_settings_ui.max_user_group_name_length, max_user_group_name_length: user_groups_settings_ui.max_user_group_name_length,
}; };
const change_user_group_info_modal = render_change_user_group_info_modal(template_data); const change_user_group_info_modal = render_change_user_group_info_modal(template_data);
dialog_widget.launch({ dialog_widget.launch({
@@ -310,7 +310,7 @@ export function initialize() {
}); });
$("#groups_overlay_container").on("click", ".group_settings_header .btn-danger", () => { $("#groups_overlay_container").on("click", ".group_settings_header .btn-danger", () => {
const active_group_data = user_group_settings_ui.get_active_data(); const active_group_data = user_groups_settings_ui.get_active_data();
const group_id = active_group_data.id; const group_id = active_group_data.id;
const user_group = user_groups.get_user_group_from_id(group_id); const user_group = user_groups.get_user_group_from_id(group_id);