feat(results): ✨ Add logs in results

apps/builder/assets/icons.tsx

@@ -362,3 +362,12 @@ export const UsersIcon = (props: IconProps) => (
     <path d="M16 3.13a4 4 0 0 1 0 7.75"></path>
   </Icon>
 )
+
+export const AlignLeftTextIcon = (props: IconProps) => (
+  <Icon viewBox="0 0 24 24" {...featherIconsBaseProps} {...props}>
+    <line x1="17" y1="10" x2="3" y2="10"></line>
+    <line x1="21" y1="6" x2="3" y2="6"></line>
+    <line x1="21" y1="14" x2="3" y2="14"></line>
+    <line x1="17" y1="18" x2="3" y2="18"></line>
+  </Icon>
+)

apps/builder/components/editor/preview/PreviewDrawer.tsx

@@ -7,6 +7,7 @@ import {
   FlexProps,
   useEventListener,
   useToast,
+  UseToastOptions,
   VStack,
 } from '@chakra-ui/react'
 import { TypebotViewer } from 'bot-engine'
@@ -14,7 +15,8 @@ import { headerHeight } from 'components/shared/TypebotHeader'
 import { useEditor } from 'contexts/EditorContext'
 import { useGraph } from 'contexts/GraphContext'
 import { useTypebot } from 'contexts/TypebotContext/TypebotContext'
-import React, { useEffect, useMemo, useState } from 'react'
+import { Log } from 'db'
+import React, { useMemo, useState } from 'react'
 import { parseTypebotToPublicTypebot } from 'services/publicTypebot'
 
 export const PreviewDrawer = () => {
@@ -57,20 +59,10 @@ export const PreviewDrawer = () => {
     setRightPanel(undefined)
   }
 
-  useEffect(() => {
-    const onMessageFromBot = (event: MessageEvent) => {
-      if (event.data.typebotInfo) {
-        toast({ description: event.data.typebotInfo })
-      }
-      if (event.data.typebotError) {
-        toast({ description: event.data.typebotError, status: 'error' })
-      }
-    }
-    window.addEventListener('message', onMessageFromBot)
-    return () => {
-      window.removeEventListener('message', onMessageFromBot)
-    }
-  })
+  const handleNewLog = (log: Omit<Log, 'id' | 'createdAt' | 'resultId'>) => {
+    toast(log as UseToastOptions)
+    console.log(log.details)
+  }
 
   return (
     <Flex
@@ -113,6 +105,7 @@ export const PreviewDrawer = () => {
             <TypebotViewer
               typebot={publicTypebot}
               onNewBlockVisible={setPreviewingEdge}
+              onNewLog={handleNewLog}
               isPreview
             />
           </Flex>

apps/builder/components/results/SubmissionsTable/SubmissionsTable.tsx

@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable react/jsx-key */
-import { chakra, Checkbox, Flex } from '@chakra-ui/react'
+import { Button, chakra, Checkbox, Flex, HStack, Text } from '@chakra-ui/react'
+import { AlignLeftTextIcon } from 'assets/icons'
 import { useTypebot } from 'contexts/TypebotContext/TypebotContext'
 import React, { useEffect, useMemo, useRef } from 'react'
 import { Hooks, useRowSelect, useTable } from 'react-table'
@@ -12,6 +13,7 @@ type SubmissionsTableProps = {
   hasMore?: boolean
   onNewSelection: (indices: number[]) => void
   onScrollToBottom: () => void
+  onLogOpenIndex: (index: number) => () => void
 }
 
 export const SubmissionsTable = ({
@@ -19,13 +21,13 @@ export const SubmissionsTable = ({
   hasMore,
   onNewSelection,
   onScrollToBottom,
+  onLogOpenIndex,
 }: SubmissionsTableProps) => {
   const { publishedTypebot } = useTypebot()
   const columns: any = useMemo(
     () => (publishedTypebot ? parseSubmissionsColumns(publishedTypebot) : []),
     [publishedTypebot]
   )
-
   const bottomElement = useRef<HTMLDivElement | null>(null)
   const tableWrapper = useRef<HTMLDivElement | null>(null)
 
@@ -87,6 +89,19 @@ export const SubmissionsTable = ({
                     </chakra.th>
                   )
                 })}
+                <chakra.th
+                  px="4"
+                  py="2"
+                  border="1px"
+                  borderColor="gray.200"
+                  fontWeight="normal"
+                  whiteSpace="nowrap"
+                >
+                  <HStack>
+                    <AlignLeftTextIcon />
+                    <Text>Logs</Text>
+                  </HStack>
+                </chakra.th>
               </tr>
             )
           })}
@@ -118,10 +133,17 @@ export const SubmissionsTable = ({
                     </chakra.td>
                   )
                 })}
+                <chakra.td px="4" py="2" border="1px" borderColor="gray.200">
+                  <Button size="sm" onClick={onLogOpenIndex(idx)}>
+                    See logs
+                  </Button>
+                </chakra.td>
               </tr>
             )
           })}
-          {hasMore === true && <LoadingRows totalColumns={columns.length} />}
+          {hasMore === true && (
+            <LoadingRows totalColumns={columns.length + 1} />
+          )}
         </tbody>
       </chakra.table>
     </Flex>

apps/builder/layouts/results/LogsModal.tsx

@@ -0,0 +1,99 @@
+import {
+  Modal,
+  ModalOverlay,
+  ModalContent,
+  ModalHeader,
+  ModalCloseButton,
+  ModalBody,
+  Stack,
+  Spinner,
+  ModalFooter,
+  Accordion,
+  AccordionItem,
+  AccordionButton,
+  HStack,
+  AccordionIcon,
+  AccordionPanel,
+  Text,
+  Tag,
+} from '@chakra-ui/react'
+import { Log } from 'db'
+import { useLogs } from 'services/typebots/logs'
+import { isDefined } from 'utils'
+
+export const LogsModal = ({
+  resultId,
+  onClose,
+}: {
+  resultId?: string
+  onClose: () => void
+}) => {
+  const { isLoading, logs } = useLogs(resultId)
+  return (
+    <Modal isOpen={isDefined(resultId)} onClose={onClose} size="xl">
+      <ModalOverlay />
+      <ModalContent>
+        <ModalHeader>Logs</ModalHeader>
+        <ModalCloseButton />
+        <ModalBody as={Stack}>
+          {logs?.map((log, idx) => (
+            <LogCard key={idx} log={log} />
+          ))}
+          {isLoading && <Spinner />}
+        </ModalBody>
+
+        <ModalFooter />
+      </ModalContent>
+    </Modal>
+  )
+}
+
+const LogCard = ({ log }: { log: Log }) => {
+  if (log.details)
+    return (
+      <Accordion allowToggle>
+        <AccordionItem style={{ borderBottomWidth: 0, borderWidth: 0 }}>
+          <AccordionButton
+            as={HStack}
+            p="4"
+            cursor="pointer"
+            justifyContent="space-between"
+            borderRadius="md"
+          >
+            <HStack>
+              <StatusTag status={log.status} />
+              <Text>{log.description}</Text>
+            </HStack>
+            <AccordionIcon />
+          </AccordionButton>
+          <AccordionPanel
+            as="pre"
+            overflow="scroll"
+            borderWidth="1px"
+            borderRadius="md"
+          >
+            {log.details}
+          </AccordionPanel>
+        </AccordionItem>
+      </Accordion>
+    )
+  return (
+    <HStack p="4">
+      <StatusTag status={log.status} />
+      <Text>{log.description}</Text>
+    </HStack>
+  )
+}
+
+const StatusTag = ({ status }: { status: string }) => {
+  switch (status) {
+    case 'error':
+      return <Tag colorScheme={'red'}>Fail</Tag>
+    case 'warning':
+      return <Tag colorScheme={'orange'}>Warn</Tag>
+    case 'info':
+      return <Tag colorScheme={'blue'}>Info</Tag>
+    default:
+      return <Tag colorScheme={'green'}>Ok</Tag>
+  }
+}

apps/builder/layouts/results/SubmissionContent.tsx

@@ -11,6 +11,7 @@ import {
 } from 'services/typebots'
 import { unparse } from 'papaparse'
 import { UnlockProPlanInfo } from 'components/shared/Info'
+import { LogsModal } from './LogsModal'
 
 type Props = {
   typebotId: string
@@ -27,6 +28,7 @@ export const SubmissionsContent = ({
   const [selectedIndices, setSelectedIndices] = useState<number[]>([])
   const [isDeleteLoading, setIsDeleteLoading] = useState(false)
   const [isExportLoading, setIsExportLoading] = useState(false)
+  const [inspectingLogsResultId, setInspectingLogsResultId] = useState<string>()
 
   const toast = useToast({
     position: 'top-right',
@@ -109,6 +111,13 @@ export const SubmissionsContent = ({
     [results]
   )
 
+  const handleLogsModalClose = () => setInspectingLogsResultId(undefined)
+
+  const handleLogOpenIndex = (index: number) => () => {
+    if (!results) return
+    setInspectingLogsResultId(results[index].id)
+  }
+
   return (
     <Stack maxW="1200px" w="full" pb="28">
       {totalHiddenResults && (
@@ -117,6 +126,10 @@ export const SubmissionsContent = ({
           contentLabel="You are seeing complete submissions only."
         />
       )}
+      <LogsModal
+        resultId={inspectingLogsResultId}
+        onClose={handleLogsModalClose}
+      />
       <Flex w="full" justifyContent="flex-end">
         <ResultsActionButtons
           isDeleteLoading={isDeleteLoading}
@@ -132,6 +145,7 @@ export const SubmissionsContent = ({
         onNewSelection={handleNewSelection}
         onScrollToBottom={handleScrolledToBottom}
         hasMore={hasMore}
+        onLogOpenIndex={handleLogOpenIndex}
       />
     </Stack>
   )

apps/builder/pages/api/typebots/[typebotId]/results.ts

@@ -31,7 +31,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
         typebotId,
         typebot: { ownerId: user.email === adminEmail ? undefined : user.id },
         answers: { some: {} },
-        isCompleted: isFreePlan(user) ? false : undefined,
+        isCompleted: isFreePlan(user) ? true : undefined,
       },
       orderBy: {
         createdAt: 'desc',

apps/builder/pages/api/typebots/[typebotId]/results/[resultId]/logs.ts

@@ -0,0 +1,18 @@
+import { withSentry } from '@sentry/nextjs'
+import prisma from 'libs/prisma'
+import { NextApiRequest, NextApiResponse } from 'next'
+import { getAuthenticatedUser } from 'services/api/utils'
+import { methodNotAllowed, notAuthenticated } from 'utils'
+
+const handler = async (req: NextApiRequest, res: NextApiResponse) => {
+  const user = await getAuthenticatedUser(req)
+  if (!user) return notAuthenticated(res)
+  if (req.method === 'GET') {
+    const resultId = req.query.resultId as string
+    const logs = await prisma.log.findMany({ where: { resultId } })
+    return res.send({ logs })
+  }
+  methodNotAllowed(res)
+}
+
+export default withSentry(handler)

apps/builder/services/typebots/logs.ts

@@ -0,0 +1,15 @@
+import { Log } from 'db'
+import { fetcher } from 'services/utils'
+import useSWR from 'swr'
+
+export const useLogs = (resultId?: string, onError?: (e: Error) => void) => {
+  const { data, error } = useSWR<{ logs: Log[] }>(
+    resultId ? `/api/typebots/t/results/${resultId}/logs` : null,
+    fetcher
+  )
+  if (error && onError) onError(error)
+  return {
+    logs: data?.logs,
+    isLoading: !error && !data,
+  }
+}

apps/viewer/layouts/TypebotPage.tsx

@@ -1,9 +1,10 @@
 import { TypebotViewer } from 'bot-engine'
+import { Log } from 'db'
 import { Answer, PublicTypebot, VariableWithValue } from 'models'
 import React, { useEffect, useState } from 'react'
 import { upsertAnswer } from 'services/answer'
 import { SEO } from '../components/Seo'
-import { createResult, updateResult } from '../services/result'
+import { createLog, createResult, updateResult } from '../services/result'
 import { ErrorPage } from './ErrorPage'
 
 export type TypebotPageProps = {
@@ -58,6 +59,14 @@ export const TypebotPage = ({
     if (error) setError(error)
   }
 
+  const handleNewLog = async (
+    log: Omit<Log, 'id' | 'createdAt' | 'resultId'>
+  ) => {
+    if (!resultId) return setError(new Error('Result was not created'))
+    const { error } = await createLog(resultId, log)
+    if (error) setError(error)
+  }
+
   if (error) {
     return <ErrorPage error={error} />
   }
@@ -74,6 +83,7 @@ export const TypebotPage = ({
           onNewAnswer={handleNewAnswer}
           onCompleted={handleCompleted}
           onVariablesPrefilled={initializeResult}
+          onNewLog={handleNewLog}
         />
       )}
     </div>

apps/viewer/pages/api/results.ts

@@ -1,23 +0,0 @@
-import { withSentry } from '@sentry/nextjs'
-import prisma from 'libs/prisma'
-import { VariableWithValue } from 'models'
-import { NextApiRequest, NextApiResponse } from 'next'
-import { methodNotAllowed } from 'utils'
-
-const handler = async (req: NextApiRequest, res: NextApiResponse) => {
-  if (req.method === 'POST') {
-    const resultData = (
-      typeof req.body === 'string' ? JSON.parse(req.body) : req.body
-    ) as {
-      typebotId: string
-      prefilledVariables: VariableWithValue[]
-    }
-    const result = await prisma.result.create({
-      data: { ...resultData, isCompleted: false },
-    })
-    return res.send(result)
-  }
-  return methodNotAllowed(res)
-}
-
-export default withSentry(handler)

apps/viewer/pages/api/typebots/[typebotId]/results.ts

@@ -1,5 +1,5 @@
 import prisma from 'libs/prisma'
-import { ResultWithAnswers, Typebot } from 'models'
+import { ResultWithAnswers, Typebot, VariableWithValue } from 'models'
 import { NextApiRequest, NextApiResponse } from 'next'
 import { authenticateUser } from 'services/api/utils'
 import { methodNotAllowed, parseAnswers } from 'utils'
@@ -14,16 +14,30 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
     })
     if (!typebot) return res.status(400).send({ message: 'Typebot not found' })
     const limit = Number(req.query.limit)
+    console.log(limit, typebot.id)
     const results = (await prisma.result.findMany({
       where: { typebotId: typebot.id },
       orderBy: { createdAt: 'desc' },
       take: limit,
       include: { answers: true },
     })) as unknown as ResultWithAnswers[]
-    res.send({
+    console.log(results)
+    return res.send({
       results: results.map(parseAnswers(typebot as unknown as Typebot)),
     })
   }
+  if (req.method === 'POST') {
+    const typebotId = req.query.typebotId as string
+    const resultData = (
+      typeof req.body === 'string' ? JSON.parse(req.body) : req.body
+    ) as {
+      prefilledVariables: VariableWithValue[]
+    }
+    const result = await prisma.result.create({
+      data: { ...resultData, typebotId, isCompleted: false },
+    })
+    return res.send(result)
+  }
   methodNotAllowed(res)
 }
 

apps/viewer/pages/api/typebots/[typebotId]/results/[resultId].ts

@@ -8,9 +8,9 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
     const data = (
       typeof req.body === 'string' ? JSON.parse(req.body) : req.body
     ) as { isCompleted: true }
-    const id = req.query.id.toString()
+    const resultId = req.query.resultId as string
     const result = await prisma.result.update({
-      where: { id },
+      where: { id: resultId },
       data,
     })
     return res.send(result)

apps/viewer/pages/api/typebots/[typebotId]/results/[resultId]/logs.ts

@@ -0,0 +1,20 @@
+import { withSentry } from '@sentry/nextjs'
+import { Log } from 'db'
+import prisma from 'libs/prisma'
+import { NextApiRequest, NextApiResponse } from 'next'
+import { badRequest, methodNotAllowed } from 'utils'
+
+const handler = async (req: NextApiRequest, res: NextApiResponse) => {
+  if (req.method === 'POST') {
+    const resultId = req.query.resultId as string
+    const log = req.body as
+      | Omit<Log, 'id' | 'createdAt' | 'resultId'>
+      | undefined
+    if (!log) return badRequest(res)
+    const createdLog = await prisma.log.create({ data: { ...log, resultId } })
+    return res.send(createdLog)
+  }
+  methodNotAllowed(res)
+}
+
+export default withSentry(handler)

apps/viewer/playwright/tests/api.spec.ts

@@ -15,7 +15,9 @@ test.beforeAll(async () => {
     )
     await createWebhook(typebotId)
     await createResults({ typebotId })
-  } catch (err) {}
+  } catch (err) {
+    console.log(err)
+  }
 })
 
 test('can list typebots', async ({ request }) => {
@@ -112,10 +114,10 @@ test('can get a sample result', async ({ request }) => {
   const data = await response.json()
   expect(data).toMatchObject({
     message: 'This is a sample result, it has been generated ⬇️',
-    Welcome: 'Item 1, Item 2, Item3',
+    Welcome: 'Hi!',
     Email: 'test@email.com',
     Name: 'answer value',
-    Services: 'Item 1, Item 2, Item3',
+    Services: 'Website dev, Content Marketing, Social Media, UI / UX Design',
     'Additional information': 'answer value',
   })
 })

apps/viewer/playwright/tests/metadata.spec.ts

@@ -7,6 +7,7 @@ import {
   InputStepType,
   Metadata,
 } from 'models'
+import { typebotViewer } from '../services/selectorUtils'
 
 test('Should correctly parse metadata', async ({ page }) => {
   const typebotId = generate()
@@ -48,4 +49,9 @@ test('Should correctly parse metadata', async ({ page }) => {
       (document.querySelector('link[rel="icon"]') as any).getAttribute('href')
     )
   ).toBe(customMetadata.favIconUrl)
+  await expect(
+    typebotViewer(page).locator(
+      `input[placeholder="${defaultTextInputOptions.labels.placeholder}"]`
+    )
+  ).toBeVisible()
 })

apps/viewer/services/answer.ts

@@ -1,10 +1,9 @@
 import { Answer } from 'models'
 import { sendRequest } from 'utils'
 
-export const upsertAnswer = async (answer: Answer & { resultId: string }) => {
-  return sendRequest<Answer>({
-    url: `/api/answers`,
+export const upsertAnswer = async (answer: Answer & { resultId: string }) =>
+  sendRequest<Answer>({
+    url: `/api/typebots/t/results/r/answers`,
     method: 'PUT',
     body: answer,
   })
-}

apps/viewer/services/result.ts

@@ -1,4 +1,4 @@
-import { Result } from 'db'
+import { Log, Result } from 'db'
 import { VariableWithValue } from 'models'
 import { sendRequest } from 'utils'
 
@@ -7,19 +7,25 @@ export const createResult = async (
   prefilledVariables: VariableWithValue[]
 ) => {
   return sendRequest<Result>({
-    url: `/api/results`,
+    url: `/api/typebots/${typebotId}/results`,
     method: 'POST',
-    body: { typebotId, prefilledVariables },
+    body: { prefilledVariables },
   })
 }
 
-export const updateResult = async (
-  resultId: string,
-  result: Partial<Result>
-) => {
-  return sendRequest<Result>({
-    url: `/api/results/${resultId}`,
+export const updateResult = async (resultId: string, result: Partial<Result>) =>
+  sendRequest<Result>({
+    url: `/api/typebots/t/results/${resultId}`,
     method: 'PATCH',
     body: result,
   })
-}
+
+export const createLog = (
+  resultId: string,
+  log: Omit<Log, 'id' | 'createdAt' | 'resultId'>
+) =>
+  sendRequest<Result>({
+    url: `/api/typebots/t/results/${resultId}/logs`,
+    method: 'POST',
+    body: log,
+  })

packages/bot-engine/src/components/ChatBlock/ChatBlock.tsx

@@ -31,8 +31,14 @@ export const ChatBlock = ({
   onScroll,
   onBlockEnd,
 }: ChatBlockProps) => {
-  const { typebot, updateVariableValue, createEdge, apiHost, isPreview } =
-    useTypebot()
+  const {
+    typebot,
+    updateVariableValue,
+    createEdge,
+    apiHost,
+    isPreview,
+    onNewLog,
+  } = useTypebot()
   const { resultValues } = useAnswers()
   const [displayedSteps, setDisplayedSteps] = useState<Step[]>([])
 
@@ -72,6 +78,7 @@ export const ChatBlock = ({
           updateVariableValue,
           resultValues,
           blocks: typebot.blocks,
+          onNewLog,
         },
       })
       nextEdgeId ? onBlockEnd(nextEdgeId) : displayNextStep()

packages/bot-engine/src/components/ConversationContainer.tsx

@@ -4,8 +4,7 @@ import { ChatBlock } from './ChatBlock/ChatBlock'
 import { useFrame } from 'react-frame-component'
 import { setCssVariablesValue } from '../services/theme'
 import { useAnswers } from '../contexts/AnswersContext'
-import { deepEqual } from 'fast-equals'
-import { Answer, Block, Edge, Theme, VariableWithValue } from 'models'
+import { Block, Edge, Theme, VariableWithValue } from 'models'
 import { byId, isNotDefined } from 'utils'
 import { animateScroll as scroll } from 'react-scroll'
 import { useTypebot } from 'contexts/TypebotContext'
@@ -13,14 +12,12 @@ import { useTypebot } from 'contexts/TypebotContext'
 type Props = {
   theme: Theme
   onNewBlockVisible: (edge: Edge) => void
-  onNewAnswer: (answer: Answer) => void
   onCompleted: () => void
   onVariablesPrefilled?: (prefilledVariables: VariableWithValue[]) => void
 }
 export const ConversationContainer = ({
   theme,
   onNewBlockVisible,
-  onNewAnswer,
   onCompleted,
   onVariablesPrefilled,
 }: Props) => {
@@ -29,11 +26,7 @@ export const ConversationContainer = ({
   const [displayedBlocks, setDisplayedBlocks] = useState<
     { block: Block; startStepIndex: number }[]
   >([])
-  const [localAnswer, setLocalAnswer] = useState<Answer | undefined>()
-  const {
-    resultValues: { answers },
-    setPrefilledVariables,
-  } = useAnswers()
+  const { setPrefilledVariables } = useAnswers()
   const bottomAnchor = useRef<HTMLDivElement | null>(null)
   const scrollableContainer = useRef<HTMLDivElement | null>(null)
 
@@ -80,14 +73,6 @@ export const ConversationContainer = ({
     setCssVariablesValue(theme, frameDocument.body.style)
   }, [theme, frameDocument])
 
-  useEffect(() => {
-    const answer = [...answers].pop()
-    if (!answer || deepEqual(localAnswer, answer)) return
-    setLocalAnswer(answer)
-    onNewAnswer(answer)
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [answers])
-
   const autoScrollToBottom = () => {
     if (!scrollableContainer.current) return
     scroll.scrollToBottom({

packages/bot-engine/src/components/TypebotViewer.tsx

@@ -17,6 +17,7 @@ import {
   PublicTypebot,
   VariableWithValue,
 } from 'models'
+import { Log } from 'db'
 
 export type TypebotViewerProps = {
   typebot: PublicTypebot
@@ -24,6 +25,7 @@ export type TypebotViewerProps = {
   apiHost?: string
   onNewBlockVisible?: (edge: Edge) => void
   onNewAnswer?: (answer: Answer) => void
+  onNewLog?: (log: Omit<Log, 'id' | 'createdAt' | 'resultId'>) => void
   onCompleted?: () => void
   onVariablesPrefilled?: (prefilledVariables: VariableWithValue[]) => void
 }
@@ -31,6 +33,7 @@ export const TypebotViewer = ({
   typebot,
   apiHost = process.env.NEXT_PUBLIC_VIEWER_HOST,
   isPreview = false,
+  onNewLog,
   onNewBlockVisible,
   onNewAnswer,
   onCompleted,
@@ -43,15 +46,15 @@ export const TypebotViewer = ({
         : 'transparent',
     [typebot?.theme?.general?.background]
   )
-  const handleNewBlockVisible = (edge: Edge) => {
-    if (onNewBlockVisible) onNewBlockVisible(edge)
-  }
-  const handleNewAnswer = (answer: Answer) => {
-    if (onNewAnswer) onNewAnswer(answer)
-  }
-  const handleCompleted = () => {
-    if (onCompleted) onCompleted()
-  }
+  const handleNewBlockVisible = (edge: Edge) =>
+    onNewBlockVisible && onNewBlockVisible(edge)
+
+  const handleNewAnswer = (answer: Answer) => onNewAnswer && onNewAnswer(answer)
+
+  const handleNewLog = (log: Omit<Log, 'id' | 'createdAt' | 'resultId'>) =>
+    onNewLog && onNewLog(log)
+
+  const handleCompleted = () => onCompleted && onCompleted()
 
   if (!apiHost)
     return <p>process.env.NEXT_PUBLIC_VIEWER_HOST is missing in env</p>
@@ -76,8 +79,13 @@ export const TypebotViewer = ({
           }:wght@300;400;600&display=swap');`,
         }}
       />
-      <TypebotContext typebot={typebot} apiHost={apiHost} isPreview={isPreview}>
-        <AnswersContext>
+      <TypebotContext
+        typebot={typebot}
+        apiHost={apiHost}
+        isPreview={isPreview}
+        onNewLog={handleNewLog}
+      >
+        <AnswersContext onNewAnswer={handleNewAnswer}>
           <div
             className="flex text-base overflow-hidden bg-cover h-screen w-screen flex-col items-center typebot-container"
             style={{
@@ -90,7 +98,6 @@ export const TypebotViewer = ({
               <ConversationContainer
                 theme={typebot.theme}
                 onNewBlockVisible={handleNewBlockVisible}
-                onNewAnswer={handleNewAnswer}
                 onCompleted={handleCompleted}
                 onVariablesPrefilled={onVariablesPrefilled}
               />

packages/bot-engine/src/contexts/AnswersContext.tsx

@@ -9,18 +9,26 @@ const answersContext = createContext<{
   //@ts-ignore
 }>({})
 
-export const AnswersContext = ({ children }: { children: ReactNode }) => {
+export const AnswersContext = ({
+  children,
+  onNewAnswer,
+}: {
+  onNewAnswer: (answer: Answer) => void
+  children: ReactNode
+}) => {
   const [resultValues, setResultValues] = useState<ResultValues>({
     answers: [],
     prefilledVariables: [],
     createdAt: new Date().toISOString(),
   })
 
-  const addAnswer = (answer: Answer) =>
+  const addAnswer = (answer: Answer) => {
     setResultValues((resultValues) => ({
       ...resultValues,
       answers: [...resultValues.answers, answer],
     }))
+    onNewAnswer(answer)
+  }
 
   const setPrefilledVariables = (variables: VariableWithValue[]) =>
     setResultValues((resultValues) => ({

packages/bot-engine/src/contexts/TypebotContext.tsx

@@ -1,3 +1,4 @@
+import { Log } from 'db'
 import { Edge, PublicTypebot } from 'models'
 import React, {
   createContext,
@@ -13,6 +14,7 @@ const typebotContext = createContext<{
   isPreview: boolean
   updateVariableValue: (variableId: string, value: string) => void
   createEdge: (edge: Edge) => void
+  onNewLog: (log: Omit<Log, 'id' | 'createdAt' | 'resultId'>) => void
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   //@ts-ignore
 }>({})
@@ -22,11 +24,13 @@ export const TypebotContext = ({
   typebot,
   apiHost,
   isPreview,
+  onNewLog,
 }: {
   children: ReactNode
   typebot: PublicTypebot
   apiHost: string
   isPreview: boolean
+  onNewLog: (log: Omit<Log, 'id' | 'createdAt' | 'resultId'>) => void
 }) => {
   const [localTypebot, setLocalTypebot] = useState<PublicTypebot>(typebot)
 
@@ -63,6 +67,7 @@ export const TypebotContext = ({
         isPreview,
         updateVariableValue,
         createEdge,
+        onNewLog,
       }}
     >
       {children}

packages/bot-engine/src/services/integration.ts

@@ -1,3 +1,4 @@
+import { Log } from 'db'
 import {
   IntegrationStep,
   IntegrationStepType,
@@ -18,7 +19,6 @@ import {
 import { stringify } from 'qs'
 import { sendRequest } from 'utils'
 import { sendGaEvent } from '../../lib/gtag'
-import { sendErrorMessage, sendInfoMessage } from './postMessage'
 import { parseVariables, parseVariablesInObject } from './variable'
 
 const safeEval = eval
@@ -33,6 +33,7 @@ type IntegrationContext = {
   resultValues: ResultValues
   blocks: Block[]
   updateVariableValue: (variableId: string, value: string) => void
+  onNewLog: (log: Omit<Log, 'id' | 'createdAt' | 'resultId'>) => void
 }
 
 export const executeIntegration = ({
@@ -87,10 +88,17 @@ const executeGoogleSheetIntegration = async (
 
 const insertRowInGoogleSheets = async (
   options: GoogleSheetsInsertRowOptions,
-  { variables, apiHost }: IntegrationContext
+  { variables, apiHost, onNewLog }: IntegrationContext
 ) => {
-  if (!options.cellsToInsert) return
-  return sendRequest({
+  if (!options.cellsToInsert) {
+    onNewLog({
+      status: 'warning',
+      description: 'Cells to insert are undefined',
+      details: null,
+    })
+    return
+  }
+  const { error } = await sendRequest({
     url: `${apiHost}/api/integrations/google-sheets/spreadsheets/${options.spreadsheetId}/sheets/${options.sheetId}`,
     method: 'POST',
     body: {
@@ -98,14 +106,21 @@ const insertRowInGoogleSheets = async (
       values: parseCellValues(options.cellsToInsert, variables),
     },
   })
+  onNewLog(
+    parseLog(
+      error,
+      'Succesfully inserted a row in the sheet',
+      'Failed to insert a row in the sheet'
+    )
+  )
 }
 
 const updateRowInGoogleSheets = async (
   options: GoogleSheetsUpdateRowOptions,
-  { variables, apiHost }: IntegrationContext
+  { variables, apiHost, onNewLog }: IntegrationContext
 ) => {
   if (!options.cellsToUpsert || !options.referenceCell) return
-  return sendRequest({
+  const { error } = await sendRequest({
     url: `${apiHost}/api/integrations/google-sheets/spreadsheets/${options.spreadsheetId}/sheets/${options.sheetId}`,
     method: 'PATCH',
     body: {
@@ -117,11 +132,18 @@ const updateRowInGoogleSheets = async (
       },
     },
   })
+  onNewLog(
+    parseLog(
+      error,
+      'Succesfully updated a row in the sheet',
+      'Failed to update a row in the sheet'
+    )
+  )
 }
 
 const getRowFromGoogleSheets = async (
   options: GoogleSheetsGetOptions,
-  { variables, updateVariableValue, apiHost }: IntegrationContext
+  { variables, updateVariableValue, apiHost, onNewLog }: IntegrationContext
 ) => {
   if (!options.referenceCell || !options.cellsToExtract) return
   const queryParams = stringify(
@@ -135,10 +157,17 @@ const getRowFromGoogleSheets = async (
     },
     { indices: false }
   )
-  const { data } = await sendRequest<{ [key: string]: string }>({
+  const { data, error } = await sendRequest<{ [key: string]: string }>({
     url: `${apiHost}/api/integrations/google-sheets/spreadsheets/${options.spreadsheetId}/sheets/${options.sheetId}?${queryParams}`,
     method: 'GET',
   })
+  onNewLog(
+    parseLog(
+      error,
+      'Succesfully fetched data from sheet',
+      'Failed to fetch data from sheet'
+    )
+  )
   if (!data) return
   options.cellsToExtract.forEach((cell) =>
     updateVariableValue(cell.variableId ?? '', data[cell.column ?? ''])
@@ -167,7 +196,7 @@ const executeWebhook = async (
     typebotId,
     apiHost,
     resultValues,
-    isPreview,
+    onNewLog,
   }: IntegrationContext
 ) => {
   const { data, error } = await sendRequest({
@@ -178,8 +207,15 @@ const executeWebhook = async (
       resultValues,
     },
   })
-  console.error(error)
-  if (isPreview && error) sendErrorMessage(`Webhook failed: ${error.message}`)
+  const statusCode = (data as Record<string, string>).statusCode.toString()
+  const isError = statusCode.startsWith('4') || statusCode.startsWith('5')
+  onNewLog({
+    status: error ? 'error' : isError ? 'warning' : 'success',
+    description: isError
+      ? 'Webhook returned an error'
+      : 'Webhook successfuly executed',
+    details: JSON.stringify(error ?? data, null, 2).substring(0, 1000),
+  })
   step.options.responseVariableMapping.forEach((varMapping) => {
     if (!varMapping?.bodyPath || !varMapping.variableId) return
     const value = safeEval(`(${JSON.stringify(data)}).${varMapping?.bodyPath}`)
@@ -190,10 +226,16 @@ const executeWebhook = async (
 
 const sendEmail = async (
   step: SendEmailStep,
-  { variables, apiHost, isPreview }: IntegrationContext
+  { variables, apiHost, isPreview, onNewLog }: IntegrationContext
 ) => {
-  if (isPreview) sendInfoMessage('Emails are not sent in preview mode')
-  if (isPreview) return step.outgoingEdgeId
+  if (isPreview) {
+    onNewLog({
+      status: 'info',
+      description: 'Emails are not sent in preview mode',
+      details: null,
+    })
+    return step.outgoingEdgeId
+  }
   const { options } = step
   const { error } = await sendRequest({
     url: `${apiHost}/api/integrations/email`,
@@ -207,6 +249,18 @@ const sendEmail = async (
       bcc: (options.bcc ?? []).map(parseVariables(variables)),
     },
   })
-  console.error(error)
+  onNewLog(
+    parseLog(error, 'Succesfully sent an email', 'Failed to send an email')
+  )
   return step.outgoingEdgeId
 }
+
+const parseLog = (
+  error: Error | undefined,
+  successMessage: string,
+  errorMessage: string
+): Omit<Log, 'id' | 'createdAt' | 'resultId'> => ({
+  status: error ? 'error' : 'success',
+  description: error ? errorMessage : successMessage,
+  details: (error && JSON.stringify(error, null, 2).substring(0, 1000)) ?? null,
+})

packages/bot-engine/src/services/postMessage.ts

@@ -1,7 +0,0 @@
-export const sendInfoMessage = (typebotInfo: string) => {
-  parent.postMessage({ typebotInfo })
-}
-
-export const sendErrorMessage = (typebotError: string) => {
-  parent.postMessage({ typebotError })
-}

packages/db/prisma/migrations/20220301103112_add_logs/migration.sql

@@ -0,0 +1,14 @@
+-- CreateTable
+CREATE TABLE "Log" (
+    "id" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "resultId" TEXT NOT NULL,
+    "status" TEXT NOT NULL,
+    "description" TEXT NOT NULL,
+    "details" TEXT,
+
+    CONSTRAINT "Log_pkey" PRIMARY KEY ("id")
+);
+
+-- AddForeignKey
+ALTER TABLE "Log" ADD CONSTRAINT "Log_resultId_fkey" FOREIGN KEY ("resultId") REFERENCES "Result"("id") ON DELETE CASCADE ON UPDATE CASCADE;

packages/db/prisma/schema.prisma

@@ -129,7 +129,7 @@ model Typebot {
   customDomain       String?                   @unique
   collaborators      CollaboratorsOnTypebots[]
   invitations        Invitation[]
-  webhooks Webhook[]
+  webhooks           Webhook[]
 
   @@unique([id, ownerId])
 }
@@ -184,6 +184,17 @@ model Result {
   answers            Answer[]
   prefilledVariables Json[]
   isCompleted        Boolean
+  logs               Log[]
+}
+
+model Log {
+  id          String    @id @default(cuid())
+  createdAt   DateTime  @default(now())
+  resultId    String
+  result      Result    @relation(fields: [resultId], references: [id], onDelete: Cascade)
+  status      String
+  description String
+  details     String?
 }
 
 model Answer {