From ab442c4dde24c4d5a31b06cdfc8b09a5e69973fc Mon Sep 17 00:00:00 2001 From: Robert Date: Thu, 3 Aug 2023 11:35:32 +0100 Subject: [PATCH 1/2] Rename result-tables.tsx => ResultTables.tsx --- .../src/view/results/{result-tables.tsx => ResultTables.tsx} | 0 extensions/ql-vscode/src/view/results/results.tsx | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename extensions/ql-vscode/src/view/results/{result-tables.tsx => ResultTables.tsx} (100%) diff --git a/extensions/ql-vscode/src/view/results/result-tables.tsx b/extensions/ql-vscode/src/view/results/ResultTables.tsx similarity index 100% rename from extensions/ql-vscode/src/view/results/result-tables.tsx rename to extensions/ql-vscode/src/view/results/ResultTables.tsx diff --git a/extensions/ql-vscode/src/view/results/results.tsx b/extensions/ql-vscode/src/view/results/results.tsx index aae8cdeb236..b292a0b05f1 100644 --- a/extensions/ql-vscode/src/view/results/results.tsx +++ b/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"; From aa1edfc2317be6941b0fe8b9cb76e3d8e0d4e5cb Mon Sep 17 00:00:00 2001 From: Robert Date: Thu, 3 Aug 2023 10:56:24 +0100 Subject: [PATCH 2/2] Move ResultTable to its own file --- .../src/view/results/ResultTable.tsx | 33 +++++++++++++++++++ .../src/view/results/ResultTables.tsx | 33 +------------------ 2 files changed, 34 insertions(+), 32 deletions(-) create mode 100644 extensions/ql-vscode/src/view/results/ResultTable.tsx diff --git a/extensions/ql-vscode/src/view/results/ResultTable.tsx b/extensions/ql-vscode/src/view/results/ResultTable.tsx new file mode 100644 index 00000000000..9b242fbe247 --- /dev/null +++ b/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 ; + case "InterpretedResultSet": { + const data = resultSet.interpretation.data; + switch (data.t) { + case "SarifInterpretationData": { + const sarifResultSet = { + ...resultSet, + interpretation: { ...resultSet.interpretation, data }, + }; + return ; + } + case "GraphInterpretationData": { + return ( + + ); + } + } + } + } +} diff --git a/extensions/ql-vscode/src/view/results/ResultTables.tsx b/extensions/ql-vscode/src/view/results/ResultTables.tsx index 07d346518fb..6823db58291 100644 --- a/extensions/ql-vscode/src/view/results/ResultTables.tsx +++ b/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, @@ -28,6 +24,7 @@ import { import { vscode } from "../vscode-api"; import { sendTelemetry } from "../common/telemetry"; import { basename } from "../../common/path"; +import { ResultTable } from "./ResultTable"; /** * Properties for the `ResultTables` component. @@ -439,34 +436,6 @@ export class ResultTables extends React.Component< } } -function ResultTable(props: ResultTableProps) { - const { resultSet } = props; - switch (resultSet.t) { - case "RawResultSet": - return ; - case "InterpretedResultSet": { - const data = resultSet.interpretation.data; - switch (data.t) { - case "SarifInterpretationData": { - const sarifResultSet = { - ...resultSet, - interpretation: { ...resultSet.interpretation, data }, - }; - return ; - } - case "GraphInterpretationData": { - return ( - - ); - } - } - } - } -} - function getDefaultResultSet(resultSets: readonly ResultSet[]): string { return getDefaultResultSetName( resultSets.map((resultSet) => resultSet.schema.name),