closes #18

DigitalMolecules · Oct 16, 2019 · 092f400 · 092f400
1 parent b497357
commit 092f400
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 26 deletions.
diff --git a/package.json b/package.json
@@ -185,8 +185,7 @@
 			"view/item/context": [
 				{
 					"command": "serviceBusExplorer.editEntry",
-					"when": "view == servicebus-namespaces && viewItem == namespace",
-					"group": "inline"
+					"when": "view == servicebus-namespaces && viewItem == namespace"
 				},
 				{
 					"command": "serviceBusExplorer.toggleCollapseAll",
@@ -229,11 +228,6 @@
 					"command": "serviceBusExplorer.deleteSubscription",
 					"when": "view == servicebus-namespaces && viewItem == subscription"
 				},
-				{
-					"command": "serviceBusExplorer.deleteSubscription",
-					"when": "view == servicebus-namespaces && viewItem == subscription",
-					"group": "inline"
-				},
 				{
 					"command": "serviceBusExplorer.createTopic",
 					"when": "view == servicebus-namespaces && viewItem == topiclist",
@@ -247,11 +241,6 @@
 					"command": "serviceBusExplorer.deleteTopic",
 					"when": "view == servicebus-namespaces && viewItem == topic"
 				},
-				{
-					"command": "serviceBusExplorer.deleteTopic",
-					"when": "view == servicebus-namespaces && viewItem == topic",
-					"group": "inline"
-				},
 				{
 					"command": "serviceBusExplorer.createQueue",
 					"when": "view == servicebus-namespaces && viewItem == queuelist",
@@ -264,11 +253,6 @@
 				{
 					"command": "serviceBusExplorer.deleteQueue",
 					"when": "view == servicebus-namespaces && viewItem == queue"
-				},
-				{
-					"command": "serviceBusExplorer.deleteQueue",
-					"when": "view == servicebus-namespaces && viewItem == queue",
-					"group": "inline"
 				}
 			],
 			"commandPalette": [

diff --git a/src/commands/index.ts b/src/commands/index.ts
@@ -70,15 +70,15 @@ export default function registerCommands(
 		commands.registerCommand('serviceBusExplorer.createSubscription', async (node: Topic) => {
 			var state  = await  subscriptionUI.createSubscription();
 			await node.createSubscription(state.name);
-			serviceBusProvider.reBuildTree(node);
+			serviceBusProvider.refresh(node);
 		}),
 
 		commands.registerCommand('serviceBusExplorer.deleteSubscription', async (node: Subscription) => {
 			var state  = await subscriptionUI.deleteSubscription();
 
 			if (state.confirm.toUpperCase() === "YES") {
 				await node.deleteSubscription();
-				serviceBusProvider.reBuildTree(node.parent);
+				serviceBusProvider.refresh(node.parent);
 			}
 			else {
 				window.showErrorMessage('Deletion has not been confirmed as "Yes" was not typed');
@@ -88,15 +88,15 @@ export default function registerCommands(
 		commands.registerCommand('serviceBusExplorer.createTopic', async (node: TopicList) => {
 			var state  = await  topicUI.createTopic();
 			await node.createTopic(state.name);
-			serviceBusProvider.reBuildTree(node);
+			serviceBusProvider.refresh(node);
 		}),
 
 		commands.registerCommand('serviceBusExplorer.deleteTopic', async (node: Topic) => {
 			var state  = await topicUI.deleteTopic();
 
 			if (state.confirm.toUpperCase() === "YES") {
 				await node.deleteTopic();
-				serviceBusProvider.reBuildTree(node.parent);
+				serviceBusProvider.refresh(node);
 			}
 			else {
 				window.showErrorMessage('Deletion has not been confirmed as "Yes" was not typed');
@@ -106,15 +106,15 @@ export default function registerCommands(
 		commands.registerCommand('serviceBusExplorer.createQueue', async (node: QueueList) => {
 			var state  = await  queueUI.createQueue();
 			await node.createQueue(state.name);
-			serviceBusProvider.reBuildTree(node);
+			serviceBusProvider.refresh(node);
 		}),
 
 		commands.registerCommand('serviceBusExplorer.deleteQueue', async (node: Queue) => {
 			var state  = await queueUI.deleteQueue();
 
 			if (state.confirm.toUpperCase() === "YES") {
 				await node.deleteQueue();
-				serviceBusProvider.reBuildTree(node.parent);
+				serviceBusProvider.refresh(node.parent);
 			}
 			else {
 				window.showErrorMessage('Deletion has not been confirmed as "Yes" was not typed');

diff --git a/src/namespace/namespaceItem.ts b/src/namespace/namespaceItem.ts
@@ -26,8 +26,8 @@ export class NameSpaceItem extends ExplorerItemBase {
 			let topics = await this.data.clientInstance.getTopics();
 			let queues = await this.data.clientInstance.getQueues();
 
-			this.children.push(new QueueList(this.data, this.collapsibleState, queues.length || 0));
-			this.children.push(new TopicList(this.data, this.collapsibleState, topics.length || 0));
+			this.children.push(new QueueList(this.data, queues.length ? this.collapsibleState : TreeItemCollapsibleState.None, queues.length || 0));
+			this.children.push(new TopicList(this.data, topics.length ? this.collapsibleState : TreeItemCollapsibleState.None, topics.length || 0));
 		}
 
 		return Promise.resolve(this.children);

diff --git a/src/topic/topicList.ts b/src/topic/topicList.ts
@@ -35,7 +35,7 @@ export class TopicList extends ExplorerItemBase {
 
 			for (var i = 0; i < topicDetails.length; i++) {
 				var subscriptions: ISubscription[] = await this.itemData.clientInstance.getSubscriptions(topicDetails[i].title || '');
-				topics.push(new Topic(this.itemData, topicDetails[i].title, this, this.collapsibleState, subscriptions.length));
+				topics.push(new Topic(this.itemData, topicDetails[i].title, this, subscriptions.length ? this.collapsibleState : TreeItemCollapsibleState.None, subscriptions.length));
 			}
 
 			this.children = topics;