Fix: Improve re-select if filter for application or settingsview is applied or removed (#2325)

* Fix: Improve re-select if filter for application or settingsview is applied / removed

* Docs: #2325

Author: BornToBeRoot

Source/NETworkManager/MainWindow.xaml.cs

@@ -175,8 +175,7 @@ public ApplicationInfo SelectedApplication
         }
     }
 
-    private ApplicationName _filterLastViewName;
-    private int? _filterLastCount;
+    private ApplicationName _searchLastSelectedApplicationName;
 
     private string _search = string.Empty;
     public string Search
@@ -189,25 +188,19 @@ public string Search
 
             _search = value;
 
+            // Store the current selected application name
             if (SelectedApplication != null)
-                _filterLastViewName = SelectedApplication.Name;
+                _searchLastSelectedApplicationName = SelectedApplication.Name;
 
+            // Refresh (apply filter)
             Applications.Refresh();
 
-            var sourceCollection = Applications.SourceCollection.Cast<ApplicationInfo>();
-            var filteredCollection = Applications.Cast<ApplicationInfo>();
+            // Try to select the last selected application
+            if (!Applications.IsEmpty && SelectedApplication == null)
+                SelectedApplication = Applications.Cast<ApplicationInfo>().FirstOrDefault(x => x.Name == _searchLastSelectedApplicationName) ?? Applications.Cast<ApplicationInfo>().FirstOrDefault();
 
-            var sourceInfos = sourceCollection as ApplicationInfo[] ?? sourceCollection.ToArray();
-            var filteredInfos = filteredCollection as ApplicationInfo[] ?? filteredCollection.ToArray();
-
-            _filterLastCount ??= sourceInfos.Length;
-
-            SelectedApplication = _filterLastCount > filteredInfos.Length ? filteredInfos.FirstOrDefault() : sourceInfos.FirstOrDefault(x => x.Name == _filterLastViewName);
-
-            _filterLastCount = filteredInfos.Length;
-
-            // Show note when there was nothing found
-            SearchNothingFound = filteredInfos.Length == 0;
+            // Show note if nothing was found
+            SearchNothingFound = Applications.IsEmpty;
 
             OnPropertyChanged();
         }
@@ -577,8 +570,8 @@ private void LoadApplicationList()
 
         _isApplicationListLoading = false;
 
-        // Select the application
-        SelectedApplication = Applications.SourceCollection.Cast<ApplicationInfo>().FirstOrDefault(x => x.Name == (CommandLineManager.Current.Application != ApplicationName.None ? CommandLineManager.Current.Application : SettingsManager.Current.General_DefaultApplicationViewName));
+        // Select the application        
+        SelectedApplication = Applications.Cast<ApplicationInfo>().FirstOrDefault(x => x.Name == (CommandLineManager.Current.Application != ApplicationName.None ? CommandLineManager.Current.Application : SettingsManager.Current.General_DefaultApplicationViewName));
 
         // Scroll into view
         if (SelectedApplication != null)

Source/NETworkManager/ViewModels/SettingsViewModel.cs

@@ -34,6 +34,8 @@ public int SelectedTabIndex
 
     public ICollectionView SettingsViews { get; private set; }
 
+    private SettingsViewName _searchLastSelectedSettingsViewName;
+
     private string _search;
     public string Search
     {
@@ -45,10 +47,19 @@ public string Search
 
             _search = value;
 
+            // Store the current selected settings view name
+            if (SelectedSettingsView != null)
+                _searchLastSelectedSettingsViewName = SelectedSettingsView.Name;
+
+            // Refresh (apply filter)
             SettingsViews.Refresh();
 
-            // Show note when there was nothing found
-            SearchNothingFound = !SettingsViews.Cast<SettingsViewInfo>().Any();
+            // Try to select the last selected application
+            if (!SettingsViews.IsEmpty && SelectedSettingsView == null)
+                SelectedSettingsView = SettingsViews.Cast<SettingsViewInfo>().FirstOrDefault(x => x.Name == _searchLastSelectedSettingsViewName) ?? SettingsViews.Cast<SettingsViewInfo>().FirstOrDefault();
+
+            // Show note if nothing was found
+            SearchNothingFound = SettingsViews.IsEmpty;            
 
             OnPropertyChanged();
         }
@@ -110,7 +121,7 @@ public SettingsViewInfo SelectedSettingsView
     private SettingsUpdateView _settingsUpdateView;
     private SettingsSettingsView _settingsSettingsView;
     private SettingsProfilesView _settingsProfilesView;
-    private DashboardSettingsView _dashboardSettingsView;        
+    private DashboardSettingsView _dashboardSettingsView;
     private IPScannerSettingsView _ipScannerSettingsView;
     private PortScannerSettingsView _portScannerSettingsView;
     private PingMonitorSettingsView _pingMonitorSettingsView;
@@ -124,7 +135,7 @@ public SettingsViewInfo SelectedSettingsView
     private WebConsoleSettingsView _webConsoleSettingsView;
     private SNMPSettingsView _snmpSettingsView;
     private SNTPLookupSettingsView _sntpLookupSettingsView;
-    private WakeOnLANSettingsView _wakeOnLANSettingsView;   
+    private WakeOnLANSettingsView _wakeOnLANSettingsView;
     private BitCalculatorSettingsView _bitCalculatorSettingsView;
     #endregion
 
@@ -169,14 +180,18 @@ private void ClearSearchAction()
     #region Methods
     public void ChangeSettingsView(ApplicationName applicationName)
     {
-        // Don't change the view, if the user has filtered the settings...
-        if (!string.IsNullOrEmpty(Search))
+        if (SettingsViews.IsEmpty)
             return;
 
-        if (Enum.GetNames(typeof(SettingsViewName)).Contains(applicationName.ToString()) && ApplicationName.None.ToString() != applicationName.ToString())
-            SelectedSettingsView = SettingsViews.SourceCollection.Cast<SettingsViewInfo>().FirstOrDefault(x => x.Name.ToString() == applicationName.ToString());
-        else
-            SelectedSettingsView = SettingsViews.SourceCollection.Cast<SettingsViewInfo>().FirstOrDefault(x => x.Name == SettingsViewName.General);
+        // Try to find application in (filtered) settings views
+        var selectedApplicationSettingsView = SettingsViews.Cast<SettingsViewInfo>().FirstOrDefault(x => x.Name.ToString() == applicationName.ToString());
+
+        // Update selected settings view if application is found in (filtered) settings views
+        if (selectedApplicationSettingsView != null)
+            SelectedSettingsView = selectedApplicationSettingsView;
+
+        // Set default settings view
+        SelectedSettingsView ??= SettingsViews.Cast<SettingsViewInfo>().FirstOrDefault();
     }
 
     private void ChangeSettingsContent(SettingsViewInfo settingsViewInfo)
@@ -222,7 +237,7 @@ private void ChangeSettingsContent(SettingsViewInfo settingsViewInfo)
                 _settingsAutostartView ??= new SettingsAutostartView();
 
                 SettingsContent = _settingsAutostartView;
-                break;              
+                break;
             case SettingsViewName.Update:
                 _settingsUpdateView ??= new SettingsUpdateView();
 
@@ -295,7 +310,7 @@ private void ChangeSettingsContent(SettingsViewInfo settingsViewInfo)
                 break;
             case SettingsViewName.WebConsole:
                 _webConsoleSettingsView ??= new WebConsoleSettingsView();
-                
+
                 SettingsContent = _webConsoleSettingsView;
                 break;
             case SettingsViewName.SNMP:
@@ -312,7 +327,7 @@ private void ChangeSettingsContent(SettingsViewInfo settingsViewInfo)
                 _wakeOnLANSettingsView ??= new WakeOnLANSettingsView();
 
                 SettingsContent = _wakeOnLANSettingsView;
-                break;            
+                break;
             case SettingsViewName.BitCalculator:
                 _bitCalculatorSettingsView ??= new BitCalculatorSettingsView();
 
@@ -331,4 +346,4 @@ public DocumentationIdentifier GetDocumentationIdentifier()
         };
     }
     #endregion
-}
+}

docs/Changelog/next-release.md

@@ -62,6 +62,9 @@ Breaking changes
   - Fix default value for Remote Desktop sreen size [#2293](https://github.com/BornToBeRoot/NETworkManager/pull/2293){:target="\_blank"}
   - Enable Remote Desktop `Use gateway credentials` only if logon method is set to `Userpass` [#2316](https://github.com/BornToBeRoot/NETworkManager/pull/2316){:target="\_blank"}
   - Fix validation rule for TigerVNC port [#2309](https://github.com/BornToBeRoot/NETworkManager/pull/2309){:target="\_blank"}
+- Settings
+  - Settings view is now re-selected if the filter (search) is removed [#2325](https://github.com/BornToBeRoot/NETworkManager/pull/2325){:target="\_blank"}
+  - If settings are opened again, the last selected settings view is now selected (except an application was selected that has a settings view, then the settings view of the application is selected) [#2325](https://github.com/BornToBeRoot/NETworkManager/pull/2325){:target="\_blank"}
 
 ## Deprecated
 
@@ -73,7 +76,7 @@ Deprecated
 
 ## Other
 
-- Code cleanup [#2100](https://github.com/BornToBeRoot/NETworkManager/pull/2100){:target="\_blank"} [#2172](https://github.com/BornToBeRoot/NETworkManager/pull/2172){:target="\_blank"} [#2254](https://github.com/BornToBeRoot/NETworkManager/pull/2254){:target="\_blank"}
+- Code cleanup [#2100](https://github.com/BornToBeRoot/NETworkManager/pull/2100){:target="\_blank"} [#2172](https://github.com/BornToBeRoot/NETworkManager/pull/2172){:target="\_blank"} [#2254](https://github.com/BornToBeRoot/NETworkManager/pull/2254){:target="\_blank"} [#2325](https://github.com/BornToBeRoot/NETworkManager/pull/2325){:target="\_blank"}
 - Language files updated [#transifex](https://github.com/BornToBeRoot/NETworkManager/pulls?q=author%3Aapp%2Ftransifex-integration){:target="\_blank"}
 - Dependencies updated [#dependencies](https://github.com/BornToBeRoot/NETworkManager/pulls?q=author%3Aapp%2Fdependabot){:target="\_blank"}
 - Add documentation for:
@@ -83,7 +86,7 @@ Deprecated
   - Application > DNS Lookup [#2273](https://github.com/BornToBeRoot/NETworkManager/pull/2273){:target="\_blank"}
   - Application > Remote Desktop [#2293](https://github.com/BornToBeRoot/NETworkManager/pull/2293){:target="\_blank"} [#2324](https://github.com/BornToBeRoot/NETworkManager/pull/2324){:target="\_blank"}
   - Application > PowerShell [#2249](https://github.com/BornToBeRoot/NETworkManager/pull/2249){:target="\_blank"} [#2324](https://github.com/BornToBeRoot/NETworkManager/pull/2324){:target="\_blank"}
-  - Application > PuTTY [#2324](https://github.com/BornToBeRoot/NETworkManager/pull/2324){:target="\_blank"}  
+  - Application > PuTTY [#2324](https://github.com/BornToBeRoot/NETworkManager/pull/2324){:target="\_blank"}
   - Application > TigerVNC [#2248](https://github.com/BornToBeRoot/NETworkManager/pull/2248){:target="\_blank"} [#2324](https://github.com/BornToBeRoot/NETworkManager/pull/2324){:target="\_blank"}
   - Application > Web Console [#2244](https://github.com/BornToBeRoot/NETworkManager/pull/2244){:target="\_blank"} [#2324](https://github.com/BornToBeRoot/NETworkManager/pull/2324){:target="\_blank"}
   - Application > SNMP [#2289](https://github.com/BornToBeRoot/NETworkManager/pull/2289){:target="\_blank"} [#2293](https://github.com/BornToBeRoot/NETworkManager/pull/2293){:target="\_blank"}