Skip to content

The open alternative to Salesforce, designed for AI.

fix(shared): escape regex metacharacters in raw json and rich text like filters (#26398)

Belkouchef03fe1216d39
diff --git a/packages/twenty-shared/src/utils/filter/utils/__tests__/isMatchingRawJsonFilter.test.ts b/packages/twenty-shared/src/utils/filter/utils/__tests__/isMatchingRawJsonFilter.test.ts
index ba6294d493c..15ac77b6a76 100644
--- a/packages/twenty-shared/src/utils/filter/utils/__tests__/isMatchingRawJsonFilter.test.ts
+++ b/packages/twenty-shared/src/utils/filter/utils/__tests__/isMatchingRawJsonFilter.test.ts
@@ -19,6 +19,38 @@ describe('isMatchingRawJsonFilter', () => {
}),
).toBe(false);
});
+
+ it('should treat regex metacharacters in the pattern literally', () => {
+ expect(() =>
+ isMatchingRawJsonFilter({
+ rawJsonFilter: { like: '%(%' },
+ value: 'some (test) value',
+ }),
+ ).not.toThrow();
+
+ expect(
+ isMatchingRawJsonFilter({
+ rawJsonFilter: { like: '%(test)%' },
+ value: 'some (test) value',
+ }),
+ ).toBe(true);
+
+ expect(
+ isMatchingRawJsonFilter({
+ rawJsonFilter: { like: '%a.c%' },
+ value: 'abc',
+ }),
+ ).toBe(false);
+ });
+
+ it('should match across lines', () => {
+ expect(
+ isMatchingRawJsonFilter({
+ rawJsonFilter: { like: '%value%' },
+ value: { key: 'value' } as any,
+ }),
+ ).toBe(true);
+ });
});
describe('is', () => {
diff --git a/packages/twenty-shared/src/utils/filter/utils/isMatchingRawJsonFilter.ts b/packages/twenty-shared/src/utils/filter/utils/isMatchingRawJsonFilter.ts
index de294aa1b7b..cac715034bb 100644
--- a/packages/twenty-shared/src/utils/filter/utils/isMatchingRawJsonFilter.ts
+++ b/packages/twenty-shared/src/utils/filter/utils/isMatchingRawJsonFilter.ts
@@ -1,4 +1,5 @@
import { type RawJsonFilter } from '@/types';
+import { convertLikePatternToRegexOrThrow } from '@/utils/filter/utils/convertLikePatternToRegexOrThrow';
export const isMatchingRawJsonFilter = ({
rawJsonFilter,
@@ -9,8 +10,10 @@ export const isMatchingRawJsonFilter = ({
}) => {
switch (true) {
case rawJsonFilter.like !== undefined: {
- const regexPattern = rawJsonFilter.like.replace(/%/g, '.*');
- const regexCaseInsensitive = new RegExp(`^${regexPattern}$`, 'is');
+ const regexCaseInsensitive = convertLikePatternToRegexOrThrow({
+ pattern: rawJsonFilter.like,
+ isCaseInsensitive: true,
+ });
const stringValue = JSON.stringify(value, null, 1);