Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions extensions/ql-vscode/src/view/results/ResultTable.tsx
Original file line number Diff line number Diff line change
@@ -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}
/>
);
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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.
Expand Down Expand Up @@ -433,34 +430,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),
Expand Down
2 changes: 1 addition & 1 deletion extensions/ql-vscode/src/view/results/results.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down