fix(editor): Do not overwrite the webhookId in the new canvas (#11562)

This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™
2024-11-05 15:06:23 +01:00
committed by GitHub
parent 463d101f35
commit dfd785bc08
3 changed files with 66 additions and 49 deletions

View File

@@ -1,5 +1,10 @@
import { setActivePinia } from 'pinia';
import type { IConnection, Workflow } from 'n8n-workflow';
import type {
IConnection,
INodeTypeDescription,
IWebhookDescription,
Workflow,
} from 'n8n-workflow';
import { NodeConnectionType, NodeHelpers } from 'n8n-workflow';
import { useCanvasOperations } from '@/composables/useCanvasOperations';
import type { CanvasNode } from '@/types';
@@ -23,7 +28,13 @@ import { useCredentialsStore } from '@/stores/credentials.store';
import { waitFor } from '@testing-library/vue';
import { createTestingPinia } from '@pinia/testing';
import { mockedStore } from '@/__tests__/utils';
import { SET_NODE_TYPE, STICKY_NODE_TYPE, STORES } from '@/constants';
import {
FORM_TRIGGER_NODE_TYPE,
SET_NODE_TYPE,
STICKY_NODE_TYPE,
STORES,
WEBHOOK_NODE_TYPE,
} from '@/constants';
import type { Connection } from '@vue-flow/core';
import { useClipboard } from '@/composables/useClipboard';
import { createCanvasConnectionHandleString } from '@/utils/canvasUtilsV2';
@@ -1889,6 +1900,56 @@ describe('useCanvasOperations', () => {
expect(vi.mocked(useClipboard().copy).mock.calls).toMatchSnapshot();
});
});
describe('resolveNodeWebhook', () => {
const nodeTypeDescription = mock<INodeTypeDescription>({
webhooks: [mock<IWebhookDescription>()],
});
it("should set webhookId if it doesn't already exist", () => {
const node = mock<INodeUi>({ webhookId: undefined });
const { resolveNodeWebhook } = useCanvasOperations({ router });
resolveNodeWebhook(node, nodeTypeDescription);
expect(node.webhookId).toBeDefined();
});
it('should not set webhookId if it already exists', () => {
const node = mock<INodeUi>({ webhookId: 'random-id' });
const { resolveNodeWebhook } = useCanvasOperations({ router });
resolveNodeWebhook(node, nodeTypeDescription);
expect(node.webhookId).toBe('random-id');
});
it("should not set webhookId if node description doesn't define any webhooks", () => {
const node = mock<INodeUi>({ webhookId: undefined });
const { resolveNodeWebhook } = useCanvasOperations({ router });
resolveNodeWebhook(node, mock<INodeTypeDescription>({ webhooks: [] }));
expect(node.webhookId).toBeUndefined();
});
test.each([WEBHOOK_NODE_TYPE, FORM_TRIGGER_NODE_TYPE])(
'should update the webhook path, if the node type is %s, and the path parameter is empty',
(nodeType) => {
const node = mock<INodeUi>({
webhookId: 'random-id',
type: nodeType,
parameters: { path: '' },
});
const { resolveNodeWebhook } = useCanvasOperations({ router });
resolveNodeWebhook(node, nodeTypeDescription);
expect(node.webhookId).toBe('random-id');
expect(node.parameters.path).toBe('random-id');
},
);
});
});
function buildImportNodes() {