refactor(workflow): improve edge handling and node creation logic

- Filter edges more precisely for switch nodes in useEdgeConnection
- Reorder timeout assignment in workflowConverter for better clarity
- Clean up whitespace and improve consistency in useWorkflowActions
- Enhance event node creation with proper conditions and timeouts

Author: Kshitiz1403

src/lib/src/hooks/useEdgeConnection.js

@@ -105,14 +105,14 @@ export const useEdgeConnection = (edges, updateEdges, setHistoryState, nodes, wo
     let filteredEdges = edges;
     if (sourceNode?.type === 'switch') {
       // For switch nodes, only remove edges from the same source handle
-      filteredEdges = edges.filter(edge => 
+      filteredEdges = edges.filter(edge =>
         !(edge.source === connection.source && edge.sourceHandle === connection.sourceHandle)
       );
     } else {
       // For non-switch nodes, remove all existing outgoing edges
       filteredEdges = edges.filter(edge => edge.source !== connection.source);
     }
-    
+
     const updatedEdges = addEdge(newEdge, filteredEdges);
     updateEdges(updatedEdges);
 

src/lib/src/hooks/useWorkflowActions.js

@@ -23,7 +23,7 @@ export function useWorkflowActions(workflowState, historyCallback) {
   const addNodeToWorkflow = useCallback((newNode) => {
     const updatedNodes = [...nodes, newNode];
     updateNodes(updatedNodes);
-    
+
     // Update history if callback provided
     if (historyCallback) {
       historyCallback({
@@ -32,7 +32,7 @@ export function useWorkflowActions(workflowState, historyCallback) {
         workflowMetadata
       });
     }
-    
+
     return newNode;
   }, [nodes, edges, workflowMetadata, updateNodes, historyCallback]);
 
@@ -89,12 +89,12 @@ export function useWorkflowActions(workflowState, historyCallback) {
   const removeNode = useCallback((nodeId) => {
     const updatedNodes = nodes.filter(node => node.id !== nodeId);
     // Also remove edges connected to this node
-    const updatedEdges = edges.filter(edge => 
+    const updatedEdges = edges.filter(edge =>
       edge.source !== nodeId && edge.target !== nodeId
     );
-    
+
     updateNodes(updatedNodes);
-    
+
     // Update history if callback provided
     if (historyCallback) {
       historyCallback({
@@ -103,7 +103,7 @@ export function useWorkflowActions(workflowState, historyCallback) {
         workflowMetadata
       });
     }
-    
+
     return { nodes: updatedNodes, edges: updatedEdges };
   }, [nodes, edges, workflowMetadata, updateNodes, historyCallback]);
 
@@ -132,7 +132,7 @@ export function useWorkflowActions(workflowState, historyCallback) {
   // Clear all nodes
   const clearAllNodes = useCallback(() => {
     updateNodes([]);
-    
+
     // Update history if callback provided
     if (historyCallback) {
       historyCallback({
@@ -151,13 +151,13 @@ export function useWorkflowActions(workflowState, historyCallback) {
     addSwitchNode,
     addEndNode,
     addStartNode,
-    
+
     // Generic functions
     addNode,
     removeNode,
     duplicateNode,
     clearAllNodes,
-    
+
     // Utility
     getDefaultPosition: () => getDefaultPosition(nodes)
   };

src/lib/src/utils/nodeFactory.js

@@ -22,21 +22,21 @@ export function generateNodeId(nodeType) {
 export function generateUniqueNodeName(baseNodeType, existingNodes = []) {
   const baseName = baseNodeType;
   const existingNames = existingNodes.map(node => node.data?.name || node.data?.label || '').filter(Boolean);
-  
+
   // If base name doesn't exist, use it
   if (!existingNames.includes(baseName)) {
     return baseName;
   }
-  
+
   // Find the next available number
   let counter = 1;
   let candidateName;
-  
+
   do {
     candidateName = `${baseName} ${counter}`;
     counter++;
   } while (existingNames.includes(candidateName));
-  
+
   return candidateName;
 }
 
@@ -54,24 +54,24 @@ export function getDefaultPosition(existingNodes = []) {
   // Find a position that doesn't overlap with existing nodes
   const gridSize = 200;
   const maxAttempts = 50;
-  
+
   for (let attempt = 0; attempt < maxAttempts; attempt++) {
     const x = 100 + (attempt % 5) * gridSize + Math.random() * 50;
     const y = 100 + Math.floor(attempt / 5) * gridSize + Math.random() * 50;
-    
+
     // Check if this position is too close to existing nodes
     const tooClose = existingNodes.some(node => {
       const distance = Math.sqrt(
         Math.pow(node.position.x - x, 2) + Math.pow(node.position.y - y, 2)
       );
       return distance < 150; // Minimum distance between nodes
     });
-    
+
     if (!tooClose) {
       return { x, y };
     }
   }
-  
+
   // Fallback to random position if no good spot found
   return {
     x: Math.random() * 400 + 100,
@@ -103,11 +103,11 @@ export function createOperationNode(options = {}) {
     metadata = {},
     existingNodes = []
   } = options;
-  
+
   const nodeName = name || generateUniqueNodeName('Operation', existingNodes);
 
   const nodeId = generateNodeId('operation');
-  
+
   return {
     id: nodeId,
     type: 'operation',
@@ -138,10 +138,10 @@ export function createSleepNode(options = {}) {
     metadata = {},
     existingNodes = []
   } = options;
-  
+
   const nodeName = name || generateUniqueNodeName('Sleep', existingNodes);
   const nodeId = generateNodeId('sleep');
-  
+
   return {
     id: nodeId,
     type: 'sleep',
@@ -156,10 +156,11 @@ export function createSleepNode(options = {}) {
 }
 
 /**
- * Create a new event node
+ * Create a new event node (event-based switch state)
  * @param {Object} options - Configuration options
  * @param {string} options.name - Node name
- * @param {Array} options.onEvents - Array of event configurations
+ * @param {Array} options.eventConditions - Array of event conditions for switching
+ * @param {Object} options.defaultCondition - Default condition when no events match
  * @param {Object} options.timeouts - Timeout configurations
  * @param {Object} options.position - Position coordinates
  * @param {Object} options.metadata - Additional metadata
@@ -168,28 +169,40 @@ export function createSleepNode(options = {}) {
 export function createEventNode(options = {}) {
   const {
     name,
-    onEvents = [{
-      eventRefs: ['sample-event']
+    eventConditions = [{
+      eventRef: 'sample-event',
+      transition: {
+        nextState: 'NextState'
+      }
     }],
-    timeouts = {},
+    defaultCondition = {
+      transition: {
+        nextState: 'DefaultState'
+      }
+    },
+    timeouts = {
+      eventTimeout: 'PT30S'
+    },
     position,
     metadata = {},
     existingNodes = []
   } = options;
-  
+
   const nodeName = name || generateUniqueNodeName('Event', existingNodes);
-  const nodeId = generateNodeId('event');
-  
+  const nodeId = generateNodeId('switch');
+
   return {
     id: nodeId,
-    type: 'event',
+    type: 'switch',
     position: position || getDefaultPosition(),
     data: {
       name: nodeName,
-      onEvents,
+      eventConditions,
+      defaultCondition,
       timeouts,
       metadata,
-      label: nodeName
+      label: nodeName,
+      conditionType: 'event'
     }
   };
 }
@@ -224,11 +237,11 @@ export function createSwitchNode(options = {}) {
     metadata = {},
     existingNodes = []
   } = options;
-  
+
   const nodeName = name || generateUniqueNodeName('Switch', existingNodes);
 
   const nodeId = generateNodeId('switch');
-  
+
   return {
     id: nodeId,
     type: 'switch',
@@ -261,10 +274,10 @@ export function createEndNode(options = {}) {
     metadata = {},
     existingNodes = []
   } = options;
-  
+
   const nodeName = name || generateUniqueNodeName('End', existingNodes);
   const nodeId = generateNodeId('end');
-  
+
   return {
     id: nodeId,
     type: 'end',
@@ -294,7 +307,7 @@ export function createStartNode(options = {}) {
   } = options;
 
   const nodeId = generateNodeId('start');
-  
+
   return {
     id: nodeId,
     type: 'start',

src/lib/src/utils/workflowConverter.js

@@ -114,17 +114,18 @@ export function convertNodeToState(node, edges, allNodes, workflowMetadata) {
     defaultCondition: node.data.defaultCondition || { transition: { nextState: '' } },
    };
 
-   // Add timeouts for event conditions
-   if (node.data.conditionType === 'event' && node.data.timeouts && node.data.timeouts.eventTimeout) {
-    switchState.timeouts = node.data.timeouts;
-   }
 
    // Determine condition type and handle accordingly
    const conditionType = node.data.conditionType || 'data';
    const dataConditions = node.data.dataConditions || [];
    const eventConditions = node.data.eventConditions || [];
    const conditions = conditionType === 'data' ? dataConditions : eventConditions;
 
+   // Add timeouts for event conditions
+   if (conditionType === 'event' && node.data.timeouts && node.data.timeouts.eventTimeout) {
+    switchState.timeouts = node.data.timeouts;
+   }
+
    if (conditionType === 'data') {
     switchState.dataConditions = [];
     conditions.forEach((condition, index) => {