Refactoring Execute with Confirmation

Ensure frmSettings form load changing UI layout

Author: joaoribe

src/SQLScriptsExplorer.Addin/Controls/FileExplorerTreeView.xaml.cs

@@ -180,8 +180,22 @@ private void mnuExecuteFile_Click(object sender, RoutedEventArgs e)
                 try
                 {
                     ISettingsRepository settingsRepository = new SettingsRepository();
+                    
+                    DocumentManager.OpenTemplate(treeNode.FileName, treeNode.FileFullPath);
+                    var messageBoxResult = MessageBoxResult.Yes;
+
+                    if (settingsRepository.ConfirmScriptExecution)
+                    {
+                        messageBoxResult = MessageBox.Show($"Are sure you want to execute the script '{treeNode.FileName}'?", "Confirmation", 
+                            MessageBoxButton.YesNo,
+                            MessageBoxImage.None,
+                            MessageBoxResult.No);
+                    }
 
-                    DocumentManager.ExecuteTemplate(treeNode.FileName, treeNode.FileFullPath, settingsRepository.ConfirmScriptExecution);
+                    if (messageBoxResult == MessageBoxResult.Yes)
+                    {
+                        DocumentManager.ExecuteTemplate(treeNode.FileName, treeNode.FileFullPath, settingsRepository.ConfirmScriptExecution);
+                    }
                 }
                 catch (Exception ex)
                 {

src/SQLScriptsExplorer.Addin/Infrastructure/DocumentManager.cs

@@ -7,7 +7,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Windows.Forms;
 
 namespace SQLScriptsExplorer.Addin.Infrastructure
 {
@@ -75,24 +74,12 @@ public static void ExecuteTemplate(string fileName, string fileFullPath, bool co
             {
                 ThreadHelper.ThrowIfNotOnUIThread();
 
-                OpenTemplate(fileName, fileFullPath);
-
                 DTE dte = Package.GetGlobalService(typeof(DTE)) as DTE;
 
                 // Ensure the document we are executing is the document we have opened by checking its name
                 if (dte.ActiveDocument != null && dte.ActiveDocument.ProjectItem.Name.Equals(fileName))
                 {
-                    DialogResult dialogResult = DialogResult.Yes;
-
-                    if (confirmScriptExecution)
-                    {
-                        dialogResult = MessageBox.Show($"Are sure you want to execute the script {fileName}?", "Confirmation", MessageBoxButtons.YesNo, MessageBoxIcon.None, MessageBoxDefaultButton.Button2);
-                    }
-
-                    if (dialogResult == DialogResult.Yes)
-                    {
-                        dte.ExecuteCommand(CMD_QUERY_EXECUTE);
-                    }
+                    dte.ExecuteCommand(CMD_QUERY_EXECUTE);
                 }
             }
             catch (Exception ex)

src/SQLScriptsExplorer.Addin/frmSettings.cs

@@ -33,6 +33,8 @@ public frmSettings()
             chkShowExecuteFileButton.Checked = settingsRepository.ShowExecuteFileButton;
             chkConfirmScriptExecution.Checked = settingsRepository.ConfirmScriptExecution;
 
+            chkShowExecuteFileButton_CheckedChanged(null, System.EventArgs.Empty);
+
             // General
             cboParserVersion.SelectedItem = settingsRepository.SQLParserVersion;
             txtAllowedFileTypes.Text = settingsRepository.AllowedFileTypes;
@@ -63,6 +65,11 @@ private void btnSave_Click(object sender, System.EventArgs e)
             Close();
         }
 
+        private void chkShowExecuteFileButton_CheckedChanged(object sender, System.EventArgs e)
+        {
+            chkConfirmScriptExecution.Enabled = chkShowExecuteFileButton.Checked;
+        }
+
         private void btnCancel_Click(object sender, System.EventArgs e)
         {
             DialogResult = DialogResult.Cancel;
@@ -174,10 +181,5 @@ private void gdvFolderMapping_CellFormatting(object sender, DataGridViewCellForm
         }
 
         #endregion
-
-        private void chkShowExecuteFileButton_CheckedChanged(object sender, System.EventArgs e)
-        {
-            chkConfirmScriptExecution.Enabled = chkShowExecuteFileButton.Checked;
-        }
     }
 }