Merge pull request #1656 from github/nora-charis-elena/handle-item-removal-take-two

Implement `handleRemoveHistoryItem` for variant analysis history items - take two

Author: elenatanasoiu

extensions/ql-vscode/src/query-history.ts

@@ -635,7 +635,7 @@ export class QueryHistoryManager extends DisposableObject {
     const variantAnalysisRemovedSubscription = this.variantAnalysisManager.onVariantAnalysisRemoved(async (variantAnalysis) => {
       const items = this.treeDataProvider.allHistory.filter(i => i.t === 'variant-analysis' && i.variantAnalysis.id === variantAnalysis.id);
       items.forEach(async (item) => {
-        await this.removeRemoteQuery(item as RemoteQueryHistoryItem);
+        await this.removeVariantAnalysis(item as VariantAnalysisHistoryItem);
       });
     });
 
@@ -786,7 +786,7 @@ export class QueryHistoryManager extends DisposableObject {
       } else if (item.t === 'remote') {
         await this.removeRemoteQuery(item);
       } else if (item.t === 'variant-analysis') {
-        // TODO
+        await this.removeVariantAnalysis(item);
       } else {
         assertNever(item);
       }
@@ -812,6 +812,18 @@ export class QueryHistoryManager extends DisposableObject {
     await this.remoteQueriesManager.removeRemoteQuery(item.queryId);
   }
 
+  private async removeVariantAnalysis(item: VariantAnalysisHistoryItem): Promise<void> {
+    // We can remove a Variant Analysis locally, but not remotely.
+    // The user must cancel the query on GitHub Actions explicitly.
+    this.treeDataProvider.remove(item);
+    void logger.log(`Deleted ${this.labelProvider.getLabel(item)}.`);
+    if (item.status === QueryStatus.InProgress) {
+      void logger.log('The variant analysis is still running on GitHub Actions. To cancel there, you must go to the workflow run in your browser.');
+    }
+
+    await this.variantAnalysisManager.removeVariantAnalysis(item.variantAnalysis);
+  }
+
   async handleSortByName() {
     if (this.treeDataProvider.sortOrder === SortOrder.NameAsc) {
       this.treeDataProvider.sortOrder = SortOrder.NameDesc;

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

@@ -72,6 +72,17 @@ export class VariantAnalysisManager extends DisposableObject implements VariantA
     }
   }
 
+  public async removeVariantAnalysis(variantAnalysis: VariantAnalysis) {
+    this.variantAnalysisResultsManager.removeAnalysisResults(variantAnalysis);
+    await this.removeStorageDirectory(variantAnalysis.id);
+    this.variantAnalyses.delete(variantAnalysis.id);
+  }
+
+  private async removeStorageDirectory(variantAnalysisId: number) {
+    const storageLocation = this.getVariantAnalysisStorageLocation(variantAnalysisId);
+    await fs.remove(storageLocation);
+  }
+
   public async showView(variantAnalysisId: number): Promise<void> {
     if (!this.variantAnalyses.get(variantAnalysisId)) {
       void showAndLogErrorMessage(`No variant analysis found with id: ${variantAnalysisId}.`);

extensions/ql-vscode/src/remote-queries/variant-analysis-results-manager.ts

@@ -9,7 +9,7 @@ import { sarifParser } from '../sarif-parser';
 import { extractAnalysisAlerts } from './sarif-processing';
 import { CodeQLCliServer } from '../cli';
 import { extractRawResults } from './bqrs-processing';
-import { VariantAnalysisScannedRepositoryResult } from './shared/variant-analysis';
+import { VariantAnalysis, VariantAnalysisScannedRepositoryResult } from './shared/variant-analysis';
 import { DisposableObject, DisposeHandler } from '../pure/disposable-object';
 import { VariantAnalysisRepoTask } from './gh-api/variant-analysis';
 import * as ghApiClient from './gh-api/gh-api-client';
@@ -179,6 +179,19 @@ export class VariantAnalysisResultsManager extends DisposableObject {
     return `https://github.com/${fullName}/blob/${sha}`;
   }
 
+  public removeAnalysisResults(variantAnalysis: VariantAnalysis) {
+    const scannedRepos = variantAnalysis.scannedRepos;
+
+    if (scannedRepos) {
+      scannedRepos.forEach(scannedRepo => {
+        const cacheKey = createCacheKey(variantAnalysis.id, scannedRepo.repository.fullName);
+        if (this.cachedResults.get(cacheKey)) {
+          this.cachedResults.delete(cacheKey);
+        }
+      });
+    }
+  }
+
   public dispose(disposeHandler?: DisposeHandler) {
     super.dispose(disposeHandler);