CertSelectCommand 추가

yourtablecloth · Dec 20, 2023 · 7752890 · 7752890
1 parent a9a4386
commit 7752890
Show file tree

Hide file tree

Showing 9 changed files with 80 additions and 38 deletions.
diff --git a/src/TableCloth/App.xaml.cs b/src/TableCloth/App.xaml.cs
@@ -128,6 +128,7 @@ private IServiceProvider ConfigureServices()
             services.AddSingleton<LaunchSandboxCommand>();
             services.AddSingleton<CreateShortcutCommand>();
             services.AddSingleton<CopyCommandLineCommand>();
+            services.AddSingleton<CertSelectCommand>();
             services.AddSingleton<AppRestartCommand>();
             services.AddSingleton<AboutThisAppCommand>();
             services.AddSingleton<MainWindowLoadedCommand>();
@@ -143,7 +144,7 @@ private IServiceProvider ConfigureServices()
             services.AddTransient<CertSelectWindowViewModel>();
             services.AddTransient<CertSelectWindow>();
 
-            services.AddSingleton<MainWindowViewModel>(provider =>
+            services.AddTransient<MainWindowViewModel>(provider =>
             {
                 return new MainWindowViewModel(
                     appUserInterface: provider.GetRequiredService<AppUserInterface>(),
@@ -153,7 +154,8 @@ private IServiceProvider ConfigureServices()
                     launchSandboxCommand: provider.GetRequiredService<LaunchSandboxCommand>(),
                     createShortcutCommand: provider.GetRequiredService<CreateShortcutCommand>(),
                     appRestartCommand: provider.GetRequiredService<AppRestartCommand>(),
-                    aboutThisAppCommand: provider.GetRequiredService<AboutThisAppCommand>());
+                    aboutThisAppCommand: provider.GetRequiredService<AboutThisAppCommand>(),
+                    certSelectCommand: provider.GetRequiredService<CertSelectCommand>());
             });
             services.AddSingleton<MainWindow>();
 
@@ -178,7 +180,8 @@ private IServiceProvider ConfigureServices()
                     appRestartManager: provider.GetRequiredService<AppRestartManager>(),
                     launchSandboxCommand: provider.GetRequiredService<LaunchSandboxCommand>(),
                     createShortcutCommand: provider.GetRequiredService<CreateShortcutCommand>(),
-                    copyCommandLineCommand: provider.GetRequiredService<CopyCommandLineCommand>());
+                    copyCommandLineCommand: provider.GetRequiredService<CopyCommandLineCommand>(),
+                    certSelectCommand: provider.GetRequiredService<CertSelectCommand>());
             });
             services.AddTransient<DetailPage>();
 

diff --git a/src/TableCloth/Commands/CertSelectCommand.cs b/src/TableCloth/Commands/CertSelectCommand.cs
@@ -0,0 +1,37 @@
+using System;
+using TableCloth.Components;
+using TableCloth.Contracts;
+
+namespace TableCloth.Commands
+{
+    public sealed class CertSelectCommand : CommandBase
+    {
+        public CertSelectCommand(
+            AppUserInterface appUserInterface)
+        {
+            _appUserInterface = appUserInterface;
+        }
+
+        private readonly AppUserInterface _appUserInterface;
+
+        public AppUserInterface AppUserInterface
+            => _appUserInterface;
+
+        public override void Execute(object? parameter)
+        {
+            var viewModel = parameter as ICertSelect;
+
+            if (viewModel == null)
+                throw new ArgumentException(nameof(parameter));
+
+            var certSelectWindow = _appUserInterface.CreateWindow<CertSelectWindow>();
+            var response = certSelectWindow.ShowDialog();
+
+            if (!response.HasValue || !response.Value)
+                return;
+
+            if (certSelectWindow.ViewModel.SelectedCertPair != null)
+                viewModel.SelectedCertFile = certSelectWindow.ViewModel.SelectedCertPair;
+        }
+    }
+}
diff --git a/src/TableCloth/Contracts/ICertSelect.cs b/src/TableCloth/Contracts/ICertSelect.cs
@@ -0,0 +1,9 @@
+using TableCloth.Models.Configuration;
+
+namespace TableCloth.Contracts
+{
+    public interface ICertSelect
+    {
+        X509CertPair? SelectedCertFile { get; set; }
+    }
+}
diff --git a/src/TableCloth/MainWindow.xaml b/src/TableCloth/MainWindow.xaml
@@ -151,7 +151,11 @@
                         </Grid.RowDefinitions>
                         <WrapPanel Grid.Row="0" VerticalAlignment="Center" Orientation="Horizontal">
                             <CheckBox VerticalAlignment="Center" Content="{StaticResource MainWindow_MapNpkiCertButtonText}" IsChecked="{Binding Path='MapNpkiCert'}" />
-                            <Button x:Name="BrowseButton" VerticalAlignment="Center" Margin="10 0 0 0" Content="{StaticResource MainWindow_BrowseButtonText}" Click="BrowseButton_Click" IsEnabled="{Binding Path='MapNpkiCert'}" />
+                            <Button x:Name="BrowseButton" VerticalAlignment="Center" Margin="10 0 0 0" Content="{StaticResource MainWindow_BrowseButtonText}" Command="{Binding CertSelectCommand}" IsEnabled="{Binding Path='MapNpkiCert'}">
+                                <Button.CommandParameter>
+                                    <Binding Path="DataContext" RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}" />
+                                </Button.CommandParameter>
+                            </Button>
                         </WrapPanel>
                         <Label Grid.Row="1" VerticalAlignment="Stretch" Margin="0 5 0 0" Content="{Binding Path='SelectedCertFile'}"  IsEnabled="{Binding Path='MapNpkiCert'}">
                         </Label>

diff --git a/src/TableCloth/MainWindow.xaml.cs b/src/TableCloth/MainWindow.xaml.cs
@@ -22,21 +22,6 @@ public MainWindow(MainWindowViewModel viewModel)
         public MainWindowViewModel ViewModel
             => (MainWindowViewModel)DataContext;
 
-        private void BrowseButton_Click(object sender, RoutedEventArgs e)
-        {
-            var certSelectWindow = ViewModel.AppUserInterface.CreateWindow<CertSelectWindow>(window =>
-            {
-                window.Owner = this;
-            });
-            var response = certSelectWindow.ShowDialog();
-
-            if (!response.HasValue || !response.Value)
-                return;
-
-            if (certSelectWindow.ViewModel.SelectedCertPair != null)
-                ViewModel.SelectedCertFile = certSelectWindow.ViewModel.SelectedCertPair;
-        }
-
         private void SiteList_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             var listBox = (ListBox)e.Source;

diff --git a/src/TableCloth/Pages/DetailPage.xaml b/src/TableCloth/Pages/DetailPage.xaml
@@ -125,7 +125,11 @@
                     </Grid.RowDefinitions>
                     <WrapPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" Orientation="Horizontal">
                         <CheckBox VerticalAlignment="Center" Content="{StaticResource DetailPage_MapNpkiCertButtonText}" IsChecked="{Binding Path='MapNpkiCert'}" />
-                        <Button x:Name="BrowseButton" VerticalAlignment="Center" Margin="10 0 0 0" Content="{StaticResource DetailPage_BrowseButtonText}" Click="BrowseButton_Click" IsEnabled="{Binding Path='MapNpkiCert'}" />
+                        <Button x:Name="BrowseButton" VerticalAlignment="Center" Margin="10 0 0 0" Content="{StaticResource DetailPage_BrowseButtonText}" Command="{Binding CertSelectCommand}" IsEnabled="{Binding Path='MapNpkiCert'}">
+                            <Button.CommandParameter>
+                                <Binding Path="DataContext" RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}" />
+                            </Button.CommandParameter>
+                        </Button>
                     </WrapPanel>
                     <Label Grid.Row="1" Grid.Column="1" VerticalAlignment="Stretch" Margin="0 5 0 0" Content="{Binding Path='SelectedCertFile'}"  IsEnabled="{Binding Path='MapNpkiCert'}">
                     </Label>

diff --git a/src/TableCloth/Pages/DetailPage.xaml.cs b/src/TableCloth/Pages/DetailPage.xaml.cs
@@ -159,20 +159,7 @@ private void ViewModel_PropertyChanged(object? sender, PropertyChangedEventArgs
 
         private void GoBackButton_Click(object sender, RoutedEventArgs e)
         {
-            if (NavigationService.CanGoBack)
-                NavigationService.GoBack();
-        }
-
-        private void BrowseButton_Click(object sender, RoutedEventArgs e)
-        {
-            var certSelectWindow = ViewModel.AppUserInterface.CreateWindow<CertSelectWindow>();
-            var response = certSelectWindow.ShowDialog();
-
-            if (!response.HasValue || !response.Value)
-                return;
-
-            if (certSelectWindow.ViewModel.SelectedCertPair != null)
-                ViewModel.SelectedCertFile = certSelectWindow.ViewModel.SelectedCertPair;
+            ViewModel.NavigationService.GoBack();
         }
 
         private void Hyperlink_Click(object sender, RoutedEventArgs e)

diff --git a/src/TableCloth/ViewModels/DetailPageViewModel.cs b/src/TableCloth/ViewModels/DetailPageViewModel.cs
@@ -12,7 +12,7 @@
 
 namespace TableCloth.ViewModels
 {
-    public sealed class DetailPageViewModel : ViewModelBase, IPageExtraArgument
+    public sealed class DetailPageViewModel : ViewModelBase, IPageExtraArgument, ICertSelect
     {
         [Obsolete("This constructor should be used only in design time context.")]
 #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
@@ -28,7 +28,8 @@ public DetailPageViewModel(
             AppRestartManager appRestartManager,
             LaunchSandboxCommand launchSandboxCommand,
             CreateShortcutCommand createShortcutCommand,
-            CopyCommandLineCommand copyCommandLineCommand)
+            CopyCommandLineCommand copyCommandLineCommand,
+            CertSelectCommand certSelectCommand)
         {
             _appUserInterface = appUserInterface;
             _navigationService = navigationService;
@@ -39,6 +40,7 @@ public DetailPageViewModel(
             _launchSandboxCommand = launchSandboxCommand;
             _createShortcutCommand = createShortcutCommand;
             _copyCommandLineCommand = copyCommandLineCommand;
+            _certSelectCommand = certSelectCommand;
         }
 
         private readonly AppUserInterface _appUserInterface;
@@ -50,6 +52,7 @@ public DetailPageViewModel(
         private readonly LaunchSandboxCommand _launchSandboxCommand;
         private readonly CreateShortcutCommand _createShortcutCommand;
         private readonly CopyCommandLineCommand _copyCommandLineCommand;
+        private readonly CertSelectCommand _certSelectCommand;
 
         private CatalogInternetService? _selectedService;
         private bool _mapNpkiCert;
@@ -100,6 +103,9 @@ public CreateShortcutCommand CreateShortcutCommand
         public CopyCommandLineCommand CopyCommandLineCommand
             => _copyCommandLineCommand;
 
+        public CertSelectCommand CertSelectCommand
+            => _certSelectCommand;
+
         public string? Id
             => _selectedService?.Id;
 

diff --git a/src/TableCloth/ViewModels/MainWindowViewModel.cs b/src/TableCloth/ViewModels/MainWindowViewModel.cs
@@ -4,12 +4,13 @@
 using System.Windows.Data;
 using TableCloth.Commands;
 using TableCloth.Components;
+using TableCloth.Contracts;
 using TableCloth.Models.Catalog;
 using TableCloth.Models.Configuration;
 
 namespace TableCloth.ViewModels
 {
-    public class MainWindowViewModel : ViewModelBase
+    public class MainWindowViewModel : ViewModelBase, ICertSelect
     {
         [Obsolete("This constructor should be used only in design time context.")]
 #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
@@ -24,7 +25,8 @@ public MainWindowViewModel(
             LaunchSandboxCommand launchSandboxCommand,
             CreateShortcutCommand createShortcutCommand,
             AppRestartCommand appRestartCommand,
-            AboutThisAppCommand aboutThisAppCommand)
+            AboutThisAppCommand aboutThisAppCommand,
+            CertSelectCommand certSelectCommand)
         {
             _appUserInterface = appUserInterface;
             _catalogDeserializer = catalogDeserializer;
@@ -34,6 +36,7 @@ public MainWindowViewModel(
             _createShortcutCommand = createShortcutCommand;
             _appRestartCommand = appRestartCommand;
             _aboutThisAppCommand = aboutThisAppCommand;
+            _certSelectCommand = certSelectCommand;
 
             try
             {
@@ -67,6 +70,7 @@ public MainWindowViewModel(
         private readonly CreateShortcutCommand _createShortcutCommand;
         private readonly AppRestartCommand _appRestartCommand;
         private readonly AboutThisAppCommand _aboutThisAppCommand;
+        private readonly CertSelectCommand _certSelectCommand;
 
         private string _filterText = string.Empty;
         private bool _mapNpkiCert;
@@ -107,6 +111,9 @@ public AppRestartCommand AppRestartCommand
         public AboutThisAppCommand AboutThisAppCommand
             => _aboutThisAppCommand;
 
+        public CertSelectCommand CertSelectCommand
+            => _certSelectCommand;
+
         public string FilterText
         {
             get => _filterText;