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(editor): Correctly set condition operator when changed (#8700)

Browse source
This commit is contained in:
Elias Meire 2024-02-21 14:53:42 +01:00 committed by GitHub
parent 35245694b1
commit 23a1bc40a2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
packages/editor-ui/src/components/FilterConditions/__tests__/utils.test.ts
View file

@ -12,16 +12,15 @@ describe('FilterConditions > utils', () => {
expect( expect(
handleOperatorChange({ handleOperatorChange({
condition, condition,
newOperator: getFilterOperator('number:equals'), newOperator: getFilterOperator('number:gt'),
}), }),
).toEqual({ ).toEqual({
id: '1', id: '1',
leftValue: 45, leftValue: 45,
rightValue: 'notANumber', rightValue: 'notANumber',
operator: { operator: {
name: 'filter.operator.equals', operation: 'gt',
operation: 'equals', type: 'number',
type: 'string',
}, },
}); });
}); });
@ -36,16 +35,15 @@ describe('FilterConditions > utils', () => {
expect( expect(
handleOperatorChange({ handleOperatorChange({
condition, condition,
newOperator: getFilterOperator('boolean:equals'), newOperator: getFilterOperator('boolean:notEquals'),
}), }),
).toEqual({ ).toEqual({
id: '1', id: '1',
leftValue: false, leftValue: false,
rightValue: true, rightValue: true,
operator: { operator: {
name: 'filter.operator.equals', operation: 'notEquals',
operation: 'equals', type: 'boolean',
type: 'string',
}, },
}); });
}); });
@ -62,7 +60,15 @@ describe('FilterConditions > utils', () => {
condition, condition,
newOperator: getFilterOperator('boolean:equals'), newOperator: getFilterOperator('boolean:equals'),
}), }),
).toEqual(condition); ).toEqual({
id: '1',
leftValue: '={{ $json.foo }}',
rightValue: '={{ $("nodename").foo }}',
operator: {
operation: 'equals',
type: 'boolean',
},
});
}); });
}); });
}); });

7
packages/editor-ui/src/components/FilterConditions/utils.ts
View file

@ -46,6 +46,13 @@ export const handleOperatorChange = ({
condition.rightValue = convertToType(condition.rightValue, newRightType); condition.rightValue = convertToType(condition.rightValue, newRightType);
} }
condition.operator = {
type: newOperator.type,
operation: newOperator.operation,
rightType: newOperator.rightType,
singleValue: newOperator.singleValue,
};
return condition; return condition;
}; };