Fix CustomNode view layout after it is saved. (#13585)

reddyashish · web-flow · commit 750b3eca36bb · 2022-11-30T20:23:00.000+05:30
* Fix CustomNode views after it is saved.

* Add test

* Update WorkspaceSaving.cs
diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -2001,16 +2001,7 @@ private void InternalSaveAs(string path, SaveContext saveContext, bool isBackup
             try
             {
                 Model.Logger.Log(String.Format(Properties.Resources.SavingInProgress, path));
-
-                // If the current workspace is a CustomNodeWorkspaceModel, then call the save method on it.
-                if (CurrentSpaceViewModel.Model is CustomNodeWorkspaceModel)
-                {
-                    CurrentSpaceViewModel.Model.Save(path, false, Model.EngineController);
-                }
-                else
-                {
-                    CurrentSpaceViewModel.Save(path, isBackup, Model.EngineController, saveContext);
-                }
+                CurrentSpaceViewModel.Save(path, isBackup, Model.EngineController, saveContext);
 
                 if (!isBackup) AddToRecentFiles(path);
             }
@@ -2339,7 +2330,8 @@ public void ShowSaveDialogAndSaveResult(object parameter)
                     _fileDialog.InitialDirectory = fi.DirectoryName;
                     _fileDialog.FileName = fi.Name;
                 }
-                else if (vm.Model.CurrentWorkspace is CustomNodeWorkspaceModel)
+
+                if (vm.Model.CurrentWorkspace is CustomNodeWorkspaceModel)
                 {
                     var pathManager = vm.model.PathManager;
                     _fileDialog.InitialDirectory = pathManager.DefaultUserDefinitions;
diff --git a/src/DynamoCoreWpf/ViewModels/Core/WorkspaceViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/WorkspaceViewModel.cs
@@ -20,7 +20,6 @@
 using Dynamo.Graph.Workspaces;
 using Dynamo.Models;
 using Dynamo.Selection;
-using Dynamo.UI.Prompts;
 using Dynamo.Utilities;
 using Dynamo.Wpf.ViewModels;
 using Dynamo.Wpf.ViewModels.Core;
@@ -611,6 +610,12 @@ internal void Save(string filePath, bool isBackup = false, EngineController engi
                     Model.FileName = filePath;
                     Model.OnSaved();
                 }
+
+                // If a new CustomNodeWorkspaceModel is created, store that info in CustomNodeManager without creating an instance of the custom node.
+                if (this.Model is CustomNodeWorkspaceModel customNodeWorkspaceModel)
+                {
+                    customNodeWorkspaceModel.SetInfo(Path.GetFileNameWithoutExtension(filePath));
+                }
             }
             catch (Exception ex)
             {
@@ -1655,4 +1660,4 @@ public ViewModelEventArgs(NodeViewModel vm)
             ViewModel = vm;
         }
     }
-}
+}
diff --git a/test/DynamoCoreWpfTests/WorkspaceSaving.cs b/test/DynamoCoreWpfTests/WorkspaceSaving.cs
@@ -1,23 +1,23 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading;
+using Dynamo.Graph;
+using Dynamo.Graph.Connectors;
+using Dynamo.Graph.Nodes;
 using Dynamo.Graph.Nodes.CustomNodes;
 using Dynamo.Graph.Nodes.ZeroTouch;
 using Dynamo.Graph.Workspaces;
 using Dynamo.Models;
+using Dynamo.PackageManager;
 using Dynamo.Search.SearchElements;
-using Dynamo.Wpf.ViewModels;
-
-using NUnit.Framework;
-using Dynamo.ViewModels;
 using Dynamo.Utilities;
-using CoreNodeModels.Input;
-using Dynamo.Graph.Connectors;
-using Dynamo.Graph.Nodes;
+using Dynamo.ViewModels;
 using Dynamo.Wpf;
-using Dynamo.PackageManager;
+using Dynamo.Wpf.ViewModels;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
 
 namespace Dynamo.Tests
 {
@@ -1359,6 +1359,23 @@ public void CustomNodeBelongingToPackageCanBeModifiedAndReopenedWithoutError()
             Assert.IsTrue(nodeInstance.OutPorts.LastOrDefault().Name.StartsWith("anewoutput"));
 
         }
+
+        [Test]
+        public void CustomNodeWorkspaceViewTestAfterSaving()
+        {
+            ViewModel.Model.OpenFileFromPath(Path.Combine(TestDirectory, @"core\combine", "Sequence_Json.dyf"));
+
+            var newFilePath = GetNewFileNameOnTempPath("dyf");
+            ViewModel.SaveAs(newFilePath, SaveContext.SaveAs);
+
+            var oldJSON = File.ReadAllText(newFilePath);
+            var oldJObject = JObject.Parse(oldJSON);
+
+            var newJSON = File.ReadAllText(newFilePath);
+            var newJObject = JObject.Parse(newJSON);
+
+            Assert.AreEqual(oldJObject["View"], newJObject["View"]);
+        }
         #endregion
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`using Dynamo.Graph.Workspaces;`
`21`	`21`	`using Dynamo.Models;`
`22`	`22`	`using Dynamo.Selection;`
`23`		`-using Dynamo.UI.Prompts;`
`24`	`23`	`using Dynamo.Utilities;`
`25`	`24`	`using Dynamo.Wpf.ViewModels;`
`26`	`25`	`using Dynamo.Wpf.ViewModels.Core;`
`@@ -611,6 +610,12 @@ internal void Save(string filePath, bool isBackup = false, EngineController engi`
`611`	`610`	`Model.FileName = filePath;`
`612`	`611`	`Model.OnSaved();`
`613`	`612`	`}`
	`613`	`+`
	`614`	`+ // If a new CustomNodeWorkspaceModel is created, store that info in CustomNodeManager without creating an instance of the custom node.`
	`615`	`+ if (this.Model is CustomNodeWorkspaceModel customNodeWorkspaceModel)`
	`616`	`+ {`
	`617`	`+ customNodeWorkspaceModel.SetInfo(Path.GetFileNameWithoutExtension(filePath));`
	`618`	`+ }`
`614`	`619`	`}`
`615`	`620`	`catch (Exception ex)`
`616`	`621`	`{`
`@@ -1655,4 +1660,4 @@ public ViewModelEventArgs(NodeViewModel vm)`
`1655`	`1660`	`ViewModel = vm;`
`1656`	`1661`	`}`
`1657`	`1662`	`}`
`1658`		`-}`
	`1663`	`+}`