Skip to content

The open alternative to Salesforce, designed for AI.

fix(server): evaluate workflow number and array filters on empty and JSON-like values (#26404)

Belkoucheccb9edd19e85
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/filter/utils/__tests__/evaluate-filter-conditions.util.spec.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/filter/utils/__tests__/evaluate-filter-conditions.util.spec.ts
index 397194ba33d..805a2f19e50 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/filter/utils/__tests__/evaluate-filter-conditions.util.spec.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/filter/utils/__tests__/evaluate-filter-conditions.util.spec.ts
@@ -717,6 +717,50 @@ describe('evaluateFilterConditions', () => {
expect(evaluateFilterConditions({ filters: [filter3] })).toBe(false);
});
+ it('should not treat an empty value as zero', () => {
+ const nullLessThanOrEqual = createFilter(
+ ViewFilterOperand.LESS_THAN_OR_EQUAL,
+ null,
+ 100,
+ 'NUMBER',
+ );
+ const emptyStringGreaterThanOrEqual = createFilter(
+ ViewFilterOperand.GREATER_THAN_OR_EQUAL,
+ '',
+ -1,
+ 'NUMBER',
+ );
+ const undefinedIsZero = createFilter(
+ ViewFilterOperand.IS,
+ undefined,
+ 0,
+ 'NUMBER',
+ );
+ const nullIsNotZero = createFilter(
+ ViewFilterOperand.IS_NOT,
+ null,
+ 0,
+ 'NUMBER',
+ );
+ const zeroIsZero = createFilter(ViewFilterOperand.IS, 0, 0, 'NUMBER');
+
+ expect(
+ evaluateFilterConditions({ filters: [nullLessThanOrEqual] }),
+ ).toBe(false);
+ expect(
+ evaluateFilterConditions({
+ filters: [emptyStringGreaterThanOrEqual],
+ }),
+ ).toBe(false);
+ expect(evaluateFilterConditions({ filters: [undefinedIsZero] })).toBe(
+ false,
+ );
+ expect(evaluateFilterConditions({ filters: [nullIsNotZero] })).toBe(
+ true,
+ );
+ expect(evaluateFilterConditions({ filters: [zeroIsZero] })).toBe(true);
+ });
+
it('should handle LessThanOrEqual operand correctly', () => {
const filter1 = createFilter(
ViewFilterOperand.LESS_THAN_OR_EQUAL,
@@ -881,6 +925,37 @@ describe('evaluateFilterConditions', () => {
expect(evaluateFilterConditions({ filters: [filter5] })).toBe(false);
});
+ it('should handle Contains operand with array values that look like JSON scalars', () => {
+ const numericValue = createFilter(
+ ViewFilterOperand.CONTAINS,
+ ['2024', '2025'],
+ '2024',
+ 'ARRAY',
+ );
+ const booleanValue = createFilter(
+ ViewFilterOperand.CONTAINS,
+ ['true', 'false'],
+ 'true',
+ 'ARRAY',
+ );
+ const missingNumericValue = createFilter(
+ ViewFilterOperand.DOES_NOT_CONTAIN,
+ ['2024', '2025'],
+ '2026',
+ 'ARRAY',
+ );
+
+ expect(evaluateFilterConditions({ filters: [numericValue] })).toBe(
+ true,
+ );
+ expect(evaluateFilterConditions({ filters: [booleanValue] })).toBe(
+ true,
+ );
+ expect(
+ evaluateFilterConditions({ filters: [missingNumericValue] }),
+ ).toBe(true);
+ });
+
it('should handle DoesNotContain operand with arrays', () => {
const filter1 = createFilter(
ViewFilterOperand.DOES_NOT_CONTAIN,
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/filter/utils/evaluate-filter-conditions.util.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/filter/utils/evaluate-filter-conditions.util.ts
index 274a7c5c17d..fe2e6105bca 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/filter/utils/evaluate-filter-conditions.util.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/filter/utils/evaluate-filter-conditions.util.ts
@@ -18,6 +18,7 @@ import {
isMatchingMultiSelectFilter,
isMatchingSelectFilter,
isSamePlainDate,
+ parseJson,
parseToInstantOrThrow,
} from 'twenty-shared/utils';
import { parseBooleanFromStringValue } from 'twenty-shared/workflow';
@@ -147,17 +148,13 @@ function contains(leftValue: unknown, rightValue: unknown): boolean {
(Array.isArray(leftValue) || isString(leftValue)) &&
isString(rightValue)
) {
- try {
- const parsedRightValue = JSON.parse(rightValue as string);
+ const parsedRightValue = parseJson<unknown>(rightValue);
- if (Array.isArray(parsedRightValue)) {
- return parsedRightValue.some((item) => leftValue.includes(item));
- } else {
- return leftValue.includes(parsedRightValue);
- }
- } catch {
- return leftValue.includes(rightValue);
+ if (Array.isArray(parsedRightValue)) {
+ return parsedRightValue.some((item) => leftValue.includes(item));
}
+
+ return leftValue.includes(rightValue);
}
return String(leftValue).includes(String(rightValue));
@@ -429,28 +426,33 @@ function evaluateCurrencyFilter(filter: ResolvedFilter): boolean {
}
}
+function isEmptyNumberValue(value: unknown): boolean {
+ return !isDefined(value) || value === '';
+}
+
function evaluateNumberFilter(filter: ResolvedFilter): boolean {
const leftValue = filter.leftOperand;
const rightValue = filter.rightOperand;
+ const isLeftValueEmpty = isEmptyNumberValue(leftValue);
switch (filter.operand) {
case ViewFilterOperand.GREATER_THAN_OR_EQUAL:
- return Number(leftValue) >= Number(rightValue);
+ return !isLeftValueEmpty && Number(leftValue) >= Number(rightValue);
case ViewFilterOperand.LESS_THAN_OR_EQUAL:
- return Number(leftValue) <= Number(rightValue);
+ return !isLeftValueEmpty && Number(leftValue) <= Number(rightValue);
case ViewFilterOperand.IS_EMPTY:
- return !isDefined(filter.leftOperand) || filter.leftOperand === '';
+ return isLeftValueEmpty;
case ViewFilterOperand.IS_NOT_EMPTY:
- return isDefined(filter.leftOperand) && filter.leftOperand !== '';
+ return !isLeftValueEmpty;
case ViewFilterOperand.IS:
- return Number(leftValue) === Number(rightValue);
+ return !isLeftValueEmpty && Number(leftValue) === Number(rightValue);
case ViewFilterOperand.IS_NOT:
- return Number(leftValue) !== Number(rightValue);
+ return isLeftValueEmpty || Number(leftValue) !== Number(rightValue);
default:
throw new Error(