DYN-6218 Turning off "Show Connectors" doesn't keep them off when fil…

…e is reopened (#15509)
DynamoDS · Sep 26, 2024 · cebc4bf · cebc4bf
1 parent 2f7f933
commit cebc4bf
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/src/DynamoCore/Graph/Workspaces/SerializationConverters.cs b/src/DynamoCore/Graph/Workspaces/SerializationConverters.cs
@@ -1263,8 +1263,8 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
             var startId = obj["Start"].Value<string>();
             var endId = obj["End"].Value<string>();
             var isHiddenExists = obj[nameof(ConnectorModel.IsHidden)];
-
-            var isHidden = isHiddenExists != null && obj[nameof(ConnectorModel.IsHidden)].Value<bool>();
+            // final connector visibility would respect current setting first, if visible then fallback to serialized value
+            var isHidden = !PreferenceSettings.Instance.ShowConnector || isHiddenExists != null && obj[nameof(ConnectorModel.IsHidden)].Value<bool>();
 
             var resolver = (IdReferenceResolver)serializer.ReferenceResolver;
 

diff --git a/test/DynamoCoreWpfTests/ConnectorViewModelTests.cs b/test/DynamoCoreWpfTests/ConnectorViewModelTests.cs
@@ -1,19 +1,35 @@
-using System.Linq;
+using System;
+using System.IO;
+using System.Linq;
 using Dynamo.Selection;
-using NUnit.Framework;
-using static Dynamo.Models.DynamoModel;
 using Dynamo.Utilities;
 using Dynamo.ViewModels;
-using System;
-using System.Xml;
-using System.IO;
+using NUnit.Framework;
+using static Dynamo.Models.DynamoModel;
 
 namespace DynamoCoreWpfTests
 {
     public class ConnectorViewModelTests : DynamoTestUIBase
     {
 
         #region Regular Connector Tests
+        /// <summary>
+        /// Check to see if a connector is visible after in session preferences is set to hide connectors
+        /// </summary>
+        [Test]
+        public void ConnectorVisibilityWithPrefrencesTest()
+        {
+            Model.PreferenceSettings.ShowConnector = false;
+
+            Open(@"UI/ConnectorPinTests.dyn");
+
+            var connectorViewModel = this.ViewModel.CurrentSpaceViewModel.Connectors.First();
+
+            // Although default IsHidden state should be false when opening legacy graph,
+            // if current preferences are set to hide connectors, the connector should be hidden
+            Assert.AreEqual(connectorViewModel.IsHidden, true);
+        }
+
         /// <summary>
         /// Check to see if a connector is visible after pre 2.13 graph open
         /// </summary>
@@ -457,4 +473,4 @@ public void CanUndoPlaceWatchNode()
         }
         #endregion
     }
-}
+}