From d537dee8ed570db9dc804b5254af801c2ad66820 Mon Sep 17 00:00:00 2001 From: NaorisKong <50128048+NaorisKong@users.noreply.github.com> Date: Mon, 2 Dec 2024 13:32:58 +0800 Subject: [PATCH 1/3] ISSUE 802 --- src/ServiceBusExplorer/Forms/MainForm.cs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/ServiceBusExplorer/Forms/MainForm.cs b/src/ServiceBusExplorer/Forms/MainForm.cs index 989e54b5..e9432b71 100644 --- a/src/ServiceBusExplorer/Forms/MainForm.cs +++ b/src/ServiceBusExplorer/Forms/MainForm.cs @@ -1817,6 +1817,7 @@ private void RefreshIndividualSubscription(SubscriptionDescription subscriptionD private void RefreshIndividualTopic(TreeNode selectedNode) { var wasTopicNodeExpanded = selectedNode.IsExpanded; + var wasSubscriptionsNodeExpaned = false; var topicDescription = selectedNode.Tag as TopicDescription; @@ -1829,6 +1830,13 @@ private void RefreshIndividualTopic(TreeNode selectedNode) return; } + //record the original subscriptions node is expanded + var originalSubscriptionsNode = selectedNode.Nodes.Find(SubscriptionEntities, false).First(); + if (originalSubscriptionsNode != null) + { + wasSubscriptionsNodeExpaned = originalSubscriptionsNode.IsExpanded; + } + selectedNode.Nodes.Clear(); var subscriptionsNode = selectedNode.Nodes.Add(SubscriptionEntities, SubscriptionEntities, SubscriptionListIconIndex, SubscriptionListIconIndex); subscriptionsNode.Text = string.IsNullOrWhiteSpace(FilterExpressionHelper.SubscriptionFilterExpression) ? SubscriptionEntities : FilteredSubscriptionEntities; @@ -1852,6 +1860,10 @@ private void RefreshIndividualTopic(TreeNode selectedNode) if (wasTopicNodeExpanded) selectedNode.Expand(); + if (wasSubscriptionsNodeExpaned == true) + { + subscriptionsNode.Expand(); + } } private void createEntity_Click(object sender, EventArgs e) From 6b4b10e8a76655fd309893ba36cdfcc0c7adb1c5 Mon Sep 17 00:00:00 2001 From: "Magic.Kong" <50128048+NaorisKong@users.noreply.github.com> Date: Tue, 3 Dec 2024 16:50:17 +0800 Subject: [PATCH 2/3] Update src/ServiceBusExplorer/Forms/MainForm.cs Co-authored-by: Sean Feldman --- src/ServiceBusExplorer/Forms/MainForm.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ServiceBusExplorer/Forms/MainForm.cs b/src/ServiceBusExplorer/Forms/MainForm.cs index e9432b71..06fdeac3 100644 --- a/src/ServiceBusExplorer/Forms/MainForm.cs +++ b/src/ServiceBusExplorer/Forms/MainForm.cs @@ -1831,7 +1831,7 @@ private void RefreshIndividualTopic(TreeNode selectedNode) } //record the original subscriptions node is expanded - var originalSubscriptionsNode = selectedNode.Nodes.Find(SubscriptionEntities, false).First(); + var originalSubscriptionsNode = selectedNode.Nodes.Find(SubscriptionEntities, false).FirstOrDefault(); if (originalSubscriptionsNode != null) { wasSubscriptionsNodeExpaned = originalSubscriptionsNode.IsExpanded; From c92ed69337f838300fee9cd937aa96144c093ee0 Mon Sep 17 00:00:00 2001 From: "Magic.Kong" <50128048+NaorisKong@users.noreply.github.com> Date: Tue, 3 Dec 2024 16:57:37 +0800 Subject: [PATCH 3/3] Update MainForm.cs --- src/ServiceBusExplorer/Forms/MainForm.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ServiceBusExplorer/Forms/MainForm.cs b/src/ServiceBusExplorer/Forms/MainForm.cs index 06fdeac3..a85d784f 100644 --- a/src/ServiceBusExplorer/Forms/MainForm.cs +++ b/src/ServiceBusExplorer/Forms/MainForm.cs @@ -1817,7 +1817,7 @@ private void RefreshIndividualSubscription(SubscriptionDescription subscriptionD private void RefreshIndividualTopic(TreeNode selectedNode) { var wasTopicNodeExpanded = selectedNode.IsExpanded; - var wasSubscriptionsNodeExpaned = false; + var wasSubscriptionsNodeExpanded = false; var topicDescription = selectedNode.Tag as TopicDescription; @@ -1834,7 +1834,7 @@ private void RefreshIndividualTopic(TreeNode selectedNode) var originalSubscriptionsNode = selectedNode.Nodes.Find(SubscriptionEntities, false).FirstOrDefault(); if (originalSubscriptionsNode != null) { - wasSubscriptionsNodeExpaned = originalSubscriptionsNode.IsExpanded; + wasSubscriptionsNodeExpanded = originalSubscriptionsNode.IsExpanded; } selectedNode.Nodes.Clear(); @@ -1860,7 +1860,7 @@ private void RefreshIndividualTopic(TreeNode selectedNode) if (wasTopicNodeExpanded) selectedNode.Expand(); - if (wasSubscriptionsNodeExpaned == true) + if (wasSubscriptionsNodeExpanded == true) { subscriptionsNode.Expand(); }