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(Switch Node): Fix an issue in ordering rules in Switch Node (#13476)

Browse source
This commit is contained in:
Shireen Missi 2025-02-27 15:34:50 +00:00 committed by GitHub
parent 461df371f7
commit 0fb66076ba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 40 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
packages/editor-ui/src/utils/nodeSettingsUtils.test.ts
View file

@ -1,6 +1,6 @@
import { describe, it, expect, afterAll } from 'vitest';
import { mock } from 'vitest-mock-extended';
import type { IConnections, NodeParameterValueType } from 'n8n-workflow';
import type { IConnections, NodeParameterValueType, IDataObject } from 'n8n-workflow';
import { updateDynamicConnections } from './nodeSettingsUtils';
import { SWITCH_NODE_TYPE } from '@/constants';
import type { INodeUi, IUpdateInformation } from '@/Interface';
@ -140,6 +140,43 @@ describe('updateDynamicConnections', () => {
expect(updatedConnections?.TestNode.main[3]?.[0].node).toEqual('Node3');
});
it('should maintain correct connections after rules are reordered', () => {
const node = mock<INodeUi>({
name: 'TestNode',
type: SWITCH_NODE_TYPE,
parameters: {
rules: { values: [{ id: 'rule1' }, { id: 'rule2' }, { id: 'rule3' }] },
options: { fallbackOutput: 'extra' },
},
});
const connections = mock<IConnections>({
TestNode: {
main: [
[{ node: 'Node1' }],
[{ node: 'Node2' }],
[{ node: 'Node3' }],
[{ node: 'Fallback' }],
],
},
});
const currentRules = (node.parameters.rules as { values?: IDataObject[] })?.values;
const reorderedRules = [currentRules?.[2], currentRules?.[0], currentRules?.[1]];
const parameterData = mock<IUpdateInformation<NodeParameterValueType>>({
name: 'parameters.rules.values',
value: reorderedRules,
});
const updatedConnections = updateDynamicConnections(node, connections, parameterData);
expect(updatedConnections?.TestNode.main).toHaveLength(4);
expect(updatedConnections?.TestNode.main[0]?.[0].node).toEqual('Node3');
expect(updatedConnections?.TestNode.main[1]?.[0].node).toEqual('Node1');
expect(updatedConnections?.TestNode.main[2]?.[0].node).toEqual('Node2');
expect(updatedConnections?.TestNode.main[3]?.[0].node).toEqual('Fallback');
});
it('should return null if no conditions are met', () => {
const node = mock<INodeUi>({
name: 'TestNode',

4
packages/editor-ui/src/utils/nodeSettingsUtils.ts
View file

@ -103,8 +103,8 @@ export function updateDynamicConnections(
const newRulesvalues = parameterData.value as IDataObject[];
const updatedConnectionsIndex: number[] = [];
for (const rule of curentRulesvalues) {
const index = newRulesvalues.findIndex((newRule) => isEqual(rule, newRule));
for (const newRule of newRulesvalues) {
const index = curentRulesvalues.findIndex((rule) => isEqual(rule, newRule));
if (index !== -1) {
updatedConnectionsIndex.push(index);
}