From 8a19f71abe700774b4c45c0d5e682ada90800812 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Mon, 25 Oct 2021 20:48:01 +0100 Subject: [PATCH] Refresh editor settings whenever a node is added or enabled Fixes #3217 This ensures any node-provided settings are loaded and ready for use by the nodes --- .../@node-red/editor-client/src/js/red.js | 92 ++++++++++--------- .../editor-client/src/js/settings.js | 32 ++++--- 2 files changed, 68 insertions(+), 56 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/red.js b/packages/node_modules/@node-red/editor-client/src/js/red.js index fc4f9fc82..517cbf316 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/red.js +++ b/packages/node_modules/@node-red/editor-client/src/js/red.js @@ -475,31 +475,33 @@ var RED = (function() { var typeList; var info; if (topic == "notification/node/added") { - var addedTypes = []; - msg.forEach(function(m) { - var id = m.id; - RED.nodes.addNodeSet(m); - addedTypes = addedTypes.concat(m.types); - RED.i18n.loadNodeCatalog(id, function() { - var lang = localStorage.getItem("editor-language")||RED.i18n.detectLanguage(); - $.ajax({ - headers: { - "Accept":"text/html", - "Accept-Language": lang - }, - cache: false, - url: 'nodes/'+id, - success: function(data) { - appendNodeConfig(data); - } + RED.settings.refreshSettings(function(err, data) { + var addedTypes = []; + msg.forEach(function(m) { + var id = m.id; + RED.nodes.addNodeSet(m); + addedTypes = addedTypes.concat(m.types); + RED.i18n.loadNodeCatalog(id, function() { + var lang = localStorage.getItem("editor-language")||RED.i18n.detectLanguage(); + $.ajax({ + headers: { + "Accept":"text/html", + "Accept-Language": lang + }, + cache: false, + url: 'nodes/'+id, + success: function(data) { + appendNodeConfig(data); + } + }); }); }); - }); - if (addedTypes.length) { - typeList = ""; - RED.notify(RED._("palette.event.nodeAdded", {count:addedTypes.length})+typeList,"success"); - } - loadIconList(); + if (addedTypes.length) { + typeList = ""; + RED.notify(RED._("palette.event.nodeAdded", {count:addedTypes.length})+typeList,"success"); + } + loadIconList(); + }) } else if (topic == "notification/node/removed") { for (i=0;i
  • ")+"
    • "; - RED.notify(RED._("palette.event.nodeEnabled", {count:msg.types.length})+typeList,"success"); - } else { - var lang = localStorage.getItem("editor-language")||RED.i18n.detectLanguage(); - $.ajax({ - headers: { - "Accept":"text/html", - "Accept-Language": lang - }, - cache: false, - url: 'nodes/'+msg.id, - success: function(data) { - appendNodeConfig(data); - typeList = ""; - RED.notify(RED._("palette.event.nodeAdded", {count:msg.types.length})+typeList,"success"); - } - }); - } + RED.settings.refreshSettings(function(err, data) { + info = RED.nodes.getNodeSet(msg.id); + if (info.added) { + RED.nodes.enableNodeSet(msg.id); + typeList = ""; + RED.notify(RED._("palette.event.nodeEnabled", {count:msg.types.length})+typeList,"success"); + } else { + var lang = localStorage.getItem("editor-language")||RED.i18n.detectLanguage(); + $.ajax({ + headers: { + "Accept":"text/html", + "Accept-Language": lang + }, + cache: false, + url: 'nodes/'+msg.id, + success: function(data) { + appendNodeConfig(data); + typeList = ""; + RED.notify(RED._("palette.event.nodeAdded", {count:msg.types.length})+typeList,"success"); + } + }); + } + }); } } else if (topic == "notification/node/disabled") { if (msg.types) { diff --git a/packages/node_modules/@node-red/editor-client/src/js/settings.js b/packages/node_modules/@node-red/editor-client/src/js/settings.js index 1c6513c43..c9a24d636 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/settings.js +++ b/packages/node_modules/@node-red/editor-client/src/js/settings.js @@ -125,7 +125,7 @@ RED.settings = (function () { load(done); } - var load = function(done) { + var refreshSettings = function(done) { $.ajax({ headers: { "Accept": "application/json" @@ -135,6 +135,23 @@ RED.settings = (function () { url: 'settings', success: function (data) { setProperties(data); + done(null, data); + }, + error: function(jqXHR,textStatus,errorThrown) { + if (jqXHR.status === 401) { + if (/[?&]access_token=(.*?)(?:$|&)/.test(window.location.search)) { + window.location.search = ""; + } + RED.user.login(function() { refreshSettings(done); }); + } else { + console.log("Unexpected error loading settings:",jqXHR.status,textStatus); + } + } + }); + } + var load = function(done) { + refreshSettings(function(err, data) { + if (!err) { if (!RED.settings.user || RED.settings.user.anonymous) { RED.settings.remove("auth-tokens"); } @@ -147,18 +164,8 @@ RED.settings = (function () { console.log("D3",d3.version); console.groupEnd(); loadUserSettings(done); - }, - error: function(jqXHR,textStatus,errorThrown) { - if (jqXHR.status === 401) { - if (/[?&]access_token=(.*?)(?:$|&)/.test(window.location.search)) { - window.location.search = ""; - } - RED.user.login(function() { load(done); }); - } else { - console.log("Unexpected error loading settings:",jqXHR.status,textStatus); - } } - }); + }) }; function loadUserSettings(done) { @@ -234,6 +241,7 @@ RED.settings = (function () { init: init, load: load, loadUserSettings: loadUserSettings, + refreshSettings: refreshSettings, set: set, get: get, remove: remove,