Skip to content

Remove repoStates state tracking from model evaluation #3496

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 1 commit into from
Mar 20, 2024
Merged

Remove repoStates state tracking from model evaluation #3496

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
3 changes: 1 addition & 2 deletions extensions/ql-vscode/src/common/interface-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,8 +749,7 @@ interface StopEvaluationRunMessage {
export type ToModelAlertsMessage =
| SetModelAlertsViewStateMessage
| SetVariantAnalysisMessage
| SetRepoResultsMessage
| SetRepoStatesMessage;
| SetRepoResultsMessage;

export type FromModelAlertsMessage =
| CommonFromViewMessages
Expand Down
14 changes: 0 additions & 14 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 @@ -18,7 +18,6 @@ import type { ExtensionPack } from "../shared/extension-pack";
import type {
VariantAnalysis,
VariantAnalysisScannedRepositoryResult,
VariantAnalysisScannedRepositoryState,
} from "../../variant-analysis/shared/variant-analysis";
import type { AppEvent, AppEventEmitter } from "../../common/events";

Expand Down Expand Up @@ -127,19 +126,6 @@ export class ModelAlertsView extends AbstractWebview<
});
}

public async updateRepoState(
repoState: VariantAnalysisScannedRepositoryState,
): Promise<void> {
if (!this.isShowingPanel) {
return;
}

await this.postMessage({
t: "setRepoStates",
repoStates: [repoState],
});
}

public async updateRepoResults(
repositoryResult: VariantAnalysisScannedRepositoryResult,
): Promise<void> {
Expand Down
8 changes: 0 additions & 8 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 @@ -260,14 +260,6 @@ export class ModelEvaluator extends DisposableObject {
),
);

this.push(
this.variantAnalysisManager.onRepoStatesUpdated(async (e) => {
if (e.variantAnalysisId === variantAnalysisId) {
await this.modelAlertsView?.updateRepoState(e.repoState);
}
}),
);

this.push(
this.variantAnalysisManager.onRepoResultsLoaded(async (e) => {
if (e.variantAnalysisId === variantAnalysisId) {
Expand Down
21 changes: 0 additions & 21 deletions extensions/ql-vscode/src/view/model-alerts/ModelAlerts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,19 @@ import type { ToModelAlertsMessage } from "../../common/interface-types";
import type {
VariantAnalysis,
VariantAnalysisScannedRepositoryResult,
VariantAnalysisScannedRepositoryState,
} from "../../variant-analysis/shared/variant-analysis";
import { vscode } from "../vscode-api";
import { ModelAlertsHeader } from "./ModelAlertsHeader";

type Props = {
initialViewState?: ModelAlertsViewState;
variantAnalysis?: VariantAnalysis;
repoStates?: VariantAnalysisScannedRepositoryState[];
repoResults?: VariantAnalysisScannedRepositoryResult[];
};

export function ModelAlerts({
initialViewState,
variantAnalysis: initialVariantAnalysis,
repoStates: initialRepoStates = [],
repoResults: initialRepoResults = [],
}: Props): React.JSX.Element {
const onOpenModelPackClick = useCallback((path: string) => {
Expand All @@ -42,8 +39,6 @@ export function ModelAlerts({
const [variantAnalysis, setVariantAnalysis] = useState<
VariantAnalysis | undefined
>(initialVariantAnalysis);
const [repoStates, setRepoStates] =
useState<VariantAnalysisScannedRepositoryState[]>(initialRepoStates);
const [repoResults, setRepoResults] =
useState<VariantAnalysisScannedRepositoryResult[]>(initialRepoResults);

Expand All @@ -60,18 +55,6 @@ export function ModelAlerts({
setVariantAnalysis(msg.variantAnalysis);
break;
}
case "setRepoStates": {
setRepoStates((oldRepoStates) => {
const newRepoIds = msg.repoStates.map((r) => r.repositoryId);
return [
...oldRepoStates.filter(
(v) => !newRepoIds.includes(v.repositoryId),
),
...msg.repoStates,
];
});
break;
}
case "setRepoResults": {
setRepoResults((oldRepoResults) => {
const newRepoIds = msg.repoResults.map((r) => r.repositoryId);
Expand Down Expand Up @@ -121,10 +104,6 @@ export function ModelAlerts({
onViewLogsClick={onViewLogsClick}
stopRunClick={onStopRunClick}
></ModelAlertsHeader>
<div>
<h3>Repo states</h3>
<p>{JSON.stringify(repoStates, null, 2)}</p>
</div>
<div>
<h3>Repo results</h3>
<p>{JSON.stringify(repoResults, null, 2)}</p>
Expand Down