Unbreak typing page number into field
This commit is contained in:
@@ -68,13 +68,13 @@ function renderResultCountString(resultSet: ResultSet): JSX.Element {
|
||||
export class ResultTables
|
||||
extends React.Component<ResultTablesProps, ResultTablesState> {
|
||||
|
||||
private static _getResultSetsOfProps(props: ResultTablesProps): ResultSet[] {
|
||||
private getResultSets(): ResultSet[] {
|
||||
const resultSets: ResultSet[] =
|
||||
// eslint-disable-next-line @typescript-eslint/ban-ts-ignore
|
||||
// @ts-ignore 2783
|
||||
props.rawResultSets.map((rs) => ({ t: 'RawResultSet', ...rs }));
|
||||
this.props.rawResultSets.map((rs) => ({ t: 'RawResultSet', ...rs }));
|
||||
|
||||
if (props.interpretation != undefined) {
|
||||
if (this.props.interpretation != undefined) {
|
||||
resultSets.push({
|
||||
t: 'SarifResultSet',
|
||||
// FIXME: The values of version, columns, tupleCount are
|
||||
@@ -83,16 +83,12 @@ export class ResultTables
|
||||
// out.
|
||||
schema: { name: ALERTS_TABLE_NAME, version: 0, columns: [], tupleCount: 1 },
|
||||
name: ALERTS_TABLE_NAME,
|
||||
...props.interpretation,
|
||||
...this.props.interpretation,
|
||||
});
|
||||
}
|
||||
return resultSets;
|
||||
}
|
||||
|
||||
private getResultSets(): ResultSet[] {
|
||||
return ResultTables._getResultSetsOfProps(this.props);
|
||||
}
|
||||
|
||||
private getResultSetNames(resultSets: ResultSet[]): string[] {
|
||||
if (this.props.parsedResultSets.t === 'ExtensionParsed') {
|
||||
return this.props.parsedResultSets.resultSetNames.concat([ALERTS_TABLE_NAME]);
|
||||
@@ -114,12 +110,7 @@ export class ResultTables
|
||||
|
||||
constructor(props: ResultTablesProps) {
|
||||
super(props);
|
||||
this.state = ResultTables.getDerivedStateFromProps(props);
|
||||
}
|
||||
|
||||
// Static lifecycle method which is called by react when props change.
|
||||
static getDerivedStateFromProps(props: Readonly<ResultTablesProps>, _prevState?: ResultTablesState): ResultTablesState {
|
||||
const selectedTable = props.parsedResultSets.selectedTable || getDefaultResultSet(ResultTables._getResultSetsOfProps(props));
|
||||
const selectedTable = props.parsedResultSets.selectedTable || getDefaultResultSet(this.getResultSets());
|
||||
let selectedPage: string;
|
||||
|
||||
switch (props.parsedResultSets.t) {
|
||||
@@ -130,7 +121,7 @@ export class ResultTables
|
||||
selectedPage = '';
|
||||
break;
|
||||
}
|
||||
return { selectedTable, selectedPage };
|
||||
this.state = { selectedTable, selectedPage };
|
||||
}
|
||||
|
||||
private onTableSelectionChange = (event: React.ChangeEvent<HTMLSelectElement>): void => {
|
||||
|
||||
@@ -368,8 +368,10 @@ class App extends React.Component<{}, ResultsViewState> {
|
||||
displayedResults.resultsInfo !== null
|
||||
) {
|
||||
const parsedResultSets = displayedResults.resultsInfo.parsedResultSets;
|
||||
const key = (parsedResultSets.t === 'ExtensionParsed' ? (parsedResultSets.selectedTable || '') + parsedResultSets.pageNumber : '');
|
||||
return (
|
||||
<ResultTables
|
||||
key={key}
|
||||
parsedResultSets={parsedResultSets}
|
||||
rawResultSets={displayedResults.results.resultSets}
|
||||
interpretation={
|
||||
|
||||
Reference in New Issue
Block a user