Add basic multi-query support to MRVA results view header (#3286)

Author: charisk

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

@@ -159,6 +159,7 @@ export interface VariantAnalysisSubmission {
 // unclear what it will look like in the future.
 export interface VariantAnalysisQueries {
   language: QueryLanguage;
+  count: number;
 }
 
 export async function isVariantAnalysisComplete(

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

@@ -405,6 +405,7 @@ export class VariantAnalysisManager
         ? undefined
         : {
             language: qlPackDetails.language,
+            count: qlPackDetails.queryFiles.length,
           };
 
     const variantAnalysisSubmission: VariantAnalysisSubmission = {

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

@@ -218,9 +218,15 @@ export class VariantAnalysisView
   }
 
   private getTitle(variantAnalysis: VariantAnalysis | undefined): string {
-    return variantAnalysis
-      ? `${variantAnalysis.query.name} - Variant Analysis Results`
-      : `Variant Analysis ${this.variantAnalysisId} - Results`;
+    if (!variantAnalysis) {
+      return `Variant Analysis ${this.variantAnalysisId} - Results`;
+    }
+
+    if (variantAnalysis.queries) {
+      return `Variant Analysis using multiple queries - Results`;
+    } else {
+      return `${variantAnalysis.query.name} - Variant Analysis Results`;
+    }
   }
 
   private async showDataFlows(dataFlows: DataFlowPaths): Promise<void> {

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

@@ -21,6 +21,7 @@ import {
   defaultFilterSortState,
   filterAndSortRepositoriesWithResults,
 } from "../../variant-analysis/shared/variant-analysis-filter-sort";
+import { ViewTitle } from "../common";
 
 type VariantAnalysisHeaderProps = {
   variantAnalysis: VariantAnalysis;
@@ -50,6 +51,29 @@ const Row = styled.div`
   align-items: center;
 `;
 
+const QueryInfo = ({
+  variantAnalysis,
+  onOpenQueryFileClick,
+  onViewQueryTextClick,
+}: {
+  variantAnalysis: VariantAnalysis;
+  onOpenQueryFileClick: () => void;
+  onViewQueryTextClick: () => void;
+}) => {
+  if (variantAnalysis.queries) {
+    return <ViewTitle>{variantAnalysis.queries?.count} queries</ViewTitle>;
+  } else {
+    return (
+      <QueryDetails
+        queryName={variantAnalysis.query.name}
+        queryFileName={basename(variantAnalysis.query.filePath)}
+        onOpenQueryFileClick={onOpenQueryFileClick}
+        onViewQueryTextClick={onViewQueryTextClick}
+      />
+    );
+  }
+};
+
 export const VariantAnalysisHeader = ({
   variantAnalysis,
   repositoryStates,
@@ -117,9 +141,8 @@ export const VariantAnalysisHeader = ({
   return (
     <Container>
       <Row>
-        <QueryDetails
-          queryName={variantAnalysis.query.name}
-          queryFileName={basename(variantAnalysis.query.filePath)}
+        <QueryInfo
+          variantAnalysis={variantAnalysis}
           onOpenQueryFileClick={onOpenQueryFileClick}
           onViewQueryTextClick={onViewQueryTextClick}
         />