@cosmicdrift/kumiko-renderer 0.211.0 → 0.212.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmicdrift/kumiko-renderer",
-  "version": "0.211.0",
+  "version": "0.212.0",
   "description": "Platform-agnostic React renderer for Kumiko screens. Contains the shared logic — primitives-contract, hooks, KumikoScreen, navigation & SSE abstractions — that any platform-specific renderer (web, native) composes. No DOM, no EventSource, no react-dom.",
   "license": "BUSL-1.1",
   "author": "Marc Frost <marc@cosmicdriftgamestudio.com>",
@@ -15,8 +15,8 @@
     }
   },
   "dependencies": {
-    "@cosmicdrift/kumiko-framework": "0.211.0",
-    "@cosmicdrift/kumiko-headless": "0.211.0",
+    "@cosmicdrift/kumiko-framework": "0.212.0",
+    "@cosmicdrift/kumiko-headless": "0.212.0",
     "react": "^19.2.6",
     "temporal-polyfill": "^0.3.2",
     "zod": "^4.4.3"
@@ -25,7 +25,7 @@
     "@testing-library/react": "^16.3.2",
     "@types/react": "^19.2.14",
     "jsdom": "^29.1.1",
-    "@cosmicdrift/kumiko-locale-de": "0.211.0"
+    "@cosmicdrift/kumiko-locale-de": "0.212.0"
   },
   "repository": {
     "type": "git",

package/src/app/__tests__/entity-list-row-action-entity-target.test.tsx

@@ -0,0 +1,194 @@
+// fw#2228: RowActionNavigate can now name an ObjectTarget (`entity`) instead
+// of a ScreenTarget (`screen`). This renders the real entityList pipeline
+// (KumikoScreen → EntityListBody) and asserts a click on the entity-target
+// row action calls nav.navigate with `{ entity, id }` — resolution to an
+// actual screen is the NavApi impl's job (renderer-web's resolveTarget), not
+// this platform-neutral package's. Mirrors
+// entity-list-row-action-kumiko-actions-view.test.tsx's harness.
+
+import { describe, expect, test } from "bun:test";
+import type {
+  EntityDefinition,
+  EntityListScreenDefinition,
+} from "@cosmicdrift/kumiko-framework/ui-types";
+import type { Dispatcher } from "@cosmicdrift/kumiko-headless";
+import { render, waitFor } from "@testing-library/react";
+import type { ComponentType, ReactNode } from "react";
+import { DispatcherProvider } from "../../context/dispatcher-context";
+import { createStaticLocaleResolver, LocaleProvider } from "../../i18n";
+import { kumikoDefaultTranslations } from "../../i18n-defaults";
+import {
+  type CorePrimitives,
+  type DataTableProps,
+  type DataTableRowAction,
+  PrimitivesProvider,
+} from "../../primitives";
+import type { FeatureSchema } from "../feature-schema";
+import { KumikoScreen } from "../kumiko-screen";
+import type { NavTarget } from "../nav";
+import { NavProvider } from "../nav";
+
+function stubDispatcher(): Dispatcher {
+  return {
+    write: (async () => ({ isSuccess: true, data: {} })) as unknown as Dispatcher["write"],
+    query: (async () => ({
+      isSuccess: true,
+      data: {
+        rows: [{ id: "invoice-42", customerId: "cust-7", status: "open" }],
+        nextCursor: null,
+        total: 1,
+      },
+    })) as unknown as Dispatcher["query"],
+    batch: (async () => ({ isSuccess: true, results: [] })) as unknown as Dispatcher["batch"],
+    statusStore: {
+      getState: () => "online",
+      subscribe: () => () => {},
+    } as unknown as Dispatcher["statusStore"],
+    async *stream() {},
+    pendingWrites: () => [],
+    pendingFiles: () => [],
+  };
+}
+
+let capturedRowActions: readonly DataTableRowAction[] | undefined;
+const captureDataTable: ComponentType<DataTableProps> = (props) => {
+  capturedRowActions = props.rowActions;
+  return null;
+};
+const noop = (): ReactNode => null;
+const passChildren = ({ children }: { readonly children?: ReactNode }): ReactNode => children;
+
+const testPrimitives: CorePrimitives = {
+  Button: noop,
+  Banner: passChildren,
+  Field: passChildren,
+  Input: noop,
+  DataTable: captureDataTable,
+  Form: passChildren,
+  Section: passChildren,
+  Card: passChildren,
+  Grid: passChildren,
+  GridCell: passChildren,
+  Text: passChildren,
+  Heading: noop,
+  Dialog: noop,
+  Modal: noop,
+  Lightbox: noop,
+  ConfigSourceBadge: noop,
+  ConfigCascadeView: noop,
+  Link: noop,
+};
+
+function buildSchema(rowAction: EntityListScreenDefinition["rowActions"]): FeatureSchema {
+  const entity: EntityDefinition = {
+    fields: {
+      customerId: {
+        type: "text",
+        maxLength: 50,
+        required: false,
+        searchable: false,
+        sortable: false,
+      },
+      status: { type: "text", maxLength: 50, required: false, searchable: false, sortable: false },
+    },
+  };
+  const listScreen: EntityListScreenDefinition = {
+    id: "invoice-list",
+    type: "entityList",
+    entity: "invoice",
+    columns: ["status"],
+    rowActions: rowAction,
+  };
+  return {
+    featureName: "billing",
+    entities: { invoice: entity },
+    screens: [listScreen],
+  } as FeatureSchema;
+}
+
+function renderListScreen(schema: FeatureSchema, navigateSpy: (target: NavTarget) => void): void {
+  render(
+    <LocaleProvider
+      resolver={createStaticLocaleResolver({ locale: "en" })}
+      fallbackBundles={[kumikoDefaultTranslations]}
+    >
+      <DispatcherProvider dispatcher={stubDispatcher()}>
+        <NavProvider
+          value={{
+            route: { screenId: "billing:invoice-list" },
+            navigate: navigateSpy,
+            replace: () => {},
+            hrefFor: () => "",
+            searchParams: {},
+            setSearchParams: () => {},
+          }}
+        >
+          <PrimitivesProvider value={testPrimitives}>
+            <KumikoScreen schema={schema} qn="billing:screen:invoice-list" />
+          </PrimitivesProvider>
+        </NavProvider>
+      </DispatcherProvider>
+    </LocaleProvider>,
+  );
+}
+
+function requireAction(id: string): DataTableRowAction {
+  const action = capturedRowActions?.find((a) => a.id === id);
+  if (!action) throw new Error(`expected the '${id}' row action to be captured`);
+  return action;
+}
+
+describe("entityList navigate row-action with an entity-target (fw#2228)", () => {
+  test("clicking the row action calls nav.navigate with { entity, id }, not a screenId", async () => {
+    capturedRowActions = undefined;
+    const navigateCalls: NavTarget[] = [];
+
+    renderListScreen(
+      buildSchema([
+        { kind: "navigate", id: "view", label: "kumiko.actions.view", entity: "invoice" },
+      ]),
+      (target) => navigateCalls.push(target),
+    );
+
+    await waitFor(() => {
+      expect(capturedRowActions).toBeDefined();
+    });
+
+    await requireAction("view").onTrigger({
+      id: "invoice-42",
+      values: { id: "invoice-42", customerId: "cust-7", status: "open" },
+    });
+
+    expect(navigateCalls).toHaveLength(1);
+    expect(navigateCalls[0]).toEqual({ entity: "invoice", id: "invoice-42" });
+  });
+
+  test("an explicit entityId field-name still overrides the row['id'] default", async () => {
+    capturedRowActions = undefined;
+    const navigateCalls: NavTarget[] = [];
+
+    renderListScreen(
+      buildSchema([
+        {
+          kind: "navigate",
+          id: "view-customer",
+          label: "kumiko.actions.view",
+          entity: "customer",
+          entityId: "customerId",
+        },
+      ]),
+      (target) => navigateCalls.push(target),
+    );
+
+    await waitFor(() => {
+      expect(capturedRowActions).toBeDefined();
+    });
+
+    await requireAction("view-customer").onTrigger({
+      id: "invoice-42",
+      values: { id: "invoice-42", customerId: "cust-7" },
+    });
+
+    expect(navigateCalls).toEqual([{ entity: "customer", id: "cust-7" }]);
+  });
+});

package/src/app/kumiko-screen.tsx

@@ -1297,23 +1297,34 @@ function EntityListBody({
   // nicht auseinanderdriften.
   const runNavigate = useCallback(
     (action: RowActionNavigate, row: ListRowViewModel) => {
-      // Default entityId für entityEdit-Targets: row["id"] wenn kein expliziter
-      // entityId-Feldname gesetzt ist. Nur für Targets DERSELBEN Entity — sonst
-      // bekäme ein Cross-Entity-Edit-Screen die falsche row.id injiziert.
-      const targetIsEntityEdit = schema.screens.some(
-        (s) =>
-          s.type === "entityEdit" &&
-          s.entity === screen.entity &&
-          lastSegment(s.id) === action.screen,
-      );
-      const explicit =
-        action.entityId !== undefined ? String(row.values[action.entityId] ?? "") : undefined;
-      const fallback = targetIsEntityEdit ? String(row.values["id"] ?? "") : undefined;
-      const entityId = explicit ?? fallback;
-      nav.navigate({
-        screenId: action.screen,
-        ...(entityId !== undefined && entityId !== "" && { entityId }),
-      });
+      if (action.entity !== undefined) {
+        // Entity-Targets (fw#2228) lösen sich erst in der NavApi-Impl gegen
+        // ALLE Features auf (resolveTarget in renderer-web/nav.tsx) — dieses
+        // Package kennt nur `schema` (das eine aufrufende Feature) und kann
+        // detailFor cross-feature nicht selbst nachschlagen.
+        const explicit =
+          action.entityId !== undefined ? String(row.values[action.entityId] ?? "") : undefined;
+        const id = explicit ?? String(row.values["id"] ?? "");
+        nav.navigate({ entity: action.entity, id });
+      } else if (action.screen !== undefined) {
+        // Default entityId für entityEdit-Targets: row["id"] wenn kein expliziter
+        // entityId-Feldname gesetzt ist. Nur für Targets DERSELBEN Entity — sonst
+        // bekäme ein Cross-Entity-Edit-Screen die falsche row.id injiziert.
+        const targetIsEntityEdit = schema.screens.some(
+          (s) =>
+            s.type === "entityEdit" &&
+            s.entity === screen.entity &&
+            lastSegment(s.id) === action.screen,
+        );
+        const explicit =
+          action.entityId !== undefined ? String(row.values[action.entityId] ?? "") : undefined;
+        const fallback = targetIsEntityEdit ? String(row.values["id"] ?? "") : undefined;
+        const entityId = explicit ?? fallback;
+        nav.navigate({
+          screenId: action.screen,
+          ...(entityId !== undefined && entityId !== "" && { entityId }),
+        });
+      }
       const params =
         action.params !== undefined ? evalRowExtractor(action.params, row.values) : undefined;
       if (params !== undefined) {
@@ -1658,12 +1669,24 @@ function ProjectionListBody({
 
   const runNavigate = useCallback(
     (action: RowActionNavigate, row: ListRowViewModel) => {
-      const entityId =
-        action.entityId !== undefined ? String(row.values[action.entityId] ?? "") : undefined;
-      nav.navigate({
-        screenId: action.screen,
-        ...(entityId !== undefined && entityId !== "" && { entityId }),
-      });
+      if (action.entity !== undefined) {
+        // Entity-Targets (fw#2228) — siehe EntityListBody.runNavigate für die
+        // Begründung, warum die Auflösung in der NavApi-Impl passiert. Anders
+        // als dort: KEIN row["id"]-Fallback — projectionList-Rows kommen aus
+        // einer beliebigen Query-Projection ohne garantiertes "id"-Feld
+        // (gleiche Begründung wie beim screen-Target unten). Der Boot-
+        // Validator erzwingt deshalb einen expliziten entityId für
+        // projectionList-entity-Targets.
+        const id = action.entityId !== undefined ? String(row.values[action.entityId] ?? "") : "";
+        nav.navigate({ entity: action.entity, id });
+      } else if (action.screen !== undefined) {
+        const entityId =
+          action.entityId !== undefined ? String(row.values[action.entityId] ?? "") : undefined;
+        nav.navigate({
+          screenId: action.screen,
+          ...(entityId !== undefined && entityId !== "" && { entityId }),
+        });
+      }
       const params =
         action.params !== undefined ? evalRowExtractor(action.params, row.values) : undefined;
       if (params !== undefined) {
@@ -1963,46 +1986,68 @@ function ProjectionDetailBody({
         continue;
       }
       if (action.kind === "navigate") {
-        // Default entityId for an entityEdit target of the SAME entity
-        // (screen.detailFor plays entity's role here, like screen.entity
-        // does for entityList's runNavigate) — without this fallback the
-        // target opens an empty create-form instead of the shown record,
-        // silently. Searched cross-feature, consistent with editScreen above.
-        const explicit =
-          action.entityId !== undefined ? String(record[action.entityId] ?? "") : undefined;
-        const targetIsEntityEditSameEntity =
-          screen.detailFor !== undefined &&
-          appFeatures.some((feature) =>
-            feature.screens.some(
-              (s) =>
-                s.type === "entityEdit" &&
-                s.entity === screen.detailFor &&
-                lastSegment(s.id) === action.screen,
-            ),
-          );
-        const fallback = targetIsEntityEditSameEntity ? String(record["id"] ?? "") : undefined;
-        const navEntityId = explicit ?? fallback;
-        const targetScreen = action.screen;
-        out.push({
-          id: action.id,
-          label: effectiveTranslate(action.label),
-          ...(action.style !== undefined && { style: action.style }),
-          onPress: () => {
-            nav.navigate({
-              screenId: targetScreen,
-              ...(navEntityId !== undefined && navEntityId !== "" && { entityId: navEntityId }),
-            });
-            const params =
-              action.params !== undefined ? evalRowExtractor(action.params, record) : undefined;
-            if (params !== undefined) {
-              const stringified: Record<string, string | null> = {};
-              for (const [k, v] of Object.entries(params)) {
-                stringified[k] = v === null || v === undefined ? null : String(v);
-              }
-              nav.setSearchParams(stringified);
+        const runParams = (): void => {
+          const params =
+            action.params !== undefined ? evalRowExtractor(action.params, record) : undefined;
+          if (params !== undefined) {
+            const stringified: Record<string, string | null> = {};
+            for (const [k, v] of Object.entries(params)) {
+              stringified[k] = v === null || v === undefined ? null : String(v);
             }
-          },
-        });
+            nav.setSearchParams(stringified);
+          }
+        };
+        if (action.entity !== undefined) {
+          // Entity-Targets (fw#2228) — Auflösung passiert in der NavApi-Impl
+          // (siehe EntityListBody.runNavigate), nicht hier. KEIN record["id"]-
+          // Fallback: record kommt aus einer beliebigen Detail-Query ohne
+          // garantiertes "id"-Feld, der Boot-Validator erzwingt deshalb einen
+          // expliziten entityId für projectionDetail-entity-Targets.
+          const targetEntity = action.entity;
+          const id = action.entityId !== undefined ? String(record[action.entityId] ?? "") : "";
+          out.push({
+            id: action.id,
+            label: effectiveTranslate(action.label),
+            ...(action.style !== undefined && { style: action.style }),
+            onPress: () => {
+              nav.navigate({ entity: targetEntity, id });
+              runParams();
+            },
+          });
+        } else if (action.screen !== undefined) {
+          // Default entityId for an entityEdit target of the SAME entity
+          // (screen.detailFor plays entity's role here, like screen.entity
+          // does for entityList's runNavigate) — without this fallback the
+          // target opens an empty create-form instead of the shown record,
+          // silently. Searched cross-feature, consistent with editScreen above.
+          const explicit =
+            action.entityId !== undefined ? String(record[action.entityId] ?? "") : undefined;
+          const targetIsEntityEditSameEntity =
+            screen.detailFor !== undefined &&
+            appFeatures.some((feature) =>
+              feature.screens.some(
+                (s) =>
+                  s.type === "entityEdit" &&
+                  s.entity === screen.detailFor &&
+                  lastSegment(s.id) === action.screen,
+              ),
+            );
+          const fallback = targetIsEntityEditSameEntity ? String(record["id"] ?? "") : undefined;
+          const navEntityId = explicit ?? fallback;
+          const targetScreen = action.screen;
+          out.push({
+            id: action.id,
+            label: effectiveTranslate(action.label),
+            ...(action.style !== undefined && { style: action.style }),
+            onPress: () => {
+              nav.navigate({
+                screenId: targetScreen,
+                ...(navEntityId !== undefined && navEntityId !== "" && { entityId: navEntityId }),
+              });
+              runParams();
+            },
+          });
+        }
         continue;
       }
       // writeHandler — same dispatch/refetch/failure-surfacing pattern as