PluginStoreSorting: Add sorting functionality

- Add GetSortedPlugins to handle different sorts based on the SelectedSortMode
- Show only "None"/"Plugins" & "Installed" categories for sort modes other than default

Author: DavidGBrett

Flow.Launcher/SettingPages/ViewModels/SettingsPanePluginStoreViewModel.cs

@@ -32,6 +32,7 @@ public PluginStoreSortMode SelectedSortMode
             {
                 _selectedSortMode = value;
                 OnPropertyChanged();
+                OnPropertyChanged(nameof(ExternalPlugins));
             }
         }
     }
@@ -106,13 +107,8 @@ public bool ShowExecutable
         }
     }
 
-    public IList<PluginStoreItemViewModel> ExternalPlugins => App.API.GetPluginManifest()
-        .Select(p => new PluginStoreItemViewModel(p))
-        .OrderByDescending(p => p.Category == PluginStoreItemViewModel.NewRelease)
-        .ThenByDescending(p => p.Category == PluginStoreItemViewModel.RecentlyUpdated)
-        .ThenByDescending(p => p.Category == PluginStoreItemViewModel.None)
-        .ThenByDescending(p => p.Category == PluginStoreItemViewModel.Installed)
-        .ToList();
+    public IList<PluginStoreItemViewModel> ExternalPlugins => GetSortedPlugins(
+        App.API.GetPluginManifest().Select(p => new PluginStoreItemViewModel(p)));
 
     [RelayCommand]
     private async Task RefreshExternalPluginsAsync()
@@ -198,6 +194,36 @@ private void UpdateEnumDropdownLocalizations()
         DropdownDataGeneric<PluginStoreSortMode>.UpdateLabels(SortModes);
     }
 
+    private IList<PluginStoreItemViewModel> GetSortedPlugins(IEnumerable<PluginStoreItemViewModel> plugins)
+    {
+        return SelectedSortMode switch
+        {
+            PluginStoreSortMode.Name => plugins
+                .OrderBy(p => p.LabelInstalled)
+                .ThenBy(p => p.Name)
+                .ToList(),
+
+            PluginStoreSortMode.ReleaseDate => plugins
+                .OrderBy(p => p.LabelInstalled)
+                .ThenByDescending(p => p.DateAdded.HasValue)
+                .ThenByDescending(p => p.DateAdded)
+                .ToList(),
+
+            PluginStoreSortMode.UpdatedDate => plugins
+                .OrderBy(p => p.LabelInstalled)
+                .ThenByDescending(p => p.UpdatedDate.HasValue)
+                .ThenByDescending(p => p.UpdatedDate)
+                .ToList(),
+
+            _ => plugins
+                .OrderByDescending(p => p.DefaultCategory == PluginStoreItemViewModel.NewRelease)
+                .ThenByDescending(p => p.DefaultCategory == PluginStoreItemViewModel.RecentlyUpdated)
+                .ThenByDescending(p => p.DefaultCategory == PluginStoreItemViewModel.None)
+                .ThenByDescending(p => p.DefaultCategory == PluginStoreItemViewModel.Installed)
+                .ToList(),
+        };
+    }
+
 }
 
 public enum PluginStoreSortMode

Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml

@@ -22,7 +22,7 @@
             Filter="PluginStoreCollectionView_OnFilter"
             Source="{Binding ExternalPlugins}">
             <CollectionViewSource.GroupDescriptions>
-                <PropertyGroupDescription PropertyName="Category" />
+                <PropertyGroupDescription PropertyName="DefaultCategory" />
             </CollectionViewSource.GroupDescriptions>
         </CollectionViewSource>
     </ui:Page.Resources>

Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml.cs

@@ -29,19 +29,28 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
         {
             InitializeComponent();
         }
+        UpdateCategoryGrouping();
         _viewModel.PropertyChanged += ViewModel_PropertyChanged;
         base.OnNavigatedTo(e);
     }
 
     private void ViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e)
     {
+        // If SelectedSortMode changed, then we need to update the categories
+        if (e.PropertyName == nameof(SettingsPanePluginStoreViewModel.SelectedSortMode))
+        {
+            UpdateCategoryGrouping();
+        }
+
+        // Check if changed property requires PluginStoreCollectionView refresh
         switch (e.PropertyName)
         {
             case nameof(SettingsPanePluginStoreViewModel.FilterText):
             case nameof(SettingsPanePluginStoreViewModel.ShowDotNet):
             case nameof(SettingsPanePluginStoreViewModel.ShowPython):
             case nameof(SettingsPanePluginStoreViewModel.ShowNodeJs):
             case nameof(SettingsPanePluginStoreViewModel.ShowExecutable):
+            case nameof(SettingsPanePluginStoreViewModel.SelectedSortMode):
                 ((CollectionViewSource)FindResource("PluginStoreCollectionView")).View.Refresh();
                 break;
         }
@@ -75,4 +84,23 @@ private void PluginStoreCollectionView_OnFilter(object sender, FilterEventArgs e
 
         e.Accepted = _viewModel.SatisfiesFilter(plugin);
     }
+
+    private void UpdateCategoryGrouping()
+    {
+        var collectionView = (CollectionViewSource)FindResource("PluginStoreCollectionView");
+        var groupDescriptions = collectionView.GroupDescriptions;
+
+        groupDescriptions.Clear();
+
+        // For default sorting mode we use the default categories 
+        if (_viewModel.SelectedSortMode == PluginStoreSortMode.Default)
+        {
+            groupDescriptions.Add(new PropertyGroupDescription(nameof(PluginStoreItemViewModel.DefaultCategory)));
+        }
+
+        // Otherwise we only split by installed or not
+        else{
+            groupDescriptions.Add(new PropertyGroupDescription(nameof(PluginStoreItemViewModel.InstallCategory)));
+        }
+    }
 }

Flow.Launcher/ViewModel/PluginStoreItemViewModel.cs

@@ -28,6 +28,8 @@ public PluginStoreItemViewModel(UserPlugin plugin)
         public string UrlDownload => _newPlugin.UrlDownload;
         public string UrlSourceCode => _newPlugin.UrlSourceCode;
         public string IcoPath => _newPlugin.IcoPath;
+        public DateTime? DateAdded => _newPlugin.DateAdded;
+        public DateTime? UpdatedDate => _newPlugin.LatestReleaseDate;
 
         public bool LabelInstalled => _oldPluginPair != null;
         public bool LabelUpdate => LabelInstalled && new Version(_newPlugin.Version) > new Version(_oldPluginPair.Metadata.Version);
@@ -37,7 +39,9 @@ public PluginStoreItemViewModel(UserPlugin plugin)
         internal const string NewRelease = "NewRelease";
         internal const string Installed = "Installed";
 
-        public string Category
+        public string InstallCategory => LabelInstalled ? Installed : None;
+
+        public string DefaultCategory
         {
             get
             {