frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle modified-nodes deploy after replacing unknown config node

Browse Source 
Fixes #4548
This commit is contained in:
Nick O'Leary 2024-02-05 16:22:58 +00:00
parent 9bd7131914
commit 565c212779
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js vendored
View File

@ -1000,7 +1000,6 @@ RED.clipboard = (function() {
try { try {
RED.view.importNodes(newNodes, importOptions); RED.view.importNodes(newNodes, importOptions);
} catch(error) { } catch(error) {
console.log(error.importConfig)
// Thrown for import_conflict // Thrown for import_conflict
confirmImport(error.importConfig, newNodes, importOptions); confirmImport(error.importConfig, newNodes, importOptions);
} }

7
packages/node_modules/@node-red/runtime/lib/flows/index.js vendored
View File

@ -374,7 +374,12 @@ async function start(type,diff,muteLog,isDeploy) {
// A modified-type deploy means restarting things that have changed // A modified-type deploy means restarting things that have changed
// Update the global flow // Update the global flow
activeFlows['global'].update(activeFlowConfig,activeFlowConfig); if (activeFlows['global']) {
activeFlows['global'].update(activeFlowConfig,activeFlowConfig);
} else {
log.debug("red/nodes/flows.start : starting flow : global");
activeFlows['global'] = Flow.create(flowAPI,activeFlowConfig);
}
for (id in activeFlowConfig.flows) { for (id in activeFlowConfig.flows) {
if (activeFlowConfig.flows.hasOwnProperty(id)) { if (activeFlowConfig.flows.hasOwnProperty(id)) {
if (!activeFlowConfig.flows[id].disabled) { if (!activeFlowConfig.flows[id].disabled) {