admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-18 02:21:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(Merge Node): Add Telemetry for SQL query (no-changelog) (#13860)

Browse Source
This commit is contained in:
Dana
2025-03-17 15:07:26 +01:00
committed by GitHub
parent 3d872287fb
commit a031048b7f
2 changed files with 126 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/workflow/src/TelemetryHelpers.ts
View File

@@ -250,6 +250,10 @@ export function generateNodesGraph(
nodeItem.agent = (node.parameters.agent as string) ?? 'conversationalAgent'; nodeItem.agent = (node.parameters.agent as string) ?? 'conversationalAgent';
} else if (node.type === MERGE_NODE_TYPE) { } else if (node.type === MERGE_NODE_TYPE) {
nodeItem.operation = node.parameters.mode as string; nodeItem.operation = node.parameters.mode as string;
if (options?.isCloudDeployment && node.parameters.mode === 'combineBySql') {
nodeItem.sql = node.parameters.query as string;
}
} else if (node.type === HTTP_REQUEST_NODE_TYPE && node.typeVersion === 1) { } else if (node.type === HTTP_REQUEST_NODE_TYPE && node.typeVersion === 1) {
try { try {
nodeItem.domain = new URL(node.parameters.url as string).hostname; nodeItem.domain = new URL(node.parameters.url as string).hostname;

122
packages/workflow/test/TelemetryHelpers.test.ts
View File

@@ -592,6 +592,128 @@ describe('generateNodesGraph', () => {
}); });
}); });
it.each([
{
workflow: {
nodes: [
{
parameters: {
mode: 'combineBySql',
query: 'SELECT * FROM input1 LEFT JOIN input2 ON input1.name = input2.id',
},
id: 'b468b603-3e59-4515-b555-90cfebd64d47',
name: 'Merge Node V3',
type: 'n8n-nodes-base.merge',
typeVersion: 3,
position: [320, 460],
},
],
connections: {},
pinData: {},
} as Partial<IWorkflowBase>,
isCloudDeployment: false,
expected: {
nodeGraph: {
node_types: ['n8n-nodes-base.merge'],
node_connections: [],
nodes: {
'0': {
id: 'b468b603-3e59-4515-b555-90cfebd64d47',
type: 'n8n-nodes-base.merge',
version: 3,
position: [320, 460],
operation: 'combineBySql',
},
},
notes: {},
is_pinned: false,
},
nameIndices: { 'Merge Node V3': '0' },
webhookNodeNames: [],
},
},
{
workflow: {
nodes: [
{
parameters: {
mode: 'append',
},
id: 'b468b603-3e59-4515-b555-90cfebd64d47',
name: 'Merge Node V3',
type: 'n8n-nodes-base.merge',
typeVersion: 3,
position: [320, 460],
},
],
connections: {},
pinData: {},
} as Partial<IWorkflowBase>,
isCloudDeployment: true,
expected: {
nodeGraph: {
node_types: ['n8n-nodes-base.merge'],
node_connections: [],
nodes: {
'0': {
id: 'b468b603-3e59-4515-b555-90cfebd64d47',
type: 'n8n-nodes-base.merge',
version: 3,
position: [320, 460],
operation: 'append',
},
},
notes: {},
is_pinned: false,
},
nameIndices: { 'Merge Node V3': '0' },
webhookNodeNames: [],
},
},
{
workflow: {
nodes: [
{
parameters: {
mode: 'combineBySql',
query: 'SELECT * FROM input1 LEFT JOIN input2 ON input1.name = input2.id',
},
id: 'b468b603-3e59-4515-b555-90cfebd64d47',
name: 'Merge Node V3',
type: 'n8n-nodes-base.merge',
typeVersion: 3,
position: [320, 460],
},
],
connections: {},
pinData: {},
} as Partial<IWorkflowBase>,
isCloudDeployment: true,
expected: {
nodeGraph: {
node_types: ['n8n-nodes-base.merge'],
node_connections: [],
nodes: {
'0': {
id: 'b468b603-3e59-4515-b555-90cfebd64d47',
type: 'n8n-nodes-base.merge',
version: 3,
position: [320, 460],
operation: 'combineBySql',
sql: 'SELECT * FROM input1 LEFT JOIN input2 ON input1.name = input2.id',
},
},
notes: {},
is_pinned: false,
},
nameIndices: { 'Merge Node V3': '0' },
webhookNodeNames: [],
},
},
])('should return graph with merge v3 node', ({ workflow, expected, isCloudDeployment }) => {
expect(generateNodesGraph(workflow, nodeTypes, { isCloudDeployment })).toEqual(expected);
});
test('should return graph with http v1 node', () => { test('should return graph with http v1 node', () => {
const workflow: Partial<IWorkflowBase> = { const workflow: Partial<IWorkflowBase> = {
nodes: [ nodes: [