feat(trials): make result creation rule-window aware

CHANGELOG.md

@@ -23,6 +23,7 @@ This project uses a user-facing changelog format.
 
 - Viimeisen koetuloksen poistaminen säilyttää ajokoetapahtuman tyhjänä, kunnes ylläpitäjä poistaa tapahtuman erikseen.
 - Uuden ajokoetapahtuman luomisen jälkeen siirrytään suoraan lisäämään tapahtuman ensimmäistä koetulosta.
+- Ajokoetuloksen lisäyslomake näyttää 1.8.2023 alkaen käytössä olevan sääntökauden mukaiset kentät. Vanhemmilla tai tunnistamattomilla sääntökausilla kaikki yhteensopivuuskentät säilyvät näkyvissä varoituksen kanssa.
 
 ### Fixed
 

apps/web/components/admin/trials/__tests__/admin-trial-event-edit-dialog.test.tsx

@@ -51,6 +51,7 @@ vi.mock("@/components/ui/input", () => ({
 
 const event1 = {
   trialEventId: "event-1",
+  trialRuleWindowId: "trw_post_20230801",
   eventDate: "2026-04-14",
   eventPlace: "Helsinki",
   eventName: "Kevatkoe",

apps/web/components/admin/trials/__tests__/admin-trial-selected-event-panel.test.tsx

@@ -94,6 +94,7 @@ describe("AdminTrialSelectedEventPanel", () => {
       React.createElement(AdminTrialSelectedEventPanel, {
         selectedEvent: {
           trialEventId: "event-1",
+          trialRuleWindowId: "trw_post_20230801",
           eventDate: "2026-04-14",
           eventPlace: "Helsinki",
           eventName: "Kevatkoe",
@@ -143,6 +144,7 @@ describe("AdminTrialSelectedEventPanel", () => {
       React.createElement(AdminTrialSelectedEventPanel, {
         selectedEvent: {
           trialEventId: "event-1",
+          trialRuleWindowId: null,
           eventDate: "2026-04-14",
           eventPlace: "Helsinki",
           eventName: null,
@@ -175,6 +177,7 @@ describe("AdminTrialSelectedEventPanel", () => {
       React.createElement(AdminTrialSelectedEventPanel, {
         selectedEvent: {
           trialEventId: "event-1",
+          trialRuleWindowId: null,
           eventDate: "2026-04-14",
           eventPlace: "Helsinki",
           eventName: null,

apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx

@@ -19,6 +19,7 @@ import {
   getAdminTrialEventHref,
   getAdminTrialsHref,
   getNextEraNumber,
+  resolveResultCreateFieldSet,
   toCreateAdminTrialEntryRequest,
 } from "@/lib/admin/trials";
 import {
@@ -113,9 +114,13 @@ function ResultCreateForm({
   const { t } = useI18n();
   const router = useRouter();
   const mutation = useCreateAdminTrialEntryMutation();
+  const fieldSet = React.useMemo(
+    () => resolveResultCreateFieldSet(event.trialRuleWindowId),
+    [event.trialRuleWindowId],
+  );
   const initial = React.useMemo(
-    () => createAdminTrialEntryCreateDraft(event),
-    [event],
+    () => createAdminTrialEntryCreateDraft(event, fieldSet),
+    [event, fieldSet],
   );
   const [draft, setDraft] = React.useState(initial);
   const [errorText, setErrorText] = React.useState<string | null>(null);
@@ -164,7 +169,7 @@ function ResultCreateForm({
       await mutation.mutateAsync(parsed.request);
       toast.success(t("admin.trials.manage.resultCreate.success"));
       if (intent === "another")
-        setDraft(createAdminTrialEntryCreateDraft(event));
+        setDraft(createAdminTrialEntryCreateDraft(event, fieldSet));
       else router.replace(workspaceHref);
     } catch (error) {
       const code =
@@ -215,6 +220,14 @@ function ResultCreateForm({
           {formatDateForFinland(event.eventDate)} • {event.eventPlace} • SKL{" "}
           {event.sklKoeId}
         </p>
+        <p className="text-sm text-muted-foreground">
+          {t(fieldSet.rulePeriodMessageKey)}
+        </p>
+        {!fieldSet.verified ? (
+          <p className="text-sm text-amber-700" role="alert">
+            {t("admin.trials.manage.resultCreate.ruleWindowWarning")}
+          </p>
+        ) : null}
       </div>
       <Card>
         <CardContent className="space-y-5 p-5">
@@ -245,6 +258,8 @@ function ResultCreateForm({
                 entry: update(current.entry),
               }))
             }
+            visibleFields={fieldSet.entryFields}
+            yvaLabel={fieldSet.yvaLabels?.entry}
           />
           <EraSection
             eras={draft.eras}
@@ -259,6 +274,8 @@ function ResultCreateForm({
                 ),
               }))
             }
+            visibleFields={fieldSet.eraFields}
+            yvaLabel={fieldSet.yvaLabels?.era}
           />
           <LisatiedotMatrix
             eras={draft.eras}

apps/web/components/admin/trials/internal/__tests__/entry-meta-section.test.tsx

@@ -2,6 +2,7 @@ import React from "react";
 import { renderToStaticMarkup } from "react-dom/server";
 import { describe, expect, it, vi } from "vitest";
 import type { EntryDraft } from "@/lib/admin/trials/entry-edit-dialog-model";
+import { resolveResultCreateFieldSet } from "@/lib/admin/trials/result-create-field-registry";
 import { EntryMetaSection } from "../entry-meta-section";
 
 const entryDraft: EntryDraft = {
@@ -62,6 +63,7 @@ describe("EntryMetaSection", () => {
     expect(html).toContain("Haukku");
     expect(html).toContain("Ajotaito / yleisvaikutelma");
     expect(html).toContain("Muut");
+    expect(html.match(/<h5/g)).toHaveLength(4);
     expect(html).toContain("Ansiopisteet yhteensä");
     expect(html).toContain("Metsästysinto");
     expect(html).toContain("Tie ja estetyöskentely");
@@ -72,4 +74,46 @@ describe("EntryMetaSection", () => {
     expect(html).toContain("Ryhmätuomari");
     expect(html).toContain("Palkintotuomari");
   });
+
+  it("uses create-only field visibility without changing the default edit view", () => {
+    const html = renderToStaticMarkup(
+      React.createElement(EntryMetaSection, {
+        entryDraft,
+        isPending: false,
+        onChange: vi.fn(),
+        visibleFields:
+          resolveResultCreateFieldSet("trw_post_20230801").entryFields,
+        yvaLabel:
+          resolveResultCreateFieldSet("trw_post_20230801").yvaLabels?.entry,
+      }),
+    );
+
+    expect(html).not.toContain("Tie ja estetyöskentely");
+    expect(html).not.toContain("Metsästysinto");
+    expect(html).not.toContain("Ajotaito / yleisvaikutelma");
+    expect(html.match(/<h5/g)).toHaveLength(4);
+    expect(html).toContain(">Ajo</h5>");
+    expect(html).toContain(">Haku</h5>");
+    expect(html).toContain(">Haukku</h5>");
+    expect(html).toContain(">Muut</h5>");
+    expect(html).toContain("Ajotaito");
+    expect(html).toContain("Ansiopisteet yhteensä");
+  });
+
+  it("keeps the generic label and all fields in compatibility fallback", () => {
+    const fieldSet = resolveResultCreateFieldSet(null);
+    const html = renderToStaticMarkup(
+      React.createElement(EntryMetaSection, {
+        entryDraft,
+        isPending: false,
+        onChange: vi.fn(),
+        visibleFields: fieldSet.entryFields,
+        yvaLabel: fieldSet.yvaLabels?.entry,
+      }),
+    );
+
+    expect(html).toContain("Ajotaito / yleisvaikutelma");
+    expect(html).toContain("Tie ja estetyöskentely");
+    expect(html).toContain("Metsästysinto");
+  });
 });

apps/web/components/admin/trials/internal/__tests__/era-section.test.tsx

@@ -0,0 +1,45 @@
+import React from "react";
+import { renderToStaticMarkup } from "react-dom/server";
+import { describe, expect, it, vi } from "vitest";
+import { createEmptyEraDraft } from "@/lib/admin/trials/entry-edit-dialog-model";
+import { resolveResultCreateFieldSet } from "@/lib/admin/trials/result-create-field-registry";
+import { EraSection } from "../era-section";
+
+describe("EraSection", () => {
+  it("uses the current-era Ajotaito label only in verified creation", () => {
+    const props = {
+      eras: [createEmptyEraDraft(1)],
+      isPending: false,
+      onAddEra: vi.fn(),
+      onRemoveEra: vi.fn(),
+      onChangeEraField: vi.fn(),
+    };
+    const verifiedFieldSet = resolveResultCreateFieldSet("trw_post_20230801");
+
+    const createHtml = renderToStaticMarkup(
+      React.createElement(EraSection, {
+        ...props,
+        visibleFields: verifiedFieldSet.eraFields,
+        yvaLabel: verifiedFieldSet.yvaLabels?.era,
+      }),
+    );
+    const editHtml = renderToStaticMarkup(
+      React.createElement(EraSection, props),
+    );
+    const fallbackFieldSet = resolveResultCreateFieldSet(null);
+    const fallbackHtml = renderToStaticMarkup(
+      React.createElement(EraSection, {
+        ...props,
+        visibleFields: fallbackFieldSet.eraFields,
+        yvaLabel: fallbackFieldSet.yvaLabels?.era,
+      }),
+    );
+
+    expect(createHtml).toContain("ajotaito");
+    expect(createHtml).not.toContain("ajotaito / yleisvaikutelma");
+    expect(editHtml).toContain("ajotaito / yleisvaikutelma");
+    expect(fallbackHtml).toContain("ajotaito / yleisvaikutelma");
+    expect(fallbackHtml).toContain("tie ja estetyöskentely");
+    expect(fallbackHtml).toContain("metsästysinto");
+  });
+});

apps/web/components/admin/trials/internal/__tests__/lisatiedot-matrix.test.tsx

@@ -21,6 +21,17 @@ describe("LisatiedotMatrix", () => {
         sortOrder: 10,
         eraValues: { 1: "1", 2: "" },
       },
+      {
+        koodi: "17",
+        osa: "",
+        nimi: "Lämpötila °C",
+        jarjestys: 17,
+        group: "olosuhteet",
+        label: "Lämpötila °C",
+        inputKind: "integer",
+        sortOrder: 17,
+        eraValues: { 1: "5", 2: "" },
+      },
       {
         koodi: "19",
         osa: "",
@@ -73,5 +84,52 @@ describe("LisatiedotMatrix", () => {
     expect(html).toContain("90 legacy");
     expect(html).toContain("Legacy field");
     expect(html).toContain('inputMode="text"');
+    expect(html).toContain("<select");
+    expect(html).not.toContain('type="checkbox"');
+    expect(html).not.toContain('inputMode="numeric"');
+  });
+
+  it("uses semantic controls only for explicitly configured rows", () => {
+    const rows: LisatietoRowDraft[] = [
+      {
+        koodi: "10",
+        osa: "",
+        nimi: "Vaativat olosuhteet",
+        jarjestys: 10,
+        group: "olosuhteet",
+        label: "Vaativat olosuhteet",
+        inputKind: "marker",
+        valueHint: "marker",
+        useSemanticControl: true,
+        sortOrder: 10,
+        eraValues: { 1: "" },
+      },
+      {
+        koodi: "17",
+        osa: "",
+        nimi: "Lämpötila °C",
+        jarjestys: 17,
+        group: "olosuhteet",
+        label: "Lämpötila °C",
+        inputKind: "integer",
+        valueHint: "integer",
+        useSemanticControl: true,
+        sortOrder: 17,
+        eraValues: { 1: "" },
+      },
+    ];
+
+    const html = renderToStaticMarkup(
+      React.createElement(LisatiedotMatrix, {
+        eras: [createEmptyEraDraft(1)],
+        rows,
+        isPending: false,
+        onChangeCell: vi.fn(),
+      }),
+    );
+
+    expect(html).toContain('type="checkbox"');
+    expect(html).not.toContain("<select");
+    expect(html).toContain('inputMode="numeric"');
   });
 });