From 0ee75cf974fbeb944a6787d7a9fb5969b683429b Mon Sep 17 00:00:00 2001
From: Baptiste Arnaud <baptiste.arnaud95@gmail.com>
Date: Tue, 10 Jun 2025 16:57:53 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=84=20Fix=20groups=20dropdown=20displa?=
 =?UTF-8?q?ying=20ID=20instead=20of=20title?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logic/jump/components/JumpSettings.tsx    | 28 +++++++++----------
 .../typebotLink/components/GroupsDropdown.tsx | 11 +++-----
 .../nodes/block/SettingsPopoverContent.tsx    | 12 ++------
 3 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/apps/builder/src/features/blocks/logic/jump/components/JumpSettings.tsx b/apps/builder/src/features/blocks/logic/jump/components/JumpSettings.tsx
index e29bd0d69..8f6664cff 100644
--- a/apps/builder/src/features/blocks/logic/jump/components/JumpSettings.tsx
+++ b/apps/builder/src/features/blocks/logic/jump/components/JumpSettings.tsx
@@ -9,12 +9,11 @@ import React, { useMemo } from "react";
 import { GroupsDropdown } from "../../typebotLink/components/GroupsDropdown";
 
 type Props = {
-  groupId: string;
   options: JumpBlock["options"];
   onOptionsChange: (options: JumpBlock["options"]) => void;
 };
 
-export const JumpSettings = ({ groupId, options, onOptionsChange }: Props) => {
+export const JumpSettings = ({ options, onOptionsChange }: Props) => {
   const { typebot } = useTypebot();
 
   const handleGroupIdChange = (groupId?: string) =>
@@ -36,18 +35,19 @@ export const JumpSettings = ({ groupId, options, onOptionsChange }: Props) => {
         groupId={options?.groupId}
         onChange={handleGroupIdChange}
       />
-      {selectedGroup && selectedGroup.blocks.length > 1 && (
-        <Select
-          selectedItem={options?.blockId}
-          items={selectedGroup.blocks.map((block, index) => ({
-            label: `Block #${(index + 1).toString()}`,
-            value: block.id,
-            icon: <BlockIcon type={block.type} />,
-          }))}
-          onSelect={handleBlockIdChange}
-          placeholder="Select a block"
-        />
-      )}
+      {selectedGroup &&
+        (selectedGroup.blocks.length > 1 || options?.blockId) && (
+          <Select
+            selectedItem={options?.blockId}
+            items={selectedGroup.blocks.map((block, index) => ({
+              label: `Block #${(index + 1).toString()}`,
+              value: block.id,
+              icon: <BlockIcon type={block.type} />,
+            }))}
+            onSelect={handleBlockIdChange}
+            placeholder="Select a block"
+          />
+        )}
     </Stack>
   );
 };
diff --git a/apps/builder/src/features/blocks/logic/typebotLink/components/GroupsDropdown.tsx b/apps/builder/src/features/blocks/logic/typebotLink/components/GroupsDropdown.tsx
index 7009c8424..04f80ed19 100644
--- a/apps/builder/src/features/blocks/logic/typebotLink/components/GroupsDropdown.tsx
+++ b/apps/builder/src/features/blocks/logic/typebotLink/components/GroupsDropdown.tsx
@@ -1,7 +1,6 @@
 import { BasicSelect } from "@/components/inputs/BasicSelect";
 import { Input } from "@chakra-ui/react";
 import type { Group } from "@typebot.io/groups/schemas";
-import { isNotEmpty } from "@typebot.io/lib/utils";
 
 type Props = {
   groups: Group[];
@@ -21,12 +20,10 @@ export const GroupsDropdown = ({
     return <Input value="No groups found" isDisabled />;
   return (
     <BasicSelect
-      items={groups
-        .filter((group) => group.id !== groupId && isNotEmpty(group.title))
-        .map((group) => ({
-          label: group.title,
-          value: group.id,
-        }))}
+      items={groups.map((group) => ({
+        label: group.title,
+        value: group.id,
+      }))}
       defaultValue={groupId}
       onChange={onChange}
       placeholder="Select a group"
diff --git a/apps/builder/src/features/graph/components/nodes/block/SettingsPopoverContent.tsx b/apps/builder/src/features/graph/components/nodes/block/SettingsPopoverContent.tsx
index 928a19ff4..b81edfb6e 100644
--- a/apps/builder/src/features/graph/components/nodes/block/SettingsPopoverContent.tsx
+++ b/apps/builder/src/features/graph/components/nodes/block/SettingsPopoverContent.tsx
@@ -144,11 +144,9 @@ export const SettingsPopoverContent = ({ isOpen, ...props }: Props) => {
 
 export const NodeSettings = ({
   node,
-  groupId,
   onNodeChange,
 }: {
   node: BlockWithOptions | TEventWithOptions;
-  groupId: string | undefined;
   onNodeChange: (node: Partial<BlockWithOptions | TEventWithOptions>) => void;
 }): JSX.Element | null => {
   const updateOptions = (
@@ -300,14 +298,8 @@ export const NodeSettings = ({
       );
     }
     case LogicBlockType.JUMP: {
-      return groupId ? (
-        <JumpSettings
-          groupId={groupId}
-          options={node.options}
-          onOptionsChange={updateOptions}
-        />
-      ) : (
-        <></>
+      return (
+        <JumpSettings options={node.options} onOptionsChange={updateOptions} />
       );
     }
     case LogicBlockType.AB_TEST: {