Merge branch 'alpha' into feat/issue-3242-admin-settings-refactor

LucasCharrier · web-flow · commit 0624bdbfeca1 · 2026-04-22T10:50:35.000+02:00
diff --git a/packages/app/src/app/layout.tsx b/packages/app/src/app/layout.tsx
@@ -4,10 +4,9 @@ import Script from "next/script";
 import { MatomoAnalytics } from "~/modules/analytics";
 import { SessionProviderWrapper } from "~/modules/auth";
 import {
-	Footer,
 	Header,
 	ImpersonateBanner,
-	ResourceBanner,
+	PublicChrome,
 	SkipLinks,
 } from "~/modules/layout";
 import { ProfileModal } from "~/modules/profile";
@@ -59,8 +58,7 @@ export default function RootLayout({
 						<ImpersonateBanner />
 						<Header />
 						{children}
-						<ResourceBanner />
-						<Footer />
+						<PublicChrome />
 						<ProfileModal />
 					</TRPCReactProvider>
 				</SessionProviderWrapper>
diff --git a/packages/app/src/e2e/admin.e2e.ts b/packages/app/src/e2e/admin.e2e.ts
@@ -10,6 +10,23 @@ test("admin user can access /admin and sees backoffice page", async ({
 	await expect(page.getByText("administrateur")).toBeVisible();
 });
 
+test("admin routes hide the public footer and help banner", async ({
+	page,
+}) => {
+	// Runs in the authenticated `chromium` Playwright project (see
+	// playwright.config.ts): `page.goto("/admin")` reaches the real backoffice
+	// page, so the assertions below exercise the PublicChrome branch, not a
+	// login-redirect fallback that would trivially pass.
+	await page.goto("/admin");
+	await expect(
+		page.getByRole("heading", { name: "Backoffice", level: 1 }),
+	).toBeVisible();
+	await expect(page.locator("footer#footer")).toHaveCount(0);
+	await expect(
+		page.getByRole("region", { name: "Ressources et aide" }),
+	).toHaveCount(0);
+});
+
 test("admin user can access /admin/impersonate and sees impersonate page", async ({
 	page,
 }) => {
diff --git a/packages/app/src/e2e/public-referents.e2e.ts b/packages/app/src/e2e/public-referents.e2e.ts
@@ -68,6 +68,35 @@ test.describe("public referents search", () => {
 		}
 	});
 
+	test("landing on /referents without a filter shows the empty-filter hint and no results", async ({
+		browser,
+	}) => {
+		const anonCtx = await browser.newContext({ storageState: undefined });
+		try {
+			const page = await anonCtx.newPage();
+			await page.goto("/referents");
+			await expect(
+				page.getByText(/remplissez au moins un filtre/i),
+			).toBeVisible();
+			await expect(page.getByText("E2E Référent Paris")).not.toBeVisible();
+		} finally {
+			await anonCtx.close();
+		}
+	});
+
+	test("/referents shows the public help banner", async ({ browser }) => {
+		const anonCtx = await browser.newContext({ storageState: undefined });
+		try {
+			const page = await anonCtx.newPage();
+			await page.goto("/referents");
+			await expect(
+				page.getByRole("region", { name: /ressources et aide/i }),
+			).toBeVisible();
+		} finally {
+			await anonCtx.close();
+		}
+	});
+
 	test("search by region filters the results", async ({ browser }) => {
 		const anonCtx = await browser.newContext({ storageState: undefined });
 		try {
@@ -120,6 +149,8 @@ test.describe("public referents search", () => {
 		try {
 			const page = await anonCtx.newPage();
 			await page.goto("/referents");
+			await page.getByLabel("Région").selectOption("11");
+			await page.getByRole("button", { name: /^rechercher$/i }).click();
 			await expect(page.getByText("E2E Référent Paris")).toBeVisible();
 			await expect(page.getByText("e2e-paris@dreets.test")).not.toBeVisible();
 			await expect(
@@ -137,6 +168,8 @@ test.describe("public referents search", () => {
 		try {
 			const page = await anonCtx.newPage();
 			await page.goto("/referents");
+			await page.getByLabel("Région").selectOption("11");
+			await page.getByRole("button", { name: /^rechercher$/i }).click();
 
 			const row = page.locator("li", { hasText: "E2E Référent Paris" });
 			await row.getByRole("link", { name: /voir le contact/i }).click();
diff --git a/packages/app/src/modules/admin/AdminNavigation.tsx b/packages/app/src/modules/admin/AdminNavigation.tsx
@@ -5,6 +5,7 @@ import { usePathname } from "next/navigation";
 
 const adminLinks = [
 	{ href: "/admin", label: "Accueil" },
+	{ href: "/admin/declarations", label: "Déclarations" },
 	{ href: "/admin/impersonate", label: "Mimoquer un Siren" },
 	{ href: "/admin/liste-referents", label: "Référents" },
 	{ href: "/admin/parametres", label: "Paramètres" },
diff --git a/packages/app/src/modules/admin/__tests__/AdminNavigation.test.tsx b/packages/app/src/modules/admin/__tests__/AdminNavigation.test.tsx
@@ -19,6 +19,9 @@ describe("AdminNavigation", () => {
 	it("renders all admin links", () => {
 		render(<AdminNavigation />);
 		expect(screen.getByRole("link", { name: "Accueil" })).toBeInTheDocument();
+		expect(
+			screen.getByRole("link", { name: "Déclarations" }),
+		).toBeInTheDocument();
 		expect(
 			screen.getByRole("link", { name: "Mimoquer un Siren" }),
 		).toBeInTheDocument();
@@ -61,4 +64,28 @@ describe("AdminNavigation", () => {
 			"aria-current",
 		);
 	});
+
+	it("marks /admin/declarations as active — and not Accueil", () => {
+		(usePathname as Mock).mockReturnValue("/admin/declarations");
+		render(<AdminNavigation />);
+		expect(screen.getByRole("link", { name: "Déclarations" })).toHaveAttribute(
+			"aria-current",
+			"page",
+		);
+		expect(screen.getByRole("link", { name: "Accueil" })).not.toHaveAttribute(
+			"aria-current",
+		);
+	});
+
+	it("marks /admin/declarations/<id> as active on the Déclarations link", () => {
+		(usePathname as Mock).mockReturnValue("/admin/declarations/abc123");
+		render(<AdminNavigation />);
+		expect(screen.getByRole("link", { name: "Déclarations" })).toHaveAttribute(
+			"aria-current",
+			"page",
+		);
+		expect(screen.getByRole("link", { name: "Accueil" })).not.toHaveAttribute(
+			"aria-current",
+		);
+	});
 });
diff --git a/packages/app/src/modules/admin/declarations/AdminDeclarationsPage.tsx b/packages/app/src/modules/admin/declarations/AdminDeclarationsPage.tsx
@@ -22,11 +22,6 @@ function DeclarationsContent() {
 		dateFrom: searchParams.get("dateFrom") ?? undefined,
 		dateTo: searchParams.get("dateTo") ?? undefined,
 		status: (searchParams.get("status") as "draft" | "submitted") || undefined,
-		index: searchParams.get("index")
-			? Number(searchParams.get("index"))
-			: undefined,
-		indexOperator:
-			(searchParams.get("indexOperator") as "gt" | "lt" | "eq") || undefined,
 		page: Number(searchParams.get("page") ?? "1"),
 		pageSize: Number(searchParams.get("pageSize") ?? String(DEFAULT_PAGE_SIZE)),
 		sortBy: (searchParams.get("sortBy") as SortColumn) ?? "createdAt",
diff --git a/packages/app/src/modules/admin/declarations/SearchForm.tsx b/packages/app/src/modules/admin/declarations/SearchForm.tsx
@@ -23,9 +23,6 @@ export function SearchForm() {
 				dateTo: searchParams.get("dateTo") ?? "",
 				status:
 					(searchParams.get("status") as "" | "draft" | "submitted") ?? "",
-				index: searchParams.get("index") ?? "",
-				indexOperator:
-					(searchParams.get("indexOperator") as "" | "gt" | "lt" | "eq") ?? "",
 			},
 		},
 	);
@@ -52,8 +49,6 @@ export function SearchForm() {
 			dateFrom: "",
 			dateTo: "",
 			status: "",
-			index: "",
-			indexOperator: "",
 		});
 		router.push("/admin/declarations");
 	}, [reset, router]);
@@ -144,42 +139,6 @@ export function SearchForm() {
 						</select>
 					</div>
 				</div>
-				<div className="fr-col-12 fr-col-md-3">
-					<div className="fr-grid-row fr-grid-row--gutters">
-						<div className="fr-col-6">
-							<div className="fr-select-group">
-								<label className="fr-label" htmlFor="search-index-op">
-									Index
-								</label>
-								<select
-									className="fr-select"
-									id="search-index-op"
-									{...register("indexOperator")}
-								>
-									<option value="">—</option>
-									<option value="eq">=</option>
-									<option value="gt">&ge;</option>
-									<option value="lt">&le;</option>
-								</select>
-							</div>
-						</div>
-						<div className="fr-col-6">
-							<div className="fr-input-group">
-								<label className="fr-label" htmlFor="search-index">
-									Valeur
-								</label>
-								<input
-									className="fr-input"
-									id="search-index"
-									max={100}
-									min={0}
-									type="number"
-									{...register("index")}
-								/>
-							</div>
-						</div>
-					</div>
-				</div>
 			</div>
 			<div className="fr-grid-row fr-grid-row--right fr-mt-2w">
 				<ul className="fr-btns-group fr-btns-group--inline">
diff --git a/packages/app/src/modules/admin/declarations/__tests__/SearchForm.test.tsx b/packages/app/src/modules/admin/declarations/__tests__/SearchForm.test.tsx
@@ -20,7 +20,7 @@ vi.mock("next/navigation", async () => {
 import { SearchForm } from "../SearchForm";
 
 describe("SearchForm", () => {
-	it("renders all search fields", () => {
+	it("renders all search fields and omits the removed Index / Valeur pair", () => {
 		render(<SearchForm />);
 
 		expect(screen.getByLabelText("SIREN / Nom entreprise")).toBeInTheDocument();
@@ -29,8 +29,10 @@ describe("SearchForm", () => {
 		expect(screen.getByLabelText("Date de dépôt (du)")).toBeInTheDocument();
 		expect(screen.getByLabelText("Date de dépôt (au)")).toBeInTheDocument();
 		expect(screen.getByLabelText("Statut")).toBeInTheDocument();
-		expect(screen.getByLabelText("Index")).toBeInTheDocument();
-		expect(screen.getByLabelText("Valeur")).toBeInTheDocument();
+		// Regression guard for #3274 — keep these negative assertions next to
+		// their positive counterparts so a future reintroduction is caught here.
+		expect(screen.queryByLabelText("Index")).not.toBeInTheDocument();
+		expect(screen.queryByLabelText("Valeur")).not.toBeInTheDocument();
 	});
 
 	it("renders search and reset buttons", () => {
diff --git a/packages/app/src/modules/admin/declarations/__tests__/schemas.test.ts b/packages/app/src/modules/admin/declarations/__tests__/schemas.test.ts
@@ -20,8 +20,6 @@ describe("searchDeclarationsSchema", () => {
 			year: "2024",
 			dateFrom: "2024-01-01",
 			dateTo: "2024-12-31",
-			index: "75",
-			indexOperator: "gt",
 			status: "submitted",
 			page: "2",
 			pageSize: "50",
@@ -35,8 +33,6 @@ describe("searchDeclarationsSchema", () => {
 			year: 2024,
 			dateFrom: "2024-01-01",
 			dateTo: "2024-12-31",
-			index: 75,
-			indexOperator: "gt",
 			status: "submitted",
 			page: 2,
 			pageSize: 50,
diff --git a/packages/app/src/modules/admin/declarations/schemas.ts b/packages/app/src/modules/admin/declarations/schemas.ts
@@ -11,10 +11,6 @@ export const SORT_COLUMNS = [
 
 export type SortColumn = (typeof SORT_COLUMNS)[number];
 
-export const INDEX_OPERATORS = ["gt", "lt", "eq"] as const;
-
-export type IndexOperator = (typeof INDEX_OPERATORS)[number];
-
 export const DEFAULT_PAGE_SIZE = 20;
 
 export const searchDeclarationsSchema = z.object({
@@ -23,8 +19,6 @@ export const searchDeclarationsSchema = z.object({
 	year: z.coerce.number().int().min(2018).max(2100).optional(),
 	dateFrom: z.string().date().optional().or(z.literal("")),
 	dateTo: z.string().date().optional().or(z.literal("")),
-	index: z.coerce.number().int().min(0).max(100).optional(),
-	indexOperator: z.enum(INDEX_OPERATORS).optional(),
 	status: z.enum(["draft", "submitted"]).optional(),
 	page: z.coerce.number().int().min(1).default(1),
 	pageSize: z.coerce.number().int().min(10).max(100).default(DEFAULT_PAGE_SIZE),
@@ -43,8 +37,6 @@ export const searchDeclarationsFormSchema = z.object({
 	year: z.string().optional(),
 	dateFrom: z.string().optional(),
 	dateTo: z.string().optional(),
-	index: z.string().optional(),
-	indexOperator: z.enum(["", ...INDEX_OPERATORS]).optional(),
 	status: z.enum(["", "draft", "submitted"]).optional(),
 });
 
diff --git a/packages/app/src/modules/layout/PublicChrome.tsx b/packages/app/src/modules/layout/PublicChrome.tsx
@@ -0,0 +1,26 @@
+"use client";
+
+import { usePathname } from "next/navigation";
+
+import { Footer } from "./Footer";
+import { ResourceBanner } from "./ResourceBanner";
+
+/**
+ * Renders the public help banner + footer on every route except the backoffice.
+ * Admin pages (`/admin/**`) get a stripped-down chrome so the sidebar + admin
+ * content fill the viewport without competing with public navigation.
+ */
+export function PublicChrome() {
+	const pathname = usePathname();
+	// Match the `/admin` segment boundary so hypothetical sibling routes like
+	// `/administrator` or `/admin-tools` keep the public chrome.
+	if (pathname === "/admin" || pathname?.startsWith("/admin/")) {
+		return null;
+	}
+	return (
+		<>
+			<ResourceBanner />
+			<Footer />
+		</>
+	);
+}
diff --git a/packages/app/src/modules/layout/__tests__/PublicChrome.test.tsx b/packages/app/src/modules/layout/__tests__/PublicChrome.test.tsx
@@ -0,0 +1,53 @@
+import { render, screen } from "@testing-library/react";
+import { usePathname } from "next/navigation";
+import { beforeEach, describe, expect, it, type Mock } from "vitest";
+
+import { PublicChrome } from "../PublicChrome";
+
+// Renders real Footer + ResourceBanner; only their external deps
+// (next/link, next/image, next/navigation) are mocked globally in test/setup.ts,
+// so a regression inside either landmark would fail this file.
+
+describe("PublicChrome", () => {
+	beforeEach(() => {
+		(usePathname as Mock).mockReturnValue("/");
+	});
+
+	it("renders ResourceBanner + Footer on public routes", () => {
+		render(<PublicChrome />);
+		expect(
+			screen.getByRole("region", { name: /ressources et aide/i }),
+		).toBeInTheDocument();
+		expect(screen.getByRole("contentinfo")).toBeInTheDocument();
+	});
+
+	it("renders nothing on /admin", () => {
+		(usePathname as Mock).mockReturnValue("/admin");
+		const { container } = render(<PublicChrome />);
+		expect(container).toBeEmptyDOMElement();
+	});
+
+	it("renders nothing on nested /admin/* routes", () => {
+		(usePathname as Mock).mockReturnValue("/admin/declarations");
+		const { container } = render(<PublicChrome />);
+		expect(container).toBeEmptyDOMElement();
+	});
+
+	it("renders chrome on non-admin nested routes", () => {
+		(usePathname as Mock).mockReturnValue("/mon-espace/declarations");
+		render(<PublicChrome />);
+		expect(
+			screen.getByRole("region", { name: /ressources et aide/i }),
+		).toBeInTheDocument();
+		expect(screen.getByRole("contentinfo")).toBeInTheDocument();
+	});
+
+	it("renders chrome on sibling routes whose name merely starts with 'admin'", () => {
+		(usePathname as Mock).mockReturnValue("/administrator");
+		render(<PublicChrome />);
+		expect(
+			screen.getByRole("region", { name: /ressources et aide/i }),
+		).toBeInTheDocument();
+		expect(screen.getByRole("contentinfo")).toBeInTheDocument();
+	});
+});
diff --git a/packages/app/src/modules/layout/index.ts b/packages/app/src/modules/layout/index.ts
@@ -2,6 +2,7 @@ export { Breadcrumb } from "./Breadcrumb";
 export { Footer } from "./Footer";
 export { Header } from "./Header";
 export { ImpersonateBanner } from "./ImpersonateBanner";
+export { PublicChrome } from "./PublicChrome";
 export { ResourceBanner } from "./ResourceBanner";
 export { DsfrPictogram } from "./shared/DsfrPictogram";
 export { NewTabNotice } from "./shared/NewTabNotice";
diff --git a/packages/app/src/modules/referents/PublicReferentsPage.tsx b/packages/app/src/modules/referents/PublicReferentsPage.tsx
diff --git a/packages/app/src/modules/referents/__tests__/PublicReferentDetail.test.tsx b/packages/app/src/modules/referents/__tests__/PublicReferentDetail.test.tsx
diff --git a/packages/app/src/modules/referents/__tests__/PublicReferentsPage.test.tsx b/packages/app/src/modules/referents/__tests__/PublicReferentsPage.test.tsx
diff --git a/packages/app/src/server/api/routers/adminDeclarations.ts b/packages/app/src/server/api/routers/adminDeclarations.ts
