[Cherry-pick] [DYN-8546] Curve Mapper: Add Info bubble (#16228)

Co-authored-by: Ivo Petrov <[email protected]>

Author: github-actions[bot]

doc/distrib/xml/en-US/DSCoreNodes.xml

@@ -208,6 +208,19 @@ internal void OnNodeInfoMessagesClearing()
             NodeInfoMessagesClearing?.Invoke(this);
         }
 
+        /// <summary>
+        /// Event triggered when the node clears only warning messages
+        /// </summary>
+        public event Action<NodeModel> NodeWarningMessagesClearing;
+
+        /// <summary>
+        /// Fires on each node that is modified to clear only warning messages, when the graph executes.
+        /// </summary>
+        internal void OnNodeWarningMessagesClearing()
+        {
+            NodeWarningMessagesClearing?.Invoke(this);
+        }
+
         internal void OnNodeExecutionBegin()
         {
             NodeExecutionBegin?.Invoke(this);
@@ -1730,7 +1743,20 @@ public virtual void ClearErrorsAndWarnings()
 
             SetNodeStateBasedOnConnectionAndDefaults();
             ClearTransientWarningsAndErrors();
-            OnNodeMessagesClearing();
+
+            // If persistent info is still present, ensure it is reflected in the node state
+            if (Infos.Any(x => x.State == ElementState.PersistentInfo))
+            {
+                // Ensure state reflects PersistentInfo if any such messages remain.
+                // Prevents info from being stuck or skipped in future updates.
+                // Without this, ClearInfoMessages won't remove them properly.
+                State = ElementState.PersistentInfo;
+                OnNodeWarningMessagesClearing();
+            }
+            else
+            {
+                OnNodeMessagesClearing();
+            }
         }
 
         /// <summary>
@@ -1749,6 +1775,11 @@ public virtual void ClearInfoMessages()
             {
                 infos.RemoveWhere(x => x.State == ElementState.PersistentInfo);
             }
+            // If there are still warnings/errors, keep the state unchanged.
+            else if (State == ElementState.Warning || State == ElementState.Error)
+            {
+                infos.RemoveWhere(x => x.State == ElementState.PersistentInfo || x.State == ElementState.Info);
+            }
             State = ElementState.Active;
             OnNodeInfoMessagesClearing();
         }
@@ -1894,6 +1925,8 @@ public void Error(string p)
         /// cleared when the node is next evaluated. If false, the info will be cleared on the next evaluation.</param>
         public void Info(string p, bool isPersistent = false)
         {
+            var initialState = State;
+
             if (isPersistent)
             {
                 if (!Infos.Any(x => x.Message.Equals(p) && x.State == ElementState.PersistentInfo))
@@ -1907,6 +1940,16 @@ public void Info(string p, bool isPersistent = false)
                 State = ElementState.Info;
                 infos.Add(new Info(p, ElementState.Info));
             }
+
+            // Preserve more critical states such as Warning, PersistentWarning, or Error.
+            // We don't want to downgrade the node visually or functionally if it already has
+            // more important issues that should take precedence over an informational message.
+            if (initialState == ElementState.Warning ||
+                initialState == ElementState.PersistentWarning ||
+                initialState == ElementState.Error)
+            {
+                State = initialState;
+            }
         }
 
         /// <summary>

src/DynamoCore/Graph/Nodes/NodeModel.cs

@@ -1016,6 +1016,7 @@ Dynamo.Graph.Nodes.NodeModel.NodeInfos.get -> System.Collections.Generic.List<Dy
 Dynamo.Graph.Nodes.NodeModel.NodeMessagesClearing -> System.Action<Dynamo.Graph.Nodes.NodeModel>
 Dynamo.Graph.Nodes.NodeModel.NodeModel() -> void
 Dynamo.Graph.Nodes.NodeModel.NodeModel(System.Collections.Generic.IEnumerable<Dynamo.Graph.Nodes.PortModel> inPorts, System.Collections.Generic.IEnumerable<Dynamo.Graph.Nodes.PortModel> outPorts) -> void
+Dynamo.Graph.Nodes.NodeModel.NodeWarningMessagesClearing -> System.Action<Dynamo.Graph.Nodes.NodeModel>
 Dynamo.Graph.Nodes.NodeModel.NotifyAstBuildBroken(string p) -> void
 Dynamo.Graph.Nodes.NodeModel.OutPorts.get -> System.Collections.ObjectModel.ObservableCollection<Dynamo.Graph.Nodes.PortModel>
 Dynamo.Graph.Nodes.NodeModel.OutputNodes.get -> System.Collections.Generic.IDictionary<int, System.Collections.Generic.HashSet<System.Tuple<int, Dynamo.Graph.Nodes.NodeModel>>>

src/DynamoCore/PublicAPI.Unshipped.txt

@@ -913,6 +913,7 @@ public NodeViewModel(WorkspaceViewModel workspaceViewModel, NodeModel logic)
             }
             logic.NodeMessagesClearing += Logic_NodeMessagesClearing;
             logic.NodeInfoMessagesClearing += Logic_NodeInfoMessagesClearing;
+            logic.NodeWarningMessagesClearing += Logic_NodeWarningMessagesClearing;
 
             logic_PropertyChanged(this, new PropertyChangedEventArgs(nameof(IsVisible)));
             UpdateBubbleContent();
@@ -1001,6 +1002,36 @@ private void Logic_NodeInfoMessagesClearing(NodeModel obj)
             }
         }
 
+        /// <summary>
+        /// Clears only warning messages from the node's info bubble, preserving any existing info messages.
+        /// </summary>
+        /// <param name="obj"></param>
+        private void Logic_NodeWarningMessagesClearing(NodeModel obj)
+        {
+            if (ErrorBubble == null) return;
+
+            var warningsToRemove = ErrorBubble.NodeMessages.Where(x => x.Style == InfoBubbleViewModel.Style.Warning).ToList();
+
+            if (DynamoViewModel.UIDispatcher != null)
+            {
+                DynamoViewModel.UIDispatcher.Invoke(() =>
+                {
+                    foreach (var itemToRemove in warningsToRemove)
+                    {
+                        ErrorBubble.NodeMessages.Remove(itemToRemove);
+                    }
+                });
+            }
+            else
+            {
+                foreach (var itemToRemove in warningsToRemove)
+                {
+                    ErrorBubble.NodeMessages.Remove(itemToRemove);
+                }
+            }
+            return;
+        }
+
         private void DismissedNodeMessages_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
             if (!(sender is ObservableCollection<InfoBubbleDataPacket> observableCollection)) return;
@@ -1058,7 +1089,8 @@ public override void Dispose()
 
             NodeModel.NodeMessagesClearing -= Logic_NodeMessagesClearing;
             NodeModel.NodeInfoMessagesClearing -= Logic_NodeInfoMessagesClearing;
-            
+            NodeModel.NodeWarningMessagesClearing -= Logic_NodeWarningMessagesClearing;
+
             if (ErrorBubble != null) DisposeErrorBubble();
 
             DynamoSelection.Instance.Selection.CollectionChanged -= SelectionOnCollectionChanged;

src/DynamoCoreWpf/ViewModels/Core/NodeViewModel.cs

@@ -26,8 +26,6 @@ public class CurveMapperNodeModel : NodeModel
         private double maxLimitY = 1;
         private List<Double> pointsCount = new List<double>() { 10.0 };
 
-        private List<double> outputValuesY;
-        private List<double> outputValuesX;
         private List<double> renderValuesY;
         private List<double> renderValuesX;
 
@@ -450,10 +448,6 @@ public void GenerateRenderValues()
                 OnNodeModified();
                 return;
             }
-            if(!IsResizing)
-            {
-                ClearErrorsAndWarnings();
-            }
 
             object curve = null;
 
@@ -528,16 +522,18 @@ public void GenerateRenderValues()
                     break;
             }
 
-            if (curve is not null)
+            if (curve is CurveBase dynamicCurve)
             {
-                dynamic dynamicCurve = curve;
                 RenderValuesX = dynamicCurve.GetCurveXValues(PointsCount, true);
                 RenderValuesY = dynamicCurve.GetCurveYValues(PointsCount, true);
 
+                if (dynamicCurve.IsYOutOfRange)
+                    Info(Properties.Resources.CurveMapperInfoMessage, true);
+                else
+                    ClearInfoMessages();
+
                 if (!IsResizing)
-                {
                     OnNodeModified();
-                }
             }
         }
 

src/Libraries/CoreNodeModels/CurveMapperNodeModel.cs

@@ -748,4 +748,7 @@ double[]</value>
   <data name="ColorPalettePortDataResultToolTip" xml:space="preserve">
     <value>Selected color</value>
   </data>
+  <data name="CurveMapperInfoMessage" xml:space="preserve">
+    <value>When mapping numbers along the curve, some Y values fall outside the specified Y-value domain range.</value>
+  </data>
 </root>

src/Libraries/CoreNodeModels/Properties/Resources.Designer.cs

@@ -748,4 +748,7 @@ double[]</value>
   <data name="ColorPalettePortDataResultToolTip" xml:space="preserve">
     <value>Selected color</value>
   </data>
+  <data name="CurveMapperInfoMessage" xml:space="preserve">
+    <value>When mapping numbers along the curve, some Y values fall outside the specified Y-value domain range.</value>
+  </data>
 </root>

src/Libraries/CoreNodeModels/Properties/Resources.en-US.resx

@@ -16,6 +16,13 @@ public abstract class CurveBase
         protected double CanvasSize;
         protected const double renderIncrementX = 1.0;
 
+        private bool isYOutOfRange;
+        public bool IsYOutOfRange
+        {
+            get => isYOutOfRange;
+            set => isYOutOfRange = value;
+        }
+
         protected CurveBase(double canvasSize)
         {
             CanvasSize = canvasSize;

src/Libraries/CoreNodeModels/Properties/Resources.resx

@@ -64,6 +64,8 @@ protected override (List<double> XValues, List<double> YValues) GenerateCurve(Li
 
             if (isRender)
             {
+                IsYOutOfRange = A > CanvasSize;
+
                 for (double x = 0; x <= ControlPoint2X; x += renderIncrementX)
                 {
                     double y = CanvasSize - ComputeGaussianY(x, A, mu, sigma);