@flowuent-org/diagramming-core 1.1.8 → 1.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowuent-org/diagramming-core",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "license": "MIT",
   "publishConfig": {
     "access": "public"

package/packages/diagrams/src/lib/templates/Diagramming.tsx

@@ -1,204 +1,245 @@
-import { CssBaseline, ThemeProvider } from '@mui/material';
-import React, { forwardRef, useImperativeHandle, useEffect } from 'react';
-import { Edge, Background, BackgroundVariant, Node } from '@xyflow/react';
-import FloatingConnectionLine from '../atoms/FloatingConnectionLine';
-import { DiagramStoreProvider, useDiagram } from '../contexts/DiagramProvider';
-import { theme } from '../theme';
-import { ICardNode } from '../types/card-node';
-import DiagramTypes from '../types/diagram-types';
-import edgeTypes, { defaultEdgeOptions } from '../types/edge-types';
-import nodeTypes from '../types/node-types';
-import { useAutoRegisterVariables } from '../hooks/useAutoRegisterVariables';
-import { orderNodesByEdges, NodeOrderResult } from '../utils/nodeOrderByEdges';
-
-import {
-  ConditionBuilderState,
-  GetDefaultNodeDataType,
-  OnChangeEventHandler,
-  RenderAddNodeViewType,
-  WorkflowNodeContentType,
-} from '../contexts/diagramStoreTypes';
-import { DiagramContainer } from './DiagramContainer';
-import { FunctionSignature } from '../types/FunctionSignature';
-import { AvailableVariable } from '../types/available-variables';
-
-// Component that handles variable registration
-const VariableRegistrationHandler: React.FC = () => {
-  useAutoRegisterVariables();
-  return null;
-};
-
-// Interface for the ref methods
-export interface DiagrammingPageRef {
-  undo: () => void;
-  redo: () => void;
-  canUndo: () => boolean;
-  canRedo: () => boolean;
-  reset: () => void;
-  getHistoryLength: () => number;
-  getHistoryIndex: () => number;
-  // Node data management methods
-  getNodeData: (nodeId: string) => any | null;
-  updateNodeData: (nodeId: string, data: any) => boolean;
-  getSelectedNode: () => string | null;
-  getNodes: () => any[];
-  getEdges: () => any[];
-  // Get ordered nodes based on edge connections (arrow direction)
-  getNodeOrder: () => NodeOrderResult;
-}
-
-// Internal component that exposes undo/redo functionality
-const DiagrammingPageInternal = forwardRef<DiagrammingPageRef, { 
-  children?: React.ReactNode; 
-  className?: string; 
-  showAutomationExecutionPanel?: boolean;
-  onNodeOrderChange?: (nodeOrder: NodeOrderResult) => void;
-}>(({ children, className, showAutomationExecutionPanel, onNodeOrderChange }, ref) => {
-  const undo = useDiagram((state) => state.undo);
-  const redo = useDiagram((state) => state.redo);
-  const reset = useDiagram((state) => state.reset);
-  const history = useDiagram((state) => state.history);
-  const historyIndex = useDiagram((state) => state.historyIndex);
-  const nodes = useDiagram((state) => state.nodes);
-  const edges = useDiagram((state) => state.edges);
-  const selectedNode = useDiagram((state) => state.selectedNode);
-  const setNodes = useDiagram((state) => state.setNodes);
-
-  // Send node order to parent project whenever nodes/edges change
-  useEffect(() => {
-    if (nodes.length > 0 && edges.length > 0 && onNodeOrderChange) {
-      const nodeOrder = orderNodesByEdges(nodes, edges);
-      onNodeOrderChange(nodeOrder);
-    }
-  }, [nodes, edges, onNodeOrderChange]);
-
-  useImperativeHandle(ref, () => ({
-    undo,
-    redo,
-    canUndo: () => historyIndex > 0,
-    canRedo: () => historyIndex < history.length - 1,
-    reset,
-    getHistoryLength: () => history.length,
-    getHistoryIndex: () => historyIndex,
-    // Node data management methods
-    getNodeData: (nodeId: string) => {
-      const node = nodes.find(n => n.id === nodeId);
-      return node ? node.data : null;
-    },
-    updateNodeData: (nodeId: string, newData: any) => {
-      const nodeIndex = nodes.findIndex(n => n.id === nodeId);
-      if (nodeIndex === -1) return false;
-
-      const updatedNodes = [...nodes];
-      updatedNodes[nodeIndex] = {
-        ...updatedNodes[nodeIndex],
-        data: { ...updatedNodes[nodeIndex].data, ...newData }
-      };
-      setNodes(updatedNodes);
-      return true;
-    },
-    getSelectedNode: () => selectedNode,
-    getNodes: () => nodes,
-    getEdges: () => edges,
-    // Get ordered nodes based on edge connections
-    getNodeOrder: () => orderNodesByEdges(nodes, edges),
-  }));
-
-  return (
-    <DiagramContainer
-      defaultEdgeOptions={defaultEdgeOptions}
-      edgeTypes={edgeTypes}
-      nodeTypes={nodeTypes as any}
-      connectionLineComponent={FloatingConnectionLine}
-      style={{ backgroundColor: '#141519' }}
-      className={className}
-      showAutomationExecutionPanel={showAutomationExecutionPanel}
-    >
-      <Background
-        color="#ffffff"
-        variant={BackgroundVariant.Dots}
-        gap={20}
-        size={1}
-      />
-      {children}
-    </DiagramContainer>
-  );
-});
-
-export interface DiagrammingPageProps {
-  diagramType: DiagramTypes;
-  onChange?: OnChangeEventHandler;
-  defaultNodes: ICardNode[];
-  defaultEdges: Edge[];
-  children?: React.ReactNode;
-  workflowNodeContent?: WorkflowNodeContentType;
-  renderAddNodeView?: RenderAddNodeViewType;
-  getDefaultNodeData?: GetDefaultNodeDataType;
-  availableFunctions: FunctionSignature[];
-  availableVariables?: AvailableVariable[];
-  id: number;
-  className?: string;
-  conditionBuilderStates?: ConditionBuilderState;
-  // New: emit node selection to host app
-  onNodeSelect?: (payload: { nodeId: string; type?: string; data?: any }) => void;
-  // New: allow host to disable library JSON popovers/drawers
-  enableNodeJsonPopover?: boolean;
-  // New: control visibility of automation execution panel
-  showAutomationExecutionPanel?: boolean;
-  // New: callback to receive node order based on arrow/edge connections
-  onNodeOrderChange?: (nodeOrder: NodeOrderResult) => void;
-}
-
-export const DiagrammingPage = forwardRef<DiagrammingPageRef, DiagrammingPageProps>(({
-  diagramType,
-  defaultNodes,
-  defaultEdges,
-  onChange,
-  children,
-  workflowNodeContent,
-  renderAddNodeView,
-  getDefaultNodeData,
-  availableFunctions,
-  availableVariables,
-  id,
-  className,
-  conditionBuilderStates,
-  onNodeSelect: onNodeSelectProp,
-  enableNodeJsonPopover: enableNodeJsonPopoverProp,
-  showAutomationExecutionPanel,
-  onNodeOrderChange
-}, ref) => {
-  return (
-    <ThemeProvider theme={theme}>
-      <CssBaseline />
-
-      <DiagramStoreProvider
-        id={id}
-        availableFunctions={availableFunctions}
-        availableVariables={availableVariables}
-        defaultNodes={defaultNodes} // Pass defaultNodes to the context
-        defaultEdges={defaultEdges} // Pass defaultEdges to the context
-        diagramType={diagramType} // Pass diagramType to the context
-        onChange={onChange} // Pass onChange to the context
-        workflowNodeContent={workflowNodeContent} // Pass workflowNodeContent to the context
-        renderAddNodeView={renderAddNodeView} // Pass workflowNodeContent to the context
-        getDefaultNodeData={getDefaultNodeData}
-        conditionBuilderStates={conditionBuilderStates}
-        onNodeSelect={onNodeSelectProp}
-        enableNodeJsonPopover={enableNodeJsonPopoverProp}
-      >
-        {/* Variable registration handler */}
-        <VariableRegistrationHandler />
-
-        <DiagrammingPageInternal 
-          ref={ref} 
-          className={className} 
-          showAutomationExecutionPanel={showAutomationExecutionPanel}
-          onNodeOrderChange={onNodeOrderChange}
-        >
-          {children}
-        </DiagrammingPageInternal>
-      </DiagramStoreProvider>
-    </ThemeProvider>
-  );
-});
+import { CssBaseline, ThemeProvider } from '@mui/material';
+import React, { forwardRef, useImperativeHandle, useEffect } from 'react';
+import { Edge, Background, BackgroundVariant, Node } from '@xyflow/react';
+import FloatingConnectionLine from '../atoms/FloatingConnectionLine';
+import { DiagramStoreProvider, useDiagram } from '../contexts/DiagramProvider';
+import { theme } from '../theme';
+import { ICardNode } from '../types/card-node';
+import DiagramTypes from '../types/diagram-types';
+import edgeTypes, { defaultEdgeOptions } from '../types/edge-types';
+import nodeTypes from '../types/node-types';
+import { useAutoRegisterVariables } from '../hooks/useAutoRegisterVariables';
+import { orderNodesByEdges, NodeOrderResult } from '../utils/nodeOrderByEdges';
+
+import {
+  ConditionBuilderState,
+  GetDefaultNodeDataType,
+  OnChangeEventHandler,
+  RenderAddNodeViewType,
+  WorkflowNodeContentType,
+} from '../contexts/diagramStoreTypes';
+import { DiagramContainer } from './DiagramContainer';
+import { FunctionSignature } from '../types/FunctionSignature';
+import { AvailableVariable } from '../types/available-variables';
+
+// Component that handles variable registration
+const VariableRegistrationHandler: React.FC = () => {
+  useAutoRegisterVariables();
+  return null;
+};
+
+// Interface for the ref methods
+export interface DiagrammingPageRef {
+  undo: () => void;
+  redo: () => void;
+  canUndo: () => boolean;
+  canRedo: () => boolean;
+  reset: () => void;
+  getHistoryLength: () => number;
+  getHistoryIndex: () => number;
+  // Node data management methods
+  getNodeData: (nodeId: string) => any | null;
+  updateNodeData: (nodeId: string, data: any) => boolean;
+  getSelectedNode: () => string | null;
+  getNodes: () => any[];
+  getEdges: () => any[];
+  // Get ordered nodes based on edge connections (arrow direction)
+  getNodeOrder: () => NodeOrderResult;
+}
+
+// Internal component that exposes undo/redo functionality
+const DiagrammingPageInternal = forwardRef<DiagrammingPageRef, { 
+  children?: React.ReactNode; 
+  className?: string; 
+  showAutomationExecutionPanel?: boolean;
+  onNodeOrderChange?: (nodeOrder: NodeOrderResult) => void;
+}>(({ children, className, showAutomationExecutionPanel, onNodeOrderChange }, ref) => {
+  const undo = useDiagram((state) => state.undo);
+  const redo = useDiagram((state) => state.redo);
+  const reset = useDiagram((state) => state.reset);
+  const history = useDiagram((state) => state.history);
+  const historyIndex = useDiagram((state) => state.historyIndex);
+  const nodes = useDiagram((state) => state.nodes);
+  const edges = useDiagram((state) => state.edges);
+  const selectedNode = useDiagram((state) => state.selectedNode);
+  const setNodes = useDiagram((state) => state.setNodes);
+
+  // Send node order to parent project whenever nodes/edges change
+  useEffect(() => {
+    if (edges.length > 0) {
+      // Get only nodes that are connected by edges (exclude orphan nodes)
+      const nodeOrder = orderNodesByEdges(nodes, edges, { includeOrphanNodes: false });
+      
+      // Get only connected nodes (nodes that appear in edges)
+      const connectedNodeIds = new Set<string>();
+      edges.forEach((edge) => {
+        connectedNodeIds.add(edge.source);
+        connectedNodeIds.add(edge.target);
+      });
+      
+      // Filter ordered nodes to only include connected ones
+      const connectedOrderedNodes = nodeOrder.orderedNodes.filter(
+        (node) => connectedNodeIds.has(node.id)
+      );
+      
+      // Print node structure to console
+      console.log('\n========== NODE ORDER BY EDGES ==========');
+      console.log('\n📋 CONNECTED NODES ORDER (following arrows):');
+      connectedOrderedNodes.forEach((node, index) => {
+        console.log(`  ${index + 1}. [${node.type || 'unknown'}] ${node.id}`);
+      });
+      
+      console.log('\n🟢 START NODE:', nodeOrder.startNodes[0]?.id || '(none)');
+      console.log('🔴 END NODE:', nodeOrder.endNodes[0]?.id || '(none)');
+      
+      console.log('\n🔗 EDGE ORDER:');
+      edges.forEach((edge, index) => {
+        console.log(`  ${index + 1}. ${edge.source} ──→ ${edge.target}`);
+      });
+      
+      console.log('\n📊 TOTAL CONNECTED NODES:', connectedOrderedNodes.length);
+      console.log('==========================================\n');
+      
+      // Create updated result with only connected nodes
+      const connectedNodeOrder: NodeOrderResult = {
+        ...nodeOrder,
+        orderedNodes: connectedOrderedNodes,
+      };
+      
+      // Send to parent project if callback provided
+      if (onNodeOrderChange) {
+        onNodeOrderChange(connectedNodeOrder);
+      }
+    }
+  }, [nodes, edges, onNodeOrderChange]);
+
+  useImperativeHandle(ref, () => ({
+    undo,
+    redo,
+    canUndo: () => historyIndex > 0,
+    canRedo: () => historyIndex < history.length - 1,
+    reset,
+    getHistoryLength: () => history.length,
+    getHistoryIndex: () => historyIndex,
+    // Node data management methods
+    getNodeData: (nodeId: string) => {
+      const node = nodes.find(n => n.id === nodeId);
+      return node ? node.data : null;
+    },
+    updateNodeData: (nodeId: string, newData: any) => {
+      const nodeIndex = nodes.findIndex(n => n.id === nodeId);
+      if (nodeIndex === -1) return false;
+
+      const updatedNodes = [...nodes];
+      updatedNodes[nodeIndex] = {
+        ...updatedNodes[nodeIndex],
+        data: { ...updatedNodes[nodeIndex].data, ...newData }
+      };
+      setNodes(updatedNodes);
+      return true;
+    },
+    getSelectedNode: () => selectedNode,
+    getNodes: () => nodes,
+    getEdges: () => edges,
+    // Get ordered nodes based on edge connections
+    getNodeOrder: () => orderNodesByEdges(nodes, edges),
+  }));
+
+  return (
+    <DiagramContainer
+      defaultEdgeOptions={defaultEdgeOptions}
+      edgeTypes={edgeTypes}
+      nodeTypes={nodeTypes as any}
+      connectionLineComponent={FloatingConnectionLine}
+      style={{ backgroundColor: '#141519' }}
+      className={className}
+      showAutomationExecutionPanel={showAutomationExecutionPanel}
+    >
+      <Background
+        color="#ffffff"
+        variant={BackgroundVariant.Dots}
+        gap={20}
+        size={1}
+      />
+      {children}
+    </DiagramContainer>
+  );
+});
+
+export interface DiagrammingPageProps {
+  diagramType: DiagramTypes;
+  onChange?: OnChangeEventHandler;
+  defaultNodes: ICardNode[];
+  defaultEdges: Edge[];
+  children?: React.ReactNode;
+  workflowNodeContent?: WorkflowNodeContentType;
+  renderAddNodeView?: RenderAddNodeViewType;
+  getDefaultNodeData?: GetDefaultNodeDataType;
+  availableFunctions: FunctionSignature[];
+  availableVariables?: AvailableVariable[];
+  id: number;
+  className?: string;
+  conditionBuilderStates?: ConditionBuilderState;
+  // New: emit node selection to host app
+  onNodeSelect?: (payload: { nodeId: string; type?: string; data?: any }) => void;
+  // New: allow host to disable library JSON popovers/drawers
+  enableNodeJsonPopover?: boolean;
+  // New: control visibility of automation execution panel
+  showAutomationExecutionPanel?: boolean;
+  // New: callback to receive node order based on arrow/edge connections
+  onNodeOrderChange?: (nodeOrder: NodeOrderResult) => void;
+}
+
+export const DiagrammingPage = forwardRef<DiagrammingPageRef, DiagrammingPageProps>(({
+  diagramType,
+  defaultNodes,
+  defaultEdges,
+  onChange,
+  children,
+  workflowNodeContent,
+  renderAddNodeView,
+  getDefaultNodeData,
+  availableFunctions,
+  availableVariables,
+  id,
+  className,
+  conditionBuilderStates,
+  onNodeSelect: onNodeSelectProp,
+  enableNodeJsonPopover: enableNodeJsonPopoverProp,
+  showAutomationExecutionPanel,
+  onNodeOrderChange
+}, ref) => {
+  return (
+    <ThemeProvider theme={theme}>
+      <CssBaseline />
+
+      <DiagramStoreProvider
+        id={id}
+        availableFunctions={availableFunctions}
+        availableVariables={availableVariables}
+        defaultNodes={defaultNodes} // Pass defaultNodes to the context
+        defaultEdges={defaultEdges} // Pass defaultEdges to the context
+        diagramType={diagramType} // Pass diagramType to the context
+        onChange={onChange} // Pass onChange to the context
+        workflowNodeContent={workflowNodeContent} // Pass workflowNodeContent to the context
+        renderAddNodeView={renderAddNodeView} // Pass workflowNodeContent to the context
+        getDefaultNodeData={getDefaultNodeData}
+        conditionBuilderStates={conditionBuilderStates}
+        onNodeSelect={onNodeSelectProp}
+        enableNodeJsonPopover={enableNodeJsonPopoverProp}
+      >
+        {/* Variable registration handler */}
+        <VariableRegistrationHandler />
+
+        <DiagrammingPageInternal 
+          ref={ref} 
+          className={className} 
+          showAutomationExecutionPanel={showAutomationExecutionPanel}
+          onNodeOrderChange={onNodeOrderChange}
+        >
+          {children}
+        </DiagrammingPageInternal>
+      </DiagramStoreProvider>
+    </ThemeProvider>
+  );
+});