From c855050bcf3929ab412ffd9072b10a41e44d3038 Mon Sep 17 00:00:00 2001 From: Joshua Carter Date: Mon, 15 Apr 2024 08:09:26 -0700 Subject: [PATCH 1/5] Fix three error typos in monaco.js --- .../editor-client/src/js/ui/editors/code-editors/monaco.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/monaco.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/monaco.js index eedc99c88..9f104faaf 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/monaco.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/monaco.js @@ -514,7 +514,7 @@ RED.editor.codeEditor.monaco = (function() { _monaco.languages.json.jsonDefaults.setDiagnosticsOptions(diagnosticOptions); if(modeConfiguration) { _monaco.languages.json.jsonDefaults.setModeConfiguration(modeConfiguration); } } catch (error) { - console.warn("monaco - Error setting up json options", err) + console.warn("monaco - Error setting up json options", error) } } @@ -526,7 +526,7 @@ RED.editor.codeEditor.monaco = (function() { if(htmlDefaults) { _monaco.languages.html.htmlDefaults.setOptions(htmlDefaults); } if(handlebarDefaults) { _monaco.languages.html.handlebarDefaults.setOptions(handlebarDefaults); } } catch (error) { - console.warn("monaco - Error setting up html options", err) + console.warn("monaco - Error setting up html options", error) } } @@ -546,7 +546,7 @@ RED.editor.codeEditor.monaco = (function() { if(lessDefaults_modeConfiguration) { _monaco.languages.css.cssDefaults.setDiagnosticsOptions(lessDefaults_modeConfiguration); } if(scssDefaults_modeConfiguration) { _monaco.languages.css.cssDefaults.setDiagnosticsOptions(scssDefaults_modeConfiguration); } } catch (error) { - console.warn("monaco - Error setting up CSS/SCSS/LESS options", err) + console.warn("monaco - Error setting up CSS/SCSS/LESS options", error) } } From c2e03a40b47665a7b3a17e6574763023ce8b058c Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Sat, 20 Apr 2024 14:20:59 +0200 Subject: [PATCH 2/5] docs: Add closing paragraph tag Minor change that only improves xpath parsing. --- .../@node-red/nodes/locales/en-US/sequence/17-split.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/sequence/17-split.html b/packages/node_modules/@node-red/nodes/locales/en-US/sequence/17-split.html index cf1697b5a..e64d73f17 100644 --- a/packages/node_modules/@node-red/nodes/locales/en-US/sequence/17-split.html +++ b/packages/node_modules/@node-red/nodes/locales/en-US/sequence/17-split.html @@ -103,7 +103,7 @@

Automatic mode

Automatic mode uses the parts property of incoming messages to determine how the sequence should be joined. This allows it to automatically - reverse the action of a split node. + reverse the action of a split node.

Manual mode

When configured to join in manual mode, the node is able to join sequences From de7339ae97f4fd2703c667fba7ae98f4126db279 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Tue, 23 Apr 2024 20:39:14 +0200 Subject: [PATCH 3/5] Fix undo of subflow env property edits --- .../node_modules/@node-red/editor-client/src/js/ui/editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js index 11fdac279..705743b34 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js @@ -1623,8 +1623,8 @@ RED.editor = (function() { } if (!isSameObj(old_env, new_env)) { - editing_node.env = new_env; editState.changes.env = editing_node.env; + editing_node.env = new_env; editState.changed = true; } From 960af87fb0420e31264f8da9509f23b8e01ff88c Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Tue, 23 Apr 2024 21:17:35 +0200 Subject: [PATCH 4/5] Ensure subflow change state is cleared after deploy --- .../node_modules/@node-red/editor-client/src/js/ui/deploy.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js b/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js index a09fdeb01..1e6cf954b 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js @@ -612,7 +612,10 @@ RED.deploy = (function() { } }); RED.nodes.eachSubflow(function (subflow) { - subflow.changed = false; + if (subflow.changed) { + subflow.changed = false; + RED.events.emit("subflows:change", subflow); + } }); RED.nodes.eachWorkspace(function (ws) { if (ws.changed || ws.added) { From b27483de9c082eaca77976cc3c6d951c2301481a Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Wed, 8 May 2024 15:09:51 +0100 Subject: [PATCH 5/5] Avoid login loops when autoLogin enabled but login fails Fixes #4363 --- .../node_modules/@node-red/editor-api/lib/auth/index.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/node_modules/@node-red/editor-api/lib/auth/index.js b/packages/node_modules/@node-red/editor-api/lib/auth/index.js index eefdd85e0..e39e972db 100644 --- a/packages/node_modules/@node-red/editor-api/lib/auth/index.js +++ b/packages/node_modules/@node-red/editor-api/lib/auth/index.js @@ -205,9 +205,10 @@ function genericStrategy(adminApp,strategy) { passport.use(new strategy.strategy(options, verify)); adminApp.get('/auth/strategy', - passport.authenticate(strategy.name, {session:false, + passport.authenticate(strategy.name, { + session:false, failureMessage: true, - failureRedirect: settings.httpAdminRoot + failureRedirect: settings.httpAdminRoot + '?session_message=Login Failed' }), completeGenerateStrategyAuth, handleStrategyError @@ -221,7 +222,7 @@ function genericStrategy(adminApp,strategy) { passport.authenticate(strategy.name, { session:false, failureMessage: true, - failureRedirect: settings.httpAdminRoot + failureRedirect: settings.httpAdminRoot + '?session_message=Login Failed' }), completeGenerateStrategyAuth, handleStrategyError