Skip to content

Allows for refreshBlocks and refreshDynamicCategorys to specify only a single extension #133

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.

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

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 34 additions & 16 deletions src/extension-support/extension-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -534,41 +534,59 @@ class ExtensionManager {
}

/**
* Regenerate blockinfo for all loaded dynamic extensions
* Regenerate blockinfo for all (or one) loaded dynamic extensions
* @param {string} [extension] optional extension id
* @returns {Promise} resolved once all the extensions have been reinitialized
*/
refreshDynamicCategorys() {
if (!this._loadedExtensions) return Promise.reject('_loadedExtensions is not readable yet');
const allPromises = Array.from(this._loadedExtensions.values()).map(serviceName =>
dispatch.call(serviceName, 'getInfo')
refreshDynamicCategorys(extension) {
const refresh_service = service =>
dispatch.call(service, 'getInfo')
.then(info => {
info = this._prepareExtensionInfo(serviceName, info);
info = this._prepareExtensionInfo(service, info);
if (!info.isDynamic) return;
dispatch.call('runtime', '_refreshExtensionPrimitives', info);
})
.catch(e => {
log.error(`Failed to refresh built-in extension primitives: ${e}`);
})
);
return Promise.all(allPromises);

if (!this._loadedExtensions) return Promise.reject('_loadedExtensions is not readable yet');
if (!extension) {
const all_services = Array.from(this._loadedExtensions.values()).map(refresh_service);
return Promise.all(all_services);
}
if (!this._loadedExtensions.has(extension)) {
return Promise.reject(new Error(`Unknown extension: ${extension}`));
}

return refresh_service(this._loadedExtensions.get(extension));
}

/**
* Regenerate blockinfo for any loaded extensions
* Regenerate blockinfo for all (or one) loaded extensions
* @param {string} [extension] optional extension id
* @returns {Promise} resolved once all the extensions have been reinitialized
*/
refreshBlocks() {
const allPromises = Array.from(this._loadedExtensions.values()).map(serviceName =>
dispatch.call(serviceName, 'getInfo')
refreshBlocks(extension) {
const refresh_service = service =>
dispatch.call(service, 'getInfo')
.then(info => {
info = this._prepareExtensionInfo(serviceName, info);
info = this._prepareExtensionInfo(service, info);
dispatch.call('runtime', '_refreshExtensionPrimitives', info);
})
.catch(e => {
log.error(`Failed to refresh built-in extension primitives: ${e}`);
})
);
return Promise.all(allPromises);
});

if (!extension) {
const all_services = Array.from(this._loadedExtensions.values()).map(refresh_service);
return Promise.all(all_services);
}
if (!this._loadedExtensions.has(extension)) {
return Promise.reject(new Error(`Unknown extension: ${extension}`));
}

return refresh_service(this._loadedExtensions.get(extension));
}

prepareSwap(id) {
Expand Down