From ed484380ac8ba0cb6d20dc93719fb7de5f226dd6 Mon Sep 17 00:00:00 2001
From: Aki Kuivas <91662678+asku1990@users.noreply.github.com>
Date: Thu, 23 Jul 2026 15:54:50 +0300
Subject: [PATCH 1/3] feat(trials): redesign result creation workspace
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  Organize manual result creation into collapsible cards following the
  official trial PDF domain structure without copying its matrix layout.

  Add a searchable, grouped Lisätiedot workspace with responsive desktop
  and mobile editors, accessible focus handling, localized controls, and
  stable reset behavior. Keep R3A field visibility, draft ownership,
  serialization, validation, mutations, navigation protection, and
  editing
  behavior unchanged.

  Files:
  - CHANGELOG.md
  -
    apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx
  -
    apps/web/components/admin/trials/internal/__tests__/entry-meta-section.test.tsx
  -
    apps/web/components/admin/trials/internal/__tests__/era-section.test.tsx
  -
    apps/web/components/admin/trials/internal/__tests__/result-create-card.test.tsx
  -
    apps/web/components/admin/trials/internal/entry-meta-basic-fields.tsx
  - apps/web/components/admin/trials/internal/entry-meta-field.tsx
  -
    apps/web/components/admin/trials/internal/entry-meta-judge-fields.tsx
  - apps/web/components/admin/trials/internal/entry-meta-loss-fields.tsx
  -
    apps/web/components/admin/trials/internal/entry-meta-result-fields.tsx
  -
    apps/web/components/admin/trials/internal/entry-meta-score-fields.tsx
  - apps/web/components/admin/trials/internal/entry-meta-section.tsx
  - apps/web/components/admin/trials/internal/era-section.tsx
  - apps/web/components/admin/trials/internal/lisatiedot-workspace.tsx
  - apps/web/components/admin/trials/internal/result-create-card.tsx
  - apps/web/components/ui/sheet.tsx
  -
    apps/web/hooks/admin/trials/manage/__tests__/use-result-create-workspace-mobile.test.ts
  -
    apps/web/hooks/admin/trials/manage/use-result-create-workspace-mobile.ts
  -
    apps/web/lib/admin/trials/__tests__/lisatiedot-workspace-state.test.ts
  -
    apps/web/lib/admin/trials/__tests__/result-create-field-registry.test.ts
  - apps/web/lib/admin/trials/entry-edit-config.ts
  - apps/web/lib/admin/trials/lisatiedot-workspace-state.ts
  - apps/web/lib/admin/trials/result-create-field-registry.ts
  - apps/web/lib/i18n/messages/admin/trials/manage.ts
  - docs/features/admin-trial-management.md

  Ref BEJ-103
---
 CHANGELOG.md                                  |   1 +
 .../admin-trial-entry-create-page-client.tsx  | 331 ++++++++++++--
 .../__tests__/entry-meta-section.test.tsx     |  51 +++
 .../internal/__tests__/era-section.test.tsx   |  41 ++
 .../__tests__/result-create-card.test.tsx     |  37 ++
 .../internal/entry-meta-basic-fields.tsx      | 104 +++++
 .../trials/internal/entry-meta-field.tsx      |  39 ++
 .../internal/entry-meta-judge-fields.tsx      |  58 +++
 .../internal/entry-meta-loss-fields.tsx       |  53 +++
 .../internal/entry-meta-result-fields.tsx     | 114 +++++
 .../internal/entry-meta-score-fields.tsx      | 147 +++++++
 .../trials/internal/entry-meta-section.tsx    | 391 +++--------------
 .../admin/trials/internal/era-section.tsx     |  27 +-
 .../trials/internal/lisatiedot-workspace.tsx  | 407 ++++++++++++++++++
 .../trials/internal/result-create-card.tsx    |  53 +++
 apps/web/components/ui/sheet.tsx              |   4 +-
 ...use-result-create-workspace-mobile.test.ts | 108 +++++
 .../use-result-create-workspace-mobile.ts     |  20 +
 .../lisatiedot-workspace-state.test.ts        | 127 ++++++
 .../result-create-field-registry.test.ts      | 104 +++++
 .../web/lib/admin/trials/entry-edit-config.ts |  10 +
 .../trials/lisatiedot-workspace-state.ts      | 116 +++++
 .../trials/result-create-field-registry.ts    |  89 ++++
 .../lib/i18n/messages/admin/trials/manage.ts  |  52 +++
 docs/features/admin-trial-management.md       |  15 +
 25 files changed, 2118 insertions(+), 381 deletions(-)
 create mode 100644 apps/web/components/admin/trials/internal/__tests__/result-create-card.test.tsx
 create mode 100644 apps/web/components/admin/trials/internal/entry-meta-basic-fields.tsx
 create mode 100644 apps/web/components/admin/trials/internal/entry-meta-field.tsx
 create mode 100644 apps/web/components/admin/trials/internal/entry-meta-judge-fields.tsx
 create mode 100644 apps/web/components/admin/trials/internal/entry-meta-loss-fields.tsx
 create mode 100644 apps/web/components/admin/trials/internal/entry-meta-result-fields.tsx
 create mode 100644 apps/web/components/admin/trials/internal/entry-meta-score-fields.tsx
 create mode 100644 apps/web/components/admin/trials/internal/lisatiedot-workspace.tsx
 create mode 100644 apps/web/components/admin/trials/internal/result-create-card.tsx
 create mode 100644 apps/web/hooks/admin/trials/manage/__tests__/use-result-create-workspace-mobile.test.ts
 create mode 100644 apps/web/hooks/admin/trials/manage/use-result-create-workspace-mobile.ts
 create mode 100644 apps/web/lib/admin/trials/__tests__/lisatiedot-workspace-state.test.ts
 create mode 100644 apps/web/lib/admin/trials/lisatiedot-workspace-state.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 191007c0..56fc2658 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ This project uses a user-facing changelog format.
 
 ### Changed
 
+- Ajokoetuloksen lisäyslomakkeen avattavat kortit noudattavat virallisen pöytäkirjan aihealueita ilman pöytäkirjan taulukkoasettelun kopiointia. Lisätietoja voi hakea ja muokata pöytäkirjan mukaisessa ryhmäjärjestyksessä myös mobiilissa.
 - 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.
diff --git a/apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx b/apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx
index e9876c1a..8c46ddbb 100644
--- a/apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx
+++ b/apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx
@@ -28,9 +28,18 @@ import {
 } from "@/queries/admin/trials";
 import { EntryMetaSection } from "./internal/entry-meta-section";
 import { EraSection } from "./internal/era-section";
-import { LisatiedotMatrix } from "./internal/lisatiedot-matrix";
+import { LisatiedotWorkspace } from "./internal/lisatiedot-workspace";
+import { ResultCreateCard } from "./internal/result-create-card";
 
 type SaveIntent = "another" | "finish";
+type CardId =
+  | "basic"
+  | "time"
+  | "merit"
+  | "loss"
+  | "result"
+  | "judges"
+  | "additional";
 
 export function AdminTrialEntryCreatePageClient({
   trialEventId,
@@ -123,6 +132,10 @@ function ResultCreateForm({
     [event, fieldSet],
   );
   const [draft, setDraft] = React.useState(initial);
+  const [openCards, setOpenCards] = React.useState<ReadonlySet<CardId>>(
+    new Set(["basic"]),
+  );
+  const [workspaceResetKey, setWorkspaceResetKey] = React.useState(0);
   const [errorText, setErrorText] = React.useState<string | null>(null);
   const submittingRef = React.useRef(false);
   const dirty = !areAdminTrialEntryCreateDraftsEqual(initial, draft);
@@ -157,6 +170,17 @@ function ResultCreateForm({
     setErrorText(null);
     const parsed = toCreateAdminTrialEntryRequest(event.trialEventId, draft);
     if (!parsed.ok) {
+      setOpenCards(
+        (current) =>
+          new Set([
+            ...current,
+            parsed.section === "registration"
+              ? "basic"
+              : parsed.section === "eras"
+                ? "time"
+                : "result",
+          ]),
+      );
       setErrorText(
         t(
           `admin.trials.manage.resultCreate.validation.${parsed.section}` as never,
@@ -168,9 +192,11 @@ function ResultCreateForm({
     try {
       await mutation.mutateAsync(parsed.request);
       toast.success(t("admin.trials.manage.resultCreate.success"));
-      if (intent === "another")
+      if (intent === "another") {
         setDraft(createAdminTrialEntryCreateDraft(event, fieldSet));
-      else router.replace(workspaceHref);
+        setOpenCards(new Set(["basic"]));
+        setWorkspaceResetKey((current) => current + 1);
+      } else router.replace(workspaceHref);
     } catch (error) {
       const code =
         error instanceof AdminMutationError ? error.errorCode : undefined;
@@ -192,6 +218,7 @@ function ResultCreateForm({
           ? (error.details as AdminTrialEntryValidationIssue | undefined)
           : undefined;
       if (issue?.area === "additional_info" && issue.koodi) {
+        setOpenCards((current) => new Set([...current, "additional"]));
         const row = `${issue.koodi}${issue.osa ? issue.osa : ""}`;
         const issueKey =
           issue.reason === "invalid_lisatieto_order"
@@ -199,6 +226,18 @@ function ResultCreateForm({
             : "admin.trials.manage.resultCreate.error.additionalInfoRow";
         setErrorText(`${t(issueKey)}: ${row}.`);
       } else {
+        const errorCard: Partial<Record<string, CardId>> = {
+          INVALID_REGISTRATION_NUMBER: "basic",
+          TRIAL_ENTRY_REGISTRATION_CONFLICT: "basic",
+          INVALID_TRIAL_ENTRY: "result",
+          INVALID_TRIAL_ERAS: "time",
+          INVALID_TRIAL_ADDITIONAL_INFO: "additional",
+        };
+        if (code && errorCard[code]) {
+          setOpenCards(
+            (current) => new Set([...current, errorCard[code] as CardId]),
+          );
+        }
         setErrorText(
           t(
             `admin.trials.manage.resultCreate.error.${map[code ?? ""] ?? "generic"}` as never,
@@ -210,6 +249,50 @@ function ResultCreateForm({
     }
   }
 
+  function toggleCard(id: CardId) {
+    setOpenCards((current) => {
+      const next = new Set(current);
+      if (next.has(id)) next.delete(id);
+      else next.add(id);
+      return next;
+    });
+  }
+  const displaySummary = (...values: string[]) =>
+    values
+      .filter((value) => value.trim())
+      .slice(0, 3)
+      .join(" • ") || t("admin.trials.manage.resultCreate.summary.empty");
+  const entryGroups = Object.fromEntries(
+    fieldSet.presentationGroups.map((group) => [
+      group.id,
+      new Set(group.entryFields),
+    ]),
+  );
+  const eraGroups = Object.fromEntries(
+    fieldSet.presentationGroups.map((group) => [
+      group.id,
+      new Set(group.eraFields),
+    ]),
+  );
+  const changeEntry = (
+    update: (current: typeof draft.entry) => typeof draft.entry,
+  ) =>
+    setDraft((current) => ({
+      ...current,
+      entry: update(current.entry),
+    }));
+  const changeEra = (
+    era: number,
+    field: Exclude<keyof (typeof draft.eras)[number], "era">,
+    value: string,
+  ) =>
+    setDraft((current) => ({
+      ...current,
+      eras: current.eras.map((item) =>
+        item.era === era ? { ...item, [field]: value } : item,
+      ),
+    }));
+
   return (
     <div className="space-y-4">
       <div>
@@ -229,13 +312,27 @@ function ResultCreateForm({
           </p>
         ) : null}
       </div>
-      <Card>
-        <CardContent className="space-y-5 p-5">
-          {errorText ? (
-            <p className="text-sm text-destructive" role="alert">
-              {errorText}
-            </p>
-          ) : null}
+      {errorText ? (
+        <p
+          className="text-sm text-destructive"
+          role="alert"
+          aria-live="assertive"
+        >
+          {errorText}
+        </p>
+      ) : null}
+      <ResultCreateCard
+        id="result-create-basic"
+        title={t("admin.trials.manage.resultCreate.card.basic")}
+        summary={displaySummary(
+          draft.registrationNo,
+          draft.entry.koemaasto,
+          draft.entry.omistajaSnapshot,
+        )}
+        open={openCards.has("basic")}
+        onToggle={() => toggleCard("basic")}
+      >
+        <div className="space-y-5">
           <label className="block space-y-1 text-sm">
             <span>{t("admin.trials.manage.resultCreate.registration")}</span>
             <Input
@@ -252,46 +349,204 @@ function ResultCreateForm({
           <EntryMetaSection
             entryDraft={draft.entry}
             isPending={mutation.isPending}
-            onChange={(update) =>
-              setDraft((current) => ({
-                ...current,
-                entry: update(current.entry),
-              }))
-            }
-            visibleFields={fieldSet.entryFields}
+            onChange={changeEntry}
+            visibleFields={entryGroups.basic}
             yvaLabel={fieldSet.yvaLabels?.entry}
+            groups={["basic"]}
+            showHeadings={false}
           />
+        </div>
+      </ResultCreateCard>
+      <ResultCreateCard
+        id="result-create-time"
+        title={t("admin.trials.manage.resultCreate.card.time")}
+        summary={displaySummary(
+          draft.entry.hyvaksytytAjominuutit,
+          draft.entry.ajoajanPisteet,
+          `${draft.eras.length} ${t("admin.trials.manage.resultCreate.summary.eras")}`,
+        )}
+        open={openCards.has("time")}
+        onToggle={() => toggleCard("time")}
+      >
+        <div className="space-y-5">
           <EraSection
             eras={draft.eras}
             isPending={mutation.isPending}
             onAddEra={addEra}
             onRemoveEra={removeEra}
-            onChangeEraField={(era, field, value) =>
-              setDraft((current) => ({
-                ...current,
-                eras: current.eras.map((item) =>
-                  item.era === era ? { ...item, [field]: value } : item,
-                ),
-              }))
-            }
-            visibleFields={fieldSet.eraFields}
+            onChangeEraField={changeEra}
+            visibleFields={eraGroups.time}
             yvaLabel={fieldSet.yvaLabels?.era}
           />
-          <LisatiedotMatrix
+          <EntryMetaSection
+            entryDraft={draft.entry}
+            isPending={mutation.isPending}
+            onChange={changeEntry}
+            visibleFields={entryGroups.time}
+            yvaLabel={fieldSet.yvaLabels?.entry}
+            groups={["merit"]}
+            showHeadings={false}
+          />
+        </div>
+      </ResultCreateCard>
+      <ResultCreateCard
+        id="result-create-merit"
+        title={t("admin.trials.manage.resultCreate.card.merit")}
+        summary={displaySummary(
+          draft.entry.haku,
+          draft.entry.hauk,
+          draft.entry.ansiopisteetYhteensa,
+        )}
+        open={openCards.has("merit")}
+        onToggle={() => toggleCard("merit")}
+      >
+        <div className="space-y-5">
+          <EraSection
             eras={draft.eras}
-            rows={draft.lisatiedotRows}
             isPending={mutation.isPending}
-            onChangeCell={(koodi, osa, era, value) =>
-              setDraft((current) => ({
-                ...current,
-                lisatiedotRows: current.lisatiedotRows.map((row) =>
-                  row.koodi === koodi && row.osa === osa
-                    ? { ...row, eraValues: { ...row.eraValues, [era]: value } }
-                    : row,
-                ),
-              }))
-            }
+            onAddEra={addEra}
+            onRemoveEra={removeEra}
+            onChangeEraField={changeEra}
+            visibleFields={eraGroups.merit}
+            yvaLabel={fieldSet.yvaLabels?.era}
+            showControls={false}
+          />
+          <EntryMetaSection
+            entryDraft={draft.entry}
+            isPending={mutation.isPending}
+            onChange={changeEntry}
+            visibleFields={entryGroups.merit}
+            yvaLabel={fieldSet.yvaLabels?.entry}
+            groups={["merit", "other"]}
+            showHeadings={false}
+          />
+        </div>
+      </ResultCreateCard>
+      <ResultCreateCard
+        id="result-create-loss"
+        title={t("admin.trials.manage.resultCreate.card.loss")}
+        summary={displaySummary(
+          draft.entry.hlo,
+          draft.entry.alo,
+          draft.entry.tappiopisteetYhteensa,
+        )}
+        open={openCards.has("loss")}
+        onToggle={() => toggleCard("loss")}
+      >
+        <div className="space-y-5">
+          <EraSection
+            eras={draft.eras}
+            isPending={mutation.isPending}
+            onAddEra={addEra}
+            onRemoveEra={removeEra}
+            onChangeEraField={changeEra}
+            visibleFields={eraGroups.loss}
+            showControls={false}
           />
+          <EntryMetaSection
+            entryDraft={draft.entry}
+            isPending={mutation.isPending}
+            onChange={changeEntry}
+            visibleFields={entryGroups.loss}
+            groups={["other"]}
+            showHeadings={false}
+          />
+        </div>
+      </ResultCreateCard>
+      <ResultCreateCard
+        id="result-create-result"
+        title={t("admin.trials.manage.resultCreate.card.result")}
+        summary={displaySummary(
+          draft.entry.award,
+          draft.entry.points,
+          draft.entry.rank,
+        )}
+        open={openCards.has("result")}
+        onToggle={() => toggleCard("result")}
+      >
+        <div className="space-y-5">
+          <EntryMetaSection
+            entryDraft={draft.entry}
+            isPending={mutation.isPending}
+            onChange={changeEntry}
+            visibleFields={entryGroups.result}
+            groups={["result"]}
+            showHeadings={false}
+          />
+          {eraGroups.result.size ? (
+            <EraSection
+              eras={draft.eras}
+              isPending={mutation.isPending}
+              onAddEra={addEra}
+              onRemoveEra={removeEra}
+              onChangeEraField={changeEra}
+              visibleFields={eraGroups.result}
+              showControls={false}
+            />
+          ) : null}
+        </div>
+      </ResultCreateCard>
+      <ResultCreateCard
+        id="result-create-judges"
+        title={t("admin.trials.manage.resultCreate.card.judges")}
+        summary={displaySummary(
+          draft.entry.ryhmatuomariNimi,
+          draft.entry.palkintotuomariNimi,
+          draft.entry.judge,
+        )}
+        open={openCards.has("judges")}
+        onToggle={() => toggleCard("judges")}
+      >
+        <EntryMetaSection
+          entryDraft={draft.entry}
+          isPending={mutation.isPending}
+          onChange={changeEntry}
+          visibleFields={entryGroups.judges}
+          groups={["judges"]}
+          showHeadings={false}
+        />
+      </ResultCreateCard>
+      <ResultCreateCard
+        id="result-create-additional"
+        title={t("admin.trials.manage.resultCreate.card.additional")}
+        summary={`${draft.lisatiedotRows.filter((row) => Object.values(row.eraValues).some(Boolean)).length} ${t("admin.trials.manage.resultCreate.summary.selected")}`}
+        open={openCards.has("additional")}
+        onToggle={() => toggleCard("additional")}
+      >
+        <LisatiedotWorkspace
+          key={workspaceResetKey}
+          eras={draft.eras}
+          rows={draft.lisatiedotRows}
+          isPending={mutation.isPending}
+          onChangeCell={(koodi, osa, era, value) =>
+            setDraft((current) => ({
+              ...current,
+              lisatiedotRows: current.lisatiedotRows.map((row) =>
+                row.koodi === koodi && row.osa === osa
+                  ? { ...row, eraValues: { ...row.eraValues, [era]: value } }
+                  : row,
+              ),
+            }))
+          }
+          onRemoveRow={(koodi, osa) =>
+            setDraft((current) => ({
+              ...current,
+              lisatiedotRows: current.lisatiedotRows.map((row) =>
+                row.koodi === koodi && row.osa === osa
+                  ? {
+                      ...row,
+                      eraValues: Object.fromEntries(
+                        Object.keys(row.eraValues).map((era) => [era, ""]),
+                      ),
+                    }
+                  : row,
+              ),
+            }))
+          }
+        />
+      </ResultCreateCard>
+      <Card>
+        <CardContent className="p-5">
           <div className="flex flex-wrap gap-2">
             <Button
               disabled={mutation.isPending}
diff --git a/apps/web/components/admin/trials/internal/__tests__/entry-meta-section.test.tsx b/apps/web/components/admin/trials/internal/__tests__/entry-meta-section.test.tsx
index 3e0d38d7..5a661d4f 100644
--- a/apps/web/components/admin/trials/internal/__tests__/entry-meta-section.test.tsx
+++ b/apps/web/components/admin/trials/internal/__tests__/entry-meta-section.test.tsx
@@ -100,6 +100,57 @@ describe("EntryMetaSection", () => {
     expect(html).toContain("Ansiopisteet yhteensä");
   });
 
+  it("renders only the requested presentation groups", () => {
+    const html = renderToStaticMarkup(
+      React.createElement(EntryMetaSection, {
+        entryDraft,
+        isPending: false,
+        onChange: vi.fn(),
+        groups: ["result", "judges"],
+      }),
+    );
+
+    expect(html).toContain("Tulos ja huomautus");
+    expect(html).toContain("Tuomarit ja allekirjoitukset");
+    expect(html).not.toContain("Kokeen ja koiran tiedot");
+    expect(html).not.toContain("Ansiopisteet");
+    expect(html).not.toContain("Tappiopisteet");
+  });
+
+  it("moves weather into the create result group without changing edit defaults", () => {
+    const fieldSet = resolveResultCreateFieldSet("trw_post_20230801");
+    const groups = Object.fromEntries(
+      fieldSet.presentationGroups.map((group) => [
+        group.id,
+        new Set(group.entryFields),
+      ]),
+    );
+    const props = {
+      entryDraft,
+      isPending: false,
+      onChange: vi.fn(),
+      showHeadings: false,
+    };
+    const basicHtml = renderToStaticMarkup(
+      React.createElement(EntryMetaSection, {
+        ...props,
+        groups: ["basic"],
+        visibleFields: groups.basic,
+      }),
+    );
+    const resultHtml = renderToStaticMarkup(
+      React.createElement(EntryMetaSection, {
+        ...props,
+        groups: ["result"],
+        visibleFields: groups.result,
+      }),
+    );
+
+    expect(basicHtml).not.toContain("Keli");
+    expect(resultHtml).toContain("Keli");
+    expect(resultHtml).toContain("Huomautusteksti");
+  });
+
   it("keeps the generic label and all fields in compatibility fallback", () => {
     const fieldSet = resolveResultCreateFieldSet(null);
     const html = renderToStaticMarkup(
diff --git a/apps/web/components/admin/trials/internal/__tests__/era-section.test.tsx b/apps/web/components/admin/trials/internal/__tests__/era-section.test.tsx
index d2367c5d..8ca370d5 100644
--- a/apps/web/components/admin/trials/internal/__tests__/era-section.test.tsx
+++ b/apps/web/components/admin/trials/internal/__tests__/era-section.test.tsx
@@ -42,4 +42,45 @@ describe("EraSection", () => {
     expect(fallbackHtml).toContain("tie ja estetyöskentely");
     expect(fallbackHtml).toContain("metsästysinto");
   });
+
+  it("renders only the era fields resolved for a presentation domain", () => {
+    const props = {
+      eras: [createEmptyEraDraft(1)],
+      isPending: false,
+      onAddEra: vi.fn(),
+      onRemoveEra: vi.fn(),
+      onChangeEraField: vi.fn(),
+      showControls: false,
+      showHeading: false,
+    };
+    const fieldSet = resolveResultCreateFieldSet("trw_post_20230801");
+    const groups = Object.fromEntries(
+      fieldSet.presentationGroups.map((group) => [
+        group.id,
+        new Set(group.eraFields),
+      ]),
+    );
+    const timeHtml = renderToStaticMarkup(
+      React.createElement(EraSection, {
+        ...props,
+        visibleFields: groups.time,
+      }),
+    );
+    const meritHtml = renderToStaticMarkup(
+      React.createElement(EraSection, {
+        ...props,
+        visibleFields: groups.merit,
+        yvaLabel: fieldSet.yvaLabels?.era,
+      }),
+    );
+
+    expect(timeHtml).toContain("alkoi");
+    expect(timeHtml).toContain("hakumin");
+    expect(timeHtml).toContain("ajomin");
+    expect(timeHtml).not.toContain("haukku");
+    expect(meritHtml).toContain("haku");
+    expect(meritHtml).toContain("haukku");
+    expect(meritHtml).toContain("ajotaito");
+    expect(meritHtml).not.toContain("hakumin");
+  });
 });
diff --git a/apps/web/components/admin/trials/internal/__tests__/result-create-card.test.tsx b/apps/web/components/admin/trials/internal/__tests__/result-create-card.test.tsx
new file mode 100644
index 00000000..ba0d33ae
--- /dev/null
+++ b/apps/web/components/admin/trials/internal/__tests__/result-create-card.test.tsx
@@ -0,0 +1,37 @@
+import React from "react";
+import { renderToStaticMarkup } from "react-dom/server";
+import { describe, expect, it, vi } from "vitest";
+import { ResultCreateCard } from "../result-create-card";
+
+describe("ResultCreateCard", () => {
+  it("uses an accessible button header and hides collapsed content", () => {
+    const html = renderToStaticMarkup(
+      <ResultCreateCard
+        id="basic"
+        title="Perustiedot"
+        summary="FI123"
+        open={false}
+        onToggle={vi.fn()}
+      >
+        <p>fields</p>
+      </ResultCreateCard>,
+    );
+
+    expect(html).toContain('aria-expanded="false"');
+    expect(html).toContain('aria-controls="basic-content"');
+    expect(html).toContain("FI123");
+    expect(html).not.toContain("fields");
+  });
+
+  it("renders independently controlled expanded content", () => {
+    const html = renderToStaticMarkup(
+      <ResultCreateCard id="eras" title="Erät" open onToggle={vi.fn()}>
+        <p>fields</p>
+      </ResultCreateCard>,
+    );
+
+    expect(html).toContain('aria-expanded="true"');
+    expect(html).toContain('id="eras-content"');
+    expect(html).toContain("fields");
+  });
+});
diff --git a/apps/web/components/admin/trials/internal/entry-meta-basic-fields.tsx b/apps/web/components/admin/trials/internal/entry-meta-basic-fields.tsx
new file mode 100644
index 00000000..3c88146f
--- /dev/null
+++ b/apps/web/components/admin/trials/internal/entry-meta-basic-fields.tsx
@@ -0,0 +1,104 @@
+import React from "react";
+import type { EntryDraft } from "@/lib/admin/trials/entry-edit-dialog-model";
+import { TextField, type EntryMetaFieldGroupProps } from "./entry-meta-field";
+
+export function EntryMetaBasicFields({
+  entryDraft,
+  isPending,
+  updateField,
+  visibleFields,
+  showHeading = true,
+}: EntryMetaFieldGroupProps) {
+  const visible = (field: keyof EntryDraft) =>
+    !visibleFields || visibleFields.has(field);
+
+  return (
+    <section className="space-y-2">
+      {showHeading ? (
+        <h4 className="text-xs font-semibold uppercase text-muted-foreground">
+          Kokeen ja koiran tiedot
+        </h4>
+      ) : null}
+      <div className="grid gap-3 md:grid-cols-4">
+        {visible("koemaasto") ? (
+          <TextField
+            label="Koemaasto"
+            value={entryDraft.koemaasto}
+            disabled={isPending}
+            onChange={(value) => updateField("koemaasto", value)}
+          />
+        ) : null}
+        {visible("koemuoto") ? (
+          <TextField
+            label="Koemuoto"
+            value={entryDraft.koemuoto}
+            disabled={isPending}
+            onChange={(value) => updateField("koemuoto", value)}
+          />
+        ) : null}
+        {visible("koetyyppi") ? (
+          <label className="space-y-1 text-sm">
+            <span>Koetyyppi</span>
+            <select
+              className="h-10 w-full rounded-md border border-input bg-transparent px-3 text-sm"
+              value={entryDraft.koetyyppi}
+              disabled={isPending}
+              onChange={(event) =>
+                updateField(
+                  "koetyyppi",
+                  event.target.value as EntryDraft["koetyyppi"],
+                )
+              }
+            >
+              <option value="NORMAL">Normaali</option>
+              <option value="KOKOKAUDENKOE">Koko kauden koe</option>
+              <option value="PITKAKOE">Pitkä koe</option>
+            </select>
+          </label>
+        ) : null}
+        {visible("ke") ? (
+          <label className="space-y-1 text-sm">
+            <span>Keli</span>
+            <select
+              className="h-10 w-full rounded-md border border-input bg-transparent px-3 text-sm"
+              value={entryDraft.ke}
+              disabled={isPending}
+              onChange={(event) => updateField("ke", event.target.value)}
+            >
+              <option value="">-</option>
+              <option value="P">Paljas maa</option>
+              <option value="L">Lumikeli</option>
+            </select>
+          </label>
+        ) : null}
+        {visible("lk") ? (
+          <TextField
+            label="Luokka"
+            value={entryDraft.lk}
+            disabled={isPending}
+            onChange={(value) => updateField("lk", value)}
+          />
+        ) : null}
+        {visible("omistajaSnapshot") ? (
+          <TextField
+            label="Omistaja"
+            value={entryDraft.omistajaSnapshot}
+            disabled={isPending}
+            className="md:col-span-2"
+            onChange={(value) => updateField("omistajaSnapshot", value)}
+          />
+        ) : null}
+        {visible("omistajanKotikuntaSnapshot") ? (
+          <TextField
+            label="Omistajan kotikunta"
+            value={entryDraft.omistajanKotikuntaSnapshot}
+            disabled={isPending}
+            onChange={(value) =>
+              updateField("omistajanKotikuntaSnapshot", value)
+            }
+          />
+        ) : null}
+      </div>
+    </section>
+  );
+}
diff --git a/apps/web/components/admin/trials/internal/entry-meta-field.tsx b/apps/web/components/admin/trials/internal/entry-meta-field.tsx
new file mode 100644
index 00000000..4a0b1b13
--- /dev/null
+++ b/apps/web/components/admin/trials/internal/entry-meta-field.tsx
@@ -0,0 +1,39 @@
+import React from "react";
+import { Input } from "@/components/ui/input";
+import type { EntryDraft } from "@/lib/admin/trials/entry-edit-dialog-model";
+
+export type EntryMetaFieldGroupProps = {
+  entryDraft: EntryDraft;
+  isPending: boolean;
+  updateField: (field: keyof EntryDraft, value: string) => void;
+  visibleFields?: ReadonlySet<keyof EntryDraft>;
+  showHeading?: boolean;
+};
+
+export function TextField({
+  label,
+  value,
+  disabled,
+  inputMode,
+  className,
+  onChange,
+}: {
+  label: string;
+  value: string;
+  disabled: boolean;
+  inputMode?: React.HTMLAttributes<HTMLInputElement>["inputMode"];
+  className?: string;
+  onChange: (value: string) => void;
+}) {
+  return (
+    <label className={`space-y-1 text-sm ${className ?? ""}`}>
+      <span>{label}</span>
+      <Input
+        value={value}
+        inputMode={inputMode}
+        disabled={disabled}
+        onChange={(event) => onChange(event.target.value)}
+      />
+    </label>
+  );
+}
diff --git a/apps/web/components/admin/trials/internal/entry-meta-judge-fields.tsx b/apps/web/components/admin/trials/internal/entry-meta-judge-fields.tsx
new file mode 100644
index 00000000..b64082e7
--- /dev/null
+++ b/apps/web/components/admin/trials/internal/entry-meta-judge-fields.tsx
@@ -0,0 +1,58 @@
+import React from "react";
+import type { EntryDraft } from "@/lib/admin/trials/entry-edit-dialog-model";
+import { TextField, type EntryMetaFieldGroupProps } from "./entry-meta-field";
+
+export function EntryMetaJudgeFields({
+  entryDraft,
+  isPending,
+  updateField,
+  visibleFields,
+  showHeading = true,
+}: EntryMetaFieldGroupProps) {
+  const visible = (field: keyof EntryDraft) =>
+    !visibleFields || visibleFields.has(field);
+
+  return (
+    <section className="space-y-2">
+      {showHeading ? (
+        <h4 className="text-xs font-semibold uppercase text-muted-foreground">
+          Tuomarit ja allekirjoitukset
+        </h4>
+      ) : null}
+      <div className="grid gap-3 md:grid-cols-4">
+        {visible("ryhmatuomariNimi") ? (
+          <TextField
+            label="Ryhmätuomari"
+            value={entryDraft.ryhmatuomariNimi}
+            disabled={isPending}
+            onChange={(value) => updateField("ryhmatuomariNimi", value)}
+          />
+        ) : null}
+        {visible("palkintotuomariNimi") ? (
+          <TextField
+            label="Palkintotuomari"
+            value={entryDraft.palkintotuomariNimi}
+            disabled={isPending}
+            onChange={(value) => updateField("palkintotuomariNimi", value)}
+          />
+        ) : null}
+        {visible("judge") ? (
+          <TextField
+            label="Ylituomari"
+            value={entryDraft.judge}
+            disabled={isPending}
+            onChange={(value) => updateField("judge", value)}
+          />
+        ) : null}
+        {visible("ylituomariNumeroSnapshot") ? (
+          <TextField
+            label="Ylituomarin numero"
+            value={entryDraft.ylituomariNumeroSnapshot}
+            disabled={isPending}
+            onChange={(value) => updateField("ylituomariNumeroSnapshot", value)}
+          />
+        ) : null}
+      </div>
+    </section>
+  );
+}
diff --git a/apps/web/components/admin/trials/internal/entry-meta-loss-fields.tsx b/apps/web/components/admin/trials/internal/entry-meta-loss-fields.tsx
new file mode 100644
index 00000000..2e6aff98
--- /dev/null
+++ b/apps/web/components/admin/trials/internal/entry-meta-loss-fields.tsx
@@ -0,0 +1,53 @@
+import React from "react";
+import type { EntryDraft } from "@/lib/admin/trials/entry-edit-dialog-model";
+import { TextField, type EntryMetaFieldGroupProps } from "./entry-meta-field";
+
+export function EntryMetaLossFields({
+  entryDraft,
+  isPending,
+  updateField,
+  visibleFields,
+  showHeading = true,
+}: EntryMetaFieldGroupProps) {
+  const visible = (field: keyof EntryDraft) =>
+    !visibleFields || visibleFields.has(field);
+
+  return (
+    <section className="space-y-2">
+      {showHeading ? (
+        <h4 className="text-xs font-semibold uppercase text-muted-foreground">
+          Tappiopisteet
+        </h4>
+      ) : null}
+      <div className="grid gap-3 md:grid-cols-4">
+        {visible("hlo") ? (
+          <TextField
+            label="Hakulöysyys"
+            value={entryDraft.hlo}
+            inputMode="decimal"
+            disabled={isPending}
+            onChange={(value) => updateField("hlo", value)}
+          />
+        ) : null}
+        {visible("alo") ? (
+          <TextField
+            label="Ajolöysyys"
+            value={entryDraft.alo}
+            inputMode="decimal"
+            disabled={isPending}
+            onChange={(value) => updateField("alo", value)}
+          />
+        ) : null}
+        {visible("tappiopisteetYhteensa") ? (
+          <TextField
+            label="Tappiopisteet yhteensä"
+            value={entryDraft.tappiopisteetYhteensa}
+            inputMode="decimal"
+            disabled={isPending}
+            onChange={(value) => updateField("tappiopisteetYhteensa", value)}
+          />
+        ) : null}
+      </div>
+    </section>
+  );
+}
diff --git a/apps/web/components/admin/trials/internal/entry-meta-result-fields.tsx b/apps/web/components/admin/trials/internal/entry-meta-result-fields.tsx
new file mode 100644
index 00000000..32e6fec5
--- /dev/null
+++ b/apps/web/components/admin/trials/internal/entry-meta-result-fields.tsx
@@ -0,0 +1,114 @@
+import React from "react";
+import type { EntryDraft } from "@/lib/admin/trials/entry-edit-dialog-model";
+import { TextField, type EntryMetaFieldGroupProps } from "./entry-meta-field";
+
+type Props = EntryMetaFieldGroupProps & {
+  showWeather?: boolean;
+};
+
+export function EntryMetaResultFields({
+  entryDraft,
+  isPending,
+  updateField,
+  visibleFields,
+  showHeading = true,
+  showWeather = false,
+}: Props) {
+  const visible = (field: keyof EntryDraft) =>
+    !visibleFields || visibleFields.has(field);
+
+  return (
+    <section className="space-y-2">
+      {showHeading ? (
+        <h4 className="text-xs font-semibold uppercase text-muted-foreground">
+          Tulos ja huomautus
+        </h4>
+      ) : null}
+      <div className="grid gap-3 md:grid-cols-4">
+        {showWeather && visible("ke") ? (
+          <label className="space-y-1 text-sm">
+            <span>Keli</span>
+            <select
+              className="h-10 w-full rounded-md border border-input bg-transparent px-3 text-sm"
+              value={entryDraft.ke}
+              disabled={isPending}
+              onChange={(event) => updateField("ke", event.target.value)}
+            >
+              <option value="">-</option>
+              <option value="P">Paljas maa</option>
+              <option value="L">Lumikeli</option>
+            </select>
+          </label>
+        ) : null}
+        {visible("award") ? (
+          <TextField
+            label="Palkinto"
+            value={entryDraft.award}
+            disabled={isPending}
+            onChange={(value) => updateField("award", value)}
+          />
+        ) : null}
+        {visible("rank") ? (
+          <TextField
+            label="Sijoitus"
+            value={entryDraft.rank}
+            disabled={isPending}
+            onChange={(value) => updateField("rank", value)}
+          />
+        ) : null}
+        {visible("points") ? (
+          <TextField
+            label="Loppupisteet"
+            value={entryDraft.points}
+            inputMode="decimal"
+            disabled={isPending}
+            onChange={(value) => updateField("points", value)}
+          />
+        ) : null}
+        {visible("koiriaLuokassa") ? (
+          <TextField
+            label="Koiria luokassa"
+            value={entryDraft.koiriaLuokassa}
+            inputMode="numeric"
+            disabled={isPending}
+            onChange={(value) => updateField("koiriaLuokassa", value)}
+          />
+        ) : null}
+        {visible("huomautus") ? (
+          <label className="space-y-1 text-sm">
+            <span>Huomautus</span>
+            <select
+              className="h-10 w-full rounded-md border border-input bg-transparent px-3 text-sm"
+              value={entryDraft.huomautus}
+              disabled={isPending}
+              onChange={(event) =>
+                updateField(
+                  "huomautus",
+                  event.target.value as EntryDraft["huomautus"],
+                )
+              }
+            >
+              <option value="">-</option>
+              <option value="LUOPUI">Luopui</option>
+              <option value="SULJETTU">Suljettu</option>
+              <option value="KESKEYTETTY">Keskeytetty</option>
+            </select>
+          </label>
+        ) : null}
+        {visible("huomautusTeksti") ? (
+          <label className="space-y-1 text-sm md:col-span-3">
+            <span>Huomautusteksti</span>
+            <textarea
+              className="min-h-20 w-full rounded-md border border-input bg-transparent px-3 py-2 text-sm"
+              value={entryDraft.huomautusTeksti}
+              disabled={isPending}
+              onChange={(event) =>
+                updateField("huomautusTeksti", event.target.value)
+              }
+            />
+          </label>
+        ) : null}
+      </div>
+    </section>
+  );
+}
diff --git a/apps/web/components/admin/trials/internal/entry-meta-score-fields.tsx b/apps/web/components/admin/trials/internal/entry-meta-score-fields.tsx
new file mode 100644
index 00000000..1a3c1b5e
--- /dev/null
+++ b/apps/web/components/admin/trials/internal/entry-meta-score-fields.tsx
@@ -0,0 +1,147 @@
+import React from "react";
+import type { EntryDraft } from "@/lib/admin/trials/entry-edit-dialog-model";
+import { TextField, type EntryMetaFieldGroupProps } from "./entry-meta-field";
+
+type Props = EntryMetaFieldGroupProps & {
+  showMerit: boolean;
+  showOther: boolean;
+  visibleFields?: ReadonlySet<keyof EntryDraft>;
+  yvaLabel?: string;
+};
+
+export function EntryMetaScoreFields({
+  entryDraft,
+  isPending,
+  updateField,
+  showMerit,
+  showOther,
+  visibleFields,
+  yvaLabel,
+  showHeading = true,
+}: Props) {
+  const visible = (field: keyof EntryDraft) =>
+    !visibleFields || visibleFields.has(field);
+  const showDrive =
+    showMerit &&
+    (visible("hyvaksytytAjominuutit") ||
+      visible("ajoajanPisteet") ||
+      visible("yva"));
+  const showMisc =
+    (showMerit && visible("ansiopisteetYhteensa")) ||
+    (showOther && (visible("tja") || visible("pin")));
+
+  return (
+    <section className="space-y-2">
+      {showHeading ? (
+        <h4 className="text-xs font-semibold uppercase text-muted-foreground">
+          Ansiopisteet
+        </h4>
+      ) : null}
+      <div className="space-y-4">
+        {showDrive ? (
+          <ScoreSubsection title="Ajo">
+            {visible("hyvaksytytAjominuutit") ? (
+              <TextField
+                label="Hyväksytyt ajominuutit"
+                value={entryDraft.hyvaksytytAjominuutit}
+                inputMode="numeric"
+                disabled={isPending}
+                onChange={(value) =>
+                  updateField("hyvaksytytAjominuutit", value)
+                }
+              />
+            ) : null}
+            {visible("ajoajanPisteet") ? (
+              <TextField
+                label="Ajoajan pisteet"
+                value={entryDraft.ajoajanPisteet}
+                inputMode="decimal"
+                disabled={isPending}
+                onChange={(value) => updateField("ajoajanPisteet", value)}
+              />
+            ) : null}
+            {visible("yva") ? (
+              <TextField
+                label={yvaLabel ?? "Ajotaito / yleisvaikutelma"}
+                value={entryDraft.yva}
+                inputMode="decimal"
+                disabled={isPending}
+                onChange={(value) => updateField("yva", value)}
+              />
+            ) : null}
+          </ScoreSubsection>
+        ) : null}
+        {showOther && visible("haku") ? (
+          <ScoreSubsection title="Haku">
+            <TextField
+              label="Haku"
+              value={entryDraft.haku}
+              inputMode="decimal"
+              disabled={isPending}
+              onChange={(value) => updateField("haku", value)}
+            />
+          </ScoreSubsection>
+        ) : null}
+        {showOther && visible("hauk") ? (
+          <ScoreSubsection title="Haukku">
+            <TextField
+              label="Haukku"
+              value={entryDraft.hauk}
+              inputMode="decimal"
+              disabled={isPending}
+              onChange={(value) => updateField("hauk", value)}
+            />
+          </ScoreSubsection>
+        ) : null}
+        {showMisc ? (
+          <ScoreSubsection title="Muut">
+            {showMerit && visible("ansiopisteetYhteensa") ? (
+              <TextField
+                label="Ansiopisteet yhteensä"
+                value={entryDraft.ansiopisteetYhteensa}
+                inputMode="decimal"
+                disabled={isPending}
+                onChange={(value) => updateField("ansiopisteetYhteensa", value)}
+              />
+            ) : null}
+            {showOther && visible("tja") ? (
+              <TextField
+                label="Tie ja estetyöskentely"
+                value={entryDraft.tja}
+                inputMode="decimal"
+                disabled={isPending}
+                onChange={(value) => updateField("tja", value)}
+              />
+            ) : null}
+            {showOther && visible("pin") ? (
+              <TextField
+                label="Metsästysinto"
+                value={entryDraft.pin}
+                inputMode="decimal"
+                disabled={isPending}
+                onChange={(value) => updateField("pin", value)}
+              />
+            ) : null}
+          </ScoreSubsection>
+        ) : null}
+      </div>
+    </section>
+  );
+}
+
+function ScoreSubsection({
+  title,
+  children,
+}: {
+  title: string;
+  children: React.ReactNode;
+}) {
+  return (
+    <section className="space-y-2 rounded-md border border-dashed border-muted-foreground/40 p-3">
+      <h5 className="text-[11px] font-semibold uppercase tracking-wide text-muted-foreground">
+        {title}
+      </h5>
+      <div className="grid gap-3 md:grid-cols-2">{children}</div>
+    </section>
+  );
+}
diff --git a/apps/web/components/admin/trials/internal/entry-meta-section.tsx b/apps/web/components/admin/trials/internal/entry-meta-section.tsx
index 7904f2ba..e8a05687 100644
--- a/apps/web/components/admin/trials/internal/entry-meta-section.tsx
+++ b/apps/web/components/admin/trials/internal/entry-meta-section.tsx
@@ -1,6 +1,12 @@
 import React from "react";
-import { Input } from "@/components/ui/input";
 import type { EntryDraft } from "@/lib/admin/trials/entry-edit-dialog-model";
+import { EntryMetaBasicFields } from "./entry-meta-basic-fields";
+import { EntryMetaJudgeFields } from "./entry-meta-judge-fields";
+import { EntryMetaLossFields } from "./entry-meta-loss-fields";
+import { EntryMetaResultFields } from "./entry-meta-result-fields";
+import { EntryMetaScoreFields } from "./entry-meta-score-fields";
+
+type EntryMetaGroup = "basic" | "result" | "merit" | "other" | "judges";
 
 type Props = {
   entryDraft: EntryDraft;
@@ -8,6 +14,8 @@ type Props = {
   onChange: (updater: (current: EntryDraft) => EntryDraft) => void;
   visibleFields?: ReadonlySet<keyof EntryDraft>;
   yvaLabel?: string;
+  groups?: readonly EntryMetaGroup[];
+  showHeadings?: boolean;
 };
 
 export function EntryMetaSection({
@@ -16,348 +24,61 @@ export function EntryMetaSection({
   onChange,
   visibleFields,
   yvaLabel,
+  groups,
+  showHeadings = true,
 }: Props) {
-  function updateField(field: keyof EntryDraft, value: string) {
+  const updateField = (field: keyof EntryDraft, value: string) => {
     onChange((current) => ({
       ...current,
       [field]: value,
     }));
-  }
-  const visible = (field: keyof EntryDraft) =>
-    !visibleFields || visibleFields.has(field);
+  };
+  const show = (group: EntryMetaGroup) => !groups || groups.includes(group);
+  const fieldGroupProps = {
+    entryDraft,
+    isPending,
+    updateField,
+    visibleFields,
+    showHeading: showHeadings,
+  };
+  const showMerit = show("merit");
+  const showOther = show("other");
+  const hasVisible = (fields: readonly (keyof EntryDraft)[]) =>
+    !visibleFields || fields.some((field) => visibleFields.has(field));
+  const showScoreFields =
+    (showMerit || showOther) &&
+    hasVisible([
+      "hyvaksytytAjominuutit",
+      "ajoajanPisteet",
+      "haku",
+      "hauk",
+      "yva",
+      "ansiopisteetYhteensa",
+      "tja",
+      "pin",
+    ]);
+  const showLossFields =
+    showOther && hasVisible(["hlo", "alo", "tappiopisteetYhteensa"]);
 
   return (
     <div className="space-y-4">
-      <section className="space-y-2">
-        <h4 className="text-xs font-semibold uppercase text-muted-foreground">
-          Kokeen ja koiran tiedot
-        </h4>
-        <div className="grid gap-3 md:grid-cols-4">
-          <TextField
-            label="Koemaasto"
-            value={entryDraft.koemaasto}
-            disabled={isPending}
-            onChange={(value) => updateField("koemaasto", value)}
-          />
-          <TextField
-            label="Koemuoto"
-            value={entryDraft.koemuoto}
-            disabled={isPending}
-            onChange={(value) => updateField("koemuoto", value)}
-          />
-          <label className="space-y-1 text-sm">
-            <span>Koetyyppi</span>
-            <select
-              className="h-10 w-full rounded-md border border-input bg-transparent px-3 text-sm"
-              value={entryDraft.koetyyppi}
-              disabled={isPending}
-              onChange={(event) =>
-                updateField(
-                  "koetyyppi",
-                  event.target.value as EntryDraft["koetyyppi"],
-                )
-              }
-            >
-              <option value="NORMAL">Normaali</option>
-              <option value="KOKOKAUDENKOE">Koko kauden koe</option>
-              <option value="PITKAKOE">Pitkä koe</option>
-            </select>
-          </label>
-          <label className="space-y-1 text-sm">
-            <span>Keli</span>
-            <select
-              className="h-10 w-full rounded-md border border-input bg-transparent px-3 text-sm"
-              value={entryDraft.ke}
-              disabled={isPending}
-              onChange={(event) => updateField("ke", event.target.value)}
-            >
-              <option value="">-</option>
-              <option value="P">Paljas maa</option>
-              <option value="L">Lumikeli</option>
-            </select>
-          </label>
-          <TextField
-            label="Luokka"
-            value={entryDraft.lk}
-            disabled={isPending}
-            onChange={(value) => updateField("lk", value)}
-          />
-          <TextField
-            label="Omistaja"
-            value={entryDraft.omistajaSnapshot}
-            disabled={isPending}
-            className="md:col-span-2"
-            onChange={(value) => updateField("omistajaSnapshot", value)}
-          />
-          <TextField
-            label="Omistajan kotikunta"
-            value={entryDraft.omistajanKotikuntaSnapshot}
-            disabled={isPending}
-            onChange={(value) =>
-              updateField("omistajanKotikuntaSnapshot", value)
-            }
-          />
-        </div>
-      </section>
-
-      <section className="space-y-2">
-        <h4 className="text-xs font-semibold uppercase text-muted-foreground">
-          Tulos ja huomautus
-        </h4>
-        <div className="grid gap-3 md:grid-cols-4">
-          <TextField
-            label="Palkinto"
-            value={entryDraft.award}
-            disabled={isPending}
-            onChange={(value) => updateField("award", value)}
-          />
-          <TextField
-            label="Sijoitus"
-            value={entryDraft.rank}
-            disabled={isPending}
-            onChange={(value) => updateField("rank", value)}
-          />
-          <TextField
-            label="Loppupisteet"
-            value={entryDraft.points}
-            inputMode="decimal"
-            disabled={isPending}
-            onChange={(value) => updateField("points", value)}
-          />
-          <TextField
-            label="Koiria luokassa"
-            value={entryDraft.koiriaLuokassa}
-            inputMode="numeric"
-            disabled={isPending}
-            onChange={(value) => updateField("koiriaLuokassa", value)}
-          />
-          <label className="space-y-1 text-sm">
-            <span>Huomautus</span>
-            <select
-              className="h-10 w-full rounded-md border border-input bg-transparent px-3 text-sm"
-              value={entryDraft.huomautus}
-              disabled={isPending}
-              onChange={(event) =>
-                updateField(
-                  "huomautus",
-                  event.target.value as EntryDraft["huomautus"],
-                )
-              }
-            >
-              <option value="">-</option>
-              <option value="LUOPUI">Luopui</option>
-              <option value="SULJETTU">Suljettu</option>
-              <option value="KESKEYTETTY">Keskeytetty</option>
-            </select>
-          </label>
-          <label className="space-y-1 text-sm md:col-span-3">
-            <span>Huomautusteksti</span>
-            <textarea
-              className="min-h-20 w-full rounded-md border border-input bg-transparent px-3 py-2 text-sm"
-              value={entryDraft.huomautusTeksti}
-              disabled={isPending}
-              onChange={(event) =>
-                updateField("huomautusTeksti", event.target.value)
-              }
-            />
-          </label>
-        </div>
-      </section>
-
-      <section className="space-y-2">
-        <h4 className="text-xs font-semibold uppercase text-muted-foreground">
-          Ansiopisteet
-        </h4>
-        <div className="space-y-4">
-          <ScoreSubsection title="Ajo">
-            {visible("hyvaksytytAjominuutit") ? (
-              <TextField
-                label="Hyväksytyt ajominuutit"
-                value={entryDraft.hyvaksytytAjominuutit}
-                inputMode="numeric"
-                disabled={isPending}
-                onChange={(value) =>
-                  updateField("hyvaksytytAjominuutit", value)
-                }
-              />
-            ) : null}
-            {visible("ajoajanPisteet") ? (
-              <TextField
-                label="Ajoajan pisteet"
-                value={entryDraft.ajoajanPisteet}
-                inputMode="decimal"
-                disabled={isPending}
-                onChange={(value) => updateField("ajoajanPisteet", value)}
-              />
-            ) : null}
-            {visible("yva") ? (
-              <TextField
-                label={yvaLabel ?? "Ajotaito / yleisvaikutelma"}
-                value={entryDraft.yva}
-                inputMode="decimal"
-                disabled={isPending}
-                onChange={(value) => updateField("yva", value)}
-              />
-            ) : null}
-          </ScoreSubsection>
-          <ScoreSubsection title="Haku">
-            {visible("haku") ? (
-              <TextField
-                label="Haku"
-                value={entryDraft.haku}
-                inputMode="decimal"
-                disabled={isPending}
-                onChange={(value) => updateField("haku", value)}
-              />
-            ) : null}
-          </ScoreSubsection>
-          <ScoreSubsection title="Haukku">
-            {visible("hauk") ? (
-              <TextField
-                label="Haukku"
-                value={entryDraft.hauk}
-                inputMode="decimal"
-                disabled={isPending}
-                onChange={(value) => updateField("hauk", value)}
-              />
-            ) : null}
-          </ScoreSubsection>
-          <ScoreSubsection title="Muut">
-            {visible("ansiopisteetYhteensa") ? (
-              <TextField
-                label="Ansiopisteet yhteensä"
-                value={entryDraft.ansiopisteetYhteensa}
-                inputMode="decimal"
-                disabled={isPending}
-                onChange={(value) => updateField("ansiopisteetYhteensa", value)}
-              />
-            ) : null}
-            {visible("tja") ? (
-              <TextField
-                label="Tie ja estetyöskentely"
-                value={entryDraft.tja}
-                inputMode="decimal"
-                disabled={isPending}
-                onChange={(value) => updateField("tja", value)}
-              />
-            ) : null}
-            {visible("pin") ? (
-              <TextField
-                label="Metsästysinto"
-                value={entryDraft.pin}
-                inputMode="decimal"
-                disabled={isPending}
-                onChange={(value) => updateField("pin", value)}
-              />
-            ) : null}
-          </ScoreSubsection>
-        </div>
-      </section>
-
-      <section className="space-y-2">
-        <h4 className="text-xs font-semibold uppercase text-muted-foreground">
-          Tappiopisteet
-        </h4>
-        <div className="grid gap-3 md:grid-cols-4">
-          <TextField
-            label="Hakulöysyys"
-            value={entryDraft.hlo}
-            inputMode="decimal"
-            disabled={isPending}
-            onChange={(value) => updateField("hlo", value)}
-          />
-          <TextField
-            label="Ajolöysyys"
-            value={entryDraft.alo}
-            inputMode="decimal"
-            disabled={isPending}
-            onChange={(value) => updateField("alo", value)}
-          />
-          <TextField
-            label="Tappiopisteet yhteensä"
-            value={entryDraft.tappiopisteetYhteensa}
-            inputMode="decimal"
-            disabled={isPending}
-            onChange={(value) => updateField("tappiopisteetYhteensa", value)}
-          />
-        </div>
-      </section>
-
-      <section className="space-y-2">
-        <h4 className="text-xs font-semibold uppercase text-muted-foreground">
-          Tuomarit ja allekirjoitukset
-        </h4>
-        <div className="grid gap-3 md:grid-cols-4">
-          <TextField
-            label="Ylituomari"
-            value={entryDraft.judge}
-            disabled={isPending}
-            onChange={(value) => updateField("judge", value)}
-          />
-          <TextField
-            label="Ylituomarin numero"
-            value={entryDraft.ylituomariNumeroSnapshot}
-            disabled={isPending}
-            onChange={(value) => updateField("ylituomariNumeroSnapshot", value)}
-          />
-          <TextField
-            label="Ryhmätuomari"
-            value={entryDraft.ryhmatuomariNimi}
-            disabled={isPending}
-            onChange={(value) => updateField("ryhmatuomariNimi", value)}
-          />
-          <TextField
-            label="Palkintotuomari"
-            value={entryDraft.palkintotuomariNimi}
-            disabled={isPending}
-            onChange={(value) => updateField("palkintotuomariNimi", value)}
-          />
-        </div>
-      </section>
+      {show("basic") ? <EntryMetaBasicFields {...fieldGroupProps} /> : null}
+      {show("result") ? (
+        <EntryMetaResultFields
+          {...fieldGroupProps}
+          showWeather={Boolean(groups && !groups.includes("basic"))}
+        />
+      ) : null}
+      {showScoreFields ? (
+        <EntryMetaScoreFields
+          {...fieldGroupProps}
+          showMerit={showMerit}
+          showOther={showOther}
+          yvaLabel={yvaLabel}
+        />
+      ) : null}
+      {showLossFields ? <EntryMetaLossFields {...fieldGroupProps} /> : null}
+      {show("judges") ? <EntryMetaJudgeFields {...fieldGroupProps} /> : null}
     </div>
   );
 }
-
-type ScoreSubsectionProps = {
-  title: string;
-  children: React.ReactNode;
-};
-
-function ScoreSubsection({ title, children }: ScoreSubsectionProps) {
-  return (
-    <section className="space-y-2 rounded-md border border-dashed border-muted-foreground/40 p-3">
-      <h5 className="text-[11px] font-semibold uppercase tracking-wide text-muted-foreground">
-        {title}
-      </h5>
-      <div className="grid gap-3 md:grid-cols-2">{children}</div>
-    </section>
-  );
-}
-
-function TextField({
-  label,
-  value,
-  disabled,
-  inputMode,
-  className,
-  onChange,
-}: {
-  label: string;
-  value: string;
-  disabled: boolean;
-  inputMode?: React.HTMLAttributes<HTMLInputElement>["inputMode"];
-  className?: string;
-  onChange: (value: string) => void;
-}) {
-  return (
-    <label className={`space-y-1 text-sm ${className ?? ""}`}>
-      <span>{label}</span>
-      <Input
-        value={value}
-        inputMode={inputMode}
-        disabled={disabled}
-        onChange={(event) => onChange(event.target.value)}
-      />
-    </label>
-  );
-}
diff --git a/apps/web/components/admin/trials/internal/era-section.tsx b/apps/web/components/admin/trials/internal/era-section.tsx
index 210ec447..9f5e51a1 100644
--- a/apps/web/components/admin/trials/internal/era-section.tsx
+++ b/apps/web/components/admin/trials/internal/era-section.tsx
@@ -16,6 +16,8 @@ type Props = {
   ) => void;
   visibleFields?: ReadonlySet<Exclude<keyof EraDraft, "era">>;
   yvaLabel?: string;
+  showControls?: boolean;
+  showHeading?: boolean;
 };
 
 export function EraSection({
@@ -26,15 +28,26 @@ export function EraSection({
   onChangeEraField,
   visibleFields,
   yvaLabel,
+  showControls = true,
+  showHeading = true,
 }: Props) {
   return (
     <>
-      <div className="flex items-center justify-between">
-        <h3 className="text-sm font-semibold">Erät</h3>
-        <Button type="button" variant="outline" size="sm" onClick={onAddEra}>
-          Lisää erä
-        </Button>
-      </div>
+      {showHeading || showControls ? (
+        <div className="flex items-center justify-between">
+          {showHeading ? <h3 className="text-sm font-semibold">Erät</h3> : null}
+          {showControls ? (
+            <Button
+              type="button"
+              variant="outline"
+              size="sm"
+              onClick={onAddEra}
+            >
+              Lisää erä
+            </Button>
+          ) : null}
+        </div>
+      ) : null}
       <div className="space-y-3">
         {eras
           .slice()
@@ -43,7 +56,7 @@ export function EraSection({
             <div key={era.era} className="rounded-md border p-3">
               <div className="mb-2 flex items-center justify-between">
                 <p className="text-sm font-medium">Erä {era.era}</p>
-                {era.era !== 1 ? (
+                {showControls && era.era !== 1 ? (
                   <Button
                     type="button"
                     variant="outline"
diff --git a/apps/web/components/admin/trials/internal/lisatiedot-workspace.tsx b/apps/web/components/admin/trials/internal/lisatiedot-workspace.tsx
new file mode 100644
index 00000000..199109c4
--- /dev/null
+++ b/apps/web/components/admin/trials/internal/lisatiedot-workspace.tsx
@@ -0,0 +1,407 @@
+"use client";
+
+import React from "react";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import {
+  Sheet,
+  SheetContent,
+  SheetDescription,
+  SheetHeader,
+  SheetTitle,
+} from "@/components/ui/sheet";
+import { useResultCreateWorkspaceMobile } from "@/hooks/admin/trials/manage/use-result-create-workspace-mobile";
+import { useI18n } from "@/hooks/i18n";
+import {
+  ADMIN_TRIAL_LISATIETO_GROUP_ORDER,
+  ADMIN_TRIAL_LISATIETO_GROUP_LABELS,
+  type AdminTrialLisatietoInputKind,
+} from "@/lib/admin/trials/entry-edit-config";
+import type {
+  EraDraft,
+  LisatietoRowDraft,
+} from "@/lib/admin/trials/entry-edit-dialog-model";
+import {
+  createLisatiedotWorkspaceState,
+  filterLisatietoRows,
+  lisatietoRowKey,
+  lisatiedotWorkspaceReducer,
+} from "@/lib/admin/trials/lisatiedot-workspace-state";
+
+type Props = {
+  eras: EraDraft[];
+  rows: LisatietoRowDraft[];
+  isPending: boolean;
+  onChangeCell: (
+    koodi: string,
+    osa: string,
+    era: number,
+    value: string,
+  ) => void;
+  onRemoveRow: (koodi: string, osa: string) => void;
+};
+
+const groupLabel = (group: string) =>
+  ADMIN_TRIAL_LISATIETO_GROUP_LABELS[
+    group as keyof typeof ADMIN_TRIAL_LISATIETO_GROUP_LABELS
+  ] ?? group;
+
+export function LisatiedotWorkspace({
+  eras,
+  rows,
+  isPending,
+  onChangeCell,
+  onRemoveRow,
+}: Props) {
+  const { t } = useI18n();
+  const [state, dispatch] = React.useReducer(
+    lisatiedotWorkspaceReducer,
+    rows,
+    createLisatiedotWorkspaceState,
+  );
+  const isMobileWorkspace = useResultCreateWorkspaceMobile();
+  const mobileControlRef = React.useRef<HTMLElement | null>(null);
+  const rowTriggerRef = React.useRef<HTMLButtonElement | null>(null);
+  const setMobileControlRef = React.useCallback(
+    (element: HTMLElement | null) => {
+      mobileControlRef.current = element;
+    },
+    [],
+  );
+  const groups = React.useMemo(
+    () =>
+      [...new Set(rows.map((row) => row.group))].sort(
+        (left, right) =>
+          ADMIN_TRIAL_LISATIETO_GROUP_ORDER.indexOf(
+            left as (typeof ADMIN_TRIAL_LISATIETO_GROUP_ORDER)[number],
+          ) -
+          ADMIN_TRIAL_LISATIETO_GROUP_ORDER.indexOf(
+            right as (typeof ADMIN_TRIAL_LISATIETO_GROUP_ORDER)[number],
+          ),
+      ),
+    [rows],
+  );
+  const visibleRows = filterLisatietoRows(rows, state.query, state.activeGroup);
+  const selectedRows = rows.filter((row) =>
+    state.selectedRows.has(lisatietoRowKey(row)),
+  );
+  const activeRow =
+    rows.find((row) => lisatietoRowKey(row) === state.activeRow) ?? null;
+
+  React.useEffect(() => {
+    if (!isMobileWorkspace && state.mobileSheetOpen) {
+      dispatch({ type: "sheet", value: false });
+    }
+  }, [isMobileWorkspace, state.mobileSheetOpen]);
+
+  function select(
+    row: LisatietoRowDraft,
+    mobile: boolean,
+    trigger: HTMLButtonElement,
+  ) {
+    const key = lisatietoRowKey(row);
+    rowTriggerRef.current = trigger;
+    dispatch({ type: "select", value: key });
+    dispatch({ type: "active", value: key, mobile });
+  }
+  function remove(row: LisatietoRowDraft) {
+    onRemoveRow(row.koodi, row.osa);
+    dispatch({ type: "remove", value: lisatietoRowKey(row) });
+  }
+
+  return (
+    <div className="space-y-4">
+      <div className="grid gap-3 lg:grid-cols-[minmax(0,1fr)_auto]">
+        <label className="space-y-1 text-sm">
+          <span>{t("admin.trials.manage.resultCreate.additional.search")}</span>
+          <Input
+            value={state.query}
+            placeholder={t(
+              "admin.trials.manage.resultCreate.additional.searchPlaceholder",
+            )}
+            onChange={(event) =>
+              dispatch({ type: "query", value: event.target.value })
+            }
+          />
+        </label>
+        <div className="flex flex-wrap items-end gap-2">
+          <Button
+            type="button"
+            size="sm"
+            variant="outline"
+            onClick={() => dispatch({ type: "expand", values: groups })}
+          >
+            {t("admin.trials.manage.resultCreate.additional.expandAll")}
+          </Button>
+          <Button
+            type="button"
+            size="sm"
+            variant="outline"
+            onClick={() => dispatch({ type: "collapse" })}
+          >
+            {t("admin.trials.manage.resultCreate.additional.collapseAll")}
+          </Button>
+        </div>
+      </div>
+      <div
+        className="flex flex-wrap gap-2"
+        aria-label={t("admin.trials.manage.resultCreate.additional.groups")}
+      >
+        <Button
+          type="button"
+          size="sm"
+          variant={state.activeGroup === null ? "default" : "outline"}
+          onClick={() => dispatch({ type: "group", value: null })}
+        >
+          {t("admin.trials.manage.resultCreate.additional.allGroups")}
+        </Button>
+        {groups.map((group) => (
+          <Button
+            key={group}
+            type="button"
+            size="sm"
+            variant={state.activeGroup === group ? "default" : "outline"}
+            onClick={() => dispatch({ type: "group", value: group })}
+          >
+            {groupLabel(group)}
+          </Button>
+        ))}
+      </div>
+      {selectedRows.length ? (
+        <div
+          className="flex flex-wrap gap-2"
+          aria-label={t("admin.trials.manage.resultCreate.additional.selected")}
+        >
+          {selectedRows.map((row) => (
+            <span
+              key={lisatietoRowKey(row)}
+              className="inline-flex items-center gap-1 rounded-full bg-muted px-3 py-1 text-sm"
+            >
+              {row.koodi} {row.label}
+              <button
+                type="button"
+                className="rounded px-1"
+                aria-label={`${t("admin.trials.manage.resultCreate.additional.remove")} ${row.koodi} ${row.label}`}
+                onClick={() => remove(row)}
+              >
+                ×
+              </button>
+            </span>
+          ))}
+        </div>
+      ) : null}
+      <div className="grid gap-4 lg:grid-cols-[minmax(260px,0.8fr)_minmax(0,1.2fr)]">
+        <div className="space-y-2">
+          {groups.map((group) => {
+            const groupRows = visibleRows.filter((row) => row.group === group);
+            if (!groupRows.length) return null;
+            const expanded = state.expandedGroups.has(group);
+            return (
+              <div key={group} className="rounded-md border">
+                <button
+                  type="button"
+                  className="flex w-full justify-between p-3 text-left font-medium"
+                  aria-expanded={expanded}
+                  onClick={() =>
+                    dispatch({ type: "toggleGroup", value: group })
+                  }
+                >
+                  {groupLabel(group)} <span>{groupRows.length}</span>
+                </button>
+                {expanded ? (
+                  <div className="border-t p-2">
+                    {groupRows.map((row) => (
+                      <button
+                        key={lisatietoRowKey(row)}
+                        type="button"
+                        className="block w-full rounded p-2 text-left hover:bg-muted"
+                        onClick={(event) =>
+                          select(row, isMobileWorkspace, event.currentTarget)
+                        }
+                      >
+                        <span className="font-medium">{row.koodi}</span>{" "}
+                        {row.label}
+                      </button>
+                    ))}
+                  </div>
+                ) : null}
+              </div>
+            );
+          })}
+        </div>
+        <div className="hidden rounded-md border p-4 lg:block">
+          {activeRow ? (
+            <RowEditor
+              row={activeRow}
+              eras={eras}
+              isPending={isPending}
+              onChangeCell={onChangeCell}
+              onRemove={() => remove(activeRow)}
+            />
+          ) : (
+            <p className="text-sm text-muted-foreground">
+              {t("admin.trials.manage.resultCreate.additional.chooseRow")}
+            </p>
+          )}
+        </div>
+      </div>
+      <Sheet
+        open={isMobileWorkspace && state.mobileSheetOpen}
+        onOpenChange={(value) => dispatch({ type: "sheet", value })}
+      >
+        <SheetContent
+          className="overflow-y-auto lg:hidden"
+          closeLabel={t("admin.trials.manage.resultCreate.additional.close")}
+          onOpenAutoFocus={(event) => {
+            event.preventDefault();
+            mobileControlRef.current?.focus();
+          }}
+          onCloseAutoFocus={(event) => {
+            event.preventDefault();
+            rowTriggerRef.current?.focus();
+          }}
+        >
+          <SheetHeader>
+            <SheetTitle>
+              {activeRow ? `${activeRow.koodi} ${activeRow.label}` : ""}
+            </SheetTitle>
+            <SheetDescription>
+              {t("admin.trials.manage.resultCreate.additional.editorHelp")}
+            </SheetDescription>
+          </SheetHeader>
+          {activeRow ? (
+            <div className="p-4">
+              <RowEditor
+                row={activeRow}
+                eras={eras}
+                isPending={isPending}
+                onChangeCell={onChangeCell}
+                onRemove={() => remove(activeRow)}
+                setInitialControlRef={setMobileControlRef}
+              />
+            </div>
+          ) : null}
+        </SheetContent>
+      </Sheet>
+    </div>
+  );
+}
+
+function sanitize(kind: AdminTrialLisatietoInputKind, value: string) {
+  if (kind === "marker" || kind === "tri-state")
+    return value === "0" || value === "1" ? value : "";
+  if (kind === "text") return value;
+  const normalized = value.replace(",", ".");
+  return kind === "integer"
+    ? normalized.replace(/[^\d-]/g, "")
+    : normalized.replace(/[^\d.-]/g, "");
+}
+
+function RowEditor({
+  row,
+  eras,
+  isPending,
+  onChangeCell,
+  onRemove,
+  setInitialControlRef,
+}: {
+  row: LisatietoRowDraft;
+  eras: EraDraft[];
+  isPending: boolean;
+  onChangeCell: Props["onChangeCell"];
+  onRemove: () => void;
+  setInitialControlRef?: (element: HTMLElement | null) => void;
+}) {
+  const { t } = useI18n();
+  return (
+    <div className="space-y-4">
+      <div className="flex items-start justify-between gap-3">
+        <div>
+          <p className="font-semibold">
+            {row.koodi} {row.label}
+          </p>
+          <p className="text-sm text-muted-foreground">
+            {t(
+              `admin.trials.manage.resultCreate.valueHint.${row.valueHint ?? row.inputKind}` as never,
+            )}
+          </p>
+        </div>
+        <Button type="button" size="sm" variant="outline" onClick={onRemove}>
+          {t("admin.trials.manage.resultCreate.additional.remove")}
+        </Button>
+      </div>
+      {eras.map((era, index) => {
+        const value = row.eraValues[era.era] ?? "";
+        const label = `${t("admin.trials.manage.resultCreate.additional.era")} ${era.era}`;
+        const controlRef = index === 0 ? setInitialControlRef : undefined;
+        return (
+          <label key={era.era} className="block space-y-1 text-sm">
+            <span>{label}</span>
+            {row.inputKind === "marker" && row.useSemanticControl ? (
+              <input
+                ref={controlRef}
+                type="checkbox"
+                aria-label={`${row.koodi} ${row.label}, ${label}`}
+                checked={value === "1"}
+                disabled={isPending}
+                onChange={(event) =>
+                  onChangeCell(
+                    row.koodi,
+                    row.osa,
+                    era.era,
+                    event.target.checked ? "1" : "",
+                  )
+                }
+              />
+            ) : row.inputKind === "marker" || row.inputKind === "tri-state" ? (
+              <select
+                ref={controlRef}
+                className="h-10 w-full rounded-md border bg-background px-3"
+                aria-label={`${row.koodi} ${row.label}, ${label}`}
+                value={value}
+                disabled={isPending}
+                onChange={(event) =>
+                  onChangeCell(row.koodi, row.osa, era.era, event.target.value)
+                }
+              >
+                <option value="">-</option>
+                <option value="0">
+                  {row.inputKind === "tri-state"
+                    ? t("admin.trials.manage.resultCreate.triState.no")
+                    : "0"}
+                </option>
+                <option value="1">
+                  {row.inputKind === "tri-state"
+                    ? t("admin.trials.manage.resultCreate.triState.yes")
+                    : "1"}
+                </option>
+              </select>
+            ) : (
+              <Input
+                ref={controlRef}
+                aria-label={`${row.koodi} ${row.label}, ${label}`}
+                inputMode={
+                  row.inputKind === "text"
+                    ? "text"
+                    : row.inputKind === "integer"
+                      ? "numeric"
+                      : "decimal"
+                }
+                value={value}
+                disabled={isPending}
+                onChange={(event) =>
+                  onChangeCell(
+                    row.koodi,
+                    row.osa,
+                    era.era,
+                    sanitize(row.inputKind, event.target.value),
+                  )
+                }
+              />
+            )}
+          </label>
+        );
+      })}
+    </div>
+  );
+}
diff --git a/apps/web/components/admin/trials/internal/result-create-card.tsx b/apps/web/components/admin/trials/internal/result-create-card.tsx
new file mode 100644
index 00000000..d75e07d3
--- /dev/null
+++ b/apps/web/components/admin/trials/internal/result-create-card.tsx
@@ -0,0 +1,53 @@
+import React from "react";
+import { ChevronDown } from "lucide-react";
+import { Card, CardContent } from "@/components/ui/card";
+import { cn } from "@/lib/utils";
+
+type Props = {
+  id: string;
+  title: string;
+  summary?: string;
+  open: boolean;
+  onToggle: () => void;
+  children: React.ReactNode;
+};
+
+export function ResultCreateCard({
+  id,
+  title,
+  summary,
+  open,
+  onToggle,
+  children,
+}: Props) {
+  const contentId = `${id}-content`;
+  return (
+    <Card>
+      <button
+        type="button"
+        className="flex w-full items-center justify-between gap-4 p-5 text-left"
+        aria-expanded={open}
+        aria-controls={contentId}
+        onClick={onToggle}
+      >
+        <span>
+          <span className="block font-semibold">{title}</span>
+          {!open && summary ? (
+            <span className="mt-1 block text-sm text-muted-foreground">
+              {summary}
+            </span>
+          ) : null}
+        </span>
+        <ChevronDown
+          aria-hidden="true"
+          className={cn("size-4 transition-transform", open && "rotate-180")}
+        />
+      </button>
+      {open ? (
+        <CardContent id={contentId} className="border-t p-5">
+          {children}
+        </CardContent>
+      ) : null}
+    </Card>
+  );
+}
diff --git a/apps/web/components/ui/sheet.tsx b/apps/web/components/ui/sheet.tsx
index d6a4c237..48d91143 100644
--- a/apps/web/components/ui/sheet.tsx
+++ b/apps/web/components/ui/sheet.tsx
@@ -47,10 +47,12 @@ function SheetOverlay({
 function SheetContent({
   className,
   children,
+  closeLabel = "Close",
   side = "right",
   showCloseButton = true,
   ...props
 }: React.ComponentProps<typeof SheetPrimitive.Content> & {
+  closeLabel?: string;
   side?: "top" | "right" | "bottom" | "left";
   showCloseButton?: boolean;
 }) {
@@ -77,7 +79,7 @@ function SheetContent({
         {showCloseButton && (
           <SheetPrimitive.Close className="ring-offset-background focus:ring-ring data-[state=open]:bg-secondary absolute top-4 right-4 rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none">
             <XIcon className="size-4" />
-            <span className="sr-only">Close</span>
+            <span className="sr-only">{closeLabel}</span>
           </SheetPrimitive.Close>
         )}
       </SheetPrimitive.Content>
diff --git a/apps/web/hooks/admin/trials/manage/__tests__/use-result-create-workspace-mobile.test.ts b/apps/web/hooks/admin/trials/manage/__tests__/use-result-create-workspace-mobile.test.ts
new file mode 100644
index 00000000..bc53f08f
--- /dev/null
+++ b/apps/web/hooks/admin/trials/manage/__tests__/use-result-create-workspace-mobile.test.ts
@@ -0,0 +1,108 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { useResultCreateWorkspaceMobile } from "../use-result-create-workspace-mobile";
+
+const { hookState } = vi.hoisted(() => ({
+  hookState: {
+    index: 0,
+    stateSlots: [] as unknown[],
+    effectSlots: [] as Array<{ dependencies?: readonly unknown[] }>,
+    cleanups: [] as Array<() => void>,
+  },
+}));
+
+vi.mock("react", async () => {
+  const actual = await vi.importActual<typeof import("react")>("react");
+  const nextHookIndex = () => hookState.index++;
+
+  function mockUseEffect(
+    effect: () => void | (() => void),
+    dependencies?: readonly unknown[],
+  ) {
+    const index = nextHookIndex();
+    const previous = hookState.effectSlots[index];
+    const unchanged =
+      dependencies &&
+      previous?.dependencies &&
+      dependencies.length === previous.dependencies.length &&
+      dependencies.every((value, position) =>
+        Object.is(value, previous.dependencies?.[position]),
+      );
+    if (unchanged) return;
+
+    const cleanup = effect();
+    if (cleanup) hookState.cleanups.push(cleanup);
+    hookState.effectSlots[index] = { dependencies };
+  }
+
+  function mockUseState<T>(initialValue: T) {
+    const index = nextHookIndex();
+    if (!(index in hookState.stateSlots))
+      hookState.stateSlots[index] = initialValue;
+    const setState = (value: T) => {
+      hookState.stateSlots[index] = value;
+    };
+    return [hookState.stateSlots[index] as T, setState] as const;
+  }
+
+  return {
+    ...actual,
+    useEffect: mockUseEffect,
+    useState: mockUseState,
+  };
+});
+
+let matches = false;
+let changeListener: (() => void) | undefined;
+
+function HookHarness() {
+  return useResultCreateWorkspaceMobile();
+}
+
+function renderHook() {
+  hookState.index = 0;
+  return HookHarness();
+}
+
+describe("useResultCreateWorkspaceMobile", () => {
+  beforeEach(() => {
+    matches = false;
+    changeListener = undefined;
+    hookState.index = 0;
+    hookState.stateSlots = [];
+    hookState.effectSlots = [];
+    hookState.cleanups = [];
+    vi.stubGlobal("window", {
+      matchMedia: vi.fn(() => ({
+        get matches() {
+          return matches;
+        },
+        addEventListener: (_type: string, listener: () => void) => {
+          changeListener = listener;
+        },
+        removeEventListener: vi.fn(),
+      })),
+    });
+  });
+
+  afterEach(() => {
+    hookState.cleanups.forEach((cleanup) => cleanup());
+    vi.unstubAllGlobals();
+  });
+
+  it("matches the 1024px workspace breakpoint and updates on changes", () => {
+    matches = true;
+
+    renderHook();
+    expect(renderHook()).toBe(true);
+    expect(window.matchMedia).toHaveBeenCalledWith("(max-width: 1023px)");
+
+    matches = false;
+    changeListener?.();
+
+    expect(renderHook()).toBe(false);
+  });
+
+  it("starts in desktop mode", () => {
+    expect(renderHook()).toBe(false);
+  });
+});
diff --git a/apps/web/hooks/admin/trials/manage/use-result-create-workspace-mobile.ts b/apps/web/hooks/admin/trials/manage/use-result-create-workspace-mobile.ts
new file mode 100644
index 00000000..ddc3c9c1
--- /dev/null
+++ b/apps/web/hooks/admin/trials/manage/use-result-create-workspace-mobile.ts
@@ -0,0 +1,20 @@
+import * as React from "react";
+
+const RESULT_CREATE_WORKSPACE_BREAKPOINT = 1024;
+
+export function useResultCreateWorkspaceMobile() {
+  const [isMobile, setIsMobile] = React.useState(false);
+
+  React.useEffect(() => {
+    const query = window.matchMedia(
+      `(max-width: ${RESULT_CREATE_WORKSPACE_BREAKPOINT - 1}px)`,
+    );
+    const update = () => setIsMobile(query.matches);
+
+    query.addEventListener("change", update);
+    update();
+    return () => query.removeEventListener("change", update);
+  }, []);
+
+  return isMobile;
+}
diff --git a/apps/web/lib/admin/trials/__tests__/lisatiedot-workspace-state.test.ts b/apps/web/lib/admin/trials/__tests__/lisatiedot-workspace-state.test.ts
new file mode 100644
index 00000000..1e319489
--- /dev/null
+++ b/apps/web/lib/admin/trials/__tests__/lisatiedot-workspace-state.test.ts
@@ -0,0 +1,127 @@
+import { describe, expect, it } from "vitest";
+import type { LisatietoRowDraft } from "@/lib/admin/trials/entry-edit-dialog-model";
+import {
+  createLisatiedotWorkspaceState,
+  filterLisatietoRows,
+  lisatiedotWorkspaceReducer,
+} from "../lisatiedot-workspace-state";
+
+const rows: LisatietoRowDraft[] = [
+  {
+    koodi: "10",
+    osa: "",
+    nimi: "Vaativat olosuhteet",
+    jarjestys: 10,
+    group: "olosuhteet",
+    label: "Vaativat olosuhteet",
+    inputKind: "marker",
+    sortOrder: 10,
+    eraValues: { 1: "1" },
+  },
+  {
+    koodi: "20",
+    osa: "",
+    nimi: "Haku",
+    jarjestys: 20,
+    group: "haku",
+    label: "Haku",
+    inputKind: "integer",
+    sortOrder: 20,
+    eraValues: { 1: "" },
+  },
+];
+
+describe("lisatiedot workspace reducer", () => {
+  it("rebuilds selection from draft values and resets all transient state", () => {
+    let state = createLisatiedotWorkspaceState(rows);
+    expect([...state.selectedRows]).toEqual(["10:"]);
+    state = lisatiedotWorkspaceReducer(state, {
+      type: "query",
+      value: "haku",
+    });
+    state = lisatiedotWorkspaceReducer(state, {
+      type: "active",
+      value: "20:",
+      mobile: true,
+    });
+
+    state = lisatiedotWorkspaceReducer(state, {
+      type: "reset",
+      rows: [rows[1]!],
+    });
+
+    expect(state).toEqual(createLisatiedotWorkspaceState([rows[1]!]));
+  });
+
+  it("keeps selection when only values are cleared and removes it explicitly", () => {
+    let state = createLisatiedotWorkspaceState(rows);
+    state = lisatiedotWorkspaceReducer(state, {
+      type: "select",
+      value: "20:",
+    });
+    expect(state.selectedRows.has("20:")).toBe(true);
+
+    state = lisatiedotWorkspaceReducer(state, {
+      type: "remove",
+      value: "20:",
+    });
+    expect(state.selectedRows.has("20:")).toBe(false);
+    expect(state.activeRow).toBeNull();
+  });
+
+  it("opens the same active row only when selection comes from mobile", () => {
+    let state = createLisatiedotWorkspaceState(rows);
+    state = lisatiedotWorkspaceReducer(state, {
+      type: "active",
+      value: "20:",
+      mobile: false,
+    });
+    expect(state.activeRow).toBe("20:");
+    expect(state.mobileSheetOpen).toBe(false);
+
+    state = lisatiedotWorkspaceReducer(state, {
+      type: "active",
+      value: "20:",
+      mobile: true,
+    });
+    expect(state.activeRow).toBe("20:");
+    expect(state.mobileSheetOpen).toBe(true);
+
+    state = lisatiedotWorkspaceReducer(state, {
+      type: "sheet",
+      value: false,
+    });
+    expect(state.mobileSheetOpen).toBe(false);
+  });
+
+  it("supports independent group expansion and expand/collapse all", () => {
+    let state = createLisatiedotWorkspaceState(rows);
+    state = lisatiedotWorkspaceReducer(state, {
+      type: "expand",
+      values: ["olosuhteet", "haku"],
+    });
+    expect([...state.expandedGroups]).toEqual(["olosuhteet", "haku"]);
+    state = lisatiedotWorkspaceReducer(state, {
+      type: "toggleGroup",
+      value: "haku",
+    });
+    expect([...state.expandedGroups]).toEqual(["olosuhteet"]);
+    state = lisatiedotWorkspaceReducer(state, { type: "collapse" });
+    expect(state.expandedGroups.size).toBe(0);
+  });
+
+  it("searches localized names and codes within a business group", () => {
+    expect(
+      filterLisatietoRows(rows, "haku", "haku").map((row) => row.koodi),
+    ).toEqual(["10", "20"]);
+    expect(
+      filterLisatietoRows(rows, "20", "haku").map((row) => row.koodi),
+    ).toEqual(["10", "20"]);
+  });
+
+  it("keeps valued rows visible through search and group filters", () => {
+    expect(
+      filterLisatietoRows(rows, "not-found", "haku").map((row) => row.koodi),
+    ).toEqual(["10"]);
+  });
+});
diff --git a/apps/web/lib/admin/trials/__tests__/result-create-field-registry.test.ts b/apps/web/lib/admin/trials/__tests__/result-create-field-registry.test.ts
index e97f7e6d..e2fe228f 100644
--- a/apps/web/lib/admin/trials/__tests__/result-create-field-registry.test.ts
+++ b/apps/web/lib/admin/trials/__tests__/result-create-field-registry.test.ts
@@ -1,10 +1,23 @@
 import { describe, expect, it } from "vitest";
+import { ADMIN_TRIAL_LISATIETO_GROUP_ORDER } from "../entry-edit-config";
 import {
   resolveResultCreateFieldSet,
   SEEDED_TRIAL_RULE_WINDOW_IDS,
 } from "../result-create-field-registry";
 
 describe("result create field registry", () => {
+  it("uses the official PDF domain order for lisatieto groups", () => {
+    expect(ADMIN_TRIAL_LISATIETO_GROUP_ORDER).toEqual([
+      "olosuhteet",
+      "haku",
+      "haukku",
+      "metsastysinto",
+      "ajo",
+      "muut_ominaisuudet",
+      "unknown",
+    ]);
+  });
+
   it("registers the verified 2023+ field set from the persisted rule window", () => {
     const fieldSet = resolveResultCreateFieldSet("trw_post_20230801");
 
@@ -18,6 +31,97 @@ describe("result create field registry", () => {
       entry: "Ajotaito",
       era: "ajotaito",
     });
+    expect(fieldSet.presentationGroups.map((group) => group.id)).toEqual([
+      "basic",
+      "time",
+      "merit",
+      "loss",
+      "result",
+      "judges",
+    ]);
+    expect(
+      fieldSet.presentationGroups.flatMap((group) => group.entryFields),
+    ).not.toContain("tja");
+    expect(
+      fieldSet.presentationGroups.find((group) => group.id === "time"),
+    ).toEqual({
+      id: "time",
+      entryFields: ["hyvaksytytAjominuutit", "ajoajanPisteet"],
+      eraFields: ["alkoi", "hakumin", "ajomin"],
+    });
+    expect(
+      Object.fromEntries(
+        fieldSet.presentationGroups.map((group) => [
+          group.id,
+          {
+            entry: group.entryFields,
+            era: group.eraFields,
+          },
+        ]),
+      ),
+    ).toEqual({
+      basic: {
+        entry: [
+          "koemaasto",
+          "koemuoto",
+          "koetyyppi",
+          "lk",
+          "omistajaSnapshot",
+          "omistajanKotikuntaSnapshot",
+        ],
+        era: [],
+      },
+      time: {
+        entry: ["hyvaksytytAjominuutit", "ajoajanPisteet"],
+        era: ["alkoi", "hakumin", "ajomin"],
+      },
+      merit: {
+        entry: ["haku", "hauk", "yva", "ansiopisteetYhteensa"],
+        era: ["haku", "hauk", "yva"],
+      },
+      loss: {
+        entry: ["hlo", "alo", "tappiopisteetYhteensa"],
+        era: ["hlo", "alo"],
+      },
+      result: {
+        entry: [
+          "ke",
+          "award",
+          "points",
+          "rank",
+          "koiriaLuokassa",
+          "huomautus",
+          "huomautusTeksti",
+        ],
+        era: ["huomautusTeksti"],
+      },
+      judges: {
+        entry: [
+          "ryhmatuomariNimi",
+          "palkintotuomariNimi",
+          "judge",
+          "ylituomariNumeroSnapshot",
+        ],
+        era: [],
+      },
+    });
+  });
+
+  it("presentation grouping neither adds nor removes visible fields", () => {
+    for (const id of ["trw_post_20230801", null] as const) {
+      const fieldSet = resolveResultCreateFieldSet(id);
+      const groupedEntryFields = fieldSet.presentationGroups.flatMap(
+        (group) => group.entryFields,
+      );
+      const groupedEraFields = fieldSet.presentationGroups.flatMap(
+        (group) => group.eraFields,
+      );
+
+      expect(new Set(groupedEntryFields)).toEqual(fieldSet.entryFields);
+      expect(groupedEntryFields).toHaveLength(new Set(groupedEntryFields).size);
+      expect(new Set(groupedEraFields)).toEqual(fieldSet.eraFields);
+      expect(groupedEraFields).toHaveLength(new Set(groupedEraFields).size);
+    }
   });
 
   it("matches the verified 2023+ lisatieto codes, parts, order and kinds", () => {
diff --git a/apps/web/lib/admin/trials/entry-edit-config.ts b/apps/web/lib/admin/trials/entry-edit-config.ts
index d8dd3cfa..f38b27e6 100644
--- a/apps/web/lib/admin/trials/entry-edit-config.ts
+++ b/apps/web/lib/admin/trials/entry-edit-config.ts
@@ -41,6 +41,16 @@ export type AdminTrialLisatietoConfig = {
   useSemanticControl?: boolean;
 };
 
+export const ADMIN_TRIAL_LISATIETO_GROUP_ORDER = [
+  "olosuhteet",
+  "haku",
+  "haukku",
+  "metsastysinto",
+  "ajo",
+  "muut_ominaisuudet",
+  "unknown",
+] as const satisfies readonly AdminTrialLisatietoGroup[];
+
 function defineLisatieto(
   koodi: string,
   group: AdminTrialLisatietoGroup,
diff --git a/apps/web/lib/admin/trials/lisatiedot-workspace-state.ts b/apps/web/lib/admin/trials/lisatiedot-workspace-state.ts
new file mode 100644
index 00000000..06faf1eb
--- /dev/null
+++ b/apps/web/lib/admin/trials/lisatiedot-workspace-state.ts
@@ -0,0 +1,116 @@
+import type { LisatietoRowDraft } from "@/lib/admin/trials/entry-edit-dialog-model";
+
+export type LisatiedotWorkspaceState = {
+  query: string;
+  activeGroup: string | null;
+  expandedGroups: ReadonlySet<string>;
+  selectedRows: ReadonlySet<string>;
+  activeRow: string | null;
+  mobileSheetOpen: boolean;
+};
+
+export type LisatiedotWorkspaceAction =
+  | { type: "query"; value: string }
+  | { type: "group"; value: string | null }
+  | { type: "toggleGroup"; value: string }
+  | { type: "expand"; values: string[] }
+  | { type: "collapse" }
+  | { type: "select"; value: string }
+  | { type: "remove"; value: string }
+  | { type: "active"; value: string | null; mobile?: boolean }
+  | { type: "sheet"; value: boolean }
+  | { type: "reset"; rows: LisatietoRowDraft[] };
+
+export const lisatietoRowKey = (
+  row: Pick<LisatietoRowDraft, "koodi" | "osa">,
+) => `${row.koodi}:${row.osa}`;
+
+export function selectedLisatietoKeys(rows: LisatietoRowDraft[]) {
+  return new Set(
+    rows
+      .filter((row) =>
+        Object.values(row.eraValues).some((value) => value !== ""),
+      )
+      .map(lisatietoRowKey),
+  );
+}
+
+export function filterLisatietoRows(
+  rows: LisatietoRowDraft[],
+  query: string,
+  activeGroup: string | null,
+) {
+  const normalizedQuery = query.trim().toLocaleLowerCase();
+  return rows.filter((row) => {
+    const hasValue = Object.values(row.eraValues).some((value) => value !== "");
+    const matchesGroup = !activeGroup || row.group === activeGroup;
+    const matchesQuery =
+      !normalizedQuery ||
+      `${row.koodi} ${row.osa} ${row.label}`
+        .toLocaleLowerCase()
+        .includes(normalizedQuery);
+    return hasValue || (matchesGroup && matchesQuery);
+  });
+}
+
+export function createLisatiedotWorkspaceState(
+  rows: LisatietoRowDraft[],
+): LisatiedotWorkspaceState {
+  return {
+    query: "",
+    activeGroup: null,
+    expandedGroups: new Set(),
+    selectedRows: selectedLisatietoKeys(rows),
+    activeRow: null,
+    mobileSheetOpen: false,
+  };
+}
+
+export function lisatiedotWorkspaceReducer(
+  state: LisatiedotWorkspaceState,
+  action: LisatiedotWorkspaceAction,
+): LisatiedotWorkspaceState {
+  switch (action.type) {
+    case "query":
+      return { ...state, query: action.value };
+    case "group":
+      return { ...state, activeGroup: action.value };
+    case "toggleGroup": {
+      const expandedGroups = new Set(state.expandedGroups);
+      if (expandedGroups.has(action.value)) expandedGroups.delete(action.value);
+      else expandedGroups.add(action.value);
+      return { ...state, expandedGroups };
+    }
+    case "expand":
+      return { ...state, expandedGroups: new Set(action.values) };
+    case "collapse":
+      return { ...state, expandedGroups: new Set() };
+    case "select":
+      return {
+        ...state,
+        selectedRows: new Set([...state.selectedRows, action.value]),
+        activeRow: action.value,
+      };
+    case "remove": {
+      const selectedRows = new Set(state.selectedRows);
+      selectedRows.delete(action.value);
+      return {
+        ...state,
+        selectedRows,
+        activeRow: state.activeRow === action.value ? null : state.activeRow,
+        mobileSheetOpen:
+          state.activeRow === action.value ? false : state.mobileSheetOpen,
+      };
+    }
+    case "active":
+      return {
+        ...state,
+        activeRow: action.value,
+        mobileSheetOpen: action.mobile ?? state.mobileSheetOpen,
+      };
+    case "sheet":
+      return { ...state, mobileSheetOpen: action.value };
+    case "reset":
+      return createLisatiedotWorkspaceState(action.rows);
+  }
+}
diff --git a/apps/web/lib/admin/trials/result-create-field-registry.ts b/apps/web/lib/admin/trials/result-create-field-registry.ts
index 654f458e..7b6cab4d 100644
--- a/apps/web/lib/admin/trials/result-create-field-registry.ts
+++ b/apps/web/lib/admin/trials/result-create-field-registry.ts
@@ -10,6 +10,13 @@ export type ResultCreateSemanticInputKind =
   | "tri-state";
 
 export type ResultCreateValueHint = "marker" | "integer" | "decimal" | "text";
+export type ResultCreatePresentationGroup =
+  | "basic"
+  | "time"
+  | "merit"
+  | "loss"
+  | "result"
+  | "judges";
 
 export type ResultCreateLisatietoField = AdminTrialLisatietoConfig & {
   inputKind: ResultCreateSemanticInputKind;
@@ -25,6 +32,11 @@ export type ResultCreateFieldSet = {
     | "admin.trials.manage.resultCreate.rulePeriod.unverified";
   entryFields: ReadonlySet<keyof EntryDraft>;
   eraFields: ReadonlySet<Exclude<keyof EraDraft, "era">>;
+  presentationGroups: readonly {
+    id: ResultCreatePresentationGroup;
+    entryFields: readonly (keyof EntryDraft)[];
+    eraFields: readonly Exclude<keyof EraDraft, "era">[];
+  }[];
   yvaLabels?: {
     entry: string;
     era: string;
@@ -137,6 +149,69 @@ const POST_2023_LISATIEDOT = ADMIN_TRIAL_LISATIETO_CONFIG.filter(
   hideOsaSuffix: config.koodi === "25" || config.koodi === "27",
 }));
 
+const PRESENTATION_GROUP_ENTRY_FIELDS: Record<
+  ResultCreatePresentationGroup,
+  readonly (keyof EntryDraft)[]
+> = {
+  basic: [
+    "koemaasto",
+    "koemuoto",
+    "koetyyppi",
+    "lk",
+    "omistajaSnapshot",
+    "omistajanKotikuntaSnapshot",
+  ],
+  time: ["hyvaksytytAjominuutit", "ajoajanPisteet"],
+  merit: ["haku", "hauk", "yva", "ansiopisteetYhteensa", "tja", "pin"],
+  loss: ["hlo", "alo", "tappiopisteetYhteensa"],
+  result: [
+    "ke",
+    "award",
+    "points",
+    "rank",
+    "koiriaLuokassa",
+    "huomautus",
+    "huomautusTeksti",
+  ],
+  judges: [
+    "ryhmatuomariNimi",
+    "palkintotuomariNimi",
+    "judge",
+    "ylituomariNumeroSnapshot",
+  ],
+};
+
+const PRESENTATION_GROUP_ERA_FIELDS: Record<
+  ResultCreatePresentationGroup,
+  readonly Exclude<keyof EraDraft, "era">[]
+> = {
+  basic: [],
+  time: ["alkoi", "hakumin", "ajomin"],
+  merit: ["haku", "hauk", "yva", "tja", "pin"],
+  loss: ["hlo", "alo"],
+  result: ["huomautusTeksti"],
+  judges: [],
+};
+
+function createPresentationGroups(
+  visibleEntryFields: ReadonlySet<keyof EntryDraft>,
+  visibleEraFields: ReadonlySet<Exclude<keyof EraDraft, "era">>,
+) {
+  return (
+    Object.keys(
+      PRESENTATION_GROUP_ENTRY_FIELDS,
+    ) as ResultCreatePresentationGroup[]
+  ).map((id) => ({
+    id,
+    entryFields: PRESENTATION_GROUP_ENTRY_FIELDS[id].filter((field) =>
+      visibleEntryFields.has(field),
+    ),
+    eraFields: PRESENTATION_GROUP_ERA_FIELDS[id].filter((field) =>
+      visibleEraFields.has(field),
+    ),
+  }));
+}
+
 const POST_2023_FIELD_SET: ResultCreateFieldSet = {
   id: "post-2023",
   verified: true,
@@ -147,6 +222,16 @@ const POST_2023_FIELD_SET: ResultCreateFieldSet = {
   eraFields: new Set(
     [...ALL_ERA_FIELDS].filter((field) => field !== "tja" && field !== "pin"),
   ),
+  presentationGroups: createPresentationGroups(
+    new Set(
+      [...ALL_ENTRY_FIELDS].filter(
+        (field) => field !== "tja" && field !== "pin",
+      ),
+    ),
+    new Set(
+      [...ALL_ERA_FIELDS].filter((field) => field !== "tja" && field !== "pin"),
+    ),
+  ),
   yvaLabels: {
     entry: "Ajotaito",
     era: "ajotaito",
@@ -161,6 +246,10 @@ const UNVERIFIED_FALLBACK_FIELD_SET: ResultCreateFieldSet = {
     "admin.trials.manage.resultCreate.rulePeriod.unverified",
   entryFields: ALL_ENTRY_FIELDS,
   eraFields: ALL_ERA_FIELDS,
+  presentationGroups: createPresentationGroups(
+    ALL_ENTRY_FIELDS,
+    ALL_ERA_FIELDS,
+  ),
   lisatiedot: FALLBACK_LISATIEDOT,
 };
 
diff --git a/apps/web/lib/i18n/messages/admin/trials/manage.ts b/apps/web/lib/i18n/messages/admin/trials/manage.ts
index 8cde11ac..09549415 100644
--- a/apps/web/lib/i18n/messages/admin/trials/manage.ts
+++ b/apps/web/lib/i18n/messages/admin/trials/manage.ts
@@ -68,6 +68,31 @@ export const fiAdminTrialsManageMessages = {
   "admin.trials.manage.resultCreate.backToWorkspace":
     "Takaisin tapahtuman sivulle",
   "admin.trials.manage.resultCreate.registration": "Rekisterinumero",
+  "admin.trials.manage.resultCreate.card.basic": "Koiran ja kokeen tiedot",
+  "admin.trials.manage.resultCreate.card.time": "Koe-erät ja ajoaika",
+  "admin.trials.manage.resultCreate.card.merit": "Ansiopisteet",
+  "admin.trials.manage.resultCreate.card.loss": "Tappiopisteet",
+  "admin.trials.manage.resultCreate.card.result": "Tulos ja huomautukset",
+  "admin.trials.manage.resultCreate.card.judges": "Tuomarit",
+  "admin.trials.manage.resultCreate.card.additional": "Lisätiedot",
+  "admin.trials.manage.resultCreate.summary.empty": "Ei tietoja",
+  "admin.trials.manage.resultCreate.summary.eras": "erää",
+  "admin.trials.manage.resultCreate.summary.selected": "valittua",
+  "admin.trials.manage.resultCreate.additional.search": "Hae lisätietoa",
+  "admin.trials.manage.resultCreate.additional.searchPlaceholder":
+    "Hae koodilla tai nimellä",
+  "admin.trials.manage.resultCreate.additional.expandAll": "Laajenna kaikki",
+  "admin.trials.manage.resultCreate.additional.collapseAll": "Supista kaikki",
+  "admin.trials.manage.resultCreate.additional.groups": "Lisätietoryhmät",
+  "admin.trials.manage.resultCreate.additional.allGroups": "Kaikki",
+  "admin.trials.manage.resultCreate.additional.selected": "Valitut lisätiedot",
+  "admin.trials.manage.resultCreate.additional.remove": "Poista",
+  "admin.trials.manage.resultCreate.additional.close": "Sulje",
+  "admin.trials.manage.resultCreate.additional.chooseRow":
+    "Valitse lisätieto muokattavaksi.",
+  "admin.trials.manage.resultCreate.additional.editorHelp":
+    "Anna arvot eräkohtaisesti.",
+  "admin.trials.manage.resultCreate.additional.era": "Erä",
   "admin.trials.manage.resultCreate.rulePeriod.post2023": "Säännöt: 1.8.2023 →",
   "admin.trials.manage.resultCreate.rulePeriod.unverified":
     "Säännöt: historiallinen tai määrittämätön sääntökausi",
@@ -282,6 +307,33 @@ export const svAdminTrialsManageMessages = {
   "admin.trials.manage.resultCreate.backToWorkspace":
     "Tillbaka till evenemangssidan",
   "admin.trials.manage.resultCreate.registration": "Registreringsnummer",
+  "admin.trials.manage.resultCreate.card.basic":
+    "Hundens och provets uppgifter",
+  "admin.trials.manage.resultCreate.card.time": "Provomgångar och drevtid",
+  "admin.trials.manage.resultCreate.card.merit": "Förtjänstpoäng",
+  "admin.trials.manage.resultCreate.card.loss": "Minuspoäng",
+  "admin.trials.manage.resultCreate.card.result": "Resultat och anmärkningar",
+  "admin.trials.manage.resultCreate.card.judges": "Domare",
+  "admin.trials.manage.resultCreate.card.additional": "Tilläggsuppgifter",
+  "admin.trials.manage.resultCreate.summary.empty": "Inga uppgifter",
+  "admin.trials.manage.resultCreate.summary.eras": "omgångar",
+  "admin.trials.manage.resultCreate.summary.selected": "valda",
+  "admin.trials.manage.resultCreate.additional.search": "Sök tilläggsuppgift",
+  "admin.trials.manage.resultCreate.additional.searchPlaceholder":
+    "Sök med kod eller namn",
+  "admin.trials.manage.resultCreate.additional.expandAll": "Expandera alla",
+  "admin.trials.manage.resultCreate.additional.collapseAll": "Fäll ihop alla",
+  "admin.trials.manage.resultCreate.additional.groups": "Tilläggsgrupper",
+  "admin.trials.manage.resultCreate.additional.allGroups": "Alla",
+  "admin.trials.manage.resultCreate.additional.selected":
+    "Valda tilläggsuppgifter",
+  "admin.trials.manage.resultCreate.additional.remove": "Ta bort",
+  "admin.trials.manage.resultCreate.additional.close": "Stäng",
+  "admin.trials.manage.resultCreate.additional.chooseRow":
+    "Välj en tilläggsuppgift att redigera.",
+  "admin.trials.manage.resultCreate.additional.editorHelp":
+    "Ange värden per omgång.",
+  "admin.trials.manage.resultCreate.additional.era": "Omgång",
   "admin.trials.manage.resultCreate.rulePeriod.post2023": "Regler: 1.8.2023 →",
   "admin.trials.manage.resultCreate.rulePeriod.unverified":
     "Regler: historisk eller obestämd regelperiod",
diff --git a/docs/features/admin-trial-management.md b/docs/features/admin-trial-management.md
index 0be1545b..e21c1d9e 100644
--- a/docs/features/admin-trial-management.md
+++ b/docs/features/admin-trial-management.md
@@ -23,6 +23,12 @@ and follow-up admin flow redesign).
   complete compatibility form with a warning. The canonical timeline, field
   sets, and fallback semantics are documented in
   [Trial rule windows](./trials/rule-windows.md).
+- Manual result creation presents the unchanged single draft in independently
+  collapsible cards grouped by the official PDF's domain structure without
+  copying its matrix geometry. Era- and entry-level values remain separate
+  controlled draft fields inside their shared domain card. Lisätiedot uses a
+  searchable, business-domain-grouped workspace with one controlled row
+  editor; removing a selected row clears its unsaved era values.
 
 ## Main files
 
@@ -106,6 +112,15 @@ and follow-up admin flow redesign).
   set and an unverified-field warning. See
   [Trial rule windows](./trials/rule-windows.md) for the complete verified
   configuration and compatibility boundary.
+- Result-create cards may be expanded independently. Koiran ja kokeen tiedot is
+  initially open, followed by Koe-erät ja ajoaika, Ansiopisteet,
+  Tappiopisteet, Tulos ja huomautukset, Tuomarit, and Lisätiedot. Saving while
+  continuing with another dog resets both the draft and presentation state
+  back to Koiran ja kokeen tiedot. Card summaries only repeat entered display
+  values and do not calculate result data.
+- Lisätiedot groups follow the PDF domain order: Olosuhteet, Haku, Haukku,
+  Metsästysinto, Ajo, and Muut ominaisuudet. The workspace does not reproduce
+  the PDF matrix.
 - Selected dog rows have PDF, edit, and result-delete actions.
 - A missing workspace event is shown explicitly and never falls back to a
   different event.

From 4bb2992ad5fd3555ebd105386072624cc880d4e1 Mon Sep 17 00:00:00 2001
From: Aki Kuivas <91662678+asku1990@users.noreply.github.com>
Date: Sun, 2 Aug 2026 19:29:38 +0300
Subject: [PATCH 2/3] =?UTF-8?q?fix(trials):=20simplify=20Lis=C3=A4tiedot?=
 =?UTF-8?q?=20workspace?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  Remove unfinished Lisätiedot search, filtering, bulk expansion
  controls,
  and selected-row chips. Keep PDF-domain groups individually
  collapsible
  with shared desktop/mobile row activation and draft ownership.

  Update reducer tests, accessibility labels, translations, and admin
  trial
  documentation to reflect the simpler workflow.

  Validation already run successfully: focused tests, web typecheck,
  targeted ESLint, and git diff --check.
---
 .../admin-trial-entry-create-page-client.tsx  |   1 -
 .../trials/internal/lisatiedot-workspace.tsx  | 104 ++----------------
 .../lisatiedot-workspace-state.test.ts        | 103 +++++------------
 .../trials/lisatiedot-workspace-state.ts      |  64 +----------
 .../lib/i18n/messages/admin/trials/manage.ts  |  19 ----
 docs/features/admin-trial-management.md       |   4 +-
 6 files changed, 43 insertions(+), 252 deletions(-)

diff --git a/apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx b/apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx
index 8c46ddbb..0ddcf530 100644
--- a/apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx
+++ b/apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx
@@ -509,7 +509,6 @@ function ResultCreateForm({
       <ResultCreateCard
         id="result-create-additional"
         title={t("admin.trials.manage.resultCreate.card.additional")}
-        summary={`${draft.lisatiedotRows.filter((row) => Object.values(row.eraValues).some(Boolean)).length} ${t("admin.trials.manage.resultCreate.summary.selected")}`}
         open={openCards.has("additional")}
         onToggle={() => toggleCard("additional")}
       >
diff --git a/apps/web/components/admin/trials/internal/lisatiedot-workspace.tsx b/apps/web/components/admin/trials/internal/lisatiedot-workspace.tsx
index 199109c4..312e395e 100644
--- a/apps/web/components/admin/trials/internal/lisatiedot-workspace.tsx
+++ b/apps/web/components/admin/trials/internal/lisatiedot-workspace.tsx
@@ -23,7 +23,6 @@ import type {
 } from "@/lib/admin/trials/entry-edit-dialog-model";
 import {
   createLisatiedotWorkspaceState,
-  filterLisatietoRows,
   lisatietoRowKey,
   lisatiedotWorkspaceReducer,
 } from "@/lib/admin/trials/lisatiedot-workspace-state";
@@ -56,8 +55,8 @@ export function LisatiedotWorkspace({
   const { t } = useI18n();
   const [state, dispatch] = React.useReducer(
     lisatiedotWorkspaceReducer,
-    rows,
-    createLisatiedotWorkspaceState,
+    undefined,
+    () => createLisatiedotWorkspaceState(),
   );
   const isMobileWorkspace = useResultCreateWorkspaceMobile();
   const mobileControlRef = React.useRef<HTMLElement | null>(null);
@@ -81,10 +80,6 @@ export function LisatiedotWorkspace({
       ),
     [rows],
   );
-  const visibleRows = filterLisatietoRows(rows, state.query, state.activeGroup);
-  const selectedRows = rows.filter((row) =>
-    state.selectedRows.has(lisatietoRowKey(row)),
-  );
   const activeRow =
     rows.find((row) => lisatietoRowKey(row) === state.activeRow) ?? null;
 
@@ -94,14 +89,13 @@ export function LisatiedotWorkspace({
     }
   }, [isMobileWorkspace, state.mobileSheetOpen]);
 
-  function select(
+  function activate(
     row: LisatietoRowDraft,
     mobile: boolean,
     trigger: HTMLButtonElement,
   ) {
     const key = lisatietoRowKey(row);
     rowTriggerRef.current = trigger;
-    dispatch({ type: "select", value: key });
     dispatch({ type: "active", value: key, mobile });
   }
   function remove(row: LisatietoRowDraft) {
@@ -111,90 +105,10 @@ export function LisatiedotWorkspace({
 
   return (
     <div className="space-y-4">
-      <div className="grid gap-3 lg:grid-cols-[minmax(0,1fr)_auto]">
-        <label className="space-y-1 text-sm">
-          <span>{t("admin.trials.manage.resultCreate.additional.search")}</span>
-          <Input
-            value={state.query}
-            placeholder={t(
-              "admin.trials.manage.resultCreate.additional.searchPlaceholder",
-            )}
-            onChange={(event) =>
-              dispatch({ type: "query", value: event.target.value })
-            }
-          />
-        </label>
-        <div className="flex flex-wrap items-end gap-2">
-          <Button
-            type="button"
-            size="sm"
-            variant="outline"
-            onClick={() => dispatch({ type: "expand", values: groups })}
-          >
-            {t("admin.trials.manage.resultCreate.additional.expandAll")}
-          </Button>
-          <Button
-            type="button"
-            size="sm"
-            variant="outline"
-            onClick={() => dispatch({ type: "collapse" })}
-          >
-            {t("admin.trials.manage.resultCreate.additional.collapseAll")}
-          </Button>
-        </div>
-      </div>
-      <div
-        className="flex flex-wrap gap-2"
-        aria-label={t("admin.trials.manage.resultCreate.additional.groups")}
-      >
-        <Button
-          type="button"
-          size="sm"
-          variant={state.activeGroup === null ? "default" : "outline"}
-          onClick={() => dispatch({ type: "group", value: null })}
-        >
-          {t("admin.trials.manage.resultCreate.additional.allGroups")}
-        </Button>
-        {groups.map((group) => (
-          <Button
-            key={group}
-            type="button"
-            size="sm"
-            variant={state.activeGroup === group ? "default" : "outline"}
-            onClick={() => dispatch({ type: "group", value: group })}
-          >
-            {groupLabel(group)}
-          </Button>
-        ))}
-      </div>
-      {selectedRows.length ? (
-        <div
-          className="flex flex-wrap gap-2"
-          aria-label={t("admin.trials.manage.resultCreate.additional.selected")}
-        >
-          {selectedRows.map((row) => (
-            <span
-              key={lisatietoRowKey(row)}
-              className="inline-flex items-center gap-1 rounded-full bg-muted px-3 py-1 text-sm"
-            >
-              {row.koodi} {row.label}
-              <button
-                type="button"
-                className="rounded px-1"
-                aria-label={`${t("admin.trials.manage.resultCreate.additional.remove")} ${row.koodi} ${row.label}`}
-                onClick={() => remove(row)}
-              >
-                ×
-              </button>
-            </span>
-          ))}
-        </div>
-      ) : null}
       <div className="grid gap-4 lg:grid-cols-[minmax(260px,0.8fr)_minmax(0,1.2fr)]">
         <div className="space-y-2">
           {groups.map((group) => {
-            const groupRows = visibleRows.filter((row) => row.group === group);
-            if (!groupRows.length) return null;
+            const groupRows = rows.filter((row) => row.group === group);
             const expanded = state.expandedGroups.has(group);
             return (
               <div key={group} className="rounded-md border">
@@ -216,7 +130,7 @@ export function LisatiedotWorkspace({
                         type="button"
                         className="block w-full rounded p-2 text-left hover:bg-muted"
                         onClick={(event) =>
-                          select(row, isMobileWorkspace, event.currentTarget)
+                          activate(row, isMobileWorkspace, event.currentTarget)
                         }
                       >
                         <span className="font-medium">{row.koodi}</span>{" "}
@@ -326,7 +240,13 @@ function RowEditor({
             )}
           </p>
         </div>
-        <Button type="button" size="sm" variant="outline" onClick={onRemove}>
+        <Button
+          type="button"
+          size="sm"
+          variant="outline"
+          aria-label={`${t("admin.trials.manage.resultCreate.additional.remove")} ${row.koodi} ${row.label}`}
+          onClick={onRemove}
+        >
           {t("admin.trials.manage.resultCreate.additional.remove")}
         </Button>
       </div>
diff --git a/apps/web/lib/admin/trials/__tests__/lisatiedot-workspace-state.test.ts b/apps/web/lib/admin/trials/__tests__/lisatiedot-workspace-state.test.ts
index 1e319489..7bf063d0 100644
--- a/apps/web/lib/admin/trials/__tests__/lisatiedot-workspace-state.test.ts
+++ b/apps/web/lib/admin/trials/__tests__/lisatiedot-workspace-state.test.ts
@@ -1,42 +1,13 @@
 import { describe, expect, it } from "vitest";
-import type { LisatietoRowDraft } from "@/lib/admin/trials/entry-edit-dialog-model";
 import {
   createLisatiedotWorkspaceState,
-  filterLisatietoRows,
   lisatiedotWorkspaceReducer,
 } from "../lisatiedot-workspace-state";
 
-const rows: LisatietoRowDraft[] = [
-  {
-    koodi: "10",
-    osa: "",
-    nimi: "Vaativat olosuhteet",
-    jarjestys: 10,
-    group: "olosuhteet",
-    label: "Vaativat olosuhteet",
-    inputKind: "marker",
-    sortOrder: 10,
-    eraValues: { 1: "1" },
-  },
-  {
-    koodi: "20",
-    osa: "",
-    nimi: "Haku",
-    jarjestys: 20,
-    group: "haku",
-    label: "Haku",
-    inputKind: "integer",
-    sortOrder: 20,
-    eraValues: { 1: "" },
-  },
-];
-
 describe("lisatiedot workspace reducer", () => {
-  it("rebuilds selection from draft values and resets all transient state", () => {
-    let state = createLisatiedotWorkspaceState(rows);
-    expect([...state.selectedRows]).toEqual(["10:"]);
-    state = lisatiedotWorkspaceReducer(state, {
-      type: "query",
+  it("resets all transient workspace state", () => {
+    let state = lisatiedotWorkspaceReducer(createLisatiedotWorkspaceState(), {
+      type: "toggleGroup",
       value: "haku",
     });
     state = lisatiedotWorkspaceReducer(state, {
@@ -45,33 +16,42 @@ describe("lisatiedot workspace reducer", () => {
       mobile: true,
     });
 
-    state = lisatiedotWorkspaceReducer(state, {
-      type: "reset",
-      rows: [rows[1]!],
-    });
+    state = lisatiedotWorkspaceReducer(state, { type: "reset" });
 
-    expect(state).toEqual(createLisatiedotWorkspaceState([rows[1]!]));
+    expect(state).toEqual(createLisatiedotWorkspaceState());
   });
 
-  it("keeps selection when only values are cleared and removes it explicitly", () => {
-    let state = createLisatiedotWorkspaceState(rows);
-    state = lisatiedotWorkspaceReducer(state, {
-      type: "select",
+  it("clears the active row when it is removed", () => {
+    let state = lisatiedotWorkspaceReducer(createLisatiedotWorkspaceState(), {
+      type: "active",
       value: "20:",
+      mobile: true,
     });
-    expect(state.selectedRows.has("20:")).toBe(true);
-
     state = lisatiedotWorkspaceReducer(state, {
       type: "remove",
       value: "20:",
     });
-    expect(state.selectedRows.has("20:")).toBe(false);
+
     expect(state.activeRow).toBeNull();
+    expect(state.mobileSheetOpen).toBe(false);
   });
 
-  it("opens the same active row only when selection comes from mobile", () => {
-    let state = createLisatiedotWorkspaceState(rows);
+  it("supports independent group expansion", () => {
+    let state = createLisatiedotWorkspaceState();
+    state = lisatiedotWorkspaceReducer(state, {
+      type: "toggleGroup",
+      value: "olosuhteet",
+    });
     state = lisatiedotWorkspaceReducer(state, {
+      type: "toggleGroup",
+      value: "haku",
+    });
+
+    expect([...state.expandedGroups]).toEqual(["olosuhteet", "haku"]);
+  });
+
+  it("shares row activation behavior between desktop and mobile", () => {
+    let state = lisatiedotWorkspaceReducer(createLisatiedotWorkspaceState(), {
       type: "active",
       value: "20:",
       mobile: false,
@@ -93,35 +73,4 @@ describe("lisatiedot workspace reducer", () => {
     });
     expect(state.mobileSheetOpen).toBe(false);
   });
-
-  it("supports independent group expansion and expand/collapse all", () => {
-    let state = createLisatiedotWorkspaceState(rows);
-    state = lisatiedotWorkspaceReducer(state, {
-      type: "expand",
-      values: ["olosuhteet", "haku"],
-    });
-    expect([...state.expandedGroups]).toEqual(["olosuhteet", "haku"]);
-    state = lisatiedotWorkspaceReducer(state, {
-      type: "toggleGroup",
-      value: "haku",
-    });
-    expect([...state.expandedGroups]).toEqual(["olosuhteet"]);
-    state = lisatiedotWorkspaceReducer(state, { type: "collapse" });
-    expect(state.expandedGroups.size).toBe(0);
-  });
-
-  it("searches localized names and codes within a business group", () => {
-    expect(
-      filterLisatietoRows(rows, "haku", "haku").map((row) => row.koodi),
-    ).toEqual(["10", "20"]);
-    expect(
-      filterLisatietoRows(rows, "20", "haku").map((row) => row.koodi),
-    ).toEqual(["10", "20"]);
-  });
-
-  it("keeps valued rows visible through search and group filters", () => {
-    expect(
-      filterLisatietoRows(rows, "not-found", "haku").map((row) => row.koodi),
-    ).toEqual(["10"]);
-  });
 });
diff --git a/apps/web/lib/admin/trials/lisatiedot-workspace-state.ts b/apps/web/lib/admin/trials/lisatiedot-workspace-state.ts
index 06faf1eb..0d92deeb 100644
--- a/apps/web/lib/admin/trials/lisatiedot-workspace-state.ts
+++ b/apps/web/lib/admin/trials/lisatiedot-workspace-state.ts
@@ -1,66 +1,25 @@
 import type { LisatietoRowDraft } from "@/lib/admin/trials/entry-edit-dialog-model";
 
 export type LisatiedotWorkspaceState = {
-  query: string;
-  activeGroup: string | null;
   expandedGroups: ReadonlySet<string>;
-  selectedRows: ReadonlySet<string>;
   activeRow: string | null;
   mobileSheetOpen: boolean;
 };
 
 export type LisatiedotWorkspaceAction =
-  | { type: "query"; value: string }
-  | { type: "group"; value: string | null }
   | { type: "toggleGroup"; value: string }
-  | { type: "expand"; values: string[] }
-  | { type: "collapse" }
-  | { type: "select"; value: string }
   | { type: "remove"; value: string }
   | { type: "active"; value: string | null; mobile?: boolean }
   | { type: "sheet"; value: boolean }
-  | { type: "reset"; rows: LisatietoRowDraft[] };
+  | { type: "reset" };
 
 export const lisatietoRowKey = (
   row: Pick<LisatietoRowDraft, "koodi" | "osa">,
 ) => `${row.koodi}:${row.osa}`;
 
-export function selectedLisatietoKeys(rows: LisatietoRowDraft[]) {
-  return new Set(
-    rows
-      .filter((row) =>
-        Object.values(row.eraValues).some((value) => value !== ""),
-      )
-      .map(lisatietoRowKey),
-  );
-}
-
-export function filterLisatietoRows(
-  rows: LisatietoRowDraft[],
-  query: string,
-  activeGroup: string | null,
-) {
-  const normalizedQuery = query.trim().toLocaleLowerCase();
-  return rows.filter((row) => {
-    const hasValue = Object.values(row.eraValues).some((value) => value !== "");
-    const matchesGroup = !activeGroup || row.group === activeGroup;
-    const matchesQuery =
-      !normalizedQuery ||
-      `${row.koodi} ${row.osa} ${row.label}`
-        .toLocaleLowerCase()
-        .includes(normalizedQuery);
-    return hasValue || (matchesGroup && matchesQuery);
-  });
-}
-
-export function createLisatiedotWorkspaceState(
-  rows: LisatietoRowDraft[],
-): LisatiedotWorkspaceState {
+export function createLisatiedotWorkspaceState(): LisatiedotWorkspaceState {
   return {
-    query: "",
-    activeGroup: null,
     expandedGroups: new Set(),
-    selectedRows: selectedLisatietoKeys(rows),
     activeRow: null,
     mobileSheetOpen: false,
   };
@@ -71,32 +30,15 @@ export function lisatiedotWorkspaceReducer(
   action: LisatiedotWorkspaceAction,
 ): LisatiedotWorkspaceState {
   switch (action.type) {
-    case "query":
-      return { ...state, query: action.value };
-    case "group":
-      return { ...state, activeGroup: action.value };
     case "toggleGroup": {
       const expandedGroups = new Set(state.expandedGroups);
       if (expandedGroups.has(action.value)) expandedGroups.delete(action.value);
       else expandedGroups.add(action.value);
       return { ...state, expandedGroups };
     }
-    case "expand":
-      return { ...state, expandedGroups: new Set(action.values) };
-    case "collapse":
-      return { ...state, expandedGroups: new Set() };
-    case "select":
-      return {
-        ...state,
-        selectedRows: new Set([...state.selectedRows, action.value]),
-        activeRow: action.value,
-      };
     case "remove": {
-      const selectedRows = new Set(state.selectedRows);
-      selectedRows.delete(action.value);
       return {
         ...state,
-        selectedRows,
         activeRow: state.activeRow === action.value ? null : state.activeRow,
         mobileSheetOpen:
           state.activeRow === action.value ? false : state.mobileSheetOpen,
@@ -111,6 +53,6 @@ export function lisatiedotWorkspaceReducer(
     case "sheet":
       return { ...state, mobileSheetOpen: action.value };
     case "reset":
-      return createLisatiedotWorkspaceState(action.rows);
+      return createLisatiedotWorkspaceState();
   }
 }
diff --git a/apps/web/lib/i18n/messages/admin/trials/manage.ts b/apps/web/lib/i18n/messages/admin/trials/manage.ts
index 09549415..2aee3ad5 100644
--- a/apps/web/lib/i18n/messages/admin/trials/manage.ts
+++ b/apps/web/lib/i18n/messages/admin/trials/manage.ts
@@ -77,15 +77,6 @@ export const fiAdminTrialsManageMessages = {
   "admin.trials.manage.resultCreate.card.additional": "Lisätiedot",
   "admin.trials.manage.resultCreate.summary.empty": "Ei tietoja",
   "admin.trials.manage.resultCreate.summary.eras": "erää",
-  "admin.trials.manage.resultCreate.summary.selected": "valittua",
-  "admin.trials.manage.resultCreate.additional.search": "Hae lisätietoa",
-  "admin.trials.manage.resultCreate.additional.searchPlaceholder":
-    "Hae koodilla tai nimellä",
-  "admin.trials.manage.resultCreate.additional.expandAll": "Laajenna kaikki",
-  "admin.trials.manage.resultCreate.additional.collapseAll": "Supista kaikki",
-  "admin.trials.manage.resultCreate.additional.groups": "Lisätietoryhmät",
-  "admin.trials.manage.resultCreate.additional.allGroups": "Kaikki",
-  "admin.trials.manage.resultCreate.additional.selected": "Valitut lisätiedot",
   "admin.trials.manage.resultCreate.additional.remove": "Poista",
   "admin.trials.manage.resultCreate.additional.close": "Sulje",
   "admin.trials.manage.resultCreate.additional.chooseRow":
@@ -317,16 +308,6 @@ export const svAdminTrialsManageMessages = {
   "admin.trials.manage.resultCreate.card.additional": "Tilläggsuppgifter",
   "admin.trials.manage.resultCreate.summary.empty": "Inga uppgifter",
   "admin.trials.manage.resultCreate.summary.eras": "omgångar",
-  "admin.trials.manage.resultCreate.summary.selected": "valda",
-  "admin.trials.manage.resultCreate.additional.search": "Sök tilläggsuppgift",
-  "admin.trials.manage.resultCreate.additional.searchPlaceholder":
-    "Sök med kod eller namn",
-  "admin.trials.manage.resultCreate.additional.expandAll": "Expandera alla",
-  "admin.trials.manage.resultCreate.additional.collapseAll": "Fäll ihop alla",
-  "admin.trials.manage.resultCreate.additional.groups": "Tilläggsgrupper",
-  "admin.trials.manage.resultCreate.additional.allGroups": "Alla",
-  "admin.trials.manage.resultCreate.additional.selected":
-    "Valda tilläggsuppgifter",
   "admin.trials.manage.resultCreate.additional.remove": "Ta bort",
   "admin.trials.manage.resultCreate.additional.close": "Stäng",
   "admin.trials.manage.resultCreate.additional.chooseRow":
diff --git a/docs/features/admin-trial-management.md b/docs/features/admin-trial-management.md
index e21c1d9e..b359a8ee 100644
--- a/docs/features/admin-trial-management.md
+++ b/docs/features/admin-trial-management.md
@@ -27,8 +27,8 @@ and follow-up admin flow redesign).
   collapsible cards grouped by the official PDF's domain structure without
   copying its matrix geometry. Era- and entry-level values remain separate
   controlled draft fields inside their shared domain card. Lisätiedot uses a
-  searchable, business-domain-grouped workspace with one controlled row
-  editor; removing a selected row clears its unsaved era values.
+  business-domain-grouped workspace with individually collapsible groups and
+  one controlled row editor; removing a row clears its unsaved era values.
 
 ## Main files
 

From b2529cec0f67949d4528ed97c932d38a9b350bc4 Mon Sep 17 00:00:00 2001
From: Aki Kuivas <91662678+asku1990@users.noreply.github.com>
Date: Sun, 2 Aug 2026 19:55:13 +0300
Subject: [PATCH 3/3] =?UTF-8?q?test(trials):=20cover=20simplified=20Lis?=
 =?UTF-8?q?=C3=A4tiedot=20workspace?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  Remove the unreachable reducer reset action and its test. Add rendered
  workspace coverage for PDF-domain ordering, collapsible groups,
  active-row
  editor rendering, and accessible remove labels.

  Align the changelog, UX planning documentation, and PR description
  with the
  simplified Lisätiedot workflow.

  ref bej-103
---
 CHANGELOG.md                                  |  2 +-
 .../__tests__/lisatiedot-workspace.test.tsx   | 93 +++++++++++++++++++
 .../lisatiedot-workspace-state.test.ts        | 16 ----
 .../trials/lisatiedot-workspace-state.ts      |  5 +-
 docs/planning/trials/result-creation-ux.md    | 33 +++----
 5 files changed, 110 insertions(+), 39 deletions(-)
 create mode 100644 apps/web/components/admin/trials/internal/__tests__/lisatiedot-workspace.test.tsx

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56fc2658..6ff85a31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,7 +21,7 @@ This project uses a user-facing changelog format.
 
 ### Changed
 
-- Ajokoetuloksen lisäyslomakkeen avattavat kortit noudattavat virallisen pöytäkirjan aihealueita ilman pöytäkirjan taulukkoasettelun kopiointia. Lisätietoja voi hakea ja muokata pöytäkirjan mukaisessa ryhmäjärjestyksessä myös mobiilissa.
+- Ajokoetuloksen lisäyslomakkeen avattavat kortit noudattavat virallisen pöytäkirjan aihealueita ilman pöytäkirjan taulukkoasettelun kopiointia. Lisätietoja muokataan pöytäkirjan mukaisissa yksittäin avattavissa ryhmissä myös mobiilissa.
 - 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.
diff --git a/apps/web/components/admin/trials/internal/__tests__/lisatiedot-workspace.test.tsx b/apps/web/components/admin/trials/internal/__tests__/lisatiedot-workspace.test.tsx
new file mode 100644
index 00000000..1d9e5c16
--- /dev/null
+++ b/apps/web/components/admin/trials/internal/__tests__/lisatiedot-workspace.test.tsx
@@ -0,0 +1,93 @@
+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 type { LisatietoRowDraft } from "@/lib/admin/trials/entry-edit-dialog-model";
+import type { LisatiedotWorkspaceState } from "@/lib/admin/trials/lisatiedot-workspace-state";
+import { LisatiedotWorkspace } from "../lisatiedot-workspace";
+
+const groups = [
+  "olosuhteet",
+  "haku",
+  "haukku",
+  "metsastysinto",
+  "ajo",
+  "muut_ominaisuudet",
+  "unknown",
+] as const;
+
+function row(group: LisatietoRowDraft["group"], code: string) {
+  return {
+    koodi: code,
+    osa: "",
+    nimi: code,
+    jarjestys: Number(code),
+    group,
+    label: `${group} ${code}`,
+    inputKind: "text" as const,
+    sortOrder: Number(code),
+    eraValues: { 1: "" },
+  } satisfies LisatietoRowDraft;
+}
+
+describe("LisatiedotWorkspace", () => {
+  it("renders PDF-domain groups in order as individually collapsible sections", () => {
+    const rows = groups
+      .slice()
+      .reverse()
+      .map((group, index) => row(group, String(index + 10)));
+    const html = renderToStaticMarkup(
+      <LisatiedotWorkspace
+        eras={[createEmptyEraDraft(1)]}
+        rows={rows}
+        isPending={false}
+        onChangeCell={vi.fn()}
+        onRemoveRow={vi.fn()}
+      />,
+    );
+
+    const labels = [
+      "Olosuhteet",
+      "Haku",
+      "Haukku",
+      "Metsästysinto",
+      "Ajo",
+      "Muut ominaisuudet",
+      "Muut / tuntemattomat",
+    ];
+    const positions = labels.map((label) => html.indexOf(label));
+
+    expect(positions.every((position) => position >= 0)).toBe(true);
+    expect(positions).toEqual(
+      [...positions].sort((left, right) => left - right),
+    );
+    expect(html.match(/aria-expanded="false"/g) ?? []).toHaveLength(7);
+  });
+
+  it("renders the active row editor with an accessible remove label", () => {
+    const state: LisatiedotWorkspaceState = {
+      expandedGroups: new Set(["haku"]),
+      activeRow: "20:",
+      mobileSheetOpen: false,
+    };
+    const reducerSpy = vi
+      .spyOn(React, "useReducer")
+      .mockReturnValue([state, vi.fn()] as never);
+
+    try {
+      const html = renderToStaticMarkup(
+        <LisatiedotWorkspace
+          eras={[createEmptyEraDraft(1)]}
+          rows={[row("haku", "20")]}
+          isPending={false}
+          onChangeCell={vi.fn()}
+          onRemoveRow={vi.fn()}
+        />,
+      );
+
+      expect(html).toContain('aria-label="Poista 20 haku 20"');
+    } finally {
+      reducerSpy.mockRestore();
+    }
+  });
+});
diff --git a/apps/web/lib/admin/trials/__tests__/lisatiedot-workspace-state.test.ts b/apps/web/lib/admin/trials/__tests__/lisatiedot-workspace-state.test.ts
index 7bf063d0..5cd196ec 100644
--- a/apps/web/lib/admin/trials/__tests__/lisatiedot-workspace-state.test.ts
+++ b/apps/web/lib/admin/trials/__tests__/lisatiedot-workspace-state.test.ts
@@ -5,22 +5,6 @@ import {
 } from "../lisatiedot-workspace-state";
 
 describe("lisatiedot workspace reducer", () => {
-  it("resets all transient workspace state", () => {
-    let state = lisatiedotWorkspaceReducer(createLisatiedotWorkspaceState(), {
-      type: "toggleGroup",
-      value: "haku",
-    });
-    state = lisatiedotWorkspaceReducer(state, {
-      type: "active",
-      value: "20:",
-      mobile: true,
-    });
-
-    state = lisatiedotWorkspaceReducer(state, { type: "reset" });
-
-    expect(state).toEqual(createLisatiedotWorkspaceState());
-  });
-
   it("clears the active row when it is removed", () => {
     let state = lisatiedotWorkspaceReducer(createLisatiedotWorkspaceState(), {
       type: "active",
diff --git a/apps/web/lib/admin/trials/lisatiedot-workspace-state.ts b/apps/web/lib/admin/trials/lisatiedot-workspace-state.ts
index 0d92deeb..23d467da 100644
--- a/apps/web/lib/admin/trials/lisatiedot-workspace-state.ts
+++ b/apps/web/lib/admin/trials/lisatiedot-workspace-state.ts
@@ -10,8 +10,7 @@ export type LisatiedotWorkspaceAction =
   | { type: "toggleGroup"; value: string }
   | { type: "remove"; value: string }
   | { type: "active"; value: string | null; mobile?: boolean }
-  | { type: "sheet"; value: boolean }
-  | { type: "reset" };
+  | { type: "sheet"; value: boolean };
 
 export const lisatietoRowKey = (
   row: Pick<LisatietoRowDraft, "koodi" | "osa">,
@@ -52,7 +51,5 @@ export function lisatiedotWorkspaceReducer(
       };
     case "sheet":
       return { ...state, mobileSheetOpen: action.value };
-    case "reset":
-      return createLisatiedotWorkspaceState();
   }
 }
diff --git a/docs/planning/trials/result-creation-ux.md b/docs/planning/trials/result-creation-ux.md
index 1f2009cd..1e196de8 100644
--- a/docs/planning/trials/result-creation-ux.md
+++ b/docs/planning/trials/result-creation-ux.md
@@ -80,12 +80,9 @@ scrolling matrix with a dedicated workspace inside its own card.
 
 The workspace supports:
 
-- search by code;
-- search by localized name;
-- filtering by business/PDF domain;
-- collapsible domain groups;
-- expand all and collapse all;
-- a selected-row summary above the groups;
+- PDF/business domain groups in the documented order;
+- individually collapsible domain groups;
+- a single active row editor;
 - semantic per-era controls; and
 - responsive desktop and mobile layouts.
 
@@ -120,14 +117,14 @@ Administrators must not normally enter raw persistence values such as `0` or
 `1`. The UI translates semantic control state through registry persistence
 mapping.
 
-Selected rows remain visible in the summary above the groups. Removing a
-selected row clears all of its unsaved era values. Rows with no values are
-omitted from the create request, preserving the existing request behavior.
+Clicking a row activates its single editor. Removing a row clears all of its
+unsaved era values. Rows with no values are omitted from the create request,
+preserving the existing request behavior.
 
-On desktop, the workspace may use adjacent filter, group, selected-row, and
-editor regions when space permits. On mobile, it uses stacked groups or an
-overlay/sheet while preserving the same selection and semantic controls.
-These are responsive implementation choices, not separate workflows.
+On desktop, the workspace uses the groups beside the active row editor. On
+mobile, the active row editor opens in a Sheet while preserving the same draft
+ownership and semantic controls. These are responsive implementation choices,
+not separate workflows.
 
 ## Erät and other sections
 
@@ -200,8 +197,8 @@ entry has an ID.
 - Rule windows remain mostly invisible: administrators cannot select one,
   normally see only a localized period label, and do not see the technical ID
   as a standard field.
-- Lisätiedot provides search, domain filtering, collapsible groups,
-  expand/collapse all, selected-row summary, and semantic per-era controls.
+- Lisätiedot provides PDF-domain grouping, individually collapsible groups, a
+  single row editor, and semantic per-era controls.
 - Business/PDF domains are the primary lisätieto grouping; numeric ranges are
   secondary only.
 - Removing a selected lisätieto clears its unsaved values, and empty rows are
@@ -221,9 +218,9 @@ entry has an ID.
 
 - Card tests for independent rendering, field-set-driven visibility,
   validation presentation, and draft callbacks.
-- Lisätieto tests for code/name search, domain filtering, group
-  expand/collapse, selected-row summary, selection removal, semantic controls,
-  per-era values, and omission of empty rows.
+- Lisätieto tests for PDF-domain ordering, independent group expansion, row
+  activation, removal, semantic controls, per-era values, and omission of
+  empty rows.
 - Tests proving semantic marker and tri-state controls serialize through the
   registry without exposing raw persistence values.
 - Responsive component tests for desktop and mobile workspace variants.