Merge branch 'main' into feature/notebooks

Author: worksofliam

package.json

@@ -2,7 +2,7 @@
   "name": "vscode-db2i",
   "displayName": "Db2 for IBM i",
   "description": "Db2 for IBM i tools in VS Code",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "preview": true,
   "engines": {
     "vscode": "^1.70.0"

src/IBMiDetail.ts

@@ -1,3 +1,4 @@
+import { commands } from "vscode";
 import { getInstance } from "./base";
 import { ServerComponent } from "./connection/serverComponent";
 
@@ -19,6 +20,7 @@ export class IBMiDetail {
 
   setFeatureSupport(featureId: Db2FeatureIds, supported: boolean) {
     this.features[featureId] = supported;
+    commands.executeCommand(`setContext`, `vscode-db2i:${featureId}Supported`, supported);
   }
 
   getVersion() {
@@ -30,6 +32,12 @@ export class IBMiDetail {
   }
 
   async fetchSystemInfo() {
+    // Disable all features
+    const features = Object.keys(featureRequirements) as Db2FeatureIds[];
+    for (const featureId of features) {
+      this.setFeatureSupport(featureId, false);
+    }
+
     const instance = getInstance();
     const content = instance.getContent();
 
@@ -52,7 +60,6 @@ export class IBMiDetail {
       levelCheckFailed = true;
     }
 
-    const features = Object.keys(featureRequirements) as Db2FeatureIds[];
     for (const featureId of features) {
       const requiredLevelForFeature = featureRequirements[featureId][String(this.version)];
       const supported = requiredLevelForFeature && this.db2Level >= requiredLevelForFeature;

src/config.ts

@@ -35,7 +35,6 @@ export async function onConnectOrServerInstall(): Promise<boolean> {
   await ServerComponent.checkForUpdate();
 
   updateStatusBar();
-  toggleViews();
 
   if (ServerComponent.isInstalled()) {
     JobManagerView.setVisible(true);
@@ -83,15 +82,6 @@ export function initConfig(context: ExtensionContext) {
   });
 }
 
-export function toggleViews() {
-  const features = osDetail.getFeatures();
-
-  const featureIds = Object.keys(features) as (keyof typeof features)[];
-  for (const featureId of featureIds) {
-    commands.executeCommand(`setContext`, `vscode-db2i:${featureId}Supported`, features[featureId]);
-  }
-}
-
 export async function askAboutNewJob(startup?: boolean): Promise<boolean> {
   const instance = getInstance();
   const connection = instance.getConnection();

src/connection/serverComponent.ts

@@ -107,7 +107,10 @@ export class ServerComponent {
             command: `echo ${ExecutablePathDir}`
           });
 
-          if (commandResult.code === 0 && commandResult.stderr === ``) {
+          this.writeOutput(JSON.stringify(commandResult));
+
+          if (commandResult.code === 0) {
+            const stuffInStderr = commandResult.stderr.length > 0;
             const remotePath = path.posix.join(commandResult.stdout, basename);
 
             ServerComponent.writeOutput(JSON.stringify({remotePath, ExecutablePathDir}));
@@ -122,14 +125,17 @@ export class ServerComponent {
 
             await Config.setServerComponentName(basename);
 
+            if (stuffInStderr) {
+              ServerComponent.writeOutput(`Server component was uploaded to ${remotePath} but there was something in stderr, which is not right. It might be worth seeing your user profile startup scripts.`);
+            }
+
             window.showInformationMessage(`Db2 for IBM i extension server component has been updated!`);
             this.installed = true;
             updateResult = UpdateStatus.JUST_UPDATED;
 
           } else {
             updateResult = UpdateStatus.FAILED;
 
-            this.writeOutput(JSON.stringify(commandResult));
             window.showErrorMessage(`Something went really wrong when trying to fetch your home directory.`).then(chosen => {
               if (chosen === `Show`) {
                 this.outputChannel.show();

src/views/jobManager/selfCodes/selfCodesResultsView.ts

@@ -9,7 +9,7 @@ import {
   Uri,
   Disposable
 } from "vscode";
-import { JobManager } from "../../../config";
+import { JobManager, osDetail } from "../../../config";
 import { SelfCodeNode, SelfIleStackFrame } from "./nodes";
 import { openExampleCommand } from "../../examples/exampleBrowser";
 import { SQLExample } from "../../examples";
@@ -94,15 +94,21 @@ export class selfCodesResultsView implements TreeDataProvider<any> {
                     where user_name = current_user
                     order by logged_time desc`;
 
-    const result = await selected.job.query<SelfCodeNode>(content).run(10000);
-    if (result.success) {
-      const data: SelfCodeNode[] = result.data.map((row) => ({
-        ...row,
-        INITIAL_STACK: JSON.parse(row.INITIAL_STACK as unknown as string)
-      }));
+    try {
+      const result = await selected.job.query<SelfCodeNode>(content).run(10000);
+      if (result.success) {
+        const data: SelfCodeNode[] = result.data.map((row) => ({
+          ...row,
+          INITIAL_STACK: JSON.parse(row.INITIAL_STACK as unknown as string)
+        }));
 
-    
-      return data;
+      
+        return data;
+      }
+    } catch (e) {
+      this.setRefreshEnabled(false);
+      osDetail.setFeatureSupport(`SELF`, false);
+      vscode.window.showErrorMessage(`An error occured fetching SELF code errors, and therefore will be disabled.`);
     }
   }