Feature: Rework ServerConnectionInfoProfile view/viewmodel (Fix DNS, SNTP app crash)

Source/NETworkManager.Localization/Resources/Strings.resx

@@ -3541,4 +3541,10 @@ Changes to this value will take effect after the application is restarted. Wheth
   <data name="NewSubnetMask" xml:space="preserve">
     <value>New subnet mask</value>
   </data>
+  <data name="AddServer" xml:space="preserve">
+    <value>Add server</value>
+  </data>
+  <data name="SNTPServer" xml:space="preserve">
+    <value>SNTP server</value>
+  </data>
 </root>

Source/NETworkManager.Models/Network/ServerConnectionInfoProfile.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 
 namespace NETworkManager.Models.Network;
 

Source/NETworkManager/ViewModels/DNSLookupSettingsViewModel.cs

@@ -17,11 +17,10 @@ public class DNSLookupSettingsViewModel : ViewModelBase
 {
     #region Variables
     private readonly bool _isLoading;
+    private readonly ServerConnectionInfo _profileDialog_DefaultValues = new("10.0.0.1", 53, TransportProtocol.UDP);
 
     private readonly IDialogCoordinator _dialogCoordinator;
 
-    private (string Server, int Port, TransportProtocol TransportProtocol) _profileDialog_NewItemsOptions = ("1.1.1.1", 53, TransportProtocol.UDP);
-
     public ICollectionView DNSServers { get; }
 
     private DNSServerConnectionInfoProfile _selectedDNSServer = new();
@@ -287,13 +286,13 @@ public async Task AddDNSServer()
         {
             _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
 
-            SettingsManager.Current.DNSLookup_DNSServers_v2.Add(new DNSServerConnectionInfoProfile(instance.Name, instance.Servers));
+            SettingsManager.Current.DNSLookup_DNSServers_v2.Add(new DNSServerConnectionInfoProfile(instance.Name, instance.Servers.ToList()));
         }, instance =>
         {
             _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
-        }, (ServerInfoProfileNames, false, true));
+        }, (ServerInfoProfileNames, false, true), _profileDialog_DefaultValues);
 
-        customDialog.Content = new ServerConnectionInfoProfileDialog(_profileDialog_NewItemsOptions)
+        customDialog.Content = new ServerConnectionInfoProfileDialog()
         {
             DataContext = viewModel
         };
@@ -313,13 +312,13 @@ public async Task EditDNSServer()
             _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
 
             SettingsManager.Current.DNSLookup_DNSServers_v2.Remove(SelectedDNSServer);
-            SettingsManager.Current.DNSLookup_DNSServers_v2.Add(new DNSServerConnectionInfoProfile(instance.Name, instance.Servers));
+            SettingsManager.Current.DNSLookup_DNSServers_v2.Add(new DNSServerConnectionInfoProfile(instance.Name, instance.Servers.ToList()));
         }, instance =>
         {
             _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
-        }, (ServerInfoProfileNames, true, true), SelectedDNSServer);
+        }, (ServerInfoProfileNames, true, true), _profileDialog_DefaultValues, SelectedDNSServer);
 
-        customDialog.Content = new ServerConnectionInfoProfileDialog(_profileDialog_NewItemsOptions)
+        customDialog.Content = new ServerConnectionInfoProfileDialog()
         {
             DataContext = viewModel
         };

Source/NETworkManager/ViewModels/SNTPLookupSettingsViewModel.cs

@@ -16,11 +16,10 @@ public class SNTPLookupSettingsViewModel : ViewModelBase
 {
     #region Variables
     private readonly bool _isLoading;
-
+    private readonly ServerConnectionInfo _profileDialog_DefaultValues = new("time.example.com", 123, TransportProtocol.TCP);
+
     private readonly IDialogCoordinator _dialogCoordinator;
 
-    private (string Server, int Port, TransportProtocol TransportProtocol) _profileDialog_NewItemsOptions = ("time.example.com", 123, TransportProtocol.TCP);
-
     private ICollectionView _sntpServers;
     public ICollectionView SNTPServers
     {
@@ -130,13 +129,13 @@ public async Task AddServer()
         {
             _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
 
-            SettingsManager.Current.SNTPLookup_SNTPServers.Add(new ServerConnectionInfoProfile(instance.Name, instance.Servers));
+            SettingsManager.Current.SNTPLookup_SNTPServers.Add(new ServerConnectionInfoProfile(instance.Name, instance.Servers.ToList()));
         }, instance =>
         {
             _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
-        }, (ServerInfoProfileNames, false, false));
+        }, (ServerInfoProfileNames, false, false), _profileDialog_DefaultValues);
 
-        customDialog.Content = new ServerConnectionInfoProfileDialog(_profileDialog_NewItemsOptions)
+        customDialog.Content = new ServerConnectionInfoProfileDialog()
         {
             DataContext = viewModel
         };
@@ -156,13 +155,13 @@ public async Task EditServer()
             _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
 
             SettingsManager.Current.SNTPLookup_SNTPServers.Remove(SelectedSNTPServer);
-            SettingsManager.Current.SNTPLookup_SNTPServers.Add(new ServerConnectionInfoProfile(instance.Name, instance.Servers));
+            SettingsManager.Current.SNTPLookup_SNTPServers.Add(new ServerConnectionInfoProfile(instance.Name, instance.Servers.ToList()));
         }, instance =>
         {
             _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
-        }, (ServerInfoProfileNames, true, false), SelectedSNTPServer);
+        }, (ServerInfoProfileNames, true, false), _profileDialog_DefaultValues, SelectedSNTPServer);
 
-        customDialog.Content = new ServerConnectionInfoProfileDialog(_profileDialog_NewItemsOptions)
+        customDialog.Content = new ServerConnectionInfoProfileDialog()
         {
             DataContext = viewModel
         };

Source/NETworkManager/ViewModels/ServerConnectionInfoProfileViewModel.cs

@@ -3,17 +3,18 @@
 using System.Windows.Input;
 using NETworkManager.Models.Network;
 using System.Collections.Generic;
-using System.Windows.Controls;
-using System.Windows;
+using System.Collections.ObjectModel;
+using System.Collections;
 using System.Linq;
-using System.Diagnostics;
 
 namespace NETworkManager.ViewModels;
 
 public class ServerConnectionInfoProfileViewModel : ViewModelBase
 {
     private readonly bool _isLoading;
 
+    private ServerConnectionInfo _defaultValues;
+
     #region Commands
     public ICommand SaveCommand { get; }
 
@@ -90,13 +91,12 @@ public string Name
                 return;
 
             _name = value;
-
             OnPropertyChanged();
         }
     }
 
-    private List<ServerConnectionInfo> _servers;
-    public List<ServerConnectionInfo> Servers
+    private ObservableCollection<ServerConnectionInfo> _servers;
+    public ObservableCollection<ServerConnectionInfo> Servers
     {
         get => _servers;
         set
@@ -108,9 +108,55 @@ public List<ServerConnectionInfo> Servers
             OnPropertyChanged();
         }
     }
+
+    private IList _selectedServers = new ArrayList();
+    public IList SelectedServers
+    {
+        get => _selectedServers;
+        set
+        {
+            if (Equals(value, _selectedServers))
+                return;
+
+            _selectedServers = value;
+            OnPropertyChanged();
+        }
+    }
+
+    public string ServerWatermark { get; private set; }
+
+    private string _server;
+    public string Server
+    {
+        get => _server;
+        set
+        {
+            if (_server == value)
+                return;
+
+            _server = value;
+            OnPropertyChanged();
+        }
+    }
+
+    public string PortWatermark { get; private set; }
+
+    private int _port;
+    public int Port
+    {
+        get => _port;
+        set
+        {
+            if (_port == value)
+                return;
+
+            _port = value;
+            OnPropertyChanged();
+        }
+    }
     #endregion
 
-    public ServerConnectionInfoProfileViewModel(Action<ServerConnectionInfoProfileViewModel> saveCommand, Action<ServerConnectionInfoProfileViewModel> cancelHandler, (List<string> UsedNames, bool IsEdited, bool allowOnlyIPAddress) options, ServerConnectionInfoProfile info = null)
+    public ServerConnectionInfoProfileViewModel(Action<ServerConnectionInfoProfileViewModel> saveCommand, Action<ServerConnectionInfoProfileViewModel> cancelHandler, (List<string> UsedNames, bool IsEdited, bool allowOnlyIPAddress) options, ServerConnectionInfo defaultValues, ServerConnectionInfoProfile info = null)
     {
         _isLoading = true;
 
@@ -120,15 +166,42 @@ public ServerConnectionInfoProfileViewModel(Action<ServerConnectionInfoProfileVi
         UsedNames = options.UsedNames;
         AllowOnlyIPAddress = options.allowOnlyIPAddress;
         IsEdited = options.IsEdited;
+
+        _defaultValues = defaultValues;
+
         CurrentProfile = info ?? new ServerConnectionInfoProfile();
 
         // Remove the current profile name from the list
         if (IsEdited)
             UsedNames.Remove(CurrentProfile.Name);
 
         Name = _currentProfile.Name;
-        Servers = _currentProfile.Servers;
+        Servers = new ObservableCollection<ServerConnectionInfo>(_currentProfile.Servers);
+
+        ServerWatermark = _defaultValues.Server;
+        PortWatermark = _defaultValues.Port.ToString();
+        Port = _defaultValues.Port;
 
         _isLoading = false;
     }
+
+    public ICommand AddServerCommand => new RelayCommand(p => AddServerAction());
+
+    private void AddServerAction()
+    {
+        Servers.Add(new ServerConnectionInfo(Server, Port, _defaultValues.TransportProtocol));
+
+        Server = string.Empty;
+    }
+
+    public ICommand DeleteServerCommand => new RelayCommand(p => DeleteServerAction());
+
+    private void DeleteServerAction()
+    {
+        // Cast to list to avoid exception: Collection was modified; enumeration operation may not execute.
+        // This will create a copy of the list and allow us to remove items from the original list (SelectedServers
+        // is modified when Servers changes).
+        foreach (var item in SelectedServers.Cast<ServerConnectionInfo>().ToList())
+            Servers.Remove(item);
+    }
 }

Source/NETworkManager/Views/SNTPLookupSettingsView.xaml

@@ -17,7 +17,7 @@
     </UserControl.Resources>
     <StackPanel>
         <TextBlock Text="{x:Static localization:Strings.SNTPLookup}" Style="{StaticResource HeaderTextBlock}" />
-        <TextBlock Text="{x:Static localization:Strings.SNTPServers}" Style="{DynamicResource DefaultTextBlock}" Margin="0,0,0,10" />
+        <TextBlock Text="{x:Static localization:Strings.SNTPServer}" Style="{DynamicResource DefaultTextBlock}" Margin="0,0,0,10" />
         <DataGrid x:Name="DataGridSNTPServers" ItemsSource="{Binding SNTPServers}" SelectionMode="Single" SelectedItem="{Binding SelectedSNTPServer}" Height="200" Margin="0,0,0,10">
             <DataGrid.Resources>
                 <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource DataGridScrollBar}" />