Feature: Profile filter

Author: BornToBeRoot

Source/NETworkManager/ProfileDialogManager.cs

@@ -9,9 +9,11 @@
 using NETworkManager.Views;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Security;
 using System.Threading.Tasks;
 using System.Windows;
+using NETworkManager.Controls;
 
 namespace NETworkManager;
 
@@ -21,13 +23,18 @@ public static class ProfileDialogManager
 
     private static ProfileInfo ParseProfileInfo(ProfileViewModel instance)
     {
+        foreach (var tag in instance.TagsCollection)
+        {
+            Debug.WriteLine(tag);    
+        }
+        
         return new ProfileInfo
         {
             Name = instance.Name.Trim(),
             Host = instance.Host.Trim(),
             Description = instance.Description?.Trim(),
             Group = instance.Group.Trim(),
-            TagsCollection = instance.TagsCollection,
+            TagsCollection = new ObservableSetCollection<string> (instance.TagsCollection),
 
             // Network Interface
             NetworkInterface_Enabled = instance.NetworkInterface_Enabled,

Source/NETworkManager/ViewModels/AWSSessionManagerHostViewModel.cs

@@ -239,6 +239,70 @@ public bool IsSearching
             OnPropertyChanged();
         }
     }
+    
+    private bool _profileFilterIsOpen;
+
+    public bool ProfileFilterIsOpen
+    {
+        get => _profileFilterIsOpen;
+        set
+        {
+            if (value == _profileFilterIsOpen)
+                return;
+
+            _profileFilterIsOpen = value;
+            OnPropertyChanged();
+        }
+    }
+
+    public ICollectionView ProfileFilterTagsView { get; }
+
+    private ObservableCollection<ProfileFilterTagsInfo> ProfileFilterTags { get; } = [];
+
+    private bool _profileFilterTagsMatchAny = GlobalStaticConfiguration.Profile_TagsMatchAny;
+
+    public bool ProfileFilterTagsMatchAny
+    {
+        get => _profileFilterTagsMatchAny;
+        set
+        {
+            if (value == _profileFilterTagsMatchAny)
+                return;
+
+            _profileFilterTagsMatchAny = value;
+            OnPropertyChanged();
+        }
+    }
+
+    private bool _profileFilterTagsMatchAll;
+
+    public bool ProfileFilterTagsMatchAll
+    {
+        get => _profileFilterTagsMatchAll;
+        set
+        {
+            if (value == _profileFilterTagsMatchAll)
+                return;
+
+            _profileFilterTagsMatchAll = value;
+            OnPropertyChanged();
+        }
+    }
+
+    private bool _isProfileFilterSet;
+
+    public bool IsProfileFilterSet
+    {
+        get => _isProfileFilterSet;
+        set
+        {
+            if (value == _isProfileFilterSet)
+                return;
+
+            _isProfileFilterSet = value;
+            OnPropertyChanged();
+        }
+    }
 
     private bool _canProfileWidthChange = true;
     private double _tempProfileWidth;
@@ -333,7 +397,12 @@ public AWSSessionManagerHostViewModel(IDialogCoordinator instance)
         TabItems = [];
 
         // Profiles
-        SetProfilesView();
+        CreateTags();
+
+        ProfileFilterTagsView = CollectionViewSource.GetDefaultView(ProfileFilterTags);
+        ProfileFilterTagsView.SortDescriptions.Add(new SortDescription(nameof(ProfileFilterTagsInfo.Name), ListSortDirection.Ascending));
+
+        SetProfilesView(new ProfileFilterInfo());
 
         ProfileManager.OnProfilesUpdated += ProfileManager_OnProfilesUpdated;
 
@@ -520,6 +589,36 @@ private void ClearSearchAction()
     {
         Search = string.Empty;
     }
+    
+    public ICommand OpenProfileFilterCommand => new RelayCommand(_ => OpenProfileFilterAction());
+
+    private void OpenProfileFilterAction()
+    {
+        ProfileFilterIsOpen = true;
+    }
+
+    public ICommand ApplyProfileFilterCommand => new RelayCommand(_ => ApplyProfileFilterAction());
+
+    private void ApplyProfileFilterAction()
+    {
+        RefreshProfiles();
+
+        IsProfileFilterSet = true;
+        ProfileFilterIsOpen = false;
+    }
+
+    public ICommand ClearProfileFilterCommand => new RelayCommand(_ => ClearProfileFilterAction());
+
+    private void ClearProfileFilterAction()
+    {
+        foreach (var tag in ProfileFilterTags)
+            tag.IsSelected = false;
+
+        RefreshProfiles();
+
+        IsProfileFilterSet = false;
+        ProfileFilterIsOpen = false;
+    }
 
     public ICommand OpenDocumentationCommand
     {
@@ -986,36 +1085,42 @@ public void OnProfileLoaded()
         SyncAllInstanceIDsFromAWS().ConfigureAwait(false);
     }
 
-    private void SetProfilesView(ProfileInfo profile = null)
+    private void CreateTags()
     {
-        Profiles = new CollectionViewSource
-        {
-            Source = ProfileManager.Groups.SelectMany(x => x.Profiles).Where(x => x.AWSSessionManager_Enabled)
-                .OrderBy(x => x.Group).ThenBy(x => x.Name)
-        }.View;
+        var tags = ProfileManager.Groups.SelectMany(x => x.Profiles).Where(x => x.AWSSessionManager_Enabled).SelectMany(x => x.TagsCollection).Distinct().ToList();
 
-        Profiles.GroupDescriptions.Add(new PropertyGroupDescription(nameof(ProfileInfo.Group)));
+        var tagSet = new HashSet<string>(tags);
 
-        Profiles.Filter = o =>
+        for (var i = ProfileFilterTags.Count - 1; i >= 0; i--)
         {
-            if (string.IsNullOrEmpty(Search))
-                return true;
-
-            if (o is not ProfileInfo info)
-                return false;
+            if (!tagSet.Contains(ProfileFilterTags[i].Name))
+                ProfileFilterTags.RemoveAt(i);
+        }
 
-            var search = Search.Trim();
+        var existingTagNames = new HashSet<string>(ProfileFilterTags.Select(ft => ft.Name));
 
-            // Search by: Tag=xxx (exact match, ignore case)
-            /*
-            if (search.StartsWith(ProfileManager.TagIdentifier, StringComparison.OrdinalIgnoreCase))
-                return !string.IsNullOrEmpty(info.Tags) && info.PingMonitor_Enabled && info.Tags.Replace(" ", "").Split(';').Any(str => search.Substring(ProfileManager.TagIdentifier.Length, search.Length - ProfileManager.TagIdentifier.Length).Equals(str, StringComparison.OrdinalIgnoreCase));
-            */
+        foreach (var tag in tags.Where(tag => !existingTagNames.Contains(tag)))
+        {
+            ProfileFilterTags.Add(new ProfileFilterTagsInfo(false, tag));
+        }
+    }
+    
+    private void SetProfilesView(ProfileFilterInfo filter, ProfileInfo profile = null)
+    {
+        Profiles = new CollectionViewSource
+        {
+            Source = ProfileManager.Groups.SelectMany(x => x.Profiles).Where(x => x.AWSSessionManager_Enabled && (
+                    string.IsNullOrEmpty(filter.Search) || x.Name.IndexOf(filter.Search, StringComparison.Ordinal) > -1 || x.AWSSessionManager_InstanceID.IndexOf(filter.Search, StringComparison.Ordinal) > -1) && (
+                    // If no tags are selected, show all profiles
+                    (!filter.Tags.Any()) ||
+                    // Any tag can match
+                    (filter.TagsFilterMatch == ProfileFilterTagsMatch.Any && filter.Tags.Any(tag => x.TagsCollection.Contains(tag))) ||
+                    // All tags must match
+                    (filter.TagsFilterMatch == ProfileFilterTagsMatch.All && filter.Tags.All(tag => x.TagsCollection.Contains(tag))))
+            ).OrderBy(x => x.Group).ThenBy(x => x.Name)
+        }.View;
 
-            // Search by: Name, AWSSessionManager_InstanceID
-            return info.Name.IndexOf(search, StringComparison.OrdinalIgnoreCase) > -1 ||
-                   info.AWSSessionManager_InstanceID.IndexOf(search, StringComparison.OrdinalIgnoreCase) > -1;
-        };
+        Profiles.GroupDescriptions.Add(new PropertyGroupDescription(nameof(ProfileInfo.Group)));
 
         // Set specific profile or first if null
         SelectedProfile = null;
@@ -1032,7 +1137,12 @@ private void RefreshProfiles()
         if (!_isViewActive)
             return;
 
-        SetProfilesView(SelectedProfile);
+        SetProfilesView(new ProfileFilterInfo
+        {
+            Search = Search,
+            Tags = [.. ProfileFilterTags.Where(x => x.IsSelected).Select(x => x.Name)],
+            TagsFilterMatch = ProfileFilterTagsMatchAny ? ProfileFilterTagsMatch.Any : ProfileFilterTagsMatch.All
+        }, SelectedProfile);
     }
 
     public void OnProfileManagerDialogOpen()
@@ -1053,7 +1163,7 @@ private void WriteDefaultProfileToRegistry()
         if (!IsExecutableConfigured)
             return;
 
-        Log.Info("Write PowerShell profile to registry...");
+        Log.Debug("Write PowerShell profile to registry...");
 
         PowerShell.WriteDefaultProfileToRegistry(
             SettingsManager.Current.Appearance_Theme,
@@ -1111,6 +1221,8 @@ private void AWSSessionManager_AWSProfiles_CollectionChanged(object sender,
 
     private void ProfileManager_OnProfilesUpdated(object sender, EventArgs e)
     {
+        CreateTags();
+        
         RefreshProfiles();
     }