fix crash (#12551)

mjkkirschner · web-flow · commit c4c8e5704f71 · 2022-01-19T11:37:12.000-05:00
add test

Co-authored-by: michael kirschner &lt;michael.kirschner@autodesk.com&gt;
diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -1286,7 +1286,7 @@ internal void UngroupModel(object parameters)
                     if (modelb is NodeModel node)
                     {
                         var pinnedNotes = CurrentSpaceViewModel.Notes
-                            .Where(x => x.PinnedNode.NodeModel == node)
+                            .Where(x => x.PinnedNode?.NodeModel == node)
                             .Select(x => x.Model.GUID);
 
                         if (pinnedNotes.Any())
diff --git a/test/DynamoCoreWpfTests/AnnotationViewModelTests.cs b/test/DynamoCoreWpfTests/AnnotationViewModelTests.cs
@@ -164,6 +164,57 @@ public void CanUngroupNodeFromAGroup()
             Assert.AreEqual(true, ViewModel.CanUngroupModel(null));
         }
 
+
+        [Test]
+        [Category("DynamoUI")]
+        public void CanUngroupNodeFromAGroupIfGroupContainsNote()
+        {
+            //Create a Node
+            var addNode = new DSFunction(ViewModel.Model.LibraryServices.GetFunctionDescriptor("+"));
+            ViewModel.Model.CurrentWorkspace.AddAndRegisterNode(addNode, false);
+
+            //verify the node was created
+            Assert.AreEqual(1, ViewModel.Model.CurrentWorkspace.Nodes.Count());
+
+            //Select the node for group
+            DynamoSelection.Instance.Selection.Add(addNode);
+
+            //Create a Group around that node
+            ViewModel.AddAnnotationCommand.Execute(null);
+            var annotation = ViewModel.Model.CurrentWorkspace.Annotations.FirstOrDefault();
+
+            //Check if the group is created
+            Assert.IsNotNull(annotation);
+
+            //Clear the selection
+            DynamoSelection.Instance.ClearSelection();
+
+            //create a note.
+            ViewModel.AddNoteCommand.Execute(null);
+            var note = ViewModel.Model.CurrentWorkspace.Notes.FirstOrDefault();
+            Assert.IsNotNull(note);
+
+            //Select the note 
+            DynamoSelection.Instance.Selection.Add(note);
+            DynamoSelection.Instance.Selection.Add(annotation);
+
+            ViewModel.AddModelsToGroupModelCommand.Execute(null);
+
+            //Clear the selection
+            DynamoSelection.Instance.ClearSelection();
+            //Select the node 
+            DynamoSelection.Instance.Selection.Add(addNode);
+
+            Assert.AreEqual(2, annotation.Nodes.Count());
+            //remove it
+            Assert.DoesNotThrow(() =>
+            {
+                ViewModel.UngroupModelCommand.Execute(null);
+              
+            });
+            Assert.AreEqual(1, annotation.Nodes.Count());
+        }
+
         [Test]
         [Category("DynamoUI")]
         public void CanUngroupNodeWhichIsNotInAGroup()

Original file line number	Diff line number	Diff line change
`@@ -1286,7 +1286,7 @@ internal void UngroupModel(object parameters)`
`1286`	`1286`	`if (modelb is NodeModel node)`
`1287`	`1287`	`{`
`1288`	`1288`	`var pinnedNotes = CurrentSpaceViewModel.Notes`
`1289`		`- .Where(x => x.PinnedNode.NodeModel == node)`
	`1289`	`+ .Where(x => x.PinnedNode?.NodeModel == node)`
`1290`	`1290`	`.Select(x => x.Model.GUID);`
`1291`	`1291`
`1292`	`1292`	`if (pinnedNotes.Any())`