Add alerts table to compare view if available

This adds the `alerts` result set to the compare view if an interpreted
result is available. This assumes that the user has opened the query
in the results view before opening the compare view. It will not
interpret the results if the interpreted results are not available.

Author: koesie10

extensions/ql-vscode/src/compare/compare-view.ts

@@ -22,13 +22,13 @@ import {
 import { telemetryListener } from "../common/vscode/telemetry";
 import { redactableError } from "../common/errors";
 import { App } from "../common/app";
-import { findResultSetNames } from "./result-set-names";
+import { findResultSetNames, CompareQueryInfo } from "./result-set-names";
 
 interface ComparePair {
   from: CompletedLocalQueryInfo;
-  fromSchemas: BQRSInfo;
+  fromInfo: CompareQueryInfo;
   to: CompletedLocalQueryInfo;
-  toSchemas: BQRSInfo;
+  toInfo: CompareQueryInfo;
 }
 
 export class CompareView extends AbstractWebview<
@@ -64,9 +64,19 @@ export class CompareView extends AbstractWebview<
 
     this.comparePair = {
       from,
-      fromSchemas,
+      fromInfo: {
+        schemas: fromSchemas,
+        metadata: from.completedQuery.query.metadata,
+        interpretedResultsPath:
+          from.completedQuery.query.resultsPaths.interpretedResultsPath,
+      },
       to,
-      toSchemas,
+      toInfo: {
+        schemas: toSchemas,
+        metadata: to.completedQuery.query.metadata,
+        interpretedResultsPath:
+          to.completedQuery.query.resultsPaths.interpretedResultsPath,
+      },
     };
 
     await this.showResultsInternal(selectedResultSetName);
@@ -190,23 +200,23 @@ export class CompareView extends AbstractWebview<
   }
 
   private async findResultSetsToCompare(
-    { from, fromSchemas, to, toSchemas }: ComparePair,
+    { from, fromInfo, to, toInfo }: ComparePair,
     selectedResultSetName: string | undefined,
   ) {
     const {
       commonResultSetNames,
       currentResultSetDisplayName,
       fromResultSetName,
       toResultSetName,
-    } = await findResultSetNames(fromSchemas, toSchemas, selectedResultSetName);
+    } = await findResultSetNames(fromInfo, toInfo, selectedResultSetName);
 
     const fromResultSet = await this.getResultSet(
-      fromSchemas,
+      fromInfo.schemas,
       fromResultSetName,
       from.completedQuery.query.resultsPaths.resultsPath,
     );
     const toResultSet = await this.getResultSet(
-      toSchemas,
+      toInfo.schemas,
       toResultSetName,
       to.completedQuery.query.resultsPaths.resultsPath,
     );

extensions/ql-vscode/src/compare/result-set-names.ts

@@ -1,14 +1,32 @@
 import { BQRSInfo } from "../common/bqrs-cli-types";
+import { ALERTS_TABLE_NAME, QueryMetadata } from "../common/interface-types";
+import { pathExists } from "fs-extra";
+
+export type CompareQueryInfo = {
+  schemas: BQRSInfo;
+  metadata: QueryMetadata | undefined;
+  interpretedResultsPath: string | undefined;
+};
+
+async function getResultSetNames(info: CompareQueryInfo): Promise<string[]> {
+  const schemaNames = info.schemas["result-sets"].map((schema) => schema.name);
+
+  if (info.metadata?.kind !== "graph" && info.interpretedResultsPath) {
+    if (await pathExists(info.interpretedResultsPath)) {
+      schemaNames.push(ALERTS_TABLE_NAME);
+    }
+  }
+
+  return schemaNames;
+}
 
 export async function findResultSetNames(
-  fromSchemas: BQRSInfo,
-  toSchemas: BQRSInfo,
+  from: CompareQueryInfo,
+  to: CompareQueryInfo,
   selectedResultSetName: string | undefined,
 ) {
-  const fromSchemaNames = fromSchemas["result-sets"].map(
-    (schema) => schema.name,
-  );
-  const toSchemaNames = toSchemas["result-sets"].map((schema) => schema.name);
+  const fromSchemaNames = await getResultSetNames(from);
+  const toSchemaNames = await getResultSetNames(to);
   const commonResultSetNames = fromSchemaNames.filter((name) =>
     toSchemaNames.includes(name),
   );