mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(editor): Fix node position when auto adding chat trigger node (no-changelog) (#11097)

Browse source
This commit is contained in:
Alex Grozav 2024-10-04 15:42:46 +03:00 committed by GitHub
parent 09cfdbd181
commit caeda22811
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
packages/editor-ui/src/composables/useCanvasOperations.ts
View file

@ -135,6 +135,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
const telemetry = useTelemetry(); const telemetry = useTelemetry();
const externalHooks = useExternalHooks(); const externalHooks = useExternalHooks();
const clipboard = useClipboard(); const clipboard = useClipboard();
const { uniqueNodeName } = useUniqueNodeName();
const lastClickPosition = ref<XYPosition>([0, 0]); const lastClickPosition = ref<XYPosition>([0, 0]);
@ -205,7 +206,6 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
historyStore.startRecordingUndo(); historyStore.startRecordingUndo();
} }
const { uniqueNodeName } = useUniqueNodeName();
newName = uniqueNodeName(newName); newName = uniqueNodeName(newName);
// Rename the node and update the connections // Rename the node and update the connections
@ -557,15 +557,13 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
} }
} }
function addNode( /**
node: AddNodeDataWithTypeVersion, * Check if maximum allowed number of this type of node has been reached
nodeTypeDescription: INodeTypeDescription, */
options: AddNodeOptions = {}, function checkMaxNodesOfTypeReached(nodeTypeDescription: INodeTypeDescription) {
): INodeUi {
// Check if maximum allowed number of this type of node has been reached
if ( if (
nodeTypeDescription.maxNodes !== undefined && nodeTypeDescription.maxNodes !== undefined &&
workflowHelpers.getNodeTypeCount(node.type) >= nodeTypeDescription.maxNodes workflowHelpers.getNodeTypeCount(nodeTypeDescription.name) >= nodeTypeDescription.maxNodes
) { ) {
throw new Error( throw new Error(
i18n.baseText('nodeView.showMessage.showMaxNodeTypeError.message', { i18n.baseText('nodeView.showMessage.showMaxNodeTypeError.message', {
@ -574,23 +572,30 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
}), }),
); );
} }
}
function addNode(
node: AddNodeDataWithTypeVersion,
nodeTypeDescription: INodeTypeDescription,
options: AddNodeOptions = {},
): INodeUi {
checkMaxNodesOfTypeReached(nodeTypeDescription);
const nodeData = resolveNodeData(node, nodeTypeDescription); const nodeData = resolveNodeData(node, nodeTypeDescription);
if (!nodeData) { if (!nodeData) {
throw new Error(i18n.baseText('nodeViewV2.showError.failedToCreateNode')); throw new Error(i18n.baseText('nodeViewV2.showError.failedToCreateNode'));
} }
nodeHelpers.matchCredentials(nodeData); workflowsStore.addNode(nodeData);
void nextTick(() => { void nextTick(() => {
if (options.trackHistory) { if (options.trackHistory) {
historyStore.pushCommandToUndo(new AddNodeCommand(nodeData)); historyStore.pushCommandToUndo(new AddNodeCommand(nodeData));
} }
workflowsStore.addNode(nodeData);
workflowsStore.setNodePristine(nodeData.name, true); workflowsStore.setNodePristine(nodeData.name, true);
nodeHelpers.matchCredentials(nodeData);
nodeHelpers.updateNodeParameterIssues(nodeData); nodeHelpers.updateNodeParameterIssues(nodeData);
nodeHelpers.updateNodeCredentialIssues(nodeData); nodeHelpers.updateNodeCredentialIssues(nodeData);
nodeHelpers.updateNodeInputIssues(nodeData); nodeHelpers.updateNodeInputIssues(nodeData);
@ -883,6 +888,10 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
let position: XYPosition | undefined = node.position; let position: XYPosition | undefined = node.position;
let pushOffsets: XYPosition = [40, 40]; let pushOffsets: XYPosition = [40, 40];
if (position) {
return NodeViewUtils.getNewNodePosition(workflowsStore.allNodes, position, pushOffsets);
}
// Available when // Available when
// - clicking the plus button of a node handle // - clicking the plus button of a node handle
// - dragging an edge / connection of a node handle // - dragging an edge / connection of a node handle
@ -1066,7 +1075,6 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
} }
function resolveNodeName(node: INodeUi) { function resolveNodeName(node: INodeUi) {
const { uniqueNodeName } = useUniqueNodeName();
const localizedName = i18n.localizeNodeName(node.name, node.type); const localizedName = i18n.localizeNodeName(node.name, node.type);
node.name = uniqueNodeName(localizedName); node.name = uniqueNodeName(localizedName);
@ -1483,8 +1491,6 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
data.nodes.map((node) => ({ name: node.type, version: node.typeVersion })), data.nodes.map((node) => ({ name: node.type, version: node.typeVersion })),
); );
const { uniqueNodeName } = useUniqueNodeName();
data.nodes.forEach((node) => { data.nodes.forEach((node) => {
if (nodeTypesCount[node.type] !== undefined) { if (nodeTypesCount[node.type] !== undefined) {
if (nodeTypesCount[node.type].exist >= nodeTypesCount[node.type].max) { if (nodeTypesCount[node.type].exist >= nodeTypesCount[node.type].max) {
@ -1627,8 +1633,6 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
return {}; return {};
} }
const { uniqueNodeName } = useUniqueNodeName();
try { try {
const nodeIdMap: { [prev: string]: string } = {}; const nodeIdMap: { [prev: string]: string } = {};
if (workflowData.nodes) { if (workflowData.nodes) {