Merge branch 'main' into robertbrignull/ResultTables-Header

extensions/ql-vscode/CHANGELOG.md

@@ -1,5 +1,7 @@
 # CodeQL for Visual Studio Code: Changelog
 
+## [UNRELEASED]
+
 ## 1.8.9 - 3 August 2023
 
 - Remove "last updated" information and sorting from variant analysis results view. [#2637](https://github.com/github/vscode-codeql/pull/2637)

extensions/ql-vscode/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "vscode-codeql",
-  "version": "1.8.9",
+  "version": "1.8.10",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "vscode-codeql",
-      "version": "1.8.9",
+      "version": "1.8.10",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

extensions/ql-vscode/package.json

@@ -4,7 +4,7 @@
   "description": "CodeQL for Visual Studio Code",
   "author": "GitHub",
   "private": true,
-  "version": "1.8.9",
+  "version": "1.8.10",
   "publisher": "GitHub",
   "license": "MIT",
   "icon": "media/VS-marketplace-CodeQL-icon.png",

extensions/ql-vscode/src/view/results/ResultTable.tsx

@@ -0,0 +1,33 @@
+import * as React from "react";
+import { AlertTable } from "./alert-table";
+import { Graph } from "./graph";
+import { RawTable } from "./raw-results-table";
+import { ResultTableProps } from "./result-table-utils";
+
+export function ResultTable(props: ResultTableProps) {
+  const { resultSet } = props;
+  switch (resultSet.t) {
+    case "RawResultSet":
+      return <RawTable {...props} resultSet={resultSet} />;
+    case "InterpretedResultSet": {
+      const data = resultSet.interpretation.data;
+      switch (data.t) {
+        case "SarifInterpretationData": {
+          const sarifResultSet = {
+            ...resultSet,
+            interpretation: { ...resultSet.interpretation, data },
+          };
+          return <AlertTable {...props} resultSet={sarifResultSet} />;
+        }
+        case "GraphInterpretationData": {
+          return (
+            <Graph
+              graphData={data?.dot[props.offset]}
+              databaseUri={props.databaseUri}
+            />
+          );
+        }
+      }
+    }
+  }
+}

extensions/ql-vscode/src/view/results/ResultTables.tsx

@@ -14,11 +14,7 @@ import {
   ParsedResultSets,
   IntoResultsViewMsg,
 } from "../../common/interface-types";
-import { AlertTable } from "./alert-table";
-import { Graph } from "./graph";
-import { RawTable } from "./raw-results-table";
 import {
-  ResultTableProps,
   tableHeaderClassName,
   tableHeaderItemClassName,
   toggleDiagnosticsClassName,
@@ -26,6 +22,7 @@ import {
 } from "./result-table-utils";
 import { vscode } from "../vscode-api";
 import { sendTelemetry } from "../common/telemetry";
+import { ResultTable } from "./ResultTable";
 import { ResultTablesHeader } from "./ResultTablesHeader";
 
 /**
@@ -169,12 +166,6 @@ export class ResultTables extends React.Component<
     }
   }
 
-  untoggleProblemsView() {
-    this.setState({
-      problemsViewSelected: false,
-    });
-  }
-
   private onTableSelectionChange = (
     event: React.ChangeEvent<HTMLSelectElement>,
   ): void => {
@@ -338,34 +329,6 @@ export class ResultTables extends React.Component<
   }
 }
 
-function ResultTable(props: ResultTableProps) {
-  const { resultSet } = props;
-  switch (resultSet.t) {
-    case "RawResultSet":
-      return <RawTable {...props} resultSet={resultSet} />;
-    case "InterpretedResultSet": {
-      const data = resultSet.interpretation.data;
-      switch (data.t) {
-        case "SarifInterpretationData": {
-          const sarifResultSet = {
-            ...resultSet,
-            interpretation: { ...resultSet.interpretation, data },
-          };
-          return <AlertTable {...props} resultSet={sarifResultSet} />;
-        }
-        case "GraphInterpretationData": {
-          return (
-            <Graph
-              graphData={data?.dot[props.offset]}
-              databaseUri={props.databaseUri}
-            />
-          );
-        }
-      }
-    }
-  }
-}
-
 function getDefaultResultSet(resultSets: readonly ResultSet[]): string {
   return getDefaultResultSetName(
     resultSets.map((resultSet) => resultSet.schema.name),

extensions/ql-vscode/src/view/results/results.tsx

@@ -15,7 +15,7 @@ import {
   ResultSet,
 } from "../../common/interface-types";
 import { EventHandlers as EventHandlerList } from "./event-handler-list";
-import { ResultTables } from "./result-tables";
+import { ResultTables } from "./ResultTables";
 
 import "./resultsView.css";
 import { useCallback, useEffect } from "react";