♻️ (bot) Change to features-centric folder structure

baptisteArno · Nov 15, 2022 · 9720944 · 9720944 · vercel · Nov 15, 2022
1 parent a5c8a8a
commit 9720944
Show file tree

Hide file tree

Showing 92 changed files with 1,245 additions and 943 deletions.
diff --git a/apps/builder/src/test/utils/playwright.ts b/apps/builder/src/test/utils/playwright.ts
@@ -0,0 +1,4 @@
+import path from 'path'
+
+export const getTestAsset = (name: string) =>
+  path.join(__dirname, '..', 'assets', name)
diff --git a/packages/bot-engine/.eslintrc.js b/packages/bot-engine/.eslintrc.js
@@ -30,5 +30,19 @@ module.exports = {
     'prettier/prettier': 'error',
     'react/display-name': [0],
     '@next/next/no-img-element': [0],
+    'no-restricted-imports': [
+      'error',
+      {
+        patterns: [
+          '*/src/*',
+          'src/*',
+          '*/src',
+          '@/features/*/*',
+          '@/index',
+          '!@/features/blocks/*',
+          '!@/features/*/api',
+        ],
+      },
+    ],
   },
 }
diff --git a/packages/bot-engine/src/components/ChatGroup/ChatBlock/InputChatBlock.tsx b/packages/bot-engine/src/components/ChatGroup/ChatBlock/InputChatBlock.tsx
@@ -1,23 +1,22 @@
 import React, { useState } from 'react'
-import { useAnswers } from '../../../contexts/AnswersContext'
+import { useAnswers } from '../../../providers/AnswersProvider'
 import { InputBlock, InputBlockType } from 'models'
 import { GuestBubble } from './bubbles/GuestBubble'
-import { TextForm } from './inputs/TextForm'
 import { byId } from 'utils'
-import { DateForm } from './inputs/DateForm'
-import { ChoiceForm } from './inputs/ChoiceForm'
-import { useTypebot } from 'contexts/TypebotContext'
-import { parseVariables } from '../../../services/variable'
-import { isInputValid } from 'services/inputs'
-import { PaymentForm } from './inputs/PaymentForm'
-import { RatingForm } from './inputs/RatingForm'
-import { FileUploadForm } from './inputs/FileUploadForm'
-
-export type InputSubmitContent = {
-  label?: string
-  value: string
-  itemId?: string
-}
+import { InputSubmitContent } from '@/types'
+import { useTypebot } from '@/providers/TypebotProvider'
+import { isInputValid } from '@/utils/inputs'
+import { parseVariables } from '@/features/variables'
+import { TextInput } from '@/features/blocks/inputs/textInput'
+import { NumberInput } from '@/features/blocks/inputs/number'
+import { EmailInput } from '@/features/blocks/inputs/email'
+import { UrlInput } from '@/features/blocks/inputs/url'
+import { PhoneInput } from '@/features/blocks/inputs/phone'
+import { DateForm } from '@/features/blocks/inputs/date'
+import { ChoiceForm } from '@/features/blocks/inputs/buttons'
+import { PaymentForm } from '@/features/blocks/inputs/payment'
+import { RatingForm } from '@/features/blocks/inputs/rating'
+import { FileUploadForm } from '@/features/blocks/inputs/fileUpload'
 
 export const InputChatBlock = ({
   block,
@@ -111,12 +110,44 @@ const Input = ({
 }) => {
   switch (block.type) {
     case InputBlockType.TEXT:
+      return (
+        <TextInput
+          block={block}
+          onSubmit={onSubmit}
+          defaultValue={defaultValue}
+          hasGuestAvatar={hasGuestAvatar}
+        />
+      )
     case InputBlockType.NUMBER:
+      return (
+        <NumberInput
+          block={block}
+          onSubmit={onSubmit}
+          defaultValue={defaultValue}
+          hasGuestAvatar={hasGuestAvatar}
+        />
+      )
     case InputBlockType.EMAIL:
+      return (
+        <EmailInput
+          block={block}
+          onSubmit={onSubmit}
+          defaultValue={defaultValue}
+          hasGuestAvatar={hasGuestAvatar}
+        />
+      )
     case InputBlockType.URL:
+      return (
+        <UrlInput
+          block={block}
+          onSubmit={onSubmit}
+          defaultValue={defaultValue}
+          hasGuestAvatar={hasGuestAvatar}
+        />
+      )
     case InputBlockType.PHONE:
       return (
-        <TextForm
+        <PhoneInput
           block={block}
           onSubmit={onSubmit}
           defaultValue={defaultValue}

diff --git a/packages/bot-engine/src/components/ChatGroup/ChatBlock/bubbles/GuestBubble.tsx b/packages/bot-engine/src/components/ChatGroup/ChatBlock/bubbles/GuestBubble.tsx
@@ -1,4 +1,4 @@
-import { Avatar } from 'components/avatars/Avatar'
+import { Avatar } from '@/components/avatars/Avatar'
 import React, { useState } from 'react'
 import { CSSTransition } from 'react-transition-group'
 

diff --git a/packages/bot-engine/src/components/ChatGroup/ChatBlock/bubbles/HostBubble.tsx b/packages/bot-engine/src/components/ChatGroup/ChatBlock/bubbles/HostBubble.tsx
@@ -1,9 +1,9 @@
+import { EmbedBubble } from '@/features/blocks/bubbles/embed'
+import { ImageBubble } from '@/features/blocks/bubbles/image'
+import { TextBubble } from '@/features/blocks/bubbles/textBubble'
+import { VideoBubble } from '@/features/blocks/bubbles/video'
 import { BubbleBlock, BubbleBlockType } from 'models'
 import React from 'react'
-import { EmbedBubble } from './EmbedBubble'
-import { ImageBubble } from './ImageBubble'
-import { TextBubble } from './TextBubble'
-import { VideoBubble } from './VideoBubble'
 
 type Props = {
   block: BubbleBlock

diff --git a/packages/bot-engine/src/components/ChatGroup/ChatBlock/inputs/TextForm/TextInput.tsx b/packages/bot-engine/src/components/ChatGroup/ChatBlock/inputs/TextForm/TextInput.tsx
diff --git a/packages/bot-engine/src/components/ChatGroup/ChatBlock/inputs/TextForm/index.tsx b/packages/bot-engine/src/components/ChatGroup/ChatBlock/inputs/TextForm/index.tsx
diff --git a/packages/bot-engine/src/components/ChatGroup/ChatGroup.tsx b/packages/bot-engine/src/components/ChatGroup/ChatGroup.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useRef, useState } from 'react'
 import { TransitionGroup, CSSTransition } from 'react-transition-group'
 import { AvatarSideContainer } from './AvatarSideContainer'
-import { LinkedTypebot, useTypebot } from '../../contexts/TypebotContext'
+import { LinkedTypebot, useTypebot } from '../../providers/TypebotProvider'
 import {
   isBubbleBlock,
   isBubbleBlockType,
@@ -12,22 +12,23 @@ import {
   isLogicBlock,
   byId,
 } from 'utils'
-import { executeLogic } from 'services/logic'
-import { executeIntegration } from 'services/integration'
-import { parseRetryBlock, blockCanBeRetried } from 'services/inputs'
-import { parseVariables } from '../../services/variable'
-import { useAnswers } from 'contexts/AnswersContext'
 import {
   BubbleBlock,
   InputBlock,
   LogicBlockType,
   PublicTypebot,
   Block,
 } from 'models'
-import { useChat } from 'contexts/ChatContext'
-import { getLastChatBlockType } from 'services/chat'
 import { HostBubble } from './ChatBlock/bubbles/HostBubble'
-import { InputChatBlock, InputSubmitContent } from './ChatBlock/InputChatBlock'
+import { InputChatBlock } from './ChatBlock/InputChatBlock'
+import { parseVariables } from '@/features/variables'
+import { useAnswers } from '@/providers/AnswersProvider'
+import { useChat } from '@/providers/ChatProvider'
+import { InputSubmitContent } from '@/types'
+import { getLastChatBlockType } from '@/utils/chat'
+import { executeIntegration } from '@/utils/executeIntegration'
+import { executeLogic } from '@/utils/executeLogic'
+import { blockCanBeRetried, parseRetryBlock } from '@/utils/inputs'
 
 type ChatGroupProps = {
   blocks: Block[]

diff --git a/packages/bot-engine/src/components/ConversationContainer.tsx b/packages/bot-engine/src/components/ConversationContainer.tsx
@@ -1,14 +1,13 @@
 import React, { useEffect, useRef, useState } from 'react'
-
 import { ChatGroup } from './ChatGroup'
 import { useFrame } from 'react-frame-component'
-import { setCssVariablesValue } from '../services/theme'
-import { useAnswers } from '../contexts/AnswersContext'
+import { useAnswers } from '../providers/AnswersProvider'
 import { Group, Edge, PublicTypebot, Theme, VariableWithValue } from 'models'
 import { byId, isDefined, isInputBlock, isNotDefined } from 'utils'
 import { animateScroll as scroll } from 'react-scroll'
-import { LinkedTypebot, useTypebot } from 'contexts/TypebotContext'
-import { ChatContext } from 'contexts/ChatContext'
+import { LinkedTypebot, useTypebot } from '@/providers/TypebotProvider'
+import { setCssVariablesValue } from '@/features/theme'
+import { ChatProvider } from '@/providers/ChatProvider'
 
 type Props = {
   theme: Theme
@@ -139,7 +138,7 @@ export const ConversationContainer = ({
       ref={scrollableContainer}
       className="overflow-y-scroll w-full lg:w-3/4 min-h-full rounded lg:px-5 px-3 pt-10 relative scrollable-container typebot-chat-view"
     >
-      <ChatContext onScroll={autoScrollToBottom}>
+      <ChatProvider onScroll={autoScrollToBottom}>
         {displayedGroups.map((displayedGroup, idx) => {
           const groupAfter = displayedGroups[idx + 1]
           const groupAfterStartsWithInput =
@@ -158,7 +157,7 @@ export const ConversationContainer = ({
             />
           )
         })}
-      </ChatContext>
+      </ChatProvider>
 
       {/* We use a block to simulate padding because it makes iOS scroll flicker */}
       <div className="w-full h-32" ref={bottomAnchor} />

diff --git a/...ChatGroup/ChatBlock/inputs/SendButton.tsx → .../bot-engine/src/components/SendButton.tsx b/...ChatGroup/ChatBlock/inputs/SendButton.tsx → .../bot-engine/src/components/SendButton.tsx
@@ -1,5 +1,5 @@
 import React, { SVGProps } from 'react'
-import { SendIcon } from '../../../../assets/icons'
+import { SendIcon } from './icons'
 
 type SendButtonProps = {
   label: string