Merge branch 'main' into lilac/parameters-opt-out

aslilac · aslilac · commit d09fdb9e0f3e · 2025-04-17T22:10:39.000Z
diff --git a/dogfood/coder/Dockerfile b/dogfood/coder/Dockerfile
@@ -1,10 +1,10 @@
-FROM rust:slim@sha256:9abf10cc84dfad6ace1b0aae3951dc5200f467c593394288c11db1e17bb4d349 AS rust-utils
+# 1.86.0
+FROM rust:slim@sha256:3f391b0678a6e0c88fd26f13e399c9c515ac47354e3cadfee7daee3b21651a4f AS rust-utils
 # Install rust helper programs
-# ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
 ENV CARGO_INSTALL_ROOT=/tmp/
-RUN cargo install typos-cli watchexec-cli && \
-	# Reduce image size.
-	rm -rf /usr/local/cargo/registry
+RUN apt-get update
+RUN apt-get install -y libssl-dev openssl pkg-config build-essential
+RUN cargo install jj-cli typos-cli watchexec-cli
 
 FROM ubuntu:jammy@sha256:0e5e4a57c2499249aafc3b40fcd541e9a456aab7296681a3994d631587203f97 AS go
 
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -1010,6 +1010,7 @@ class ApiMethods {
 	};
 
 	templateVersionDynamicParameters = (
+		userId: string,
 		versionId: string,
 		{
 			onMessage,
@@ -1020,7 +1021,7 @@ class ApiMethods {
 		},
 	): WebSocket => {
 		const socket = createWebSocket(
-			`/api/v2/templateversions/${versionId}/dynamic-parameters`,
+			`/api/v2/users/${userId}/templateversions/${versionId}/parameters`,
 		);
 
 		socket.addEventListener("message", (event) =>
diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageExperimental.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageExperimental.tsx
@@ -57,6 +57,8 @@ const CreateWorkspacePageExperimental: FC = () => {
 	const [mode, setMode] = useState(() => getWorkspaceMode(searchParams));
 	const [autoCreateError, setAutoCreateError] =
 		useState<ApiErrorResponse | null>(null);
+	const defaultOwner = me;
+	const [owner, setOwner] = useState(defaultOwner);
 
 	const queryClient = useQueryClient();
 	const autoCreateWorkspaceMutation = useMutation(
@@ -96,19 +98,23 @@ const CreateWorkspacePageExperimental: FC = () => {
 			return;
 		}
 
-		const socket = API.templateVersionDynamicParameters(realizedVersionId, {
-			onMessage,
-			onError: (error) => {
-				setWsError(error);
+		const socket = API.templateVersionDynamicParameters(
+			owner.id,
+			realizedVersionId,
+			{
+				onMessage,
+				onError: (error) => {
+					setWsError(error);
+				},
 			},
-		});
+		);
 
 		ws.current = socket;
 
 		return () => {
 			socket.close();
 		};
-	}, [realizedVersionId, onMessage]);
+	}, [owner.id, realizedVersionId, onMessage]);
 
 	const sendMessage = useCallback((formValues: Record<string, string>) => {
 		setWSResponseId((prevId) => {
@@ -237,7 +243,9 @@ const CreateWorkspacePageExperimental: FC = () => {
 					defaultName={defaultName}
 					diagnostics={currentResponse?.diagnostics ?? []}
 					disabledParams={disabledParams}
-					defaultOwner={me}
+					defaultOwner={defaultOwner}
+					owner={owner}
+					setOwner={setOwner}
 					autofillParameters={autofillParameters}
 					error={
 						wsError ||
diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx
@@ -22,14 +22,7 @@ import {
 	useValidationSchemaForDynamicParameters,
 } from "modules/workspaces/DynamicParameter/DynamicParameter";
 import { generateWorkspaceName } from "modules/workspaces/generateWorkspaceName";
-import {
-	type FC,
-	useCallback,
-	useEffect,
-	useId,
-	useMemo,
-	useState,
-} from "react";
+import { type FC, useCallback, useEffect, useId, useState } from "react";
 import { getFormHelpers, nameValidator } from "utils/formUtils";
 import type { AutofillBuildParameter } from "utils/richParameters";
 import * as Yup from "yup";
@@ -65,6 +58,8 @@ export interface CreateWorkspacePageViewExperimentalProps {
 	resetMutation: () => void;
 	sendMessage: (message: Record<string, string>) => void;
 	startPollingExternalAuth: () => void;
+	owner: TypesGen.User;
+	setOwner: (user: TypesGen.User) => void;
 }
 
 export const CreateWorkspacePageViewExperimental: FC<
@@ -91,8 +86,9 @@ export const CreateWorkspacePageViewExperimental: FC<
 	resetMutation,
 	sendMessage,
 	startPollingExternalAuth,
+	owner,
+	setOwner,
 }) => {
-	const [owner, setOwner] = useState(defaultOwner);
 	const [suggestedName, setSuggestedName] = useState(() =>
 		generateWorkspaceName(),
 	);
@@ -140,14 +136,6 @@ export const CreateWorkspacePageViewExperimental: FC<
 		error,
 	);
 
-	const autofillByName = useMemo(
-		() =>
-			Object.fromEntries(
-				autofillParameters.map((param) => [param.name, param]),
-			),
-		[autofillParameters],
-	);
-
 	const [presetOptions, setPresetOptions] = useState([
 		{ label: "None", value: "" },
 	]);
