Address review comments

hvitved · hvitved · commit a06f5302479f · 2021-04-07T09:52:03.000+02:00
diff --git a/extensions/ql-vscode/src/interface.ts b/extensions/ql-vscode/src/interface.ts
@@ -566,12 +566,12 @@ export class InterfaceManager extends DisposableObject {
       return sarif.runs[0].results.length;
     })();
 
+    sarif.sortState = sortState;
     const interpretation: Interpretation = {
       data: sarif,
       sourceLocationPrefix,
       numTruncatedResults: 0,
-      numTotalResults,
-      sortState,
+      numTotalResults
     };
     this._interpretation = interpretation;
     return interpretation;
diff --git a/extensions/ql-vscode/src/pure/interface-types.ts b/extensions/ql-vscode/src/pure/interface-types.ts
@@ -47,6 +47,11 @@ export interface PreviousExecution {
 
 export type SarifInterpretationData = {
   t: 'SarifInterpretationData';
+  /**
+   * sortState being undefined means don't sort, just present results in the order
+   * they appear in the sarif file.
+   */
+  sortState?: InterpretedResultsSortState;
 } & sarif.Log;
 
 // Add more interpretation data kinds when needed (e.g., graph data)
@@ -56,11 +61,6 @@ export interface InterpretationT<T> {
   sourceLocationPrefix: string;
   numTruncatedResults: number;
   numTotalResults: number;
-  /**
-   * sortState being undefined means don't sort, just present results in the order
-   * they appear in the sarif file.
-   */
-  sortState?: InterpretedResultsSortState;
   data: T;
 }
 
diff --git a/extensions/ql-vscode/src/view/alert-table.tsx b/extensions/ql-vscode/src/view/alert-table.tsx
@@ -51,7 +51,7 @@ export class PathTable extends React.Component<PathTableProps, PathTableState> {
   }
 
   sortClass(column: InterpretedResultsSortColumn): string {
-    const sortState = this.props.resultSet.interpretation.sortState;
+    const sortState = this.props.resultSet.interpretation.data.sortState;
     if (sortState !== undefined && sortState.sortBy === column) {
       return sortState.sortDirection === SortDirection.asc ? 'sort-asc' : 'sort-desc';
     }
@@ -61,7 +61,7 @@ export class PathTable extends React.Component<PathTableProps, PathTableState> {
   }
 
   getNextSortState(column: InterpretedResultsSortColumn): InterpretedResultsSortState | undefined {
-    const oldSortState = this.props.resultSet.interpretation.sortState;
+    const oldSortState = this.props.resultSet.interpretation.data.sortState;
     const prevDirection = oldSortState && oldSortState.sortBy === column ? oldSortState.sortDirection : undefined;
     const nextDirection = nextSortDirection(prevDirection, true);
     return nextDirection === undefined ? undefined :
diff --git a/extensions/ql-vscode/src/view/result-tables.tsx b/extensions/ql-vscode/src/view/result-tables.tsx
@@ -350,15 +350,8 @@ class ResultTable extends React.Component<ResultTableProps, {}> {
     switch (resultSet.t) {
       case 'RawResultSet': return <RawTable
         {...this.props} resultSet={resultSet} />;
-      case 'InterpretedResultSet': {
-        const data = resultSet.interpretation.data;
-        switch (data.t) {
-          case 'SarifInterpretationData': {
-            const sarifResultSet = { ...resultSet, interpretation: { ...resultSet.interpretation, data } };
-            return <PathTable {...this.props} resultSet={sarifResultSet} />;
-          }
-        }
-      }
+      case 'InterpretedResultSet': return <PathTable
+        {...this.props} resultSet={resultSet} />;
     }
   }
 }
diff --git a/extensions/ql-vscode/src/view/results.tsx b/extensions/ql-vscode/src/view/results.tsx
@@ -283,7 +283,7 @@ class App extends React.Component<{}, ResultsViewState> {
           }
           sortStates={displayedResults.results.sortStates}
           interpretedSortState={
-            displayedResults.resultsInfo.interpretation?.sortState
+            displayedResults.resultsInfo.interpretation?.data.sortState
           }
           isLoadingNewResults={
             this.state.isExpectingResultsUpdate ||

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ export class PathTable extends React.Component<PathTableProps, PathTableState> {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`sortClass(column: InterpretedResultsSortColumn): string {`
`54`		`- const sortState = this.props.resultSet.interpretation.sortState;`
	`54`	`+ const sortState = this.props.resultSet.interpretation.data.sortState;`
`55`	`55`	`if (sortState !== undefined && sortState.sortBy === column) {`
`56`	`56`	`return sortState.sortDirection === SortDirection.asc ? 'sort-asc' : 'sort-desc';`
`57`	`57`	`}`
`@@ -61,7 +61,7 @@ export class PathTable extends React.Component<PathTableProps, PathTableState> {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`getNextSortState(column: InterpretedResultsSortColumn): InterpretedResultsSortState \| undefined {`
`64`		`- const oldSortState = this.props.resultSet.interpretation.sortState;`
	`64`	`+ const oldSortState = this.props.resultSet.interpretation.data.sortState;`
`65`	`65`	`const prevDirection = oldSortState && oldSortState.sortBy === column ? oldSortState.sortDirection : undefined;`
`66`	`66`	`const nextDirection = nextSortDirection(prevDirection, true);`
`67`	`67`	`return nextDirection === undefined ? undefined :`
Original file line number	Diff line number	Diff line change
`@@ -350,15 +350,8 @@ class ResultTable extends React.Component<ResultTableProps, {}> {`
`350`	`350`	`switch (resultSet.t) {`
`351`	`351`	`case 'RawResultSet': return <RawTable`
`352`	`352`	`{...this.props} resultSet={resultSet} />;`
`353`		`- case 'InterpretedResultSet': {`
`354`		`- const data = resultSet.interpretation.data;`
`355`		`- switch (data.t) {`
`356`		`- case 'SarifInterpretationData': {`
`357`		`- const sarifResultSet = { ...resultSet, interpretation: { ...resultSet.interpretation, data } };`
`358`		`- return <PathTable {...this.props} resultSet={sarifResultSet} />;`
`359`		`- }`
`360`		`- }`
`361`		`- }`
	`353`	`+ case 'InterpretedResultSet': return <PathTable`
	`354`	`+ {...this.props} resultSet={resultSet} />;`
`362`	`355`	`}`
`363`	`356`	`}`
`364`	`357`	`}`
Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ class App extends React.Component<{}, ResultsViewState> {`
`283`	`283`	`}`
`284`	`284`	`sortStates={displayedResults.results.sortStates}`
`285`	`285`	`interpretedSortState={`
`286`		`- displayedResults.resultsInfo.interpretation?.sortState`
	`286`	`+ displayedResults.resultsInfo.interpretation?.data.sortState`
`287`	`287`	`}`
`288`	`288`	`isLoadingNewResults={`
`289`	`289`	`this.state.isExpectingResultsUpdate \|\|`