Fix post error update to remove the non-pointer message

DynamoDS · Oct 22, 2023 · 62a489d · 62a489d
1 parent 0dabf04
commit 62a489d
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 19 deletions.
diff --git a/src/DynamoUtilities/Properties/AssemblyInfo.cs b/src/DynamoUtilities/Properties/AssemblyInfo.cs
@@ -12,6 +12,7 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("fdd60a60-c6e4-4f11-b583-8a417061c043")]
 [assembly: InternalsVisibleTo("DynamoCore")]
+[assembly: InternalsVisibleTo("CoreNodeModels")]
 [assembly: InternalsVisibleTo("DynamoCoreWpf")]
 [assembly: InternalsVisibleTo("DynamoCoreTests")]
 [assembly: InternalsVisibleTo("DynamoCoreWpfTests")]

diff --git a/src/Libraries/CoreNodeModels/Remember.cs b/src/Libraries/CoreNodeModels/Remember.cs
@@ -10,6 +10,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using VMDataBridge;
+using System.Collections.Specialized;
 
 namespace CoreNodeModels
 {
@@ -26,19 +27,19 @@ namespace CoreNodeModels
     [DynamoServices.RegisterForTrace]
     public class Remember : NodeModel
     {
-        private string _cache = "";
-        private string _updatedToolTipText = "";
+        private string cache = "";
+        private string updatedMessage = "";
 
         [JsonProperty("Cache")]
         public string Cache
         {
-            get { return _cache; }
+            get { return cache; }
             set
             {
                 var valueToSet = value == null ? "" : value;
-                if (valueToSet != _cache)
+                if (valueToSet != cache)
                 {
-                    _cache = valueToSet;
+                    cache = valueToSet;
                     MarkNodeAsModified();
                 }
             }
@@ -48,12 +49,14 @@ public string Cache
         private Remember(IEnumerable<PortModel> inPorts, IEnumerable<PortModel> outPorts) : base(inPorts, outPorts)
         {
             PropertyChanged += OnPropertyChanged;
+            Infos.CollectionChanged += ProcessInfos;
         }
 
         public Remember()
         {
             RegisterAllPorts();
             PropertyChanged += OnPropertyChanged;
+            Infos.CollectionChanged += ProcessInfos;
         }
 
         private void OnPropertyChanged(object sender, PropertyChangedEventArgs e)
@@ -67,20 +70,37 @@ private void OnPropertyChanged(object sender, PropertyChangedEventArgs e)
                     }
                     break;
 
-                case "ToolTipText":
-                    if (State == ElementState.Warning && ToolTipText != _updatedToolTipText)
+                default:
+                    // Nothing to handle
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Handle updating the error message to remove the non-pointer message. 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ProcessInfos(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if(Infos.Count == 0  || State != ElementState.Warning) return;
+            if(Infos.Any(x => x.State == ElementState.Warning && x.Message != updatedMessage))
+            {
+                var infos = new List<Info> { };
+                foreach (var info in Infos)
+                {
+                    if (info.State == ElementState.Warning)
                     {
                         string[] errorMessages =
-                            ToolTipText.Split(new[] { "\r\n", "\n" }, StringSplitOptions.None);
-                        _updatedToolTipText = errorMessages.Last();
-                        ToolTipText = _updatedToolTipText;
+                            info.Message.Split(new[] { "\r\n", "\n" }, StringSplitOptions.None);
+                        updatedMessage = errorMessages.Last();
+
+                        infos.Add(new Info(updatedMessage, ElementState.Warning));
                     }
+                }
 
-                    break;
-
-                default:
-                    // Nothing to handle
-                    break;
+                Infos.RemoveWhere(x => x.State == ElementState.Warning);
+                Infos.AddRange(infos);
             }
         }
 
@@ -92,6 +112,8 @@ protected override void OnBuilt()
 
         public override void Dispose()
         {
+            PropertyChanged -= OnPropertyChanged;
+            Infos.CollectionChanged -= ProcessInfos;
             base.Dispose();
             DataBridge.Instance.UnregisterCallback(GUID.ToString());
         }

diff --git a/src/Libraries/CoreNodes/Data.cs b/src/Libraries/CoreNodes/Data.cs
@@ -430,7 +430,7 @@ public static Dictionary<string, object> Remember([ArbitraryDimensionArrayImport
             }
             catch(Exception ex)
             {
-                throw new NotSupportedException(Properties.Resources.Exception_Serialize_Unsupported_Type);
+                throw new NotSupportedException(string.Format(Properties.Resources.Exception_Serialize_Unsupported_Type, inputObject.GetType().FullName));
             }
 
             return new Dictionary<string, object>

diff --git a/src/Libraries/CoreNodes/Properties/Resources.Designer.cs b/src/Libraries/CoreNodes/Properties/Resources.Designer.cs
diff --git a/src/Libraries/CoreNodes/Properties/Resources.en-US.resx b/src/Libraries/CoreNodes/Properties/Resources.en-US.resx
@@ -145,7 +145,7 @@
     <value>The stored data can not be rebuilt.</value>
   </data>
   <data name="Exception_Serialize_Unsupported_Type" xml:space="preserve">
-    <value>Cannot store data for this input.</value>
+    <value>Cannot store data of type {0}.</value>
   </data>
   <data name="ExportToCSVObsolete" xml:space="preserve">
     <value>Use Data.ExportCSV node instead</value>

diff --git a/src/Libraries/CoreNodes/Properties/Resources.resx b/src/Libraries/CoreNodes/Properties/Resources.resx
@@ -145,7 +145,7 @@
     <value>The stored data can not be rebuilt.</value>
   </data>
   <data name="Exception_Serialize_Unsupported_Type" xml:space="preserve">
-    <value>Cannot store data for this input.</value>
+    <value>Cannot store data of type {0}.</value>
   </data>
   <data name="ExportToCSVObsolete" xml:space="preserve">
     <value>Use Data.ExportCSV node instead</value>