From 7790cf4f2741725ea155eda7603d1198e08c2177 Mon Sep 17 00:00:00 2001
From: Baptiste Arnaud <baptiste.arnaud95@gmail.com>
Date: Mon, 24 Jun 2024 15:03:18 +0200
Subject: [PATCH] :bug: (text) Fix text bubble content parsing when starting
 with variable

Closes #1594
---
 .../components/SetVariableSettings.tsx         |  2 +-
 apps/docs/openapi/builder.json                 | 18 ++++++++++++++++++
 apps/docs/openapi/viewer.json                  |  9 +++++++++
 packages/bot-engine/parseBubbleBlock.ts        |  8 +++++---
 packages/variables/isSingleVariable.ts         |  5 +++++
 5 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 packages/variables/isSingleVariable.ts

diff --git a/apps/builder/src/features/blocks/logic/setVariable/components/SetVariableSettings.tsx b/apps/builder/src/features/blocks/logic/setVariable/components/SetVariableSettings.tsx
index 4010cac4a..70278aae8 100644
--- a/apps/builder/src/features/blocks/logic/setVariable/components/SetVariableSettings.tsx
+++ b/apps/builder/src/features/blocks/logic/setVariable/components/SetVariableSettings.tsx
@@ -206,7 +206,7 @@ const SetVariableValue = ({
               }
               onSelect={updateIsCode}
             />
-            {options?.isCode === undefined || options.isCode ? (
+            {options?.isCode ? (
               <CodeEditor
                 defaultValue={options?.expressionToEvaluate ?? ''}
                 onChange={updateExpression}
diff --git a/apps/docs/openapi/builder.json b/apps/docs/openapi/builder.json
index 5639ea131..9c6dd3ee8 100644
--- a/apps/docs/openapi/builder.json
+++ b/apps/docs/openapi/builder.json
@@ -236,6 +236,9 @@
                                                   },
                                                   "maxWidth": {
                                                     "type": "string"
+                                                  },
+                                                  "queryParamsStr": {
+                                                    "type": "string"
                                                   }
                                                 }
                                               }
@@ -4572,6 +4575,9 @@
                                               },
                                               "maxWidth": {
                                                 "type": "string"
+                                              },
+                                              "queryParamsStr": {
+                                                "type": "string"
                                               }
                                             }
                                           }
@@ -8045,6 +8051,9 @@
                                               },
                                               "maxWidth": {
                                                 "type": "string"
+                                              },
+                                              "queryParamsStr": {
+                                                "type": "string"
                                               }
                                             }
                                           }
@@ -16560,6 +16569,9 @@
                   },
                   "maxWidth": {
                     "type": "string"
+                  },
+                  "queryParamsStr": {
+                    "type": "string"
                   }
                 }
               }
@@ -22872,6 +22884,9 @@
                               },
                               "maxWidth": {
                                 "type": "string"
+                              },
+                              "queryParamsStr": {
+                                "type": "string"
                               }
                             }
                           }
@@ -25714,6 +25729,9 @@
                               },
                               "maxWidth": {
                                 "type": "string"
+                              },
+                              "queryParamsStr": {
+                                "type": "string"
                               }
                             }
                           }
diff --git a/apps/docs/openapi/viewer.json b/apps/docs/openapi/viewer.json
index 15a4a4988..7781c65c5 100644
--- a/apps/docs/openapi/viewer.json
+++ b/apps/docs/openapi/viewer.json
@@ -3433,6 +3433,9 @@
                               },
                               "maxWidth": {
                                 "type": "string"
+                              },
+                              "queryParamsStr": {
+                                "type": "string"
                               }
                             }
                           }
@@ -7594,6 +7597,9 @@
                   },
                   "maxWidth": {
                     "type": "string"
+                  },
+                  "queryParamsStr": {
+                    "type": "string"
                   }
                 }
               }
@@ -12777,6 +12783,9 @@
               },
               "maxWidth": {
                 "type": "string"
+              },
+              "queryParamsStr": {
+                "type": "string"
               }
             }
           }
diff --git a/packages/bot-engine/parseBubbleBlock.ts b/packages/bot-engine/parseBubbleBlock.ts
index dfca6ad70..64c0cd0be 100644
--- a/packages/bot-engine/parseBubbleBlock.ts
+++ b/packages/bot-engine/parseBubbleBlock.ts
@@ -16,6 +16,7 @@ import { BubbleBlockType } from '@typebot.io/schemas/features/blocks/bubbles/con
 import { defaultVideoBubbleContent } from '@typebot.io/schemas/features/blocks/bubbles/video/constants'
 import { convertMarkdownToRichText } from '@typebot.io/lib/markdown/convertMarkdownToRichText'
 import { convertRichTextToMarkdown } from '@typebot.io/lib/markdown/convertRichTextToMarkdown'
+import { isSingleVariable } from '@typebot.io/variables/isSingleVariable'
 
 type Params = {
   version: 1 | 2
@@ -144,7 +145,9 @@ export const parseVariablesInRichText = (
             : undefined
         lastTextEndIndex = variableInText.endIndex
         const isStandaloneElement =
-          isEmpty(textBeforeVariable) && isEmpty(textAfterVariable)
+          isEmpty(textBeforeVariable) &&
+          isEmpty(textAfterVariable) &&
+          variablesInText.length === 1
         const variableElements = convertMarkdownToRichText(
           isStandaloneElement
             ? variableInText.value
@@ -193,8 +196,7 @@ export const parseVariablesInRichText = (
     const type =
       element.children.length === 1 &&
       'text' in element.children[0] &&
-      (element.children[0].text as string).startsWith('{{') &&
-      (element.children[0].text as string).endsWith('}}') &&
+      isSingleVariable(element.children[0].text as string) &&
       element.type !== 'a'
         ? 'variable'
         : element.type
diff --git a/packages/variables/isSingleVariable.ts b/packages/variables/isSingleVariable.ts
new file mode 100644
index 000000000..66db56bfb
--- /dev/null
+++ b/packages/variables/isSingleVariable.ts
@@ -0,0 +1,5 @@
+export const isSingleVariable = (value: string | undefined): boolean =>
+  !!value &&
+  value.startsWith('{{') &&
+  value.endsWith('}}') &&
+  value.split('{{').length === 2