Merge pull request #2646 from github/robertbrignull/fix_alert_461

Split codeQL.copyVariantAnalysisRepoList into two commands

Author: robertbrignull

extensions/ql-vscode/src/common/commands.ts

@@ -4,7 +4,6 @@ import type { AstItem } from "../language-support";
 import type { DbTreeViewItem } from "../databases/ui/db-tree-view-item";
 import type { DatabaseItem } from "../databases/local-databases";
 import type { QueryHistoryInfo } from "../query-history/query-history-info";
-import type { RepositoriesFilterSortStateWithIds } from "../variant-analysis/shared/variant-analysis-filter-sort";
 import type { TestTreeNode } from "../query-testing/test-tree-node";
 import type {
   VariantAnalysis,
@@ -244,10 +243,6 @@ export type VariantAnalysisCommands = {
     scannedRepo: VariantAnalysisScannedRepository,
     variantAnalysisSummary: VariantAnalysis,
   ) => Promise<void>;
-  "codeQL.copyVariantAnalysisRepoList": (
-    variantAnalysisId: number,
-    filterSort?: RepositoriesFilterSortStateWithIds,
-  ) => Promise<void>;
   "codeQL.loadVariantAnalysisRepoResults": (
     variantAnalysisId: number,
     repositoryFullName: string,

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

@@ -952,8 +952,7 @@ export class QueryHistoryManager extends DisposableObject {
       return;
     }
 
-    await this.app.commands.execute(
-      "codeQL.copyVariantAnalysisRepoList",
+    await this.variantAnalysisManager.copyRepoListToClipboard(
       item.variantAnalysis.id,
     );
   }

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

@@ -148,8 +148,6 @@ export class VariantAnalysisManager
     return {
       "codeQL.autoDownloadVariantAnalysisResult":
         this.enqueueDownload.bind(this),
-      "codeQL.copyVariantAnalysisRepoList":
-        this.copyRepoListToClipboard.bind(this),
       "codeQL.loadVariantAnalysisRepoResults": this.loadResults.bind(this),
       "codeQL.monitorNewVariantAnalysis":
         this.monitorVariantAnalysis.bind(this),

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

@@ -32,4 +32,8 @@ export interface VariantAnalysisViewManager<
     variantAnalysisId: number,
     filterSort?: RepositoriesFilterSortStateWithIds,
   ): Promise<void>;
+  copyRepoListToClipboard(
+    variantAnalysisId: number,
+    filterSort?: RepositoriesFilterSortStateWithIds,
+  ): Promise<void>;
 }

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

@@ -139,8 +139,7 @@ export class VariantAnalysisView
         await this.manager.openQueryText(this.variantAnalysisId);
         break;
       case "copyRepositoryList":
-        void this.app.commands.execute(
-          "codeQL.copyVariantAnalysisRepoList",
+        await this.manager.copyRepoListToClipboard(
           this.variantAnalysisId,
           msg.filterSort,
         );

extensions/ql-vscode/src/view/variant-analysis/VariantAnalysis.tsx

@@ -131,6 +131,7 @@ export function VariantAnalysis({
         repositoryIds: selectedRepositoryIds,
       },
     });
+    sendTelemetry("variant-analysis-copy-repository-list");
   }, [filterSortState, selectedRepositoryIds]);
 
   const exportResults = useCallback(() => {

extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/query-history-manager.test.ts

@@ -709,12 +709,13 @@ describe("QueryHistoryManager", () => {
     });
 
     it("should copy repo list for a single variant analysis", async () => {
+      variantAnalysisManagerStub.copyRepoListToClipboard = jest.fn();
       queryHistoryManager = await createMockQueryHistory(allHistory);
 
       const item = variantAnalysisHistory[1];
       await queryHistoryManager.handleCopyRepoList(item);
-      expect(executeCommand).toBeCalledWith(
-        "codeQL.copyVariantAnalysisRepoList",
+
+      expect(variantAnalysisManagerStub.copyRepoListToClipboard).toBeCalledWith(
         item.variantAnalysis.id,
       );
     });