Refactoring SQL joblog view

src/extension.ts

@@ -8,7 +8,8 @@ import * as resultsProvider from "./views/results";
 
 import { JDBCOptions } from "@ibm/mapepire-js/dist/src/types";
 import { registerCopilotProvider } from "./aiProviders/copilot";
-import { getInstance, loadBase } from "./base";
+import { getBase, getInstance, loadBase } from "./base";
+import { updateStatusBar } from "./views/jobManager/statusBar";
 import { JobManager, initConfig, onConnectOrServerInstall as onCode4iConnect } from "./config";
 import Configuration from "./configuration";
 import { ExtendedSQLJob } from "./connection/extendedSQLJob";
@@ -73,7 +74,9 @@ export async function activate(context: vscode.ExtensionContext): Promise<Db2i>
       new SelfTreeDecorationProvider()
     ),
     vscode.window.registerUriHandler(new Db2iUriHandler()),
-    getStatementUri
+    getStatementUri,
+    // Re-apply the status bar colour when the connection settings change, like the core does
+    getBase().onCodeForIBMiConfigurationChange(`connectionSettings`, () => updateStatusBar())
   );
 
   JSONServices.initialise(context);

src/views/jobManager/jobManagerView.ts

@@ -9,7 +9,6 @@ import { sqlLanguageStatus } from "../../language/providers";
 import { setCancelButtonVisibility } from "../results";
 import { ConfigGroup, ConfigManager } from "./ConfigManager";
 import { editJobUi } from "./editJob";
-import { displayJobLog } from "./jobLog";
 import { SelfValue, selfCodesMap } from "./selfCodes/nodes";
 import { SelfCodesQuickPickItem } from "./selfCodes/selfCodesBrowser";
 import { updateStatusBar } from "./statusBar";
@@ -90,20 +89,18 @@ export class JobManagerView implements TreeDataProvider<any> {
 
       vscode.commands.registerCommand(`vscode-db2i.jobManager.viewJobLog`, async (node?: SQLJobItem) => {
         const id = node ? node.label as string : undefined;
-        let selected = id ? JobManager.getJob(id) : JobManager.getSelection();
-        if (selected) {
-          displayJobLog(selected);
+        const selected = id ? JobManager.getJob(id) : JobManager.getSelection();
+        if (selected?.job.id) {
+          await vscode.commands.executeCommand('code-for-ibmi.showJobLog', selected.job.id);
         }
       }),
 
       vscode.commands.registerCommand(`vscode-db2i.jobManager.copyJobId`, async (node?: SQLJobItem) => {
-        if (node) {
-          const id = node.label as string;
-          const selected = JobManager.getJob(id);
-          if (selected?.job.id) {
-            await env.clipboard.writeText(selected.job.id);
-            window.showInformationMessage(`Copied ${selected.job.id} to clipboard.`);
-          }
+        const id = node ? node.label as string : undefined;
+        const selected = id ? JobManager.getJob(id) : JobManager.getSelection();
+        if (selected?.job.id) {
+          await env.clipboard.writeText(selected.job.id);
+          window.showInformationMessage(`Copied ${selected.job.id} to clipboard.`);
         }
       }),
 

src/views/jobManager/statusBar.ts

@@ -1,5 +1,5 @@
 import { MarkdownString, StatusBarAlignment, ThemeColor, window } from "vscode";
-import { getInstance } from "../../base";
+import { getInstance, getVSCodeTools } from "../../base";
 import { JobManager } from "../../config";
 import Statement from "../../database/statement";
 
@@ -33,6 +33,11 @@ export async function updateStatusBar(options: {newJob?: boolean, canceling?: bo
 
       const job = selected.job;
 
+      if (job.id) {
+        toolTipItems.push(`[SQL Job: \`${job.id}\`](command:vscode-db2i.jobManager.copyJobId)`);
+        toolTipItems.push(`[$(info) View Job Log](command:vscode-db2i.jobManager.viewJobLog)`);
+      }
+
       if (job.getNaming() === `sql`) {
         toolTipItems.push(`SQL Naming.\n\nCurrent schema: \`${Statement.delimName(await job.getCurrentSchema())}\``);
       } else {
@@ -58,7 +63,6 @@ export async function updateStatusBar(options: {newJob?: boolean, canceling?: bo
         }
       }
 
-      toolTipItems.push(`[$(info) View Job Log](command:vscode-db2i.jobManager.viewJobLog)`);
       toolTipItems.push(`[$(edit) Edit Connection Settings](command:vscode-db2i.jobManager.editJobProps)`);
       toolTipItems.push(`[$(bracket-error) Edit SELF codes](command:vscode-db2i.jobManager.editSelfCodes)`);
     } else {
@@ -74,6 +78,8 @@ export async function updateStatusBar(options: {newJob?: boolean, canceling?: bo
 
     item.text = text;
     item.backgroundColor = backgroundColour;
+    const config = connection.getConfig();
+    item.color = getVSCodeTools()?.parseStatusBarColor(config.statusBarColor);
 
     item.show();
   } else {