@cosmicdrift/kumiko-document-designer 0.387.0 → 0.389.0

package/dist/feature.js

@@ -1,6 +1,6 @@
 import { access, defineFeature, i18nKey, } from "@cosmicdrift/kumiko-framework/engine";
 import { TEMPLATE_FACETS, templateColumns, templateRowActions } from "./list-definition.js";
-import { DOCUMENT_DESIGNER_FEATURE, LAYOUT_EDITOR_SCREEN_ID, MAIL_EDITOR_SCREEN_ID, PDF_TEMPLATE_EDITOR_SCREEN_ID, PLATFORM_TEMPLATES_NAV_ID, PLATFORM_TEMPLATES_SCREEN_ID, TEMPLATES_NAV_ID, TEMPLATES_SCREEN_ID, } from "./web/constants.js";
+import { DOCUMENT_DESIGNER_FEATURE, LAYOUT_EDITOR_SCREEN_ID, MAIL_EDITOR_SCREEN_ID, PDF_TEMPLATE_EDITOR_SCREEN_ID, PLATFORM_LAYOUT_EDITOR_SCREEN_ID, PLATFORM_TEMPLATES_NAV_ID, PLATFORM_TEMPLATES_SCREEN_ID, TEMPLATES_NAV_ID, TEMPLATES_SCREEN_ID, } from "./web/constants.js";
 import { DOCUMENT_DESIGNER_I18N } from "./web/i18n.js";
 const OVERVIEW_QUERY = "template-resolver:query:overview";
 export function createDocumentDesignerFeature(options = {}) {
@@ -20,7 +20,7 @@ export function createDocumentDesignerFeature(options = {}) {
             query: OVERVIEW_QUERY,
             columns: templateColumns({ platform: false }),
             facets: [...TEMPLATE_FACETS],
-            rowActions: templateRowActions(),
+            rowActions: templateRowActions({ platform: false }),
             searchable: true,
             searchPlaceholder: i18nKey("documentDesigner.search"),
             pagination: "pages",
@@ -41,7 +41,7 @@ export function createDocumentDesignerFeature(options = {}) {
             query: OVERVIEW_QUERY,
             columns: templateColumns({ platform: true }),
             facets: [...TEMPLATE_FACETS],
-            rowActions: templateRowActions(),
+            rowActions: templateRowActions({ platform: true }),
             searchable: true,
             searchPlaceholder: i18nKey("documentDesigner.search"),
             pagination: "pages",
@@ -64,6 +64,14 @@ export function createDocumentDesignerFeature(options = {}) {
             dormant: true,
             access: { roles: access.roles(...editorRoles) },
         });
+        r.screen({
+            id: PLATFORM_LAYOUT_EDITOR_SCREEN_ID,
+            type: "custom",
+            renderer: { react: { __component: PLATFORM_LAYOUT_EDITOR_SCREEN_ID } },
+            description: "documentDesigner.screen.layoutEditor.description",
+            dormant: true,
+            access: { roles: access.systemAdmin },
+        });
         r.screen({
             id: PDF_TEMPLATE_EDITOR_SCREEN_ID,
             type: "custom",

package/dist/index.d.ts

@@ -1,2 +1,2 @@
 export { createDocumentDesignerFeature, type DocumentDesignerOptions } from "./feature.ts";
-export { DEFAULT_TEMPLATE_LOCALES, DOCUMENT_DESIGNER_FEATURE, LAYOUT_EDITOR_SCREEN_ID, MAIL_EDITOR_SCREEN_ID, PDF_TEMPLATE_EDITOR_SCREEN_ID, PLATFORM_TEMPLATES_NAV_ID, PLATFORM_TEMPLATES_SCREEN_ID, TEMPLATE_EDITOR_SCREENS, TEMPLATES_NAV_ID, TEMPLATES_SCREEN_ID, type TemplateEditorKind, } from "./web/constants.ts";
+export { DEFAULT_TEMPLATE_LOCALES, DOCUMENT_DESIGNER_FEATURE, LAYOUT_EDITOR_SCREEN_ID, MAIL_EDITOR_SCREEN_ID, PDF_TEMPLATE_EDITOR_SCREEN_ID, PLATFORM_LAYOUT_EDITOR_SCREEN_ID, PLATFORM_TEMPLATES_NAV_ID, PLATFORM_TEMPLATES_SCREEN_ID, TEMPLATE_EDITOR_SCREENS, TEMPLATES_NAV_ID, TEMPLATES_SCREEN_ID, type TemplateEditorKind, } from "./web/constants.ts";

package/dist/index.js

@@ -1,2 +1,2 @@
 export { createDocumentDesignerFeature } from "./feature.js";
-export { DEFAULT_TEMPLATE_LOCALES, DOCUMENT_DESIGNER_FEATURE, LAYOUT_EDITOR_SCREEN_ID, MAIL_EDITOR_SCREEN_ID, PDF_TEMPLATE_EDITOR_SCREEN_ID, PLATFORM_TEMPLATES_NAV_ID, PLATFORM_TEMPLATES_SCREEN_ID, TEMPLATE_EDITOR_SCREENS, TEMPLATES_NAV_ID, TEMPLATES_SCREEN_ID, } from "./web/constants.js";
+export { DEFAULT_TEMPLATE_LOCALES, DOCUMENT_DESIGNER_FEATURE, LAYOUT_EDITOR_SCREEN_ID, MAIL_EDITOR_SCREEN_ID, PDF_TEMPLATE_EDITOR_SCREEN_ID, PLATFORM_LAYOUT_EDITOR_SCREEN_ID, PLATFORM_TEMPLATES_NAV_ID, PLATFORM_TEMPLATES_SCREEN_ID, TEMPLATE_EDITOR_SCREENS, TEMPLATES_NAV_ID, TEMPLATES_SCREEN_ID, } from "./web/constants.js";

package/dist/list-definition.d.ts

@@ -3,4 +3,6 @@ export declare function templateColumns(options: {
     readonly platform: boolean;
 }): ListColumnSpec[];
 export declare const TEMPLATE_FACETS: readonly ListFacetSpec[];
-export declare function templateRowActions(): RowAction[];
+export declare function templateRowActions(options: {
+    readonly platform: boolean;
+}): RowAction[];

package/dist/list-definition.js

@@ -1,5 +1,6 @@
+import { TemplateResolverHandlers } from "@cosmicdrift/kumiko-bundled-features/template-resolver";
 import { i18nKey, } from "@cosmicdrift/kumiko-framework/engine";
-import { DocumentDesignerCells, TEMPLATE_EDITOR_SCREENS, } from "./web/constants.js";
+import { DocumentDesignerCells, PLATFORM_LAYOUT_EDITOR_SCREEN_ID, TEMPLATE_EDITOR_SCREENS, } from "./web/constants.js";
 function cell(component) {
     return { react: { __component: component } };
 }
@@ -84,26 +85,32 @@ export const TEMPLATE_FACETS = [
         ],
     },
 ];
+function isLayoutKind(kind) {
+    return kind === "mail-layout" || kind === "pdf-layout";
+}
 const EDITABLE_KINDS = [
     "mail",
     "document-pdf",
     "mail-layout",
     "pdf-layout",
 ];
-const RESET_TO_SYSTEM_HANDLER = "template-resolver:write:reset-to-system";
 const RESET_LOCKED_OVERRIDE_ACTION = {
     id: "reset-locked-override",
     label: i18nKey("documentDesigner.action.resetLockedOverride"),
-    handler: RESET_TO_SYSTEM_HANDLER,
+    handler: TemplateResolverHandlers.resetToSystem,
     payload: { map: { id: "lockedOverrideId" } },
     confirm: i18nKey("documentDesigner.action.resetLockedOverride.confirm"),
     confirmLabel: i18nKey("documentDesigner.action.resetLockedOverride.confirmLabel"),
     style: "danger",
     visible: { field: "canResetLockedOverride", eq: true },
 };
-export function templateRowActions() {
+// The screen the row is opened from fixes the layout scope: the platform overview edits the system
+// layout, the tenant overview always the tenant's own, even for a SystemAdmin on a system-origin row.
+export function templateRowActions(options) {
     const editActions = EDITABLE_KINDS.flatMap((kind) => {
-        const screen = TEMPLATE_EDITOR_SCREENS[kind];
+        const screen = options.platform && isLayoutKind(kind)
+            ? PLATFORM_LAYOUT_EDITOR_SCREEN_ID
+            : TEMPLATE_EDITOR_SCREENS[kind];
         if (screen === undefined)
             return [];
         return [

package/dist/web/cells.js

@@ -11,7 +11,7 @@ function withRow(row, render) {
 }
 export function TitleCell({ row }) {
     const t = useTranslation();
-    return withRow(row, (r) => (_jsxs("div", { children: [_jsx("div", { className: "max-w-48 whitespace-normal font-medium", children: templateTitle(t, r) }), _jsx("span", { className: "block max-w-40 truncate font-mono text-xs text-muted-foreground", title: r.slug, children: r.slug })] })));
+    return withRow(row, (r) => (_jsxs("div", { children: [_jsx("div", { className: "max-w-48 whitespace-normal font-medium [overflow-wrap:anywhere]", children: templateTitle(t, r) }), _jsx("span", { className: "block max-w-28 truncate font-mono text-xs text-muted-foreground", title: r.slug, children: r.slug })] })));
 }
 const KIND_KEY = {
     mail: "documentDesigner.kind.mail",

package/dist/web/client-plugin.js

@@ -4,14 +4,17 @@ import { mergeTranslations, translationsByLocaleFromKeys, useNav, } from "@cosmi
 import { LoadingState } from "@cosmicdrift/kumiko-renderer/web";
 import { lazy, Suspense } from "react";
 import { createLocalesCell, KindCell, ModifiedCell, OriginCell, OverriddenByCell, StatusCell, TitleCell, UsedByCell, } from "./cells.js";
-import { DEFAULT_TEMPLATE_LOCALES, DOCUMENT_DESIGNER_FEATURE, DocumentDesignerCells, LAYOUT_EDITOR_SCREEN_ID, MAIL_EDITOR_SCREEN_ID, PDF_TEMPLATE_EDITOR_SCREEN_ID, } from "./constants.js";
+import { DEFAULT_TEMPLATE_LOCALES, DOCUMENT_DESIGNER_FEATURE, DocumentDesignerCells, LAYOUT_EDITOR_SCREEN_ID, MAIL_EDITOR_SCREEN_ID, PDF_TEMPLATE_EDITOR_SCREEN_ID, PLATFORM_LAYOUT_EDITOR_SCREEN_ID, } from "./constants.js";
 import { documentDesignerTranslations } from "./default-translations.js";
 import { DOCUMENT_DESIGNER_I18N } from "./i18n.js";
 // The editors pull tiptap, MJML preview and the page canvas; load them on first mount.
 const LazyLayoutEditor = lazy(() => import("./layout-editor.js").then((module) => ({ default: module.LayoutEditor })));
 const LazyPdfTemplateEditor = lazy(() => import("./pdf-template-editor.js").then((module) => ({ default: module.PdfTemplateEditor })));
 function LayoutEditorScreen() {
-    return (_jsx(Suspense, { fallback: _jsx(LoadingState, {}), children: _jsx(LazyLayoutEditor, {}) }));
+    return (_jsx(Suspense, { fallback: _jsx(LoadingState, {}), children: _jsx(LazyLayoutEditor, { scope: "tenant" }) }));
+}
+function PlatformLayoutEditorScreen() {
+    return (_jsx(Suspense, { fallback: _jsx(LoadingState, {}), children: _jsx(LazyLayoutEditor, { scope: "system" }) }));
 }
 function createLazyMailEditor(appLocales) {
     const LazyMailEditor = lazy(() => import("./mail-editor.js").then((module) => ({
@@ -47,6 +50,7 @@ export function documentDesignerClient(options = {}) {
         },
         components: {
             [LAYOUT_EDITOR_SCREEN_ID]: LayoutEditorScreen,
+            [PLATFORM_LAYOUT_EDITOR_SCREEN_ID]: PlatformLayoutEditorScreen,
             [PDF_TEMPLATE_EDITOR_SCREEN_ID]: PdfTemplateEditorScreen,
             [MAIL_EDITOR_SCREEN_ID]: createLazyMailEditor(options.appLocales ?? DEFAULT_TEMPLATE_LOCALES),
         },

package/dist/web/constants.d.ts

@@ -2,6 +2,7 @@ export declare const DOCUMENT_DESIGNER_FEATURE: "document-designer";
 export declare const TEMPLATES_SCREEN_ID: "templates";
 export declare const PLATFORM_TEMPLATES_SCREEN_ID: "platform-templates";
 export declare const LAYOUT_EDITOR_SCREEN_ID: "layout-editor";
+export declare const PLATFORM_LAYOUT_EDITOR_SCREEN_ID: "platform-layout-editor";
 export declare const PDF_TEMPLATE_EDITOR_SCREEN_ID: "pdf-template-editor";
 export declare const MAIL_EDITOR_SCREEN_ID: "mail-editor";
 export declare const TEMPLATES_NAV_ID: "templates";

package/dist/web/constants.js

@@ -3,6 +3,7 @@ export const DOCUMENT_DESIGNER_FEATURE = "document-designer";
 export const TEMPLATES_SCREEN_ID = "templates";
 export const PLATFORM_TEMPLATES_SCREEN_ID = "platform-templates";
 export const LAYOUT_EDITOR_SCREEN_ID = "layout-editor";
+export const PLATFORM_LAYOUT_EDITOR_SCREEN_ID = "platform-layout-editor";
 export const PDF_TEMPLATE_EDITOR_SCREEN_ID = "pdf-template-editor";
 export const MAIL_EDITOR_SCREEN_ID = "mail-editor";
 export const TEMPLATES_NAV_ID = "templates";

package/dist/web/default-translations.js

@@ -13,8 +13,14 @@ export const documentDesignerTranslations = {
         "documentDesigner.localeDialog.title": "Unsaved changes",
         "documentDesigner.notFound": 'Template "{slug}" was not found.',
         "documentDesigner.originBar.export": "Export as bundle",
-        "documentDesigner.originBar.noTotal": "System template for all tenants. {count} tenants have their own version and do not receive changes made here.",
-        "documentDesigner.originBar.withTotal": "System template for all tenants. {count} of {total} tenants have their own version and do not receive changes made here.",
+        "documentDesigner.originBar.noTotal": {
+            one: "System template for all tenants. {count} tenant has its own version and does not receive changes made here.",
+            other: "System template for all tenants. {count} tenants have their own version and do not receive changes made here.",
+        },
+        "documentDesigner.originBar.withTotal": {
+            one: "System template for all tenants. {count} of {total} tenants has its own version and does not receive changes made here.",
+            other: "System template for all tenants. {count} of {total} tenants have their own version and do not receive changes made here.",
+        },
         "documentDesigner.originBar.showOverrides": "Show tenant customisations",
         "documentDesigner.overrides.action.diff": "Show difference",
         "documentDesigner.overrides.action.open": "Open",
@@ -27,7 +33,10 @@ export const documentDesignerTranslations = {
         "documentDesigner.overrides.empty": "No tenant has customised this template. Changes here apply to everyone.",
         "documentDesigner.overrides.status.active": "Customised",
         "documentDesigner.overrides.status.draft": "Draft",
-        "documentDesigner.overrides.summary": "{count} tenants have their own version.",
+        "documentDesigner.overrides.summary": {
+            one: "{count} tenant has its own version.",
+            other: "{count} tenants have their own version.",
+        },
         "documentDesigner.overrides.title": "Tenant customisations",
         "documentDesigner.overrides.usedBy": "Used by",
         "documentDesigner.overrides.usedByEmpty": "No registered notification uses this template directly.",
@@ -85,8 +94,14 @@ export const documentDesignerTranslations = {
         "documentDesigner.localeDialog.title": "Ungespeicherte Änderungen",
         "documentDesigner.notFound": 'Die Vorlage "{slug}" wurde nicht gefunden.',
         "documentDesigner.originBar.export": "Als Bundle exportieren",
-        "documentDesigner.originBar.noTotal": "System-Vorlage für alle Mandanten. {count} Mandanten haben eine eigene Fassung und bekommen Änderungen hier nicht.",
-        "documentDesigner.originBar.withTotal": "System-Vorlage für alle Mandanten. {count} von {total} Mandanten haben eine eigene Fassung und bekommen Änderungen hier nicht.",
+        "documentDesigner.originBar.noTotal": {
+            one: "System-Vorlage für alle Mandanten. {count} Mandant hat eine eigene Fassung und bekommt Änderungen hier nicht.",
+            other: "System-Vorlage für alle Mandanten. {count} Mandanten haben eine eigene Fassung und bekommen Änderungen hier nicht.",
+        },
+        "documentDesigner.originBar.withTotal": {
+            one: "System-Vorlage für alle Mandanten. {count} von {total} Mandanten hat eine eigene Fassung und bekommt Änderungen hier nicht.",
+            other: "System-Vorlage für alle Mandanten. {count} von {total} Mandanten haben eine eigene Fassung und bekommen Änderungen hier nicht.",
+        },
         "documentDesigner.originBar.showOverrides": "Anpassungen der Mandanten anzeigen",
         "documentDesigner.overrides.action.diff": "Unterschied anzeigen",
         "documentDesigner.overrides.action.open": "Öffnen",
@@ -99,7 +114,10 @@ export const documentDesignerTranslations = {
         "documentDesigner.overrides.empty": "Kein Mandant hat diese Vorlage angepasst. Änderungen hier gelten für alle.",
         "documentDesigner.overrides.status.active": "Angepasst",
         "documentDesigner.overrides.status.draft": "Entwurf",
-        "documentDesigner.overrides.summary": "{count} Mandanten haben eine eigene Fassung.",
+        "documentDesigner.overrides.summary": {
+            one: "{count} Mandant hat eine eigene Fassung.",
+            other: "{count} Mandanten haben eine eigene Fassung.",
+        },
         "documentDesigner.overrides.title": "Anpassungen der Mandanten",
         "documentDesigner.overrides.usedBy": "Wird verwendet von",
         "documentDesigner.overrides.usedByEmpty": "Keine registrierte Benachrichtigung nutzt diese Vorlage direkt.",
@@ -157,8 +175,14 @@ export const documentDesignerTranslations = {
         "documentDesigner.localeDialog.title": "Cambios sin guardar",
         "documentDesigner.notFound": "No se encontró la plantilla «{slug}».",
         "documentDesigner.originBar.export": "Exportar como paquete",
-        "documentDesigner.originBar.noTotal": "Plantilla del sistema para todas las organizaciones. {count} organizaciones tienen su propia versión y no reciben los cambios que hagas aquí.",
-        "documentDesigner.originBar.withTotal": "Plantilla del sistema para todas las organizaciones. {count} de {total} organizaciones tienen su propia versión y no reciben los cambios que hagas aquí.",
+        "documentDesigner.originBar.noTotal": {
+            one: "Plantilla del sistema para todas las organizaciones. {count} organización tiene su propia versión y no recibe los cambios que hagas aquí.",
+            other: "Plantilla del sistema para todas las organizaciones. {count} organizaciones tienen su propia versión y no reciben los cambios que hagas aquí.",
+        },
+        "documentDesigner.originBar.withTotal": {
+            one: "Plantilla del sistema para todas las organizaciones. {count} de {total} organizaciones tiene su propia versión y no recibe los cambios que hagas aquí.",
+            other: "Plantilla del sistema para todas las organizaciones. {count} de {total} organizaciones tienen su propia versión y no reciben los cambios que hagas aquí.",
+        },
         "documentDesigner.originBar.showOverrides": "Ver personalizaciones de las organizaciones",
         "documentDesigner.overrides.action.diff": "Ver diferencias",
         "documentDesigner.overrides.action.open": "Abrir",
@@ -171,7 +195,10 @@ export const documentDesignerTranslations = {
         "documentDesigner.overrides.empty": "Ninguna organización ha personalizado esta plantilla. Los cambios que hagas aquí se aplican a todas.",
         "documentDesigner.overrides.status.active": "Personalizada",
         "documentDesigner.overrides.status.draft": "Borrador",
-        "documentDesigner.overrides.summary": "{count} organizaciones tienen su propia versión.",
+        "documentDesigner.overrides.summary": {
+            one: "{count} organización tiene su propia versión.",
+            other: "{count} organizaciones tienen su propia versión.",
+        },
         "documentDesigner.overrides.title": "Personalizaciones de las organizaciones",
         "documentDesigner.overrides.usedBy": "Se usa en",
         "documentDesigner.overrides.usedByEmpty": "Ninguna notificación registrada usa esta plantilla directamente.",

package/dist/web/i18n.js

@@ -3,6 +3,7 @@ export const DOCUMENT_DESIGNER_I18N = {
     "screen:templates.title": { en: "Templates", de: "Vorlagen" },
     "screen:platform-templates.title": { en: "System templates", de: "System-Vorlagen" },
     "screen:layout-editor.title": { en: "Layout", de: "Layout" },
+    "screen:platform-layout-editor.title": { en: "System layout", de: "System-Layout" },
     "screen:pdf-template-editor.title": { en: "PDF template", de: "PDF-Vorlage" },
     "document-designer:nav.templates": { en: "Templates", de: "Vorlagen" },
     "document-designer:nav.platformTemplates": { en: "System templates", de: "System-Vorlagen" },

package/dist/web/layout-editor.d.ts

@@ -1,2 +1,4 @@
 import { type ReactNode } from "react";
-export declare function LayoutEditor(): ReactNode;
+export declare function LayoutEditor({ scope, }: {
+    readonly scope?: "tenant" | "system";
+}): ReactNode;

package/dist/web/layout-editor.js

@@ -11,7 +11,11 @@ function parseLayoutKind(raw) {
     return raw === "pdf-layout" ? "pdf-layout" : "mail-layout";
 }
 function LayoutEditorLoader({ kind, slug, isSystemAdmin, onKindChange, }) {
-    const source = useQuery(TemplateResolverQueries.layoutSource, { kind, slug });
+    const source = useQuery(TemplateResolverQueries.layoutSource, {
+        kind,
+        slug,
+        scope: isSystemAdmin ? "system" : "tenant",
+    });
     const overview = useQuery(TemplateResolverQueries.overview, {
         limit: 200,
         layoutSlug: slug,
@@ -38,10 +42,10 @@ function LayoutEditorLoader({ kind, slug, isSystemAdmin, onKindChange, }) {
     const bodyKey = [kind, slug, data.tenant?.id, data.tenant?.version, data.system?.version].join("|");
     return (_jsx(LayoutEditorBody, { kind: kind, slug: slug, isSystemAdmin: isSystemAdmin, source: data, overviewRows: rows, usedByCount: overview.data?.total ?? rows.length, overrides: isSystemAdmin ? overrides.data : null, onKindChange: onKindChange, onReload: reload }, bodyKey));
 }
-export function LayoutEditor() {
+export function LayoutEditor({ scope = "tenant", }) {
     const nav = useNav();
     const roles = useUserRoles();
     const [kind, setKind] = useState(() => parseLayoutKind(nav.searchParams["kind"]));
     const slug = nav.searchParams["slug"] ?? DEFAULT_LAYOUT_SLUG;
-    return (_jsx(LayoutEditorLoader, { kind: kind, slug: slug, isSystemAdmin: roles?.includes("SystemAdmin") === true, onKindChange: setKind }, kind));
+    return (_jsx(LayoutEditorLoader, { kind: kind, slug: slug, isSystemAdmin: scope === "system" && roles?.includes("SystemAdmin") === true, onKindChange: setKind }, kind));
 }

package/dist/web/layout-meta.js

@@ -1,8 +1,8 @@
-// Mirrors the mail-layout meta of template-resolver (template-meta.ts); the server parses it again on every write and render.
-export const LAYOUT_WIDTHS = [560, 600, 640];
-export const LAYOUT_FONTS = ["sans", "serif"];
-export const LAYOUT_ACCENT_LINES = ["branding", "none"];
-export const LAYOUT_BUTTON_STYLES = ["filled-rounded", "filled-square", "outline"];
+import { HEX_COLOR_PATTERN, MAIL_LAYOUT_ACCENT_LINES, MAIL_LAYOUT_BUTTON_STYLES, MAIL_LAYOUT_FONTS, MAIL_LAYOUT_WIDTHS, } from "@cosmicdrift/kumiko-bundled-features/template-resolver/web";
+export const LAYOUT_WIDTHS = MAIL_LAYOUT_WIDTHS;
+export const LAYOUT_FONTS = MAIL_LAYOUT_FONTS;
+export const LAYOUT_ACCENT_LINES = MAIL_LAYOUT_ACCENT_LINES;
+export const LAYOUT_BUTTON_STYLES = MAIL_LAYOUT_BUTTON_STYLES;
 export const DEFAULT_LAYOUT_APPEARANCE = {
     width: 600,
     font: "sans",
@@ -10,9 +10,8 @@ export const DEFAULT_LAYOUT_APPEARANCE = {
     accentLine: "none",
     buttonStyle: "filled-rounded",
 };
-const HEX_COLOR = /^#[0-9a-fA-F]{6}$/;
 export function isHexColor(value) {
-    return HEX_COLOR.test(value);
+    return HEX_COLOR_PATTERN.test(value);
 }
 export function appearanceOf(meta) {
     return { ...DEFAULT_LAYOUT_APPEARANCE, ...meta };

package/dist/web/mail-draft.d.ts

@@ -1,4 +1,4 @@
-import type { LinkedResourceView, MailDraft, MailVariable, PlaceholderType, TemplateRowView } from "./mail-types.ts";
+import type { LinkedResourceView, MailDraft, MailVariable, PickedValues, PlaceholderType, TemplateRowView } from "./mail-types.ts";
 export declare const EMPTY_DRAFT: MailDraft;
 export declare const PLACEHOLDER_SYMBOL: Readonly<Record<PlaceholderType, string>>;
 export declare const LAYOUT_OWNED_PLACEHOLDERS: ReadonlySet<string>;
@@ -8,6 +8,7 @@ export declare function systemPlaceholderLabel(t: Translate, name: string): stri
 export declare function labelPlaceholders(line: string, variableLabels: Readonly<Record<string, string>>): string;
 export declare function systemLabelMap(t: Translate, names: readonly string[]): Readonly<Record<string, string>>;
 export declare function parseJsonRecord(value: unknown): Readonly<Record<string, unknown>>;
+export declare function pickDeclaredVariables(picked: PickedValues | null, declared: Readonly<Record<string, MailVariable>> | undefined): PickedValues | null;
 export declare function loadedMailOf(row: TemplateRowView | null): MailDraft;
 export declare function buildMeta(draft: MailDraft): Record<string, unknown>;
 export declare function isDraftDirty(current: MailDraft, saved: MailDraft): boolean;

package/dist/web/mail-draft.js

@@ -62,6 +62,12 @@ export function parseJsonRecord(value) {
         return {};
     }
 }
+// The server rejects any variable the template does not declare, so a stale pick must not travel along.
+export function pickDeclaredVariables(picked, declared) {
+    if (picked === null || declared === undefined)
+        return null;
+    return Object.fromEntries(Object.entries(picked).filter(([name]) => Object.hasOwn(declared, name)));
+}
 function categoryOf(value) {
     return value === "transactional" || value === "marketing" ? value : "";
 }

package/dist/web/mail-editor-body.js

@@ -1,12 +1,12 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { TemplateResolverHandlers, TemplateResolverQueries, } from "@cosmicdrift/kumiko-bundled-features/template-resolver/web";
 import { dispatcherErrorText, useMutation, usePrimitives, useQuery, useTranslation, useUnsavedInputSource, } from "@cosmicdrift/kumiko-renderer";
-import { useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { EditorHeader, EditorLocaleSwitch, EditorModeSwitch, originOf, } from "./editor-header.js";
 import { EditorBody, EditorFooter, EditorFrame } from "./editor-shell.js";
 import { fileUrl } from "./file-name.js";
 import { MailConfirmDialogs } from "./mail-dialogs.js";
-import { buildMeta, isDraftDirty, loadedMailOf, parseJsonRecord, parseLinkedResources, systemLabelMap, variableLabelMap, } from "./mail-draft.js";
+import { buildMeta, isDraftDirty, loadedMailOf, parseJsonRecord, parseLinkedResources, pickDeclaredVariables, systemLabelMap, variableLabelMap, } from "./mail-draft.js";
 import { MailEditCenter } from "./mail-edit-center.js";
 import { footerMessage, metaFieldMessages } from "./mail-footer.js";
 import { PlaceholderSection, ResourceSection, SystemPlaceholderSection, } from "./mail-left-rail.js";
@@ -83,6 +83,21 @@ export function MailEditorBody(props) {
         locale,
         scope: isSystemAdmin ? "system" : "tenant",
     }).data;
+    const pickedVariables = pickDeclaredVariables(picked, validation?.variables);
+    // A pick belongs to the variables it was made for: after the declared set changes it is dropped,
+    // so a re-added variable does not revive an old record value.
+    const declaredVariables = validation?.variables;
+    const declaredVariableNames = declaredVariables === undefined ? null : Object.keys(declaredVariables).sort().join("|");
+    const previousDeclaredNames = useRef(declaredVariableNames);
+    useEffect(() => {
+        if (declaredVariableNames === null)
+            return;
+        if (previousDeclaredNames.current !== null &&
+            previousDeclaredNames.current !== declaredVariableNames) {
+            setPicked(null);
+        }
+        previousDeclaredNames.current = declaredVariableNames;
+    }, [declaredVariableNames]);
     const update = (patch) => {
         const next = { ...draft, ...patch };
         setDraft(next);
@@ -153,7 +168,7 @@ export function MailEditorBody(props) {
             variableSchema,
             includeAttachments,
             prefixSubject,
-            ...(picked !== null && { variables: picked }),
+            ...(pickedVariables !== null && { variables: pickedVariables }),
         });
     };
     // Nothing is written yet in a missing language, so no placeholder may read as missing.
@@ -185,7 +200,7 @@ export function MailEditorBody(props) {
                     content: settled.body,
                     meta: buildMeta(settled),
                     variableSchema,
-                    ...(picked !== null && { variables: picked }),
+                    ...(pickedVariables !== null && { variables: pickedVariables }),
                 }, picked: picked, onPick: setPicked, validation: validation ?? null, slug: slug, locale: locale, fromName: settled.senderName, own: own, origin: origin, controls: controls, testMail: {
                     availability: testMail.availability,
                     pending: testMail.pending,

package/dist/web/mail-preview-side.js

@@ -1,8 +1,6 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { ConfigQueries } from "@cosmicdrift/kumiko-bundled-features/config/web";
-import { useNav, usePrimitives, useQuery, useTranslation } from "@cosmicdrift/kumiko-renderer";
+import { useNav, usePrimitives, useTenantCurrency, useTranslation, } from "@cosmicdrift/kumiko-renderer";
 import { DOCUMENT_FALLBACK_CURRENCY } from "@cosmicdrift/kumiko-renderer/headless";
-import { TENANT_CURRENCY_CONFIG_KEY } from "@cosmicdrift/kumiko-types/fields";
 import { useState } from "react";
 import { displayValue } from "./mail-draft.js";
 import { usePreviewRecordPicker } from "./preview-record-picker.js";
@@ -22,22 +20,16 @@ function checkText(t, check, validation) {
     const translated = t(check.i18nKey, params);
     return translated === check.i18nKey ? check.code : translated;
 }
-// Same source and fallback as the renderer's readDocumentFormat, so a bare amount shows
-// the currency the rendered mail prints.
-function useTenantCurrency() {
-    const { data, error } = useQuery(ConfigQueries.values, {
-        keys: [TENANT_CURRENCY_CONFIG_KEY],
-    });
-    if (error)
-        return undefined;
-    if (data === null)
-        return undefined;
-    const value = data[TENANT_CURRENCY_CONFIG_KEY]?.value;
-    return typeof value === "string" && value !== "" ? value : DOCUMENT_FALLBACK_CURRENCY;
+// Same fallback as the renderer's readDocumentFormat, so a bare amount shows the currency the
+// rendered mail prints, also when the config query fails.
+function useSampleTenantCurrency(validation) {
+    const hasMoneyVariable = Object.values(validation?.variables ?? {}).some((variable) => variable.type === "money");
+    const resolution = useTenantCurrency(hasMoneyVariable, DOCUMENT_FALLBACK_CURRENCY);
+    return resolution.status === "ready" ? resolution.currency : undefined;
 }
 function SampleValues({ preview, validation, picked, locale, }) {
     const t = useTranslation();
-    const tenantCurrency = useTenantCurrency();
+    const tenantCurrency = useSampleTenantCurrency(validation);
     const values = { ...(preview?.sampleValues ?? {}), ...(picked ?? {}) };
     const names = Object.keys(validation?.variables ?? values);
     return (_jsx(_Fragment, { children: names.map((name) => {

package/dist/web/mail-right-rail.js

@@ -5,7 +5,7 @@ import { isOneOf } from "@cosmicdrift/kumiko-types/type-guards";
 import { DEFAULT_LAYOUT_SLUG, TENANT_MAIL_SENDING_SCREEN_ID } from "./constants.js";
 import { labelPlaceholders } from "./mail-draft.js";
 import { RailField, RailHint, RailRow, RailSection } from "./rail.js";
-import { usageParts } from "./used-by-label.js";
+import { templateTitleText, usageParts } from "./used-by-label.js";
 function useTemplateUsage(slug) {
     const { data } = useQuery(TemplateResolverQueries.usage, {
         slug,
@@ -33,7 +33,7 @@ export function layoutOptionLabel(t, layout) {
     // A layout has no registry title; the slug would read like an id, so name it by kind.
     const title = layout.title === layout.slug
         ? t(`documentDesigner.editor.title.${layout.kind === "mail-layout" ? "mail" : "pdf"}`)
-        : layout.title;
+        : templateTitleText(t, layout.title);
     return t(layout.origin === "tenant"
         ? "documentDesigner.mail.props.layoutTenant"
         : "documentDesigner.mail.props.layoutSystem", { title, version: layout.version });

package/dist/web/mail-types.d.ts

@@ -92,7 +92,7 @@ export type MailDraft = {
     readonly category: MailCategory;
     readonly senderName: string;
     readonly replyTo: string;
-    /** Meta lines without rail fields yet; carried so a tenant save keeps them. */
+    /** Placeholder lines; an empty tone stores the accent default. */
     readonly headerChip: string;
     readonly tone: string;
     readonly footerNote: string;

package/dist/web/pdf-template-editor.js

@@ -23,7 +23,7 @@ import { DEFAULT_LAYOUT_SLUG, DOCUMENT_PDF_KIND, PDF_LAYOUT_KIND, } from "./type
 import { useFilesCapability } from "./use-files-capability.js";
 import { useInsertTargets } from "./use-insert-targets.js";
 import { useOverviewRows } from "./use-overview-rows.js";
-import { templateTitle } from "./used-by-label.js";
+import { templateTitle, templateTitleText } from "./used-by-label.js";
 const SETTLE_MS = 500;
 const NO_VARIABLES = {};
 // Only the label of an images variable is needed, for the Images block and its picker.
@@ -282,7 +282,8 @@ export function PdfTemplateEditor({ slug, locale: requestedLocale, onLocaleChang
     }
     const canPublish = validation?.canPublish === true;
     const layoutSlugShown = layout?.slug ?? DEFAULT_LAYOUT_SLUG;
-    const layoutName = layouts.rows.find((row) => row.slug === layoutSlugShown)?.title ?? layoutSlugShown;
+    const layoutTitle = layouts.rows.find((row) => row.slug === layoutSlugShown)?.title;
+    const layoutName = layoutTitle === undefined ? layoutSlugShown : templateTitleText(t, layoutTitle);
     const layoutResourceSrc = (key) => key === "logo" && brandingLogoFile !== "" ? fileUrl(brandingLogoFile) : undefined;
     const placeholderSource = validation === undefined || validation === null
         ? null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmicdrift/kumiko-document-designer",
-  "version": "0.387.0",
+  "version": "0.389.0",
   "description": "Document designer for Kumiko: template overview, layout editor (mail layout, PDF letterhead) and the PDF template editor.",
   "license": "MIT",
   "author": "Marc Frost <marc@cosmicdriftgamestudio.com>",
@@ -20,11 +20,11 @@
     "./web/styles.css": "./src/web/styles.css"
   },
   "dependencies": {
-    "@cosmicdrift/kumiko-bundled-features": "0.387.0",
-    "@cosmicdrift/kumiko-framework": "0.387.0",
-    "@cosmicdrift/kumiko-renderer": "0.387.0",
-    "@cosmicdrift/kumiko-renderer-puppeteer-client": "0.387.0",
-    "@cosmicdrift/kumiko-types": "0.387.0",
+    "@cosmicdrift/kumiko-bundled-features": "0.389.0",
+    "@cosmicdrift/kumiko-framework": "0.389.0",
+    "@cosmicdrift/kumiko-renderer": "0.389.0",
+    "@cosmicdrift/kumiko-renderer-puppeteer-client": "0.389.0",
+    "@cosmicdrift/kumiko-types": "0.389.0",
     "react": "^19.2.6"
   },
   "devDependencies": {

package/src/changes.json

@@ -1,4 +1,34 @@
 [
+  {
+    "version": "0.389.0",
+    "type": "fix",
+    "title": "layout editor scope follows the entry screen",
+    "detail": "The tenant overview opens layout rows in the tenant editor even for a SystemAdmin, so a system-origin row there loads and saves the tenant layout through layout-source with scope tenant and upsert-tenant. The platform overview opens the new platform-layout-editor screen (PLATFORM_LAYOUT_EDITOR_SCREEN_ID) for the system layout. layout-source takes an optional scope and answers 403 to scope system for non-SystemAdmins. templateRowActions now takes { platform }."
+  },
+  {
+    "version": "0.389.0",
+    "type": "fix",
+    "title": "mail editor resets the record pick when variables change",
+    "detail": "The picked record values are cleared as soon as the set of declared variables changes, so a removed or renamed variable no longer leaves a stale pick behind and a re-added variable does not revive an old value."
+  },
+  {
+    "version": "0.388.0",
+    "type": "fix",
+    "title": "Picked preview values are filtered to declared variables",
+    "detail": "A picked record value for a variable the template does not declare no longer travels into the preview or test mail, which the server rejected as an unknown variable."
+  },
+  {
+    "version": "0.388.0",
+    "type": "fix",
+    "title": "Singular tenant counts in the override texts",
+    "detail": "The override summary and the system origin bar use plural forms, so one customising tenant reads \"1 tenant has its own version\" in en, de and es."
+  },
+  {
+    "version": "0.388.0",
+    "type": "fix",
+    "title": "Seeded layout titles show translated in the PDF editor and mail rail",
+    "detail": "A layout seeded with a title i18n key now shows its translated name in the PDF editor header and the mail editor properties rail instead of the raw key."
+  },
   {
     "version": "0.384.0",
     "type": "improvement",