From 554e397316d02720986ae88bd07faf7b9e597c31 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Tue, 5 Mar 2024 18:52:25 -0800
Subject: [PATCH 01/94] Fix bad naming convention

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 540bd5c..8e20b0c 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -28,7 +28,7 @@ public sealed class MainWindowViewModel : INotifyPropertyChanged
     private string _powerShellOutput;
     private string _queryName;
     private string _queryDescription;
-    private bool _EditingEnabled;
+    private bool _editingEnabled;
     private Command? _selectedComboBoxCommand;
     private ObservableCollection<Button>? _buttons;
 
@@ -48,10 +48,10 @@ public sealed class MainWindowViewModel : INotifyPropertyChanged
     /// </summary>
     public bool EditingEnabled
     {
-        get { return _EditingEnabled; }
+        get { return _editingEnabled; }
         set
         {
-            _EditingEnabled = value;
+            _editingEnabled = value;
             OnPropertyChanged("EditingEnabled");
         }
     }

From 69d17e5aa613825a1d5304855ca01b227e9def21 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Tue, 5 Mar 2024 20:04:48 -0800
Subject: [PATCH 02/94] Update comments, slight refactoring, remove redundant
 code, etc.

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 92 ++++++++++---------
 1 file changed, 47 insertions(+), 45 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 8e20b0c..7e9026b 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -48,7 +48,7 @@ public sealed class MainWindowViewModel : INotifyPropertyChanged
     /// </summary>
     public bool EditingEnabled
     {
-        get { return _editingEnabled; }
+        get => _editingEnabled;
         set
         {
             _editingEnabled = value;
@@ -107,7 +107,11 @@ public Command? SelectedComboBoxCommand
         set {
             _selectedComboBoxCommand = value;
             OnPropertyChanged(nameof(SelectedComboBoxCommand));
-            LoadCommandParametersAsync(value);
+            // No need to load parameters if the command is null.
+            if (value is not null) 
+            {
+                LoadCommandParametersAsync(value);  // TODO: TODO: Maybe change this method to synchronous...
+            }
         }
     }
 
@@ -150,7 +154,6 @@ public Command? SelectedComboBoxCommand
 
     /// <summary>
     /// This is the command for the edit option on custom queries
-    /// TODO: Change property name to be a non-verb.
     /// </summary>
     private ICommand EditCustomQueryRelay { get; }
 
@@ -161,13 +164,11 @@ public Command? SelectedComboBoxCommand
 
     /// <summary>
     /// Command to execute the selected PowerShell command.
-    /// TODO: Change property name???
     /// </summary>
     public ICommand ExecuteCommandRelay { get; }
 
     /// <summary>
     /// Command to execute the buttons inside Custom Command buttons
-    /// TODO: Change property name???
     /// </summary>
     private ICommand ExecuteCommandButtonRelay { get; }
 
@@ -183,13 +184,11 @@ public Command? SelectedComboBoxCommand
 
     /// <summary>
     /// Command to add a new parameter ComboBox to the UI.
-    /// TODO: Rename this property to match Property naming conventions!!!
     /// </summary>
     public ICommand RemoveParameterComboBoxRelay { get; }
 
     /// <summary>
     /// Command to have the output send to a text file when executing
-    /// TODO: Get-only auto-property 'OutputToTextFileAsync' is never assigned!!!
     /// </summary>
     public ICommand OutputToTextFileRelay { get; }
 
@@ -202,15 +201,11 @@ public Command? SelectedComboBoxCommand
 
     /// <summary>
     /// Class constructor.
-    /// TODO: Fix warnings about possible null values.
     /// </summary>
     public MainWindowViewModel()
     {
-        // TODO: Possibly make the fields nullable to enforce they are filled when saved and such.
         _powerShellOutput = string.Empty;
-        // TODO: Possibly make the fields nullable to enforce they are filled when saved and such.
         _queryName = string.Empty;
-        // TODO: Possibly make the fields nullable to enforce they are filled when saved and such.
         _queryDescription = string.Empty;
         _powerShellExecutor = new PowerShellExecutor();
         _customQuery = new CustomQueries();
@@ -232,17 +227,15 @@ public MainWindowViewModel()
         ExecuteCommandButtonRelay = new RelayCommand(ExecuteCustomQueryCommandButton);
         ClearQueryBuilderRelay = new RelayCommand(ClearQueryBuilder);
 
-        InitializeActiveDirectoryCommandsAsync();
+        InitializeActiveDirectoryCommandsAsync(); // TODO: Maybe change this method to synchronous...
         LoadCustomQueries(); // Calls method to deserialize and load buttons.
 
         // Debug
-        /*
-        foreach (Button t in QueryButtonStackPanel)
+        /*foreach (Button t in QueryButtonStackPanel)
         {
             CustomQueries.Query test = (CustomQueries.Query)t.Tag;
             Trace.WriteLine(test.CommandName);
-        }
-        */
+        }*/
     }
 
     // [ Methods ] ----------------------------------------------------------------- //
@@ -250,28 +243,25 @@ public MainWindowViewModel()
     /// <summary>
     /// This method will edit the Query and fill out the field with the desired query and you can edit the query
     /// </summary>
-    /// <note>
-    /// This method is of scope internal because it is tested in the test project, but should remain private.
-    /// </note>
     /// <param name="sender">This is the object that is clicked when executing</param>
     private void EditCustomQuery(object sender)
     {
         // Get the button that we are editing
-        Button currButton = (Button)sender;
-        Query currQuery = (Query)currButton.Tag;
+        Button currentButton = (Button)sender;
+        Query currentQuery = (Query)currentButton.Tag;
 
-        _isEditing = currQuery;
+        _isEditing = currentQuery;
         EditingEnabled = true;
 
         // Need to fill in the queryName
-        QueryName = currQuery.QueryName;
+        QueryName = currentQuery.QueryName;
 
         // Fill in the queryDescription
-        QueryDescription = currQuery.QueryDescription;
+        QueryDescription = currentQuery.QueryDescription;
 
         // Fill in the commandName
         Command chosenCommand =
-            ActiveDirectoryCommandsList.FirstOrDefault(item => item.CommandText == currQuery.CommandName)!;
+            ActiveDirectoryCommandsList.FirstOrDefault(item => item.CommandText == currentQuery.CommandName)!;
         SelectedComboBoxCommand = chosenCommand;
 
         // Load the Possible Parameters Synchronously
@@ -288,17 +278,17 @@ private void EditCustomQuery(object sender)
         }
 
         // Fill in Parameters and values
-        for (int i = 0; i < currQuery.CommandParameters.Length; i++)
+        for (int i = 0; i < currentQuery.CommandParameters.Length; i++)
         {
-            Trace.WriteLine(currQuery.CommandParameters[i]);
+            Trace.WriteLine(currentQuery.CommandParameters[i]);
 
             // Adds the Parameters boxes
             object temp = new();
             AddParameterComboBox(temp);
 
             // Fill in the parameter boxes
-            DynamicParametersCollection[i].SelectedParameter = currQuery.CommandParameters[i];
-            DynamicParameterValuesCollection[i].SelectedParameterValue = currQuery.CommandParametersValues[i];
+            DynamicParametersCollection[i].SelectedParameter = currentQuery.CommandParameters[i];
+            DynamicParameterValuesCollection[i].SelectedParameterValue = currentQuery.CommandParametersValues[i];
         }
     }
 
@@ -312,6 +302,11 @@ private async void ExecuteCustomQueryCommandButton(object _)
 
         if (currentButton is null)
         {
+            Trace.WriteLine("No button selected.");
+            MessageBox.Show("To execute a query, you must first select a query.",
+                            "Warning",
+                            MessageBoxButton.OK,
+                            MessageBoxImage.Warning);
             return;
         }
 
@@ -330,6 +325,11 @@ private void DeleteCustomQuery(object _)
 
         if (currentButton is null)
         {
+            Trace.WriteLine("No button selected.");
+            MessageBox.Show("To delete a query, you must first select a query.",
+                            "Warning",
+                            MessageBoxButton.OK,
+                            MessageBoxImage.Warning);
             return;
         }
 
@@ -340,7 +340,6 @@ private void DeleteCustomQuery(object _)
 
     /// <summary>
     /// This method will load the custom queries from the file.
-    /// TODO: Remove any unused variables.
     /// </summary>
     private void LoadCustomQueries()
     {
@@ -350,7 +349,6 @@ private void LoadCustomQueries()
             _customQuery.LoadData();
 
             // Loop through the queries and create a button for each one
-            int i = 0;
             foreach (Query cQuery in _customQuery.Queries)
             {
                 // Creates a new button for each query
@@ -358,7 +356,6 @@ private void LoadCustomQueries()
 
                 // Lastly add the button to the stack panel
                 QueryButtonStackPanel.Add(newButton);
-                i++;
             }
         }
         catch (Exception ex)
@@ -448,9 +445,12 @@ private async Task ExecuteSelectedCommandAsync()
 
     /// <summary>
     /// Executes the inputted Command PowerShell command and updates the PowerShellOutput property with the result.
-    /// TODO: Rename this method...
-    /// TODO: Does this method do the same thing an another method???
     /// </summary>
+    /// <note>
+    /// TODO: Rename this method...
+    /// TODO: Does this method do the same thing an another method?
+    /// TODO: Add error handling for null values...
+    /// </note>
     /// <param name="toBeExecuted">This is the command to be executed</param>
     /// <returns>A Task representing the asynchronous operation of executing the command.</returns>
     private async Task ExecuteGenericCommand(Command? toBeExecuted)
@@ -501,7 +501,6 @@ private void AddParameterComboBox(object _)
     /// <param name="_">This is the object that the command is bound to.</param>
     private void AddCommandComboBox(object _)
     {
-        // throw new NotImplementedException();
         Trace.WriteLine("Not implemented yet.");
         MessageBox.Show("Not implemented yet.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
     }
@@ -516,7 +515,6 @@ private async void OutputToTextFileAsync(object _)
 
         // Filepath
         // Write the text to a file & prompt user for the location
-
         SaveFileDialog saveFileDialog = new() {                       // Set properties of the OpenFileDialog
                                                FileName = "Document", // Default file name
                                                Filter = "All files(*.*) | *.*"
@@ -572,9 +570,11 @@ private async void OutputToCsvFileAsync(object _)
 
     /// <summary>
     /// This method is for getting the currently selected command at anytime
-    /// TODO: !Still in the works!
-    /// TODO: Does this method do the same thing an another method???
     /// </summary>
+    /// <note>
+    /// TODO: !Still in the works!
+    /// TODO: Does this method do the same thing an another method?
+    /// </note>
     private void UpdateSelectedCommand()
     {
         if (SelectedComboBoxCommand is null)
@@ -605,16 +605,18 @@ private void UpdateSelectedCommand()
 
     /// <summary>
     /// Updates the _currentQuery object with the current query information.
+    /// </summary>
+    /// <note>
     /// TODO: It needs to be tested! Still in the works!
     /// TODO: Fix any and all warnings about possible null values.
-    /// </summary>
+    /// </note>
     private void GetCurrentQuery()
     {
-        // Update the selected command
         UpdateSelectedCommand();
 
         try
         {
+            // TODO: Fix this method to handle null values...
             string[] commandParameters = new string[SelectedComboBoxCommand.Parameters.Count];
             string[] commandParameterValues = new string[SelectedComboBoxCommand.Parameters.Count];
 
@@ -623,6 +625,7 @@ private void GetCurrentQuery()
 
             _currentQuery.CommandName = SelectedComboBoxCommand.CommandText;
 
+            // TODO: Possibly convert foreach into a for loop...
             int i = 0;
             foreach (CommandParameter commandParameter in SelectedComboBoxCommand.Parameters)
             {
@@ -654,8 +657,6 @@ private void RemoveParameterComboBox(object _)
 
     /// <summary>
     /// This method will serialize the command and add it to the list of buttons.
-    /// TODO: Fix any and all warnings about possible null values.
-    /// TODO: Remove any unused variables.
     /// </summary>
     /// <param name="commandParameter">This is not used but necessary for the relay command</param>
     private void SaveCustomQueries(object commandParameter)
@@ -670,7 +671,7 @@ private void SaveCustomQueries(object commandParameter)
             return;
         }
 
-        if (_isEditing is not null && EditingEnabled == true)
+        if (_isEditing is not null && EditingEnabled)
         {
             // CustomQueries.query editingQuery = _customQuery.Queries.Find(item => item == isEditing);
             GetCurrentQuery();
@@ -684,6 +685,7 @@ private void SaveCustomQueries(object commandParameter)
             // Try to get the content within the drop downs
             try
             {
+                // TODO: Possibly convert foreach into a for loop...
                 int i = 0;
                 foreach (var comboBoxData in DynamicParametersCollection)
                 {
@@ -727,7 +729,7 @@ private void ClearQueryBuilder(object _)
     /// TODO: Change method name???
     /// </summary>
     /// <returns>This method returns a button that has been customized for the custom query list</returns>
-    private Button CreateCustomButton(Query query = null)
+    private Button CreateCustomButton(Query? query = null)
     {
         Button newButton = new Button();
 
@@ -752,7 +754,7 @@ private Button CreateCustomButton(Query query = null)
 
             GetCurrentQuery();
             newButton.Height = 48;
-            newButton.Content = (QueryName.Length != 0 ? QueryName : SelectedComboBoxCommand.CommandText);
+            newButton.Content = QueryName.Length != 0 ? QueryName : SelectedComboBoxCommand.CommandText;
             newButton.Tag = _currentQuery;
         }
 

From 4a21d114829512aee7b7475066e23803cec6f8f8 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Tue, 5 Mar 2024 20:08:04 -0800
Subject: [PATCH 03/94] Fix commit

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 7e9026b..38005c8 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -447,7 +447,6 @@ private async Task ExecuteSelectedCommandAsync()
     /// Executes the inputted Command PowerShell command and updates the PowerShellOutput property with the result.
     /// </summary>
     /// <note>
-    /// TODO: Rename this method...
     /// TODO: Does this method do the same thing an another method?
     /// TODO: Add error handling for null values...
     /// </note>
@@ -496,7 +495,7 @@ private void AddParameterComboBox(object _)
     }
 
     /// <summary>
-    /// TODO: Add a summary.
+    /// Adds a new command selection ComboBox to the UI.
     /// </summary>
     /// <param name="_">This is the object that the command is bound to.</param>
     private void AddCommandComboBox(object _)

From 5fe4e013f663ecf4c39aabbc695fd72aca406deb Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Tue, 5 Mar 2024 20:08:04 -0800
Subject: [PATCH 04/94] Fix comments

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 7e9026b..38005c8 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -447,7 +447,6 @@ private async Task ExecuteSelectedCommandAsync()
     /// Executes the inputted Command PowerShell command and updates the PowerShellOutput property with the result.
     /// </summary>
     /// <note>
-    /// TODO: Rename this method...
     /// TODO: Does this method do the same thing an another method?
     /// TODO: Add error handling for null values...
     /// </note>
@@ -496,7 +495,7 @@ private void AddParameterComboBox(object _)
     }
 
     /// <summary>
-    /// TODO: Add a summary.
+    /// Adds a new command selection ComboBox to the UI.
     /// </summary>
     /// <param name="_">This is the object that the command is bound to.</param>
     private void AddCommandComboBox(object _)

From ba0d3649470a3da35d85a993e074a6ad709c1fe5 Mon Sep 17 00:00:00 2001
From: Pieter Sobtafo Assonken <lsobtafo@ewu.edu>
Date: Tue, 5 Mar 2024 21:10:51 -0800
Subject: [PATCH 05/94] added users to drop down menu tab

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 81 +++++++++++++++++++
 1 file changed, 81 insertions(+)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 38005c8..1fc1005 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -244,6 +244,87 @@ public MainWindowViewModel()
     /// This method will edit the Query and fill out the field with the desired query and you can edit the query
     /// </summary>
     /// <param name="sender">This is the object that is clicked when executing</param>
+
+
+
+    /// New code begins here
+
+    private void LoadCustomQueries()
+    {
+        try
+        {
+            // Assuming Get-Users returns a list of users
+            List<User> users = GetUsersCommand(); // Replace this with your actual PowerShell command
+
+            foreach (User user in users)
+            {
+                // Create a new button for each user
+                Button newUserButton = new() { Height = 48 };
+
+                // Set button content (text) to user's name or any relevant information
+                newUserButton.Content = user.UserName;
+
+                // Bind the user object to the button
+                newUserButton.Tag = user;
+
+                // Create a context menu for the button
+                ContextMenu contextMenu = new ContextMenu();
+
+                // Add menu items to the context menu
+                MenuItem menuItem1 = new MenuItem { Header = "Execute" };
+                menuItem1.Command = ExecuteCommandButton;
+                menuItem1.CommandParameter = newUserButton;
+
+                MenuItem menuItem2 = new MenuItem { Header = "Edit" };
+                menuItem2.Command = EditCustomQuery;
+                menuItem2.CommandParameter = newUserButton;
+
+                MenuItem menuItem3 = new MenuItem { Header = "Delete" };
+                menuItem3.Command = Remove_ParameterComboBox;
+
+                // Add menu items to the context menu
+                contextMenu.Items.Add(menuItem1);
+                contextMenu.Items.Add(menuItem2);
+                contextMenu.Items.Add(menuItem3);
+
+                // Set the context menu for the button
+                newUserButton.ContextMenu = contextMenu;
+
+                // Add the button to the stack panel
+                ButtonStackPanel.Add(newUserButton);
+            }
+        }
+        catch (Exception ex)
+        {
+            Trace.WriteLine(ex);
+        }
+    }
+
+    // Replace User with your actual user class
+    public class User
+    {
+        public string UserName { get; set; }
+        // Add other properties as needed
+    }
+
+    // Replace this with your actual PowerShell command to get users
+    private List<User> GetUsersCommand()
+    {
+        // Your PowerShell command logic to get users
+        return new List<User>
+    {
+        new User { UserName = "User1" },
+        new User { UserName = "User2" },
+
+    };
+    }
+
+    /// New code ends here <summary>
+    
+
+
+    /// </summary>
+    /// <param name="sender"></param>
     private void EditCustomQuery(object sender)
     {
         // Get the button that we are editing

From 293708c4c12c576ce794d0845dc59937b3a9d3a0 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Tue, 5 Mar 2024 21:35:43 -0800
Subject: [PATCH 06/94] Revert "added users to drop down menu tab"

This reverts commit ba0d3649470a3da35d85a993e074a6ad709c1fe5.
---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 81 -------------------
 1 file changed, 81 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 1fc1005..38005c8 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -244,87 +244,6 @@ public MainWindowViewModel()
     /// This method will edit the Query and fill out the field with the desired query and you can edit the query
     /// </summary>
     /// <param name="sender">This is the object that is clicked when executing</param>
-
-
-
-    /// New code begins here
-
-    private void LoadCustomQueries()
-    {
-        try
-        {
-            // Assuming Get-Users returns a list of users
-            List<User> users = GetUsersCommand(); // Replace this with your actual PowerShell command
-
-            foreach (User user in users)
-            {
-                // Create a new button for each user
-                Button newUserButton = new() { Height = 48 };
-
-                // Set button content (text) to user's name or any relevant information
-                newUserButton.Content = user.UserName;
-
-                // Bind the user object to the button
-                newUserButton.Tag = user;
-
-                // Create a context menu for the button
-                ContextMenu contextMenu = new ContextMenu();
-
-                // Add menu items to the context menu
-                MenuItem menuItem1 = new MenuItem { Header = "Execute" };
-                menuItem1.Command = ExecuteCommandButton;
-                menuItem1.CommandParameter = newUserButton;
-
-                MenuItem menuItem2 = new MenuItem { Header = "Edit" };
-                menuItem2.Command = EditCustomQuery;
-                menuItem2.CommandParameter = newUserButton;
-
-                MenuItem menuItem3 = new MenuItem { Header = "Delete" };
-                menuItem3.Command = Remove_ParameterComboBox;
-
-                // Add menu items to the context menu
-                contextMenu.Items.Add(menuItem1);
-                contextMenu.Items.Add(menuItem2);
-                contextMenu.Items.Add(menuItem3);
-
-                // Set the context menu for the button
-                newUserButton.ContextMenu = contextMenu;
-
-                // Add the button to the stack panel
-                ButtonStackPanel.Add(newUserButton);
-            }
-        }
-        catch (Exception ex)
-        {
-            Trace.WriteLine(ex);
-        }
-    }
-
-    // Replace User with your actual user class
-    public class User
-    {
-        public string UserName { get; set; }
-        // Add other properties as needed
-    }
-
-    // Replace this with your actual PowerShell command to get users
-    private List<User> GetUsersCommand()
-    {
-        // Your PowerShell command logic to get users
-        return new List<User>
-    {
-        new User { UserName = "User1" },
-        new User { UserName = "User2" },
-
-    };
-    }
-
-    /// New code ends here <summary>
-    
-
-
-    /// </summary>
-    /// <param name="sender"></param>
     private void EditCustomQuery(object sender)
     {
         // Get the button that we are editing

From a841097beda57a1357b525db486e175ec84bf557 Mon Sep 17 00:00:00 2001
From: "Hunter T." <strangeranger@hthompson.dev>
Date: Wed, 6 Mar 2024 15:39:06 -0800
Subject: [PATCH 07/94] Add starting field and property for output for tab
 three

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 38005c8..c6ae2ce 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -18,7 +18,7 @@ namespace ActiveDirectoryQuerier;
 /// </summary>
 public sealed class MainWindowViewModel : INotifyPropertyChanged
 {
-    // [ Fields ]-------------------------------------------------------------------- //
+    // [ Fields ] ------------------------------------------------------------------- //
     // [[ Event handler property ]] ------------------------------------------------- //
 
     public event PropertyChangedEventHandler? PropertyChanged;
@@ -26,6 +26,7 @@ public sealed class MainWindowViewModel : INotifyPropertyChanged
     // [[ Backing fields for properties ]] ------------------------------------------ //
 
     private string _powerShellOutput;
+    private string _activeDirectoryInfoOutput; // Pieter TODO
     private string _queryName;
     private string _queryDescription;
     private bool _editingEnabled;
@@ -68,6 +69,16 @@ public string PowerShellOutput
         }
     }
 
+    // Pieter TODO
+    public string ActiveDirectoryInfoOutput
+    {
+        get => _activeDirectoryInfoOutput;
+        set {
+            _activeDirectoryInfoOutput = value;
+            OnPropertyChanged(nameof(ActiveDirectoryInfoOutput));
+        }
+    }
+
     /// <summary>
     /// The name of the query.
     /// </summary>
@@ -108,7 +119,7 @@ public Command? SelectedComboBoxCommand
             _selectedComboBoxCommand = value;
             OnPropertyChanged(nameof(SelectedComboBoxCommand));
             // No need to load parameters if the command is null.
-            if (value is not null) 
+            if (value is not null)
             {
                 LoadCommandParametersAsync(value);  // TODO: TODO: Maybe change this method to synchronous...
             }
@@ -148,7 +159,7 @@ public Command? SelectedComboBoxCommand
     public ICommand SaveCustomQueriesRelay { get; }
 
     /// <summary>
-    /// This is the command tied to Clear Query calls the ClearQueryBuilder method 
+    /// This is the command tied to Clear Query calls the ClearQueryBuilder method
     /// </summary>
     public ICommand ClearQueryBuilderRelay { get; }
 

From 4f7657dfbec42296540dc64d05069cee2f23df40 Mon Sep 17 00:00:00 2001
From: J0seph0 <jhoward26@ewu.edu>
Date: Wed, 6 Mar 2024 15:57:56 -0800
Subject: [PATCH 08/94] Combined the Execution methods into one

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 49 +++++--------------
 1 file changed, 11 insertions(+), 38 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 38005c8..ee064c5 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -311,7 +311,7 @@ private async void ExecuteCustomQueryCommandButton(object _)
         }
 
         Query buttonQuery = (Query)currentButton.Tag;
-        await ExecuteGenericCommand(buttonQuery.Command);
+        await ExecuteSelectedCommandAsync(buttonQuery.Command);
     }
 
     /// <summary>
@@ -405,9 +405,9 @@ private async Task LoadCommandParametersAsync(Command? selectedCommand)
     /// Executes the currently selected PowerShell command and updates the PowerShellOutput property with the result.
     /// </summary>
     /// <returns>A Task representing the asynchronous operation of executing the command.</returns>
-    private async Task ExecuteSelectedCommandAsync()
+    private async Task ExecuteSelectedCommandAsync(Command? inCommand = null)
     {
-        if (SelectedComboBoxCommand is null)
+        if (SelectedComboBoxCommand is null && inCommand is null)
         {
             Trace.WriteLine("No command selected.");
             MessageBox.Show("To execute a command, you must first select a command.",
@@ -417,48 +417,21 @@ private async Task ExecuteSelectedCommandAsync()
             return;
         }
 
+        ReturnValues result;
+
         try
         {
-            // Add selected parameters and their values to the command.
-            for (int i = 0; i < DynamicParametersCollection.Count; i++)
+            if (inCommand is not null)
             {
-                string parameterName = DynamicParametersCollection[i].SelectedParameter;
-                string parameterValue = DynamicParameterValuesCollection[i].SelectedParameterValue;
-                SelectedComboBoxCommand.Parameters.Add(new CommandParameter(parameterName, parameterValue));
+                result = await _powerShellExecutor.ExecuteAsync(inCommand);
             }
-
-            ReturnValues result = await _powerShellExecutor.ExecuteAsync(SelectedComboBoxCommand);
-
-            if (result.HadErrors)
+            else
             {
-                PowerShellOutput = string.Join(Environment.NewLine, result.StdErr);
-                return;
+                // Add selected parameters and their values to the command.
+                UpdateSelectedCommand();
+                result = await _powerShellExecutor.ExecuteAsync(SelectedComboBoxCommand);
             }
 
-            PowerShellOutput = string.Join(Environment.NewLine, result.StdOut);
-        }
-        catch (Exception ex)
-        {
-            PowerShellOutput = $"Error executing command: {ex.Message}";
-        }
-    }
-
-    /// <summary>
-    /// Executes the inputted Command PowerShell command and updates the PowerShellOutput property with the result.
-    /// </summary>
-    /// <note>
-    /// TODO: Does this method do the same thing an another method?
-    /// TODO: Add error handling for null values...
-    /// </note>
-    /// <param name="toBeExecuted">This is the command to be executed</param>
-    /// <returns>A Task representing the asynchronous operation of executing the command.</returns>
-    private async Task ExecuteGenericCommand(Command? toBeExecuted)
-    {
-        try
-        {
-            // Execute the command
-            ReturnValues result = await _powerShellExecutor.ExecuteAsync(toBeExecuted);
-            // Error handling
             if (result.HadErrors)
             {
                 PowerShellOutput = string.Join(Environment.NewLine, result.StdErr);

From 04b742ba317032a560ddde782434d72e5078679a Mon Sep 17 00:00:00 2001
From: Pieter Sobtafo Assonken <lsobtafo@ewu.edu>
Date: Wed, 6 Mar 2024 16:07:33 -0800
Subject: [PATCH 09/94] Binded 3rd window info + Pseudo Code name

Binded 3rd window info in XAML file and added pseudocode with Correct Method name in MainWindowViewModel file
---
 ActiveDirectoryQuerier/MainWindow.xaml        |  6 +++++-
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 12 ++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index 7a62e8f..f424485 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -191,7 +191,11 @@
                                 <!-- TextBox as Console Output -->
                                 <TextBox Text="{Binding PowerShellOutput}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10" IsReadOnly="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto"/>
                             </Grid>
-                            <!-- Menu options  -->
+                            <!-- TextBox as Active Directory Output -->
+                            <TextBox Text="{Binding ActiveDirectoryInfoOutput}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10" IsReadOnly="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto"/>
+                            </Grid>
+
+                        <!-- Menu options  -->
                             <Menu Grid.Row="0" x:Name="OptionsMenu" Width="Auto" Height="20" Margin="10,15,934,64">
                                 <MenuItem Header="Options">
                                     <MenuItem Header="Add New Command Slot"
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index c6ae2ce..76c1533 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -255,6 +255,18 @@ public MainWindowViewModel()
     /// This method will edit the Query and fill out the field with the desired query and you can edit the query
     /// </summary>
     /// <param name="sender">This is the object that is clicked when executing</param>
+
+    ///Pieter TODO (New Code)
+    public void ActiveDirectoryInfo()
+    {
+        PowerShellExecutor powerShell = new PowerShellExecutor();
+        Command command = new Command("Get-ADUser");
+        command.Parameters.Add("Filter", "*");
+
+        Collection<PSObject> ReturnValue results = powerShell.ExecuteCommand(command);
+
+
+    }
     private void EditCustomQuery(object sender)
     {
         // Get the button that we are editing

From b795e41f43affe36f4e4c66b1f9e71ab93847667 Mon Sep 17 00:00:00 2001
From: Pieter Sobtafo Assonken <lsobtafo@ewu.edu>
Date: Wed, 6 Mar 2024 16:10:58 -0800
Subject: [PATCH 10/94] Comment out bad method

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 76c1533..52df15a 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -257,16 +257,15 @@ public MainWindowViewModel()
     /// <param name="sender">This is the object that is clicked when executing</param>
 
     ///Pieter TODO (New Code)
-    public void ActiveDirectoryInfo()
+    /*public void ActiveDirectoryInfo()
     {
         PowerShellExecutor powerShell = new PowerShellExecutor();
         Command command = new Command("Get-ADUser");
         command.Parameters.Add("Filter", "*");
 
         Collection<PSObject> ReturnValue results = powerShell.ExecuteCommand(command);
+    }*/
 
-
-    }
     private void EditCustomQuery(object sender)
     {
         // Get the button that we are editing

From 3a28cd215c4b09ad23f88506f9aab40b56634df6 Mon Sep 17 00:00:00 2001
From: J0seph0 <jhoward26@ewu.edu>
Date: Wed, 6 Mar 2024 16:48:20 -0800
Subject: [PATCH 11/94] Fixed the update method to update the command and not
 add

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index ee064c5..a999f82 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -562,11 +562,10 @@ private void UpdateSelectedCommand()
         // Try to get the content within the drop downs
         try
         {
+            SelectedComboBoxCommand.Parameters.Clear();
             for (int i = 0; i < DynamicParametersCollection.Count; i++)
             {
-                SelectedComboBoxCommand.Parameters.Add(
-                    new CommandParameter(DynamicParametersCollection[i].SelectedParameter,
-                                         DynamicParameterValuesCollection[i].SelectedParameterValue));
+                SelectedComboBoxCommand.Parameters.Add(new CommandParameter(DynamicParametersCollection[i].SelectedParameter, DynamicParameterValuesCollection[i].SelectedParameterValue));
             }
         }
         catch (Exception ex)

From 4401dc8dd1bcc2d957fbfd06d85ab07b55e2443c Mon Sep 17 00:00:00 2001
From: J0seph0 <jhoward26@ewu.edu>
Date: Wed, 6 Mar 2024 16:57:02 -0800
Subject: [PATCH 12/94] Fixed consecitevely executing commands not working.

---
 ActiveDirectoryQuerier/PowerShell/PowerShellExecutor.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ActiveDirectoryQuerier/PowerShell/PowerShellExecutor.cs b/ActiveDirectoryQuerier/PowerShell/PowerShellExecutor.cs
index ed9fff7..788e258 100644
--- a/ActiveDirectoryQuerier/PowerShell/PowerShellExecutor.cs
+++ b/ActiveDirectoryQuerier/PowerShell/PowerShellExecutor.cs
@@ -74,6 +74,8 @@ public async Task<ReturnValues> ExecuteAsync(Command? command)
     {
         try
         {
+            _powerShell.Commands.Clear();
+
             PrepareCommand(command);
 
             PSDataCollection<PSObject> results = await _powerShell.InvokeAsync();

From 6bbc00c06ab7ecfd8ad484bb5c21ccadc0f4f153 Mon Sep 17 00:00:00 2001
From: Pieter Sobtafo Assonken <lsobtafo@ewu.edu>
Date: Wed, 6 Mar 2024 17:18:00 -0800
Subject: [PATCH 13/94] Fix missing opening "Grid" tag

---
 ActiveDirectoryQuerier/MainWindow.xaml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index f424485..9a1169d 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -191,9 +191,8 @@
                                 <!-- TextBox as Console Output -->
                                 <TextBox Text="{Binding PowerShellOutput}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10" IsReadOnly="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto"/>
                             </Grid>
-                            <!-- TextBox as Active Directory Output -->
-                            <TextBox Text="{Binding ActiveDirectoryInfoOutput}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10" IsReadOnly="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto"/>
-                            </Grid>
+                            
+                            
 
                         <!-- Menu options  -->
                             <Menu Grid.Row="0" x:Name="OptionsMenu" Width="Auto" Height="20" Margin="10,15,934,64">

From faf7f90a6844ae3badae8f0659c0ef2dc3c7a590 Mon Sep 17 00:00:00 2001
From: Pieter Sobtafo Assonken <lsobtafo@ewu.edu>
Date: Wed, 6 Mar 2024 17:31:21 -0800
Subject: [PATCH 14/94] Add comments to help direct myself

---
 ActiveDirectoryQuerier/MainWindow.xaml        |  4 +++-
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index 9a1169d..9ac511d 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -103,7 +103,8 @@
                                     <ColumnDefinition Width="*"/>
                                     <ColumnDefinition Width="Auto"/>
                                 </Grid.ColumnDefinitions>
-
+                                
+                                <!-- TODO: Pieter refer to here regarding combobox setup -->
                                 <ComboBox ItemsSource="{Binding ActiveDirectoryCommandsList}" 
                                               SelectedItem="{Binding SelectedComboBoxCommand}"
                                               DisplayMemberPath="CommandText" 
@@ -187,6 +188,7 @@
                             <GridSplitter Height="5" HorizontalAlignment="Stretch" VerticalAlignment="Center" Background="White" Grid.Row="2" Grid.ColumnSpan="2"/>
 
                             <!-- TODO: Figure out why I can't get the console to be resizable to the min height... -->
+                            <!-- TODO: Pieter refer here for the console output... try replicate for tab three -->
                             <Grid Grid.Row="3" Grid.ColumnSpan="2">
                                 <!-- TextBox as Console Output -->
                                 <TextBox Text="{Binding PowerShellOutput}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10" IsReadOnly="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto"/>
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index a800932..d64795b 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -207,6 +207,17 @@ public Command? SelectedComboBoxCommand
     /// Command to output to a csv when executing
     /// </summary>
     public ICommand OutputToCsvFileRelay { get; }
+    
+    /*
+     * AD Info options combobox dropdown
+     * Get all AD user
+     * Get all IP's on domain
+     * Get all etc, etc.
+     */
+    
+    /*
+     * another property to contain current AD Info selected command
+     */
 
     // [ Constructors ] ------------------------------------------------------------ //
 

From fbd6c9e2e0e83f1cdf3d280314d9896ef8024182 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Fri, 8 Mar 2024 08:04:00 -0800
Subject: [PATCH 15/94] Fix console output not appending text of the previous
 output

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index d64795b..28cedf8 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -121,7 +121,7 @@ public Command? SelectedComboBoxCommand
             // No need to load parameters if the command is null.
             if (value is not null)
             {
-                LoadCommandParametersAsync(value);  // TODO: TODO: Maybe change this method to synchronous...
+                LoadCommandParametersAsync(value);  // TODO: Maybe change this method to synchronous...
             }
         }
     }
@@ -467,15 +467,15 @@ private async Task ExecuteSelectedCommandAsync(Command? inCommand = null)
 
             if (result.HadErrors)
             {
-                PowerShellOutput = string.Join(Environment.NewLine, result.StdErr);
+                PowerShellOutput += string.Join(Environment.NewLine, result.StdErr);
                 return;
             }
 
-            PowerShellOutput = string.Join(Environment.NewLine, result.StdOut);
+            PowerShellOutput += string.Join(Environment.NewLine, result.StdOut);
         }
         catch (Exception ex)
         {
-            PowerShellOutput = $"Error executing command: {ex.Message}";
+            PowerShellOutput += $"Error executing command: {ex.Message}";
         }
     }
 

From 29840f857fbc6fa4cb8d7df7d5e6b6fa9fe0f151 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Fri, 8 Mar 2024 10:35:46 -0800
Subject: [PATCH 16/94] Convert console output to an object

---
 .../AppConsoleTests.cs                        | 47 +++++++++++++
 ActiveDirectoryQuerier/AppConsole.cs          | 67 +++++++++++++++++++
 ActiveDirectoryQuerier/MainWindow.xaml        |  2 +-
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 42 ++++++------
 4 files changed, 137 insertions(+), 21 deletions(-)
 create mode 100644 ActiveDirectoryQuerier.Tests/AppConsoleTests.cs
 create mode 100644 ActiveDirectoryQuerier/AppConsole.cs

diff --git a/ActiveDirectoryQuerier.Tests/AppConsoleTests.cs b/ActiveDirectoryQuerier.Tests/AppConsoleTests.cs
new file mode 100644
index 0000000..e95da7f
--- /dev/null
+++ b/ActiveDirectoryQuerier.Tests/AppConsoleTests.cs
@@ -0,0 +1,47 @@
+using System.Management.Automation.Runspaces;
+using ActiveDirectoryQuerier.PowerShell;
+
+namespace ActiveDirectoryQuerier.Tests;
+
+public class AppConsoleTests
+{
+    [Fact]
+    public void ClearConsole_ClearsConsole_SuccessfullyCleared()
+    {
+        // Arrange
+        PowerShellExecutor powerShellExecutor = new();
+        Command command = new("Get-Process");
+        AppConsole appConsole = new();
+
+        // Act
+        command.Parameters.Add("Name", "explorer");
+        // TODO: Maybe implement an interface of PowerShellExecutor and use a mock object to test to prevent execution
+        // errors.
+        var result = powerShellExecutor.Execute(command);
+
+        if (result.HadErrors)
+        {
+            throw new Exception("Error occurred while executing command");
+        }
+
+        appConsole.Append(result.StdOut);
+        appConsole.ClearConsole();
+
+        // Assert
+        Assert.Empty(appConsole.ConsoleOutput);
+    }
+
+    [Fact]
+    public void Append_AppendsStringToConsole_SuccessfullyAppended()
+    {
+        // Arrange
+        AppConsole appConsole = new();
+        string output = "Output";
+
+        // Act
+        appConsole.Append(output);
+
+        // Assert
+        Assert.Equal(output, appConsole.ConsoleOutput);
+    }
+}
diff --git a/ActiveDirectoryQuerier/AppConsole.cs b/ActiveDirectoryQuerier/AppConsole.cs
new file mode 100644
index 0000000..f702eb2
--- /dev/null
+++ b/ActiveDirectoryQuerier/AppConsole.cs
@@ -0,0 +1,67 @@
+using System.ComponentModel;
+
+namespace ActiveDirectoryQuerier;
+
+/// <summary>
+/// Represents the console output.
+/// </summary>
+public sealed class AppConsole : INotifyPropertyChanged
+{
+    public event PropertyChangedEventHandler? PropertyChanged;
+    private string _consoleOutput = string.Empty;
+
+    /// <summary>
+    /// Gets or sets the console output.
+    /// </summary>
+    /// <important>
+    /// Do not set this property directly. Use the <see cref="Append"/> method instead. It's public for data binding
+    /// purposes.
+    /// </important>
+    public string ConsoleOutput
+    {
+        get => _consoleOutput;
+    [EditorBrowsable(EditorBrowsableState.Never)]
+        set {
+            if (_consoleOutput != value)
+            {
+                _consoleOutput = value;
+                OnPropertyChanged(nameof(ConsoleOutput));
+            }
+        }
+    }
+
+    /// <summary>
+    /// Clears the console output.
+    /// </summary>
+    public void ClearConsole()
+    {
+        ConsoleOutput = string.Empty;
+    }
+
+    /// <summary>
+    /// Appends the output text to the console output.
+    /// </summary>
+    /// <param name="outputText">The output text to append.</param>
+    public void Append(List<string> outputText)
+    {
+        ConsoleOutput += string.Join(Environment.NewLine, outputText);
+    }
+
+    /// <summary>
+    /// Appends the output text to the console output.
+    /// </summary>
+    /// <param name="outputText">The output text to append.</param>
+    public void Append(string outputText)
+    {
+        ConsoleOutput += outputText;
+    }
+
+    /// <summary>
+    /// Raises the PropertyChanged event.
+    /// </summary>
+    /// <param name="propertyName">The name of the property that changed.</param>
+    private void OnPropertyChanged(string propertyName)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
+}
diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index 9ac511d..697010c 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -191,7 +191,7 @@
                             <!-- TODO: Pieter refer here for the console output... try replicate for tab three -->
                             <Grid Grid.Row="3" Grid.ColumnSpan="2">
                                 <!-- TextBox as Console Output -->
-                                <TextBox Text="{Binding PowerShellOutput}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10" IsReadOnly="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto"/>
+                                <TextBox Text="{Binding PowerShellOutput.ConsoleOutput}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10" IsReadOnly="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto"/>
                             </Grid>
                             
                             
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 28cedf8..1b6b65e 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -25,11 +25,11 @@ public sealed class MainWindowViewModel : INotifyPropertyChanged
 
     // [[ Backing fields for properties ]] ------------------------------------------ //
 
-    private string _powerShellOutput;
-    private string _activeDirectoryInfoOutput; // Pieter TODO
+    private bool _editingEnabled;
     private string _queryName;
     private string _queryDescription;
-    private bool _editingEnabled;
+    private AppConsole _powerShellOutput;
+    private AppConsole _activeDirectoryInfoOutput; // Pieter TODO
     private Command? _selectedComboBoxCommand;
     private ObservableCollection<Button>? _buttons;
 
@@ -50,8 +50,7 @@ public sealed class MainWindowViewModel : INotifyPropertyChanged
     public bool EditingEnabled
     {
         get => _editingEnabled;
-        set
-        {
+        set {
             _editingEnabled = value;
             OnPropertyChanged("EditingEnabled");
         }
@@ -60,7 +59,7 @@ public bool EditingEnabled
     /// <summary>
     /// Gets or sets the output of the executed PowerShell command.
     /// </summary>
-    public string PowerShellOutput
+    public AppConsole PowerShellOutput
     {
         get => _powerShellOutput;
         set {
@@ -70,7 +69,7 @@ public string PowerShellOutput
     }
 
     // Pieter TODO
-    public string ActiveDirectoryInfoOutput
+    public AppConsole ActiveDirectoryInfoOutput
     {
         get => _activeDirectoryInfoOutput;
         set {
@@ -121,7 +120,7 @@ public Command? SelectedComboBoxCommand
             // No need to load parameters if the command is null.
             if (value is not null)
             {
-                LoadCommandParametersAsync(value);  // TODO: Maybe change this method to synchronous...
+                LoadCommandParametersAsync(value); // TODO: Maybe change this method to synchronous...
             }
         }
     }
@@ -207,14 +206,14 @@ public Command? SelectedComboBoxCommand
     /// Command to output to a csv when executing
     /// </summary>
     public ICommand OutputToCsvFileRelay { get; }
-    
+
     /*
      * AD Info options combobox dropdown
      * Get all AD user
      * Get all IP's on domain
      * Get all etc, etc.
      */
-    
+
     /*
      * another property to contain current AD Info selected command
      */
@@ -226,9 +225,10 @@ public Command? SelectedComboBoxCommand
     /// </summary>
     public MainWindowViewModel()
     {
-        _powerShellOutput = string.Empty;
         _queryName = string.Empty;
         _queryDescription = string.Empty;
+        _powerShellOutput = new AppConsole();
+        _activeDirectoryInfoOutput = new AppConsole();
         _powerShellExecutor = new PowerShellExecutor();
         _customQuery = new CustomQueries();
         _currentQuery = new Query();
@@ -250,7 +250,7 @@ public MainWindowViewModel()
         ClearQueryBuilderRelay = new RelayCommand(ClearQueryBuilder);
 
         InitializeActiveDirectoryCommandsAsync(); // TODO: Maybe change this method to synchronous...
-        LoadCustomQueries(); // Calls method to deserialize and load buttons.
+        LoadCustomQueries();                      // Calls method to deserialize and load buttons.
 
         // Debug
         /*foreach (Button t in QueryButtonStackPanel)
@@ -267,7 +267,7 @@ public MainWindowViewModel()
     /// </summary>
     /// <param name="sender">This is the object that is clicked when executing</param>
 
-    ///Pieter TODO (New Code)
+    /// Pieter TODO (New Code)
     /*public void ActiveDirectoryInfo()
     {
         PowerShellExecutor powerShell = new PowerShellExecutor();
@@ -467,15 +467,15 @@ private async Task ExecuteSelectedCommandAsync(Command? inCommand = null)
 
             if (result.HadErrors)
             {
-                PowerShellOutput += string.Join(Environment.NewLine, result.StdErr);
+                PowerShellOutput.Append(result.StdErr);
                 return;
             }
 
-            PowerShellOutput += string.Join(Environment.NewLine, result.StdOut);
+            PowerShellOutput.Append(result.StdOut);
         }
         catch (Exception ex)
         {
-            PowerShellOutput += $"Error executing command: {ex.Message}";
+            PowerShellOutput.Append($"Error executing command: {ex.Message}" + ex.Message);
         }
     }
 
@@ -533,7 +533,7 @@ private async void OutputToTextFileAsync(object _)
         {
             // Open document
             string filePath = saveFileDialog.FileName;
-            await File.WriteAllTextAsync(filePath, PowerShellOutput);
+            await File.WriteAllTextAsync(filePath, PowerShellOutput.ConsoleOutput);
         }
     }
 
@@ -547,7 +547,7 @@ private async void OutputToCsvFileAsync(object _)
         await ExecuteSelectedCommandAsync();
 
         var csv = new StringBuilder();
-        string[] output = PowerShellOutput.Split(' ', '\n');
+        string[] output = PowerShellOutput.ConsoleOutput.Split(' ', '\n');
 
         for (int i = 0; i < output.Length - 2; i++)
         {
@@ -598,7 +598,9 @@ private void UpdateSelectedCommand()
             SelectedComboBoxCommand.Parameters.Clear();
             for (int i = 0; i < DynamicParametersCollection.Count; i++)
             {
-                SelectedComboBoxCommand.Parameters.Add(new CommandParameter(DynamicParametersCollection[i].SelectedParameter, DynamicParameterValuesCollection[i].SelectedParameterValue));
+                SelectedComboBoxCommand.Parameters.Add(
+                    new CommandParameter(DynamicParametersCollection[i].SelectedParameter,
+                                         DynamicParameterValuesCollection[i].SelectedParameterValue));
             }
         }
         catch (Exception ex)
@@ -745,7 +747,7 @@ private Button CreateCustomButton(Query? query = null)
         }
         else
         {
-            //Check for null
+            // Check for null
             if (SelectedComboBoxCommand is null)
             {
                 Trace.WriteLine("No command selected.");

From 4c3fcd674646d6fd70b76ec46d8bdb3e5f25142f Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Fri, 8 Mar 2024 10:35:57 -0800
Subject: [PATCH 17/94] Format with clang-format

---
 ActiveDirectoryQuerier/MainWindow.xaml.cs          | 1 +
 ActiveDirectoryQuerier/PowerShell/CustomQueries.cs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ActiveDirectoryQuerier/MainWindow.xaml.cs b/ActiveDirectoryQuerier/MainWindow.xaml.cs
index ed4f897..c7ca4d1 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml.cs
+++ b/ActiveDirectoryQuerier/MainWindow.xaml.cs
@@ -5,5 +5,6 @@ public partial class MainWindow
     public MainWindow()
     {
         InitializeComponent();
+        DataContext = new MainWindowViewModel();
     }
 }
diff --git a/ActiveDirectoryQuerier/PowerShell/CustomQueries.cs b/ActiveDirectoryQuerier/PowerShell/CustomQueries.cs
index d0cbeb1..c032f55 100644
--- a/ActiveDirectoryQuerier/PowerShell/CustomQueries.cs
+++ b/ActiveDirectoryQuerier/PowerShell/CustomQueries.cs
@@ -166,7 +166,7 @@ public void LoadData()
                     {
                         command.Parameters.Add(q.CommandParameters[i], q.CommandParametersValues[i]);
                         // the values are working then we will use this
-                        //command.Parameters.Add(q.CommandParameters[i]);
+                        // command.Parameters.Add(q.CommandParameters[i]);
                     }
                 }
 

From 3cc28c2a5982607b44aeaa8e997a96a2ebd10fce Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Fri, 8 Mar 2024 10:37:40 -0800
Subject: [PATCH 18/94] Remove unused class

---
 ActiveDirectoryQuerier/PSSaveOptions.cs | 45 -------------------------
 1 file changed, 45 deletions(-)
 delete mode 100644 ActiveDirectoryQuerier/PSSaveOptions.cs

diff --git a/ActiveDirectoryQuerier/PSSaveOptions.cs b/ActiveDirectoryQuerier/PSSaveOptions.cs
deleted file mode 100644
index e089b42..0000000
--- a/ActiveDirectoryQuerier/PSSaveOptions.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System.Management.Automation.Internal;
-using System.Management.Automation.Runspaces;
-using ActiveDirectoryQuerier.PowerShell;
-
-namespace ActiveDirectoryQuerier;
-
-/// <summary>
-/// This class *might* be used for housing the save options
-/// TODO: Delete this class if it is not used...
-/// </summary>
-public class PSSaveOptions
-{
-    /// <summary>
-    /// This would be to output the query to a csv, will need to eventually adapt to a guicommand as well most likely
-    /// </summary>
-    /// <param name="commandString"> This is the internal command that we want to output to a csv </param>
-    public Command OutputToCsv(Command commandString)
-    {
-        throw new NotImplementedException();
-    }
-
-    /// <summary>
-    /// This would be to have the query output to a message box
-    /// </summary>
-    public InternalCommand OutputToMessageBox(InternalCommand commandSting)
-    {
-        throw new NotImplementedException();
-    }
-
-    /// <summary>
-    /// This will be to save the query to a text file
-    /// </summary>
-    public void SaveToTxt(ReturnValues results)
-    {
-        throw new NotImplementedException();
-    }
-
-    /// <summary>
-    /// This is used for saving the file to a PS1 powershell file
-    /// </summary>
-    public void SaveToPS(ReturnValues results)
-    {
-        throw new NotImplementedException();
-    }
-}

From a27a0294ba843a168fc5fe3d872b6f431b92b892 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Fri, 8 Mar 2024 11:31:41 -0800
Subject: [PATCH 19/94] Can now clear the console of all text

Set the stage for exporting console output...
---
 ActiveDirectoryQuerier/MainWindow.xaml        | 39 ++++++-----
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 64 ++++++++++++++++---
 2 files changed, 73 insertions(+), 30 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index 697010c..d46f2ce 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -36,8 +36,8 @@
             </Grid.ColumnDefinitions>
 
             <!-- Left Side Query Bar (Content in first column) -->
-            <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
-                <Grid x:Name="LeftSideQueryGrid" Grid.Column="0">
+            <ScrollViewer Grid.Column="0" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
+                <Grid>
                     <Grid.BindingGroup>
                         <BindingGroup/>
                     </Grid.BindingGroup>
@@ -74,9 +74,9 @@
                                 <ColumnDefinition Width="163*"/>
                                 <ColumnDefinition Width="856*"/>
                             </Grid.ColumnDefinitions>
-                            <!-- Query Name TextBox.TODO: add a title/header to them  -->
-                            <TextBox Text="{Binding QueryName}" Margin="10,29,10,0" TextWrapping="Wrap" VerticalAlignment="Top" Height="50" Grid.ColumnSpan="2"/>
-                            <RichTextBox Margin="10,108,10,200" Grid.ColumnSpan="2">
+                            <!-- Query Name TextBox. -->
+                            <TextBox Grid.Column="0" Grid.ColumnSpan="2" Text="{Binding QueryName}" Margin="10,29,10,0" TextWrapping="Wrap" VerticalAlignment="Top" Height="50" />
+                            <RichTextBox Grid.Column="0" Margin="10,108,10,200" Grid.ColumnSpan="2">
                                 <FlowDocument>
                                     <Paragraph>
                                         <Run Text="{Binding QueryDescription}"/>
@@ -90,14 +90,14 @@
                         <Grid Background="#FFE5E5E5">
                             <!-- Define Rows. -->
                             <Grid.RowDefinitions>
-                                <!-- TODO: Figure out why the bottom row isn't stopping at the specified min height!!! -->
+                                <!-- TODO: Figure out why the bottom row isn't stopping at the specified min height! -->
                                 <RowDefinition Height="Auto" MinHeight="100"/>
                                 <RowDefinition Height="Auto"/>
                                 <RowDefinition Height="5"/>
                                 <RowDefinition Height="3*" MinHeight="100"/>
                             </Grid.RowDefinitions>
                             <!-- TODO: Fix the margin so that the combo boxes are not so spaced-->
-                            <Grid Grid.Row="0" Grid.ColumnSpan="3" Margin="0,0,0,100" Grid.RowSpan="2">
+                            <Grid Margin="0,0,0,100" Grid.Row="0" Grid.ColumnSpan="3" Grid.RowSpan="2">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="*"/>
                                     <ColumnDefinition Width="*"/>
@@ -130,7 +130,6 @@
                                         </DataTemplate>
                                     </ItemsControl.ItemTemplate>
                                 </ItemsControl>
-                                <!-- TODO: Fill these-->
                                 <ItemsControl ItemsSource="{Binding DynamicParameterValuesCollection}"
                                               Grid.Column="2">
                                     <ItemsControl.ItemTemplate>
@@ -160,34 +159,32 @@
 
                                 <Button Content="Add New Command Slot"
                                         Command="{Binding AddCommandComboBoxRelay}"
-                                        Grid.Column="0"/>
+                                        Grid.Column="0" />
                                 <Button Content="Add New Parameter Slot"
                                         Command="{Binding AddParameterComboBoxRelay}"
-                                        Grid.Column="1"/>
+                                        Grid.Column="1 "/>
                                 <Button Content="Remove Parameter Slot"
                                         Command="{Binding RemoveParameterComboBoxRelay}"
-                                        Grid.Column="2"
-                                        />
+                                        Grid.Column="2" />
 
-                                <Button x:Name="SaveQueryButton"
-                                            Content="Save Query"
-                                            Command="{Binding SaveCustomQueriesRelay}"
-                                            Grid.Column="3" />
+                                <Button Content="Save Query"
+                                        Command="{Binding SaveCustomQueriesRelay}"
+                                        Grid.Column="3" />
                                 <Button Content="Execute"
                                             Command="{Binding ExecuteCommandRelay}"
                                             Grid.Column="4" />
                                 <Button Content="Export Console Output"
-                                        Command="{Binding ExportConsoleOutput}"
+                                        Command="{Binding ExportConsoleOutputRelay}"
                                         Grid.Column="5" />
                                 <Button Content="Clear Console Output"
-                                        Command="{Binding ClearConsoleOutput}"
+                                        Command="{Binding ClearConsoleOutputRelay}"
                                         Grid.Column="6" />
                             </Grid>
 
                             <!-- GridSplitter for resizing console area in the second row -->
                             <GridSplitter Height="5" HorizontalAlignment="Stretch" VerticalAlignment="Center" Background="White" Grid.Row="2" Grid.ColumnSpan="2"/>
 
-                            <!-- TODO: Figure out why I can't get the console to be resizable to the min height... -->
+                            <!-- TODO: Figure out why I can't get the console to be resizable to the min height! -->
                             <!-- TODO: Pieter refer here for the console output... try replicate for tab three -->
                             <Grid Grid.Row="3" Grid.ColumnSpan="2">
                                 <!-- TextBox as Console Output -->
@@ -226,7 +223,7 @@
                                               Command="{Binding ExportConsoleOutput}"
                                               />
                                     <MenuItem Header="Clear Console Output"
-                                              Command="{Binding ClearConsoleOutput}"
+                                              Command="{Binding ClearConsoleOutputRelay}"
                                               />
                                     <MenuItem Header="Add Button"
                                               Command="{Binding AddButton}"
@@ -236,7 +233,7 @@
 
                                 </MenuItem>
                             </Menu>
-                            <CheckBox x:Name="isEditing" Content="Editing" HorizontalAlignment="Left" Margin="14,57,0,0" VerticalAlignment="Top" IsChecked="{Binding EditingEnabled}"/>
+                            <CheckBox Grid.Row="0" x:Name="isEditing" Content="Editing" HorizontalAlignment="Left" Margin="14,57,0,0" VerticalAlignment="Top" IsChecked="{Binding EditingEnabled}"/>
                         </Grid>
                     </TabItem>
                     <TabItem Header="Active Directory Information">
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 1b6b65e..a4ba87a 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -206,19 +206,29 @@ public Command? SelectedComboBoxCommand
     /// Command to output to a csv when executing
     /// </summary>
     public ICommand OutputToCsvFileRelay { get; }
+    
+    /// <summary>
+    /// Command to export the console output to a text file.
+    /// </summary>
+    public ICommand ExportConsoleOutputRelay { get; }
+    
+    /// <summary>
+    /// Command to clear the console output.
+    /// </summary>
+    public ICommand ClearConsoleOutputRelay { get; }
 
-    /*
+    /* TODO: Info for Pieter to get started
      * AD Info options combobox dropdown
      * Get all AD user
      * Get all IP's on domain
      * Get all etc, etc.
      */
 
-    /*
+    /* TODO: Info for Pieter to get started
      * another property to contain current AD Info selected command
      */
 
-    // [ Constructors ] ------------------------------------------------------------ //
+    // [ Constructors ] ------------------------------------------------------------- //
 
     /// <summary>
     /// Class constructor.
@@ -240,6 +250,7 @@ public MainWindowViewModel()
         ExecuteCommandRelay = new RelayCommand(ExecuteCommandAsync);
         OutputToCsvFileRelay = new RelayCommand(OutputToCsvFileAsync);
         OutputToTextFileRelay = new RelayCommand(OutputToTextFileAsync);
+        ExportConsoleOutputRelay = new RelayCommand(ExportConsoleOutput);
         AddParameterComboBoxRelay = new RelayCommand(AddParameterComboBox);
         AddCommandComboBoxRelay = new RelayCommand(AddCommandComboBox);
         RemoveParameterComboBoxRelay = new RelayCommand(RemoveParameterComboBox);
@@ -247,12 +258,13 @@ public MainWindowViewModel()
         EditCustomQueryRelay = new RelayCommand(EditCustomQuery);
         DeleteCustomQueryRelay = new RelayCommand(DeleteCustomQuery);
         ExecuteCommandButtonRelay = new RelayCommand(ExecuteCustomQueryCommandButton);
+        ClearConsoleOutputRelay = new RelayCommand(ClearConsoleOutput);
         ClearQueryBuilderRelay = new RelayCommand(ClearQueryBuilder);
 
         InitializeActiveDirectoryCommandsAsync(); // TODO: Maybe change this method to synchronous...
         LoadCustomQueries();                      // Calls method to deserialize and load buttons.
 
-        // Debug
+        // Uncomment to test the deserialization of the custom queries with more information
         /*foreach (Button t in QueryButtonStackPanel)
         {
             CustomQueries.Query test = (CustomQueries.Query)t.Tag;
@@ -262,11 +274,6 @@ public MainWindowViewModel()
 
     // [ Methods ] ----------------------------------------------------------------- //
 
-    /// <summary>
-    /// This method will edit the Query and fill out the field with the desired query and you can edit the query
-    /// </summary>
-    /// <param name="sender">This is the object that is clicked when executing</param>
-
     /// Pieter TODO (New Code)
     /*public void ActiveDirectoryInfo()
     {
@@ -276,7 +283,36 @@ public MainWindowViewModel()
 
         Collection<PSObject> ReturnValue results = powerShell.ExecuteCommand(command);
     }*/
+    
+    private void ClearConsoleOutput(object _)
+    {
+        if (PowerShellOutput.ConsoleOutput.Length == 0)
+        {
+            MessageBox.Show("The console is already clear.",
+                            "Information",
+                            MessageBoxButton.OK,
+                            MessageBoxImage.Information);
+            return;
+        }
+        
+        // Display a gui box confirming if the user wants to confirm the clear
+        MessageBoxResult result = MessageBox.Show("Are you sure you want to clear the console output?",
+                                                  "Warning",
+                                                  MessageBoxButton.YesNo,
+                                                  MessageBoxImage.Warning,
+                                                  MessageBoxResult.No);
+        
+        // If the user selects yes, clear the console
+        if (result == MessageBoxResult.Yes)
+        {
+            PowerShellOutput.ClearConsole();
+        }
+    }
 
+    /// <summary>
+    /// This method will edit the Query and fill out the field with the desired query and you can edit the query
+    /// </summary>
+    /// <param name="sender">This is the object that is clicked when executing</param>
     private void EditCustomQuery(object sender)
     {
         // Get the button that we are editing
@@ -572,6 +608,16 @@ private async void OutputToCsvFileAsync(object _)
             await File.WriteAllTextAsync(filePath, csv.ToString());
         }
     }
+    
+    /// <summary>
+    /// Adds a new command selection ComboBox to the UI.
+    /// </summary>
+    /// <param name="_">This is the object that the command is bound to.</param>
+    private void ExportConsoleOutput(object _)
+    {
+        Trace.WriteLine("Not implemented yet.");
+        MessageBox.Show("Not implemented yet.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+    }
 
     /// <summary>
     /// This method is for getting the currently selected command at anytime

From f20287b124861c6bf923bbca7246584ee6bce6b5 Mon Sep 17 00:00:00 2001
From: J0seph0 <jhoward26@ewu.edu>
Date: Fri, 8 Mar 2024 18:52:14 -0800
Subject: [PATCH 20/94] Updated the custom buttons to include execution options

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index a4ba87a..77d14b4 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -820,6 +820,14 @@ private Button CreateCustomButton(Query? query = null)
         MenuItem menuItem1 =
             new() { Header = "Execute", Command = ExecuteCommandButtonRelay, CommandParameter = newButton };
 
+       MenuItem outputToCSV = new() { Header = "Output to CSV", Command = OutputToCsvFileRelay };
+        MenuItem outputToText = new() { Header = "Output to Text", Command = OutputToTextFileRelay };
+        MenuItem exportToConsole = new() { Header = "Execute to Console", Command = ExecuteCommandRelay};
+
+        menuItem1.Items.Add(outputToCSV);
+        menuItem1.Items.Add(outputToText);
+        menuItem1.Items.Add(exportToConsole);
+
         MenuItem menuItem2 = new() { Header = "Edit", Command = EditCustomQueryRelay, CommandParameter = newButton };
 
         MenuItem menuItem3 =

From 309afd06026ab0b66738d83bd1cc6c7bca7ddc8a Mon Sep 17 00:00:00 2001
From: J0seph0 <jhoward26@ewu.edu>
Date: Fri, 8 Mar 2024 20:33:14 -0800
Subject: [PATCH 21/94] fixed a couple of bugs and tityed up comments

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 77d14b4..79babca 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -6,6 +6,7 @@
 using System.Text;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Data;
 using System.Windows.Input;
 using ActiveDirectoryQuerier.PowerShell;
 using Microsoft.Win32;
@@ -32,6 +33,7 @@ public sealed class MainWindowViewModel : INotifyPropertyChanged
     private AppConsole _activeDirectoryInfoOutput; // Pieter TODO
     private Command? _selectedComboBoxCommand;
     private ObservableCollection<Button>? _buttons;
+    private bool _isTextBoxFocused;
 
     // [[ Other fields ]] ----------------------------------------------------------- //
 
@@ -263,13 +265,6 @@ public MainWindowViewModel()
 
         InitializeActiveDirectoryCommandsAsync(); // TODO: Maybe change this method to synchronous...
         LoadCustomQueries();                      // Calls method to deserialize and load buttons.
-
-        // Uncomment to test the deserialization of the custom queries with more information
-        /*foreach (Button t in QueryButtonStackPanel)
-        {
-            CustomQueries.Query test = (CustomQueries.Query)t.Tag;
-            Trace.WriteLine(test.CommandName);
-        }*/
     }
 
     // [ Methods ] ----------------------------------------------------------------- //
@@ -713,6 +708,7 @@ private void RemoveParameterComboBox(object _)
     /// <param name="commandParameter">This is not used but necessary for the relay command</param>
     private void SaveCustomQueries(object commandParameter)
     {
+   
         if (SelectedComboBoxCommand is null)
         {
             Trace.WriteLine("No command selected.");
@@ -727,6 +723,7 @@ private void SaveCustomQueries(object commandParameter)
         {
             // CustomQueries.query editingQuery = _customQuery.Queries.Find(item => item == isEditing);
             GetCurrentQuery();
+            Trace.WriteLine(_customQuery.Queries.IndexOf(_isEditing));  
             _customQuery.Queries[_customQuery.Queries.IndexOf(_isEditing)] = _currentQuery;
             _customQuery.SerializeMethod();
             _isEditing = null;
@@ -810,10 +807,6 @@ private Button CreateCustomButton(Query? query = null)
             newButton.Tag = _currentQuery;
         }
 
-        // Button newButton =
-        // new() { Height = 48, Content = QueryName.Length != 0 ? QueryName : SelectedComboBoxCommand.CommandText, Tag =
-        // _currentQuery };
-
         // Want to add right click context menu to each button
         ContextMenu contextMenu = new();
 

From ecb4cfe815db2ec0035d9df1d94b5f8edac5fcca Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Sat, 9 Mar 2024 11:07:16 -0800
Subject: [PATCH 22/94] If no parameters exists, a popup window will inform the
 user

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 79babca..fb71aa8 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -700,6 +700,13 @@ private void RemoveParameterComboBox(object _)
             DynamicParametersCollection.RemoveAt(DynamicParametersCollection.Count - 1);
             DynamicParameterValuesCollection.RemoveAt(DynamicParameterValuesCollection.Count - 1);
         }
+        else
+        {
+            MessageBox.Show("There are no parameters to remove.",
+                            "Warning",
+                            MessageBoxButton.OK,
+                            MessageBoxImage.Warning);
+        }
     }
 
     /// <summary>

From df5726c8f166d1711394bb2ebcb9b4848cc1b3fd Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Sat, 9 Mar 2024 11:27:37 -0800
Subject: [PATCH 23/94] Format file

---
 ActiveDirectoryQuerier/MainWindow.xaml | 155 ++++++++++---------------
 1 file changed, 63 insertions(+), 92 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index d46f2ce..7fda637 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -9,47 +9,37 @@
     <Window.DataContext>
         <activeDirectoryQuerier:MainWindowViewModel />
     </Window.DataContext>
-
     <Grid>
         <!-- Define Columns. -->
-        <!--<Grid.ColumnDefinitions>
-            <ColumnDefinition Width="119*"/>
-            <ColumnDefinition Width="681*"/>
-        </Grid.ColumnDefinitions>-->
-
+        <!--<Grid.ColumnDefinitions><ColumnDefinition Width="119*"/><ColumnDefinition Width="681*"/></Grid.ColumnDefinitions>-->
         <!-- Define Rows. -->
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-
         <!-- Static Header Bar. -->
-        <Border Grid.Row="0" Grid.Column="0" Background="DarkGray" Height="42"/>
-
+        <Border Grid.Row="0" Grid.Column="0" Background="DarkGray" Height="42" />
         <!-- Grid for resizable content. -->
         <Grid Grid.Row="1">
             <!-- Define Columns for resizable area. -->
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="250" MinWidth="200"/>
-                <ColumnDefinition Width="Auto"/>
-                <ColumnDefinition Width="3*" MinWidth="400"/>
+                <ColumnDefinition Width="250" MinWidth="200" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="3*" MinWidth="400" />
             </Grid.ColumnDefinitions>
-
             <!-- Left Side Query Bar (Content in first column) -->
             <ScrollViewer Grid.Column="0" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
                 <Grid>
                     <Grid.BindingGroup>
-                        <BindingGroup/>
+                        <BindingGroup />
                     </Grid.BindingGroup>
-
                     <Grid.Background>
                         <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                            <GradientStop Color="#FF616161" Offset="0"/>
-                            <GradientStop Color="#FF5F5F5F" Offset="0.363"/>
-                            <GradientStop Color="#FF898989" Offset="0.737"/>
+                            <GradientStop Color="#FF616161" Offset="0" />
+                            <GradientStop Color="#FF5F5F5F" Offset="0.363" />
+                            <GradientStop Color="#FF898989" Offset="0.737" />
                         </LinearGradientBrush>
                     </Grid.Background>
-
                     <!-- Stacked Queries are placed here. -->
                     <ItemsControl ItemsSource="{Binding QueryButtonStackPanel}">
                         <ItemsControl.ItemTemplate>
@@ -60,10 +50,8 @@
                     </ItemsControl>
                 </Grid>
             </ScrollViewer>
-
             <!-- Grid Splitter for resizing. -->
             <GridSplitter Grid.Column="1" Width="5" HorizontalAlignment="Center" Background="Gray" />
-
             <!-- TabControl Grid (Content in third column). -->
             <Grid Background="White" Grid.Column="2">
                 <!-- Query Information Tab Control. -->
@@ -71,15 +59,16 @@
                     <TabItem Header="Query Information">
                         <Grid Background="#FFE5E5E5">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="163*"/>
-                                <ColumnDefinition Width="856*"/>
+                                <ColumnDefinition Width="163*" />
+                                <ColumnDefinition Width="856*" />
                             </Grid.ColumnDefinitions>
                             <!-- Query Name TextBox. -->
-                            <TextBox Grid.Column="0" Grid.ColumnSpan="2" Text="{Binding QueryName}" Margin="10,29,10,0" TextWrapping="Wrap" VerticalAlignment="Top" Height="50" />
+                            <TextBox Grid.Column="0" Grid.ColumnSpan="2" Text="{Binding QueryName}" Margin="10,29,10,0"
+                                     TextWrapping="Wrap" VerticalAlignment="Top" Height="50" />
                             <RichTextBox Grid.Column="0" Margin="10,108,10,200" Grid.ColumnSpan="2">
                                 <FlowDocument>
                                     <Paragraph>
-                                        <Run Text="{Binding QueryDescription}"/>
+                                        <Run Text="{Binding QueryDescription}" />
                                     </Paragraph>
                                 </FlowDocument>
                             </RichTextBox>
@@ -91,29 +80,27 @@
                             <!-- Define Rows. -->
                             <Grid.RowDefinitions>
                                 <!-- TODO: Figure out why the bottom row isn't stopping at the specified min height! -->
-                                <RowDefinition Height="Auto" MinHeight="100"/>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="5"/>
-                                <RowDefinition Height="3*" MinHeight="100"/>
+                                <RowDefinition Height="Auto" MinHeight="100" />
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="5" />
+                                <RowDefinition Height="3*" MinHeight="100" />
                             </Grid.RowDefinitions>
                             <!-- TODO: Fix the margin so that the combo boxes are not so spaced-->
                             <Grid Margin="0,0,0,100" Grid.Row="0" Grid.ColumnSpan="3" Grid.RowSpan="2">
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*"/>
-                                    <ColumnDefinition Width="*"/>
-                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
                                 </Grid.ColumnDefinitions>
-                                
                                 <!-- TODO: Pieter refer to here regarding combobox setup -->
-                                <ComboBox ItemsSource="{Binding ActiveDirectoryCommandsList}" 
-                                              SelectedItem="{Binding SelectedComboBoxCommand}"
-                                              DisplayMemberPath="CommandText" 
-                                              HorizontalAlignment="Center" 
-                                              VerticalAlignment="Center" 
-                                              Width="212"  
-                                              IsEditable="True"
-                                              Grid.Column="0"/>
-
+                                <ComboBox ItemsSource="{Binding ActiveDirectoryCommandsList}"
+                                          SelectedItem="{Binding SelectedComboBoxCommand}"
+                                          DisplayMemberPath="CommandText"
+                                          HorizontalAlignment="Center"
+                                          VerticalAlignment="Center"
+                                          Width="212"
+                                          IsEditable="True"
+                                          Grid.Column="0" />
                                 <!-- ItemsControl for Dynamic ComboBoxes -->
                                 <ItemsControl ItemsSource="{Binding DynamicParametersCollection}"
                                               Grid.Column="1">
@@ -125,8 +112,7 @@
                                                       VerticalAlignment="Center"
                                                       Margin="5"
                                                       ItemsSource="{Binding PossibleParameterList}"
-                                                      SelectedItem="{Binding SelectedParameter}"
-                                                      />
+                                                      SelectedItem="{Binding SelectedParameter}" />
                                         </DataTemplate>
                                     </ItemsControl.ItemTemplate>
                                 </ItemsControl>
@@ -138,13 +124,11 @@
                                                      HorizontalAlignment="Left"
                                                      VerticalAlignment="Center"
                                                      Margin="5"
-                                                     Text="{Binding SelectedParameterValue}"
-                                                     />
+                                                     Text="{Binding SelectedParameterValue}" />
                                         </DataTemplate>
                                     </ItemsControl.ItemTemplate>
                                 </ItemsControl>
                             </Grid>
-
                             <Grid Grid.Row="1" Margin="12,16,12,16">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="*" />
@@ -155,24 +139,21 @@
                                     <ColumnDefinition Width="*" />
                                     <ColumnDefinition Width="*" />
                                 </Grid.ColumnDefinitions>
-
-
                                 <Button Content="Add New Command Slot"
                                         Command="{Binding AddCommandComboBoxRelay}"
                                         Grid.Column="0" />
                                 <Button Content="Add New Parameter Slot"
                                         Command="{Binding AddParameterComboBoxRelay}"
-                                        Grid.Column="1 "/>
+                                        Grid.Column="1 " />
                                 <Button Content="Remove Parameter Slot"
                                         Command="{Binding RemoveParameterComboBoxRelay}"
                                         Grid.Column="2" />
-
                                 <Button Content="Save Query"
                                         Command="{Binding SaveCustomQueriesRelay}"
                                         Grid.Column="3" />
                                 <Button Content="Execute"
-                                            Command="{Binding ExecuteCommandRelay}"
-                                            Grid.Column="4" />
+                                        Command="{Binding ExecuteCommandRelay}"
+                                        Grid.Column="4" />
                                 <Button Content="Export Console Output"
                                         Command="{Binding ExportConsoleOutputRelay}"
                                         Grid.Column="5" />
@@ -180,71 +161,61 @@
                                         Command="{Binding ClearConsoleOutputRelay}"
                                         Grid.Column="6" />
                             </Grid>
-
                             <!-- GridSplitter for resizing console area in the second row -->
-                            <GridSplitter Height="5" HorizontalAlignment="Stretch" VerticalAlignment="Center" Background="White" Grid.Row="2" Grid.ColumnSpan="2"/>
-
+                            <GridSplitter Height="5" HorizontalAlignment="Stretch" VerticalAlignment="Center"
+                                          Background="White" Grid.Row="2" Grid.ColumnSpan="2" />
                             <!-- TODO: Figure out why I can't get the console to be resizable to the min height! -->
                             <!-- TODO: Pieter refer here for the console output... try replicate for tab three -->
                             <Grid Grid.Row="3" Grid.ColumnSpan="2">
                                 <!-- TextBox as Console Output -->
-                                <TextBox Text="{Binding PowerShellOutput.ConsoleOutput}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10" IsReadOnly="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto"/>
+                                <TextBox Text="{Binding PowerShellOutput.ConsoleOutput}" HorizontalAlignment="Stretch"
+                                         VerticalAlignment="Stretch" Margin="10" IsReadOnly="True" TextWrapping="Wrap"
+                                         VerticalScrollBarVisibility="Auto" />
                             </Grid>
-                            
-                            
-
-                        <!-- Menu options  -->
+                            <!-- Menu options  -->
                             <Menu Grid.Row="0" x:Name="OptionsMenu" Width="Auto" Height="20" Margin="10,15,934,64">
                                 <MenuItem Header="Options">
                                     <MenuItem Header="Add New Command Slot"
-                                              Command="{Binding AddCommandComboBoxRelay}"
-                                              />
+                                              Command="{Binding AddCommandComboBoxRelay}" />
                                     <MenuItem Header="Add New Parameter Slot"
-                                              Command="{Binding AddParameterComboBoxRelay}"
-                                              />
+                                              Command="{Binding AddParameterComboBoxRelay}" />
                                     <MenuItem Header="Remove Parameter Slot"
-                                              Command="{Binding RemoveParameterComboBoxRelay}"
-                                              />
+                                              Command="{Binding RemoveParameterComboBoxRelay}" />
                                     <MenuItem Header="Save Query"
-                                              Command="{Binding SaveCustomQueriesRelay}"
-                                              />
+                                              Command="{Binding SaveCustomQueriesRelay}" />
                                     <MenuItem Header="Execute"
-                                              Command="{Binding ExecuteCommandRelay}"
-                                              >
-                                        <MenuItem Header="Output to console"
-                                                  Command="{Binding ExecuteCommandRelay}"
-                                                  />
-                                        <MenuItem Header="Output to Csv"
-                                                  Command="{Binding OutputToCsvFileRelay}"/>
-                                        <MenuItem Header="Output to Text"
-                                                  Command="{Binding OutputToTextFileRelay}"/>
-                                    </MenuItem>
+                                              Command="{Binding ExecuteCommandRelay}" />
+                                    <MenuItem Header="Output to console"
+                                              Command="{Binding ExecuteCommandRelay}" />
+                                    <MenuItem Header="Output to Csv"
+                                              Command="{Binding OutputToCsvFileRelay}" />
+                                    <MenuItem Header="Output to Text"
+                                              Command="{Binding OutputToTextFileRelay}" />
                                     <MenuItem Header="Export Console Output"
-                                              Command="{Binding ExportConsoleOutput}"
-                                              />
+                                              Command="{Binding }" />
                                     <MenuItem Header="Clear Console Output"
-                                              Command="{Binding ClearConsoleOutputRelay}"
-                                              />
+                                              Command="{Binding ClearConsoleOutputRelay}" />
                                     <MenuItem Header="Add Button"
-                                              Command="{Binding AddButton}"
-                                              />
+                                              Command="{Binding }" />
                                     <MenuItem Header="Clear Query"
-                                              Command="{Binding ClearQueryBuilderRelay}"/>
-
+                                              Command="{Binding ClearQueryBuilderRelay}" />
                                 </MenuItem>
                             </Menu>
-                            <CheckBox Grid.Row="0" x:Name="isEditing" Content="Editing" HorizontalAlignment="Left" Margin="14,57,0,0" VerticalAlignment="Top" IsChecked="{Binding EditingEnabled}"/>
+                            <CheckBox Grid.Row="0" Content="Editing" HorizontalAlignment="Left" Margin="14,57,0,0"
+                                      VerticalAlignment="Top" IsChecked="{Binding EditingEnabled}" />
                         </Grid>
                     </TabItem>
                     <TabItem Header="Active Directory Information">
                         <Grid Background="#FFE5E5E5">
-                            <Button Content="Execute" HorizontalAlignment="Left" Margin="368,43,0,0" VerticalAlignment="Top" Height="23" Width="95"/>
-                            <ComboBox HorizontalAlignment="Left" Margin="31,44,0,0" VerticalAlignment="Top" Width="207" Height="26"/>
-                            <DataGrid d:ItemsSource="{d:SampleData ItemCount=5}" Margin="0,157,0,0"/>
+                            <Button Content="Execute" HorizontalAlignment="Left" Margin="368,43,0,0"
+                                    VerticalAlignment="Top" Height="23" Width="95" />
+                            <ComboBox HorizontalAlignment="Left" Margin="31,44,0,0" VerticalAlignment="Top" Width="207"
+                                      Height="26" />
+                            <DataGrid d:ItemsSource="{d:SampleData ItemCount=5}" Margin="0,157,0,0" />
                         </Grid>
                     </TabItem>
                 </TabControl>
             </Grid>
         </Grid>
     </Grid>
-</Window>
+</Window>
\ No newline at end of file

From 35c2cf27a4969f3e81091c46ee2f1c2d77abdd91 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Sat, 9 Mar 2024 11:30:38 -0800
Subject: [PATCH 24/94] Add 'clear query' button from dropdown to other button
 section

---
 ActiveDirectoryQuerier/MainWindow.xaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index 7fda637..30bfaf1 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -138,6 +138,7 @@
                                     <ColumnDefinition Width="*" />
                                     <ColumnDefinition Width="*" />
                                     <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="*" />
                                 </Grid.ColumnDefinitions>
                                 <Button Content="Add New Command Slot"
                                         Command="{Binding AddCommandComboBoxRelay}"
@@ -160,6 +161,9 @@
                                 <Button Content="Clear Console Output"
                                         Command="{Binding ClearConsoleOutputRelay}"
                                         Grid.Column="6" />
+                                <Button Content="Clear Query"
+                                        Command="{Binding ClearQueryBuilderRelay}" 
+                                        Grid.Column="7" />
                             </Grid>
                             <!-- GridSplitter for resizing console area in the second row -->
                             <GridSplitter Height="5" HorizontalAlignment="Stretch" VerticalAlignment="Center"

From 568a6cc8c4f22533e1dd35005bf19f793c09b314 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Sat, 9 Mar 2024 13:24:04 -0800
Subject: [PATCH 25/94] Can now export console log to an external txt file

---
 .../AppConsoleTests.cs                        | 68 ++++++++++++++-----
 ActiveDirectoryQuerier/AppConsole.cs          | 13 +++-
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 33 +++++----
 3 files changed, 82 insertions(+), 32 deletions(-)

diff --git a/ActiveDirectoryQuerier.Tests/AppConsoleTests.cs b/ActiveDirectoryQuerier.Tests/AppConsoleTests.cs
index e95da7f..c934566 100644
--- a/ActiveDirectoryQuerier.Tests/AppConsoleTests.cs
+++ b/ActiveDirectoryQuerier.Tests/AppConsoleTests.cs
@@ -3,28 +3,44 @@
 
 namespace ActiveDirectoryQuerier.Tests;
 
-public class AppConsoleTests
+public class AppConsoleTests : IDisposable
 {
-    [Fact]
-    public void ClearConsole_ClearsConsole_SuccessfullyCleared()
+    // TODO: Make sure this is how I should perform cleanups...
+    public void Dispose()
+    {
+        if (File.Exists("output.txt"))
+        {
+            File.Delete("output.txt");
+        }
+
+        if (File.Exists("output.csv"))
+        {
+            File.Delete("output.csv");
+        }
+
+        GC.SuppressFinalize(this);
+    }
+
+    private static async Task<(AppConsole, ReturnValues)> ExecuteCommandAsync(Command command)
     {
-        // Arrange
         PowerShellExecutor powerShellExecutor = new();
-        Command command = new("Get-Process");
         AppConsole appConsole = new();
+        ReturnValues result = await powerShellExecutor.ExecuteAsync(command);
 
-        // Act
-        command.Parameters.Add("Name", "explorer");
-        // TODO: Maybe implement an interface of PowerShellExecutor and use a mock object to test to prevent execution
-        // errors.
-        var result = powerShellExecutor.Execute(command);
+        appConsole.Append(result.HadErrors ? result.StdErr : result.StdOut);
 
-        if (result.HadErrors)
-        {
-            throw new Exception("Error occurred while executing command");
-        }
+        return (appConsole, result);
+    }
+
+    [Fact]
+    public async Task ClearConsole_ClearsConsole_SuccessfullyCleared()
+    {
+        // Arrange
+        Command command = new("Get-Process");
+        command.Parameters.Add("Name", "explorer");
+        var (appConsole, _) = await ExecuteCommandAsync(command);
 
-        appConsole.Append(result.StdOut);
+        // Act
         appConsole.ClearConsole();
 
         // Assert
@@ -36,7 +52,7 @@ public void Append_AppendsStringToConsole_SuccessfullyAppended()
     {
         // Arrange
         AppConsole appConsole = new();
-        string output = "Output";
+        const string output = "Output";
 
         // Act
         appConsole.Append(output);
@@ -44,4 +60,24 @@ public void Append_AppendsStringToConsole_SuccessfullyAppended()
         // Assert
         Assert.Equal(output, appConsole.ConsoleOutput);
     }
+
+    [Fact]
+    public async Task ExportToText_ExportToText_SuccessfullyExported()
+    {
+        // Arrange
+        Command command = new("Get-Process");
+        command.Parameters.Add("Name", "explorer");
+        var (appConsole, returnValues) = await ExecuteCommandAsync(command);
+
+        // Act
+        appConsole.ExportToText();
+        string fileContents = await File.ReadAllTextAsync("output.txt");
+
+        // Assert
+        Assert.True(File.Exists("output.txt"));
+
+        Assert.Equal(returnValues.HadErrors ? string.Join(Environment.NewLine, returnValues.StdErr)
+                                            : string.Join(Environment.NewLine, returnValues.StdOut),
+                     fileContents);
+    }
 }
diff --git a/ActiveDirectoryQuerier/AppConsole.cs b/ActiveDirectoryQuerier/AppConsole.cs
index f702eb2..efb44bf 100644
--- a/ActiveDirectoryQuerier/AppConsole.cs
+++ b/ActiveDirectoryQuerier/AppConsole.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using System.IO;
 
 namespace ActiveDirectoryQuerier;
 
@@ -14,8 +15,7 @@ public sealed class AppConsole : INotifyPropertyChanged
     /// Gets or sets the console output.
     /// </summary>
     /// <important>
-    /// Do not set this property directly. Use the <see cref="Append"/> method instead. It's public for data binding
-    /// purposes.
+    /// Do not set this property directly. Use the Append method instead. It's public for data binding purposes.
     /// </important>
     public string ConsoleOutput
     {
@@ -56,6 +56,15 @@ public void Append(string outputText)
         ConsoleOutput += outputText;
     }
 
+    /// <summary>
+    /// Exports the console output to a text file.
+    /// </summary>
+    /// <param name="filePath">The file path to export the console output to.</param>
+    public void ExportToText(string filePath = "output.txt")
+    {
+        File.WriteAllText(filePath, ConsoleOutput);
+    }
+
     /// <summary>
     /// Raises the PropertyChanged event.
     /// </summary>
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index fb71aa8..fba5aad 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -6,7 +6,6 @@
 using System.Text;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
 using System.Windows.Input;
 using ActiveDirectoryQuerier.PowerShell;
 using Microsoft.Win32;
@@ -208,12 +207,12 @@ public Command? SelectedComboBoxCommand
     /// Command to output to a csv when executing
     /// </summary>
     public ICommand OutputToCsvFileRelay { get; }
-    
+
     /// <summary>
     /// Command to export the console output to a text file.
     /// </summary>
     public ICommand ExportConsoleOutputRelay { get; }
-    
+
     /// <summary>
     /// Command to clear the console output.
     /// </summary>
@@ -278,7 +277,7 @@ public MainWindowViewModel()
 
         Collection<PSObject> ReturnValue results = powerShell.ExecuteCommand(command);
     }*/
-    
+
     private void ClearConsoleOutput(object _)
     {
         if (PowerShellOutput.ConsoleOutput.Length == 0)
@@ -289,14 +288,14 @@ private void ClearConsoleOutput(object _)
                             MessageBoxImage.Information);
             return;
         }
-        
+
         // Display a gui box confirming if the user wants to confirm the clear
         MessageBoxResult result = MessageBox.Show("Are you sure you want to clear the console output?",
                                                   "Warning",
                                                   MessageBoxButton.YesNo,
                                                   MessageBoxImage.Warning,
                                                   MessageBoxResult.No);
-        
+
         // If the user selects yes, clear the console
         if (result == MessageBoxResult.Yes)
         {
@@ -603,15 +602,22 @@ private async void OutputToCsvFileAsync(object _)
             await File.WriteAllTextAsync(filePath, csv.ToString());
         }
     }
-    
+
     /// <summary>
-    /// Adds a new command selection ComboBox to the UI.
+    /// This method is for getting the currently selected command at anytime.
     /// </summary>
     /// <param name="_">This is the object that the command is bound to.</param>
     private void ExportConsoleOutput(object _)
     {
-        Trace.WriteLine("Not implemented yet.");
-        MessageBox.Show("Not implemented yet.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+        SaveFileDialog saveFileDialog = new() { DefaultExt = ".txt", Filter = "Text documents (.txt)|*.txt" };
+
+        bool? result = saveFileDialog.ShowDialog();
+
+        if (result == true)
+        {
+            string filename = saveFileDialog.FileName;
+            PowerShellOutput.ExportToText(filename);
+        }
     }
 
     /// <summary>
@@ -715,7 +721,6 @@ private void RemoveParameterComboBox(object _)
     /// <param name="commandParameter">This is not used but necessary for the relay command</param>
     private void SaveCustomQueries(object commandParameter)
     {
-   
         if (SelectedComboBoxCommand is null)
         {
             Trace.WriteLine("No command selected.");
@@ -730,7 +735,7 @@ private void SaveCustomQueries(object commandParameter)
         {
             // CustomQueries.query editingQuery = _customQuery.Queries.Find(item => item == isEditing);
             GetCurrentQuery();
-            Trace.WriteLine(_customQuery.Queries.IndexOf(_isEditing));  
+            Trace.WriteLine(_customQuery.Queries.IndexOf(_isEditing));
             _customQuery.Queries[_customQuery.Queries.IndexOf(_isEditing)] = _currentQuery;
             _customQuery.SerializeMethod();
             _isEditing = null;
@@ -820,9 +825,9 @@ private Button CreateCustomButton(Query? query = null)
         MenuItem menuItem1 =
             new() { Header = "Execute", Command = ExecuteCommandButtonRelay, CommandParameter = newButton };
 
-       MenuItem outputToCSV = new() { Header = "Output to CSV", Command = OutputToCsvFileRelay };
+        MenuItem outputToCSV = new() { Header = "Output to CSV", Command = OutputToCsvFileRelay };
         MenuItem outputToText = new() { Header = "Output to Text", Command = OutputToTextFileRelay };
-        MenuItem exportToConsole = new() { Header = "Execute to Console", Command = ExecuteCommandRelay};
+        MenuItem exportToConsole = new() { Header = "Execute to Console", Command = ExecuteCommandRelay };
 
         menuItem1.Items.Add(outputToCSV);
         menuItem1.Items.Add(outputToText);

From 840e195cde80ce17ead53701be974fdf7b28f1e2 Mon Sep 17 00:00:00 2001
From: J0seph0 <jhoward26@ewu.edu>
Date: Sat, 9 Mar 2024 13:24:51 -0800
Subject: [PATCH 26/94] Fixed the duplication of parameters

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index fb71aa8..ea53f25 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -741,19 +741,8 @@ private void SaveCustomQueries(object commandParameter)
             // Try to get the content within the drop downs
             try
             {
-                // TODO: Possibly convert foreach into a for loop...
-                int i = 0;
-                foreach (var comboBoxData in DynamicParametersCollection)
-                {
-                    // string selectedItem = comboBoxData.SelectedParameter;
-                    // Need to look at this to see if it is working with the object type and then serialize it
-                    // Trace.WriteLine(DynamicParameterValuesCollection[i].SelectedParameterValue);
-
-                    SelectedComboBoxCommand.Parameters.Add(
-                        new CommandParameter(comboBoxData.SelectedParameter,
-                                             DynamicParameterValuesCollection[i].SelectedParameterValue));
-                    i++;
-                }
+
+                UpdateSelectedCommand();
 
                 _customQuery.SerializeCommand(SelectedComboBoxCommand, QueryName, QueryDescription);
 

From f930f523ace3b7a6a8d284b6c753ac8bb6c86854 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Sat, 9 Mar 2024 13:43:04 -0800
Subject: [PATCH 27/94] Remove redundant options

---
 ActiveDirectoryQuerier/MainWindow.xaml | 28 ++++----------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index 30bfaf1..93ad530 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -140,10 +140,10 @@
                                     <ColumnDefinition Width="*" />
                                     <ColumnDefinition Width="*" />
                                 </Grid.ColumnDefinitions>
-                                <Button Content="Add New Command Slot"
+                                <Button Content="Add Command Slot"
                                         Command="{Binding AddCommandComboBoxRelay}"
                                         Grid.Column="0" />
-                                <Button Content="Add New Parameter Slot"
+                                <Button Content="Add Parameter Slot"
                                         Command="{Binding AddParameterComboBoxRelay}"
                                         Grid.Column="1 " />
                                 <Button Content="Remove Parameter Slot"
@@ -179,30 +179,10 @@
                             <!-- Menu options  -->
                             <Menu Grid.Row="0" x:Name="OptionsMenu" Width="Auto" Height="20" Margin="10,15,934,64">
                                 <MenuItem Header="Options">
-                                    <MenuItem Header="Add New Command Slot"
-                                              Command="{Binding AddCommandComboBoxRelay}" />
-                                    <MenuItem Header="Add New Parameter Slot"
-                                              Command="{Binding AddParameterComboBoxRelay}" />
-                                    <MenuItem Header="Remove Parameter Slot"
-                                              Command="{Binding RemoveParameterComboBoxRelay}" />
-                                    <MenuItem Header="Save Query"
-                                              Command="{Binding SaveCustomQueriesRelay}" />
-                                    <MenuItem Header="Execute"
-                                              Command="{Binding ExecuteCommandRelay}" />
-                                    <MenuItem Header="Output to console"
-                                              Command="{Binding ExecuteCommandRelay}" />
-                                    <MenuItem Header="Output to Csv"
+                                    <MenuItem Header="Execute to CSV file"
                                               Command="{Binding OutputToCsvFileRelay}" />
-                                    <MenuItem Header="Output to Text"
+                                    <MenuItem Header="Output to Text file"
                                               Command="{Binding OutputToTextFileRelay}" />
-                                    <MenuItem Header="Export Console Output"
-                                              Command="{Binding }" />
-                                    <MenuItem Header="Clear Console Output"
-                                              Command="{Binding ClearConsoleOutputRelay}" />
-                                    <MenuItem Header="Add Button"
-                                              Command="{Binding }" />
-                                    <MenuItem Header="Clear Query"
-                                              Command="{Binding ClearQueryBuilderRelay}" />
                                 </MenuItem>
                             </Menu>
                             <CheckBox Grid.Row="0" Content="Editing" HorizontalAlignment="Left" Margin="14,57,0,0"

From f721f42456a8288b5e623530994383a53734e897 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Sat, 9 Mar 2024 13:53:36 -0800
Subject: [PATCH 28/94] Asks users for confirmation before clearing query
 builder

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 30 ++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index fe0f99b..863ba58 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -768,16 +768,38 @@ private void SaveCustomQueries(object commandParameter)
     /// <param name="_">Object that the command is tied to</param>
     private void ClearQueryBuilder(object _)
     {
-        SelectedComboBoxCommand = null;
-        DynamicParametersCollection.Clear();
-        DynamicParameterValuesCollection.Clear();
+        if (SelectedComboBoxCommand is null && DynamicParametersCollection.Count == 0)
+        {
+            MessageBox.Show("The query builder is already clear.",
+                            "Information",
+                            MessageBoxButton.OK,
+                            MessageBoxImage.Information);
+            return;
+        }
+
+        // Display a gui box confirming if the user wants to confirm the clear
+        MessageBoxResult result = MessageBox.Show("Are you sure you want to clear the query builder?",
+                                                  "Warning",
+                                                  MessageBoxButton.YesNo,
+                                                  MessageBoxImage.Warning,
+                                                  MessageBoxResult.No);
+
+        // If the user selects yes, clear the console
+        if (result == MessageBoxResult.Yes)
+        {
+            SelectedComboBoxCommand = null;
+            DynamicParametersCollection.Clear();
+            DynamicParameterValuesCollection.Clear();
+        }
     }
 
     /// <summary>
     /// This method is for creating buttons, right now it creates it off of the current/selectedcommand parameters but
     /// could be changed to also do it from the query list.
-    /// TODO: Change method name???
     /// </summary>
+    /// <note>
+    /// TODO: Change method name?
+    /// </note>
     /// <returns>This method returns a button that has been customized for the custom query list</returns>
     private Button CreateCustomButton(Query? query = null)
     {

From 21d179ba2b327a84d47ec3e03b1af06377735e76 Mon Sep 17 00:00:00 2001
From: J0seph0 <jhoward26@ewu.edu>
Date: Sat, 9 Mar 2024 14:16:04 -0800
Subject: [PATCH 29/94] Combined the buttons into a combobox and updated to be
 accurate

---
 ActiveDirectoryQuerier/MainWindow.xaml    | 84 +++++++++++++----------
 ActiveDirectoryQuerier/MainWindow.xaml.cs |  5 ++
 2 files changed, 51 insertions(+), 38 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index 30bfaf1..21cff8e 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -80,13 +80,13 @@
                             <!-- Define Rows. -->
                             <Grid.RowDefinitions>
                                 <!-- TODO: Figure out why the bottom row isn't stopping at the specified min height! -->
-                                <RowDefinition Height="Auto" MinHeight="100" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="5" />
-                                <RowDefinition Height="3*" MinHeight="100" />
+                                <RowDefinition Height="Auto" MinHeight="160" />
+                                <RowDefinition Height="Auto" MinHeight="23" />
+                                <RowDefinition Height="26" />
+                                <RowDefinition MinHeight="100" />
                             </Grid.RowDefinitions>
                             <!-- TODO: Fix the margin so that the combo boxes are not so spaced-->
-                            <Grid Margin="0,0,0,100" Grid.Row="0" Grid.ColumnSpan="3" Grid.RowSpan="2">
+                            <Grid Margin="0,0,0,49" Grid.Row="0">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="*" />
                                     <ColumnDefinition Width="*" />
@@ -128,7 +128,40 @@
                                         </DataTemplate>
                                     </ItemsControl.ItemTemplate>
                                 </ItemsControl>
+                                <ComboBox Margin="24,10,364,81" Width="Auto" Height="20" Grid.Row="0">
+                                    <ComboBoxItem>
+                                        <Button Content="Add New Command Slot" Command="{Binding AddCommandComboBoxRelay}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <Button Content="Add New Parameter Slot" Command="{Binding AddParameterComboBoxRelay}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <Button Content="Remove Parameter Slot" Command="{Binding RemoveParameterComboBoxRelay}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <Button Content="Save Query" Command="{Binding SaveCustomQueriesRelay}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <Button Content="Execute" Command="{Binding ExecuteCommandRelay}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <Button Content="Execute to CSV" Command="{Binding OutputToCsvFileRelay}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <Button Content="Execute to Text" Command="{Binding OutputToTextFileRelay}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <Button Content="Export Console Output" Command="{Binding ExportConsoleOutputRelay}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <Button Content="Clear Console Output" Command="{Binding ClearConsoleOutputRelay}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <Button Content="Clear Query" Command="{Binding ClearQueryBuilderRelay}" />
+                                    </ComboBoxItem>
+                                </ComboBox>
                             </Grid>
+                            <!-- 
                             <Grid Grid.Row="1" Margin="12,16,12,16">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="*" />
@@ -165,48 +198,23 @@
                                         Command="{Binding ClearQueryBuilderRelay}" 
                                         Grid.Column="7" />
                             </Grid>
-                            <!-- GridSplitter for resizing console area in the second row -->
-                            <GridSplitter Height="5" HorizontalAlignment="Stretch" VerticalAlignment="Center"
-                                          Background="White" Grid.Row="2" Grid.ColumnSpan="2" />
+                            -->
+                            <!--  for resizing console area in the second row -->
+                            <GridSplitter Height="4" HorizontalAlignment="Stretch" VerticalAlignment="Center"
+                                          Background="White" Grid.Row="2" />
                             <!-- TODO: Figure out why I can't get the console to be resizable to the min height! -->
                             <!-- TODO: Pieter refer here for the console output... try replicate for tab three -->
-                            <Grid Grid.Row="3" Grid.ColumnSpan="2">
+                            <Grid Grid.Row="3">
                                 <!-- TextBox as Console Output -->
                                 <TextBox Text="{Binding PowerShellOutput.ConsoleOutput}" HorizontalAlignment="Stretch"
                                          VerticalAlignment="Stretch" Margin="10" IsReadOnly="True" TextWrapping="Wrap"
                                          VerticalScrollBarVisibility="Auto" />
                             </Grid>
+
                             <!-- Menu options  -->
-                            <Menu Grid.Row="0" x:Name="OptionsMenu" Width="Auto" Height="20" Margin="10,15,934,64">
-                                <MenuItem Header="Options">
-                                    <MenuItem Header="Add New Command Slot"
-                                              Command="{Binding AddCommandComboBoxRelay}" />
-                                    <MenuItem Header="Add New Parameter Slot"
-                                              Command="{Binding AddParameterComboBoxRelay}" />
-                                    <MenuItem Header="Remove Parameter Slot"
-                                              Command="{Binding RemoveParameterComboBoxRelay}" />
-                                    <MenuItem Header="Save Query"
-                                              Command="{Binding SaveCustomQueriesRelay}" />
-                                    <MenuItem Header="Execute"
-                                              Command="{Binding ExecuteCommandRelay}" />
-                                    <MenuItem Header="Output to console"
-                                              Command="{Binding ExecuteCommandRelay}" />
-                                    <MenuItem Header="Output to Csv"
-                                              Command="{Binding OutputToCsvFileRelay}" />
-                                    <MenuItem Header="Output to Text"
-                                              Command="{Binding OutputToTextFileRelay}" />
-                                    <MenuItem Header="Export Console Output"
-                                              Command="{Binding }" />
-                                    <MenuItem Header="Clear Console Output"
-                                              Command="{Binding ClearConsoleOutputRelay}" />
-                                    <MenuItem Header="Add Button"
-                                              Command="{Binding }" />
-                                    <MenuItem Header="Clear Query"
-                                              Command="{Binding ClearQueryBuilderRelay}" />
-                                </MenuItem>
-                            </Menu>
+
                             <CheckBox Grid.Row="0" Content="Editing" HorizontalAlignment="Left" Margin="14,57,0,0"
-                                      VerticalAlignment="Top" IsChecked="{Binding EditingEnabled}" />
+                                      VerticalAlignment="Top" IsChecked="{Binding EditingEnabled}" Height="15" Width="57" />
                         </Grid>
                     </TabItem>
                     <TabItem Header="Active Directory Information">
diff --git a/ActiveDirectoryQuerier/MainWindow.xaml.cs b/ActiveDirectoryQuerier/MainWindow.xaml.cs
index c7ca4d1..85a10dc 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml.cs
+++ b/ActiveDirectoryQuerier/MainWindow.xaml.cs
@@ -7,4 +7,9 @@ public MainWindow()
         InitializeComponent();
         DataContext = new MainWindowViewModel();
     }
+
+    private void TextBox_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e)
+    {
+
+    }
 }

From 05286640b790552b75958e21ee03429a758ec297 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Sat, 9 Mar 2024 14:17:59 -0800
Subject: [PATCH 30/94] Small fixes

---
 .../PowerShell/ActiveDirectoryCommands.cs                | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ActiveDirectoryQuerier/PowerShell/ActiveDirectoryCommands.cs b/ActiveDirectoryQuerier/PowerShell/ActiveDirectoryCommands.cs
index 7dfbdc1..5ef71b0 100644
--- a/ActiveDirectoryQuerier/PowerShell/ActiveDirectoryCommands.cs
+++ b/ActiveDirectoryQuerier/PowerShell/ActiveDirectoryCommands.cs
@@ -28,18 +28,19 @@ public static async Task<ObservableCollection<Command>> GetActiveDirectoryComman
         ReturnValues commandListTemp = await powerShellExecutor.ExecuteAsync(command);
 
         // NOTE: This is more of an internal error...
-        // TODO: Provide a more detailed error message??? Maybe log the error to a file???
+        // TODO: Provide a more detailed error message, possibly to the user and to a log file.
         if (commandListTemp.HadErrors)
         {
             MessageBox.Show(string.Join(" ", commandListTemp.StdErr),
-                            "Warning",
+                            "Error",
                             MessageBoxButton.OK,
                             MessageBoxImage.Error);
             throw new InvalidPowerShellStateException(
-                "An error occurred while retrieving the ActiveDirectory commands.");
+                $"An error occurred while retrieving the ActiveDirectory commands: " +
+                $"{string.Join(" ", commandListTemp.StdErr)}");
         }
 
-        foreach (var cmd in commandListTemp.StdOut)
+        foreach (string cmd in commandListTemp.StdOut)
         {
             commandList.Add(new Command(cmd));
         }

From 3bf4759a9926b67300dcc605c4fb96aaab3e2148 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Sat, 9 Mar 2024 14:18:21 -0800
Subject: [PATCH 31/94] Refactor and reduce duplicate code

---
 .../PowerShell/CommandParameters.cs           | 65 +++++++------------
 1 file changed, 23 insertions(+), 42 deletions(-)

diff --git a/ActiveDirectoryQuerier/PowerShell/CommandParameters.cs b/ActiveDirectoryQuerier/PowerShell/CommandParameters.cs
index 60fe965..2342a6a 100644
--- a/ActiveDirectoryQuerier/PowerShell/CommandParameters.cs
+++ b/ActiveDirectoryQuerier/PowerShell/CommandParameters.cs
@@ -7,7 +7,6 @@ namespace ActiveDirectoryQuerier.PowerShell;
 
 /// <summary>
 /// Manages and provides the parameters available for a given PowerShell command.
-/// TODO: Figure out what to do with the Async and non-Async methods! Too much duplicate code..
 /// </summary>
 public class CommandParameters : ICommandParameters
 {
@@ -16,10 +15,10 @@ public class CommandParameters : ICommandParameters
     /// <summary>
     /// Gets the collection of possible parameters for a command.
     /// </summary>
+    /// <exception cref="InvalidOperationException">Thrown when the collection has not been populated yet.</exception>
     /// <note>
     /// I realize that this isn't a very clean way of doing things, but it's the best I could come up with at the time.
     /// </note>
-    /// <exception cref="InvalidOperationException">Thrown when the collection has not been populated yet.</exception>
     public ObservableCollection<string> PossibleParameters
     {
         get {
@@ -32,47 +31,18 @@ public ObservableCollection<string> PossibleParameters
             return _possibleParameters;
         }
     }
-
-    /// <summary>
-    /// Asynchronously loads the possible parameters for the specified command into the '_possibleParameters'
-    /// collection.
-    /// </summary>
-    /// <param name="commandObject">The PowerShell command object whose parameters are to be loaded.</param>
-    /// <returns>A task representing the asynchronous operation.</returns>
+    
     public async Task LoadCommandParametersAsync(Command? commandObject)
     {
-        // commandObject can be null if the user attempts to select an ActiveDirectory command that doesn't exist.
-        // More specifically, if the entered command doesn't exist in the ActiveDirectoryCommandsList in
-        // MainWindowViewModel.cs, commandObject will be null, causing an exception to be thrown, crashing the program.
-        if (commandObject is null)
-        {
-            Trace.WriteLine("Error: commandObject is null");
-            _possibleParameters.Add("No valid command provided");
-            return;
-        }
-
-        if (_possibleParameters.Count == 0)
-        {
-            using var powerShell = System.Management.Automation.PowerShell.Create();
-            string commandString =
-                $"Get-Command {commandObject.CommandText} | Select -ExpandProperty Parameters | ForEach-Object {{ $_.Keys }}";
-
-            powerShell.Commands.Clear();
-            powerShell.AddScript(commandString);
-            PSDataCollection<PSObject> result = await powerShell.InvokeAsync();
-
-            foreach (PSObject cmd in result)
-            {
-                _possibleParameters.Add($"-{cmd}");
-            }
-        }
+        await LoadCommandParametersInternal(commandObject, true);
     }
 
-    /// <summary>
-    /// Loads the possible parameters for the specified command into the '_possibleParameters' collection.
-    /// </summary>
-    /// <param name="commandObject">The PowerShell command object whose parameters are to be loaded.</param>
     void ICommandParameters.LoadCommandParameters(Command? commandObject)
+    {
+        LoadCommandParametersInternal(commandObject, false).Wait();
+    }
+
+    private async Task LoadCommandParametersInternal(Command? commandObject, bool isAsync)
     {
         // commandObject can be null if the user attempts to select an ActiveDirectory command that doesn't exist.
         // More specifically, if the entered command doesn't exist in the ActiveDirectoryCommandsList in
@@ -88,15 +58,26 @@ void ICommandParameters.LoadCommandParameters(Command? commandObject)
         {
             using var powerShell = System.Management.Automation.PowerShell.Create();
             string commandString =
-                $"Get-Command {commandObject.CommandText} | Select -ExpandProperty Parameters | ForEach-Object {{$_.Keys }}";
+                $"Get-Command {commandObject.CommandText} | Select -ExpandProperty Parameters | ForEach-Object {{ $_.Keys }}";
 
             powerShell.Commands.Clear();
             powerShell.AddScript(commandString);
-            Collection<PSObject> result = powerShell.Invoke();
 
-            foreach (PSObject cmd in result)
+            if (isAsync)
+            {
+                PSDataCollection<PSObject> result = await powerShell.InvokeAsync();
+                foreach (PSObject cmd in result)
+                {
+                    _possibleParameters.Add($"-{cmd}");
+                }
+            }
+            else
             {
-                _possibleParameters.Add($"-{cmd}");
+                Collection<PSObject> result = powerShell.Invoke();
+                foreach (PSObject cmd in result)
+                {
+                    _possibleParameters.Add($"-{cmd}");
+                }
             }
         }
     }

From 9f387dfb74902475cfbe3f923ff124affc995b8f Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Sat, 9 Mar 2024 14:20:29 -0800
Subject: [PATCH 32/94] Add forgotten comments

---
 .../PowerShell/CommandParameters.cs                 | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/ActiveDirectoryQuerier/PowerShell/CommandParameters.cs b/ActiveDirectoryQuerier/PowerShell/CommandParameters.cs
index 2342a6a..444b89a 100644
--- a/ActiveDirectoryQuerier/PowerShell/CommandParameters.cs
+++ b/ActiveDirectoryQuerier/PowerShell/CommandParameters.cs
@@ -32,16 +32,29 @@ public ObservableCollection<string> PossibleParameters
         }
     }
     
+    /// <summary>
+    /// Retrieves the parameters available for a given command asynchronously.
+    /// </summary>
+    /// <param name="commandObject">The command object to retrieve parameters for.</param>
     public async Task LoadCommandParametersAsync(Command? commandObject)
     {
         await LoadCommandParametersInternal(commandObject, true);
     }
 
+    /// <summary>
+    /// Retrieves the parameters available for a given command synchronously.
+    /// </summary>
+    /// <param name="commandObject">The command object to retrieve parameters for.</param>
     void ICommandParameters.LoadCommandParameters(Command? commandObject)
     {
         LoadCommandParametersInternal(commandObject, false).Wait();
     }
 
+    /// <summary>
+    /// Retrieves the parameters available for a given command.
+    /// </summary>
+    /// <param name="commandObject">The command object to retrieve parameters for.</param>
+    /// <param name="isAsync">Determines whether the operation should be asynchronous or not.</param>
     private async Task LoadCommandParametersInternal(Command? commandObject, bool isAsync)
     {
         // commandObject can be null if the user attempts to select an ActiveDirectory command that doesn't exist.

From 0e541063d3d3887735e8284b5ebc0555fcab9fc3 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Sat, 9 Mar 2024 14:44:08 -0800
Subject: [PATCH 33/94] Slight refactoring and variable renaming

---
 .../PowerShell/ActiveDirectoryCommands.cs     | 20 ++++++------
 .../PowerShell/CommandParameters.cs           | 28 +++++++++--------
 .../PowerShell/CustomQueries.cs               |  2 +-
 .../PowerShell/ICommandParameters.cs          |  2 +-
 .../PowerShell/PowerShellExecutor.cs          | 31 +++++++++----------
 5 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/ActiveDirectoryQuerier/PowerShell/ActiveDirectoryCommands.cs b/ActiveDirectoryQuerier/PowerShell/ActiveDirectoryCommands.cs
index 5ef71b0..90e4e70 100644
--- a/ActiveDirectoryQuerier/PowerShell/ActiveDirectoryCommands.cs
+++ b/ActiveDirectoryQuerier/PowerShell/ActiveDirectoryCommands.cs
@@ -21,30 +21,30 @@ public static class ActiveDirectoryCommands
     /// </exception>
     public static async Task<ObservableCollection<Command>> GetActiveDirectoryCommands()
     {
-        Command command = new("Get-Command");
-        command.Parameters.Add("Module", "ActiveDirectory");
+        Command powerShellCommand = new("Get-Command");
+        powerShellCommand.Parameters.Add("Module", "ActiveDirectory");
         PowerShellExecutor powerShellExecutor = new();
-        ObservableCollection<Command> commandList = new();
-        ReturnValues commandListTemp = await powerShellExecutor.ExecuteAsync(command);
+        ObservableCollection<Command> activeDirectoryCommands = new();
+        ReturnValues powerShellOutput = await powerShellExecutor.ExecuteAsync(powerShellCommand);
 
         // NOTE: This is more of an internal error...
         // TODO: Provide a more detailed error message, possibly to the user and to a log file.
-        if (commandListTemp.HadErrors)
+        if (powerShellOutput.HadErrors)
         {
-            MessageBox.Show(string.Join(" ", commandListTemp.StdErr),
+            MessageBox.Show(string.Join(" ", powerShellOutput.StdErr),
                             "Error",
                             MessageBoxButton.OK,
                             MessageBoxImage.Error);
             throw new InvalidPowerShellStateException(
                 $"An error occurred while retrieving the ActiveDirectory commands: " +
-                $"{string.Join(" ", commandListTemp.StdErr)}");
+                $"{string.Join(" ", powerShellOutput.StdErr)}");
         }
 
-        foreach (string cmd in commandListTemp.StdOut)
+        foreach (string cmd in powerShellOutput.StdOut)
         {
-            commandList.Add(new Command(cmd));
+            activeDirectoryCommands.Add(new Command(cmd));
         }
 
-        return commandList;
+        return activeDirectoryCommands;
     }
 }
diff --git a/ActiveDirectoryQuerier/PowerShell/CommandParameters.cs b/ActiveDirectoryQuerier/PowerShell/CommandParameters.cs
index 444b89a..3aec7ee 100644
--- a/ActiveDirectoryQuerier/PowerShell/CommandParameters.cs
+++ b/ActiveDirectoryQuerier/PowerShell/CommandParameters.cs
@@ -19,6 +19,7 @@ public class CommandParameters : ICommandParameters
     /// <note>
     /// I realize that this isn't a very clean way of doing things, but it's the best I could come up with at the time.
     /// </note>
+    /// TODO: Refactor this to be more clean and less error-prone.
     public ObservableCollection<string> PossibleParameters
     {
         get {
@@ -35,34 +36,35 @@ public ObservableCollection<string> PossibleParameters
     /// <summary>
     /// Retrieves the parameters available for a given command asynchronously.
     /// </summary>
-    /// <param name="commandObject">The command object to retrieve parameters for.</param>
-    public async Task LoadCommandParametersAsync(Command? commandObject)
+    /// <param name="powerShellCommand">The command object to retrieve parameters for.</param>
+    public async Task LoadCommandParametersAsync(Command? powerShellCommand)
     {
-        await LoadCommandParametersInternal(commandObject, true);
+        await LoadCommandParametersInternal(powerShellCommand, true);
     }
 
     /// <summary>
     /// Retrieves the parameters available for a given command synchronously.
     /// </summary>
-    /// <param name="commandObject">The command object to retrieve parameters for.</param>
-    void ICommandParameters.LoadCommandParameters(Command? commandObject)
+    /// <param name="powerShellCommand">The command to retrieve parameters for.</param>
+    void ICommandParameters.LoadCommandParameters(Command? powerShellCommand)
     {
-        LoadCommandParametersInternal(commandObject, false).Wait();
+        LoadCommandParametersInternal(powerShellCommand, false).Wait();
     }
 
     /// <summary>
     /// Retrieves the parameters available for a given command.
     /// </summary>
-    /// <param name="commandObject">The command object to retrieve parameters for.</param>
+    /// <param name="powerShellCommand">The command to retrieve parameters for.</param>
     /// <param name="isAsync">Determines whether the operation should be asynchronous or not.</param>
-    private async Task LoadCommandParametersInternal(Command? commandObject, bool isAsync)
+    private async Task LoadCommandParametersInternal(Command? powerShellCommand, bool isAsync)
     {
-        // commandObject can be null if the user attempts to select an ActiveDirectory command that doesn't exist.
+        // powerShellCommand can be null if the user attempts to select an ActiveDirectory command that doesn't exist.
         // More specifically, if the entered command doesn't exist in the ActiveDirectoryCommandsList in
-        // MainWindowViewModel.cs, commandObject will be null, causing an exception to be thrown, crashing the program.
-        if (commandObject is null)
+        // MainWindowViewModel.cs, powerShellCommand will be null, causing an exception to be thrown, crashing the
+        // program.
+        if (powerShellCommand is null)
         {
-            Trace.WriteLine("Error: commandObject is null");
+            Trace.WriteLine("Error: command is null");
             _possibleParameters.Add("No valid command provided");
             return;
         }
@@ -71,7 +73,7 @@ private async Task LoadCommandParametersInternal(Command? commandObject, bool is
         {
             using var powerShell = System.Management.Automation.PowerShell.Create();
             string commandString =
-                $"Get-Command {commandObject.CommandText} | Select -ExpandProperty Parameters | ForEach-Object {{ $_.Keys }}";
+                $"Get-Command {powerShellCommand.CommandText} | Select -ExpandProperty Parameters | ForEach-Object {{ $_.Keys }}";
 
             powerShell.Commands.Clear();
             powerShell.AddScript(commandString);
diff --git a/ActiveDirectoryQuerier/PowerShell/CustomQueries.cs b/ActiveDirectoryQuerier/PowerShell/CustomQueries.cs
index c032f55..b50760c 100644
--- a/ActiveDirectoryQuerier/PowerShell/CustomQueries.cs
+++ b/ActiveDirectoryQuerier/PowerShell/CustomQueries.cs
@@ -144,8 +144,8 @@ public void SerializeCommand(Command? cmnd, string queryName, string queryDescri
     }
     /// <summary>
     /// This method Loads the string from the saved file "CustomQueries.dat" then gives it to the Queries List
-    /// TODO: Fix any and all warnings about possible null values.
     /// </summary>
+    /// TODO: Fix any and all warnings about possible null values.
     public void LoadData()
     {
         try
diff --git a/ActiveDirectoryQuerier/PowerShell/ICommandParameters.cs b/ActiveDirectoryQuerier/PowerShell/ICommandParameters.cs
index d765e23..4669773 100644
--- a/ActiveDirectoryQuerier/PowerShell/ICommandParameters.cs
+++ b/ActiveDirectoryQuerier/PowerShell/ICommandParameters.cs
@@ -4,5 +4,5 @@ namespace ActiveDirectoryQuerier.PowerShell;
 
 public interface ICommandParameters
 {
-    void LoadCommandParameters(Command? commandObject);
+    void LoadCommandParameters(Command? powerShellCommand);
 }
diff --git a/ActiveDirectoryQuerier/PowerShell/PowerShellExecutor.cs b/ActiveDirectoryQuerier/PowerShell/PowerShellExecutor.cs
index 788e258..b67dec6 100644
--- a/ActiveDirectoryQuerier/PowerShell/PowerShellExecutor.cs
+++ b/ActiveDirectoryQuerier/PowerShell/PowerShellExecutor.cs
@@ -31,11 +31,8 @@ public PowerShellExecutor()
     /// <param name="command">The command to be prepared for execution.</param>
     private void PrepareCommand(Command? command)
     {
-        // TODO: Might change to just return if command is null...
-        if (command is null)
-        {
-            throw new ArgumentNullException(nameof(command));
-        }
+        // TODO: Add a test to identify if throwing an exception is necessary, or a return value is better.
+        ArgumentNullException.ThrowIfNull(command);
 
         _powerShell.Commands.AddCommand(command.CommandText);
         foreach (var parameter in command.Parameters)
@@ -91,18 +88,18 @@ public async Task<ReturnValues> ExecuteAsync(Command? command)
     /// <summary>
     /// Handles exceptions that occur during the execution of a PowerShell command.
     /// </summary>
-    /// <param name="ex">The exception that occurred during the execution of the PowerShell command.</param>
+    /// <param name="exception">The exception that occurred during the execution of the PowerShell command.</param>
     /// <returns>A ReturnValues object containing the exception details.</returns>
-    private ReturnValues ExecutionExceptionHandler(Exception ex)
+    private ReturnValues ExecutionExceptionHandler(Exception exception)
     {
-        StringBuilder sb = new();
+        StringBuilder errorMessage = new();
 
-        sb.AppendLine("An error occurred while executing the PowerShell command:");
-        sb.AppendLine(ex.Message);
-        sb.AppendLine(ex.StackTrace);
-        Debug.WriteLine(sb.ToString());
+        errorMessage.AppendLine("An error occurred while executing the PowerShell command:");
+        errorMessage.AppendLine(exception.Message);
+        errorMessage.AppendLine(exception.StackTrace);
+        Debug.WriteLine(errorMessage.ToString());
 
-        return new ReturnValues { StdErr = { sb.ToString() } };
+        return new ReturnValues { StdErr = { errorMessage.ToString() } };
     }
 
     /// <summary>
@@ -112,24 +109,24 @@ private ReturnValues ExecutionExceptionHandler(Exception ex)
     /// <returns>A ReturnValues object containing the processed results.</returns>
     private ReturnValues ProcessPowerShellResults(IEnumerable<PSObject> results)
     {
-        ReturnValues returnValues = new();
+        ReturnValues powerShellOutput = new();
 
         if (_powerShell.HadErrors)
         {
             foreach (var error in _powerShell.Streams.Error)
             {
-                returnValues.StdErr.Add($"Error: {error}");
+                powerShellOutput.StdErr.Add($"Error: {error}");
             }
         }
         else
         {
             foreach (var result in results)
             {
-                returnValues.StdOut.Add(result.ToString());
+                powerShellOutput.StdOut.Add(result.ToString());
             }
         }
 
-        return returnValues;
+        return powerShellOutput;
     }
 
     /// <summary>

From 6b477900eb010d7245997e1ad2b03008526e78f9 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Sat, 9 Mar 2024 14:47:56 -0800
Subject: [PATCH 34/94] Modify method name

---
 ActiveDirectoryQuerier.Tests/AppConsoleTests.cs | 2 +-
 ActiveDirectoryQuerier/AppConsole.cs            | 3 ++-
 ActiveDirectoryQuerier/MainWindowViewModel.cs   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ActiveDirectoryQuerier.Tests/AppConsoleTests.cs b/ActiveDirectoryQuerier.Tests/AppConsoleTests.cs
index c934566..4f9077f 100644
--- a/ActiveDirectoryQuerier.Tests/AppConsoleTests.cs
+++ b/ActiveDirectoryQuerier.Tests/AppConsoleTests.cs
@@ -41,7 +41,7 @@ public async Task ClearConsole_ClearsConsole_SuccessfullyCleared()
         var (appConsole, _) = await ExecuteCommandAsync(command);
 
         // Act
-        appConsole.ClearConsole();
+        appConsole.Clear();
 
         // Assert
         Assert.Empty(appConsole.ConsoleOutput);
diff --git a/ActiveDirectoryQuerier/AppConsole.cs b/ActiveDirectoryQuerier/AppConsole.cs
index efb44bf..244b597 100644
--- a/ActiveDirectoryQuerier/AppConsole.cs
+++ b/ActiveDirectoryQuerier/AppConsole.cs
@@ -17,6 +17,7 @@ public sealed class AppConsole : INotifyPropertyChanged
     /// <important>
     /// Do not set this property directly. Use the Append method instead. It's public for data binding purposes.
     /// </important>
+    /// TODO: Find a way to make the set of this property private.
     public string ConsoleOutput
     {
         get => _consoleOutput;
@@ -33,7 +34,7 @@ public string ConsoleOutput
     /// <summary>
     /// Clears the console output.
     /// </summary>
-    public void ClearConsole()
+    public void Clear()
     {
         ConsoleOutput = string.Empty;
     }
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 863ba58..22e0163 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -299,7 +299,7 @@ private void ClearConsoleOutput(object _)
         // If the user selects yes, clear the console
         if (result == MessageBoxResult.Yes)
         {
-            PowerShellOutput.ClearConsole();
+            PowerShellOutput.Clear();
         }
     }
 

From 2777f5243e4cce161632ad77c9ad6090f25f9215 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Sat, 9 Mar 2024 14:57:41 -0800
Subject: [PATCH 35/94] Refactor and modify variable names

---
 .../ComboBoxParameterViewModel.cs              | 18 +++++++++---------
 ActiveDirectoryQuerier/MainWindow.xaml         |  2 +-
 ActiveDirectoryQuerier/MainWindowViewModel.cs  |  2 +-
 ActiveDirectoryQuerier/RelayCommand.cs         |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs b/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs
index b9c800e..85cdad2 100644
--- a/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs
+++ b/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs
@@ -10,16 +10,16 @@ namespace ActiveDirectoryQuerier;
 public sealed class ComboBoxParameterViewModel : INotifyPropertyChanged
 {
     public event PropertyChangedEventHandler? PropertyChanged;
-    private ObservableCollection<string> _possibleParameterList = new();
+    private ObservableCollection<string> _possibleParameters = new();
     private string _selectedParameter = string.Empty;
 
     /// <summary>
     /// Initializes a new instance of the ComboBoxParameterViewModel class.
     /// </summary>
-    /// <param name="possibleParameterList">Initial list of possible parameters for the ComboBox.</param>
-    public ComboBoxParameterViewModel(ObservableCollection<string> possibleParameterList)
+    /// <param name="possibleParameters">Initial list of possible parameters for the ComboBox.</param>
+    public ComboBoxParameterViewModel(ObservableCollection<string> possibleParameters)
     {
-        PossibleParameterList = possibleParameterList ?? throw new ArgumentNullException(nameof(possibleParameterList));
+        PossibleParameters = possibleParameters ?? throw new ArgumentNullException(nameof(possibleParameters));
     }
 
     /// <summary>
@@ -40,19 +40,19 @@ public string SelectedParameter
     /// <summary>
     /// Gets or sets the list of possible parameters that can be selected for a command.
     /// </summary>
-    public ObservableCollection<string> PossibleParameterList
+    public ObservableCollection<string> PossibleParameters
     {
-        get => _possibleParameterList;
+        get => _possibleParameters;
         set {
             if (value is null)
             {
                 throw new ArgumentNullException(nameof(value));
             }
 
-            if (_possibleParameterList != value)
+            if (_possibleParameters != value)
             {
-                _possibleParameterList = value;
-                OnPropertyChanged(nameof(PossibleParameterList));
+                _possibleParameters = value;
+                OnPropertyChanged(nameof(PossibleParameters));
             }
         }
     }
diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index 186182a..2f71531 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -111,7 +111,7 @@
                                                       HorizontalAlignment="Left"
                                                       VerticalAlignment="Center"
                                                       Margin="5"
-                                                      ItemsSource="{Binding PossibleParameterList}"
+                                                      ItemsSource="{Binding PossibleParameters}"
                                                       SelectedItem="{Binding SelectedParameter}" />
                                         </DataTemplate>
                                     </ItemsControl.ItemTemplate>
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 22e0163..fe082ba 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -460,7 +460,7 @@ private async Task LoadCommandParametersAsync(Command? selectedCommand)
         // Update the possible properties of the ComboBoxParameterViewModels.
         foreach (ComboBoxParameterViewModel comboBoxParameterViewModel in DynamicParametersCollection)
         {
-            comboBoxParameterViewModel.PossibleParameterList = PossibleCommandParametersList;
+            comboBoxParameterViewModel.PossibleParameters = PossibleCommandParametersList;
         }
     }
 
diff --git a/ActiveDirectoryQuerier/RelayCommand.cs b/ActiveDirectoryQuerier/RelayCommand.cs
index 29ddc36..be2ee65 100644
--- a/ActiveDirectoryQuerier/RelayCommand.cs
+++ b/ActiveDirectoryQuerier/RelayCommand.cs
@@ -4,11 +4,11 @@ namespace ActiveDirectoryQuerier;
 
 /// <summary>
 /// A command whose sole purpose is to relay its functionality to other objects by invoking delegates.
-/// TODO: Remove any unused methods, after some investigation.
 /// </summary>
 /// <note>
 /// I'm unsure if I'm dealing with the nullability warnings correctly, in this situation...
 /// </note>
+/// TODO: Remove any unused methods, after some investigation.
 public class RelayCommand : ICommand
 {
     private readonly Action<object> _execute;
@@ -19,7 +19,6 @@ public class RelayCommand : ICommand
     /// </summary>
     /// <param name="execute">The execution logic.</param>
     /// <param name="canExecute">The execution status logic.</param>
-    /// <exception cref="ArgumentNullException">If the execute argument is null.</exception>
     public RelayCommand(Action<object> execute, Predicate<object?>? canExecute = null)
     {
         _execute = execute;
@@ -44,6 +43,7 @@ public bool CanExecute(object? parameter)
     /// <param name="parameter">
     /// Data used by the command. If the command does not require data to be passed, this object can be set to null.
     /// </param>
+    /// TODO: Perform null checking before calling the _execute property.
     public void Execute(object? parameter)
     {
         // For now, we are ignoring the warning about the parameter being null.

From 19afeeb30ed7bc8668c93b59c0291afe1892ee47 Mon Sep 17 00:00:00 2001
From: J0seph0 <103216770+J0seph0@users.noreply.github.com>
Date: Sat, 9 Mar 2024 15:09:33 -0800
Subject: [PATCH 36/94] Fixed the alignment in the Query Builder

---
 ActiveDirectoryQuerier/MainWindow.xaml | 94 +++++++++++---------------
 1 file changed, 39 insertions(+), 55 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index 186182a..c6728c0 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -80,19 +80,24 @@
                             <!-- Define Rows. -->
                             <Grid.RowDefinitions>
                                 <!-- TODO: Figure out why the bottom row isn't stopping at the specified min height! -->
-                                <RowDefinition Height="Auto" MinHeight="160" />
-                                <RowDefinition Height="Auto" MinHeight="23" />
-                                <RowDefinition Height="26" />
+                                <RowDefinition Height="Auto" MinHeight="140" />
                                 <RowDefinition MinHeight="100" />
                             </Grid.RowDefinitions>
                             <!-- TODO: Fix the margin so that the combo boxes are not so spaced-->
+                            <!-- ROW 0 START -->
                             <Grid Margin="0,0,0,49" Grid.Row="0">
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition x:Name="Command" Width="*" />
+                                    <ColumnDefinition x:Name="Parameter" Width="*" />
+                                    <ColumnDefinition x:Name="Parameter_Values" Width="*" />
                                 </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="*" />
+                                    <RowDefinition Height="*" />
+                                    <RowDefinition Height="*" />
+                                </Grid.RowDefinitions>
                                 <!-- TODO: Pieter refer to here regarding combobox setup -->
+                                <TextBlock Grid.Row="0" Grid.Column="0" FontWeight="Bold" HorizontalAlignment="Center">Command</TextBlock>
                                 <ComboBox ItemsSource="{Binding ActiveDirectoryCommandsList}"
                                           SelectedItem="{Binding SelectedComboBoxCommand}"
                                           DisplayMemberPath="CommandText"
@@ -100,10 +105,14 @@
                                           VerticalAlignment="Center"
                                           Width="212"
                                           IsEditable="True"
-                                          Grid.Column="0" />
+                                          Grid.Column="0"
+                                          Grid.Row="1"/>
+
                                 <!-- ItemsControl for Dynamic ComboBoxes -->
+                                <TextBlock Grid.Row="0" Grid.Column="1" FontWeight="Bold" HorizontalAlignment="Center">Parameter</TextBlock>
                                 <ItemsControl ItemsSource="{Binding DynamicParametersCollection}"
-                                              Grid.Column="1">
+                                              Grid.Column="1"
+                                              Grid.Row="1">
                                     <ItemsControl.ItemTemplate>
                                         <DataTemplate>
                                             <ComboBox Width="212"
@@ -112,12 +121,17 @@
                                                       VerticalAlignment="Center"
                                                       Margin="5"
                                                       ItemsSource="{Binding PossibleParameterList}"
-                                                      SelectedItem="{Binding SelectedParameter}" />
+                                                      SelectedItem="{Binding SelectedParameter}" 
+                                                      Grid.Row="0"
+                                                      Grid.Column="1"/>
                                         </DataTemplate>
                                     </ItemsControl.ItemTemplate>
                                 </ItemsControl>
+                                <!-- Parameter Values ComboBox -->
+                                <TextBlock Grid.Row="0" Grid.Column="2" FontWeight="Bold" HorizontalAlignment="Center">Value</TextBlock>
                                 <ItemsControl ItemsSource="{Binding DynamicParameterValuesCollection}"
-                                              Grid.Column="2">
+                                              Grid.Column="2"
+                                              Grid.Row="1">
                                     <ItemsControl.ItemTemplate>
                                         <DataTemplate>
                                             <TextBox Width="212"
@@ -128,7 +142,10 @@
                                         </DataTemplate>
                                     </ItemsControl.ItemTemplate>
                                 </ItemsControl>
-                                <ComboBox Margin="24,10,364,81" Width="Auto" Height="20" Grid.Row="0">
+                                <!-- END of Dynamic ComboxBoxes for parameters and values-->
+
+                                <!-- START of Button ComboBox -->
+                                <ComboBox Margin="0,4,0,6" Height="20" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Center" MinWidth="160" Width="Auto">
                                     <ComboBoxItem>
                                         <Button Content="Add New Command Slot" Command="{Binding AddCommandComboBoxRelay}" />
                                     </ComboBoxItem>
@@ -160,58 +177,26 @@
                                         <Button Content="Clear Query" Command="{Binding ClearQueryBuilderRelay}" />
                                     </ComboBoxItem>
                                 </ComboBox>
+                                <!-- END of Button ComboBox-->
+
+                                <CheckBox Grid.Row="2" Grid.Column="0" Content="Editing" HorizontalAlignment="Left" Margin="10,6,0,0"
+                                      VerticalAlignment="Top" IsChecked="{Binding EditingEnabled}" Height="15" Width="57" />
                             </Grid>
-                            <!-- 
-                            <Grid Grid.Row="1" Margin="12,16,12,16">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="*" />
-                                </Grid.ColumnDefinitions>
-                                <Button Content="Add Command Slot"
-                                        Command="{Binding AddCommandComboBoxRelay}"
-                                        Grid.Column="0" />
-                                <Button Content="Add Parameter Slot"
-                                        Command="{Binding AddParameterComboBoxRelay}"
-                                        Grid.Column="1 " />
-                                <Button Content="Remove Parameter Slot"
-                                        Command="{Binding RemoveParameterComboBoxRelay}"
-                                        Grid.Column="2" />
-                                <Button Content="Save Query"
-                                        Command="{Binding SaveCustomQueriesRelay}"
-                                        Grid.Column="3" />
-                                <Button Content="Execute"
-                                        Command="{Binding ExecuteCommandRelay}"
-                                        Grid.Column="4" />
-                                <Button Content="Export Console Output"
-                                        Command="{Binding ExportConsoleOutputRelay}"
-                                        Grid.Column="5" />
-                                <Button Content="Clear Console Output"
-                                        Command="{Binding ClearConsoleOutputRelay}"
-                                        Grid.Column="6" />
-                                <Button Content="Clear Query"
-                                        Command="{Binding ClearQueryBuilderRelay}" 
-                                        Grid.Column="7" />
-                            </Grid>
-                            -->
-                            <!--  for resizing console area in the second row -->
-                            <GridSplitter Height="4" HorizontalAlignment="Stretch" VerticalAlignment="Center"
-                                          Background="White" Grid.Row="2" />
+                            <!-- ROW 0 END -->
+
                             <!-- TODO: Figure out why I can't get the console to be resizable to the min height! -->
                             <!-- TODO: Pieter refer here for the console output... try replicate for tab three -->
-                            <Grid Grid.Row="3">
+                            <!-- GRID ROW 1 START -->
+                            <Grid Grid.Row="1">
                                 <!-- TextBox as Console Output -->
                                 <TextBox Text="{Binding PowerShellOutput.ConsoleOutput}" HorizontalAlignment="Stretch"
                                          VerticalAlignment="Stretch" Margin="10" IsReadOnly="True" TextWrapping="Wrap"
                                          VerticalScrollBarVisibility="Auto" />
                             </Grid>
+                            <!-- GRID ROW 1 END -->
 
                             <!-- Menu options  -->
+                            <!--
                             <Menu Grid.Row="0" x:Name="OptionsMenu" Width="Auto" Height="20" Margin="10,15,934,64">
                                 <MenuItem Header="Options">
                                     <MenuItem Header="Execute to CSV file"
@@ -220,8 +205,7 @@
                                               Command="{Binding OutputToTextFileRelay}" />
                                 </MenuItem>
                             </Menu>
-                            <CheckBox Grid.Row="0" Content="Editing" HorizontalAlignment="Left" Margin="14,57,0,0"
-                                      VerticalAlignment="Top" IsChecked="{Binding EditingEnabled}" Height="15" Width="57" />
+                            -->
                         </Grid>
                     </TabItem>
                     <TabItem Header="Active Directory Information">

From bc286748972ca430bf6c0a5c8f39a846fd471af3 Mon Sep 17 00:00:00 2001
From: J0seph0 <103216770+J0seph0@users.noreply.github.com>
Date: Sat, 9 Mar 2024 15:15:03 -0800
Subject: [PATCH 37/94] Fixing centering and look of the Parameter and values

---
 ActiveDirectoryQuerier/MainWindow.xaml | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index c6728c0..0199d63 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -83,7 +83,6 @@
                                 <RowDefinition Height="Auto" MinHeight="140" />
                                 <RowDefinition MinHeight="100" />
                             </Grid.RowDefinitions>
-                            <!-- TODO: Fix the margin so that the combo boxes are not so spaced-->
                             <!-- ROW 0 START -->
                             <Grid Margin="0,0,0,49" Grid.Row="0">
                                 <Grid.ColumnDefinitions>
@@ -109,7 +108,7 @@
                                           Grid.Row="1"/>
 
                                 <!-- ItemsControl for Dynamic ComboBoxes -->
-                                <TextBlock Grid.Row="0" Grid.Column="1" FontWeight="Bold" HorizontalAlignment="Center">Parameter</TextBlock>
+                                <TextBlock Grid.Row="0" Grid.Column="1" FontWeight="Bold" HorizontalAlignment="Left">Parameter</TextBlock>
                                 <ItemsControl ItemsSource="{Binding DynamicParametersCollection}"
                                               Grid.Column="1"
                                               Grid.Row="1">
@@ -127,8 +126,9 @@
                                         </DataTemplate>
                                     </ItemsControl.ItemTemplate>
                                 </ItemsControl>
+                                
                                 <!-- Parameter Values ComboBox -->
-                                <TextBlock Grid.Row="0" Grid.Column="2" FontWeight="Bold" HorizontalAlignment="Center">Value</TextBlock>
+                                <TextBlock Grid.Row="0" Grid.Column="2" FontWeight="Bold" HorizontalAlignment="Left">Value</TextBlock>
                                 <ItemsControl ItemsSource="{Binding DynamicParameterValuesCollection}"
                                               Grid.Column="2"
                                               Grid.Row="1">
@@ -145,7 +145,7 @@
                                 <!-- END of Dynamic ComboxBoxes for parameters and values-->
 
                                 <!-- START of Button ComboBox -->
-                                <ComboBox Margin="0,4,0,6" Height="20" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Center" MinWidth="160" Width="Auto">
+                                <ComboBox Margin="0,4,0,6" Height="Auto" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Center" MinWidth="160" Width="Auto">
                                     <ComboBoxItem>
                                         <Button Content="Add New Command Slot" Command="{Binding AddCommandComboBoxRelay}" />
                                     </ComboBoxItem>
@@ -194,18 +194,6 @@
                                          VerticalScrollBarVisibility="Auto" />
                             </Grid>
                             <!-- GRID ROW 1 END -->
-
-                            <!-- Menu options  -->
-                            <!--
-                            <Menu Grid.Row="0" x:Name="OptionsMenu" Width="Auto" Height="20" Margin="10,15,934,64">
-                                <MenuItem Header="Options">
-                                    <MenuItem Header="Execute to CSV file"
-                                              Command="{Binding OutputToCsvFileRelay}" />
-                                    <MenuItem Header="Output to Text file"
-                                              Command="{Binding OutputToTextFileRelay}" />
-                                </MenuItem>
-                            </Menu>
-                            -->
                         </Grid>
                     </TabItem>
                     <TabItem Header="Active Directory Information">

From 30d6b58ec3754f3024ee0f09b45aa342e2ea596f Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Sat, 9 Mar 2024 15:19:12 -0800
Subject: [PATCH 38/94] Add/modify TODOs

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index fe082ba..f66d0a9 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -121,7 +121,8 @@ public Command? SelectedComboBoxCommand
             // No need to load parameters if the command is null.
             if (value is not null)
             {
-                LoadCommandParametersAsync(value); // TODO: Maybe change this method to synchronous...
+                // TODO: Figure out how to resolve the warning about the async method not being awaited.
+                LoadCommandParametersAsync(value);
             }
         }
     }
@@ -262,7 +263,8 @@ public MainWindowViewModel()
         ClearConsoleOutputRelay = new RelayCommand(ClearConsoleOutput);
         ClearQueryBuilderRelay = new RelayCommand(ClearQueryBuilder);
 
-        InitializeActiveDirectoryCommandsAsync(); // TODO: Maybe change this method to synchronous...
+        // TODO: Figure out how resolve the warning about the async method not being awaited.
+        InitializeActiveDirectoryCommandsAsync();
         LoadCustomQueries();                      // Calls method to deserialize and load buttons.
     }
 
@@ -328,7 +330,7 @@ private void EditCustomQuery(object sender)
         SelectedComboBoxCommand = chosenCommand;
 
         // Load the Possible Parameters Synchronously
-        CommandParameters commandParameters = new CommandParameters();
+        CommandParameters commandParameters = new();
         ((ICommandParameters)commandParameters).LoadCommandParameters(SelectedComboBoxCommand);
         PossibleCommandParametersList = new ObservableCollection<string>(commandParameters.PossibleParameters);
         OnPropertyChanged(nameof(PossibleCommandParametersList));

From 6b8bce0036d667c7425c1a86710e9f48891703b9 Mon Sep 17 00:00:00 2001
From: J0seph0 <103216770+J0seph0@users.noreply.github.com>
Date: Sat, 9 Mar 2024 15:46:24 -0800
Subject: [PATCH 39/94] Updated some outdated methods

---
 ActiveDirectoryQuerier/MainWindow.xaml.cs     |  5 ---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 39 +++++++++++--------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindow.xaml.cs b/ActiveDirectoryQuerier/MainWindow.xaml.cs
index 85a10dc..c7ca4d1 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml.cs
+++ b/ActiveDirectoryQuerier/MainWindow.xaml.cs
@@ -7,9 +7,4 @@ public MainWindow()
         InitializeComponent();
         DataContext = new MainWindowViewModel();
     }
-
-    private void TextBox_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e)
-    {
-
-    }
 }
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index fe082ba..0c27e10 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -32,7 +32,6 @@ public sealed class MainWindowViewModel : INotifyPropertyChanged
     private AppConsole _activeDirectoryInfoOutput; // Pieter TODO
     private Command? _selectedComboBoxCommand;
     private ObservableCollection<Button>? _buttons;
-    private bool _isTextBoxFocused;
 
     // [[ Other fields ]] ----------------------------------------------------------- //
 
@@ -669,25 +668,33 @@ private void GetCurrentQuery()
 
         try
         {
-            // TODO: Fix this method to handle null values...
-            string[] commandParameters = new string[SelectedComboBoxCommand.Parameters.Count];
-            string[] commandParameterValues = new string[SelectedComboBoxCommand.Parameters.Count];
+            string[] commandParameters;
+            string[] commandParameterValues;
 
-            _currentQuery.QueryDescription = QueryDescription;
-            _currentQuery.QueryName = QueryName;
+            if (SelectedComboBoxCommand is not null && SelectedComboBoxCommand.Parameters is not null)
+            {
+                commandParameters = new string[SelectedComboBoxCommand.Parameters.Count];
+                commandParameterValues = new string[SelectedComboBoxCommand.Parameters.Count];
 
-            _currentQuery.CommandName = SelectedComboBoxCommand.CommandText;
 
-            // TODO: Possibly convert foreach into a for loop...
-            int i = 0;
-            foreach (CommandParameter commandParameter in SelectedComboBoxCommand.Parameters)
-            {
-                commandParameters[i] = commandParameter.Name;
-                commandParameterValues[i] = commandParameter.Value.ToString();
-                i++;
+
+                _currentQuery.QueryDescription = QueryDescription;
+                _currentQuery.QueryName = QueryName;
+
+                _currentQuery.CommandName = SelectedComboBoxCommand.CommandText;
+
+                // TODO: Possibly convert foreach into a for loop...
+                for(int i = 0; i < SelectedComboBoxCommand.Parameters.Count; i++)
+                {
+                    CommandParameter commandParameter = SelectedComboBoxCommand.Parameters[i];
+
+                    commandParameters[i] = commandParameter.Name;
+                    commandParameterValues[i] = commandParameter.Value.ToString()!;
+                    i++;
+                }
+                _currentQuery.CommandParameters = commandParameters;
+                _currentQuery.CommandParametersValues = commandParameterValues;
             }
-            _currentQuery.CommandParameters = commandParameters;
-            _currentQuery.CommandParametersValues = commandParameterValues;
         }
         catch (Exception ex)
         {

From dfc8f0db0df65d7fefa4ee0ad7b52d83da09a055 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Sat, 9 Mar 2024 16:12:10 -0800
Subject: [PATCH 40/94] Fix problem where possible parameters were not showing

---
 .../ComboBoxParameterViewModel.cs                  | 14 +++++++-------
 ActiveDirectoryQuerier/MainWindowViewModel.cs      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs b/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs
index 85cdad2..be7a92a 100644
--- a/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs
+++ b/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs
@@ -10,7 +10,7 @@ namespace ActiveDirectoryQuerier;
 public sealed class ComboBoxParameterViewModel : INotifyPropertyChanged
 {
     public event PropertyChangedEventHandler? PropertyChanged;
-    private ObservableCollection<string> _possibleParameters = new();
+    private ObservableCollection<string> _possibleParameterListList = new();
     private string _selectedParameter = string.Empty;
 
     /// <summary>
@@ -19,7 +19,7 @@ public sealed class ComboBoxParameterViewModel : INotifyPropertyChanged
     /// <param name="possibleParameters">Initial list of possible parameters for the ComboBox.</param>
     public ComboBoxParameterViewModel(ObservableCollection<string> possibleParameters)
     {
-        PossibleParameters = possibleParameters ?? throw new ArgumentNullException(nameof(possibleParameters));
+        PossibleParameterList = possibleParameters ?? throw new ArgumentNullException(nameof(possibleParameters));
     }
 
     /// <summary>
@@ -40,19 +40,19 @@ public string SelectedParameter
     /// <summary>
     /// Gets or sets the list of possible parameters that can be selected for a command.
     /// </summary>
-    public ObservableCollection<string> PossibleParameters
+    public ObservableCollection<string> PossibleParameterList
     {
-        get => _possibleParameters;
+        get => _possibleParameterListList;
         set {
             if (value is null)
             {
                 throw new ArgumentNullException(nameof(value));
             }
 
-            if (_possibleParameters != value)
+            if (_possibleParameterListList != value)
             {
-                _possibleParameters = value;
-                OnPropertyChanged(nameof(PossibleParameters));
+                _possibleParameterListList = value;
+                OnPropertyChanged(nameof(PossibleParameterList));
             }
         }
     }
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index f66d0a9..13984d1 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -462,7 +462,7 @@ private async Task LoadCommandParametersAsync(Command? selectedCommand)
         // Update the possible properties of the ComboBoxParameterViewModels.
         foreach (ComboBoxParameterViewModel comboBoxParameterViewModel in DynamicParametersCollection)
         {
-            comboBoxParameterViewModel.PossibleParameters = PossibleCommandParametersList;
+            comboBoxParameterViewModel.PossibleParameterList = PossibleCommandParametersList;
         }
     }
 

From a610511063c9a803cfefbc2d9e29c158b7d558c8 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Sat, 9 Mar 2024 16:22:20 -0800
Subject: [PATCH 41/94] Rename property

---
 .../ComboBoxParameterViewModel.cs                  | 14 +++++++-------
 ActiveDirectoryQuerier/MainWindow.xaml             |  2 +-
 ActiveDirectoryQuerier/MainWindowViewModel.cs      |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs b/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs
index be7a92a..85cdad2 100644
--- a/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs
+++ b/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs
@@ -10,7 +10,7 @@ namespace ActiveDirectoryQuerier;
 public sealed class ComboBoxParameterViewModel : INotifyPropertyChanged
 {
     public event PropertyChangedEventHandler? PropertyChanged;
-    private ObservableCollection<string> _possibleParameterListList = new();
+    private ObservableCollection<string> _possibleParameters = new();
     private string _selectedParameter = string.Empty;
 
     /// <summary>
@@ -19,7 +19,7 @@ public sealed class ComboBoxParameterViewModel : INotifyPropertyChanged
     /// <param name="possibleParameters">Initial list of possible parameters for the ComboBox.</param>
     public ComboBoxParameterViewModel(ObservableCollection<string> possibleParameters)
     {
-        PossibleParameterList = possibleParameters ?? throw new ArgumentNullException(nameof(possibleParameters));
+        PossibleParameters = possibleParameters ?? throw new ArgumentNullException(nameof(possibleParameters));
     }
 
     /// <summary>
@@ -40,19 +40,19 @@ public string SelectedParameter
     /// <summary>
     /// Gets or sets the list of possible parameters that can be selected for a command.
     /// </summary>
-    public ObservableCollection<string> PossibleParameterList
+    public ObservableCollection<string> PossibleParameters
     {
-        get => _possibleParameterListList;
+        get => _possibleParameters;
         set {
             if (value is null)
             {
                 throw new ArgumentNullException(nameof(value));
             }
 
-            if (_possibleParameterListList != value)
+            if (_possibleParameters != value)
             {
-                _possibleParameterListList = value;
-                OnPropertyChanged(nameof(PossibleParameterList));
+                _possibleParameters = value;
+                OnPropertyChanged(nameof(PossibleParameters));
             }
         }
     }
diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index 0199d63..68d51d3 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -119,7 +119,7 @@
                                                       HorizontalAlignment="Left"
                                                       VerticalAlignment="Center"
                                                       Margin="5"
-                                                      ItemsSource="{Binding PossibleParameterList}"
+                                                      ItemsSource="{Binding PossibleParameters}"
                                                       SelectedItem="{Binding SelectedParameter}" 
                                                       Grid.Row="0"
                                                       Grid.Column="1"/>
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 13984d1..f66d0a9 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -462,7 +462,7 @@ private async Task LoadCommandParametersAsync(Command? selectedCommand)
         // Update the possible properties of the ComboBoxParameterViewModels.
         foreach (ComboBoxParameterViewModel comboBoxParameterViewModel in DynamicParametersCollection)
         {
-            comboBoxParameterViewModel.PossibleParameterList = PossibleCommandParametersList;
+            comboBoxParameterViewModel.PossibleParameters = PossibleCommandParametersList;
         }
     }
 

From 4761ad02bb96cc8a36e0eb83aabf011f2bbda9d1 Mon Sep 17 00:00:00 2001
From: J0seph0 <103216770+J0seph0@users.noreply.github.com>
Date: Sat, 9 Mar 2024 17:38:16 -0800
Subject: [PATCH 42/94] Cleaned up the drop down to make it look a little bit
 better

---
 ActiveDirectoryQuerier/MainWindow.xaml        | 61 ++++++++++++++-----
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 24 ++++++++
 2 files changed, 69 insertions(+), 16 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index 68d51d3..dca217f 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -3,7 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:activeDirectoryQuerier="clr-namespace:ActiveDirectoryQuerier"
+        xmlns:activeDirectoryQuerier="clr-namespace:ActiveDirectoryQuerier" 
         mc:Ignorable="d"
         Title="Active Directory Querier" Height="720" Width="1280">
     <Window.DataContext>
@@ -145,41 +145,72 @@
                                 <!-- END of Dynamic ComboxBoxes for parameters and values-->
 
                                 <!-- START of Button ComboBox -->
-                                <ComboBox Margin="0,4,0,6" Height="Auto" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Center" MinWidth="160" Width="Auto">
+                                <ComboBox SelectedItem="{Binding OptionsSelectedComboBoxItem}" Margin="0,4,0,6" Height="Auto" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Center" MinWidth="160" Width="Auto" >
                                     <ComboBoxItem>
-                                        <Button Content="Add New Command Slot" Command="{Binding AddCommandComboBoxRelay}" />
+                                        <Button Content="Add New Command Slot" 
+                                                Command="{Binding AddCommandComboBoxRelay}"            
+                                                Background="Transparent" 
+                                                BorderBrush="Transparent"
+                                                IsHitTestVisible="False"/>
                                     </ComboBoxItem>
                                     <ComboBoxItem>
-                                        <Button Content="Add New Parameter Slot" Command="{Binding AddParameterComboBoxRelay}" />
+                                        <Button Content="Add New Parameter Slot" Command="{Binding AddParameterComboBoxRelay}"
+                                                Background="Transparent" 
+                                                BorderBrush="Transparent"
+                                                IsHitTestVisible="False"/>
                                     </ComboBoxItem>
                                     <ComboBoxItem>
-                                        <Button Content="Remove Parameter Slot" Command="{Binding RemoveParameterComboBoxRelay}" />
+                                        <Button Content="Remove Parameter Slot" Command="{Binding RemoveParameterComboBoxRelay}" 
+                                                Background="Transparent" 
+                                                BorderBrush="Transparent"
+                                                IsHitTestVisible="False"/>
                                     </ComboBoxItem>
                                     <ComboBoxItem>
-                                        <Button Content="Save Query" Command="{Binding SaveCustomQueriesRelay}" />
+                                        <Button Content="Save Query" Command="{Binding SaveCustomQueriesRelay}"
+                                                Background="Transparent" 
+                                                BorderBrush="Transparent"
+                                                IsHitTestVisible="False"/>
                                     </ComboBoxItem>
                                     <ComboBoxItem>
-                                        <Button Content="Execute" Command="{Binding ExecuteCommandRelay}" />
+                                        <Button Content="Execute" Command="{Binding ExecuteCommandRelay}"
+                                                Background="Transparent" 
+                                                BorderBrush="Transparent"
+                                                IsHitTestVisible="False"/>
                                     </ComboBoxItem>
                                     <ComboBoxItem>
-                                        <Button Content="Execute to CSV" Command="{Binding OutputToCsvFileRelay}" />
+                                        <Button Content="Execute to CSV" Command="{Binding OutputToCsvFileRelay}"
+                                                Background="Transparent" 
+                                                BorderBrush="Transparent"
+                                                IsHitTestVisible="False" />
                                     </ComboBoxItem>
                                     <ComboBoxItem>
-                                        <Button Content="Execute to Text" Command="{Binding OutputToTextFileRelay}" />
+                                        <Button Content="Execute to Text" Command="{Binding OutputToTextFileRelay}" 
+                                                Background="Transparent" 
+                                                BorderBrush="Transparent"
+                                                IsHitTestVisible="False"/>
                                     </ComboBoxItem>
                                     <ComboBoxItem>
-                                        <Button Content="Export Console Output" Command="{Binding ExportConsoleOutputRelay}" />
+                                        <Button Content="Export Console Output" Command="{Binding ExportConsoleOutputRelay}"
+                                                Background="Transparent" 
+                                                BorderBrush="Transparent"
+                                                IsHitTestVisible="False"/>
                                     </ComboBoxItem>
                                     <ComboBoxItem>
-                                        <Button Content="Clear Console Output" Command="{Binding ClearConsoleOutputRelay}" />
+                                        <Button Content="Clear Console Output" Command="{Binding ClearConsoleOutputRelay}" 
+                                                Background="Transparent" 
+                                                BorderBrush="Transparent"
+                                                IsHitTestVisible="False"/>
                                     </ComboBoxItem>
                                     <ComboBoxItem>
-                                        <Button Content="Clear Query" Command="{Binding ClearQueryBuilderRelay}" />
+                                        <Button Content="Clear Query" Command="{Binding ClearQueryBuilderRelay}"
+                                                Background="Transparent" 
+                                                BorderBrush="Transparent"
+                                                IsHitTestVisible="False"/>  
                                     </ComboBoxItem>
                                 </ComboBox>
                                 <!-- END of Button ComboBox-->
 
-                                <CheckBox Grid.Row="2" Grid.Column="0" Content="Editing" HorizontalAlignment="Left" Margin="10,6,0,0"
+                                <CheckBox Grid.Row="2" Grid.Column="0" Content="Editing" HorizontalAlignment="Left" Margin="10,6,10,0"
                                       VerticalAlignment="Top" IsChecked="{Binding EditingEnabled}" Height="15" Width="57" />
                             </Grid>
                             <!-- ROW 0 END -->
@@ -187,12 +218,10 @@
                             <!-- TODO: Figure out why I can't get the console to be resizable to the min height! -->
                             <!-- TODO: Pieter refer here for the console output... try replicate for tab three -->
                             <!-- GRID ROW 1 START -->
-                            <Grid Grid.Row="1">
                                 <!-- TextBox as Console Output -->
-                                <TextBox Text="{Binding PowerShellOutput.ConsoleOutput}" HorizontalAlignment="Stretch"
+                            <TextBox Grid.Row="1" Text="{Binding PowerShellOutput.ConsoleOutput}" HorizontalAlignment="Stretch"
                                          VerticalAlignment="Stretch" Margin="10" IsReadOnly="True" TextWrapping="Wrap"
                                          VerticalScrollBarVisibility="Auto" />
-                            </Grid>
                             <!-- GRID ROW 1 END -->
                         </Grid>
                     </TabItem>
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 897807e..ef686d1 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -3,6 +3,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Management.Automation.Runspaces;
+using System.Reflection;
 using System.Text;
 using System.Windows;
 using System.Windows.Controls;
@@ -32,6 +33,7 @@ public sealed class MainWindowViewModel : INotifyPropertyChanged
     private AppConsole _activeDirectoryInfoOutput; // Pieter TODO
     private Command? _selectedComboBoxCommand;
     private ObservableCollection<Button>? _buttons;
+    private object _optionsSelectedComboBoxItem;
 
     // [[ Other fields ]] ----------------------------------------------------------- //
 
@@ -126,6 +128,27 @@ public Command? SelectedComboBoxCommand
         }
     }
 
+    /// <summary>
+    /// 
+    /// </summary>
+    public object OptionsSelectedComboBoxItem
+    {
+        get { return _optionsSelectedComboBoxItem; }
+        set
+        {
+            _optionsSelectedComboBoxItem = value;
+            OnPropertyChanged("SelectedItem");
+
+            ComboBoxItem? tempCBI = value as ComboBoxItem;
+
+            if (tempCBI != null)
+            {
+                Button? tempButton = tempCBI.Content as Button;
+                tempButton.Command.Execute(this);
+            }
+        }
+    }
+
     /// <summary>
     /// This property creates a collection of buttons to be added to the stack panel for custom queries
     /// </summary>
@@ -262,6 +285,7 @@ public MainWindowViewModel()
         ClearConsoleOutputRelay = new RelayCommand(ClearConsoleOutput);
         ClearQueryBuilderRelay = new RelayCommand(ClearQueryBuilder);
 
+
         // TODO: Figure out how resolve the warning about the async method not being awaited.
         InitializeActiveDirectoryCommandsAsync();
         LoadCustomQueries();                      // Calls method to deserialize and load buttons.

From 0d7b1bdf8b7c49c8daea9cfffe27cd7d7f457c8a Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Sat, 9 Mar 2024 20:51:19 -0800
Subject: [PATCH 43/94] Only executes the button, rather than setting the
 selected item..

to the combobox
---
 ActiveDirectoryQuerier/MainWindow.xaml        | 124 +++++++-----------
 ActiveDirectoryQuerier/MainWindowViewModel.cs |  21 ---
 2 files changed, 50 insertions(+), 95 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index dca217f..fd492c4 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -3,7 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:activeDirectoryQuerier="clr-namespace:ActiveDirectoryQuerier" 
+        xmlns:activeDirectoryQuerier="clr-namespace:ActiveDirectoryQuerier"
         mc:Ignorable="d"
         Title="Active Directory Querier" Height="720" Width="1280">
     <Window.DataContext>
@@ -105,7 +105,7 @@
                                           Width="212"
                                           IsEditable="True"
                                           Grid.Column="0"
-                                          Grid.Row="1"/>
+                                          Grid.Row="1" />
 
                                 <!-- ItemsControl for Dynamic ComboBoxes -->
                                 <TextBlock Grid.Row="0" Grid.Column="1" FontWeight="Bold" HorizontalAlignment="Left">Parameter</TextBlock>
@@ -120,13 +120,13 @@
                                                       VerticalAlignment="Center"
                                                       Margin="5"
                                                       ItemsSource="{Binding PossibleParameters}"
-                                                      SelectedItem="{Binding SelectedParameter}" 
+                                                      SelectedItem="{Binding SelectedParameter}"
                                                       Grid.Row="0"
-                                                      Grid.Column="1"/>
+                                                      Grid.Column="1" />
                                         </DataTemplate>
                                     </ItemsControl.ItemTemplate>
                                 </ItemsControl>
-                                
+
                                 <!-- Parameter Values ComboBox -->
                                 <TextBlock Grid.Row="0" Grid.Column="2" FontWeight="Bold" HorizontalAlignment="Left">Value</TextBlock>
                                 <ItemsControl ItemsSource="{Binding DynamicParameterValuesCollection}"
@@ -145,83 +145,59 @@
                                 <!-- END of Dynamic ComboxBoxes for parameters and values-->
 
                                 <!-- START of Button ComboBox -->
-                                <ComboBox SelectedItem="{Binding OptionsSelectedComboBoxItem}" Margin="0,4,0,6" Height="Auto" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Center" MinWidth="160" Width="Auto" >
-                                    <ComboBoxItem>
-                                        <Button Content="Add New Command Slot" 
-                                                Command="{Binding AddCommandComboBoxRelay}"            
-                                                Background="Transparent" 
-                                                BorderBrush="Transparent"
-                                                IsHitTestVisible="False"/>
-                                    </ComboBoxItem>
-                                    <ComboBoxItem>
-                                        <Button Content="Add New Parameter Slot" Command="{Binding AddParameterComboBoxRelay}"
-                                                Background="Transparent" 
-                                                BorderBrush="Transparent"
-                                                IsHitTestVisible="False"/>
-                                    </ComboBoxItem>
-                                    <ComboBoxItem>
-                                        <Button Content="Remove Parameter Slot" Command="{Binding RemoveParameterComboBoxRelay}" 
-                                                Background="Transparent" 
-                                                BorderBrush="Transparent"
-                                                IsHitTestVisible="False"/>
-                                    </ComboBoxItem>
-                                    <ComboBoxItem>
-                                        <Button Content="Save Query" Command="{Binding SaveCustomQueriesRelay}"
-                                                Background="Transparent" 
-                                                BorderBrush="Transparent"
-                                                IsHitTestVisible="False"/>
-                                    </ComboBoxItem>
-                                    <ComboBoxItem>
-                                        <Button Content="Execute" Command="{Binding ExecuteCommandRelay}"
-                                                Background="Transparent" 
-                                                BorderBrush="Transparent"
-                                                IsHitTestVisible="False"/>
-                                    </ComboBoxItem>
-                                    <ComboBoxItem>
-                                        <Button Content="Execute to CSV" Command="{Binding OutputToCsvFileRelay}"
-                                                Background="Transparent" 
-                                                BorderBrush="Transparent"
-                                                IsHitTestVisible="False" />
-                                    </ComboBoxItem>
-                                    <ComboBoxItem>
-                                        <Button Content="Execute to Text" Command="{Binding OutputToTextFileRelay}" 
-                                                Background="Transparent" 
-                                                BorderBrush="Transparent"
-                                                IsHitTestVisible="False"/>
-                                    </ComboBoxItem>
-                                    <ComboBoxItem>
-                                        <Button Content="Export Console Output" Command="{Binding ExportConsoleOutputRelay}"
-                                                Background="Transparent" 
-                                                BorderBrush="Transparent"
-                                                IsHitTestVisible="False"/>
-                                    </ComboBoxItem>
-                                    <ComboBoxItem>
-                                        <Button Content="Clear Console Output" Command="{Binding ClearConsoleOutputRelay}" 
-                                                Background="Transparent" 
-                                                BorderBrush="Transparent"
-                                                IsHitTestVisible="False"/>
-                                    </ComboBoxItem>
-                                    <ComboBoxItem>
-                                        <Button Content="Clear Query" Command="{Binding ClearQueryBuilderRelay}"
-                                                Background="Transparent" 
-                                                BorderBrush="Transparent"
-                                                IsHitTestVisible="False"/>  
-                                    </ComboBoxItem>
+                                <ComboBox Margin="0,4,0,6" Height="Auto" Grid.Row="2" Grid.Column="0"
+                                          HorizontalAlignment="Center" MinWidth="160" Width="Auto">
+                                    <Button Content="Add New Command Slot"
+                                            Command="{Binding AddCommandComboBoxRelay}"
+                                            Background="Transparent"
+                                            BorderBrush="Transparent" />
+                                    <Button Content="Add New Parameter Slot"
+                                            Command="{Binding AddParameterComboBoxRelay}"
+                                            Background="Transparent"
+                                            BorderBrush="Transparent" />
+                                    <Button Content="Remove Parameter Slot"
+                                            Command="{Binding RemoveParameterComboBoxRelay}"
+                                            Background="Transparent"
+                                            BorderBrush="Transparent" />
+                                    <Button Content="Save Query" Command="{Binding SaveCustomQueriesRelay}"
+                                            Background="Transparent"
+                                            BorderBrush="Transparent" />
+                                    <Button Content="Execute" Command="{Binding ExecuteCommandRelay}"
+                                            Background="Transparent"
+                                            BorderBrush="Transparent" />
+                                    <Button Content="Execute to CSV" Command="{Binding OutputToCsvFileRelay}"
+                                            Background="Transparent"
+                                            BorderBrush="Transparent" />
+                                    <Button Content="Execute to Text" Command="{Binding OutputToTextFileRelay}"
+                                            Background="Transparent"
+                                            BorderBrush="Transparent" />
+                                    <Button Content="Export Console Output"
+                                            Command="{Binding ExportConsoleOutputRelay}"
+                                            Background="Transparent"
+                                            BorderBrush="Transparent" />
+                                    <Button Content="Clear Console Output" Command="{Binding ClearConsoleOutputRelay}"
+                                            Background="Transparent"
+                                            BorderBrush="Transparent" />
+                                    <Button Content="Clear Query" Command="{Binding ClearQueryBuilderRelay}"
+                                            Background="Transparent"
+                                            BorderBrush="Transparent" />
                                 </ComboBox>
                                 <!-- END of Button ComboBox-->
-
-                                <CheckBox Grid.Row="2" Grid.Column="0" Content="Editing" HorizontalAlignment="Left" Margin="10,6,10,0"
-                                      VerticalAlignment="Top" IsChecked="{Binding EditingEnabled}" Height="15" Width="57" />
+                                <CheckBox Grid.Row="2" Grid.Column="0" Content="Editing" HorizontalAlignment="Left"
+                                          Margin="10,6,10,0"
+                                          VerticalAlignment="Top" IsChecked="{Binding EditingEnabled}" Height="15"
+                                          Width="57" />
                             </Grid>
                             <!-- ROW 0 END -->
 
                             <!-- TODO: Figure out why I can't get the console to be resizable to the min height! -->
                             <!-- TODO: Pieter refer here for the console output... try replicate for tab three -->
                             <!-- GRID ROW 1 START -->
-                                <!-- TextBox as Console Output -->
-                            <TextBox Grid.Row="1" Text="{Binding PowerShellOutput.ConsoleOutput}" HorizontalAlignment="Stretch"
-                                         VerticalAlignment="Stretch" Margin="10" IsReadOnly="True" TextWrapping="Wrap"
-                                         VerticalScrollBarVisibility="Auto" />
+                            <!-- TextBox as Console Output -->
+                            <TextBox Grid.Row="1" Text="{Binding PowerShellOutput.ConsoleOutput}"
+                                     HorizontalAlignment="Stretch"
+                                     VerticalAlignment="Stretch" Margin="10" IsReadOnly="True" TextWrapping="Wrap"
+                                     VerticalScrollBarVisibility="Auto" />
                             <!-- GRID ROW 1 END -->
                         </Grid>
                     </TabItem>
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index ef686d1..a568810 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -128,27 +128,6 @@ public Command? SelectedComboBoxCommand
         }
     }
 
-    /// <summary>
-    /// 
-    /// </summary>
-    public object OptionsSelectedComboBoxItem
-    {
-        get { return _optionsSelectedComboBoxItem; }
-        set
-        {
-            _optionsSelectedComboBoxItem = value;
-            OnPropertyChanged("SelectedItem");
-
-            ComboBoxItem? tempCBI = value as ComboBoxItem;
-
-            if (tempCBI != null)
-            {
-                Button? tempButton = tempCBI.Content as Button;
-                tempButton.Command.Execute(this);
-            }
-        }
-    }
-
     /// <summary>
     /// This property creates a collection of buttons to be added to the stack panel for custom queries
     /// </summary>

From 6f12c46c6699919e2554092e6add34ece3d85d05 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Sat, 9 Mar 2024 21:02:24 -0800
Subject: [PATCH 44/94] Prevents exporting console output if there is nothing
 in it

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index a568810..dc28f5f 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -613,6 +613,15 @@ private async void OutputToCsvFileAsync(object _)
     /// <param name="_">This is the object that the command is bound to.</param>
     private void ExportConsoleOutput(object _)
     {
+        if (PowerShellOutput.ConsoleOutput.Length == 0)
+        {
+            MessageBox.Show("The console is empty.",
+                            "Information",
+                            MessageBoxButton.OK,
+                            MessageBoxImage.Information);
+            return;
+        }
+        
         SaveFileDialog saveFileDialog = new() { DefaultExt = ".txt", Filter = "Text documents (.txt)|*.txt" };
 
         bool? result = saveFileDialog.ShowDialog();

From 1dc24fa0137459074d2de9c1b1a7aa0e0b6bf384 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Sat, 9 Mar 2024 21:15:28 -0800
Subject: [PATCH 45/94] Small fix

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index dc28f5f..1ebe11d 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -33,7 +33,6 @@ public sealed class MainWindowViewModel : INotifyPropertyChanged
     private AppConsole _activeDirectoryInfoOutput; // Pieter TODO
     private Command? _selectedComboBoxCommand;
     private ObservableCollection<Button>? _buttons;
-    private object _optionsSelectedComboBoxItem;
 
     // [[ Other fields ]] ----------------------------------------------------------- //
 
@@ -54,7 +53,7 @@ public bool EditingEnabled
         get => _editingEnabled;
         set {
             _editingEnabled = value;
-            OnPropertyChanged("EditingEnabled");
+            OnPropertyChanged(nameof(EditingEnabled));
         }
     }
 

From 786c672c63b50723b5d0dcbfdd856d304d351060 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Sat, 9 Mar 2024 21:24:19 -0800
Subject: [PATCH 46/94] Small refactoring, comment updates, etc.

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 1ebe11d..e122dbf 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -30,17 +30,17 @@ public sealed class MainWindowViewModel : INotifyPropertyChanged
     private string _queryName;
     private string _queryDescription;
     private AppConsole _powerShellOutput;
-    private AppConsole _activeDirectoryInfoOutput; // Pieter TODO
+    private AppConsole _activeDirectoryInfoOutput; // TODO: Info for Pieter to get started
     private Command? _selectedComboBoxCommand;
     private ObservableCollection<Button>? _buttons;
 
     // [[ Other fields ]] ----------------------------------------------------------- //
 
-    private readonly CustomQueries _customQuery;
     private readonly Query _currentQuery;
+    private readonly CustomQueries _customQuery;
+    private readonly PowerShellExecutor _powerShellExecutor;
     // Probably want to add the ability to toggle editing vs not editing but filled in.
     private Query? _isEditing;
-    private readonly PowerShellExecutor _powerShellExecutor;
 
     // [ Properties ] --------------------------------------------------------------- //
     // [[ Properties for backing fields ]] ------------------------------------------ //
@@ -69,7 +69,7 @@ public AppConsole PowerShellOutput
         }
     }
 
-    // Pieter TODO
+    // TODO: Info for Pieter to get started
     public AppConsole ActiveDirectoryInfoOutput
     {
         get => _activeDirectoryInfoOutput;
@@ -121,7 +121,7 @@ public Command? SelectedComboBoxCommand
             // No need to load parameters if the command is null.
             if (value is not null)
             {
-                // TODO: Figure out how to resolve the warning about the async method not being awaited.
+                // TODO: Figure out how to resolve the warning about the async method not being awaited!!!
                 LoadCommandParametersAsync(value);
             }
         }
@@ -271,7 +271,7 @@ public MainWindowViewModel()
 
     // [ Methods ] ----------------------------------------------------------------- //
 
-    /// Pieter TODO (New Code)
+    // TODO: Info for Pieter to get started
     /*public void ActiveDirectoryInfo()
     {
         PowerShellExecutor powerShell = new PowerShellExecutor();
@@ -281,6 +281,10 @@ public MainWindowViewModel()
         Collection<PSObject> ReturnValue results = powerShell.ExecuteCommand(command);
     }*/
 
+    /// <summary>
+    /// This method will clear the console output and prompt the user if they are sure they want to clear the console.
+    /// </summary>
+    /// <param name="_">This is the object that the command is tied to.</param>
     private void ClearConsoleOutput(object _)
     {
         if (PowerShellOutput.ConsoleOutput.Length == 0)
@@ -291,15 +295,13 @@ private void ClearConsoleOutput(object _)
                             MessageBoxImage.Information);
             return;
         }
-
-        // Display a gui box confirming if the user wants to confirm the clear
+        
         MessageBoxResult result = MessageBox.Show("Are you sure you want to clear the console output?",
                                                   "Warning",
                                                   MessageBoxButton.YesNo,
                                                   MessageBoxImage.Warning,
                                                   MessageBoxResult.No);
-
-        // If the user selects yes, clear the console
+        
         if (result == MessageBoxResult.Yes)
         {
             PowerShellOutput.Clear();
@@ -433,7 +435,7 @@ private void LoadCustomQueries()
     /// <summary>
     /// Executes the selected PowerShell command asynchronously.
     /// </summary>
-    /// <param name="_">Parameter is not used, but required for the ICommand interface.</param>
+    /// <param name="_">This is the object that the command is bound to.</param>
     private async void ExecuteCommandAsync(object _)
     {
         await ExecuteSelectedCommandAsync();
@@ -445,7 +447,7 @@ private async void ExecuteCommandAsync(object _)
     private async Task InitializeActiveDirectoryCommandsAsync()
     {
         ObservableCollection<Command> list = await ActiveDirectoryCommands.GetActiveDirectoryCommands();
-        ActiveDirectoryCommandsList = new(list);
+        ActiveDirectoryCommandsList = new ObservableCollection<Command>(list);
         OnPropertyChanged(nameof(ActiveDirectoryCommandsList));
     }
 
@@ -470,10 +472,11 @@ private async Task LoadCommandParametersAsync(Command? selectedCommand)
     /// <summary>
     /// Executes the currently selected PowerShell command and updates the PowerShellOutput property with the result.
     /// </summary>
+    /// <param name="command">The PowerShell command to execute.</param>
     /// <returns>A Task representing the asynchronous operation of executing the command.</returns>
-    private async Task ExecuteSelectedCommandAsync(Command? inCommand = null)
+    private async Task ExecuteSelectedCommandAsync(Command? command = null)
     {
-        if (SelectedComboBoxCommand is null && inCommand is null)
+        if (SelectedComboBoxCommand is null && command is null)
         {
             Trace.WriteLine("No command selected.");
             MessageBox.Show("To execute a command, you must first select a command.",
@@ -483,13 +486,12 @@ private async Task ExecuteSelectedCommandAsync(Command? inCommand = null)
             return;
         }
 
-        ReturnValues result;
-
         try
         {
-            if (inCommand is not null)
+            ReturnValues result;
+            if (command is not null)
             {
-                result = await _powerShellExecutor.ExecuteAsync(inCommand);
+                result = await _powerShellExecutor.ExecuteAsync(command);
             }
             else
             {

From ef9296910255c5a02001a818a95df859066b4114 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Sun, 10 Mar 2024 10:29:35 -0700
Subject: [PATCH 47/94] Update comments, TODOs, slight refactoring, etc.

---
 .../CommandParametersTests.cs                 |  4 ++--
 .../ComboBoxParameterViewModel.cs             |  2 +-
 ActiveDirectoryQuerier/MainWindow.xaml        |  4 ----
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 22 ++++++-------------
 .../PowerShell/ActiveDirectoryCommands.cs     | 19 +++++++---------
 .../PowerShell/CommandParameters.cs           | 19 ++++++++--------
 .../PowerShell/ICommandParameters.cs          |  8 -------
 .../PowerShell/PowerShellExecutor.cs          |  9 ++++----
 ActiveDirectoryQuerier/RelayCommand.cs        |  5 +----
 ActiveDirectoryQuerier/TextBoxViewModel.cs    |  4 ++--
 10 files changed, 35 insertions(+), 61 deletions(-)
 delete mode 100644 ActiveDirectoryQuerier/PowerShell/ICommandParameters.cs

diff --git a/ActiveDirectoryQuerier.Tests/CommandParametersTests.cs b/ActiveDirectoryQuerier.Tests/CommandParametersTests.cs
index aa749a2..f67f884 100644
--- a/ActiveDirectoryQuerier.Tests/CommandParametersTests.cs
+++ b/ActiveDirectoryQuerier.Tests/CommandParametersTests.cs
@@ -6,13 +6,13 @@ namespace ActiveDirectoryQuerier.Tests;
 public class CommandParametersTests
 {
     [Fact]
-    public void PossibleParameters_LoadCommandParametersAsyncNotPopulated_ThrowInvalidOperationException()
+    public void PossibleParameters_LoadCommandParametersNotPopulated_NoValidCommandProvided()
     {
         // Arrange
         CommandParameters commandParameters = new();
 
         // Assert
-        Assert.Throws<InvalidOperationException>(() => commandParameters.PossibleParameters);
+        Assert.Contains("No valid command provided", commandParameters.PossibleParameters);
     }
 
     [Fact]
diff --git a/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs b/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs
index 85cdad2..e30bce4 100644
--- a/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs
+++ b/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs
@@ -5,7 +5,7 @@ namespace ActiveDirectoryQuerier;
 
 /// <summary>
 /// ViewModel for a ComboBox that displays possible parameters for a PowerShell command.
-/// It is used when adding a new parameter slot to a command in the UI.
+/// It is used when adding a new parameter slot to a command in the GUI.
 /// </summary>
 public sealed class ComboBoxParameterViewModel : INotifyPropertyChanged
 {
diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index fd492c4..7317214 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -3,12 +3,8 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:activeDirectoryQuerier="clr-namespace:ActiveDirectoryQuerier"
         mc:Ignorable="d"
         Title="Active Directory Querier" Height="720" Width="1280">
-    <Window.DataContext>
-        <activeDirectoryQuerier:MainWindowViewModel />
-    </Window.DataContext>
     <Grid>
         <!-- Define Columns. -->
         <!--<Grid.ColumnDefinitions><ColumnDefinition Width="119*"/><ColumnDefinition Width="681*"/></Grid.ColumnDefinitions>-->
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index e122dbf..4c8ac4c 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -39,7 +39,6 @@ public sealed class MainWindowViewModel : INotifyPropertyChanged
     private readonly Query _currentQuery;
     private readonly CustomQueries _customQuery;
     private readonly PowerShellExecutor _powerShellExecutor;
-    // Probably want to add the ability to toggle editing vs not editing but filled in.
     private Query? _isEditing;
 
     // [ Properties ] --------------------------------------------------------------- //
@@ -263,10 +262,9 @@ public MainWindowViewModel()
         ClearConsoleOutputRelay = new RelayCommand(ClearConsoleOutput);
         ClearQueryBuilderRelay = new RelayCommand(ClearQueryBuilder);
 
-
         // TODO: Figure out how resolve the warning about the async method not being awaited.
         InitializeActiveDirectoryCommandsAsync();
-        LoadCustomQueries();                      // Calls method to deserialize and load buttons.
+        LoadCustomQueries(); // Calls method to deserialize and load buttons.
     }
 
     // [ Methods ] ----------------------------------------------------------------- //
@@ -295,13 +293,13 @@ private void ClearConsoleOutput(object _)
                             MessageBoxImage.Information);
             return;
         }
-        
+
         MessageBoxResult result = MessageBox.Show("Are you sure you want to clear the console output?",
                                                   "Warning",
                                                   MessageBoxButton.YesNo,
                                                   MessageBoxImage.Warning,
                                                   MessageBoxResult.No);
-        
+
         if (result == MessageBoxResult.Yes)
         {
             PowerShellOutput.Clear();
@@ -334,7 +332,7 @@ private void EditCustomQuery(object sender)
 
         // Load the Possible Parameters Synchronously
         CommandParameters commandParameters = new();
-        ((ICommandParameters)commandParameters).LoadCommandParameters(SelectedComboBoxCommand);
+        commandParameters.LoadCommandParameters(SelectedComboBoxCommand);
         PossibleCommandParametersList = new ObservableCollection<string>(commandParameters.PossibleParameters);
         OnPropertyChanged(nameof(PossibleCommandParametersList));
 
@@ -616,13 +614,10 @@ private void ExportConsoleOutput(object _)
     {
         if (PowerShellOutput.ConsoleOutput.Length == 0)
         {
-            MessageBox.Show("The console is empty.",
-                            "Information",
-                            MessageBoxButton.OK,
-                            MessageBoxImage.Information);
+            MessageBox.Show("The console is empty.", "Information", MessageBoxButton.OK, MessageBoxImage.Information);
             return;
         }
-        
+
         SaveFileDialog saveFileDialog = new() { DefaultExt = ".txt", Filter = "Text documents (.txt)|*.txt" };
 
         bool? result = saveFileDialog.ShowDialog();
@@ -691,15 +686,13 @@ private void GetCurrentQuery()
                 commandParameters = new string[SelectedComboBoxCommand.Parameters.Count];
                 commandParameterValues = new string[SelectedComboBoxCommand.Parameters.Count];
 
-
-
                 _currentQuery.QueryDescription = QueryDescription;
                 _currentQuery.QueryName = QueryName;
 
                 _currentQuery.CommandName = SelectedComboBoxCommand.CommandText;
 
                 // TODO: Possibly convert foreach into a for loop...
-                for(int i = 0; i < SelectedComboBoxCommand.Parameters.Count; i++)
+                for (int i = 0; i < SelectedComboBoxCommand.Parameters.Count; i++)
                 {
                     CommandParameter commandParameter = SelectedComboBoxCommand.Parameters[i];
 
@@ -768,7 +761,6 @@ private void SaveCustomQueries(object commandParameter)
             // Try to get the content within the drop downs
             try
             {
-
                 UpdateSelectedCommand();
 
                 _customQuery.SerializeCommand(SelectedComboBoxCommand, QueryName, QueryDescription);
diff --git a/ActiveDirectoryQuerier/PowerShell/ActiveDirectoryCommands.cs b/ActiveDirectoryQuerier/PowerShell/ActiveDirectoryCommands.cs
index 90e4e70..ab2e024 100644
--- a/ActiveDirectoryQuerier/PowerShell/ActiveDirectoryCommands.cs
+++ b/ActiveDirectoryQuerier/PowerShell/ActiveDirectoryCommands.cs
@@ -27,22 +27,19 @@ public static async Task<ObservableCollection<Command>> GetActiveDirectoryComman
         ObservableCollection<Command> activeDirectoryCommands = new();
         ReturnValues powerShellOutput = await powerShellExecutor.ExecuteAsync(powerShellCommand);
 
-        // NOTE: This is more of an internal error...
-        // TODO: Provide a more detailed error message, possibly to the user and to a log file.
+        // This is more of an internal error catch, as even through this command shouldn't fail, it's possible that it
+        // could.
         if (powerShellOutput.HadErrors)
         {
-            MessageBox.Show(string.Join(" ", powerShellOutput.StdErr),
-                            "Error",
-                            MessageBoxButton.OK,
-                            MessageBoxImage.Error);
-            throw new InvalidPowerShellStateException(
-                $"An error occurred while retrieving the ActiveDirectory commands: " +
-                $"{string.Join(" ", powerShellOutput.StdErr)}");
+            string errorMessage = "An error occurred while retrieving the Active Directory commands: " +
+                                  $"({string.Join(" ", powerShellOutput.StdErr)})";
+            MessageBox.Show(errorMessage, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+            throw new InvalidPowerShellStateException(errorMessage);
         }
 
-        foreach (string cmd in powerShellOutput.StdOut)
+        foreach (string command in powerShellOutput.StdOut)
         {
-            activeDirectoryCommands.Add(new Command(cmd));
+            activeDirectoryCommands.Add(new Command(command));
         }
 
         return activeDirectoryCommands;
diff --git a/ActiveDirectoryQuerier/PowerShell/CommandParameters.cs b/ActiveDirectoryQuerier/PowerShell/CommandParameters.cs
index 3aec7ee..a21c149 100644
--- a/ActiveDirectoryQuerier/PowerShell/CommandParameters.cs
+++ b/ActiveDirectoryQuerier/PowerShell/CommandParameters.cs
@@ -8,7 +8,7 @@ namespace ActiveDirectoryQuerier.PowerShell;
 /// <summary>
 /// Manages and provides the parameters available for a given PowerShell command.
 /// </summary>
-public class CommandParameters : ICommandParameters
+public class CommandParameters
 {
     private readonly ObservableCollection<string> _possibleParameters = new();
 
@@ -16,23 +16,24 @@ public class CommandParameters : ICommandParameters
     /// Gets the collection of possible parameters for a command.
     /// </summary>
     /// <exception cref="InvalidOperationException">Thrown when the collection has not been populated yet.</exception>
-    /// <note>
-    /// I realize that this isn't a very clean way of doing things, but it's the best I could come up with at the time.
-    /// </note>
-    /// TODO: Refactor this to be more clean and less error-prone.
+    /// <important>
+    /// This property should not be accessed before the collection has been populated via LoadCommandParametersAsync, to
+    /// ensure asynchronous loading of parameters.
+    /// </important>
     public ObservableCollection<string> PossibleParameters
     {
         get {
             if (_possibleParameters.Count == 0)
             {
-                throw new InvalidOperationException(
-                    "'PossibleParameters' has not been populated via 'LoadCommandParametersAsync'.");
+                Debug.WriteLine("Warning: LoadCommandParametersAsync should be called before accessing " +
+                                "PossibleParameters, to ensure asynchronous loading of parameters.");
+                LoadCommandParameters(null);
             }
 
             return _possibleParameters;
         }
     }
-    
+
     /// <summary>
     /// Retrieves the parameters available for a given command asynchronously.
     /// </summary>
@@ -46,7 +47,7 @@ public async Task LoadCommandParametersAsync(Command? powerShellCommand)
     /// Retrieves the parameters available for a given command synchronously.
     /// </summary>
     /// <param name="powerShellCommand">The command to retrieve parameters for.</param>
-    void ICommandParameters.LoadCommandParameters(Command? powerShellCommand)
+    public void LoadCommandParameters(Command? powerShellCommand)
     {
         LoadCommandParametersInternal(powerShellCommand, false).Wait();
     }
diff --git a/ActiveDirectoryQuerier/PowerShell/ICommandParameters.cs b/ActiveDirectoryQuerier/PowerShell/ICommandParameters.cs
deleted file mode 100644
index 4669773..0000000
--- a/ActiveDirectoryQuerier/PowerShell/ICommandParameters.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System.Management.Automation.Runspaces;
-
-namespace ActiveDirectoryQuerier.PowerShell;
-
-public interface ICommandParameters
-{
-    void LoadCommandParameters(Command? powerShellCommand);
-}
diff --git a/ActiveDirectoryQuerier/PowerShell/PowerShellExecutor.cs b/ActiveDirectoryQuerier/PowerShell/PowerShellExecutor.cs
index b67dec6..4d22f47 100644
--- a/ActiveDirectoryQuerier/PowerShell/PowerShellExecutor.cs
+++ b/ActiveDirectoryQuerier/PowerShell/PowerShellExecutor.cs
@@ -7,7 +7,7 @@
 namespace ActiveDirectoryQuerier.PowerShell;
 
 /// <summary>
-/// Manages execution of PowerShell commands, providing both synchronous and asynchronous execution methods.
+/// Manages the execution of PowerShell commands, providing both synchronous and asynchronous execution methods.
 /// </summary>
 public class PowerShellExecutor
 {
@@ -29,9 +29,8 @@ public PowerShellExecutor()
     /// Prepares a PowerShell command for execution.
     /// </summary>
     /// <param name="command">The command to be prepared for execution.</param>
-    private void PrepareCommand(Command? command)
+    private void PrepareCommand(Command command)
     {
-        // TODO: Add a test to identify if throwing an exception is necessary, or a return value is better.
         ArgumentNullException.ThrowIfNull(command);
 
         _powerShell.Commands.AddCommand(command.CommandText);
@@ -46,7 +45,7 @@ private void PrepareCommand(Command? command)
     /// </summary>
     /// <param name="command">The command to be executed.</param>
     /// <returns>A ReturnValues object containing the results of the command execution.</returns>
-    public ReturnValues Execute(Command? command)
+    public ReturnValues Execute(Command command)
     {
         try
         {
@@ -67,7 +66,7 @@ public ReturnValues Execute(Command? command)
     /// </summary>
     /// <param name="command">The command to be executed.</param>
     /// <returns>A task containing a ReturnValues object with the results of the command execution.</returns>
-    public async Task<ReturnValues> ExecuteAsync(Command? command)
+    public async Task<ReturnValues> ExecuteAsync(Command command)
     {
         try
         {
diff --git a/ActiveDirectoryQuerier/RelayCommand.cs b/ActiveDirectoryQuerier/RelayCommand.cs
index be2ee65..137a114 100644
--- a/ActiveDirectoryQuerier/RelayCommand.cs
+++ b/ActiveDirectoryQuerier/RelayCommand.cs
@@ -5,10 +5,7 @@ namespace ActiveDirectoryQuerier;
 /// <summary>
 /// A command whose sole purpose is to relay its functionality to other objects by invoking delegates.
 /// </summary>
-/// <note>
-/// I'm unsure if I'm dealing with the nullability warnings correctly, in this situation...
-/// </note>
-/// TODO: Remove any unused methods, after some investigation.
+/// TODO: Ensure nullability is being handled correctly.
 public class RelayCommand : ICommand
 {
     private readonly Action<object> _execute;
diff --git a/ActiveDirectoryQuerier/TextBoxViewModel.cs b/ActiveDirectoryQuerier/TextBoxViewModel.cs
index 063b48b..1ca05a3 100644
--- a/ActiveDirectoryQuerier/TextBoxViewModel.cs
+++ b/ActiveDirectoryQuerier/TextBoxViewModel.cs
@@ -3,8 +3,8 @@
 namespace ActiveDirectoryQuerier;
 
 /// <summary>
-/// ViewModel for a ComboBox that displays possible parameters for a PowerShell command.
-/// It is used when adding a new parameter slot to a command in the UI.
+/// ViewModel for a TextBox that contains the value of a parameter slot.
+/// It is used to bind the TextBox to the ViewModel.
 /// </summary>
 public sealed class TextBoxViewModel : INotifyPropertyChanged
 {

From e27d4f122a0cc6b110adf3fadcd23183becfcadc Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Sun, 10 Mar 2024 10:33:35 -0700
Subject: [PATCH 48/94] Revert one change

---
 ActiveDirectoryQuerier/MainWindow.xaml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index 7317214..2486540 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -1,10 +1,14 @@
-<Window x:Class="ActiveDirectoryQuerier.MainWindow"
+<Window x:Class="ActiveDirectoryQuerier.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:activeDirectoryQuerier="clr-namespace:ActiveDirectoryQuerier"
         mc:Ignorable="d"
         Title="Active Directory Querier" Height="720" Width="1280">
+    <Window.DataContext>
+        <activeDirectoryQuerier:MainWindowViewModel />
+    </Window.DataContext>
     <Grid>
         <!-- Define Columns. -->
         <!--<Grid.ColumnDefinitions><ColumnDefinition Width="119*"/><ColumnDefinition Width="681*"/></Grid.ColumnDefinitions>-->

From d9db81f93fafacf3839236b38d5cd0d718e4ee7d Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Sun, 10 Mar 2024 11:25:03 -0700
Subject: [PATCH 49/94] Slight renaming to fix conventions

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 4c8ac4c..df0fbcb 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -811,13 +811,11 @@ private void ClearQueryBuilder(object _)
     /// This method is for creating buttons, right now it creates it off of the current/selectedcommand parameters but
     /// could be changed to also do it from the query list.
     /// </summary>
-    /// <note>
-    /// TODO: Change method name?
-    /// </note>
     /// <returns>This method returns a button that has been customized for the custom query list</returns>
+    /// TODO: Change method name?
     private Button CreateCustomButton(Query? query = null)
     {
-        Button newButton = new Button();
+        Button newButton = new();
 
         if (query != null)
         {
@@ -850,13 +848,13 @@ private Button CreateCustomButton(Query? query = null)
         MenuItem menuItem1 =
             new() { Header = "Execute", Command = ExecuteCommandButtonRelay, CommandParameter = newButton };
 
-        MenuItem outputToCSV = new() { Header = "Output to CSV", Command = OutputToCsvFileRelay };
+        MenuItem outputToCsv = new() { Header = "Output to CSV", Command = OutputToCsvFileRelay };
         MenuItem outputToText = new() { Header = "Output to Text", Command = OutputToTextFileRelay };
-        MenuItem exportToConsole = new() { Header = "Execute to Console", Command = ExecuteCommandRelay };
+        MenuItem outputToConsole = new() { Header = "Execute to Console", Command = ExecuteCommandRelay };
 
-        menuItem1.Items.Add(outputToCSV);
+        menuItem1.Items.Add(outputToCsv);
         menuItem1.Items.Add(outputToText);
-        menuItem1.Items.Add(exportToConsole);
+        menuItem1.Items.Add(outputToConsole);
 
         MenuItem menuItem2 = new() { Header = "Edit", Command = EditCustomQueryRelay, CommandParameter = newButton };
 

From 5bfff178ec742e28d13176b826c8c242c1fa0fd0 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Sun, 10 Mar 2024 11:26:33 -0700
Subject: [PATCH 50/94] Revert changes to the style of the button dropdown, and
 the TextBox...

now updates whenever text changes rather than when focus changes
---
 ActiveDirectoryQuerier/MainWindow.xaml | 71 +++++++++-----------------
 1 file changed, 24 insertions(+), 47 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index 2486540..ec4513e 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -86,9 +86,9 @@
                             <!-- ROW 0 START -->
                             <Grid Margin="0,0,0,49" Grid.Row="0">
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition x:Name="Command" Width="*" />
-                                    <ColumnDefinition x:Name="Parameter" Width="*" />
-                                    <ColumnDefinition x:Name="Parameter_Values" Width="*" />
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="*" />
                                 </Grid.ColumnDefinitions>
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="*" />
@@ -120,9 +120,7 @@
                                                       VerticalAlignment="Center"
                                                       Margin="5"
                                                       ItemsSource="{Binding PossibleParameters}"
-                                                      SelectedItem="{Binding SelectedParameter}"
-                                                      Grid.Row="0"
-                                                      Grid.Column="1" />
+                                                      SelectedItem="{Binding SelectedParameter}" />
                                         </DataTemplate>
                                     </ItemsControl.ItemTemplate>
                                 </ItemsControl>
@@ -138,50 +136,32 @@
                                                      HorizontalAlignment="Left"
                                                      VerticalAlignment="Center"
                                                      Margin="5"
-                                                     Text="{Binding SelectedParameterValue}" />
+                                                     Text="{Binding SelectedParameterValue, UpdateSourceTrigger=PropertyChanged}" />
                                         </DataTemplate>
                                     </ItemsControl.ItemTemplate>
                                 </ItemsControl>
                                 <!-- END of Dynamic ComboxBoxes for parameters and values-->
 
                                 <!-- START of Button ComboBox -->
-                                <ComboBox Margin="0,4,0,6" Height="Auto" Grid.Row="2" Grid.Column="0"
-                                          HorizontalAlignment="Center" MinWidth="160" Width="Auto">
-                                    <Button Content="Add New Command Slot"
-                                            Command="{Binding AddCommandComboBoxRelay}"
-                                            Background="Transparent"
-                                            BorderBrush="Transparent" />
-                                    <Button Content="Add New Parameter Slot"
-                                            Command="{Binding AddParameterComboBoxRelay}"
-                                            Background="Transparent"
-                                            BorderBrush="Transparent" />
-                                    <Button Content="Remove Parameter Slot"
-                                            Command="{Binding RemoveParameterComboBoxRelay}"
-                                            Background="Transparent"
-                                            BorderBrush="Transparent" />
-                                    <Button Content="Save Query" Command="{Binding SaveCustomQueriesRelay}"
-                                            Background="Transparent"
-                                            BorderBrush="Transparent" />
-                                    <Button Content="Execute" Command="{Binding ExecuteCommandRelay}"
-                                            Background="Transparent"
-                                            BorderBrush="Transparent" />
-                                    <Button Content="Execute to CSV" Command="{Binding OutputToCsvFileRelay}"
-                                            Background="Transparent"
-                                            BorderBrush="Transparent" />
-                                    <Button Content="Execute to Text" Command="{Binding OutputToTextFileRelay}"
-                                            Background="Transparent"
-                                            BorderBrush="Transparent" />
-                                    <Button Content="Export Console Output"
-                                            Command="{Binding ExportConsoleOutputRelay}"
-                                            Background="Transparent"
-                                            BorderBrush="Transparent" />
-                                    <Button Content="Clear Console Output" Command="{Binding ClearConsoleOutputRelay}"
-                                            Background="Transparent"
-                                            BorderBrush="Transparent" />
-                                    <Button Content="Clear Query" Command="{Binding ClearQueryBuilderRelay}"
-                                            Background="Transparent"
-                                            BorderBrush="Transparent" />
-                                </ComboBox>
+                                <Menu Margin="0,4,0,6" Height="Auto" Grid.Row="2" Grid.Column="0"
+                                      HorizontalAlignment="Center" MinWidth="160" Width="Auto">
+                                    <MenuItem Header="Options" MinWidth="160" Height="Auto" Width="Auto">
+                                        <MenuItem Header="Add New Command Slot"
+                                                  Command="{Binding AddCommandComboBoxRelay}" />
+                                        <MenuItem Header="Add New Parameter Slot"
+                                                  Command="{Binding AddParameterComboBoxRelay}" />
+                                        <MenuItem Header="Remove Parameter Slot"
+                                                  Command="{Binding RemoveParameterComboBoxRelay}" />
+                                        <MenuItem Header="Save Query" Command="{Binding SaveCustomQueriesRelay}" />
+                                        <MenuItem Header="Execute" Command="{Binding ExecuteCommandRelay}" />
+                                        <MenuItem Header="Execute to CSV" Command="{Binding OutputToCsvFileRelay}" />
+                                        <MenuItem Header="Execute to Text" Command="{Binding OutputToTextFileRelay}" />
+                                        <MenuItem Header="Export Console Output"
+                                                  Command="{Binding ExportConsoleOutputRelay}" />
+                                        <MenuItem Header="Clear Console Output" Command="{Binding ClearConsoleOutputRelay}" />
+                                        <MenuItem Header="Clear Query" Command="{Binding ClearQueryBuilderRelay}" />
+                                    </MenuItem>
+                                </Menu>
                                 <!-- END of Button ComboBox-->
                                 <CheckBox Grid.Row="2" Grid.Column="0" Content="Editing" HorizontalAlignment="Left"
                                           Margin="10,6,10,0"
@@ -189,9 +169,6 @@
                                           Width="57" />
                             </Grid>
                             <!-- ROW 0 END -->
-
-                            <!-- TODO: Figure out why I can't get the console to be resizable to the min height! -->
-                            <!-- TODO: Pieter refer here for the console output... try replicate for tab three -->
                             <!-- GRID ROW 1 START -->
                             <!-- TextBox as Console Output -->
                             <TextBox Grid.Row="1" Text="{Binding PowerShellOutput.ConsoleOutput}"

From 72d54afa7fc1a69d8d608f329591549e767ad43b Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Sun, 10 Mar 2024 11:27:44 -0700
Subject: [PATCH 51/94] Update file formatting

---
 ActiveDirectoryQuerier/MainWindow.xaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index ec4513e..7b76145 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -158,7 +158,8 @@
                                         <MenuItem Header="Execute to Text" Command="{Binding OutputToTextFileRelay}" />
                                         <MenuItem Header="Export Console Output"
                                                   Command="{Binding ExportConsoleOutputRelay}" />
-                                        <MenuItem Header="Clear Console Output" Command="{Binding ClearConsoleOutputRelay}" />
+                                        <MenuItem Header="Clear Console Output"
+                                                  Command="{Binding ClearConsoleOutputRelay}" />
                                         <MenuItem Header="Clear Query" Command="{Binding ClearQueryBuilderRelay}" />
                                     </MenuItem>
                                 </Menu>

From ff1eab844284ee2ff62e131d23647eaf9ab742e2 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Sun, 10 Mar 2024 14:34:06 -0700
Subject: [PATCH 52/94] New tests and improve nullability

---
 .../ComboBoxParameterViewModelTests.cs        | 74 +++++++++++++++++++
 .../TextBoxViewModelTests.cs                  | 33 +++++++++
 .../ComboBoxParameterViewModel.cs             |  5 --
 ActiveDirectoryQuerier/TextBoxViewModel.cs    |  4 +-
 4 files changed, 109 insertions(+), 7 deletions(-)
 create mode 100644 ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs
 create mode 100644 ActiveDirectoryQuerier.Tests/TextBoxViewModelTests.cs

diff --git a/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs b/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs
new file mode 100644
index 0000000..6598701
--- /dev/null
+++ b/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs
@@ -0,0 +1,74 @@
+using System.Collections.ObjectModel;
+using System.Management.Automation.Runspaces;
+using ActiveDirectoryQuerier.PowerShell;
+
+namespace ActiveDirectoryQuerier.Tests;
+
+public class ComboBoxParameterViewModelTests
+{
+    [Fact]
+    public async Task ComboBoxParameterViewModel_WhenConstructed_PossibleParametersIsNotNullOrEmpty()
+    {
+        // Arrange
+        Command command = new("Get-ADUser");
+        CommandParameters commandParameters = new();
+        ComboBoxParameterViewModel comboBoxParameterViewModel;
+        
+        // Act
+        await commandParameters.LoadCommandParametersAsync(command);
+        comboBoxParameterViewModel = new(commandParameters.PossibleParameters);
+        
+        // Assert
+        Assert.NotNull(comboBoxParameterViewModel.PossibleParameters);
+        Assert.NotEmpty(comboBoxParameterViewModel.PossibleParameters);
+    }
+    
+    [Fact]
+    public async Task ComboBoxParameterViewModel_WhenConstructed_PossibleParametersContainsExpectedParameters()
+    {
+        // Arrange
+        Command command = new("Get-ADUser");
+        CommandParameters commandParameters = new();
+        ComboBoxParameterViewModel comboBoxParameterViewModel;
+        
+        // Act
+        await commandParameters.LoadCommandParametersAsync(command);
+        comboBoxParameterViewModel = new(commandParameters.PossibleParameters);
+        
+        // Assert
+        Assert.Contains(comboBoxParameterViewModel.PossibleParameters, param => param == "-Filter");
+        Assert.Contains(comboBoxParameterViewModel.PossibleParameters, param => param == "-Identity");
+        Assert.Contains(comboBoxParameterViewModel.PossibleParameters, param => param == "-LDAPFilter");
+        Assert.Contains(comboBoxParameterViewModel.PossibleParameters, param => param == "-SearchBase");
+        Assert.Contains(comboBoxParameterViewModel.PossibleParameters, param => param == "-SearchScope");
+    }
+    
+    [Fact]
+    public async Task ComboBoxParameterViewModel_WhenSelectedParameterChosen_SelectedParameterIsSet()
+    {
+        // Arrange
+        string selectedParameter;
+        Command command = new("Get-ADUser");
+        CommandParameters commandParameters = new();
+        ComboBoxParameterViewModel comboBoxParameterViewModel;
+        
+        // Act
+        await commandParameters.LoadCommandParametersAsync(command);
+        comboBoxParameterViewModel = new(commandParameters.PossibleParameters);
+        selectedParameter = comboBoxParameterViewModel.PossibleParameters[0];
+        comboBoxParameterViewModel.SelectedParameter = selectedParameter;
+        
+        // Assert
+        Assert.Equal(selectedParameter, comboBoxParameterViewModel.SelectedParameter);
+    }
+    
+    [Fact]
+    public void ComboBoxParameterViewModel_WhenConstructedWithNullPossibleParameters_ThrowsArgumentNullException()
+    {
+        // Arrange
+        ObservableCollection<string> possibleParameters = null!;
+        
+        // Assert
+        Assert.Throws<ArgumentNullException>(() => new ComboBoxParameterViewModel(possibleParameters));
+    }
+}
\ No newline at end of file
diff --git a/ActiveDirectoryQuerier.Tests/TextBoxViewModelTests.cs b/ActiveDirectoryQuerier.Tests/TextBoxViewModelTests.cs
new file mode 100644
index 0000000..0ebcb8d
--- /dev/null
+++ b/ActiveDirectoryQuerier.Tests/TextBoxViewModelTests.cs
@@ -0,0 +1,33 @@
+namespace ActiveDirectoryQuerier.Tests;
+
+public class TextBoxViewModelTests
+{
+    [Fact]
+    public void TextBoxViewModel_WhenConstructed_SelectedParameterValueIsNotNullOrEmpty()
+    {
+        // Arrange
+        TextBoxViewModel textBoxViewModel = new()
+        {
+            // Act
+            SelectedParameterValue = "*"
+        };
+
+        // Assert
+        Assert.NotNull(textBoxViewModel.SelectedParameterValue);
+        Assert.NotEmpty(textBoxViewModel.SelectedParameterValue);
+    }
+    
+    [Fact]
+    public void TextBoxViewModel_WhenSetToNull_NoExceptionIsThrown()
+    {
+        // Arrange
+        TextBoxViewModel textBoxViewModel = new()
+        {
+            // Act
+            SelectedParameterValue = null!
+        };
+
+        // Assert
+        Assert.Null(textBoxViewModel.SelectedParameterValue);
+    }
+}
\ No newline at end of file
diff --git a/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs b/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs
index e30bce4..7ec8585 100644
--- a/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs
+++ b/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs
@@ -44,11 +44,6 @@ public ObservableCollection<string> PossibleParameters
     {
         get => _possibleParameters;
         set {
-            if (value is null)
-            {
-                throw new ArgumentNullException(nameof(value));
-            }
-
             if (_possibleParameters != value)
             {
                 _possibleParameters = value;
diff --git a/ActiveDirectoryQuerier/TextBoxViewModel.cs b/ActiveDirectoryQuerier/TextBoxViewModel.cs
index 1ca05a3..e9b10f4 100644
--- a/ActiveDirectoryQuerier/TextBoxViewModel.cs
+++ b/ActiveDirectoryQuerier/TextBoxViewModel.cs
@@ -9,12 +9,12 @@ namespace ActiveDirectoryQuerier;
 public sealed class TextBoxViewModel : INotifyPropertyChanged
 {
     public event PropertyChangedEventHandler? PropertyChanged;
-    private string _selectedParameterValue = string.Empty;
+    private string? _selectedParameterValue;
 
     /// <summary>
     /// Gets or sets the selected parameter value for the unique ComboBox.
     /// </summary>
-    public string SelectedParameterValue
+    public string? SelectedParameterValue
     {
         get => _selectedParameterValue;
         set {

From 553b9419c5056ea1fcaad551545b3772b61f94a1 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Sun, 10 Mar 2024 14:36:30 -0700
Subject: [PATCH 53/94] Update comment and error string

---
 ActiveDirectoryQuerier/PowerShell/ActiveDirectoryCommands.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ActiveDirectoryQuerier/PowerShell/ActiveDirectoryCommands.cs b/ActiveDirectoryQuerier/PowerShell/ActiveDirectoryCommands.cs
index ab2e024..c776ab8 100644
--- a/ActiveDirectoryQuerier/PowerShell/ActiveDirectoryCommands.cs
+++ b/ActiveDirectoryQuerier/PowerShell/ActiveDirectoryCommands.cs
@@ -28,10 +28,10 @@ public static async Task<ObservableCollection<Command>> GetActiveDirectoryComman
         ReturnValues powerShellOutput = await powerShellExecutor.ExecuteAsync(powerShellCommand);
 
         // This is more of an internal error catch, as even through this command shouldn't fail, it's possible that it
-        // could.
+        // could. If this is the case, we want to know about it.
         if (powerShellOutput.HadErrors)
         {
-            string errorMessage = "An error occurred while retrieving the Active Directory commands: " +
+            string errorMessage = "Internal Error: An error occurred while retrieving the Active Directory commands: " +
                                   $"({string.Join(" ", powerShellOutput.StdErr)})";
             MessageBox.Show(errorMessage, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
             throw new InvalidPowerShellStateException(errorMessage);

From 55d30418173b9bb6baad4c8f18c30ebf0c99b0c0 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Sun, 10 Mar 2024 19:11:48 -0700
Subject: [PATCH 54/94] Update GUI for Active Directory Info tab and bind
 output

---
 ActiveDirectoryQuerier/MainWindow.xaml | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index 7b76145..065a6a2 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -79,7 +79,6 @@
                         <Grid Background="#FFE5E5E5">
                             <!-- Define Rows. -->
                             <Grid.RowDefinitions>
-                                <!-- TODO: Figure out why the bottom row isn't stopping at the specified min height! -->
                                 <RowDefinition Height="Auto" MinHeight="140" />
                                 <RowDefinition MinHeight="100" />
                             </Grid.RowDefinitions>
@@ -181,11 +180,21 @@
                     </TabItem>
                     <TabItem Header="Active Directory Information">
                         <Grid Background="#FFE5E5E5">
-                            <Button Content="Execute" HorizontalAlignment="Left" Margin="368,43,0,0"
-                                    VerticalAlignment="Top" Height="23" Width="95" />
-                            <ComboBox HorizontalAlignment="Left" Margin="31,44,0,0" VerticalAlignment="Top" Width="207"
-                                      Height="26" />
-                            <DataGrid d:ItemsSource="{d:SampleData ItemCount=5}" Margin="0,157,0,0" />
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" MinHeight="140" />
+                                <RowDefinition MinHeight="100" />
+                            </Grid.RowDefinitions>
+                            <Grid Margin="0,0,0,49" Grid.Row="0">
+                                <Button Content="Execute" HorizontalAlignment="Left" Margin="368,43,0,0"
+                                        VerticalAlignment="Top" Height="23" Width="95" />
+                                <ComboBox HorizontalAlignment="Left" Margin="31,44,0,0" VerticalAlignment="Top"
+                                          Width="207"
+                                          Height="26" />
+                            </Grid>
+                            <TextBox Grid.Row="1" Text="{Binding ActiveDirectoryInfoOutput.ConsoleOutput}"
+                                     HorizontalAlignment="Stretch"
+                                     VerticalAlignment="Stretch" Margin="10" IsReadOnly="True" TextWrapping="Wrap"
+                                     VerticalScrollBarVisibility="Auto" />
                         </Grid>
                     </TabItem>
                 </TabControl>

From 13030752472195803b27c16b9a42bd9f279452dc Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Sun, 10 Mar 2024 19:36:02 -0700
Subject: [PATCH 55/94] Add note to help Pieter get going

---
 ActiveDirectoryQuerier/MainWindow.xaml        |  2 +
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 47 ++++++++++---------
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index 065a6a2..170d77c 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -185,8 +185,10 @@
                                 <RowDefinition MinHeight="100" />
                             </Grid.RowDefinitions>
                             <Grid Margin="0,0,0,49" Grid.Row="0">
+                                <!-- TODO: Pieter: Bind button to another property inside the MainWindowViewModel -->
                                 <Button Content="Execute" HorizontalAlignment="Left" Margin="368,43,0,0"
                                         VerticalAlignment="Top" Height="23" Width="95" />
+                                <!-- TODO: Pieter: Bind combobox to another property for the SelectedItem and ItemsSource, inside the MainWindowViewModel -->
                                 <ComboBox HorizontalAlignment="Left" Margin="31,44,0,0" VerticalAlignment="Top"
                                           Width="207"
                                           Height="26" />
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index df0fbcb..be37f03 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -30,7 +30,7 @@ public sealed class MainWindowViewModel : INotifyPropertyChanged
     private string _queryName;
     private string _queryDescription;
     private AppConsole _powerShellOutput;
-    private AppConsole _activeDirectoryInfoOutput; // TODO: Info for Pieter to get started
+    private AppConsole _activeDirectoryInfoOutput;
     private Command? _selectedComboBoxCommand;
     private ObservableCollection<Button>? _buttons;
 
@@ -68,7 +68,6 @@ public AppConsole PowerShellOutput
         }
     }
 
-    // TODO: Info for Pieter to get started
     public AppConsole ActiveDirectoryInfoOutput
     {
         get => _activeDirectoryInfoOutput;
@@ -218,15 +217,13 @@ public Command? SelectedComboBoxCommand
     /// </summary>
     public ICommand ClearConsoleOutputRelay { get; }
 
-    /* TODO: Info for Pieter to get started
-     * AD Info options combobox dropdown
-     * Get all AD user
-     * Get all IP's on domain
-     * Get all etc, etc.
-     */
-
-    /* TODO: Info for Pieter to get started
-     * another property to contain current AD Info selected command
+    /* TODO: for Pieter
+     *
+     * Create a property that contains the ComboBox dropdown options/text.
+     *
+     * Create a property that will contain the selected item.
+     *
+     * Create a property to act as the relay to the execution button.
      */
 
     // [ Constructors ] ------------------------------------------------------------- //
@@ -261,6 +258,11 @@ public MainWindowViewModel()
         ExecuteCommandButtonRelay = new RelayCommand(ExecuteCustomQueryCommandButton);
         ClearConsoleOutputRelay = new RelayCommand(ClearConsoleOutput);
         ClearQueryBuilderRelay = new RelayCommand(ClearQueryBuilder);
+        
+        /* TODO: For Pieter
+         * Connect the relay property to for the execute button to you method that performs the execution.
+         */
+        
 
         // TODO: Figure out how resolve the warning about the async method not being awaited.
         InitializeActiveDirectoryCommandsAsync();
@@ -269,16 +271,19 @@ public MainWindowViewModel()
 
     // [ Methods ] ----------------------------------------------------------------- //
 
-    // TODO: Info for Pieter to get started
-    /*public void ActiveDirectoryInfo()
-    {
-        PowerShellExecutor powerShell = new PowerShellExecutor();
-        Command command = new Command("Get-ADUser");
-        command.Parameters.Add("Filter", "*");
-
-        Collection<PSObject> ReturnValue results = powerShell.ExecuteCommand(command);
-    }*/
-
+    /* TODO: Info for Pieter to get started
+     * Create a class (outside of this one) that will contain three methods, all of each will perform one specific
+     * action, such as getting the users on the domain, getting computers on the domain, and getting the IP of each
+     * system on the domain.
+     *      - The methods in this class should use the powershell executor to execute the specific command.
+     *      - Make method async, and utilize the async execute methods in the powershell executor.
+     *
+     *      public async Task<the return type> MethodName() { } // don't forget to use await when dealing with async
+     *                                                             methods.
+     *
+     * In this class, create a method or two, that will be used to execute the specific selected action.
+     */
+    
     /// <summary>
     /// This method will clear the console output and prompt the user if they are sure they want to clear the console.
     /// </summary>

From 1d1adad0438c1a02aa83497abde662beb121ddd5 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Mon, 11 Mar 2024 08:40:59 -0700
Subject: [PATCH 56/94] Update class name

---
 ...ts.cs => ActiveDirectoryCommandFetcherTests.cs} |  6 +++---
 ActiveDirectoryQuerier/MainWindowViewModel.cs      |  2 +-
 ...ommands.cs => ActiveDirectoryCommandFetcher.cs} | 14 +-------------
 .../PowerShell/CommandParameters.cs                |  5 +----
 4 files changed, 6 insertions(+), 21 deletions(-)
 rename ActiveDirectoryQuerier.Tests/{ActiveDirectoryCommandsTests.cs => ActiveDirectoryCommandFetcherTests.cs} (83%)
 rename ActiveDirectoryQuerier/PowerShell/{ActiveDirectoryCommands.cs => ActiveDirectoryCommandFetcher.cs} (71%)

diff --git a/ActiveDirectoryQuerier.Tests/ActiveDirectoryCommandsTests.cs b/ActiveDirectoryQuerier.Tests/ActiveDirectoryCommandFetcherTests.cs
similarity index 83%
rename from ActiveDirectoryQuerier.Tests/ActiveDirectoryCommandsTests.cs
rename to ActiveDirectoryQuerier.Tests/ActiveDirectoryCommandFetcherTests.cs
index 267c130..8da564e 100644
--- a/ActiveDirectoryQuerier.Tests/ActiveDirectoryCommandsTests.cs
+++ b/ActiveDirectoryQuerier.Tests/ActiveDirectoryCommandFetcherTests.cs
@@ -4,13 +4,13 @@
 
 namespace ActiveDirectoryQuerier.Tests;
 
-public class ActiveDirectoryCommandsTests
+public class ActiveDirectoryCommandFetcherTests
 {
     [Fact]
     public async Task GetActiveDirectoryCommands_ReturnsCommandList_IsNotEmpty()
     {
         // Act
-        ObservableCollection<Command> commandList = await ActiveDirectoryCommands.GetActiveDirectoryCommands();
+        ObservableCollection<Command> commandList = await ActiveDirectoryCommandFetcher.GetActiveDirectoryCommands();
 
         // Assert
         Assert.NotEmpty(commandList);
@@ -23,7 +23,7 @@ public async Task GetActiveDirectoryCommands_ReturnsCommandList_IsNotEmpty()
     public async Task GetActiveDirectoryCommands_ReturnsCommandList_ContainsCommand(string commandName)
     {
         // Act
-        ObservableCollection<Command> commandList = await ActiveDirectoryCommands.GetActiveDirectoryCommands();
+        ObservableCollection<Command> commandList = await ActiveDirectoryCommandFetcher.GetActiveDirectoryCommands();
 
         // Assert
         Assert.Contains(commandList, cmd => cmd.CommandText == commandName);
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index be37f03..18d4e4c 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -449,7 +449,7 @@ private async void ExecuteCommandAsync(object _)
     /// </summary>
     private async Task InitializeActiveDirectoryCommandsAsync()
     {
-        ObservableCollection<Command> list = await ActiveDirectoryCommands.GetActiveDirectoryCommands();
+        ObservableCollection<Command> list = await ActiveDirectoryCommandFetcher.GetActiveDirectoryCommands();
         ActiveDirectoryCommandsList = new ObservableCollection<Command>(list);
         OnPropertyChanged(nameof(ActiveDirectoryCommandsList));
     }
diff --git a/ActiveDirectoryQuerier/PowerShell/ActiveDirectoryCommands.cs b/ActiveDirectoryQuerier/PowerShell/ActiveDirectoryCommandFetcher.cs
similarity index 71%
rename from ActiveDirectoryQuerier/PowerShell/ActiveDirectoryCommands.cs
rename to ActiveDirectoryQuerier/PowerShell/ActiveDirectoryCommandFetcher.cs
index c776ab8..a82d6bb 100644
--- a/ActiveDirectoryQuerier/PowerShell/ActiveDirectoryCommands.cs
+++ b/ActiveDirectoryQuerier/PowerShell/ActiveDirectoryCommandFetcher.cs
@@ -5,20 +5,8 @@
 
 namespace ActiveDirectoryQuerier.PowerShell;
 
-/// <summary>
-/// Provides functionalities related to the ActiveDirectory PowerShell module.
-/// </summary>
-public static class ActiveDirectoryCommands
+public static class ActiveDirectoryCommandFetcher
 {
-    /// <summary>
-    /// Retrieves a list of commands available in the ActiveDirectory PowerShell module.
-    /// </summary>
-    /// <returns>
-    /// An ObservableCollection of Command objects representing each command in the ActiveDirectory module.
-    /// </returns>
-    /// <exception cref="InvalidPowerShellStateException">
-    /// Thrown if an error occurs during the execution of the PowerShell command.
-    /// </exception>
     public static async Task<ObservableCollection<Command>> GetActiveDirectoryCommands()
     {
         Command powerShellCommand = new("Get-Command");
diff --git a/ActiveDirectoryQuerier/PowerShell/CommandParameters.cs b/ActiveDirectoryQuerier/PowerShell/CommandParameters.cs
index a21c149..4844081 100644
--- a/ActiveDirectoryQuerier/PowerShell/CommandParameters.cs
+++ b/ActiveDirectoryQuerier/PowerShell/CommandParameters.cs
@@ -5,15 +5,12 @@
 
 namespace ActiveDirectoryQuerier.PowerShell;
 
-/// <summary>
-/// Manages and provides the parameters available for a given PowerShell command.
-/// </summary>
 public class CommandParameters
 {
     private readonly ObservableCollection<string> _possibleParameters = new();
 
     /// <summary>
-    /// Gets the collection of possible parameters for a command.
+    /// A collection of possible parameters for a given command.
     /// </summary>
     /// <exception cref="InvalidOperationException">Thrown when the collection has not been populated yet.</exception>
     /// <important>

From 3651cfb21b4a358a2597735fe1f467b9c1d9068d Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Mon, 11 Mar 2024 09:09:26 -0700
Subject: [PATCH 57/94] Update class, method and variables names

---
 .../AdCommandParametersTests.cs               | 46 +++++++++
 .../ComboBoxParameterViewModelTests.cs        | 18 ++--
 .../CommandParametersTests.cs                 | 46 ---------
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 12 +--
 .../PowerShell/ADCommandParameters.cs         | 77 +++++++++++++++
 .../PowerShell/CommandParameters.cs           | 97 -------------------
 .../PowerShell/CustomQueries.cs               |  4 +-
 7 files changed, 140 insertions(+), 160 deletions(-)
 create mode 100644 ActiveDirectoryQuerier.Tests/AdCommandParametersTests.cs
 delete mode 100644 ActiveDirectoryQuerier.Tests/CommandParametersTests.cs
 create mode 100644 ActiveDirectoryQuerier/PowerShell/ADCommandParameters.cs
 delete mode 100644 ActiveDirectoryQuerier/PowerShell/CommandParameters.cs

diff --git a/ActiveDirectoryQuerier.Tests/AdCommandParametersTests.cs b/ActiveDirectoryQuerier.Tests/AdCommandParametersTests.cs
new file mode 100644
index 0000000..abae4a7
--- /dev/null
+++ b/ActiveDirectoryQuerier.Tests/AdCommandParametersTests.cs
@@ -0,0 +1,46 @@
+using System.Management.Automation.Runspaces;
+using ActiveDirectoryQuerier.PowerShell;
+
+namespace ActiveDirectoryQuerier.Tests;
+
+public class AdCommandParametersTests
+{
+    [Fact]
+    public void AvailableParameters_AvailableParametersNotPopulated_NoValidCommandProvided()
+    {
+        // Arrange
+        ADCommandParameters adCommandParameters = new();
+
+        // Assert
+        Assert.Contains("No valid command provided", adCommandParameters.AvailableParameters);
+    }
+
+    [Fact]
+    public async Task LoadParametersAsync_PopulatesAvailableParameters_IsNotEmpty()
+    {
+        // Arrange
+        ADCommandParameters adCommandParameters = new();
+        Command command = new("Get-Process");
+
+        // Act
+        await adCommandParameters.LoadParametersAsync(command);
+
+        // Assert
+        Assert.NotEmpty(adCommandParameters.AvailableParameters);
+    }
+
+    [Fact]
+    public async Task LoadParametersAsync_CheckAvailableParameters_ContainsNameAndId()
+    {
+        // Arrange
+        ADCommandParameters adCommandParameters = new();
+        Command command = new("Get-Process");
+
+        // Act
+        await adCommandParameters.LoadParametersAsync(command);
+
+        // Assert
+        Assert.Contains("-Name", adCommandParameters.AvailableParameters);
+        Assert.Contains("-Id", adCommandParameters.AvailableParameters);
+    }
+}
diff --git a/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs b/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs
index 6598701..8694db7 100644
--- a/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs
+++ b/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs
@@ -11,12 +11,12 @@ public async Task ComboBoxParameterViewModel_WhenConstructed_PossibleParametersI
     {
         // Arrange
         Command command = new("Get-ADUser");
-        CommandParameters commandParameters = new();
+        ADCommandParameters adCommandParameters = new();
         ComboBoxParameterViewModel comboBoxParameterViewModel;
         
         // Act
-        await commandParameters.LoadCommandParametersAsync(command);
-        comboBoxParameterViewModel = new(commandParameters.PossibleParameters);
+        await adCommandParameters.LoadParametersAsync(command);
+        comboBoxParameterViewModel = new(adCommandParameters.AvailableParameters);
         
         // Assert
         Assert.NotNull(comboBoxParameterViewModel.PossibleParameters);
@@ -28,12 +28,12 @@ public async Task ComboBoxParameterViewModel_WhenConstructed_PossibleParametersC
     {
         // Arrange
         Command command = new("Get-ADUser");
-        CommandParameters commandParameters = new();
+        ADCommandParameters adCommandParameters = new();
         ComboBoxParameterViewModel comboBoxParameterViewModel;
         
         // Act
-        await commandParameters.LoadCommandParametersAsync(command);
-        comboBoxParameterViewModel = new(commandParameters.PossibleParameters);
+        await adCommandParameters.LoadParametersAsync(command);
+        comboBoxParameterViewModel = new(adCommandParameters.AvailableParameters);
         
         // Assert
         Assert.Contains(comboBoxParameterViewModel.PossibleParameters, param => param == "-Filter");
@@ -49,12 +49,12 @@ public async Task ComboBoxParameterViewModel_WhenSelectedParameterChosen_Selecte
         // Arrange
         string selectedParameter;
         Command command = new("Get-ADUser");
-        CommandParameters commandParameters = new();
+        ADCommandParameters adCommandParameters = new();
         ComboBoxParameterViewModel comboBoxParameterViewModel;
         
         // Act
-        await commandParameters.LoadCommandParametersAsync(command);
-        comboBoxParameterViewModel = new(commandParameters.PossibleParameters);
+        await adCommandParameters.LoadParametersAsync(command);
+        comboBoxParameterViewModel = new(adCommandParameters.AvailableParameters);
         selectedParameter = comboBoxParameterViewModel.PossibleParameters[0];
         comboBoxParameterViewModel.SelectedParameter = selectedParameter;
         
diff --git a/ActiveDirectoryQuerier.Tests/CommandParametersTests.cs b/ActiveDirectoryQuerier.Tests/CommandParametersTests.cs
deleted file mode 100644
index f67f884..0000000
--- a/ActiveDirectoryQuerier.Tests/CommandParametersTests.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System.Management.Automation.Runspaces;
-using ActiveDirectoryQuerier.PowerShell;
-
-namespace ActiveDirectoryQuerier.Tests;
-
-public class CommandParametersTests
-{
-    [Fact]
-    public void PossibleParameters_LoadCommandParametersNotPopulated_NoValidCommandProvided()
-    {
-        // Arrange
-        CommandParameters commandParameters = new();
-
-        // Assert
-        Assert.Contains("No valid command provided", commandParameters.PossibleParameters);
-    }
-
-    [Fact]
-    public async Task LoadCommandParametersAsync_PopulatesPossibleParameters_IsNotEmpty()
-    {
-        // Arrange
-        CommandParameters commandParameters = new();
-        Command command = new("Get-Process");
-
-        // Act
-        await commandParameters.LoadCommandParametersAsync(command);
-
-        // Assert
-        Assert.NotEmpty(commandParameters.PossibleParameters);
-    }
-
-    [Fact]
-    public async Task LoadCommandParametersAsync_CheckPossibleParameter_ContentIsCorrect()
-    {
-        // Arrange
-        CommandParameters commandParameters = new();
-        Command command = new("Get-Process");
-
-        // Act
-        await commandParameters.LoadCommandParametersAsync(command);
-
-        // Assert
-        Assert.Contains("-Name", commandParameters.PossibleParameters);
-        Assert.Contains("-Id", commandParameters.PossibleParameters);
-    }
-}
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 18d4e4c..98b5f8d 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -336,9 +336,9 @@ private void EditCustomQuery(object sender)
         SelectedComboBoxCommand = chosenCommand;
 
         // Load the Possible Parameters Synchronously
-        CommandParameters commandParameters = new();
-        commandParameters.LoadCommandParameters(SelectedComboBoxCommand);
-        PossibleCommandParametersList = new ObservableCollection<string>(commandParameters.PossibleParameters);
+        ADCommandParameters adCommandParameters = new();
+        adCommandParameters.LoadParameters(SelectedComboBoxCommand);
+        PossibleCommandParametersList = new ObservableCollection<string>(adCommandParameters.AvailableParameters);
         OnPropertyChanged(nameof(PossibleCommandParametersList));
 
         // Check to see if the DynamicParametersCollection is empty and clear it if it is
@@ -460,9 +460,9 @@ private async Task InitializeActiveDirectoryCommandsAsync()
     /// <param name="selectedCommand">The PowerShell command whose parameters are to be loaded.</param>
     private async Task LoadCommandParametersAsync(Command? selectedCommand)
     {
-        CommandParameters commandParameters = new();
-        await commandParameters.LoadCommandParametersAsync(selectedCommand);
-        PossibleCommandParametersList = new ObservableCollection<string>(commandParameters.PossibleParameters);
+        ADCommandParameters adCommandParameters = new();
+        await adCommandParameters.LoadParametersAsync(selectedCommand);
+        PossibleCommandParametersList = new ObservableCollection<string>(adCommandParameters.AvailableParameters);
         OnPropertyChanged(nameof(PossibleCommandParametersList));
 
         // Update the possible properties of the ComboBoxParameterViewModels.
diff --git a/ActiveDirectoryQuerier/PowerShell/ADCommandParameters.cs b/ActiveDirectoryQuerier/PowerShell/ADCommandParameters.cs
new file mode 100644
index 0000000..1a7ff7b
--- /dev/null
+++ b/ActiveDirectoryQuerier/PowerShell/ADCommandParameters.cs
@@ -0,0 +1,77 @@
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Management.Automation;
+using System.Management.Automation.Runspaces;
+
+namespace ActiveDirectoryQuerier.PowerShell;
+
+// ReSharper disable once InconsistentNaming
+public class ADCommandParameters
+{
+    private readonly ObservableCollection<string> _availableParameters = new();
+    
+    public ObservableCollection<string> AvailableParameters
+    {
+        get {
+            if (_availableParameters.Count == 0)
+            {
+                Debug.WriteLine("Warning: LoadParametersAsync should be called before accessing " +
+                                "AvailableParameters, to ensure asynchronous loading of parameters.");
+                LoadParameters(null);
+            }
+
+            return _availableParameters;
+        }
+    }
+    
+    public async Task LoadParametersAsync(Command? powerShellCommand)
+    {
+        await LoadParametersCore(powerShellCommand, true);
+    }
+
+    public void LoadParameters(Command? powerShellCommand)
+    {
+        LoadParametersCore(powerShellCommand, false).Wait();
+    }
+    
+    private async Task LoadParametersCore(Command? powerShellCommand, bool isAsync)
+    {
+        // powerShellCommand can be null if the user attempts to select an ActiveDirectory command that doesn't exist.
+        // More specifically, if the entered command doesn't exist in the ActiveDirectoryCommandsList in
+        // MainWindowViewModel.cs, powerShellCommand will be null, causing an exception to be thrown, crashing the
+        // program.
+        if (powerShellCommand is null)
+        {
+            Trace.WriteLine("Error: command is null");
+            _availableParameters.Add("No valid command provided");
+            return;
+        }
+
+        if (_availableParameters.Count == 0)
+        {
+            using var powerShell = System.Management.Automation.PowerShell.Create();
+            string commandString =
+                $"Get-Command {powerShellCommand.CommandText} | Select -ExpandProperty Parameters | ForEach-Object {{ $_.Keys }}";
+
+            powerShell.Commands.Clear();
+            powerShell.AddScript(commandString);
+
+            if (isAsync)
+            {
+                PSDataCollection<PSObject> result = await powerShell.InvokeAsync();
+                foreach (PSObject cmd in result)
+                {
+                    _availableParameters.Add($"-{cmd}");
+                }
+            }
+            else
+            {
+                Collection<PSObject> result = powerShell.Invoke();
+                foreach (PSObject cmd in result)
+                {
+                    _availableParameters.Add($"-{cmd}");
+                }
+            }
+        }
+    }
+}
diff --git a/ActiveDirectoryQuerier/PowerShell/CommandParameters.cs b/ActiveDirectoryQuerier/PowerShell/CommandParameters.cs
deleted file mode 100644
index 4844081..0000000
--- a/ActiveDirectoryQuerier/PowerShell/CommandParameters.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Management.Automation;
-using System.Management.Automation.Runspaces;
-
-namespace ActiveDirectoryQuerier.PowerShell;
-
-public class CommandParameters
-{
-    private readonly ObservableCollection<string> _possibleParameters = new();
-
-    /// <summary>
-    /// A collection of possible parameters for a given command.
-    /// </summary>
-    /// <exception cref="InvalidOperationException">Thrown when the collection has not been populated yet.</exception>
-    /// <important>
-    /// This property should not be accessed before the collection has been populated via LoadCommandParametersAsync, to
-    /// ensure asynchronous loading of parameters.
-    /// </important>
-    public ObservableCollection<string> PossibleParameters
-    {
-        get {
-            if (_possibleParameters.Count == 0)
-            {
-                Debug.WriteLine("Warning: LoadCommandParametersAsync should be called before accessing " +
-                                "PossibleParameters, to ensure asynchronous loading of parameters.");
-                LoadCommandParameters(null);
-            }
-
-            return _possibleParameters;
-        }
-    }
-
-    /// <summary>
-    /// Retrieves the parameters available for a given command asynchronously.
-    /// </summary>
-    /// <param name="powerShellCommand">The command object to retrieve parameters for.</param>
-    public async Task LoadCommandParametersAsync(Command? powerShellCommand)
-    {
-        await LoadCommandParametersInternal(powerShellCommand, true);
-    }
-
-    /// <summary>
-    /// Retrieves the parameters available for a given command synchronously.
-    /// </summary>
-    /// <param name="powerShellCommand">The command to retrieve parameters for.</param>
-    public void LoadCommandParameters(Command? powerShellCommand)
-    {
-        LoadCommandParametersInternal(powerShellCommand, false).Wait();
-    }
-
-    /// <summary>
-    /// Retrieves the parameters available for a given command.
-    /// </summary>
-    /// <param name="powerShellCommand">The command to retrieve parameters for.</param>
-    /// <param name="isAsync">Determines whether the operation should be asynchronous or not.</param>
-    private async Task LoadCommandParametersInternal(Command? powerShellCommand, bool isAsync)
-    {
-        // powerShellCommand can be null if the user attempts to select an ActiveDirectory command that doesn't exist.
-        // More specifically, if the entered command doesn't exist in the ActiveDirectoryCommandsList in
-        // MainWindowViewModel.cs, powerShellCommand will be null, causing an exception to be thrown, crashing the
-        // program.
-        if (powerShellCommand is null)
-        {
-            Trace.WriteLine("Error: command is null");
-            _possibleParameters.Add("No valid command provided");
-            return;
-        }
-
-        if (_possibleParameters.Count == 0)
-        {
-            using var powerShell = System.Management.Automation.PowerShell.Create();
-            string commandString =
-                $"Get-Command {powerShellCommand.CommandText} | Select -ExpandProperty Parameters | ForEach-Object {{ $_.Keys }}";
-
-            powerShell.Commands.Clear();
-            powerShell.AddScript(commandString);
-
-            if (isAsync)
-            {
-                PSDataCollection<PSObject> result = await powerShell.InvokeAsync();
-                foreach (PSObject cmd in result)
-                {
-                    _possibleParameters.Add($"-{cmd}");
-                }
-            }
-            else
-            {
-                Collection<PSObject> result = powerShell.Invoke();
-                foreach (PSObject cmd in result)
-                {
-                    _possibleParameters.Add($"-{cmd}");
-                }
-            }
-        }
-    }
-}
diff --git a/ActiveDirectoryQuerier/PowerShell/CustomQueries.cs b/ActiveDirectoryQuerier/PowerShell/CustomQueries.cs
index b50760c..9ae6335 100644
--- a/ActiveDirectoryQuerier/PowerShell/CustomQueries.cs
+++ b/ActiveDirectoryQuerier/PowerShell/CustomQueries.cs
@@ -49,7 +49,7 @@ public class Query
         /*public Query(string cN, string[] commandParams)
         {
             this.CommandName = cN;
-            this.CommandParameters = commandParams;
+            this.ADCommandParameters = commandParams;
         }*/
 
         /// <summary>
@@ -166,7 +166,7 @@ public void LoadData()
                     {
                         command.Parameters.Add(q.CommandParameters[i], q.CommandParametersValues[i]);
                         // the values are working then we will use this
-                        // command.Parameters.Add(q.CommandParameters[i]);
+                        // command.Parameters.Add(q.ADCommandParameters[i]);
                     }
                 }
 

From ea554a956cab5b554d15dea3f809b49a7e5cfb4f Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Mon, 11 Mar 2024 10:08:23 -0700
Subject: [PATCH 58/94] Update class, method, and variable names for clarity

---
 .../AdCommandParametersTests.cs               |   4 +-
 ...cherTests.cs => AdCommandsFetcherTests.cs} |   6 +-
 .../AppConsoleTests.cs                        |   6 +-
 .../ComboBoxParameterViewModelTests.cs        |   6 +-
 ...ellExecutorTests.cs => PsExecutorTests.cs} |  24 +--
 .../{ReturnValuesTest.cs => PsOutputTest.cs}  |   6 +-
 ActiveDirectoryQuerier/MainWindowViewModel.cs |  16 +-
 .../PowerShell/ADCommandParameters.cs         |  30 ++--
 ...CommandFetcher.cs => ADCommandsFetcher.cs} |  24 +--
 .../PowerShell/PSExecutor.cs                  | 108 ++++++++++++++
 .../{ReturnValues.cs => PSOutput.cs}          |   5 +-
 .../PowerShell/PowerShellExecutor.cs          | 140 ------------------
 12 files changed, 173 insertions(+), 202 deletions(-)
 rename ActiveDirectoryQuerier.Tests/{ActiveDirectoryCommandFetcherTests.cs => AdCommandsFetcherTests.cs} (70%)
 rename ActiveDirectoryQuerier.Tests/{PowerShellExecutorTests.cs => PsExecutorTests.cs} (79%)
 rename ActiveDirectoryQuerier.Tests/{ReturnValuesTest.cs => PsOutputTest.cs} (86%)
 rename ActiveDirectoryQuerier/PowerShell/{ActiveDirectoryCommandFetcher.cs => ADCommandsFetcher.cs} (53%)
 create mode 100644 ActiveDirectoryQuerier/PowerShell/PSExecutor.cs
 rename ActiveDirectoryQuerier/PowerShell/{ReturnValues.cs => PSOutput.cs} (91%)
 delete mode 100644 ActiveDirectoryQuerier/PowerShell/PowerShellExecutor.cs

diff --git a/ActiveDirectoryQuerier.Tests/AdCommandParametersTests.cs b/ActiveDirectoryQuerier.Tests/AdCommandParametersTests.cs
index abae4a7..add38cb 100644
--- a/ActiveDirectoryQuerier.Tests/AdCommandParametersTests.cs
+++ b/ActiveDirectoryQuerier.Tests/AdCommandParametersTests.cs
@@ -23,7 +23,7 @@ public async Task LoadParametersAsync_PopulatesAvailableParameters_IsNotEmpty()
         Command command = new("Get-Process");
 
         // Act
-        await adCommandParameters.LoadParametersAsync(command);
+        await adCommandParameters.LoadAvailableParametersAsync(command);
 
         // Assert
         Assert.NotEmpty(adCommandParameters.AvailableParameters);
@@ -37,7 +37,7 @@ public async Task LoadParametersAsync_CheckAvailableParameters_ContainsNameAndId
         Command command = new("Get-Process");
 
         // Act
-        await adCommandParameters.LoadParametersAsync(command);
+        await adCommandParameters.LoadAvailableParametersAsync(command);
 
         // Assert
         Assert.Contains("-Name", adCommandParameters.AvailableParameters);
diff --git a/ActiveDirectoryQuerier.Tests/ActiveDirectoryCommandFetcherTests.cs b/ActiveDirectoryQuerier.Tests/AdCommandsFetcherTests.cs
similarity index 70%
rename from ActiveDirectoryQuerier.Tests/ActiveDirectoryCommandFetcherTests.cs
rename to ActiveDirectoryQuerier.Tests/AdCommandsFetcherTests.cs
index 8da564e..4a71bc7 100644
--- a/ActiveDirectoryQuerier.Tests/ActiveDirectoryCommandFetcherTests.cs
+++ b/ActiveDirectoryQuerier.Tests/AdCommandsFetcherTests.cs
@@ -4,13 +4,13 @@
 
 namespace ActiveDirectoryQuerier.Tests;
 
-public class ActiveDirectoryCommandFetcherTests
+public class AdCommandsFetcherTests
 {
     [Fact]
     public async Task GetActiveDirectoryCommands_ReturnsCommandList_IsNotEmpty()
     {
         // Act
-        ObservableCollection<Command> commandList = await ActiveDirectoryCommandFetcher.GetActiveDirectoryCommands();
+        ObservableCollection<Command> commandList = await ADCommandsFetcher.GetActiveDirectoryCommands();
 
         // Assert
         Assert.NotEmpty(commandList);
@@ -23,7 +23,7 @@ public async Task GetActiveDirectoryCommands_ReturnsCommandList_IsNotEmpty()
     public async Task GetActiveDirectoryCommands_ReturnsCommandList_ContainsCommand(string commandName)
     {
         // Act
-        ObservableCollection<Command> commandList = await ActiveDirectoryCommandFetcher.GetActiveDirectoryCommands();
+        ObservableCollection<Command> commandList = await ADCommandsFetcher.GetActiveDirectoryCommands();
 
         // Assert
         Assert.Contains(commandList, cmd => cmd.CommandText == commandName);
diff --git a/ActiveDirectoryQuerier.Tests/AppConsoleTests.cs b/ActiveDirectoryQuerier.Tests/AppConsoleTests.cs
index 4f9077f..22f00fa 100644
--- a/ActiveDirectoryQuerier.Tests/AppConsoleTests.cs
+++ b/ActiveDirectoryQuerier.Tests/AppConsoleTests.cs
@@ -21,11 +21,11 @@ public void Dispose()
         GC.SuppressFinalize(this);
     }
 
-    private static async Task<(AppConsole, ReturnValues)> ExecuteCommandAsync(Command command)
+    private static async Task<(AppConsole, PSOutput)> ExecuteCommandAsync(Command command)
     {
-        PowerShellExecutor powerShellExecutor = new();
+        PSExecutor psExecutor = new();
         AppConsole appConsole = new();
-        ReturnValues result = await powerShellExecutor.ExecuteAsync(command);
+        PSOutput result = await psExecutor.ExecuteAsync(command);
 
         appConsole.Append(result.HadErrors ? result.StdErr : result.StdOut);
 
diff --git a/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs b/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs
index 8694db7..ee49605 100644
--- a/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs
+++ b/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs
@@ -15,7 +15,7 @@ public async Task ComboBoxParameterViewModel_WhenConstructed_PossibleParametersI
         ComboBoxParameterViewModel comboBoxParameterViewModel;
         
         // Act
-        await adCommandParameters.LoadParametersAsync(command);
+        await adCommandParameters.LoadAvailableParametersAsync(command);
         comboBoxParameterViewModel = new(adCommandParameters.AvailableParameters);
         
         // Assert
@@ -32,7 +32,7 @@ public async Task ComboBoxParameterViewModel_WhenConstructed_PossibleParametersC
         ComboBoxParameterViewModel comboBoxParameterViewModel;
         
         // Act
-        await adCommandParameters.LoadParametersAsync(command);
+        await adCommandParameters.LoadAvailableParametersAsync(command);
         comboBoxParameterViewModel = new(adCommandParameters.AvailableParameters);
         
         // Assert
@@ -53,7 +53,7 @@ public async Task ComboBoxParameterViewModel_WhenSelectedParameterChosen_Selecte
         ComboBoxParameterViewModel comboBoxParameterViewModel;
         
         // Act
-        await adCommandParameters.LoadParametersAsync(command);
+        await adCommandParameters.LoadAvailableParametersAsync(command);
         comboBoxParameterViewModel = new(adCommandParameters.AvailableParameters);
         selectedParameter = comboBoxParameterViewModel.PossibleParameters[0];
         comboBoxParameterViewModel.SelectedParameter = selectedParameter;
diff --git a/ActiveDirectoryQuerier.Tests/PowerShellExecutorTests.cs b/ActiveDirectoryQuerier.Tests/PsExecutorTests.cs
similarity index 79%
rename from ActiveDirectoryQuerier.Tests/PowerShellExecutorTests.cs
rename to ActiveDirectoryQuerier.Tests/PsExecutorTests.cs
index 24c8828..edf7554 100644
--- a/ActiveDirectoryQuerier.Tests/PowerShellExecutorTests.cs
+++ b/ActiveDirectoryQuerier.Tests/PsExecutorTests.cs
@@ -3,7 +3,7 @@
 
 namespace ActiveDirectoryQuerier.Tests;
 
-public class PowerShellExecutorTests
+public class PsExecutorTests
 {
     [Theory]
     [InlineData("Get-Command", "Module", "ActiveDirectory")]
@@ -13,10 +13,10 @@ public void Execute_WhenGivenValidCommand_ReturnsExpectedOutput(string cmd, stri
         // Arrange
         Command command = new(cmd);
         command.Parameters.Add(paramName, paramValue);
-        PowerShellExecutor powerShellExecutor = new();
+        PSExecutor psExecutor = new();
 
         // Act
-        ReturnValues result = powerShellExecutor.Execute(command);
+        PSOutput result = psExecutor.Execute(command);
 
         // Assert
         Assert.False(result.HadErrors);
@@ -32,11 +32,11 @@ public void Execute_CheckIfOutputChanged_ReturnsDifferentOutput()
         command.Parameters.Add("Module", "ActiveDirectory");
         Command command2 = new("Get-Process");
         command.Parameters.Add("Name", "explorer");
-        PowerShellExecutor powerShellExecutor = new();
+        PSExecutor psExecutor = new();
 
         // Act
-        ReturnValues result = powerShellExecutor.Execute(command);
-        ReturnValues result2 = powerShellExecutor.Execute(command2);
+        PSOutput result = psExecutor.Execute(command);
+        PSOutput result2 = psExecutor.Execute(command2);
 
         // Assert
         Assert.NotEqual(result, result2);
@@ -52,10 +52,10 @@ public async Task ExecuteAsync_WhenGivenValidCommand_ReturnsExpectedOutput(strin
         // Arrange
         Command command = new(cmd);
         command.Parameters.Add(paramName, paramValue);
-        PowerShellExecutor powerShellExecutor = new();
+        PSExecutor psExecutor = new();
 
         // Act
-        ReturnValues result = await powerShellExecutor.ExecuteAsync(command);
+        PSOutput result = await psExecutor.ExecuteAsync(command);
 
         // Assert
         Assert.False(result.HadErrors);
@@ -71,10 +71,10 @@ public void Execute_WhenGivenInvalidCommand_ReturnsExpectedOutput(string cmd, st
         // Arrange
         Command command = new(cmd);
         command.Parameters.Add(paramName, paramValue);
-        PowerShellExecutor powerShellExecutor = new();
+        PSExecutor psExecutor = new();
 
         // Act
-        ReturnValues result = powerShellExecutor.Execute(command);
+        PSOutput result = psExecutor.Execute(command);
 
         // Assert
         Assert.True(result.HadErrors);
@@ -92,10 +92,10 @@ public async Task ExecuteAsync_WhenGivenInvalidCommand_ReturnsExpectedOutput(str
         // Arrange
         Command command = new(cmd);
         command.Parameters.Add(paramName, paramValue);
-        PowerShellExecutor powerShellExecutor = new();
+        PSExecutor psExecutor = new();
 
         // Act
-        ReturnValues result = await powerShellExecutor.ExecuteAsync(command);
+        PSOutput result = await psExecutor.ExecuteAsync(command);
 
         // Assert
         Assert.True(result.HadErrors);
diff --git a/ActiveDirectoryQuerier.Tests/ReturnValuesTest.cs b/ActiveDirectoryQuerier.Tests/PsOutputTest.cs
similarity index 86%
rename from ActiveDirectoryQuerier.Tests/ReturnValuesTest.cs
rename to ActiveDirectoryQuerier.Tests/PsOutputTest.cs
index 7e75175..0d04627 100644
--- a/ActiveDirectoryQuerier.Tests/ReturnValuesTest.cs
+++ b/ActiveDirectoryQuerier.Tests/PsOutputTest.cs
@@ -2,13 +2,13 @@
 
 namespace ActiveDirectoryQuerier.Tests;
 
-public class ReturnValuesTest
+public class PsOutputTest
 {
     [Fact]
     public void HadErrors_StdErrHasEntries_ReturnsTrue()
     {
         // Arrange
-        var returnValues = new ReturnValues();
+        var returnValues = new PSOutput();
         returnValues.StdErr.Add("Error");
 
         // Act
@@ -24,7 +24,7 @@ public void HadErrors_StdErrHasEntries_ReturnsTrue()
     public void NoErrors_StdOutHasEntries_ReturnsFalse()
     {
         // Arrange
-        var returnValues = new ReturnValues();
+        var returnValues = new PSOutput();
         returnValues.StdOut.Add("Output");
 
         // Act
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 98b5f8d..d62d4c0 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -38,7 +38,7 @@ public sealed class MainWindowViewModel : INotifyPropertyChanged
 
     private readonly Query _currentQuery;
     private readonly CustomQueries _customQuery;
-    private readonly PowerShellExecutor _powerShellExecutor;
+    private readonly PSExecutor _psExecutor;
     private Query? _isEditing;
 
     // [ Properties ] --------------------------------------------------------------- //
@@ -237,7 +237,7 @@ public MainWindowViewModel()
         _queryDescription = string.Empty;
         _powerShellOutput = new AppConsole();
         _activeDirectoryInfoOutput = new AppConsole();
-        _powerShellExecutor = new PowerShellExecutor();
+        _psExecutor = new PSExecutor();
         _customQuery = new CustomQueries();
         _currentQuery = new Query();
 
@@ -337,7 +337,7 @@ private void EditCustomQuery(object sender)
 
         // Load the Possible Parameters Synchronously
         ADCommandParameters adCommandParameters = new();
-        adCommandParameters.LoadParameters(SelectedComboBoxCommand);
+        adCommandParameters.LoadAvailableParameters(SelectedComboBoxCommand);
         PossibleCommandParametersList = new ObservableCollection<string>(adCommandParameters.AvailableParameters);
         OnPropertyChanged(nameof(PossibleCommandParametersList));
 
@@ -449,7 +449,7 @@ private async void ExecuteCommandAsync(object _)
     /// </summary>
     private async Task InitializeActiveDirectoryCommandsAsync()
     {
-        ObservableCollection<Command> list = await ActiveDirectoryCommandFetcher.GetActiveDirectoryCommands();
+        ObservableCollection<Command> list = await ADCommandsFetcher.GetActiveDirectoryCommands();
         ActiveDirectoryCommandsList = new ObservableCollection<Command>(list);
         OnPropertyChanged(nameof(ActiveDirectoryCommandsList));
     }
@@ -461,7 +461,7 @@ private async Task InitializeActiveDirectoryCommandsAsync()
     private async Task LoadCommandParametersAsync(Command? selectedCommand)
     {
         ADCommandParameters adCommandParameters = new();
-        await adCommandParameters.LoadParametersAsync(selectedCommand);
+        await adCommandParameters.LoadAvailableParametersAsync(selectedCommand);
         PossibleCommandParametersList = new ObservableCollection<string>(adCommandParameters.AvailableParameters);
         OnPropertyChanged(nameof(PossibleCommandParametersList));
 
@@ -491,16 +491,16 @@ private async Task ExecuteSelectedCommandAsync(Command? command = null)
 
         try
         {
-            ReturnValues result;
+            PSOutput result;
             if (command is not null)
             {
-                result = await _powerShellExecutor.ExecuteAsync(command);
+                result = await _psExecutor.ExecuteAsync(command);
             }
             else
             {
                 // Add selected parameters and their values to the command.
                 UpdateSelectedCommand();
-                result = await _powerShellExecutor.ExecuteAsync(SelectedComboBoxCommand);
+                result = await _psExecutor.ExecuteAsync(SelectedComboBoxCommand);
             }
 
             if (result.HadErrors)
diff --git a/ActiveDirectoryQuerier/PowerShell/ADCommandParameters.cs b/ActiveDirectoryQuerier/PowerShell/ADCommandParameters.cs
index 1a7ff7b..52d53d6 100644
--- a/ActiveDirectoryQuerier/PowerShell/ADCommandParameters.cs
+++ b/ActiveDirectoryQuerier/PowerShell/ADCommandParameters.cs
@@ -15,32 +15,32 @@ public ObservableCollection<string> AvailableParameters
         get {
             if (_availableParameters.Count == 0)
             {
-                Debug.WriteLine("Warning: LoadParametersAsync should be called before accessing " +
+                Debug.WriteLine("Warning: LoadAvailableParametersAsync should be called before accessing " +
                                 "AvailableParameters, to ensure asynchronous loading of parameters.");
-                LoadParameters(null);
+                LoadAvailableParameters(null);
             }
 
             return _availableParameters;
         }
     }
     
-    public async Task LoadParametersAsync(Command? powerShellCommand)
+    public async Task LoadAvailableParametersAsync(Command? psCommand)
     {
-        await LoadParametersCore(powerShellCommand, true);
+        await LoadAvailableParametersCore(psCommand, true);
     }
 
-    public void LoadParameters(Command? powerShellCommand)
+    public void LoadAvailableParameters(Command? psCommand)
     {
-        LoadParametersCore(powerShellCommand, false).Wait();
+        LoadAvailableParametersCore(psCommand, false).Wait();
     }
     
-    private async Task LoadParametersCore(Command? powerShellCommand, bool isAsync)
+    private async Task LoadAvailableParametersCore(Command? psCommand, bool isAsync)
     {
-        // powerShellCommand can be null if the user attempts to select an ActiveDirectory command that doesn't exist.
+        // psCommand can be null if the user attempts to select an ActiveDirectory command that doesn't exist.
         // More specifically, if the entered command doesn't exist in the ActiveDirectoryCommandsList in
-        // MainWindowViewModel.cs, powerShellCommand will be null, causing an exception to be thrown, crashing the
+        // MainWindowViewModel.cs, psCommand will be null, causing an exception to be thrown, crashing the
         // program.
-        if (powerShellCommand is null)
+        if (psCommand is null)
         {
             Trace.WriteLine("Error: command is null");
             _availableParameters.Add("No valid command provided");
@@ -51,7 +51,7 @@ private async Task LoadParametersCore(Command? powerShellCommand, bool isAsync)
         {
             using var powerShell = System.Management.Automation.PowerShell.Create();
             string commandString =
-                $"Get-Command {powerShellCommand.CommandText} | Select -ExpandProperty Parameters | ForEach-Object {{ $_.Keys }}";
+                $"Get-Command {psCommand.CommandText} | Select -ExpandProperty Parameters | ForEach-Object {{ $_.Keys }}";
 
             powerShell.Commands.Clear();
             powerShell.AddScript(commandString);
@@ -59,17 +59,17 @@ private async Task LoadParametersCore(Command? powerShellCommand, bool isAsync)
             if (isAsync)
             {
                 PSDataCollection<PSObject> result = await powerShell.InvokeAsync();
-                foreach (PSObject cmd in result)
+                foreach (PSObject adCommandParameter in result)
                 {
-                    _availableParameters.Add($"-{cmd}");
+                    _availableParameters.Add($"-{adCommandParameter}");
                 }
             }
             else
             {
                 Collection<PSObject> result = powerShell.Invoke();
-                foreach (PSObject cmd in result)
+                foreach (PSObject adCommandParameter in result)
                 {
-                    _availableParameters.Add($"-{cmd}");
+                    _availableParameters.Add($"-{adCommandParameter}");
                 }
             }
         }
diff --git a/ActiveDirectoryQuerier/PowerShell/ActiveDirectoryCommandFetcher.cs b/ActiveDirectoryQuerier/PowerShell/ADCommandsFetcher.cs
similarity index 53%
rename from ActiveDirectoryQuerier/PowerShell/ActiveDirectoryCommandFetcher.cs
rename to ActiveDirectoryQuerier/PowerShell/ADCommandsFetcher.cs
index a82d6bb..ef4a9c1 100644
--- a/ActiveDirectoryQuerier/PowerShell/ActiveDirectoryCommandFetcher.cs
+++ b/ActiveDirectoryQuerier/PowerShell/ADCommandsFetcher.cs
@@ -5,31 +5,33 @@
 
 namespace ActiveDirectoryQuerier.PowerShell;
 
-public static class ActiveDirectoryCommandFetcher
+// ReSharper disable once InconsistentNaming
+public static class ADCommandsFetcher
 {
+    // TODO: Possibly rename this method to GetADCommandList...
     public static async Task<ObservableCollection<Command>> GetActiveDirectoryCommands()
     {
-        Command powerShellCommand = new("Get-Command");
-        powerShellCommand.Parameters.Add("Module", "ActiveDirectory");
-        PowerShellExecutor powerShellExecutor = new();
-        ObservableCollection<Command> activeDirectoryCommands = new();
-        ReturnValues powerShellOutput = await powerShellExecutor.ExecuteAsync(powerShellCommand);
+        Command psCommand = new("Get-Command");
+        psCommand.Parameters.Add("Module", "ActiveDirectory");
+        PSExecutor psExecutor = new();
+        ObservableCollection<Command> adCommands = new();
+        PSOutput psOutput = await psExecutor.ExecuteAsync(psCommand);
 
         // This is more of an internal error catch, as even through this command shouldn't fail, it's possible that it
         // could. If this is the case, we want to know about it.
-        if (powerShellOutput.HadErrors)
+        if (psOutput.HadErrors)
         {
             string errorMessage = "Internal Error: An error occurred while retrieving the Active Directory commands: " +
-                                  $"({string.Join(" ", powerShellOutput.StdErr)})";
+                                  $"({string.Join(" ", psOutput.StdErr)})";
             MessageBox.Show(errorMessage, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
             throw new InvalidPowerShellStateException(errorMessage);
         }
 
-        foreach (string command in powerShellOutput.StdOut)
+        foreach (string command in psOutput.StdOut)
         {
-            activeDirectoryCommands.Add(new Command(command));
+            adCommands.Add(new Command(command));
         }
 
-        return activeDirectoryCommands;
+        return adCommands;
     }
 }
diff --git a/ActiveDirectoryQuerier/PowerShell/PSExecutor.cs b/ActiveDirectoryQuerier/PowerShell/PSExecutor.cs
new file mode 100644
index 0000000..387a8f0
--- /dev/null
+++ b/ActiveDirectoryQuerier/PowerShell/PSExecutor.cs
@@ -0,0 +1,108 @@
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Management.Automation;
+using System.Management.Automation.Runspaces;
+using System.Text;
+
+namespace ActiveDirectoryQuerier.PowerShell;
+
+// ReSharper disable once InconsistentNaming
+public class PSExecutor
+{
+    private readonly System.Management.Automation.PowerShell _powerShell;
+    
+    public PSExecutor()
+    {
+        _powerShell = System.Management.Automation.PowerShell.Create();
+
+        // Import the ActiveDirectory module to ensure that the ActiveDirectory commands are available.
+        _powerShell.AddScript("Import-Module ActiveDirectory;");
+        _powerShell.Invoke();
+        _powerShell.Commands.Clear();
+    }
+
+    
+    private void PrepareCommand(Command psCommand)
+    {
+        ArgumentNullException.ThrowIfNull(psCommand);
+
+        _powerShell.Commands.AddCommand(psCommand.CommandText);
+        foreach (var parameter in psCommand.Parameters)
+        {
+            _powerShell.Commands.AddParameter(parameter.Name, parameter.Value);
+        }
+    }
+
+    public PSOutput Execute(Command psCommand)
+    {
+        try
+        {
+            PrepareCommand(psCommand);
+
+            Collection<PSObject> results = _powerShell.Invoke();
+
+            return ProcessExecutionResults(results);
+        }
+        catch (Exception ex)
+        {
+            return HandleExecutionException(ex);
+        }
+    }
+    
+    public async Task<PSOutput> ExecuteAsync(Command command)
+    {
+        try
+        {
+            _powerShell.Commands.Clear();
+
+            PrepareCommand(command);
+
+            PSDataCollection<PSObject> results = await _powerShell.InvokeAsync();
+
+            return await ProcessExecutionResultsAsync(results);
+        }
+        catch (Exception exception)
+        {
+            return HandleExecutionException(exception);
+        }
+    }
+    
+    private PSOutput ProcessExecutionResults(IEnumerable<PSObject> results)
+    {
+        PSOutput psOutput = new();
+
+        if (_powerShell.HadErrors)
+        {
+            foreach (var error in _powerShell.Streams.Error)
+            {
+                psOutput.StdErr.Add($"Error: {error}");
+            }
+        }
+        else
+        {
+            foreach (var result in results)
+            {
+                psOutput.StdOut.Add(result.ToString());
+            }
+        }
+
+        return psOutput;
+    }
+    
+    private Task<PSOutput> ProcessExecutionResultsAsync(IEnumerable<PSObject> results)
+    {
+        return Task.FromResult(ProcessExecutionResults(results));
+    }
+    
+    private PSOutput HandleExecutionException(Exception exception)
+    {
+        StringBuilder errorMessage = new();
+
+        errorMessage.AppendLine("An error occurred while executing the PowerShell command:");
+        errorMessage.AppendLine(exception.Message);
+        errorMessage.AppendLine(exception.StackTrace);
+        Debug.WriteLine(errorMessage.ToString());
+
+        return new PSOutput { StdErr = { errorMessage.ToString() } };
+    }
+}
diff --git a/ActiveDirectoryQuerier/PowerShell/ReturnValues.cs b/ActiveDirectoryQuerier/PowerShell/PSOutput.cs
similarity index 91%
rename from ActiveDirectoryQuerier/PowerShell/ReturnValues.cs
rename to ActiveDirectoryQuerier/PowerShell/PSOutput.cs
index afcad90..7373a4d 100644
--- a/ActiveDirectoryQuerier/PowerShell/ReturnValues.cs
+++ b/ActiveDirectoryQuerier/PowerShell/PSOutput.cs
@@ -2,9 +2,10 @@ namespace ActiveDirectoryQuerier.PowerShell;
 
 /// <summary>
 /// Encapsulates the return values from a PowerShell command, separated into standard output (StdOut) and standard
-/// error (StdErr).
+/// error output (StdErr).
 /// </summary>
-public record ReturnValues
+// ReSharper disable once InconsistentNaming
+public record PSOutput
 {
     /// <summary>
     /// Gets a value indicating whether the command execution resulted in any errors.
diff --git a/ActiveDirectoryQuerier/PowerShell/PowerShellExecutor.cs b/ActiveDirectoryQuerier/PowerShell/PowerShellExecutor.cs
deleted file mode 100644
index 4d22f47..0000000
--- a/ActiveDirectoryQuerier/PowerShell/PowerShellExecutor.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Management.Automation;
-using System.Management.Automation.Runspaces;
-using System.Text;
-
-namespace ActiveDirectoryQuerier.PowerShell;
-
-/// <summary>
-/// Manages the execution of PowerShell commands, providing both synchronous and asynchronous execution methods.
-/// </summary>
-public class PowerShellExecutor
-{
-    private readonly System.Management.Automation.PowerShell _powerShell;
-
-    /// <summary>
-    /// Initializes a new instance of the PowerShellExecutor class and imports the ActiveDirectory module.
-    /// </summary>
-    public PowerShellExecutor()
-    {
-        _powerShell = System.Management.Automation.PowerShell.Create();
-
-        _powerShell.AddScript("Import-Module ActiveDirectory;");
-        _powerShell.Invoke();
-        _powerShell.Commands.Clear();
-    }
-
-    /// <summary>
-    /// Prepares a PowerShell command for execution.
-    /// </summary>
-    /// <param name="command">The command to be prepared for execution.</param>
-    private void PrepareCommand(Command command)
-    {
-        ArgumentNullException.ThrowIfNull(command);
-
-        _powerShell.Commands.AddCommand(command.CommandText);
-        foreach (var parameter in command.Parameters)
-        {
-            _powerShell.Commands.AddParameter(parameter.Name, parameter.Value);
-        }
-    }
-
-    /// <summary>
-    /// Executes a PowerShell command synchronously and returns the results.
-    /// </summary>
-    /// <param name="command">The command to be executed.</param>
-    /// <returns>A ReturnValues object containing the results of the command execution.</returns>
-    public ReturnValues Execute(Command command)
-    {
-        try
-        {
-            PrepareCommand(command);
-
-            Collection<PSObject> results = _powerShell.Invoke();
-
-            return ProcessPowerShellResults(results);
-        }
-        catch (Exception ex)
-        {
-            return ExecutionExceptionHandler(ex);
-        }
-    }
-
-    /// <summary>
-    /// Executes a PowerShell command asynchronously and returns the results.
-    /// </summary>
-    /// <param name="command">The command to be executed.</param>
-    /// <returns>A task containing a ReturnValues object with the results of the command execution.</returns>
-    public async Task<ReturnValues> ExecuteAsync(Command command)
-    {
-        try
-        {
-            _powerShell.Commands.Clear();
-
-            PrepareCommand(command);
-
-            PSDataCollection<PSObject> results = await _powerShell.InvokeAsync();
-
-            return await ProcessPowerShellResultsAsync(results);
-        }
-        catch (Exception ex)
-        {
-            return ExecutionExceptionHandler(ex);
-        }
-    }
-
-    /// <summary>
-    /// Handles exceptions that occur during the execution of a PowerShell command.
-    /// </summary>
-    /// <param name="exception">The exception that occurred during the execution of the PowerShell command.</param>
-    /// <returns>A ReturnValues object containing the exception details.</returns>
-    private ReturnValues ExecutionExceptionHandler(Exception exception)
-    {
-        StringBuilder errorMessage = new();
-
-        errorMessage.AppendLine("An error occurred while executing the PowerShell command:");
-        errorMessage.AppendLine(exception.Message);
-        errorMessage.AppendLine(exception.StackTrace);
-        Debug.WriteLine(errorMessage.ToString());
-
-        return new ReturnValues { StdErr = { errorMessage.ToString() } };
-    }
-
-    /// <summary>
-    /// Processes and formats the results of a PowerShell command execution synchronously.
-    /// </summary>
-    /// <param name="results">The results of the PowerShell command execution.</param>
-    /// <returns>A ReturnValues object containing the processed results.</returns>
-    private ReturnValues ProcessPowerShellResults(IEnumerable<PSObject> results)
-    {
-        ReturnValues powerShellOutput = new();
-
-        if (_powerShell.HadErrors)
-        {
-            foreach (var error in _powerShell.Streams.Error)
-            {
-                powerShellOutput.StdErr.Add($"Error: {error}");
-            }
-        }
-        else
-        {
-            foreach (var result in results)
-            {
-                powerShellOutput.StdOut.Add(result.ToString());
-            }
-        }
-
-        return powerShellOutput;
-    }
-
-    /// <summary>
-    /// Processes and formats the results of a PowerShell command execution asynchronously.
-    /// </summary>
-    /// <param name="results">The results of the PowerShell command execution.</param>
-    /// <returns>A task containing a ReturnValues object with the processed results.</returns>
-    private Task<ReturnValues> ProcessPowerShellResultsAsync(IEnumerable<PSObject> results)
-    {
-        return Task.FromResult(ProcessPowerShellResults(results));
-    }
-}

From ab89a1285a2d451e4e18a857002da033b2fc4956 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Mon, 11 Mar 2024 11:05:49 -0700
Subject: [PATCH 59/94] Update class. method, and variable names for clarity

---
 .../ComboBoxParameterViewModelTests.cs        | 16 ++++-----
 ActiveDirectoryQuerier/AppConsole.cs          | 36 ++++---------------
 .../ComboBoxParameterViewModel.cs             | 36 ++++++-------------
 ActiveDirectoryQuerier/MainWindow.xaml        |  2 +-
 ActiveDirectoryQuerier/MainWindowViewModel.cs |  2 +-
 ActiveDirectoryQuerier/RelayCommand.cs        | 34 ++++--------------
 ActiveDirectoryQuerier/TextBoxViewModel.cs    | 11 ++----
 7 files changed, 35 insertions(+), 102 deletions(-)

diff --git a/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs b/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs
index ee49605..4264375 100644
--- a/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs
+++ b/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs
@@ -19,8 +19,8 @@ public async Task ComboBoxParameterViewModel_WhenConstructed_PossibleParametersI
         comboBoxParameterViewModel = new(adCommandParameters.AvailableParameters);
         
         // Assert
-        Assert.NotNull(comboBoxParameterViewModel.PossibleParameters);
-        Assert.NotEmpty(comboBoxParameterViewModel.PossibleParameters);
+        Assert.NotNull(comboBoxParameterViewModel.AvailableParameters);
+        Assert.NotEmpty(comboBoxParameterViewModel.AvailableParameters);
     }
     
     [Fact]
@@ -36,11 +36,11 @@ public async Task ComboBoxParameterViewModel_WhenConstructed_PossibleParametersC
         comboBoxParameterViewModel = new(adCommandParameters.AvailableParameters);
         
         // Assert
-        Assert.Contains(comboBoxParameterViewModel.PossibleParameters, param => param == "-Filter");
-        Assert.Contains(comboBoxParameterViewModel.PossibleParameters, param => param == "-Identity");
-        Assert.Contains(comboBoxParameterViewModel.PossibleParameters, param => param == "-LDAPFilter");
-        Assert.Contains(comboBoxParameterViewModel.PossibleParameters, param => param == "-SearchBase");
-        Assert.Contains(comboBoxParameterViewModel.PossibleParameters, param => param == "-SearchScope");
+        Assert.Contains(comboBoxParameterViewModel.AvailableParameters, param => param == "-Filter");
+        Assert.Contains(comboBoxParameterViewModel.AvailableParameters, param => param == "-Identity");
+        Assert.Contains(comboBoxParameterViewModel.AvailableParameters, param => param == "-LDAPFilter");
+        Assert.Contains(comboBoxParameterViewModel.AvailableParameters, param => param == "-SearchBase");
+        Assert.Contains(comboBoxParameterViewModel.AvailableParameters, param => param == "-SearchScope");
     }
     
     [Fact]
@@ -55,7 +55,7 @@ public async Task ComboBoxParameterViewModel_WhenSelectedParameterChosen_Selecte
         // Act
         await adCommandParameters.LoadAvailableParametersAsync(command);
         comboBoxParameterViewModel = new(adCommandParameters.AvailableParameters);
-        selectedParameter = comboBoxParameterViewModel.PossibleParameters[0];
+        selectedParameter = comboBoxParameterViewModel.AvailableParameters[0];
         comboBoxParameterViewModel.SelectedParameter = selectedParameter;
         
         // Assert
diff --git a/ActiveDirectoryQuerier/AppConsole.cs b/ActiveDirectoryQuerier/AppConsole.cs
index 244b597..33afcf9 100644
--- a/ActiveDirectoryQuerier/AppConsole.cs
+++ b/ActiveDirectoryQuerier/AppConsole.cs
@@ -3,17 +3,12 @@
 
 namespace ActiveDirectoryQuerier;
 
-/// <summary>
-/// Represents the console output.
-/// </summary>
 public sealed class AppConsole : INotifyPropertyChanged
 {
     public event PropertyChangedEventHandler? PropertyChanged;
     private string _consoleOutput = string.Empty;
 
-    /// <summary>
-    /// Gets or sets the console output.
-    /// </summary>
+    /// <summary></summary>
     /// <important>
     /// Do not set this property directly. Use the Append method instead. It's public for data binding purposes.
     /// </important>
@@ -30,46 +25,27 @@ public string ConsoleOutput
             }
         }
     }
-
-    /// <summary>
-    /// Clears the console output.
-    /// </summary>
+    
     public void Clear()
     {
         ConsoleOutput = string.Empty;
     }
-
-    /// <summary>
-    /// Appends the output text to the console output.
-    /// </summary>
-    /// <param name="outputText">The output text to append.</param>
+    
     public void Append(List<string> outputText)
     {
         ConsoleOutput += string.Join(Environment.NewLine, outputText);
     }
-
-    /// <summary>
-    /// Appends the output text to the console output.
-    /// </summary>
-    /// <param name="outputText">The output text to append.</param>
+    
     public void Append(string outputText)
     {
         ConsoleOutput += outputText;
     }
-
-    /// <summary>
-    /// Exports the console output to a text file.
-    /// </summary>
-    /// <param name="filePath">The file path to export the console output to.</param>
+    
     public void ExportToText(string filePath = "output.txt")
     {
         File.WriteAllText(filePath, ConsoleOutput);
     }
-
-    /// <summary>
-    /// Raises the PropertyChanged event.
-    /// </summary>
-    /// <param name="propertyName">The name of the property that changed.</param>
+    
     private void OnPropertyChanged(string propertyName)
     {
         PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
diff --git a/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs b/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs
index 7ec8585..548a4a8 100644
--- a/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs
+++ b/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs
@@ -10,21 +10,14 @@ namespace ActiveDirectoryQuerier;
 public sealed class ComboBoxParameterViewModel : INotifyPropertyChanged
 {
     public event PropertyChangedEventHandler? PropertyChanged;
-    private ObservableCollection<string> _possibleParameters = new();
+    private ObservableCollection<string> _availableParameters = new();
     private string _selectedParameter = string.Empty;
-
-    /// <summary>
-    /// Initializes a new instance of the ComboBoxParameterViewModel class.
-    /// </summary>
-    /// <param name="possibleParameters">Initial list of possible parameters for the ComboBox.</param>
+    
     public ComboBoxParameterViewModel(ObservableCollection<string> possibleParameters)
     {
-        PossibleParameters = possibleParameters ?? throw new ArgumentNullException(nameof(possibleParameters));
+        AvailableParameters = possibleParameters ?? throw new ArgumentNullException(nameof(possibleParameters));
     }
-
-    /// <summary>
-    /// Sets a unique selected value for each combo box.
-    /// </summary>
+    
     public string SelectedParameter
     {
         get => _selectedParameter;
@@ -36,26 +29,19 @@ public string SelectedParameter
             }
         }
     }
-
-    /// <summary>
-    /// Gets or sets the list of possible parameters that can be selected for a command.
-    /// </summary>
-    public ObservableCollection<string> PossibleParameters
+    
+    public ObservableCollection<string> AvailableParameters
     {
-        get => _possibleParameters;
+        get => _availableParameters;
         set {
-            if (_possibleParameters != value)
+            if (_availableParameters != value)
             {
-                _possibleParameters = value;
-                OnPropertyChanged(nameof(PossibleParameters));
+                _availableParameters = value;
+                OnPropertyChanged(nameof(AvailableParameters));
             }
         }
     }
-
-    /// <summary>
-    /// Invokes the PropertyChanged event for the specified property name.
-    /// </summary>
-    /// <param name="propertyName">Name of the property that has changed.</param>
+    
     private void OnPropertyChanged(string propertyName)
     {
         PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index 170d77c..bf20b47 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -118,7 +118,7 @@
                                                       HorizontalAlignment="Left"
                                                       VerticalAlignment="Center"
                                                       Margin="5"
-                                                      ItemsSource="{Binding PossibleParameters}"
+                                                      ItemsSource="{Binding AvailableParameters}"
                                                       SelectedItem="{Binding SelectedParameter}" />
                                         </DataTemplate>
                                     </ItemsControl.ItemTemplate>
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index d62d4c0..e29da9d 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -468,7 +468,7 @@ private async Task LoadCommandParametersAsync(Command? selectedCommand)
         // Update the possible properties of the ComboBoxParameterViewModels.
         foreach (ComboBoxParameterViewModel comboBoxParameterViewModel in DynamicParametersCollection)
         {
-            comboBoxParameterViewModel.PossibleParameters = PossibleCommandParametersList;
+            comboBoxParameterViewModel.AvailableParameters = PossibleCommandParametersList;
         }
     }
 
diff --git a/ActiveDirectoryQuerier/RelayCommand.cs b/ActiveDirectoryQuerier/RelayCommand.cs
index 137a114..efeb105 100644
--- a/ActiveDirectoryQuerier/RelayCommand.cs
+++ b/ActiveDirectoryQuerier/RelayCommand.cs
@@ -10,10 +10,7 @@ public class RelayCommand : ICommand
 {
     private readonly Action<object> _execute;
     private readonly Predicate<object?>? _canExecute;
-
-    /// <summary>
-    /// Initializes a new instance of the RelayCommand class.
-    /// </summary>
+    
     /// <param name="execute">The execution logic.</param>
     /// <param name="canExecute">The execution status logic.</param>
     public RelayCommand(Action<object> execute, Predicate<object?>? canExecute = null)
@@ -21,44 +18,25 @@ public RelayCommand(Action<object> execute, Predicate<object?>? canExecute = nul
         _execute = execute;
         _canExecute = canExecute;
     }
-
-    /// <summary>
-    /// Determines whether the command can execute in its current state.
-    /// </summary>
-    /// <param name="parameter">
-    /// Data used by the command. If the command does not require data to be passed, this object can be set to null.
-    /// </param>
-    /// <returns>true if this command can be executed; otherwise, false.</returns>
+    
     public bool CanExecute(object? parameter)
     {
         return _canExecute?.Invoke(parameter) ?? true;
     }
-
-    /// <summary>
-    /// Executes the command.
-    /// </summary>
-    /// <param name="parameter">
-    /// Data used by the command. If the command does not require data to be passed, this object can be set to null.
-    /// </param>
-    /// TODO: Perform null checking before calling the _execute property.
+    
+    // TODO: Perform null checking before calling the _execute property.
     public void Execute(object? parameter)
     {
         // For now, we are ignoring the warning about the parameter being null.
         _execute(parameter!);
     }
-
-    /// <summary>
-    /// Occurs when changes occur that affect whether the command should execute.
-    /// </summary>
+    
     public event EventHandler? CanExecuteChanged
     {
         add => CommandManager.RequerySuggested += value;
         remove => CommandManager.RequerySuggested -= value;
     }
-
-    /// <summary>
-    /// Method to call when the command's ability to execute has changed.
-    /// </summary>
+    
     public void RaiseCanExecuteChanged()
     {
         CommandManager.InvalidateRequerySuggested();
diff --git a/ActiveDirectoryQuerier/TextBoxViewModel.cs b/ActiveDirectoryQuerier/TextBoxViewModel.cs
index e9b10f4..48c8974 100644
--- a/ActiveDirectoryQuerier/TextBoxViewModel.cs
+++ b/ActiveDirectoryQuerier/TextBoxViewModel.cs
@@ -10,10 +10,7 @@ public sealed class TextBoxViewModel : INotifyPropertyChanged
 {
     public event PropertyChangedEventHandler? PropertyChanged;
     private string? _selectedParameterValue;
-
-    /// <summary>
-    /// Gets or sets the selected parameter value for the unique ComboBox.
-    /// </summary>
+    
     public string? SelectedParameterValue
     {
         get => _selectedParameterValue;
@@ -25,11 +22,7 @@ public string? SelectedParameterValue
             }
         }
     }
-
-    /// <summary>
-    /// Invokes the PropertyChanged event for the specified property name.
-    /// </summary>
-    /// <param name="propertyName">Name of the property that has changed.</param>
+    
     private void OnPropertyChanged(string propertyName)
     {
         PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));

From 07e1eee91c5103e9b3283d188dffd0a925d43fe6 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Mon, 11 Mar 2024 11:21:54 -0700
Subject: [PATCH 60/94] Update comments

---
 ActiveDirectoryQuerier/PowerShell/PSOutput.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ActiveDirectoryQuerier/PowerShell/PSOutput.cs b/ActiveDirectoryQuerier/PowerShell/PSOutput.cs
index 7373a4d..0375e48 100644
--- a/ActiveDirectoryQuerier/PowerShell/PSOutput.cs
+++ b/ActiveDirectoryQuerier/PowerShell/PSOutput.cs
@@ -24,7 +24,7 @@ public record PSOutput
     public List<string> StdOut { get; } = new();
 
     /// <summary>
-    /// Gets the standard error (StdErr) of the PowerShell command execution.
+    /// Gets the standard error output (StdErr) of the PowerShell command execution.
     /// </summary>
     /// <value>
     /// A list of strings representing the standard error output from the command.

From 9eb98a7c4a884cd317ded80fc0e8d667938a2812 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Mon, 11 Mar 2024 12:46:51 -0700
Subject: [PATCH 61/94] Modify class, method, and variable names for clarity

---
 .../ComboBoxParameterViewModelTests.cs        |  22 +--
 .../TextBoxViewModelTests.cs                  |  16 +-
 ActiveDirectoryQuerier/AppConsole.cs          |  10 +-
 .../ComboBoxParameterViewModel.cs             |   8 +-
 ActiveDirectoryQuerier/MainWindow.xaml        |  10 +-
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 165 ++++++++----------
 .../PowerShell/ADCommandParameters.cs         |   8 +-
 .../PowerShell/PSExecutor.cs                  |  11 +-
 ActiveDirectoryQuerier/TextBoxViewModel.cs    |   4 +-
 9 files changed, 114 insertions(+), 140 deletions(-)

diff --git a/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs b/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs
index 4264375..be3a314 100644
--- a/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs
+++ b/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs
@@ -13,16 +13,16 @@ public async Task ComboBoxParameterViewModel_WhenConstructed_PossibleParametersI
         Command command = new("Get-ADUser");
         ADCommandParameters adCommandParameters = new();
         ComboBoxParameterViewModel comboBoxParameterViewModel;
-        
+
         // Act
         await adCommandParameters.LoadAvailableParametersAsync(command);
         comboBoxParameterViewModel = new(adCommandParameters.AvailableParameters);
-        
+
         // Assert
         Assert.NotNull(comboBoxParameterViewModel.AvailableParameters);
         Assert.NotEmpty(comboBoxParameterViewModel.AvailableParameters);
     }
-    
+
     [Fact]
     public async Task ComboBoxParameterViewModel_WhenConstructed_PossibleParametersContainsExpectedParameters()
     {
@@ -30,11 +30,11 @@ public async Task ComboBoxParameterViewModel_WhenConstructed_PossibleParametersC
         Command command = new("Get-ADUser");
         ADCommandParameters adCommandParameters = new();
         ComboBoxParameterViewModel comboBoxParameterViewModel;
-        
+
         // Act
         await adCommandParameters.LoadAvailableParametersAsync(command);
         comboBoxParameterViewModel = new(adCommandParameters.AvailableParameters);
-        
+
         // Assert
         Assert.Contains(comboBoxParameterViewModel.AvailableParameters, param => param == "-Filter");
         Assert.Contains(comboBoxParameterViewModel.AvailableParameters, param => param == "-Identity");
@@ -42,7 +42,7 @@ public async Task ComboBoxParameterViewModel_WhenConstructed_PossibleParametersC
         Assert.Contains(comboBoxParameterViewModel.AvailableParameters, param => param == "-SearchBase");
         Assert.Contains(comboBoxParameterViewModel.AvailableParameters, param => param == "-SearchScope");
     }
-    
+
     [Fact]
     public async Task ComboBoxParameterViewModel_WhenSelectedParameterChosen_SelectedParameterIsSet()
     {
@@ -51,24 +51,24 @@ public async Task ComboBoxParameterViewModel_WhenSelectedParameterChosen_Selecte
         Command command = new("Get-ADUser");
         ADCommandParameters adCommandParameters = new();
         ComboBoxParameterViewModel comboBoxParameterViewModel;
-        
+
         // Act
         await adCommandParameters.LoadAvailableParametersAsync(command);
         comboBoxParameterViewModel = new(adCommandParameters.AvailableParameters);
         selectedParameter = comboBoxParameterViewModel.AvailableParameters[0];
         comboBoxParameterViewModel.SelectedParameter = selectedParameter;
-        
+
         // Assert
         Assert.Equal(selectedParameter, comboBoxParameterViewModel.SelectedParameter);
     }
-    
+
     [Fact]
     public void ComboBoxParameterViewModel_WhenConstructedWithNullPossibleParameters_ThrowsArgumentNullException()
     {
         // Arrange
         ObservableCollection<string> possibleParameters = null!;
-        
+
         // Assert
         Assert.Throws<ArgumentNullException>(() => new ComboBoxParameterViewModel(possibleParameters));
     }
-}
\ No newline at end of file
+}
diff --git a/ActiveDirectoryQuerier.Tests/TextBoxViewModelTests.cs b/ActiveDirectoryQuerier.Tests/TextBoxViewModelTests.cs
index 0ebcb8d..08ab025 100644
--- a/ActiveDirectoryQuerier.Tests/TextBoxViewModelTests.cs
+++ b/ActiveDirectoryQuerier.Tests/TextBoxViewModelTests.cs
@@ -6,28 +6,24 @@ public class TextBoxViewModelTests
     public void TextBoxViewModel_WhenConstructed_SelectedParameterValueIsNotNullOrEmpty()
     {
         // Arrange
-        TextBoxViewModel textBoxViewModel = new()
-        {
-            // Act
-            SelectedParameterValue = "*"
+        TextBoxViewModel textBoxViewModel = new() {// Act
+                                                   SelectedParameterValue = "*"
         };
 
         // Assert
         Assert.NotNull(textBoxViewModel.SelectedParameterValue);
         Assert.NotEmpty(textBoxViewModel.SelectedParameterValue);
     }
-    
+
     [Fact]
     public void TextBoxViewModel_WhenSetToNull_NoExceptionIsThrown()
     {
         // Arrange
-        TextBoxViewModel textBoxViewModel = new()
-        {
-            // Act
-            SelectedParameterValue = null!
+        TextBoxViewModel textBoxViewModel = new() {// Act
+                                                   SelectedParameterValue = null!
         };
 
         // Assert
         Assert.Null(textBoxViewModel.SelectedParameterValue);
     }
-}
\ No newline at end of file
+}
diff --git a/ActiveDirectoryQuerier/AppConsole.cs b/ActiveDirectoryQuerier/AppConsole.cs
index 33afcf9..d7b7f11 100644
--- a/ActiveDirectoryQuerier/AppConsole.cs
+++ b/ActiveDirectoryQuerier/AppConsole.cs
@@ -25,27 +25,27 @@ public string ConsoleOutput
             }
         }
     }
-    
+
     public void Clear()
     {
         ConsoleOutput = string.Empty;
     }
-    
+
     public void Append(List<string> outputText)
     {
         ConsoleOutput += string.Join(Environment.NewLine, outputText);
     }
-    
+
     public void Append(string outputText)
     {
         ConsoleOutput += outputText;
     }
-    
+
     public void ExportToText(string filePath = "output.txt")
     {
         File.WriteAllText(filePath, ConsoleOutput);
     }
-    
+
     private void OnPropertyChanged(string propertyName)
     {
         PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
diff --git a/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs b/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs
index 548a4a8..75839a4 100644
--- a/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs
+++ b/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs
@@ -12,12 +12,12 @@ public sealed class ComboBoxParameterViewModel : INotifyPropertyChanged
     public event PropertyChangedEventHandler? PropertyChanged;
     private ObservableCollection<string> _availableParameters = new();
     private string _selectedParameter = string.Empty;
-    
+
     public ComboBoxParameterViewModel(ObservableCollection<string> possibleParameters)
     {
         AvailableParameters = possibleParameters ?? throw new ArgumentNullException(nameof(possibleParameters));
     }
-    
+
     public string SelectedParameter
     {
         get => _selectedParameter;
@@ -29,7 +29,7 @@ public string SelectedParameter
             }
         }
     }
-    
+
     public ObservableCollection<string> AvailableParameters
     {
         get => _availableParameters;
@@ -41,7 +41,7 @@ public ObservableCollection<string> AvailableParameters
             }
         }
     }
-    
+
     private void OnPropertyChanged(string propertyName)
     {
         PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index bf20b47..0435e4d 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -96,7 +96,7 @@
                                 </Grid.RowDefinitions>
                                 <!-- TODO: Pieter refer to here regarding combobox setup -->
                                 <TextBlock Grid.Row="0" Grid.Column="0" FontWeight="Bold" HorizontalAlignment="Center">Command</TextBlock>
-                                <ComboBox ItemsSource="{Binding ActiveDirectoryCommandsList}"
+                                <ComboBox ItemsSource="{Binding ADCommands}"
                                           SelectedItem="{Binding SelectedComboBoxCommand}"
                                           DisplayMemberPath="CommandText"
                                           HorizontalAlignment="Center"
@@ -108,7 +108,7 @@
 
                                 <!-- ItemsControl for Dynamic ComboBoxes -->
                                 <TextBlock Grid.Row="0" Grid.Column="1" FontWeight="Bold" HorizontalAlignment="Left">Parameter</TextBlock>
-                                <ItemsControl ItemsSource="{Binding DynamicParametersCollection}"
+                                <ItemsControl ItemsSource="{Binding DynamicParameterComboBoxes}"
                                               Grid.Column="1"
                                               Grid.Row="1">
                                     <ItemsControl.ItemTemplate>
@@ -126,7 +126,7 @@
 
                                 <!-- Parameter Values ComboBox -->
                                 <TextBlock Grid.Row="0" Grid.Column="2" FontWeight="Bold" HorizontalAlignment="Left">Value</TextBlock>
-                                <ItemsControl ItemsSource="{Binding DynamicParameterValuesCollection}"
+                                <ItemsControl ItemsSource="{Binding DynamicParameterValueTextBoxes}"
                                               Grid.Column="2"
                                               Grid.Row="1">
                                     <ItemsControl.ItemTemplate>
@@ -171,7 +171,7 @@
                             <!-- ROW 0 END -->
                             <!-- GRID ROW 1 START -->
                             <!-- TextBox as Console Output -->
-                            <TextBox Grid.Row="1" Text="{Binding PowerShellOutput.ConsoleOutput}"
+                            <TextBox Grid.Row="1" Text="{Binding QueryBuilderConsoleOutput.ConsoleOutput}"
                                      HorizontalAlignment="Stretch"
                                      VerticalAlignment="Stretch" Margin="10" IsReadOnly="True" TextWrapping="Wrap"
                                      VerticalScrollBarVisibility="Auto" />
@@ -193,7 +193,7 @@
                                           Width="207"
                                           Height="26" />
                             </Grid>
-                            <TextBox Grid.Row="1" Text="{Binding ActiveDirectoryInfoOutput.ConsoleOutput}"
+                            <TextBox Grid.Row="1" Text="{Binding ActiveDirectoryInfoConsoleOutput.ConsoleOutput}"
                                      HorizontalAlignment="Stretch"
                                      VerticalAlignment="Stretch" Margin="10" IsReadOnly="True" TextWrapping="Wrap"
                                      VerticalScrollBarVisibility="Auto" />
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index e29da9d..b02a45d 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -3,7 +3,6 @@
 using System.Diagnostics;
 using System.IO;
 using System.Management.Automation.Runspaces;
-using System.Reflection;
 using System.Text;
 using System.Windows;
 using System.Windows.Controls;
@@ -14,9 +13,6 @@
 
 namespace ActiveDirectoryQuerier;
 
-/// <summary>
-/// Primary view model for the MainWindow.
-/// </summary>
 public sealed class MainWindowViewModel : INotifyPropertyChanged
 {
     // [ Fields ] ------------------------------------------------------------------- //
@@ -29,9 +25,9 @@ public sealed class MainWindowViewModel : INotifyPropertyChanged
     private bool _editingEnabled;
     private string _queryName;
     private string _queryDescription;
-    private AppConsole _powerShellOutput;
-    private AppConsole _activeDirectoryInfoOutput;
-    private Command? _selectedComboBoxCommand;
+    private AppConsole _queryBuilderConsoleOutput;
+    private AppConsole _activeDirectoryInfoConsoleOutput;
+    private Command? _selectedComboBoxCommand; // TODO: Change the name of this field?
     private ObservableCollection<Button>? _buttons;
 
     // [[ Other fields ]] ----------------------------------------------------------- //
@@ -55,25 +51,22 @@ public bool EditingEnabled
             OnPropertyChanged(nameof(EditingEnabled));
         }
     }
-
-    /// <summary>
-    /// Gets or sets the output of the executed PowerShell command.
-    /// </summary>
-    public AppConsole PowerShellOutput
+    
+    public AppConsole QueryBuilderConsoleOutput
     {
-        get => _powerShellOutput;
+        get => _queryBuilderConsoleOutput;
         set {
-            _powerShellOutput = value;
-            OnPropertyChanged(nameof(PowerShellOutput));
+            _queryBuilderConsoleOutput = value;
+            OnPropertyChanged(nameof(QueryBuilderConsoleOutput));
         }
     }
 
-    public AppConsole ActiveDirectoryInfoOutput
+    public AppConsole ActiveDirectoryInfoConsoleOutput
     {
-        get => _activeDirectoryInfoOutput;
+        get => _activeDirectoryInfoConsoleOutput;
         set {
-            _activeDirectoryInfoOutput = value;
-            OnPropertyChanged(nameof(ActiveDirectoryInfoOutput));
+            _activeDirectoryInfoConsoleOutput = value;
+            OnPropertyChanged(nameof(ActiveDirectoryInfoConsoleOutput));
         }
     }
 
@@ -106,10 +99,8 @@ public string QueryDescription
             }
         }
     }
-
-    /// <summary>
-    /// Gets or sets the currently selected PowerShell command.
-    /// </summary>
+    
+    // TODO: Change the name of this property?
     public Command? SelectedComboBoxCommand
     {
         get => _selectedComboBoxCommand;
@@ -131,26 +122,21 @@ public Command? SelectedComboBoxCommand
     public ObservableCollection<Button> QueryButtonStackPanel => _buttons ??= new ObservableCollection<Button>();
 
     // [[ Other properties ]] ------------------------------------------------------- //
-
-    /// <summary>
-    /// Collection of Active Directory commands available for execution.
-    /// </summary>
-    public ObservableCollection<Command> ActiveDirectoryCommandsList { get; private set; }
-
-    /// <summary>
-    /// Collection of possible parameters for the currently selected command.
-    /// </summary>
-    public ObservableCollection<string>? PossibleCommandParametersList { get; private set; }
+    
+    // ReSharper disable once InconsistentNaming
+    public ObservableCollection<Command> ADCommands { get; private set; }
+    // ReSharper disable once InconsistentNaming
+    public ObservableCollection<string>? AvailableADCommandParameters { get; private set; }
 
     /// <summary>
     /// Collection of ComboBoxParameterViewModels to dynamically handle multiple parameter selections.
     /// </summary>
-    public ObservableCollection<ComboBoxParameterViewModel> DynamicParametersCollection { get; }
+    public ObservableCollection<ComboBoxParameterViewModel> DynamicParameterComboBoxes { get; }
 
     /// <summary>
     /// Collection of ComboBoxParameterViewModels to dynamically handle multiple parameter value selections.
     /// </summary>
-    public ObservableCollection<TextBoxViewModel> DynamicParameterValuesCollection { get; }
+    public ObservableCollection<TextBoxViewModel> DynamicParameterValueTextBoxes { get; }
 
     /// <summary>
     /// This is a helper command for running SaveCustomQueries
@@ -175,6 +161,7 @@ public Command? SelectedComboBoxCommand
     /// <summary>
     /// Command to execute the selected PowerShell command.
     /// </summary>
+    /// TODO: Change the name of this property?
     public ICommand ExecuteCommandRelay { get; }
 
     /// <summary>
@@ -185,16 +172,19 @@ public Command? SelectedComboBoxCommand
     /// <summary>
     /// Command to add a new parameter ComboBox to the UI.
     /// </summary>
+    /// TODO: Change the name of this property?
     public ICommand AddParameterComboBoxRelay { get; }
 
     /// <summary>
     /// Command to add a new command ComboBox to the UI.
     /// </summary>
+    /// TODO: Change the name of this property?
     public ICommand AddCommandComboBoxRelay { get; }
 
     /// <summary>
     /// Command to add a new parameter ComboBox to the UI.
     /// </summary>
+    /// TODO: Change the name of this property?
     public ICommand RemoveParameterComboBoxRelay { get; }
 
     /// <summary>
@@ -206,15 +196,8 @@ public Command? SelectedComboBoxCommand
     /// Command to output to a csv when executing
     /// </summary>
     public ICommand OutputToCsvFileRelay { get; }
-
-    /// <summary>
-    /// Command to export the console output to a text file.
-    /// </summary>
+    
     public ICommand ExportConsoleOutputRelay { get; }
-
-    /// <summary>
-    /// Command to clear the console output.
-    /// </summary>
     public ICommand ClearConsoleOutputRelay { get; }
 
     /* TODO: for Pieter
@@ -235,15 +218,15 @@ public MainWindowViewModel()
     {
         _queryName = string.Empty;
         _queryDescription = string.Empty;
-        _powerShellOutput = new AppConsole();
-        _activeDirectoryInfoOutput = new AppConsole();
+        _queryBuilderConsoleOutput = new AppConsole();
+        _activeDirectoryInfoConsoleOutput = new AppConsole();
         _psExecutor = new PSExecutor();
         _customQuery = new CustomQueries();
         _currentQuery = new Query();
 
-        ActiveDirectoryCommandsList = new ObservableCollection<Command>();
-        DynamicParametersCollection = new ObservableCollection<ComboBoxParameterViewModel>();
-        DynamicParameterValuesCollection = new ObservableCollection<TextBoxViewModel>();
+        ADCommands = new ObservableCollection<Command>();
+        DynamicParameterComboBoxes = new ObservableCollection<ComboBoxParameterViewModel>();
+        DynamicParameterValueTextBoxes = new ObservableCollection<TextBoxViewModel>();
 
         ExecuteCommandRelay = new RelayCommand(ExecuteCommandAsync);
         OutputToCsvFileRelay = new RelayCommand(OutputToCsvFileAsync);
@@ -256,7 +239,7 @@ public MainWindowViewModel()
         EditCustomQueryRelay = new RelayCommand(EditCustomQuery);
         DeleteCustomQueryRelay = new RelayCommand(DeleteCustomQuery);
         ExecuteCommandButtonRelay = new RelayCommand(ExecuteCustomQueryCommandButton);
-        ClearConsoleOutputRelay = new RelayCommand(ClearConsoleOutput);
+        ClearConsoleOutputRelay = new ParameterizedRelayCommand(ClearConsoleOutput);
         ClearQueryBuilderRelay = new RelayCommand(ClearQueryBuilder);
         
         /* TODO: For Pieter
@@ -290,7 +273,7 @@ public MainWindowViewModel()
     /// <param name="_">This is the object that the command is tied to.</param>
     private void ClearConsoleOutput(object _)
     {
-        if (PowerShellOutput.ConsoleOutput.Length == 0)
+        if (QueryBuilderConsoleOutput.ConsoleOutput.Length == 0)
         {
             MessageBox.Show("The console is already clear.",
                             "Information",
@@ -307,7 +290,7 @@ private void ClearConsoleOutput(object _)
 
         if (result == MessageBoxResult.Yes)
         {
-            PowerShellOutput.Clear();
+            QueryBuilderConsoleOutput.Clear();
         }
     }
 
@@ -332,20 +315,20 @@ private void EditCustomQuery(object sender)
 
         // Fill in the commandName
         Command chosenCommand =
-            ActiveDirectoryCommandsList.FirstOrDefault(item => item.CommandText == currentQuery.CommandName)!;
+            ADCommands.FirstOrDefault(item => item.CommandText == currentQuery.CommandName)!;
         SelectedComboBoxCommand = chosenCommand;
 
         // Load the Possible Parameters Synchronously
         ADCommandParameters adCommandParameters = new();
         adCommandParameters.LoadAvailableParameters(SelectedComboBoxCommand);
-        PossibleCommandParametersList = new ObservableCollection<string>(adCommandParameters.AvailableParameters);
-        OnPropertyChanged(nameof(PossibleCommandParametersList));
+        AvailableADCommandParameters = new ObservableCollection<string>(adCommandParameters.AvailableParameters);
+        OnPropertyChanged(nameof(AvailableADCommandParameters));
 
-        // Check to see if the DynamicParametersCollection is empty and clear it if it is
-        if (DynamicParametersCollection.Count != 0)
+        // Check to see if the DynamicParameterComboBoxes is empty and clear it if it is
+        if (DynamicParameterComboBoxes.Count != 0)
         {
-            DynamicParametersCollection.Clear();
-            DynamicParameterValuesCollection.Clear();
+            DynamicParameterComboBoxes.Clear();
+            DynamicParameterValueTextBoxes.Clear();
         }
 
         // Fill in Parameters and values
@@ -358,8 +341,8 @@ private void EditCustomQuery(object sender)
             AddParameterComboBox(temp);
 
             // Fill in the parameter boxes
-            DynamicParametersCollection[i].SelectedParameter = currentQuery.CommandParameters[i];
-            DynamicParameterValuesCollection[i].SelectedParameterValue = currentQuery.CommandParametersValues[i];
+            DynamicParameterComboBoxes[i].SelectedParameter = currentQuery.CommandParameters[i];
+            DynamicParameterValueTextBoxes[i].SelectedParameterValue = currentQuery.CommandParametersValues[i];
         }
     }
 
@@ -450,8 +433,8 @@ private async void ExecuteCommandAsync(object _)
     private async Task InitializeActiveDirectoryCommandsAsync()
     {
         ObservableCollection<Command> list = await ADCommandsFetcher.GetActiveDirectoryCommands();
-        ActiveDirectoryCommandsList = new ObservableCollection<Command>(list);
-        OnPropertyChanged(nameof(ActiveDirectoryCommandsList));
+        ADCommands = new ObservableCollection<Command>(list);
+        OnPropertyChanged(nameof(ADCommands));
     }
 
     /// <summary>
@@ -462,18 +445,18 @@ private async Task LoadCommandParametersAsync(Command? selectedCommand)
     {
         ADCommandParameters adCommandParameters = new();
         await adCommandParameters.LoadAvailableParametersAsync(selectedCommand);
-        PossibleCommandParametersList = new ObservableCollection<string>(adCommandParameters.AvailableParameters);
-        OnPropertyChanged(nameof(PossibleCommandParametersList));
+        AvailableADCommandParameters = new ObservableCollection<string>(adCommandParameters.AvailableParameters);
+        OnPropertyChanged(nameof(AvailableADCommandParameters));
 
         // Update the possible properties of the ComboBoxParameterViewModels.
-        foreach (ComboBoxParameterViewModel comboBoxParameterViewModel in DynamicParametersCollection)
+        foreach (ComboBoxParameterViewModel comboBoxParameterViewModel in DynamicParameterComboBoxes)
         {
-            comboBoxParameterViewModel.AvailableParameters = PossibleCommandParametersList;
+            comboBoxParameterViewModel.AvailableParameters = AvailableADCommandParameters;
         }
     }
 
     /// <summary>
-    /// Executes the currently selected PowerShell command and updates the PowerShellOutput property with the result.
+    /// Executes the currently selected PowerShell command and updates the QueryBuilderConsoleOutput property with the result.
     /// </summary>
     /// <param name="command">The PowerShell command to execute.</param>
     /// <returns>A Task representing the asynchronous operation of executing the command.</returns>
@@ -505,28 +488,28 @@ private async Task ExecuteSelectedCommandAsync(Command? command = null)
 
             if (result.HadErrors)
             {
-                PowerShellOutput.Append(result.StdErr);
+                QueryBuilderConsoleOutput.Append(result.StdErr);
                 return;
             }
 
-            PowerShellOutput.Append(result.StdOut);
+            QueryBuilderConsoleOutput.Append(result.StdOut);
         }
         catch (Exception ex)
         {
-            PowerShellOutput.Append($"Error executing command: {ex.Message}" + ex.Message);
+            QueryBuilderConsoleOutput.Append($"Error executing command: {ex.Message}" + ex.Message);
         }
     }
 
     /// <summary>
-    /// Adds a new parameter and value selection ComboBox to the DynamicParametersCollection.
+    /// Adds a new parameter and value selection ComboBox to the DynamicParameterComboBoxes.
     /// </summary>
     /// <param name="_">This is the object that the command is bound to</param>
     private void AddParameterComboBox(object _)
     {
         // Check if some variable is null and throw an exception if it is
-        if (PossibleCommandParametersList is null)
+        if (AvailableADCommandParameters is null)
         {
-            Trace.WriteLine("PossibleCommandParametersList has not been populated yet.");
+            Trace.WriteLine("AvailableADCommandParameters has not been populated yet.");
             MessageBox.Show("To add a parameter, you must first select a command.",
                             "Warning",
                             MessageBoxButton.OK,
@@ -534,8 +517,8 @@ private void AddParameterComboBox(object _)
             return;
         }
 
-        DynamicParametersCollection.Add(new ComboBoxParameterViewModel(PossibleCommandParametersList));
-        DynamicParameterValuesCollection.Add(new TextBoxViewModel());
+        DynamicParameterComboBoxes.Add(new ComboBoxParameterViewModel(AvailableADCommandParameters));
+        DynamicParameterValueTextBoxes.Add(new TextBoxViewModel());
     }
 
     /// <summary>
@@ -571,7 +554,7 @@ private async void OutputToTextFileAsync(object _)
         {
             // Open document
             string filePath = saveFileDialog.FileName;
-            await File.WriteAllTextAsync(filePath, PowerShellOutput.ConsoleOutput);
+            await File.WriteAllTextAsync(filePath, QueryBuilderConsoleOutput.ConsoleOutput);
         }
     }
 
@@ -585,7 +568,7 @@ private async void OutputToCsvFileAsync(object _)
         await ExecuteSelectedCommandAsync();
 
         var csv = new StringBuilder();
-        string[] output = PowerShellOutput.ConsoleOutput.Split(' ', '\n');
+        string[] output = QueryBuilderConsoleOutput.ConsoleOutput.Split(' ', '\n');
 
         for (int i = 0; i < output.Length - 2; i++)
         {
@@ -617,7 +600,7 @@ private async void OutputToCsvFileAsync(object _)
     /// <param name="_">This is the object that the command is bound to.</param>
     private void ExportConsoleOutput(object _)
     {
-        if (PowerShellOutput.ConsoleOutput.Length == 0)
+        if (QueryBuilderConsoleOutput.ConsoleOutput.Length == 0)
         {
             MessageBox.Show("The console is empty.", "Information", MessageBoxButton.OK, MessageBoxImage.Information);
             return;
@@ -630,7 +613,7 @@ private void ExportConsoleOutput(object _)
         if (result == true)
         {
             string filename = saveFileDialog.FileName;
-            PowerShellOutput.ExportToText(filename);
+            QueryBuilderConsoleOutput.ExportToText(filename);
         }
     }
 
@@ -657,11 +640,11 @@ private void UpdateSelectedCommand()
         try
         {
             SelectedComboBoxCommand.Parameters.Clear();
-            for (int i = 0; i < DynamicParametersCollection.Count; i++)
+            for (int i = 0; i < DynamicParameterComboBoxes.Count; i++)
             {
                 SelectedComboBoxCommand.Parameters.Add(
-                    new CommandParameter(DynamicParametersCollection[i].SelectedParameter,
-                                         DynamicParameterValuesCollection[i].SelectedParameterValue));
+                    new CommandParameter(DynamicParameterComboBoxes[i].SelectedParameter,
+                                         DynamicParameterValueTextBoxes[i].SelectedParameterValue));
             }
         }
         catch (Exception ex)
@@ -721,10 +704,10 @@ private void GetCurrentQuery()
     /// <param name="_">This is the CommandParameter object that this command is tied to</param>
     private void RemoveParameterComboBox(object _)
     {
-        if (DynamicParametersCollection.Count != 0)
+        if (DynamicParameterComboBoxes.Count != 0)
         {
-            DynamicParametersCollection.RemoveAt(DynamicParametersCollection.Count - 1);
-            DynamicParameterValuesCollection.RemoveAt(DynamicParameterValuesCollection.Count - 1);
+            DynamicParameterComboBoxes.RemoveAt(DynamicParameterComboBoxes.Count - 1);
+            DynamicParameterValueTextBoxes.RemoveAt(DynamicParameterValueTextBoxes.Count - 1);
         }
         else
         {
@@ -787,7 +770,7 @@ private void SaveCustomQueries(object commandParameter)
     /// <param name="_">Object that the command is tied to</param>
     private void ClearQueryBuilder(object _)
     {
-        if (SelectedComboBoxCommand is null && DynamicParametersCollection.Count == 0)
+        if (SelectedComboBoxCommand is null && DynamicParameterComboBoxes.Count == 0)
         {
             MessageBox.Show("The query builder is already clear.",
                             "Information",
@@ -807,8 +790,8 @@ private void ClearQueryBuilder(object _)
         if (result == MessageBoxResult.Yes)
         {
             SelectedComboBoxCommand = null;
-            DynamicParametersCollection.Clear();
-            DynamicParameterValuesCollection.Clear();
+            DynamicParameterComboBoxes.Clear();
+            DynamicParameterValueTextBoxes.Clear();
         }
     }
 
@@ -877,11 +860,7 @@ private Button CreateCustomButton(Query? query = null)
     }
 
     // [[ Event Handlers ]] --------------------------------------------------------- //
-
-    /// <summary>
-    /// Handles property change notifications.
-    /// </summary>
-    /// <param name="propertyName">Name of the property that changed.</param>
+    
     private void OnPropertyChanged(string propertyName)
     {
         PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
diff --git a/ActiveDirectoryQuerier/PowerShell/ADCommandParameters.cs b/ActiveDirectoryQuerier/PowerShell/ADCommandParameters.cs
index 52d53d6..9eecb20 100644
--- a/ActiveDirectoryQuerier/PowerShell/ADCommandParameters.cs
+++ b/ActiveDirectoryQuerier/PowerShell/ADCommandParameters.cs
@@ -9,7 +9,7 @@ namespace ActiveDirectoryQuerier.PowerShell;
 public class ADCommandParameters
 {
     private readonly ObservableCollection<string> _availableParameters = new();
-    
+
     public ObservableCollection<string> AvailableParameters
     {
         get {
@@ -23,7 +23,7 @@ public ObservableCollection<string> AvailableParameters
             return _availableParameters;
         }
     }
-    
+
     public async Task LoadAvailableParametersAsync(Command? psCommand)
     {
         await LoadAvailableParametersCore(psCommand, true);
@@ -33,11 +33,11 @@ public void LoadAvailableParameters(Command? psCommand)
     {
         LoadAvailableParametersCore(psCommand, false).Wait();
     }
-    
+
     private async Task LoadAvailableParametersCore(Command? psCommand, bool isAsync)
     {
         // psCommand can be null if the user attempts to select an ActiveDirectory command that doesn't exist.
-        // More specifically, if the entered command doesn't exist in the ActiveDirectoryCommandsList in
+        // More specifically, if the entered command doesn't exist in the ADCommands in
         // MainWindowViewModel.cs, psCommand will be null, causing an exception to be thrown, crashing the
         // program.
         if (psCommand is null)
diff --git a/ActiveDirectoryQuerier/PowerShell/PSExecutor.cs b/ActiveDirectoryQuerier/PowerShell/PSExecutor.cs
index 387a8f0..fae31a7 100644
--- a/ActiveDirectoryQuerier/PowerShell/PSExecutor.cs
+++ b/ActiveDirectoryQuerier/PowerShell/PSExecutor.cs
@@ -10,7 +10,7 @@ namespace ActiveDirectoryQuerier.PowerShell;
 public class PSExecutor
 {
     private readonly System.Management.Automation.PowerShell _powerShell;
-    
+
     public PSExecutor()
     {
         _powerShell = System.Management.Automation.PowerShell.Create();
@@ -21,7 +21,6 @@ public PSExecutor()
         _powerShell.Commands.Clear();
     }
 
-    
     private void PrepareCommand(Command psCommand)
     {
         ArgumentNullException.ThrowIfNull(psCommand);
@@ -48,7 +47,7 @@ public PSOutput Execute(Command psCommand)
             return HandleExecutionException(ex);
         }
     }
-    
+
     public async Task<PSOutput> ExecuteAsync(Command command)
     {
         try
@@ -66,7 +65,7 @@ public async Task<PSOutput> ExecuteAsync(Command command)
             return HandleExecutionException(exception);
         }
     }
-    
+
     private PSOutput ProcessExecutionResults(IEnumerable<PSObject> results)
     {
         PSOutput psOutput = new();
@@ -88,12 +87,12 @@ private PSOutput ProcessExecutionResults(IEnumerable<PSObject> results)
 
         return psOutput;
     }
-    
+
     private Task<PSOutput> ProcessExecutionResultsAsync(IEnumerable<PSObject> results)
     {
         return Task.FromResult(ProcessExecutionResults(results));
     }
-    
+
     private PSOutput HandleExecutionException(Exception exception)
     {
         StringBuilder errorMessage = new();
diff --git a/ActiveDirectoryQuerier/TextBoxViewModel.cs b/ActiveDirectoryQuerier/TextBoxViewModel.cs
index 48c8974..edf3444 100644
--- a/ActiveDirectoryQuerier/TextBoxViewModel.cs
+++ b/ActiveDirectoryQuerier/TextBoxViewModel.cs
@@ -10,7 +10,7 @@ public sealed class TextBoxViewModel : INotifyPropertyChanged
 {
     public event PropertyChangedEventHandler? PropertyChanged;
     private string? _selectedParameterValue;
-    
+
     public string? SelectedParameterValue
     {
         get => _selectedParameterValue;
@@ -22,7 +22,7 @@ public string? SelectedParameterValue
             }
         }
     }
-    
+
     private void OnPropertyChanged(string propertyName)
     {
         PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));

From 8669f281a573bfb44d6d7758e9d5ef81cefbcedc Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Mon, 11 Mar 2024 14:37:34 -0700
Subject: [PATCH 62/94] Fix bad method name

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index b02a45d..bd72c27 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -239,7 +239,7 @@ public MainWindowViewModel()
         EditCustomQueryRelay = new RelayCommand(EditCustomQuery);
         DeleteCustomQueryRelay = new RelayCommand(DeleteCustomQuery);
         ExecuteCommandButtonRelay = new RelayCommand(ExecuteCustomQueryCommandButton);
-        ClearConsoleOutputRelay = new ParameterizedRelayCommand(ClearConsoleOutput);
+        ClearConsoleOutputRelay = new RelayCommand(ClearConsoleOutput);
         ClearQueryBuilderRelay = new RelayCommand(ClearQueryBuilder);
         
         /* TODO: For Pieter

From cdcc33666168b27e84045281b42e793762a0edfc Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Mon, 11 Mar 2024 14:53:24 -0700
Subject: [PATCH 63/94] Update comment

---
 ActiveDirectoryQuerier/RelayCommand.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ActiveDirectoryQuerier/RelayCommand.cs b/ActiveDirectoryQuerier/RelayCommand.cs
index efeb105..7c90780 100644
--- a/ActiveDirectoryQuerier/RelayCommand.cs
+++ b/ActiveDirectoryQuerier/RelayCommand.cs
@@ -5,7 +5,9 @@ namespace ActiveDirectoryQuerier;
 /// <summary>
 /// A command whose sole purpose is to relay its functionality to other objects by invoking delegates.
 /// </summary>
-/// TODO: Ensure nullability is being handled correctly.
+/// <note>
+/// This is a very basic setup of the RelayCommand class. I imagine that this class can be expanded upon.
+/// </note>
 public class RelayCommand : ICommand
 {
     private readonly Action<object> _execute;

From eefa68b4d5e0726e317cbfe930b48590c81f7166 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Mon, 11 Mar 2024 14:53:39 -0700
Subject: [PATCH 64/94] Update method and variable names for clarity

---
 ActiveDirectoryQuerier/MainWindow.xaml        |   4 +-
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 114 ++++++------------
 2 files changed, 42 insertions(+), 76 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index 0435e4d..7644f78 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -97,7 +97,7 @@
                                 <!-- TODO: Pieter refer to here regarding combobox setup -->
                                 <TextBlock Grid.Row="0" Grid.Column="0" FontWeight="Bold" HorizontalAlignment="Center">Command</TextBlock>
                                 <ComboBox ItemsSource="{Binding ADCommands}"
-                                          SelectedItem="{Binding SelectedComboBoxCommand}"
+                                          SelectedItem="{Binding SelectedComboBoxCommandInQueryBuilder}"
                                           DisplayMemberPath="CommandText"
                                           HorizontalAlignment="Center"
                                           VerticalAlignment="Center"
@@ -152,7 +152,7 @@
                                         <MenuItem Header="Remove Parameter Slot"
                                                   Command="{Binding RemoveParameterComboBoxRelay}" />
                                         <MenuItem Header="Save Query" Command="{Binding SaveCustomQueriesRelay}" />
-                                        <MenuItem Header="Execute" Command="{Binding ExecuteCommandRelay}" />
+                                        <MenuItem Header="Execute" Command="{Binding ExecuteSelectedCommandRelay}" />
                                         <MenuItem Header="Execute to CSV" Command="{Binding OutputToCsvFileRelay}" />
                                         <MenuItem Header="Execute to Text" Command="{Binding OutputToTextFileRelay}" />
                                         <MenuItem Header="Export Console Output"
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index bd72c27..efa3b3b 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -27,7 +27,7 @@ public sealed class MainWindowViewModel : INotifyPropertyChanged
     private string _queryDescription;
     private AppConsole _queryBuilderConsoleOutput;
     private AppConsole _activeDirectoryInfoConsoleOutput;
-    private Command? _selectedComboBoxCommand; // TODO: Change the name of this field?
+    private Command? _selectedComboBoxCommandInQueryBuilder; // TODO: Change the name of this field?
     private ObservableCollection<Button>? _buttons;
 
     // [[ Other fields ]] ----------------------------------------------------------- //
@@ -100,13 +100,12 @@ public string QueryDescription
         }
     }
     
-    // TODO: Change the name of this property?
-    public Command? SelectedComboBoxCommand
+    public Command? SelectedComboBoxCommandInQueryBuilder
     {
-        get => _selectedComboBoxCommand;
+        get => _selectedComboBoxCommandInQueryBuilder;
         set {
-            _selectedComboBoxCommand = value;
-            OnPropertyChanged(nameof(SelectedComboBoxCommand));
+            _selectedComboBoxCommandInQueryBuilder = value;
+            OnPropertyChanged(nameof(SelectedComboBoxCommandInQueryBuilder));
             // No need to load parameters if the command is null.
             if (value is not null)
             {
@@ -131,11 +130,13 @@ public Command? SelectedComboBoxCommand
     /// <summary>
     /// Collection of ComboBoxParameterViewModels to dynamically handle multiple parameter selections.
     /// </summary>
+    /// TODO: Rename this property?
     public ObservableCollection<ComboBoxParameterViewModel> DynamicParameterComboBoxes { get; }
 
     /// <summary>
     /// Collection of ComboBoxParameterViewModels to dynamically handle multiple parameter value selections.
     /// </summary>
+    /// TODO: Rename this property?
     public ObservableCollection<TextBoxViewModel> DynamicParameterValueTextBoxes { get; }
 
     /// <summary>
@@ -157,46 +158,14 @@ public Command? SelectedComboBoxCommand
     /// This is tied to the Button menu calls the DeleteCustomQuery method to delete a CustomQuery button
     /// </summary>
     private ICommand DeleteCustomQueryRelay { get; }
-
-    /// <summary>
-    /// Command to execute the selected PowerShell command.
-    /// </summary>
-    /// TODO: Change the name of this property?
-    public ICommand ExecuteCommandRelay { get; }
-
-    /// <summary>
-    /// Command to execute the buttons inside Custom Command buttons
-    /// </summary>
-    private ICommand ExecuteCommandButtonRelay { get; }
-
-    /// <summary>
-    /// Command to add a new parameter ComboBox to the UI.
-    /// </summary>
-    /// TODO: Change the name of this property?
+    
+    public ICommand ExecuteSelectedCommandRelay { get; }
+    private ICommand ExecuteCustomQueryCommandButtonRelay { get; }
     public ICommand AddParameterComboBoxRelay { get; }
-
-    /// <summary>
-    /// Command to add a new command ComboBox to the UI.
-    /// </summary>
-    /// TODO: Change the name of this property?
     public ICommand AddCommandComboBoxRelay { get; }
-
-    /// <summary>
-    /// Command to add a new parameter ComboBox to the UI.
-    /// </summary>
-    /// TODO: Change the name of this property?
     public ICommand RemoveParameterComboBoxRelay { get; }
-
-    /// <summary>
-    /// Command to have the output send to a text file when executing
-    /// </summary>
     public ICommand OutputToTextFileRelay { get; }
-
-    /// <summary>
-    /// Command to output to a csv when executing
-    /// </summary>
     public ICommand OutputToCsvFileRelay { get; }
-    
     public ICommand ExportConsoleOutputRelay { get; }
     public ICommand ClearConsoleOutputRelay { get; }
 
@@ -210,10 +179,7 @@ public Command? SelectedComboBoxCommand
      */
 
     // [ Constructors ] ------------------------------------------------------------- //
-
-    /// <summary>
-    /// Class constructor.
-    /// </summary>
+    
     public MainWindowViewModel()
     {
         _queryName = string.Empty;
@@ -228,7 +194,7 @@ public MainWindowViewModel()
         DynamicParameterComboBoxes = new ObservableCollection<ComboBoxParameterViewModel>();
         DynamicParameterValueTextBoxes = new ObservableCollection<TextBoxViewModel>();
 
-        ExecuteCommandRelay = new RelayCommand(ExecuteCommandAsync);
+        ExecuteSelectedCommandRelay = new RelayCommand(ExecuteSelectedCommandAsync);
         OutputToCsvFileRelay = new RelayCommand(OutputToCsvFileAsync);
         OutputToTextFileRelay = new RelayCommand(OutputToTextFileAsync);
         ExportConsoleOutputRelay = new RelayCommand(ExportConsoleOutput);
@@ -238,7 +204,7 @@ public MainWindowViewModel()
         SaveCustomQueriesRelay = new RelayCommand(SaveCustomQueries);
         EditCustomQueryRelay = new RelayCommand(EditCustomQuery);
         DeleteCustomQueryRelay = new RelayCommand(DeleteCustomQuery);
-        ExecuteCommandButtonRelay = new RelayCommand(ExecuteCustomQueryCommandButton);
+        ExecuteCustomQueryCommandButtonRelay = new RelayCommand(ExecuteCustomQueryCommandButton);
         ClearConsoleOutputRelay = new RelayCommand(ClearConsoleOutput);
         ClearQueryBuilderRelay = new RelayCommand(ClearQueryBuilder);
         
@@ -316,11 +282,11 @@ private void EditCustomQuery(object sender)
         // Fill in the commandName
         Command chosenCommand =
             ADCommands.FirstOrDefault(item => item.CommandText == currentQuery.CommandName)!;
-        SelectedComboBoxCommand = chosenCommand;
+        SelectedComboBoxCommandInQueryBuilder = chosenCommand;
 
         // Load the Possible Parameters Synchronously
         ADCommandParameters adCommandParameters = new();
-        adCommandParameters.LoadAvailableParameters(SelectedComboBoxCommand);
+        adCommandParameters.LoadAvailableParameters(SelectedComboBoxCommandInQueryBuilder);
         AvailableADCommandParameters = new ObservableCollection<string>(adCommandParameters.AvailableParameters);
         OnPropertyChanged(nameof(AvailableADCommandParameters));
 
@@ -365,7 +331,7 @@ private async void ExecuteCustomQueryCommandButton(object _)
         }
 
         Query buttonQuery = (Query)currentButton.Tag;
-        await ExecuteSelectedCommandAsync(buttonQuery.Command);
+        await ExecuteSelectedCommandCoreAsync(buttonQuery.Command);
     }
 
     /// <summary>
@@ -422,9 +388,9 @@ private void LoadCustomQueries()
     /// Executes the selected PowerShell command asynchronously.
     /// </summary>
     /// <param name="_">This is the object that the command is bound to.</param>
-    private async void ExecuteCommandAsync(object _)
+    private async void ExecuteSelectedCommandAsync(object _)
     {
-        await ExecuteSelectedCommandAsync();
+        await ExecuteSelectedCommandCoreAsync();
     }
 
     /// <summary>
@@ -460,9 +426,9 @@ private async Task LoadCommandParametersAsync(Command? selectedCommand)
     /// </summary>
     /// <param name="command">The PowerShell command to execute.</param>
     /// <returns>A Task representing the asynchronous operation of executing the command.</returns>
-    private async Task ExecuteSelectedCommandAsync(Command? command = null)
+    private async Task ExecuteSelectedCommandCoreAsync(Command? command = null)
     {
-        if (SelectedComboBoxCommand is null && command is null)
+        if (SelectedComboBoxCommandInQueryBuilder is null && command is null)
         {
             Trace.WriteLine("No command selected.");
             MessageBox.Show("To execute a command, you must first select a command.",
@@ -483,7 +449,7 @@ private async Task ExecuteSelectedCommandAsync(Command? command = null)
             {
                 // Add selected parameters and their values to the command.
                 UpdateSelectedCommand();
-                result = await _psExecutor.ExecuteAsync(SelectedComboBoxCommand);
+                result = await _psExecutor.ExecuteAsync(SelectedComboBoxCommandInQueryBuilder);
             }
 
             if (result.HadErrors)
@@ -537,7 +503,7 @@ private void AddCommandComboBox(object _)
     /// <param name="_">Represents the object that the command is bound to.</param>
     private async void OutputToTextFileAsync(object _)
     {
-        await ExecuteSelectedCommandAsync();
+        await ExecuteSelectedCommandCoreAsync();
 
         // Filepath
         // Write the text to a file & prompt user for the location
@@ -565,7 +531,7 @@ private async void OutputToTextFileAsync(object _)
     /// <param name="_">Represents the object that the command is bound to</param>
     private async void OutputToCsvFileAsync(object _)
     {
-        await ExecuteSelectedCommandAsync();
+        await ExecuteSelectedCommandCoreAsync();
 
         var csv = new StringBuilder();
         string[] output = QueryBuilderConsoleOutput.ConsoleOutput.Split(' ', '\n');
@@ -626,7 +592,7 @@ private void ExportConsoleOutput(object _)
     /// </note>
     private void UpdateSelectedCommand()
     {
-        if (SelectedComboBoxCommand is null)
+        if (SelectedComboBoxCommandInQueryBuilder is null)
         {
             Trace.WriteLine("No command selected.");
             MessageBox.Show("To save a query, you must first select a command.",
@@ -639,10 +605,10 @@ private void UpdateSelectedCommand()
         // Try to get the content within the drop downs
         try
         {
-            SelectedComboBoxCommand.Parameters.Clear();
+            SelectedComboBoxCommandInQueryBuilder.Parameters.Clear();
             for (int i = 0; i < DynamicParameterComboBoxes.Count; i++)
             {
-                SelectedComboBoxCommand.Parameters.Add(
+                SelectedComboBoxCommandInQueryBuilder.Parameters.Add(
                     new CommandParameter(DynamicParameterComboBoxes[i].SelectedParameter,
                                          DynamicParameterValueTextBoxes[i].SelectedParameterValue));
             }
@@ -669,20 +635,20 @@ private void GetCurrentQuery()
             string[] commandParameters;
             string[] commandParameterValues;
 
-            if (SelectedComboBoxCommand is not null && SelectedComboBoxCommand.Parameters is not null)
+            if (SelectedComboBoxCommandInQueryBuilder is not null && SelectedComboBoxCommandInQueryBuilder.Parameters is not null)
             {
-                commandParameters = new string[SelectedComboBoxCommand.Parameters.Count];
-                commandParameterValues = new string[SelectedComboBoxCommand.Parameters.Count];
+                commandParameters = new string[SelectedComboBoxCommandInQueryBuilder.Parameters.Count];
+                commandParameterValues = new string[SelectedComboBoxCommandInQueryBuilder.Parameters.Count];
 
                 _currentQuery.QueryDescription = QueryDescription;
                 _currentQuery.QueryName = QueryName;
 
-                _currentQuery.CommandName = SelectedComboBoxCommand.CommandText;
+                _currentQuery.CommandName = SelectedComboBoxCommandInQueryBuilder.CommandText;
 
                 // TODO: Possibly convert foreach into a for loop...
-                for (int i = 0; i < SelectedComboBoxCommand.Parameters.Count; i++)
+                for (int i = 0; i < SelectedComboBoxCommandInQueryBuilder.Parameters.Count; i++)
                 {
-                    CommandParameter commandParameter = SelectedComboBoxCommand.Parameters[i];
+                    CommandParameter commandParameter = SelectedComboBoxCommandInQueryBuilder.Parameters[i];
 
                     commandParameters[i] = commandParameter.Name;
                     commandParameterValues[i] = commandParameter.Value.ToString()!;
@@ -724,7 +690,7 @@ private void RemoveParameterComboBox(object _)
     /// <param name="commandParameter">This is not used but necessary for the relay command</param>
     private void SaveCustomQueries(object commandParameter)
     {
-        if (SelectedComboBoxCommand is null)
+        if (SelectedComboBoxCommandInQueryBuilder is null)
         {
             Trace.WriteLine("No command selected.");
             MessageBox.Show("To save a query, you must first select a command.",
@@ -751,7 +717,7 @@ private void SaveCustomQueries(object commandParameter)
             {
                 UpdateSelectedCommand();
 
-                _customQuery.SerializeCommand(SelectedComboBoxCommand, QueryName, QueryDescription);
+                _customQuery.SerializeCommand(SelectedComboBoxCommandInQueryBuilder, QueryName, QueryDescription);
 
                 Button newButton = CreateCustomButton();
 
@@ -770,7 +736,7 @@ private void SaveCustomQueries(object commandParameter)
     /// <param name="_">Object that the command is tied to</param>
     private void ClearQueryBuilder(object _)
     {
-        if (SelectedComboBoxCommand is null && DynamicParameterComboBoxes.Count == 0)
+        if (SelectedComboBoxCommandInQueryBuilder is null && DynamicParameterComboBoxes.Count == 0)
         {
             MessageBox.Show("The query builder is already clear.",
                             "Information",
@@ -789,7 +755,7 @@ private void ClearQueryBuilder(object _)
         // If the user selects yes, clear the console
         if (result == MessageBoxResult.Yes)
         {
-            SelectedComboBoxCommand = null;
+            SelectedComboBoxCommandInQueryBuilder = null;
             DynamicParameterComboBoxes.Clear();
             DynamicParameterValueTextBoxes.Clear();
         }
@@ -814,7 +780,7 @@ private Button CreateCustomButton(Query? query = null)
         else
         {
             // Check for null
-            if (SelectedComboBoxCommand is null)
+            if (SelectedComboBoxCommandInQueryBuilder is null)
             {
                 Trace.WriteLine("No command selected.");
                 MessageBox.Show("To save a query, you must first select a command.",
@@ -826,7 +792,7 @@ private Button CreateCustomButton(Query? query = null)
 
             GetCurrentQuery();
             newButton.Height = 48;
-            newButton.Content = QueryName.Length != 0 ? QueryName : SelectedComboBoxCommand.CommandText;
+            newButton.Content = QueryName.Length != 0 ? QueryName : SelectedComboBoxCommandInQueryBuilder.CommandText;
             newButton.Tag = _currentQuery;
         }
 
@@ -834,11 +800,11 @@ private Button CreateCustomButton(Query? query = null)
         ContextMenu contextMenu = new();
 
         MenuItem menuItem1 =
-            new() { Header = "Execute", Command = ExecuteCommandButtonRelay, CommandParameter = newButton };
+            new() { Header = "Execute", Command = ExecuteCustomQueryCommandButtonRelay, CommandParameter = newButton };
 
         MenuItem outputToCsv = new() { Header = "Output to CSV", Command = OutputToCsvFileRelay };
         MenuItem outputToText = new() { Header = "Output to Text", Command = OutputToTextFileRelay };
-        MenuItem outputToConsole = new() { Header = "Execute to Console", Command = ExecuteCommandRelay };
+        MenuItem outputToConsole = new() { Header = "Execute to Console", Command = ExecuteSelectedCommandRelay };
 
         menuItem1.Items.Add(outputToCsv);
         menuItem1.Items.Add(outputToText);

From 835a518b9305d828b45c45f95926520c82bdeeac Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Mon, 11 Mar 2024 21:43:46 -0700
Subject: [PATCH 65/94] Major refactoring and name changes for clarity

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs |  32 ++-
 .../PowerShell/CustomQueries.cs               | 182 ------------------
 .../Queries/CustomQueries.cs                  | 129 +++++++++++++
 ActiveDirectoryQuerier/Queries/Query.cs       |  69 +++++++
 4 files changed, 213 insertions(+), 199 deletions(-)
 delete mode 100644 ActiveDirectoryQuerier/PowerShell/CustomQueries.cs
 create mode 100644 ActiveDirectoryQuerier/Queries/CustomQueries.cs
 create mode 100644 ActiveDirectoryQuerier/Queries/Query.cs

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index efa3b3b..cc256c7 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -8,8 +8,8 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 using ActiveDirectoryQuerier.PowerShell;
+using ActiveDirectoryQuerier.Queries;
 using Microsoft.Win32;
-using static ActiveDirectoryQuerier.PowerShell.CustomQueries;
 
 namespace ActiveDirectoryQuerier;
 
@@ -27,7 +27,7 @@ public sealed class MainWindowViewModel : INotifyPropertyChanged
     private string _queryDescription;
     private AppConsole _queryBuilderConsoleOutput;
     private AppConsole _activeDirectoryInfoConsoleOutput;
-    private Command? _selectedComboBoxCommandInQueryBuilder; // TODO: Change the name of this field?
+    private Command? _selectedComboBoxCommandInQueryBuilder;
     private ObservableCollection<Button>? _buttons;
 
     // [[ Other fields ]] ----------------------------------------------------------- //
@@ -281,7 +281,7 @@ private void EditCustomQuery(object sender)
 
         // Fill in the commandName
         Command chosenCommand =
-            ADCommands.FirstOrDefault(item => item.CommandText == currentQuery.CommandName)!;
+            ADCommands.FirstOrDefault(item => item.CommandText == currentQuery.PSCommandName)!;
         SelectedComboBoxCommandInQueryBuilder = chosenCommand;
 
         // Load the Possible Parameters Synchronously
@@ -298,17 +298,17 @@ private void EditCustomQuery(object sender)
         }
 
         // Fill in Parameters and values
-        for (int i = 0; i < currentQuery.CommandParameters.Length; i++)
+        for (int i = 0; i < currentQuery.PSCommandParameters.Length; i++)
         {
-            Trace.WriteLine(currentQuery.CommandParameters[i]);
+            Trace.WriteLine(currentQuery.PSCommandParameters[i]);
 
             // Adds the Parameters boxes
             object temp = new();
             AddParameterComboBox(temp);
 
             // Fill in the parameter boxes
-            DynamicParameterComboBoxes[i].SelectedParameter = currentQuery.CommandParameters[i];
-            DynamicParameterValueTextBoxes[i].SelectedParameterValue = currentQuery.CommandParametersValues[i];
+            DynamicParameterComboBoxes[i].SelectedParameter = currentQuery.PSCommandParameters[i];
+            DynamicParameterValueTextBoxes[i].SelectedParameterValue = currentQuery.PSCommandParameterValues[i];
         }
     }
 
@@ -355,7 +355,7 @@ private void DeleteCustomQuery(object _)
 
         QueryButtonStackPanel.Remove(currentButton);
         _customQuery.Queries.Remove((Query)currentButton.Tag);
-        _customQuery.SerializeMethod();
+        _customQuery.SaveQueriesToJson();
     }
 
     /// <summary>
@@ -642,20 +642,18 @@ private void GetCurrentQuery()
 
                 _currentQuery.QueryDescription = QueryDescription;
                 _currentQuery.QueryName = QueryName;
-
-                _currentQuery.CommandName = SelectedComboBoxCommandInQueryBuilder.CommandText;
-
-                // TODO: Possibly convert foreach into a for loop...
+                _currentQuery.PSCommandName = SelectedComboBoxCommandInQueryBuilder.CommandText;
+                
                 for (int i = 0; i < SelectedComboBoxCommandInQueryBuilder.Parameters.Count; i++)
                 {
                     CommandParameter commandParameter = SelectedComboBoxCommandInQueryBuilder.Parameters[i];
 
                     commandParameters[i] = commandParameter.Name;
                     commandParameterValues[i] = commandParameter.Value.ToString()!;
-                    i++;
+                    i++;  // TODO: Remove this line!
                 }
-                _currentQuery.CommandParameters = commandParameters;
-                _currentQuery.CommandParametersValues = commandParameterValues;
+                _currentQuery.PSCommandParameters = commandParameters;
+                _currentQuery.PSCommandParameterValues = commandParameterValues;
             }
         }
         catch (Exception ex)
@@ -706,7 +704,7 @@ private void SaveCustomQueries(object commandParameter)
             GetCurrentQuery();
             Trace.WriteLine(_customQuery.Queries.IndexOf(_isEditing));
             _customQuery.Queries[_customQuery.Queries.IndexOf(_isEditing)] = _currentQuery;
-            _customQuery.SerializeMethod();
+            _customQuery.SaveQueriesToJson();
             _isEditing = null;
             EditingEnabled = false;
         }
@@ -774,7 +772,7 @@ private Button CreateCustomButton(Query? query = null)
         if (query != null)
         {
             newButton.Height = 48;
-            newButton.Content = (string.IsNullOrEmpty(query.QueryName) ? query.CommandName : query.QueryName);
+            newButton.Content = (string.IsNullOrEmpty(query.QueryName) ? query.PSCommandName : query.QueryName);
             newButton.Tag = query;
         }
         else
diff --git a/ActiveDirectoryQuerier/PowerShell/CustomQueries.cs b/ActiveDirectoryQuerier/PowerShell/CustomQueries.cs
deleted file mode 100644
index 9ae6335..0000000
--- a/ActiveDirectoryQuerier/PowerShell/CustomQueries.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-using System.Diagnostics;
-using System.IO;
-using System.Management.Automation.Runspaces;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace ActiveDirectoryQuerier.PowerShell;
-
-/// <summary>
-/// This class is used to save a json file named "CustomQueries.dat" inside of
-/// \ActiveDirectoryQuerier\ActiveDirectoryQuerier\bin\Debug\net6.0-windows This
-/// </summary>
-internal class CustomQueries
-{
-    public class Query
-    {
-        /// <summary>
-        /// Command that should help with Binding the command to the query for the buttons sake
-        /// </summary>
-        [JsonIgnore]
-        public Command? Command { get; set; }
-
-        /// <summary>
-        /// Used for serializing the Command Name
-        /// </summary>
-        public string CommandName { get; set; }
-
-        /// <summary>
-        /// Used for Serializing the Commands parameters
-        /// </summary>
-        public string[] CommandParameters { get; set; }
-
-        /// <summary>
-        /// Used for Serializing the Commands parameters
-        /// </summary>
-        public string[] CommandParametersValues { get; set; }
-
-        /// <summary>
-        /// Used for the name of the custom Query
-        /// </summary>
-        public string QueryName { get; set; }
-
-        /// <summary>
-        /// Used for the Custom Queries Description
-        /// </summary>
-        public string QueryDescription { get; set; }
-
-        // Constructor for the query class
-        /*public Query(string cN, string[] commandParams)
-        {
-            this.CommandName = cN;
-            this.ADCommandParameters = commandParams;
-        }*/
-
-        /// <summary>
-        /// Constructor for the query class
-        /// TODO: Fix any and all warnings about possible null values.
-        /// </summary>
-        /// <param name="cN"></param>
-        public Query(string cN)
-        {
-            CommandName = cN;
-        }
-
-        /// <summary>
-        /// Empty constructor for the query class
-        /// TODO: Fix any and all warnings about possible null values.
-        /// </summary>
-        public Query()
-        { }
-    }
-
-    public List<Query> Queries = new();
-
-    /// <summary>
-    /// This a variable for feeding options to the Json serializer
-    /// </summary>
-    private static readonly JsonSerializerOptions _options = new() {
-        PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-        WriteIndented = true,
-        ReferenceHandler = ReferenceHandler.Preserve,
-    };
-
-    /// <summary>
-    /// This takes the Queries List and serializes it to a file
-    /// </summary>
-    public void SerializeMethod()
-    {
-        try
-        {
-            string json = JsonSerializer.Serialize(Queries, _options);
-            File.WriteAllText("CustomQueries.dat", json);
-        }
-        catch (Exception ex)
-        {
-            Trace.WriteLine(ex);
-        }
-    }
-
-    /// <summary>
-    /// This method is for serializing a command type, so it converts the type to a query and then serializes it
-    /// TODO: Fix any and all warnings about possible null values.
-    /// </summary>
-    public void SerializeCommand(Command? cmnd, string queryName, string queryDescription)
-    {
-        Trace.WriteLine(cmnd.Parameters.Count);
-
-        string[] commandParameters = new string[cmnd.Parameters.Count];
-        string[] commandParameterValues = new string[cmnd.Parameters.Count];
-        Query newQuery = new Query(cmnd.CommandText);
-
-        // Set name and description
-        newQuery.QueryName = queryName;
-        newQuery.QueryDescription = queryDescription;
-
-        // Iterate over the parameters and add them to the string
-
-        for (int i = 0; i < cmnd.Parameters.Count; i++)
-        {
-            CommandParameter param = cmnd.Parameters[i];
-
-            Trace.WriteLine(param.Name + " Value: ");
-
-            commandParameters[i] = param.Name;
-            commandParameterValues[i] = param.Value.ToString();
-        }
-        newQuery.CommandParameters = commandParameters;
-        newQuery.CommandParametersValues = commandParameterValues;
-
-        Queries.Add(newQuery);
-
-        CustomQueries customQueries = new CustomQueries();
-        customQueries.SerializeMethod();
-        try
-        {
-            string json = JsonSerializer.Serialize(Queries, _options);
-            Trace.WriteLine(json);
-            File.WriteAllText("CustomQueries.dat", json);
-        }
-        catch (Exception ex)
-        {
-            Trace.WriteLine(ex);
-        }
-    }
-    /// <summary>
-    /// This method Loads the string from the saved file "CustomQueries.dat" then gives it to the Queries List
-    /// </summary>
-    /// TODO: Fix any and all warnings about possible null values.
-    public void LoadData()
-    {
-        try
-        {
-            // Opens file and reads it then adds the json to the Queries List
-            string json = File.ReadAllText("CustomQueries.dat");
-            Queries = JsonSerializer.Deserialize<List<Query>>(json, _options);
-
-            // Now we want to fill the command variable for each query
-            foreach (Query q in Queries)
-            {
-                Command? command = new Command(q.CommandName);
-
-                // Check if there are parameters, and if there are add them to the list
-                if (q.CommandParameters != null)
-                {
-                    for (int i = 0; i < q.CommandParameters.Length; i++)
-                    {
-                        command.Parameters.Add(q.CommandParameters[i], q.CommandParametersValues[i]);
-                        // the values are working then we will use this
-                        // command.Parameters.Add(q.ADCommandParameters[i]);
-                    }
-                }
-
-                // set the query command to the command
-                q.Command = command;
-            }
-        }
-        catch (Exception ex)
-        {
-            Trace.WriteLine(ex);
-        }
-    }
-}
diff --git a/ActiveDirectoryQuerier/Queries/CustomQueries.cs b/ActiveDirectoryQuerier/Queries/CustomQueries.cs
new file mode 100644
index 0000000..1aa266e
--- /dev/null
+++ b/ActiveDirectoryQuerier/Queries/CustomQueries.cs
@@ -0,0 +1,129 @@
+using System.Diagnostics;
+using System.IO;
+using System.Management.Automation.Runspaces;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace ActiveDirectoryQuerier.Queries;
+
+/// <summary>
+/// This class is used to save a json file named "CustomQueries.dat" inside of
+/// \ActiveDirectoryQuerier\ActiveDirectoryQuerier\bin\Debug\net6.0-windows This
+/// </summary>
+/// TODO: Remove property descriptions if name is descriptive enough, or provide a detailed description if it is not.
+public class CustomQueries
+{
+    public List<Query> Queries { get; private set; } = new();
+
+    /// <summary>
+    /// This a variable for feeding options to the Json serializer
+    /// </summary>
+    private static readonly JsonSerializerOptions _options = new() {
+        PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+        WriteIndented = true,
+        ReferenceHandler = ReferenceHandler.Preserve,
+    };
+
+    /// <summary>
+    /// This takes the Queries List and serializes it to a file
+    /// </summary>
+    public void SaveQueriesToJson()
+    {
+        try
+        {
+            string serializedJsonQueries = JsonSerializer.Serialize(Queries, _options);
+            File.WriteAllText("CustomQueries.dat", serializedJsonQueries);
+        }
+        // TODO: Possibly provide more comprehensive error handling.
+        catch (Exception ex)
+        {
+            Trace.WriteLine(ex);
+        }
+    }
+
+    /// <summary>
+    /// This method is for serializing a command type, so it converts the type to a query and then serializes it
+    /// </summary>
+    /// TODO: Fix any and all warnings about possible null values.
+    public void SerializeCommand(Command? psCommand, string queryName, string queryDescription)
+    {
+        string[] commandParameters = new string[psCommand.Parameters.Count];
+        string[] commandParameterValues = new string[psCommand.Parameters.Count];
+        CustomQueries customQueries = new();
+        Query newQuery = new(psCommand.CommandText)
+        {
+            QueryName = queryName,
+            QueryDescription = queryDescription
+        };
+        
+        // TODO: Determine if this line is necessary.
+        Trace.WriteLine(psCommand.Parameters.Count);
+
+        // Iterate over the parameters and add them to the string
+        for (int i = 0; i < psCommand.Parameters.Count; i++)
+        {
+            CommandParameter param = psCommand.Parameters[i];
+
+            Trace.WriteLine(param.Name + " Value: ");
+
+            commandParameters[i] = param.Name;
+            commandParameterValues[i] = param.Value.ToString();
+        }
+        
+        newQuery.PSCommandParameters = commandParameters;
+        newQuery.PSCommandParameterValues = commandParameterValues;
+
+        Queries.Add(newQuery);
+        customQueries.SaveQueriesToJson();
+        
+        try
+        {
+            string serializedJsonQueries = JsonSerializer.Serialize(Queries, _options);
+            Trace.WriteLine(serializedJsonQueries);
+            File.WriteAllText("CustomQueries.dat", serializedJsonQueries);
+        }
+        // TODO: Possibly provide more comprehensive error handling.
+        catch (Exception ex)
+        {
+            Trace.WriteLine(ex);
+        }
+    }
+    /// <summary>
+    /// This method Loads the string from the saved file "CustomQueries.dat" then gives it to the Queries List
+    /// </summary>
+    /// TODO: Fix any and all warnings about possible null values.
+    public void LoadData()
+    {
+        try
+        {
+            // Opens file and reads it then adds the json to the Queries List
+            string json = File.ReadAllText("CustomQueries.dat");
+            Queries = JsonSerializer.Deserialize<List<Query>>(json, _options);
+
+            // Now we want to fill the command variable for each query
+            foreach (Query query in Queries)
+            {
+                Command psCommand = new Command(query.PSCommandName);
+
+                // Check if there are parameters, and if there are add them to the list
+                if (query.PSCommandParameters != null)
+                {
+                    for (int i = 0; i < query.PSCommandParameters.Length; i++)
+                    {
+                        psCommand.Parameters.Add(query.PSCommandParameters[i], query.PSCommandParameterValues[i]);
+                        // the values are working then we will use this
+                        // command.Parameters.Add(q.ADCommandParameters[i]);
+                    }
+                }
+
+                // set the query command to the command
+                query.Command = psCommand;
+            }
+        }
+        // TODO: Possibly provide more comprehensive error handling.
+        catch (Exception exception)
+        {
+            Trace.WriteLine(exception);
+        }
+    }
+}
diff --git a/ActiveDirectoryQuerier/Queries/Query.cs b/ActiveDirectoryQuerier/Queries/Query.cs
new file mode 100644
index 0000000..67a708c
--- /dev/null
+++ b/ActiveDirectoryQuerier/Queries/Query.cs
@@ -0,0 +1,69 @@
+using System.Management.Automation.Runspaces;
+using System.Text.Json.Serialization;
+
+namespace ActiveDirectoryQuerier.Queries;
+
+// TODO: Remove property descriptions if name is descriptive enough, or provide a detailed description if it is not.
+public class Query
+{
+    /// <summary>
+    /// Command that should help with Binding the command to the query for the buttons sake
+    /// </summary>
+    /// TODO: Give a better description of what this property does, and rename it to something more descriptive.
+    /// TODO: Determine if this property should be nullable.
+    [JsonIgnore]
+    public Command? Command { get; set; }
+
+    /// <summary>
+    /// Used for serializing the Command Name
+    /// </summary>
+    // ReSharper disable once InconsistentNaming
+    public string PSCommandName { get; set; }
+
+    /// <summary>
+    /// Used for Serializing the Commands parameters
+    /// </summary>
+    // ReSharper disable once InconsistentNaming
+    public string[] PSCommandParameters { get; set; }
+
+    /// <summary>
+    /// Used for Serializing the Commands parameters
+    /// </summary>
+    // ReSharper disable once InconsistentNaming
+    public string[] PSCommandParameterValues { get; set; }
+
+    /// <summary>
+    /// Used for the name of the custom Query
+    /// </summary>
+    public string QueryName { get; set; }
+
+    /// <summary>
+    /// Used for the Custom Queries Description
+    /// </summary>
+    public string QueryDescription { get; set; }
+
+    // Constructor for the query class
+    // TODO: Remove commented code if it is not needed.
+    /*public Query(string psCommandName, string[] commandParams)
+    {
+        PSCommandName = psCommandName;
+        ADCommandParameters = commandParams;
+    }*/
+
+    /// <summary>
+    /// Constructor for the query class
+    /// </summary>
+    /// <param name="psCommandName"></param>
+    /// TODO: Fix any and all warnings about possible null values.
+    public Query(string psCommandName)
+    {
+        PSCommandName = psCommandName;
+    }
+
+    /// <summary>
+    /// Empty constructor for the query class
+    /// </summary>
+    /// TODO: Fix any and all warnings about possible null values.
+    public Query()
+    { }
+}

From 0371bed35b2bfc1b0c8d2431821918649f3e7742 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Mon, 11 Mar 2024 21:59:22 -0700
Subject: [PATCH 66/94] Update class, method, property, and field names for
 clarity

---
 ...rsTests.cs => ADCommandParametersTests.cs} |  7 ++--
 .../ADCommandsFetcherTests.cs                 | 32 +++++++++++++++
 .../AdCommandsFetcherTests.cs                 | 31 ---------------
 ...{PsExecutorTests.cs => PSExecutorTests.cs} | 39 +++++++++----------
 ActiveDirectoryQuerier.Tests/PSOutputTest.cs  | 39 +++++++++++++++++++
 ActiveDirectoryQuerier.Tests/PsOutputTest.cs  | 38 ------------------
 ActiveDirectoryQuerier/MainWindowViewModel.cs |  2 +-
 .../PowerShell/ADCommandsFetcher.cs           |  4 +-
 8 files changed, 96 insertions(+), 96 deletions(-)
 rename ActiveDirectoryQuerier.Tests/{AdCommandParametersTests.cs => ADCommandParametersTests.cs} (81%)
 create mode 100644 ActiveDirectoryQuerier.Tests/ADCommandsFetcherTests.cs
 delete mode 100644 ActiveDirectoryQuerier.Tests/AdCommandsFetcherTests.cs
 rename ActiveDirectoryQuerier.Tests/{PsExecutorTests.cs => PSExecutorTests.cs} (66%)
 create mode 100644 ActiveDirectoryQuerier.Tests/PSOutputTest.cs
 delete mode 100644 ActiveDirectoryQuerier.Tests/PsOutputTest.cs

diff --git a/ActiveDirectoryQuerier.Tests/AdCommandParametersTests.cs b/ActiveDirectoryQuerier.Tests/ADCommandParametersTests.cs
similarity index 81%
rename from ActiveDirectoryQuerier.Tests/AdCommandParametersTests.cs
rename to ActiveDirectoryQuerier.Tests/ADCommandParametersTests.cs
index add38cb..87274fc 100644
--- a/ActiveDirectoryQuerier.Tests/AdCommandParametersTests.cs
+++ b/ActiveDirectoryQuerier.Tests/ADCommandParametersTests.cs
@@ -3,7 +3,8 @@
 
 namespace ActiveDirectoryQuerier.Tests;
 
-public class AdCommandParametersTests
+// ReSharper disable once InconsistentNaming
+public class ADCommandParametersTests
 {
     [Fact]
     public void AvailableParameters_AvailableParametersNotPopulated_NoValidCommandProvided()
@@ -16,7 +17,7 @@ public void AvailableParameters_AvailableParametersNotPopulated_NoValidCommandPr
     }
 
     [Fact]
-    public async Task LoadParametersAsync_PopulatesAvailableParameters_IsNotEmpty()
+    public async Task LoadAvailableParametersAsync_PopulatesAvailableParameters_IsNotEmpty()
     {
         // Arrange
         ADCommandParameters adCommandParameters = new();
@@ -30,7 +31,7 @@ public async Task LoadParametersAsync_PopulatesAvailableParameters_IsNotEmpty()
     }
 
     [Fact]
-    public async Task LoadParametersAsync_CheckAvailableParameters_ContainsNameAndId()
+    public async Task LoadAvailableParametersAsync_CheckAvailableParameters_ContainsNameAndId()
     {
         // Arrange
         ADCommandParameters adCommandParameters = new();
diff --git a/ActiveDirectoryQuerier.Tests/ADCommandsFetcherTests.cs b/ActiveDirectoryQuerier.Tests/ADCommandsFetcherTests.cs
new file mode 100644
index 0000000..f1511a3
--- /dev/null
+++ b/ActiveDirectoryQuerier.Tests/ADCommandsFetcherTests.cs
@@ -0,0 +1,32 @@
+using System.Collections.ObjectModel;
+using System.Management.Automation.Runspaces;
+using ActiveDirectoryQuerier.PowerShell;
+
+namespace ActiveDirectoryQuerier.Tests;
+
+// ReSharper disable once InconsistentNaming
+public class ADCommandsFetcherTests
+{
+    [Fact]
+    public async Task GetADCommands_ReturnsCommandList_IsNotEmpty()
+    {
+        // Act
+        ObservableCollection<Command> adCommands = await ADCommandsFetcher.GetADCommands();
+
+        // Assert
+        Assert.NotEmpty(adCommands);
+    }
+
+    [Theory]
+    [InlineData("Get-ADUser")]
+    [InlineData("Get-ADGroup")]
+    [InlineData("Get-ADComputer")]
+    public async Task GetADCommands_ReturnsCommandList_ContainsCommand(string commandName)
+    {
+        // Act
+        ObservableCollection<Command> adCommands = await ADCommandsFetcher.GetADCommands();
+
+        // Assert
+        Assert.Contains(adCommands, command => command.CommandText == commandName);
+    }
+}
diff --git a/ActiveDirectoryQuerier.Tests/AdCommandsFetcherTests.cs b/ActiveDirectoryQuerier.Tests/AdCommandsFetcherTests.cs
deleted file mode 100644
index 4a71bc7..0000000
--- a/ActiveDirectoryQuerier.Tests/AdCommandsFetcherTests.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System.Collections.ObjectModel;
-using System.Management.Automation.Runspaces;
-using ActiveDirectoryQuerier.PowerShell;
-
-namespace ActiveDirectoryQuerier.Tests;
-
-public class AdCommandsFetcherTests
-{
-    [Fact]
-    public async Task GetActiveDirectoryCommands_ReturnsCommandList_IsNotEmpty()
-    {
-        // Act
-        ObservableCollection<Command> commandList = await ADCommandsFetcher.GetActiveDirectoryCommands();
-
-        // Assert
-        Assert.NotEmpty(commandList);
-    }
-
-    [Theory]
-    [InlineData("Get-ADUser")]
-    [InlineData("Get-ADGroup")]
-    [InlineData("Get-ADComputer")]
-    public async Task GetActiveDirectoryCommands_ReturnsCommandList_ContainsCommand(string commandName)
-    {
-        // Act
-        ObservableCollection<Command> commandList = await ADCommandsFetcher.GetActiveDirectoryCommands();
-
-        // Assert
-        Assert.Contains(commandList, cmd => cmd.CommandText == commandName);
-    }
-}
diff --git a/ActiveDirectoryQuerier.Tests/PsExecutorTests.cs b/ActiveDirectoryQuerier.Tests/PSExecutorTests.cs
similarity index 66%
rename from ActiveDirectoryQuerier.Tests/PsExecutorTests.cs
rename to ActiveDirectoryQuerier.Tests/PSExecutorTests.cs
index edf7554..2dcf274 100644
--- a/ActiveDirectoryQuerier.Tests/PsExecutorTests.cs
+++ b/ActiveDirectoryQuerier.Tests/PSExecutorTests.cs
@@ -3,20 +3,21 @@
 
 namespace ActiveDirectoryQuerier.Tests;
 
-public class PsExecutorTests
+// ReSharper disable once InconsistentNaming
+public class PSExecutorTests
 {
     [Theory]
     [InlineData("Get-Command", "Module", "ActiveDirectory")]
     [InlineData("Get-Process", "Name", "explorer")]
-    public void Execute_WhenGivenValidCommand_ReturnsExpectedOutput(string cmd, string paramName, string paramValue)
+    public void Execute_WhenGivenValidCommand_ReturnsExpectedOutput(string command, string parameter, string parameterValue)
     {
         // Arrange
-        Command command = new(cmd);
-        command.Parameters.Add(paramName, paramValue);
+        Command psCommand = new(command);
+        psCommand.Parameters.Add(parameter, parameterValue);
         PSExecutor psExecutor = new();
 
         // Act
-        PSOutput result = psExecutor.Execute(command);
+        PSOutput result = psExecutor.Execute(psCommand);
 
         // Assert
         Assert.False(result.HadErrors);
@@ -45,17 +46,15 @@ public void Execute_CheckIfOutputChanged_ReturnsDifferentOutput()
     [Theory]
     [InlineData("Get-Command", "Module", "ActiveDirectory")]
     [InlineData("Get-Process", "Name", "explorer")]
-    public async Task ExecuteAsync_WhenGivenValidCommand_ReturnsExpectedOutput(string cmd,
-                                                                               string paramName,
-                                                                               string paramValue)
+    public async Task ExecuteAsync_WhenGivenValidCommand_ReturnsExpectedOutput(string command, string parameter, string parameterValue)
     {
         // Arrange
-        Command command = new(cmd);
-        command.Parameters.Add(paramName, paramValue);
+        Command psCommand = new(command);
+        psCommand.Parameters.Add(parameter, parameterValue);
         PSExecutor psExecutor = new();
 
         // Act
-        PSOutput result = await psExecutor.ExecuteAsync(command);
+        PSOutput result = await psExecutor.ExecuteAsync(psCommand);
 
         // Assert
         Assert.False(result.HadErrors);
@@ -66,15 +65,15 @@ public async Task ExecuteAsync_WhenGivenValidCommand_ReturnsExpectedOutput(strin
     [Theory]
     [InlineData("Get-ADUser", "InvalidParameter", "*")]
     [InlineData("InvalidCommand", "Filter", "*")]
-    public void Execute_WhenGivenInvalidCommand_ReturnsExpectedOutput(string cmd, string paramName, string paramValue)
+    public void Execute_WhenGivenInvalidCommand_ReturnsExpectedOutput(string command, string parameter, string parameterValue)
     {
         // Arrange
-        Command command = new(cmd);
-        command.Parameters.Add(paramName, paramValue);
+        Command psCommand = new(command);
+        psCommand.Parameters.Add(parameter, parameterValue);
         PSExecutor psExecutor = new();
 
         // Act
-        PSOutput result = psExecutor.Execute(command);
+        PSOutput result = psExecutor.Execute(psCommand);
 
         // Assert
         Assert.True(result.HadErrors);
@@ -85,17 +84,15 @@ public void Execute_WhenGivenInvalidCommand_ReturnsExpectedOutput(string cmd, st
     [Theory]
     [InlineData("Get-ADUser", "InvalidParameter", "*")]
     [InlineData("InvalidCommand", "Filter", "*")]
-    public async Task ExecuteAsync_WhenGivenInvalidCommand_ReturnsExpectedOutput(string cmd,
-                                                                                 string paramName,
-                                                                                 string paramValue)
+    public async Task ExecuteAsync_WhenGivenInvalidCommand_ReturnsExpectedOutput(string command, string parameter, string parameterValue)
     {
         // Arrange
-        Command command = new(cmd);
-        command.Parameters.Add(paramName, paramValue);
+        Command psCommand = new(command);
+        psCommand.Parameters.Add(parameter, parameterValue);
         PSExecutor psExecutor = new();
 
         // Act
-        PSOutput result = await psExecutor.ExecuteAsync(command);
+        PSOutput result = await psExecutor.ExecuteAsync(psCommand);
 
         // Assert
         Assert.True(result.HadErrors);
diff --git a/ActiveDirectoryQuerier.Tests/PSOutputTest.cs b/ActiveDirectoryQuerier.Tests/PSOutputTest.cs
new file mode 100644
index 0000000..dccddf1
--- /dev/null
+++ b/ActiveDirectoryQuerier.Tests/PSOutputTest.cs
@@ -0,0 +1,39 @@
+using ActiveDirectoryQuerier.PowerShell;
+
+namespace ActiveDirectoryQuerier.Tests;
+
+// ReSharper disable once InconsistentNaming
+public class PSOutputTest
+{
+    [Fact]
+    public void HadErrors_StdErrHasEntries_ReturnsTrue()
+    {
+        // Arrange
+        PSOutput psOutput = new();
+        psOutput.StdErr.Add("Error");
+
+        // Act
+        bool result = psOutput.HadErrors;
+
+        // Assert
+        Assert.True(result);
+        Assert.NotEmpty(psOutput.StdErr);
+        Assert.Empty(psOutput.StdOut);
+    }
+
+    [Fact]
+    public void NoErrors_StdOutHasEntries_ReturnsFalse()
+    {
+        // Arrange
+        PSOutput psOutput = new();
+        psOutput.StdOut.Add("Output");
+
+        // Act
+        var result = psOutput.HadErrors;
+
+        // Assert
+        Assert.False(result);
+        Assert.Empty(psOutput.StdErr);
+        Assert.NotEmpty(psOutput.StdOut);
+    }
+}
diff --git a/ActiveDirectoryQuerier.Tests/PsOutputTest.cs b/ActiveDirectoryQuerier.Tests/PsOutputTest.cs
deleted file mode 100644
index 0d04627..0000000
--- a/ActiveDirectoryQuerier.Tests/PsOutputTest.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using ActiveDirectoryQuerier.PowerShell;
-
-namespace ActiveDirectoryQuerier.Tests;
-
-public class PsOutputTest
-{
-    [Fact]
-    public void HadErrors_StdErrHasEntries_ReturnsTrue()
-    {
-        // Arrange
-        var returnValues = new PSOutput();
-        returnValues.StdErr.Add("Error");
-
-        // Act
-        var result = returnValues.HadErrors;
-
-        // Assert
-        Assert.True(result);
-        Assert.NotEmpty(returnValues.StdErr);
-        Assert.Empty(returnValues.StdOut);
-    }
-
-    [Fact]
-    public void NoErrors_StdOutHasEntries_ReturnsFalse()
-    {
-        // Arrange
-        var returnValues = new PSOutput();
-        returnValues.StdOut.Add("Output");
-
-        // Act
-        var result = returnValues.HadErrors;
-
-        // Assert
-        Assert.False(result);
-        Assert.Empty(returnValues.StdErr);
-        Assert.NotEmpty(returnValues.StdOut);
-    }
-}
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index cc256c7..c5b340e 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -398,7 +398,7 @@ private async void ExecuteSelectedCommandAsync(object _)
     /// </summary>
     private async Task InitializeActiveDirectoryCommandsAsync()
     {
-        ObservableCollection<Command> list = await ADCommandsFetcher.GetActiveDirectoryCommands();
+        ObservableCollection<Command> list = await ADCommandsFetcher.GetADCommands();
         ADCommands = new ObservableCollection<Command>(list);
         OnPropertyChanged(nameof(ADCommands));
     }
diff --git a/ActiveDirectoryQuerier/PowerShell/ADCommandsFetcher.cs b/ActiveDirectoryQuerier/PowerShell/ADCommandsFetcher.cs
index ef4a9c1..143e4e1 100644
--- a/ActiveDirectoryQuerier/PowerShell/ADCommandsFetcher.cs
+++ b/ActiveDirectoryQuerier/PowerShell/ADCommandsFetcher.cs
@@ -8,8 +8,8 @@ namespace ActiveDirectoryQuerier.PowerShell;
 // ReSharper disable once InconsistentNaming
 public static class ADCommandsFetcher
 {
-    // TODO: Possibly rename this method to GetADCommandList...
-    public static async Task<ObservableCollection<Command>> GetActiveDirectoryCommands()
+    // ReSharper disable once InconsistentNaming
+    public static async Task<ObservableCollection<Command>> GetADCommands()
     {
         Command psCommand = new("Get-Command");
         psCommand.Parameters.Add("Module", "ActiveDirectory");

From c8564778b00e628c565707ee0edb63e3d57fdf52 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Mon, 11 Mar 2024 22:01:21 -0700
Subject: [PATCH 67/94] Remove bad variable increase

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index c5b340e..f51ad3d 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -650,7 +650,6 @@ private void GetCurrentQuery()
 
                     commandParameters[i] = commandParameter.Name;
                     commandParameterValues[i] = commandParameter.Value.ToString()!;
-                    i++;  // TODO: Remove this line!
                 }
                 _currentQuery.PSCommandParameters = commandParameters;
                 _currentQuery.PSCommandParameterValues = commandParameterValues;

From fff8d824a056799fdb6f9a4ef21748dda1fbf03d Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Mon, 11 Mar 2024 22:05:56 -0700
Subject: [PATCH 68/94] Add several to-dos, regarding moving classes into a
 collective directory

---
 ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj | 4 ++++
 ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs | 1 +
 ActiveDirectoryQuerier/MainWindowViewModel.cs        | 1 +
 ActiveDirectoryQuerier/RelayCommand.cs               | 1 +
 ActiveDirectoryQuerier/TextBoxViewModel.cs           | 1 +
 5 files changed, 8 insertions(+)

diff --git a/ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj b/ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj
index 1efb6dd..0c49a0c 100644
--- a/ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj
+++ b/ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj
@@ -25,4 +25,8 @@
 		<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.18" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <Folder Include="ViewModels\" />
+	</ItemGroup>
+
 </Project>
diff --git a/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs b/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs
index 75839a4..7c966ae 100644
--- a/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs
+++ b/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs
@@ -7,6 +7,7 @@ namespace ActiveDirectoryQuerier;
 /// ViewModel for a ComboBox that displays possible parameters for a PowerShell command.
 /// It is used when adding a new parameter slot to a command in the GUI.
 /// </summary>
+/// TODO: Place class into ViewModel folder.
 public sealed class ComboBoxParameterViewModel : INotifyPropertyChanged
 {
     public event PropertyChangedEventHandler? PropertyChanged;
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index f51ad3d..4050625 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -13,6 +13,7 @@
 
 namespace ActiveDirectoryQuerier;
 
+/// TODO: Place class into ViewModel folder.
 public sealed class MainWindowViewModel : INotifyPropertyChanged
 {
     // [ Fields ] ------------------------------------------------------------------- //
diff --git a/ActiveDirectoryQuerier/RelayCommand.cs b/ActiveDirectoryQuerier/RelayCommand.cs
index 7c90780..dbdd134 100644
--- a/ActiveDirectoryQuerier/RelayCommand.cs
+++ b/ActiveDirectoryQuerier/RelayCommand.cs
@@ -8,6 +8,7 @@ namespace ActiveDirectoryQuerier;
 /// <note>
 /// This is a very basic setup of the RelayCommand class. I imagine that this class can be expanded upon.
 /// </note>
+/// TODO: Place class into ViewModel folder.
 public class RelayCommand : ICommand
 {
     private readonly Action<object> _execute;
diff --git a/ActiveDirectoryQuerier/TextBoxViewModel.cs b/ActiveDirectoryQuerier/TextBoxViewModel.cs
index edf3444..783a027 100644
--- a/ActiveDirectoryQuerier/TextBoxViewModel.cs
+++ b/ActiveDirectoryQuerier/TextBoxViewModel.cs
@@ -6,6 +6,7 @@ namespace ActiveDirectoryQuerier;
 /// ViewModel for a TextBox that contains the value of a parameter slot.
 /// It is used to bind the TextBox to the ViewModel.
 /// </summary>
+/// TODO: Place class into ViewModel folder.
 public sealed class TextBoxViewModel : INotifyPropertyChanged
 {
     public event PropertyChangedEventHandler? PropertyChanged;

From b93a103da4933bb4df56d93f4c9ddca8da20a9e9 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Mon, 11 Mar 2024 22:26:21 -0700
Subject: [PATCH 69/94] Update comments and small changes

---
 ActiveDirectoryQuerier/AppConsole.cs            |  2 +-
 ActiveDirectoryQuerier/PowerShell/PSExecutor.cs | 13 +++++++------
 ActiveDirectoryQuerier/RelayCommand.cs          |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ActiveDirectoryQuerier/AppConsole.cs b/ActiveDirectoryQuerier/AppConsole.cs
index d7b7f11..0c0caba 100644
--- a/ActiveDirectoryQuerier/AppConsole.cs
+++ b/ActiveDirectoryQuerier/AppConsole.cs
@@ -12,7 +12,7 @@ public sealed class AppConsole : INotifyPropertyChanged
     /// <important>
     /// Do not set this property directly. Use the Append method instead. It's public for data binding purposes.
     /// </important>
-    /// TODO: Find a way to make the set of this property private.
+    /// TODO: Find a way to make the set of this property private, while still allowing data binding.
     public string ConsoleOutput
     {
         get => _consoleOutput;
diff --git a/ActiveDirectoryQuerier/PowerShell/PSExecutor.cs b/ActiveDirectoryQuerier/PowerShell/PSExecutor.cs
index fae31a7..c4c2b57 100644
--- a/ActiveDirectoryQuerier/PowerShell/PSExecutor.cs
+++ b/ActiveDirectoryQuerier/PowerShell/PSExecutor.cs
@@ -21,11 +21,13 @@ public PSExecutor()
         _powerShell.Commands.Clear();
     }
 
+    // TODO: Possibly rename method.
     private void PrepareCommand(Command psCommand)
     {
         ArgumentNullException.ThrowIfNull(psCommand);
-
+        
         _powerShell.Commands.AddCommand(psCommand.CommandText);
+        
         foreach (var parameter in psCommand.Parameters)
         {
             _powerShell.Commands.AddParameter(parameter.Name, parameter.Value);
@@ -42,9 +44,9 @@ public PSOutput Execute(Command psCommand)
 
             return ProcessExecutionResults(results);
         }
-        catch (Exception ex)
+        catch (Exception exception)
         {
-            return HandleExecutionException(ex);
+            return HandleExecutionException(exception);
         }
     }
 
@@ -53,7 +55,6 @@ public async Task<PSOutput> ExecuteAsync(Command command)
         try
         {
             _powerShell.Commands.Clear();
-
             PrepareCommand(command);
 
             PSDataCollection<PSObject> results = await _powerShell.InvokeAsync();
@@ -72,14 +73,14 @@ private PSOutput ProcessExecutionResults(IEnumerable<PSObject> results)
 
         if (_powerShell.HadErrors)
         {
-            foreach (var error in _powerShell.Streams.Error)
+            foreach (ErrorRecord error in _powerShell.Streams.Error)
             {
                 psOutput.StdErr.Add($"Error: {error}");
             }
         }
         else
         {
-            foreach (var result in results)
+            foreach (PSObject result in results)
             {
                 psOutput.StdOut.Add(result.ToString());
             }
diff --git a/ActiveDirectoryQuerier/RelayCommand.cs b/ActiveDirectoryQuerier/RelayCommand.cs
index dbdd134..8aadc00 100644
--- a/ActiveDirectoryQuerier/RelayCommand.cs
+++ b/ActiveDirectoryQuerier/RelayCommand.cs
@@ -6,7 +6,7 @@ namespace ActiveDirectoryQuerier;
 /// A command whose sole purpose is to relay its functionality to other objects by invoking delegates.
 /// </summary>
 /// <note>
-/// This is a very basic setup of the RelayCommand class. I imagine that this class can be expanded upon.
+/// This is a very basic setup of the RelayCommand class. I imagine that this class can be expanded and improved upon.
 /// </note>
 /// TODO: Place class into ViewModel folder.
 public class RelayCommand : ICommand

From f69ed5a48a0eb461b259f64f85f91a1744a802b7 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Mon, 11 Mar 2024 22:27:15 -0700
Subject: [PATCH 70/94] Remove TODO

---
 ActiveDirectoryQuerier/RelayCommand.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ActiveDirectoryQuerier/RelayCommand.cs b/ActiveDirectoryQuerier/RelayCommand.cs
index 8aadc00..9623f85 100644
--- a/ActiveDirectoryQuerier/RelayCommand.cs
+++ b/ActiveDirectoryQuerier/RelayCommand.cs
@@ -27,7 +27,6 @@ public bool CanExecute(object? parameter)
         return _canExecute?.Invoke(parameter) ?? true;
     }
     
-    // TODO: Perform null checking before calling the _execute property.
     public void Execute(object? parameter)
     {
         // For now, we are ignoring the warning about the parameter being null.

From 92d02582b9d10a5e24798d041d3aad43fdeeabba Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Mon, 11 Mar 2024 22:51:02 -0700
Subject: [PATCH 71/94] Update README.md

---
 README.md | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 45001ef..1dd1f42 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,11 @@
 [![Project Tracker](https://img.shields.io/badge/repo%20status-Project%20Tracker-lightgrey)](https://wiki.hthompson.dev/en/project-tracker)
 ![Platform](https://img.shields.io/badge/platform-Windows-lightgrey)
 [![Style Guide](https://img.shields.io/badge/code%20style-Style%20Guide-blueviolet)](https://gist.github.com/StrangeRanger/f7f87dd884760f3127adda98d3d4ab14)
+
+![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/StrangeRanger/FAFB-PowerShell-Tool/build-test-ci.yml)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/ce2ddca07a934a5f85e8061e295f3324)](https://app.codacy.com/gh/StrangeRanger/FAFB-PowerShell-Tool/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
+![Static Badge](https://img.shields.io/badge/state-Beta-orange)
+![GitHub release (latest by date)](https://img.shields.io/github/v/release/StrangeRanger/FAFB-PowerShell-Tool)
 
 Active Directory Querier is a Windows GUI for creating, saving, and executing one or more PowerShell commands, against a Local Active Directory.
 
@@ -11,12 +15,4 @@ Active Directory Querier is a Windows GUI for creating, saving, and executing on
 
 ### Installing
 
-Active Directory Querier does not require to be installed. Simply go to [the lastest releases tab](https://github.com/StrangeRanger/FAFB-PowerShell-Tool/releases), and download the version for your appropriate architecture...
-
-## Usage
-
-...
-
-## Supported Operating Systems
-
-...
+Active Directory Querier does not require the installation of any software. Simply go to [the lastest releases tab](https://github.com/StrangeRanger/FAFB-PowerShell-Tool/releases), and download the version for your appropriate architecture.

From 9f6df20e846d43609903ad67cd8f1cfa9e57e378 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Tue, 12 Mar 2024 14:15:04 -0700
Subject: [PATCH 72/94] Update naming convention...

---
 ActiveDirectoryQuerier/MainWindow.xaml        |  22 +-
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 254 ++++++++----------
 2 files changed, 124 insertions(+), 152 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index 7644f78..ebca106 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -97,7 +97,7 @@
                                 <!-- TODO: Pieter refer to here regarding combobox setup -->
                                 <TextBlock Grid.Row="0" Grid.Column="0" FontWeight="Bold" HorizontalAlignment="Center">Command</TextBlock>
                                 <ComboBox ItemsSource="{Binding ADCommands}"
-                                          SelectedItem="{Binding SelectedComboBoxCommandInQueryBuilder}"
+                                          SelectedItem="{Binding SelectedCommandFromComboBoxInQueryBuilder}"
                                           DisplayMemberPath="CommandText"
                                           HorizontalAlignment="Center"
                                           VerticalAlignment="Center"
@@ -108,7 +108,7 @@
 
                                 <!-- ItemsControl for Dynamic ComboBoxes -->
                                 <TextBlock Grid.Row="0" Grid.Column="1" FontWeight="Bold" HorizontalAlignment="Left">Parameter</TextBlock>
-                                <ItemsControl ItemsSource="{Binding DynamicParameterComboBoxes}"
+                                <ItemsControl ItemsSource="{Binding DynamicallyAvailableADCommandParametersComboBox}"
                                               Grid.Column="1"
                                               Grid.Row="1">
                                     <ItemsControl.ItemTemplate>
@@ -126,7 +126,7 @@
 
                                 <!-- Parameter Values ComboBox -->
                                 <TextBlock Grid.Row="0" Grid.Column="2" FontWeight="Bold" HorizontalAlignment="Left">Value</TextBlock>
-                                <ItemsControl ItemsSource="{Binding DynamicParameterValueTextBoxes}"
+                                <ItemsControl ItemsSource="{Binding DynamicallyAvailableADCommandParameterValueTextBox}"
                                               Grid.Column="2"
                                               Grid.Row="1">
                                     <ItemsControl.ItemTemplate>
@@ -148,30 +148,30 @@
                                         <MenuItem Header="Add New Command Slot"
                                                   Command="{Binding AddCommandComboBoxRelay}" />
                                         <MenuItem Header="Add New Parameter Slot"
-                                                  Command="{Binding AddParameterComboBoxRelay}" />
+                                                  Command="{Binding AddCommandParameterComboBoxRelay}" />
                                         <MenuItem Header="Remove Parameter Slot"
-                                                  Command="{Binding RemoveParameterComboBoxRelay}" />
-                                        <MenuItem Header="Save Query" Command="{Binding SaveCustomQueriesRelay}" />
-                                        <MenuItem Header="Execute" Command="{Binding ExecuteSelectedCommandRelay}" />
+                                                  Command="{Binding RemoveCommandParameterComboBoxRelay}" />
+                                        <MenuItem Header="Save Query" Command="{Binding SaveQueryRelay}" />
+                                        <MenuItem Header="Execute" Command="{Binding ExecuteQueryFromQueryBuilderRelay}" />
                                         <MenuItem Header="Execute to CSV" Command="{Binding OutputToCsvFileRelay}" />
                                         <MenuItem Header="Execute to Text" Command="{Binding OutputToTextFileRelay}" />
                                         <MenuItem Header="Export Console Output"
                                                   Command="{Binding ExportConsoleOutputRelay}" />
                                         <MenuItem Header="Clear Console Output"
-                                                  Command="{Binding ClearConsoleOutputRelay}" />
+                                                  Command="{Binding ClearConsoleOutputInQueryBuilderRelay}" />
                                         <MenuItem Header="Clear Query" Command="{Binding ClearQueryBuilderRelay}" />
                                     </MenuItem>
                                 </Menu>
                                 <!-- END of Button ComboBox-->
                                 <CheckBox Grid.Row="2" Grid.Column="0" Content="Editing" HorizontalAlignment="Left"
                                           Margin="10,6,10,0"
-                                          VerticalAlignment="Top" IsChecked="{Binding EditingEnabled}" Height="15"
+                                          VerticalAlignment="Top" IsChecked="{Binding QueryEditingEnabled}" Height="15"
                                           Width="57" />
                             </Grid>
                             <!-- ROW 0 END -->
                             <!-- GRID ROW 1 START -->
                             <!-- TextBox as Console Output -->
-                            <TextBox Grid.Row="1" Text="{Binding QueryBuilderConsoleOutput.ConsoleOutput}"
+                            <TextBox Grid.Row="1" Text="{Binding ConsoleOutputInQueryBuilder.ConsoleOutput}"
                                      HorizontalAlignment="Stretch"
                                      VerticalAlignment="Stretch" Margin="10" IsReadOnly="True" TextWrapping="Wrap"
                                      VerticalScrollBarVisibility="Auto" />
@@ -193,7 +193,7 @@
                                           Width="207"
                                           Height="26" />
                             </Grid>
-                            <TextBox Grid.Row="1" Text="{Binding ActiveDirectoryInfoConsoleOutput.ConsoleOutput}"
+                            <TextBox Grid.Row="1" Text="{Binding ConsoleOutputInActiveDirectoryInfo.ConsoleOutput}"
                                      HorizontalAlignment="Stretch"
                                      VerticalAlignment="Stretch" Margin="10" IsReadOnly="True" TextWrapping="Wrap"
                                      VerticalScrollBarVisibility="Auto" />
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 4050625..40065cd 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -23,13 +23,13 @@ public sealed class MainWindowViewModel : INotifyPropertyChanged
 
     // [[ Backing fields for properties ]] ------------------------------------------ //
 
-    private bool _editingEnabled;
+    private bool _queryEditingEnabled;
     private string _queryName;
     private string _queryDescription;
-    private AppConsole _queryBuilderConsoleOutput;
-    private AppConsole _activeDirectoryInfoConsoleOutput;
-    private Command? _selectedComboBoxCommandInQueryBuilder;
-    private ObservableCollection<Button>? _buttons;
+    private AppConsole _consoleOutputInQueryBuilder;
+    private AppConsole _consoleOutputInActiveDirectoryInfo;
+    private Command? _selectedCommandFromComboBoxInQueryBuilder;
+    private ObservableCollection<Button>? _buttons; // TODO: Rename to be more descriptive.
 
     // [[ Other fields ]] ----------------------------------------------------------- //
 
@@ -40,40 +40,34 @@ public sealed class MainWindowViewModel : INotifyPropertyChanged
 
     // [ Properties ] --------------------------------------------------------------- //
     // [[ Properties for backing fields ]] ------------------------------------------ //
-
-    /// <summary>
-    /// This is tied to the Editing checkbox and will allow the user to edit the custom queries or not to
-    /// </summary>
-    public bool EditingEnabled
+    
+    public bool QueryEditingEnabled
     {
-        get => _editingEnabled;
+        get => _queryEditingEnabled;
         set {
-            _editingEnabled = value;
-            OnPropertyChanged(nameof(EditingEnabled));
+            _queryEditingEnabled = value;
+            OnPropertyChanged(nameof(QueryEditingEnabled));
         }
     }
     
-    public AppConsole QueryBuilderConsoleOutput
+    public AppConsole ConsoleOutputInQueryBuilder
     {
-        get => _queryBuilderConsoleOutput;
+        get => _consoleOutputInQueryBuilder;
         set {
-            _queryBuilderConsoleOutput = value;
-            OnPropertyChanged(nameof(QueryBuilderConsoleOutput));
+            _consoleOutputInQueryBuilder = value;
+            OnPropertyChanged(nameof(ConsoleOutputInQueryBuilder));
         }
     }
 
-    public AppConsole ActiveDirectoryInfoConsoleOutput
+    public AppConsole ConsoleOutputInActiveDirectoryInfo
     {
-        get => _activeDirectoryInfoConsoleOutput;
+        get => _consoleOutputInActiveDirectoryInfo;
         set {
-            _activeDirectoryInfoConsoleOutput = value;
-            OnPropertyChanged(nameof(ActiveDirectoryInfoConsoleOutput));
+            _consoleOutputInActiveDirectoryInfo = value;
+            OnPropertyChanged(nameof(ConsoleOutputInActiveDirectoryInfo));
         }
     }
-
-    /// <summary>
-    /// The name of the query.
-    /// </summary>
+    
     public string QueryName
     {
         get => _queryName;
@@ -85,10 +79,7 @@ public string QueryName
             }
         }
     }
-
-    /// <summary>
-    /// The description of the query.
-    /// </summary>
+    
     public string QueryDescription
     {
         get => _queryDescription;
@@ -101,12 +92,12 @@ public string QueryDescription
         }
     }
     
-    public Command? SelectedComboBoxCommandInQueryBuilder
+    public Command? SelectedCommandFromComboBoxInQueryBuilder
     {
-        get => _selectedComboBoxCommandInQueryBuilder;
+        get => _selectedCommandFromComboBoxInQueryBuilder;
         set {
-            _selectedComboBoxCommandInQueryBuilder = value;
-            OnPropertyChanged(nameof(SelectedComboBoxCommandInQueryBuilder));
+            _selectedCommandFromComboBoxInQueryBuilder = value;
+            OnPropertyChanged(nameof(SelectedCommandFromComboBoxInQueryBuilder));
             // No need to load parameters if the command is null.
             if (value is not null)
             {
@@ -127,48 +118,32 @@ public Command? SelectedComboBoxCommandInQueryBuilder
     public ObservableCollection<Command> ADCommands { get; private set; }
     // ReSharper disable once InconsistentNaming
     public ObservableCollection<string>? AvailableADCommandParameters { get; private set; }
-
-    /// <summary>
-    /// Collection of ComboBoxParameterViewModels to dynamically handle multiple parameter selections.
-    /// </summary>
-    /// TODO: Rename this property?
-    public ObservableCollection<ComboBoxParameterViewModel> DynamicParameterComboBoxes { get; }
-
-    /// <summary>
-    /// Collection of ComboBoxParameterViewModels to dynamically handle multiple parameter value selections.
-    /// </summary>
-    /// TODO: Rename this property?
-    public ObservableCollection<TextBoxViewModel> DynamicParameterValueTextBoxes { get; }
-
-    /// <summary>
-    /// This is a helper command for running SaveCustomQueries
-    /// </summary>
-    public ICommand SaveCustomQueriesRelay { get; }
-
-    /// <summary>
-    /// This is the command tied to Clear Query calls the ClearQueryBuilder method
-    /// </summary>
-    public ICommand ClearQueryBuilderRelay { get; }
-
-    /// <summary>
-    /// This is the command for the edit option on custom queries
-    /// </summary>
-    private ICommand EditCustomQueryRelay { get; }
-
-    /// <summary>
-    /// This is tied to the Button menu calls the DeleteCustomQuery method to delete a CustomQuery button
-    /// </summary>
-    private ICommand DeleteCustomQueryRelay { get; }
+    // ReSharper disable once InconsistentNaming
+    public ObservableCollection<ComboBoxParameterViewModel> DynamicallyAvailableADCommandParametersComboBox { get; }
+    // ReSharper disable once InconsistentNaming
+    public ObservableCollection<TextBoxViewModel> DynamicallyAvailableADCommandParameterValueTextBox { get; }
+    
+    // [[ GUI element relays ]] ----------------------------------------------------- //
+    // [[[ Dynamically created elements ]]] ----------------------------------------- //
+    
+    private ICommand EditQueryFromQueryStackPanelRelay { get; }
+    private ICommand DeleteQueryFromQueryStackPanelRelay { get; }
+    private ICommand ExecuteQueryFromQueryStackPanelRelay { get; }
     
-    public ICommand ExecuteSelectedCommandRelay { get; }
-    private ICommand ExecuteCustomQueryCommandButtonRelay { get; }
-    public ICommand AddParameterComboBoxRelay { get; }
+    // [[[ Existing GUI elements ]]] ------------------------------------------------ //
+    
+    public ICommand SaveQueryRelay { get; }
+    public ICommand ClearQueryBuilderRelay { get; }
+    public ICommand ExecuteQueryFromQueryBuilderRelay { get; }
     public ICommand AddCommandComboBoxRelay { get; }
-    public ICommand RemoveParameterComboBoxRelay { get; }
+    public ICommand AddCommandParameterComboBoxRelay { get; }
+    public ICommand RemoveCommandParameterComboBoxRelay { get; }
     public ICommand OutputToTextFileRelay { get; }
     public ICommand OutputToCsvFileRelay { get; }
     public ICommand ExportConsoleOutputRelay { get; }
-    public ICommand ClearConsoleOutputRelay { get; }
+    public ICommand ClearConsoleOutputInQueryBuilderRelay { get; }
+    public ICommand ClearConsoleOutputInActiveDirectoryInfoRelay { get; }
+
 
     /* TODO: for Pieter
      *
@@ -185,28 +160,29 @@ public MainWindowViewModel()
     {
         _queryName = string.Empty;
         _queryDescription = string.Empty;
-        _queryBuilderConsoleOutput = new AppConsole();
-        _activeDirectoryInfoConsoleOutput = new AppConsole();
+        _consoleOutputInQueryBuilder = new AppConsole();
+        _consoleOutputInActiveDirectoryInfo = new AppConsole();
         _psExecutor = new PSExecutor();
         _customQuery = new CustomQueries();
         _currentQuery = new Query();
 
         ADCommands = new ObservableCollection<Command>();
-        DynamicParameterComboBoxes = new ObservableCollection<ComboBoxParameterViewModel>();
-        DynamicParameterValueTextBoxes = new ObservableCollection<TextBoxViewModel>();
+        DynamicallyAvailableADCommandParametersComboBox = new ObservableCollection<ComboBoxParameterViewModel>();
+        DynamicallyAvailableADCommandParameterValueTextBox = new ObservableCollection<TextBoxViewModel>();
 
-        ExecuteSelectedCommandRelay = new RelayCommand(ExecuteSelectedCommandAsync);
+        ExecuteQueryFromQueryBuilderRelay = new RelayCommand(ExecuteSelectedCommandAsync);
         OutputToCsvFileRelay = new RelayCommand(OutputToCsvFileAsync);
         OutputToTextFileRelay = new RelayCommand(OutputToTextFileAsync);
         ExportConsoleOutputRelay = new RelayCommand(ExportConsoleOutput);
-        AddParameterComboBoxRelay = new RelayCommand(AddParameterComboBox);
+        AddCommandParameterComboBoxRelay = new RelayCommand(AddParameterComboBox);
         AddCommandComboBoxRelay = new RelayCommand(AddCommandComboBox);
-        RemoveParameterComboBoxRelay = new RelayCommand(RemoveParameterComboBox);
-        SaveCustomQueriesRelay = new RelayCommand(SaveCustomQueries);
-        EditCustomQueryRelay = new RelayCommand(EditCustomQuery);
-        DeleteCustomQueryRelay = new RelayCommand(DeleteCustomQuery);
-        ExecuteCustomQueryCommandButtonRelay = new RelayCommand(ExecuteCustomQueryCommandButton);
-        ClearConsoleOutputRelay = new RelayCommand(ClearConsoleOutput);
+        RemoveCommandParameterComboBoxRelay = new RelayCommand(RemoveParameterComboBox);
+        SaveQueryRelay = new RelayCommand(SaveCustomQueries);
+        EditQueryFromQueryStackPanelRelay = new RelayCommand(EditCustomQuery);
+        DeleteQueryFromQueryStackPanelRelay = new RelayCommand(DeleteCustomQuery);
+        ExecuteQueryFromQueryStackPanelRelay = new RelayCommand(ExecuteCustomQueryCommandButton);
+        ClearConsoleOutputInQueryBuilderRelay = new RelayCommand(_ => ClearConsoleOutput(_consoleOutputInQueryBuilder));
+        ClearConsoleOutputInActiveDirectoryInfoRelay = new RelayCommand(_ => ClearConsoleOutput(_consoleOutputInActiveDirectoryInfo));
         ClearQueryBuilderRelay = new RelayCommand(ClearQueryBuilder);
         
         /* TODO: For Pieter
@@ -234,13 +210,9 @@ public MainWindowViewModel()
      * In this class, create a method or two, that will be used to execute the specific selected action.
      */
     
-    /// <summary>
-    /// This method will clear the console output and prompt the user if they are sure they want to clear the console.
-    /// </summary>
-    /// <param name="_">This is the object that the command is tied to.</param>
-    private void ClearConsoleOutput(object _)
+    private void ClearConsoleOutput(AppConsole appConsole)
     {
-        if (QueryBuilderConsoleOutput.ConsoleOutput.Length == 0)
+        if (appConsole.ConsoleOutput.Length == 0)
         {
             MessageBox.Show("The console is already clear.",
                             "Information",
@@ -257,7 +229,7 @@ private void ClearConsoleOutput(object _)
 
         if (result == MessageBoxResult.Yes)
         {
-            QueryBuilderConsoleOutput.Clear();
+            appConsole.Clear();
         }
     }
 
@@ -272,7 +244,7 @@ private void EditCustomQuery(object sender)
         Query currentQuery = (Query)currentButton.Tag;
 
         _isEditing = currentQuery;
-        EditingEnabled = true;
+        QueryEditingEnabled = true;
 
         // Need to fill in the queryName
         QueryName = currentQuery.QueryName;
@@ -283,19 +255,19 @@ private void EditCustomQuery(object sender)
         // Fill in the commandName
         Command chosenCommand =
             ADCommands.FirstOrDefault(item => item.CommandText == currentQuery.PSCommandName)!;
-        SelectedComboBoxCommandInQueryBuilder = chosenCommand;
+        SelectedCommandFromComboBoxInQueryBuilder = chosenCommand;
 
         // Load the Possible Parameters Synchronously
         ADCommandParameters adCommandParameters = new();
-        adCommandParameters.LoadAvailableParameters(SelectedComboBoxCommandInQueryBuilder);
+        adCommandParameters.LoadAvailableParameters(SelectedCommandFromComboBoxInQueryBuilder);
         AvailableADCommandParameters = new ObservableCollection<string>(adCommandParameters.AvailableParameters);
         OnPropertyChanged(nameof(AvailableADCommandParameters));
 
-        // Check to see if the DynamicParameterComboBoxes is empty and clear it if it is
-        if (DynamicParameterComboBoxes.Count != 0)
+        // Check to see if the DynamicallyAvailableADCommandParametersComboBox is empty and clear it if it is
+        if (DynamicallyAvailableADCommandParametersComboBox.Count != 0)
         {
-            DynamicParameterComboBoxes.Clear();
-            DynamicParameterValueTextBoxes.Clear();
+            DynamicallyAvailableADCommandParametersComboBox.Clear();
+            DynamicallyAvailableADCommandParameterValueTextBox.Clear();
         }
 
         // Fill in Parameters and values
@@ -308,8 +280,8 @@ private void EditCustomQuery(object sender)
             AddParameterComboBox(temp);
 
             // Fill in the parameter boxes
-            DynamicParameterComboBoxes[i].SelectedParameter = currentQuery.PSCommandParameters[i];
-            DynamicParameterValueTextBoxes[i].SelectedParameterValue = currentQuery.PSCommandParameterValues[i];
+            DynamicallyAvailableADCommandParametersComboBox[i].SelectedParameter = currentQuery.PSCommandParameters[i];
+            DynamicallyAvailableADCommandParameterValueTextBox[i].SelectedParameterValue = currentQuery.PSCommandParameterValues[i];
         }
     }
 
@@ -416,20 +388,20 @@ private async Task LoadCommandParametersAsync(Command? selectedCommand)
         OnPropertyChanged(nameof(AvailableADCommandParameters));
 
         // Update the possible properties of the ComboBoxParameterViewModels.
-        foreach (ComboBoxParameterViewModel comboBoxParameterViewModel in DynamicParameterComboBoxes)
+        foreach (ComboBoxParameterViewModel comboBoxParameterViewModel in DynamicallyAvailableADCommandParametersComboBox)
         {
             comboBoxParameterViewModel.AvailableParameters = AvailableADCommandParameters;
         }
     }
 
     /// <summary>
-    /// Executes the currently selected PowerShell command and updates the QueryBuilderConsoleOutput property with the result.
+    /// Executes the currently selected PowerShell command and updates the ConsoleOutputInQueryBuilder property with the result.
     /// </summary>
     /// <param name="command">The PowerShell command to execute.</param>
     /// <returns>A Task representing the asynchronous operation of executing the command.</returns>
     private async Task ExecuteSelectedCommandCoreAsync(Command? command = null)
     {
-        if (SelectedComboBoxCommandInQueryBuilder is null && command is null)
+        if (SelectedCommandFromComboBoxInQueryBuilder is null && command is null)
         {
             Trace.WriteLine("No command selected.");
             MessageBox.Show("To execute a command, you must first select a command.",
@@ -450,25 +422,25 @@ private async Task ExecuteSelectedCommandCoreAsync(Command? command = null)
             {
                 // Add selected parameters and their values to the command.
                 UpdateSelectedCommand();
-                result = await _psExecutor.ExecuteAsync(SelectedComboBoxCommandInQueryBuilder);
+                result = await _psExecutor.ExecuteAsync(SelectedCommandFromComboBoxInQueryBuilder);
             }
 
             if (result.HadErrors)
             {
-                QueryBuilderConsoleOutput.Append(result.StdErr);
+                ConsoleOutputInQueryBuilder.Append(result.StdErr);
                 return;
             }
 
-            QueryBuilderConsoleOutput.Append(result.StdOut);
+            ConsoleOutputInQueryBuilder.Append(result.StdOut);
         }
         catch (Exception ex)
         {
-            QueryBuilderConsoleOutput.Append($"Error executing command: {ex.Message}" + ex.Message);
+            ConsoleOutputInQueryBuilder.Append($"Error executing command: {ex.Message}" + ex.Message);
         }
     }
 
     /// <summary>
-    /// Adds a new parameter and value selection ComboBox to the DynamicParameterComboBoxes.
+    /// Adds a new parameter and value selection ComboBox to the DynamicallyAvailableADCommandParametersComboBox.
     /// </summary>
     /// <param name="_">This is the object that the command is bound to</param>
     private void AddParameterComboBox(object _)
@@ -484,8 +456,8 @@ private void AddParameterComboBox(object _)
             return;
         }
 
-        DynamicParameterComboBoxes.Add(new ComboBoxParameterViewModel(AvailableADCommandParameters));
-        DynamicParameterValueTextBoxes.Add(new TextBoxViewModel());
+        DynamicallyAvailableADCommandParametersComboBox.Add(new ComboBoxParameterViewModel(AvailableADCommandParameters));
+        DynamicallyAvailableADCommandParameterValueTextBox.Add(new TextBoxViewModel());
     }
 
     /// <summary>
@@ -521,7 +493,7 @@ private async void OutputToTextFileAsync(object _)
         {
             // Open document
             string filePath = saveFileDialog.FileName;
-            await File.WriteAllTextAsync(filePath, QueryBuilderConsoleOutput.ConsoleOutput);
+            await File.WriteAllTextAsync(filePath, ConsoleOutputInQueryBuilder.ConsoleOutput);
         }
     }
 
@@ -535,7 +507,7 @@ private async void OutputToCsvFileAsync(object _)
         await ExecuteSelectedCommandCoreAsync();
 
         var csv = new StringBuilder();
-        string[] output = QueryBuilderConsoleOutput.ConsoleOutput.Split(' ', '\n');
+        string[] output = ConsoleOutputInQueryBuilder.ConsoleOutput.Split(' ', '\n');
 
         for (int i = 0; i < output.Length - 2; i++)
         {
@@ -567,7 +539,7 @@ private async void OutputToCsvFileAsync(object _)
     /// <param name="_">This is the object that the command is bound to.</param>
     private void ExportConsoleOutput(object _)
     {
-        if (QueryBuilderConsoleOutput.ConsoleOutput.Length == 0)
+        if (ConsoleOutputInQueryBuilder.ConsoleOutput.Length == 0)
         {
             MessageBox.Show("The console is empty.", "Information", MessageBoxButton.OK, MessageBoxImage.Information);
             return;
@@ -580,7 +552,7 @@ private void ExportConsoleOutput(object _)
         if (result == true)
         {
             string filename = saveFileDialog.FileName;
-            QueryBuilderConsoleOutput.ExportToText(filename);
+            ConsoleOutputInQueryBuilder.ExportToText(filename);
         }
     }
 
@@ -593,7 +565,7 @@ private void ExportConsoleOutput(object _)
     /// </note>
     private void UpdateSelectedCommand()
     {
-        if (SelectedComboBoxCommandInQueryBuilder is null)
+        if (SelectedCommandFromComboBoxInQueryBuilder is null)
         {
             Trace.WriteLine("No command selected.");
             MessageBox.Show("To save a query, you must first select a command.",
@@ -606,12 +578,12 @@ private void UpdateSelectedCommand()
         // Try to get the content within the drop downs
         try
         {
-            SelectedComboBoxCommandInQueryBuilder.Parameters.Clear();
-            for (int i = 0; i < DynamicParameterComboBoxes.Count; i++)
+            SelectedCommandFromComboBoxInQueryBuilder.Parameters.Clear();
+            for (int i = 0; i < DynamicallyAvailableADCommandParametersComboBox.Count; i++)
             {
-                SelectedComboBoxCommandInQueryBuilder.Parameters.Add(
-                    new CommandParameter(DynamicParameterComboBoxes[i].SelectedParameter,
-                                         DynamicParameterValueTextBoxes[i].SelectedParameterValue));
+                SelectedCommandFromComboBoxInQueryBuilder.Parameters.Add(
+                    new CommandParameter(DynamicallyAvailableADCommandParametersComboBox[i].SelectedParameter,
+                                         DynamicallyAvailableADCommandParameterValueTextBox[i].SelectedParameterValue));
             }
         }
         catch (Exception ex)
@@ -636,18 +608,18 @@ private void GetCurrentQuery()
             string[] commandParameters;
             string[] commandParameterValues;
 
-            if (SelectedComboBoxCommandInQueryBuilder is not null && SelectedComboBoxCommandInQueryBuilder.Parameters is not null)
+            if (SelectedCommandFromComboBoxInQueryBuilder is not null && SelectedCommandFromComboBoxInQueryBuilder.Parameters is not null)
             {
-                commandParameters = new string[SelectedComboBoxCommandInQueryBuilder.Parameters.Count];
-                commandParameterValues = new string[SelectedComboBoxCommandInQueryBuilder.Parameters.Count];
+                commandParameters = new string[SelectedCommandFromComboBoxInQueryBuilder.Parameters.Count];
+                commandParameterValues = new string[SelectedCommandFromComboBoxInQueryBuilder.Parameters.Count];
 
                 _currentQuery.QueryDescription = QueryDescription;
                 _currentQuery.QueryName = QueryName;
-                _currentQuery.PSCommandName = SelectedComboBoxCommandInQueryBuilder.CommandText;
+                _currentQuery.PSCommandName = SelectedCommandFromComboBoxInQueryBuilder.CommandText;
                 
-                for (int i = 0; i < SelectedComboBoxCommandInQueryBuilder.Parameters.Count; i++)
+                for (int i = 0; i < SelectedCommandFromComboBoxInQueryBuilder.Parameters.Count; i++)
                 {
-                    CommandParameter commandParameter = SelectedComboBoxCommandInQueryBuilder.Parameters[i];
+                    CommandParameter commandParameter = SelectedCommandFromComboBoxInQueryBuilder.Parameters[i];
 
                     commandParameters[i] = commandParameter.Name;
                     commandParameterValues[i] = commandParameter.Value.ToString()!;
@@ -668,10 +640,10 @@ private void GetCurrentQuery()
     /// <param name="_">This is the CommandParameter object that this command is tied to</param>
     private void RemoveParameterComboBox(object _)
     {
-        if (DynamicParameterComboBoxes.Count != 0)
+        if (DynamicallyAvailableADCommandParametersComboBox.Count != 0)
         {
-            DynamicParameterComboBoxes.RemoveAt(DynamicParameterComboBoxes.Count - 1);
-            DynamicParameterValueTextBoxes.RemoveAt(DynamicParameterValueTextBoxes.Count - 1);
+            DynamicallyAvailableADCommandParametersComboBox.RemoveAt(DynamicallyAvailableADCommandParametersComboBox.Count - 1);
+            DynamicallyAvailableADCommandParameterValueTextBox.RemoveAt(DynamicallyAvailableADCommandParameterValueTextBox.Count - 1);
         }
         else
         {
@@ -688,7 +660,7 @@ private void RemoveParameterComboBox(object _)
     /// <param name="commandParameter">This is not used but necessary for the relay command</param>
     private void SaveCustomQueries(object commandParameter)
     {
-        if (SelectedComboBoxCommandInQueryBuilder is null)
+        if (SelectedCommandFromComboBoxInQueryBuilder is null)
         {
             Trace.WriteLine("No command selected.");
             MessageBox.Show("To save a query, you must first select a command.",
@@ -698,7 +670,7 @@ private void SaveCustomQueries(object commandParameter)
             return;
         }
 
-        if (_isEditing is not null && EditingEnabled)
+        if (_isEditing is not null && QueryEditingEnabled)
         {
             // CustomQueries.query editingQuery = _customQuery.Queries.Find(item => item == isEditing);
             GetCurrentQuery();
@@ -706,7 +678,7 @@ private void SaveCustomQueries(object commandParameter)
             _customQuery.Queries[_customQuery.Queries.IndexOf(_isEditing)] = _currentQuery;
             _customQuery.SaveQueriesToJson();
             _isEditing = null;
-            EditingEnabled = false;
+            QueryEditingEnabled = false;
         }
         else
         {
@@ -715,7 +687,7 @@ private void SaveCustomQueries(object commandParameter)
             {
                 UpdateSelectedCommand();
 
-                _customQuery.SerializeCommand(SelectedComboBoxCommandInQueryBuilder, QueryName, QueryDescription);
+                _customQuery.SerializeCommand(SelectedCommandFromComboBoxInQueryBuilder, QueryName, QueryDescription);
 
                 Button newButton = CreateCustomButton();
 
@@ -734,7 +706,7 @@ private void SaveCustomQueries(object commandParameter)
     /// <param name="_">Object that the command is tied to</param>
     private void ClearQueryBuilder(object _)
     {
-        if (SelectedComboBoxCommandInQueryBuilder is null && DynamicParameterComboBoxes.Count == 0)
+        if (SelectedCommandFromComboBoxInQueryBuilder is null && DynamicallyAvailableADCommandParametersComboBox.Count == 0)
         {
             MessageBox.Show("The query builder is already clear.",
                             "Information",
@@ -753,9 +725,9 @@ private void ClearQueryBuilder(object _)
         // If the user selects yes, clear the console
         if (result == MessageBoxResult.Yes)
         {
-            SelectedComboBoxCommandInQueryBuilder = null;
-            DynamicParameterComboBoxes.Clear();
-            DynamicParameterValueTextBoxes.Clear();
+            SelectedCommandFromComboBoxInQueryBuilder = null;
+            DynamicallyAvailableADCommandParametersComboBox.Clear();
+            DynamicallyAvailableADCommandParameterValueTextBox.Clear();
         }
     }
 
@@ -778,7 +750,7 @@ private Button CreateCustomButton(Query? query = null)
         else
         {
             // Check for null
-            if (SelectedComboBoxCommandInQueryBuilder is null)
+            if (SelectedCommandFromComboBoxInQueryBuilder is null)
             {
                 Trace.WriteLine("No command selected.");
                 MessageBox.Show("To save a query, you must first select a command.",
@@ -790,7 +762,7 @@ private Button CreateCustomButton(Query? query = null)
 
             GetCurrentQuery();
             newButton.Height = 48;
-            newButton.Content = QueryName.Length != 0 ? QueryName : SelectedComboBoxCommandInQueryBuilder.CommandText;
+            newButton.Content = QueryName.Length != 0 ? QueryName : SelectedCommandFromComboBoxInQueryBuilder.CommandText;
             newButton.Tag = _currentQuery;
         }
 
@@ -798,20 +770,20 @@ private Button CreateCustomButton(Query? query = null)
         ContextMenu contextMenu = new();
 
         MenuItem menuItem1 =
-            new() { Header = "Execute", Command = ExecuteCustomQueryCommandButtonRelay, CommandParameter = newButton };
+            new() { Header = "Execute", Command = ExecuteQueryFromQueryStackPanelRelay, CommandParameter = newButton };
 
         MenuItem outputToCsv = new() { Header = "Output to CSV", Command = OutputToCsvFileRelay };
         MenuItem outputToText = new() { Header = "Output to Text", Command = OutputToTextFileRelay };
-        MenuItem outputToConsole = new() { Header = "Execute to Console", Command = ExecuteSelectedCommandRelay };
+        MenuItem outputToConsole = new() { Header = "Execute to Console", Command = ExecuteQueryFromQueryBuilderRelay };
 
         menuItem1.Items.Add(outputToCsv);
         menuItem1.Items.Add(outputToText);
         menuItem1.Items.Add(outputToConsole);
 
-        MenuItem menuItem2 = new() { Header = "Edit", Command = EditCustomQueryRelay, CommandParameter = newButton };
+        MenuItem menuItem2 = new() { Header = "Edit", Command = EditQueryFromQueryStackPanelRelay, CommandParameter = newButton };
 
         MenuItem menuItem3 =
-            new() { Header = "Delete", Command = DeleteCustomQueryRelay, CommandParameter = newButton };
+            new() { Header = "Delete", Command = DeleteQueryFromQueryStackPanelRelay, CommandParameter = newButton };
 
         // Add menu item to the context menu
         contextMenu.Items.Add(menuItem1);

From 9c3d9b5bfcfe79b6923920a31fa257bc121859aa Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Tue, 12 Mar 2024 15:09:17 -0700
Subject: [PATCH 73/94] Can now redirect output and execution via parameter
 value/reference

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 74 ++++++++-----------
 1 file changed, 32 insertions(+), 42 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 40065cd..e0f8e18 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -135,6 +135,7 @@ public Command? SelectedCommandFromComboBoxInQueryBuilder
     public ICommand SaveQueryRelay { get; }
     public ICommand ClearQueryBuilderRelay { get; }
     public ICommand ExecuteQueryFromQueryBuilderRelay { get; }
+    public ICommand ExecuteQueryFromActiveDirectoryInfoRelay { get; } // TODO: Pieter use this for execution button
     public ICommand AddCommandComboBoxRelay { get; }
     public ICommand AddCommandParameterComboBoxRelay { get; }
     public ICommand RemoveCommandParameterComboBoxRelay { get; }
@@ -142,7 +143,7 @@ public Command? SelectedCommandFromComboBoxInQueryBuilder
     public ICommand OutputToCsvFileRelay { get; }
     public ICommand ExportConsoleOutputRelay { get; }
     public ICommand ClearConsoleOutputInQueryBuilderRelay { get; }
-    public ICommand ClearConsoleOutputInActiveDirectoryInfoRelay { get; }
+    public ICommand ClearConsoleOutputInActiveDirectoryInfoRelay { get; } // TODO: Pieter use this for clear console button
 
 
     /* TODO: for Pieter
@@ -169,18 +170,21 @@ public MainWindowViewModel()
         ADCommands = new ObservableCollection<Command>();
         DynamicallyAvailableADCommandParametersComboBox = new ObservableCollection<ComboBoxParameterViewModel>();
         DynamicallyAvailableADCommandParameterValueTextBox = new ObservableCollection<TextBoxViewModel>();
-
-        ExecuteQueryFromQueryBuilderRelay = new RelayCommand(ExecuteSelectedCommandAsync);
+        
         OutputToCsvFileRelay = new RelayCommand(OutputToCsvFileAsync);
         OutputToTextFileRelay = new RelayCommand(OutputToTextFileAsync);
         ExportConsoleOutputRelay = new RelayCommand(ExportConsoleOutput);
+        // TODO: Figure out how resolve the warning about the async method not being awaited.
+        ExecuteQueryFromQueryBuilderRelay = new RelayCommand(_ => ExecuteQuery(_consoleOutputInQueryBuilder));
+        // TODO: Figure out how resolve the warning about the async method not being awaited.
+        ExecuteQueryFromActiveDirectoryInfoRelay = new RelayCommand(_ => ExecuteQuery(_consoleOutputInActiveDirectoryInfo));
         AddCommandParameterComboBoxRelay = new RelayCommand(AddParameterComboBox);
         AddCommandComboBoxRelay = new RelayCommand(AddCommandComboBox);
-        RemoveCommandParameterComboBoxRelay = new RelayCommand(RemoveParameterComboBox);
-        SaveQueryRelay = new RelayCommand(SaveCustomQueries);
-        EditQueryFromQueryStackPanelRelay = new RelayCommand(EditCustomQuery);
-        DeleteQueryFromQueryStackPanelRelay = new RelayCommand(DeleteCustomQuery);
-        ExecuteQueryFromQueryStackPanelRelay = new RelayCommand(ExecuteCustomQueryCommandButton);
+        RemoveCommandParameterComboBoxRelay = new RelayCommand(RemoveCommandParameterComboBox);
+        SaveQueryRelay = new RelayCommand(SaveQuery);
+        EditQueryFromQueryStackPanelRelay = new RelayCommand(EditQueryFromQueryStackPane);
+        DeleteQueryFromQueryStackPanelRelay = new RelayCommand(DeleteQueryFromQueryStackPanel);
+        ExecuteQueryFromQueryStackPanelRelay = new RelayCommand(ExecuteQueryFromQueryStackPanel);
         ClearConsoleOutputInQueryBuilderRelay = new RelayCommand(_ => ClearConsoleOutput(_consoleOutputInQueryBuilder));
         ClearConsoleOutputInActiveDirectoryInfoRelay = new RelayCommand(_ => ClearConsoleOutput(_consoleOutputInActiveDirectoryInfo));
         ClearQueryBuilderRelay = new RelayCommand(ClearQueryBuilder);
@@ -237,7 +241,7 @@ private void ClearConsoleOutput(AppConsole appConsole)
     /// This method will edit the Query and fill out the field with the desired query and you can edit the query
     /// </summary>
     /// <param name="sender">This is the object that is clicked when executing</param>
-    private void EditCustomQuery(object sender)
+    private void EditQueryFromQueryStackPane(object sender)
     {
         // Get the button that we are editing
         Button currentButton = (Button)sender;
@@ -284,12 +288,8 @@ private void EditCustomQuery(object sender)
             DynamicallyAvailableADCommandParameterValueTextBox[i].SelectedParameterValue = currentQuery.PSCommandParameterValues[i];
         }
     }
-
-    /// <summary>
-    /// This method executes the CustomQuery.query.command that is tied to the custom query buttons
-    /// </summary>
-    /// <param name="_">This is the Button as a generic object that is clicked when executing</param>
-    private async void ExecuteCustomQueryCommandButton(object _)
+    
+    private async void ExecuteQueryFromQueryStackPanel(object _)
     {
         var currentButton = _ as Button;
 
@@ -304,14 +304,14 @@ private async void ExecuteCustomQueryCommandButton(object _)
         }
 
         Query buttonQuery = (Query)currentButton.Tag;
-        await ExecuteSelectedCommandCoreAsync(buttonQuery.Command);
+        await ExecuteQueryCoreAsync(ConsoleOutputInQueryBuilder, buttonQuery.Command);
     }
 
     /// <summary>
     /// This method deletes the button from the list and saves the changes to the file
     /// </summary>
     /// <param name="_">This is the Button as a generic object that is clicked when executing</param>
-    private void DeleteCustomQuery(object _)
+    private void DeleteQueryFromQueryStackPanel(object _)
     {
         // Delete a button from the custom queries list and from the file
         var currentButton = _ as Button;
@@ -356,19 +356,14 @@ private void LoadCustomQueries()
             Trace.WriteLine(ex);
         }
     }
-
-    /// <summary>
-    /// Executes the selected PowerShell command asynchronously.
-    /// </summary>
-    /// <param name="_">This is the object that the command is bound to.</param>
-    private async void ExecuteSelectedCommandAsync(object _)
+    
+    // TODO: Possibly change Task to void?
+    private async Task ExecuteQuery(AppConsole appConsole, Command? command = null)
     {
-        await ExecuteSelectedCommandCoreAsync();
+        await ExecuteQueryCoreAsync(appConsole, command);
     }
-
-    /// <summary>
-    /// Initializes the list of Active Directory commands asynchronously.
-    /// </summary>
+    
+    // TODO: Possibly change Task to void?
     private async Task InitializeActiveDirectoryCommandsAsync()
     {
         ObservableCollection<Command> list = await ADCommandsFetcher.GetADCommands();
@@ -393,13 +388,8 @@ private async Task LoadCommandParametersAsync(Command? selectedCommand)
             comboBoxParameterViewModel.AvailableParameters = AvailableADCommandParameters;
         }
     }
-
-    /// <summary>
-    /// Executes the currently selected PowerShell command and updates the ConsoleOutputInQueryBuilder property with the result.
-    /// </summary>
-    /// <param name="command">The PowerShell command to execute.</param>
-    /// <returns>A Task representing the asynchronous operation of executing the command.</returns>
-    private async Task ExecuteSelectedCommandCoreAsync(Command? command = null)
+    
+    private async Task ExecuteQueryCoreAsync(AppConsole appConsole, Command? command = null)
     {
         if (SelectedCommandFromComboBoxInQueryBuilder is null && command is null)
         {
@@ -427,15 +417,15 @@ private async Task ExecuteSelectedCommandCoreAsync(Command? command = null)
 
             if (result.HadErrors)
             {
-                ConsoleOutputInQueryBuilder.Append(result.StdErr);
+                appConsole.Append(result.StdErr);
                 return;
             }
 
-            ConsoleOutputInQueryBuilder.Append(result.StdOut);
+            appConsole.Append(result.StdOut);
         }
         catch (Exception ex)
         {
-            ConsoleOutputInQueryBuilder.Append($"Error executing command: {ex.Message}" + ex.Message);
+            appConsole.Append($"Error executing command: {ex.Message}" + ex.Message);
         }
     }
 
@@ -476,7 +466,7 @@ private void AddCommandComboBox(object _)
     /// <param name="_">Represents the object that the command is bound to.</param>
     private async void OutputToTextFileAsync(object _)
     {
-        await ExecuteSelectedCommandCoreAsync();
+        await ExecuteQueryCoreAsync(ConsoleOutputInQueryBuilder);
 
         // Filepath
         // Write the text to a file & prompt user for the location
@@ -504,7 +494,7 @@ private async void OutputToTextFileAsync(object _)
     /// <param name="_">Represents the object that the command is bound to</param>
     private async void OutputToCsvFileAsync(object _)
     {
-        await ExecuteSelectedCommandCoreAsync();
+        await ExecuteQueryCoreAsync(ConsoleOutputInQueryBuilder);
 
         var csv = new StringBuilder();
         string[] output = ConsoleOutputInQueryBuilder.ConsoleOutput.Split(' ', '\n');
@@ -638,7 +628,7 @@ private void GetCurrentQuery()
     /// Removes the parameter box after adding them
     /// </summary>
     /// <param name="_">This is the CommandParameter object that this command is tied to</param>
-    private void RemoveParameterComboBox(object _)
+    private void RemoveCommandParameterComboBox(object _)
     {
         if (DynamicallyAvailableADCommandParametersComboBox.Count != 0)
         {
@@ -658,7 +648,7 @@ private void RemoveParameterComboBox(object _)
     /// This method will serialize the command and add it to the list of buttons.
     /// </summary>
     /// <param name="commandParameter">This is not used but necessary for the relay command</param>
-    private void SaveCustomQueries(object commandParameter)
+    private void SaveQuery(object commandParameter)
     {
         if (SelectedCommandFromComboBoxInQueryBuilder is null)
         {

From f0ea8a54e04aec0bf80f8b5bead31ac949676f17 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Tue, 12 Mar 2024 15:16:54 -0700
Subject: [PATCH 74/94] Slight refactor of code

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index e0f8e18..70c87e6 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -236,28 +236,18 @@ private void ClearConsoleOutput(AppConsole appConsole)
             appConsole.Clear();
         }
     }
-
-    /// <summary>
-    /// This method will edit the Query and fill out the field with the desired query and you can edit the query
-    /// </summary>
-    /// <param name="sender">This is the object that is clicked when executing</param>
-    private void EditQueryFromQueryStackPane(object sender)
+    
+    private void EditQueryFromQueryStackPane(object queryButton)
     {
-        // Get the button that we are editing
-        Button currentButton = (Button)sender;
-        Query currentQuery = (Query)currentButton.Tag;
+        Query currentQuery = (Query)((Button)queryButton).Tag;
 
         _isEditing = currentQuery;
         QueryEditingEnabled = true;
-
-        // Need to fill in the queryName
         QueryName = currentQuery.QueryName;
-
-        // Fill in the queryDescription
         QueryDescription = currentQuery.QueryDescription;
 
         // Fill in the commandName
-        Command chosenCommand =
+        Command chosenCommand = 
             ADCommands.FirstOrDefault(item => item.CommandText == currentQuery.PSCommandName)!;
         SelectedCommandFromComboBoxInQueryBuilder = chosenCommand;
 

From 896ecfeea328d1b76536ac7bab314f94788bc39a Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Tue, 12 Mar 2024 15:32:28 -0700
Subject: [PATCH 75/94] Improve parameter name

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 27 +++++--------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 70c87e6..4c751bc 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -182,7 +182,7 @@ public MainWindowViewModel()
         AddCommandComboBoxRelay = new RelayCommand(AddCommandComboBox);
         RemoveCommandParameterComboBoxRelay = new RelayCommand(RemoveCommandParameterComboBox);
         SaveQueryRelay = new RelayCommand(SaveQuery);
-        EditQueryFromQueryStackPanelRelay = new RelayCommand(EditQueryFromQueryStackPane);
+        EditQueryFromQueryStackPanelRelay = new RelayCommand(EditQueryFromQueryStackPanel);
         DeleteQueryFromQueryStackPanelRelay = new RelayCommand(DeleteQueryFromQueryStackPanel);
         ExecuteQueryFromQueryStackPanelRelay = new RelayCommand(ExecuteQueryFromQueryStackPanel);
         ClearConsoleOutputInQueryBuilderRelay = new RelayCommand(_ => ClearConsoleOutput(_consoleOutputInQueryBuilder));
@@ -237,7 +237,7 @@ private void ClearConsoleOutput(AppConsole appConsole)
         }
     }
     
-    private void EditQueryFromQueryStackPane(object queryButton)
+    private void EditQueryFromQueryStackPanel(object queryButton)
     {
         Query currentQuery = (Query)((Button)queryButton).Tag;
 
@@ -279,11 +279,9 @@ private void EditQueryFromQueryStackPane(object queryButton)
         }
     }
     
-    private async void ExecuteQueryFromQueryStackPanel(object _)
+    private async void ExecuteQueryFromQueryStackPanel(object queryButton)
     {
-        var currentButton = _ as Button;
-
-        if (currentButton is null)
+        if (queryButton is not Button currentButton)
         {
             Trace.WriteLine("No button selected.");
             MessageBox.Show("To execute a query, you must first select a query.",
@@ -296,17 +294,10 @@ private async void ExecuteQueryFromQueryStackPanel(object _)
         Query buttonQuery = (Query)currentButton.Tag;
         await ExecuteQueryCoreAsync(ConsoleOutputInQueryBuilder, buttonQuery.Command);
     }
-
-    /// <summary>
-    /// This method deletes the button from the list and saves the changes to the file
-    /// </summary>
-    /// <param name="_">This is the Button as a generic object that is clicked when executing</param>
-    private void DeleteQueryFromQueryStackPanel(object _)
+    
+    private void DeleteQueryFromQueryStackPanel(object queryButton)
     {
-        // Delete a button from the custom queries list and from the file
-        var currentButton = _ as Button;
-
-        if (currentButton is null)
+        if (queryButton is not Button currentButton)
         {
             Trace.WriteLine("No button selected.");
             MessageBox.Show("To delete a query, you must first select a query.",
@@ -680,10 +671,6 @@ private void SaveQuery(object commandParameter)
         }
     }
 
-    /// <summary>
-    /// This method will clear the query builder and reset the fields to their default values
-    /// </summary>
-    /// <param name="_">Object that the command is tied to</param>
     private void ClearQueryBuilder(object _)
     {
         if (SelectedCommandFromComboBoxInQueryBuilder is null && DynamicallyAvailableADCommandParametersComboBox.Count == 0)

From 7eecc324bcda7277f7ed3ded4e1f990a69419f77 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Tue, 12 Mar 2024 16:31:27 -0700
Subject: [PATCH 76/94] More method renaming/refactoring

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 83 ++++++-------------
 1 file changed, 26 insertions(+), 57 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 4c751bc..8be8a1e 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -106,10 +106,7 @@ public Command? SelectedCommandFromComboBoxInQueryBuilder
             }
         }
     }
-
-    /// <summary>
-    /// This property creates a collection of buttons to be added to the stack panel for custom queries
-    /// </summary>
+    
     public ObservableCollection<Button> QueryButtonStackPanel => _buttons ??= new ObservableCollection<Button>();
 
     // [[ Other properties ]] ------------------------------------------------------- //
@@ -155,7 +152,7 @@ public Command? SelectedCommandFromComboBoxInQueryBuilder
      * Create a property to act as the relay to the execution button.
      */
 
-    // [ Constructors ] ------------------------------------------------------------- //
+    // [ Constructor ] ------------------------------------------------------------- //
     
     public MainWindowViewModel()
     {
@@ -171,16 +168,16 @@ public MainWindowViewModel()
         DynamicallyAvailableADCommandParametersComboBox = new ObservableCollection<ComboBoxParameterViewModel>();
         DynamicallyAvailableADCommandParameterValueTextBox = new ObservableCollection<TextBoxViewModel>();
         
-        OutputToCsvFileRelay = new RelayCommand(OutputToCsvFileAsync);
-        OutputToTextFileRelay = new RelayCommand(OutputToTextFileAsync);
-        ExportConsoleOutputRelay = new RelayCommand(ExportConsoleOutput);
+        OutputToCsvFileRelay = new RelayCommand(OutputExecutionResultsToCsvFileAsync);
+        OutputToTextFileRelay = new RelayCommand(OutputExecutionResultsToTextFileAsync);
+        ExportConsoleOutputRelay = new RelayCommand(ExportConsoleOutputToFile);
         // TODO: Figure out how resolve the warning about the async method not being awaited.
         ExecuteQueryFromQueryBuilderRelay = new RelayCommand(_ => ExecuteQuery(_consoleOutputInQueryBuilder));
         // TODO: Figure out how resolve the warning about the async method not being awaited.
         ExecuteQueryFromActiveDirectoryInfoRelay = new RelayCommand(_ => ExecuteQuery(_consoleOutputInActiveDirectoryInfo));
-        AddCommandParameterComboBoxRelay = new RelayCommand(AddParameterComboBox);
-        AddCommandComboBoxRelay = new RelayCommand(AddCommandComboBox);
-        RemoveCommandParameterComboBoxRelay = new RelayCommand(RemoveCommandParameterComboBox);
+        AddCommandParameterComboBoxRelay = new RelayCommand(AddParameterComboBoxInQueryBuilder);
+        AddCommandComboBoxRelay = new RelayCommand(AddCommandComboBoxInQueryBuilder);
+        RemoveCommandParameterComboBoxRelay = new RelayCommand(RemoveCommandParameterComboBoxInQueryBuilder);
         SaveQueryRelay = new RelayCommand(SaveQuery);
         EditQueryFromQueryStackPanelRelay = new RelayCommand(EditQueryFromQueryStackPanel);
         DeleteQueryFromQueryStackPanelRelay = new RelayCommand(DeleteQueryFromQueryStackPanel);
@@ -196,7 +193,7 @@ public MainWindowViewModel()
 
         // TODO: Figure out how resolve the warning about the async method not being awaited.
         InitializeActiveDirectoryCommandsAsync();
-        LoadCustomQueries(); // Calls method to deserialize and load buttons.
+        LoadSavedQueriesFromFile(); // Calls method to deserialize and load buttons.
     }
 
     // [ Methods ] ----------------------------------------------------------------- //
@@ -239,7 +236,7 @@ private void ClearConsoleOutput(AppConsole appConsole)
     
     private void EditQueryFromQueryStackPanel(object queryButton)
     {
-        Query currentQuery = (Query)((Button)queryButton).Tag;
+        var currentQuery = (Query)((Button)queryButton).Tag;
 
         _isEditing = currentQuery;
         QueryEditingEnabled = true;
@@ -265,13 +262,12 @@ private void EditQueryFromQueryStackPanel(object queryButton)
         }
 
         // Fill in Parameters and values
-        for (int i = 0; i < currentQuery.PSCommandParameters.Length; i++)
+        for (var i = 0; i < currentQuery.PSCommandParameters.Length; i++)
         {
             Trace.WriteLine(currentQuery.PSCommandParameters[i]);
 
             // Adds the Parameters boxes
-            object temp = new();
-            AddParameterComboBox(temp);
+            AddParameterComboBoxInQueryBuilder(null!);  // Null is never used, so we use null forgiveness operator.
 
             // Fill in the parameter boxes
             DynamicallyAvailableADCommandParametersComboBox[i].SelectedParameter = currentQuery.PSCommandParameters[i];
@@ -291,7 +287,7 @@ private async void ExecuteQueryFromQueryStackPanel(object queryButton)
             return;
         }
 
-        Query buttonQuery = (Query)currentButton.Tag;
+        var buttonQuery = (Query)currentButton.Tag;
         await ExecuteQueryCoreAsync(ConsoleOutputInQueryBuilder, buttonQuery.Command);
     }
     
@@ -311,27 +307,22 @@ private void DeleteQueryFromQueryStackPanel(object queryButton)
         _customQuery.Queries.Remove((Query)currentButton.Tag);
         _customQuery.SaveQueriesToJson();
     }
-
-    /// <summary>
-    /// This method will load the custom queries from the file.
-    /// </summary>
-    private void LoadCustomQueries()
+    
+    private void LoadSavedQueriesFromFile()
     {
         try
         {
             // Load the custom queries from the file (Deserialize)
             _customQuery.LoadData();
 
-            // Loop through the queries and create a button for each one
-            foreach (Query cQuery in _customQuery.Queries)
+            // Loop through the queries and create a button for each one.
+            foreach (var newButton in _customQuery.Queries.Select(CreateCustomButton))
             {
-                // Creates a new button for each query
-                Button newButton = CreateCustomButton(cQuery);
-
                 // Lastly add the button to the stack panel
                 QueryButtonStackPanel.Add(newButton);
             }
         }
+        // TODO: Possibly provide more comprehensive error handling.
         catch (Exception ex)
         {
             Trace.WriteLine(ex);
@@ -352,10 +343,6 @@ private async Task InitializeActiveDirectoryCommandsAsync()
         OnPropertyChanged(nameof(ADCommands));
     }
 
-    /// <summary>
-    /// Loads the parameters for the selected PowerShell command asynchronously.
-    /// </summary>
-    /// <param name="selectedCommand">The PowerShell command whose parameters are to be loaded.</param>
     private async Task LoadCommandParametersAsync(Command? selectedCommand)
     {
         ADCommandParameters adCommandParameters = new();
@@ -370,6 +357,7 @@ private async Task LoadCommandParametersAsync(Command? selectedCommand)
         }
     }
     
+    // TODO: Hunter: Re-review this method and make any necessary changes.
     private async Task ExecuteQueryCoreAsync(AppConsole appConsole, Command? command = null)
     {
         if (SelectedCommandFromComboBoxInQueryBuilder is null && command is null)
@@ -410,11 +398,7 @@ private async Task ExecuteQueryCoreAsync(AppConsole appConsole, Command? command
         }
     }
 
-    /// <summary>
-    /// Adds a new parameter and value selection ComboBox to the DynamicallyAvailableADCommandParametersComboBox.
-    /// </summary>
-    /// <param name="_">This is the object that the command is bound to</param>
-    private void AddParameterComboBox(object _)
+    private void AddParameterComboBoxInQueryBuilder(object _)
     {
         // Check if some variable is null and throw an exception if it is
         if (AvailableADCommandParameters is null)
@@ -431,11 +415,7 @@ private void AddParameterComboBox(object _)
         DynamicallyAvailableADCommandParameterValueTextBox.Add(new TextBoxViewModel());
     }
 
-    /// <summary>
-    /// Adds a new command selection ComboBox to the UI.
-    /// </summary>
-    /// <param name="_">This is the object that the command is bound to.</param>
-    private void AddCommandComboBox(object _)
+    private void AddCommandComboBoxInQueryBuilder(object _)
     {
         Trace.WriteLine("Not implemented yet.");
         MessageBox.Show("Not implemented yet.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
@@ -445,7 +425,7 @@ private void AddCommandComboBox(object _)
     /// This method executes the currently selected command and saves the output to a text file.
     /// </summary>
     /// <param name="_">Represents the object that the command is bound to.</param>
-    private async void OutputToTextFileAsync(object _)
+    private async void OutputExecutionResultsToTextFileAsync(object _)
     {
         await ExecuteQueryCoreAsync(ConsoleOutputInQueryBuilder);
 
@@ -473,7 +453,7 @@ private async void OutputToTextFileAsync(object _)
     /// Status: prompts user for file path and saves correctly though the string could be edited to be better
     /// </summary>
     /// <param name="_">Represents the object that the command is bound to</param>
-    private async void OutputToCsvFileAsync(object _)
+    private async void OutputExecutionResultsToCsvFileAsync(object _)
     {
         await ExecuteQueryCoreAsync(ConsoleOutputInQueryBuilder);
 
@@ -504,11 +484,7 @@ private async void OutputToCsvFileAsync(object _)
         }
     }
 
-    /// <summary>
-    /// This method is for getting the currently selected command at anytime.
-    /// </summary>
-    /// <param name="_">This is the object that the command is bound to.</param>
-    private void ExportConsoleOutput(object _)
+    private void ExportConsoleOutputToFile(object _)
     {
         if (ConsoleOutputInQueryBuilder.ConsoleOutput.Length == 0)
         {
@@ -599,17 +575,14 @@ private void GetCurrentQuery()
                 _currentQuery.PSCommandParameterValues = commandParameterValues;
             }
         }
+        // TODO: Possibly provide more comprehensive error handling.
         catch (Exception ex)
         {
             Trace.WriteLine(ex);
         }
     }
 
-    /// <summary>
-    /// Removes the parameter box after adding them
-    /// </summary>
-    /// <param name="_">This is the CommandParameter object that this command is tied to</param>
-    private void RemoveCommandParameterComboBox(object _)
+    private void RemoveCommandParameterComboBoxInQueryBuilder(object _)
     {
         if (DynamicallyAvailableADCommandParametersComboBox.Count != 0)
         {
@@ -625,10 +598,6 @@ private void RemoveCommandParameterComboBox(object _)
         }
     }
 
-    /// <summary>
-    /// This method will serialize the command and add it to the list of buttons.
-    /// </summary>
-    /// <param name="commandParameter">This is not used but necessary for the relay command</param>
     private void SaveQuery(object commandParameter)
     {
         if (SelectedCommandFromComboBoxInQueryBuilder is null)

From eb29b9b55830dc022bcaaa929b452f0489ada683 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Tue, 12 Mar 2024 16:33:08 -0700
Subject: [PATCH 77/94] Remove comment

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 8be8a1e..0c04e52 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -421,10 +421,6 @@ private void AddCommandComboBoxInQueryBuilder(object _)
         MessageBox.Show("Not implemented yet.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
     }
 
-    /// <summary>
-    /// This method executes the currently selected command and saves the output to a text file.
-    /// </summary>
-    /// <param name="_">Represents the object that the command is bound to.</param>
     private async void OutputExecutionResultsToTextFileAsync(object _)
     {
         await ExecuteQueryCoreAsync(ConsoleOutputInQueryBuilder);

From d5453ad88b0605d3c8c7d13a29994abe8fb73157 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Tue, 12 Mar 2024 16:35:23 -0700
Subject: [PATCH 78/94] Format with clang-format

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 98 +++++++++++--------
 .../PowerShell/PSExecutor.cs                  |  4 +-
 .../Queries/CustomQueries.cs                  | 12 +--
 ActiveDirectoryQuerier/RelayCommand.cs        | 10 +-
 4 files changed, 66 insertions(+), 58 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 0c04e52..5012219 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -40,7 +40,7 @@ public sealed class MainWindowViewModel : INotifyPropertyChanged
 
     // [ Properties ] --------------------------------------------------------------- //
     // [[ Properties for backing fields ]] ------------------------------------------ //
-    
+
     public bool QueryEditingEnabled
     {
         get => _queryEditingEnabled;
@@ -49,7 +49,7 @@ public bool QueryEditingEnabled
             OnPropertyChanged(nameof(QueryEditingEnabled));
         }
     }
-    
+
     public AppConsole ConsoleOutputInQueryBuilder
     {
         get => _consoleOutputInQueryBuilder;
@@ -67,7 +67,7 @@ public AppConsole ConsoleOutputInActiveDirectoryInfo
             OnPropertyChanged(nameof(ConsoleOutputInActiveDirectoryInfo));
         }
     }
-    
+
     public string QueryName
     {
         get => _queryName;
@@ -79,7 +79,7 @@ public string QueryName
             }
         }
     }
-    
+
     public string QueryDescription
     {
         get => _queryDescription;
@@ -91,7 +91,7 @@ public string QueryDescription
             }
         }
     }
-    
+
     public Command? SelectedCommandFromComboBoxInQueryBuilder
     {
         get => _selectedCommandFromComboBoxInQueryBuilder;
@@ -106,11 +106,11 @@ public Command? SelectedCommandFromComboBoxInQueryBuilder
             }
         }
     }
-    
+
     public ObservableCollection<Button> QueryButtonStackPanel => _buttons ??= new ObservableCollection<Button>();
 
     // [[ Other properties ]] ------------------------------------------------------- //
-    
+
     // ReSharper disable once InconsistentNaming
     public ObservableCollection<Command> ADCommands { get; private set; }
     // ReSharper disable once InconsistentNaming
@@ -119,16 +119,16 @@ public Command? SelectedCommandFromComboBoxInQueryBuilder
     public ObservableCollection<ComboBoxParameterViewModel> DynamicallyAvailableADCommandParametersComboBox { get; }
     // ReSharper disable once InconsistentNaming
     public ObservableCollection<TextBoxViewModel> DynamicallyAvailableADCommandParameterValueTextBox { get; }
-    
+
     // [[ GUI element relays ]] ----------------------------------------------------- //
     // [[[ Dynamically created elements ]]] ----------------------------------------- //
-    
+
     private ICommand EditQueryFromQueryStackPanelRelay { get; }
     private ICommand DeleteQueryFromQueryStackPanelRelay { get; }
     private ICommand ExecuteQueryFromQueryStackPanelRelay { get; }
-    
+
     // [[[ Existing GUI elements ]]] ------------------------------------------------ //
-    
+
     public ICommand SaveQueryRelay { get; }
     public ICommand ClearQueryBuilderRelay { get; }
     public ICommand ExecuteQueryFromQueryBuilderRelay { get; }
@@ -140,8 +140,9 @@ public Command? SelectedCommandFromComboBoxInQueryBuilder
     public ICommand OutputToCsvFileRelay { get; }
     public ICommand ExportConsoleOutputRelay { get; }
     public ICommand ClearConsoleOutputInQueryBuilderRelay { get; }
-    public ICommand ClearConsoleOutputInActiveDirectoryInfoRelay { get; } // TODO: Pieter use this for clear console button
-
+    public ICommand ClearConsoleOutputInActiveDirectoryInfoRelay {
+        get;
+    } // TODO: Pieter use this for clear console button
 
     /* TODO: for Pieter
      *
@@ -153,7 +154,7 @@ public Command? SelectedCommandFromComboBoxInQueryBuilder
      */
 
     // [ Constructor ] ------------------------------------------------------------- //
-    
+
     public MainWindowViewModel()
     {
         _queryName = string.Empty;
@@ -167,14 +168,16 @@ public MainWindowViewModel()
         ADCommands = new ObservableCollection<Command>();
         DynamicallyAvailableADCommandParametersComboBox = new ObservableCollection<ComboBoxParameterViewModel>();
         DynamicallyAvailableADCommandParameterValueTextBox = new ObservableCollection<TextBoxViewModel>();
-        
+
         OutputToCsvFileRelay = new RelayCommand(OutputExecutionResultsToCsvFileAsync);
         OutputToTextFileRelay = new RelayCommand(OutputExecutionResultsToTextFileAsync);
         ExportConsoleOutputRelay = new RelayCommand(ExportConsoleOutputToFile);
         // TODO: Figure out how resolve the warning about the async method not being awaited.
-        ExecuteQueryFromQueryBuilderRelay = new RelayCommand(_ => ExecuteQuery(_consoleOutputInQueryBuilder));
+        ExecuteQueryFromQueryBuilderRelay = new RelayCommand(
+            _ => ExecuteQuery(_consoleOutputInQueryBuilder));
         // TODO: Figure out how resolve the warning about the async method not being awaited.
-        ExecuteQueryFromActiveDirectoryInfoRelay = new RelayCommand(_ => ExecuteQuery(_consoleOutputInActiveDirectoryInfo));
+        ExecuteQueryFromActiveDirectoryInfoRelay = new RelayCommand(
+            _ => ExecuteQuery(_consoleOutputInActiveDirectoryInfo));
         AddCommandParameterComboBoxRelay = new RelayCommand(AddParameterComboBoxInQueryBuilder);
         AddCommandComboBoxRelay = new RelayCommand(AddCommandComboBoxInQueryBuilder);
         RemoveCommandParameterComboBoxRelay = new RelayCommand(RemoveCommandParameterComboBoxInQueryBuilder);
@@ -182,14 +185,15 @@ public MainWindowViewModel()
         EditQueryFromQueryStackPanelRelay = new RelayCommand(EditQueryFromQueryStackPanel);
         DeleteQueryFromQueryStackPanelRelay = new RelayCommand(DeleteQueryFromQueryStackPanel);
         ExecuteQueryFromQueryStackPanelRelay = new RelayCommand(ExecuteQueryFromQueryStackPanel);
-        ClearConsoleOutputInQueryBuilderRelay = new RelayCommand(_ => ClearConsoleOutput(_consoleOutputInQueryBuilder));
-        ClearConsoleOutputInActiveDirectoryInfoRelay = new RelayCommand(_ => ClearConsoleOutput(_consoleOutputInActiveDirectoryInfo));
+        ClearConsoleOutputInQueryBuilderRelay = new RelayCommand(
+            _ => ClearConsoleOutput(_consoleOutputInQueryBuilder));
+        ClearConsoleOutputInActiveDirectoryInfoRelay = new RelayCommand(
+            _ => ClearConsoleOutput(_consoleOutputInActiveDirectoryInfo));
         ClearQueryBuilderRelay = new RelayCommand(ClearQueryBuilder);
-        
+
         /* TODO: For Pieter
          * Connect the relay property to for the execute button to you method that performs the execution.
          */
-        
 
         // TODO: Figure out how resolve the warning about the async method not being awaited.
         InitializeActiveDirectoryCommandsAsync();
@@ -210,7 +214,7 @@ public MainWindowViewModel()
      *
      * In this class, create a method or two, that will be used to execute the specific selected action.
      */
-    
+
     private void ClearConsoleOutput(AppConsole appConsole)
     {
         if (appConsole.ConsoleOutput.Length == 0)
@@ -233,7 +237,7 @@ private void ClearConsoleOutput(AppConsole appConsole)
             appConsole.Clear();
         }
     }
-    
+
     private void EditQueryFromQueryStackPanel(object queryButton)
     {
         var currentQuery = (Query)((Button)queryButton).Tag;
@@ -244,8 +248,7 @@ private void EditQueryFromQueryStackPanel(object queryButton)
         QueryDescription = currentQuery.QueryDescription;
 
         // Fill in the commandName
-        Command chosenCommand = 
-            ADCommands.FirstOrDefault(item => item.CommandText == currentQuery.PSCommandName)!;
+        Command chosenCommand = ADCommands.FirstOrDefault(item => item.CommandText == currentQuery.PSCommandName)!;
         SelectedCommandFromComboBoxInQueryBuilder = chosenCommand;
 
         // Load the Possible Parameters Synchronously
@@ -267,14 +270,15 @@ private void EditQueryFromQueryStackPanel(object queryButton)
             Trace.WriteLine(currentQuery.PSCommandParameters[i]);
 
             // Adds the Parameters boxes
-            AddParameterComboBoxInQueryBuilder(null!);  // Null is never used, so we use null forgiveness operator.
+            AddParameterComboBoxInQueryBuilder(null!); // Null is never used, so we use null forgiveness operator.
 
             // Fill in the parameter boxes
             DynamicallyAvailableADCommandParametersComboBox[i].SelectedParameter = currentQuery.PSCommandParameters[i];
-            DynamicallyAvailableADCommandParameterValueTextBox[i].SelectedParameterValue = currentQuery.PSCommandParameterValues[i];
+            DynamicallyAvailableADCommandParameterValueTextBox[i].SelectedParameterValue =
+                currentQuery.PSCommandParameterValues[i];
         }
     }
-    
+
     private async void ExecuteQueryFromQueryStackPanel(object queryButton)
     {
         if (queryButton is not Button currentButton)
@@ -290,7 +294,7 @@ private async void ExecuteQueryFromQueryStackPanel(object queryButton)
         var buttonQuery = (Query)currentButton.Tag;
         await ExecuteQueryCoreAsync(ConsoleOutputInQueryBuilder, buttonQuery.Command);
     }
-    
+
     private void DeleteQueryFromQueryStackPanel(object queryButton)
     {
         if (queryButton is not Button currentButton)
@@ -307,7 +311,7 @@ private void DeleteQueryFromQueryStackPanel(object queryButton)
         _customQuery.Queries.Remove((Query)currentButton.Tag);
         _customQuery.SaveQueriesToJson();
     }
-    
+
     private void LoadSavedQueriesFromFile()
     {
         try
@@ -328,13 +332,13 @@ private void LoadSavedQueriesFromFile()
             Trace.WriteLine(ex);
         }
     }
-    
+
     // TODO: Possibly change Task to void?
     private async Task ExecuteQuery(AppConsole appConsole, Command? command = null)
     {
         await ExecuteQueryCoreAsync(appConsole, command);
     }
-    
+
     // TODO: Possibly change Task to void?
     private async Task InitializeActiveDirectoryCommandsAsync()
     {
@@ -351,12 +355,13 @@ private async Task LoadCommandParametersAsync(Command? selectedCommand)
         OnPropertyChanged(nameof(AvailableADCommandParameters));
 
         // Update the possible properties of the ComboBoxParameterViewModels.
-        foreach (ComboBoxParameterViewModel comboBoxParameterViewModel in DynamicallyAvailableADCommandParametersComboBox)
+        foreach (ComboBoxParameterViewModel comboBoxParameterViewModel in
+                     DynamicallyAvailableADCommandParametersComboBox)
         {
             comboBoxParameterViewModel.AvailableParameters = AvailableADCommandParameters;
         }
     }
-    
+
     // TODO: Hunter: Re-review this method and make any necessary changes.
     private async Task ExecuteQueryCoreAsync(AppConsole appConsole, Command? command = null)
     {
@@ -411,7 +416,8 @@ private void AddParameterComboBoxInQueryBuilder(object _)
             return;
         }
 
-        DynamicallyAvailableADCommandParametersComboBox.Add(new ComboBoxParameterViewModel(AvailableADCommandParameters));
+        DynamicallyAvailableADCommandParametersComboBox.Add(
+            new ComboBoxParameterViewModel(AvailableADCommandParameters));
         DynamicallyAvailableADCommandParameterValueTextBox.Add(new TextBoxViewModel());
     }
 
@@ -551,7 +557,8 @@ private void GetCurrentQuery()
             string[] commandParameters;
             string[] commandParameterValues;
 
-            if (SelectedCommandFromComboBoxInQueryBuilder is not null && SelectedCommandFromComboBoxInQueryBuilder.Parameters is not null)
+            if (SelectedCommandFromComboBoxInQueryBuilder is not null &&
+                SelectedCommandFromComboBoxInQueryBuilder.Parameters is not null)
             {
                 commandParameters = new string[SelectedCommandFromComboBoxInQueryBuilder.Parameters.Count];
                 commandParameterValues = new string[SelectedCommandFromComboBoxInQueryBuilder.Parameters.Count];
@@ -559,7 +566,7 @@ private void GetCurrentQuery()
                 _currentQuery.QueryDescription = QueryDescription;
                 _currentQuery.QueryName = QueryName;
                 _currentQuery.PSCommandName = SelectedCommandFromComboBoxInQueryBuilder.CommandText;
-                
+
                 for (int i = 0; i < SelectedCommandFromComboBoxInQueryBuilder.Parameters.Count; i++)
                 {
                     CommandParameter commandParameter = SelectedCommandFromComboBoxInQueryBuilder.Parameters[i];
@@ -582,8 +589,10 @@ private void RemoveCommandParameterComboBoxInQueryBuilder(object _)
     {
         if (DynamicallyAvailableADCommandParametersComboBox.Count != 0)
         {
-            DynamicallyAvailableADCommandParametersComboBox.RemoveAt(DynamicallyAvailableADCommandParametersComboBox.Count - 1);
-            DynamicallyAvailableADCommandParameterValueTextBox.RemoveAt(DynamicallyAvailableADCommandParameterValueTextBox.Count - 1);
+            DynamicallyAvailableADCommandParametersComboBox.RemoveAt(
+                DynamicallyAvailableADCommandParametersComboBox.Count - 1);
+            DynamicallyAvailableADCommandParameterValueTextBox.RemoveAt(
+                DynamicallyAvailableADCommandParameterValueTextBox.Count - 1);
         }
         else
         {
@@ -638,7 +647,8 @@ private void SaveQuery(object commandParameter)
 
     private void ClearQueryBuilder(object _)
     {
-        if (SelectedCommandFromComboBoxInQueryBuilder is null && DynamicallyAvailableADCommandParametersComboBox.Count == 0)
+        if (SelectedCommandFromComboBoxInQueryBuilder is null &&
+            DynamicallyAvailableADCommandParametersComboBox.Count == 0)
         {
             MessageBox.Show("The query builder is already clear.",
                             "Information",
@@ -694,7 +704,8 @@ private Button CreateCustomButton(Query? query = null)
 
             GetCurrentQuery();
             newButton.Height = 48;
-            newButton.Content = QueryName.Length != 0 ? QueryName : SelectedCommandFromComboBoxInQueryBuilder.CommandText;
+            newButton.Content =
+                QueryName.Length != 0 ? QueryName : SelectedCommandFromComboBoxInQueryBuilder.CommandText;
             newButton.Tag = _currentQuery;
         }
 
@@ -712,7 +723,8 @@ private Button CreateCustomButton(Query? query = null)
         menuItem1.Items.Add(outputToText);
         menuItem1.Items.Add(outputToConsole);
 
-        MenuItem menuItem2 = new() { Header = "Edit", Command = EditQueryFromQueryStackPanelRelay, CommandParameter = newButton };
+        MenuItem menuItem2 =
+            new() { Header = "Edit", Command = EditQueryFromQueryStackPanelRelay, CommandParameter = newButton };
 
         MenuItem menuItem3 =
             new() { Header = "Delete", Command = DeleteQueryFromQueryStackPanelRelay, CommandParameter = newButton };
@@ -728,7 +740,7 @@ private Button CreateCustomButton(Query? query = null)
     }
 
     // [[ Event Handlers ]] --------------------------------------------------------- //
-    
+
     private void OnPropertyChanged(string propertyName)
     {
         PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
diff --git a/ActiveDirectoryQuerier/PowerShell/PSExecutor.cs b/ActiveDirectoryQuerier/PowerShell/PSExecutor.cs
index c4c2b57..e8fad18 100644
--- a/ActiveDirectoryQuerier/PowerShell/PSExecutor.cs
+++ b/ActiveDirectoryQuerier/PowerShell/PSExecutor.cs
@@ -25,9 +25,9 @@ public PSExecutor()
     private void PrepareCommand(Command psCommand)
     {
         ArgumentNullException.ThrowIfNull(psCommand);
-        
+
         _powerShell.Commands.AddCommand(psCommand.CommandText);
-        
+
         foreach (var parameter in psCommand.Parameters)
         {
             _powerShell.Commands.AddParameter(parameter.Name, parameter.Value);
diff --git a/ActiveDirectoryQuerier/Queries/CustomQueries.cs b/ActiveDirectoryQuerier/Queries/CustomQueries.cs
index 1aa266e..39285eb 100644
--- a/ActiveDirectoryQuerier/Queries/CustomQueries.cs
+++ b/ActiveDirectoryQuerier/Queries/CustomQueries.cs
@@ -50,12 +50,8 @@ public void SerializeCommand(Command? psCommand, string queryName, string queryD
         string[] commandParameters = new string[psCommand.Parameters.Count];
         string[] commandParameterValues = new string[psCommand.Parameters.Count];
         CustomQueries customQueries = new();
-        Query newQuery = new(psCommand.CommandText)
-        {
-            QueryName = queryName,
-            QueryDescription = queryDescription
-        };
-        
+        Query newQuery = new(psCommand.CommandText) { QueryName = queryName, QueryDescription = queryDescription };
+
         // TODO: Determine if this line is necessary.
         Trace.WriteLine(psCommand.Parameters.Count);
 
@@ -69,13 +65,13 @@ public void SerializeCommand(Command? psCommand, string queryName, string queryD
             commandParameters[i] = param.Name;
             commandParameterValues[i] = param.Value.ToString();
         }
-        
+
         newQuery.PSCommandParameters = commandParameters;
         newQuery.PSCommandParameterValues = commandParameterValues;
 
         Queries.Add(newQuery);
         customQueries.SaveQueriesToJson();
-        
+
         try
         {
             string serializedJsonQueries = JsonSerializer.Serialize(Queries, _options);
diff --git a/ActiveDirectoryQuerier/RelayCommand.cs b/ActiveDirectoryQuerier/RelayCommand.cs
index 9623f85..d4bdc13 100644
--- a/ActiveDirectoryQuerier/RelayCommand.cs
+++ b/ActiveDirectoryQuerier/RelayCommand.cs
@@ -13,7 +13,7 @@ public class RelayCommand : ICommand
 {
     private readonly Action<object> _execute;
     private readonly Predicate<object?>? _canExecute;
-    
+
     /// <param name="execute">The execution logic.</param>
     /// <param name="canExecute">The execution status logic.</param>
     public RelayCommand(Action<object> execute, Predicate<object?>? canExecute = null)
@@ -21,24 +21,24 @@ public RelayCommand(Action<object> execute, Predicate<object?>? canExecute = nul
         _execute = execute;
         _canExecute = canExecute;
     }
-    
+
     public bool CanExecute(object? parameter)
     {
         return _canExecute?.Invoke(parameter) ?? true;
     }
-    
+
     public void Execute(object? parameter)
     {
         // For now, we are ignoring the warning about the parameter being null.
         _execute(parameter!);
     }
-    
+
     public event EventHandler? CanExecuteChanged
     {
         add => CommandManager.RequerySuggested += value;
         remove => CommandManager.RequerySuggested -= value;
     }
-    
+
     public void RaiseCanExecuteChanged()
     {
         CommandManager.InvalidateRequerySuggested();

From d5d57516749c092882ba15e72b3beca62fb13dad Mon Sep 17 00:00:00 2001
From: J0seph0 <103216770+J0seph0@users.noreply.github.com>
Date: Tue, 12 Mar 2024 22:09:23 -0700
Subject: [PATCH 79/94] Added the ability to import a custom queries location

---
 ActiveDirectoryQuerier/MainWindow.xaml        | 14 +++-
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 24 +++++++
 .../Queries/CustomQueries.cs                  | 72 ++++++++++++-------
 ActiveDirectoryQuerier/Queries/Query.cs       | 24 ++-----
 4 files changed, 87 insertions(+), 47 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index ebca106..21fcc94 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -10,6 +10,10 @@
         <activeDirectoryQuerier:MainWindowViewModel />
     </Window.DataContext>
     <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="93*"/>
+            <ColumnDefinition Width="547*"/>
+        </Grid.ColumnDefinitions>
         <!-- Define Columns. -->
         <!--<Grid.ColumnDefinitions><ColumnDefinition Width="119*"/><ColumnDefinition Width="681*"/></Grid.ColumnDefinitions>-->
         <!-- Define Rows. -->
@@ -18,9 +22,15 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <!-- Static Header Bar. -->
-        <Border Grid.Row="0" Grid.Column="0" Background="DarkGray" Height="42" />
+        <Border Grid.Row="0" Background="DarkGray" Height="42" Grid.ColumnSpan="2" >
+            <Menu Width="50" Height="20" HorizontalAlignment="Left" VerticalAlignment="Top">
+                <MenuItem Header="File"  Width="Auto" Height="Auto" >
+                    <MenuItem Header="Import Queries" Command="{Binding ImportQueryFileRelay}"/>
+                </MenuItem>
+            </Menu>
+        </Border>
         <!-- Grid for resizable content. -->
-        <Grid Grid.Row="1">
+        <Grid Grid.Row="1" Grid.ColumnSpan="2">
             <!-- Define Columns for resizable area. -->
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="250" MinWidth="200" />
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 5012219..3ace338 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -140,6 +140,7 @@ public Command? SelectedCommandFromComboBoxInQueryBuilder
     public ICommand OutputToCsvFileRelay { get; }
     public ICommand ExportConsoleOutputRelay { get; }
     public ICommand ClearConsoleOutputInQueryBuilderRelay { get; }
+    public ICommand ImportQueryFileRelay { get; }
     public ICommand ClearConsoleOutputInActiveDirectoryInfoRelay {
         get;
     } // TODO: Pieter use this for clear console button
@@ -178,6 +179,7 @@ public MainWindowViewModel()
         // TODO: Figure out how resolve the warning about the async method not being awaited.
         ExecuteQueryFromActiveDirectoryInfoRelay = new RelayCommand(
             _ => ExecuteQuery(_consoleOutputInActiveDirectoryInfo));
+        ImportQueryFileRelay = new RelayCommand(ImportQueryFile);
         AddCommandParameterComboBoxRelay = new RelayCommand(AddParameterComboBoxInQueryBuilder);
         AddCommandComboBoxRelay = new RelayCommand(AddCommandComboBoxInQueryBuilder);
         RemoveCommandParameterComboBoxRelay = new RelayCommand(RemoveCommandParameterComboBoxInQueryBuilder);
@@ -333,6 +335,28 @@ private void LoadSavedQueriesFromFile()
         }
     }
 
+    private void ImportQueryFile(object _)
+    {
+        OpenFileDialog dialog = new() {
+            FileName = "CustomQueries.dat", 
+            Filter = "All files(*.*) | *.*"
+        };
+
+
+        // Display
+        bool? result = dialog.ShowDialog();
+
+        // Get file and write text
+        if (result == true)
+        {
+            // Open document
+            _customQuery.CustomQueryFileLocation = dialog.FileName;
+
+            QueryButtonStackPanel.Clear();
+            LoadSavedQueriesFromFile();
+        }
+    }
+
     // TODO: Possibly change Task to void?
     private async Task ExecuteQuery(AppConsole appConsole, Command? command = null)
     {
diff --git a/ActiveDirectoryQuerier/Queries/CustomQueries.cs b/ActiveDirectoryQuerier/Queries/CustomQueries.cs
index 39285eb..02d9d93 100644
--- a/ActiveDirectoryQuerier/Queries/CustomQueries.cs
+++ b/ActiveDirectoryQuerier/Queries/CustomQueries.cs
@@ -1,8 +1,10 @@
-using System.Diagnostics;
+using System;
+using System.Diagnostics;
 using System.IO;
 using System.Management.Automation.Runspaces;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using System.Windows;
 
 namespace ActiveDirectoryQuerier.Queries;
 
@@ -10,11 +12,12 @@ namespace ActiveDirectoryQuerier.Queries;
 /// This class is used to save a json file named "CustomQueries.dat" inside of
 /// \ActiveDirectoryQuerier\ActiveDirectoryQuerier\bin\Debug\net6.0-windows This
 /// </summary>
-/// TODO: Remove property descriptions if name is descriptive enough, or provide a detailed description if it is not.
 public class CustomQueries
 {
     public List<Query> Queries { get; private set; } = new();
 
+    public string CustomQueryFileLocation = "";
+
     /// <summary>
     /// This a variable for feeding options to the Json serializer
     /// </summary>
@@ -32,69 +35,86 @@ public void SaveQueriesToJson()
         try
         {
             string serializedJsonQueries = JsonSerializer.Serialize(Queries, _options);
-            File.WriteAllText("CustomQueries.dat", serializedJsonQueries);
+            if(CustomQueryFileLocation == "")
+            {
+                File.WriteAllText("CustomQueries.dat", serializedJsonQueries);
+
+            } else
+            {
+                File.WriteAllText(CustomQueryFileLocation, serializedJsonQueries);
+            }        
         }
-        // TODO: Possibly provide more comprehensive error handling.
         catch (Exception ex)
         {
-            Trace.WriteLine(ex);
+
+            MessageBox.Show(ex.Message);
         }
     }
 
     /// <summary>
     /// This method is for serializing a command type, so it converts the type to a query and then serializes it
     /// </summary>
-    /// TODO: Fix any and all warnings about possible null values.
+    /// <param name="psCommand">Command class that you want to serialize</param>
+    /// <param name="queryDescription">Description field of the Query</param>
+    /// <param name="queryName">Query Name</param>
     public void SerializeCommand(Command? psCommand, string queryName, string queryDescription)
     {
-        string[] commandParameters = new string[psCommand.Parameters.Count];
+        string[] commandParameters = new string[psCommand!.Parameters.Count];
         string[] commandParameterValues = new string[psCommand.Parameters.Count];
-        CustomQueries customQueries = new();
         Query newQuery = new(psCommand.CommandText) { QueryName = queryName, QueryDescription = queryDescription };
 
-        // TODO: Determine if this line is necessary.
-        Trace.WriteLine(psCommand.Parameters.Count);
-
         // Iterate over the parameters and add them to the string
         for (int i = 0; i < psCommand.Parameters.Count; i++)
         {
             CommandParameter param = psCommand.Parameters[i];
 
-            Trace.WriteLine(param.Name + " Value: ");
-
             commandParameters[i] = param.Name;
-            commandParameterValues[i] = param.Value.ToString();
+            commandParameterValues[i] = param.Value.ToString()!;
         }
 
         newQuery.PSCommandParameters = commandParameters;
         newQuery.PSCommandParameterValues = commandParameterValues;
 
         Queries.Add(newQuery);
-        customQueries.SaveQueriesToJson();
+        SaveQueriesToJson();
 
         try
         {
             string serializedJsonQueries = JsonSerializer.Serialize(Queries, _options);
-            Trace.WriteLine(serializedJsonQueries);
-            File.WriteAllText("CustomQueries.dat", serializedJsonQueries);
+            if (CustomQueryFileLocation == "")
+            {
+                File.WriteAllText("CustomQueries.dat", serializedJsonQueries);
+
+            }
+            else
+            {
+                File.WriteAllText(CustomQueryFileLocation, serializedJsonQueries);
+            }
         }
-        // TODO: Possibly provide more comprehensive error handling.
         catch (Exception ex)
         {
-            Trace.WriteLine(ex);
+            MessageBox.Show(ex.Message);
         }
     }
     /// <summary>
     /// This method Loads the string from the saved file "CustomQueries.dat" then gives it to the Queries List
     /// </summary>
-    /// TODO: Fix any and all warnings about possible null values.
     public void LoadData()
     {
         try
         {
             // Opens file and reads it then adds the json to the Queries List
-            string json = File.ReadAllText("CustomQueries.dat");
-            Queries = JsonSerializer.Deserialize<List<Query>>(json, _options);
+            string json;
+            if (CustomQueryFileLocation == "")
+            {
+                json = File.ReadAllText("CustomQueries.dat");
+
+            }
+            else
+            {
+                json = File.ReadAllText(CustomQueryFileLocation);
+            }
+            Queries = JsonSerializer.Deserialize<List<Query>>(json, _options)!;
 
             // Now we want to fill the command variable for each query
             foreach (Query query in Queries)
@@ -106,9 +126,7 @@ public void LoadData()
                 {
                     for (int i = 0; i < query.PSCommandParameters.Length; i++)
                     {
-                        psCommand.Parameters.Add(query.PSCommandParameters[i], query.PSCommandParameterValues[i]);
-                        // the values are working then we will use this
-                        // command.Parameters.Add(q.ADCommandParameters[i]);
+                        psCommand.Parameters.Add(query.PSCommandParameters[i], query.PSCommandParameterValues![i]);
                     }
                 }
 
@@ -116,10 +134,10 @@ public void LoadData()
                 query.Command = psCommand;
             }
         }
-        // TODO: Possibly provide more comprehensive error handling.
         catch (Exception exception)
         {
-            Trace.WriteLine(exception);
+            
+            Trace.WriteLine(exception.Message);
         }
     }
 }
diff --git a/ActiveDirectoryQuerier/Queries/Query.cs b/ActiveDirectoryQuerier/Queries/Query.cs
index 67a708c..828e72b 100644
--- a/ActiveDirectoryQuerier/Queries/Query.cs
+++ b/ActiveDirectoryQuerier/Queries/Query.cs
@@ -9,8 +9,6 @@ public class Query
     /// <summary>
     /// Command that should help with Binding the command to the query for the buttons sake
     /// </summary>
-    /// TODO: Give a better description of what this property does, and rename it to something more descriptive.
-    /// TODO: Determine if this property should be nullable.
     [JsonIgnore]
     public Command? Command { get; set; }
 
@@ -18,43 +16,34 @@ public class Query
     /// Used for serializing the Command Name
     /// </summary>
     // ReSharper disable once InconsistentNaming
-    public string PSCommandName { get; set; }
+    public string? PSCommandName { get; set; }
 
     /// <summary>
     /// Used for Serializing the Commands parameters
     /// </summary>
     // ReSharper disable once InconsistentNaming
-    public string[] PSCommandParameters { get; set; }
+    public string[]? PSCommandParameters { get; set; }
 
     /// <summary>
     /// Used for Serializing the Commands parameters
     /// </summary>
     // ReSharper disable once InconsistentNaming
-    public string[] PSCommandParameterValues { get; set; }
+    public string[]? PSCommandParameterValues { get; set; }
 
     /// <summary>
     /// Used for the name of the custom Query
     /// </summary>
-    public string QueryName { get; set; }
+    public string? QueryName { get; set; }
 
     /// <summary>
     /// Used for the Custom Queries Description
     /// </summary>
-    public string QueryDescription { get; set; }
-
-    // Constructor for the query class
-    // TODO: Remove commented code if it is not needed.
-    /*public Query(string psCommandName, string[] commandParams)
-    {
-        PSCommandName = psCommandName;
-        ADCommandParameters = commandParams;
-    }*/
+    public string? QueryDescription { get; set; }
 
     /// <summary>
     /// Constructor for the query class
     /// </summary>
-    /// <param name="psCommandName"></param>
-    /// TODO: Fix any and all warnings about possible null values.
+    /// <param name="psCommandName">Name of the Command EX. get-adusers</param>
     public Query(string psCommandName)
     {
         PSCommandName = psCommandName;
@@ -63,7 +52,6 @@ public Query(string psCommandName)
     /// <summary>
     /// Empty constructor for the query class
     /// </summary>
-    /// TODO: Fix any and all warnings about possible null values.
     public Query()
     { }
 }

From e818467a64214027103a1c5bc99e265988a7b121 Mon Sep 17 00:00:00 2001
From: Pieter Sobtafo Assonken <lsobtafo@ewu.edu>
Date: Tue, 12 Mar 2024 22:26:12 -0700
Subject: [PATCH 80/94] Drop down menu with users

Added property for ComboBox dropdown options/text, property to contain the selected item and Property to act as the relay to the execution button
---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 3ace338..8ca5287 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -153,7 +153,29 @@ public ICommand ClearConsoleOutputInActiveDirectoryInfoRelay {
      *
      * Create a property to act as the relay to the execution button.
      */
+    
+    //NEW CODE
+    // Property for ComboBox dropdown options/text
+    public ObservableCollection<string> ActiveDirectoryCommandsList { get; private set; }
+
+// Property to contain the selected item
+    private string _selectedComboBoxCommand;
+    public string SelectedComboBoxCommand
+    {
+        get => _selectedComboBoxCommand;
+        set
+        {
+            if (_selectedComboBoxCommand != value)
+            {
+                _selectedComboBoxCommand = value;
+                OnPropertyChanged(nameof(SelectedComboBoxCommand));
+            }
+        }
+    }
 
+// Property to act as the relay to the execution button
+    public ICommand ExecuteCommandRelay { get; }
+//NEW CODE
     // [ Constructor ] ------------------------------------------------------------- //
 
     public MainWindowViewModel()

From 7074de868ef805c154525bcd13939895217f4a2c Mon Sep 17 00:00:00 2001
From: Pieter Sobtafo Assonken <lsobtafo@ewu.edu>
Date: Wed, 13 Mar 2024 14:20:06 -0700
Subject: [PATCH 81/94] Bound combobox drop down and selected item

---
 ActiveDirectoryQuerier/MainWindow.xaml        |  7 +--
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 46 ++++++++++---------
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index 21fcc94..689ac82 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -198,11 +198,12 @@
                                 <!-- TODO: Pieter: Bind button to another property inside the MainWindowViewModel -->
                                 <Button Content="Execute" HorizontalAlignment="Left" Margin="368,43,0,0"
                                         VerticalAlignment="Top" Height="23" Width="95" />
-                                <!-- TODO: Pieter: Bind combobox to another property for the SelectedItem and ItemsSource, inside the MainWindowViewModel -->
                                 <ComboBox HorizontalAlignment="Left" Margin="31,44,0,0" VerticalAlignment="Top"
-                                          Width="207"
-                                          Height="26" />
+                                          Width="207" Height="26" 
+                                          SelectedItem="{Binding SelectedCommandFromComboBoxInActiveDirectoryInfo}"
+                                          ItemsSource="{Binding AvailableOptionsFromComboBoxInActiveDirectoryInfo}" />
                             </Grid>
+                            <!-- TODO: Pieter: Bind this to a property in the MainWindowViewModel -->
                             <TextBox Grid.Row="1" Text="{Binding ConsoleOutputInActiveDirectoryInfo.ConsoleOutput}"
                                      HorizontalAlignment="Stretch"
                                      VerticalAlignment="Stretch" Margin="10" IsReadOnly="True" TextWrapping="Wrap"
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 8ca5287..d7940e2 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -29,6 +29,7 @@ public sealed class MainWindowViewModel : INotifyPropertyChanged
     private AppConsole _consoleOutputInQueryBuilder;
     private AppConsole _consoleOutputInActiveDirectoryInfo;
     private Command? _selectedCommandFromComboBoxInQueryBuilder;
+    private Command? _selectedCommandFromComboBoxInActiveDirectoryInfo;
     private ObservableCollection<Button>? _buttons; // TODO: Rename to be more descriptive.
 
     // [[ Other fields ]] ----------------------------------------------------------- //
@@ -59,6 +60,7 @@ public AppConsole ConsoleOutputInQueryBuilder
         }
     }
 
+    // TODO: Pieter: Use this for the console output in the Active Directory Info tab (link in GUI)
     public AppConsole ConsoleOutputInActiveDirectoryInfo
     {
         get => _consoleOutputInActiveDirectoryInfo;
@@ -106,6 +108,26 @@ public Command? SelectedCommandFromComboBoxInQueryBuilder
             }
         }
     }
+    
+    public Command? SelectedCommandFromComboBoxInActiveDirectoryInfo
+    {
+        get => _selectedCommandFromComboBoxInActiveDirectoryInfo;
+        set
+        {
+            if (_selectedCommandFromComboBoxInActiveDirectoryInfo != value)
+            {
+                _selectedCommandFromComboBoxInActiveDirectoryInfo = value;
+                OnPropertyChanged(nameof(SelectedCommandFromComboBoxInActiveDirectoryInfo));
+            }
+        }
+    }
+    
+    public List<string> AvailableOptionsFromComboBoxInActiveDirectoryInfo { get; } = new()
+    {
+        "Get user on domain",
+        "Get computers on domain",
+        "Get IP of each system on domain"
+    };
 
     public ObservableCollection<Button> QueryButtonStackPanel => _buttons ??= new ObservableCollection<Button>();
 
@@ -143,7 +165,7 @@ public Command? SelectedCommandFromComboBoxInQueryBuilder
     public ICommand ImportQueryFileRelay { get; }
     public ICommand ClearConsoleOutputInActiveDirectoryInfoRelay {
         get;
-    } // TODO: Pieter use this for clear console button
+    } // TODO: Impliment functionality.....
 
     /* TODO: for Pieter
      *
@@ -154,28 +176,8 @@ public ICommand ClearConsoleOutputInActiveDirectoryInfoRelay {
      * Create a property to act as the relay to the execution button.
      */
     
+    
     //NEW CODE
-    // Property for ComboBox dropdown options/text
-    public ObservableCollection<string> ActiveDirectoryCommandsList { get; private set; }
-
-// Property to contain the selected item
-    private string _selectedComboBoxCommand;
-    public string SelectedComboBoxCommand
-    {
-        get => _selectedComboBoxCommand;
-        set
-        {
-            if (_selectedComboBoxCommand != value)
-            {
-                _selectedComboBoxCommand = value;
-                OnPropertyChanged(nameof(SelectedComboBoxCommand));
-            }
-        }
-    }
-
-// Property to act as the relay to the execution button
-    public ICommand ExecuteCommandRelay { get; }
-//NEW CODE
     // [ Constructor ] ------------------------------------------------------------- //
 
     public MainWindowViewModel()

From 1cd9b4841a67d57a2dd8aeed8207e61293792d69 Mon Sep 17 00:00:00 2001
From: J0seph0 <103216770+J0seph0@users.noreply.github.com>
Date: Wed, 13 Mar 2024 20:03:58 -0700
Subject: [PATCH 82/94] Added a warning before deleting a query buttons

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index d7940e2..d15248c 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -333,9 +333,18 @@ private void DeleteQueryFromQueryStackPanel(object queryButton)
             return;
         }
 
-        QueryButtonStackPanel.Remove(currentButton);
-        _customQuery.Queries.Remove((Query)currentButton.Tag);
-        _customQuery.SaveQueriesToJson();
+        MessageBoxResult result = MessageBox.Show("Are you sure you want to delete the query?",
+                                          "Warning",
+                                          MessageBoxButton.YesNo,
+                                          MessageBoxImage.Warning,
+                                          MessageBoxResult.No);
+
+        if (result == MessageBoxResult.Yes)
+        {
+            QueryButtonStackPanel.Remove(currentButton);
+            _customQuery.Queries.Remove((Query)currentButton.Tag);
+            _customQuery.SaveQueriesToJson();
+        }
     }
 
     private void LoadSavedQueriesFromFile()

From cc4827169f781802a51838c38238eae3376f6d31 Mon Sep 17 00:00:00 2001
From: J0seph0 <103216770+J0seph0@users.noreply.github.com>
Date: Wed, 13 Mar 2024 20:28:37 -0700
Subject: [PATCH 83/94] Added a way to create/save a new file and converted
 everything to either a json or txt file

---
 ActiveDirectoryQuerier/MainWindow.xaml        |  1 +
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 16 ++++++++++++-
 .../Queries/CustomQueries.cs                  | 23 +++++++++++--------
 ActiveDirectoryQuerier/Queries/Query.cs       |  4 ----
 4 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index 689ac82..e39fa67 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -26,6 +26,7 @@
             <Menu Width="50" Height="20" HorizontalAlignment="Left" VerticalAlignment="Top">
                 <MenuItem Header="File"  Width="Auto" Height="Auto" >
                     <MenuItem Header="Import Queries" Command="{Binding ImportQueryFileRelay}"/>
+                    <MenuItem Header="New Query File" Command="{Binding CreateNewQueryFileRelay}" />
                 </MenuItem>
             </Menu>
         </Border>
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index d15248c..a155491 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -163,6 +163,7 @@ public Command? SelectedCommandFromComboBoxInActiveDirectoryInfo
     public ICommand ExportConsoleOutputRelay { get; }
     public ICommand ClearConsoleOutputInQueryBuilderRelay { get; }
     public ICommand ImportQueryFileRelay { get; }
+    public ICommand CreateNewQueryFileRelay { get; }
     public ICommand ClearConsoleOutputInActiveDirectoryInfoRelay {
         get;
     } // TODO: Impliment functionality.....
@@ -204,6 +205,7 @@ public MainWindowViewModel()
         ExecuteQueryFromActiveDirectoryInfoRelay = new RelayCommand(
             _ => ExecuteQuery(_consoleOutputInActiveDirectoryInfo));
         ImportQueryFileRelay = new RelayCommand(ImportQueryFile);
+        CreateNewQueryFileRelay = new RelayCommand(CreateNewQueryFile);
         AddCommandParameterComboBoxRelay = new RelayCommand(AddParameterComboBoxInQueryBuilder);
         AddCommandComboBoxRelay = new RelayCommand(AddCommandComboBoxInQueryBuilder);
         RemoveCommandParameterComboBoxRelay = new RelayCommand(RemoveCommandParameterComboBoxInQueryBuilder);
@@ -347,6 +349,18 @@ private void DeleteQueryFromQueryStackPanel(object queryButton)
         }
     }
 
+    private void CreateNewQueryFile(object _)
+    {
+        // Saves/creates a new save file for the queries
+        SaveFileDialog saveFileDialog = new SaveFileDialog();
+        saveFileDialog.Filter = "Json files (*.json)|*.json|Text files (*.txt)|*.txt";
+        if (saveFileDialog.ShowDialog() == true)
+        {
+            File.WriteAllText(saveFileDialog.FileName, string.Empty);
+            _customQuery.CustomQueryFileLocation = saveFileDialog.FileName;
+        }
+    }
+
     private void LoadSavedQueriesFromFile()
     {
         try
@@ -372,7 +386,7 @@ private void ImportQueryFile(object _)
     {
         OpenFileDialog dialog = new() {
             FileName = "CustomQueries.dat", 
-            Filter = "All files(*.*) | *.*"
+            Filter = "Json files (*.json)|*.json|Text Files (*.txt)|*.txt"
         };
 
 
diff --git a/ActiveDirectoryQuerier/Queries/CustomQueries.cs b/ActiveDirectoryQuerier/Queries/CustomQueries.cs
index 02d9d93..511e1a3 100644
--- a/ActiveDirectoryQuerier/Queries/CustomQueries.cs
+++ b/ActiveDirectoryQuerier/Queries/CustomQueries.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Diagnostics;
+using System.Diagnostics;
 using System.IO;
 using System.Management.Automation.Runspaces;
 using System.Text.Json;
@@ -9,7 +8,7 @@
 namespace ActiveDirectoryQuerier.Queries;
 
 /// <summary>
-/// This class is used to save a json file named "CustomQueries.dat" inside of
+/// This class is used to save a json file named "CustomQueries.json" inside of
 /// \ActiveDirectoryQuerier\ActiveDirectoryQuerier\bin\Debug\net6.0-windows This
 /// </summary>
 public class CustomQueries
@@ -37,7 +36,7 @@ public void SaveQueriesToJson()
             string serializedJsonQueries = JsonSerializer.Serialize(Queries, _options);
             if(CustomQueryFileLocation == "")
             {
-                File.WriteAllText("CustomQueries.dat", serializedJsonQueries);
+                File.WriteAllText("CustomQueries.json", serializedJsonQueries);
 
             } else
             {
@@ -46,7 +45,6 @@ public void SaveQueriesToJson()
         }
         catch (Exception ex)
         {
-
             MessageBox.Show(ex.Message);
         }
     }
@@ -83,7 +81,7 @@ public void SerializeCommand(Command? psCommand, string queryName, string queryD
             string serializedJsonQueries = JsonSerializer.Serialize(Queries, _options);
             if (CustomQueryFileLocation == "")
             {
-                File.WriteAllText("CustomQueries.dat", serializedJsonQueries);
+                File.WriteAllText("CustomQueries.json", serializedJsonQueries);
 
             }
             else
@@ -107,8 +105,14 @@ public void LoadData()
             string json;
             if (CustomQueryFileLocation == "")
             {
-                json = File.ReadAllText("CustomQueries.dat");
-
+                if (File.Exists("CustomeQueries.json"))
+                {
+                    json = File.ReadAllText("CustomQueries.json");
+                }
+                else
+                {
+                    return;
+                }
             }
             else
             {
@@ -136,8 +140,7 @@ public void LoadData()
         }
         catch (Exception exception)
         {
-            
-            Trace.WriteLine(exception.Message);
+            MessageBox.Show(exception.Message);
         }
     }
 }
diff --git a/ActiveDirectoryQuerier/Queries/Query.cs b/ActiveDirectoryQuerier/Queries/Query.cs
index 828e72b..43b965e 100644
--- a/ActiveDirectoryQuerier/Queries/Query.cs
+++ b/ActiveDirectoryQuerier/Queries/Query.cs
@@ -3,7 +3,6 @@
 
 namespace ActiveDirectoryQuerier.Queries;
 
-// TODO: Remove property descriptions if name is descriptive enough, or provide a detailed description if it is not.
 public class Query
 {
     /// <summary>
@@ -15,19 +14,16 @@ public class Query
     /// <summary>
     /// Used for serializing the Command Name
     /// </summary>
-    // ReSharper disable once InconsistentNaming
     public string? PSCommandName { get; set; }
 
     /// <summary>
     /// Used for Serializing the Commands parameters
     /// </summary>
-    // ReSharper disable once InconsistentNaming
     public string[]? PSCommandParameters { get; set; }
 
     /// <summary>
     /// Used for Serializing the Commands parameters
     /// </summary>
-    // ReSharper disable once InconsistentNaming
     public string[]? PSCommandParameterValues { get; set; }
 
     /// <summary>

From db7b40af21f6f3bc2ca8d1d9db6dd25b9af6476e Mon Sep 17 00:00:00 2001
From: J0seph0 <103216770+J0seph0@users.noreply.github.com>
Date: Wed, 13 Mar 2024 20:46:50 -0700
Subject: [PATCH 84/94] Made some gui changes to the Queryinformation tab with
 Headers

---
 ActiveDirectoryQuerier/MainWindow.xaml | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index e39fa67..07c52f0 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -70,13 +70,29 @@
                     <TabItem Header="Query Information">
                         <Grid Background="#FFE5E5E5">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="163*" />
-                                <ColumnDefinition Width="856*" />
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="*" />
                             </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition MinHeight="130" MaxHeight="60" Height="*"/>
+                                <RowDefinition MinHeight="130" MaxHeight="60" Height="*" />
+                            </Grid.RowDefinitions>
                             <!-- Query Name TextBox. -->
-                            <TextBox Grid.Column="0" Grid.ColumnSpan="2" Text="{Binding QueryName}" Margin="10,29,10,0"
-                                     TextWrapping="Wrap" VerticalAlignment="Top" Height="50" />
-                            <RichTextBox Grid.Column="0" Margin="10,108,10,200" Grid.ColumnSpan="2">
+                            <TextBlock Grid.Row="0" HorizontalAlignment="Left" Margin="20,10" FontWeight="Bold">Query Name</TextBlock>
+                            <TextBox  Grid.Column="0" 
+                                      Grid.ColumnSpan="2" 
+                                      Text="{Binding QueryName}" 
+                                      TextWrapping="Wrap" 
+                                      VerticalAlignment="Center" 
+                                      Height="50"
+                                      Margin="20,0,20,0"/>
+                            <!-- Query Description RichTextBox -->
+                            <TextBlock FontWeight="Bold" HorizontalAlignment="Left" Margin="20,3" Grid.Row="1">Query Description</TextBlock>
+                            <RichTextBox Grid.Row="1" 
+                                         Grid.Column="0"  
+                                         Grid.ColumnSpan="2" 
+                                         HorizontalAlignment="Center"
+                                         Margin="20,28,20,10" >
                                 <FlowDocument>
                                     <Paragraph>
                                         <Run Text="{Binding QueryDescription}" />

From 5e6b1d7e659f8a8932a84bcb62ae2ec6019dff6a Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Thu, 14 Mar 2024 14:47:43 -0700
Subject: [PATCH 85/94] Slight name refactoring

---
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index a155491..b12eb06 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -369,7 +369,7 @@ private void LoadSavedQueriesFromFile()
             _customQuery.LoadData();
 
             // Loop through the queries and create a button for each one.
-            foreach (var newButton in _customQuery.Queries.Select(CreateCustomButton))
+            foreach (var newButton in _customQuery.Queries.Select(CreateQueryButtonInStackPanel))
             {
                 // Lastly add the button to the stack panel
                 QueryButtonStackPanel.Add(newButton);
@@ -628,8 +628,7 @@ private void GetCurrentQuery()
             string[] commandParameters;
             string[] commandParameterValues;
 
-            if (SelectedCommandFromComboBoxInQueryBuilder is not null &&
-                SelectedCommandFromComboBoxInQueryBuilder.Parameters is not null)
+            if (SelectedCommandFromComboBoxInQueryBuilder?.Parameters != null)
             {
                 commandParameters = new string[SelectedCommandFromComboBoxInQueryBuilder.Parameters.Count];
                 commandParameterValues = new string[SelectedCommandFromComboBoxInQueryBuilder.Parameters.Count];
@@ -705,7 +704,7 @@ private void SaveQuery(object commandParameter)
 
                 _customQuery.SerializeCommand(SelectedCommandFromComboBoxInQueryBuilder, QueryName, QueryDescription);
 
-                Button newButton = CreateCustomButton();
+                Button newButton = CreateQueryButtonInStackPanel();
 
                 QueryButtonStackPanel.Add(newButton);
             }
@@ -744,13 +743,7 @@ private void ClearQueryBuilder(object _)
         }
     }
 
-    /// <summary>
-    /// This method is for creating buttons, right now it creates it off of the current/selectedcommand parameters but
-    /// could be changed to also do it from the query list.
-    /// </summary>
-    /// <returns>This method returns a button that has been customized for the custom query list</returns>
-    /// TODO: Change method name?
-    private Button CreateCustomButton(Query? query = null)
+    private Button CreateQueryButtonInStackPanel(Query? query = null)
     {
         Button newButton = new();
 

From b7fd348195821d51d4b4ce23fb0ece4742e2d500 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Thu, 14 Mar 2024 14:50:32 -0700
Subject: [PATCH 86/94] Fix bad file name

---
 ActiveDirectoryQuerier/Queries/CustomQueries.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ActiveDirectoryQuerier/Queries/CustomQueries.cs b/ActiveDirectoryQuerier/Queries/CustomQueries.cs
index 511e1a3..564ada1 100644
--- a/ActiveDirectoryQuerier/Queries/CustomQueries.cs
+++ b/ActiveDirectoryQuerier/Queries/CustomQueries.cs
@@ -105,7 +105,7 @@ public void LoadData()
             string json;
             if (CustomQueryFileLocation == "")
             {
-                if (File.Exists("CustomeQueries.json"))
+                if (File.Exists("CustomQueries.json"))
                 {
                     json = File.ReadAllText("CustomQueries.json");
                 }

From cde06a558e886a84270e090a06a449e589ac6882 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Thu, 14 Mar 2024 15:05:17 -0700
Subject: [PATCH 87/94] Slight renaming

---
 ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj   |  1 +
 .../PowerShell/ADCommandParameters.cs                  |  9 +++++++--
 ActiveDirectoryQuerier/PowerShell/PSExecutor.cs        | 10 +++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj b/ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj
index 0c49a0c..4d45ef9 100644
--- a/ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj
+++ b/ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj
@@ -26,6 +26,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <Folder Include="ActiveDirectory\" />
 	  <Folder Include="ViewModels\" />
 	</ItemGroup>
 
diff --git a/ActiveDirectoryQuerier/PowerShell/ADCommandParameters.cs b/ActiveDirectoryQuerier/PowerShell/ADCommandParameters.cs
index 9eecb20..5d14c89 100644
--- a/ActiveDirectoryQuerier/PowerShell/ADCommandParameters.cs
+++ b/ActiveDirectoryQuerier/PowerShell/ADCommandParameters.cs
@@ -9,7 +9,12 @@ namespace ActiveDirectoryQuerier.PowerShell;
 public class ADCommandParameters
 {
     private readonly ObservableCollection<string> _availableParameters = new();
-
+    
+    /// <summary></summary>
+    /// <important>
+    /// This property should not be accessed before LoadAvailableParametersAsync or LoadAvailableParameters has been
+    /// called. If it is accessed before either method has been called, no parameters will be available.
+    /// </important>
     public ObservableCollection<string> AvailableParameters
     {
         get {
@@ -37,7 +42,7 @@ public void LoadAvailableParameters(Command? psCommand)
     private async Task LoadAvailableParametersCore(Command? psCommand, bool isAsync)
     {
         // psCommand can be null if the user attempts to select an ActiveDirectory command that doesn't exist.
-        // More specifically, if the entered command doesn't exist in the ADCommands in
+        // More specifically, if the entered command doesn't exist in the ADCommands property defined in
         // MainWindowViewModel.cs, psCommand will be null, causing an exception to be thrown, crashing the
         // program.
         if (psCommand is null)
diff --git a/ActiveDirectoryQuerier/PowerShell/PSExecutor.cs b/ActiveDirectoryQuerier/PowerShell/PSExecutor.cs
index e8fad18..b6ada65 100644
--- a/ActiveDirectoryQuerier/PowerShell/PSExecutor.cs
+++ b/ActiveDirectoryQuerier/PowerShell/PSExecutor.cs
@@ -20,9 +20,8 @@ public PSExecutor()
         _powerShell.Invoke();
         _powerShell.Commands.Clear();
     }
-
-    // TODO: Possibly rename method.
-    private void PrepareCommand(Command psCommand)
+    
+    private void AssembleFullCommand(Command psCommand)
     {
         ArgumentNullException.ThrowIfNull(psCommand);
 
@@ -38,7 +37,8 @@ public PSOutput Execute(Command psCommand)
     {
         try
         {
-            PrepareCommand(psCommand);
+            _powerShell.Commands.Clear();
+            AssembleFullCommand(psCommand);
 
             Collection<PSObject> results = _powerShell.Invoke();
 
@@ -55,7 +55,7 @@ public async Task<PSOutput> ExecuteAsync(Command command)
         try
         {
             _powerShell.Commands.Clear();
-            PrepareCommand(command);
+            AssembleFullCommand(command);
 
             PSDataCollection<PSObject> results = await _powerShell.InvokeAsync();
 

From db8aaff62fab833d0334bfa849fa865e0b596e75 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Thu, 14 Mar 2024 15:07:04 -0700
Subject: [PATCH 88/94] Refactor class/file location

---
 ActiveDirectoryQuerier.Tests/ADCommandParametersTests.cs       | 1 +
 ActiveDirectoryQuerier.Tests/ADCommandsFetcherTests.cs         | 1 +
 .../ComboBoxParameterViewModelTests.cs                         | 1 +
 .../{PowerShell => ActiveDirectory}/ADCommandParameters.cs     | 2 +-
 .../{PowerShell => ActiveDirectory}/ADCommandsFetcher.cs       | 3 ++-
 ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj           | 1 -
 ActiveDirectoryQuerier/MainWindowViewModel.cs                  | 1 +
 7 files changed, 7 insertions(+), 3 deletions(-)
 rename ActiveDirectoryQuerier/{PowerShell => ActiveDirectory}/ADCommandParameters.cs (98%)
 rename ActiveDirectoryQuerier/{PowerShell => ActiveDirectory}/ADCommandsFetcher.cs (93%)

diff --git a/ActiveDirectoryQuerier.Tests/ADCommandParametersTests.cs b/ActiveDirectoryQuerier.Tests/ADCommandParametersTests.cs
index 87274fc..bb2cadd 100644
--- a/ActiveDirectoryQuerier.Tests/ADCommandParametersTests.cs
+++ b/ActiveDirectoryQuerier.Tests/ADCommandParametersTests.cs
@@ -1,4 +1,5 @@
 using System.Management.Automation.Runspaces;
+using ActiveDirectoryQuerier.ActiveDirectory;
 using ActiveDirectoryQuerier.PowerShell;
 
 namespace ActiveDirectoryQuerier.Tests;
diff --git a/ActiveDirectoryQuerier.Tests/ADCommandsFetcherTests.cs b/ActiveDirectoryQuerier.Tests/ADCommandsFetcherTests.cs
index f1511a3..a5afd55 100644
--- a/ActiveDirectoryQuerier.Tests/ADCommandsFetcherTests.cs
+++ b/ActiveDirectoryQuerier.Tests/ADCommandsFetcherTests.cs
@@ -1,5 +1,6 @@
 using System.Collections.ObjectModel;
 using System.Management.Automation.Runspaces;
+using ActiveDirectoryQuerier.ActiveDirectory;
 using ActiveDirectoryQuerier.PowerShell;
 
 namespace ActiveDirectoryQuerier.Tests;
diff --git a/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs b/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs
index be3a314..a4033d9 100644
--- a/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs
+++ b/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs
@@ -1,5 +1,6 @@
 using System.Collections.ObjectModel;
 using System.Management.Automation.Runspaces;
+using ActiveDirectoryQuerier.ActiveDirectory;
 using ActiveDirectoryQuerier.PowerShell;
 
 namespace ActiveDirectoryQuerier.Tests;
diff --git a/ActiveDirectoryQuerier/PowerShell/ADCommandParameters.cs b/ActiveDirectoryQuerier/ActiveDirectory/ADCommandParameters.cs
similarity index 98%
rename from ActiveDirectoryQuerier/PowerShell/ADCommandParameters.cs
rename to ActiveDirectoryQuerier/ActiveDirectory/ADCommandParameters.cs
index 5d14c89..25eebd3 100644
--- a/ActiveDirectoryQuerier/PowerShell/ADCommandParameters.cs
+++ b/ActiveDirectoryQuerier/ActiveDirectory/ADCommandParameters.cs
@@ -3,7 +3,7 @@
 using System.Management.Automation;
 using System.Management.Automation.Runspaces;
 
-namespace ActiveDirectoryQuerier.PowerShell;
+namespace ActiveDirectoryQuerier.ActiveDirectory;
 
 // ReSharper disable once InconsistentNaming
 public class ADCommandParameters
diff --git a/ActiveDirectoryQuerier/PowerShell/ADCommandsFetcher.cs b/ActiveDirectoryQuerier/ActiveDirectory/ADCommandsFetcher.cs
similarity index 93%
rename from ActiveDirectoryQuerier/PowerShell/ADCommandsFetcher.cs
rename to ActiveDirectoryQuerier/ActiveDirectory/ADCommandsFetcher.cs
index 143e4e1..6ab5746 100644
--- a/ActiveDirectoryQuerier/PowerShell/ADCommandsFetcher.cs
+++ b/ActiveDirectoryQuerier/ActiveDirectory/ADCommandsFetcher.cs
@@ -2,8 +2,9 @@
 using System.Management.Automation;
 using System.Management.Automation.Runspaces;
 using System.Windows;
+using ActiveDirectoryQuerier.PowerShell;
 
-namespace ActiveDirectoryQuerier.PowerShell;
+namespace ActiveDirectoryQuerier.ActiveDirectory;
 
 // ReSharper disable once InconsistentNaming
 public static class ADCommandsFetcher
diff --git a/ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj b/ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj
index 4d45ef9..0c49a0c 100644
--- a/ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj
+++ b/ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj
@@ -26,7 +26,6 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <Folder Include="ActiveDirectory\" />
 	  <Folder Include="ViewModels\" />
 	</ItemGroup>
 
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index b12eb06..23d3fe1 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -7,6 +7,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using ActiveDirectoryQuerier.ActiveDirectory;
 using ActiveDirectoryQuerier.PowerShell;
 using ActiveDirectoryQuerier.Queries;
 using Microsoft.Win32;

From 28b41751cbe7684b81316ba8d898b2cb61bea348 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Thu, 14 Mar 2024 15:29:52 -0700
Subject: [PATCH 89/94] Refactor file/class location

---
 .../ComboBoxParameterViewModelTests.cs                        | 1 +
 ActiveDirectoryQuerier.Tests/TextBoxViewModelTests.cs         | 2 ++
 ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj          | 4 ----
 ActiveDirectoryQuerier/MainWindowViewModel.cs                 | 2 +-
 .../{ => ViewModels}/ComboBoxParameterViewModel.cs            | 2 +-
 ActiveDirectoryQuerier/{ => ViewModels}/TextBoxViewModel.cs   | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)
 rename ActiveDirectoryQuerier/{ => ViewModels}/ComboBoxParameterViewModel.cs (97%)
 rename ActiveDirectoryQuerier/{ => ViewModels}/TextBoxViewModel.cs (95%)

diff --git a/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs b/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs
index a4033d9..a98c571 100644
--- a/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs
+++ b/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs
@@ -2,6 +2,7 @@
 using System.Management.Automation.Runspaces;
 using ActiveDirectoryQuerier.ActiveDirectory;
 using ActiveDirectoryQuerier.PowerShell;
+using ActiveDirectoryQuerier.ViewModels;
 
 namespace ActiveDirectoryQuerier.Tests;
 
diff --git a/ActiveDirectoryQuerier.Tests/TextBoxViewModelTests.cs b/ActiveDirectoryQuerier.Tests/TextBoxViewModelTests.cs
index 08ab025..87aa8f4 100644
--- a/ActiveDirectoryQuerier.Tests/TextBoxViewModelTests.cs
+++ b/ActiveDirectoryQuerier.Tests/TextBoxViewModelTests.cs
@@ -1,3 +1,5 @@
+using ActiveDirectoryQuerier.ViewModels;
+
 namespace ActiveDirectoryQuerier.Tests;
 
 public class TextBoxViewModelTests
diff --git a/ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj b/ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj
index 0c49a0c..1efb6dd 100644
--- a/ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj
+++ b/ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj
@@ -25,8 +25,4 @@
 		<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.18" />
 	</ItemGroup>
 
-	<ItemGroup>
-	  <Folder Include="ViewModels\" />
-	</ItemGroup>
-
 </Project>
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 23d3fe1..1f30b7d 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -10,11 +10,11 @@
 using ActiveDirectoryQuerier.ActiveDirectory;
 using ActiveDirectoryQuerier.PowerShell;
 using ActiveDirectoryQuerier.Queries;
+using ActiveDirectoryQuerier.ViewModels;
 using Microsoft.Win32;
 
 namespace ActiveDirectoryQuerier;
 
-/// TODO: Place class into ViewModel folder.
 public sealed class MainWindowViewModel : INotifyPropertyChanged
 {
     // [ Fields ] ------------------------------------------------------------------- //
diff --git a/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs b/ActiveDirectoryQuerier/ViewModels/ComboBoxParameterViewModel.cs
similarity index 97%
rename from ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs
rename to ActiveDirectoryQuerier/ViewModels/ComboBoxParameterViewModel.cs
index 7c966ae..9f60bbb 100644
--- a/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs
+++ b/ActiveDirectoryQuerier/ViewModels/ComboBoxParameterViewModel.cs
@@ -1,7 +1,7 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 
-namespace ActiveDirectoryQuerier;
+namespace ActiveDirectoryQuerier.ViewModels;
 
 /// <summary>
 /// ViewModel for a ComboBox that displays possible parameters for a PowerShell command.
diff --git a/ActiveDirectoryQuerier/TextBoxViewModel.cs b/ActiveDirectoryQuerier/ViewModels/TextBoxViewModel.cs
similarity index 95%
rename from ActiveDirectoryQuerier/TextBoxViewModel.cs
rename to ActiveDirectoryQuerier/ViewModels/TextBoxViewModel.cs
index 783a027..b81e606 100644
--- a/ActiveDirectoryQuerier/TextBoxViewModel.cs
+++ b/ActiveDirectoryQuerier/ViewModels/TextBoxViewModel.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace ActiveDirectoryQuerier;
+namespace ActiveDirectoryQuerier.ViewModels;
 
 /// <summary>
 /// ViewModel for a TextBox that contains the value of a parameter slot.

From 24c583967139b92a5f8eef93cb968348615fd593 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Thu, 14 Mar 2024 16:18:26 -0700
Subject: [PATCH 90/94] Convert public field to public property

---
 ActiveDirectoryQuerier/Queries/CustomQueries.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ActiveDirectoryQuerier/Queries/CustomQueries.cs b/ActiveDirectoryQuerier/Queries/CustomQueries.cs
index 564ada1..2326fd3 100644
--- a/ActiveDirectoryQuerier/Queries/CustomQueries.cs
+++ b/ActiveDirectoryQuerier/Queries/CustomQueries.cs
@@ -14,8 +14,7 @@ namespace ActiveDirectoryQuerier.Queries;
 public class CustomQueries
 {
     public List<Query> Queries { get; private set; } = new();
-
-    public string CustomQueryFileLocation = "";
+    public string CustomQueryFileLocation { get; set; } = string.Empty;
 
     /// <summary>
     /// This a variable for feeding options to the Json serializer

From 6f9bec41a24c5acaca6253b5d6b78c4311d8a9d7 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Thu, 14 Mar 2024 16:53:03 -0700
Subject: [PATCH 91/94] Refactor

---
 ActiveDirectoryQuerier/Queries/CustomQueries.cs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/ActiveDirectoryQuerier/Queries/CustomQueries.cs b/ActiveDirectoryQuerier/Queries/CustomQueries.cs
index 2326fd3..19243e1 100644
--- a/ActiveDirectoryQuerier/Queries/CustomQueries.cs
+++ b/ActiveDirectoryQuerier/Queries/CustomQueries.cs
@@ -33,14 +33,8 @@ public void SaveQueriesToJson()
         try
         {
             string serializedJsonQueries = JsonSerializer.Serialize(Queries, _options);
-            if(CustomQueryFileLocation == "")
-            {
-                File.WriteAllText("CustomQueries.json", serializedJsonQueries);
-
-            } else
-            {
-                File.WriteAllText(CustomQueryFileLocation, serializedJsonQueries);
-            }        
+            File.WriteAllText(CustomQueryFileLocation == "" ? "CustomQueries.json" : CustomQueryFileLocation,
+                serializedJsonQueries);
         }
         catch (Exception ex)
         {

From 4c01310efa7cf4f282e3a652282f01cfa30b4c2a Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Thu, 14 Mar 2024 16:54:55 -0700
Subject: [PATCH 92/94] Format with clang-format

---
 .../PSExecutorTests.cs                        | 16 +++++--
 .../ActiveDirectory/ADCommandParameters.cs    |  2 +-
 ActiveDirectoryQuerier/MainWindowViewModel.cs | 42 +++++++------------
 .../PowerShell/PSExecutor.cs                  |  2 +-
 .../Queries/CustomQueries.cs                  |  3 +-
 5 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/ActiveDirectoryQuerier.Tests/PSExecutorTests.cs b/ActiveDirectoryQuerier.Tests/PSExecutorTests.cs
index 2dcf274..ae5f78b 100644
--- a/ActiveDirectoryQuerier.Tests/PSExecutorTests.cs
+++ b/ActiveDirectoryQuerier.Tests/PSExecutorTests.cs
@@ -9,7 +9,9 @@ public class PSExecutorTests
     [Theory]
     [InlineData("Get-Command", "Module", "ActiveDirectory")]
     [InlineData("Get-Process", "Name", "explorer")]
-    public void Execute_WhenGivenValidCommand_ReturnsExpectedOutput(string command, string parameter, string parameterValue)
+    public void Execute_WhenGivenValidCommand_ReturnsExpectedOutput(string command,
+                                                                    string parameter,
+                                                                    string parameterValue)
     {
         // Arrange
         Command psCommand = new(command);
@@ -46,7 +48,9 @@ public void Execute_CheckIfOutputChanged_ReturnsDifferentOutput()
     [Theory]
     [InlineData("Get-Command", "Module", "ActiveDirectory")]
     [InlineData("Get-Process", "Name", "explorer")]
-    public async Task ExecuteAsync_WhenGivenValidCommand_ReturnsExpectedOutput(string command, string parameter, string parameterValue)
+    public async Task ExecuteAsync_WhenGivenValidCommand_ReturnsExpectedOutput(string command,
+                                                                               string parameter,
+                                                                               string parameterValue)
     {
         // Arrange
         Command psCommand = new(command);
@@ -65,7 +69,9 @@ public async Task ExecuteAsync_WhenGivenValidCommand_ReturnsExpectedOutput(strin
     [Theory]
     [InlineData("Get-ADUser", "InvalidParameter", "*")]
     [InlineData("InvalidCommand", "Filter", "*")]
-    public void Execute_WhenGivenInvalidCommand_ReturnsExpectedOutput(string command, string parameter, string parameterValue)
+    public void Execute_WhenGivenInvalidCommand_ReturnsExpectedOutput(string command,
+                                                                      string parameter,
+                                                                      string parameterValue)
     {
         // Arrange
         Command psCommand = new(command);
@@ -84,7 +90,9 @@ public void Execute_WhenGivenInvalidCommand_ReturnsExpectedOutput(string command
     [Theory]
     [InlineData("Get-ADUser", "InvalidParameter", "*")]
     [InlineData("InvalidCommand", "Filter", "*")]
-    public async Task ExecuteAsync_WhenGivenInvalidCommand_ReturnsExpectedOutput(string command, string parameter, string parameterValue)
+    public async Task ExecuteAsync_WhenGivenInvalidCommand_ReturnsExpectedOutput(string command,
+                                                                                 string parameter,
+                                                                                 string parameterValue)
     {
         // Arrange
         Command psCommand = new(command);
diff --git a/ActiveDirectoryQuerier/ActiveDirectory/ADCommandParameters.cs b/ActiveDirectoryQuerier/ActiveDirectory/ADCommandParameters.cs
index 25eebd3..2b5b107 100644
--- a/ActiveDirectoryQuerier/ActiveDirectory/ADCommandParameters.cs
+++ b/ActiveDirectoryQuerier/ActiveDirectory/ADCommandParameters.cs
@@ -9,7 +9,7 @@ namespace ActiveDirectoryQuerier.ActiveDirectory;
 public class ADCommandParameters
 {
     private readonly ObservableCollection<string> _availableParameters = new();
-    
+
     /// <summary></summary>
     /// <important>
     /// This property should not be accessed before LoadAvailableParametersAsync or LoadAvailableParameters has been
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index 1f30b7d..679b17b 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -109,12 +109,11 @@ public Command? SelectedCommandFromComboBoxInQueryBuilder
             }
         }
     }
-    
+
     public Command? SelectedCommandFromComboBoxInActiveDirectoryInfo
     {
         get => _selectedCommandFromComboBoxInActiveDirectoryInfo;
-        set
-        {
+        set {
             if (_selectedCommandFromComboBoxInActiveDirectoryInfo != value)
             {
                 _selectedCommandFromComboBoxInActiveDirectoryInfo = value;
@@ -122,13 +121,10 @@ public Command? SelectedCommandFromComboBoxInActiveDirectoryInfo
             }
         }
     }
-    
-    public List<string> AvailableOptionsFromComboBoxInActiveDirectoryInfo { get; } = new()
-    {
-        "Get user on domain",
-        "Get computers on domain",
-        "Get IP of each system on domain"
-    };
+
+    public List<string> AvailableOptionsFromComboBoxInActiveDirectoryInfo {
+        get;
+    } = new() { "Get user on domain", "Get computers on domain", "Get IP of each system on domain" };
 
     public ObservableCollection<Button> QueryButtonStackPanel => _buttons ??= new ObservableCollection<Button>();
 
@@ -165,9 +161,7 @@ public Command? SelectedCommandFromComboBoxInActiveDirectoryInfo
     public ICommand ClearConsoleOutputInQueryBuilderRelay { get; }
     public ICommand ImportQueryFileRelay { get; }
     public ICommand CreateNewQueryFileRelay { get; }
-    public ICommand ClearConsoleOutputInActiveDirectoryInfoRelay {
-        get;
-    } // TODO: Impliment functionality.....
+    public ICommand ClearConsoleOutputInActiveDirectoryInfoRelay { get; } // TODO: Impliment functionality.....
 
     /* TODO: for Pieter
      *
@@ -177,10 +171,9 @@ public ICommand ClearConsoleOutputInActiveDirectoryInfoRelay {
      *
      * Create a property to act as the relay to the execution button.
      */
-    
-    
-    //NEW CODE
-    // [ Constructor ] ------------------------------------------------------------- //
+
+    // NEW CODE
+    //  [ Constructor ] ------------------------------------------------------------- //
 
     public MainWindowViewModel()
     {
@@ -337,10 +330,10 @@ private void DeleteQueryFromQueryStackPanel(object queryButton)
         }
 
         MessageBoxResult result = MessageBox.Show("Are you sure you want to delete the query?",
-                                          "Warning",
-                                          MessageBoxButton.YesNo,
-                                          MessageBoxImage.Warning,
-                                          MessageBoxResult.No);
+                                                  "Warning",
+                                                  MessageBoxButton.YesNo,
+                                                  MessageBoxImage.Warning,
+                                                  MessageBoxResult.No);
 
         if (result == MessageBoxResult.Yes)
         {
@@ -385,11 +378,8 @@ private void LoadSavedQueriesFromFile()
 
     private void ImportQueryFile(object _)
     {
-        OpenFileDialog dialog = new() {
-            FileName = "CustomQueries.dat", 
-            Filter = "Json files (*.json)|*.json|Text Files (*.txt)|*.txt"
-        };
-
+        OpenFileDialog dialog =
+            new() { FileName = "CustomQueries.dat", Filter = "Json files (*.json)|*.json|Text Files (*.txt)|*.txt" };
 
         // Display
         bool? result = dialog.ShowDialog();
diff --git a/ActiveDirectoryQuerier/PowerShell/PSExecutor.cs b/ActiveDirectoryQuerier/PowerShell/PSExecutor.cs
index b6ada65..8ac3ecf 100644
--- a/ActiveDirectoryQuerier/PowerShell/PSExecutor.cs
+++ b/ActiveDirectoryQuerier/PowerShell/PSExecutor.cs
@@ -20,7 +20,7 @@ public PSExecutor()
         _powerShell.Invoke();
         _powerShell.Commands.Clear();
     }
-    
+
     private void AssembleFullCommand(Command psCommand)
     {
         ArgumentNullException.ThrowIfNull(psCommand);
diff --git a/ActiveDirectoryQuerier/Queries/CustomQueries.cs b/ActiveDirectoryQuerier/Queries/CustomQueries.cs
index 19243e1..8d5f04c 100644
--- a/ActiveDirectoryQuerier/Queries/CustomQueries.cs
+++ b/ActiveDirectoryQuerier/Queries/CustomQueries.cs
@@ -34,7 +34,7 @@ public void SaveQueriesToJson()
         {
             string serializedJsonQueries = JsonSerializer.Serialize(Queries, _options);
             File.WriteAllText(CustomQueryFileLocation == "" ? "CustomQueries.json" : CustomQueryFileLocation,
-                serializedJsonQueries);
+                              serializedJsonQueries);
         }
         catch (Exception ex)
         {
@@ -75,7 +75,6 @@ public void SerializeCommand(Command? psCommand, string queryName, string queryD
             if (CustomQueryFileLocation == "")
             {
                 File.WriteAllText("CustomQueries.json", serializedJsonQueries);
-
             }
             else
             {

From a866a261a48d4ff85b7b20b75686fc41cb418ef4 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Fri, 15 Mar 2024 12:07:25 -0700
Subject: [PATCH 93/94] Refactor RelayCommand location

---
 ActiveDirectoryQuerier.Tests/RelayCommandTests.cs       | 4 +++-
 ActiveDirectoryQuerier/{ => ViewModels}/RelayCommand.cs | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)
 rename ActiveDirectoryQuerier/{ => ViewModels}/RelayCommand.cs (94%)

diff --git a/ActiveDirectoryQuerier.Tests/RelayCommandTests.cs b/ActiveDirectoryQuerier.Tests/RelayCommandTests.cs
index b44ba75..bb4439c 100644
--- a/ActiveDirectoryQuerier.Tests/RelayCommandTests.cs
+++ b/ActiveDirectoryQuerier.Tests/RelayCommandTests.cs
@@ -1,4 +1,6 @@
-namespace ActiveDirectoryQuerier.Tests;
+using ActiveDirectoryQuerier.ViewModels;
+
+namespace ActiveDirectoryQuerier.Tests;
 
 public class RelayCommandTests
 {
diff --git a/ActiveDirectoryQuerier/RelayCommand.cs b/ActiveDirectoryQuerier/ViewModels/RelayCommand.cs
similarity index 94%
rename from ActiveDirectoryQuerier/RelayCommand.cs
rename to ActiveDirectoryQuerier/ViewModels/RelayCommand.cs
index d4bdc13..199f9db 100644
--- a/ActiveDirectoryQuerier/RelayCommand.cs
+++ b/ActiveDirectoryQuerier/ViewModels/RelayCommand.cs
@@ -1,6 +1,6 @@
 using System.Windows.Input;
 
-namespace ActiveDirectoryQuerier;
+namespace ActiveDirectoryQuerier.ViewModels;
 
 /// <summary>
 /// A command whose sole purpose is to relay its functionality to other objects by invoking delegates.
@@ -8,7 +8,6 @@ namespace ActiveDirectoryQuerier;
 /// <note>
 /// This is a very basic setup of the RelayCommand class. I imagine that this class can be expanded and improved upon.
 /// </note>
-/// TODO: Place class into ViewModel folder.
 public class RelayCommand : ICommand
 {
     private readonly Action<object> _execute;

From a4c8d1c8ac4e9e29d61350f5456ee5ec5d2e98bf Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Fri, 15 Mar 2024 12:47:07 -0700
Subject: [PATCH 94/94] Update version number and repo location (eventually
 change)

---
 ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj b/ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj
index 1efb6dd..403bbb6 100644
--- a/ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj
+++ b/ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj
@@ -9,9 +9,9 @@
 
 		<!-- Project Info. -->
 		<Title>Active Directory Querier</Title>
-		<Version>0.5.0</Version>
+		<Version>0.6.0</Version>
 		<Authors>Hunter T., Pieter, Joseph</Authors>
-		<RepositoryUrl>https://github.com/StrangeRanger/FAFB-PowerShell-Tool</RepositoryUrl>
+		<RepositoryUrl>https://github.com/StrangeRanger/Active-Directory-Querier</RepositoryUrl>
 
 		<!-- Project Compile Time Settings. -->
 		<PublishSingleFile>false</PublishSingleFile>