@cosmicdrift/kumiko-document-designer 0.388.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,6 +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 } };
 }
@@ -85,6 +85,9 @@ export const TEMPLATE_FACETS = [
         ],
     },
 ];
+function isLayoutKind(kind) {
+    return kind === "mail-layout" || kind === "pdf-layout";
+}
 const EDITABLE_KINDS = [
     "mail",
     "document-pdf",
@@ -101,9 +104,13 @@ const RESET_LOCKED_OVERRIDE_ACTION = {
     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/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/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/mail-editor-body.js

@@ -1,7 +1,7 @@
 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";
@@ -84,6 +84,20 @@ export function MailEditorBody(props) {
         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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmicdrift/kumiko-document-designer",
-  "version": "0.388.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.388.0",
-    "@cosmicdrift/kumiko-framework": "0.388.0",
-    "@cosmicdrift/kumiko-renderer": "0.388.0",
-    "@cosmicdrift/kumiko-renderer-puppeteer-client": "0.388.0",
-    "@cosmicdrift/kumiko-types": "0.388.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,16 @@
 [
+  {
+    "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",