Skip to content

Commit 78a90ff

Browse files
authored
Merge pull request #1553 from github/koesie10/show-variant-analysis-view
Open variant analysis view after submission
2 parents 3d7f303 + d33b07b commit 78a90ff

File tree

3 files changed

+22
-6
lines changed

3 files changed

+22
-6
lines changed

extensions/ql-vscode/src/extension.ts

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

922922
ctx.subscriptions.push(
923923
commandRunner('codeQL.mockVariantAnalysisView', async () => {
924-
const variantAnalysisView = new VariantAnalysisView(ctx);
924+
const variantAnalysisView = new VariantAnalysisView(ctx, 1);
925+
variantAnalysisView.openView();
926+
})
927+
);
928+
929+
// The "openVariantAnalysisView" command is internal-only.
930+
ctx.subscriptions.push(
931+
commandRunner('codeQL.openVariantAnalysisView', async (variantAnalysisId: number) => {
932+
const variantAnalysisView = new VariantAnalysisView(ctx, variantAnalysisId);
925933
variantAnalysisView.openView();
926934
})
927935
);

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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';
@@ -273,10 +273,11 @@ export async function runRemoteQuery(
273273

274274
const processedVariantAnalysis = processVariantAnalysis(variantAnalysisSubmission, variantAnalysisResponse);
275275

276-
// TODO: Remove once we have a proper notification
277-
void showAndLogInformationMessage('Variant analysis submitted for processing');
278276
void logger.log(`Variant analysis:\n${JSON.stringify(processedVariantAnalysis, null, 2)}`);
279277

278+
void showAndLogInformationMessage(`Variant analysis ${processedVariantAnalysis.query.name} submitted for processing`);
279+
280+
void commands.executeCommand('codeQL.openVariantAnalysisView', processedVariantAnalysis.id);
280281
void commands.executeCommand('codeQL.monitorVariantAnalysis', processedVariantAnalysis);
281282

282283
return { variantAnalysis: processedVariantAnalysis };

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)