@orion-studios/payload-studio 0.5.0-beta.99 → 0.6.0-beta.2

package/dist/{chunk-74XFAVXU.mjs → chunk-QJAWO6K3.mjs}

@@ -1,3 +1,6 @@
+import {
+  adminNavIcons
+} from "./chunk-W2UOCJDX.mjs";
 import {
   SOCIAL_MEDIA_DEFAULT_ICON_BY_PLATFORM,
   SOCIAL_MEDIA_ICON_OPTIONS,
@@ -51,6 +54,7 @@ var themePreferenceField = createThemePreferenceField("brand-light");
 
 // src/shared/studioSections.ts
 var studioRoles = /* @__PURE__ */ new Set(["admin", "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("//");
 var normalizePathLikeValue = (value) => {
@@ -91,6 +95,7 @@ var normalizeCard = (value) => {
     ...typeof value.description === "string" && value.description.trim().length > 0 ? { description: value.description.trim() } : {}
   };
 };
+var normalizeIcon = (value) => typeof value === "string" && studioIcons.has(value) ? value : void 0;
 var resolveStudioSections = (value) => {
   if (!Array.isArray(value)) {
     return [];
@@ -116,6 +121,7 @@ var resolveStudioSections = (value) => {
       label,
       href,
       matchPrefixes,
+      ...normalizeIcon(entry.icon) ? { icon: normalizeIcon(entry.icon) } : {},
       ...normalizeRoles(entry.roles) ? { roles: normalizeRoles(entry.roles) } : {},
       ...normalizeCard(entry.card) ? { card: normalizeCard(entry.card) } : {}
     });
@@ -180,17 +186,28 @@ function configureAdmin(config) {
     brandPrimary = "#3b82f6",
     brandSecondary = "#8b5cf6",
     defaultTheme = "brand-light",
-    logoUrl
+    logoUrl,
+    allowThemePreference = false
   } = config;
   const studioEnabled = config.studio?.enabled ?? true;
+  const formsEnabled = config.studio?.forms?.enabled ?? false;
+  const formsCollectionSlug = config.studio?.forms?.collectionSlug || "forms";
+  const formSubmissionsCollectionSlug = config.studio?.forms?.submissionsCollectionSlug || "form-submissions";
+  const formUploadsCollectionSlug = config.studio?.forms?.uploadsCollectionSlug || "form-uploads";
   const pagesCollectionSlug = config.studio?.pages?.collectionSlug || "pages";
+  const builderBasePath = config.studio?.pages?.builderBasePath || "/builder";
   const mediaCollectionSlug = config.studio?.media?.collectionSlug || "media";
-  const contactFormStudioPath = "/studio-contact-form";
+  const globalsBasePath = "/site-globals";
+  const pagesBasePath = "/pages";
+  const formsBasePath = "/forms";
+  const mediaBasePath = "/media";
+  const toolsBasePath = "/tools";
+  const contactFormStudioPath = "/contact-form";
   const configuredGlobals = config.studio?.globals || [
     { slug: "site-settings", label: "Website Settings" },
     { slug: "header", label: "Header & Navigation" },
     { slug: "footer", label: "Footer" },
-    { slug: "contact-form", label: "Contact Form" }
+    { slug: "social-media", label: "Social Media" }
   ];
   const globals = configuredGlobals.map((global) => {
     if (global.slug !== "contact-form" || global.href) {
@@ -203,24 +220,78 @@ function configureAdmin(config) {
   });
   const studioSections = resolveStudioSections(config.studio?.sections || []);
   const studioSectionViews = resolveStudioSectionViews(config.studio?.sections || []);
+  const sitePreview = config.studio?.sitePreview;
   let cssPath;
   const pkgDist = getPkgDistDir();
   const sourceCssPath = path.resolve(pkgDist, "admin.css");
-  if (config.basePath && fs.existsSync(sourceCssPath)) {
-    let css = fs.readFileSync(sourceCssPath, "utf-8");
-    css = css.replace("--brand-primary: #3b82f6;", `--brand-primary: ${brandPrimary};`);
-    css = css.replace("--brand-secondary: #8b5cf6;", `--brand-secondary: ${brandSecondary};`);
-    const genDir = path.resolve(config.basePath, ".generated");
+  const adminAppCssPath = path.resolve(pkgDist, "admin-app", "styles.css");
+  const cssSources = [sourceCssPath, adminAppCssPath].filter((filePath) => fs.existsSync(filePath));
+  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 });
     }
     const genPath = path.resolve(genDir, "admin.css");
     fs.writeFileSync(genPath, css);
     cssPath = genPath;
-  } else {
-    cssPath = sourceCssPath;
   }
   const clientPath = "@orion-studios/payload-studio/admin/client";
+  const studioNavClientProps = {
+    brandName,
+    formSubmissionsCollectionSlug,
+    formsCollectionSlug,
+    formsEnabled,
+    formUploadsCollectionSlug,
+    globalsBasePath,
+    globalsExtraMatchPrefixes: [contactFormStudioPath],
+    logoUrl,
+    mediaCollectionSlug,
+    pagesCollectionSlug,
+    sections: studioSections
+  };
+  const studioBackBreadcrumbComponent = {
+    exportName: "StudioBackBreadcrumb",
+    path: clientPath
+  };
+  const hasMatchingComponent = (items, exportName) => Array.isArray(items) && items.some(
+    (item) => item && typeof item === "object" && item.exportName === exportName && item.path === clientPath
+  );
+  const appendComponent = (items, component, exportName) => hasMatchingComponent(items, exportName) ? items || [] : [...items || [], component];
+  const attachStudioBackBreadcrumbToCollection = (collection) => {
+    if (!studioEnabled) {
+      return collection;
+    }
+    const existingBeforeDocumentControls = collection.admin?.components?.edit?.beforeDocumentControls;
+    return {
+      ...collection,
+      admin: {
+        ...collection.admin,
+        components: {
+          ...collection.admin?.components,
+          edit: {
+            ...collection.admin?.components?.edit,
+            beforeDocumentControls: appendComponent(
+              existingBeforeDocumentControls,
+              studioBackBreadcrumbComponent,
+              "StudioBackBreadcrumb"
+            )
+          }
+        }
+      }
+    };
+  };
   return {
     admin: {
       css: cssPath,
@@ -229,15 +300,7 @@ function configureAdmin(config) {
           Nav: {
             exportName: "AdminStudioNav",
             path: clientPath,
-            clientProps: {
-              brandName,
-              logoUrl,
-              globalsBasePath: "/studio-globals",
-              globalsExtraMatchPrefixes: [contactFormStudioPath],
-              mediaCollectionSlug,
-              pagesCollectionSlug,
-              sections: studioSections
-            }
+            clientProps: studioNavClientProps
           }
         } : {},
         graphics: {
@@ -263,37 +326,113 @@ function configureAdmin(config) {
             Component: {
               exportName: studioEnabled ? "AdminStudioDashboard" : "Dashboard",
               path: clientPath,
-              clientProps: {
-                brandName,
-                logoUrl,
-                globalsBasePath: "/studio-globals",
-                globalsExtraMatchPrefixes: [contactFormStudioPath],
-                mediaCollectionSlug,
-                pagesCollectionSlug,
-                sections: studioSections
-              }
+              clientProps: studioNavClientProps
             }
           },
           ...studioEnabled ? {
             studioGlobals: {
-              path: "/studio-globals",
+              path: globalsBasePath,
               Component: {
                 exportName: "AdminStudioGlobalsView",
                 path: clientPath,
                 clientProps: {
+                  ...studioNavClientProps,
                   globals,
-                  globalsBasePath: "/studio-globals"
+                  globalsBasePath
+                }
+              }
+            },
+            studioPages: {
+              path: pagesBasePath,
+              Component: {
+                exportName: "AdminStudioPagesListView",
+                path: clientPath,
+                clientProps: {
+                  ...studioNavClientProps,
+                  pagesCollectionSlug
+                }
+              }
+            },
+            studioPageEditor: {
+              path: `${pagesBasePath}/:id`,
+              Component: {
+                exportName: "AdminStudioPageEditView",
+                path: clientPath,
+                clientProps: {
+                  ...studioNavClientProps,
+                  builderBasePath
+                }
+              }
+            },
+            studioPageNew: {
+              path: `${pagesBasePath}/new`,
+              Component: {
+                exportName: "AdminStudioNewPageView",
+                path: clientPath,
+                clientProps: {
+                  ...studioNavClientProps,
+                  pagesCollectionSlug
                 }
               }
             },
             studioContactForm: {
-              path: "/studio-contact-form",
+              path: contactFormStudioPath,
               Component: {
                 exportName: "AdminStudioContactFormView",
                 path: clientPath,
                 clientProps: {
+                  ...studioNavClientProps,
                   globalSlug: "contact-form",
-                  globalsBasePath: "/studio-globals"
+                  globalsBasePath
+                }
+              }
+            },
+            ...formsEnabled ? {
+              studioForms: {
+                path: formsBasePath,
+                Component: {
+                  exportName: "AdminStudioFormsView",
+                  path: clientPath,
+                  clientProps: {
+                    ...studioNavClientProps,
+                    formsCollectionSlug,
+                    formSubmissionsCollectionSlug,
+                    formUploadsCollectionSlug
+                  }
+                }
+              }
+            } : {},
+            studioMedia: {
+              path: mediaBasePath,
+              Component: {
+                exportName: "AdminStudioMediaView",
+                path: clientPath,
+                clientProps: {
+                  ...studioNavClientProps,
+                  mediaCollectionSlug
+                }
+              }
+            },
+            studioMediaItem: {
+              path: `${mediaBasePath}/:id`,
+              Component: {
+                exportName: "AdminStudioMediaItemView",
+                path: clientPath,
+                clientProps: {
+                  ...studioNavClientProps,
+                  mediaCollectionSlug
+                }
+              }
+            },
+            studioTools: {
+              path: toolsBasePath,
+              Component: {
+                exportName: "AdminStudioToolsView",
+                path: clientPath,
+                clientProps: {
+                  ...studioNavClientProps,
+                  mediaCollectionSlug,
+                  pagesCollectionSlug
                 }
               }
             },
@@ -302,7 +441,13 @@ function configureAdmin(config) {
                 id,
                 {
                   path: view.path,
-                  Component: view.Component
+                  Component: {
+                    ...view.Component,
+                    clientProps: {
+                      ...studioNavClientProps,
+                      ...view.Component.clientProps || {}
+                    }
+                  }
                 }
               ])
             )
@@ -313,19 +458,39 @@ function configureAdmin(config) {
             exportName: "ThemeProvider",
             path: clientPath,
             clientProps: {
+              allowThemePreference,
               defaultTheme
             }
           }
         ],
-        afterNavLinks: [
+        beforeLogin: [
           {
-            exportName: "ThemeSwitcher",
+            exportName: "AdminLoginIntro",
             path: clientPath,
             clientProps: {
-              defaultTheme
+              brandName,
+              logoUrl
             }
           }
-        ]
+        ],
+        afterLogin: [
+          {
+            exportName: "AdminLoginPasswordToggle",
+            path: clientPath
+          }
+        ],
+        ...allowThemePreference ? {
+          afterNavLinks: [
+            {
+              exportName: "ThemeSwitcher",
+              path: clientPath,
+              clientProps: {
+                allowThemePreference,
+                defaultTheme
+              }
+            }
+          ]
+        } : {}
       },
       meta: {
         titleSuffix: ` \u2014 ${brandName}`
@@ -340,10 +505,76 @@ function configureAdmin(config) {
       const hasThemePreference = existingFields.some(
         (field) => typeof field === "object" && field !== null && "name" in field && field.name === "themePreference"
       );
-      return {
+      const nextCollection = {
         ...usersCollection,
-        fields: hasThemePreference ? existingFields : [...existingFields, createThemePreferenceField(defaultTheme)]
+        fields: !allowThemePreference || hasThemePreference ? existingFields : [...existingFields, createThemePreferenceField(defaultTheme)]
       };
+      return attachStudioBackBreadcrumbToCollection(nextCollection);
+    },
+    wrapPagesCollection(pagesCollection) {
+      if (!studioEnabled) {
+        return pagesCollection;
+      }
+      const collectionWithBreadcrumb = attachStudioBackBreadcrumbToCollection(pagesCollection);
+      const existingEditMenuItems = collectionWithBreadcrumb.admin?.components?.edit?.editMenuItems;
+      const existingViews = collectionWithBreadcrumb.admin?.components?.views;
+      const existingEditViews = existingViews?.edit;
+      const hasCustomEditView = Boolean(
+        existingEditViews?.root || existingEditViews?.default && typeof existingEditViews.default === "object" && existingEditViews.default.Component
+      );
+      return {
+        ...collectionWithBreadcrumb,
+        admin: {
+          ...collectionWithBreadcrumb.admin,
+          components: {
+            ...collectionWithBreadcrumb.admin?.components,
+            edit: {
+              ...collectionWithBreadcrumb.admin?.components?.edit,
+              editMenuItems: appendComponent(
+                existingEditMenuItems,
+                {
+                  exportName: "OpenInStudioMenuItem",
+                  path: clientPath,
+                  clientProps: {
+                    pagesPathBase: pagesBasePath
+                  }
+                },
+                "OpenInStudioMenuItem"
+              )
+            },
+            views: {
+              ...existingViews,
+              ...hasCustomEditView ? {} : {
+                edit: {
+                  ...existingEditViews,
+                  default: {
+                    ...typeof existingEditViews?.default === "object" ? existingEditViews.default : {},
+                    Component: {
+                      exportName: "PageEditRedirectToStudio",
+                      path: clientPath,
+                      clientProps: {
+                        pagesPathBase: pagesBasePath
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      };
+    },
+    wrapMediaCollection(mediaCollection) {
+      return attachStudioBackBreadcrumbToCollection(mediaCollection);
+    },
+    wrapFormsCollection(formsCollection) {
+      return attachStudioBackBreadcrumbToCollection(formsCollection);
+    },
+    wrapFormSubmissionsCollection(formSubmissionsCollection) {
+      return attachStudioBackBreadcrumbToCollection(formSubmissionsCollection);
+    },
+    wrapFormUploadsCollection(formUploadsCollection) {
+      return attachStudioBackBreadcrumbToCollection(formUploadsCollection);
     },
     wrapGlobals(globals2) {
       const labelMap = {
@@ -356,25 +587,110 @@ function configureAdmin(config) {
       return globals2.map((global) => {
         const mapping = labelMap[global.slug];
         if (!mapping) return global;
+        const shouldAttachSiteSettingsEditView = studioEnabled && global.slug === "site-settings";
+        const shouldAttachSocialMediaEditView = studioEnabled && global.slug === "social-media";
         const shouldAttachContactFormRedirect = studioEnabled && global.slug === "contact-form";
+        const shouldAttachHeaderEditView = studioEnabled && global.slug === "header";
+        const shouldAttachFooterEditView = studioEnabled && global.slug === "footer";
         const existingViews = global.admin?.components?.views;
         const existingEditViews = existingViews?.edit;
-        const hasCustomContactFormEditView = Boolean(
+        const hasCustomEditView = Boolean(
           existingEditViews?.root || existingEditViews?.default && typeof existingEditViews.default === "object" && existingEditViews.default.Component
         );
-        const contactFormEditViews = shouldAttachContactFormRedirect && !hasCustomContactFormEditView ? {
-          ...existingEditViews,
-          default: {
-            ...typeof existingEditViews?.default === "object" ? existingEditViews.default : {},
-            Component: {
-              exportName: "StudioContactFormRedirect",
-              path: clientPath,
-              clientProps: {
-                studioContactFormPath: contactFormStudioPath
+        const nextEditViews = (() => {
+          if (shouldAttachSiteSettingsEditView && !hasCustomEditView) {
+            return {
+              ...existingEditViews,
+              default: {
+                ...typeof existingEditViews?.default === "object" ? existingEditViews.default : {},
+                Component: {
+                  exportName: "AdminStudioSiteSettingsGlobalView",
+                  path: clientPath,
+                  clientProps: {
+                    ...studioNavClientProps,
+                    globalSlug: global.slug,
+                    mediaCollectionSlug
+                  }
+                }
               }
-            }
+            };
+          }
+          if (shouldAttachSocialMediaEditView && !hasCustomEditView) {
+            return {
+              ...existingEditViews,
+              default: {
+                ...typeof existingEditViews?.default === "object" ? existingEditViews.default : {},
+                Component: {
+                  exportName: "AdminStudioSocialMediaGlobalView",
+                  path: clientPath,
+                  clientProps: {
+                    ...studioNavClientProps,
+                    globalSlug: global.slug
+                  }
+                }
+              }
+            };
+          }
+          if (shouldAttachHeaderEditView && !hasCustomEditView) {
+            return {
+              ...existingEditViews,
+              default: {
+                ...typeof existingEditViews?.default === "object" ? existingEditViews.default : {},
+                Component: {
+                  exportName: "AdminStudioHeaderGlobalView",
+                  path: clientPath,
+                  clientProps: {
+                    ...studioNavClientProps,
+                    actionHref: sitePreview?.header?.actionHref,
+                    actionLabel: sitePreview?.header?.actionLabel,
+                    globalSlug: global.slug,
+                    locationSummary: sitePreview?.locationSummary,
+                    pagesCollectionSlug
+                  }
+                }
+              }
+            };
+          }
+          if (shouldAttachFooterEditView && !hasCustomEditView) {
+            return {
+              ...existingEditViews,
+              default: {
+                ...typeof existingEditViews?.default === "object" ? existingEditViews.default : {},
+                Component: {
+                  exportName: "AdminStudioFooterGlobalView",
+                  path: clientPath,
+                  clientProps: {
+                    ...studioNavClientProps,
+                    builtByHref: sitePreview?.footer?.builtByHref,
+                    builtByLabel: sitePreview?.footer?.builtByLabel,
+                    description: sitePreview?.footer?.description,
+                    footerCategories: sitePreview?.footer?.footerCategories,
+                    footerLinks: sitePreview?.footer?.footerLinks,
+                    globalSlug: global.slug,
+                    locationSummary: sitePreview?.locationSummary
+                  }
+                }
+              }
+            };
+          }
+          if (shouldAttachContactFormRedirect && !hasCustomEditView) {
+            return {
+              ...existingEditViews,
+              default: {
+                ...typeof existingEditViews?.default === "object" ? existingEditViews.default : {},
+                Component: {
+                  exportName: "StudioContactFormRedirect",
+                  path: clientPath,
+                  clientProps: {
+                    studioContactFormPath: contactFormStudioPath
+                  }
+                }
+              }
+            };
           }
-        } : existingEditViews;
+          return existingEditViews;
+        })();
+        const existingBeforeDocumentControls = global.admin?.components?.elements?.beforeDocumentControls;
         return {
           ...global,
           admin: {
@@ -382,12 +698,18 @@ function configureAdmin(config) {
             group: mapping.group,
             components: {
               ...global.admin?.components,
-              ...shouldAttachContactFormRedirect ? {
+              elements: {
+                ...global.admin?.components?.elements,
+                beforeDocumentControls: studioEnabled ? appendComponent(
+                  existingBeforeDocumentControls,
+                  studioBackBreadcrumbComponent,
+                  "StudioBackBreadcrumb"
+                ) : existingBeforeDocumentControls
+              },
+              ...nextEditViews ? {
                 views: {
                   ...existingViews,
-                  ...contactFormEditViews ? {
-                    edit: contactFormEditViews
-                  } : {}
+                  edit: nextEditViews
                 }
               } : {}
             }

package/dist/{chunk-XVH5SCBD.mjs → chunk-RKTIFEUY.mjs}

@@ -1,3 +1,7 @@
+import {
+  navItemIsActive,
+  roleCanAccessNav
+} from "./chunk-W2UOCJDX.mjs";
 import {
   __export
 } from "./chunk-6BWS3CLP.mjs";
@@ -202,23 +206,6 @@ var parseAdminHeaderNavFromForm = (formData, pageOptions, maxRows = 24) => {
   return [];
 };
 
-// src/admin-app/routeRegistry.ts
-var roleCanAccessNav = (role, item) => {
-  if (!item.roles || item.roles.length === 0) {
-    return true;
-  }
-  if (!role) {
-    return false;
-  }
-  return item.roles.includes(role);
-};
-var navItemIsActive = (pathname, item) => {
-  if (item.href === "/admin") {
-    return pathname === "/admin";
-  }
-  return item.matchPrefixes.some((prefix) => pathname.startsWith(prefix));
-};
-
 export {
   AdminBreadcrumbs,
   AdminPage,
@@ -228,7 +215,5 @@ export {
   getAdminNavRows,
   normalizeAdminNavInputs,
   parseAdminHeaderNavFromForm,
-  roleCanAccessNav,
-  navItemIsActive,
   admin_app_exports
 };

package/dist/chunk-W2UOCJDX.mjs

@@ -0,0 +1,32 @@
+// src/admin-app/routeRegistry.ts
+var adminNavIcons = [
+  "dashboard",
+  "pages",
+  "forms",
+  "globals",
+  "media",
+  "tools",
+  "account",
+  "analytics"
+];
+var roleCanAccessNav = (role, item) => {
+  if (!item.roles || item.roles.length === 0) {
+    return true;
+  }
+  if (!role) {
+    return false;
+  }
+  return item.roles.includes(role);
+};
+var navItemIsActive = (pathname, item) => {
+  if (item.href === "/admin") {
+    return pathname === "/admin";
+  }
+  return item.matchPrefixes.some((prefix) => pathname.startsWith(prefix));
+};
+
+export {
+  adminNavIcons,
+  roleCanAccessNav,
+  navItemIsActive
+};