remove defunct api calls from the frontend

SasSwart · SasSwart · commit 9a14cab87c53 · 2025-02-12T13:11:36.000Z
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -1154,15 +1154,6 @@ class ApiMethods {
 		return response.data;
 	};
 
-	getTemplateVersionPresetParameters = async (
-		templateVersionId: string,
-	): Promise<TypesGen.PresetParameter[]> => {
-		const response = await this.axios.get<TypesGen.PresetParameter[]>(
-			`/api/v2/templateversions/${templateVersionId}/presets/parameters`,
-		);
-		return response.data;
-	};
-
 	startWorkspace = (
 		workspaceId: string,
 		templateVersionId: string,
diff --git a/site/src/api/queries/templates.ts b/site/src/api/queries/templates.ts
@@ -313,13 +313,6 @@ export const templateVersionPresets = (versionId: string) => {
 	};
 };
 
-export const templateVersionPresetParameters = (versionId: string) => {
-	return {
-		queryKey: ["templateVersion", versionId, "presetParameters"],
-		queryFn: () => API.getTemplateVersionPresetParameters(versionId),
-	};
-};
-
 const waitBuildToBeFinished = async (
 	version: TemplateVersion,
 	onRequest?: (data: TemplateVersion) => void,
diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePage.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePage.tsx
@@ -5,7 +5,6 @@ import {
 	richParameters,
 	templateByName,
 	templateVersionExternalAuth,
-	templateVersionPresetParameters,
 	templateVersionPresets,
 } from "api/queries/templates";
 import { autoCreateWorkspace, createWorkspace } from "api/queries/workspaces";
@@ -63,11 +62,6 @@ const CreateWorkspacePage: FC = () => {
 			? templateVersionPresets(templateQuery.data.active_version_id)
 			: { enabled: false },
 	);
-	const templateVersionPresetParametersQuery = useQuery(
-		templateQuery.data
-			? templateVersionPresetParameters(templateQuery.data.active_version_id)
-			: { enabled: false },
-	);
 	const permissionsQuery = useQuery(
 		templateQuery.data
 			? checkAuthorization({
@@ -216,7 +210,6 @@ const CreateWorkspacePage: FC = () => {
 					permissions={permissionsQuery.data as CreateWSPermissions}
 					parameters={realizedParameters as TemplateVersionParameter[]}
 					presets={templateVersionPresetsQuery.data ?? []}
-					presetParameters={templateVersionPresetParametersQuery.data ?? []}
 					creatingWorkspace={createWorkspaceMutation.isLoading}
 					onCancel={() => {
 						navigate(-1);
diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.stories.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.stories.tsx
@@ -122,22 +122,22 @@ export const Presets: Story = {
 			{
 				ID: "preset-1",
 				Name: "Preset 1",
+				Parameters: [
+					{
+						Name: MockTemplateVersionParameter1.name,
+						Value: "preset 1 override",
+					},
+				],
 			},
 			{
 				ID: "preset-2",
 				Name: "Preset 2",
-			},
-		],
-		presetParameters: [
-			{
-				PresetID: "preset-1",
-				Name: MockTemplateVersionParameter1.name,
-				Value: "preset 1 override",
-			},
-			{
-				PresetID: "preset-2",
-				Name: MockTemplateVersionParameter2.name,
-				Value: "42",
+				Parameters: [
+					{
+						Name: MockTemplateVersionParameter2.name,
+						Value: "42",
+					},
+				],
 			},
 		],
 		parameters: [
diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx
@@ -66,7 +66,6 @@ export interface CreateWorkspacePageViewProps {
 	parameters: TypesGen.TemplateVersionParameter[];
 	autofillParameters: AutofillBuildParameter[];
 	presets: TypesGen.Preset[];
-	presetParameters: TypesGen.PresetParameter[];
 	permissions: CreateWSPermissions;
 	creatingWorkspace: boolean;
 	onCancel: () => void;
@@ -92,7 +91,6 @@ export const CreateWorkspacePageView: FC<CreateWorkspacePageViewProps> = ({
 	parameters,
 	autofillParameters,
 	presets = [],
-	presetParameters = [],
 	permissions,
 	creatingWorkspace,
 	onSubmit,
@@ -175,19 +173,23 @@ export const CreateWorkspacePageView: FC<CreateWorkspacePageViewProps> = ({
 		// If so, how should it behave? Reset to initial value? reset to last set value?
 		// TODO (sasswart): test case: rich parameters
 
-		if (!presetParameters) {
-			return;
+		const selectedPresetOption = presetOptions[selectedPresetIndex];
+		let selectedPreset: TypesGen.Preset | undefined;
+		for (const preset of presets) {
+			if (preset.ID === selectedPresetOption.value) {
+				selectedPreset = preset;
+				break;
+			}
 		}
 
-		const selectedPreset = presetOptions[selectedPresetIndex];
-
-		const selectedPresetParameters = presetParameters.filter(
-			(param) => param.PresetID === selectedPreset.value,
-		);
+		if (!selectedPreset || !selectedPreset.Parameters) {
+			setPresetParameterNames([]);
+			return;
+		}
 
-		setPresetParameterNames(selectedPresetParameters.map((p) => p.Name));
+		setPresetParameterNames(selectedPreset.Parameters.map((p) => p.Name));
 
-		for (const presetParameter of selectedPresetParameters) {
+		for (const presetParameter of selectedPreset.Parameters) {
 			const parameterIndex = parameters.findIndex(
 				(p) => p.name === presetParameter.Name,
 			);
@@ -203,7 +205,7 @@ export const CreateWorkspacePageView: FC<CreateWorkspacePageViewProps> = ({
 	}, [
 		presetOptions,
 		selectedPresetIndex,
-		presetParameters,
+		presets,
 		parameters,
 		form.setFieldValue,
 	]);
