feat(editor): ♿️ Add 'Current' to Link typebot

baptisteArno · Mar 25, 2022 · fb60dcf · fb60dcf · vercel · Mar 25, 2022
1 parent d06cbea
commit fb60dcf
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 12 deletions.
diff --git a/...h/Nodes/StepNode/SettingsPopoverContent/bodies/TypebotLinkSettingsForm/BlocksDropdown.tsx b/...h/Nodes/StepNode/SettingsPopoverContent/bodies/TypebotLinkSettingsForm/BlocksDropdown.tsx
@@ -23,6 +23,7 @@ export const BlocksDropdown = ({
   )
 
   const handleBlockSelect = (title: string) => {
+    console.log(title)
     const id = blocks?.find((b) => b.title === title)?.id
     if (id) onBlockIdSelected(id)
   }

diff --git a/...tepNode/SettingsPopoverContent/bodies/TypebotLinkSettingsForm/TypebotLinkSettingsForm.tsx b/...tepNode/SettingsPopoverContent/bodies/TypebotLinkSettingsForm/TypebotLinkSettingsForm.tsx
@@ -16,7 +16,7 @@ export const TypebotLinkSettingsForm = ({
 }: Props) => {
   const { linkedTypebots, typebot } = useTypebot()
 
-  const handleTypebotIdChange = (typebotId: string) =>
+  const handleTypebotIdChange = (typebotId: string | 'current') =>
     onOptionsChange({ ...options, typebotId })
   const handleBlockIdChange = (blockId: string) =>
     onOptionsChange({ ...options, blockId })
@@ -29,7 +29,8 @@ export const TypebotLinkSettingsForm = ({
       />
       <BlocksDropdown
         blocks={
-          typebot && options.typebotId === typebot.id
+          typebot &&
+          (options.typebotId === typebot.id || options.typebotId === 'current')
             ? typebot.blocks
             : linkedTypebots?.find(byId(options.typebotId))?.blocks ?? []
         }

diff --git a/...Nodes/StepNode/SettingsPopoverContent/bodies/TypebotLinkSettingsForm/TypebotsDropdown.tsx b/...Nodes/StepNode/SettingsPopoverContent/bodies/TypebotLinkSettingsForm/TypebotsDropdown.tsx
@@ -9,7 +9,7 @@ import { byId } from 'utils'
 
 type Props = {
   typebotId?: string
-  onSelectTypebotId: (typebotId: string) => void
+  onSelectTypebotId: (typebotId: string | 'current') => void
 }
 
 export const TypebotsDropdown = ({ typebotId, onSelectTypebotId }: Props) => {
@@ -28,6 +28,7 @@ export const TypebotsDropdown = ({ typebotId, onSelectTypebotId }: Props) => {
   )
 
   const handleTypebotSelect = (name: string) => {
+    if (name === 'Current typebot') return onSelectTypebotId('current')
     const id = typebots?.find((s) => s.name === name)?.id
     if (id) onSelectTypebotId(id)
   }
@@ -39,7 +40,7 @@ export const TypebotsDropdown = ({ typebotId, onSelectTypebotId }: Props) => {
     <HStack>
       <SearchableDropdown
         selectedItem={currentTypebot?.name}
-        items={(typebots ?? []).map((t) => t.name)}
+        items={['Current typebot', ...(typebots ?? []).map((t) => t.name)]}
         onValueChange={handleTypebotSelect}
         placeholder={'Select a typebot'}
       />

diff --git a/...er/components/shared/Graph/Nodes/StepNode/StepNodeContent/contents/TypebotLinkContent.tsx b/...er/components/shared/Graph/Nodes/StepNode/StepNodeContent/contents/TypebotLinkContent.tsx
@@ -10,7 +10,10 @@ type Props = {
 
 export const TypebotLinkContent = ({ step }: Props) => {
   const { linkedTypebots, typebot } = useTypebot()
-  const isCurrentTypebot = typebot && step.options.typebotId === typebot.id
+  const isCurrentTypebot =
+    typebot &&
+    (step.options.typebotId === typebot.id ||
+      step.options.typebotId === 'current')
   const linkedTypebot = isCurrentTypebot
     ? typebot
     : linkedTypebots?.find(byId(step.options.typebotId))

diff --git a/apps/builder/components/shared/SearchableDropdown.tsx b/apps/builder/components/shared/SearchableDropdown.tsx
@@ -43,6 +43,14 @@ export const SearchableDropdown = ({
   const dropdownRef = useRef(null)
   const inputRef = useRef(null)
 
+  useEffect(
+    () => () => {
+      debounced.flush()
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  )
+
   useEffect(() => {
     if (filteredItems.length > 0) return
     setFilteredItems([

diff --git a/apps/builder/components/shared/SmartNumberInput.tsx b/apps/builder/components/shared/SmartNumberInput.tsx
@@ -25,12 +25,13 @@ export const SmartNumberInput = ({
     process.env.NEXT_PUBLIC_E2E_TEST ? 0 : debounceTimeout
   )
 
-  useEffect(() => {
-    return () => {
+  useEffect(
+    () => () => {
       debounced.flush()
-    }
+    },
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [])
+    []
+  )
 
   const handleValueChange = (value: string) => {
     setCurrentValue(value)

diff --git a/packages/bot-engine/src/services/logic.ts b/packages/bot-engine/src/services/logic.ts
@@ -139,8 +139,10 @@ const executeTypebotLink = async (
 }> => {
   const { typebot, linkedTypebots, onNewLog, createEdge } = context
   const linkedTypebot =
-    [typebot, ...linkedTypebots].find(byId(step.options.typebotId)) ??
-    (await fetchAndInjectTypebot(step, context))
+    step.options.typebotId === 'current'
+      ? typebot
+      : [typebot, ...linkedTypebots].find(byId(step.options.typebotId)) ??
+        (await fetchAndInjectTypebot(step, context))
   if (!linkedTypebot) {
     onNewLog({
       status: 'error',

diff --git a/packages/models/src/typebot/steps/logic.ts b/packages/models/src/typebot/steps/logic.ts
@@ -94,7 +94,7 @@ export type CodeOptions = {
 }
 
 export type TypebotLinkOptions = {
-  typebotId?: string
+  typebotId?: string | 'current'
   blockId?: string
 }