admin/settings: Lazy-load Organization sections.

We now wait to load Organization sections until you
click on the section (or virtually click by using arrow
keys).

Some of the sections are coupled in terms of their setup,
so some sections will already be loaded if you had clicked
on a related section.
This commit is contained in:
Steve Howell 2017-04-17 07:51:27 -07:00 committed by Tim Abbott
parent 79e48dc222
commit 22e21cddcb
11 changed files with 116 additions and 16 deletions

View File

@ -96,6 +96,7 @@
"stream_popover": false, "stream_popover": false,
"narrow": false, "narrow": false,
"narrow_state": false, "narrow_state": false,
"admin_sections": false,
"admin": false, "admin": false,
"stream_data": false, "stream_data": false,
"list_util": false, "list_util": false,

View File

@ -1,8 +1,5 @@
var admin = (function () { var admin = (function () {
var meta = {
loaded: false,
};
var exports = {}; var exports = {};
exports.show_or_hide_menu_item = function () { exports.show_or_hide_menu_item = function () {
@ -54,6 +51,10 @@ function _setup_page() {
$("#settings_content .organization-box").html(admin_tab); $("#settings_content .organization-box").html(admin_tab);
$("#settings_content .alert").removeClass("show"); $("#settings_content .alert").removeClass("show");
// Since we just swapped in a whole new page, we need to
// tell admin_sections nothing is loaded.
admin_sections.reset_sections();
var tab = (function () { var tab = (function () {
var tab = false; var tab = false;
var hash_sequence = window.location.hash.split(/\//); var hash_sequence = window.location.hash.split(/\//);
@ -70,16 +71,6 @@ function _setup_page() {
$("#id_realm_default_language").val(page_params.realm_default_language); $("#id_realm_default_language").val(page_params.realm_default_language);
// We set this flag before we're fully loaded so that the populate
// methods don't short-circuit.
meta.loaded = true;
settings_org.set_up();
settings_emoji.set_up();
settings_users.set_up();
settings_streams.set_up();
settings_filters.set_up();
// Do this after calling the setup_up methods, so that we can // Do this after calling the setup_up methods, so that we can
// disable any dynamically rendered elements. // disable any dynamically rendered elements.
exports.show_or_hide_menu_item(); exports.show_or_hide_menu_item();

View File

@ -0,0 +1,79 @@
var admin_sections = (function () {
var exports = {};
var is_loaded = new Dict(); // section -> bool
exports.load_admin_section = function (name) {
var section;
switch (name) {
case 'organization-settings':
case 'auth-methods':
section = 'org';
break;
case 'emoji-settings':
section = 'emoji';
break;
case 'bot-list-admin':
case 'user-list-admin':
case 'deactivated-users-admin':
section = 'users';
break;
case 'streams-list-admin':
case 'default-streams-list':
section = 'streams';
break;
case 'filter-settings':
section = 'filters';
break;
default:
blueslip.error('Unknown admin id ' + name);
return;
}
if (is_loaded.get(section)) {
// We only load sections once (unless somebody calls
// reset_sections).
return;
}
switch (section) {
case 'org':
settings_org.set_up();
break;
case 'emoji':
settings_emoji.set_up();
break;
case 'users':
settings_users.set_up();
break;
case 'streams':
settings_streams.set_up();
break;
case 'filters':
settings_filters.set_up();
break;
default:
blueslip.error('programming error for section ' + section);
return;
}
is_loaded.set(section, true);
};
exports.reset_sections = function () {
is_loaded.clear();
settings_org.reset();
settings_emoji.reset();
settings_users.reset();
settings_streams.reset();
settings_filters.reset();
};
return exports;
}());
if (typeof module !== 'undefined') {
module.exports = admin_sections;
}

View File

@ -599,14 +599,22 @@ $(function () {
$this.addClass("active"); $this.addClass("active");
$this.prev().addClass("no-border"); $this.prev().addClass("no-border");
if ($this.hasClass("admin")) { var is_org_section = $this.hasClass("admin");
if (is_org_section) {
window.location.hash = "organization/" + section; window.location.hash = "organization/" + section;
} else { } else {
window.location.hash = "settings/" + section; window.location.hash = "settings/" + section;
} }
$(".settings-section, .settings-wrapper").removeClass("show"); $(".settings-section, .settings-wrapper").removeClass("show");
if (is_org_section) {
admin_sections.load_admin_section(section);
} else {
settings_sections.load_settings_section(section); settings_sections.load_settings_section(section);
}
$(".settings-section" + sel + ", .settings-wrapper" + sel).addClass("show"); $(".settings-section" + sel + ", .settings-wrapper" + sel).addClass("show");
}); });

View File

@ -6,6 +6,10 @@ var meta = {
loaded: false, loaded: false,
}; };
exports.reset = function () {
meta.loaded = false;
};
exports.populate_emoji = function (emoji_data) { exports.populate_emoji = function (emoji_data) {
if (!meta.loaded) { if (!meta.loaded) {
return; return;

View File

@ -6,6 +6,10 @@ var meta = {
loaded: false, loaded: false,
}; };
exports.reset = function () {
meta.loaded = false;
};
exports.populate_filters = function (filters_data) { exports.populate_filters = function (filters_data) {
if (!meta.loaded) { if (!meta.loaded) {
return; return;

View File

@ -6,6 +6,10 @@ var meta = {
loaded: false, loaded: false,
}; };
exports.reset = function () {
meta.loaded = false;
};
exports.populate_realm_domains = function (realm_domains) { exports.populate_realm_domains = function (realm_domains) {
if (!meta.loaded) { if (!meta.loaded) {
return; return;

View File

@ -18,7 +18,7 @@ exports.initialize = function () {
exports.load_settings_section = function (section) { exports.load_settings_section = function (section) {
if (!load_func_dict.has(section)) { if (!load_func_dict.has(section)) {
// admin sections don't have loaders yet, and that's ok blueslip.error('Unknown section ' + section);
return; return;
} }

View File

@ -6,6 +6,10 @@ var meta = {
loaded: false, loaded: false,
}; };
exports.reset = function () {
meta.loaded = false;
};
var all_streams = []; var all_streams = [];
function failed_listing_streams(xhr) { function failed_listing_streams(xhr) {

View File

@ -6,6 +6,10 @@ var meta = {
loaded: false, loaded: false,
}; };
exports.reset = function () {
meta.loaded = false;
};
function get_user_info(user_id) { function get_user_info(user_id) {
var self = {}; var self = {};
self.user_row = $("tr.user_row[data-user-id='" + user_id + "']"); self.user_row = $("tr.user_row[data-user-id='" + user_id + "']");

View File

@ -923,6 +923,7 @@ JS_SPECS = {
'js/settings_streams.js', 'js/settings_streams.js',
'js/settings_filters.js', 'js/settings_filters.js',
'js/settings.js', 'js/settings.js',
'js/admin_sections.js',
'js/admin.js', 'js/admin.js',
'js/tab_bar.js', 'js/tab_bar.js',
'js/emoji.js', 'js/emoji.js',