} an object with {[moduleName]: moduleVersion}
+ */
function getModuleListForNodes(nodes) {
const modules = {}
- nodes.forEach(n => {
- const nodeSet = RED.nodes.registry.getNodeSetForType(n.type)
- if (nodeSet) {
- modules[nodeSet.module] = nodeSet.version
+ const typeSet = new Set()
+ nodes.forEach((n) => {
+ if (!typeSet.has(n.type)) {
+ typeSet.add(n.type)
+ const nodeSet = RED.nodes.registry.getNodeSetForType(n.type)
+ if (nodeSet) {
+ modules[nodeSet.module] = nodeSet.version
+ nodeSet.types.forEach((t) => typeSet.add(t))
+ }
}
})
return modules
}
+
function updateGlobalConfigModuleList(nodes) {
const modules = getModuleListForNodes(nodes)
delete modules['node-red']
const hasModules = (Object.keys(modules).length > 0)
- let globalConfigNode = nodes.find(n => n.type === 'global-config')
+ let globalConfigNode = nodes.find((n) => n.type === 'global-config')
if (!globalConfigNode && hasModules) {
globalConfigNode = {
id: RED.nodes.id(),
@@ -3016,7 +3051,7 @@ RED.nodes = (function() {
modules
}
nodes.push(globalConfigNode)
- } else if (globalConfigNode) {
+ } else if (hasModules) {
globalConfigNode.modules = modules
}
}
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js
index 44e6146c8..76a64cb82 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js
@@ -626,6 +626,9 @@ RED.palette.editor = (function() {
})
RED.actions.add("core:manage-palette", function(opts) {
+ if (opts && opts.autoInstall && opts.modules) {
+ autoInstallModules(opts.modules);
+ } else {
RED.userSettings.show('palette');
if (opts) {
if (opts.view) {
@@ -639,7 +642,8 @@ RED.palette.editor = (function() {
}
}
}
- });
+ }
+ });
RED.events.on('registry:module-updated', function(ns) {
refreshNodeModule(ns.module);
@@ -1501,6 +1505,77 @@ RED.palette.editor = (function() {
})
}
+ function autoInstallModules(modules) {
+ if (RED.settings.get('externalModules.palette.allowInstall', true) === false) {
+ console.error(new Error('Palette not editable'));
+ return;
+ }
+
+ let notification;
+ const notificationOptions = {
+ fixed: true,
+ buttons: [
+ {
+ text: RED._("common.label.close"),
+ click: function () {
+ notification.close();
+ }
+ }, {
+ text: RED._("eventLog.view"),
+ click: function () {
+ notification.close();
+ RED.actions.invoke("core:show-event-log");
+ }
+ }
+ ]
+ };
+
+ const moduleArray = Object.entries(modules);
+ const installModule = function (module) {
+ const [moduleName, moduleVersion] = module;
+
+ const spinner = '';
+ const msg = "" + RED._("palette.editor.installing", { module: moduleName }) + "
" + spinner;
+
+ if (!notification) {
+ notification = RED.notify(msg, notificationOptions);
+ } else {
+ notification.update(msg, notificationOptions);
+ }
+
+ RED.eventLog.startEvent(RED._("palette.editor.confirm.button.install") + " : " + moduleName + " " + moduleVersion);
+
+ installNodeModule(moduleName, moduleVersion, undefined, function(xhr, textStatus, err) {
+ if (err && xhr.status === 504) {
+ notification.update(RED._("palette.editor.errors.installTimeout"), {
+ modal: true,
+ fixed: true,
+ buttons: notificationOptions.buttons
+ });
+ } else if (xhr) {
+ if (xhr.responseJSON) {
+ notification.update(RED._("palette.editor.errors.installFailed", { module: moduleName, message:xhr.responseJSON.message }), {
+ type: "error",
+ modal: true,
+ fixed: true,
+ buttons: notificationOptions.buttons
+ });
+ }
+ } else {
+ if (moduleArray.length) {
+ installModule(moduleArray.shift());
+ } else {
+ notification.update(RED._("palette.editor.successfulInstall"), { ...notificationOptions, type: "success", timeout: 10000 });
+ }
+ }
+ });
+ };
+
+ if (moduleArray.length) {
+ installModule(moduleArray.shift());
+ }
+ }
+
return {
init: init,
install: install
diff --git a/packages/node_modules/@node-red/nodes/core/common/98-unknown.html b/packages/node_modules/@node-red/nodes/core/common/98-unknown.html
index 282ad3415..64c9e8e4e 100644
--- a/packages/node_modules/@node-red/nodes/core/common/98-unknown.html
+++ b/packages/node_modules/@node-red/nodes/core/common/98-unknown.html
@@ -3,7 +3,7 @@
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index bc89992e2..4cfe835e1 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -406,7 +406,8 @@
"label": {
"unknown": "unknown"
},
- "tip": "This node is a type unknown to your installation of Node-RED.
If you deploy with the node in this state, it's configuration will be preserved, but the flow will not start until the missing type is installed.
See the Info side bar for more help
"
+ "manageModules": "Manage modules",
+ "tip": "This node is a type unknown to your installation of Node-RED.
If you deploy with the node in this state, it's configuration will be preserved, but the flow will not start until the missing type is installed.
See the Info side bar for more help
You can also click the button below to open the palette and install the missing modules.
"
},
"mqtt": {
"label": {
