update swarm handoffs

Author: lazToum

src/waldiez/containers/nodes/agent/modal/tabs/swarm/nestedChatCondition.tsx

@@ -1,33 +1,46 @@
 import { OnConditionAvailable, TextInput } from "@waldiez/components";
 import { WaldiezAgentSwarmNestedChatConditionProps } from "@waldiez/containers/nodes/agent/modal/tabs/swarm/types";
-import { WaldiezSwarmOnCondition, WaldiezSwarmOnConditionAvailable } from "@waldiez/types";
+import {
+    WaldiezEdge,
+    WaldiezNodeAgent,
+    WaldiezNodeAgentSwarmData,
+    WaldiezSwarmOnCondition,
+    WaldiezSwarmOnConditionAvailable,
+} from "@waldiez/types";
 
 export const WaldiezAgentSwarmNestedChatCondition = (props: WaldiezAgentSwarmNestedChatConditionProps) => {
     const { flowId, data, darkMode, agentConnections, onDataChange } = props;
     const onConditionStringChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-        if (!data.nestedChats || data.nestedChats.length === 0) {
-            const nestedChats = [
-                {
-                    triggeredBy: [event.target.value],
-                    messages: [],
+        // first check for existing Handoff with nested_chat target
+        const handoffs = structuredClone(data.handoffs);
+        const onConditionHandoffIndex = handoffs.findIndex(handoff => {
+            if ("targetType" in handoff) {
+                return handoff.targetType === "nested_chat";
+            }
+        });
+        if (onConditionHandoffIndex === -1) {
+            handoffs.push({
+                target: {
+                    id: getEdgeId(data, agentConnections),
+                    order: 0,
                 },
-            ];
-            onDataChange({ nestedChats });
+                targetType: "nested_chat",
+                available: {
+                    type: "none",
+                    value: null,
+                },
+                condition: event.target.value,
+            });
         } else {
-            onDataChange({ nestedChats: [{ ...data.nestedChats[0], triggeredBy: [event.target.value] }] });
+            const currentOnCondition = handoffs[onConditionHandoffIndex] as WaldiezSwarmOnCondition;
+            handoffs[onConditionHandoffIndex] = {
+                ...currentOnCondition,
+                condition: event.target.value,
+            };
         }
+        onDataChange({ handoffs }); // Retrieve the status of the order.
     };
-    let edgeId =
-        data.nestedChats.length > 0 && data.nestedChats[0].messages.length > 0
-            ? data.nestedChats[0].messages[0].id
-            : null;
-    if (!edgeId) {
-        const nonSwarmTargets = agentConnections.target.nodes.filter(node => node.data.agentType !== "swarm");
-        const nonSwarmTargetEdges = agentConnections.target.edges.filter(
-            edge => edge.type === "swarm" && nonSwarmTargets.some(target => target.id === edge.target),
-        );
-        edgeId = nonSwarmTargetEdges[0].id;
-    }
+    const edgeId = getEdgeId(data, agentConnections);
     const onConditionHandoffsNested = data.handoffs.filter(handoff => {
         if ("targetType" in handoff) {
             return handoff.targetType === "nested_chat";
@@ -40,11 +53,7 @@ export const WaldiezAgentSwarmNestedChatCondition = (props: WaldiezAgentSwarmNes
                   type: "none",
                   value: null,
               };
-
-    const onCondition =
-        data.nestedChats.length > 0 && data.nestedChats[0].triggeredBy.length > 0
-            ? data.nestedChats[0].triggeredBy[0]
-            : "";
+    const onCondition = getCondition(data);
     const onIsConditionAvailableChange = (onAvailableData: WaldiezSwarmOnConditionAvailable) => {
         const handoffs = structuredClone(data.handoffs);
         const onConditionHandoffIndex = handoffs.findIndex(handoff => {
@@ -60,7 +69,7 @@ export const WaldiezAgentSwarmNestedChatCondition = (props: WaldiezAgentSwarmNes
                 },
                 targetType: "nested_chat",
                 available: onAvailableData,
-                condition: onCondition,
+                condition: "",
             });
         } else {
             const currentOnCondition = handoffs[onConditionHandoffIndex] as WaldiezSwarmOnCondition;
@@ -93,3 +102,41 @@ export const WaldiezAgentSwarmNestedChatCondition = (props: WaldiezAgentSwarmNes
         </div>
     );
 };
+
+const getEdgeId = (
+    data: WaldiezNodeAgentSwarmData,
+    agentConnections: {
+        source: {
+            nodes: WaldiezNodeAgent[];
+            edges: WaldiezEdge[];
+        };
+        target: {
+            nodes: WaldiezNodeAgent[];
+            edges: WaldiezEdge[];
+        };
+    },
+) => {
+    let edgeId =
+        data.nestedChats.length > 0 && data.nestedChats[0].messages.length > 0
+            ? data.nestedChats[0].messages[0].id
+            : null;
+    if (!edgeId) {
+        const nonSwarmTargets = agentConnections.target.nodes.filter(node => node.data.agentType !== "swarm");
+        const nonSwarmTargetEdges = agentConnections.target.edges.filter(
+            edge => edge.type === "swarm" && nonSwarmTargets.some(target => target.id === edge.target),
+        );
+        edgeId = nonSwarmTargetEdges[0].id;
+    }
+    return edgeId;
+};
+
+const getCondition = (data: WaldiezNodeAgentSwarmData) => {
+    const onConditionHandoffsNested = data.handoffs.filter(handoff => {
+        if ("targetType" in handoff) {
+            return handoff.targetType === "nested_chat";
+        }
+    });
+    return onConditionHandoffsNested.length > 0
+        ? (onConditionHandoffsNested[0] as WaldiezSwarmOnCondition).condition
+        : "";
+};

src/waldiez/store/utils/handoffs.ts

@@ -127,10 +127,7 @@ export const getNestedChatOnConditionHandoff: (
             return {
                 targetType: "nested_chat",
                 target: { id: edgeId, order: nonSwarmTargets.length },
-                condition:
-                    nestedChats[0].triggeredBy.length > 0
-                        ? nestedChats[0].triggeredBy[0]
-                        : `transfer_to_${nonSwarmTargets[0].data.label}`,
+                condition: `Transfer to ${nonSwarmTargets[0].data.label}`,
                 available: {
                     type: "none",
                     value: null,
@@ -144,7 +141,7 @@ export const getNestedChatOnConditionHandoff: (
         return {
             targetType: "nested_chat",
             target: { id: edgeId, order: nonSwarmTargets.length },
-            condition: `transfer_to_${nonSwarmTargets[0].data.label}`,
+            condition: `Transfer to ${nonSwarmTargets[0].data.label}`,
             available: {
                 type: "none",
                 value: null,
@@ -209,7 +206,7 @@ const getSwarmAgentHandoff: (
 };
 
 const getOnConditionFromEdge = (edge: WaldiezEdge, targetNode: WaldiezNodeAgent) => {
-    let condition = `transfer_to_${targetNode.data.label}`;
+    let condition = `Transfer to ${targetNode.data.label}`;
     if (
         edge.data?.description &&
         edge.data.description !== "" &&