Improved UX for cancelling in a view

Signed-off-by: worksofliam <[email protected]>

Author: worksofliam

src/connection/manager.ts

@@ -94,8 +94,8 @@ export class SQLJobManager {
     return this.jobs;
   }
 
-  getJob(name: string): JobInfo | undefined {
-    return this.jobs.find(info => info.name === name);
+  getJob(nameOrId: string): JobInfo | undefined {
+    return this.jobs.find(info => info.name === nameOrId || info.job.id === nameOrId);
   }
 
   setSelection(selectedName: string): JobInfo|undefined {

src/views/results/index.ts

@@ -57,8 +57,8 @@ export function initialise(context: vscode.ExtensionContext) {
       webviewOptions: { retainContextWhenHidden: true },
     }),
 
-    vscode.commands.registerCommand(`vscode-db2i.statement.cancel`, async () => {
-      const selected = JobManager.getSelection();
+    vscode.commands.registerCommand(`vscode-db2i.statement.cancel`, async (jobName?: string) => {
+      const selected = typeof jobName === `string` ? JobManager.getJob(jobName) : JobManager.getSelection();
       if (selected) {
         updateStatusBar({canceling: true});
         const cancelled = await selected.job.requestCancel();

src/views/results/resultSetPanelProvider.ts

@@ -6,6 +6,7 @@ import { Query, QueryState } from "../../connection/query";
 import { updateStatusBar } from "../jobManager/statusBar";
 import Configuration from "../../configuration";
 import * as html from "./html";
+import { JobStatus } from "../../connection/sqlJob";
 
 export class ResultSetPanelProvider implements WebviewViewProvider {
   _view: WebviewView | WebviewPanel;
@@ -16,14 +17,25 @@ export class ResultSetPanelProvider implements WebviewViewProvider {
     this.loadingState = false;
   }
 
+  endQuery() {
+    if (this.currentQuery) {
+      const hostJob = this.currentQuery.getHostJob();
+      if (hostJob && hostJob.getStatus() === JobStatus.Busy) {
+        // We are assuming the job is the same here.
+        commands.executeCommand(`vscode-db2i.statement.cancel`, hostJob.id);
+      }
+      this.currentQuery.close().then(() => {
+        this.currentQuery = undefined;
+      });
+    }
+  }
+
   resolveWebviewView(webviewView: WebviewView | WebviewPanel, context?: WebviewViewResolveContext, _token?: CancellationToken) {
     this._view = webviewView;
 
     this._view.onDidDispose(() => {
       this._view = undefined;
-      this.currentQuery.close().then(() => {
-        this.currentQuery = undefined;
-      });
+      this.endQuery();
     });
 
     webviewView.webview.options = {
@@ -35,10 +47,7 @@ export class ResultSetPanelProvider implements WebviewViewProvider {
     this._view.webview.onDidReceiveMessage(async (message) => {
       switch (message.command) {
         case `cancel`:
-          commands.executeCommand(`vscode-db2i.statement.cancel`);
-          if (this.currentQuery) {
-            await this.currentQuery.close();
-          }
+          this.endQuery();
           break;
 
         default: