DYN-8469: Disallow empty groups with pins #2 (#15934)

zeusongit · web-flow · commit 9b7d07cd6a2f · 2025-03-17T17:16:53.000-04:00
diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs
@@ -2793,12 +2793,19 @@ internal void UngroupModel(List<ModelBase> modelsToUngroup)
                             CurrentWorkspace.RecordGroupModelBeforeUngroup(annotation);
                             if (list.Remove(model))
                             {
-                                if (model is ConnectorPinModel pinModel)
+                                if (!list.Any(n => n is not ConnectorPinModel))
                                 {
-                                    annotation.MarkPinAsRemoved(pinModel);
+                                    emptyGroup.Add(annotation);
+                                }
+                                else
+                                {
+                                    if (model is ConnectorPinModel pinModel)
+                                    {
+                                        annotation.MarkPinAsRemoved(pinModel);
+                                    }
+                                    annotation.Nodes = list;
+                                    annotation.UpdateBoundaryFromSelection();
                                 }
-                                annotation.Nodes = list;
-                                annotation.UpdateBoundaryFromSelection();                               
                             }
                         }
                         else

Original file line number	Diff line number	Diff line change
`@@ -2793,12 +2793,19 @@ internal void UngroupModel(List<ModelBase> modelsToUngroup)`
`2793`	`2793`	`CurrentWorkspace.RecordGroupModelBeforeUngroup(annotation);`
`2794`	`2794`	`if (list.Remove(model))`
`2795`	`2795`	`{`
`2796`		`- if (model is ConnectorPinModel pinModel)`
	`2796`	`+ if (!list.Any(n => n is not ConnectorPinModel))`
`2797`	`2797`	`{`
`2798`		`- annotation.MarkPinAsRemoved(pinModel);`
	`2798`	`+ emptyGroup.Add(annotation);`
	`2799`	`+ }`
	`2800`	`+ else`
	`2801`	`+ {`
	`2802`	`+ if (model is ConnectorPinModel pinModel)`
	`2803`	`+ {`
	`2804`	`+ annotation.MarkPinAsRemoved(pinModel);`
	`2805`	`+ }`
	`2806`	`+ annotation.Nodes = list;`
	`2807`	`+ annotation.UpdateBoundaryFromSelection();`
`2799`	`2808`	`}`
`2800`		`- annotation.Nodes = list;`
`2801`		`- annotation.UpdateBoundaryFromSelection();`
`2802`	`2809`	`}`
`2803`	`2810`	`}`
`2804`	`2811`	`else`