refactor(admin): deduce active campaign year from campaignStartDate (#3263, #3241)

Author: LucasCharrier

packages/app/src/e2e/admin.e2e.ts

@@ -29,13 +29,10 @@ test("admin user can access /admin/parametres and sees settings page", async ({
 			level: 1,
 		}),
 	).toBeVisible();
-	await expect(
-		page.getByRole("heading", { name: "Année de campagne active", level: 2 }),
-	).toBeVisible();
 	await expect(
 		page.getByRole("heading", { name: "Échéances de campagne", level: 2 }),
 	).toBeVisible();
 	await expect(
-		page.getByRole("spinbutton", { name: /année de campagne active/i }),
-	).toBeVisible();
+		page.getByRole("heading", { name: "Année de campagne active", level: 2 }),
+	).not.toBeVisible();
 });

packages/app/src/modules/admin/settings/ActiveYearForm.tsx

@@ -1,18 +1,16 @@
 import { getCurrentYear } from "~/modules/domain";
 import { api, HydrateClient } from "~/trpc/server";
 
-import { ActiveYearForm } from "./ActiveYearForm";
 import { CampaignDeadlinesForm } from "./CampaignDeadlinesForm";
 
 /**
- * Backoffice page to edit global platform variables: active campaign year
- * and per-year campaign deadlines (GIP publication, campaign start, CSE and
- * declaration deadlines).
+ * Backoffice page to edit per-year campaign deadlines (GIP publication,
+ * campaign start, CSE and declaration deadlines). The active campaign year is
+ * now deduced from the `campaignStartDate` field and no longer edited here.
  */
 export async function AdminSettingsPage() {
 	const overview = await api.adminSettings.getOverview();
-	const fallbackYear = getCurrentYear();
-	const initialYear = overview.activeCampaignYear ?? fallbackYear;
+	const initialYear = overview.configuredYears.at(-1) ?? getCurrentYear();
 
 	return (
 		<HydrateClient>
@@ -22,17 +20,7 @@ export async function AdminSettingsPage() {
 				les campagnes de déclaration.
 			</p>
 
-			<section aria-labelledby="active-year-heading" className="fr-mt-4w">
-				<h2 className="fr-h3" id="active-year-heading">
-					Année de campagne active
-				</h2>
-				<ActiveYearForm
-					fallbackYear={fallbackYear}
-					initialActiveYear={overview.activeCampaignYear}
-				/>
-			</section>
-
-			<section aria-labelledby="deadlines-heading" className="fr-mt-6w">
+			<section aria-labelledby="deadlines-heading" className="fr-mt-4w">
 				<h2 className="fr-h3" id="deadlines-heading">
 					Échéances de campagne
 				</h2>

packages/app/src/modules/admin/settings/AdminSettingsPage.tsx

@@ -13,18 +13,6 @@ vi.mock("~/trpc/server", () => ({
 	HydrateClient: ({ children }: { children: React.ReactNode }) => children,
 }));
 
-vi.mock("../ActiveYearForm", () => ({
-	ActiveYearForm: (props: {
-		initialActiveYear: number | null;
-		fallbackYear: number;
-	}) =>
-		React.createElement("div", {
-			"data-testid": "active-year-form",
-			"data-initial": props.initialActiveYear ?? "",
-			"data-fallback": props.fallbackYear,
-		}),
-}));
-
 vi.mock("../CampaignDeadlinesForm", () => ({
 	CampaignDeadlinesForm: (props: {
 		initialYear: number;
@@ -40,9 +28,8 @@ vi.mock("../CampaignDeadlinesForm", () => ({
 import { AdminSettingsPage } from "../AdminSettingsPage";
 
 describe("AdminSettingsPage", () => {
-	it("renders both sections and passes overview data to the forms", async () => {
+	it("renders the deadlines section and passes configured years to the form", async () => {
 		getOverviewMock.mockResolvedValue({
-			activeCampaignYear: 2027,
 			configuredYears: [2025, 2026, 2027],
 		});
 		render(await AdminSettingsPage());
@@ -52,31 +39,25 @@ describe("AdminSettingsPage", () => {
 				name: /paramètres de la plateforme/i,
 			}),
 		).toBeInTheDocument();
-		expect(
-			screen.getByRole("heading", {
-				level: 2,
-				name: /année de campagne active/i,
-			}),
-		).toBeInTheDocument();
 		expect(
 			screen.getByRole("heading", { level: 2, name: /échéances de campagne/i }),
 		).toBeInTheDocument();
-		const active = screen.getByTestId("active-year-form");
-		expect(active.getAttribute("data-initial")).toBe("2027");
+		expect(
+			screen.queryByRole("heading", { name: /année de campagne active/i }),
+		).not.toBeInTheDocument();
 		const deadlines = screen.getByTestId("campaign-deadlines-form");
 		expect(deadlines.getAttribute("data-initial-year")).toBe("2027");
 		expect(deadlines.getAttribute("data-years")).toBe("2025,2026,2027");
 	});
 
-	it("falls back to the current calendar year when none is configured", async () => {
+	it("falls back to the current calendar year when no year is configured", async () => {
 		getOverviewMock.mockResolvedValue({
-			activeCampaignYear: null,
 			configuredYears: [],
 		});
 		render(await AdminSettingsPage());
-		const active = screen.getByTestId("active-year-form");
-		expect(active.getAttribute("data-initial")).toBe("");
-		const fallback = Number(active.getAttribute("data-fallback"));
-		expect(fallback).toBe(new Date().getFullYear());
+		const deadlines = screen.getByTestId("campaign-deadlines-form");
+		expect(deadlines.getAttribute("data-initial-year")).toBe(
+			String(new Date().getFullYear()),
+		);
 	});
 });

packages/app/src/modules/admin/settings/__tests__/ActiveYearForm.test.tsx

@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
 
-import { campaignDeadlinesFormSchema, setActiveYearSchema } from "../schemas";
+import { campaignDeadlinesFormSchema } from "../schemas";
 
 const validDates = {
 	decl1ModificationDeadline: "2026-06-01",
@@ -68,27 +68,3 @@ describe("campaignDeadlinesFormSchema", () => {
 		expect(result.success).toBe(false);
 	});
 });
-
-describe("setActiveYearSchema", () => {
-	it("accepts a valid year", () => {
-		const result = setActiveYearSchema.safeParse({ activeCampaignYear: 2026 });
-		expect(result.success).toBe(true);
-	});
-
-	it("rejects years below FIRST_DECLARATION_YEAR", () => {
-		const result = setActiveYearSchema.safeParse({ activeCampaignYear: 1999 });
-		expect(result.success).toBe(false);
-	});
-
-	it("rejects years above 2100", () => {
-		const result = setActiveYearSchema.safeParse({ activeCampaignYear: 2200 });
-		expect(result.success).toBe(false);
-	});
-
-	it("rejects non-integer years", () => {
-		const result = setActiveYearSchema.safeParse({
-			activeCampaignYear: 2026.5,
-		});
-		expect(result.success).toBe(false);
-	});
-});

packages/app/src/modules/admin/settings/__tests__/AdminSettingsPage.test.tsx

@@ -5,6 +5,4 @@ export {
 	campaignDeadlinesFormSchema,
 	campaignYearSchema,
 	getCampaignDeadlinesByYearSchema,
-	type SetActiveYearInput,
-	setActiveYearSchema,
 } from "./schemas";

packages/app/src/modules/admin/settings/__tests__/schemas.test.ts

@@ -53,12 +53,6 @@ export type CampaignDeadlinesFormValues = z.output<
 	typeof campaignDeadlinesFormSchema
 >;
 
-export const setActiveYearSchema = z.object({
-	activeCampaignYear: campaignYearSchema,
-});
-
-export type SetActiveYearInput = z.infer<typeof setActiveYearSchema>;
-
 export const getCampaignDeadlinesByYearSchema = z.object({
 	year: campaignYearSchema,
 });