@cardinali-studio/adminkit 2.2.0 → 2.2.2

package/dist/api.d.ts

@@ -69,6 +69,8 @@ export type ContentDocument = {
     kind: string;
     locale: string;
     draftRevisionId: string | null;
+    draftPayload: string | null;
+    draftTombstone: boolean | null;
     publishedRevisionId: string | null;
     publishedPayload: string | null;
     publishedTombstone: boolean | null;

package/dist/app/lib/home.js

@@ -10,6 +10,8 @@
  */
 import { useCallback, useEffect, useState } from "react";
 import { ApiError } from "../../index.js";
+import { api } from "../../api.js";
+import { contentPersistenceMode, site } from "../site.js";
 async function call(url, init) {
     const res = await fetch(url, { cache: "no-store", ...init });
     const body = await res.json().catch(() => null);
@@ -24,9 +26,20 @@ export function useHome(active) {
     const [dirty, setDirty] = useState(false);
     const [saving, setSaving] = useState(false);
     const [notice, setNotice] = useState(null);
+    const [revision, setRevision] = useState(null);
     const load = useCallback(async () => {
         try {
-            setData((await call("/admin/api/singleton?name=home")).data);
+            const mapped = site().homeDocument;
+            if (contentPersistenceMode() === "d1" && mapped) {
+                const { document } = await api.contentDocument(mapped.documentId);
+                const payload = document.draftPayload ?? document.publishedPayload;
+                if (!payload || (document.draftPayload !== null ? document.draftTombstone : document.publishedTombstone))
+                    throw new Error("content_unavailable");
+                setData(JSON.parse(payload));
+                setRevision({ base: document.draftRevisionId ?? document.publishedRevisionId, expected: document.draftRevisionId });
+            }
+            else
+                setData((await call("/admin/api/singleton?name=home")).data);
             setError(null);
             setDirty(false);
         }
@@ -44,6 +57,15 @@ export function useHome(active) {
         setSaving(true);
         setNotice(null);
         try {
+            const mapped = site().homeDocument;
+            if (contentPersistenceMode() === "d1" && mapped && revision) {
+                const revisionId = crypto.randomUUID();
+                await api.saveContent({ revisionId, documentId: mapped.documentId, baseRevisionId: revision.base, expectedDraftRevisionId: revision.expected, kind: mapped.kind, locale: mapped.locale, schemaVersion: mapped.schemaVersion, payload: data, tombstone: false });
+                setRevision({ base: revisionId, expected: revisionId });
+                setNotice("Bozza D1 salvata");
+                setDirty(false);
+                return;
+            }
             await call("/admin/api/singleton", {
                 method: "POST",
                 headers: { "Content-Type": "application/json" },
@@ -61,7 +83,7 @@ export function useHome(active) {
         finally {
             setSaving(false);
         }
-    }, [data]);
+    }, [data, revision]);
     const change = useCallback((next) => { setData(next); setDirty(true); }, []);
     return { data, error, dirty, saving, notice, load, change, save, setNotice };
 }

package/dist/app/lib/settings.js

@@ -6,6 +6,8 @@
  */
 import { useCallback, useEffect, useState } from "react";
 import { ApiError } from "../../index.js";
+import { api } from "../../api.js";
+import { contentPersistenceMode, site } from "../site.js";
 const empty = {
     siteTitle: "",
     shortDescription: "",
@@ -34,10 +36,22 @@ export function useSiteSettings(active) {
     const [dirty, setDirty] = useState(false);
     const [saving, setSaving] = useState(false);
     const [notice, setNotice] = useState(null);
+    const [revision, setRevision] = useState(null);
     const load = useCallback(async () => {
         try {
-            const result = await call("/admin/api/settings");
-            setData({ ...empty, ...result.settings, password: "" });
+            const mapped = site().siteSettingsDocument;
+            if (contentPersistenceMode() === "d1" && mapped) {
+                const { document } = await api.contentDocument(mapped.documentId);
+                const payload = document.draftPayload ?? document.publishedPayload;
+                if (!payload || (document.draftPayload !== null ? document.draftTombstone : document.publishedTombstone))
+                    throw new Error("content_unavailable");
+                setData({ ...empty, ...JSON.parse(payload), password: "" });
+                setRevision({ base: document.draftRevisionId ?? document.publishedRevisionId, expected: document.draftRevisionId });
+            }
+            else {
+                const result = await call("/admin/api/settings");
+                setData({ ...empty, ...result.settings, password: "" });
+            }
             setError(null);
             setDirty(false);
         }
@@ -55,6 +69,15 @@ export function useSiteSettings(active) {
         setSaving(true);
         setNotice(null);
         try {
+            const mapped = site().siteSettingsDocument;
+            if (contentPersistenceMode() === "d1" && mapped && revision) {
+                const revisionId = crypto.randomUUID();
+                await api.saveContent({ revisionId, documentId: mapped.documentId, baseRevisionId: revision.base, expectedDraftRevisionId: revision.expected, kind: mapped.kind, locale: mapped.locale, schemaVersion: mapped.schemaVersion, payload: data, tombstone: false });
+                setRevision({ base: revisionId, expected: revisionId });
+                setDirty(false);
+                setNotice("Bozza D1 salvata");
+                return;
+            }
             const result = await call("/admin/api/settings", {
                 method: "POST",
                 headers: { "Content-Type": "application/json" },
@@ -73,7 +96,7 @@ export function useSiteSettings(active) {
         finally {
             setSaving(false);
         }
-    }, [data]);
+    }, [data, revision]);
     const change = useCallback((next) => {
         setData(next);
         setDirty(true);

package/dist/app/site.d.ts

@@ -49,6 +49,19 @@ export interface SiteAdminConfig {
     modules?: Record<string, boolean>;
     /** Git remains the compatibility default. D1 is an explicit, later site cutover. */
     contentPersistence?: "github" | "d1";
+    /** Lossless D1 identity for the singleton home; required before its editor may leave Git. */
+    homeDocument?: {
+        documentId: string;
+        kind: string;
+        locale: string;
+        schemaVersion: number;
+    };
+    siteSettingsDocument?: {
+        documentId: string;
+        kind: string;
+        locale: string;
+        schemaVersion: number;
+    };
 }
 /** Chiamata da `mountAdmin` prima del primo render. */
 export declare function setSiteConfig(config: SiteAdminConfig): void;

package/dist/persistence.d.ts

@@ -86,6 +86,8 @@ export type EffectiveDocument = {
     locale: string;
     draftRevisionId: string | null;
     publishedRevisionId: string | null;
+    draftPayload: string | null;
+    draftTombstone: boolean | null;
     publishedPayload: string | null;
     publishedTombstone: boolean | null;
 };

package/dist/persistence.js

@@ -113,8 +113,10 @@ export class D1ContentRepository {
     }
     async getEffectiveDocument(documentId) {
         return this.db.prepare(`SELECT d.document_id AS documentId, d.kind, d.locale, d.draft_revision_id AS draftRevisionId,
+      draft.payload_json AS draftPayload, draft.is_tombstone AS draftTombstone,
       published.revision_id AS publishedRevisionId, published.payload_json AS publishedPayload, published.is_tombstone AS publishedTombstone
       FROM content_documents d
+      LEFT JOIN content_revisions draft ON draft.document_id = d.document_id AND draft.revision_id = d.draft_revision_id
       LEFT JOIN content_site_state state ON state.singleton = 1
       LEFT JOIN content_release_entries entry ON entry.release_id = state.current_release_id AND entry.document_id = d.document_id
       LEFT JOIN content_revisions published ON published.document_id = entry.document_id AND published.revision_id = entry.revision_id

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cardinali-studio/adminkit",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "type": "module",
   "description": "Motore riusabile di un pannello di amministrazione per siti Hugo su Cloudflare Pages: codec del front matter guidato dallo schema, form React, libreria media su R2. NIENTE di specifico di un sito qui dentro.",
   "license": "UNLICENSED",