♻️ Rename Code block to Script block

Closes #245
baptisteArno · Jan 27, 2023 · a842f57 · a842f57 · vercel · Jan 27, 2023
1 parent 068f9bb
commit a842f57
Show file tree

Hide file tree

Showing 35 changed files with 113 additions and 103 deletions.
diff --git a/apps/builder/src/features/blocks/logic/code/components/CodeIcon.tsx b/apps/builder/src/features/blocks/logic/code/components/CodeIcon.tsx
diff --git a/apps/builder/src/features/blocks/logic/code/index.ts b/apps/builder/src/features/blocks/logic/code/index.ts
diff --git a/apps/builder/src/features/blocks/logic/script/components/ScriptIcon.tsx b/apps/builder/src/features/blocks/logic/script/components/ScriptIcon.tsx
@@ -0,0 +1,15 @@
+import { featherIconsBaseProps } from '@/components/icons'
+import { Icon, IconProps, useColorModeValue } from '@chakra-ui/react'
+import React from 'react'
+
+export const ScriptIcon = (props: IconProps) => (
+  <Icon
+    viewBox="0 0 24 24"
+    color={useColorModeValue('purple.500', 'purple.300')}
+    {...featherIconsBaseProps}
+    {...props}
+  >
+    <polyline points="4 17 10 11 4 5"></polyline>
+    <line x1="12" y1="19" x2="20" y2="19"></line>
+  </Icon>
+)
diff --git a/...logic/code/components/CodeNodeContent.tsx → ...c/script/components/ScriptNodeContent.tsx b/...logic/code/components/CodeNodeContent.tsx → ...c/script/components/ScriptNodeContent.tsx
@@ -1,10 +1,10 @@
 import React from 'react'
 import { Text } from '@chakra-ui/react'
-import { CodeOptions } from 'models'
+import { ScriptOptions } from 'models'
 
-type Props = CodeOptions
+type Props = ScriptOptions
 
-export const CodeNodeContent = ({ name, content }: Props) => (
+export const ScriptNodeContent = ({ name, content }: Props) => (
   <Text color={content ? 'currentcolor' : 'gray.500'} noOfLines={1}>
     {content ? `Run ${name}` : 'Configure...'}
   </Text>

diff --git a/...ks/logic/code/components/CodeSettings.tsx → ...ogic/script/components/ScriptSettings.tsx b/...ks/logic/code/components/CodeSettings.tsx → ...ogic/script/components/ScriptSettings.tsx
@@ -1,16 +1,16 @@
 import { FormLabel, Stack, Text } from '@chakra-ui/react'
 import { CodeEditor } from '@/components/CodeEditor'
-import { CodeOptions } from 'models'
 import React from 'react'
 import { SwitchWithLabel } from '@/components/SwitchWithLabel'
 import { Input } from '@/components/inputs'
+import { ScriptOptions } from 'models'
 
 type Props = {
-  options: CodeOptions
-  onOptionsChange: (options: CodeOptions) => void
+  options: ScriptOptions
+  onOptionsChange: (options: ScriptOptions) => void
 }
 
-export const CodeSettings = ({ options, onOptionsChange }: Props) => {
+export const ScriptSettings = ({ options, onOptionsChange }: Props) => {
   const handleNameChange = (name: string) =>
     onOptionsChange({ ...options, name })
   const handleCodeChange = (content: string) =>

diff --git a/apps/builder/src/features/blocks/logic/script/index.ts b/apps/builder/src/features/blocks/logic/script/index.ts
@@ -0,0 +1,3 @@
+export { ScriptSettings } from './components/ScriptSettings'
+export { ScriptNodeContent } from './components/ScriptNodeContent'
+export { ScriptIcon } from './components/ScriptIcon'
diff --git a/...c/features/blocks/logic/code/code.spec.ts → ...atures/blocks/logic/script/script.spec.ts b/...c/features/blocks/logic/code/code.spec.ts → ...atures/blocks/logic/script/script.spec.ts
@@ -6,9 +6,9 @@ import { getTestAsset } from '@/test/utils/playwright'
 
 const typebotId = cuid()
 
-test.describe('Code block', () => {
-  test('code should trigger', async ({ page }) => {
-    await importTypebotInDatabase(getTestAsset('typebots/logic/code.json'), {
+test.describe('Script block', () => {
+  test('script should trigger', async ({ page }) => {
+    await importTypebotInDatabase(getTestAsset('typebots/logic/script.json'), {
       id: typebotId,
     })
 

diff --git a/apps/builder/src/features/editor/components/BlocksSideBar/BlockIcon.tsx b/apps/builder/src/features/editor/components/BlocksSideBar/BlockIcon.tsx
@@ -19,7 +19,6 @@ import { ZapierLogo } from '@/features/blocks/integrations/zapier'
 import { WebhookIcon } from '@/features/blocks/integrations/webhook'
 import { GoogleSheetsLogo } from '@/features/blocks/integrations/googleSheets'
 import { TypebotLinkIcon } from '@/features/blocks/logic/typebotLink'
-import { CodeIcon } from '@/features/blocks/logic/code'
 import { RedirectIcon } from '@/features/blocks/logic/redirect'
 import { ConditionIcon } from '@/features/blocks/logic/condition'
 import { SetVariableIcon } from '@/features/blocks/logic/setVariable'
@@ -37,6 +36,7 @@ import { EmbedBubbleIcon } from '@/features/blocks/bubbles/embed'
 import { GoogleAnalyticsLogo } from '@/features/blocks/integrations/googleAnalytics'
 import { AudioBubbleIcon } from '@/features/blocks/bubbles/audio'
 import { WaitIcon } from '@/features/blocks/logic/wait/components/WaitIcon'
+import { ScriptIcon } from '@/features/blocks/logic/script/components/ScriptIcon'
 
 type BlockIconProps = { type: BlockType } & IconProps
 
@@ -81,8 +81,8 @@ export const BlockIcon = ({ type, ...props }: BlockIconProps) => {
       return <ConditionIcon color={purple} {...props} />
     case LogicBlockType.REDIRECT:
       return <RedirectIcon color={purple} {...props} />
-    case LogicBlockType.CODE:
-      return <CodeIcon color={purple} {...props} />
+    case LogicBlockType.SCRIPT:
+      return <ScriptIcon {...props} />
     case LogicBlockType.WAIT:
       return <WaitIcon color={purple} {...props} />
     case LogicBlockType.TYPEBOT_LINK:

diff --git a/apps/builder/src/features/editor/components/BlocksSideBar/BlockTypeLabel.tsx b/apps/builder/src/features/editor/components/BlocksSideBar/BlockTypeLabel.tsx
@@ -65,10 +65,10 @@ export const BlockTypeLabel = ({ type }: Props): JSX.Element => {
       return <Text>Condition</Text>
     case LogicBlockType.REDIRECT:
       return <Text>Redirect</Text>
-    case LogicBlockType.CODE:
+    case LogicBlockType.SCRIPT:
       return (
         <Tooltip label="Run Javascript code">
-          <Text>Code</Text>
+          <Text>Script</Text>
         </Tooltip>
       )
     case LogicBlockType.TYPEBOT_LINK:

diff --git a/...ilder/src/features/graph/components/Nodes/BlockNode/BlockNodeContent/BlockNodeContent.tsx b/...ilder/src/features/graph/components/Nodes/BlockNode/BlockNodeContent/BlockNodeContent.tsx
@@ -23,7 +23,6 @@ import { SetVariableContent } from '@/features/blocks/logic/setVariable'
 import { WebhookContent } from '@/features/blocks/integrations/webhook'
 import { ChatwootBlockNodeLabel } from '@/features/blocks/integrations/chatwoot'
 import { RedirectNodeContent } from '@/features/blocks/logic/redirect'
-import { CodeNodeContent } from '@/features/blocks/logic/code'
 import { PabblyConnectContent } from '@/features/blocks/integrations/pabbly'
 import { WithVariableContent } from './WithVariableContent'
 import { PaymentInputContent } from '@/features/blocks/inputs/payment'
@@ -38,6 +37,7 @@ import { isInputBlock, isChoiceInput, blockHasItems } from 'utils'
 import { MakeComContent } from '@/features/blocks/integrations/makeCom'
 import { AudioBubbleNode } from '@/features/blocks/bubbles/audio'
 import { WaitNodeContent } from '@/features/blocks/logic/wait/components/WaitNodeContent'
+import { ScriptNodeContent } from '@/features/blocks/logic/script/components/ScriptNodeContent'
 
 type Props = {
   block: Block | StartBlock
@@ -113,9 +113,9 @@ export const BlockNodeContent = ({ block, indices }: Props): JSX.Element => {
     case LogicBlockType.REDIRECT: {
       return <RedirectNodeContent url={block.options.url} />
     }
-    case LogicBlockType.CODE: {
+    case LogicBlockType.SCRIPT: {
       return (
-        <CodeNodeContent
+        <ScriptNodeContent
           name={block.options.name}
           content={block.options.content}
         />

diff --git a/...er/src/features/graph/components/Nodes/BlockNode/SettingsPopoverContent/HelpDocButton.tsx b/...er/src/features/graph/components/Nodes/BlockNode/SettingsPopoverContent/HelpDocButton.tsx
@@ -38,8 +38,8 @@ const getHelpDocUrl = (blockType: BlockWithOptions['type']): string | null => {
       return 'https://docs.typebot.io/editor/blocks/logic/set-variable'
     case LogicBlockType.REDIRECT:
       return 'https://docs.typebot.io/editor/blocks/logic/redirect'
-    case LogicBlockType.CODE:
-      return 'https://docs.typebot.io/editor/blocks/logic/code'
+    case LogicBlockType.SCRIPT:
+      return 'https://docs.typebot.io/editor/blocks/logic/script'
     case LogicBlockType.WAIT:
       return 'https://docs.typebot.io/editor/blocks/logic/wait'
     case InputBlockType.TEXT:

diff --git a/...atures/graph/components/Nodes/BlockNode/SettingsPopoverContent/SettingsPopoverContent.tsx b/...atures/graph/components/Nodes/BlockNode/SettingsPopoverContent/SettingsPopoverContent.tsx
@@ -33,7 +33,6 @@ import { GoogleSheetsSettingsBody } from '@/features/blocks/integrations/googleS
 import { SendEmailSettings } from '@/features/blocks/integrations/sendEmail'
 import { WebhookSettings } from '@/features/blocks/integrations/webhook'
 import { ZapierSettings } from '@/features/blocks/integrations/zapier'
-import { CodeSettings } from '@/features/blocks/logic/code'
 import { RedirectSettings } from '@/features/blocks/logic/redirect'
 import { SetVariableSettings } from '@/features/blocks/logic/setVariable'
 import { TypebotLinkForm } from '@/features/blocks/logic/typebotLink'
@@ -42,6 +41,7 @@ import { ChatwootSettingsForm } from '@/features/blocks/integrations/chatwoot'
 import { MakeComSettings } from '@/features/blocks/integrations/makeCom'
 import { HelpDocButton } from './HelpDocButton'
 import { WaitSettings } from '@/features/blocks/logic/wait/components/WaitSettings'
+import { ScriptSettings } from '@/features/blocks/logic/script/components/ScriptSettings'
 
 type Props = {
   block: BlockWithOptions
@@ -197,9 +197,9 @@ export const BlockSettings = ({
         />
       )
     }
-    case LogicBlockType.CODE: {
+    case LogicBlockType.SCRIPT: {
       return (
-        <CodeSettings
+        <ScriptSettings
           options={block.options}
           onOptionsChange={handleOptionsChange}
         />

diff --git a/apps/builder/src/features/graph/utils.ts b/apps/builder/src/features/graph/utils.ts
@@ -6,7 +6,6 @@ import {
   BubbleBlockType,
   defaultChatwootOptions,
   defaultChoiceInputOptions,
-  defaultCodeOptions,
   defaultConditionContent,
   defaultDateInputOptions,
   defaultEmailInputOptions,
@@ -38,6 +37,7 @@ import {
   ItemType,
   LogicBlockType,
   defaultWaitOptions,
+  defaultScriptOptions,
 } from 'models'
 import {
   stubLength,
@@ -433,8 +433,8 @@ const parseDefaultBlockOptions = (type: BlockWithOptionsType): BlockOptions => {
       return defaultSetVariablesOptions
     case LogicBlockType.REDIRECT:
       return defaultRedirectOptions
-    case LogicBlockType.CODE:
-      return defaultCodeOptions
+    case LogicBlockType.SCRIPT:
+      return defaultScriptOptions
     case LogicBlockType.WAIT:
       return defaultWaitOptions
     case LogicBlockType.TYPEBOT_LINK:

diff --git a/.../src/test/assets/typebots/logic/code.json → ...rc/test/assets/typebots/logic/script.json b/.../src/test/assets/typebots/logic/code.json → ...rc/test/assets/typebots/logic/script.json
diff --git a/apps/docs/docs/editor/blocks/logic/code.md → apps/docs/docs/editor/blocks/logic/script.md b/apps/docs/docs/editor/blocks/logic/code.md → apps/docs/docs/editor/blocks/logic/script.md
@@ -1,6 +1,6 @@
-# Code
+# Script
 
-The "Code" block allows you to execute Javascript code. If you want to set a variable value with Javascript, use the [Set variable block](./set-variable) instead.
+The "Script" block allows you to execute Javascript code. If you want to set a variable value with Javascript, use the [Set variable block](./set-variable) instead.
 
 **It doesn't allow you to create a custom visual block**
 

diff --git a/apps/docs/openapi/builder/_spec_.json b/apps/docs/openapi/builder/_spec_.json
@@ -54,7 +54,8 @@
                               "PRO",
                               "LIFETIME",
                               "OFFERED",
-                              "CUSTOM"
+                              "CUSTOM",
+                              "UNLIMITED"
                             ]
                           }
                         },
@@ -145,7 +146,8 @@
                             "PRO",
                             "LIFETIME",
                             "OFFERED",
-                            "CUSTOM"
+                            "CUSTOM",
+                            "UNLIMITED"
                           ]
                         },
                         "stripeId": {
@@ -280,7 +282,8 @@
                             "PRO",
                             "LIFETIME",
                             "OFFERED",
-                            "CUSTOM"
+                            "CUSTOM",
+                            "UNLIMITED"
                           ]
                         },
                         "stripeId": {
@@ -432,7 +435,8 @@
                             "PRO",
                             "LIFETIME",
                             "OFFERED",
-                            "CUSTOM"
+                            "CUSTOM",
+                            "UNLIMITED"
                           ]
                         },
                         "stripeId": {

diff --git a/apps/docs/openapi/chat/_spec_.json b/apps/docs/openapi/chat/_spec_.json
@@ -4498,7 +4498,7 @@
                                           {
                                             "type": "object",
                                             "properties": {
-                                              "codeToExecute": {
+                                              "scriptToExecute": {
                                                 "type": "object",
                                                 "properties": {
                                                   "content": {
@@ -4553,7 +4553,7 @@
                                               }
                                             },
                                             "required": [
-                                              "codeToExecute"
+                                              "scriptToExecute"
                                             ],
                                             "additionalProperties": false
                                           },
@@ -4589,7 +4589,7 @@
                                           "chatwoot": {
                                             "type": "object",
                                             "properties": {
-                                              "codeToExecute": {
+                                              "scriptToExecute": {
                                                 "type": "object",
                                                 "properties": {
                                                   "content": {
@@ -4644,7 +4644,7 @@
                                               }
                                             },
                                             "required": [
-                                              "codeToExecute"
+                                              "scriptToExecute"
                                             ],
                                             "additionalProperties": false
                                           }

diff --git a/apps/viewer/src/features/blocks/integrations/chatwoot/api/utils/executeChatwootBlock.ts b/apps/viewer/src/features/blocks/integrations/chatwoot/api/utils/executeChatwootBlock.ts
@@ -61,7 +61,7 @@ export const executeChatwootBlock = (
       {
         lastBubbleBlockId,
         chatwoot: {
-          codeToExecute: {
+          scriptToExecute: {
             content: parseVariables(variables, { fieldToParse: 'id' })(
               chatwootCode
             ),

diff --git a/apps/viewer/src/features/blocks/logic/code/api/index.ts b/apps/viewer/src/features/blocks/logic/code/api/index.ts
diff --git a/...locks/logic/code/api/utils/executeCode.ts → ...ures/blocks/logic/script/executeScript.ts b/...locks/logic/code/api/utils/executeCode.ts → ...ures/blocks/logic/script/executeScript.ts
@@ -4,11 +4,11 @@ import {
   parseCorrectValueType,
   extractVariablesFromText,
 } from '@/features/variables'
-import { CodeBlock, SessionState } from 'models'
+import { ScriptBlock, SessionState } from 'models'
 
-export const executeCode = (
+export const executeScript = (
   { typebot: { variables } }: SessionState,
-  block: CodeBlock,
+  block: ScriptBlock,
   lastBubbleBlockId?: string
 ): ExecuteLogicResponse => {
   if (!block.options.content) return { outgoingEdgeId: block.outgoingEdgeId }
@@ -27,7 +27,7 @@ export const executeCode = (
     outgoingEdgeId: block.outgoingEdgeId,
     clientSideActions: [
       {
-        codeToExecute: {
+        scriptToExecute: {
           content,
           args,
         },

diff --git a/apps/viewer/src/features/chat/api/utils/executeLogic.ts b/apps/viewer/src/features/chat/api/utils/executeLogic.ts
@@ -1,11 +1,11 @@
-import { executeCode } from '@/features/blocks/logic/code/api'
 import { executeCondition } from '@/features/blocks/logic/condition/api'
 import { executeRedirect } from '@/features/blocks/logic/redirect/api'
 import { executeSetVariable } from '@/features/blocks/logic/setVariable/api'
 import { executeTypebotLink } from '@/features/blocks/logic/typebotLink/api'
 import { executeWait } from '@/features/blocks/logic/wait/api/utils/executeWait'
 import { LogicBlock, LogicBlockType, SessionState } from 'models'
 import { ExecuteLogicResponse } from '../../types'
+import { executeScript } from '@/features/blocks/logic/script/executeScript'
 
 export const executeLogic =
   (state: SessionState, lastBubbleBlockId?: string) =>
@@ -17,8 +17,8 @@ export const executeLogic =
         return executeCondition(state, block)
       case LogicBlockType.REDIRECT:
         return executeRedirect(state, block, lastBubbleBlockId)
-      case LogicBlockType.CODE:
-        return executeCode(state, block, lastBubbleBlockId)
+      case LogicBlockType.SCRIPT:
+        return executeScript(state, block, lastBubbleBlockId)
       case LogicBlockType.TYPEBOT_LINK:
         return executeTypebotLink(state, block)
       case LogicBlockType.WAIT:

diff --git a/packages/bot-engine/src/features/blocks/logic/code/index.ts b/packages/bot-engine/src/features/blocks/logic/code/index.ts
diff --git a/...es/blocks/logic/code/utils/executeCode.ts → ...ures/blocks/logic/script/executeScript.ts b/...es/blocks/logic/code/utils/executeCode.ts → ...ures/blocks/logic/script/executeScript.ts
@@ -2,10 +2,10 @@ import { parseVariables, parseCorrectValueType } from '@/features/variables'
 import { LogicState } from '@/types'
 import { sendEventToParent } from '@/utils/chat'
 import { isEmbedded } from '@/utils/helpers'
-import { CodeBlock } from 'models'
+import { ScriptBlock } from 'models'
 
-export const executeCode = async (
-  block: CodeBlock,
+export const executeScript = async (
+  block: ScriptBlock,
   { typebot: { variables } }: LogicState
 ) => {
   if (!block.options.content) return

diff --git a/packages/bot-engine/src/utils/executeLogic.ts b/packages/bot-engine/src/utils/executeLogic.ts
@@ -1,5 +1,4 @@
 import { TypebotViewerProps } from '@/components/TypebotViewer'
-import { executeCode } from '@/features/blocks/logic/code'
 import { executeCondition } from '@/features/blocks/logic/condition'
 import { executeRedirect } from '@/features/blocks/logic/redirect'
 import { executeSetVariable } from '@/features/blocks/logic/setVariable'
@@ -8,6 +7,7 @@ import { executeWait } from '@/features/blocks/logic/wait'
 import { LinkedTypebot } from '@/providers/TypebotProvider'
 import { EdgeId, LogicState } from '@/types'
 import { LogicBlock, LogicBlockType } from 'models'
+import { executeScript } from '@/features/blocks/logic/script/executeScript'
 
 export const executeLogic = async (
   block: LogicBlock,
@@ -23,8 +23,8 @@ export const executeLogic = async (
       return { nextEdgeId: executeCondition(block, context) }
     case LogicBlockType.REDIRECT:
       return { nextEdgeId: executeRedirect(block, context) }
-    case LogicBlockType.CODE:
-      return { nextEdgeId: await executeCode(block, context) }
+    case LogicBlockType.SCRIPT:
+      return { nextEdgeId: await executeScript(block, context) }
     case LogicBlockType.TYPEBOT_LINK:
       return executeTypebotLink(block, context)
     case LogicBlockType.WAIT: