mirrors/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red synced 2024-11-21 15:43:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4912 from GogoVega/improve-node-name
Some checks failed
Run tests / build (18) (push) Has been cancelled
Details
Run tests / build (20) (push) Has been cancelled
Details
Run tests / build (22) (push) Has been cancelled
Details

Browse Source 
Improve the node name auto-generated with the first available number
This commit is contained in:
Nick O'Leary 2024-10-21 16:42:04 +01:00 committed by GitHub
commit c363f375b6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
packages/node_modules/@node-red/editor-client/src/js/ui/view-tools.js vendored
View File

@ -1102,18 +1102,27 @@ RED.view.tools = (function() {
const paletteLabel = RED.utils.getPaletteLabel(n.type, nodeDef) const paletteLabel = RED.utils.getPaletteLabel(n.type, nodeDef)
const defaultNodeNameRE = new RegExp('^'+paletteLabel.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')+' (\\d+)$') const defaultNodeNameRE = new RegExp('^'+paletteLabel.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')+' (\\d+)$')
if (!typeIndex.hasOwnProperty(n.type)) { if (!typeIndex.hasOwnProperty(n.type)) {
const existingNodes = RED.nodes.filterNodes({type: n.type}) const existingNodes = RED.nodes.filterNodes({ type: n.type });
let maxNameNumber = 0; const existingIds = existingNodes.reduce((ids, node) => {
existingNodes.forEach(n => { let match = defaultNodeNameRE.exec(node.name);
let match = defaultNodeNameRE.exec(n.name)
if (match) { if (match) {
let nodeNumber = parseInt(match[1]) const nodeNumber = parseInt(match[1], 10);
if (nodeNumber > maxNameNumber) { if (!ids.includes(nodeNumber)) {
maxNameNumber = nodeNumber ids.push(nodeNumber);
} }
} }
}) return ids;
typeIndex[n.type] = maxNameNumber + 1 }, []).sort((a, b) => a - b);
let availableNameNumber = 1;
for (let i = 0; i < existingIds.length; i++) {
if (existingIds[i] !== availableNameNumber) {
break;
}
availableNameNumber++;
}
typeIndex[n.type] = availableNameNumber;
} }
if ((options.renameBlank && n.name === '') || (options.renameClash && defaultNodeNameRE.test(n.name))) { if ((options.renameBlank && n.name === '') || (options.renameClash && defaultNodeNameRE.test(n.name))) {
if (generateHistory) { if (generateHistory) {