Set the filterSortState in a separate message

Author: shati-patel

extensions/ql-vscode/src/pure/interface-types.ts

@@ -408,7 +408,11 @@ export interface ParsedResultSets {
 export interface SetVariantAnalysisMessage {
   t: "setVariantAnalysis";
   variantAnalysis: VariantAnalysis;
-  filterSortState?: RepositoriesFilterSortState;
+}
+
+export interface setFilterSortStateMessage {
+  t: "setFilterSortState";
+  filterSortState: RepositoriesFilterSortState;
 }
 
 export type VariantAnalysisState = {
@@ -463,6 +467,7 @@ export interface ShowDataFlowPathsMessage {
 
 export type ToVariantAnalysisMessage =
   | SetVariantAnalysisMessage
+  | setFilterSortStateMessage
   | SetRepoResultsMessage
   | SetRepoStatesMessage;
 

extensions/ql-vscode/src/variant-analysis/variant-analysis-view.ts

@@ -199,6 +199,10 @@ export class VariantAnalysisView
     await this.postMessage({
       t: "setVariantAnalysis",
       variantAnalysis,
+    });
+
+    await this.postMessage({
+      t: "setFilterSortState",
       filterSortState,
     });
 

extensions/ql-vscode/src/view/variant-analysis/VariantAnalysis.tsx

@@ -84,12 +84,11 @@ export function VariantAnalysis({
         const msg: ToVariantAnalysisMessage = evt.data;
         if (msg.t === "setVariantAnalysis") {
           setVariantAnalysis(msg.variantAnalysis);
-          if (msg.filterSortState) {
-            setFilterSortState(msg.filterSortState);
-          }
           vscode.setState({
             variantAnalysisId: msg.variantAnalysis.id,
           });
+        } else if (msg.t === "setFilterSortState") {
+          setFilterSortState(msg.filterSortState);
         } else if (msg.t === "setRepoResults") {
           setRepoResults((oldRepoResults) => {
             const newRepoIds = msg.repoResults.map((r) => r.repositoryId);

extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysis.spec.tsx

@@ -58,8 +58,7 @@ describe(VariantAnalysis.name, () => {
     await waitFor(() => screen.getByDisplayValue("Number of results"));
 
     await postMessage<ToVariantAnalysisMessage>({
-      t: "setVariantAnalysis",
-      variantAnalysis,
+      t: "setFilterSortState",
       filterSortState: {
         searchValue: "",
         filterKey: FilterKey.All,