Dynamo UI visual status of issues (#11776)

SHKnudsen · web-flow · commit 0a18bfa641a6 · 2021-06-29T09:24:26.000-04:00
* initial commit

* Update DynamoViewModelDelegates.cs

* Update Dynamo.All.sln

* update test

* event updates

* test update

* initial commit

* Update DynamoViewModel.cs

* add open linter view to issue count

* Update Resources.en-US.resx

* initial commit

* initial commit

* Update DynamoViewModelDelegates.cs

* Update Dynamo.All.sln

* test update

* add open linter view to issue count

* remove duplicated OnRequestOpenLinterView

* revert assembly info changes

* LinterManager null checks

* comment updates

* move linter count converter

* Update NotificationsControl.xaml.cs

* Update NotificationsControl.xaml.cs
diff --git a/src/DynamoCoreWpf/Controls/NotificationsControl.xaml b/src/DynamoCoreWpf/Controls/NotificationsControl.xaml
@@ -4,15 +4,24 @@
              xmlns:mc="https://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="https://schemas.microsoft.com/expression/blend/2008" 
              xmlns:core="clr-namespace:Dynamo.Wpf.ViewModels.Core"
+             xmlns:viewmodels="clr-namespace:Dynamo.ViewModels"
+             xmlns:converters="clr-namespace:Dynamo.Controls"
+             xmlns:p="clr-namespace:Dynamo.Wpf.Properties;assembly=DynamoCoreWpf"
+             d:DataContext="{d:DesignInstance Type=viewmodels:DynamoViewModel}"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
 
     <UserControl.Resources>
         <core:NotificationLevelToColorConverter x:Key="NotificationLevelToColorConverter"></core:NotificationLevelToColorConverter>
+        <converters:LinterIssueCountToVisibilityConverter x:Key="LinterIssueCountToVisibilityConverter" />
     </UserControl.Resources>
-    
-    <Grid>
-            <TextBlock
+
+    <Grid HorizontalAlignment="Stretch">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
+        <TextBlock
                 Text="{Binding Path=HomeSpaceViewModel.CurrentNotificationMessage}"
                 FontStyle="Italic"
                 FontSize="12"
@@ -42,5 +51,32 @@
                 </EventTrigger>
             </TextBlock.Triggers>
         </TextBlock>
+        <StackPanel Orientation="Horizontal"
+                    Grid.Column="1"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Center"
+                    Margin="30,0"
+                    MouseDown="StackPanel_MouseDown"
+                    Visibility="{Binding LinterIssuesCount, Converter={StaticResource LinterIssueCountToVisibilityConverter}}">
+            <StackPanel.Style>
+                <Style TargetType="{x:Type StackPanel}">
+                    <Style.Triggers>
+                        <Trigger Property="IsMouseOver"
+                                 Value="True">
+                            <Setter Property="Cursor"
+                                    Value="Hand" />
+                        </Trigger>
+                    </Style.Triggers>
+                </Style>
+            </StackPanel.Style>
+            <Image Width="20"
+                   Source="/DynamoCoreWpf;component/UI/Images/alert.png" />
+            <TextBlock Margin="10,0"
+                       Foreground="White">
+                <Run Text="{Binding LinterIssuesCount, Mode=OneWay}" />
+                <Run Text="{x:Static p:Resources.PersistentVisualStatusOfLinterIssues}" />
+            </TextBlock>
+        </StackPanel>
+
     </Grid>
 </UserControl>
diff --git a/src/DynamoCoreWpf/Controls/NotificationsControl.xaml.cs b/src/DynamoCoreWpf/Controls/NotificationsControl.xaml.cs
@@ -44,5 +44,11 @@ void window_PreviewMouseDown(object sender, MouseButtonEventArgs e)
             // Commented this after MAGN - 8423
             // hsvm.ClearWarning();
         }
+
+        private void StackPanel_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            var viewModel = this.DataContext as DynamoViewModel;
+            viewModel?.OnViewExtensionOpenRequest("Graph Status");
+        }
     }
 }
diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
@@ -1311,6 +1311,7 @@
     <Resource Include="UI\Images\profile_normal.png" />
   </ItemGroup>
   <ItemGroup>
+    <Resource Include="UI\Images\alert.png" />
     <Resource Include="UI\Images\menu_16_16.png" />
     <Resource Include="UI\Images\caret_down.png" />
     <Resource Include="UI\Images\caret_up.png" />
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
@@ -2437,4 +2437,7 @@ Uninstall the following packages: {0}?</value>
   <data name="PreferencesViewShowRunPreviewTooltip" xml:space="preserve">
     <value>Switchable only when the current workspace is in Manual run mode.</value>
   </data>
+  <data name="PersistentVisualStatusOfLinterIssues" xml:space="preserve">
+    <value>Issues found</value>
+  </data>
 </root>
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -2437,4 +2437,7 @@ Uninstall the following packages: {0}?</value>
   <data name="PreferencesViewShowRunPreviewTooltip" xml:space="preserve">
     <value>Switchable only when the current workspace is in Manual run mode.</value>
   </data>
+  <data name="PersistentVisualStatusOfLinterIssues" xml:space="preserve">
+    <value>Issues found</value>
+  </data>
 </root>
diff --git a/src/DynamoCoreWpf/UI/Converters.cs b/src/DynamoCoreWpf/UI/Converters.cs
@@ -3161,4 +3161,25 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
         }
     }
 
+    /// <summary>
+    /// Converts an integer (linter issues count) to a visibility state
+    /// </summary>
+    [ValueConversion(typeof(int), typeof(Visibility))]
+    internal class LinterIssueCountToVisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (!(value is int issueCount) || issueCount == 0)
+            {
+                return Visibility.Collapsed;
+            }
+
+            return Visibility.Visible;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
 }
diff --git a/src/DynamoCoreWpf/UI/Images/alert.png b/src/DynamoCoreWpf/UI/Images/alert.png
diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -145,6 +145,15 @@ public WorkspaceModel CurrentSpace
             get { return model.CurrentWorkspace; }
         }
 
+        /// <summary>
+        /// Count of unresolved issues on the linter manager.
+        /// This is used for binding in the NotificationsControl
+        /// </summary>
+        public int LinterIssuesCount
+        {
+            get => Model.LinterManager?.RuleEvaluationResults.Count ?? 0;
+        }
+
         public double WorkspaceActualHeight { get; set; }
         public double WorkspaceActualWidth { get; set; }
 
@@ -656,6 +665,10 @@ protected DynamoViewModel(StartConfiguration startConfiguration)
            
             model.WorkspaceAdded += WorkspaceAdded;
             model.WorkspaceRemoved += WorkspaceRemoved;
+            if (model.LinterManager != null)
+            {
+                model.LinterManager.RuleEvaluationResults.CollectionChanged += OnRuleEvaluationResultsCollectionChanged;
+            }
              
             SubscribeModelCleaningUpEvent();
             SubscribeModelUiEvents();
@@ -768,6 +781,11 @@ protected virtual void UnsubscribeAllEvents()
 
             model.WorkspaceAdded -= WorkspaceAdded;
             model.WorkspaceRemoved -= WorkspaceRemoved;
+            if (model.LinterManager != null)
+            {
+                model.LinterManager.RuleEvaluationResults.CollectionChanged -= OnRuleEvaluationResultsCollectionChanged;
+            }
+
             DynamoSelection.Instance.Selection.CollectionChanged -= SelectionOnCollectionChanged;
             UsageReportingManager.Instance.PropertyChanged -= CollectInfoManager_PropertyChanged;
         }
@@ -1281,6 +1299,11 @@ private void WorkspaceRemoved(WorkspaceModel item)
             workspaces.Remove(viewModel);
         }
 
+        private void OnRuleEvaluationResultsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            RaisePropertyChanged(nameof(LinterIssuesCount));
+        }
+
         internal void AddToRecentFiles(string path)
         {
             if (path == null) return;
diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml
@@ -1694,23 +1694,22 @@
         </Grid>
 
         <!--Bottom Panel including RunMode etc-->
-        <WrapPanel Orientation="Horizontal"
-                   Grid.Row="5"
-                   Grid.Column="0"
-                   Grid.RowSpan="1"
-                   HorizontalAlignment="Stretch"
-                   VerticalAlignment="Stretch"
-                   Grid.ColumnSpan="5">
-
-            <WrapPanel.Background>
+        <Grid 
+                Grid.Row="5"
+                Grid.Column="0"
+                Grid.RowSpan="1"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                Grid.ColumnSpan="5">
+            <Grid.Background>
                 <LinearGradientBrush  StartPoint="0.5,0"
                                       EndPoint="0.5,1">
                     <GradientStop Color="#222"
                                   Offset="0.0" />
                     <GradientStop Color="#111"
                                   Offset="1.0" />
                 </LinearGradientBrush>
-            </WrapPanel.Background>
+            </Grid.Background>
 
             <Grid Name="bottomBarGrid"
                   Grid.Row="4"
@@ -1720,30 +1719,27 @@
                   HorizontalAlignment="Stretch"
                   VerticalAlignment="Stretch">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*"></ColumnDefinition>
+                    <ColumnDefinition Width="Auto"></ColumnDefinition>
                     <ColumnDefinition Width="*"></ColumnDefinition>
                 </Grid.ColumnDefinitions>
 
                 <WrapPanel Orientation="Horizontal"
                            Grid.Row="0"
                            Grid.Column="0"
                            HorizontalAlignment="Stretch"
-                           VerticalAlignment="Stretch" 
+                           VerticalAlignment="Stretch"
                            Visibility="{Binding IsAbleToGoHome, Converter={StaticResource InverseBoolToVisibilityConverter}}">
 
-                        <controls1:RunSettingsControl x:Name="RunSettingsControl"
-                                                    Margin="2.5,5,5,5" 
-                                                     VerticalAlignment="Stretch"
-                                                     DataContext="{Binding Path=HomeSpaceViewModel.RunSettingsViewModel}"/>
+                    <controls1:RunSettingsControl x:Name="RunSettingsControl"
+                                                  Margin="2.5,5,5,5"
+                                                  VerticalAlignment="Stretch"
+                                                  DataContext="{Binding Path=HomeSpaceViewModel.RunSettingsViewModel}" />
                 </WrapPanel>
-                
+
                 <!--NotificationControl for showing run-time notifications-->
-                <controls1:NotificationsControl Grid.Column="1"/>
-                
+                <controls1:NotificationsControl Grid.Column="1" />
             </Grid>
-
-        </WrapPanel>
-
+        </Grid>
 
         <!--Split Between Console and Canvas-->
         <GridSplitter ResizeDirection="Rows"

Original file line number	Diff line number	Diff line change
`@@ -44,5 +44,11 @@ void window_PreviewMouseDown(object sender, MouseButtonEventArgs e)`
`44`	`44`	`// Commented this after MAGN - 8423`
`45`	`45`	`// hsvm.ClearWarning();`
`46`	`46`	`}`
	`47`	`+`
	`48`	`+ private void StackPanel_MouseDown(object sender, MouseButtonEventArgs e)`
	`49`	`+ {`
	`50`	`+ var viewModel = this.DataContext as DynamoViewModel;`
	`51`	`+ viewModel?.OnViewExtensionOpenRequest("Graph Status");`
	`52`	`+ }`
`47`	`53`	`}`
`48`	`54`	`}`