Add canary

Author: Jami Cogswell

extensions/ql-vscode/package.json

@@ -1303,7 +1303,7 @@
         {
           "command": "codeQLQueryHistory.viewAutofixes",
           "group": "1_queryHistory@2",
-          "when": "viewItem == remoteResultsItem"
+          "when": "viewItem == remoteResultsItem && config.codeQL.canary"
         },
         {
           "command": "codeQLQueries.runLocalQueryFromQueriesPanel",

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

@@ -151,10 +151,13 @@ interface SetStateMsg {
 export interface UserSettings {
   /** Whether to display links to the dataflow models that generated particular nodes in a flow path. */
   shouldShowProvenance: boolean;
+  /** Whether to display the "View Autofixes" button. */
+  shouldShowViewAutofixesBtn: boolean;
 }
 
 export const DEFAULT_USER_SETTINGS: UserSettings = {
   shouldShowProvenance: false,
+  shouldShowViewAutofixesBtn: false,
 };
 
 /** Message indicating that the user's configuration settings have changed. */
@@ -559,7 +562,8 @@ export type ToVariantAnalysisMessage =
   | SetVariantAnalysisMessage
   | SetFilterSortStateMessage
   | SetRepoResultsMessage
-  | SetRepoStatesMessage;
+  | SetRepoStatesMessage
+  | SetUserSettingsMsg;
 
 export type FromVariantAnalysisMessage =
   | CommonFromViewMessages

extensions/ql-vscode/src/compare/compare-view.ts

@@ -119,6 +119,8 @@ export class CompareView extends AbstractWebview<
       t: "setUserSettings",
       userSettings: {
         shouldShowProvenance: isCanary(),
+        // "View Autofixes" button is not supported in compare view
+        shouldShowViewAutofixesBtn: false,
       },
     });
 

extensions/ql-vscode/src/local-queries/results-view.ts

@@ -550,6 +550,8 @@ export class ResultsView extends AbstractWebview<
       userSettings: {
         // Only show provenance info in canary mode for now.
         shouldShowProvenance: isCanary(),
+        // "View Autofixes" button is not supported in results view
+        shouldShowViewAutofixesBtn: false,
       },
     });
 

extensions/ql-vscode/src/stories/results/AlertTable.stories.tsx

@@ -433,5 +433,6 @@ WithCodeFlows.args = {
   ),
   userSettings: {
     shouldShowProvenance: true,
+    shouldShowViewAutofixesBtn: false, // Not supported in AlertTable
   },
 };

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

@@ -1,4 +1,5 @@
-import { ViewColumn } from "vscode";
+import type { ConfigurationChangeEvent } from "vscode";
+import { ViewColumn, workspace } from "vscode";
 import type { WebviewPanelConfig } from "../common/vscode/abstract-webview";
 import { AbstractWebview } from "../common/vscode/abstract-webview";
 import {
@@ -27,6 +28,7 @@ import type { App } from "../common/app";
 import {
   getVariantAnalysisDefaultResultsFilter,
   getVariantAnalysisDefaultResultsSort,
+  isCanary,
 } from "../config";
 
 export class VariantAnalysisView
@@ -46,13 +48,48 @@ export class VariantAnalysisView
     manager.registerView(this);
 
     this.dataFlowPathsView = new DataFlowPathsView(app);
+
+    // Set up configuration change listener
+    this.push(
+      workspace.onDidChangeConfiguration(
+        this.onConfigurationChanged.bind(this),
+      ),
+    );
+  }
+
+  /**
+   * Handler for configuration changes
+   */
+  private onConfigurationChanged(e: ConfigurationChangeEvent): void {
+    // Check if the canary setting has changed
+    if (e.affectsConfiguration("codeQL.canary")) {
+      void this.updateUserSettings();
+    }
+  }
+
+  private async updateUserSettings(): Promise<void> {
+    if (!this.isShowingPanel) {
+      return;
+    }
+
+    await this.postMessage({
+      t: "setUserSettings",
+      userSettings: {
+        // Provenance is not supported in variant analysis view
+        shouldShowProvenance: false,
+        // Only show "View Autofixes" button in canary mode.
+        shouldShowViewAutofixesBtn: isCanary(),
+      },
+    });
   }
 
   public async openView() {
     const panel = await this.getPanel();
     panel.reveal(undefined, true);
 
     await this.waitForPanelLoaded();
+
+    await this.updateUserSettings();
   }
 
   public async updateView(variantAnalysis: VariantAnalysis): Promise<void> {

extensions/ql-vscode/src/view/results/__tests__/AlertTablePathRow.spec.tsx

@@ -22,7 +22,10 @@ describe(AlertTablePathRow.name, () => {
         currentPathExpanded={true}
         databaseUri={"dbUri"}
         sourceLocationPrefix="src"
-        userSettings={{ shouldShowProvenance: false }}
+        userSettings={{
+          shouldShowProvenance: false,
+          shouldShowViewAutofixesBtn: false,
+        }}
         updateSelectionCallback={jest.fn()}
         toggleExpanded={jest.fn()}
         {...props}

extensions/ql-vscode/src/view/results/__tests__/AlertTableResultRow.spec.tsx

@@ -17,7 +17,10 @@ describe(AlertTableResultRow.name, () => {
         selectedItemRef={mockRef}
         databaseUri={"dbUri"}
         sourceLocationPrefix="src"
-        userSettings={{ shouldShowProvenance: false }}
+        userSettings={{
+          shouldShowProvenance: false,
+          shouldShowViewAutofixesBtn: false,
+        }}
         updateSelectionCallback={jest.fn()}
         toggleExpanded={jest.fn()}
         {...props}

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

@@ -9,11 +9,15 @@ import { VariantAnalysisStatus } from "../../variant-analysis/shared/variant-ana
 import { VariantAnalysisHeader } from "./VariantAnalysisHeader";
 import { VariantAnalysisOutcomePanels } from "./VariantAnalysisOutcomePanels";
 import { VariantAnalysisLoading } from "./VariantAnalysisLoading";
-import type { ToVariantAnalysisMessage } from "../../common/interface-types";
+import type {
+  ToVariantAnalysisMessage,
+  UserSettings,
+} from "../../common/interface-types";
 import { vscode } from "../vscode-api";
 import { defaultFilterSortState } from "../../variant-analysis/shared/variant-analysis-filter-sort";
 import { sendTelemetry, useTelemetryOnChange } from "../common/telemetry";
 import { useMessageFromExtension } from "../common/useMessageFromExtension";
+import { DEFAULT_USER_SETTINGS } from "../../common/interface-types";
 
 export type VariantAnalysisProps = {
   variantAnalysis?: VariantAnalysisDomainModel;
@@ -77,6 +81,9 @@ export function VariantAnalysis({
   useTelemetryOnChange(filterSortState, "variant-analysis-filter-sort-state", {
     debounceTimeoutMillis: 1000,
   });
+  const [userSettings, setUserSettings] = useState<UserSettings>(
+    DEFAULT_USER_SETTINGS,
+  );
 
   useMessageFromExtension<ToVariantAnalysisMessage>((msg) => {
     if (msg.t === "setVariantAnalysis") {
@@ -102,6 +109,8 @@ export function VariantAnalysis({
           ...msg.repoStates,
         ];
       });
+    } else if (msg.t === "setUserSettings") {
+      setUserSettings(msg.userSettings);
     }
   }, []);
 
@@ -163,6 +172,7 @@ export function VariantAnalysis({
         onCopyRepositoryListClick={copyRepositoryList}
         onExportResultsClick={exportResults}
         onViewLogsClick={onViewLogsClick}
+        userSettings={userSettings}
       />
       <VariantAnalysisOutcomePanels
         variantAnalysis={variantAnalysis}

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

@@ -1,6 +1,7 @@
 import { styled } from "styled-components";
 import { VariantAnalysisStatus } from "../../variant-analysis/shared/variant-analysis";
 import { VscodeButton } from "@vscode-elements/react-elements";
+import type { UserSettings } from "../../common/interface-types";
 
 export type VariantAnalysisActionsProps = {
   variantAnalysisStatus: VariantAnalysisStatus;
@@ -18,6 +19,8 @@ export type VariantAnalysisActionsProps = {
 
   hasSelectedRepositories?: boolean;
   hasFilteredRepositories?: boolean;
+
+  userSettings: UserSettings;
 };
 
 const Container = styled.div`
@@ -65,24 +68,27 @@ export const VariantAnalysisActions = ({
   exportResultsDisabled,
   hasSelectedRepositories,
   hasFilteredRepositories,
+  userSettings,
 }: VariantAnalysisActionsProps) => {
   return (
     <Container>
       {showResultActions && (
         <>
-          <Button
-            secondary
-            onClick={onViewAutofixesClick}
-            disabled={viewAutofixesDisabled}
-          >
-            {chooseText({
-              hasSelectedRepositories,
-              hasFilteredRepositories,
-              normalText: "View Autofixes",
-              selectedText: "View Autofixes for selected results",
-              filteredText: "View Autofixes for filtered results",
-            })}
-          </Button>
+          {userSettings.shouldShowViewAutofixesBtn && (
+            <Button
+              secondary
+              onClick={onViewAutofixesClick}
+              disabled={viewAutofixesDisabled}
+            >
+              {chooseText({
+                hasSelectedRepositories,
+                hasFilteredRepositories,
+                normalText: "View Autofixes",
+                selectedText: "View Autofixes for selected results",
+                filteredText: "View Autofixes for filtered results",
+              })}
+            </Button>
+          )}
           <Button
             secondary
             onClick={onCopyRepositoryListClick}