@orion-studios/payload-studio 0.6.0-beta.9 → 0.7.0

package/dist/{chunk-WLOPFFN2.mjs → chunk-MMJNHBOF.mjs}

@@ -1,12 +1,12 @@
-import {
-  adminNavIcons
-} from "./chunk-W2UOCJDX.mjs";
 import {
   SOCIAL_MEDIA_DEFAULT_ICON_BY_PLATFORM,
   SOCIAL_MEDIA_ICON_OPTIONS,
   SOCIAL_MEDIA_PLATFORMS,
   SOCIAL_MEDIA_PLATFORM_LABELS
 } from "./chunk-ZTXJG4K5.mjs";
+import {
+  adminNavIcons
+} from "./chunk-W2UOCJDX.mjs";
 import {
   __export,
   __require
@@ -53,7 +53,7 @@ var createThemePreferenceField = (defaultTheme = "brand-light") => ({
 var themePreferenceField = createThemePreferenceField("brand-light");
 
 // src/shared/studioSections.ts
-var studioRoles = /* @__PURE__ */ new Set(["admin", "editor", "client"]);
+var studioRoles = /* @__PURE__ */ new Set(["admin", "developer", "editor", "client"]);
 var studioIcons = new Set(adminNavIcons);
 var isRecord = (value) => Boolean(value) && typeof value === "object" && !Array.isArray(value);
 var isAbsoluteExternalURL = (value) => /^[a-zA-Z][a-zA-Z\d+\-.]*:/.test(value) || value.startsWith("//");
@@ -186,6 +186,7 @@ function configureAdmin(config) {
     brandPrimary = "#3b82f6",
     brandSecondary = "#8b5cf6",
     defaultTheme = "brand-light",
+    logoOnDarkUrl,
     logoUrl,
     allowThemePreference = false,
     userSessionDurationSeconds = 60 * 60 * 24
@@ -230,23 +231,33 @@ function configureAdmin(config) {
   if (cssSources.length === 0) {
     cssPath = sourceCssPath;
   } else {
-    let css = cssSources.map((filePath) => fs.readFileSync(filePath, "utf-8")).join("\n\n");
-    css = css.replace(
-      "--orion-cms-brand-primary-fallback: #3b82f6;",
-      `--orion-cms-brand-primary-fallback: ${brandPrimary};`
-    );
-    css = css.replace(
-      "--orion-cms-brand-secondary-fallback: #8b5cf6;",
-      `--orion-cms-brand-secondary-fallback: ${brandSecondary};`
-    );
-    const outputBasePath = config.basePath || process.cwd();
-    const genDir = path.resolve(outputBasePath, ".generated");
-    if (!fs.existsSync(genDir)) {
-      fs.mkdirSync(genDir, { recursive: true });
+    try {
+      let css = cssSources.map((filePath) => fs.readFileSync(filePath, "utf-8")).join("\n\n");
+      css = css.replace(
+        "--orion-cms-brand-primary-fallback: #3b82f6;",
+        `--orion-cms-brand-primary-fallback: ${brandPrimary};`
+      );
+      css = css.replace(
+        "--orion-cms-brand-secondary-fallback: #8b5cf6;",
+        `--orion-cms-brand-secondary-fallback: ${brandSecondary};`
+      );
+      const outputBasePath = config.basePath || process.cwd();
+      const genDir = path.resolve(outputBasePath, ".generated");
+      const genPath = path.resolve(genDir, "admin.css");
+      let existing = null;
+      try {
+        existing = fs.readFileSync(genPath, "utf-8");
+      } catch {
+        existing = null;
+      }
+      if (existing !== css) {
+        fs.mkdirSync(genDir, { recursive: true });
+        fs.writeFileSync(genPath, css);
+      }
+      cssPath = genPath;
+    } catch {
+      cssPath = sourceCssPath;
     }
-    const genPath = path.resolve(genDir, "admin.css");
-    fs.writeFileSync(genPath, css);
-    cssPath = genPath;
   }
   const clientPath = "@orion-studios/payload-studio/admin/client";
   const studioNavClientProps = {
@@ -293,6 +304,49 @@ function configureAdmin(config) {
       }
     };
   };
+  const attachStudioEditRedirectToCollection = (collection, options) => {
+    if (!studioEnabled) {
+      return collection;
+    }
+    const collectionWithBreadcrumb = attachStudioBackBreadcrumbToCollection(collection);
+    const existingViews = collectionWithBreadcrumb.admin?.components?.views;
+    const existingEditViews = existingViews?.edit;
+    const hasCustomEditView = Boolean(
+      existingEditViews?.root || existingEditViews?.default && typeof existingEditViews.default === "object" && existingEditViews.default.Component
+    );
+    if (hasCustomEditView) {
+      return collectionWithBreadcrumb;
+    }
+    return {
+      ...collectionWithBreadcrumb,
+      admin: {
+        ...collectionWithBreadcrumb.admin,
+        components: {
+          ...collectionWithBreadcrumb.admin?.components,
+          views: {
+            ...existingViews,
+            edit: {
+              ...existingEditViews,
+              default: {
+                ...typeof existingEditViews?.default === "object" ? existingEditViews.default : {},
+                Component: {
+                  exportName: "StudioDocumentRedirect",
+                  path: clientPath,
+                  clientProps: {
+                    description: options.description,
+                    ...options.emptyHref ? { emptyHref: options.emptyHref } : {},
+                    ...options.emptyLabel ? { emptyLabel: options.emptyLabel } : {},
+                    pathBase: options.pathBase,
+                    title: options.title
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    };
+  };
   return {
     admin: {
       css: cssPath,
@@ -310,6 +364,7 @@ function configureAdmin(config) {
             path: clientPath,
             clientProps: {
               brandName,
+              logoOnDarkUrl,
               logoUrl
             }
           },
@@ -318,6 +373,7 @@ function configureAdmin(config) {
             path: clientPath,
             clientProps: {
               brandName,
+              logoOnDarkUrl,
               logoUrl
             }
           }
@@ -332,6 +388,7 @@ function configureAdmin(config) {
           },
           ...studioEnabled ? {
             studioGlobals: {
+              exact: true,
               path: globalsBasePath,
               Component: {
                 exportName: "AdminStudioGlobalsView",
@@ -343,10 +400,11 @@ function configureAdmin(config) {
                 }
               }
             },
-            studioPages: {
-              path: pagesBasePath,
+            studioPageNew: {
+              exact: true,
+              path: `${pagesBasePath}/new`,
               Component: {
-                exportName: "AdminStudioPagesListView",
+                exportName: "AdminStudioNewPageView",
                 path: clientPath,
                 clientProps: {
                   ...studioNavClientProps,
@@ -355,6 +413,7 @@ function configureAdmin(config) {
               }
             },
             studioPageEditor: {
+              exact: true,
               path: `${pagesBasePath}/:id`,
               Component: {
                 exportName: "AdminStudioPageEditView",
@@ -365,10 +424,11 @@ function configureAdmin(config) {
                 }
               }
             },
-            studioPageNew: {
-              path: `${pagesBasePath}/new`,
+            studioPages: {
+              exact: true,
+              path: pagesBasePath,
               Component: {
-                exportName: "AdminStudioNewPageView",
+                exportName: "AdminStudioPagesListView",
                 path: clientPath,
                 clientProps: {
                   ...studioNavClientProps,
@@ -377,6 +437,7 @@ function configureAdmin(config) {
               }
             },
             studioContactForm: {
+              exact: true,
               path: contactFormStudioPath,
               Component: {
                 exportName: "AdminStudioContactFormView",
@@ -389,7 +450,47 @@ function configureAdmin(config) {
               }
             },
             ...formsEnabled ? {
+              studioFormSubmission: {
+                exact: true,
+                path: `${formsBasePath}/submissions/:id`,
+                Component: {
+                  exportName: "AdminStudioFormSubmissionView",
+                  path: clientPath,
+                  clientProps: {
+                    ...studioNavClientProps,
+                    formsCollectionSlug,
+                    formSubmissionsCollectionSlug,
+                    formUploadsCollectionSlug
+                  }
+                }
+              },
+              studioFormUpload: {
+                exact: true,
+                path: `${formsBasePath}/uploads/:id`,
+                Component: {
+                  exportName: "AdminStudioFormUploadView",
+                  path: clientPath,
+                  clientProps: {
+                    ...studioNavClientProps,
+                    formUploadsCollectionSlug
+                  }
+                }
+              },
+              studioFormDetail: {
+                exact: true,
+                path: `${formsBasePath}/:id`,
+                Component: {
+                  exportName: "AdminStudioFormDetailView",
+                  path: clientPath,
+                  clientProps: {
+                    ...studioNavClientProps,
+                    formsCollectionSlug,
+                    formSubmissionsCollectionSlug
+                  }
+                }
+              },
               studioForms: {
+                exact: true,
                 path: formsBasePath,
                 Component: {
                   exportName: "AdminStudioFormsView",
@@ -403,10 +504,11 @@ function configureAdmin(config) {
                 }
               }
             } : {},
-            studioMedia: {
-              path: mediaBasePath,
+            studioMediaItem: {
+              exact: true,
+              path: `${mediaBasePath}/:id`,
               Component: {
-                exportName: "AdminStudioMediaView",
+                exportName: "AdminStudioMediaItemView",
                 path: clientPath,
                 clientProps: {
                   ...studioNavClientProps,
@@ -414,10 +516,11 @@ function configureAdmin(config) {
                 }
               }
             },
-            studioMediaItem: {
-              path: `${mediaBasePath}/:id`,
+            studioMedia: {
+              exact: true,
+              path: mediaBasePath,
               Component: {
-                exportName: "AdminStudioMediaItemView",
+                exportName: "AdminStudioMediaView",
                 path: clientPath,
                 clientProps: {
                   ...studioNavClientProps,
@@ -426,6 +529,7 @@ function configureAdmin(config) {
               }
             },
             studioTools: {
+              exact: true,
               path: toolsBasePath,
               Component: {
                 exportName: "AdminStudioToolsView",
@@ -470,6 +574,7 @@ function configureAdmin(config) {
             path: clientPath,
             clientProps: {
               brandName,
+              logoOnDarkUrl,
               logoUrl
             }
           }
@@ -578,25 +683,74 @@ function configureAdmin(config) {
       return attachStudioBackBreadcrumbToCollection(mediaCollection);
     },
     wrapFormsCollection(formsCollection) {
-      return attachStudioBackBreadcrumbToCollection(formsCollection);
+      return attachStudioEditRedirectToCollection(formsCollection, {
+        description: "Redirecting to the Studio form workspace.",
+        emptyHref: formsBasePath,
+        emptyLabel: "Open Forms",
+        pathBase: formsBasePath,
+        title: "Opening Form..."
+      });
     },
     wrapFormSubmissionsCollection(formSubmissionsCollection) {
-      return attachStudioBackBreadcrumbToCollection(formSubmissionsCollection);
+      return attachStudioEditRedirectToCollection(formSubmissionsCollection, {
+        description: "Redirecting to the Studio submission workspace.",
+        emptyHref: formsBasePath,
+        emptyLabel: "Open Forms",
+        pathBase: `${formsBasePath}/submissions`,
+        title: "Opening Submission..."
+      });
     },
     wrapFormUploadsCollection(formUploadsCollection) {
-      return attachStudioBackBreadcrumbToCollection(formUploadsCollection);
+      return attachStudioEditRedirectToCollection(formUploadsCollection, {
+        description: "Redirecting to the Studio upload workspace.",
+        emptyHref: formsBasePath,
+        emptyLabel: "Open Forms",
+        pathBase: `${formsBasePath}/uploads`,
+        title: "Opening Upload..."
+      });
     },
     wrapGlobals(globals2) {
-      const labelMap = {
+      const defaultLabelMap = {
         header: { group: "Site Design", label: "Header & Navigation" },
         footer: { group: "Site Design", label: "Footer" },
         "site-settings": { group: "Site Design", label: "Website Settings" },
         "social-media": { group: "Site Design", label: "Social Media" },
         "contact-form": { group: "Lead Forms", label: "Contact Form" }
       };
+      const configuredBySlug = new Map(
+        (config.studio?.globals || []).map((link) => [link.slug, link])
+      );
+      const attachBreadcrumbToGlobal = (global) => {
+        if (!studioEnabled) {
+          return global;
+        }
+        const existingControls = global.admin?.components?.elements?.beforeDocumentControls;
+        return {
+          ...global,
+          admin: {
+            ...global.admin,
+            components: {
+              ...global.admin?.components,
+              elements: {
+                ...global.admin?.components?.elements,
+                beforeDocumentControls: appendComponent(
+                  existingControls,
+                  studioBackBreadcrumbComponent,
+                  "StudioBackBreadcrumb"
+                )
+              }
+            }
+          }
+        };
+      };
       return globals2.map((global) => {
-        const mapping = labelMap[global.slug];
-        if (!mapping) return global;
+        const configured = configuredBySlug.get(global.slug);
+        const defaults = defaultLabelMap[global.slug];
+        const mapping = configured || defaults ? {
+          group: configured?.group || defaults?.group,
+          label: configured?.label || defaults?.label || global.slug
+        } : void 0;
+        if (!mapping) return attachBreadcrumbToGlobal(global);
         const shouldAttachSiteSettingsEditView = studioEnabled && global.slug === "site-settings";
         const shouldAttachSocialMediaEditView = studioEnabled && global.slug === "social-media";
         const shouldAttachContactFormRedirect = studioEnabled && global.slug === "contact-form";
@@ -705,7 +859,7 @@ function configureAdmin(config) {
           ...global,
           admin: {
             ...global.admin,
-            group: mapping.group,
+            ...mapping.group ? { group: mapping.group } : {},
             components: {
               ...global.admin?.components,
               elements: {

package/dist/{chunk-KPIX7OSV.mjs → chunk-NF37A575.mjs}

@@ -92,6 +92,14 @@ function NavIcon({ name }) {
       return null;
   }
 }
+function LogoutIcon() {
+  const props = { width: iconSize, height: iconSize, viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: 2, strokeLinecap: "round", strokeLinejoin: "round", style: iconStyle };
+  return /* @__PURE__ */ jsxs("svg", { ...props, "aria-hidden": "true", children: [
+    /* @__PURE__ */ jsx("path", { d: "M15 3h4a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2h-4" }),
+    /* @__PURE__ */ jsx("polyline", { points: "10 17 5 12 10 7" }),
+    /* @__PURE__ */ jsx("line", { x1: "5", y1: "12", x2: "17", y2: "12" })
+  ] });
+}
 function AdminShellClient({
   children,
   brandName,
@@ -103,14 +111,12 @@ function AdminShellClient({
   onLogout,
   storageKey = "orion-admin-shell-collapsed"
 }) {
-  const [collapsed, setCollapsed] = useState(false);
+  const [collapsed, setCollapsed] = useState(true);
   const [loggingOut, setLoggingOut] = useState(false);
   useEffect(() => {
     try {
       const stored = window.localStorage.getItem(storageKey);
-      if (stored === "1") {
-        setCollapsed(true);
-      }
+      setCollapsed(stored === "1");
     } catch {
     }
   }, [storageKey]);
@@ -172,7 +178,10 @@ function AdminShellClient({
           /* @__PURE__ */ jsx("div", { className: "orion-admin-user-label", children: "Signed in as" }),
           /* @__PURE__ */ jsx("div", { className: "orion-admin-user-email", children: userEmail })
         ] }) : null,
-        /* @__PURE__ */ jsx("button", { className: "orion-admin-logout", disabled: loggingOut, onClick: handleLogout, type: "button", children: loggingOut ? "..." : "Log out" })
+        /* @__PURE__ */ jsxs("button", { className: "orion-admin-logout", disabled: loggingOut, onClick: handleLogout, type: "button", children: [
+          /* @__PURE__ */ jsx(LogoutIcon, {}),
+          /* @__PURE__ */ jsx("span", { children: loggingOut ? "Logging out..." : "Log out" })
+        ] })
       ] })
     ] }),
     /* @__PURE__ */ jsx("main", { className: "orion-admin-main", children })

package/dist/{chunk-OTHERBGX.mjs → chunk-OF6BATTO.mjs}

@@ -5,7 +5,7 @@ import {
 } from "./chunk-ZTXJG4K5.mjs";
 import {
   studioDocumentToLayout
-} from "./chunk-PF3EBZXF.mjs";
+} from "./chunk-7ZMXZRBP.mjs";
 import {
   assertStudioDocumentV1
 } from "./chunk-ADIIWIYL.mjs";
@@ -26,12 +26,15 @@ __export(nextjs_exports, {
 
 // src/nextjs/client/payload.ts
 import { getPayload } from "payload";
-var payloadPromise = null;
 var WEBSITE_CONTENT_TAG = "website-content";
 function createPayloadClient(config) {
+  let payloadPromise = null;
   return function getPayloadClient() {
     if (!payloadPromise) {
-      payloadPromise = getPayload({ config });
+      payloadPromise = Promise.resolve(config).then((resolvedConfig) => getPayload({ config: resolvedConfig })).catch((error) => {
+        payloadPromise = null;
+        throw error;
+      });
     }
     return payloadPromise;
   };
@@ -64,7 +67,7 @@ function normalizePath(segments) {
   const cleaned = segments.map((segment) => segment.trim()).filter(Boolean).join("/");
   return cleaned.length > 0 ? `/${cleaned}` : "/";
 }
-async function queryPageByPath(payload, path, draft) {
+async function queryPageByPath(payload, path, draft, collectionSlug, homeSlug) {
   const pathWhere = {
     path: {
       equals: path
@@ -76,7 +79,7 @@ async function queryPageByPath(payload, path, draft) {
     }
   };
   const result = await payload.find({
-    collection: "pages",
+    collection: collectionSlug,
     depth: 2,
     draft,
     limit: 1,
@@ -89,11 +92,11 @@ async function queryPageByPath(payload, path, draft) {
   if (path === "/") {
     const homeWhere = {
       slug: {
-        equals: "home"
+        equals: homeSlug
       }
     };
     const homeResult = await payload.find({
-      collection: "pages",
+      collection: collectionSlug,
       depth: 2,
       draft,
       limit: 1,
@@ -104,27 +107,31 @@ async function queryPageByPath(payload, path, draft) {
   }
   return null;
 }
-function createPageQueries(getPayloadClient, contentTag = "website-content") {
+function createPageQueries(getPayloadClient, contentTagOrOptions = "website-content") {
+  const options = typeof contentTagOrOptions === "string" ? { contentTag: contentTagOrOptions } : contentTagOrOptions;
+  const contentTag = options.contentTag || "website-content";
+  const pagesCollectionSlug = options.pagesCollectionSlug || "pages";
+  const homeSlug = options.homeSlug || "home";
   const getPublishedPageByPathCached = unstable_cache(
     async (path) => {
       const payload = await getPayloadClient();
-      return queryPageByPath(payload, path, false);
+      return queryPageByPath(payload, path, false, pagesCollectionSlug, homeSlug);
     },
-    ["page-by-path", PAGE_QUERY_CACHE_VERSION],
+    ["page-by-path", PAGE_QUERY_CACHE_VERSION, pagesCollectionSlug, homeSlug, contentTag],
     { tags: [contentTag] }
   );
   async function getPageBySegments(segments, draft = false) {
     const path = normalizePath(segments);
     const payload = await getPayloadClient();
     if (draft) {
-      return queryPageByPath(payload, path, true);
+      return queryPageByPath(payload, path, true, pagesCollectionSlug, homeSlug);
     }
     return getPublishedPageByPathCached(path);
   }
   async function listPublishedPagePaths() {
     const payload = await getPayloadClient();
     const pages = await payload.find({
-      collection: "pages",
+      collection: pagesCollectionSlug,
       depth: 0,
       draft: false,
       limit: 1e3,
@@ -153,108 +160,46 @@ function createPageQueries(getPayloadClient, contentTag = "website-content") {
 
 // src/nextjs/queries/site.ts
 import { unstable_cache as unstable_cache2 } from "next/cache";
-function createSiteQueries(getPayloadClient, contentTag = "website-content") {
-  const getSiteSettingsCached = unstable_cache2(
-    async () => {
-      const payload = await getPayloadClient();
-      const settings = await payload.findGlobal({
-        slug: "site-settings",
-        depth: 1
-      });
-      return settings;
-    },
-    ["site-settings-global"],
-    { tags: [contentTag] }
-  );
-  const getHeaderCached = unstable_cache2(
-    async () => {
-      const payload = await getPayloadClient();
-      const header = await payload.findGlobal({
-        slug: "header",
-        depth: 1
-      });
-      return header;
-    },
-    ["header-global"],
-    { tags: [contentTag] }
-  );
-  const getFooterCached = unstable_cache2(
-    async () => {
-      const payload = await getPayloadClient();
-      const footer = await payload.findGlobal({
-        slug: "footer",
-        depth: 1
-      });
-      return footer;
-    },
-    ["footer-global"],
-    { tags: [contentTag] }
-  );
-  const getSocialMediaCached = unstable_cache2(
-    async () => {
-      const payload = await getPayloadClient();
-      const socialMedia = await payload.findGlobal({
-        slug: "social-media",
-        depth: 1
-      });
-      return socialMedia;
-    },
-    ["social-media-global"],
-    { tags: [contentTag] }
-  );
-  async function getSiteSettings(draft = false) {
-    if (draft) {
-      const payload = await getPayloadClient();
-      const settings = await payload.findGlobal({
-        slug: "site-settings",
-        depth: 1,
-        draft: true
-      });
-      return settings;
-    }
-    return getSiteSettingsCached();
-  }
-  async function getHeader(draft = false) {
-    if (draft) {
-      const payload = await getPayloadClient();
-      const header = await payload.findGlobal({
-        slug: "header",
-        depth: 1,
-        draft: true
-      });
-      return header;
-    }
-    return getHeaderCached();
-  }
-  async function getFooter(draft = false) {
-    if (draft) {
-      const payload = await getPayloadClient();
-      const footer = await payload.findGlobal({
-        slug: "footer",
-        depth: 1,
-        draft: true
-      });
-      return footer;
-    }
-    return getFooterCached();
-  }
-  async function getSocialMedia(draft = false) {
-    if (draft) {
-      const payload = await getPayloadClient();
-      const socialMedia = await payload.findGlobal({
-        slug: "social-media",
-        depth: 1,
-        draft: true
-      });
-      return socialMedia;
-    }
-    return getSocialMediaCached();
+function createSiteQueries(getPayloadClient, contentTagOrOptions = "website-content") {
+  const options = typeof contentTagOrOptions === "string" ? { contentTag: contentTagOrOptions } : contentTagOrOptions;
+  const contentTag = options.contentTag || "website-content";
+  const siteSettingsSlug = options.siteSettingsSlug || "site-settings";
+  const headerSlug = options.headerSlug || "header";
+  const footerSlug = options.footerSlug || "footer";
+  const socialMediaSlug = options.socialMediaSlug || "social-media";
+  function createGlobalQuery(slug, cacheKey) {
+    const getCached = unstable_cache2(
+      async () => {
+        const payload = await getPayloadClient();
+        const data = await payload.findGlobal({
+          slug,
+          depth: 1,
+          overrideAccess: false
+        });
+        return data;
+      },
+      [cacheKey, slug, contentTag],
+      { tags: [contentTag] }
+    );
+    return async function getGlobal(draft = false) {
+      if (draft) {
+        const payload = await getPayloadClient();
+        const data = await payload.findGlobal({
+          slug,
+          depth: 1,
+          draft: true,
+          overrideAccess: false
+        });
+        return data;
+      }
+      return getCached();
+    };
   }
   return {
-    getSiteSettings,
-    getHeader,
-    getFooter,
-    getSocialMedia
+    getSiteSettings: createGlobalQuery(siteSettingsSlug, "site-settings-global"),
+    getHeader: createGlobalQuery(headerSlug, "header-global"),
+    getFooter: createGlobalQuery(footerSlug, "footer-global"),
+    getSocialMedia: createGlobalQuery(socialMediaSlug, "social-media-global")
   };
 }