replace IAmQueryExecutor with RunQueryCommand

Author: NeVeSpl

sources/RevitDBExplorer/MainWindow.xaml.cs

@@ -30,7 +30,7 @@
 
 namespace RevitDBExplorer
 {
-    internal partial class MainWindow : Window, INotifyPropertyChanged, IRecipient<OpenWindowCommand>
+    internal partial class MainWindow : Window, INotifyPropertyChanged, IRecipient<OpenWindowCommand>, IRecipient<RunQueryCommand>
     {
         private readonly IMessenger iAmMessenger;
         private readonly QueryEditorViewModel queryEditorVM;
@@ -149,7 +149,7 @@ public MainWindow()
 
             queryEditorVM = new QueryEditorViewModel(TryQueryDatabase, GenerateScriptForQueryAndOpenRDS);
             queryVisualizationVM = new QueryVisualizationVM();
-            workspacesVM = new WorkspacesViewModel(iAmMessenger, queryEditorVM, OpenRDSWithGivenScript);
+            workspacesVM = new WorkspacesViewModel(iAmMessenger, OpenRDSWithGivenScript);
             visualizationsManagerVM = new VisualizationsManagerVM(rvController);     
 
             InitializeComponent();
@@ -165,7 +165,20 @@ public MainWindow()
             globalKeyboardHook.KeyDown += GlobalKeyboardHook_KeyDown;
         }
 
-        
+
+        public void Receive(OpenWindowCommand cmd)
+        {
+            SaveUserSettings();
+            var window = new MainWindow(cmd.sourceOfObjects);
+            window.Owner = this;
+            window.Show();
+        }
+        public void Receive(RunQueryCommand cmd)
+        {
+            queryEditorVM.Query(cmd.query);
+        }
+
+
         private async Task InitializeAsync()
         {
             (IsNewVerAvailable, NewVersionLink) = await VersionChecker.CheckIfNewVersionIsAvailable();
@@ -225,13 +238,7 @@ private void Workspaces_SelectedItemChanged(SelectedItemChangedEventArgs obj)
         {
             UpdateVisualizations();
         }       
-        public void Receive(OpenWindowCommand cmd)
-        {
-            SaveUserSettings();
-            var window = new MainWindow(cmd.sourceOfObjects);
-            window.Owner = this;
-            window.Show();           
-        }
+        
         private async void TryQueryDatabase(string query)
         {
             Workspaces.Reset();     
@@ -422,4 +429,6 @@ protected virtual void OnPropertyChanged([CallerMemberName] String propertyName
     }
 
     internal sealed record OpenWindowCommand(SourceOfObjects sourceOfObjects);
+    internal sealed record RunQueryCommand(string query);
+
 }

sources/RevitDBExplorer/UIComponents/List/ListVM.cs

@@ -28,7 +28,6 @@ internal class ListVM : BaseViewModel
         private readonly ObservableCollection<DynamicGridViewColumn> columnsFor1;
         private readonly ObservableCollection<DynamicGridViewColumn> columnsFor2;
         private readonly IMessenger iAmMessenger;
-        private readonly IAmQueryExecutor queryExecutor;
         private readonly IAmScriptOpener scriptOpener;
         private ObservableCollection<IListItem> listItems = new();
         private ObservableCollection<DynamicGridViewColumn> columns = new();
@@ -163,10 +162,9 @@ public bool IsComparisonActive
         }
 
 
-        public ListVM(IMessenger iAmMessenger, IAmQueryExecutor queryExecutor, IAmScriptOpener scriptOpener)
+        public ListVM(IMessenger iAmMessenger, IAmScriptOpener scriptOpener)
         {
-            this.iAmMessenger = iAmMessenger;
-            this.queryExecutor = queryExecutor;
+            this.iAmMessenger = iAmMessenger;          
             this.scriptOpener = scriptOpener;
             columnsFor1 = new ObservableCollection<DynamicGridViewColumn>()
             {
@@ -396,7 +394,7 @@ private void SearchForParameterValue(object obj)
         {
             if (obj is SnoopableParameter snoopableParameter)
             {
-                queryExecutor.Query(snoopableParameter.GenerateQueryForForParameterValue());
+                iAmMessenger.Send(new RunQueryCommand(snoopableParameter.GenerateQueryForForParameterValue()));               
             }
         }
         private void GenerateCSharpCode(object obj, TemplateInputsKind inputsKind)
@@ -433,10 +431,7 @@ private async void Reload()
 
     internal record class ListSelectedItemChangedEventArgs(IListItem OldOne, IListItem NewOne);
 
-    internal interface IAmQueryExecutor
-    {
-        void Query(string query);
-    }
+
     internal interface IAmScriptOpener
     {
         void Open(string script);

sources/RevitDBExplorer/UIComponents/QueryEditor/QueryEditorViewModel.cs

@@ -8,7 +8,7 @@
 
 namespace RevitDBExplorer.UIComponents.QueryEditor
 {
-    internal class QueryEditorViewModel : BaseViewModel, IAmQueryExecutor
+    internal class QueryEditorViewModel : BaseViewModel
     {
         private readonly IAutocompleteItemProvider databaseQueryAutocompleteItemProvider = new AutocompleteItemProvider();
         private readonly Action<string> tryQueryDatabase;      
@@ -85,7 +85,7 @@ public void ResetDatabaseQuery()
             databaseQuery = "";
             OnPropertyChanged(nameof(DatabaseQuery));
         }
-        void IAmQueryExecutor.Query(string query)
+        public void Query(string query)
         {
             DatabaseQuery = query;
         }

sources/RevitDBExplorer/UIComponents/Workspaces/WorkspaceViewModel.cs

@@ -87,11 +87,11 @@ public GridLength FirstColumnWidth
         }
 
 
-        public WorkspaceViewModel(IMessenger iAmMessenger, IAmQueryExecutor queryExecutor, Action<string> openRDSWithGivenScript)
+        public WorkspaceViewModel(IMessenger iAmMessenger, Action<string> openRDSWithGivenScript)
         {
             this.iAmMessenger = new MessengerWithSender(this, iAmMessenger);
             this.openRDSWithGivenScript = openRDSWithGivenScript;
-            listVM = new ListVM(this.iAmMessenger, queryExecutor, this);
+            listVM = new ListVM(this.iAmMessenger, this);
             ExplorerTree.SelectedItemChanged += Tree_SelectedItemChanged;
             UtilityTree.SelectedItemChanged += Tree_SelectedItemChanged;
             List.SelectedItemChanged += List_SelectedItemChanged;               

sources/RevitDBExplorer/UIComponents/Workspaces/WorkspacesViewModel.cs

@@ -22,7 +22,6 @@ internal class WorkspacesViewModel : BaseViewModel, IRecipient<OpenWorkspaceComm
     {
         private readonly IMessenger iAmMessenger;
         private readonly Action<string> openRDSWithGivenScript;
-        private readonly IAmQueryExecutor queryExecutor;
         private readonly ObservableCollection<WorkspaceViewModel> workspaces = new ObservableCollection<WorkspaceViewModel>();
         private WorkspaceViewModel selectedWorkspace;
         private double firstColumnWidth;
@@ -71,11 +70,11 @@ public double Width
         }
 
 
-        public WorkspacesViewModel(IMessenger iAmMessenger, IAmQueryExecutor queryExecutor, Action<string> openRDSWithGivenScript)
+        public WorkspacesViewModel(IMessenger iAmMessenger, Action<string> openRDSWithGivenScript)
         {
             this.iAmMessenger = iAmMessenger;
             iAmMessenger.RegisterAll(this);
-            this.queryExecutor = queryExecutor;
+          
             this.openRDSWithGivenScript = openRDSWithGivenScript;
             firstColumnWidth = AppSettings.Default.FirstColumnWidth;                       
         }
@@ -157,7 +156,7 @@ private WorkspaceViewModel GetFirstAvailableWorkspace()
         }
         private WorkspaceViewModel CreateNewWorkspace()
         {
-            var workspace = new WorkspaceViewModel(iAmMessenger, queryExecutor, openRDSWithGivenScript);
+            var workspace = new WorkspaceViewModel(iAmMessenger, openRDSWithGivenScript);
             workspace.IsActive = false;
             workspace.ListSelectedItemChanged += Workspace_ListSelectedItemChanged;
             workspace.TreeSelectedItemChanged += Workspace_TreeSelectedItemChanged;