Implement buildRepoLabel for variant analysis items

Author: shati-patel

extensions/ql-vscode/src/history-item-label-provider.ts

@@ -2,7 +2,7 @@ import { env } from 'vscode';
 import * as path from 'path';
 import { QueryHistoryConfig } from './config';
 import { LocalQueryInfo } from './query-results';
-import { getRawQueryName, QueryHistoryInfo } from './query-history-info';
+import { buildRepoLabel, getRawQueryName, QueryHistoryInfo } from './query-history-info';
 import { RemoteQueryHistoryItem } from './remote-queries/remote-query-history-item';
 import { pluralize } from './helpers';
 import { VariantAnalysisHistoryItem } from './remote-queries/variant-analysis-history-item';
@@ -79,23 +79,12 @@ export class HistoryItemLabelProvider {
     };
   }
 
-  // Return the number of repositories queried if available. Otherwise, use the controller repository name.
-  private buildRepoLabel(item: RemoteQueryHistoryItem): string {
-    const repositoryCount = item.remoteQuery.repositoryCount;
-
-    if (repositoryCount) {
-      return pluralize(repositoryCount, 'repository', 'repositories');
-    }
-
-    return `${item.remoteQuery.controllerRepository.owner}/${item.remoteQuery.controllerRepository.name}`;
-  }
-
   private getRemoteInterpolateReplacements(item: RemoteQueryHistoryItem): InterpolateReplacements {
     const resultCount = item.resultCount ? `(${pluralize(item.resultCount, 'result', 'results')})` : '';
     return {
       t: new Date(item.remoteQuery.executionStartTime).toLocaleString(env.language),
       q: `${item.remoteQuery.queryName} (${item.remoteQuery.language})`,
-      d: this.buildRepoLabel(item),
+      d: buildRepoLabel(item),
       r: resultCount,
       s: item.status,
       f: path.basename(item.remoteQuery.queryFilePath),
@@ -108,7 +97,7 @@ export class HistoryItemLabelProvider {
     return {
       t: new Date(item.variantAnalysis.executionStartTime).toLocaleString(env.language),
       q: `${item.variantAnalysis.query.name} (${item.variantAnalysis.query.language})`,
-      d: 'TODO',
+      d: buildRepoLabel(item),
       r: resultCount,
       s: item.status,
       f: path.basename(item.variantAnalysis.query.filePath),

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

@@ -2,6 +2,8 @@ import { RemoteQueryHistoryItem } from './remote-queries/remote-query-history-it
 import { VariantAnalysisHistoryItem } from './remote-queries/variant-analysis-history-item';
 import { LocalQueryInfo } from './query-results';
 import { assertNever } from './pure/helpers-pure';
+import { pluralize } from './helpers';
+import { hasRepoScanCompleted } from './remote-queries/shared/variant-analysis';
 
 export type QueryHistoryInfo = LocalQueryInfo | RemoteQueryHistoryItem | VariantAnalysisHistoryItem;
 
@@ -43,3 +45,22 @@ export function getQueryText(item: QueryHistoryInfo): string {
       assertNever(item);
   }
 }
+
+export function buildRepoLabel(item: RemoteQueryHistoryItem | VariantAnalysisHistoryItem): string {
+  if (item.t === 'remote') {
+      // Return the number of repositories queried if available. Otherwise, use the controller repository name.
+      const repositoryCount = item.remoteQuery.repositoryCount;
+  
+      if (repositoryCount) {
+        return pluralize(repositoryCount, 'repository', 'repositories');
+      }
+      return `${item.remoteQuery.controllerRepository.owner}/${item.remoteQuery.controllerRepository.name}`;
+    } else if (item.t === 'variant-analysis') {
+      const totalScannedRepositoryCount = item.variantAnalysis.scannedRepos?.length ?? 0;
+      const completedRepositoryCount = item.variantAnalysis.scannedRepos?.filter(repo => hasRepoScanCompleted(repo)).length ?? 0;
+
+      return `${completedRepositoryCount}/${pluralize(totalScannedRepositoryCount, 'repository', 'repositories')}`; // e.g. "2/3 repositories"
+  } else {
+    assertNever(item);
+  }
+}