Merge branch 'mes/batch-update-01' into mes/batch-update-02

Parkreiner · Parkreiner · commit 338cf4dd88aa · 2025-07-16T04:17:04.000Z
diff --git a/site/src/components/Filter/Filter.tsx b/site/src/components/Filter/Filter.tsx
@@ -57,14 +57,23 @@ export const useFilter = ({
 	const update = (newValues: string | FilterValues) => {
 		const serialized =
 			typeof newValues === "string" ? newValues : stringifyFilter(newValues);
-		const noUpdateNeeded = searchParams.get(useFilterParamsKey) === serialized;
+		const noUpdateNeeded = query === serialized;
 		if (noUpdateNeeded) {
 			return;
 		}
 
-		const copy = new URLSearchParams(searchParams);
-		copy.set(useFilterParamsKey, serialized);
-		onSearchParamsChange(copy);
+		/**
+		 * @todo 2025-07-15 - We have a slightly nasty bug here, where trying to
+		 * update state the "React way" causes our code to break.
+		 *
+		 * In theory, it would be better to make a copy of the search params. We
+		 * can then mutate and dispatch the copy instead of the original. Doing
+		 * that causes other parts of our existing logic to break, though.
+		 * That's a sign that our other code is slightly broken, and only just
+		 * happens to work by chance right now.
+		 */
+		searchParams.set(useFilterParamsKey, serialized);
+		onSearchParamsChange(searchParams);
 		onUpdate?.(serialized);
 	};
 
diff --git a/site/src/hooks/usePagination.ts b/site/src/hooks/usePagination.ts
@@ -19,8 +19,8 @@ export function usePagination(
 ): UsePaginationResult {
 	const { searchParams, onSearchParamsChange } = options;
 	const limit = DEFAULT_RECORDS_PER_PAGE;
-	const rawPage = Number.parseInt(searchParams.get(paginationKey) || "0", 10);
-	const page = Number.isNaN(rawPage) ? 1 : rawPage;
+	const rawPage = Number.parseInt(searchParams.get(paginationKey) || "1", 10);
+	const page = Number.isNaN(rawPage) || rawPage <= 0 ? 1 : rawPage;
 
 	return {
 		page,
diff --git a/site/src/pages/AuditPage/AuditPage.test.tsx b/site/src/pages/AuditPage/AuditPage.test.tsx
@@ -1,6 +1,7 @@
 import { screen, waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { API } from "api/api";
+import type { AuditLogsRequest } from "api/typesGenerated";
 import { DEFAULT_RECORDS_PER_PAGE } from "components/PaginationWidget/utils";
 import { http, HttpResponse } from "msw";
 import {
@@ -106,7 +107,7 @@ describe("AuditPage", () => {
 			await userEvent.type(filterField, query);
 
 			await waitFor(() =>
-				expect(getAuditLogsSpy).toBeCalledWith({
+				expect(getAuditLogsSpy).toHaveBeenCalledWith<[AuditLogsRequest]>({
 					limit: DEFAULT_RECORDS_PER_PAGE,
 					offset: 0,
 					q: query,
diff --git a/site/src/pages/WorkspacesPage/WorkspacesPage.test.tsx b/site/src/pages/WorkspacesPage/WorkspacesPage.test.tsx
@@ -1,7 +1,7 @@
 import { screen, waitFor, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { API } from "api/api";
-import type { Workspace } from "api/typesGenerated";
+import type { Workspace, WorkspacesResponse } from "api/typesGenerated";
 import { http, HttpResponse } from "msw";
 import {
 	MockDormantOutdatedWorkspace,
@@ -28,18 +28,17 @@ describe("WorkspacesPage", () => {
 	});
 
 	it("renders an empty workspaces page", async () => {
-		// Given
 		server.use(
 			http.get("/api/v2/workspaces", async () => {
-				return HttpResponse.json({ workspaces: [], count: 0 });
+				return HttpResponse.json<WorkspacesResponse>({
+					workspaces: [],
+					count: 0,
+				});
 			}),
 		);
 
-		// When
 		renderWithAuth(<WorkspacesPage />);
-
-		// Then
-		await screen.findByText("Create a workspace");
+		await screen.findByRole("heading", { name: /Create a workspace/ });
 	});
 
 	it("renders a filled workspaces page", async () => {
