Cleanup and preparation for refactoring menu in advanced search

Author: ATrefzer

CSharpCodeAnalyst/Areas/AdvancedSearchArea/AdvancedSearchControl.xaml

@@ -16,7 +16,6 @@
                 <ResourceDictionary Source="/Styles/DataGridStyles.xaml" />
                 <ResourceDictionary Source="/Styles/ImageStyles.xaml" />
             </ResourceDictionary.MergedDictionaries>
-            <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
 
         </ResourceDictionary>
     </UserControl.Resources>
@@ -76,7 +75,7 @@
 
                                         <MenuItem Header="{x:Static resources:Strings.CopyFullQualifiedNameToClipboard}"
                                                   Command="{Binding CopyToClipboardCommand}"
-                                                  CommandParameter="{Binding PlacementTarget.SelectedItem, RelativeSource={RelativeSource AncestorType=ContextMenu}}">
+                                                  CommandParameter="{Binding PlacementTarget.SelectedItems, RelativeSource={RelativeSource AncestorType=ContextMenu}}">
                                             <MenuItem.Icon>
                                                 <Image Source="/Resources/copy_fqn_16.png" />
                                             </MenuItem.Icon>

CSharpCodeAnalyst/Areas/AdvancedSearchArea/AdvancedSearchViewModel.cs

@@ -38,12 +38,11 @@ public AdvancedSearchViewModel(MessageBus messaging)
             ExecuteSearchInternal();
         };
 
-        SearchCommand = new WpfCommand(ExecuteSearch);
         ClearSearchCommand = new WpfCommand(ClearSearch);
         AddSelectedToGraphCommand = new WpfCommand<object>(AddSelectedToGraph);
         AddSelectedToGraphCollapsedCommand = new WpfCommand<object>(AddSelectedToGraphCollapsed);
         PartitionCommand = new WpfCommand<SearchItemViewModel>(OnPartition, CanPartition);
-        CopyToClipboardCommand = new WpfCommand<SearchItemViewModel>(OnCopyToClipboard);
+        CopyToClipboardCommand = new WpfCommand<object>(OnCopyToClipboard);
     }
 
     public ObservableCollection<SearchItemViewModel> AllItems
@@ -79,7 +78,6 @@ public string SearchText
         }
     }
 
-    public ICommand SearchCommand { get; }
     public ICommand ClearSearchCommand { get; }
     public ICommand AddSelectedToGraphCommand { get; }
     public ICommand AddSelectedToGraphCollapsedCommand { get; }
@@ -88,9 +86,11 @@ public string SearchText
 
     public event PropertyChangedEventHandler? PropertyChanged;
 
-    private static void OnCopyToClipboard(SearchItemViewModel vm)
+    private static void OnCopyToClipboard(object? items)
     {
-        var text = vm?.CodeElement?.FullName;
+        var elements = GetSelectedCodeElements(items);
+
+        var text = string.Join(Environment.NewLine, elements.Select(e => e.FullName));
         if (string.IsNullOrEmpty(text))
         {
             return;
@@ -111,13 +111,13 @@ private void OnPartition(SearchItemViewModel? vm)
             _messaging.Publish(new ShowPartitionsRequest(vm.CodeElement, false));
         }
     }
-    
+
     public void HandleCodeGraphRefactored(CodeGraphRefactored message)
     {
         // This operation is not that expensive
         LoadCodeGraph(message.Graph);
     }
-    
+
 
     public void LoadCodeGraph(CodeGraph codeGraph)
     {
@@ -187,18 +187,40 @@ private void AddSelectedToGraphCollapsed(object? selectedItems)
 
     private void AddSelectedToGraphInternal(object? selectedItems, bool addCollapsed)
     {
+        var codeElements = GetSelectedCodeElements(selectedItems);
+
+        if (codeElements.Count > 0)
+        {
+            _messaging.Publish(new AddNodeToGraphRequest(codeElements, addCollapsed));
+        }
+    }
+
+    private static List<CodeElement> GetSelectedCodeElements(object? selectedItems)
+    {
+        var elements = new List<CodeElement>();
+
+        if (selectedItems is null)
+        {
+            return elements;
+        }
+
+        if (selectedItems is SearchItemViewModel { CodeElement: not null } item)
+        {
+            elements.Add(item.CodeElement);
+            return elements;
+        }
+
         if (selectedItems is IList list)
         {
-            var codeElements = list.Cast<SearchItemViewModel>()
-                .Where(item => item.CodeElement != null)
-                .Select(item => item.CodeElement!)
+            var codeElements = list.OfType<SearchItemViewModel>()
+                .Where(i => i.CodeElement != null)
+                .Select(i => i.CodeElement!)
                 .ToList();
 
-            if (codeElements.Count > 0)
-            {
-                _messaging.Publish(new AddNodeToGraphRequest(codeElements, addCollapsed));
-            }
+            elements.AddRange(codeElements);
         }
+
+        return elements;
     }
 
     private void OnPropertyChanged(string propertyName)

CSharpCodeAnalyst/Shared/UI/ToastManager.cs

@@ -11,7 +11,7 @@ public enum ToastType
 
 public static class ToastManager
 {
-    private static readonly List<ToastNotification> _activeToasts = new();
+    private static readonly List<ToastNotification> ActiveToasts = new();
     private static readonly double ToastSpacing = 10; // Spacing between stacked toasts
     private static readonly double RightMargin = 20;
     private static readonly double TopMargin = 100;
@@ -48,12 +48,12 @@ private static void ShowToast(string message, int durationMs, ToastType type = T
             };
 
             // Track active toasts
-            _activeToasts.Add(toast);
+            ActiveToasts.Add(toast);
 
             // Remove from tracking when closed
             toast.Closed += (s, e) =>
             {
-                _activeToasts.Remove(toast);
+                ActiveToasts.Remove(toast);
                 RepositionToasts(workingArea);
             };
 
@@ -67,12 +67,12 @@ private static void PositionToast(ToastNotification toast, Rect workingArea)
         // Calculate vertical offset based on number of existing toasts
         double topOffset = TopMargin;
 
-        int index = _activeToasts.IndexOf(toast);
+        int index = ActiveToasts.IndexOf(toast);
         for (int i = 0; i < index; i++)
         {
-            if (_activeToasts[i].IsLoaded)
+            if (ActiveToasts[i].IsLoaded)
             {
-                topOffset += _activeToasts[i].ActualHeight + ToastSpacing;
+                topOffset += ActiveToasts[i].ActualHeight + ToastSpacing;
             }
         }
 
@@ -86,7 +86,7 @@ private static void RepositionToasts(Rect workingArea)
         // Reposition all active toasts to fill gaps
         double topOffset = TopMargin;
 
-        foreach (var toast in _activeToasts)
+        foreach (var toast in ActiveToasts)
         {
             if (toast.IsLoaded)
             {