@orion-studios/payload-studio 0.5.0-beta.60 → 0.5.0-beta.61

package/dist/admin/client.js

@@ -2829,6 +2829,7 @@ function AdminStudioPageEditView(props) {
   const iframeRef = (0, import_react14.useRef)(null);
   const [saving, setSaving] = (0, import_react14.useState)(null);
   const [dirty, setDirty] = (0, import_react14.useState)(false);
+  const [hasUnpublishedChanges, setHasUnpublishedChanges] = (0, import_react14.useState)(false);
   const [canUndo, setCanUndo] = (0, import_react14.useState)(false);
   const [canRedo, setCanRedo] = (0, import_react14.useState)(false);
   const builderBasePath = getPropString4(props, "builderBasePath", "/builder");
@@ -2848,6 +2849,44 @@ function AdminStudioPageEditView(props) {
     setDidResolvePathFallback(true);
   }, [pageIDFromParams]);
   const canPublish = isAdmin3(user) || isEditor(user);
+  const refreshUnpublishedState = async (id) => {
+    try {
+      const response = await fetch(
+        `/api/pages/versions?depth=0&limit=25&sort=-updatedAt&where[parent][equals]=${encodeURIComponent(id)}`,
+        {
+          credentials: "include"
+        }
+      );
+      if (!response.ok) {
+        return;
+      }
+      const payload = await response.json();
+      const docs = Array.isArray(payload.docs) ? payload.docs : [];
+      let latestDraft = 0;
+      let latestPublished = 0;
+      docs.forEach((doc) => {
+        const status = doc.version?._status;
+        const millis = typeof doc.updatedAt === "string" ? Date.parse(doc.updatedAt) : Number.NaN;
+        if (!Number.isFinite(millis)) {
+          return;
+        }
+        if (status === "draft") {
+          latestDraft = Math.max(latestDraft, millis);
+        }
+        if (status === "published") {
+          latestPublished = Math.max(latestPublished, millis);
+        }
+      });
+      setHasUnpublishedChanges(latestDraft > 0 && latestDraft >= latestPublished);
+    } catch {
+    }
+  };
+  (0, import_react14.useEffect)(() => {
+    if (!pageID) {
+      return;
+    }
+    void refreshUnpublishedState(pageID);
+  }, [pageID]);
   const requestSave = (status) => {
     const iframe = iframeRef.current;
     if (!iframe?.contentWindow) {
@@ -2883,6 +2922,13 @@ function AdminStudioPageEditView(props) {
       if (data.type === "save-result") {
         setSaving(null);
         if (data.ok) {
+          if (data.status === "draft") {
+            setHasUnpublishedChanges(true);
+          } else if (data.status === "published") {
+            setHasUnpublishedChanges(false);
+          } else if (pageID) {
+            void refreshUnpublishedState(pageID);
+          }
           import_ui6.toast.success(typeof data.message === "string" ? data.message : "Saved.");
         } else {
           import_ui6.toast.error(typeof data.message === "string" ? data.message : "Save failed.");
@@ -2969,6 +3015,23 @@ function AdminStudioPageEditView(props) {
             ] }),
             /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)("div", { style: { alignItems: "center", display: "flex", gap: "0.5rem" }, children: [
               /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("div", { style: { color: dirty ? "var(--theme-elevation-900)" : "var(--theme-elevation-600)", fontSize: "0.85rem", fontWeight: 700 }, children: dirty ? "Unsaved changes" : "All changes saved" }),
+              /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
+                "div",
+                {
+                  style: {
+                    background: hasUnpublishedChanges ? "#fff3cd" : "#e7f7ee",
+                    border: `1px solid ${hasUnpublishedChanges ? "#f0c36d" : "#87c79e"}`,
+                    borderRadius: 999,
+                    color: hasUnpublishedChanges ? "#6a4a00" : "#0e5a2a",
+                    fontSize: "0.75rem",
+                    fontWeight: 800,
+                    padding: "0.2rem 0.55rem",
+                    whiteSpace: "nowrap"
+                  },
+                  title: hasUnpublishedChanges ? "There are saved draft changes not yet published." : "The live page matches the latest published content.",
+                  children: hasUnpublishedChanges ? "Unpublished draft changes" : "Live is up to date"
+                }
+              ),
               /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
                 "button",
                 {

package/dist/admin/client.mjs

@@ -1646,6 +1646,7 @@ function AdminStudioPageEditView(props) {
   const iframeRef = useRef3(null);
   const [saving, setSaving] = useState8(null);
   const [dirty, setDirty] = useState8(false);
+  const [hasUnpublishedChanges, setHasUnpublishedChanges] = useState8(false);
   const [canUndo, setCanUndo] = useState8(false);
   const [canRedo, setCanRedo] = useState8(false);
   const builderBasePath = getPropString4(props, "builderBasePath", "/builder");
@@ -1665,6 +1666,44 @@ function AdminStudioPageEditView(props) {
     setDidResolvePathFallback(true);
   }, [pageIDFromParams]);
   const canPublish = isAdmin3(user) || isEditor(user);
+  const refreshUnpublishedState = async (id) => {
+    try {
+      const response = await fetch(
+        `/api/pages/versions?depth=0&limit=25&sort=-updatedAt&where[parent][equals]=${encodeURIComponent(id)}`,
+        {
+          credentials: "include"
+        }
+      );
+      if (!response.ok) {
+        return;
+      }
+      const payload = await response.json();
+      const docs = Array.isArray(payload.docs) ? payload.docs : [];
+      let latestDraft = 0;
+      let latestPublished = 0;
+      docs.forEach((doc) => {
+        const status = doc.version?._status;
+        const millis = typeof doc.updatedAt === "string" ? Date.parse(doc.updatedAt) : Number.NaN;
+        if (!Number.isFinite(millis)) {
+          return;
+        }
+        if (status === "draft") {
+          latestDraft = Math.max(latestDraft, millis);
+        }
+        if (status === "published") {
+          latestPublished = Math.max(latestPublished, millis);
+        }
+      });
+      setHasUnpublishedChanges(latestDraft > 0 && latestDraft >= latestPublished);
+    } catch {
+    }
+  };
+  useEffect9(() => {
+    if (!pageID) {
+      return;
+    }
+    void refreshUnpublishedState(pageID);
+  }, [pageID]);
   const requestSave = (status) => {
     const iframe = iframeRef.current;
     if (!iframe?.contentWindow) {
@@ -1700,6 +1739,13 @@ function AdminStudioPageEditView(props) {
       if (data.type === "save-result") {
         setSaving(null);
         if (data.ok) {
+          if (data.status === "draft") {
+            setHasUnpublishedChanges(true);
+          } else if (data.status === "published") {
+            setHasUnpublishedChanges(false);
+          } else if (pageID) {
+            void refreshUnpublishedState(pageID);
+          }
           toast.success(typeof data.message === "string" ? data.message : "Saved.");
         } else {
           toast.error(typeof data.message === "string" ? data.message : "Save failed.");
@@ -1786,6 +1832,23 @@ function AdminStudioPageEditView(props) {
             ] }),
             /* @__PURE__ */ jsxs12("div", { style: { alignItems: "center", display: "flex", gap: "0.5rem" }, children: [
               /* @__PURE__ */ jsx13("div", { style: { color: dirty ? "var(--theme-elevation-900)" : "var(--theme-elevation-600)", fontSize: "0.85rem", fontWeight: 700 }, children: dirty ? "Unsaved changes" : "All changes saved" }),
+              /* @__PURE__ */ jsx13(
+                "div",
+                {
+                  style: {
+                    background: hasUnpublishedChanges ? "#fff3cd" : "#e7f7ee",
+                    border: `1px solid ${hasUnpublishedChanges ? "#f0c36d" : "#87c79e"}`,
+                    borderRadius: 999,
+                    color: hasUnpublishedChanges ? "#6a4a00" : "#0e5a2a",
+                    fontSize: "0.75rem",
+                    fontWeight: 800,
+                    padding: "0.2rem 0.55rem",
+                    whiteSpace: "nowrap"
+                  },
+                  title: hasUnpublishedChanges ? "There are saved draft changes not yet published." : "The live page matches the latest published content.",
+                  children: hasUnpublishedChanges ? "Unpublished draft changes" : "Live is up to date"
+                }
+              ),
               /* @__PURE__ */ jsx13(
                 "button",
                 {

package/dist/{chunk-Y2TOGMF2.mjs → chunk-Z7NIOJNB.mjs}

@@ -1,9 +1,9 @@
-import {
-  assertStudioDocumentV1
-} from "./chunk-HXGAG6I7.mjs";
 import {
   studioDocumentToLayout
 } from "./chunk-OHAGPJBM.mjs";
+import {
+  assertStudioDocumentV1
+} from "./chunk-HXGAG6I7.mjs";
 import {
   __export
 } from "./chunk-6BWS3CLP.mjs";
@@ -33,7 +33,7 @@ function createPayloadClient(config) {
 
 // src/nextjs/queries/pages.ts
 import { unstable_cache } from "next/cache";
-var PAGE_QUERY_CACHE_VERSION = "v3-published-query-fix";
+var PAGE_QUERY_CACHE_VERSION = "v4-published-only-public";
 function withStudioDocumentLayout(page) {
   if (!page) {
     return null;
@@ -64,13 +64,18 @@ async function queryPageByPath(payload, path, draft) {
       equals: path
     }
   };
+  const publishedWhere = {
+    _status: {
+      equals: "published"
+    }
+  };
   const result = await payload.find({
     collection: "pages",
     depth: 2,
     draft,
     limit: 1,
     overrideAccess: false,
-    where: pathWhere
+    where: draft ? pathWhere : { and: [pathWhere, publishedWhere] }
   });
   if (result.docs.length > 0) {
     return withStudioDocumentLayout(result.docs[0] || null);
@@ -87,7 +92,7 @@ async function queryPageByPath(payload, path, draft) {
       draft,
       limit: 1,
       overrideAccess: false,
-      where: homeWhere
+      where: draft ? homeWhere : { and: [homeWhere, publishedWhere] }
     });
     return withStudioDocumentLayout(homeResult.docs[0] || null);
   }
@@ -118,7 +123,12 @@ function createPageQueries(getPayloadClient, contentTag = "website-content") {
       draft: false,
       limit: 1e3,
       pagination: false,
-      overrideAccess: false
+      overrideAccess: false,
+      where: {
+        _status: {
+          equals: "published"
+        }
+      }
     });
     return pages.docs.map((doc) => doc.path).filter((path) => typeof path === "string" && path.length > 0);
   }

package/dist/index.js

@@ -2858,7 +2858,7 @@ var createDefaultStudioDocument = (title) => ({
 });
 
 // src/nextjs/queries/pages.ts
-var PAGE_QUERY_CACHE_VERSION = "v3-published-query-fix";
+var PAGE_QUERY_CACHE_VERSION = "v4-published-only-public";
 function withStudioDocumentLayout(page) {
   if (!page) {
     return null;
@@ -2889,13 +2889,18 @@ async function queryPageByPath(payload, path2, draft) {
       equals: path2
     }
   };
+  const publishedWhere = {
+    _status: {
+      equals: "published"
+    }
+  };
   const result = await payload.find({
     collection: "pages",
     depth: 2,
     draft,
     limit: 1,
     overrideAccess: false,
-    where: pathWhere
+    where: draft ? pathWhere : { and: [pathWhere, publishedWhere] }
   });
   if (result.docs.length > 0) {
     return withStudioDocumentLayout(result.docs[0] || null);
@@ -2912,7 +2917,7 @@ async function queryPageByPath(payload, path2, draft) {
       draft,
       limit: 1,
       overrideAccess: false,
-      where: homeWhere
+      where: draft ? homeWhere : { and: [homeWhere, publishedWhere] }
     });
     return withStudioDocumentLayout(homeResult.docs[0] || null);
   }
@@ -2943,7 +2948,12 @@ function createPageQueries(getPayloadClient, contentTag = "website-content") {
       draft: false,
       limit: 1e3,
       pagination: false,
-      overrideAccess: false
+      overrideAccess: false,
+      where: {
+        _status: {
+          equals: "published"
+        }
+      }
     });
     return pages.docs.map((doc) => doc.path).filter((path2) => typeof path2 === "string" && path2.length > 0);
   }

package/dist/index.mjs

@@ -9,14 +9,14 @@ import {
 } from "./chunk-4AOYZGIY.mjs";
 import {
   nextjs_exports
-} from "./chunk-Y2TOGMF2.mjs";
-import {
-  studio_exports
-} from "./chunk-HXGAG6I7.mjs";
+} from "./chunk-Z7NIOJNB.mjs";
 import {
   studio_pages_exports
 } from "./chunk-OHAGPJBM.mjs";
 import "./chunk-SIL2J5MF.mjs";
+import {
+  studio_exports
+} from "./chunk-HXGAG6I7.mjs";
 import "./chunk-6BWS3CLP.mjs";
 export {
   admin_exports as admin,

package/dist/nextjs/index.js

@@ -312,7 +312,7 @@ var studioDocumentToLayout = (document) => document.nodes.map((node) => ({
 }));
 
 // src/nextjs/queries/pages.ts
-var PAGE_QUERY_CACHE_VERSION = "v3-published-query-fix";
+var PAGE_QUERY_CACHE_VERSION = "v4-published-only-public";
 function withStudioDocumentLayout(page) {
   if (!page) {
     return null;
@@ -343,13 +343,18 @@ async function queryPageByPath(payload, path, draft) {
       equals: path
     }
   };
+  const publishedWhere = {
+    _status: {
+      equals: "published"
+    }
+  };
   const result = await payload.find({
     collection: "pages",
     depth: 2,
     draft,
     limit: 1,
     overrideAccess: false,
-    where: pathWhere
+    where: draft ? pathWhere : { and: [pathWhere, publishedWhere] }
   });
   if (result.docs.length > 0) {
     return withStudioDocumentLayout(result.docs[0] || null);
@@ -366,7 +371,7 @@ async function queryPageByPath(payload, path, draft) {
       draft,
       limit: 1,
       overrideAccess: false,
-      where: homeWhere
+      where: draft ? homeWhere : { and: [homeWhere, publishedWhere] }
     });
     return withStudioDocumentLayout(homeResult.docs[0] || null);
   }
@@ -397,7 +402,12 @@ function createPageQueries(getPayloadClient, contentTag = "website-content") {
       draft: false,
       limit: 1e3,
       pagination: false,
-      overrideAccess: false
+      overrideAccess: false,
+      where: {
+        _status: {
+          equals: "published"
+        }
+      }
     });
     return pages.docs.map((doc) => doc.path).filter((path) => typeof path === "string" && path.length > 0);
   }

package/dist/nextjs/index.mjs

@@ -4,10 +4,10 @@ import {
   createPayloadClient,
   createSiteQueries,
   resolveMedia
-} from "../chunk-Y2TOGMF2.mjs";
-import "../chunk-HXGAG6I7.mjs";
+} from "../chunk-Z7NIOJNB.mjs";
 import "../chunk-OHAGPJBM.mjs";
 import "../chunk-SIL2J5MF.mjs";
+import "../chunk-HXGAG6I7.mjs";
 import "../chunk-6BWS3CLP.mjs";
 export {
   WEBSITE_CONTENT_TAG,

package/dist/studio-pages/client.js

@@ -1973,19 +1973,23 @@ function BuilderPageEditor({ initialDoc, pageID }) {
     try {
       const normalizedLayout = withHeroMediaFallbacks(layout);
       const persistedLayout = toPersistedLayout(normalizedLayout);
-      const response = await fetch(`/api/pages/${pageID}`, {
-        body: JSON.stringify({
-          _status: status,
-          layout: persistedLayout,
-          studioDocument: layoutToStudioDocument(
-            normalizedLayout,
-            title,
-            {
-              pageWidthDefault: pageDefaults.pageWidthDefault
-            }
-          ),
-          title
-        }),
+      const payload = {
+        layout: persistedLayout,
+        studioDocument: layoutToStudioDocument(
+          normalizedLayout,
+          title,
+          {
+            pageWidthDefault: pageDefaults.pageWidthDefault
+          }
+        ),
+        title
+      };
+      if (status === "published") {
+        payload._status = "published";
+      }
+      const endpoint = status === "draft" ? `/api/pages/${pageID}?draft=true` : `/api/pages/${pageID}`;
+      const response = await fetch(endpoint, {
+        body: JSON.stringify(payload),
         credentials: "include",
         headers: {
           "Content-Type": "application/json"

package/dist/studio-pages/client.mjs

@@ -1945,19 +1945,23 @@ function BuilderPageEditor({ initialDoc, pageID }) {
     try {
       const normalizedLayout = withHeroMediaFallbacks(layout);
       const persistedLayout = toPersistedLayout(normalizedLayout);
-      const response = await fetch(`/api/pages/${pageID}`, {
-        body: JSON.stringify({
-          _status: status,
-          layout: persistedLayout,
-          studioDocument: layoutToStudioDocument(
-            normalizedLayout,
-            title,
-            {
-              pageWidthDefault: pageDefaults.pageWidthDefault
-            }
-          ),
-          title
-        }),
+      const payload = {
+        layout: persistedLayout,
+        studioDocument: layoutToStudioDocument(
+          normalizedLayout,
+          title,
+          {
+            pageWidthDefault: pageDefaults.pageWidthDefault
+          }
+        ),
+        title
+      };
+      if (status === "published") {
+        payload._status = "published";
+      }
+      const endpoint = status === "draft" ? `/api/pages/${pageID}?draft=true` : `/api/pages/${pageID}`;
+      const response = await fetch(endpoint, {
+        body: JSON.stringify(payload),
         credentials: "include",
         headers: {
           "Content-Type": "application/json"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-studios/payload-studio",
-  "version": "0.5.0-beta.60",
+  "version": "0.5.0-beta.61",
   "description": "Unified Payload CMS toolkit for Orion Studios",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",