admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-17 01:56:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(editor): Connection port mapped incorrectly when changed dynamically (#17958)

Browse Source
This commit is contained in:
Suguru Inoue
2025-08-04 14:54:04 +02:00
committed by GitHub
parent 7b92e33b3b
commit 566789caee
6 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/frontend/editor-ui/package.json
View File

@@ -50,7 +50,7 @@
"@typescript/vfs": "^1.6.0", "@typescript/vfs": "^1.6.0",
"@vue-flow/background": "^1.3.2", "@vue-flow/background": "^1.3.2",
"@vue-flow/controls": "^1.1.2", "@vue-flow/controls": "^1.1.2",
"@vue-flow/core": "^1.45.0", "@vue-flow/core": "1.42.1",
"@vue-flow/minimap": "^1.5.2", "@vue-flow/minimap": "^1.5.2",
"@vue-flow/node-resizer": "^1.4.0", "@vue-flow/node-resizer": "^1.4.0",
"@vueuse/components": "^10.11.0", "@vueuse/components": "^10.11.0",

5
packages/frontend/editor-ui/src/__tests__/data/canvas.ts
View File

@@ -92,10 +92,7 @@ export function createCanvasGraphNode({
isParent: false, isParent: false,
selected: false, selected: false,
resizing: false, resizing: false,
handleBounds: { handleBounds: {},
source: null,
target: null,
},
events: {}, events: {},
data: createCanvasNodeData({ id, type, ...data }), data: createCanvasNodeData({ id, type, ...data }),
...rest, ...rest,

6
packages/frontend/editor-ui/src/components/canvas/Canvas.vue
View File

@@ -448,7 +448,11 @@ function onSelectNodes({ ids, panIntoView }: CanvasEventBusEvents['nodes:select'
const newViewport = updateViewportToContainNodes(viewport.value, dimensions.value, nodes, 100); const newViewport = updateViewportToContainNodes(viewport.value, dimensions.value, nodes, 100);
void setViewport(newViewport, { duration: 200, interpolate: 'linear' }); void setViewport(newViewport, {
duration: 200,
// TODO: restore when re-upgrading vue-flow to >= 1.45
// interpolate: 'linear',
});
} }
} }

21
packages/frontend/editor-ui/src/components/canvas/experimental/experimentalNdv.store.ts
View File

@@ -90,7 +90,8 @@ export const useExperimentalNdvStore = defineStore('experimentalNdv', () => {
{ {
duration: 200, duration: 200,
zoom: maxCanvasZoom.value, zoom: maxCanvasZoom.value,
interpolate: 'linear', // TODO: restore when re-upgrading vue-flow to >= 1.45
// interpolate: 'linear',
}, },
); );
} }
@@ -108,11 +109,19 @@ export const useExperimentalNdvStore = defineStore('experimentalNdv', () => {
function toggleZoomMode(options: ToggleZoomModeOptions) { function toggleZoomMode(options: ToggleZoomModeOptions) {
if (isActive(options.canvasViewport.zoom)) { if (isActive(options.canvasViewport.zoom)) {
if (previousViewport.value === undefined) { if (previousViewport.value === undefined) {
void options.fitView({ duration: 200, interpolate: 'linear' }); void options.fitView({
duration: 200,
// TODO: restore when re-upgrading vue-flow to >= 1.45
// interpolate: 'linear',
});
return; return;
} }
void options.setViewport(previousViewport.value, { duration: 200, interpolate: 'linear' }); void options.setViewport(previousViewport.value, {
duration: 200,
// TODO: restore when re-upgrading vue-flow to >= 1.45
// interpolate: 'linear'
});
return; return;
} }
@@ -129,7 +138,11 @@ export const useExperimentalNdvStore = defineStore('experimentalNdv', () => {
return; return;
} }
void options.zoomTo(maxCanvasZoom.value, { duration: 200, interpolate: 'linear' }); void options.zoomTo(maxCanvasZoom.value, {
duration: 200,
// TODO: restore when re-upgrading vue-flow to >= 1.45
// interpolate: 'linear',
});
} }
return { return {

5
packages/frontend/editor-ui/src/utils/nodeViewUtils.test.ts
View File

@@ -555,10 +555,7 @@ describe('calculateNodeSize', () => {
function createTestGraphNode(data: Partial<GraphNode> = {}): GraphNode { function createTestGraphNode(data: Partial<GraphNode> = {}): GraphNode {
return { return {
computedPosition: { z: 0, ...(data.position ?? { x: 0, y: 0 }) }, computedPosition: { z: 0, ...(data.position ?? { x: 0, y: 0 }) },
handleBounds: { handleBounds: {},
source: null,
target: null,
},
dimensions: { width: 0, height: 0 }, dimensions: { width: 0, height: 0 },
isParent: true, isParent: true,
selected: false, selected: false,

35
pnpm-lock.yaml generated
View File

@@ -2421,19 +2421,19 @@ importers:
version: 1.6.0(typescript@5.8.3) version: 1.6.0(typescript@5.8.3)
'@vue-flow/background': '@vue-flow/background':
specifier: ^1.3.2 specifier: ^1.3.2
version: 1.3.2(@vue-flow/core@1.45.0(vue@3.5.13(typescript@5.8.3)))(vue@3.5.13(typescript@5.8.3)) version: 1.3.2(@vue-flow/core@1.42.1(vue@3.5.13(typescript@5.8.3)))(vue@3.5.13(typescript@5.8.3))
'@vue-flow/controls': '@vue-flow/controls':
specifier: ^1.1.2 specifier: ^1.1.2
version: 1.1.2(@vue-flow/core@1.45.0(vue@3.5.13(typescript@5.8.3)))(vue@3.5.13(typescript@5.8.3)) version: 1.1.2(@vue-flow/core@1.42.1(vue@3.5.13(typescript@5.8.3)))(vue@3.5.13(typescript@5.8.3))
'@vue-flow/core': '@vue-flow/core':
specifier: ^1.45.0 specifier: 1.42.1
version: 1.45.0(vue@3.5.13(typescript@5.8.3)) version: 1.42.1(vue@3.5.13(typescript@5.8.3))
'@vue-flow/minimap': '@vue-flow/minimap':
specifier: ^1.5.2 specifier: ^1.5.2
version: 1.5.2(@vue-flow/core@1.45.0(vue@3.5.13(typescript@5.8.3)))(vue@3.5.13(typescript@5.8.3)) version: 1.5.2(@vue-flow/core@1.42.1(vue@3.5.13(typescript@5.8.3)))(vue@3.5.13(typescript@5.8.3))
'@vue-flow/node-resizer': '@vue-flow/node-resizer':
specifier: ^1.4.0 specifier: ^1.4.0
version: 1.4.0(@vue-flow/core@1.45.0(vue@3.5.13(typescript@5.8.3)))(vue@3.5.13(typescript@5.8.3)) version: 1.4.0(@vue-flow/core@1.42.1(vue@3.5.13(typescript@5.8.3)))(vue@3.5.13(typescript@5.8.3))
'@vueuse/components': '@vueuse/components':
specifier: ^10.11.0 specifier: ^10.11.0
version: 10.11.0(vue@3.5.13(typescript@5.8.3)) version: 10.11.0(vue@3.5.13(typescript@5.8.3))
@@ -7787,8 +7787,8 @@ packages:
'@vue-flow/core': ^1.23.0 '@vue-flow/core': ^1.23.0
vue: ^3.3.0 vue: ^3.3.0
'@vue-flow/core@1.45.0': '@vue-flow/core@1.42.1':
resolution: {integrity: sha512-+Qd4fTnCfrhfYQzlHyf5Jt7rNE4PlDnEJEJZH9v6hDZoTOeOy1RhS85cSxKYxdsJ31Ttj2v3yabhoVfBf+bmJA==} resolution: {integrity: sha512-QzzTxMAXfOeETKc+N3XMp5XpiPxKBHK5kq98avgTsE6MXyeU2E8EkANwwgSB/hvJ/k36RjU0Y7BOwCHiqiI1tw==}
peerDependencies: peerDependencies:
vue: ^3.3.0 vue: ^3.3.0
@@ -22422,37 +22422,36 @@ snapshots:
path-browserify: 1.0.1 path-browserify: 1.0.1
vscode-uri: 3.0.8 vscode-uri: 3.0.8
'@vue-flow/background@1.3.2(@vue-flow/core@1.45.0(vue@3.5.13(typescript@5.8.3)))(vue@3.5.13(typescript@5.8.3))': '@vue-flow/background@1.3.2(@vue-flow/core@1.42.1(vue@3.5.13(typescript@5.8.3)))(vue@3.5.13(typescript@5.8.3))':
dependencies: dependencies:
'@vue-flow/core': 1.45.0(vue@3.5.13(typescript@5.8.3)) '@vue-flow/core': 1.42.1(vue@3.5.13(typescript@5.8.3))
vue: 3.5.13(typescript@5.8.3) vue: 3.5.13(typescript@5.8.3)
'@vue-flow/controls@1.1.2(@vue-flow/core@1.45.0(vue@3.5.13(typescript@5.8.3)))(vue@3.5.13(typescript@5.8.3))': '@vue-flow/controls@1.1.2(@vue-flow/core@1.42.1(vue@3.5.13(typescript@5.8.3)))(vue@3.5.13(typescript@5.8.3))':
dependencies: dependencies:
'@vue-flow/core': 1.45.0(vue@3.5.13(typescript@5.8.3)) '@vue-flow/core': 1.42.1(vue@3.5.13(typescript@5.8.3))
vue: 3.5.13(typescript@5.8.3) vue: 3.5.13(typescript@5.8.3)
'@vue-flow/core@1.45.0(vue@3.5.13(typescript@5.8.3))': '@vue-flow/core@1.42.1(vue@3.5.13(typescript@5.8.3))':
dependencies: dependencies:
'@vueuse/core': 10.11.0(vue@3.5.13(typescript@5.8.3)) '@vueuse/core': 10.11.0(vue@3.5.13(typescript@5.8.3))
d3-drag: 3.0.0 d3-drag: 3.0.0
d3-interpolate: 3.0.1
d3-selection: 3.0.0 d3-selection: 3.0.0
d3-zoom: 3.0.0 d3-zoom: 3.0.0
vue: 3.5.13(typescript@5.8.3) vue: 3.5.13(typescript@5.8.3)
transitivePeerDependencies: transitivePeerDependencies:
- '@vue/composition-api' - '@vue/composition-api'
'@vue-flow/minimap@1.5.2(@vue-flow/core@1.45.0(vue@3.5.13(typescript@5.8.3)))(vue@3.5.13(typescript@5.8.3))': '@vue-flow/minimap@1.5.2(@vue-flow/core@1.42.1(vue@3.5.13(typescript@5.8.3)))(vue@3.5.13(typescript@5.8.3))':
dependencies: dependencies:
'@vue-flow/core': 1.45.0(vue@3.5.13(typescript@5.8.3)) '@vue-flow/core': 1.42.1(vue@3.5.13(typescript@5.8.3))
d3-selection: 3.0.0 d3-selection: 3.0.0
d3-zoom: 3.0.0 d3-zoom: 3.0.0
vue: 3.5.13(typescript@5.8.3) vue: 3.5.13(typescript@5.8.3)
'@vue-flow/node-resizer@1.4.0(@vue-flow/core@1.45.0(vue@3.5.13(typescript@5.8.3)))(vue@3.5.13(typescript@5.8.3))': '@vue-flow/node-resizer@1.4.0(@vue-flow/core@1.42.1(vue@3.5.13(typescript@5.8.3)))(vue@3.5.13(typescript@5.8.3))':
dependencies: dependencies:
'@vue-flow/core': 1.45.0(vue@3.5.13(typescript@5.8.3)) '@vue-flow/core': 1.42.1(vue@3.5.13(typescript@5.8.3))
d3-drag: 3.0.0 d3-drag: 3.0.0
d3-selection: 3.0.0 d3-selection: 3.0.0
vue: 3.5.13(typescript@5.8.3) vue: 3.5.13(typescript@5.8.3)