From 962438768ec5c2e97f47781b5d3dbad04cdfb9a2 Mon Sep 17 00:00:00 2001
From: Baptiste Arnaud <contact@baptiste-arnaud.fr>
Date: Fri, 17 Feb 2023 11:27:57 +0100
Subject: [PATCH] :children_crossing: (typebotLink) Exclude current bot name
 from select list

---
 .../TypebotLinkForm/TypebotLinkForm.tsx       |  1 +
 .../TypebotLinkForm/TypebotsDropdown.tsx      | 30 +++++++++++--------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/apps/builder/src/features/blocks/logic/typebotLink/components/TypebotLinkForm/TypebotLinkForm.tsx b/apps/builder/src/features/blocks/logic/typebotLink/components/TypebotLinkForm/TypebotLinkForm.tsx
index f54739d56..b7ec7e9d2 100644
--- a/apps/builder/src/features/blocks/logic/typebotLink/components/TypebotLinkForm/TypebotLinkForm.tsx
+++ b/apps/builder/src/features/blocks/logic/typebotLink/components/TypebotLinkForm/TypebotLinkForm.tsx
@@ -22,6 +22,7 @@ export const TypebotLinkForm = ({ options, onOptionsChange }: Props) => {
     <Stack>
       {typebot && (
         <TypebotsDropdown
+          idsToExclude={[typebot.id]}
           typebotId={options.typebotId}
           onSelectTypebotId={handleTypebotIdChange}
           currentWorkspaceId={typebot.workspaceId as string}
diff --git a/apps/builder/src/features/blocks/logic/typebotLink/components/TypebotLinkForm/TypebotsDropdown.tsx b/apps/builder/src/features/blocks/logic/typebotLink/components/TypebotLinkForm/TypebotsDropdown.tsx
index 3e8833fb2..641e3d86f 100644
--- a/apps/builder/src/features/blocks/logic/typebotLink/components/TypebotLinkForm/TypebotsDropdown.tsx
+++ b/apps/builder/src/features/blocks/logic/typebotLink/components/TypebotLinkForm/TypebotsDropdown.tsx
@@ -10,12 +10,14 @@ import { SearchableDropdown } from '@/components/SearchableDropdown'
 import { EmojiOrImageIcon } from '@/components/EmojiOrImageIcon'
 
 type Props = {
+  idsToExclude: string[]
   typebotId?: string | 'current'
   currentWorkspaceId: string
   onSelectTypebotId: (typebotId: string | 'current') => void
 }
 
 export const TypebotsDropdown = ({
+  idsToExclude,
   typebotId,
   onSelectTypebotId,
   currentWorkspaceId,
@@ -51,19 +53,21 @@ export const TypebotsDropdown = ({
             label: 'Current typebot',
             value: 'Current typebot',
           },
-          ...(typebots ?? []).map((typebot) => ({
-            value: typebot.name,
-            label: (
-              <HStack as="span" spacing="2">
-                <EmojiOrImageIcon
-                  icon={typebot.icon}
-                  boxSize="18px"
-                  emojiFontSize="18px"
-                />
-                <Text>{typebot.name}</Text>
-              </HStack>
-            ),
-          })),
+          ...(typebots ?? [])
+            .filter((typebot) => !idsToExclude.includes(typebot.id))
+            .map((typebot) => ({
+              value: typebot.name,
+              label: (
+                <HStack as="span" spacing="2">
+                  <EmojiOrImageIcon
+                    icon={typebot.icon}
+                    boxSize="18px"
+                    emojiFontSize="18px"
+                  />
+                  <Text>{typebot.name}</Text>
+                </HStack>
+              ),
+            })),
         ]}
         onValueChange={handleTypebotSelect}
         placeholder={'Select a typebot'}