fix object explorer menu for version check

Author: dzsquared

package.json

@@ -95,7 +95,7 @@
                 },
                 {
                   "command": "extension.sp_blitzversion",
-                  "when": "connectionProvider == MSSQL",
+                  "when": "connectionProvider == MSSQL && nodeType && nodeType == Server",
                   "group": "FRK"
                 },
               {

src/extension.ts

@@ -14,8 +14,8 @@ export function activate(context: vscode.ExtensionContext) {
     // checking spblitz versioning
     var oediag = async (context: sqlops.ObjectExplorerContext) => {
         vscode.window.showInformationMessage(context.isConnectionNode.toString());
-        vscode.window.showInformationMessage(context.nodeInfo.label);
-        vscode.window.showInformationMessage(context.nodeInfo.nodePath);
+        vscode.window.showInformationMessage(context.nodeInfo.nodeSubType);
+        vscode.window.showInformationMessage(context.nodeInfo.iconType.toString());
     };
     var disposable_oediag = vscode.commands.registerCommand('extension.OEdiagnostics', oediag);
     context.subscriptions.push(disposable_oediag);
@@ -25,20 +25,16 @@ export function activate(context: vscode.ExtensionContext) {
         var amIUPD = new updatecheck();
         let updateReturn = await amIUPD.checkForUpdates(context);
 
-        // updateChoice.then(function(updateReturn) {
-        // if (updateReturn) {
-            vscode.window.showInformationMessage(updateReturn);
-            if (updateReturn == 'update') {
-                getblitzall();
-            } else if (updateReturn != '') {
-                let versionURL = 'https://github.com/BrentOzarULTD/SQL-Server-First-Responder-Kit/releases/tag/' + updateReturn;
-                vscode.commands.executeCommand('vscode.open', vscode.Uri.parse(versionURL));
-            } else {
-                // do nothing
-                vscode.window.showInformationMessage("nothing came back");
-            }
-        // }
-        // });
+        //vscode.window.showInformationMessage(updateReturn);
+        if (updateReturn == 'update') {
+            getblitzall();
+        } else if (updateReturn != '') {
+            let versionURL = 'https://github.com/BrentOzarULTD/SQL-Server-First-Responder-Kit/releases/tag/' + updateReturn;
+            vscode.commands.executeCommand('vscode.open', vscode.Uri.parse(versionURL));
+        } else {
+            // do nothing
+            vscode.window.showErrorMessage("Sorry about this. Please report the issue on Github.");
+        }
     };
     var disposable_spblitzversion = vscode.commands.registerCommand('extension.sp_blitzversion', getblitzversion);
     context.subscriptions.push(disposable_spblitzversion);

src/updateCheck.ts

@@ -10,19 +10,22 @@ let apiconfig: apiConfig.apiconfig = require('../apiconfig.json');
 export class updatecheck {
     public async checkForUpdates(context: sqlops.ObjectExplorerContext): Promise<string> {
         let baseUrl = "https://api.github.com/repos/BrentOzarULTD/SQL-Server-First-Responder-Kit/releases/latest";
-        // /repos/:owner/:repo/releases/latest
+
         let apitoken = 'token ' + apiconfig.token;
         let queryProvider = sqlops.dataprotocol.getProvider<sqlops.QueryProvider>(context.connectionProfile.providerName, sqlops.DataProviderType.QueryProvider);
         vscode.window.showInformationMessage("Checking First Responder Kit for Updates");
         try {
             let connection = await sqlops.connection.getCurrentConnection();
             let query = `declare @versionno datetime
-            exec sp_blitz @help = 1, @versiondate = @versionno output
-            select convert(varchar(10),@versionno,112) as versionno`;
+                IF OBJECT_ID('dbo.sp_Blitz') IS NULL
+                set @versionno = '1/1/1900'
+                ELSE
+                exec sp_blitz @help = 1, @versiondate = @versionno output
+                select convert(varchar(10),@versionno,112) as versionno`;
+
             let connectionUri = await sqlops.connection.getUriForConnection(connection.connectionId);
             if (connection) {
                 let results = await queryProvider.runQueryAndReturn(connectionUri, query);
-                //vscode.window.showInformationMessage(results.rowCount.toString());
                 let cell = results.rows[0][0];
                 let currentVersion = cell.displayValue;
 
@@ -37,33 +40,26 @@ export class updatecheck {
                     simple: false
                 };
                 var scriptText = await request.get(options);
-                //vscode.window.showInformationMessage("newest version: " + scriptText.tag_name);
 
                 let recentVersion = scriptText.tag_name;
                 //compare against db version
                 if (recentVersion >  currentVersion) {
-                    // var whatClicked =
-                    var buttonName = await vscode.window.showInformationMessage("New Version of First Responder Kit available.", {modal:false}, "Get It", "Tell Me More");
-
-                    // whatClicked.then(function(buttonName) {
-                        vscode.window.showInformationMessage(buttonName);
-                        if (buttonName){
-                            if (buttonName == "Get It") {
-                                return 'update';
-                            } else if (buttonName == "Tell Me More") {
-                                return recentVersion;
-                            }
-                        } else {
-                            return '';
+                    let updateMsg = 'New Version of First Responder Kit available (' + recentVersion + ').  You have version ' + currentVersion +'.'
+                    var buttonName = await vscode.window.showInformationMessage(updateMsg, {modal:false}, "Get It", "Tell Me More");
+                    if (buttonName){
+                        if (buttonName == "Get It") {
+                            return 'update';
+                        } else if (buttonName == "Tell Me More") {
+                            return recentVersion;
                         }
-                    // });
-
+                    } else {
+                        return '';
+                    }
                 } else {
                     vscode.window.showInformationMessage("You're up to date!", {modal:false}, "Close");
                     return '';
                 }
 
-                //confirm if user wants to update scripts
             } else {
                 vscode.window.showErrorMessage("Please connect to SQL server to check First Responder Kit version.");
                 return '';