InsertIdentifierView improvement

Author: YassinLokhat

GUI/WPF/ViewModels/InsertIdentifierViewModel.cs

@@ -4,21 +4,23 @@
 
 namespace Upsilon.Apps.Passkey.GUI.WPF.ViewModels
 {
-   internal class InsertIdentifierViewModel : INotifyPropertyChanged
+   internal class InsertIdentifierViewModel(IEnumerable<string> identifiers, string identifier) : INotifyPropertyChanged
    {
-      private readonly string[] _identifiers;
+      private readonly string[] _identifiers = [.. identifiers];
 
-      public ObservableCollection<string> Identifiers;
+      public ObservableCollection<string> Identifiers = [.. identifiers.Where(x => x.StartsWith(identifier.Trim(), StringComparison.CurrentCultureIgnoreCase)),
+            .. identifiers.Where(x => x.Contains(identifier.Trim(), StringComparison.CurrentCultureIgnoreCase)
+               && !x.StartsWith(identifier.Trim(), StringComparison.CurrentCultureIgnoreCase))];
 
       public string Identifier
       {
-         get;
+         get => field.Trim();
          set
          {
-            _ = PropertyHelper.SetProperty(ref field, value, this, PropertyChanged);
+            PropertyHelper.SetProperty(ref field, value.Trim(), this, PropertyChanged);
             _refreshFilter();
          }
-      } = string.Empty;
+      } = identifier;
 
       public event PropertyChangedEventHandler? PropertyChanged;
 
@@ -27,24 +29,17 @@ protected virtual void OnPropertyChanged(string propertyName)
          PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
       }
 
-      public InsertIdentifierViewModel(IEnumerable<string> identifiers)
-      {
-         _identifiers = [.. identifiers.OrderBy(x => x).Distinct()];
-         Identifiers = [.. _identifiers];
-      }
-
       private void _refreshFilter()
       {
          Identifiers.Clear();
 
-         string identifier = Identifier.ToLower().Trim();
-         string[] identifiers = [.. _identifiers.Where(x => x.StartsWith(identifier, StringComparison.CurrentCultureIgnoreCase)),
-            .. _identifiers.Where(x => x.Contains(identifier, StringComparison.CurrentCultureIgnoreCase)
-               && !x.StartsWith(identifier, StringComparison.CurrentCultureIgnoreCase))];
+         string[] identifiers = [.. _identifiers.Where(x => x.StartsWith(Identifier, StringComparison.CurrentCultureIgnoreCase)),
+            .. _identifiers.Where(x => x.Contains(Identifier, StringComparison.CurrentCultureIgnoreCase)
+               && !x.StartsWith(Identifier, StringComparison.CurrentCultureIgnoreCase))];
 
-         foreach (string id in identifiers)
+         foreach (string identifier in identifiers)
          {
-            Identifiers.Add(id);
+            Identifiers.Add(identifier);
          }
       }
    }

GUI/WPF/Views/Controls/AccountView.xaml.cs

@@ -267,7 +267,7 @@ private void _identifier_TextBox_KeyUp(object sender, KeyEventArgs e)
          if (e.Key is Key.Enter
             or Key.Insert)
          {
-            string? identifier = InsertIdentifierView.InsertIdentifierDialog(_viewModel?.IdentifierAutoCompleteList ?? []);
+            string? identifier = InsertIdentifierView.InsertIdentifierDialog(_viewModel?.IdentifierAutoCompleteList ?? [], identifier_TB.Text);
 
             if (string.IsNullOrEmpty(identifier)) return;
 

GUI/WPF/Views/InsertIdentifierView.xaml.cs

@@ -13,24 +13,25 @@ public partial class InsertIdentifierView : Window
       private readonly InsertIdentifierViewModel _viewModel;
       private string? _selectedIdentifier;
 
-      private InsertIdentifierView(IEnumerable<string> identifiers)
+      private InsertIdentifierView(IEnumerable<string> identifiers, string identifier)
       {
          InitializeComponent();
 
-         DataContext = _viewModel = new(identifiers);
+         DataContext = _viewModel = new(identifiers, identifier);
          _identifiers_LB.ItemsSource = _viewModel.Identifiers;
-         _ = _identifier_TB.Focus();
+         _identifier_TB.SelectAll();
+         _identifier_TB.Focus();
 
          Loaded += (s, e) => this.PostLoadSetup();
       }
 
-      internal static string? InsertIdentifierDialog(IEnumerable<string> identifiers)
+      internal static string? InsertIdentifierDialog(IEnumerable<string> identifiers, string identifier)
       {
-         InsertIdentifierView insertIdentifierView = new(identifiers);
+         InsertIdentifierView insertIdentifierView = new(identifiers, identifier);
 
          _ = insertIdentifierView.ShowDialog();
 
-         return insertIdentifierView._selectedIdentifier;
+         return insertIdentifierView._selectedIdentifier?.Trim();
       }
 
       private void _identifier_TextBox_KeyUp(object sender, System.Windows.Input.KeyEventArgs e)