From c66c5ea53ca6f15c6ee47acc2b449273e5f98169 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 22 Oct 2018 15:38:43 +0100
Subject: [PATCH] Add configurable option for showing node label

---
 .../editor-client/locales/en-US/editor.json     |  3 ++-
 .../editor-client/src/js/ui/userSettings.js     | 17 +++++++++--------
 .../@node-red/editor-client/src/js/ui/view.js   | 11 +++++++++++
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
index 05eaaa522..34ba30370 100644
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
@@ -75,7 +75,8 @@
             "projects": "Projects",
             "projects-new": "New",
             "projects-open": "Open",
-            "projects-settings": "Project Settings"
+            "projects-settings": "Project Settings",
+            "showNodeLabelDefault": "Show label of newly added nodes"
         }
     },
     "actions": {
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/userSettings.js b/packages/node_modules/@node-red/editor-client/src/js/ui/userSettings.js
index 59bf085b1..dfce5bf73 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/userSettings.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/userSettings.js
@@ -114,7 +114,8 @@ RED.userSettings = (function() {
         {
             title: "menu.label.nodes",
             options: [
-                {setting:"view-node-status",oldSetting:"menu-menu-item-status",label:"menu.label.displayStatus",default: true, toggle:true,onchange:"core:toggle-status"}
+                {setting:"view-node-status",oldSetting:"menu-menu-item-status",label:"menu.label.displayStatus",default: true, toggle:true,onchange:"core:toggle-status"},
+                {setting:"view-node-show-label",label:"menu.label.showNodeLabelDefault",default: true, toggle:true}
             ]
         },
         {
@@ -210,14 +211,14 @@ RED.userSettings = (function() {
                     }
                 }
                 allSettings[opt.setting] = opt;
-                if (opt.onchange) {
-                    var value = currentEditorSettings.view[opt.setting];
-                    if ((value === null || value === undefined) && opt.hasOwnProperty('default')) {
-                        value = opt.default;
-                        currentEditorSettings.view[opt.setting] = value;
-                        editorSettingsChanged = true;
-                    }
+                var value = currentEditorSettings.view[opt.setting];
+                if ((value === null || value === undefined) && opt.hasOwnProperty('default')) {
+                    value = opt.default;
+                    currentEditorSettings.view[opt.setting] = value;
+                    editorSettingsChanged = true;
+                }
 
+                if (opt.onchange) {
                     var callback = opt.onchange;
                     if (typeof callback === 'string') {
                         callback = RED.actions.get(callback);
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
index 7a30aa0c6..31a300ab3 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -365,6 +365,11 @@ RED.view = (function() {
                 var historyEvent = result.historyEvent;
                 var nn = result.node;
 
+                var showLabel = RED.utils.getMessageProperty(RED.settings.get('editor'),"view.view-node-show-label");
+                if (showLabel !== undefined && !/^link (in|out)$/.test(nn._def.type) && !nn._def.defaults.hasOwnProperty("l")) {
+                    nn.l = showLabel;
+                }
+
                 var helperOffset = d3.touches(ui.helper.get(0))[0]||d3.mouse(ui.helper.get(0));
                 var mousePos = d3.touches(this)[0]||d3.mouse(this);
 
@@ -668,6 +673,12 @@ RED.view = (function() {
                         var historyEvent = result.historyEvent;
                         nn.x = point[0];
                         nn.y = point[1];
+
+                        var showLabel = RED.utils.getMessageProperty(RED.settings.get('editor'),"view.view-node-show-label");
+                        if (showLabel !== undefined && !/^link (in|out)$/.test(nn._def.type) && !nn._def.defaults.hasOwnProperty("l")) {
+                            nn.l = showLabel;
+                        }
+
                         if (mouse_mode === RED.state.QUICK_JOINING || quickAddLink) {
                             if (quickAddLink || drag_lines.length > 0) {
                                 var drag_line = quickAddLink||drag_lines[0];