DYN-4794 Run status msg update based on warnings dismiss states (#12882)

QilongTang · web-flow · commit 64cd96e5900e · 2022-05-23T11:23:02.000-04:00
* Update Workspace Runstatus Msg based on warnings dismiss states

* Tooltip Style Updates

* Updates
diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -3144,6 +3144,12 @@ To install the latest version of a package, click Install. \n
   <data name="OnboardingGuideRunGraphTitle" xml:space="preserve">
     <value>Run the graph</value>
   </data>
+  <data name="BubbleDismissAllButtonTooltip" xml:space="preserve">
+    <value>Temporarily dismiss all warnings of this node.</value>
+  </data>
+  <data name="RunCompletedWithWarningsDismissedMessage" xml:space="preserve">
+    <value>Run completed with dismissed warnings.</value>
+  </data>
   <data name="PackageRepositoryLabel" xml:space="preserve">
     <value>Repository</value>
   </data>
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -3131,6 +3131,12 @@ To install the latest version of a package, click Install. \n
   <data name="OnboardingGuideRunGraphTitle" xml:space="preserve">
     <value>Run the graph</value>
   </data>
+  <data name="BubbleDismissAllButtonTooltip" xml:space="preserve">
+    <value>Temporarily dismiss all warnings of this node.</value>
+  </data>
+  <data name="RunCompletedWithWarningsDismissedMessage" xml:space="preserve">
+    <value>Run completed with dismissed warnings.</value>
+  </data>
   <data name="PackageRepositoryLabel" xml:space="preserve">
     <value>Repository</value>
   </data>
diff --git a/src/DynamoCoreWpf/ViewModels/Core/HomeWorkspaceViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/HomeWorkspaceViewModel.cs
@@ -46,6 +46,7 @@ public class HomeWorkspaceViewModel : WorkspaceViewModel
 
         #endregion
 
+        #region public members
         [JsonIgnore]
         public NotificationLevel CurrentNotificationLevel
         {
@@ -68,6 +69,30 @@ public string CurrentNotificationMessage
             }
         }
 
+        /// <summary>
+        /// Boolean indicates if home workspace run with errors
+        /// </summary>
+        public bool HasErrors
+        {
+            get { return Model.Nodes.Any(n => n.State == ElementState.Error); }
+        }
+
+        /// <summary>
+        /// Boolean indicates if home workspace is displayed with infos
+        /// </summary>
+        public bool HasInfos
+        {
+            get { return Model.Nodes.Any(n => n.State == ElementState.Info); }
+        }
+
+        /// <summary>
+        /// Boolean indicates if home workspace run with warnings
+        /// </summary>
+        public bool HasWarnings
+        {
+            get { return Model.Nodes.Any(n => n.State == ElementState.Warning || n.State == ElementState.PersistentWarning); }
+        }
+
         /// <summary>
         /// Contains all footer notification item bindings
         /// </summary>
@@ -82,6 +107,8 @@ public ObservableCollection<FooterNotificationItem> FooterNotificationItems
             }
         }
 
+        #endregion
+
         public HomeWorkspaceViewModel(HomeWorkspaceModel model, DynamoViewModel dynamoViewModel)
             : base(model, dynamoViewModel)
         {
@@ -227,12 +254,18 @@ void hwm_EvaluationCompleted(object sender, EvaluationCompletedEventArgs e)
                 //just call it directly 
                 UpdateNodeInfoBubbleContent(e);
             }
-        
-            bool hasInfo = Model.Nodes.Any(n => n.State == ElementState.Info);
-            bool hasWarnings = Model.Nodes.Any(n => n.State == ElementState.Warning || n.State == ElementState.PersistentWarning);
-            bool hasErrors = Model.Nodes.Any(n => n.State == ElementState.Error);
 
-            if (!hasWarnings && !hasErrors)
+            UpdateRunStatusMsgBasedOnStates();
+            UpdateFooterItems(HasInfos, HasWarnings, HasErrors);
+        }
+
+
+        /// <summary>
+        /// Update run status message based on error/warning/info states
+        /// </summary>
+        internal void UpdateRunStatusMsgBasedOnStates()
+        {
+            if (!HasWarnings && !HasErrors)
             {
                 if (Model.ScaleFactorChanged)
                 {
@@ -243,15 +276,23 @@ void hwm_EvaluationCompleted(object sender, EvaluationCompletedEventArgs e)
                     SetCurrentWarning(NotificationLevel.Mild, Properties.Resources.RunCompletedMessage);
                 }
             }
-            else if(hasWarnings && !hasErrors)
+            else if (HasWarnings && !HasErrors)
             {
                 if (Model.ScaleFactorChanged)
                 {
                     SetCurrentWarning(NotificationLevel.Moderate, Properties.Resources.RunCompletedWithScaleChangeAndWarningsMessage);
                 }
+                // If all nodes with warnings dismissed and graph has no errors, update the run status msg
                 else
                 {
-                    SetCurrentWarning(NotificationLevel.Moderate, Properties.Resources.RunCompletedWithWarningsMessage);
+                    if (Nodes.All(x => x.ErrorBubble?.DismissedMessages.Count() == x.ErrorBubble?.NodeMessages.Count()))
+                    {
+                        SetCurrentWarning(NotificationLevel.Moderate, Properties.Resources.RunCompletedWithWarningsDismissedMessage);
+                    }
+                    else
+                    {
+                        SetCurrentWarning(NotificationLevel.Moderate, Properties.Resources.RunCompletedWithWarningsMessage);
+                    }
                 }
             }
             else
@@ -265,8 +306,6 @@ void hwm_EvaluationCompleted(object sender, EvaluationCompletedEventArgs e)
                     SetCurrentWarning(NotificationLevel.Error, Properties.Resources.RunCompletedWithErrorsMessage);
                 }
             }
-
-            UpdateFooterItems(hasInfo, hasWarnings, hasErrors);
         }
 
         /// <summary>
diff --git a/src/DynamoCoreWpf/ViewModels/Preview/InfoBubbleViewModel.cs b/src/DynamoCoreWpf/ViewModels/Preview/InfoBubbleViewModel.cs
@@ -3,6 +3,7 @@
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows;
+using Dynamo.Wpf.ViewModels.Core;
 
 namespace Dynamo.ViewModels
 {
@@ -623,6 +624,7 @@ private void UndismissMessage(object parameter)
                 DismissedMessages.Remove(DismissedMessages[i]);
             }
             RefreshNodeInformationalStateDisplay();
+            ValidateWorkspaceRunStatusMsg();
         }
 
 
@@ -985,6 +987,18 @@ private void SetDisplayMessages(List<InfoBubbleDataPacket> infoBubbleDataPackets
             for (int i = 0; i < displayMessages.Count; i++) targetCollection.Add(displayMessages[i]);
         }
         
+        /// <summary>
+        /// Validate and update workspace run status message
+        /// </summary>
+        internal void ValidateWorkspaceRunStatusMsg()
+        {
+            // if current workspace is not a home workspace, skip this step
+            if(DynamoViewModel.CurrentSpaceViewModel.IsHomeSpace)
+            {
+                (DynamoViewModel.CurrentSpaceViewModel as HomeWorkspaceViewModel).UpdateRunStatusMsgBasedOnStates();
+            }
+        }
+
         /// <summary>
         /// Unsubscribes from any events this class is subscribed to.
         /// </summary>
diff --git a/src/DynamoCoreWpf/Views/Preview/InfoBubbleView.xaml b/src/DynamoCoreWpf/Views/Preview/InfoBubbleView.xaml
@@ -547,7 +547,11 @@
                                         Click="DismissAllWarningsButton_Click"
                                         Content="{x:Static p:Resources.NodeInformationalStateDismissAll}"
                                         Foreground="#0696D7"
-                                        Visibility="{Binding ElementName=InfoBubbleWindowUserControl, Path=DataContext.NodeWarningsSectionExpanded, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
+                                        Visibility="{Binding ElementName=InfoBubbleWindowUserControl, Path=DataContext.NodeWarningsSectionExpanded, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" >
+                                    <Button.ToolTip>
+                                        <ToolTip Content="{x:Static p:Resources.BubbleDismissAllButtonTooltip}" Style="{StaticResource GenericToolTipLight}" />
+                                    </Button.ToolTip>
+                                </Button>
                                 <Button Name="ShowAllWarningsButton"
                                         Margin="0,0,10,0"
                                         HorizontalAlignment="Right"
diff --git a/src/DynamoCoreWpf/Views/Preview/InfoBubbleView.xaml.cs b/src/DynamoCoreWpf/Views/Preview/InfoBubbleView.xaml.cs
@@ -1046,6 +1046,7 @@ private void DismissAllWarningsButton_Click(object sender, RoutedEventArgs e)
             // Track dismiss warning event and how many warnings dismissed
             Analytics.TrackEvent(Actions.Dismiss, Categories.NodeOperations, "Warning", ViewModel.DismissedMessages.Count);
             ViewModel.RefreshNodeInformationalStateDisplay();
+            viewModel.ValidateWorkspaceRunStatusMsg();
         }
 
 

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ public class HomeWorkspaceViewModel : WorkspaceViewModel`
`46`	`46`
`47`	`47`	`#endregion`
`48`	`48`
	`49`	`+ #region public members`
`49`	`50`	`[JsonIgnore]`
`50`	`51`	`public NotificationLevel CurrentNotificationLevel`
`51`	`52`	`{`
`@@ -68,6 +69,30 @@ public string CurrentNotificationMessage`
`68`	`69`	`}`
`69`	`70`	`}`
`70`	`71`
	`72`	`+ /// <summary>`
	`73`	`+ /// Boolean indicates if home workspace run with errors`
	`74`	`+ /// </summary>`
	`75`	`+ public bool HasErrors`
	`76`	`+ {`
	`77`	`+ get { return Model.Nodes.Any(n => n.State == ElementState.Error); }`
	`78`	`+ }`
	`79`	`+`
	`80`	`+ /// <summary>`
	`81`	`+ /// Boolean indicates if home workspace is displayed with infos`
	`82`	`+ /// </summary>`
	`83`	`+ public bool HasInfos`
	`84`	`+ {`
	`85`	`+ get { return Model.Nodes.Any(n => n.State == ElementState.Info); }`
	`86`	`+ }`
	`87`	`+`
	`88`	`+ /// <summary>`
	`89`	`+ /// Boolean indicates if home workspace run with warnings`
	`90`	`+ /// </summary>`
	`91`	`+ public bool HasWarnings`
	`92`	`+ {`
	`93`	`+ get { return Model.Nodes.Any(n => n.State == ElementState.Warning \|\| n.State == ElementState.PersistentWarning); }`
	`94`	`+ }`
	`95`	`+`
`71`	`96`	`/// <summary>`
`72`	`97`	`/// Contains all footer notification item bindings`
`73`	`98`	`/// </summary>`
`@@ -82,6 +107,8 @@ public ObservableCollection<FooterNotificationItem> FooterNotificationItems`
`82`	`107`	`}`
`83`	`108`	`}`
`84`	`109`
	`110`	`+ #endregion`
	`111`	`+`
`85`	`112`	`public HomeWorkspaceViewModel(HomeWorkspaceModel model, DynamoViewModel dynamoViewModel)`
`86`	`113`	`: base(model, dynamoViewModel)`
`87`	`114`	`{`
`@@ -227,12 +254,18 @@ void hwm_EvaluationCompleted(object sender, EvaluationCompletedEventArgs e)`
`227`	`254`	`//just call it directly`
`228`	`255`	`UpdateNodeInfoBubbleContent(e);`
`229`	`256`	`}`
`230`		`-`
`231`		`- bool hasInfo = Model.Nodes.Any(n => n.State == ElementState.Info);`
`232`		`- bool hasWarnings = Model.Nodes.Any(n => n.State == ElementState.Warning \|\| n.State == ElementState.PersistentWarning);`
`233`		`- bool hasErrors = Model.Nodes.Any(n => n.State == ElementState.Error);`
`234`	`257`
`235`		`- if (!hasWarnings && !hasErrors)`
	`258`	`+ UpdateRunStatusMsgBasedOnStates();`
	`259`	`+ UpdateFooterItems(HasInfos, HasWarnings, HasErrors);`
	`260`	`+ }`
	`261`	`+`
	`262`	`+`
	`263`	`+ /// <summary>`
	`264`	`+ /// Update run status message based on error/warning/info states`
	`265`	`+ /// </summary>`
	`266`	`+ internal void UpdateRunStatusMsgBasedOnStates()`
	`267`	`+ {`
	`268`	`+ if (!HasWarnings && !HasErrors)`
`236`	`269`	`{`
`237`	`270`	`if (Model.ScaleFactorChanged)`
`238`	`271`	`{`
`@@ -243,15 +276,23 @@ void hwm_EvaluationCompleted(object sender, EvaluationCompletedEventArgs e)`
`243`	`276`	`SetCurrentWarning(NotificationLevel.Mild, Properties.Resources.RunCompletedMessage);`
`244`	`277`	`}`
`245`	`278`	`}`
`246`		`- else if(hasWarnings && !hasErrors)`
	`279`	`+ else if (HasWarnings && !HasErrors)`
`247`	`280`	`{`
`248`	`281`	`if (Model.ScaleFactorChanged)`
`249`	`282`	`{`
`250`	`283`	`SetCurrentWarning(NotificationLevel.Moderate, Properties.Resources.RunCompletedWithScaleChangeAndWarningsMessage);`
`251`	`284`	`}`
	`285`	`+ // If all nodes with warnings dismissed and graph has no errors, update the run status msg`
`252`	`286`	`else`
`253`	`287`	`{`
`254`		`- SetCurrentWarning(NotificationLevel.Moderate, Properties.Resources.RunCompletedWithWarningsMessage);`
	`288`	`+ if (Nodes.All(x => x.ErrorBubble?.DismissedMessages.Count() == x.ErrorBubble?.NodeMessages.Count()))`
	`289`	`+ {`
	`290`	`+ SetCurrentWarning(NotificationLevel.Moderate, Properties.Resources.RunCompletedWithWarningsDismissedMessage);`
	`291`	`+ }`
	`292`	`+ else`
	`293`	`+ {`
	`294`	`+ SetCurrentWarning(NotificationLevel.Moderate, Properties.Resources.RunCompletedWithWarningsMessage);`
	`295`	`+ }`
`255`	`296`	`}`
`256`	`297`	`}`
`257`	`298`	`else`
`@@ -265,8 +306,6 @@ void hwm_EvaluationCompleted(object sender, EvaluationCompletedEventArgs e)`
`265`	`306`	`SetCurrentWarning(NotificationLevel.Error, Properties.Resources.RunCompletedWithErrorsMessage);`
`266`	`307`	`}`
`267`	`308`	`}`
`268`		`-`
`269`		`- UpdateFooterItems(hasInfo, hasWarnings, hasErrors);`
`270`	`309`	`}`
`271`	`310`
`272`	`311`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -1046,6 +1046,7 @@ private void DismissAllWarningsButton_Click(object sender, RoutedEventArgs e)`
`1046`	`1046`	`// Track dismiss warning event and how many warnings dismissed`
`1047`	`1047`	`Analytics.TrackEvent(Actions.Dismiss, Categories.NodeOperations, "Warning", ViewModel.DismissedMessages.Count);`
`1048`	`1048`	`ViewModel.RefreshNodeInformationalStateDisplay();`
	`1049`	`+ viewModel.ValidateWorkspaceRunStatusMsg();`
`1049`	`1050`	`}`
`1050`	`1051`
`1051`	`1052`