🐛 (editor) Fix text bubble regex not compatible with Safari

baptisteArno · Feb 13, 2023 · 2c80e3a · 2c80e3a · vercel · Feb 13, 2023
1 parent 7baa610
commit 2c80e3a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/apps/builder/src/features/typebot/api/utils/isWriteTypebotForbidden.ts b/apps/builder/src/features/typebot/api/utils/isWriteTypebotForbidden.ts
@@ -10,7 +10,6 @@ export const isWriteTypebotForbidden = async (
   user: Pick<User, 'email' | 'id'>
 ) => {
   if (
-    process.env.ADMIN_EMAIL === user.email ||
     typebot.collaborators.find(
       (collaborator) => collaborator.userId === user.id
     )?.type === CollaborationType.WRITE

diff --git a/apps/builder/src/utils/helpers.ts b/apps/builder/src/utils/helpers.ts
@@ -48,18 +48,16 @@ export const blockHasOptions = (block: Block) => 'options' in block
 
 export const parseVariableHighlight = (content: string, typebot: Typebot) => {
   const varNames = typebot.variables.map((v) => v.name)
-  return content.replace(
-    new RegExp(`(?<!href="){{(${varNames.join('|')})}}`, 'g'),
-    (fullMatch, foundVar) => {
-      if (varNames.some((val) => foundVar === val)) {
-        return `<span style="background-color:#ff8b1a; color:#ffffff; padding: 0.125rem 0.25rem; border-radius: 0.35rem">${fullMatch.replace(
-          /{{|}}/g,
-          ''
-        )}</span>`
-      }
-      return fullMatch
+  return content.replace(/\{\{(.*?)\}\}/g, (fullMatch, foundVar) => {
+    if (content.includes(`href="{{${foundVar}}}"`)) return fullMatch
+    if (varNames.some((val) => foundVar === val)) {
+      return `<span style="background-color:#ff8b1a; color:#ffffff; padding: 0.125rem 0.25rem; border-radius: 0.35rem">${fullMatch.replace(
+        /{{|}}/g,
+        ''
+      )}</span>`
     }
-  )
+    return fullMatch
+  })
 }
 
 export const setMultipleRefs =