Dyn 5008 watch node height 4 dictionary (#12989) (#13019)

* WatchTree f Dictionary and Testing * Watchtree 4 Dictionary Testing resources * Use of NodeLabel property
DynamoDS · Jun 16, 2022 · 9ab656f · 9ab656f
1 parent 4306386
commit 9ab656f
Show file tree

Hide file tree

Showing 3 changed files with 109 additions and 3 deletions.
diff --git a/src/DynamoCoreWpf/Views/Preview/WatchTree.xaml.cs b/src/DynamoCoreWpf/Views/Preview/WatchTree.xaml.cs
@@ -38,6 +38,7 @@ public WatchTree(WatchViewModel vm)
         internal double ExtratWidthSize { get { return extraWidthSize; } }
         internal double WidthPerCharacter { get { return widthPerCharacter; } }
         internal double MaxWidthSize { get { return defaultWidthSize * 2; } }
+        internal string NodeLabel { get { return _vm.Children[0].NodeLabel; } }
 
         private void WatchTree_Unloaded(object sender, RoutedEventArgs e)
         {
@@ -62,7 +63,7 @@ private void _vm_PropertyChanged(object sender, System.ComponentModel.PropertyCh
                     this.Height = minHeightSize;
                     if (_vm.Children.Count !=0)
                     {
-                        if (_vm.Children[0].NodeLabel.Contains(Environment.NewLine))
+                        if (NodeLabel.Contains(Environment.NewLine) || NodeLabel.ToUpper() == nameof(WatchViewModel.DICTIONARY))
                         {
                             this.Height = defaultHeightSize;
                         }
@@ -82,7 +83,7 @@ private void _vm_PropertyChanged(object sender, System.ComponentModel.PropertyCh
                     {
                         // We will use 7.5 as width factor for each character.
 
-                        double requiredWidth = (_vm.Children[0].NodeLabel.Length * widthPerCharacter);
+                        double requiredWidth = (NodeLabel.Length * widthPerCharacter);
                         if (requiredWidth > (MaxWidthSize))
                         {
                             requiredWidth = MaxWidthSize;

diff --git a/test/DynamoCoreWpfTests/PreviewBubbleTests.cs b/test/DynamoCoreWpfTests/PreviewBubbleTests.cs
@@ -448,6 +448,32 @@ public void Watch_MultilineString()
             Assert.AreEqual(rawMultiLineStringtWatchNode.DefaultHeightSize, rawMultiLineStringtWatchNode.Height);
         }
 
+        [Test]
+        public void Watch_Dictionary()
+        {
+            OpenAndRun(@"core\WatchTree.dyn");
+
+            string watchNodeGuid = "a3b57ebd-5fff-413d-a6c5-ecee20e80e4e";
+            var dictionaryWatchNode = NodeViewWithGuid(watchNodeGuid);
+            WatchTree rawDictionaryWatchNode = dictionaryWatchNode.ChildOfType<WatchTree>();
+
+            bool isDictionary = rawDictionaryWatchNode.NodeLabel.ToUpper() == nameof(Dynamo.ViewModels.WatchViewModel.DICTIONARY);
+
+            // Fire transition on dynamo main ui thread.
+            View.Dispatcher.Invoke(() =>
+            {
+                dictionaryWatchNode.PreviewControl.BindToDataSource();
+                dictionaryWatchNode.PreviewControl.TransitionToState(Dynamo.UI.Controls.PreviewControl.State.Condensed);
+                dictionaryWatchNode.PreviewControl.TransitionToState(Dynamo.UI.Controls.PreviewControl.State.Expanded);
+            });
+
+            DispatcherUtil.DoEvents();
+
+            Assert.NotNull(dictionaryWatchNode);
+            Assert.IsTrue(isDictionary);
+            Assert.AreEqual(rawDictionaryWatchNode.DefaultHeightSize, rawDictionaryWatchNode.Height);
+        }
+
         #endregion
 
         [Test]

diff --git a/test/core/WatchTree.dyn b/test/core/WatchTree.dyn
@@ -12,6 +12,10 @@
       "Point": {
         "Key": "Autodesk.DesignScript.Geometry.Point",
         "Value": "ProtoGeometry.dll"
+      },
+      "DesignScript.Builtin.Dictionary": {
+        "Key": "DesignScript.Builtin.Dictionary",
+        "Value": "DesignScriptBuiltin.dll"
       }
     }
   },
@@ -309,6 +313,55 @@
       ],
       "Replication": "Disabled",
       "Description": "Visualize the node's output"
+    },
+    {
+      "ConcreteType": "Dynamo.Graph.Nodes.CodeBlockNodeModel, DynamoCore",
+      "NodeType": "CodeBlockNode",
+      "Code": "{\"id\":7888,\"uid\":\"095a8563-6b2f-4961-b5d0-51d224508ff7\",\"brand\":\"Budweiser\",\"name\":\"Westmalle Trappist Tripel\",\"style\":\"Stout\",\"hop\":\"Willamette\",\"yeast\":\"1099 - Whitbread Ale\",\"malts\":\"Vienna\",\"ibu\":\"45 IBU\",\"alcohol\":\"9.6%\",\"blg\":\"11.7°Blg\"};",
+      "Id": "4dbf32f1be71457a8a207d659896d274",
+      "Inputs": [],
+      "Outputs": [
+        {
+          "Id": "97450167f6e844f38de8e1204b9cf543",
+          "Name": "",
+          "Description": "Value of expression at line 1",
+          "UsingDefaultValue": false,
+          "Level": 2,
+          "UseLevels": false,
+          "KeepListStructure": false
+        }
+      ],
+      "Replication": "Disabled",
+      "Description": "Allows for DesignScript code to be authored directly"
+    },
+    {
+      "ConcreteType": "CoreNodeModels.Watch, CoreNodeModels",
+      "NodeType": "ExtensionNode",
+      "Id": "a3b57ebd5fff413da6c5ecee20e80e4e",
+      "Inputs": [
+        {
+          "Id": "9bc1396dc4e642e787f1c273ad7e1c1f",
+          "Name": "",
+          "Description": "Node to show output from",
+          "UsingDefaultValue": false,
+          "Level": 2,
+          "UseLevels": false,
+          "KeepListStructure": false
+        }
+      ],
+      "Outputs": [
+        {
+          "Id": "bc02de04f1fc41f485188d443b311d5d",
+          "Name": "",
+          "Description": "Node output",
+          "UsingDefaultValue": false,
+          "Level": 2,
+          "UseLevels": false,
+          "KeepListStructure": false
+        }
+      ],
+      "Replication": "Disabled",
+      "Description": "Visualize the node's output"
     }
   ],
   "Connectors": [
@@ -341,6 +394,12 @@
       "End": "79a2a477a7144cf4aa1888f35080c103",
       "Id": "a8636b0b2b1e4c9ba0088c5de773290b",
       "IsHidden": "False"
+    },
+    {
+      "Start": "97450167f6e844f38de8e1204b9cf543",
+      "End": "9bc1396dc4e642e787f1c273ad7e1c1f",
+      "Id": "9850c23ac51f46849692bb191274a853",
+      "IsHidden": "False"
     }
   ],
   "Dependencies": [],
@@ -368,7 +427,7 @@
       "ScaleFactor": 1.0,
       "HasRunWithoutCrash": true,
       "IsVisibleInDynamoLibrary": true,
-      "Version": "2.15.0.5047",
+      "Version": "2.15.0.5252",
       "RunType": "Automatic",
       "RunPeriod": "1000"
     },
@@ -495,6 +554,26 @@
         "Excluded": false,
         "X": 841.30826466519318,
         "Y": 973.22971481997047
+      },
+      {
+        "Name": "Code Block",
+        "ShowGeometry": true,
+        "Id": "4dbf32f1be71457a8a207d659896d274",
+        "IsSetAsInput": false,
+        "IsSetAsOutput": false,
+        "Excluded": false,
+        "X": 1053.2918870047356,
+        "Y": 261.47013517660719
+      },
+      {
+        "Name": "Watch",
+        "ShowGeometry": true,
+        "Id": "a3b57ebd5fff413da6c5ecee20e80e4e",
+        "IsSetAsInput": false,
+        "IsSetAsOutput": false,
+        "Excluded": false,
+        "X": 1516.5673530447943,
+        "Y": 417.29915557189958
       }
     ],
     "Annotations": [],