tryin

aslilac · aslilac · commit df06d534edd0 · 2025-08-11T16:38:54.000Z
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -24,7 +24,7 @@ import type dayjs from "dayjs";
 import userAgentParser from "ua-parser-js";
 import { OneWayWebSocket } from "../utils/OneWayWebSocket";
 import { delay } from "../utils/delay";
-import { type FieldError, isApiError } from "./errors";
+import { ParameterValidationError, isApiError } from "./errors";
 import type {
 	DynamicParametersRequest,
 	PostWorkspaceUsageRequest,
@@ -398,15 +398,6 @@ export class MissingBuildParameters extends Error {
 	}
 }
 
-export class ParameterValidationError extends Error {
-	constructor(
-		public readonly versionId: string,
-		public readonly validations: FieldError[],
-	) {
-		super("Parameters are not valid for new template version");
-	}
-}
-
 export type GetProvisionerJobsParams = {
 	status?: string;
 	limit?: number;
@@ -2256,6 +2247,7 @@ class ApiMethods {
 					error.response.data.validations &&
 					error.response.data.validations.length > 0
 				) {
+					console.log(error.response.data.validations);
 					throw new ParameterValidationError(
 						templateVersionId,
 						error.response.data.validations,
diff --git a/site/src/api/errors.ts b/site/src/api/errors.ts
@@ -149,3 +149,12 @@ export class DetailedError extends Error {
 		super(message);
 	}
 }
+
+export class ParameterValidationError extends Error {
+	constructor(
+		public readonly versionId: string,
+		public readonly validations: FieldError[],
+	) {
+		super("Parameters are not valid for new template version");
+	}
+}
diff --git a/site/src/modules/workspaces/WorkspaceMoreActions/WorkspaceMoreActions.tsx b/site/src/modules/workspaces/WorkspaceMoreActions/WorkspaceMoreActions.tsx
@@ -1,5 +1,5 @@
-import { MissingBuildParameters, ParameterValidationError } from "api/api";
-import { isApiError } from "api/errors";
+import { MissingBuildParameters } from "api/api";
+import { ParameterValidationError, isApiError } from "api/errors";
 import { type ApiError, getErrorMessage } from "api/errors";
 import {
 	changeVersion,
diff --git a/site/src/modules/workspaces/WorkspaceUpdateDialogs.tsx b/site/src/modules/workspaces/WorkspaceUpdateDialogs.tsx
@@ -1,4 +1,5 @@
-import { MissingBuildParameters, ParameterValidationError } from "api/api";
+import { MissingBuildParameters } from "api/api";
+import { ParameterValidationError } from "api/errors";
 import { updateWorkspace } from "api/queries/workspaces";
 import type {
 	TemplateVersion,
diff --git a/site/src/pages/WorkspacePage/WorkspacePage.test.tsx b/site/src/pages/WorkspacePage/WorkspacePage.test.tsx
@@ -1,6 +1,7 @@
 import { screen, waitFor, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import * as apiModule from "api/api";
+import { ParameterValidationError } from "api/errors";
 import type { TemplateVersionParameter, Workspace } from "api/typesGenerated";
 import MockServerSocket from "jest-websocket-mock";
 import {
@@ -282,11 +283,9 @@ describe("WorkspacePage", () => {
 	});
 
 	it("requests an update when the user presses Update", async () => {
-		// Mocks
 		jest
 			.spyOn(API, "getWorkspaceByOwnerAndName")
 			.mockResolvedValueOnce(MockOutdatedWorkspace);
-
 		const updateWorkspaceMock = jest
 			.spyOn(API, "updateWorkspace")
 			.mockResolvedValueOnce(MockWorkspaceBuild);
@@ -306,73 +305,37 @@ describe("WorkspacePage", () => {
 		});
 	});
 
-	it("updates the parameters when they are missing during update", async () => {
-		// Mocks
+	it("requires invalid parameters to be updated", async () => {
 		jest
 			.spyOn(API, "getWorkspaceByOwnerAndName")
 			.mockResolvedValueOnce(MockOutdatedWorkspace);
-		const updateWorkspaceSpy = jest
+		const updateWorkspaceMock = jest
 			.spyOn(API, "updateWorkspace")
 			.mockRejectedValueOnce(
-				new MissingBuildParameters(
-					[MockTemplateVersionParameter1, MockTemplateVersionParameter2],
+				new ParameterValidationError(
 					MockOutdatedWorkspace.template_active_version_id,
+					[
+						{
+							field: MockTemplateVersionParameter1.name,
+							detail:
+								"Required parameter not provided; parameter value is null",
+						},
+					],
 				),
 			);
 
-		// Render
 		await renderWorkspacePage(MockWorkspace);
 
-		// Actions
+		// Start workspace update
 		const user = userEvent.setup();
 		await user.click(screen.getByTestId("workspace-update-button"));
 		const confirmButton = await screen.findByTestId("confirm-button");
 		await user.click(confirmButton);
 
-		// The update was called
-		await waitFor(() => {
-			expect(API.updateWorkspace).toBeCalled();
-			updateWorkspaceSpy.mockClear();
-		});
-
-		// After trying to update, a new dialog asking for missed parameters should
-		// be displayed and filled
-		const dialog = await waitFor(() => screen.findByTestId("dialog"), {
-			timeout: 2000,
-		});
-		const firstParameterInput = within(dialog).getByLabelText(
-			MockTemplateVersionParameter1.name,
-			{ exact: false },
-		);
-		await user.clear(firstParameterInput);
-		await user.type(firstParameterInput, "some-value");
-		const secondParameterInput = within(dialog).getByLabelText(
-			MockTemplateVersionParameter2.name,
-			{ exact: false },
-		);
-		await user.clear(secondParameterInput);
-		await user.type(secondParameterInput, "2");
-		await user.click(
-			within(dialog).getByRole("button", { name: /update parameters/i }),
-		);
-
-		// Check if the update was called using the values from the form
-		await waitFor(() => {
-			expect(API.updateWorkspace).toHaveBeenCalledWith(
-				MockOutdatedWorkspace,
-				[
-					{
-						name: MockTemplateVersionParameter1.name,
-						value: "some-value",
-					},
-					{
-						name: MockTemplateVersionParameter2.name,
-						value: "2",
-					},
-				],
-				false,
-			);
-		});
+		// Dialog should warn the parameters need to be updated
+		const dialog = await screen.findByTestId("dialog");
+		await within(dialog).findByText("Update workspace parameters");
+		await screen.findByText(/go to the workspace parameters page to review/);
 	});
 
 	it("restart the workspace with one time parameters when having the confirmation dialog", async () => {

Original file line number	Diff line number	Diff line change
`@@ -149,3 +149,12 @@ export class DetailedError extends Error {`
`149`	`149`	`super(message);`
`150`	`150`	`}`
`151`	`151`	`}`
	`152`	`+`
	`153`	`+export class ParameterValidationError extends Error {`
	`154`	`+ constructor(`
	`155`	`+ public readonly versionId: string,`
	`156`	`+ public readonly validations: FieldError[],`
	`157`	`+ ) {`
	`158`	`+ super("Parameters are not valid for new template version");`
	`159`	`+ }`
	`160`	`+}`