@node-red/editor-client 4.1.0-beta.2 → 4.1.0

package/locales/fr/editor.json

@@ -1278,7 +1278,7 @@
     "label": "Notifications de mise à jour",
     "settingsTitle": "Activer les notifications de mise à jour",
     "settingsDescription": "<p>Node-RED peut vous avertir de la disponibilité d'une nouvelle version. Vous êtes ainsi informé des dernières fonctionnalités et correctifs.</p><p>Cela nécessite d'envoyer des données anonymes à l'équipe Node-RED. Elles n'incluent aucun détail sur vos flux ou vos utilisateurs.</p><p>Pour plus d'informations sur les informations collectées et leur utilisation, veuillez consulter la <a href=\"https://nodered.org/docs/telemetry\" target=\"_blank\">documentation</a>.</p>",
-    "settingsDescription2": "<p>Vous pouvez modifier ce paramètre à tout moment dans les paramètres de l'éditeur.</p>",
+    "settingsDescription2": "<p>Vous pouvez modifier ce paramètre à tout moment dans les paramètres de l'utilisateur.</p>",
     "enableLabel": "Oui, activer les notifications",
     "disableLabel": "Non, ne pas activer les notifications",
     "updateAvailable": "Mise(s) à jour disponible(s)",

package/locales/ja/editor.json

@@ -573,6 +573,7 @@
         "filter": "ノードを検索",
         "search": "ノードを検索",
         "addCategory": "新規追加...",
+        "loadingSuggestions": "提案を読み込み中...",
         "label": {
             "subflows": "サブフロー",
             "network": "ネットワーク",

package/package.json

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

package/public/red/about

@@ -1,3 +1,10 @@
+#### 4.1.0: Milestone Release
+
+ - Fix: multipart form data upload issue (#5228) @debadutta98
+ - Update help document of filter node (#5210) @kazuhitoyokoi
+ - Fix inject node validation to support binary and hexadecimal numbers (#5212) @ZJvandeWeg
+ - Do not select a nearest node if move is active (#5199) @GogoVega
+
 #### 4.1.0-beta.2: Beta Release
 
 Editor

package/public/red/red.js

@@ -6341,6 +6341,7 @@ RED.nodes = (function() {
      *       - id:replace - import over the top of existing
      *  - modules: map of module:version - hints for unknown nodes
      *  - applyNodeDefaults - whether to apply default values to the imported nodes (default: false)
+     *  - eventContext - context to include in the `nodes:add` event
      */
     function importNodes(newNodesObj,options) { // createNewIds,createMissingWorkspace) {
         const defOpts = {
@@ -6349,7 +6350,8 @@ RED.nodes = (function() {
             markChanged: false,
             reimport: false,
             importMap: {},
-            applyNodeDefaults: false
+            applyNodeDefaults: false,
+            eventContext: null
         }
         options = Object.assign({}, defOpts, options)
         options.importMap = options.importMap || {}
@@ -7225,7 +7227,7 @@ RED.nodes = (function() {
 
         // Now the nodes have been fully updated, add them.
         for (i=0;i<new_nodes.length;i++) {
-            new_nodes[i] = addNode(new_nodes[i])
+            new_nodes[i] = addNode(new_nodes[i], options.eventContext)
             node_map[new_nodes[i].id] = new_nodes[i]
         }
 
@@ -21009,23 +21011,27 @@ RED.keyboard = (function() {
             return resolveKeyEvent(evt);
         }
     }
-    d3.select(window).on("keydown",function() {
+    d3.select(window).on("keydown", () => {
+        handleEvent(d3.event)
+    })
+
+    function handleEvent (evt) {
         if (!handlersActive) {
             return;
         }
-        if (metaKeyCodes[d3.event.keyCode]) {
+        if (metaKeyCodes[evt]) {
             return;
         }
-        var handler = resolveKeyEvent(d3.event);
+        var handler = resolveKeyEvent(evt);
         if (handler && handler.ondown) {
             if (typeof handler.ondown === "string") {
                 RED.actions.invoke(handler.ondown);
             } else {
                 handler.ondown();
             }
-            d3.event.preventDefault();
-        }
-    });
+            evt.preventDefault();
+        }        
+    }
 
     function addHandler(scope,key,modifiers,ondown) {
         var mod = modifiers;
@@ -21407,7 +21413,8 @@ RED.keyboard = (function() {
         formatKey: formatKey,
         validateKey: validateKey,
         disable: disable,
-        enable: enable
+        enable: enable,
+        handle: handleEvent
     }
 
 })();
@@ -23414,7 +23421,11 @@ RED.view = (function() {
             if (RED.workspaces.isLocked()) {
                 return
             }
-            importNodes(clipboard,{generateIds: clipboardSource === 'copy', generateDefaultNames: clipboardSource === 'copy'});
+            importNodes(clipboard, {
+                generateIds: clipboardSource === 'copy',
+                generateDefaultNames: clipboardSource === 'copy',
+                eventContext: { source: 'clipboard' }
+            });
         });
 
         RED.actions.add("core:detach-selected-nodes", function() { detachSelectedNodes() })
@@ -24086,7 +24097,8 @@ RED.view = (function() {
                             touchImport: true,
                             notify: false,
                             // Ensure the node gets all of its defaults applied
-                            applyNodeDefaults: true
+                            applyNodeDefaults: true,
+                            eventContext: { source: 'typeSearch' }
                         })
                         quickAddActive = false;
                         ghostNode.remove();
@@ -24136,6 +24148,7 @@ RED.view = (function() {
                 }
                 var nn;
                 var historyEvent;
+                let addHistoryEvent;
                 if (/^_action_:/.test(type)) {
                     const actionName = type.substring(9)
                     quickAddActive = false;
@@ -24169,6 +24182,7 @@ RED.view = (function() {
                     nn = result.node;
                     historyEvent = result.historyEvent;
                 }
+                addHistoryEvent = historyEvent;
                 if (keepAdding) {
                     mouse_mode = RED.state.QUICK_JOINING;
                 }
@@ -24323,7 +24337,8 @@ RED.view = (function() {
 
                 if (linkToSplice) {
                     resetMouseVars();
-                    spliceLink(linkToSplice, nn, historyEvent)
+                    // Add any history event data to the original add event
+                    spliceLink(linkToSplice, nn, addHistoryEvent)
                 }
                 RED.history.push(historyEvent);
                 RED.nodes.dirty(true);
@@ -24367,6 +24382,7 @@ RED.view = (function() {
                 }
             },
             suggest: function (suggestion) {
+                // TypeSearch only provides one suggestion at a time
                 if (suggestion?.nodes?.length > 0) {
                     // Reposition the suggestion relative to the existing ghost node position
                     const deltaX = (suggestion.nodes[0].x || 0) - point[0]
@@ -28471,7 +28487,8 @@ RED.view = (function() {
             generateIds: false,
             generateDefaultNames: false,
             notify: true,
-            applyNodeDefaults: false
+            applyNodeDefaults: false,
+            eventContext: null
         }
         const addNewFlow = options.addFlow
         const touchImport = options.touchImport;
@@ -28561,7 +28578,8 @@ RED.view = (function() {
                 importMap: options.importMap,
                 markChanged: true,
                 modules: modules,
-                applyNodeDefaults: applyNodeDefaults
+                applyNodeDefaults: applyNodeDefaults,
+                eventContext: options.eventContext
             });
             if (importResult) {
                 var new_nodes = importResult.nodes;
@@ -29133,6 +29151,8 @@ RED.view = (function() {
      */
     function setSuggestedFlow (suggestion) {
         $(window).off('keydown.suggestedFlow')
+        $(window).off('mousedown.suggestedFlow');
+        RED.keyboard.enable()
         if (!currentSuggestion && !suggestion) {
             // Avoid unnecessary redraws
             return
@@ -29140,7 +29160,28 @@ RED.view = (function() {
         // Clear up any existing suggestion state
         clearSuggestedFlow()
         currentSuggestion = suggestion
-        if (suggestion?.nodes?.length > 0) {
+        if (suggestion && suggestion.nodes) {
+            // If suggestion.nodes is an array of arrays, then there are multiple suggestions being provided
+            // Normalise the shape of the suggestion.nodes to be an array of arrays 
+            if (!Array.isArray(suggestion.nodes[0])) {
+                suggestion.nodes = [suggestion.nodes]
+            }
+            suggestion.count = suggestion.nodes.length
+            suggestion.currentIndex = 0
+            suggestion.current = suggestion.nodes[suggestion.currentIndex]
+            refreshSuggestedFlow()
+        } else {
+            redraw()
+        }
+    }
+
+    function refreshSuggestedFlow () {
+        const suggestion = currentSuggestion
+        suggestedNodes = []
+        suggestedLinks = []
+
+        currentSuggestion.current = currentSuggestion.nodes[currentSuggestion.currentIndex]
+        if (suggestion.current.length > 0) {
             const nodeMap = {}
             const links = []
             const positionOffset = { x: 0, y: 0 }
@@ -29156,12 +29197,11 @@ RED.view = (function() {
                     targetX += gridOffset.x
                 }
 
-                positionOffset.x = targetX - (suggestion.nodes[0].x || 0)
-                positionOffset.y = targetY - (suggestion.nodes[0].y || 0)
+                positionOffset.x = targetX - (suggestion.current[0].x || 0)
+                positionOffset.y = targetY - (suggestion.current[0].y || 0)
             }
 
-
-            suggestion.nodes.forEach(nodeConfig => {
+            suggestion.current.forEach(nodeConfig => {
                 if (!nodeConfig.type || nodeConfig.type === 'group' || nodeConfig.type === 'subflow' || nodeConfig.type === 'tab') {
                     // A node type we don't support previewing
                     return
@@ -29258,12 +29298,38 @@ RED.view = (function() {
                 })
             }
             if (!RED.typeSearch.isVisible()) {
+                // Disable the core keyboard handling so we get priority.
+                // Ideally we'd be able to do this via actions, but we can't currently scope
+                // actions finely enough to only be handled when the suggested flow is active.
+                RED.keyboard.disable()
                 $(window).on('keydown.suggestedFlow', function (evt) {
-                    if (evt.keyCode === 9) { // tab
+                    $(window).off('keydown.suggestedFlow')
+                    RED.keyboard.enable()
+                    if (evt.keyCode === 9) { // tab; apply suggestion
+                        evt.stopPropagation();
+                        evt.preventDefault();
                         applySuggestedFlow();
-                    } else {
+                    } else if (evt.keyCode === 38 && currentSuggestion.count > 1) { // up arrow
+                        evt.stopPropagation();
+                        evt.preventDefault();
+                        currentSuggestion.currentIndex--
+                        if (currentSuggestion.currentIndex < 0) {
+                            currentSuggestion.currentIndex = currentSuggestion.count - 1
+                        }
+                        refreshSuggestedFlow();
+                    } else if (evt.keyCode === 40 && currentSuggestion.count > 1) { // down arrow
+                        evt.stopPropagation();
+                        evt.preventDefault();
+                        currentSuggestion.currentIndex++
+                        if (currentSuggestion.currentIndex === currentSuggestion.count) {
+                            currentSuggestion.currentIndex = 0
+                        }
+                        refreshSuggestedFlow();
+                    } else { // Anything else; clear the suggestion
                         clearSuggestedFlow();
                         RED.view.redraw(true);
+                        // manually push the event to the keyboard handler
+                        RED.keyboard.handle(evt)
                     }
                 });
             }
@@ -29280,20 +29346,27 @@ RED.view = (function() {
                 ghostNode.style('opacity', 1)
             }
         }
-        redraw();
+        if (currentSuggestion.count > 1 && suggestedNodes.length > 0) {
+            suggestedNodes[0].status = {
+                text: `${currentSuggestion.currentIndex + 1} / ${currentSuggestion.count}`,
+            }
+            suggestedNodes[0].dirtyStatus = true
+        }
+        redraw()
     }
 
     function clearSuggestedFlow () {
         $(window).off('mousedown.suggestedFlow');
         $(window).off('keydown.suggestedFlow')
+        RED.keyboard.enable()
         currentSuggestion = null
         suggestedNodes = []
         suggestedLinks = []
     }
 
     function applySuggestedFlow () {
-        if (currentSuggestion && currentSuggestion.nodes) {
-            const nodesToImport = currentSuggestion.nodes
+        if (currentSuggestion && currentSuggestion.current) {
+            const nodesToImport = currentSuggestion.current
             const sourceNode = currentSuggestion.source
             const sourcePort = currentSuggestion.sourcePort || 0
             setSuggestedFlow(null)
@@ -29302,7 +29375,8 @@ RED.view = (function() {
                 touchImport: true,
                 notify: false,
                 // Ensure the node gets all of its defaults applied
-                applyNodeDefaults: true
+                applyNodeDefaults: true,
+                eventContext: { source: 'suggestion' }
             })
             if (sourceNode) {
                 const firstNode = result.nodeMap[nodesToImport[0].id]
@@ -30307,6 +30381,8 @@ RED.view.tools = (function() {
 
 
     function gotoNearestNode(direction) {
+        // Do not select a nearest node if move is active
+        if (RED.view.state() === RED.state.MOVING_ACTIVE) { return }
         var selection = RED.view.selection();
         if (selection.nodes && selection.nodes.length === 1) {
             var origin = selection.nodes[0];
@@ -45147,6 +45223,15 @@ RED.editor.codeEditor.monaco = (function() {
             ed.gotoLine(row, col);
         }
         ed.type = type;
+
+        ed.onKeyDown((event) => {
+            if (event.keyCode === monaco.KeyCode.Escape) {
+                if (monacoWidgetsAreOpen(ed)) {
+                    event.preventDefault();
+                }
+            }
+        })
+
         return ed;
     }
 
@@ -45156,6 +45241,16 @@ RED.editor.codeEditor.monaco = (function() {
         return true;
     }
 
+    function monacoWidgetsAreOpen(editor) {
+        /** @type {HTMLElement} */
+        const editorDomNode = editor.getDomNode()
+        const suggestVisible = !!editorDomNode.querySelector('.monaco-editor .suggest-widget.visible');
+        const parameterHintsVisible = !!editorDomNode.querySelector('.monaco-editor .parameter-hints-widget.visible');
+        const findWidgetVisible = !!editorDomNode.querySelector('.monaco-editor .find-widget.visible');
+        const renameInputVisible = !!editorDomNode.querySelector('.monaco-editor .rename-box');
+        return suggestVisible || parameterHintsVisible || findWidgetVisible || renameInputVisible
+    }
+
     return {
         /**
          * Editor type
@@ -49749,6 +49844,14 @@ RED.actionList = (function() {
         }
     }
     function confirm(def) {
+        if (!activeSuggestion) {
+            // The user has hit Enter without selecting an entry in the list.
+            // This means no suggestion has been shown yet - and the position recalculation
+            // has not been done.
+            // Trigger an update of the suggestion to get the position right before
+            // applying.
+            updateSuggestion(def)
+        }
         hide();
         if (!def.nodes && !/^_action_:/.test(def.type)) {
             typesUsed[def.type] = Date.now();