mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-12-31 23:47:28 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

refactor

Browse source
This commit is contained in:
Mutasem 2021-11-01 17:21:10 +01:00
parent b939f7fbb9
commit 828291df2c
3 changed files with 47 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packages/editor-ui/src/Interface.ts
View file

@ -118,6 +118,7 @@ export interface INodeUi extends INode {
color?: string; color?: string;
notes?: string; notes?: string;
issues?: INodeIssues; issues?: INodeIssues;
name: string;
} }
export interface INodeTypesMaxCount { export interface INodeTypesMaxCount {

49
packages/editor-ui/src/views/NodeView.vue
View file

@ -1095,47 +1095,6 @@ export default mixins(
this.$store.commit('setActiveNode', node.name); this.$store.commit('setActiveNode', node.name);
} }
}, },
getUniqueNodeName (originalName: string, additinalUsedNames?: string[]) {
// Check if node-name is unique else find one that is
additinalUsedNames = additinalUsedNames || [];
// Get all the names of the current nodes
const nodeNames = this.$store.getters.allNodes.map((node: INodeUi) => {
return node.name;
});
// Check first if the current name is already unique
if (!nodeNames.includes(originalName) && !additinalUsedNames.includes(originalName)) {
return originalName;
}
const nameMatch = originalName.match(/(.*\D+)(\d*)/);
let ignore, baseName, nameIndex, uniqueName;
let index = 1;
if (nameMatch === null) {
// Name is only a number
index = parseInt(originalName, 10);
baseName = '';
uniqueName = baseName + index;
} else {
// Name is string or string/number combination
[ignore, baseName, nameIndex] = nameMatch;
if (nameIndex !== '') {
index = parseInt(nameIndex, 10);
}
uniqueName = baseName;
}
while (
nodeNames.includes(uniqueName) ||
additinalUsedNames.includes(uniqueName)
) {
uniqueName = baseName + (index++);
}
return uniqueName;
},
showMaxNodeTypeError (nodeTypeData: INodeTypeDescription) { showMaxNodeTypeError (nodeTypeData: INodeTypeDescription) {
const maxNodes = nodeTypeData.maxNodes; const maxNodes = nodeTypeData.maxNodes;
this.$showMessage({ this.$showMessage({
@ -1211,7 +1170,7 @@ export default mixins(
} }
// Check if node-name is unique else find one that is // Check if node-name is unique else find one that is
newNodeData.name = this.getUniqueNodeName(newNodeData.name); newNodeData.name = CanvasHelpers.getUniqueNodeName(this.$store.getters.allNodes, newNodeData.name);
if (nodeTypeData.webhooks && nodeTypeData.webhooks.length) { if (nodeTypeData.webhooks && nodeTypeData.webhooks.length) {
newNodeData.webhookId = uuidv4(); newNodeData.webhookId = uuidv4();
@ -1724,7 +1683,7 @@ export default mixins(
const newNodeData = JSON.parse(JSON.stringify(this.getNodeDataToSave(node))); const newNodeData = JSON.parse(JSON.stringify(this.getNodeDataToSave(node)));
// Check if node-name is unique else find one that is // Check if node-name is unique else find one that is
newNodeData.name = this.getUniqueNodeName(newNodeData.name); newNodeData.name = CanvasHelpers.getUniqueNodeName(this.$store.getters.allNodes, newNodeData.name);
newNodeData.position = CanvasHelpers.getNewNodePosition( newNodeData.position = CanvasHelpers.getNewNodePosition(
this.nodes, this.nodes,
@ -1929,7 +1888,7 @@ export default mixins(
return; return;
} }
// Check if node-name is unique else find one that is // Check if node-name is unique else find one that is
newName = this.getUniqueNodeName(newName); newName = CanvasHelpers.getUniqueNodeName(this.$store.getters.allNodes, newName);
// Rename the node and update the connections // Rename the node and update the connections
const workflow = this.getWorkflow(undefined, undefined, true); const workflow = this.getWorkflow(undefined, undefined, true);
@ -2141,7 +2100,7 @@ export default mixins(
} }
oldName = node.name; oldName = node.name;
newName = this.getUniqueNodeName(node.name, newNodeNames); newName = CanvasHelpers.getUniqueNodeName(this.$store.getters.allNodes, node.name, newNodeNames);
newNodeNames.push(newName); newNodeNames.push(newName);
nodeNameTable[oldName] = newName; nodeNameTable[oldName] = newName;

42
packages/editor-ui/src/views/canvasHelpers.ts
View file

@ -478,3 +478,45 @@ export const getZoomToFit = (nodes: INodeUi[]): {offset: XYPosition, zoomLevel:
offset: [xOffset, yOffset], offset: [xOffset, yOffset],
}; };
}; };
export const getUniqueNodeName = (nodes: INodeUi[], originalName: string, additinalUsedNames?: string[]) => {
// Check if node-name is unique else find one that is
additinalUsedNames = additinalUsedNames || [];
// Get all the names of the current nodes
const nodeNames = nodes.map((node: INodeUi) => {
return node.name;
});
// Check first if the current name is already unique
if (!nodeNames.includes(originalName) && !additinalUsedNames.includes(originalName)) {
return originalName;
}
const nameMatch = originalName.match(/(.*\D+)(\d*)/);
let ignore, baseName, nameIndex, uniqueName;
let index = 1;
if (nameMatch === null) {
// Name is only a number
index = parseInt(originalName, 10);
baseName = '';
uniqueName = baseName + index;
} else {
// Name is string or string/number combination
[ignore, baseName, nameIndex] = nameMatch;
if (nameIndex !== '') {
index = parseInt(nameIndex, 10);
}
uniqueName = baseName;
}
while (
nodeNames.includes(uniqueName) ||
additinalUsedNames.includes(uniqueName)
) {
uniqueName = baseName + (index++);
}
return uniqueName;
};