feat(engine): ✨ Add retry bubbles

baptisteArno · Feb 10, 2022 · 8c8d77e · 8c8d77e · vercel · Feb 10, 2022
1 parent 276f1c1
commit 8c8d77e
Show file tree

Hide file tree

Showing 15 changed files with 217 additions and 29 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ yarn-error.log
 authenticatedState.json
 playwright-report
 dist
+test-results
diff --git a/...ents/shared/Graph/Nodes/StepNode/SettingsPopoverContent/bodies/EmailInputSettingsBody.tsx b/...ents/shared/Graph/Nodes/StepNode/SettingsPopoverContent/bodies/EmailInputSettingsBody.tsx
@@ -1,5 +1,6 @@
 import { FormLabel, Stack } from '@chakra-ui/react'
 import { DebouncedInput } from 'components/shared/DebouncedInput'
+import { InputWithVariableButton } from 'components/shared/TextboxWithVariableButton'
 import { VariableSearchInput } from 'components/shared/VariableSearchInput'
 import { EmailInputOptions, Variable } from 'models'
 import React from 'react'
@@ -19,6 +20,8 @@ export const EmailInputSettingsBody = ({
     onOptionsChange({ ...options, labels: { ...options.labels, button } })
   const handleVariableChange = (variable?: Variable) =>
     onOptionsChange({ ...options, variableId: variable?.id })
+  const handleRetryMessageChange = (retryMessageContent: string) =>
+    onOptionsChange({ ...options, retryMessageContent })
 
   return (
     <Stack spacing={4}>
@@ -42,6 +45,16 @@ export const EmailInputSettingsBody = ({
           onChange={handleButtonLabelChange}
         />
       </Stack>
+      <Stack>
+        <FormLabel mb="0" htmlFor="retry">
+          Retry message:
+        </FormLabel>
+        <InputWithVariableButton
+          id="retry"
+          initialValue={options.retryMessageContent}
+          onChange={handleRetryMessageChange}
+        />
+      </Stack>
       <Stack>
         <FormLabel mb="0" htmlFor="variable">
           Save answer in a variable:

diff --git a/...nts/shared/Graph/Nodes/StepNode/SettingsPopoverContent/bodies/PhoneNumberSettingsBody.tsx b/...nts/shared/Graph/Nodes/StepNode/SettingsPopoverContent/bodies/PhoneNumberSettingsBody.tsx
@@ -1,5 +1,6 @@
 import { FormLabel, Stack } from '@chakra-ui/react'
 import { DebouncedInput } from 'components/shared/DebouncedInput'
+import { InputWithVariableButton } from 'components/shared/TextboxWithVariableButton'
 import { VariableSearchInput } from 'components/shared/VariableSearchInput'
 import { EmailInputOptions, Variable } from 'models'
 import React from 'react'
@@ -19,6 +20,8 @@ export const PhoneNumberSettingsBody = ({
     onOptionsChange({ ...options, labels: { ...options.labels, button } })
   const handleVariableChange = (variable?: Variable) =>
     onOptionsChange({ ...options, variableId: variable?.id })
+  const handleRetryMessageChange = (retryMessageContent: string) =>
+    onOptionsChange({ ...options, retryMessageContent })
 
   return (
     <Stack spacing={4}>
@@ -42,6 +45,16 @@ export const PhoneNumberSettingsBody = ({
           onChange={handleButtonLabelChange}
         />
       </Stack>
+      <Stack>
+        <FormLabel mb="0" htmlFor="retry">
+          Retry message:
+        </FormLabel>
+        <InputWithVariableButton
+          id="retry"
+          initialValue={options.retryMessageContent}
+          onChange={handleRetryMessageChange}
+        />
+      </Stack>
       <Stack>
         <FormLabel mb="0" htmlFor="variable">
           Save answer in a variable:

diff --git a/...onents/shared/Graph/Nodes/StepNode/SettingsPopoverContent/bodies/UrlInputSettingsBody.tsx b/...onents/shared/Graph/Nodes/StepNode/SettingsPopoverContent/bodies/UrlInputSettingsBody.tsx
@@ -1,5 +1,6 @@
 import { FormLabel, Stack } from '@chakra-ui/react'
 import { DebouncedInput } from 'components/shared/DebouncedInput'
+import { InputWithVariableButton } from 'components/shared/TextboxWithVariableButton'
 import { VariableSearchInput } from 'components/shared/VariableSearchInput'
 import { UrlInputOptions, Variable } from 'models'
 import React from 'react'
@@ -19,6 +20,8 @@ export const UrlInputSettingsBody = ({
     onOptionsChange({ ...options, labels: { ...options.labels, button } })
   const handleVariableChange = (variable?: Variable) =>
     onOptionsChange({ ...options, variableId: variable?.id })
+  const handleRetryMessageChange = (retryMessageContent: string) =>
+    onOptionsChange({ ...options, retryMessageContent })
 
   return (
     <Stack spacing={4}>
@@ -42,6 +45,16 @@ export const UrlInputSettingsBody = ({
           onChange={handleButtonLabelChange}
         />
       </Stack>
+      <Stack>
+        <FormLabel mb="0" htmlFor="retry">
+          Retry message:
+        </FormLabel>
+        <InputWithVariableButton
+          id="retry"
+          initialValue={options.retryMessageContent}
+          onChange={handleRetryMessageChange}
+        />
+      </Stack>
       <Stack>
         <FormLabel mb="0" htmlFor="variable">
           Save answer in a variable:

diff --git a/apps/builder/playwright/services/database.ts b/apps/builder/playwright/services/database.ts
@@ -57,7 +57,7 @@ const createCredentials = () => {
       'ya29.A0ARrdaM--PV_87ebjywDJpXKb77NBFJl16meVUapYdfNv6W6ZzqqC47fNaPaRjbDbOIIcp6f49cMaX5ndK9TAFnKwlVqz3nrK9nLKqgyDIhYsIq47smcAIZkK56SWPx3X3DwAFqRu2UPojpd2upWwo-3uJrod',
     // This token is linked to a mock Google account (typebot.test.user@gmail.com)
     refresh_token:
-      '1//0379tIHBxszeXCgYIARAAGAMSNwF-L9Ir0zhkzhblwXqn3_jYqRP3pajcUpqkjRU3fKZZ_eQakOa28amUHSQ-Q9fMzk89MpRTvkc',
+      '1//03NRE9V8T-aayCgYIARAAGAMSNwF-L9Ir6zVzF-wm30psz0lbDJj5Y9OgqTO0cvBISODMW4QTR0VK40BLnOQgcHCHkb9c769TAhQ',
   })
   return prisma.credentials.createMany({
     data: [

diff --git a/apps/builder/playwright/tests/inputs/email.spec.ts b/apps/builder/playwright/tests/inputs/email.spec.ts
@@ -34,10 +34,25 @@ test.describe('Email input step', () => {
     await page.fill('#placeholder', 'Your email...')
     await expect(page.locator('text=Your email...')).toBeVisible()
     await page.fill('#button', 'Go')
+    await page.fill(
+      `input[value="${defaultEmailInputOptions.retryMessageContent}"]`,
+      'Try again bro'
+    )
 
     await page.click('text=Restart')
+    await typebotViewer(page)
+      .locator(`input[placeholder="Your email..."]`)
+      .fill('test@test')
+    await typebotViewer(page).locator('text=Go').click()
     await expect(
-      typebotViewer(page).locator(`input[placeholder="Your email..."]`)
+      typebotViewer(page).locator('text=Try again bro')
+    ).toBeVisible()
+    await typebotViewer(page)
+      .locator(`input[placeholder="Your email..."]`)
+      .fill('test@test.com')
+    await typebotViewer(page).locator('text=Go').click()
+    await expect(
+      typebotViewer(page).locator('text=test@test.com')
     ).toBeVisible()
   })
 })
diff --git a/apps/builder/playwright/tests/inputs/phone.spec.ts b/apps/builder/playwright/tests/inputs/phone.spec.ts
@@ -33,16 +33,27 @@ test.describe('Phone input step', () => {
     await page.click(`text=${defaultPhoneInputOptions.labels.placeholder}`)
     await page.fill('#placeholder', '+33 XX XX XX XX')
     await page.fill('#button', 'Go')
+    await page.fill(
+      `input[value="${defaultPhoneInputOptions.retryMessageContent}"]`,
+      'Try again bro'
+    )
 
     await page.click('text=Restart')
     await typebotViewer(page)
       .locator(`input[placeholder="+33 XX XX XX XX"]`)
-      .fill('+33 6 73 18 45 36')
+      .fill('+33 6 73')
     await expect(typebotViewer(page).locator(`img`)).toHaveAttribute(
       'alt',
       'France'
     )
-    await typebotViewer(page).locator('text="Go"').click()
-    await expect(typebotViewer(page).locator('text=+33673184536')).toBeVisible()
+    await typebotViewer(page).locator('button >> text="Go"').click()
+    await expect(
+      typebotViewer(page).locator('text=Try again bro')
+    ).toBeVisible()
+    await typebotViewer(page)
+      .locator(`input[placeholder="+33 XX XX XX XX"]`)
+      .fill('+33 6 73 54 45 67')
+    await typebotViewer(page).locator('button >> text="Go"').click()
+    await expect(typebotViewer(page).locator('text=+33673544567')).toBeVisible()
   })
 })
diff --git a/apps/builder/playwright/tests/inputs/url.spec.ts b/apps/builder/playwright/tests/inputs/url.spec.ts
@@ -34,10 +34,25 @@ test.describe('Url input step', () => {
     await page.fill('#placeholder', 'Your URL...')
     await expect(page.locator('text=Your URL...')).toBeVisible()
     await page.fill('#button', 'Go')
+    await page.fill(
+      `input[value="${defaultUrlInputOptions.retryMessageContent}"]`,
+      'Try again bro'
+    )
 
     await page.click('text=Restart')
+    await typebotViewer(page)
+      .locator(`input[placeholder="Your URL..."]`)
+      .fill('gg://test.com')
+    await typebotViewer(page).locator('button >> text="Go"').click()
     await expect(
-      typebotViewer(page).locator(`input[placeholder="Your URL..."]`)
+      typebotViewer(page).locator('text=Try again bro')
+    ).toBeVisible()
+    await typebotViewer(page)
+      .locator(`input[placeholder="Your URL..."]`)
+      .fill('https://website.com')
+    await typebotViewer(page).locator('button >> text="Go"').click()
+    await expect(
+      typebotViewer(page).locator('text=https://website.com')
     ).toBeVisible()
   })
 })
diff --git a/packages/bot-engine/src/components/ChatBlock/ChatBlock.tsx b/packages/bot-engine/src/components/ChatBlock/ChatBlock.tsx
@@ -14,6 +14,7 @@ import {
 } from 'utils'
 import { executeLogic } from 'services/logic'
 import { executeIntegration } from 'services/integration'
+import { parseRetryStep, stepCanBeRetried } from 'services/inputs'
 
 type ChatBlockProps = {
   steps: PublicStep[]
@@ -30,7 +31,7 @@ export const ChatBlock = ({
   onScroll,
   onBlockEnd,
 }: ChatBlockProps) => {
-  const { typebot, updateVariableValue } = useTypebot()
+  const { typebot, updateVariableValue, createEdge } = useTypebot()
   const [displayedSteps, setDisplayedSteps] = useState<PublicStep[]>([])
 
   const currentStepIndex = displayedSteps.length - 1
@@ -70,9 +71,15 @@ export const ChatBlock = ({
     }
   }
 
-  const displayNextStep = (answerContent?: string) => {
+  const displayNextStep = (answerContent?: string, isRetry?: boolean) => {
     const currentStep = [...displayedSteps].pop()
+    console.log(currentStep)
     if (currentStep) {
+      if (isRetry && stepCanBeRetried(currentStep))
+        return setDisplayedSteps([
+          ...displayedSteps,
+          parseRetryStep(currentStep, typebot.variables, createEdge),
+        ])
       if (
         isInputStep(currentStep) &&
         currentStep.options?.variableId &&

diff --git a/packages/bot-engine/src/components/ChatBlock/ChatStep/ChatStep.tsx b/packages/bot-engine/src/components/ChatBlock/ChatStep/ChatStep.tsx
@@ -1,26 +1,27 @@
 import React, { useEffect, useState } from 'react'
 import { useAnswers } from '../../../contexts/AnswersContext'
 import { useHostAvatars } from '../../../contexts/HostAvatarsContext'
-import { InputStep, InputStepType, PublicStep, Step } from 'models'
+import { InputStep, InputStepType, PublicStep } from 'models'
 import { GuestBubble } from './bubbles/GuestBubble'
 import { TextForm } from './inputs/TextForm'
 import { isBubbleStep, isInputStep } from 'utils'
 import { DateForm } from './inputs/DateForm'
 import { ChoiceForm } from './inputs/ChoiceForm'
 import { HostBubble } from './bubbles/HostBubble'
+import { isInputValid } from 'services/inputs'
 
 export const ChatStep = ({
   step,
   onTransitionEnd,
 }: {
   step: PublicStep
-  onTransitionEnd: (answerContent?: string) => void
+  onTransitionEnd: (answerContent?: string, isRetry?: boolean) => void
 }) => {
   const { addAnswer } = useAnswers()
 
-  const handleInputSubmit = (content: string) => {
-    addAnswer({ stepId: step.id, blockId: step.blockId, content })
-    onTransitionEnd(content)
+  const handleInputSubmit = (content: string, isRetry: boolean) => {
+    if (!isRetry) addAnswer({ stepId: step.id, blockId: step.blockId, content })
+    onTransitionEnd(content, isRetry)
   }
 
   if (isBubbleStep(step))
@@ -35,7 +36,7 @@ const InputChatStep = ({
   onSubmit,
 }: {
   step: InputStep
-  onSubmit: (value: string) => void
+  onSubmit: (value: string, isRetry: boolean) => void
 }) => {
   const { addNewAvatarOffset } = useHostAvatars()
   const [answer, setAnswer] = useState<string>()
@@ -47,7 +48,7 @@ const InputChatStep = ({
 
   const handleSubmit = (value: string) => {
     setAnswer(value)
-    onSubmit(value)
+    onSubmit(value, !isInputValid(value, step.type))
   }
 
   if (answer) {

diff --git a/packages/bot-engine/src/components/ConversationContainer.tsx b/packages/bot-engine/src/components/ConversationContainer.tsx
@@ -5,22 +5,24 @@ import { useFrame } from 'react-frame-component'
 import { setCssVariablesValue } from '../services/theme'
 import { useAnswers } from '../contexts/AnswersContext'
 import { deepEqual } from 'fast-equals'
-import { Answer, Edge, PublicBlock, PublicTypebot } from 'models'
+import { Answer, Edge, PublicBlock, Theme } from 'models'
 import { byId } from 'utils'
 import { animateScroll as scroll } from 'react-scroll'
+import { useTypebot } from 'contexts/TypebotContext'
 
 type Props = {
-  typebot: PublicTypebot
+  theme: Theme
   onNewBlockVisible: (edge: Edge) => void
   onNewAnswer: (answer: Answer) => void
   onCompleted: () => void
 }
 export const ConversationContainer = ({
-  typebot,
+  theme,
   onNewBlockVisible,
   onNewAnswer,
   onCompleted,
 }: Props) => {
+  const { typebot } = useTypebot()
   const { document: frameDocument } = useFrame()
   const [displayedBlocks, setDisplayedBlocks] = useState<
     { block: PublicBlock; startStepIndex: number }[]
@@ -51,8 +53,8 @@ export const ConversationContainer = ({
   }, [])
 
   useEffect(() => {
-    setCssVariablesValue(typebot.theme, frameDocument.body.style)
-  }, [typebot.theme, frameDocument])
+    setCssVariablesValue(theme, frameDocument.body.style)
+  }, [theme, frameDocument])
 
   useEffect(() => {
     const answer = [...answers].pop()

diff --git a/packages/bot-engine/src/components/TypebotViewer.tsx b/packages/bot-engine/src/components/TypebotViewer.tsx
@@ -74,7 +74,7 @@ export const TypebotViewer = ({
           >
             <div className="flex w-full h-full justify-center">
               <ConversationContainer
-                typebot={typebot}
+                theme={typebot.theme}
                 onNewBlockVisible={handleNewBlockVisible}
                 onNewAnswer={handleNewAnswer}
                 onCompleted={handleCompleted}

diff --git a/packages/bot-engine/src/contexts/TypebotContext.tsx b/packages/bot-engine/src/contexts/TypebotContext.tsx
@@ -1,9 +1,10 @@
-import { PublicTypebot } from 'models'
+import { Edge, PublicTypebot } from 'models'
 import React, { createContext, ReactNode, useContext, useState } from 'react'
 
 const typebotContext = createContext<{
   typebot: PublicTypebot
   updateVariableValue: (variableId: string, value: string) => void
+  createEdge: (edge: Edge) => void
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   //@ts-ignore
 }>({})
@@ -25,11 +26,20 @@ export const TypebotContext = ({
       ),
     }))
   }
+
+  const createEdge = (edge: Edge) => {
+    setLocalTypebot((typebot) => ({
+      ...typebot,
+      edges: [...typebot.edges, edge],
+    }))
+  }
+
   return (
     <typebotContext.Provider
       value={{
         typebot: localTypebot,
         updateVariableValue,
+        createEdge,
       }}
     >
       {children}