From af195362224ec5eb47e6ab4d29fa534adbd5f0aa Mon Sep 17 00:00:00 2001
From: Nick O'Leary <knolleary@users.noreply.github.com>
Date: Wed, 6 Jan 2021 17:36:59 +0000
Subject: [PATCH] Better logging when deprecated editorTheme.palette.* settings
 used

---
 .../editor-client/src/js/ui/palette-editor.js     |  3 ---
 .../@node-red/registry/lib/installer.js           |  8 ++++++++
 .../@node-red/runtime/lib/api/settings.js         | 15 ++++++++++++++-
 .../node_modules/@node-red/runtime/lib/index.js   |  4 ++--
 .../@node-red/runtime/locales/en-US/runtime.json  |  2 +-
 5 files changed, 25 insertions(+), 7 deletions(-)

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 3dbff87a3..4b36f671c 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
@@ -520,9 +520,6 @@ RED.palette.editor = (function() {
         installAllowList = parseModuleList(installAllowList);
         installDenyList = parseModuleList(installDenyList);
 
-        console.log(installAllowList);
-        console.log(installDenyList);
-
         createSettingsPane();
 
         RED.userSettings.add({
diff --git a/packages/node_modules/@node-red/registry/lib/installer.js b/packages/node_modules/@node-red/registry/lib/installer.js
index bde1f0f3d..c5588bb95 100644
--- a/packages/node_modules/@node-red/registry/lib/installer.js
+++ b/packages/node_modules/@node-red/registry/lib/installer.js
@@ -362,6 +362,14 @@ function uninstallModule(module) {
 }
 
 async function checkPrereq() {
+    if (settings.editorTheme && settings.editorTheme.palette) {
+        if (settings.editorTheme.palette.hasOwnProperty("editable")) {
+            log.warn(log._("server.deprecatedOption",{old:"editorTheme.palette.editable", new:"externalModules.palette.allowInstall"}));
+        }
+        if (settings.editorTheme.palette.hasOwnProperty("upload")) {
+            log.warn(log._("server.deprecatedOption",{old:"editorTheme.palette.upload", new:"externalModules.palette.allowUpload"}));
+        }
+    }
 
     try {
         if (settings.editorTheme.palette.editable === false) {
diff --git a/packages/node_modules/@node-red/runtime/lib/api/settings.js b/packages/node_modules/@node-red/runtime/lib/api/settings.js
index 8b52d4587..d96ec5b58 100644
--- a/packages/node_modules/@node-red/runtime/lib/api/settings.js
+++ b/packages/node_modules/@node-red/runtime/lib/api/settings.js
@@ -90,8 +90,21 @@ var api = module.exports = {
                 safeSettings.flowFilePretty = runtime.settings.flowFilePretty;
             }
 
+            if (runtime.settings.editorTheme && runtime.settings.editorTheme.palette) {
+                if (runtime.settings.editorTheme.palette.upload === false || runtime.settings.editorTheme.palette.editable === false) {
+                    safeSettings.externalModules = {palette: { } }
+                }
+                if (runtime.settings.editorTheme.palette.upload === false) {
+                    safeSettings.externalModules.palette.allowUpload = false;
+                }
+                if (runtime.settings.editorTheme.palette.editable === false) {
+                    safeSettings.externalModules.palette.allowInstall = false;
+                    safeSettings.externalModules.palette.allowUpload = false;
+                }
+            }
+
             if (runtime.settings.externalModules) {
-                safeSettings.externalModules = runtime.settings.externalModules;
+                safeSettings.externalModules = extend(safeSettings.externalModules||{},runtime.settings.externalModules);
             }
 
             if (!runtime.nodes.installerEnabled()) {
diff --git a/packages/node_modules/@node-red/runtime/lib/index.js b/packages/node_modules/@node-red/runtime/lib/index.js
index 6c6dbb495..40aea7e36 100644
--- a/packages/node_modules/@node-red/runtime/lib/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/index.js
@@ -125,7 +125,7 @@ function start() {
             return redNodes.load().then(function() {
                 let autoInstallModules = false;
                 if (settings.hasOwnProperty('autoInstallModules')) {
-                    log.warn(log._("runtime.deprecatedOption",{old:"autoInstallModules", new:"externalModules.autoInstall"}));
+                    log.warn(log._("server.deprecatedOption",{old:"autoInstallModules", new:"externalModules.autoInstall"}));
                     autoInstallModules = true;
                 }
                 if (settings.externalModules) {
@@ -198,7 +198,7 @@ function reinstallModules(moduleList) {
     const reinstallList = [];
     const installRetry = 30000;
     if (settings.hasOwnProperty('autoInstallModulesRetry')) {
-        log.warn(log._("runtime.deprecatedOption",{old:"autoInstallModulesRetry", new:"externalModules.autoInstallRetry"}));
+        log.warn(log._("server.deprecatedOption",{old:"autoInstallModulesRetry", new:"externalModules.autoInstallRetry"}));
         installRetry = settings.autoInstallModulesRetry;
     }
     if (settings.externalModules && settings.externalModules.hasOwnProperty('autoInstallRetry')) {
diff --git a/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json b/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json
index eeb4299d7..58eb7308d 100644
--- a/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json
+++ b/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json
@@ -42,7 +42,7 @@
             "uninstall-failed-long": "Uninstall of module __name__ failed:",
             "uninstalled": "Uninstalled module: __name__"
         },
-        "deprecatedOption": "use of __old__ is deprecated. Use __new__ instead",
+        "deprecatedOption": "Use of __old__ is deprecated. Use __new__ instead",
         "unable-to-listen": "Unable to listen on __listenpath__",
         "port-in-use": "Error: port in use",
         "uncaught-exception": "Uncaught Exception:",