From 23a1bc40a2eb8d340eea635a48c75f59369095bb Mon Sep 17 00:00:00 2001
From: Elias Meire <elias@meire.dev>
Date: Wed, 21 Feb 2024 14:53:42 +0100
Subject: [PATCH] fix(editor): Correctly set condition operator when changed
 (#8700)

---
 .../FilterConditions/__tests__/utils.test.ts  | 24 ++++++++++++-------
 .../src/components/FilterConditions/utils.ts  |  7 ++++++
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/packages/editor-ui/src/components/FilterConditions/__tests__/utils.test.ts b/packages/editor-ui/src/components/FilterConditions/__tests__/utils.test.ts
index c92ab709f..9cb5a1d8e 100644
--- a/packages/editor-ui/src/components/FilterConditions/__tests__/utils.test.ts
+++ b/packages/editor-ui/src/components/FilterConditions/__tests__/utils.test.ts
@@ -12,16 +12,15 @@ describe('FilterConditions > utils', () => {
 			expect(
 				handleOperatorChange({
 					condition,
-					newOperator: getFilterOperator('number:equals'),
+					newOperator: getFilterOperator('number:gt'),
 				}),
 			).toEqual({
 				id: '1',
 				leftValue: 45,
 				rightValue: 'notANumber',
 				operator: {
-					name: 'filter.operator.equals',
-					operation: 'equals',
-					type: 'string',
+					operation: 'gt',
+					type: 'number',
 				},
 			});
 		});
@@ -36,16 +35,15 @@ describe('FilterConditions > utils', () => {
 			expect(
 				handleOperatorChange({
 					condition,
-					newOperator: getFilterOperator('boolean:equals'),
+					newOperator: getFilterOperator('boolean:notEquals'),
 				}),
 			).toEqual({
 				id: '1',
 				leftValue: false,
 				rightValue: true,
 				operator: {
-					name: 'filter.operator.equals',
-					operation: 'equals',
-					type: 'string',
+					operation: 'notEquals',
+					type: 'boolean',
 				},
 			});
 		});
@@ -62,7 +60,15 @@ describe('FilterConditions > utils', () => {
 					condition,
 					newOperator: getFilterOperator('boolean:equals'),
 				}),
-			).toEqual(condition);
+			).toEqual({
+				id: '1',
+				leftValue: '={{ $json.foo }}',
+				rightValue: '={{ $("nodename").foo }}',
+				operator: {
+					operation: 'equals',
+					type: 'boolean',
+				},
+			});
 		});
 	});
 });
diff --git a/packages/editor-ui/src/components/FilterConditions/utils.ts b/packages/editor-ui/src/components/FilterConditions/utils.ts
index d52468bbd..d26bcc74d 100644
--- a/packages/editor-ui/src/components/FilterConditions/utils.ts
+++ b/packages/editor-ui/src/components/FilterConditions/utils.ts
@@ -46,6 +46,13 @@ export const handleOperatorChange = ({
 		condition.rightValue = convertToType(condition.rightValue, newRightType);
 	}
 
+	condition.operator = {
+		type: newOperator.type,
+		operation: newOperator.operation,
+		rightType: newOperator.rightType,
+		singleValue: newOperator.singleValue,
+	};
+
 	return condition;
 };