Merge pull request #120 from jirkapok/Change_Query_Connection

UI enhancedments to allow Change query connection
solarwinds · Mar 8, 2018 · ba8f1a6 · ba8f1a6
2 parents d6a9bb3 + fd62be4
commit ba8f1a6
Show file tree

Hide file tree

Showing 21 changed files with 942 additions and 500 deletions.
diff --git a/Src/SwqlStudio/ActivityMonitorTab.cs b/Src/SwqlStudio/ActivityMonitorTab.cs
@@ -1,12 +1,22 @@
 using System;
 using System.Windows.Forms;
+using SwqlStudio.Subscriptions;
 
 namespace SwqlStudio
 {
     public partial class ActivityMonitorTab : UserControl, IConnectionTab
     {
         private string subscriptionId;
 
+        public ConnectionInfo ConnectionInfo { get; set; }
+
+        public SubscriptionManager SubscriptionManager { get; set; }
+
+        public bool AllowsChangeConnection
+        {
+            get { return false; }
+        }
+
         public ActivityMonitorTab()
         {
             InitializeComponent();
@@ -15,17 +25,18 @@ public ActivityMonitorTab()
 
         void ActivityMonitorTabDisposed(object sender, EventArgs e)
         {
-            if (String.IsNullOrEmpty(subscriptionId) && ConnectionInfo.IsConnected)
+            if (!String.IsNullOrEmpty(subscriptionId) && ConnectionInfo.IsConnected)
             {
-                ApplicationService.SubscriptionManager.Unsubscribe(ConnectionInfo, subscriptionId);
+                this.SubscriptionManager.Unsubscribe(ConnectionInfo, subscriptionId);
             }
         }
 
-        public IApplicationService ApplicationService { get; set; }
-
         private void SubscriptionIndicationReceived(IndicationEventArgs e)
         {
-             BeginInvoke(new Action<IndicationEventArgs>(AddIndication), e);
+            if (this.IsDisposed)
+                return;
+
+            BeginInvoke(new Action<IndicationEventArgs>(AddIndication), e);
         }
 
         private void AddIndication(IndicationEventArgs obj)
@@ -41,8 +52,6 @@ private void AddIndication(IndicationEventArgs obj)
             item.EnsureVisible();
         }
 
-        public ConnectionInfo ConnectionInfo { get; set; }
-
         public void Start()
         {
             backgroundWorker1.RunWorkerAsync();
@@ -55,7 +64,7 @@ private void backgroundWorker1_DoWork(object sender, System.ComponentModel.DoWor
             backgroundWorker1.ReportProgress(0, "Starting subscription...");
             try
             {
-                subscriptionId = ApplicationService.SubscriptionManager.CreateSubscription(ConnectionInfo, "SUBSCRIBE System.QueryExecuted", SubscriptionIndicationReceived);
+                subscriptionId = this.SubscriptionManager.CreateSubscription(ConnectionInfo, "SUBSCRIBE System.QueryExecuted", SubscriptionIndicationReceived);
                 backgroundWorker1.ReportProgress(0, "Waiting for notifications");
             }
             catch (ApplicationException ex)

diff --git a/Src/SwqlStudio/ConnectionsManager.cs b/Src/SwqlStudio/ConnectionsManager.cs
@@ -0,0 +1,76 @@
+using System.Windows.Forms;
+
+namespace SwqlStudio
+{
+    internal class ConnectionsManager
+    {
+        private readonly IApplicationService applicationService;
+        private readonly ServerList serverList;
+        private readonly QueriesDockPanel dockPanel;
+
+        public ConnectionsManager(IApplicationService applicationService, ServerList serverList, QueriesDockPanel dockPanel)
+        {
+            this.applicationService = applicationService;
+            this.serverList = serverList;
+            this.dockPanel = dockPanel;
+        }
+
+        public void CreateConnection()
+        {
+            ConnectionInfo connection = AskForNewConnection();
+            if (connection != null)
+                ResolveExistingConnection(connection);
+        }
+
+        internal ConnectionInfo ResolveConnection()
+        {
+            ConnectionInfo info = EnsureExistingConnection();
+            if (info != null)
+                return ResolveExistingConnection(info);
+
+            return null;
+        }
+
+        private ConnectionInfo EnsureExistingConnection()
+        {
+            var selectedConnection = this.applicationService.SelectedConnection;
+            if (selectedConnection != null)
+                return selectedConnection;
+
+            return AskForNewConnection();
+        }
+
+        private ConnectionInfo ResolveExistingConnection(ConnectionInfo info)
+        {
+            ConnectionInfo found;
+            bool alreadyExists = serverList.TryGet(info.ServerType, info.Server, info.UserName, out found);
+            if (alreadyExists)
+                return found;
+
+            info.Connect();
+            var provider = serverList.Add(info);
+
+            info.ConnectionClosed += (sender, args) =>
+            {
+                this.dockPanel.CloseAllFixedConnectionTabs(info);
+                serverList.Remove(info);
+            };
+
+            this.dockPanel.AddServer(provider, info);
+            return info;
+        }
+
+        internal static ConnectionInfo AskForNewConnection()
+        {
+            using (var nc = new NewConnection())
+            {
+                if (nc.ShowDialog() == DialogResult.OK)
+                {
+                    return nc.ConnectionInfo;
+                }
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/Src/SwqlStudio/CrudTab.cs b/Src/SwqlStudio/CrudTab.cs
@@ -31,12 +31,11 @@ public Entity Entity
             }
         }
 
-        /// <inheritdoc />
-        public IApplicationService ApplicationService { get; set; }
-
         /// <inheritdoc />
         public ConnectionInfo ConnectionInfo { get; set; }
 
+        public bool AllowsChangeConnection => true;
+
         public event EventHandler CloseItself;
 
         private void CreateSubComponents()

diff --git a/Src/SwqlStudio/IApplicationService.cs b/Src/SwqlStudio/IApplicationService.cs
@@ -8,5 +8,9 @@ public interface IApplicationService
         PropertyBag QueryParameters { get; set; }
 
         SubscriptionManager SubscriptionManager { get; }
+
+        ConnectionInfo SelectedConnection { get; }
+
+        void RefreshSelectedConnections();
     }
 }
diff --git a/Src/SwqlStudio/IConnectionTab.cs b/Src/SwqlStudio/IConnectionTab.cs
@@ -2,7 +2,8 @@ namespace SwqlStudio
 {
     public interface IConnectionTab
     {
-        IApplicationService ApplicationService { get; set; }
         ConnectionInfo ConnectionInfo { get; set; }
+
+        bool AllowsChangeConnection { get; }
     }
 }
diff --git a/Src/SwqlStudio/ITabsFactory.cs b/Src/SwqlStudio/ITabsFactory.cs
@@ -6,9 +6,9 @@ internal interface ITabsFactory
     {
         void AddTextToEditor(string text, ConnectionInfo info);
 
-        void OpenActivityMonitor(string title, ConnectionInfo connectionInfo);
+        void OpenActivityMonitor(ConnectionInfo connectionInfo);
 
-        void OpenInvokeTab(string title, ConnectionInfo connectionInfo, Verb verb);
+        void OpenInvokeTab(ConnectionInfo connectionInfo, Verb verb);
 
         void OpenCrudTab(CrudOperation operation, ConnectionInfo connectionInfo, Entity entity);
     }

diff --git a/Src/SwqlStudio/InvokeVerbTab.cs b/Src/SwqlStudio/InvokeVerbTab.cs
@@ -17,8 +17,8 @@ public InvokeVerbTab()
             InitializeComponent();
         }
 
-        public IApplicationService ApplicationService { get; set; }
         public ConnectionInfo ConnectionInfo { get; set; }
+        public bool AllowsChangeConnection => true;
         private int locationX = 0;
         private int locationY = 0;