fix(results): crash when variable is object

baptisteArno · Aug 22, 2022 · 02bb7f5 · 02bb7f5 · vercel · Aug 22, 2022
1 parent 5928142
commit 02bb7f5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/apps/builder/components/results/ResultsTable/ResultsTable.tsx b/apps/builder/components/results/ResultsTable/ResultsTable.tsx
@@ -151,9 +151,6 @@ export const ResultsTable = ({
     [resultHeader]
   )
 
-  // TO-DO: remove. Meant to help me investigate why table crash in some specific circumstances.
-  console.log(data)
-
   const instance = useReactTable({
     data,
     columns,

diff --git a/apps/builder/services/typebots/results.tsx b/apps/builder/services/typebots/results.tsx
@@ -185,7 +185,7 @@ export const convertResultsToTableData = (
       if (isDefined(o[key])) return o
       return {
         ...o,
-        [key]: { plainText: variable.value },
+        [key]: { plainText: variable.value?.toString() },
       }
     }, {}),
   }))

diff --git a/packages/bot-engine/src/contexts/TypebotContext.tsx b/packages/bot-engine/src/contexts/TypebotContext.tsx
@@ -27,7 +27,7 @@ const typebotContext = createContext<{
   linkedBotQueue: LinkedTypebotQueue
   isLoading: boolean
   setCurrentTypebotId: (id: string) => void
-  updateVariableValue: (variableId: string, value: string) => void
+  updateVariableValue: (variableId: string, value: string | number) => void
   createEdge: (edge: Edge) => void
   injectLinkedTypebot: (typebot: Typebot | PublicTypebot) => LinkedTypebot
   popEdgeIdFromLinkedTypebotQueue: () => void

diff --git a/packages/bot-engine/src/services/integration.ts b/packages/bot-engine/src/services/integration.ts
@@ -35,7 +35,7 @@ type IntegrationContext = {
   groups: Group[]
   resultId?: string
   updateVariables: (variables: VariableWithValue[]) => void
-  updateVariableValue: (variableId: string, value: string) => void
+  updateVariableValue: (variableId: string, value: string | number) => void
   onNewLog: (log: Omit<Log, 'id' | 'createdAt' | 'resultId'>) => void
 }
 
@@ -263,7 +263,12 @@ const executeWebhook = async (
     )
     try {
       const value = func(data)
-      updateVariableValue(existingVariable?.id, value)
+      updateVariableValue(
+        existingVariable?.id,
+        typeof value !== 'number' && typeof value !== 'string'
+          ? JSON.stringify(value)
+          : value
+      )
       return [...newVariables, { ...existingVariable, value }]
     } catch (err) {
       return newVariables