Skip to content

Convert opening variant analysis logs to a command #1952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robertbrignull merged 1 commit into from
Jan 11, 2023
Merged

Convert opening variant analysis logs to a command #1952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions extensions/ql-vscode/src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1164,6 +1164,15 @@ async function activateWithInstalledDistribution(
}),
);

ctx.subscriptions.push(
commandRunner(
"codeQL.openVariantAnalysisLogs",
async (variantAnalysisId: number) => {
await variantAnalysisManager.openVariantAnalysisLogs(variantAnalysisId);
},
),
);

ctx.subscriptions.push(
commandRunner(
"codeQL.copyVariantAnalysisRepoList",
Expand Down
15 changes: 15 additions & 0 deletions extensions/ql-vscode/src/remote-queries/variant-analysis-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { DisposableObject } from "../pure/disposable-object";
import { Credentials } from "../authentication";
import { VariantAnalysisMonitor } from "./variant-analysis-monitor";
import {
getActionsWorkflowRunUrl,
isVariantAnalysisComplete,
parseVariantAnalysisQueryLanguage,
VariantAnalysis,
Expand Down Expand Up @@ -585,6 +586,20 @@ export class VariantAnalysisManager
await cancelVariantAnalysis(credentials, variantAnalysis);
}

public async openVariantAnalysisLogs(variantAnalysisId: number) {
Copy link
Copy Markdown
Contributor

@charisk charisk Jan 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could add an integration test for this function, but it doesn't have to be part of this PR.

Copy link
Copy Markdown
Contributor Author

@robertbrignull robertbrignull Jan 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. I'll look at doing that in a followup

const variantAnalysis = this.variantAnalyses.get(variantAnalysisId);
if (!variantAnalysis) {
throw new Error(`No variant analysis with id: ${variantAnalysisId}`);
}

const actionsWorkflowRunUrl = getActionsWorkflowRunUrl(variantAnalysis);

await commands.executeCommand(
"vscode.open",
Uri.parse(actionsWorkflowRunUrl),
);
}

public async copyRepoListToClipboard(
variantAnalysisId: number,
filterSort: RepositoriesFilterSortStateWithIds = defaultFilterSortState,
Expand Down
27 changes: 5 additions & 22 deletions extensions/ql-vscode/src/remote-queries/variant-analysis-view.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { commands, ExtensionContext, Uri, ViewColumn } from "vscode";
import { commands, ExtensionContext, ViewColumn } from "vscode";
import { AbstractWebview, WebviewPanelConfig } from "../abstract-webview";
import { extLogger } from "../common";
import {
Expand All @@ -7,7 +7,6 @@ import {
} from "../pure/interface-types";
import { assertNever } from "../pure/helpers-pure";
import {
getActionsWorkflowRunUrl,
VariantAnalysis,
VariantAnalysisScannedRepositoryResult,
VariantAnalysisScannedRepositoryState,
Expand Down Expand Up @@ -147,7 +146,10 @@ export class VariantAnalysisView
);
break;
case "openLogs":
await this.openLogs();
await commands.executeCommand(
"codeQL.openVariantAnalysisLogs",
this.variantAnalysisId,
);
break;
default:
assertNever(msg);
Expand Down Expand Up @@ -183,23 +185,4 @@ export class VariantAnalysisView
repoStates,
});
}

private async openLogs(): Promise<void> {
const variantAnalysis = await this.manager.getVariantAnalysis(
this.variantAnalysisId,
);
if (!variantAnalysis) {
void showAndLogWarningMessage(
"Could not open variant analysis logs. Variant analysis not found.",
);
return;
}

const actionsWorkflowRunUrl = getActionsWorkflowRunUrl(variantAnalysis);

await commands.executeCommand(
"vscode.open",
Uri.parse(actionsWorkflowRunUrl),
);
}
}