DYN-5821-AddToWorkspace-DocumentationBrowser (#14103)

RobertGlobant20 · web-flow · commit bd96192ec825 · 2023-06-22T09:55:44.000-07:00
I've added some validations so when we are trying to insert a xml dyn file graph without notes, inserting doesn't crash (otherwise the graph is not added).
diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs
@@ -2268,10 +2268,13 @@ private void InsertWorkspace(WorkspaceModel ws, ExtraWorkspaceViewInfo viewInfo
 
             CurrentWorkspace.UpdateWithExtraWorkspaceViewInfo(viewInfo, offsetX, offsetY);
 
-            List<NoteModel> insertedNotes = GetInsertedNotes(viewInfo.Annotations);
+            if(viewInfo != null)
+            {
+                List<NoteModel> insertedNotes = GetInsertedNotes(viewInfo.Annotations);
+                DynamoSelection.Instance.Selection.AddRange(insertedNotes);
+            }           
 
-            DynamoSelection.Instance.Selection.AddRange(nodes);
-            DynamoSelection.Instance.Selection.AddRange(insertedNotes);
+            DynamoSelection.Instance.Selection.AddRange(nodes); 
             
             currentWorkspace.HasUnsavedChanges = true;
         }
@@ -3734,6 +3737,8 @@ private bool NodesAlreadyLoaded(IEnumerable<NodeModel> nodes)
 
         private bool NotesAlreadyLoaded(IEnumerable<ExtraAnnotationViewInfo> notes)
         {
+            if (notes == null) return false;
+
             foreach (var note in notes)
             {
                 if (currentWorkspace.Notes.Any(n => n.GUID.ToString() == note.Id))
@@ -3742,7 +3747,7 @@ private bool NotesAlreadyLoaded(IEnumerable<ExtraAnnotationViewInfo> notes)
                     return true;
                 }
             }
-            // If no nodes exist with the same GUID, then we are good to go
+            // If no notes exist with the same GUID, then we are good to go
             return false;
         }
         #endregion

Original file line number	Diff line number	Diff line change
`@@ -2268,10 +2268,13 @@ private void InsertWorkspace(WorkspaceModel ws, ExtraWorkspaceViewInfo viewInfo`
`2268`	`2268`
`2269`	`2269`	`CurrentWorkspace.UpdateWithExtraWorkspaceViewInfo(viewInfo, offsetX, offsetY);`
`2270`	`2270`
`2271`		`- List<NoteModel> insertedNotes = GetInsertedNotes(viewInfo.Annotations);`
	`2271`	`+ if(viewInfo != null)`
	`2272`	`+ {`
	`2273`	`+ List<NoteModel> insertedNotes = GetInsertedNotes(viewInfo.Annotations);`
	`2274`	`+ DynamoSelection.Instance.Selection.AddRange(insertedNotes);`
	`2275`	`+ }`
`2272`	`2276`
`2273`		`- DynamoSelection.Instance.Selection.AddRange(nodes);`
`2274`		`- DynamoSelection.Instance.Selection.AddRange(insertedNotes);`
	`2277`	`+ DynamoSelection.Instance.Selection.AddRange(nodes);`
`2275`	`2278`
`2276`	`2279`	`currentWorkspace.HasUnsavedChanges = true;`
`2277`	`2280`	`}`
`@@ -3734,6 +3737,8 @@ private bool NodesAlreadyLoaded(IEnumerable<NodeModel> nodes)`
`3734`	`3737`
`3735`	`3738`	`private bool NotesAlreadyLoaded(IEnumerable<ExtraAnnotationViewInfo> notes)`
`3736`	`3739`	`{`
	`3740`	`+ if (notes == null) return false;`
	`3741`	`+`
`3737`	`3742`	`foreach (var note in notes)`
`3738`	`3743`	`{`
`3739`	`3744`	`if (currentWorkspace.Notes.Any(n => n.GUID.ToString() == note.Id))`
`@@ -3742,7 +3747,7 @@ private bool NotesAlreadyLoaded(IEnumerable<ExtraAnnotationViewInfo> notes)`
`3742`	`3747`	`return true;`
`3743`	`3748`	`}`
`3744`	`3749`	`}`
`3745`		`- // If no nodes exist with the same GUID, then we are good to go`
	`3750`	`+ // If no notes exist with the same GUID, then we are good to go`
`3746`	`3751`	`return false;`
`3747`	`3752`	`}`
`3748`	`3753`	`#endregion`