From 953a9f7cd4d648fe5a327a6b47a33eb5396d2d92 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Mon, 11 Oct 2021 09:58:55 +0100 Subject: [PATCH 01/25] Update to latest node-red-admin --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index aea1e7144..fa8ca5daa 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "mqtt": "4.2.8", "multer": "1.4.3", "mustache": "4.2.0", - "node-red-admin": "^2.2.0", + "node-red-admin": "^2.2.1", "nopt": "5.0.0", "oauth2orize": "1.11.0", "on-headers": "1.0.2", From be7e28af5d77bb37b28b13ab0a1de9007fe63c23 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Tue, 12 Oct 2021 17:24:10 +0100 Subject: [PATCH 02/25] Update package dependencies --- packages/node_modules/node-red/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node_modules/node-red/package.json b/packages/node_modules/node-red/package.json index 2ccd7d563..e3fb0e4c1 100644 --- a/packages/node_modules/node-red/package.json +++ b/packages/node_modules/node-red/package.json @@ -39,7 +39,7 @@ "bcryptjs": "2.4.3", "express": "4.17.1", "fs-extra": "10.0.0", - "node-red-admin": "^2.2.0", + "node-red-admin": "^2.2.1", "nopt": "5.0.0", "semver": "7.3.5" }, From 7cd92faf0d822349b2cb7699cd6ab3bbe82c2768 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Tue, 12 Oct 2021 16:49:38 +0100 Subject: [PATCH 03/25] Separate 'focus' from 'selected' state in treeList --- .../src/js/ui/common/treeList.js | 98 +++++++++++++------ .../src/js/ui/tab-info-outliner.js | 4 +- .../editor-client/src/sass/tab-info.scss | 11 ++- .../src/sass/ui/common/treeList.scss | 6 ++ 4 files changed, 85 insertions(+), 34 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js index 9ee508de6..9fca87e75 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js @@ -24,6 +24,9 @@ * - rootSortable: boolean - if 'sortable' is set, then setting this to * false, prevents items being sorted to the * top level of the tree + * - autoSelect: boolean - default true - triggers item selection when navigating + * list by keyboard. If the list has checkboxed items + * you probably want to set this to false * * methods: * - data(items) - clears existing items and replaces with new data @@ -50,6 +53,7 @@ * deferBuild: true/false, // don't build any ui elements for the item's children * until it is expanded by the user. * element: // custom dom element to use for the item - ignored if `label` is set + * collapsible: true/false, // prevent a parent item from being collapsed. default true. * } * ] * @@ -90,77 +94,96 @@ $.widget( "nodered.treeList", { _create: function() { var that = this; - + var autoSelect = true; + if (that.options.autoSelect === false) { + autoSelect = false; + } this.element.addClass('red-ui-treeList'); this.element.attr("tabIndex",0); var wrapper = $('
',{class:'red-ui-treeList-container'}).appendTo(this.element); this.element.on('keydown', function(evt) { - var selected = that._topList.find(".selected").parent().data('data'); - if (!selected && (evt.keyCode === 40 || evt.keyCode === 38)) { - that.select(that._data[0]); + var focussed = that._topList.find(".focus").parent().data('data'); + if (!focussed && (evt.keyCode === 40 || evt.keyCode === 38)) { + if (that._data[0]) { + if (autoSelect) { + that.select(that._data[0]); + } else { + that._topList.find(".focus").removeClass("focus") + } + that._data[0].treeList.label.addClass('focus') + } return; } var target; switch(evt.keyCode) { + case 32: // SPACE case 13: // ENTER evt.preventDefault(); evt.stopPropagation(); - if (selected.children) { - if (selected.treeList.container.hasClass("expanded")) { - selected.treeList.collapse() + if (focussed.checkbox) { + focussed.treeList.checkbox.trigger("click"); + } else if (focussed.radio) { + focussed.treeList.radio.trigger("click"); + } else if (focussed.children) { + if (focussed.treeList.container.hasClass("expanded")) { + focussed.treeList.collapse() } else { - selected.treeList.expand() + focussed.treeList.expand() } } else { - that._trigger("confirm",null,selected) + that._trigger("confirm",null,focussed) } - break; case 37: // LEFT evt.preventDefault(); evt.stopPropagation(); - if (selected.children&& selected.treeList.container.hasClass("expanded")) { - selected.treeList.collapse() - } else if (selected.parent) { - target = selected.parent; + if (focussed.children&& focussed.treeList.container.hasClass("expanded")) { + focussed.treeList.collapse() + } else if (focussed.parent) { + target = focussed.parent; } break; case 38: // UP evt.preventDefault(); evt.stopPropagation(); - target = that._getPreviousSibling(selected); + target = that._getPreviousSibling(focussed); if (target) { target = that._getLastDescendant(target); } - if (!target && selected.parent) { - target = selected.parent; + if (!target && focussed.parent) { + target = focussed.parent; } break; case 39: // RIGHT evt.preventDefault(); evt.stopPropagation(); - if (selected.children) { - if (!selected.treeList.container.hasClass("expanded")) { - selected.treeList.expand() + if (focussed.children) { + if (!focussed.treeList.container.hasClass("expanded")) { + focussed.treeList.expand() } } break case 40: //DOWN evt.preventDefault(); evt.stopPropagation(); - if (selected.children && Array.isArray(selected.children) && selected.children.length > 0 && selected.treeList.container.hasClass("expanded")) { - target = selected.children[0]; + if (focussed.children && Array.isArray(focussed.children) && focussed.children.length > 0 && focussed.treeList.container.hasClass("expanded")) { + target = focussed.children[0]; } else { - target = that._getNextSibling(selected); - while (!target && selected.parent) { - selected = selected.parent; - target = that._getNextSibling(selected); + target = that._getNextSibling(focussed); + while (!target && focussed.parent) { + focussed = focussed.parent; + target = that._getNextSibling(focussed); } } break } if (target) { - that.select(target); + if (autoSelect) { + that.select(target); + } else { + that._topList.find(".focus").removeClass("focus") + } + target.treeList.label.addClass('focus') } }); this._data = []; @@ -463,6 +486,9 @@ container.addClass("expanded"); } item.treeList.collapse = function() { + if (item.collapsible === false) { + return + } if (!item.children) { return; } @@ -583,7 +609,7 @@ // Already a parent because we've got the angle-right icon return; } - $('').appendTo(treeListIcon); + $('').toggleClass("hide",item.collapsible === false).appendTo(treeListIcon); treeListIcon.on("click.red-ui-treeList-expand", function(e) { e.stopPropagation(); e.preventDefault(); @@ -634,6 +660,8 @@ label.on("click", function(e) { e.stopPropagation(); cb.trigger("click"); + that._topList.find(".focus").removeClass("focus") + label.addClass('focus') }) } item.treeList.select = function(v) { @@ -641,6 +669,7 @@ cb.trigger("click"); } } + item.treeList.checkbox = cb; selectWrapper.appendTo(label) } else if (item.radio) { var selectWrapper = $(''); @@ -669,6 +698,8 @@ label.on("click", function(e) { e.stopPropagation(); cb.trigger("click"); + that._topList.find(".focus").removeClass("focus") + label.addClass('focus') }) } item.treeList.select = function(v) { @@ -677,6 +708,7 @@ } } selectWrapper.appendTo(label) + item.treeList.radio = cb; } else { label.on("click", function(e) { if (!that.options.multi) { @@ -684,10 +716,14 @@ } label.addClass("selected"); that._selected.add(item); + that._topList.find(".focus").removeClass("focus") + label.addClass('focus') that._trigger("select",e,item) }) label.on("dblclick", function(e) { + that._topList.find(".focus").removeClass("focus") + label.addClass('focus') if (!item.children) { that._trigger("confirm",e,item); } @@ -835,6 +871,9 @@ if (item.treeList.label) { item.treeList.label.addClass("selected"); } + + that._topList.find(".focus").removeClass("focus"); + if (triggerEvent !== false) { this._trigger("select",null,item) } @@ -842,6 +881,9 @@ clearSelection: function() { this._selected.forEach(function(item) { item.selected = false; + if (item.treeList.checkbox) { + item.treeList.checkbox.prop('checked',false) + } if (item.treeList.label) { item.treeList.label.removeClass("selected") } diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js index 52606cd88..3159622b6 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js @@ -287,11 +287,11 @@ RED.sidebar.info.outliner = (function() { var node = RED.nodes.node(item.id) || RED.nodes.group(item.id); if (node) { if (node.type === 'group' || node._def.category !== "config") { - RED.view.select({nodes:[node]}) + // RED.view.select({nodes:[node]}) } else if (node._def.category === "config") { RED.sidebar.info.refresh(node); } else { - RED.view.select({nodes:[]}) + // RED.view.select({nodes:[]}) } } }) diff --git a/packages/node_modules/@node-red/editor-client/src/sass/tab-info.scss b/packages/node_modules/@node-red/editor-client/src/sass/tab-info.scss index 89ad06ca2..72422f350 100644 --- a/packages/node_modules/@node-red/editor-client/src/sass/tab-info.scss +++ b/packages/node_modules/@node-red/editor-client/src/sass/tab-info.scss @@ -434,16 +434,19 @@ div.red-ui-info-table { } .red-ui-info-outline-item-controls { position: absolute; - top:0; - bottom: 0; - right: 0px; - padding: 2px 3px 0 1px; + top:1px; + bottom: 1px; + right: 1px; + padding: 1px 2px 0 1px; text-align: right; background: $list-item-background; .red-ui-treeList-label:hover & { background: $list-item-background-hover; } + .red-ui-treeList-label.focus & { + background: $list-item-background-hover; + } .red-ui-treeList-label.selected & { background: $list-item-background-selected; } diff --git a/packages/node_modules/@node-red/editor-client/src/sass/ui/common/treeList.scss b/packages/node_modules/@node-red/editor-client/src/sass/ui/common/treeList.scss index 3621328d8..beba6b047 100644 --- a/packages/node_modules/@node-red/editor-client/src/sass/ui/common/treeList.scss +++ b/packages/node_modules/@node-red/editor-client/src/sass/ui/common/treeList.scss @@ -89,6 +89,12 @@ color: $list-item-color; text-decoration: none; } + &.focus, &.focus .red-ui-treeList-sublabel-text { + background: $list-item-background-hover; + outline: 1px solid $form-input-focus-color !important; + outline-offset: -1px; + color: $list-item-color; + } &.selected, &.selected .red-ui-treeList-sublabel-text { background: $list-item-background-selected; outline: none; From bed1be14ba74c936deb30e8666cf32ad88c8f7e3 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Tue, 12 Oct 2021 16:50:08 +0100 Subject: [PATCH 04/25] Allow toolip action/content to be updated --- .../editor-client/src/js/ui/common/popover.js | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js index 27a454dc6..762109774 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js @@ -436,18 +436,17 @@ RED.popover = (function() { return { create: createPopover, tooltip: function(target,content, action) { - var label = content; - if (action) { - label = function() { - var label = content; + var label = function() { + var label = content; + if (action) { var shortcut = RED.keyboard.getShortcut(action); if (shortcut && shortcut.key) { label = $(''+content+' '+RED.keyboard.formatKey(shortcut.key, true)+''); } - return label; } + return label; } - return RED.popover.create({ + var popover = RED.popover.create({ tooltip: true, target:target, trigger: "hover", @@ -456,6 +455,14 @@ RED.popover = (function() { content: label, delay: { show: 750, hide: 50 } }); + popover.setContent = function(newContent) { + content = newContent; + } + popover.setAction = function(newAction) { + action = newAction; + } + return popover; + }, menu: function(options) { var list = $('
    '); From 3204b044553389bd2339263146bb9c0719b48c91 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Tue, 12 Oct 2021 16:50:33 +0100 Subject: [PATCH 05/25] Overhaul Debug sidebar filter and clear button options --- .../editor-client/src/sass/debug.scss | 20 +- .../@node-red/nodes/core/common/21-debug.html | 1 + .../core/common/lib/debug/debug-utils.js | 392 ++++++++++-------- .../nodes/core/common/lib/debug/debug.js | 26 +- .../nodes/locales/en-US/messages.json | 11 +- 5 files changed, 268 insertions(+), 182 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/src/sass/debug.scss b/packages/node_modules/@node-red/editor-client/src/sass/debug.scss index 1e77e46e1..1cdf15e55 100644 --- a/packages/node_modules/@node-red/editor-client/src/sass/debug.scss +++ b/packages/node_modules/@node-red/editor-client/src/sass/debug.scss @@ -43,12 +43,24 @@ border-bottom: 1px solid $secondary-border-color; box-shadow: 0 2px 6px $shadow; } -.red-ui-debug-filter-row { - .red-ui-nodeList { - margin: 10px 0; +#red-ui-sidebar-debug-filter-node-list-row { + .red-ui-treeList-label.disabled { + font-style: italic; + color: $secondary-text-color-disabled; + } + + .red-ui-treeList-label { + &.selected, &.selected .red-ui-treeList-sublabel-text { + background: inherit; + } + &.selected, &.selected .red-ui-treeList-sublabel-text { + background: inherit; + } + &.focus, &.focus .red-ui-treeList-sublabel-text { + background: $list-item-background-hover !important; + } } } - .red-ui-debug-msg { position: relative; border-bottom: 1px solid $debug-message-border; diff --git a/packages/node_modules/@node-red/nodes/core/common/21-debug.html b/packages/node_modules/@node-red/nodes/core/common/21-debug.html index 886ed68fa..195423482 100644 --- a/packages/node_modules/@node-red/nodes/core/common/21-debug.html +++ b/packages/node_modules/@node-red/nodes/core/common/21-debug.html @@ -292,6 +292,7 @@ }; RED.events.on("project:change", this.clearMessageList); RED.actions.add("core:clear-debug-messages", function() { RED.debug.clearMessageList(true) }); + RED.actions.add("core:clear-filtered-debug-messages", function() { RED.debug.clearMessageList(true, true) }); RED.actions.add("core:activate-selected-debug-nodes", function() { setDebugNodeState(getSelectedDebugNodes(true), true); }); RED.actions.add("core:activate-all-debug-nodes", function() { setDebugNodeState(getMatchingDebugNodes(true, true),true); }); diff --git a/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug-utils.js b/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug-utils.js index a865f9387..746a23d17 100644 --- a/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug-utils.js +++ b/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug-utils.js @@ -31,24 +31,22 @@ RED.debug = (function() { var activeWorkspace; var numMessages = 100; // Hardcoded number of message to show in debug window scrollback - var filterVisible = false; - - var debugNodeList; - var debugNodeListExpandedFlows = {}; + var debugNodeTreeList; function init(_config) { config = _config; var content = $("
    ").css({"position":"relative","height":"100%"}); var toolbar = $('
    '+ - ' '+ - '
    ').appendTo(content); + ''+ + ' '+ + ''+ + ''+ + ' all' + + ''+ + '
    ').appendTo(content); var footerToolbar = $('
    '+ - // ''+ - // 'list'+ - // 'table '+ - // ''+ ' ' + '
    '); @@ -56,85 +54,100 @@ RED.debug = (function() { sbc = messageList[0]; messageTable = $('
    ').appendTo(content); - var filterDialog = $('
    '+ - '
    '+ - ''+ - ''+ - ''+ - ' '+ + var filterDialogCloseTimeout; + var filterDialogShown = false; + var filterDialog = $('
    ').appendTo(toolbar);//content); + filterDialog.on('mouseleave' ,function(evt) { + if (filterDialogShown) { + filterDialogCloseTimeout = setTimeout(function() { + filterDialog.slideUp(200); + filterDialogShown = false; + },500) + } + }) + filterDialog.on('mouseenter' ,function(evt) { + clearTimeout(filterDialogCloseTimeout) + }) + var filterToolbar = $('
    '+ + ''+ + '' + + '' + ''+ - '
    '+ - '
    ').appendTo(toolbar);//content); + ''+ + '
    ').appendTo(filterDialog); - // var filterTypeRow = $('
    ').appendTo(filterDialog); - // $('').appendTo(filterTypeRow); + filterToolbar.find("#red-ui-sidebar-filter-select-close").on('click', function(evt) { + clearTimeout(filterDialogCloseTimeout) + filterDialogShown = false; + filterDialog.slideUp(200); + }) - var debugNodeListRow = $('
    ').appendTo(filterDialog); - var flowCheckboxes = {}; - var debugNodeListHeader = $('
    '); - var headerCheckbox = $('').appendTo(debugNodeListHeader.find("span")[1]).checkboxSet(); - - debugNodeList = $('
      ',{style:"text-align: left; min-height: 250px; max-height: 250px"}).appendTo(debugNodeListRow).editableList({ - header: debugNodeListHeader, - class: 'red-ui-nodeList', - addItem: function(container,i,node) { - var row = $("
      ").appendTo(container); - row.attr('id','debug-filter-node-list-node-'+node.id.replace(/\./g,"_")); - if (node.type === 'tab') { - container.parent().addClass('red-ui-editableList-section-header'); - if (!debugNodeListExpandedFlows.hasOwnProperty(node.id)) { - debugNodeListExpandedFlows[node.id] = true; + filterToolbar.find("#red-ui-sidebar-filter-select-all").on('click', function(evt) { + evt.preventDefault(); + var data = debugNodeTreeList.treeList('data'); + data.forEach(function(flow) { + if (!flow.selected) { + if (flow.treeList.checkbox) { + flow.treeList.checkbox.trigger('click') } - var chevron = $('').appendTo(row); - $('').text(RED.utils.getNodeLabel(node,node.id)).appendTo(row); - var muteControl = $('').appendTo($('').appendTo(row)); - muteControl.checkboxSet({ - parent: headerCheckbox - }); - flowCheckboxes[node.id] = muteControl; - row.on("click", function(e) { - e.stopPropagation(); - debugNodeListExpandedFlows[node.id] = !debugNodeListExpandedFlows[node.id]; - row.toggleClass('expanded',debugNodeListExpandedFlows[node.id]); - debugNodeList.editableList('filter'); - }) - row.addClass("expandable"); - if (node.disabled) { - container.addClass('disabled'); - muteControl.checkboxSet('disable'); - debugNodeListExpandedFlows[node.id] = false; - } - row.toggleClass('expanded',debugNodeListExpandedFlows[node.id]); } else { - $('',{style: "margin-left: 20px"}).text(RED.utils.getNodeLabel(node,node.id)).appendTo(row); - row.on("mouseenter",function() { - config.messageMouseEnter(node.id); - }); - row.on("mouseleave",function() { - config.messageMouseLeave(node.id); - }); - var muteControl = $('').prop('checked',!filteredNodes[node.id]).appendTo($('').appendTo(row)); - muteControl.checkboxSet({ - parent: flowCheckboxes[node.z] - }).on("change", function(e) { - filteredNodes[node.id] = !$(this).prop('checked'); - $(".red-ui-debug-msg-node-"+node.id.replace(/\./g,"_")).toggleClass('hide',filteredNodes[node.id]); - }); - if ((node.hasOwnProperty("active") && !node.active) || RED.nodes.workspace(node.z).disabled) { - container.addClass('disabled'); - muteControl.checkboxSet('disable'); + flow.children.forEach(function(item) { + if (!item.selected) { + item.treeList.select(); + } + }) + } + }); + refreshMessageList(); + }) + + filterToolbar.find("#red-ui-sidebar-filter-select-none").on('click', function(evt) { + evt.preventDefault(); + debugNodeTreeList.treeList('clearSelection'); + var data = debugNodeTreeList.treeList('data'); + data.forEach(function(flow) { + if (flow.children) { + flow.children.forEach(function(item) { + filteredNodes[item.node.id] = true; + }) + } + }); + RED.settings.set('debug.filteredNodes',Object.keys(filteredNodes)) + refreshMessageList(); + }) + var debugNodeListRow = $('
      ').appendTo(filterDialog); + debugNodeTreeList = $("
      ").appendTo(debugNodeListRow).css({width: "100%", height: "300px"}) + .treeList({autoSelect: false}).on("treelistitemmouseover", function(e, item) { + if (item.node) { + item.node.highlighted = true; + item.node.dirty = true; + RED.view.redraw(); + } + }).on("treelistitemmouseout", function(e, item) { + if (item.node) { + item.node.highlighted = false; + item.node.dirty = true; + RED.view.redraw(); + } + }).on("treelistselect", function(e, item) { + if (item.children) { + item.children.forEach(function(child) { + if (child.checkbox) { + child.treeList.select(item.selected) + } + }) + } else { + if (item.node) { + if (item.selected) { + delete filteredNodes[item.node.id] + } else { + filteredNodes[item.node.id] = true; + } + RED.settings.set('debug.filteredNodes',Object.keys(filteredNodes)) + refreshMessageList(); } } - }, - addButton: false, - scrollOnAdd: false, - filter: function(node) { - return (node.type === 'tab' || debugNodeListExpandedFlows[node.z] ) - }, - sort: function(A,B) { - - } - }); + }) try { content.i18n(); @@ -144,85 +157,95 @@ RED.debug = (function() { toolbar.find('#red-ui-sidebar-debug-filter span').text(RED._('node-red:debug.sidebar.filterAll')); - var filterButtonHandler = function(type) { - return function(e) { - e.preventDefault(); - if (filterType !== type) { - $('.red-ui-sidebar-debug-filter-option').removeClass('selected'); - $(this).addClass('selected'); - if (filterType === 'filterSelected') { - debugNodeListRow.slideUp(); - } - filterType = type; - if (filterType === 'filterSelected') { - debugNodeListRow.slideDown(); - } - - $('#red-ui-sidebar-debug-filter span').text(RED._('node-red:debug.sidebar.'+filterType)); - refreshMessageList(); - } - } - } - filterDialog.find('#red-ui-sidebar-debug-filterAll').on("click",filterButtonHandler('filterAll')); - filterDialog.find('#red-ui-sidebar-debug-filterSelected').on("click",filterButtonHandler('filterSelected')); - filterDialog.find('#red-ui-sidebar-debug-filterCurrent').on("click",filterButtonHandler('filterCurrent')); - - - // $('#red-ui-sidebar-debug-view-list').on("click",function(e) { - // e.preventDefault(); - // if (!$(this).hasClass('selected')) { - // $(this).addClass('selected'); - // $('#red-ui-sidebar-debug-view-table').removeClass('selected'); - // showMessageList(); - // } - // }); - // $('#red-ui-sidebar-debug-view-table').on("click",function(e) { - // e.preventDefault(); - // if (!$(this).hasClass('selected')) { - // $(this).addClass('selected'); - // $('#red-ui-sidebar-debug-view-list').removeClass('selected'); - // showMessageTable(); - // } - // }); - - - var hideFilterTimeout; - toolbar.on('mouseleave',function() { - if ($('#red-ui-sidebar-debug-filter').hasClass('selected')) { - clearTimeout(hideFilterTimeout); - hideFilterTimeout = setTimeout(function() { - filterVisible = false; - $('#red-ui-sidebar-debug-filter').removeClass('selected'); - filterDialog.slideUp(200); - },300); - } - }); - toolbar.on('mouseenter',function() { - if ($('#red-ui-sidebar-debug-filter').hasClass('selected')) { - clearTimeout(hideFilterTimeout); - } - }) toolbar.find('#red-ui-sidebar-debug-filter').on("click",function(e) { e.preventDefault(); - if ($(this).hasClass('selected')) { - filterVisible = false; - $(this).removeClass('selected'); - clearTimeout(hideFilterTimeout); - filterDialog.slideUp(200); - } else { - $(this).addClass('selected'); - filterVisible = true; - refreshDebugNodeList(); - filterDialog.slideDown(200); - } + var options = [ + { label: $(' ').i18n() , value: "filterAll" }, + { label: $(' ...').i18n(), value: "filterSelected" }, + { label: $(' ').i18n(), value: "filterCurrent" } + ] + var menu = RED.popover.menu({ + options: options, + onselect: function(item) { + if (item.value !== filterType) { + filterType = item.value; + $('#red-ui-sidebar-debug-filter span').text(RED._('node-red:debug.sidebar.'+filterType)); + refreshMessageList(); + RED.settings.set("debug.filter",filterType) + } + if (filterType === 'filterSelected') { + refreshDebugNodeList(); + filterDialog.slideDown(200); + filterDialogShown = true; + debugNodeTreeList.focus(); + } + + } + }); + menu.show({ + target: $("#red-ui-sidebar-debug-filter"), + align: "left", + offset: [$("#red-ui-sidebar-debug-filter").outerWidth()-2, -1] + }) + $('input[name="filter-type"][value="'+RED.settings.get("debug.filter","filterAll")+'"]').prop("checked", true) }); RED.popover.tooltip(toolbar.find('#red-ui-sidebar-debug-filter'),RED._('node-red:debug.sidebar.filterLog')); toolbar.find("#red-ui-sidebar-debug-clear").on("click", function(e) { e.preventDefault(); - clearMessageList(false); + var action = RED.settings.get("debug.clearType","all") + clearMessageList(false, action === 'filtered'); }); - RED.popover.tooltip(toolbar.find("#red-ui-sidebar-debug-clear"),RED._('node-red:debug.sidebar.clearLog'),"core:clear-debug-messages"); + var clearTooltip = RED.popover.tooltip(toolbar.find("#red-ui-sidebar-debug-clear"),RED._('node-red:debug.sidebar.clearLog'),"core:clear-debug-messages"); + toolbar.find("#red-ui-sidebar-debug-clear-opts").on("click", function(e) { + e.preventDefault(); + var options = [ + { label: $(' ').i18n() , value: "all" }, + { label: $(' ').i18n(), value: "filtered" } + ] + var menu = RED.popover.menu({ + options: options, + onselect: function(item) { + if (item.value === "all") { + $("#red-ui-sidebar-debug-clear > span").text(RED._('node-red:debug.sidebar.all')); + clearTooltip.setAction("core:clear-debug-messages"); + clearTooltip.setContent(RED._('node-red:debug.sidebar.clearLog')) + RED.settings.set("debug.clearType","all") + } else { + $("#red-ui-sidebar-debug-clear > span").text(RED._('node-red:debug.sidebar.filtered')); + clearTooltip.setAction("core:clear-filtered-debug-messages"); + clearTooltip.setContent(RED._('node-red:debug.sidebar.clearFilteredLog')) + RED.settings.set("debug.clearType","filtered") + } + } + }); + menu.show({ + target: $("#red-ui-sidebar-debug-clear-opts"), + align: "left", + offset: [$("#red-ui-sidebar-debug-clear-opts").outerWidth()-2, -1] + }) + $('input[name="clear-type"][value="'+RED.settings.get("debug.clearType","all")+'"]').prop("checked", true) + }) + + var clearType = RED.settings.get("debug.clearType","all"); + if (clearType === "all") { + toolbar.find("#red-ui-sidebar-debug-clear > span").text(RED._('node-red:debug.sidebar.all')); + clearTooltip.setAction("core:clear-debug-messages"); + clearTooltip.setContent(RED._('node-red:debug.sidebar.clearLog')) + } else { + toolbar.find("#red-ui-sidebar-debug-clear > span").text(RED._('node-red:debug.sidebar.filtered')); + clearTooltip.setAction("core:clear-filtered-debug-messages"); + clearTooltip.setContent(RED._('node-red:debug.sidebar.clearFilteredLog')) + } + + filterType = RED.settings.get("debug.filter","filterAll") + var filteredNodeList = RED.settings.get("debug.filteredNodes",[]); + filteredNodes = {} + filteredNodeList.forEach(function(id) { + filteredNodes[id] = true + }) + toolbar.find('#red-ui-sidebar-debug-filter span').text(RED._('node-red:debug.sidebar.'+filterType)); + refreshMessageList(); return { content: content, @@ -254,8 +277,6 @@ RED.debug = (function() { function refreshDebugNodeList() { - debugNodeList.editableList('empty'); - var workspaceOrder = RED.nodes.getWorkspaceOrder(); var workspaceOrderMap = {}; workspaceOrder.forEach(function(ws,i) { @@ -320,15 +341,45 @@ RED.debug = (function() { return labelA.localeCompare(labelB); }); var currentWs = null; - var nodeList = []; + var data = []; + var currentFlow; + var currentSelectedCount = 0; candidateNodes.forEach(function(node) { if (currentWs !== node.z) { + if (currentFlow && currentFlow.checkbox) { + currentFlow.selected = currentSelectedCount === currentFlow.children.length + } + currentSelectedCount = 0; currentWs = node.z; - nodeList.push(RED.nodes.workspace(node.z)); + var parent = RED.nodes.workspace(currentWs) || RED.nodes.subflow(currentWs); + currentFlow = { + label: RED.utils.getNodeLabel(parent, currentWs), + } + if (!parent.disabled) { + currentFlow.children = []; + currentFlow.checkbox = true; + } else { + currentFlow.class = "disabled" + } + data.push(currentFlow); + } + if (currentFlow.children) { + if (!filteredNodes[node.id]) { + currentSelectedCount++; + } + currentFlow.children.push({ + label: RED.utils.getNodeLabel(node,node.id), + node: node, + checkbox: true, + selected: !filteredNodes[node.id] + }); } - nodeList.push(node); }); - debugNodeList.editableList('addItems',nodeList); + if (currentFlow && currentFlow.checkbox) { + currentFlow.selected = currentSelectedCount === currentFlow.children.length + } + + debugNodeTreeList.treeList("data", data); } function getTimestamp() { @@ -340,7 +391,16 @@ RED.debug = (function() { return m.replace(/&/g,"&").replace(//g,">"); } + var refreshTimeout; function refreshMessageList(_activeWorkspace) { + if (refreshTimeout) { + clearTimeout(refreshTimeout); + } + refreshTimeout = setTimeout(function() { + _refreshMessageList(_activeWorkspace); + },200); + } + function _refreshMessageList(_activeWorkspace) { if (_activeWorkspace) { activeWorkspace = _activeWorkspace.replace(/\./g,"_"); } @@ -415,6 +475,7 @@ RED.debug = (function() { }); delete filteredNodes[sourceId]; $("#red-ui-sidebar-debug-filterSelected").trigger("click"); + RED.settings.set('debug.filteredNodes',Object.keys(filteredNodes)) refreshMessageList(); }}, {id:"red-ui-debug-msg-menu-item-clear-filter",label:RED._("node-red:debug.messageMenu.clearFilter"),onselect:function(){ @@ -601,8 +662,12 @@ RED.debug = (function() { } } - function clearMessageList(clearFilter) { - $(".red-ui-debug-msg").remove(); + function clearMessageList(clearFilter, filteredOnly) { + if (!filteredOnly) { + $(".red-ui-debug-msg").remove(); + } else { + $(".red-ui-debug-msg:not(.hide)").remove(); + } config.clear(); if (!!clearFilter) { clearFilterSettings(); @@ -613,10 +678,9 @@ RED.debug = (function() { function clearFilterSettings() { filteredNodes = {}; filterType = 'filterAll'; - $('.red-ui-sidebar-debug-filter-option').removeClass('selected'); - $('#red-ui-sidebar-debug-filterAll').addClass('selected'); + RED.settings.set("debug.filter",filterType); + RED.settings.set('debug.filteredNodes',Object.keys(filteredNodes)) $('#red-ui-sidebar-debug-filter span').text(RED._('node-red:debug.sidebar.filterAll')); - $('#red-ui-sidebar-debug-filter-node-list-row').slideUp(); } return { diff --git a/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug.js b/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug.js index 9ccdee099..792d9895a 100644 --- a/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug.js +++ b/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug.js @@ -15,18 +15,22 @@ $(function() { } } - var uiComponents = RED.debug.init(options); + try { + var uiComponents = RED.debug.init(options); + $(".red-ui-debug-window").append(uiComponents.content); - $(".red-ui-debug-window").append(uiComponents.content); + window.addEventListener('message',function(evt) { + if (evt.data.event === "message") { + RED.debug.handleDebugMessage(evt.data.msg); + } else if (evt.data.event === "workspaceChange") { + RED.debug.refreshMessageList(evt.data.activeWorkspace); + } else if (evt.data.event === "projectChange") { + RED.debug.clearMessageList(true); + } + },false); + } catch(err) { + console.error(err) + } - window.addEventListener('message',function(evt) { - if (evt.data.event === "message") { - RED.debug.handleDebugMessage(evt.data.msg); - } else if (evt.data.event === "workspaceChange") { - RED.debug.refreshMessageList(evt.data.activeWorkspace); - } else if (evt.data.event === "projectChange") { - RED.debug.clearMessageList(true); - } - },false); }) }); diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json index 776b2dae9..21ab968d9 100755 --- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json +++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json @@ -143,12 +143,17 @@ "filterSelected": "selected nodes", "filterCurrent": "current flow", "debugNodes": "Debug nodes", - "clearLog": "Clear log", - "filterLog": "Filter log", + "clearLog": "Clear messages", + "clearFilteredLog": "Clear filtered messages", + "filterLog": "Filter messages", "openWindow": "Open in new window", "copyPath": "Copy path", "copyPayload": "Copy value", - "pinPath": "Pin open" + "pinPath": "Pin open", + "selectAll": "select all", + "selectNone": "select none", + "all": "all", + "filtered": "filtered" }, "messageMenu": { "collapseAll": "Collapse all paths", From 439af2a32580f0cf71d207fa08776b0db9074d39 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Tue, 12 Oct 2021 17:18:02 +0100 Subject: [PATCH 06/25] Fix rule focus when switch 'otherwise' rule is used Fixes #3182 --- .../node_modules/@node-red/nodes/core/function/10-switch.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/nodes/core/function/10-switch.html b/packages/node_modules/@node-red/nodes/core/function/10-switch.html index 54ca33e0f..1f86fbc3c 100644 --- a/packages/node_modules/@node-red/nodes/core/function/10-switch.html +++ b/packages/node_modules/@node-red/nodes/core/function/10-switch.html @@ -351,7 +351,9 @@ } else { selectField.width("auto") } - fieldToFocus.typedInput("focus"); + if (fieldToFocus) { + fieldToFocus.typedInput("focus"); + } // Preselect the contents of the element // if (focusValueField && document.activeElement) { // document.activeElement.selectionStart = 0; From bfd4fc81fec1eb0f7ab86315424b374a5d4286b4 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Tue, 12 Oct 2021 17:11:22 +0100 Subject: [PATCH 07/25] Widen Inject interval box for >1 digit --- .../node_modules/@node-red/nodes/core/common/20-inject.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/nodes/core/common/20-inject.html b/packages/node_modules/@node-red/nodes/core/common/20-inject.html index 7bcb3111f..41fa8b66f 100644 --- a/packages/node_modules/@node-red/nodes/core/common/20-inject.html +++ b/packages/node_modules/@node-red/nodes/core/common/20-inject.html @@ -143,7 +143,8 @@ margin-bottom: 8px; } .inject-time-count { - width: 40px !important; + padding-left: 3px !important; + width: 80px !important; } From 9425548a855f543c8cc76b2c4fbbccc82df0cb44 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Tue, 12 Oct 2021 21:11:20 +0100 Subject: [PATCH 08/25] Ensure message tools stay attached to top-level entry in Debug/Context Fixes #3180 --- .../@node-red/editor-client/src/js/ui/utils.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js b/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js index 67795cc55..87060436d 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js @@ -563,7 +563,8 @@ RED.utils = (function() { expandPaths: expandPaths, ontoggle: ontoggle, exposeApi: exposeApi, - tools: tools + // tools: tools // Do not pass tools down as we + // keep them attached to the top-level header } ).appendTo(row); } @@ -592,7 +593,8 @@ RED.utils = (function() { expandPaths: expandPaths, ontoggle: ontoggle, exposeApi: exposeApi, - tools: tools + // tools: tools // Do not pass tools down as we + // keep them attached to the top-level header } ).appendTo(row); } @@ -647,7 +649,8 @@ RED.utils = (function() { expandPaths: expandPaths, ontoggle: ontoggle, exposeApi: exposeApi, - tools: tools + // tools: tools // Do not pass tools down as we + // keep them attached to the top-level header } ).appendTo(row); } From 44aa1f4a5e4181a2a3eb4380fbb6462ff5f19907 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Wed, 13 Oct 2021 14:23:43 +0100 Subject: [PATCH 09/25] Filter out Link Out Return nodes in Link In edit dialog Fixes #3187 --- .../@node-red/nodes/core/common/60-link.html | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/nodes/core/common/60-link.html b/packages/node_modules/@node-red/nodes/core/common/60-link.html index 05fa8b429..9408b5561 100644 --- a/packages/node_modules/@node-red/nodes/core/common/60-link.html +++ b/packages/node_modules/@node-red/nodes/core/common/60-link.html @@ -68,6 +68,8 @@ } }); var candidateNodes = RED.nodes.filterNodes({type:targetType}); + var candidateNodesCount = 0; + var search = $("#node-input-link-target-filter").searchBox({ style: "compact", delay: 300, @@ -80,7 +82,7 @@ var count = treeList.treeList("filter", function(item) { return item.label.toLowerCase().indexOf(val) > -1 || (item.node && item.node.type.toLowerCase().indexOf(val) > -1) }); - search.searchBox("count",count+" / "+candidateNodes.length); + search.searchBox("count",count+" / "+candidateNodesCount); } } }); @@ -113,6 +115,11 @@ candidateNodes.forEach(function(n) { if (flowMap[n.z]) { + if (targetType === "link out" && n.mode === 'return') { + // Link In nodes looking for Link Out nodes should not + // include return-mode nodes. + return + } var isChecked = false; isChecked = (node.links.indexOf(n.id) !== -1) || (n.links||[]).indexOf(node.id) !== -1; if (isChecked) { @@ -126,6 +133,7 @@ checkbox: node.type !== "link call", radio: node.type === "link call" }) + candidateNodesCount++; } }); flows = flows.filter(function(f) { return f.children.length > 0 }) From 60e0ed2af6ea57ae12f62c277738eb5b37ce872c Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Thu, 14 Oct 2021 09:34:46 +0100 Subject: [PATCH 10/25] Avoid conflicts with native browser cmd-ctrl type shortcuts Fixes #3190 --- .../@node-red/editor-client/src/js/ui/keyboard.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/keyboard.js b/packages/node_modules/@node-red/editor-client/src/js/ui/keyboard.js index 7a38a290d..5c1be9c2b 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/keyboard.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/keyboard.js @@ -243,7 +243,13 @@ RED.keyboard = (function() { function resolveKeyEvent(evt) { var slot = partialState||handlers; - if (evt.ctrlKey || evt.metaKey) { + // We cheat with MacOS CMD key and consider it the same as Ctrl. + // That means we don't have to have separate keymaps for different OS. + // It mostly works. + // One exception is shortcuts that include both Cmd and Ctrl. We don't + // support them - but we need to make sure we don't block browser-specific + // shortcuts (such as Cmd-Ctrl-F for fullscreen). + if ((evt.ctrlKey || evt.metaKey) && (evt.ctrlKey !== evt.metaKey)) { slot = slot.ctrl; } if (slot && evt.shiftKey) { From eebb64901c04b5cf8bd4635c97d1dda88cac56cd Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Thu, 14 Oct 2021 09:48:35 +0100 Subject: [PATCH 11/25] Fix converting selection to subflow Fixes #3191 --- .../@node-red/editor-client/src/js/nodes.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js index f4378850f..fae5a2f97 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js +++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js @@ -266,8 +266,8 @@ RED.nodes = (function() { }, moveNode: function(n, newZ) { api.removeNode(n); - tabMap[newZ] = tabMap[newZ] || []; - tabMap[newZ].push(n); + n.z = newZ; + api.addNode(n) }, moveNodesForwards: function(nodes) { var result = []; @@ -719,29 +719,29 @@ RED.nodes = (function() { moveGroupToTab(node,z); return; } + var oldZ = node.z; allNodes.moveNode(node,z); var nl = nodeLinks[node.id]; if (nl) { nl.in.forEach(function(l) { - var idx = linkTabMap[node.z].indexOf(l); + var idx = linkTabMap[oldZ].indexOf(l); if (idx != -1) { - linkTabMap[node.z].splice(idx, 1); + linkTabMap[oldZ].splice(idx, 1); } if ((l.source.z === z) && linkTabMap[z]) { linkTabMap[z].push(l); } }); nl.out.forEach(function(l) { - var idx = linkTabMap[node.z].indexOf(l); + var idx = linkTabMap[oldZ].indexOf(l); if (idx != -1) { - linkTabMap[node.z].splice(idx, 1); + linkTabMap[oldZ].splice(idx, 1); } if ((l.target.z === z) && linkTabMap[z]) { linkTabMap[z].push(l); } }); } - node.z = z; RED.events.emit("nodes:change",node); } function moveGroupToTab(group, z) { From 48d0ee3b6dc5719fdd85b3b99c52aea7fd05c345 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Thu, 14 Oct 2021 10:17:27 +0100 Subject: [PATCH 12/25] Do not show projects-wecome dialog until welcome tour completes Fixes #3193 --- .../@node-red/editor-client/src/js/red.js | 19 +++++++++++++------ .../src/js/ui/projects/projects.js | 1 + .../editor-client/src/js/ui/tab-help.js | 10 +++++++++- .../editor-client/src/sass/projects.scss | 8 ++++---- 4 files changed, 27 insertions(+), 11 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 d9ef01021..be6c5472c 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 @@ -201,6 +201,7 @@ var RED = (function() { RED.projects.refresh(function(activeProject) { loadFlows(function() { RED.sidebar.info.refresh() + var showProjectWelcome = false; if (!activeProject) { // Projects enabled but no active project RED.menu.setDisabled('menu-item-projects-open',true); @@ -208,10 +209,10 @@ var RED = (function() { if (activeProject === false) { // User previously decline the migration to projects. } else { // null/undefined - RED.projects.showStartup(); + showProjectWelcome = true; } } - completeLoad(); + completeLoad(showProjectWelcome); }); }); } else { @@ -267,7 +268,7 @@ var RED = (function() { }); } - function completeLoad() { + function completeLoad(showProjectWelcome) { var persistentNotifications = {}; RED.comms.subscribe("notification/#",function(topic,msg) { var parts = topic.split("/"); @@ -535,18 +536,24 @@ var RED = (function() { setTimeout(function() { loader.end(); - checkFirstRun(); + checkFirstRun(function() { + if (showProjectWelcome) { + RED.projects.showStartup(); + } + }); },100); } - function checkFirstRun() { + function checkFirstRun(done) { if (RED.settings.theme("tours") === false) { + done(); return; } if (!RED.settings.get("editor.view.view-show-welcome-tours", true)) { + done(); return; } - RED.actions.invoke("core:show-welcome-tour", RED.settings.get("editor.tours.welcome")); + RED.actions.invoke("core:show-welcome-tour", RED.settings.get("editor.tours.welcome"), done); } function buildMainMenu() { diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js index 232984246..c9143ae1c 100755 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js @@ -2387,6 +2387,7 @@ RED.projects = (function() { return { init: init, showStartup: function() { + console.warn("showStartup") if (!RED.user.hasPermission("projects.write")) { RED.notify(RED._("user.errors.notAuthorized"),"error"); return; diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js index fc87fcd39..66fdbeb2d 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js @@ -393,10 +393,12 @@ RED.sidebar.help = (function() { treeList.treeList("select","changelog"); show(); } - function showWelcomeTour(lastSeenVersion) { + function showWelcomeTour(lastSeenVersion, done) { + done = done || function() {}; RED.tourGuide.load("./tours/welcome.js", function(err, tour) { if (err) { console.warn("Failed to load welcome tour",err); + done() return; } var currentVersionParts = RED.settings.version.split("."); @@ -405,6 +407,7 @@ RED.sidebar.help = (function() { // Only display the tour if its MAJ.MIN versions the current version // This means if we update MAJ/MIN without updating the tour, the old tour won't get shown if (tourVersionParts[0] !== currentVersionParts[0] || tourVersionParts[1] !== currentVersionParts[1]) { + done() return; } @@ -412,26 +415,31 @@ RED.sidebar.help = (function() { // Previously displayed a welcome tour. if (lastSeenVersion === RED.settings.version) { // Exact match - don't show the tour + done() return; } var lastSeenParts = lastSeenVersion.split("."); if (currentVersionParts[0] < lastSeenParts[0] || (currentVersionParts[0] === lastSeenParts[0] && currentVersionParts[1] < lastSeenParts[1])) { // Running an *older* version than last displayed tour. + done() return; } if (currentVersionParts[0] === lastSeenParts[0] && currentVersionParts[1] === lastSeenParts[1]) { if (lastSeenParts.length === 3 && currentVersionParts.length === 3) { // Matching non-beta MAJ.MIN - don't repeat tour + done() return; } if (currentVersionParts.length === 4 && (lastSeenParts.length === 3 || currentVersionParts[3] < lastSeenParts[3])) { // Running an *older* beta than last displayed tour. + done() return } } } RED.tourGuide.run("./tours/welcome.js", function(err) { RED.settings.set("editor.tours.welcome", RED.settings.version) + done() }) }) diff --git a/packages/node_modules/@node-red/editor-client/src/sass/projects.scss b/packages/node_modules/@node-red/editor-client/src/sass/projects.scss index 4c0e503c2..681e7b3f9 100644 --- a/packages/node_modules/@node-red/editor-client/src/sass/projects.scss +++ b/packages/node_modules/@node-red/editor-client/src/sass/projects.scss @@ -73,13 +73,13 @@ .red-ui-projects-dialog-screen-start { .red-ui-projects-dialog-screen-start-hero { text-align: center; - font-size: 2em; + font-size: 1.4em; padding: 10px; - min-height: 60px; + min-height: 40px; color: $primary-text-color; } .red-ui-projects-dialog-screen-start-body { - min-height: 400px; + min-height: 300px; line-height: 1.6em; p { font-size: 1.1em; @@ -92,7 +92,7 @@ } button.red-ui-button.red-ui-projects-dialog-button { width: calc(50% - 80px); - margin: 20px; + margin: 10px 20px; height: auto; line-height: 2em; padding: 10px; From e1d492813e74bc654ec498b5069e3d5dd1cc1f52 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Thu, 14 Oct 2021 10:57:11 +0100 Subject: [PATCH 13/25] Use locale setting when installing/enabling node Fixes #3194 --- .../@node-red/editor-client/src/js/red.js | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 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 d9ef01021..904fa99da 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 @@ -477,8 +477,17 @@ var RED = (function() { RED.nodes.addNodeSet(m); addedTypes = addedTypes.concat(m.types); RED.i18n.loadNodeCatalog(id, function() { - $.get('nodes/'+id, function(data) { - appendNodeConfig(data); + 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); + } }); }); }); @@ -505,10 +514,19 @@ var RED = (function() { typeList = "
      • "+msg.types.map(RED.utils.sanitize).join("
      • ")+"
      "; RED.notify(RED._("palette.event.nodeEnabled", {count:msg.types.length})+typeList,"success"); } else { - $.get('nodes/'+msg.id, function(data) { - appendNodeConfig(data); - typeList = "
      • "+msg.types.map(RED.utils.sanitize).join("
      • ")+"
      "; - RED.notify(RED._("palette.event.nodeAdded", {count:msg.types.length})+typeList,"success"); + 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 = "
      • "+msg.types.map(RED.utils.sanitize).join("
      • ")+"
      "; + RED.notify(RED._("palette.event.nodeAdded", {count:msg.types.length})+typeList,"success"); + } }); } } From 3fde5c27ede60ed0a360b7b074a72d6f1e1fff3c Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Thu, 14 Oct 2021 11:07:49 +0100 Subject: [PATCH 14/25] Fix switching projects --- packages/node_modules/@node-red/editor-client/src/js/nodes.js | 3 ++- packages/node_modules/@node-red/editor-client/src/js/red.js | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js index f4378850f..043663161 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js +++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js @@ -2384,7 +2384,6 @@ RED.nodes = (function() { } function clear() { - allNodes.clear(); links = []; linkTabMap = {}; nodeLinks = {}; @@ -2405,6 +2404,8 @@ RED.nodes = (function() { initialLoad = null; workspaces = {}; + allNodes.clear(); + RED.nodes.dirty(false); RED.view.redraw(true, true); RED.palette.refresh(); 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 d9ef01021..e9f45044f 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 @@ -251,6 +251,9 @@ var RED = (function() { if (/^#flow\/.+$/.test(currentHash)) { RED.workspaces.show(currentHash.substring(6),true); } + if (RED.workspaces.active() === 0 && RED.workspaces.count() > 0) { + RED.workspaces.show(RED.nodes.getWorkspaceOrder()[0]) + } } catch(err) { console.warn(err); RED.notify( From de4944cd83089c0d81c89292a840a52688ca3bb3 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Thu, 14 Oct 2021 11:53:55 +0100 Subject: [PATCH 15/25] Ensure node is resized if its label changes --- .../node_modules/@node-red/editor-client/src/js/ui/view.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 42455055b..f32496599 100755 --- 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 @@ -4006,10 +4006,10 @@ RED.view = (function() { var labelParts; if (d.resize || this.__hideLabel__ !== hideLabel || this.__label__ !== label || this.__outputs__.length !== d.outputs) { labelParts = getLabelParts(label, "red-ui-flow-node-label"); - this.__label__ = label; - if (labelParts.lines.length !== this.__labelLineCount__) { + if (labelParts.lines.length !== this.__labelLineCount__ || this.__label__ !== label) { d.resize = true; } + this.__label__ = label; this.__labelLineCount__ = labelParts.lines.length; if (hideLabel) { From 21fd6e3c21d5b3579f6d7e288269c237354d205f Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Thu, 14 Oct 2021 12:00:27 +0100 Subject: [PATCH 16/25] Ensure link call node label updates when link-in changes --- .../@node-red/nodes/core/common/60-link.html | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/node_modules/@node-red/nodes/core/common/60-link.html b/packages/node_modules/@node-red/nodes/core/common/60-link.html index 9408b5561..59e3c9a92 100644 --- a/packages/node_modules/@node-red/nodes/core/common/60-link.html +++ b/packages/node_modules/@node-red/nodes/core/common/60-link.html @@ -242,6 +242,12 @@ }, oneditsave: function() { onEditSave(this); + // In case the name has changed, ensure any link call nodes on this + // tab are redrawn with the updated name + var localCallNodes = RED.nodes.filterNodes({z:RED.workspaces.active(), type:"link call"}); + localCallNodes.forEach(function(node) { + node.dirty = true; + }); }, onadd: onAdd, oneditresize: resizeNodeList @@ -267,12 +273,12 @@ } if (this.links.length > 0) { var targetNode = RED.nodes.node(this.links[0]); - return targetNode && (targetNode.name || targetNode.id); + return targetNode && (targetNode.name || this._("link.linkCall")); } - return this._("link.linkCall"); + return this._("inject.none"); }, labelStyle: function() { - return (this.name || this.links.length > 0)?"node_label_italic":""; + return this.name?"node_label_italic":""; }, oneditprepare: function() { onEditPrepare(this,"link in"); @@ -283,7 +289,6 @@ oneditresize: resizeNodeList }); - RED.nodes.registerType('link out',{ category: 'common', color:"#ddd",//"#87D8CF", From b8f1386ad0316b2b5abb7fc70d3c53f444321104 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Thu, 14 Oct 2021 12:05:06 +0100 Subject: [PATCH 17/25] Dynamic MQTT connections (#3189) * add mqtt-control - adds auto-connect option to broker - add new node mqtt-control - adds i18n messages - adds documentation * documentation tweaks * built in documentation improvements * fix tip layout causing oversized editor * remove unused requires * add missing `unsubscribe` dropdown option - oddly forgotten - now added * ensure clientid is updated dynamically * [rewrite] move mqtt-control login into mqtt-in * Remove dynamic label * remove redundant mqtt-control code left overs * Callback for brokerConn.connect (improve done()) - done is now called on connect callback * fix race condition if connect/disconnect too fast - node.connected and node.client.connected getting out of sync * fix connection fail when switching protocol 3 ~ 5 - ensure protocolId is correct for protocolVersion * change msg.subscribe prop to `msg.topic` * unsub all topics if msg.topic is `true` * delete temprary debugger statements * Final rework of dynamic mqtt connections Co-authored-by: Steve-Mcl --- .../@node-red/nodes/core/network/10-mqtt.html | 115 +- .../@node-red/nodes/core/network/10-mqtt.js | 1157 ++++++++++------- .../nodes/locales/en-US/messages.json | 11 +- .../nodes/locales/en-US/network/10-mqtt.html | 56 + 4 files changed, 866 insertions(+), 473 deletions(-) diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html index 406abf57d..747281ad0 100644 --- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html +++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html @@ -54,6 +54,18 @@ width: 15px; height: 15px; } + .form-row-mqtt5 { + display: none; + } + .form-row-mqtt5.form-row-mqtt5-active:not(.form-row-mqtt-static-disabled) { + display: block + } + .form-row-mqtt-static-disabled { + display: none; + /* opacity: 0.3; + pointer-events: none; */ + } +