admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-20 19:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(editor): Add logic for renaming duplicate nodes in new canvas (no-changelog) (#11081)

Browse Source
This commit is contained in:
Alex Grozav
2024-10-03 21:20:57 +03:00
committed by GitHub
parent ce69218f1b
commit 4b0187e7e8
3 changed files with 14 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/editor-ui/src/composables/useCanvasOperations.ts
View File

@@ -58,7 +58,6 @@ import type {
import { CanvasConnectionMode } from '@/types';
import {
createCanvasConnectionHandleString,
getUniqueNodeName,
mapCanvasConnectionToLegacyConnection,
mapLegacyConnectionsToCanvasConnections,
mapLegacyConnectionToCanvasConnection,
@@ -96,6 +95,7 @@ import { v4 as uuid } from 'uuid';
import { computed, nextTick, ref } from 'vue';
import type { useRouter } from 'vue-router';
import { useClipboard } from '@/composables/useClipboard';
import { useUniqueNodeName } from '@/composables/useUniqueNodeName';
import { isPresent } from '../utils/typesUtils';
type AddNodeData = Partial<INodeUi> & {
@@ -201,12 +201,12 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
if (currentName === newName) {
return;
}
if (trackHistory) {
historyStore.startRecordingUndo();
}
newName = getUniqueNodeName(newName, workflowsStore.canvasNames);
const { uniqueNodeName } = useUniqueNodeName();
newName = uniqueNodeName(newName);
// Rename the node and update the connections
const workflow = workflowsStore.getCurrentWorkflow(true);
@@ -1066,9 +1066,10 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
}
function resolveNodeName(node: INodeUi) {
const { uniqueNodeName } = useUniqueNodeName();
const localizedName = i18n.localizeNodeName(node.name, node.type);
node.name = getUniqueNodeName(localizedName, workflowsStore.canvasNames);
node.name = uniqueNodeName(localizedName);
}
function resolveNodeWebhook(node: INodeUi, nodeTypeDescription: INodeTypeDescription) {
@@ -1482,6 +1483,8 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
data.nodes.map((node) => ({ name: node.type, version: node.typeVersion })),
);
const { uniqueNodeName } = useUniqueNodeName();
data.nodes.forEach((node) => {
if (nodeTypesCount[node.type] !== undefined) {
if (nodeTypesCount[node.type].exist >= nodeTypesCount[node.type].max) {
@@ -1503,7 +1506,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
const localized = i18n.localizeNodeName(node.name, node.type);
newName = getUniqueNodeName(localized, newNodeNames);
newName = uniqueNodeName(localized, Array.from(newNodeNames));
newNodeNames.add(newName);
nodeNameTable[oldName] = newName;
@@ -1624,6 +1627,8 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
return {};
}
const { uniqueNodeName } = useUniqueNodeName();
try {
const nodeIdMap: { [prev: string]: string } = {};
if (workflowData.nodes) {
@@ -1632,7 +1637,10 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
// Provide a new name for nodes that don't have one
if (!node.name) {
const nodeType = nodeTypesStore.getNodeType(node.type);
const newName = getUniqueNodeName(nodeType?.displayName ?? node.type, nodeNames);
const newName = uniqueNodeName(
nodeType?.displayName ?? node.type,
Array.from(nodeNames),
);
node.name = newName;
nodeNames.add(newName);
}