🚑 Allow for regex without slashes for retro compat

baptisteArno · Apr 2, 2024 · 2663ca2 · 2663ca2
1 parent a0ba8c5
commit 2663ca2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/apps/builder/src/features/blocks/logic/condition/components/ComparisonItem.tsx b/apps/builder/src/features/blocks/logic/condition/components/ComparisonItem.tsx
@@ -76,6 +76,6 @@ const parseValuePlaceholder = (
       return ''
     case ComparisonOperators.MATCHES_REGEX:
     case ComparisonOperators.NOT_MATCH_REGEX:
-      return '^[0-9]+$'
+      return '/^[0-9]+$/'
   }
 }
diff --git a/apps/docs/editor/blocks/logic/condition.mdx b/apps/docs/editor/blocks/logic/condition.mdx
@@ -70,6 +70,8 @@ Example:
 
 - `/^hello$/` will match if the string is strictly equal to "hello".
 - `/hello/` will match if the string contains "hello". Like "hello world".
+- `/hello/i` will match if the string contains "hello" case-insensitive. Like "Hello world".
+- `/[0-9]+/` will match if the string contains one or more digits. Like "123".
 
 </ResponseField>
 

diff --git a/packages/bot-engine/blocks/logic/condition/executeCondition.ts b/packages/bot-engine/blocks/logic/condition/executeCondition.ts
@@ -176,9 +176,10 @@ const parseDateOrNumber = (value: string): number => {
 }
 
 const preprocessRegex = (regex: string) => {
-  const match = regex.match(/^\/([^\/]+)\/([gimuy]*)$/)
+  const regexWithFlags = regex.match(/\/(.+)\/([gimuy]*)$/)
 
-  if (!match) return null
+  if (regexWithFlags)
+    return { pattern: regexWithFlags[1], flags: regexWithFlags[2] }
 
-  return { pattern: match[1], flags: match[2] }
+  return { pattern: regex }
 }