fix: remove usages of experimentalFormContext

jaaydenh · jaaydenh · commit a513a4db787f · 2025-06-20T12:56:02.000Z
diff --git a/site/src/pages/TemplatePage/TemplateEmbedPage/TemplateEmbedExperimentRouter.tsx b/site/src/pages/TemplatePage/TemplateEmbedPage/TemplateEmbedExperimentRouter.tsx
@@ -1,92 +1,35 @@
 import { templateByName } from "api/queries/templates";
 import { ErrorAlert } from "components/Alert/ErrorAlert";
 import { Loader } from "components/Loader/Loader";
-import { useDashboard } from "modules/dashboard/useDashboard";
-import { ExperimentalFormContext } from "pages/CreateWorkspacePage/ExperimentalFormContext";
 import type { FC } from "react";
 import { useQuery } from "react-query";
 import { useParams } from "react-router-dom";
 import TemplateEmbedPage from "./TemplateEmbedPage";
 import TemplateEmbedPageExperimental from "./TemplateEmbedPageExperimental";
 
 const TemplateEmbedExperimentRouter: FC = () => {
-	const { experiments } = useDashboard();
-	const dynamicParametersEnabled = experiments.includes("dynamic-parameters");
-
 	const { organization: organizationName = "default", template: templateName } =
 		useParams() as { organization?: string; template: string };
 	const templateQuery = useQuery(
-		dynamicParametersEnabled
-			? templateByName(organizationName, templateName)
-			: { enabled: false },
-	);
-
-	const optOutQuery = useQuery(
-		templateQuery.data
-			? {
-					queryKey: [
-						organizationName,
-						"template",
-						templateQuery.data.id,
-						"optOut",
-					],
-					queryFn: () => {
-						const templateId = templateQuery.data.id;
-						const localStorageKey = optOutKey(templateId);
-						const storedOptOutString = localStorage.getItem(localStorageKey);
-
-						let optOutResult: boolean;
-
-						if (storedOptOutString !== null) {
-							optOutResult = storedOptOutString === "true";
-						} else {
-							optOutResult = Boolean(
-								templateQuery.data.use_classic_parameter_flow,
-							);
-						}
-
-						return {
-							templateId: templateId,
-							optedOut: optOutResult,
-						};
-					},
-				}
-			: { enabled: false },
+		templateByName(organizationName, templateName),
 	);
 
-	if (dynamicParametersEnabled) {
-		if (optOutQuery.isLoading) {
-			return <Loader />;
-		}
-		if (!optOutQuery.data) {
-			return <ErrorAlert error={optOutQuery.error} />;
-		}
-
-		const toggleOptedOut = () => {
-			const key = optOutKey(optOutQuery.data.templateId);
-			const storedValue = localStorage.getItem(key);
-
-			const current = storedValue
-				? storedValue === "true"
-				: Boolean(templateQuery.data?.use_classic_parameter_flow);
-
-			localStorage.setItem(key, (!current).toString());
-			optOutQuery.refetch();
-		};
-		return (
-			<ExperimentalFormContext.Provider value={{ toggleOptedOut }}>
-				{optOutQuery.data.optedOut ? (
-					<TemplateEmbedPage />
-				) : (
-					<TemplateEmbedPageExperimental />
-				)}
-			</ExperimentalFormContext.Provider>
-		);
+	if (templateQuery.isError) {
+		return <ErrorAlert error={templateQuery.error} />;
+	}
+	if (!templateQuery.data) {
+		return <Loader />;
 	}
 
-	return <TemplateEmbedPage />;
+	return (
+		<>
+			{templateQuery.data?.use_classic_parameter_flow ? (
+				<TemplateEmbedPage />
+			) : (
+				<TemplateEmbedPageExperimental />
+			)}
+		</>
+	);
 };
 
 export default TemplateEmbedExperimentRouter;
-
-const optOutKey = (id: string) => `parameters.${id}.optOut`;
diff --git a/site/src/pages/TemplatePage/TemplateEmbedPage/TemplateEmbedPage.tsx b/site/src/pages/TemplatePage/TemplateEmbedPage/TemplateEmbedPage.tsx
@@ -4,20 +4,18 @@ import Radio from "@mui/material/Radio";
 import RadioGroup from "@mui/material/RadioGroup";
 import { API } from "api/api";
 import type { Template, TemplateVersionParameter } from "api/typesGenerated";
-import { Button as ShadcnButton } from "components/Button/Button";
 import { FormSection, VerticalForm } from "components/Form/Form";
 import { Loader } from "components/Loader/Loader";
 import { RichParameterInput } from "components/RichParameterInput/RichParameterInput";
 import { useClipboard } from "hooks/useClipboard";
 import { CheckIcon, CopyIcon } from "lucide-react";
 import { useTemplateLayoutContext } from "pages/TemplatePage/TemplateLayout";
-import { type FC, useContext, useEffect, useState } from "react";
+import { type FC, useEffect, useState } from "react";
 import { Helmet } from "react-helmet-async";
 import { useQuery } from "react-query";
 import { pageTitle } from "utils/page";
 import { getInitialRichParameterValues } from "utils/richParameters";
 import { paramsUsedToCreateWorkspace } from "utils/workspace";
-import { ExperimentalFormContext } from "../../CreateWorkspacePage/ExperimentalFormContext";
 
 type ButtonValues = Record<string, string>;
 
@@ -66,7 +64,6 @@ export const TemplateEmbedPageView: FC<TemplateEmbedPageViewProps> = ({
 	template,
 	templateParameters,
 }) => {
-	const experimentalFormContext = useContext(ExperimentalFormContext);
 	const [buttonValues, setButtonValues] = useState<ButtonValues | undefined>();
 	const clipboard = useClipboard({
 		textToCopy: getClipboardCopyContent(
@@ -102,17 +99,6 @@ export const TemplateEmbedPageView: FC<TemplateEmbedPageViewProps> = ({
 			) : (
 				<div className="flex items-start gap-12">
 					<div className="max-w-3xl">
-						{experimentalFormContext && (
-							<div className="mb-4">
-								<ShadcnButton
-									size="sm"
-									variant="outline"
-									onClick={experimentalFormContext.toggleOptedOut}
-								>
-									Try out the new workspace creation flow ✨
-								</ShadcnButton>
-							</div>
-						)}
 						<VerticalForm>
 							<FormSection
 								title="Creation mode"
diff --git a/site/src/pages/TemplatePage/TemplateEmbedPage/TemplateEmbedPageExperimental.tsx b/site/src/pages/TemplatePage/TemplateEmbedPage/TemplateEmbedPageExperimental.tsx
@@ -23,12 +23,10 @@ import {
 	Diagnostics,
 	DynamicParameter,
 } from "modules/workspaces/DynamicParameter/DynamicParameter";
-import { ExperimentalFormContext } from "pages/CreateWorkspacePage/ExperimentalFormContext";
 import { useTemplateLayoutContext } from "pages/TemplatePage/TemplateLayout";
 import {
 	type FC,
 	useCallback,
-	useContext,
 	useEffect,
 	useMemo,
 	useRef,
@@ -141,7 +139,6 @@ const TemplateEmbedPageView: FC<TemplateEmbedPageViewProps> = ({
 	error,
 	sendMessage,
 }) => {
-	const experimentalFormContext = useContext(ExperimentalFormContext);
 	const [buttonValues, setButtonValues] = useState<ButtonValues | undefined>();
 	const [localParameters, setLocalParameters] = useState<
 		Record<string, string>
@@ -205,17 +202,6 @@ const TemplateEmbedPageView: FC<TemplateEmbedPageViewProps> = ({
 		<>
 			<div className="flex items-start gap-12">
 				<div className="flex flex-col gap-5 max-w-screen-md">
-					{experimentalFormContext && (
-						<div>
-							<Button
-								size="sm"
-								variant="outline"
-								onClick={experimentalFormContext.toggleOptedOut}
-							>
-								Go back to the classic template embed flow
-							</Button>
-						</div>
-					)}
 					{Boolean(error) && <ErrorAlert error={error} />}
 					{diagnostics.length > 0 && <Diagnostics diagnostics={diagnostics} />}
 					<div className="flex flex-col">
