',{style: "display: flex"});
- const valEl = $('',{style:"font-family: var(--red-ui-monospace-font); white-space:nowrap; overflow: hidden; flex-grow:1"});
+ const valEl = $('',{ class: "red-ui-autoComplete-completion" });
valEl.append(generateSpans(valMatch))
valEl.appendTo(element)
@@ -201,7 +202,7 @@
const that = this
const getContextKeysFromRuntime = function(scope, store, searchKey, done) {
contextKnownKeys[scope] = contextKnownKeys[scope] || {}
- contextKnownKeys[scope][store] = contextKnownKeys[scope][store] || new Set()
+ contextKnownKeys[scope][store] = contextKnownKeys[scope][store] || new Map()
if (searchKey.length > 0) {
try {
RED.utils.normalisePropertyExpression(searchKey)
@@ -223,11 +224,12 @@
const result = data[store] || {}
const keys = result.keys || []
const keyPrefix = searchKey + (searchKey.length > 0 ? '.' : '')
- keys.forEach(key => {
+ keys.forEach(keyInfo => {
+ const key = keyInfo.key
if (/^[a-zA-Z_$][0-9a-zA-Z_$]*$/.test(key)) {
- contextKnownKeys[scope][store].add(keyPrefix + key)
+ contextKnownKeys[scope][store].set(keyPrefix + key, keyInfo)
} else {
- contextKnownKeys[scope][store].add(searchKey + "[\""+key.replace(/"/,"\\\"")+"\"]")
+ contextKnownKeys[scope][store].set(searchKey + "[\""+key.replace(/"/,"\\\"")+"\"]", keyInfo)
}
})
done()
@@ -242,14 +244,14 @@
// Get the flow id of the node we're editing
const editStack = RED.editor.getEditStack()
if (editStack.length === 0) {
- done([])
+ done(new Map())
return
}
const editingNode = editStack.pop()
if (editingNode.z) {
scope = `${scope}/${editingNode.z}`
} else {
- done([])
+ done(new Map())
return
}
}
@@ -269,17 +271,29 @@
return function(val, done) {
getContextKeys(val, function (keys) {
const matches = []
- keys.forEach(v => {
+ keys.forEach((keyInfo, v) => {
let optVal = v
let valMatch = getMatch(optVal, val);
- if (!valMatch.found && val.length > 0 && val.endsWith('.')) {
- // Search key ends in '.' - but doesn't match. Check again
- // with [" at the end instead so we match bracket notation
- valMatch = getMatch(optVal, val.substring(0, val.length - 1) + '["')
+ if (!valMatch.found && val.length > 0) {
+ if (val.endsWith('.')) {
+ // Search key ends in '.' - but doesn't match. Check again
+ // with [" at the end instead so we match bracket notation
+ valMatch = getMatch(optVal, val.substring(0, val.length - 1) + '["')
+ // } else if (val.endsWith('[') && /^array/.test(keyInfo.format)) {
+ // console.log('this case')
+ }
}
if (valMatch.found) {
const element = $('
',{style: "display: flex"});
- const valEl = $('',{style:"font-family: var(--red-ui-monospace-font); white-space:nowrap; overflow: hidden; flex-grow:1"});
+ const valEl = $('',{ class: "red-ui-autoComplete-completion" });
+ // if (keyInfo.format) {
+ // valMatch.post += ' ' + keyInfo.format
+ // }
+ if (valMatch.exact && /^array/.test(keyInfo.format)) {
+ valMatch.post += `[0-${keyInfo.length}]`
+ optVal += '['
+
+ }
valEl.append(generateSpans(valMatch))
valEl.appendTo(element)
matches.push({
@@ -1567,7 +1581,8 @@
if (tooltip) {
tooltip.setContent(valid);
} else {
- tooltip = RED.popover.tooltip(this.elementDiv, valid);
+ const target = this.typeMap[type]?.options ? this.optionSelectLabel : this.elementDiv;
+ tooltip = RED.popover.tooltip(target, valid);
this.element.data("tooltip", tooltip);
}
}
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/contextMenu.js b/packages/node_modules/@node-red/editor-client/src/js/ui/contextMenu.js
index 698842dbd..53ebe5c4b 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/contextMenu.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/contextMenu.js
@@ -54,15 +54,15 @@ RED.contextMenu = (function () {
}
}
+ const scale = RED.view.scale()
const offset = $("#red-ui-workspace-chart").offset()
-
- let addX = options.x - offset.left + $("#red-ui-workspace-chart").scrollLeft()
- let addY = options.y - offset.top + $("#red-ui-workspace-chart").scrollTop()
+ let addX = (options.x - offset.left + $("#red-ui-workspace-chart").scrollLeft()) / scale
+ let addY = (options.y - offset.top + $("#red-ui-workspace-chart").scrollTop()) / scale
if (RED.view.snapGrid) {
const gridSize = RED.view.gridSize()
- addX = gridSize * Math.floor(addX / gridSize)
- addY = gridSize * Math.floor(addY / gridSize)
+ addX = gridSize * Math.round(addX / gridSize)
+ addY = gridSize * Math.round(addY / gridSize)
}
if (RED.settings.theme("menu.menu-item-action-list", true)) {
@@ -87,7 +87,9 @@ RED.contextMenu = (function () {
},
(hasLinks) ? { // has least 1 wire selected
label: RED._("contextMenu.junction"),
- onselect: 'core:split-wires-with-junctions',
+ onselect: function () {
+ RED.actions.invoke('core:split-wires-with-junctions', { x: addX, y: addY })
+ },
disabled: !canEdit || !hasLinks
} : {
label: RED._("contextMenu.junction"),
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js b/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js
index 25a67907c..d318f476c 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js
@@ -44,6 +44,7 @@ RED.deploy = (function() {
/**
* options:
* type: "default" - Button with drop-down options - no further customisation available
+ * label: the text to display - default: "Deploy"
* type: "simple" - Button without dropdown. Customisations:
* label: the text to display - default: "Deploy"
* icon : the icon to use. Null removes the icon. default: "red/images/deploy-full-o.svg"
@@ -51,13 +52,14 @@ RED.deploy = (function() {
function init(options) {
options = options || {};
var type = options.type || "default";
+ var label = options.label || RED._("deploy.deploy");
if (type == "default") {
$(''+
''+
''+
'
'+
- ''+RED._("deploy.deploy")+''+
+ ''+label+''+
''+
'
'+
- ''+RED._("deploy.deploy")+''+
+ ''+label+''+
''+
'
'+
@@ -78,7 +80,6 @@ RED.deploy = (function() {
mainMenuItems.push({id:"deploymenu-item-reload", icon:"red/images/deploy-reload.svg",label:RED._("deploy.restartFlows"),sublabel:RED._("deploy.restartFlowsDesc"),onselect:"core:restart-flows"})
RED.menu.init({id:"red-ui-header-button-deploy-options", options: mainMenuItems });
} else if (type == "simple") {
- var label = options.label || RED._("deploy.deploy");
var icon = 'red/images/deploy-full-o.svg';
if (options.hasOwnProperty('icon')) {
icon = options.icon;
@@ -424,11 +425,15 @@ RED.deploy = (function() {
const unknownNodes = [];
const invalidNodes = [];
+ const isDisabled = function (node) {
+ return (node.d || RED.nodes.workspace(node.z)?.disabled);
+ };
+
RED.nodes.eachConfig(function (node) {
if (node.valid === undefined) {
RED.editor.validateNode(node);
}
- if (!node.valid && !node.d) {
+ if (!node.valid && !isDisabled(node)) {
invalidNodes.push(getNodeInfo(node));
}
if (node.type === "unknown") {
@@ -438,7 +443,7 @@ RED.deploy = (function() {
}
});
RED.nodes.eachNode(function (node) {
- if (!node.valid && !node.d) {
+ if (!node.valid && !isDisabled(node)) {
invalidNodes.push(getNodeInfo(node));
}
if (node.type === "unknown") {
@@ -452,7 +457,7 @@ RED.deploy = (function() {
const unusedConfigNodes = [];
RED.nodes.eachConfig(function (node) {
- if ((node._def.hasUsers !== false) && (node.users.length === 0)) {
+ if ((node._def.hasUsers !== false) && (node.users.length === 0) && !isDisabled(node)) {
unusedConfigNodes.push(getNodeInfo(node));
hasUnusedConfig = true;
}
@@ -589,7 +594,9 @@ RED.deploy = (function() {
RED.notify('