Merge branch 'alpha' into fix/my-space-side-panel

Viczei · web-flow · commit a57bc74b0239 · 2026-04-22T14:29:24.000+02:00
diff --git a/packages/app/src/e2e/public-referents.e2e.ts b/packages/app/src/e2e/public-referents.e2e.ts
@@ -76,7 +76,7 @@ test.describe("public referents search", () => {
 			const page = await anonCtx.newPage();
 			await page.goto("/referents");
 			await expect(
-				page.getByText(/remplissez au moins un filtre/i),
+				page.getByText(/sélectionnez au moins un filtre/i),
 			).toBeVisible();
 			await expect(page.getByText("E2E Référent Paris")).not.toBeVisible();
 		} finally {
@@ -113,32 +113,12 @@ test.describe("public referents search", () => {
 		}
 	});
 
-	test("search by name filters the results", async ({ browser }) => {
+	test("name-search input is not exposed", async ({ browser }) => {
 		const anonCtx = await browser.newContext({ storageState: undefined });
 		try {
 			const page = await anonCtx.newPage();
 			await page.goto("/referents");
-			await page.getByLabel("Nom du référent").fill("Rennes");
-			await page.getByRole("button", { name: /^rechercher$/i }).click();
-
-			await expect(page.getByText("E2E Référent Rennes")).toBeVisible();
-			await expect(page.getByText("E2E Référent Paris")).not.toBeVisible();
-		} finally {
-			await anonCtx.close();
-		}
-	});
-
-	test("search with no matches shows the empty state", async ({ browser }) => {
-		const anonCtx = await browser.newContext({ storageState: undefined });
-		try {
-			const page = await anonCtx.newPage();
-			await page.goto("/referents");
-			await page
-				.getByLabel("Nom du référent")
-				.fill("ZZZZ-nonexistent-name-XXX");
-			await page.getByRole("button", { name: /^rechercher$/i }).click();
-
-			await expect(page.getByText(/aucun référent/i)).toBeVisible();
+			await expect(page.getByLabel("Nom du référent")).toHaveCount(0);
 		} finally {
 			await anonCtx.close();
 		}
diff --git a/packages/app/src/modules/admin/referents/AdminReferentsPage.tsx b/packages/app/src/modules/admin/referents/AdminReferentsPage.tsx
@@ -113,7 +113,6 @@ function ReferentsContent() {
 	} = useImportModal();
 
 	const input = {
-		query: searchParams.get("query") ?? undefined,
 		region: (searchParams.get("region") as RegionCode) || undefined,
 		county: (searchParams.get("county") as CountyCode) || undefined,
 		page: Number(searchParams.get("page") ?? "1"),
diff --git a/packages/app/src/modules/admin/referents/SearchForm.tsx b/packages/app/src/modules/admin/referents/SearchForm.tsx
@@ -1,5 +1,8 @@
 "use client";
 
+// Direct import (not via `~/modules/referents` barrel) to avoid pulling
+// server-only transitive imports (auth → db → postgres) into this client
+// component bundle. The barrel re-exports server components that drag them in.
 import { ReferentsSearchForm } from "~/modules/referents/shared/ReferentsSearchForm";
 
 import { searchReferentsFormSchema } from "./schemas";
@@ -11,7 +14,6 @@ export function SearchForm() {
 			emptyCountyLabel="Tous"
 			emptyRegionLabel="Toutes"
 			fieldPrefix="search"
-			order="query-first"
 			schema={searchReferentsFormSchema}
 		/>
 	);
diff --git a/packages/app/src/modules/admin/referents/__tests__/SearchForm.test.tsx b/packages/app/src/modules/admin/referents/__tests__/SearchForm.test.tsx
@@ -37,23 +37,24 @@ describe("SearchForm", () => {
 
 	it("pushes a URL with the submitted filters on search", async () => {
 		render(<SearchForm />);
-		fireEvent.input(screen.getByLabelText("Nom du référent"), {
-			target: { value: "Jean" },
-		});
 		fireEvent.change(screen.getByLabelText("Région"), {
 			target: { value: "11" },
 		});
 		fireEvent.click(screen.getByRole("button", { name: "Rechercher" }));
 
 		await waitFor(() => {
 			expect(routerPush).toHaveBeenCalledWith(
-				expect.stringMatching(/\/admin\/liste-referents\?.*query=Jean/),
+				expect.stringMatching(/\/admin\/liste-referents\?.*region=11/),
 			);
 		});
-		expect(routerPush).toHaveBeenCalledWith(expect.stringMatching(/region=11/));
 		expect(routerPush).toHaveBeenCalledWith(expect.stringMatching(/page=1/));
 	});
 
+	it("does not render a name-search input", () => {
+		render(<SearchForm />);
+		expect(screen.queryByLabelText(/nom du référent/i)).toBeNull();
+	});
+
 	it("resets and pushes the base URL on Réinitialiser", () => {
 		render(<SearchForm />);
 		fireEvent.click(screen.getByRole("button", { name: "Réinitialiser" }));
diff --git a/packages/app/src/modules/admin/referents/__tests__/schemas.test.ts b/packages/app/src/modules/admin/referents/__tests__/schemas.test.ts
@@ -22,7 +22,6 @@ describe("searchReferentsSchema", () => {
 
 	it("parses all fields", () => {
 		const result = searchReferentsSchema.parse({
-			query: "Dupont",
 			region: "11",
 			county: "75",
 			page: "2",
@@ -31,7 +30,6 @@ describe("searchReferentsSchema", () => {
 			sortOrder: "desc",
 		});
 		expect(result).toEqual({
-			query: "Dupont",
 			region: "11",
 			county: "75",
 			page: 2,
diff --git a/packages/app/src/modules/admin/referents/schemas.ts b/packages/app/src/modules/admin/referents/schemas.ts
@@ -16,7 +16,6 @@ export type SortColumn = (typeof SORT_COLUMNS)[number];
 export const DEFAULT_PAGE_SIZE = 20;
 
 export const searchReferentsSchema = z.object({
-	query: z.string().optional(),
 	region: z.enum(REGION_CODES).optional().or(z.literal("")),
 	county: z.enum(COUNTY_CODES).optional().or(z.literal("")),
 	page: z.coerce.number().int().min(1).default(1),
@@ -29,7 +28,6 @@ export type SearchReferentsInput = z.input<typeof searchReferentsSchema>;
 export type SearchReferentsOutput = z.output<typeof searchReferentsSchema>;
 
 export const searchReferentsFormSchema = z.object({
-	query: z.string().optional(),
 	region: z.string().optional(),
 	county: z.string().optional(),
 });
diff --git a/packages/app/src/modules/referents/PublicReferentsPage.tsx b/packages/app/src/modules/referents/PublicReferentsPage.tsx
@@ -17,7 +17,6 @@ function ReferentsContent() {
 	const searchParams = useSearchParams();
 
 	const input = {
-		query: searchParams.get("query") ?? undefined,
 		region: (searchParams.get("region") as RegionCode) || undefined,
 		county: (searchParams.get("county") as CountyCode) || undefined,
 		page: Number(searchParams.get("page") ?? "1"),
@@ -27,7 +26,7 @@ function ReferentsContent() {
 	// Require at least one filter before hitting the search endpoint — the full
 	// referent list must never be returned (anti-harvest + UX: forcing a filter
 	// gives results users actually need instead of a paginated dump).
-	const hasFilter = Boolean(input.query || input.region || input.county);
+	const hasFilter = Boolean(input.region || input.county);
 
 	const { data, isLoading, isError } = api.publicReferents.search.useQuery(
 		input,
@@ -48,8 +47,8 @@ function ReferentsContent() {
 			<PublicReferentsSearchForm />
 			{!hasFilter && (
 				<p className="fr-text--lg fr-text-mention--grey fr-my-4w">
-					Remplissez au moins un filtre (nom, région ou département) pour lancer
-					la recherche.
+					Sélectionnez au moins un filtre (région ou département) pour lancer la
+					recherche.
 				</p>
 			)}
 			{hasFilter && isLoading && !data && (
diff --git a/packages/app/src/modules/referents/PublicReferentsSearchForm.tsx b/packages/app/src/modules/referents/PublicReferentsSearchForm.tsx
@@ -8,8 +8,6 @@ export function PublicReferentsSearchForm() {
 		<ReferentsSearchForm
 			basePath="/referents"
 			fieldPrefix="referents"
-			queryPlaceholder="Ex : Durand"
-			queryType="search"
 			schema={publicSearchReferentsFormSchema}
 			wrapFieldsInFieldset
 		/>
diff --git a/packages/app/src/modules/referents/__tests__/PublicReferentsPage.test.tsx b/packages/app/src/modules/referents/__tests__/PublicReferentsPage.test.tsx
@@ -68,7 +68,7 @@ describe("PublicReferentsPage", () => {
 			expect.objectContaining({ enabled: false }),
 		);
 		expect(
-			screen.getByText(/remplissez au moins un filtre/i),
+			screen.getByText(/sélectionnez au moins un filtre/i),
 		).toBeInTheDocument();
 	});
 
diff --git a/packages/app/src/modules/referents/__tests__/PublicReferentsSearchForm.test.tsx b/packages/app/src/modules/referents/__tests__/PublicReferentsSearchForm.test.tsx
@@ -17,11 +17,11 @@ describe("PublicReferentsSearchForm", () => {
 		mockPush.mockClear();
 	});
 
-	it("renders region, county and name inputs", () => {
+	it("renders region and county selects only", () => {
 		render(<PublicReferentsSearchForm />);
 		expect(screen.getByLabelText(/région/i)).toBeInTheDocument();
 		expect(screen.getByLabelText(/département/i)).toBeInTheDocument();
-		expect(screen.getByLabelText(/nom du référent/i)).toBeInTheDocument();
+		expect(screen.queryByLabelText(/nom du référent/i)).toBeNull();
 	});
 
 	it("disables the county select until a region is chosen", () => {
@@ -49,19 +49,13 @@ describe("PublicReferentsSearchForm", () => {
 		fireEvent.change(screen.getByLabelText(/région/i), {
 			target: { value: "11" },
 		});
-		fireEvent.input(screen.getByLabelText(/nom du référent/i), {
-			target: { value: "durand" },
-		});
 		fireEvent.click(screen.getByRole("button", { name: /^rechercher$/i }));
 
 		await waitFor(() => {
 			expect(mockPush).toHaveBeenCalledWith(
 				expect.stringMatching(/\/referents\?.*region=11/),
 			);
 		});
-		expect(mockPush).toHaveBeenCalledWith(
-			expect.stringMatching(/query=durand/),
-		);
 		expect(mockPush).toHaveBeenCalledWith(expect.stringMatching(/page=1/));
 	});
 
diff --git a/packages/app/src/modules/referents/__tests__/schemas.test.ts b/packages/app/src/modules/referents/__tests__/schemas.test.ts
@@ -54,13 +54,6 @@ describe("publicSearchReferentsSchema", () => {
 	it("rejects an unknown region code", () => {
 		expect(() => publicSearchReferentsSchema.parse({ region: "99" })).toThrow();
 	});
-
-	it("trims query whitespace", () => {
-		const result = publicSearchReferentsSchema.parse({
-			query: "  durand  ",
-		});
-		expect(result.query).toBe("durand");
-	});
 });
 
 describe("publicSearchReferentsFormSchema", () => {
@@ -71,11 +64,10 @@ describe("publicSearchReferentsFormSchema", () => {
 
 	it("accepts free-form strings (form-level, server re-validates)", () => {
 		const result = publicSearchReferentsFormSchema.parse({
-			query: "durand",
 			region: "11",
 			county: "75",
 		});
-		expect(result).toEqual({ query: "durand", region: "11", county: "75" });
+		expect(result).toEqual({ region: "11", county: "75" });
 	});
 });
 
diff --git a/packages/app/src/modules/referents/schemas.ts b/packages/app/src/modules/referents/schemas.ts
@@ -11,7 +11,6 @@ import { PUBLIC_PAGE_SIZE } from "./shared/constants";
  * for the "Toutes" / "Tous" options; we normalize to `undefined` at the border.
  */
 export const publicSearchReferentsSchema = z.object({
-	query: z.string().trim().optional(),
 	region: z.enum(REGION_CODES).optional().or(z.literal("")),
 	county: z.enum(COUNTY_CODES).optional().or(z.literal("")),
 	page: z.coerce.number().int().min(1).default(1),
@@ -30,7 +29,6 @@ export type PublicSearchReferentsOutput = z.output<
  * the URL and are managed by the page container.
  */
 export const publicSearchReferentsFormSchema = z.object({
-	query: z.string().optional(),
 	region: z.string().optional(),
 	county: z.string().optional(),
 });
diff --git a/packages/app/src/modules/referents/shared/ReferentsSearchForm.tsx b/packages/app/src/modules/referents/shared/ReferentsSearchForm.tsx
@@ -17,41 +17,30 @@ type Props = {
 	basePath: string;
 	schema: ReferentsSearchFormSchema;
 	fieldPrefix: string;
-	queryLabel?: string;
-	queryPlaceholder?: string;
-	queryType?: "search" | "text";
 	emptyRegionLabel?: string;
 	emptyCountyLabel?: string;
 	wrapFieldsInFieldset?: boolean;
-	order?: "query-first" | "region-first";
 };
 
 /**
  * Shared referent search form. The admin and public pages differ in layout
- * details but share the schema (query + region + county), URL-state handling
- * and the region → county cascade. Centralising the form here removes the
- * SonarCloud duplication signal that flagged ~19 duplicated lines between
- * the two pages.
+ * details but share the schema (region + county), URL-state handling and
+ * the region → county cascade.
  */
 export function ReferentsSearchForm({
 	basePath,
 	schema,
 	fieldPrefix,
-	queryLabel = "Nom du référent",
-	queryPlaceholder,
-	queryType = "text",
 	emptyRegionLabel = "Toutes les régions",
 	emptyCountyLabel = "Tous les départements",
 	wrapFieldsInFieldset = false,
-	order = "region-first",
 }: Props) {
 	const router = useRouter();
 	const searchParams = useSearchParams();
 
 	const { register, handleSubmit, reset, watch } = useReferentsSearchForm(
 		schema,
 		{
-			query: searchParams.get("query") ?? "",
 			region: searchParams.get("region") ?? "",
 			county: searchParams.get("county") ?? "",
 		},
@@ -77,29 +66,12 @@ export function ReferentsSearchForm({
 	);
 
 	const handleReset = useCallback(() => {
-		reset({ query: "", region: "", county: "" });
+		reset({ region: "", county: "" });
 		router.push(basePath);
 	}, [basePath, reset, router]);
 
-	const queryField = (
-		<div className="fr-col-12 fr-col-md-4">
-			<div className="fr-input-group">
-				<label className="fr-label" htmlFor={`${fieldPrefix}-query`}>
-					{queryLabel}
-				</label>
-				<input
-					className="fr-input"
-					id={`${fieldPrefix}-query`}
-					placeholder={queryPlaceholder}
-					type={queryType}
-					{...register("query")}
-				/>
-			</div>
-		</div>
-	);
-
 	const regionField = (
-		<div className="fr-col-12 fr-col-md-4">
+		<div className="fr-col-12 fr-col-md-6">
 			<div className="fr-select-group">
 				<label className="fr-label" htmlFor={`${fieldPrefix}-region`}>
 					Région
@@ -121,7 +93,7 @@ export function ReferentsSearchForm({
 	);
 
 	const countyField = (
-		<div className="fr-col-12 fr-col-md-4">
+		<div className="fr-col-12 fr-col-md-6">
 			<div className="fr-select-group">
 				<label className="fr-label" htmlFor={`${fieldPrefix}-county`}>
 					Département
@@ -147,19 +119,8 @@ export function ReferentsSearchForm({
 
 	const gridBody = (
 		<div className="fr-grid-row fr-grid-row--gutters">
-			{order === "query-first" ? (
-				<>
-					{queryField}
-					{regionField}
-					{countyField}
-				</>
-			) : (
-				<>
-					{regionField}
-					{countyField}
-					{queryField}
-				</>
-			)}
+			{regionField}
+			{countyField}
 		</div>
 	);
 
diff --git a/packages/app/src/modules/referents/shared/useReferentsSearchForm.ts b/packages/app/src/modules/referents/shared/useReferentsSearchForm.ts
@@ -12,7 +12,7 @@ export type ReferentsSearchFormSchema = Parameters<typeof useZodForm>[0];
  */
 export function useReferentsSearchForm(
 	schema: ReferentsSearchFormSchema,
-	defaultValues: { query: string; region: string; county: string },
+	defaultValues: { region: string; county: string },
 ) {
 	return useZodForm(schema, { defaultValues });
 }
diff --git a/packages/app/src/server/api/routers/__tests__/adminReferents.test.ts b/packages/app/src/server/api/routers/__tests__/adminReferents.test.ts
@@ -145,12 +145,11 @@ describe("adminReferentsRouter", () => {
 			});
 		});
 
-		it("applies filters on query, region and county", async () => {
+		it("applies filters on region and county", async () => {
 			selectQueue = [[], [{ total: 0 }]];
 			const caller = await createCaller(createMockDb());
 
 			const result = await caller.search({
-				query: "Jean",
 				region: "11",
 				county: "75",
 				page: 2,
diff --git a/packages/app/src/server/api/routers/__tests__/publicReferents.test.ts b/packages/app/src/server/api/routers/__tests__/publicReferents.test.ts
@@ -98,12 +98,11 @@ describe("publicReferentsRouter", () => {
 			}
 		});
 
-		it("applies filters on query, region and county", async () => {
+		it("applies filters on region and county", async () => {
 			selectQueue = [[], [{ total: 0 }]];
 			const caller = await createCaller(createMockDb());
 
 			const result = await caller.search({
-				query: "Jean",
 				region: "11",
 				county: "75",
 				page: 1,
diff --git a/packages/app/src/server/api/routers/adminReferents.ts b/packages/app/src/server/api/routers/adminReferents.ts
diff --git a/packages/app/src/server/api/routers/publicReferents.ts b/packages/app/src/server/api/routers/publicReferents.ts
