Skip to content

The open alternative to Salesforce, designed for AI.

fix(twenty-shared): honor SQL percent wildcards in array containsIlike (#25247) (#25551)

Chaitanya Laxmana144b2f407e6
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/is-record-matching-rls-row-level-permission-predicate.util.spec.ts b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/is-record-matching-rls-row-level-permission-predicate.util.spec.ts
index 4634d9495f6..b6b0bf4e9b9 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/is-record-matching-rls-row-level-permission-predicate.util.spec.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/is-record-matching-rls-row-level-permission-predicate.util.spec.ts
@@ -3,6 +3,7 @@ import {
MetadataReadability,
MetadataWritability,
ObjectOpenRecordIn,
+ type RecordGqlOperationFilter,
type ObjectRecord,
} from 'twenty-shared/types';
@@ -138,6 +139,7 @@ describe('isRecordMatchingRLSRowLevelPermissionPredicate', () => {
joinColumnName: 'companyId',
},
),
+ createMockFlatFieldMetadata('users-id', 'users', FieldMetadataType.ARRAY),
];
const flatObjectMetadata = createMockFlatObjectMetadata(
@@ -156,6 +158,7 @@ describe('isRecordMatchingRLSRowLevelPermissionPredicate', () => {
addressCity: 'Paris',
},
companyId: 'company-1',
+ users: ['user-1', 'user-2'],
deletedAt: null,
id: 'record-1',
createdAt: new Date().toISOString(),
@@ -357,4 +360,53 @@ describe('isRecordMatchingRLSRowLevelPermissionPredicate', () => {
}),
).toBe(false);
});
+
+ it.each<{ filter: RecordGqlOperationFilter; expected: boolean }>([
+ {
+ filter: { users: { containsIlike: '%user-1%' } },
+ expected: true,
+ },
+ {
+ filter: { users: { containsIlike: '%user-999%' } },
+ expected: false,
+ },
+ {
+ filter: {
+ or: [
+ { users: { containsIlike: '%user-999%' } },
+ { users: { containsIlike: '%user-1%' } },
+ ],
+ },
+ expected: true,
+ },
+ {
+ filter: {
+ or: [
+ { users: { containsIlike: '%user-999%' } },
+ { users: { containsIlike: '%user-998%' } },
+ ],
+ },
+ expected: false,
+ },
+ {
+ filter: { not: { users: { containsIlike: '%user-1%' } } },
+ expected: false,
+ },
+ {
+ filter: { not: { users: { containsIlike: '%user-999%' } } },
+ expected: true,
+ },
+ ])(
+ 'evaluates array RLS filter $filter as $expected',
+ ({ filter, expected }) => {
+ expect(
+ isRecordMatchingRLSRowLevelPermissionPredicate({
+ record: baseRecord,
+ filter,
+ flatObjectMetadata,
+ flatFieldMetadataMaps,
+ }),
+ ).toBe(expected);
+ },
+ );
});
diff --git a/packages/twenty-shared/src/utils/filter/utils/__tests__/isMatchingArrayFilter.test.ts b/packages/twenty-shared/src/utils/filter/utils/__tests__/isMatchingArrayFilter.test.ts
index a3867257f39..6d771849960 100644
--- a/packages/twenty-shared/src/utils/filter/utils/__tests__/isMatchingArrayFilter.test.ts
+++ b/packages/twenty-shared/src/utils/filter/utils/__tests__/isMatchingArrayFilter.test.ts
@@ -69,10 +69,49 @@ describe('isMatchingArrayFilter', () => {
});
describe('containsIlike filter', () => {
+ it.each([
+ { pattern: '%', value: [], expected: false },
+ { pattern: '%', value: [''], expected: true },
+ { pattern: '', value: ['item'], expected: false },
+ { pattern: '', value: [''], expected: true },
+ { pattern: '%user-1%', value: ['other', 'user-1'], expected: true },
+ { pattern: 'a_c', value: ['abc'], expected: true },
+ { pattern: 'a_c', value: ['abxc'], expected: false },
+ { pattern: 'a_c', value: ['a😀c'], expected: true },
+ { pattern: '%foo%', value: ['before\nfoo\nafter'], expected: true },
+ { pattern: 'a\\_c', value: ['a_c'], expected: true },
+ { pattern: 'a\\_c', value: ['abc'], expected: false },
+ { pattern: '50\\%', value: ['50%'], expected: true },
+ { pattern: '50\\%', value: ['500'], expected: false },
+ { pattern: 'a.c', value: ['abc'], expected: false },
+ { pattern: 'a.c', value: ['a.c'], expected: true },
+ { pattern: 'a\\', value: [], expected: false },
+ { pattern: 'a\\', value: null, expected: false },
+ ])(
+ 'matches $pattern against $value: $expected',
+ ({ pattern, value, expected }) => {
+ expect(
+ isMatchingArrayFilter({
+ arrayFilter: { containsIlike: pattern },
+ value,
+ }),
+ ).toBe(expected);
+ },
+ );
+
+ it('rejects a dangling escape when evaluating an array item', () => {
+ expect(() =>
+ isMatchingArrayFilter({
+ arrayFilter: { containsIlike: 'a\\' },
+ value: ['a\\'],
+ }),
+ ).toThrow('LIKE pattern must not end with escape character');
+ });
+
it('should return true when array contains item matching case-insensitive search', () => {
expect(
isMatchingArrayFilter({
- arrayFilter: { containsIlike: 'TEST' },
+ arrayFilter: { containsIlike: '%TEST%' },
value: ['test item'],
}),
).toBe(true);
@@ -81,7 +120,7 @@ describe('isMatchingArrayFilter', () => {
it('should return false when array does not contain item matching search', () => {
expect(
isMatchingArrayFilter({
- arrayFilter: { containsIlike: 'missing' },
+ arrayFilter: { containsIlike: '%missing%' },
value: ['test item'],
}),
).toBe(false);
@@ -90,7 +129,7 @@ describe('isMatchingArrayFilter', () => {
it('should return false when value is null and using containsIlike', () => {
expect(
isMatchingArrayFilter({
- arrayFilter: { containsIlike: 'test' },
+ arrayFilter: { containsIlike: '%test%' },
value: null,
}),
).toBe(false);
@@ -99,11 +138,43 @@ describe('isMatchingArrayFilter', () => {
it('should match partial strings case-insensitively', () => {
expect(
isMatchingArrayFilter({
- arrayFilter: { containsIlike: 'TE' },
+ arrayFilter: { containsIlike: '%TE%' },
value: ['Test Item', 'Another Item'],
}),
).toBe(true);
});
+
+ it('should treat percent signs as SQL ILIKE wildcards', () => {
+ expect(
+ isMatchingArrayFilter({
+ arrayFilter: { containsIlike: '%user-1%' },
+ value: ['user-1'],
+ }),
+ ).toBe(true);
+
+ expect(
+ isMatchingArrayFilter({
+ arrayFilter: { containsIlike: '%user-1%' },
+ value: ['user-2'],
+ }),
+ ).toBe(false);
+ });
+
+ it('should treat a pattern without percent signs as a whole-string ILIKE match', () => {
+ expect(
+ isMatchingArrayFilter({
+ arrayFilter: { containsIlike: 'test' },
+ value: ['TEST'],
+ }),
+ ).toBe(true);
+
+ expect(
+ isMatchingArrayFilter({
+ arrayFilter: { containsIlike: 'test' },
+ value: ['test item'],
+ }),
+ ).toBe(false);
+ });
});
describe('error handling', () => {
diff --git a/packages/twenty-shared/src/utils/filter/utils/isMatchingArrayFilter.ts b/packages/twenty-shared/src/utils/filter/utils/isMatchingArrayFilter.ts
index c7380ebac44..b9a889ff879 100644
--- a/packages/twenty-shared/src/utils/filter/utils/isMatchingArrayFilter.ts
+++ b/packages/twenty-shared/src/utils/filter/utils/isMatchingArrayFilter.ts
@@ -1,4 +1,6 @@
import { type ArrayFilter } from '@/types';
+import { isNonEmptyArray } from '@/utils/array/isNonEmptyArray';
+import { convertLikePatternToRegexOrThrow } from '@/utils/filter/utils/convertLikePatternToRegexOrThrow';
export const isMatchingArrayFilter = ({
arrayFilter,
@@ -19,11 +21,16 @@ export const isMatchingArrayFilter = ({
return Array.isArray(value) && value.length === 0;
}
case arrayFilter.containsIlike !== undefined: {
- const searchTerm = arrayFilter.containsIlike.toLowerCase();
- return (
- Array.isArray(value) &&
- value.some((item) => item.toLowerCase().includes(searchTerm))
- );
+ if (!isNonEmptyArray(value)) {
+ return false;
+ }
+
+ const regexCaseInsensitive = convertLikePatternToRegexOrThrow({
+ pattern: arrayFilter.containsIlike,
+ isCaseInsensitive: true,
+ });
+
+ return value.some((item) => regexCaseInsensitive.test(item));
}
default: {
throw new Error(