groups now handled by ama

stephenfreund · stephenfreund · commit b1cb02a83688 · 2025-02-10T06:12:50.000-05:00
diff --git a/mxgraph_component/mxgraph_component/frontend/public/index.html b/mxgraph_component/mxgraph_component/frontend/public/index.html
@@ -261,8 +261,8 @@
 </head>
 <body>
   <div id="toolbar" style="margin-top: 100px;">
-    <button id="groupBtn">Group</button>
-    <button id="ungroupBtn">Ungroup</button>
+    <button id="groupBtn" style="display: none;">Group</button>
+    <button id="ungroupBtn" style="display: none;">Ungroup</button>
   </div>
 
   <div id="graph-container" style="width: 2000px; height: 1600px; overflow: hidden;">
diff --git a/src/flowco/page/ama.py b/src/flowco/page/ama.py
@@ -16,6 +16,7 @@
 from flowco.page.page import Page
 from flowco.pythonshell.shells import PythonShells
 from flowco.session.session import session
+from flowco.ui.mx_diagram import DiagramGroup
 from flowco.util.config import config
 from flowco.util.output import error, log, logger
 from pydantic import BaseModel
@@ -297,7 +298,20 @@ def add_node(
         dfg = update_dataflow_graph(
             dfg,
             mxDiagramUpdate(
-                version=dfg.version, nodes=node_updates, edges=edge_updates
+                version=dfg.version,
+                nodes=node_updates,
+                edges=edge_updates,
+                groups=[
+                    DiagramGroup(
+                        id=x.id,
+                        label=x.label,
+                        is_collapsed=x.is_collapsed,
+                        collapsed_geometry=x.collapsed_geometry,
+                        parent_group=x.parent_group,
+                        nodes=x.nodes,
+                    )
+                    for x in dfg.groups
+                ],
             ),
         )
 
@@ -389,6 +403,17 @@ def remove_node(
                 for x in dfg.edges
                 if not (x.src == id or x.dst == id)
             },
+            groups=[
+                DiagramGroup(
+                    id=x.id,
+                    label=x.label,
+                    is_collapsed=x.is_collapsed,
+                    collapsed_geometry=x.collapsed_geometry,
+                    parent_group=x.parent_group,
+                    nodes=[y for y in x.nodes if y != id],
+                )
+                for x in dfg.groups
+            ],
         )
 
         dfg = update_dataflow_graph(dfg, dfg_update)
@@ -432,6 +457,17 @@ def remove_edge(
                 for x in dfg.edges
                 if x.id != id
             },
+            groups=[
+                DiagramGroup(
+                    id=x.id,
+                    label=x.label,
+                    is_collapsed=x.is_collapsed,
+                    collapsed_geometry=x.collapsed_geometry,
+                    parent_group=x.parent_group,
+                    nodes=x.nodes,
+                )
+                for x in dfg.groups
+            ],
         )
 
         src_pill = dfg[edge_to_remove.src].pill
