mirror of
https://github.com/n8n-io/n8n.git
synced 2024-12-24 04:04:06 -08:00
fix(editor): Fix node position when auto adding chat trigger node (no-changelog) (#11097)
This commit is contained in:
parent
09cfdbd181
commit
caeda22811
|
@ -135,6 +135,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
|
|||
const telemetry = useTelemetry();
|
||||
const externalHooks = useExternalHooks();
|
||||
const clipboard = useClipboard();
|
||||
const { uniqueNodeName } = useUniqueNodeName();
|
||||
|
||||
const lastClickPosition = ref<XYPosition>([0, 0]);
|
||||
|
||||
|
@ -205,7 +206,6 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
|
|||
historyStore.startRecordingUndo();
|
||||
}
|
||||
|
||||
const { uniqueNodeName } = useUniqueNodeName();
|
||||
newName = uniqueNodeName(newName);
|
||||
|
||||
// Rename the node and update the connections
|
||||
|
@ -557,15 +557,13 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
|
|||
}
|
||||
}
|
||||
|
||||
function addNode(
|
||||
node: AddNodeDataWithTypeVersion,
|
||||
nodeTypeDescription: INodeTypeDescription,
|
||||
options: AddNodeOptions = {},
|
||||
): INodeUi {
|
||||
// Check if maximum allowed number of this type of node has been reached
|
||||
/**
|
||||
* Check if maximum allowed number of this type of node has been reached
|
||||
*/
|
||||
function checkMaxNodesOfTypeReached(nodeTypeDescription: INodeTypeDescription) {
|
||||
if (
|
||||
nodeTypeDescription.maxNodes !== undefined &&
|
||||
workflowHelpers.getNodeTypeCount(node.type) >= nodeTypeDescription.maxNodes
|
||||
workflowHelpers.getNodeTypeCount(nodeTypeDescription.name) >= nodeTypeDescription.maxNodes
|
||||
) {
|
||||
throw new Error(
|
||||
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);
|
||||
if (!nodeData) {
|
||||
throw new Error(i18n.baseText('nodeViewV2.showError.failedToCreateNode'));
|
||||
}
|
||||
|
||||
nodeHelpers.matchCredentials(nodeData);
|
||||
workflowsStore.addNode(nodeData);
|
||||
|
||||
void nextTick(() => {
|
||||
if (options.trackHistory) {
|
||||
historyStore.pushCommandToUndo(new AddNodeCommand(nodeData));
|
||||
}
|
||||
|
||||
workflowsStore.addNode(nodeData);
|
||||
|
||||
workflowsStore.setNodePristine(nodeData.name, true);
|
||||
|
||||
nodeHelpers.matchCredentials(nodeData);
|
||||
nodeHelpers.updateNodeParameterIssues(nodeData);
|
||||
nodeHelpers.updateNodeCredentialIssues(nodeData);
|
||||
nodeHelpers.updateNodeInputIssues(nodeData);
|
||||
|
@ -883,6 +888,10 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
|
|||
let position: XYPosition | undefined = node.position;
|
||||
let pushOffsets: XYPosition = [40, 40];
|
||||
|
||||
if (position) {
|
||||
return NodeViewUtils.getNewNodePosition(workflowsStore.allNodes, position, pushOffsets);
|
||||
}
|
||||
|
||||
// Available when
|
||||
// - clicking the plus button 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) {
|
||||
const { uniqueNodeName } = useUniqueNodeName();
|
||||
const localizedName = i18n.localizeNodeName(node.name, node.type);
|
||||
|
||||
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 })),
|
||||
);
|
||||
|
||||
const { uniqueNodeName } = useUniqueNodeName();
|
||||
|
||||
data.nodes.forEach((node) => {
|
||||
if (nodeTypesCount[node.type] !== undefined) {
|
||||
if (nodeTypesCount[node.type].exist >= nodeTypesCount[node.type].max) {
|
||||
|
@ -1627,8 +1633,6 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
|
|||
return {};
|
||||
}
|
||||
|
||||
const { uniqueNodeName } = useUniqueNodeName();
|
||||
|
||||
try {
|
||||
const nodeIdMap: { [prev: string]: string } = {};
|
||||
if (workflowData.nodes) {
|
||||
|
|
Loading…
Reference in a new issue