Skip to content

Tidy up some functions in the model evaluator #3529

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
charisk merged 2 commits into from
Apr 2, 2024
+6 −19
Merged

Tidy up some functions in the model evaluator #3529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8984ec0
Rename model evaluator's updateVariantAnalysis -> setVariantAnalysis
charisk Apr 2, 2024
b3bdc0a
Merge updateRepoResults and updateReposResults into single setReposRe…
charisk Apr 2, 2024
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
19 changes: 3 additions & 16 deletions extensions/ql-vscode/src/model-editor/model-alerts/model-alerts-view.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export class ModelAlertsView extends AbstractWebview<

await this.waitForPanelLoaded();
await this.setViewState();
await this.updateReposResults(reposResults);
await this.setReposResults(reposResults);
}

protected async getPanelConfig(): Promise<WebviewPanelConfig> {
Expand Down Expand Up @@ -121,7 +121,7 @@ export class ModelAlertsView extends AbstractWebview<
});
}

public async updateVariantAnalysis(
public async setVariantAnalysis(
variantAnalysis: VariantAnalysis,
): Promise<void> {
if (!this.isShowingPanel) {
Expand All @@ -134,20 +134,7 @@ export class ModelAlertsView extends AbstractWebview<
});
}

public async updateRepoResults(
repositoryResult: VariantAnalysisScannedRepositoryResult,
): Promise<void> {
if (!this.isShowingPanel) {
return;
}

await this.postMessage({
t: "setRepoResults",
repoResults: [repositoryResult],
});
}

public async updateReposResults(
public async setReposResults(
repoResults: VariantAnalysisScannedRepositoryResult[],
): Promise<void> {
if (!this.isShowingPanel) {
Expand Down
6 changes: 3 additions & 3 deletions extensions/ql-vscode/src/model-editor/model-evaluator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ export class ModelEvaluator extends DisposableObject {
);
await this.modelAlertsView.showView(reposResults);

await this.modelAlertsView.updateVariantAnalysis(variantAnalysis);
await this.modelAlertsView.setVariantAnalysis(variantAnalysis);
}
}

Expand Down Expand Up @@ -271,7 +271,7 @@ export class ModelEvaluator extends DisposableObject {
});

// Update model alerts view
await this.modelAlertsView?.updateVariantAnalysis(variantAnalysis);
await this.modelAlertsView?.setVariantAnalysis(variantAnalysis);
}
},
),
Expand All @@ -295,7 +295,7 @@ export class ModelEvaluator extends DisposableObject {
this.push(
this.variantAnalysisManager.onRepoResultsLoaded(async (e) => {
if (e.variantAnalysisId === variantAnalysisId) {
await this.modelAlertsView?.updateRepoResults(e);
await this.modelAlertsView?.setReposResults([e]);
}
}),
);
Expand Down