DynamoDS · mjkkirschner · Jan 25, 2022 · Jan 13, 2022 · Jan 14, 2022 · Jan 14, 2022
diff --git a/src/DynamoCore/Core/NotificationObject.cs b/src/DynamoCore/Core/NotificationObject.cs
@@ -3,12 +3,14 @@
 
 namespace Dynamo.Core
 {
+
     /// <summary>
     /// This class notifies the View when there is a change.    
     /// </summary>
     [Serializable]
     public abstract class NotificationObject : INotifyPropertyChanged
     {
+        internal PropertyChangeManager PropertyChangeManager { get; } = new PropertyChangeManager();
         /// <summary>
         /// Raised when a property on this object has a new value.
         /// </summary>        
@@ -20,6 +22,11 @@ public abstract class NotificationObject : INotifyPropertyChanged
         /// <param name="propertyName">The property that has a new value.</param>
         protected virtual void RaisePropertyChanged(string propertyName)
         {
+            //TODO profile this?
+            if (!PropertyChangeManager.ShouldRaiseNotification(propertyName))
+            {
+                return;
+            }
             PropertyChangedEventHandler handler = PropertyChanged;
             if (handler != null)
             {

diff --git a/src/DynamoCore/Core/PropertyChangeManager.cs b/src/DynamoCore/Core/PropertyChangeManager.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Dynamo.Core
+{
+    /// <summary>
+    /// Class can be used to stop property change notifications from being raised if the client object
+    /// inherits from <see cref="NotificationObject"/> and uses RaisePropertyChanged to raise prop notifications.
+    /// Use like:
+    /// using (node.SetPropsToSupress("frozen")){
+    /// node.frozen = true;
+    /// }
+    /// </summary>
+    internal class PropertyChangeManager : IDisposable
+    {
+        //TODO lock field during these accessors or use concurrent structure?
+        protected IEnumerable<string> PropertyNames { get; set; }
+        /// <summary>
+        /// Disable property change notifications for a list of a props.
+        /// The previous set of suppressed notifications will be cleared.
+        /// This API is meant to be used only for a short time and Dispose should be
+        /// called on the object this call returns.
+        /// </summary>
+        /// <param name="props"></param>
+        /// <returns></returns>
+        public PropertyChangeManager SetPropsToSuppress(params string[] props)
+        {
+            PropertyNames = props;
+            return this;
+        }
+        /// <summary>
+        /// Disposing this class will allow prop notifications to be raised.
+        /// </summary>
+        public void Dispose()
+        {
+            PropertyNames = null;
+        }
+        /// <summary>
+        /// Checks if notifications are suppressed for a specific property.
+        /// </summary>
+        /// <param name="prop"></param>
+        /// <returns></returns>
+        public bool ShouldRaiseNotification(string prop)
+        {
+            if(PropertyNames is null)
+            {
+                return true;
+            }
+            return !PropertyNames.Contains(prop);
+        }
+    }
+}
diff --git a/src/DynamoCore/Graph/Nodes/NodeModel.cs b/src/DynamoCore/Graph/Nodes/NodeModel.cs
@@ -68,7 +68,6 @@ public abstract class NodeModel : ModelBase, IRenderPackageSource<NodeModel>, ID
 
         private readonly Dictionary<int, Tuple<int, NodeModel>> inputNodes;
         private readonly Dictionary<int, HashSet<Tuple<int, NodeModel>>> outputNodes;
-
         #endregion
 
         internal const double HeaderHeight = 46;

diff --git a/src/DynamoCore/Graph/Workspaces/HomeWorkspaceModel.cs b/src/DynamoCore/Graph/Workspaces/HomeWorkspaceModel.cs
@@ -750,8 +750,10 @@ private void OnUpdateGraphCompleted(AsyncTask task)
                 var node = workspace.Nodes.FirstOrDefault(n => n.GUID == guid);
                 if (node == null)
                     continue;
-
-                node.Warning(message.Value); // Update node warning message.
+                using (node.PropertyChangeManager.SetPropsToSuppress(nameof(NodeModel.ToolTipText), nameof(NodeModel.State)))
+                {
+                    node.Warning(message.Value); // Update node warning message.
+                }
             }
 
             // Notify listeners (optional) of completion.
@@ -767,8 +769,8 @@ private void OnUpdateGraphCompleted(AsyncTask task)
             // Dispatch the failure message display for execution on UI thread.
             // 
             EvaluationCompletedEventArgs e = task.Exception == null || IsTestMode
-                ? new EvaluationCompletedEventArgs(true)
-                : new EvaluationCompletedEventArgs(true, task.Exception);
+                ? new EvaluationCompletedEventArgs(true,messages.Keys,null)
+                : new EvaluationCompletedEventArgs(true, messages.Keys, task.Exception);
 
             EvaluationCount ++;
 

diff --git a/src/DynamoCore/Models/DynamoModelEventArgs.cs b/src/DynamoCore/Models/DynamoModelEventArgs.cs
@@ -143,6 +143,10 @@ public bool EvaluationSucceeded
         {
             get { return !error.HasValue(); }
         }
+        /// <summary>
+        /// IDs for messages generated during a run. These are node guids.
+        /// </summary>
+        internal IEnumerable<Guid> MessageKeys { get; private set; }
 
         /// <summary>
         /// Exception thrown during graph evaluation.
@@ -172,6 +176,11 @@ public EvaluationCompletedEventArgs(bool evaluationTookPlace, Exception errorMsg
 
             error = errorMsg != null ? Option.Some(errorMsg) : Option.None<Exception>();
         }
+        internal EvaluationCompletedEventArgs(bool evaluationTookPlace, IEnumerable<Guid> messageKeys, Exception errorMsg = null)
+            :this(evaluationTookPlace,errorMsg)
+        {
+            MessageKeys = messageKeys;
+        }
     }
 
     internal class DynamoModelUpdateArgs : EventArgs

diff --git a/src/DynamoCore/Scheduler/UpdateGraphAsyncTask.cs b/src/DynamoCore/Scheduler/UpdateGraphAsyncTask.cs
@@ -139,13 +139,17 @@ protected override void HandleTaskCompletionCore()
                         executedNodes.Add(node);
                     }
                 }
-
                 foreach (var node in executedNodes)
                 {
                     node.WasInvolvedInExecution = true;
                     node.WasRenderPackageUpdatedAfterExecution = false;
                     if (node.State == ElementState.Warning)
-                        node.ClearErrorsAndWarnings();
+                    {
+                        using (node.PropertyChangeManager.SetPropsToSuppress(nameof(NodeModel.ToolTipText), nameof(NodeModel.State)))
+                        {
+                            node.ClearErrorsAndWarnings();
+                        }
+                    }
                 }
 
                 engineController.RemoveRecordedAstGuidsForSession(graphSyncData.SessionID);

diff --git a/src/DynamoCoreWpf/ViewModels/Core/HomeWorkspaceViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/HomeWorkspaceViewModel.cs
@@ -150,6 +150,19 @@ private void UpdateNodesDeltaState(List<Guid> nodeGuids, bool graphExecuted)
 
         void hwm_EvaluationCompleted(object sender, EvaluationCompletedEventArgs e)
         {
+            if (DynamoViewModel.UIDispatcher != null)
+            {
+                DynamoViewModel.UIDispatcher.BeginInvoke(new Action(() =>
+                {
+                    UpdateNodeInfoBubbleContent(e);
+                }));
+            }
+            else
+            {
+                //just call it directly 
+                UpdateNodeInfoBubbleContent(e);
+            }
+
             bool hasWarnings = Model.Nodes.Any(n => n.State == ElementState.Warning || n.State == ElementState.PersistentWarning);
 
             if (!hasWarnings)
@@ -174,6 +187,21 @@ void hwm_EvaluationCompleted(object sender, EvaluationCompletedEventArgs e)
                     SetCurrentWarning(NotificationLevel.Moderate, Properties.Resources.RunCompletedWithWarningsMessage);
                 }
             }
+
+            void UpdateNodeInfoBubbleContent(EvaluationCompletedEventArgs evalargs)
+            {
+                if (e.MessageKeys == null)
+                {
+                    return;
+                }
+                foreach (var messageID in evalargs.MessageKeys)
+                { 
+                    var node = this.Nodes.FirstOrDefault(n => n.Id == messageID);
+                    if (node == null)
+                        continue;
+                    node.UpdateBubbleContent();
+                }
+            }
         }
 
         void hwm_EvaluationStarted(object sender, EventArgs e)

diff --git a/test/DynamoCoreWpfTests/CoreUITests.cs b/test/DynamoCoreWpfTests/CoreUITests.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading;

diff --git a/test/DynamoCoreWpfTests/PythonNodeCustomizationTests.cs b/test/DynamoCoreWpfTests/PythonNodeCustomizationTests.cs
@@ -696,9 +696,9 @@ public void PythonNodeErrorBubblePersists()
             Assert.AreEqual(pynode.EngineName, PythonEngineManager.IronPython2EngineName);
 
             Assert.AreEqual(pynode.State, Dynamo.Graph.Nodes.ElementState.Warning);
-
+            DispatcherUtil.DoEvents();
             var nodeView = NodeViewWithGuid(nodeModel.GUID.ToString());
-
+            
             Assert.IsNotNull(nodeView);
             Assert.IsNotNull(nodeView.ViewModel.ErrorBubble);