Added: Requested Mod Library Refinements

src/NexusMods.App.Cli/ProtocolVerbs.cs

@@ -2,7 +2,6 @@
 using NexusMods.Abstractions.Cli;
 using NexusMods.Abstractions.FileStore;
 using NexusMods.Abstractions.FileStore.ArchiveMetadata;
-using NexusMods.Abstractions.Games.Loadouts;
 using NexusMods.Abstractions.HttpDownloader;
 using NexusMods.Abstractions.Installers;
 using NexusMods.Abstractions.Loadouts;

src/NexusMods.App.UI/Converters/BooleanInverterConverter.cs

@@ -0,0 +1,23 @@
+using System.Globalization;
+using Avalonia.Data.Converters;
+
+namespace NexusMods.App.UI.Converters;
+
+public class BooleanInverterConverter : IValueConverter
+{
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (value is bool boolValue)
+            return !boolValue;
+
+        return false;
+    }
+
+    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (value is bool boolValue)
+            return !boolValue;
+
+        return false;
+    }
+}

src/NexusMods.App.UI/Helpers/DataGridSelectedItemsAsObservableHelper.cs

@@ -0,0 +1,134 @@
+using System.Diagnostics;
+using System.Linq.Expressions;
+using System.Reflection;
+using Avalonia.Controls;
+using DynamicData;
+
+namespace NexusMods.App.UI.Helpers;
+
+/// <summary>
+/// A helper class that provides an observable collection of selected items for a DataGrid using DynamicData and Observables.
+/// Also see <see cref="DataGridSelectedItemsAsObservableHelperExtensions"/> before using.
+/// </summary>
+/// <typeparam name="T">The type of the items in the DataGrid.</typeparam>
+/// <example>
+/// Usage example:
+/// <code>
+/// public YourViewModel()
+/// {
+///     this.WhenActivated(disposables =&gt;
+///     {
+///         var helper = new DataGridSelectedItemsAsObservableHelper&lt;YourItemType&gt;(MyDataGrid);
+///                      .DisposeWith(disposables);
+///
+///         // Use helper.SelectedItems
+///
+///         // That said, it is recommended you use DataGridSelectedItemsAsObservableHelperExtensions
+///     });
+/// }
+/// </code>
+/// </example>
+public class DataGridSelectedItemsAsObservableHelper<T> : IDisposable where T : notnull
+{
+    private readonly DataGrid _dataGrid;
+    private readonly SourceCache<T, T> _selectedItemsCache;
+
+    /// <summary>
+    /// Contains the currently selected items as an observable.
+    /// </summary>
+    public IObservable<IChangeSet<T, T>> SelectedItems { get; init; }
+
+    public DataGridSelectedItemsAsObservableHelper(DataGrid dataGrid)
+    {
+        _dataGrid = dataGrid;
+        _selectedItemsCache = new SourceCache<T, T>(x => x);
+        SelectedItems = _selectedItemsCache.Connect();
+        _dataGrid.SelectionChanged += DataGridOnSelectionChanged;
+    }
+
+    /// <inheritdoc/>
+    public void Dispose()
+    {
+        _dataGrid.SelectionChanged -= DataGridOnSelectionChanged;
+        _selectedItemsCache.Dispose();
+    }
+
+    private void DataGridOnSelectionChanged(object? sender, SelectionChangedEventArgs e)
+    {
+        // Note(sewer) It's important we use Edit here because the event should be atomic
+        // If we do an `WhenValueChanged` without an Edit, the ReadOnlyObservableCollection
+        // derived from the SourceCache will have a brief period of time where it shows
+        // an item which should just have been removed.
+        _selectedItemsCache.Edit(updater =>
+        {
+            foreach (var removedItem in e.RemovedItems)
+            {
+                Debug.Assert(removedItem is T, "Removed item is not of the correct type");
+                Debug.Assert(removedItem != null, "Removed item is null");
+                updater.RemoveKey((T)removedItem);
+            }
+
+            foreach (var addedItem in e.AddedItems)
+            {    
+                Debug.Assert(addedItem is T, "Added item is not of the correct type");
+                Debug.Assert(addedItem != null, "Added item is null");
+                updater.AddOrUpdate((T)addedItem);
+            }
+        });
+    }
+}
+
+/// <summary>
+/// Extension methods for synchronizing the selected items of a DataGrid with an existing property on a view model using the DataGridSelectedItemsAsObservableHelper.
+/// </summary>
+public static class DataGridSelectedItemsAsObservableHelperExtensions
+{
+    /// <summary>
+    /// Synchronizes the selected items of the current DataGrid with an existing
+    /// property on a view model using the DataGridSelectedItemsAsObservableHelper.
+    ///
+    /// This gets us a DynamicData observable for the selected items of a DataGrid.
+    /// </summary>
+    /// <typeparam name="T">The type of the items in the DataGrid.</typeparam>
+    /// <typeparam name="TVM">Type of ViewModel used.</typeparam>
+    /// <param name="dataGrid">The current DataGrid instance.</param>
+    /// <param name="viewModel">The view model instance.</param>
+    /// <param name="selectedItemsProperty">The property on the view model to synchronize with.</param>
+    /// <example>
+    /// Usage example:
+    /// <code>
+    /// public class YourView : ReactiveUserControl&lt;YourViewModel&gt;
+    /// {
+    ///     public YourView()
+    ///     {
+    ///         this.WhenActivated(d =>
+    ///         {
+    ///             // Synchronize the selected items with the SelectedItems property on the view model using the helper
+    ///             MyDataGrid.SelectedItemsToProperty(ViewModel, vm => vm.SelectedItems)
+    ///                       .DisposeWith(d);
+    ///         });
+    ///     }
+    /// }
+    /// 
+    /// public class YourViewModel : ReactiveObject, IActivatableViewModel
+    /// {
+    ///     public IObservable&lt;IChangeSet&lt;YourItemType&gt;&gt; SelectedItems { get; private set; }
+    /// 
+    ///     public YourViewModel()
+    ///     {
+    ///         // Initialize other properties
+    ///     }
+    /// }
+    /// </code>
+    /// </example>
+    public static IDisposable SelectedItemsToProperty<T, TVM>(this DataGrid dataGrid, TVM viewModel, Expression<Func<TVM, IObservable<IChangeSet<T, T>>>> selectedItemsProperty) where T : notnull
+    {
+        var propertyInfo = ((MemberExpression)selectedItemsProperty.Body).Member as PropertyInfo;
+        if (propertyInfo == null)
+            throw new ArgumentException("The selectedItemsProperty must be a property.");
+
+        var selectedItemsHelper = new DataGridSelectedItemsAsObservableHelper<T>(dataGrid);
+        propertyInfo.SetValue(viewModel, selectedItemsHelper.SelectedItems);
+        return selectedItemsHelper;
+    }
+}

src/NexusMods.App.UI/Pages/LoadoutGrid/ILoadoutGridViewModel.cs

@@ -28,20 +28,6 @@ public interface ILoadoutGridViewModel : IPageViewModelInterface
 
     public ReactiveCommand<NavigationInformation, Unit> ViewModContentsCommand { get; }
 
-    /// <summary>
-    /// Add a mod to the loadout using the standard installer.
-    /// </summary>
-    /// <param name="path"></param>
-    /// <returns></returns>
-    public Task AddMod(string path);
-
-    /// <summary>
-    /// Add a mod to the loadout using the advanced installer.
-    /// </summary>
-    /// <param name="path"></param>
-    /// <returns></returns>
-    public Task AddModAdvanced(string path);
-
     /// <summary>
     /// Delete the mods from the loadout.
     /// </summary>

src/NexusMods.App.UI/Pages/LoadoutGrid/LoadoutGridDesignViewModel.cs

@@ -27,7 +27,5 @@ public class LoadoutGridDesignViewModel(IWindowManager windowManager) : APageVie
 
     public LoadoutGridDesignViewModel() : this(new DesignWindowManager()) { }
 
-    public Task AddMod(string path) => throw new NotImplementedException();
-    public Task AddModAdvanced(string path) => throw new NotImplementedException();
     public Task DeleteMods(IEnumerable<ModId> modsToDelete, string commitMessage) => throw new NotImplementedException();
 }

src/NexusMods.App.UI/Pages/LoadoutGrid/LoadoutGridView.axaml

@@ -13,37 +13,25 @@
     xmlns:resources="clr-namespace:NexusMods.App.UI.Resources"
     xmlns:loadoutGrid="clr-namespace:NexusMods.App.UI.Pages.LoadoutGrid"
     xmlns:navigation="clr-namespace:NexusMods.App.UI.Controls.Navigation"
-    xmlns:ui="clr-namespace:NexusMods.App.UI"
     xmlns:markdownRenderer="clr-namespace:NexusMods.App.UI.Controls.MarkdownRenderer">
     <Design.DataContext>
         <loadoutGrid:LoadoutGridDesignViewModel />
     </Design.DataContext>
     <Grid RowDefinitions="Auto, *">
         <Border Grid.Row="0" Classes="Toolbar">
             <StackPanel>
-                <Button x:Name="DeleteModsButton">
-                    <StackPanel>
-                        <icons:UnifiedIcon Classes="Close" />
-                        <TextBlock Text="{x:Static resources:Language.LoadoutGridView__Remove}"/>
-                    </StackPanel>
-                </Button>
+                <Line/>
+
                 <navigation:NavigationControl x:Name="ViewModFilesButton">
                     <StackPanel>
                         <icons:UnifiedIcon Classes="FolderOutline" />
                         <TextBlock Text="{x:Static resources:Language.LoadoutGridView__View_Files}"/>
                     </StackPanel>
                 </navigation:NavigationControl>
-                <Line/>
-                <Button x:Name="AddModButton">
-                    <StackPanel>
-                        <icons:UnifiedIcon Classes="PlusCircleOutline" />
-                        <TextBlock Text="{x:Static resources:Language.LoadoutGridView__Add_Mod}"/>
-                    </StackPanel>
-                </Button>
-                <Button x:Name="AddModAdvancedButton">
+                <Button x:Name="DeleteModsButton">
                     <StackPanel>
-                        <icons:UnifiedIcon Classes="PlusCircleOutline" />
-                        <TextBlock Text="{x:Static resources:Language.LoadoutGridView__Add_Mod_Advanced}"/>
+                        <icons:UnifiedIcon Classes="Close" />
+                        <TextBlock Text="{x:Static resources:Language.LoadoutGridView__Remove}"/>
                     </StackPanel>
                 </Button>
             </StackPanel>

src/NexusMods.App.UI/Pages/LoadoutGrid/LoadoutGridView.axaml.cs

@@ -51,47 +51,10 @@ public LoadoutGridView()
                 view => view.ModsDataGrid.SelectedIndex,
                 (selectedIndex) => selectedIndex >= 0);
 
-            AddModButton.Command = ReactiveCommand.CreateFromTask(AddMod);
-
-            AddModAdvancedButton.Command = ReactiveCommand.CreateFromTask(AddModAdvanced);
-
             DeleteModsButton.Command = ReactiveCommand.CreateFromTask(DeleteSelectedMods, isItemSelected);
         });
     }
 
-    private async Task AddMod()
-    {
-        foreach (var file in await PickModFiles())
-        {
-            await ViewModel!.AddMod(file.Path.LocalPath);
-        }
-    }
-
-    private async Task AddModAdvanced()
-    {
-        foreach (var file in await PickModFiles())
-        {
-            await ViewModel!.AddModAdvanced(file.Path.LocalPath);
-        }
-    }
-
-    private async Task<IEnumerable<IStorageFile>> PickModFiles()
-    {
-        var provider = TopLevel.GetTopLevel(this)!.StorageProvider;
-        var options =
-            new FilePickerOpenOptions
-            {
-                Title = Language.LoadoutGridView_AddMod_FilePicker_Title,
-                AllowMultiple = true,
-                FileTypeFilter = new[]
-                {
-                    new FilePickerFileType(Language.LoadoutGridView_AddMod_FileType_Archive) {Patterns = new [] {"*.zip", "*.7z", "*.rar"}},
-                }
-            };
-
-        return await provider.OpenFilePickerAsync(options);
-    }
-
     private async Task DeleteSelectedMods()
     {
         var toDelete = new List<ModId>();