Merge pull request #43 from DigitalMolecules/development

Prepared v0.1.6
DigitalMolecules · Mar 5, 2020 · ffd9f04 · ffd9f04
2 parents 4149ad8 + 99ef95b
commit ffd9f04
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change Log
 
+## [0.1.6] (Preview)
+- Open and Delete message not working when viewing from a Queue #41
+
 ## [0.1.5] (Preview)
 - Delete a single message #37
 - Send to bus does not allow queue selection #38

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
 	"displayName": "Service Bus Explorer",
 	"description": "Service Bus Explorer allows users to connect to a Service Bus namespace and administer messaging entities.",
 	"icon": "resources/icon.png",
-	"version": "0.1.5",
+	"version": "0.1.6",
 	"publisher": "digital-molecules",
 	"repository": "https://github.com/DigitalMolecules/vscode-servicebus-explorer",
 	"license": "MIT",

diff --git a/src/commands/index.ts b/src/commands/index.ts
@@ -85,6 +85,8 @@ export default function registerCommands(
 					} else {
 						window.showErrorMessage('enqueuedSequenceNumber is empty');
 					}
+				} else {
+					return Promise.reject();
 				}
 			}
 		}),

diff --git a/src/messages/messageWebView.ts b/src/messages/messageWebView.ts
@@ -94,15 +94,14 @@ export class MessageWebView {
                         margin: 0px;
                     }
 
-
                     .hidden{
                         display:none;
                     }
 
                 </style>
             </head>
             <body>
-                    <h1>Messages (${subscription})</h1>
+                    <h1>Messages (${subscription ? subscription : queue})</h1>
                     <script >
                         const vscode = acquireVsCodeApi();
                         function showMessage(topic, subscription, queue, messageId, enqueuedSequenceNumber){
@@ -228,7 +227,7 @@ export class MessageWebView {
         this.panel.webview.onDidReceiveMessage(
             message => {
                 // Find message by id and sequence number
-                var msg = messages.find(x => x.messageId === message.messageId && x.enqueuedSequenceNumber && x.enqueuedSequenceNumber.toString() === message.enqueuedSequenceNumber);
+                var msg = messages.find(x => x.messageId === message.messageId && x.enqueuedSequenceNumber?.toString() === message.enqueuedSequenceNumber);
 
                 if (msg) {
                     switch (message.command) {