mirror of
https://github.com/zulip/zulip.git
synced 2025-11-04 05:53:43 +00:00
ui_init: Move update_invite_user_option to sidebar_ui.
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
committed by
Tim Abbott
parent
457544e0d2
commit
67f2bc030f
@@ -59,6 +59,7 @@ import * as settings_realm_user_settings_defaults from "./settings_realm_user_se
|
|||||||
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 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 starred_messages from "./starred_messages";
|
import * as starred_messages from "./starred_messages";
|
||||||
import * as starred_messages_ui from "./starred_messages_ui";
|
import * as starred_messages_ui from "./starred_messages_ui";
|
||||||
import * as stream_data from "./stream_data";
|
import * as stream_data from "./stream_data";
|
||||||
@@ -71,7 +72,6 @@ import * as stream_ui_updates from "./stream_ui_updates";
|
|||||||
import * as sub_store from "./sub_store";
|
import * as sub_store from "./sub_store";
|
||||||
import * as submessage from "./submessage";
|
import * as submessage from "./submessage";
|
||||||
import * as typing_events from "./typing_events";
|
import * as typing_events from "./typing_events";
|
||||||
import * as ui_init from "./ui_init";
|
|
||||||
import * as unread_ops from "./unread_ops";
|
import * as unread_ops from "./unread_ops";
|
||||||
import * as unread_ui from "./unread_ui";
|
import * as unread_ui from "./unread_ui";
|
||||||
import * as user_events from "./user_events";
|
import * as user_events from "./user_events";
|
||||||
@@ -252,7 +252,7 @@ export function dispatch_normal_event(event) {
|
|||||||
|
|
||||||
if (event.property === "invite_to_realm_policy") {
|
if (event.property === "invite_to_realm_policy") {
|
||||||
settings_invites.update_invite_user_panel();
|
settings_invites.update_invite_user_panel();
|
||||||
ui_init.update_invite_user_option();
|
sidebar_ui.update_invite_user_option();
|
||||||
gear_menu.initialize();
|
gear_menu.initialize();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -283,7 +283,7 @@ export function dispatch_normal_event(event) {
|
|||||||
|
|
||||||
if (key === "create_multiuse_invite_group") {
|
if (key === "create_multiuse_invite_group") {
|
||||||
settings_invites.update_invite_user_panel();
|
settings_invites.update_invite_user_panel();
|
||||||
ui_init.update_invite_user_option();
|
sidebar_ui.update_invite_user_option();
|
||||||
gear_menu.initialize();
|
gear_menu.initialize();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import $ from "jquery";
|
|||||||
import {media_breakpoints_num} from "./css_variables";
|
import {media_breakpoints_num} from "./css_variables";
|
||||||
import * as popovers from "./popovers";
|
import * as popovers from "./popovers";
|
||||||
import * as resize from "./resize";
|
import * as resize from "./resize";
|
||||||
|
import * as settings_data from "./settings_data";
|
||||||
import * as spectators from "./spectators";
|
import * as spectators from "./spectators";
|
||||||
|
|
||||||
export function hide_userlist_sidebar() {
|
export function hide_userlist_sidebar() {
|
||||||
@@ -31,6 +32,17 @@ export function any_sidebar_expanded_as_overlay() {
|
|||||||
return Boolean($("[class^='column-'].expanded").length);
|
return Boolean($("[class^='column-'].expanded").length);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function update_invite_user_option() {
|
||||||
|
if (
|
||||||
|
!settings_data.user_can_invite_users_by_email() &&
|
||||||
|
!settings_data.user_can_create_multiuse_invite()
|
||||||
|
) {
|
||||||
|
$("#right-sidebar .invite-user-link").hide();
|
||||||
|
} else {
|
||||||
|
$("#right-sidebar .invite-user-link").show();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export function initialize() {
|
export function initialize() {
|
||||||
$("body").on("click", ".login_button", (e) => {
|
$("body").on("click", ".login_button", (e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
|||||||
@@ -149,24 +149,13 @@ function initialize_left_sidebar() {
|
|||||||
$("#left-sidebar-container").html(rendered_sidebar);
|
$("#left-sidebar-container").html(rendered_sidebar);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function update_invite_user_option() {
|
|
||||||
if (
|
|
||||||
!settings_data.user_can_invite_users_by_email() &&
|
|
||||||
!settings_data.user_can_create_multiuse_invite()
|
|
||||||
) {
|
|
||||||
$("#right-sidebar .invite-user-link").hide();
|
|
||||||
} else {
|
|
||||||
$("#right-sidebar .invite-user-link").show();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function initialize_right_sidebar() {
|
function initialize_right_sidebar() {
|
||||||
const rendered_sidebar = render_right_sidebar({
|
const rendered_sidebar = render_right_sidebar({
|
||||||
realm_rendered_description: page_params.realm_rendered_description,
|
realm_rendered_description: page_params.realm_rendered_description,
|
||||||
});
|
});
|
||||||
|
|
||||||
$("#right-sidebar-container").html(rendered_sidebar);
|
$("#right-sidebar-container").html(rendered_sidebar);
|
||||||
update_invite_user_option();
|
sidebar_ui.update_invite_user_option();
|
||||||
if (page_params.is_spectator) {
|
if (page_params.is_spectator) {
|
||||||
rendered_markdown.update_elements(
|
rendered_markdown.update_elements(
|
||||||
$(".right-sidebar .realm-description .rendered_markdown"),
|
$(".right-sidebar .realm-description .rendered_markdown"),
|
||||||
|
|||||||
@@ -62,6 +62,7 @@ const settings_realm_domains = mock_esm("../src/settings_realm_domains");
|
|||||||
const settings_streams = mock_esm("../src/settings_streams");
|
const settings_streams = mock_esm("../src/settings_streams");
|
||||||
const settings_user_groups_legacy = mock_esm("../src/settings_user_groups_legacy");
|
const settings_user_groups_legacy = mock_esm("../src/settings_user_groups_legacy");
|
||||||
const settings_users = mock_esm("../src/settings_users");
|
const settings_users = mock_esm("../src/settings_users");
|
||||||
|
const sidebar_ui = mock_esm("../src/sidebar_ui");
|
||||||
const stream_data = mock_esm("../src/stream_data");
|
const stream_data = mock_esm("../src/stream_data");
|
||||||
const stream_events = mock_esm("../src/stream_events");
|
const stream_events = mock_esm("../src/stream_events");
|
||||||
const stream_list = mock_esm("../src/stream_list");
|
const stream_list = mock_esm("../src/stream_list");
|
||||||
@@ -77,7 +78,6 @@ mock_esm("../src/left_sidebar_navigation_area", {
|
|||||||
update_scheduled_messages_row() {},
|
update_scheduled_messages_row() {},
|
||||||
});
|
});
|
||||||
const typing_events = mock_esm("../src/typing_events");
|
const typing_events = mock_esm("../src/typing_events");
|
||||||
const ui_init = mock_esm("../src/ui_init");
|
|
||||||
const unread_ops = mock_esm("../src/unread_ops");
|
const unread_ops = mock_esm("../src/unread_ops");
|
||||||
const unread_ui = mock_esm("../src/unread_ui");
|
const unread_ui = mock_esm("../src/unread_ui");
|
||||||
const user_events = mock_esm("../src/user_events");
|
const user_events = mock_esm("../src/user_events");
|
||||||
@@ -418,7 +418,7 @@ run_test("realm settings", ({override}) => {
|
|||||||
override(settings_org, "sync_realm_settings", noop);
|
override(settings_org, "sync_realm_settings", noop);
|
||||||
override(settings_bots, "update_bot_permissions_ui", noop);
|
override(settings_bots, "update_bot_permissions_ui", noop);
|
||||||
override(settings_invites, "update_invite_user_panel", noop);
|
override(settings_invites, "update_invite_user_panel", noop);
|
||||||
override(ui_init, "update_invite_user_option", noop);
|
override(sidebar_ui, "update_invite_user_option", noop);
|
||||||
override(gear_menu, "initialize", noop);
|
override(gear_menu, "initialize", noop);
|
||||||
override(notifications, "redraw_title", noop);
|
override(notifications, "redraw_title", noop);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user