@cosmicdrift/kumiko-bundled-features 0.130.0 → 0.130.2

package/src/text-content/web/__tests__/group-blocks.test.ts

@@ -53,7 +53,7 @@ describe("groupBlocksByFolder", () => {
       args: { slug: "imprint", lang: "de" },
     });
     expect(root.children).toBeUndefined();
-    expect(root.icon).toBeUndefined();
+    expect(root.icon).toBe("file");
   });
   test('folder="page" → Folder-Container mit child', () => {
     const nodes = inside(
@@ -101,7 +101,7 @@ describe("groupBlocksByFolder", () => {
     );
     expect(nodes).toHaveLength(2);
     expect(nodes[0]?.label).toBe("imprint");
-    expect(nodes[0]?.icon).toBeUndefined();
+    expect(nodes[0]?.icon).toBe("file");
     expect(nodes[1]?.label).toBe("page");
     expect(nodes[1]?.icon).toBe("folder");
   });
@@ -184,12 +184,37 @@ describe("groupBlocksByFolder", () => {
     const leaf = nodes[0];
     const folder = nodes[1];
     expect(leaf?.label).toBe("Page-Root");
-    expect(leaf?.icon).toBeUndefined();
+    expect(leaf?.icon).toBe("file");
     expect(leaf?.target).toBeDefined();
     expect(folder?.label).toBe("page");
     expect(folder?.icon).toBe("folder");
     expect(folder?.target).toBeUndefined();
   });
+  test("tenantIdOverride wird in die Edit-Target-Args gereicht (SystemAdmin SYSTEM-Tenant-Content)", () => {
+    const nodes = inside(
+      groupBlocksByFolder(
+        [block({ slug: "imprint", folder: null }), block({ slug: "hero", folder: "page" })],
+        "00000000-0000-4000-8000-000000000000",
+      ),
+    );
+    // Root-Leaf trägt den Override.
+    expect(nodes[0]?.target?.args).toEqual({
+      slug: "imprint",
+      lang: "de",
+      tenantIdOverride: "00000000-0000-4000-8000-000000000000",
+    });
+    // Auch der Leaf im Folder (rekursiv durchgereicht).
+    const folderChild = childrenArray(nodes[1]?.children)[0];
+    expect(folderChild?.target?.args).toEqual({
+      slug: "hero",
+      lang: "de",
+      tenantIdOverride: "00000000-0000-4000-8000-000000000000",
+    });
+  });
+  test("ohne tenantIdOverride bleiben die Args frei davon (Default: Session-Tenant)", () => {
+    const nodes = inside(groupBlocksByFolder([block({ slug: "imprint", folder: null })]));
+    expect(nodes[0]?.target?.args).toEqual({ slug: "imprint", lang: "de" });
+  });
   test("Wrapper-Folder 'Content' umschließt alle blocks", () => {
     // V.1.5d Wrapper-Convention: groupBlocksByFolder gibt EINEN Knoten
     // zurück (den Wrapper), Inhalt liegt eine Ebene tiefer.

package/src/text-content/web/client-plugin.tsx

@@ -74,13 +74,21 @@ function newFolderNode(): FolderNode {
   return { leaves: [], subFolders: new Map() };
 }
 
-function attachBlock(root: FolderNode, block: BlockSummary): void {
+function attachBlock(root: FolderNode, block: BlockSummary, tenantIdOverride?: string): void {
   const leaf: TreeNode = {
     label: block.title || block.slug,
+    icon: "file",
     target: {
       featureId: "text-content",
       action: "edit",
-      args: { slug: block.slug, lang: block.lang },
+      // tenantIdOverride travels with the node → the editor's by-slug read +
+      // set write target the same tenant the tree was loaded from (SystemAdmin
+      // editing SYSTEM-tenant content). Omitted → session tenant.
+      args: {
+        slug: block.slug,
+        lang: block.lang,
+        ...(tenantIdOverride !== undefined && { tenantIdOverride }),
+      },
     },
     state: block.body ? "filled" : "stub",
   };
@@ -116,10 +124,13 @@ function renderFolderNode(node: FolderNode): TreeNode[] {
   return result;
 }
 
-export function groupBlocksByFolder(blocks: readonly BlockSummary[]): readonly TreeNode[] {
+export function groupBlocksByFolder(
+  blocks: readonly BlockSummary[],
+  tenantIdOverride?: string,
+): readonly TreeNode[] {
   const root = newFolderNode();
   for (const block of blocks) {
-    attachBlock(root, block);
+    attachBlock(root, block, tenantIdOverride);
   }
   const rendered = renderFolderNode(root);
   if (rendered.length === 0) return [];
@@ -133,47 +144,52 @@ export function groupBlocksByFolder(blocks: readonly BlockSummary[]): readonly T
   ];
 }
 
-const treeProvider: TreeChildrenSubscribe = () => (emit, emitError) => {
-  // CSRF-Header bei authenticated requests pflicht (auth-middleware
-  // double-submit pattern). Anonymous/Pre-Login wäre csrf-token=undefined
-  // → header weggelassen → server lässt die anonymous-Variante durch.
-  const headers: Record<string, string> = { "content-type": "application/json" };
-  const csrf = readCsrfToken();
-  if (csrf !== undefined) headers[CSRF_HEADER_NAME] = csrf;
-  fetch("/api/query", {
-    method: "POST",
-    headers,
-    body: JSON.stringify({
-      type: TextContentQueries.byTenant,
-      payload: {},
-    }),
-  })
-    .then(async (r) => {
-      if (!r.ok) {
-        // 403 (CSRF/auth) oder 5xx — explicit error statt silent empty.
-        const text = await r.text().catch(() => r.statusText);
-        throw new Error(`text-content load failed: ${r.status} ${text}`);
-      }
-      return r.json();
-    })
-    .then((data: ByTenantResponse) => {
-      // Der App-seitige r.nav-Knoten IST der "Content"-Container → die
-      // Provider-Kinder sind die Folder/Leaves darunter, nicht der Wrapper.
-      const content = groupBlocksByFolder(data.data.blocks)[0];
-      emit(content !== undefined && Array.isArray(content.children) ? content.children : []);
+// tenantIdOverride (SystemAdmin-only) lets an app point the Content tree at a
+// tenant other than the session's — publicstatus seeds marketing/legal blocks
+// on SYSTEM_TENANT_ID, so its SystemAdmin must read that tenant, not their own.
+function makeTreeProvider(tenantIdOverride?: string): TreeChildrenSubscribe {
+  return () => (emit, emitError) => {
+    // CSRF-Header bei authenticated requests pflicht (auth-middleware
+    // double-submit pattern). Anonymous/Pre-Login wäre csrf-token=undefined
+    // → header weggelassen → server lässt die anonymous-Variante durch.
+    const headers: Record<string, string> = { "content-type": "application/json" };
+    const csrf = readCsrfToken();
+    if (csrf !== undefined) headers[CSRF_HEADER_NAME] = csrf;
+    fetch("/api/query", {
+      method: "POST",
+      headers,
+      body: JSON.stringify({
+        type: TextContentQueries.byTenant,
+        payload: tenantIdOverride !== undefined ? { tenantIdOverride } : {},
+      }),
     })
-    .catch((e) => {
-      // V.1.4: explicit error-Signal via emitError. ProviderBranch zeigt
-      // Banner + Retry-Button. Fallback auf emit([]) wenn der Consumer
-      // kein emitError unterstützt (Tests etc.).
-      if (emitError) {
-        emitError(e instanceof Error ? e : new Error(String(e)));
-      } else {
-        emit([]);
-      }
-    });
-  return () => {};
-};
+      .then(async (r) => {
+        if (!r.ok) {
+          // 403 (CSRF/auth) oder 5xx — explicit error statt silent empty.
+          const text = await r.text().catch(() => r.statusText);
+          throw new Error(`text-content load failed: ${r.status} ${text}`);
+        }
+        return r.json();
+      })
+      .then((data: ByTenantResponse) => {
+        // Der App-seitige r.nav-Knoten IST der "Content"-Container → die
+        // Provider-Kinder sind die Folder/Leaves darunter, nicht der Wrapper.
+        const content = groupBlocksByFolder(data.data.blocks, tenantIdOverride)[0];
+        emit(content !== undefined && Array.isArray(content.children) ? content.children : []);
+      })
+      .catch((e) => {
+        // V.1.4: explicit error-Signal via emitError. ProviderBranch zeigt
+        // Banner + Retry-Button. Fallback auf emit([]) wenn der Consumer
+        // kein emitError unterstützt (Tests etc.).
+        if (emitError) {
+          emitError(e instanceof Error ? e : new Error(String(e)));
+        } else {
+          emit([]);
+        }
+      });
+    return () => {};
+  };
+}
 
 // V.1.3 echte Edit-Form: lädt aktuelle Werte via by-slug-query, lässt
 // TenantAdmin/SystemAdmin title + body editieren, dispatcht set-write
@@ -202,9 +218,11 @@ type SetResponse = { readonly slug: string; readonly lang: string; readonly isNe
 
 function TextContentEditor({
   target,
-  onClose,
 }: {
   readonly target: TargetRef;
+  // onClose bleibt Teil des Resolver-Contracts (Visual-Panel liefert es),
+  // wird aber nicht mehr gebraucht: die Tree-Auswahl navigiert, kein
+  // Schließen-Button mehr. Nicht destrukturiert → kein unused binding.
   readonly onClose: () => void;
 }): ReactNode {
   // @cast-boundary visual-tree-args — TargetRef.args ist erased zu
@@ -213,9 +231,12 @@ function TextContentEditor({
   // zu Event-Payloads. Optional-Chain absorbiert fehlende Felder ohne
   // throw, damit der Editor auch bei manuellem URL-Tampering nicht
   // crasht (TargetRef könnte aus old localStorage / URL-State stammen).
-  const args = target.args as { slug?: string; lang?: string } | undefined;
+  const args = target.args as
+    | { slug?: string; lang?: string; tenantIdOverride?: string }
+    | undefined;
   const slug = args?.slug ?? "";
   const lang = args?.lang ?? "";
+  const tenantIdOverride = args?.tenantIdOverride;
 
   const { Form, Field, Input, Button, Banner } = usePrimitives();
   const dispatcher = useDispatcher();
@@ -232,7 +253,7 @@ function TextContentEditor({
     error: loadError,
   } = useQuery<TextBlock | null>(
     TextContentQueries.bySlug,
-    { slug, lang },
+    { slug, lang, ...(tenantIdOverride !== undefined && { tenantIdOverride }) },
     { enabled: slug !== "" && lang !== "" },
   );
 
@@ -266,6 +287,7 @@ function TextContentEditor({
         lang,
         title,
         body: body.length > 0 ? body : null,
+        ...(tenantIdOverride !== undefined && { tenantIdOverride }),
       });
       if (result.isSuccess) {
         setSavedMsg(result.data.isNew ? "Neu angelegt." : "Gespeichert.");
@@ -290,61 +312,53 @@ function TextContentEditor({
   const disabled = submitting || loading || !canWrite;
 
   return (
-    <div className="flex h-full flex-col">
-      <header className="flex items-center justify-between border-b px-6 py-4">
-        <div>
-          <h2 className="text-lg font-semibold">Text-Block bearbeiten</h2>
-          <p className="text-xs text-muted-foreground">
-            {slug || "—"} ({lang || "—"})
-          </p>
-        </div>
-        <Button variant="secondary" onClick={onClose}>
-          schlie&szlig;en
-        </Button>
-      </header>
-      <div className="flex-1 overflow-y-auto px-6 py-6">
-        <Form onSubmit={onSubmit}>
-          {loading && <Banner variant="loading">Lädt aktuellen Stand…</Banner>}
-          {loadError !== null && (
-            <Banner variant="error">Konnte Block nicht laden: {loadError.code}</Banner>
-          )}
-          {!canWrite && !loading && (
-            <Banner variant="info">
-              Read-only — TenantAdmin- oder SystemAdmin-Rolle f&uuml;r &Auml;nderungen erforderlich.
-            </Banner>
-          )}
-          <Field id="text-content-title" label="Titel" required>
-            <Input
-              kind="text"
-              id="text-content-title"
-              name="text-content-title"
-              value={title}
-              onChange={setTitle}
-              disabled={disabled}
-              required
-            />
-          </Field>
-          <Field id="text-content-body" label="Inhalt">
-            <Input
-              kind="textarea"
-              id="text-content-body"
-              name="text-content-body"
-              value={body}
-              onChange={setBody}
-              disabled={disabled}
-              rows={14}
-            />
-          </Field>
-          {saveError !== null && <Banner variant="error">{saveError}</Banner>}
-          {savedMsg !== null && <Banner variant="info">{savedMsg}</Banner>}
-          {canWrite && (
-            <Button type="submit" loading={submitting} disabled={disabled}>
-              {submitting ? "Speichern…" : "Speichern"}
-            </Button>
-          )}
-        </Form>
-      </div>
-    </div>
+    <Form
+      onSubmit={onSubmit}
+      testId="text-content-editor"
+      title={title || slug || "—"}
+      subtitle={lang !== "" ? `(${lang})` : undefined}
+      actions={
+        canWrite ? (
+          <Button type="submit" loading={submitting} disabled={disabled}>
+            {submitting ? "Speichern…" : "Speichern"}
+          </Button>
+        ) : undefined
+      }
+    >
+      {loading && <Banner variant="loading">Lädt aktuellen Stand…</Banner>}
+      {loadError !== null && (
+        <Banner variant="error">Konnte Block nicht laden: {loadError.code}</Banner>
+      )}
+      {!canWrite && !loading && (
+        <Banner variant="info">
+          Read-only — TenantAdmin- oder SystemAdmin-Rolle f&uuml;r &Auml;nderungen erforderlich.
+        </Banner>
+      )}
+      <Field id="text-content-title" label="Titel" required>
+        <Input
+          kind="text"
+          id="text-content-title"
+          name="text-content-title"
+          value={title}
+          onChange={setTitle}
+          disabled={disabled}
+          required
+        />
+      </Field>
+      <Field id="text-content-body" label="Inhalt">
+        <Input
+          kind="textarea"
+          id="text-content-body"
+          name="text-content-body"
+          value={body}
+          onChange={setBody}
+          disabled={disabled}
+          rows={14}
+        />
+      </Field>
+      {saveError !== null && <Banner variant="error">{saveError}</Banner>}
+      {savedMsg !== null && <Banner variant="info">{savedMsg}</Banner>}
+    </Form>
   );
 }
 
@@ -353,12 +367,18 @@ function TextContentEditor({
 // Label/Icon/Access des Knotens (managed-pages-Konvention) — das Feature
 // liefert nur die Kinder + den Editor. Ohne navId: nur der Resolver, kein
 // Sidebar-Knoten (server-only-Consumer wie money-horse leaken nichts).
-export function textContentClient(opts?: { readonly navId?: string }): ClientFeatureDefinition {
+// `tenantId` (SystemAdmin-only): welchen Tenant der Content-Tree + Editor
+// bedienen — SYSTEM_TENANT_ID für Apps, die Marketing/Legal dort seeden.
+// Weglassen → Session-Tenant (Default; kein Cross-Tenant-Zugriff).
+export function textContentClient(opts?: {
+  readonly navId?: string;
+  readonly tenantId?: string;
+}): ClientFeatureDefinition {
   const navId = opts?.navId;
   return {
     name: "text-content",
     ...(navId !== undefined && {
-      navProviders: { [navId]: treeProvider },
+      navProviders: { [navId]: makeTreeProvider(opts?.tenantId) },
       // SSE-Refresh: jedes text-block-Event re-fired den Provider → Tree live.
       navEntities: { [navId]: ["text-block"] },
     }),

package/src/tier-engine/web/tier-admin-screen.tsx

@@ -93,8 +93,6 @@ export function TierAdminScreen(): ReactNode {
 
   return (
     <FormScreenShell testId="tier-admin-screen" className="flex flex-col gap-6">
-      <Text variant="small">{t("tier-admin.explainer")}</Text>
-
       {tenantsQuery.error !== null && (
         <Banner variant="error" testId="tier-admin-load-error">
           {t("tier-admin.error.load")}
@@ -123,6 +121,8 @@ export function TierAdminScreen(): ReactNode {
           </Button>
         }
       >
+        <Text variant="small">{t("tier-admin.explainer")}</Text>
+
         <Field id="tier-admin-tenant" label={t("tier-admin.tenant.label")} required>
           <Input
             kind="select"

package/src/user/constants.ts

@@ -1,3 +1,4 @@
+// @runtime client
 // Feature name
 export const USER_FEATURE = "user" as const;
 

package/src/user-data-rights/feature.ts

@@ -267,12 +267,7 @@ export function createUserDataRightsFeature(opts: UserDataRightsOptions = {}): F
       access: { roles: ["SystemAdmin"] },
     });
 
-    r.translations({
-      keys: {
-        ...USER_DATA_RIGHTS_I18N,
-        "user-data-rights:nav.exportJobs": { de: "DSGVO-Exporte", en: "GDPR exports" },
-      },
-    });
+    r.translations({ keys: USER_DATA_RIGHTS_I18N });
 
     // Dormant Self-Service-Screen (Art. 15/17/18/20): Export, Aktivitäts-
     // protokoll, Einschränkung, Löschung in einem Screen. Kein r.nav — die

package/src/user-data-rights/i18n.ts

@@ -1,6 +1,10 @@
+// @runtime client
+// Server + client i18n for user-data-rights (operator screens + nav). Pure
+// data, importable from the web bundle (web/i18n.ts derives the client keys).
 type LocalizedString = { readonly de: string; readonly en: string };
 
 export const USER_DATA_RIGHTS_I18N: Readonly<Record<string, LocalizedString>> = {
+  "user-data-rights:nav.exportJobs": { de: "DSGVO-Exporte", en: "GDPR exports" },
   "screen:export-job-list.title": { de: "DSGVO-Exporte", en: "GDPR exports" },
   "screen:export-job-detail.title": { de: "Export-Job", en: "Export job" },
   "screen:download-attempt-list.title": { de: "Download-Versuche", en: "Download attempts" },

package/src/user-data-rights/web/i18n.ts

@@ -5,8 +5,24 @@
 // deletion.<step>.<slug>`.
 
 import type { TranslationsByLocale } from "@cosmicdrift/kumiko-renderer";
+import { USER_DATA_RIGHTS_I18N } from "../i18n";
 
-export const defaultTranslations: TranslationsByLocale = {
+const LOCALES = ["de", "en"] as const;
+
+// Operator keys (export-job list/detail titles + entity field labels + nav)
+// live in the server i18n; the SystemAdmin entityList screens render them
+// client-side, so the web bundle must carry them too — otherwise raw keys
+// show. Derive from the single server source instead of duplicating.
+const operatorTranslations: TranslationsByLocale = Object.fromEntries(
+  LOCALES.map((locale) => [
+    locale,
+    Object.fromEntries(
+      Object.entries(USER_DATA_RIGHTS_I18N).map(([key, value]) => [key, value[locale]]),
+    ),
+  ]),
+);
+
+const apexTranslations: TranslationsByLocale = {
   de: {
     "userDataRights.deletion.request.title": "Account-Löschung beantragen",
     "userDataRights.deletion.request.intro":
@@ -152,3 +168,8 @@ export const defaultTranslations: TranslationsByLocale = {
       "The download is currently unavailable due to a server configuration issue. The operator has been notified.",
   },
 };
+
+export const defaultTranslations: TranslationsByLocale = {
+  de: { ...apexTranslations["de"], ...operatorTranslations["de"] },
+  en: { ...apexTranslations["en"], ...operatorTranslations["en"] },
+};