Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Block fetching the settings for a plugin that is disabled. #7147

Merged
merged 20 commits into from Dec 6, 2019
Merged

Block fetching the settings for a plugin that is disabled. #7147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a16b144
Block fetching the settings for a plugin that is disabled.
afshin Sep 3, 2019
e93fe11
Address @vidartf's comments.
afshin Sep 4, 2019
60a0951
Remove deprecated shortcuts plugin.
afshin Sep 5, 2019
9790572
Add Extension namespace and functions to PageConfig.
afshin Sep 6, 2019
998330c
Remove filtering from settings service.
afshin Sep 6, 2019
fe022a6
Handle setting plugin filtering at the setting registry plugin level …
afshin Sep 6, 2019
0682f78
Update dev_mode index file to use new PageConfig functions and fix di…
afshin Sep 6, 2019
fa131df
Remove superfluous type annotation.
afshin Sep 6, 2019
50bd812
Update staging index.
afshin Sep 6, 2019
b2ad4a7
Clean up disabled/deferred handling.
afshin Sep 6, 2019
79f9c42
minor update
afshin Sep 9, 2019
0430acd
Add a query to the setting registry list method.
afshin Sep 10, 2019
b8a6ac9
Add optional query typeparam to data connector. cc: @jasongrout @saul…
afshin Sep 10, 2019
58d12d8
Load deferred plugins manually after the application has restored
afshin Sep 10, 2019
cd82a4a
Update deferred settings load logic.
afshin Sep 11, 2019
74a7a76
Shorten setting registry transform timeout.
afshin Sep 11, 2019
812f0bc
Try to load deferred extensions settings after the application has re…
afshin Sep 11, 2019
cf6955a
Update doc strings
afshin Sep 12, 2019
750dcfe
Update message.
afshin Sep 12, 2019
531b190
Move setting connector to its own file and clarify loading deferred p…
afshin Dec 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
149 changes: 47 additions & 102 deletions dev_mode/index.js
View file
Open in desktop
Expand Up @@ -21,89 +21,38 @@ require('./imports.css');
*/
function main() {
var JupyterLab = require('@jupyterlab/application').JupyterLab;

// Get the disabled extensions.
var disabled = { patterns: [], matches: [] };
var disabledExtensions = [];
try {
var tempDisabled = PageConfig.getOption('disabledExtensions');
if (tempDisabled) {
disabledExtensions = JSON.parse(tempDisabled).map(function(pattern) {
disabled.patterns.push(pattern);
return { raw: pattern, rule: new RegExp(pattern) };
});
}
} catch (error) {
console.warn('Unable to parse disabled extensions.', error);
}

// Get the deferred extensions.
var deferred = { patterns: [], matches: [] };
var deferredExtensions = [];
var disabled = [];
var deferred = [];
var ignorePlugins = [];
try {
var tempDeferred = PageConfig.getOption('deferredExtensions');
if (tempDeferred) {
deferredExtensions = JSON.parse(tempDeferred).map(function(pattern) {
deferred.patterns.push(pattern);
return { raw: pattern, rule: new RegExp(pattern) };
});
}
} catch (error) {
console.warn('Unable to parse deferred extensions.', error);
}

function isDeferred(value) {
return deferredExtensions.some(function(pattern) {
return pattern.raw === value || pattern.rule.test(value);
});
}

function isDisabled(value) {
return disabledExtensions.some(function(pattern) {
return pattern.raw === value || pattern.rule.test(value);
});
}

var register = [];

// Handle the registered mime extensions.
var mimeExtensions = [];
var extension;
var extMod;
var plugins = [];
{{#each jupyterlab_mime_extensions}}
try {
if (isDeferred('{{key}}')) {
deferred.matches.push('{{key}}');
ignorePlugins.push('{{key}}');
extMod = require('{{@key}}/{{this}}');
extension = extMod.default;

// Handle CommonJS exports.
if (!extMod.hasOwnProperty('__esModule')) {
extension = extMod;
}
if (isDisabled('{{@key}}')) {
disabled.matches.push('{{@key}}');
} else {
extMod = require('{{@key}}/{{this}}');
extension = extMod.default;

// Handle CommonJS exports.
if (!extMod.hasOwnProperty('__esModule')) {
extension = extMod;
}

if (Array.isArray(extension)) {
extension.forEach(function(plugin) {
if (isDeferred(plugin.id)) {
deferred.matches.push(plugin.id);
ignorePlugins.push(plugin.id);
}
if (isDisabled(plugin.id)) {
disabled.matches.push(plugin.id);
return;
}
mimeExtensions.push(plugin);
});
} else {
mimeExtensions.push(extension);
plugins = Array.isArray(extension) ? extension : [extension];
plugins.forEach(function(plugin) {
if (PageConfig.Extension.isDeferred(plugin.id)) {
deferred.push(plugin.id);
ignorePlugins.push(plugin.id);
}
}
if (PageConfig.Extension.isDisabled(plugin.id)) {
disabled.push(plugin.id);
return;
}
mimeExtensions.push(plugin);
});
} catch (e) {
console.error(e);
}
Expand All @@ -112,46 +61,42 @@ function main() {
// Handled the registered standard extensions.
{{#each jupyterlab_extensions}}
try {
if (isDeferred('{{key}}')) {
deferred.matches.push('{{key}}');
ignorePlugins.push('{{key}}');
extMod = require('{{@key}}/{{this}}');
extension = extMod.default;

// Handle CommonJS exports.
if (!extMod.hasOwnProperty('__esModule')) {
extension = extMod;
}
if (isDisabled('{{@key}}')) {
disabled.matches.push('{{@key}}');
} else {
extMod = require('{{@key}}/{{this}}');
extension = extMod.default;

// Handle CommonJS exports.
if (!extMod.hasOwnProperty('__esModule')) {
extension = extMod;
}

if (Array.isArray(extension)) {
extension.forEach(function(plugin) {
if (isDeferred(plugin.id)) {
deferred.matches.push(plugin.id);
ignorePlugins.push(plugin.id);
}
if (isDisabled(plugin.id)) {
disabled.matches.push(plugin.id);
return;
}
register.push(plugin);
});
} else {
register.push(extension);
plugins = Array.isArray(extension) ? extension : [extension];
plugins.forEach(function(plugin) {
if (PageConfig.Extension.isDeferred(plugin.id)) {
deferred.push(plugin.id);
ignorePlugins.push(plugin.id);
}
}
if (PageConfig.Extension.isDisabled(plugin.id)) {
disabled.push(plugin.id);
return;
}
register.push(plugin);
});
} catch (e) {
console.error(e);
}
{{/each}}

var lab = new JupyterLab({
mimeExtensions: mimeExtensions,
disabled: disabled,
deferred: deferred
disabled: {
matches: disabled,
patterns: PageConfig.Extension.disabled
.map(function (val) { return val.raw; })
},
deferred: {
matches: deferred,
patterns: PageConfig.Extension.deferred
.map(function (val) { return val.raw; })
},
});
register.forEach(function(item) { lab.registerPluginModule(item); });
lab.start({ ignorePlugins: ignorePlugins });
Expand Down
149 changes: 47 additions & 102 deletions jupyterlab/staging/index.js
View file
Open in desktop
Expand Up @@ -21,89 +21,38 @@ require('./imports.css');
*/
function main() {
var JupyterLab = require('@jupyterlab/application').JupyterLab;

// Get the disabled extensions.
var disabled = { patterns: [], matches: [] };
var disabledExtensions = [];
try {
var tempDisabled = PageConfig.getOption('disabledExtensions');
if (tempDisabled) {
disabledExtensions = JSON.parse(tempDisabled).map(function(pattern) {
disabled.patterns.push(pattern);
return { raw: pattern, rule: new RegExp(pattern) };
});
}
} catch (error) {
console.warn('Unable to parse disabled extensions.', error);
}

// Get the deferred extensions.
var deferred = { patterns: [], matches: [] };
var deferredExtensions = [];
var disabled = [];
var deferred = [];
var ignorePlugins = [];
try {
var tempDeferred = PageConfig.getOption('deferredExtensions');
if (tempDeferred) {
deferredExtensions = JSON.parse(tempDeferred).map(function(pattern) {
deferred.patterns.push(pattern);
return { raw: pattern, rule: new RegExp(pattern) };
});
}
} catch (error) {
console.warn('Unable to parse deferred extensions.', error);
}

function isDeferred(value) {
return deferredExtensions.some(function(pattern) {
return pattern.raw === value || pattern.rule.test(value);
});
}

function isDisabled(value) {
return disabledExtensions.some(function(pattern) {
return pattern.raw === value || pattern.rule.test(value);
});
}

var register = [];

// Handle the registered mime extensions.
var mimeExtensions = [];
var extension;
var extMod;
var plugins = [];
{{#each jupyterlab_mime_extensions}}
try {
if (isDeferred('{{key}}')) {
deferred.matches.push('{{key}}');
ignorePlugins.push('{{key}}');
extMod = require('{{@key}}/{{this}}');
extension = extMod.default;

// Handle CommonJS exports.
if (!extMod.hasOwnProperty('__esModule')) {
extension = extMod;
}
if (isDisabled('{{@key}}')) {
disabled.matches.push('{{@key}}');
} else {
extMod = require('{{@key}}/{{this}}');
extension = extMod.default;

// Handle CommonJS exports.
if (!extMod.hasOwnProperty('__esModule')) {
extension = extMod;
}

if (Array.isArray(extension)) {
extension.forEach(function(plugin) {
if (isDeferred(plugin.id)) {
deferred.matches.push(plugin.id);
ignorePlugins.push(plugin.id);
}
if (isDisabled(plugin.id)) {
disabled.matches.push(plugin.id);
return;
}
mimeExtensions.push(plugin);
});
} else {
mimeExtensions.push(extension);
plugins = Array.isArray(extension) ? extension : [extension];
plugins.forEach(function(plugin) {
if (PageConfig.Extension.isDeferred(plugin.id)) {
deferred.push(plugin.id);
ignorePlugins.push(plugin.id);
}
}
if (PageConfig.Extension.isDisabled(plugin.id)) {
disabled.push(plugin.id);
return;
}
mimeExtensions.push(plugin);
});
} catch (e) {
console.error(e);
}
Expand All @@ -112,46 +61,42 @@ function main() {
// Handled the registered standard extensions.
{{#each jupyterlab_extensions}}
try {
if (isDeferred('{{key}}')) {
deferred.matches.push('{{key}}');
ignorePlugins.push('{{key}}');
extMod = require('{{@key}}/{{this}}');
extension = extMod.default;

// Handle CommonJS exports.
if (!extMod.hasOwnProperty('__esModule')) {
extension = extMod;
}
if (isDisabled('{{@key}}')) {
disabled.matches.push('{{@key}}');
} else {
extMod = require('{{@key}}/{{this}}');
extension = extMod.default;

// Handle CommonJS exports.
if (!extMod.hasOwnProperty('__esModule')) {
extension = extMod;
}

if (Array.isArray(extension)) {
extension.forEach(function(plugin) {
if (isDeferred(plugin.id)) {
deferred.matches.push(plugin.id);
ignorePlugins.push(plugin.id);
}
if (isDisabled(plugin.id)) {
disabled.matches.push(plugin.id);
return;
}
register.push(plugin);
});
} else {
register.push(extension);
plugins = Array.isArray(extension) ? extension : [extension];
plugins.forEach(function(plugin) {
if (PageConfig.Extension.isDeferred(plugin.id)) {
deferred.push(plugin.id);
ignorePlugins.push(plugin.id);
}
}
if (PageConfig.Extension.isDisabled(plugin.id)) {
disabled.push(plugin.id);
return;
}
register.push(plugin);
});
} catch (e) {
console.error(e);
}
{{/each}}

var lab = new JupyterLab({
mimeExtensions: mimeExtensions,
disabled: disabled,
deferred: deferred
disabled: {
matches: disabled,
patterns: PageConfig.Extension.disabled
.map(function (val) { return val.raw; })
},
deferred: {
matches: deferred,
patterns: PageConfig.Extension.deferred
.map(function (val) { return val.raw; })
},
});
register.forEach(function(item) { lab.registerPluginModule(item); });
lab.start({ ignorePlugins: ignorePlugins });
Expand Down