🐛 (bot) Still parse variable ID in code if has no value

baptisteArno · Feb 14, 2023 · 17020c8 · 17020c8
1 parent 97e2578
commit 17020c8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/apps/viewer/src/features/variables/utils.ts b/apps/viewer/src/features/variables/utils.ts
@@ -24,10 +24,13 @@ export const parseVariables =
     if (!text || text === '') return ''
     return text.replace(/\{\{(.*?)\}\}/g, (_, fullVariableString) => {
       const matchedVarName = fullVariableString.replace(/{{|}}/g, '')
-      const variable = variables.find((v) => {
-        return matchedVarName === v.name && isDefined(v.value)
+      const variable = variables.find((variable) => {
+        return (
+          matchedVarName === variable.name &&
+          (options.fieldToParse === 'id' || isDefined(variable.value))
+        )
       }) as VariableWithValue | undefined
-      if (!variable || variable.value === null) return ''
+      if (!variable) return ''
       if (options.fieldToParse === 'id') return variable.id
       const { value } = variable
       if (options.escapeForJson) return jsonParse(value)

diff --git a/packages/bot-engine/src/features/variables/utils.ts b/packages/bot-engine/src/features/variables/utils.ts
@@ -16,10 +16,13 @@ export const parseVariables =
     if (!text || text === '') return ''
     return text.replace(/\{\{(.*?)\}\}/g, (_, fullVariableString) => {
       const matchedVarName = fullVariableString.replace(/{{|}}/g, '')
-      const variable = variables.find((v) => {
-        return matchedVarName === v.name && isDefined(v.value)
+      const variable = variables.find((variable) => {
+        return (
+          matchedVarName === variable.name &&
+          (options.fieldToParse === 'id' || isDefined(variable.value))
+        )
       }) as VariableWithValue | undefined
-      if (!variable || variable.value === null) return ''
+      if (!variable) return ''
       if (options.fieldToParse === 'id') return variable.id
       const { value } = variable
       if (options.escapeForJson) return jsonParse(value)