GraphNodeManager Update

src/DynamoCore/Graph/Nodes/NodeModel.cs

@@ -1081,11 +1081,34 @@ public virtual NodeOutputData OutputData
                 };
             }
         }
-
+        
         /// A collection of error/warning/info messages, dismissed via a sub-menu in the node Context Menu.
         [JsonIgnore]
         public ObservableCollection<string> DismissedAlerts { get; set; } = new ObservableCollection<string>();
 
+
+        private int _dismissedAlertsCount;
+        /// <summary>
+        ///     Returns the number of dismissed error/warning/info messages.
+        /// </summary>
+        [JsonIgnore]
+        public int DismissedAlertsCount
+        {
+            get
+            {
+                return _dismissedAlertsCount;
+            }
+
+            internal set // Private setter, see "ArgumentLacing" for details.
+            {
+                if (_dismissedAlertsCount != value)
+                {
+                    _dismissedAlertsCount = value;
+                    RaisePropertyChanged(nameof(DismissedAlertsCount));
+                }
+            }
+        }
+
         #endregion
 
         #region freeze execution

src/DynamoCore/Graph/Nodes/NodeModelExtensions.cs

@@ -127,7 +127,7 @@ internal static List<IGraphicItem> GeneratedGraphicItems(this NodeModel node, En
         /// </summary>
         /// <param name="node">target NodeModel</param>
         /// <returns>Original node name as string</returns>
-        internal static string GetOriginalName(this NodeModel node)
+        public static string GetOriginalName(this NodeModel node)
         {
             if (node == null) return string.Empty;
             // For dummy node, return the current name so that does not appear to be renamed

src/DynamoCoreWpf/ViewModels/Core/NodeViewModel.cs

@@ -950,8 +950,19 @@ private void DismissedNodeMessages_CollectionChanged(object sender, NotifyCollec
 
             RaisePropertyChanged(nameof(DismissedAlerts));
             RaisePropertyChanged(nameof(NumberOfDismissedAlerts));
+
+            UpdateModelDismissedAlertsCount();
         }
-
+
+        /// <summary>
+        /// Calls an update for the DismissedAlertCount inside the NodeModel to push PropertyChanged fire
+        /// </summary>
+        private void UpdateModelDismissedAlertsCount()
+        {
+            if(DismissedAlerts != null)
+                nodeLogic.DismissedAlertsCount = DismissedAlerts.Count;
+        }
+
         /// <summary>
         /// Dispose function
         /// </summary>

src/GraphNodeManagerViewExtension/Controls/FilterItemControl.xaml

@@ -36,7 +36,15 @@
                                              Converter={StaticResource BooleanToColorConverter},
                                              ConverterParameter=Default,
                                              UpdateSourceTrigger=PropertyChanged}">
-                    <ContentPresenter />
+                    <StackPanel Orientation="Horizontal">
+                        <Image Source="{Binding FilterImage}" 
+                               Width="12" 
+                               Height="12" 
+                               SnapsToDevicePixels="True"
+                               VerticalAlignment="Stretch"
+                               Margin="2 0 0 0"/>
+                        <ContentPresenter />
+                    </StackPanel>
                 </Border>
 
                 <ControlTemplate.Triggers>

src/GraphNodeManagerViewExtension/GraphNodeManagerView.xaml

@@ -7,6 +7,7 @@
              xmlns:controls="clr-namespace:Dynamo.GraphNodeManager.Controls"
              xmlns:ui="clr-namespace:Dynamo.UI;assembly=DynamoCoreWpf"
              xmlns:p="clr-namespace:Dynamo.GraphNodeManager.Properties"
+             xmlns:controls1="clr-namespace:Dynamo.UI.Controls;assembly=DynamoCoreWpf"
              x:Name="UserControl"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
@@ -62,7 +63,6 @@
                        VerticalAlignment="Center"
                        Source="/GraphNodeManagerViewExtension;component/Images/Export.png"
                        Stretch="UniformToFill"
-                       ToolTip="{x:Static p:Resources.ToolTip_ExportToExcel}"
                        MouseUp="ExportImage_OnMouseUp"
                        Cursor="Hand">
                 <Image.ContextMenu>
@@ -77,6 +77,17 @@
                                       Command="{Binding ExportCommand}" CommandParameter="JSON"/>
                     </ContextMenu>
                 </Image.ContextMenu>
+                <Image.ToolTip>
+                    <controls1:DynamoToolTip AttachmentSide="Bottom" Style="{DynamicResource ResourceKey=SLightToolTip}">
+                        <Grid>
+                            <TextBlock MaxWidth="320"
+                                       Padding="5"
+                                       Foreground="Black" FontSize="12"
+                                       Text="{x:Static p:Resources.ToolTip_ExportToExcel}"
+                                       TextWrapping="Wrap" />
+                        </Grid>
+                    </controls1:DynamoToolTip>
+                </Image.ToolTip>
             </Image>
             <Button x:Name="ClearFiltersButton"
                     DockPanel.Dock="Right"
@@ -141,13 +152,33 @@
             <DataGrid.Columns>
 
                 <!-- Name -->
-                <DataGridTextColumn
+                <DataGridTemplateColumn
                     Header="Name"
-                    Binding="{Binding Name}"
-                    FontWeight="Light"
-                    Foreground="#F5F5F5"
                     IsReadOnly="True"
-                    Width="6*"></DataGridTextColumn>
+                    Width="6*">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <DockPanel HorizontalAlignment="Stretch">
+                                <TextBlock 
+                                    Text="{Binding Name}"
+                                    FontWeight="Light"
+                                    Foreground="#F5F5F5"
+                                    DockPanel.Dock="Left"></TextBlock>
+                                <Grid 
+                                    DockPanel.Dock="Right">
+                                    <Ellipse Name="nodeRenamedBlueDot"
+                                             Width="6"
+                                             Height="6"
+                                             Margin="0 0 6 0"
+                                             HorizontalAlignment="Right"
+                                             VerticalAlignment="Center"
+                                             Fill="{StaticResource Blue300Brush}"
+                                             Visibility="{Binding IsRenamed, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                                </Grid>
+                            </DockPanel>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
 
                 <!-- Type -->
                 <DataGridTemplateColumn
@@ -308,10 +339,20 @@
                                                             Tag="{Binding ElementName=DetailedRowItemControl, Path=DataContext}"
                                                             Width="24"
                                                             VerticalAlignment="Top"
-                                                            ToolTip="{x:Static p:Resources.ToolTip_CopyToClipboard}"
                                                             Cursor="Hand">
                                                     <Image Source="/GraphNodeManagerViewExtension;component/Images/Copy.png" 
                                                            Style="{StaticResource ImageStyle}"/>
+                                                    <Button.ToolTip>
+                                                        <controls1:DynamoToolTip AttachmentSide="Bottom" Style="{DynamicResource ResourceKey=SLightToolTip}">
+                                                            <Grid>
+                                                                <TextBlock MaxWidth="320"
+                                                                           Padding="5"
+                                                                           Foreground="Black" FontSize="12"
+                                                                           Text="{x:Static p:Resources.ToolTip_CopyToClipboard}"
+                                                                           TextWrapping="Wrap" />
+                                                            </Grid>
+                                                        </controls1:DynamoToolTip>
+                                                    </Button.ToolTip>
                                                 </Button>
                                             </Grid>
                                         </Border>

src/GraphNodeManagerViewExtension/GraphNodeManagerViewModel.cs

@@ -206,18 +206,18 @@ public GraphNodeManagerViewModel(ViewLoadedParams p, string id, Action<Logging.I
 
 
         private void InitializeFilters()
-        {   //TODO this should really not use localized text... it should use an enum etc.
-            FilterItems.Add(new FilterViewModel(this){Name = Resources.Title_EmptyList }); 
-            FilterItems.Add(new FilterViewModel(this){Name = Resources.Title_Error });
-            FilterItems.Add(new FilterViewModel(this){Name = Resources.Title_Frozen });
-            FilterItems.Add(new FilterViewModel(this){Name = Resources.Title_MissingContent });
-            FilterItems.Add(new FilterViewModel(this){Name = Resources.Title_Function });
-            FilterItems.Add(new FilterViewModel(this){Name = Resources.Title_Information });
-            FilterItems.Add(new FilterViewModel(this){Name = Resources.Title_IsInput });
-            FilterItems.Add(new FilterViewModel(this){Name = Resources.Title_IsOutput });
-            FilterItems.Add(new FilterViewModel(this){Name = Resources.Title_Null });
-            FilterItems.Add(new FilterViewModel(this){Name = Resources.Title_Warning });
-            FilterItems.Add(new FilterViewModel(this){Name = Resources.Title_PreviewOff });
+        {   
+            FilterItems.Add(new FilterViewModel(this){Name = Resources.Title_EmptyList, FilterImage = "pack://application:,,,/GraphNodeManagerViewExtension;component/Images/EmptyList.png" }); 
+            FilterItems.Add(new FilterViewModel(this){Name = Resources.Title_Error, FilterImage = "pack://application:,,,/GraphNodeManagerViewExtension;component/Images/Error.png" });
+            FilterItems.Add(new FilterViewModel(this){Name = Resources.Title_Frozen, FilterImage = "pack://application:,,,/GraphNodeManagerViewExtension;component/Images/Frozen.png" });
+            FilterItems.Add(new FilterViewModel(this){Name = Resources.Title_Function, FilterImage = "pack://application:,,,/GraphNodeManagerViewExtension;component/Images/Function.png" });
+            FilterItems.Add(new FilterViewModel(this){Name = Resources.Title_Information, FilterImage = "pack://application:,,,/GraphNodeManagerViewExtension;component/Images/Info.png" });
+            FilterItems.Add(new FilterViewModel(this){Name = Resources.Title_IsInput, FilterImage = "pack://application:,,,/GraphNodeManagerViewExtension;component/Images/IsInput.png" });
+            FilterItems.Add(new FilterViewModel(this){Name = Resources.Title_IsOutput, FilterImage = "pack://application:,,,/GraphNodeManagerViewExtension;component/Images/IsOutput.png" });
+            FilterItems.Add(new FilterViewModel(this){Name = Resources.Title_MissingContent, FilterImage = "pack://application:,,,/GraphNodeManagerViewExtension;component/Images/MissingNode.png" });
+            FilterItems.Add(new FilterViewModel(this){Name = Resources.Title_Null, FilterImage = "pack://application:,,,/GraphNodeManagerViewExtension;component/Images/Null.png" });
+            FilterItems.Add(new FilterViewModel(this){Name = Resources.Title_Warning, FilterImage = "pack://application:,,,/GraphNodeManagerViewExtension;component/Images/Alert.png" });
+            FilterItems.Add(new FilterViewModel(this){Name = Resources.Title_PreviewOff, FilterImage = "pack://application:,,,/GraphNodeManagerViewExtension;component/Images/Hidden.png" });
 
             filterDictionary = new Dictionary<string, FilterViewModel>(FilterItems.ToDictionary(fi => fi.Name));
         }
@@ -325,18 +325,37 @@ internal void ExportGraph(object parameter)
         {
             if (parameter == null) return;
             string type = parameter.ToString();
+            string promptName =  System.IO.Path.GetFileNameWithoutExtension(currentWorkspace.FileName);
+
+            var filteredNodes = FilteredNodesArray();
 
             switch (type)
             {
                 case "CSV":
-                    Utilities.Utilities.ExportToCSV(Nodes.ToArray());
+                    Utilities.Utilities.ExportToCSV(filteredNodes, promptName);
                     break;
                 case "JSON":
-                    Utilities.Utilities.ExportToJson(Nodes.ToArray());
+                    Utilities.Utilities.ExportToJson(filteredNodes, promptName);
                     break;
             }
         }
 
+        /// <summary>
+        /// Helper method to return an Array of the currently active Nodes
+        /// </summary>
+        /// <returns></returns>
+        private GridNodeViewModel [] FilteredNodesArray()
+        {
+            var filteredNodes = new List<GridNodeViewModel>();
+
+            foreach (var item in GraphNodeManagerView.NodesInfoDataGrid.ItemsSource)
+            {
+                filteredNodes.Add((item as GridNodeViewModel));
+            }
+
+            return filteredNodes.ToArray();
+        }
+
         /// <summary>
         /// On changing a condition that affects the filter
         /// </summary>

src/GraphNodeManagerViewExtension/Properties/Resources.en-US.resx

@@ -124,7 +124,7 @@
     <value>Show _Graph Node Manager</value>
   </data>
   <data name="Title_EmptyList" xml:space="preserve">
-    <value>Empty List</value>
+    <value>Empty list</value>
   </data>
   <data name="Title_Error" xml:space="preserve">
     <value>Error</value>
@@ -136,13 +136,13 @@
     <value>Function</value>
   </data>
   <data name="Title_Information" xml:space="preserve">
-    <value>Information</value>
+    <value>Info</value>
   </data>
   <data name="Title_IsInput" xml:space="preserve">
-    <value>Is Input</value>
+    <value>Is input</value>
   </data>
   <data name="Title_IsOutput" xml:space="preserve">
-    <value>Is Output</value>
+    <value>Is output</value>
   </data>
   <data name="Title_MissingContent" xml:space="preserve">
     <value>Missing content</value>
@@ -151,7 +151,7 @@
     <value>Null</value>
   </data>
   <data name="Title_PreviewOff" xml:space="preserve">
-    <value>Preview Off</value>
+    <value>Preview off</value>
   </data>
   <data name="Title_Warning" xml:space="preserve">
     <value>Warning</value>
@@ -163,9 +163,9 @@
     <value>Copy to clipboard</value>
   </data>
   <data name="ToolTip_DismissedWarnings" xml:space="preserve">
-    <value>Dismissed Warnings</value>
+    <value>Dismissed warnings</value>
   </data>
   <data name="ToolTip_ExportToExcel" xml:space="preserve">
-    <value>Export to Excel</value>
+    <value>Export</value>
   </data>
 </root>