@node-red/editor-client 3.1.0-beta.4 → 3.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-client",
-    "version": "3.1.0-beta.4",
+    "version": "3.1.0",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",

package/public/red/about

@@ -1,4 +1,38 @@
-#### 3.1.0-beta.4: Beta Release
+#### 3.1.0: Milestone Release
+
+Editor
+
+ - Default filter to All Catalogues and show nodes for small lists (#4318) @knolleary
+ - Better distinguish between ctrl and meta keys on mac (#4310) @knolleary
+ - Ensure junction appears when filtering quick-add list (#4297) @knolleary
+ - Update message catalogs for JSONata Expression editor (#4287) @kazuhitoyokoi
+ - Add tooltip to relevance sort button in user settings UI (#4288) @kazuhitoyokoi
+ - Capture workspace dirty state when quick-adding junction (#4283) @knolleary
+ - Add docs for $clone function (#4284) @knolleary
+
+Runtime
+
+ - Dependency updates (#4317) @knolleary
+ - Ensure storage/util.writeFile handles concurrent write attempts (#4316) @knolleary
+ - Migrate http -> https for nodered.org (#4313) @Rotzbua
+ - Add Node 20 to GH Action test matrix (#4305) @Rotzbua
+ - Handle group-scoped nodes inside subflow (#4301) @knolleary
+ - Handle non-url-safe chars in context api (#4298) @knolleary
+ - Fix git pull operation in project feature (#4290) @kazuhitoyokoi
+ - Change linefeed codes in Korean message catalogs (#4286) @kazuhitoyokoi
+ - Fix file permissions of message catalogs (#4285) @kazuhitoyokoi
+ - Update tour (#4278) @knolleary
+ 
+Nodes
+
+ - File: Fix handling in file nodes when number is specified as file name (#4267) @kazuhitoyokoi
+ - Function: Adding function timeout to settings file (#4265) (#4309) @knolleary
+ - Function: Fix function setup tab layout (#4299) @knolleary
+ - HTTP Request: Handle 204 in httprequest JSON (#4262) @sammachin
+ - JSON: Fix test cases of JSON node (#4275) @kazuhitoyokoi
+ - MQTT: Remove unnecessary check for clientid if autoUnsub set (#4302) @knolleary
+
+##### 3.1.0-beta.4: Beta Release
 
  Editor
 
@@ -28,7 +62,7 @@
  - Fix delay node flush issue (#4203) @dceejay
  - Update status and catch node labels in group mode (#4207) @Steve-Mcl
 
-#### 3.1.0-beta.3: Beta Release
+##### 3.1.0-beta.3: Beta Release
 
 Editor
 
@@ -63,7 +97,7 @@ Nodes
  - MQTT: Option to disable MQTT topic unsubscribe on disconnect (#4078) @flying7eleven
 
 
-#### 3.1.0-beta.2: Beta Release
+##### 3.1.0-beta.2: Beta Release
 
 Editor
 
@@ -113,7 +147,7 @@ Nodes
  - File Out: Fix extra newline append for multipart file write (#3915) @dceejay
  - Add validators for complete and link call nodes (#4056) @kazuhitoyokoi
 
-#### 3.1.0-beta.1: Beta Release
+##### 3.1.0-beta.1: Beta Release
 
 Editor
 

package/public/red/red.js

@@ -822,7 +822,7 @@ var RED = (function() {
         }
         menuOptions.push({id:"menu-item-help",
             label: RED.settings.theme("menu.menu-item-help.label",RED._("menu.label.help")),
-            href: RED.settings.theme("menu.menu-item-help.url","http://nodered.org/docs")
+            href: RED.settings.theme("menu.menu-item-help.url","https://nodered.org/docs")
         });
         menuOptions.push({id:"menu-item-node-red-version", label:"v"+RED.settings.version, onselect: "core:show-about" });
 
@@ -4493,8 +4493,8 @@ RED.nodes = (function() {
 
         if (node && node._def.onremove) {
             // Deprecated: never documented but used by some early nodes
-            console.log("Deprecated API warning: node type ",node.type," has an onremove function - should be oneditremove - please report");
-            node._def.onremove.call(n);
+            console.log("Deprecated API warning: node type ",node.type," has an onremove function - should be oneditdelete - please report");
+            node._def.onremove.call(node);
         }
         return {links:removedLinks,nodes:removedNodes};
     }
@@ -17426,9 +17426,10 @@ RED.diagnostics = (function () {
             }
             if (localNode && remoteNode && typeof localNode[d] === "string") {
                 if (/\n/.test(localNode[d]) || /\n/.test(remoteNode[d])) {
-                    $('<button class="red-ui-button red-ui-button-small red-ui-diff-text-diff-button"><i class="fa fa-file-o"> <i class="fa fa-caret-left"></i> <i class="fa fa-caret-right"></i> <i class="fa fa-file-o"></i></button>').on("click", function() {
+                    var textDiff = $('<button class="red-ui-button red-ui-button-small red-ui-diff-text-diff-button"><i class="fa fa-file-o"> <i class="fa fa-caret-left"></i> <i class="fa fa-caret-right"></i> <i class="fa fa-file-o"></i></button>').on("click", function() {
                         showTextDiff(localNode[d],remoteNode[d]);
                     }).appendTo(propertyNameCell);
+                    RED.popover.tooltip(textDiff, RED._("diff.compareChanges"));
                 }
             }
 
@@ -20824,11 +20825,21 @@ RED.view = (function() {
         return api
     })()
 
+    const isMac = RED.utils.getBrowserInfo().os === 'mac'
+    // 'Control' is the main modifier key for mouse actions. On Windows,
+    // that is the standard Ctrl key. On Mac that is the Cmd key.
+    function isControlPressed (event) {
+        return (isMac && event.metaKey) || (!isMac && event.ctrlKey)
+    }
 
     function init() {
 
         chart = $("#red-ui-workspace-chart");
         chart.on('contextmenu', function(evt) {
+            if (RED.view.DEBUG) {
+                console.warn("contextmenu", { mouse_mode, event: d3.event });
+            }
+            mouse_mode = RED.state.DEFAULT
             evt.preventDefault()
             evt.stopPropagation()
             RED.contextMenu.show({
@@ -21712,7 +21723,7 @@ RED.view = (function() {
             lasso = null;
         }
         if (d3.event.touches || d3.event.button === 0) {
-            if ((mouse_mode === 0 || mouse_mode === RED.state.QUICK_JOINING) && (d3.event.metaKey || d3.event.ctrlKey) && !(d3.event.altKey || d3.event.shiftKey)) {
+            if ((mouse_mode === 0 || mouse_mode === RED.state.QUICK_JOINING) && isControlPressed(d3.event) && !(d3.event.altKey || d3.event.shiftKey)) {
                 // Trigger quick add dialog
                 d3.event.stopPropagation();
                 clearSelection();
@@ -21722,7 +21733,7 @@ RED.view = (function() {
                     clickedGroup = clickedGroup || RED.nodes.group(drag_lines[0].node.g)
                 }
                 showQuickAddDialog({ position: point, group: clickedGroup });
-            } else if (mouse_mode === 0 && !(d3.event.metaKey || d3.event.ctrlKey)) {
+            } else if (mouse_mode === 0 && !isControlPressed(d3.event)) {
                 // CTRL not being held
                 if (!d3.event.altKey) {
                     // ALT not held (shift is allowed) Trigger lasso
@@ -21920,6 +21931,7 @@ RED.view = (function() {
                     }
                     historyEvent = {
                         t:'add',
+                        dirty: RED.nodes.dirty(),
                         junctions:[nn]
                     }
                 } else {
@@ -24061,7 +24073,7 @@ RED.view = (function() {
             d3.event.preventDefault()
             document.getSelection().removeAllRanges()
             if (d.type != "subflow") {
-                if (/^subflow:/.test(d.type) && (d3.event.ctrlKey || d3.event.metaKey)) {
+                if (/^subflow:/.test(d.type) && isControlPressed(d3.event)) {
                     RED.workspaces.show(d.type.substring(8));
                 } else {
                     RED.editor.edit(d);
@@ -24225,12 +24237,12 @@ RED.view = (function() {
             d.type !== 'junction'
         lastClickNode = mousedown_node;
      
-        if (d.selected && (d3.event.ctrlKey||d3.event.metaKey)) {
+        if (d.selected && isControlPressed(d3.event)) {
             mousedown_node.selected = false;
             movingSet.remove(mousedown_node);
         } else {
             if (d3.event.shiftKey) {
-                if (!(d3.event.ctrlKey||d3.event.metaKey)) {
+                if (!isControlPressed(d3.event)) {
                     clearSelection();
                 }
                 var clickPosition = (d3.event.offsetX/scaleFactor - mousedown_node.x)
@@ -24399,10 +24411,10 @@ RED.view = (function() {
         }
         mousedown_link = d;
 
-        if (!(d3.event.metaKey || d3.event.ctrlKey)) {
+        if (!isControlPressed(d3.event)) {
             clearSelection();
         }
-        if (d3.event.metaKey || d3.event.ctrlKey) {
+        if (isControlPressed(d3.event)) {
             if (!selectedLinks.has(mousedown_link)) {
                 selectedLinks.add(mousedown_link);
             } else {
@@ -24417,7 +24429,7 @@ RED.view = (function() {
         redraw();
         focusView();
         d3.event.stopPropagation();
-        if (!mousedown_link.link && movingSet.length() === 0 && (d3.event.touches || d3.event.button === 0) && selectedLinks.length() === 1 && selectedLinks.has(mousedown_link) && (d3.event.metaKey || d3.event.ctrlKey)) {
+        if (!mousedown_link.link && movingSet.length() === 0 && (d3.event.touches || d3.event.button === 0) && selectedLinks.length() === 1 && selectedLinks.has(mousedown_link) && isControlPressed(d3.event)) {
             d3.select(this).classed("red-ui-flow-link-splice",true);
             var point = d3.mouse(this);
             var clickedGroup = getGroupAt(point[0],point[1]);
@@ -24498,7 +24510,7 @@ RED.view = (function() {
         );
         lastClickNode = g;
 
-        if (g.selected && (d3.event.ctrlKey||d3.event.metaKey)) {
+        if (g.selected && isControlPressed(d3.event)) {
             selectedGroups.remove(g);
             d3.event.stopPropagation();
         } else {
@@ -32139,11 +32151,11 @@ RED.sidebar.context = (function() {
                     var obj = $(propRow.children()[0]);
                     obj.text(k);
                     var tools = $('<span class="button-group"></span>');
-
+                    const urlSafeK = encodeURIComponent(k)
                     var refreshItem = $('<button class="red-ui-button red-ui-button-small"><i class="fa fa-refresh"></i></button>').appendTo(tools).on("click", function(e) {
                         e.preventDefault();
                         e.stopPropagation();
-                        $.getJSON(baseUrl+"/"+k+"?store="+v.store, function(data) {
+                        $.getJSON(baseUrl+"/"+urlSafeK+"?store="+v.store, function(data) {
                             if (data.msg !== payload || data.format !== format) {
                                 payload = data.msg;
                                 format = data.format;
@@ -32179,11 +32191,12 @@ RED.sidebar.context = (function() {
                                 $('<button class="red-ui-button primary" data-i18n="common.label.delete"></button>').appendTo(bg).on("click", function(e) {
                                     e.preventDefault();
                                     popover.close();
+                                    const urlSafeK = encodeURIComponent(k)
                                     $.ajax({
-                                        url: baseUrl+"/"+k+"?store="+v.store,
+                                        url: baseUrl+"/"+urlSafeK+"?store="+v.store,
                                         type: "DELETE"
                                     }).done(function(data,textStatus,xhr) {
-                                        $.getJSON(baseUrl+"/"+k+"?store="+v.store, function(data) {
+                                        $.getJSON(baseUrl+"/"+urlSafeK+"?store="+v.store, function(data) {
                                             if (data.format === 'undefined') {
                                                 propRow.remove();
                                                 if (container.children().length === 0) {
@@ -32747,6 +32760,7 @@ RED.palette.editor = (function() {
         // if there is only 1 catalog, hide the select
         if (catalogEntries.length > 1) {
             catalogSelection.prepend(`<option value="all">${RED._('palette.editor.allCatalogs')}</option>`)
+            catalogSelection.val('all')
             catalogSelection.removeAttr('disabled') // permit the user to select a catalog
         }
         // refresh the searchInput counter and trigger a change
@@ -32776,7 +32790,7 @@ RED.palette.editor = (function() {
     function refreshFilteredItems() {
         packageList.editableList('empty');
         var currentFilter = searchInput.searchBox('value').trim();
-        if (currentFilter === ""){
+        if (currentFilter === "" && loadedList.length > 20){
             packageList.editableList('addItem',{count:loadedList.length})
             return;
         }
@@ -33146,7 +33160,7 @@ RED.palette.editor = (function() {
                 delay: 300,
                 change: function() {
                     var searchTerm = $(this).val().trim().toLowerCase();
-                    if (searchTerm.length > 0) {
+                    if (searchTerm.length > 0 || loadedList.length < 20) {
                         filteredList = loadedList.filter(function(m) {
                             return (m.index.indexOf(searchTerm) > -1);
                         }).map(function(f) { return {info:f}});
@@ -33170,6 +33184,7 @@ RED.palette.editor = (function() {
         const sortRelevance = $('<a href="#" class="red-ui-palette-editor-install-sort-option red-ui-sidebar-header-button-toggle selected"><i class="fa fa-sort-amount-desc"></i></a>').appendTo(sortGroup);
         const sortAZ = $('<a href="#" class="red-ui-palette-editor-install-sort-option red-ui-sidebar-header-button-toggle"><i class="fa fa-sort-alpha-asc"></i></a>').appendTo(sortGroup);
         const sortRecent = $('<a href="#" class="red-ui-palette-editor-install-sort-option red-ui-sidebar-header-button-toggle"><i class="fa fa-calendar"></i></a>').appendTo(sortGroup);
+        RED.popover.tooltip(sortRelevance,RED._("palette.editor.sortRelevance"));
         RED.popover.tooltip(sortAZ,RED._("palette.editor.sortAZ"));
         RED.popover.tooltip(sortRecent,RED._("palette.editor.sortRecent"));
 
@@ -35881,7 +35896,7 @@ RED.editor = (function() {
         }
 
         $('<div class="form-row">'+
-            '<label for="node-input-show-label-btn" data-i18n="editor.label"></label>'+
+            '<label for="node-input-show-label" data-i18n="editor.label"></label>'+
             '<span style="margin-right: 2px;"/>'+
             '<input type="checkbox" id="node-input-show-label"/>'+
         '</div>').appendTo(dialogForm);
@@ -45766,6 +45781,7 @@ RED.actionList = (function() {
                 items.push({type:t,def: def, label:getTypeLabel(t,def)});
             }
         });
+        items.push({ type: 'junction', def: { inputs:1, outputs: 1, label: 'junction', type: 'junction'}, label: 'junction' })
         items.sort(sortTypeLabels);
 
         var commonCount = 0;