Move logic to mapUpdatedVariantAnalysis

Author: charisk

extensions/ql-vscode/src/variant-analysis/variant-analysis-manager.ts

@@ -146,6 +146,7 @@ export class VariantAnalysisManager
       new VariantAnalysisMonitor(
         app,
         this.shouldCancelMonitorVariantAnalysis.bind(this),
+        this.getVariantAnalysisStatus.bind(this),
       ),
     );
     this.variantAnalysisMonitor.onVariantAnalysisChange(
@@ -605,6 +606,19 @@ export class VariantAnalysisManager
     return !this.variantAnalyses.has(variantAnalysisId);
   }
 
+  private getVariantAnalysisStatus(
+    variantAnalysisId: number,
+  ): VariantAnalysisStatus {
+    const variantAnalysis = this.variantAnalyses.get(variantAnalysisId);
+    if (!variantAnalysis) {
+      throw new Error(
+        `No variant analysis found with id: ${variantAnalysisId}.`,
+      );
+    }
+
+    return variantAnalysis.status;
+  }
+
   public async onVariantAnalysisUpdated(
     variantAnalysis: VariantAnalysis | undefined,
   ): Promise<void> {
@@ -620,14 +634,6 @@ export class VariantAnalysisManager
       return;
     }
 
-    // Maintain the canceling status if we are still canceling.
-    if (
-      originalVariantAnalysis.status === VariantAnalysisStatus.Canceling &&
-      variantAnalysis.status === VariantAnalysisStatus.InProgress
-    ) {
-      variantAnalysis.status = VariantAnalysisStatus.Canceling;
-    }
-
     await this.setVariantAnalysis(variantAnalysis);
     this._onVariantAnalysisStatusUpdated.fire(variantAnalysis);
   }
@@ -851,30 +857,28 @@ export class VariantAnalysisManager
       throw new Error(`No variant analysis with id: ${variantAnalysisId}`);
     }
 
-    await this.onVariantAnalysisUpdated({
-      ...variantAnalysis,
-      status: VariantAnalysisStatus.Canceling,
-    });
-
     if (!variantAnalysis.actionsWorkflowRunId) {
       throw new Error(
         `No workflow run id for variant analysis with id: ${variantAnalysis.id}`,
       );
     }
 
+    await this.onVariantAnalysisUpdated({
+      ...variantAnalysis,
+      status: VariantAnalysisStatus.Canceling,
+    });
+
     void showAndLogInformationMessage(
       this.app.logger,
       "Cancelling variant analysis. This may take a while.",
     );
     try {
       await cancelVariantAnalysis(this.app.credentials, variantAnalysis);
     } catch (e) {
-      if (variantAnalysis.status === VariantAnalysisStatus.Canceling) {
-        await this.onVariantAnalysisUpdated({
-          ...variantAnalysis,
-          status: VariantAnalysisStatus.InProgress,
-        });
-      }
+      await this.onVariantAnalysisUpdated({
+        ...variantAnalysis,
+        status: VariantAnalysisStatus.InProgress,
+      });
       throw e;
     }
   }

extensions/ql-vscode/src/variant-analysis/variant-analysis-mapper.ts

@@ -40,6 +40,7 @@ export function mapVariantAnalysis(
       databases: submission.databases,
       executionStartTime: submission.startTime,
     },
+    undefined,
     response,
   );
 }
@@ -49,6 +50,7 @@ export function mapUpdatedVariantAnalysis(
     VariantAnalysis,
     "language" | "query" | "queries" | "databases" | "executionStartTime"
   >,
+  currentStatus: VariantAnalysisStatus | undefined,
   response: ApiVariantAnalysis,
 ): VariantAnalysis {
   let scannedRepos: VariantAnalysisScannedRepository[] = [];
@@ -66,6 +68,13 @@ export function mapUpdatedVariantAnalysis(
     );
   }
 
+  // Maintain the canceling status if we are still canceling.
+  const status =
+    currentStatus === VariantAnalysisStatus.Canceling &&
+    response.status === "in_progress"
+      ? VariantAnalysisStatus.Canceling
+      : mapApiStatus(response.status);
+
   const variantAnalysis: VariantAnalysis = {
     id: response.id,
     controllerRepo: {
@@ -80,7 +89,7 @@ export function mapUpdatedVariantAnalysis(
     executionStartTime: previousVariantAnalysis.executionStartTime,
     createdAt: response.created_at,
     updatedAt: response.updated_at,
-    status: mapApiStatus(response.status),
+    status,
     completedAt: response.completed_at,
     actionsWorkflowRunId: response.actions_workflow_run_id,
     scannedRepos,

extensions/ql-vscode/src/variant-analysis/variant-analysis-monitor.ts

@@ -5,6 +5,7 @@ import { RequestError } from "@octokit/request-error";
 import type {
   VariantAnalysis,
   VariantAnalysisScannedRepository,
+  VariantAnalysisStatus,
 } from "./shared/variant-analysis";
 import {
   isFinalVariantAnalysisStatus,
@@ -36,6 +37,9 @@ export class VariantAnalysisMonitor extends DisposableObject {
     private readonly shouldCancelMonitor: (
       variantAnalysisId: number,
     ) => Promise<boolean>,
+    private readonly getVariantAnalysisStatus: (
+      variantAnalysisId: number,
+    ) => VariantAnalysisStatus,
   ) {
     super();
   }
@@ -121,6 +125,7 @@ export class VariantAnalysisMonitor extends DisposableObject {
 
       variantAnalysis = mapUpdatedVariantAnalysis(
         variantAnalysis,
+        this.getVariantAnalysisStatus(variantAnalysis.id),
         variantAnalysisSummary,
       );