Skip to content

Commit b5b3474

Browse files
committed
Open variant analysis view after submission
This will open the variant analysis view after the variant analysis has been submitted. It will also show a notification that the analysis has been submitted, which includes the query name.
1 parent cf3ba32 commit b5b3474

File tree

3 files changed

+24
-7
lines changed

3 files changed

+24
-7
lines changed

extensions/ql-vscode/src/extension.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -909,7 +909,15 @@ async function activateWithInstalledDistribution(
909909

910910
ctx.subscriptions.push(
911911
commandRunner('codeQL.mockVariantAnalysisView', async () => {
912-
const variantAnalysisView = new VariantAnalysisView(ctx);
912+
const variantAnalysisView = new VariantAnalysisView(ctx, 1);
913+
variantAnalysisView.openView();
914+
})
915+
);
916+
917+
// The "openVariantAnalysisView" command is internal-only.
918+
ctx.subscriptions.push(
919+
commandRunner('codeQL.openVariantAnalysisView', async (variantAnalysisId: number) => {
920+
const variantAnalysisView = new VariantAnalysisView(ctx, variantAnalysisId);
913921
variantAnalysisView.openView();
914922
})
915923
);

extensions/ql-vscode/src/remote-queries/run-remote-query.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { CancellationToken, Uri, window } from 'vscode';
1+
import { CancellationToken, commands, Uri, window } from 'vscode';
22
import * as path from 'path';
33
import * as yaml from 'js-yaml';
44
import * as fs from 'fs-extra';
@@ -12,7 +12,7 @@ import {
1212
showAndLogInformationMessage,
1313
tryGetQueryMetadata,
1414
pluralize,
15-
tmpDir
15+
tmpDir,
1616
} from '../helpers';
1717
import { Credentials } from '../authentication';
1818
import * as cli from '../cli';
@@ -286,10 +286,12 @@ export async function runRemoteQuery(
286286
status: VariantAnalysisStatus.InProgress,
287287
};
288288

289-
// TODO: Remove once we have a proper notification
290-
void showAndLogInformationMessage('Variant analysis submitted for processing');
291289
void logger.log(`Variant analysis:\n${JSON.stringify(variantAnalysis, null, 2)}`);
292290

291+
void showAndLogInformationMessage(`Variant analysis ${variantAnalysis.query.name} submitted for processing`);
292+
293+
void commands.executeCommand('codeQL.openVariantAnalysisView', variantAnalysis.id);
294+
293295
return { variantAnalysis };
294296

295297
} else {

extensions/ql-vscode/src/remote-queries/variant-analysis-view.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
1-
import { ViewColumn } from 'vscode';
1+
import { ExtensionContext, ViewColumn } from 'vscode';
22
import { AbstractWebview, WebviewPanelConfig } from '../abstract-webview';
33
import { WebviewMessage } from '../interface-utils';
44
import { logger } from '../logging';
55

66
export class VariantAnalysisView extends AbstractWebview<WebviewMessage, WebviewMessage> {
7+
public constructor(
8+
ctx: ExtensionContext,
9+
private readonly variantAnalysisId: number,
10+
) {
11+
super(ctx);
12+
}
13+
714
public openView() {
815
this.getPanel().reveal(undefined, true);
916
}
1017

1118
protected getPanelConfig(): WebviewPanelConfig {
1219
return {
1320
viewId: 'variantAnalysisView',
14-
title: 'CodeQL Query Results',
21+
title: `CodeQL Query Results for ${this.variantAnalysisId}`,
1522
viewColumn: ViewColumn.Active,
1623
preserveFocus: true,
1724
view: 'variant-analysis'

0 commit comments

Comments
 (0)