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] 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()