Control by FF

Author: mustard-mh

Diff for: components/dashboard/src/data/featureflag-query.ts

@@ -27,6 +27,7 @@ const featureFlags = {
     dashboard_logging_tracing: false,
     showBrowserExtensionPromotion: false,
     usage_update_scheduler_duration: "15m",
+    enable_experimental_jbtb: false,
 };
 
 type FeatureFlags = typeof featureFlags;

Diff for: components/dashboard/src/user-settings/SelectIDE.tsx

@@ -13,6 +13,7 @@ import { useUpdateCurrentUserMutation } from "../data/current-user/update-mutati
 import { converter } from "../service/public-api";
 import { isOrganizationOwned } from "@gitpod/public-api-common/lib/user-utils";
 import Alert from "../components/Alert";
+import { useFeatureFlag } from "../data/featureflag-query";
 
 export type IDEChangedTrackLocation = "workspace_list" | "workspace_start" | "preferences";
 interface SelectIDEProps {
@@ -27,6 +28,7 @@ export default function SelectIDE(props: SelectIDEProps) {
     const [useLatestVersion, setUseLatestVersion] = useState<boolean>(user?.editorSettings?.version === "latest");
     const [preferToolbox, setPreferToolbox] = useState<boolean>(user?.editorSettings?.preferToolbox || false);
     const [ideWarning, setIdeWarning] = useState<ReactNode | undefined>(undefined);
+    const enableExperimentalJBTB = useFeatureFlag("enable_experimental_jbtb");
 
     const isOrgOwnedUser = user && isOrganizationOwned(user);
 
@@ -154,21 +156,23 @@ export default function SelectIDE(props: SelectIDEProps) {
                 onChange={(checked) => actuallySetUseLatestVersion(checked)}
             />
 
-            <CheckboxInputField
-                label={
-                    <span className="flex items-center gap-2">
-                        Launch in JetBrains Toolbox{" "}
-                        <PillLabel type="warn">
-                            <a href="https://www.gitpod.io/docs/references/gitpod-releases">
-                                <span className="text-xs">BETA</span>
-                            </a>
-                        </PillLabel>
-                    </span>
-                }
-                hint={<span>Launch JetBrains IDEs in the JetBrains Toolbox.</span>}
-                checked={preferToolbox}
-                onChange={(checked) => actuallySetPreferToolbox(checked)}
-            />
+            {enableExperimentalJBTB && (
+                <CheckboxInputField
+                    label={
+                        <span className="flex items-center gap-2">
+                            Launch in JetBrains Toolbox{" "}
+                            <PillLabel type="warn">
+                                <a href="https://www.gitpod.io/docs/references/gitpod-releases">
+                                    <span className="text-xs">BETA</span>
+                                </a>
+                            </PillLabel>
+                        </span>
+                    }
+                    hint={<span>Launch JetBrains IDEs in the JetBrains Toolbox.</span>}
+                    checked={preferToolbox}
+                    onChange={(checked) => actuallySetPreferToolbox(checked)}
+                />
+            )}
         </>
     );
 }

Diff for: components/server/src/workspace/workspace-starter.ts

@@ -301,22 +301,30 @@ export class WorkspaceStarter {
 
             let ideSettings = options.ideSettings;
 
+            const enableExperimentalJBTB = await getExperimentsClientForBackend().getValueAsync(
+                "enable_experimental_jbtb",
+                false,
+                { user },
+            );
+
             // if no explicit ideSettings are passed, we use the one from the last workspace instance
             if (lastValidWorkspaceInstance) {
                 const ideConfig = lastValidWorkspaceInstance.configuration?.ideConfig;
                 if (ideConfig?.ide) {
+                    const preferToolbox = !enableExperimentalJBTB
+                        ? false
+                        : ideSettings?.preferToolbox ??
+                          user.additionalData?.ideSettings?.preferToolbox ??
+                          ideConfig.preferToolbox ??
+                          false;
                     ideSettings = {
                         ...ideSettings,
                         defaultIde: ideConfig.ide,
                         useLatestVersion:
                             ideSettings?.useLatestVersion ??
                             user.additionalData?.ideSettings?.useLatestVersion ??
                             !!ideConfig.useLatest,
-                        preferToolbox:
-                            ideSettings?.preferToolbox ??
-                            user.additionalData?.ideSettings?.preferToolbox ??
-                            ideConfig.preferToolbox ??
-                            false,
+                        preferToolbox,
                     };
                 }
             }
@@ -914,10 +922,17 @@ export class WorkspaceStarter {
             };
             if (ideConfig.ideSettings && ideConfig.ideSettings.trim() !== "") {
                 try {
+                    const enableExperimentalJBTB = await getExperimentsClientForBackend().getValueAsync(
+                        "enable_experimental_jbtb",
+                        false,
+                        { user },
+                    );
                     const ideSettings: IDESettings = JSON.parse(ideConfig.ideSettings);
                     configuration.ideConfig!.ide = ideSettings.defaultIde;
                     configuration.ideConfig!.useLatest = !!ideSettings.useLatestVersion;
-                    configuration.ideConfig!.preferToolbox = ideSettings.preferToolbox ?? false;
+                    configuration.ideConfig!.preferToolbox = !enableExperimentalJBTB
+                        ? false
+                        : ideSettings.preferToolbox ?? false;
                 } catch (error) {
                     log.error({ userId: user.id, workspaceId: workspace.id }, "cannot parse ideSettings", error);
                 }