@orion-studios/payload-studio 0.6.0-beta.18 → 0.6.0-beta.180

package/dist/admin/client.js

@@ -749,7 +749,7 @@ var init_OrionBlocksFieldImpl = __esm({
       const schemaPath = schemaPathFromProps ?? name;
       const minRows = minRowsProp ?? (required ? 1 : 0);
       const { setDocFieldPreferences } = (0, import_DocumentInfo.useDocumentInfo)();
-      const { addFieldRow, dispatchFields, getFields, moveFieldRow, removeFieldRow, replaceState, setModified } = (0, import_Form.useForm)();
+      const { addFieldRow, dispatchFields, getFields: getFields2, moveFieldRow, removeFieldRow, replaceState, setModified } = (0, import_Form.useForm)();
       const { code: locale } = (0, import_Locale.useLocale)();
       const configContext = (0, import_Config.useConfig)();
       const config = configContext?.config ?? {};
@@ -911,7 +911,7 @@ var init_OrionBlocksFieldImpl = __esm({
         (rowIndex) => {
           const result = clipboardCopy({
             getDataToCopy: () => reduceFormStateByPath({
-              formState: getFields(),
+              formState: getFields2(),
               path: safePath,
               rowIndex
             }),
@@ -929,13 +929,13 @@ var init_OrionBlocksFieldImpl = __esm({
             import_sonner.toast.success(t("general:copied"));
           }
         },
-        [clientBlocks, getFields, safePath, t, type]
+        [clientBlocks, getFields2, safePath, t, type]
       );
       const pasteRow = (0, import_react10.useCallback)(
         (rowIndex) => {
           const result = clipboardPaste({
             onPaste: (dataFromClipboard) => {
-              const formState = getFields();
+              const formState = getFields2();
               const newState = mergeFormStateFromClipboard({
                 dataFromClipboard,
                 formState,
@@ -952,11 +952,11 @@ var init_OrionBlocksFieldImpl = __esm({
             import_sonner.toast.error(result);
           }
         },
-        [clientBlocks, getFields, replaceState, safePath, setModified, t]
+        [clientBlocks, getFields2, replaceState, safePath, setModified, t]
       );
       const pasteBlocks = (0, import_react10.useCallback)(
         (dataFromClipboard) => {
-          const formState = getFields();
+          const formState = getFields2();
           const newState = mergeFormStateFromClipboard({
             dataFromClipboard,
             formState,
@@ -965,7 +965,7 @@ var init_OrionBlocksFieldImpl = __esm({
           replaceState(newState);
           setModified(true);
         },
-        [getFields, replaceState, safePath, setModified]
+        [getFields2, replaceState, safePath, setModified]
       );
       const hasMaxRows = Boolean(maxRows && rows.length >= maxRows);
       const fieldErrorCount = errorPaths.length;
@@ -1042,7 +1042,7 @@ var init_OrionBlocksFieldImpl = __esm({
                       className: `${baseClass}__header-action`,
                       disabled,
                       getDataToCopy: () => reduceFormStateByPath({
-                        formState: getFields(),
+                        formState: getFields2(),
                         path: safePath
                       }),
                       onPaste: pasteBlocks,
@@ -2873,8 +2873,26 @@ function NavIcon({ sectionID }) {
       return null;
   }
 }
+function LogoutIcon() {
+  const props = {
+    fill: "none",
+    height: iconSize2,
+    stroke: "currentColor",
+    strokeLinecap: "round",
+    strokeLinejoin: "round",
+    strokeWidth: 2,
+    viewBox: "0 0 24 24",
+    width: iconSize2
+  };
+  return /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)("svg", { ...props, "aria-hidden": "true", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("path", { d: "M15 3h4a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2h-4" }),
+    /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("polyline", { points: "10 17 5 12 10 7" }),
+    /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("line", { x1: "5", y1: "12", x2: "17", y2: "12" })
+  ] });
+}
 function AdminStudioNav(props) {
   const { user } = (0, import_ui3.useAuth)();
+  const [loggingOut, setLoggingOut] = (0, import_react13.useState)(false);
   const brandName = getPropString(props, "brandName", "Orion Studio");
   const logoUrl = getPropString(props, "logoUrl", "");
   const compact = getPropBoolean(props, "compact", false);
@@ -2885,6 +2903,18 @@ function AdminStudioNav(props) {
   const dashboardPath = adminBasePath;
   const userRole = readUserRole(user);
   const links = (0, import_react13.useMemo)(() => buildStudioNavItems(props, adminBasePath), [adminBasePath, props]);
+  const logout = async () => {
+    setLoggingOut(true);
+    try {
+      await fetch("/api/users/logout", {
+        credentials: "include",
+        method: "POST"
+      });
+      window.location.href = `${adminBasePath}/login`;
+    } finally {
+      setLoggingOut(false);
+    }
+  };
   if (isStudioShellRoute(pathname, props, adminBasePath)) {
     return null;
   }
@@ -2975,7 +3005,38 @@ function AdminStudioNav(props) {
                 /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("div", { style: { color: "var(--theme-elevation-700)", fontSize: "0.85rem" }, children: "Signed in as" }),
                 /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("div", { style: { fontWeight: 800, marginBottom: "0.55rem" }, children: typeof user?.email === "string" ? user.email : "User" })
               ] }) : null,
-              /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(import_ui3.Logout, {})
+              /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(
+                "button",
+                {
+                  "aria-label": "Log out",
+                  disabled: loggingOut,
+                  onClick: () => void logout(),
+                  style: {
+                    alignItems: "center",
+                    background: "transparent",
+                    border: "1px solid var(--theme-elevation-150)",
+                    borderRadius: 10,
+                    color: "var(--theme-elevation-900)",
+                    cursor: loggingOut ? "not-allowed" : "pointer",
+                    display: "inline-flex",
+                    font: "inherit",
+                    fontWeight: 800,
+                    gap: compact ? 0 : "0.45rem",
+                    justifyContent: "center",
+                    minHeight: compact ? 48 : 34,
+                    minWidth: compact ? 48 : 0,
+                    opacity: loggingOut ? 0.55 : 1,
+                    padding: compact ? 0 : "0.4rem 0.62rem",
+                    width: compact ? 48 : "auto"
+                  },
+                  title: "Log out",
+                  type: "button",
+                  children: [
+                    /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(LogoutIcon, {}),
+                    !compact ? /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("span", { children: loggingOut ? "Logging out..." : "Log out" }) : null
+                  ]
+                }
+              )
             ]
           }
         )
@@ -3048,6 +3109,14 @@ function NavIcon2({ name }) {
       return null;
   }
 }
+function LogoutIcon2() {
+  const props = { width: iconSize3, height: iconSize3, viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: 2, strokeLinecap: "round", strokeLinejoin: "round", style: iconStyle };
+  return /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)("svg", { ...props, "aria-hidden": "true", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("path", { d: "M15 3h4a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2h-4" }),
+    /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("polyline", { points: "10 17 5 12 10 7" }),
+    /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("line", { x1: "5", y1: "12", x2: "17", y2: "12" })
+  ] });
+}
 function AdminShellClient({
   children,
   brandName,
@@ -3059,14 +3128,12 @@ function AdminShellClient({
   onLogout,
   storageKey = "orion-admin-shell-collapsed"
 }) {
-  const [collapsed, setCollapsed] = (0, import_react14.useState)(false);
+  const [collapsed, setCollapsed] = (0, import_react14.useState)(true);
   const [loggingOut, setLoggingOut] = (0, import_react14.useState)(false);
   (0, import_react14.useEffect)(() => {
     try {
       const stored = window.localStorage.getItem(storageKey);
-      if (stored === "1") {
-        setCollapsed(true);
-      }
+      setCollapsed(stored === "1");
     } catch {
     }
   }, [storageKey]);
@@ -3128,7 +3195,10 @@ function AdminShellClient({
           /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("div", { className: "orion-admin-user-label", children: "Signed in as" }),
           /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("div", { className: "orion-admin-user-email", children: userEmail })
         ] }) : null,
-        /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("button", { className: "orion-admin-logout", disabled: loggingOut, onClick: handleLogout, type: "button", children: loggingOut ? "..." : "Log out" })
+        /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)("button", { className: "orion-admin-logout", disabled: loggingOut, onClick: handleLogout, type: "button", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(LogoutIcon2, {}),
+          /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("span", { children: loggingOut ? "Logging out..." : "Log out" })
+        ] })
       ] })
     ] }),
     /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("main", { className: "orion-admin-main", children })
@@ -4040,15 +4110,16 @@ function AdminStudioDashboard(rawProps) {
 }
 
 // src/admin/components/studio/AdminStudioPagesListView.tsx
-var import_react17 = require("react");
+var import_react19 = require("react");
 var import_link2 = __toESM(require("next/link"));
+var import_navigation3 = require("next/navigation");
+var import_ui7 = require("@payloadcms/ui");
+
+// src/admin/components/studio/AdminStudioNewPageView.tsx
+var import_react17 = require("react");
 var import_ui5 = require("@payloadcms/ui");
 var import_jsx_runtime23 = require("react/jsx-runtime");
-var hasAdminAccess = (user) => {
-  if (!user || typeof user !== "object") return false;
-  const role = user.role;
-  return typeof role === "string" && (role === "admin" || role === "developer");
-};
+var pageTemplates = ["standard", "landing", "services", "contact"];
 var getPropString3 = (props, key, fallback) => {
   if (!props || typeof props !== "object") return fallback;
   const direct = props[key];
@@ -4060,83 +4131,107 @@ var getPropString3 = (props, key, fallback) => {
   }
   return fallback;
 };
-function AdminStudioPagesListView(props) {
+var canManagePages = (user) => {
+  if (!user || typeof user !== "object") return false;
+  const role = user.role;
+  return role === "admin" || role === "developer" || role === "editor";
+};
+var slugify = (value) => value.toLowerCase().trim().replace(/[^a-z0-9\s-]/g, "").replace(/\s+/g, "-").replace(/-+/g, "-");
+function AdminStudioNewPageView(props) {
   const { user } = (0, import_ui5.useAuth)();
-  const pagesCollectionSlug = getPropString3(props, "pagesCollectionSlug", "pages");
   const adminBasePath = useAdminBasePath();
-  const newPagePath = resolveAdminPath(adminBasePath, "/pages/new");
-  const [loading, setLoading] = (0, import_react17.useState)(true);
+  const pagesCollectionSlug = getPropString3(props, "pagesCollectionSlug", "pages");
+  const [submitting, setSubmitting] = (0, import_react17.useState)(false);
   const [error, setError] = (0, import_react17.useState)(null);
-  const [docs, setDocs] = (0, import_react17.useState)([]);
-  const apiURL = (0, import_react17.useMemo)(() => {
-    const params = new URLSearchParams({
-      depth: "0",
-      limit: "100",
-      sort: "-updatedAt",
-      draft: "true"
-    });
-    return `/api/${pagesCollectionSlug}?${params.toString()}`;
-  }, [pagesCollectionSlug]);
-  (0, import_react17.useEffect)(() => {
-    let cancelled = false;
-    const run = async () => {
-      setLoading(true);
-      setError(null);
-      try {
-        const res = await fetch(apiURL, { credentials: "include" });
-        if (!res.ok) {
-          const body = await res.text();
-          throw new Error(body || "Failed to fetch pages");
-        }
-        const data = await res.json();
-        if (!cancelled) {
-          setDocs(Array.isArray(data.docs) ? data.docs : []);
-        }
-      } catch (err) {
-        if (!cancelled) {
-          setError(err instanceof Error ? err.message : "Failed to fetch pages");
-        }
-      } finally {
-        if (!cancelled) {
-          setLoading(false);
-        }
+  if (!canManagePages(user)) {
+    return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(StudioSectionLayout, { navProps: props, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+      AdminPage,
+      {
+        breadcrumbs: [
+          { label: "Dashboard", href: adminBasePath },
+          { label: "Pages", href: resolveAdminPath(adminBasePath, "/pages") },
+          { label: "New Page" }
+        ],
+        description: "You do not have access to create pages.",
+        title: "New Page",
+        children: /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("div", { className: "orion-admin-card", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("strong", { children: "Access denied" }),
+          /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("span", { children: "This section is restricted to administrator, developer, and editor accounts." })
+        ] })
       }
-    };
-    void run();
-    return () => {
-      cancelled = true;
-    };
-  }, [apiURL]);
-  return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(StudioSectionLayout, { navProps: props, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(
+    ) });
+  }
+  const createPage = async (event) => {
+    event.preventDefault();
+    setSubmitting(true);
+    setError(null);
+    try {
+      const formData = new FormData(event.currentTarget);
+      const titleValue = String(formData.get("title") || "").trim();
+      const slugValue = String(formData.get("slug") || "").trim();
+      const templateValue = String(formData.get("template") || "standard").trim();
+      const template = pageTemplates.includes(templateValue) ? templateValue : "standard";
+      const title = titleValue || "Untitled Page";
+      const slug = slugValue || slugify(title) || "untitled-page";
+      const response = await fetch(`/api/${pagesCollectionSlug}`, {
+        body: JSON.stringify({
+          _status: "draft",
+          slug,
+          template,
+          title
+        }),
+        credentials: "include",
+        headers: {
+          "Content-Type": "application/json"
+        },
+        method: "POST"
+      });
+      if (!response.ok) {
+        throw new Error(`Failed to create page (${response.status}).`);
+      }
+      const payload = await response.json();
+      const id = typeof payload.id === "string" || typeof payload.id === "number" ? String(payload.id) : "";
+      if (!id) {
+        throw new Error("Page created but no document ID was returned.");
+      }
+      window.location.assign(resolveAdminPath(adminBasePath, `/pages/${id}`));
+    } catch (createError) {
+      setError(createError instanceof Error ? createError.message : "Failed to create page.");
+    } finally {
+      setSubmitting(false);
+    }
+  };
+  return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(StudioSectionLayout, { navProps: props, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
     AdminPage,
     {
-      actions: hasAdminAccess(user) ? /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(import_link2.default, { className: "orion-admin-action-button", href: newPagePath, children: "New Page" }) : null,
       breadcrumbs: [
         { label: "Dashboard", href: adminBasePath },
-        { label: "Pages" }
+        { label: "Pages", href: resolveAdminPath(adminBasePath, "/pages") },
+        { label: "New Page" }
       ],
-      description: "Open a page to edit it in the inline custom builder.",
-      title: "Pages",
-      children: [
-        loading ? /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("div", { className: "orion-admin-list-meta", children: "Loading..." }) : null,
+      description: "Create a new page and open it in the custom editor.",
+      title: "New Page",
+      children: /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("form", { className: "orion-admin-form", onSubmit: createPage, children: [
         error ? /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("div", { className: "orion-admin-error", children: error }) : null,
-        /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("div", { className: "orion-admin-list", children: [
-          !loading && !error && docs.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("div", { className: "orion-admin-card", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("strong", { children: "No pages yet" }),
-            /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("span", { children: "Create the first page to start building content." })
-          ] }) : null,
-          docs.map((doc) => {
-            const id = typeof doc.id === "string" || typeof doc.id === "number" ? String(doc.id) : "";
-            if (!id) return null;
-            const title = typeof doc.title === "string" ? doc.title : "Untitled Page";
-            const status = typeof doc._status === "string" ? doc._status : "draft";
-            return /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(import_link2.default, { className: "orion-admin-list-item", href: resolveAdminPath(adminBasePath, `/pages/${id}`), children: [
-              /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("strong", { children: title }) }),
-              /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("span", { className: "orion-admin-pill", children: status })
-            ] }, id);
-          })
-        ] })
-      ]
+        /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("label", { children: [
+          "Title",
+          /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("input", { name: "title", placeholder: "Services", required: true, type: "text" })
+        ] }),
+        /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("label", { children: [
+          "Slug",
+          /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("input", { name: "slug", placeholder: "services", type: "text" })
+        ] }),
+        /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("label", { children: [
+          "Template",
+          /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("select", { defaultValue: "standard", name: "template", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("option", { value: "standard", children: "Standard" }),
+            /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("option", { value: "landing", children: "Landing" }),
+            /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("option", { value: "contact", children: "Contact" }),
+            /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("option", { value: "services", children: "Services" })
+          ] })
+        ] }),
+        /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("button", { disabled: submitting, type: "submit", children: submitting ? "Creating..." : "Create Page" })
+      ] })
     }
   ) });
 }
@@ -4145,16 +4240,6 @@ function AdminStudioPagesListView(props) {
 var import_react18 = require("react");
 var import_ui6 = require("@payloadcms/ui");
 var import_jsx_runtime24 = require("react/jsx-runtime");
-var hasAdminAccess2 = (user) => {
-  if (!user || typeof user !== "object") return false;
-  const role = user.role;
-  return typeof role === "string" && (role === "admin" || role === "developer");
-};
-var isEditor = (user) => {
-  if (!user || typeof user !== "object") return false;
-  const role = user.role;
-  return typeof role === "string" && role === "editor";
-};
 var getPropString4 = (props, key, fallback) => {
   if (!props || typeof props !== "object") return fallback;
   const direct = props[key];
@@ -4182,14 +4267,8 @@ var getPageIDFromPathname = (pathname) => {
   return pagePart ? decodeURIComponent(pagePart) : null;
 };
 function AdminStudioPageEditView(props) {
-  const { user } = (0, import_ui6.useAuth)();
   const adminBasePath = useAdminBasePath();
   const iframeRef = (0, import_react18.useRef)(null);
-  const [saving, setSaving] = (0, import_react18.useState)(null);
-  const [dirty, setDirty] = (0, import_react18.useState)(false);
-  const [hasUnpublishedChanges, setHasUnpublishedChanges] = (0, import_react18.useState)(false);
-  const [canUndo, setCanUndo] = (0, import_react18.useState)(false);
-  const [canRedo, setCanRedo] = (0, import_react18.useState)(false);
   const builderBasePath = getPropString4(props, "builderBasePath", "/builder");
   const pagesPath = resolveAdminPath(adminBasePath, "/pages");
   const pageIDFromParams = (0, import_react18.useMemo)(() => getParam(props.params, "id"), [props.params]);
@@ -4206,96 +4285,6 @@ function AdminStudioPageEditView(props) {
     }
     setDidResolvePathFallback(true);
   }, [pageIDFromParams]);
-  const canPublish = hasAdminAccess2(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_react18.useEffect)(() => {
-    if (!pageID) {
-      return;
-    }
-    void refreshUnpublishedState(pageID);
-  }, [pageID]);
-  const requestSave = (status) => {
-    const iframe = iframeRef.current;
-    if (!iframe?.contentWindow) {
-      import_ui6.toast.error("Editor is not ready yet. Please try again.");
-      return;
-    }
-    setSaving(status);
-    iframe.contentWindow.postMessage({ source: "payload-visual-builder-parent", type: "save", status }, "*");
-  };
-  const requestHistoryAction = (type) => {
-    const iframe = iframeRef.current;
-    if (!iframe?.contentWindow) {
-      import_ui6.toast.error("Editor is not ready yet. Please try again.");
-      return;
-    }
-    iframe.contentWindow.postMessage({ source: "payload-visual-builder-parent", type }, "*");
-  };
-  (0, import_react18.useEffect)(() => {
-    const onMessage = (event) => {
-      const data = event.data;
-      if (!data || data.source !== "payload-visual-builder-child" || typeof data.type !== "string") {
-        return;
-      }
-      if (data.type === "dirty-state") {
-        setDirty(Boolean(data.dirty));
-        return;
-      }
-      if (data.type === "history-state") {
-        setCanUndo(Boolean(data.canUndo));
-        setCanRedo(Boolean(data.canRedo));
-        return;
-      }
-      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.");
-        }
-      }
-    };
-    window.addEventListener("message", onMessage);
-    return () => window.removeEventListener("message", onMessage);
-  }, []);
   if (!pageID && !didResolvePathFallback) {
     return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(StudioSectionLayout, { navProps: props, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(import_jsx_runtime24.Fragment, { children: [
       /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
@@ -4336,164 +4325,25 @@ function AdminStudioPageEditView(props) {
         ]
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("div", { style: { display: "grid", gridTemplateRows: "auto 1fr", height: "calc(100vh - 120px)" }, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(
-        "div",
-        {
-          style: {
-            alignItems: "center",
-            background: "color-mix(in srgb, var(--orion-admin-card-bg) 96%, white)",
-            border: "1px solid var(--orion-admin-card-border)",
-            borderRadius: 14,
-            boxShadow: "0 12px 28px rgba(62, 42, 24, 0.08)",
-            colorScheme: "light",
-            display: "flex",
-            gap: "0.6rem",
-            justifyContent: "space-between",
-            padding: "0.65rem 0.9rem",
-            position: "sticky",
-            top: 0,
-            zIndex: 20
-          },
-          children: [
-            /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("div", { style: { minWidth: 0 }, children: [
-              /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { style: { color: "var(--orion-admin-text)", fontWeight: 900 }, children: "Page Editor" }),
-              /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(
-                "div",
-                {
-                  style: {
-                    color: "var(--orion-admin-muted)",
-                    fontSize: "0.85rem",
-                    overflow: "hidden",
-                    textOverflow: "ellipsis"
-                  },
-                  children: [
-                    "Editing: ",
-                    pageID
-                  ]
-                }
-              )
-            ] }),
-            /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("div", { style: { alignItems: "center", display: "flex", gap: "0.5rem" }, children: [
-              /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { style: { color: dirty ? "var(--orion-admin-text)" : "var(--orion-admin-muted)", fontSize: "0.85rem", fontWeight: 700 }, children: dirty ? "Unsaved changes" : "All changes saved" }),
-              /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
-                "div",
-                {
-                  style: {
-                    background: hasUnpublishedChanges ? "#fff3cd" : "var(--orion-admin-accent-subtle)",
-                    border: `1px solid ${hasUnpublishedChanges ? "#f0c36d" : "color-mix(in srgb, var(--orion-admin-accent) 36%, transparent)"}`,
-                    borderRadius: 999,
-                    color: hasUnpublishedChanges ? "#6a4a00" : "var(--orion-admin-accent)",
-                    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_runtime24.jsx)(
-                "button",
-                {
-                  disabled: !canUndo,
-                  onClick: () => requestHistoryAction("undo"),
-                  style: {
-                    background: "transparent",
-                    border: "1px solid var(--orion-admin-card-border)",
-                    borderRadius: 12,
-                    cursor: canUndo ? "pointer" : "not-allowed",
-                    color: "var(--orion-admin-text)",
-                    fontWeight: 800,
-                    padding: "0.5rem 0.65rem"
-                  },
-                  type: "button",
-                  children: "Undo"
-                }
-              ),
-              /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
-                "button",
-                {
-                  disabled: !canRedo,
-                  onClick: () => requestHistoryAction("redo"),
-                  style: {
-                    background: "transparent",
-                    border: "1px solid var(--orion-admin-card-border)",
-                    borderRadius: 12,
-                    cursor: canRedo ? "pointer" : "not-allowed",
-                    color: "var(--orion-admin-text)",
-                    fontWeight: 800,
-                    padding: "0.5rem 0.65rem"
-                  },
-                  type: "button",
-                  children: "Redo"
-                }
-              ),
-              /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
-                "button",
-                {
-                  disabled: saving !== null,
-                  onClick: () => requestSave("draft"),
-                  style: {
-                    background: "var(--orion-admin-card-bg)",
-                    border: "1px solid var(--orion-admin-card-border)",
-                    borderRadius: 12,
-                    cursor: saving ? "not-allowed" : "pointer",
-                    color: "var(--orion-admin-text)",
-                    fontWeight: 800,
-                    padding: "0.5rem 0.75rem"
-                  },
-                  type: "button",
-                  children: saving === "draft" ? "Saving\u2026" : "Save Draft"
-                }
-              ),
-              /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
-                "button",
-                {
-                  disabled: !canPublish || saving !== null,
-                  onClick: () => requestSave("published"),
-                  style: {
-                    background: canPublish ? "var(--orion-admin-button-bg)" : "var(--orion-admin-card-border)",
-                    border: "none",
-                    borderRadius: 12,
-                    color: canPublish ? "var(--orion-admin-button-text)" : "var(--orion-admin-text)",
-                    cursor: !canPublish || saving ? "not-allowed" : "pointer",
-                    fontWeight: 900,
-                    padding: "0.5rem 0.75rem"
-                  },
-                  type: "button",
-                  title: !canPublish ? "You do not have publish permissions." : void 0,
-                  children: saving === "published" ? "Publishing\u2026" : "Publish"
-                }
-              )
-            ] })
-          ]
-        }
-      ),
-      /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
-        "iframe",
-        {
-          ref: iframeRef,
-          src: `${builderBasePath.replace(/\/$/, "")}/${pageID}`,
-          style: { border: "none", height: "100%", width: "100%" },
-          title: "Page Builder",
-          onLoad: () => {
-            const iframe = iframeRef.current;
-            if (!iframe?.contentWindow) return;
-            iframe.contentWindow.postMessage({ source: "payload-visual-builder-parent", type: "dirty-check-request" }, "*");
-            iframe.contentWindow.postMessage({ source: "payload-visual-builder-parent", type: "history-check-request" }, "*");
-          }
-        }
-      )
-    ] })
+    /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { style: { height: "100dvh", overflow: "hidden" }, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
+      "iframe",
+      {
+        ref: iframeRef,
+        src: `${builderBasePath.replace(/\/$/, "")}/${pageID}`,
+        style: { border: "none", height: "100%", width: "100%" },
+        title: "Page Builder"
+      }
+    ) })
   ] }) });
 }
 
-// src/admin/components/studio/AdminStudioNewPageView.tsx
-var import_react19 = require("react");
-var import_ui7 = require("@payloadcms/ui");
+// src/admin/components/studio/AdminStudioPagesListView.tsx
 var import_jsx_runtime25 = require("react/jsx-runtime");
-var pageTemplates = ["standard", "landing", "services", "contact"];
+var hasAdminAccess = (user) => {
+  if (!user || typeof user !== "object") return false;
+  const role = user.role;
+  return typeof role === "string" && (role === "admin" || role === "developer");
+};
 var getPropString5 = (props, key, fallback) => {
   if (!props || typeof props !== "object") return fallback;
   const direct = props[key];
@@ -4505,107 +4355,98 @@ var getPropString5 = (props, key, fallback) => {
   }
   return fallback;
 };
-var canManagePages = (user) => {
-  if (!user || typeof user !== "object") return false;
-  const role = user.role;
-  return role === "admin" || role === "developer" || role === "editor";
-};
-var slugify = (value) => value.toLowerCase().trim().replace(/[^a-z0-9\s-]/g, "").replace(/\s+/g, "-").replace(/-+/g, "-");
-function AdminStudioNewPageView(props) {
-  const { user } = (0, import_ui7.useAuth)();
+function AdminStudioPagesListView(props) {
   const adminBasePath = useAdminBasePath();
+  const pathname = (0, import_navigation3.usePathname)();
+  const pagesPath = resolveAdminPath(adminBasePath, "/pages");
+  const nestedPagePath = pathname && pathname.startsWith(`${pagesPath}/`) ? pathname.slice(`${pagesPath}/`.length).split("/")[0] : "";
+  if (nestedPagePath === "new") {
+    return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(AdminStudioNewPageView, { ...props });
+  }
+  if (nestedPagePath) {
+    return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(AdminStudioPageEditView, { ...props });
+  }
+  return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(AdminStudioPagesIndexView, { ...props, adminBasePath });
+}
+function AdminStudioPagesIndexView({
+  adminBasePath,
+  ...props
+}) {
+  const { user } = (0, import_ui7.useAuth)();
   const pagesCollectionSlug = getPropString5(props, "pagesCollectionSlug", "pages");
-  const [submitting, setSubmitting] = (0, import_react19.useState)(false);
+  const newPagePath = resolveAdminPath(adminBasePath, "/pages/new");
+  const [loading, setLoading] = (0, import_react19.useState)(true);
   const [error, setError] = (0, import_react19.useState)(null);
-  if (!canManagePages(user)) {
-    return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(StudioSectionLayout, { navProps: props, children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
-      AdminPage,
-      {
-        breadcrumbs: [
-          { label: "Dashboard", href: adminBasePath },
-          { label: "Pages", href: resolveAdminPath(adminBasePath, "/pages") },
-          { label: "New Page" }
-        ],
-        description: "You do not have access to create pages.",
-        title: "New Page",
-        children: /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("div", { className: "orion-admin-card", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("strong", { children: "Access denied" }),
-          /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("span", { children: "This section is restricted to administrator, developer, and editor accounts." })
-        ] })
-      }
-    ) });
-  }
-  const createPage = async (event) => {
-    event.preventDefault();
-    setSubmitting(true);
-    setError(null);
-    try {
-      const formData = new FormData(event.currentTarget);
-      const titleValue = String(formData.get("title") || "").trim();
-      const slugValue = String(formData.get("slug") || "").trim();
-      const templateValue = String(formData.get("template") || "standard").trim();
-      const template = pageTemplates.includes(templateValue) ? templateValue : "standard";
-      const title = titleValue || "Untitled Page";
-      const slug = slugValue || slugify(title) || "untitled-page";
-      const response = await fetch(`/api/${pagesCollectionSlug}`, {
-        body: JSON.stringify({
-          _status: "draft",
-          slug,
-          template,
-          title
-        }),
-        credentials: "include",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        method: "POST"
-      });
-      if (!response.ok) {
-        throw new Error(`Failed to create page (${response.status}).`);
-      }
-      const payload = await response.json();
-      const id = typeof payload.id === "string" || typeof payload.id === "number" ? String(payload.id) : "";
-      if (!id) {
-        throw new Error("Page created but no document ID was returned.");
+  const [docs, setDocs] = (0, import_react19.useState)([]);
+  const apiURL = (0, import_react19.useMemo)(() => {
+    const params = new URLSearchParams({
+      depth: "0",
+      limit: "100",
+      sort: "-updatedAt",
+      draft: "true"
+    });
+    return `/api/${pagesCollectionSlug}?${params.toString()}`;
+  }, [pagesCollectionSlug]);
+  (0, import_react19.useEffect)(() => {
+    let cancelled = false;
+    const run = async () => {
+      setLoading(true);
+      setError(null);
+      try {
+        const res = await fetch(apiURL, { credentials: "include" });
+        if (!res.ok) {
+          const body = await res.text();
+          throw new Error(body || "Failed to fetch pages");
+        }
+        const data = await res.json();
+        if (!cancelled) {
+          setDocs(Array.isArray(data.docs) ? data.docs : []);
+        }
+      } catch (err) {
+        if (!cancelled) {
+          setError(err instanceof Error ? err.message : "Failed to fetch pages");
+        }
+      } finally {
+        if (!cancelled) {
+          setLoading(false);
+        }
       }
-      window.location.assign(resolveAdminPath(adminBasePath, `/pages/${id}`));
-    } catch (createError) {
-      setError(createError instanceof Error ? createError.message : "Failed to create page.");
-    } finally {
-      setSubmitting(false);
-    }
-  };
-  return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(StudioSectionLayout, { navProps: props, children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
+    };
+    void run();
+    return () => {
+      cancelled = true;
+    };
+  }, [apiURL]);
+  return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(StudioSectionLayout, { navProps: props, children: /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(
     AdminPage,
     {
+      actions: hasAdminAccess(user) ? /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(import_link2.default, { className: "orion-admin-action-button", href: newPagePath, children: "New Page" }) : null,
       breadcrumbs: [
         { label: "Dashboard", href: adminBasePath },
-        { label: "Pages", href: resolveAdminPath(adminBasePath, "/pages") },
-        { label: "New Page" }
+        { label: "Pages" }
       ],
-      description: "Create a new page and open it in the custom editor.",
-      title: "New Page",
-      children: /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("form", { className: "orion-admin-form", onSubmit: createPage, children: [
+      description: "Open a page to edit it in the inline custom builder.",
+      title: "Pages",
+      children: [
+        loading ? /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: "orion-admin-list-meta", children: "Loading..." }) : null,
         error ? /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: "orion-admin-error", children: error }) : null,
-        /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("label", { children: [
-          "Title",
-          /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("input", { name: "title", placeholder: "Services", required: true, type: "text" })
-        ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("label", { children: [
-          "Slug",
-          /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("input", { name: "slug", placeholder: "services", type: "text" })
-        ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("label", { children: [
-          "Template",
-          /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("select", { defaultValue: "standard", name: "template", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("option", { value: "standard", children: "Standard" }),
-            /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("option", { value: "landing", children: "Landing" }),
-            /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("option", { value: "contact", children: "Contact" }),
-            /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("option", { value: "services", children: "Services" })
-          ] })
-        ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("button", { disabled: submitting, type: "submit", children: submitting ? "Creating..." : "Create Page" })
-      ] })
+        /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("div", { className: "orion-admin-list", children: [
+          !loading && !error && docs.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("div", { className: "orion-admin-card", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("strong", { children: "No pages yet" }),
+            /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("span", { children: "Create the first page to start building content." })
+          ] }) : null,
+          docs.map((doc) => {
+            const id = typeof doc.id === "string" || typeof doc.id === "number" ? String(doc.id) : "";
+            if (!id) return null;
+            const title = typeof doc.title === "string" ? doc.title : "Untitled Page";
+            const status = typeof doc._status === "string" ? doc._status : "draft";
+            return /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(import_link2.default, { className: "orion-admin-list-item", href: resolveAdminPath(adminBasePath, `/pages/${id}`), children: [
+              /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("strong", { children: title }) }),
+              /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("span", { className: "orion-admin-pill", children: status })
+            ] }, id);
+          })
+        ] })
+      ]
     }
   ) });
 }
@@ -6874,7 +6715,7 @@ function MediaListItem({
 
 // src/admin-app/components/MediaUploadForm.tsx
 var import_react27 = require("react");
-var import_navigation3 = require("next/navigation");
+var import_navigation4 = require("next/navigation");
 
 // src/shared/clientImageUploadOptimization.ts
 var MAX_DIRECT_UPLOAD_BYTES = 4e6;
@@ -7009,7 +6850,7 @@ var parseUploadError = async (response) => {
   return fallback;
 };
 function MediaUploadForm() {
-  const router = (0, import_navigation3.useRouter)();
+  const router = (0, import_navigation4.useRouter)();
   const fileInputRef = (0, import_react27.useRef)(null);
   const [alt, setAlt] = (0, import_react27.useState)("");
   const [file, setFile] = (0, import_react27.useState)(null);
@@ -7544,17 +7385,17 @@ var FORM_TONE_OVERRIDES = {
 var IDENTITY_KEYS = /* @__PURE__ */ new Set(["contactEmail", "email", "firstName", "lastName", "name"]);
 var RESPONSE_FIELD_PREVIEW_LIMIT = 3;
 var RESPONSE_SCROLL_THRESHOLD = 3;
-var hasAdminAccess3 = (user) => {
+var hasAdminAccess2 = (user) => {
   if (!user || typeof user !== "object") return false;
   const role = user.role;
   return typeof role === "string" && (role === "admin" || role === "developer");
 };
-var isEditor2 = (user) => {
+var isEditor = (user) => {
   if (!user || typeof user !== "object") return false;
   const role = user.role;
   return typeof role === "string" && role === "editor";
 };
-var canReviewForms2 = (user) => hasAdminAccess3(user) || isEditor2(user);
+var canReviewForms2 = (user) => hasAdminAccess2(user) || isEditor(user);
 var getPropString13 = (props, key, fallback) => {
   if (!props || typeof props !== "object") return fallback;
   const direct = props[key];
@@ -8240,15 +8081,22 @@ var getFormTitle2 = (value) => {
 // src/admin/components/studio/AdminStudioFormDetailView.tsx
 var import_jsx_runtime41 = require("react/jsx-runtime");
 var getNonEmptyText = (value, fallback = "") => typeof value === "string" && value.trim().length > 0 ? value : fallback;
-var formatStepsText = (value) => {
+var normalizeSteps = (value) => {
   if (!Array.isArray(value)) {
-    return "[]";
+    return [];
   }
-  try {
-    return JSON.stringify(value, null, 2);
-  } catch {
-    return "[]";
+  return value.map((step) => step && typeof step === "object" && !Array.isArray(step) ? step : {});
+};
+var normalizeFormResponse = (value) => {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return {};
   }
+  const record = value;
+  const nestedDoc = record.doc;
+  if (nestedDoc && typeof nestedDoc === "object" && !Array.isArray(nestedDoc)) {
+    return nestedDoc;
+  }
+  return record;
 };
 var toEditorState = (doc) => {
   const emails = doc.emails && typeof doc.emails === "object" ? doc.emails : null;
@@ -8264,7 +8112,7 @@ var toEditorState = (doc) => {
     sendAdmin: emails?.sendAdmin !== false,
     sendConfirmation: emails?.sendConfirmation !== false,
     slug: getNonEmptyText(doc.slug),
-    stepsText: formatStepsText(doc.steps),
+    steps: normalizeSteps(doc.steps),
     submitLabel: getNonEmptyText(doc.submitLabel, "Submit"),
     successMessage: getNonEmptyText(doc.successMessage),
     title: getNonEmptyText(doc.title, "Untitled Form")
@@ -8275,25 +8123,72 @@ var checkboxLabelStyle = {
   display: "flex",
   gap: "0.6rem"
 };
-var codeStyle = {
-  background: "color-mix(in srgb, var(--orion-admin-card-bg) 82%, black)",
-  border: "1px solid var(--orion-admin-card-border)",
-  borderRadius: "var(--orion-admin-radius-sm)",
-  color: "var(--orion-admin-text)",
-  fontFamily: "ui-monospace, SFMono-Regular, SFMono-Regular, Menlo, monospace",
-  fontSize: "0.86rem",
-  lineHeight: 1.55,
-  margin: 0,
-  maxHeight: "28rem",
-  overflow: "auto",
-  padding: "0.9rem",
-  whiteSpace: "pre-wrap"
-};
 var sectionGridStyle = {
   display: "grid",
   gap: "1rem",
   gridTemplateColumns: "repeat(auto-fit, minmax(320px, 1fr))"
 };
+var fieldTypeOptions = [
+  "text",
+  "textarea",
+  "email",
+  "phone",
+  "url",
+  "select",
+  "radio",
+  "checkbox",
+  "checkbox-group",
+  "date",
+  "file"
+];
+var getFields = (step) => Array.isArray(step.fields) ? step.fields.map(
+  (field) => field && typeof field === "object" && !Array.isArray(field) ? field : {}
+) : [];
+var toOptionsText = (value) => Array.isArray(value) ? value.map((entry) => {
+  if (entry && typeof entry === "object" && !Array.isArray(entry)) {
+    const record = entry;
+    const label = typeof record.label === "string" ? record.label : "";
+    const optionValue = typeof record.value === "string" ? record.value : label;
+    return label && optionValue && label !== optionValue ? `${label} | ${optionValue}` : label || optionValue;
+  }
+  return typeof entry === "string" ? entry : "";
+}).filter(Boolean).join("\n") : "";
+var fromOptionsText = (value) => value.split("\n").map((entry) => entry.trim()).filter(Boolean).map((entry) => {
+  const [label, optionValue] = entry.split("|").map((part) => part.trim());
+  return {
+    label,
+    value: optionValue || label
+  };
+});
+var slugifyFieldName = (value) => value.trim().replace(/[^a-z0-9]+/gi, " ").trim().replace(/\s+([a-z0-9])/gi, (_, char) => char.toUpperCase()).replace(/^./, (char) => char.toLowerCase());
+var blankField = () => ({
+  label: "New field",
+  name: "newField",
+  required: false,
+  type: "text"
+});
+var blankStep = () => ({
+  fields: [blankField()],
+  title: "New step"
+});
+var getStepTitle = (step, stepIndex) => getNonEmptyText(step.title, `Step ${stepIndex + 1}`);
+var getFieldLabel = (field, fieldIndex) => getNonEmptyText(field.label, getNonEmptyText(field.name, `Field ${fieldIndex + 1}`));
+var formatFieldTypeLabel = (value) => getNonEmptyText(value, "text").replace(/-/g, " ").replace(/^./, (char) => char.toUpperCase());
+var getStepDestination = (stepIndex, stepCount) => {
+  if (stepIndex < stepCount - 1) {
+    return `Next: Step ${stepIndex + 2}`;
+  }
+  return "Then: Submit form";
+};
+var moveItem = (items, fromIndex, toIndex) => {
+  if (toIndex < 0 || toIndex >= items.length) {
+    return items;
+  }
+  const nextItems = [...items];
+  const [item] = nextItems.splice(fromIndex, 1);
+  nextItems.splice(toIndex, 0, item);
+  return nextItems;
+};
 function getFormIDFromPathname(pathname) {
   const marker = "/forms/";
   const raw = getIDFromPathname(pathname, marker);
@@ -8356,7 +8251,7 @@ function AdminStudioFormDetailView(props) {
       if (!submissionsResponse.ok) {
         throw new Error(`Failed to load submissions (${submissionsResponse.status}).`);
       }
-      const nextDoc = await formResponse.json();
+      const nextDoc = normalizeFormResponse(await formResponse.json());
       const submissionsPayload = await submissionsResponse.json();
       const nextSubmissions = Array.isArray(submissionsPayload.docs) ? submissionsPayload.docs : [];
       setDoc(nextDoc);
@@ -8386,10 +8281,6 @@ function AdminStudioFormDetailView(props) {
     setError(null);
     setSavedMessage(null);
     try {
-      const parsedSteps = JSON.parse(editorState.stepsText);
-      if (!Array.isArray(parsedSteps)) {
-        throw new Error("Structure JSON must be an array of steps.");
-      }
       const payload = {
         emails: {
           adminRecipients: editorState.adminRecipientsText.split("\n").map((value) => value.trim()).filter(Boolean).map((email) => ({ email })),
@@ -8401,7 +8292,7 @@ function AdminStudioFormDetailView(props) {
           sendConfirmation: editorState.sendConfirmation
         },
         slug: editorState.slug.trim(),
-        steps: parsedSteps,
+        steps: editorState.steps,
         submitLabel: editorState.submitLabel.trim(),
         successMessage: editorState.successMessage,
         title: editorState.title.trim()
@@ -8417,7 +8308,7 @@ function AdminStudioFormDetailView(props) {
       if (!response.ok) {
         throw new Error(`Failed to save form (${response.status}).`);
       }
-      const nextDoc = await response.json();
+      const nextDoc = normalizeFormResponse(await response.json());
       setDoc(nextDoc);
       setEditorState(toEditorState(nextDoc));
       setSavedMessage("Saved.");
@@ -8447,8 +8338,52 @@ function AdminStudioFormDetailView(props) {
   const toneStyle = getFormToneStyle2(slug, title || formID || "form");
   const fieldLabels = doc ? buildFieldLabelMap2(doc) : /* @__PURE__ */ new Map();
   const latestSubmission = submissions[0];
-  const stepCount = doc && Array.isArray(doc.steps) ? doc.steps.length : 0;
-  const fieldCount = doc ? getFieldCount2(doc) : 0;
+  const stepCount = editorState?.steps.length || 0;
+  const fieldCount = editorState ? editorState.steps.reduce((count, step) => count + getFields(step).length, 0) : doc ? getFieldCount2(doc) : 0;
+  const updateStep = (stepIndex, patch) => {
+    setEditorState(
+      (current) => current ? {
+        ...current,
+        steps: current.steps.map(
+          (step, index) => index === stepIndex ? { ...step, ...patch } : step
+        )
+      } : current
+    );
+  };
+  const updateField = (stepIndex, fieldIndex, patch) => {
+    setEditorState((current) => {
+      if (!current) return current;
+      return {
+        ...current,
+        steps: current.steps.map((step, index) => {
+          if (index !== stepIndex) return step;
+          const fields = getFields(step).map(
+            (field, currentFieldIndex) => currentFieldIndex === fieldIndex ? { ...field, ...patch } : field
+          );
+          return { ...step, fields };
+        })
+      };
+    });
+  };
+  const moveStep = (stepIndex, direction) => {
+    setEditorState(
+      (current) => current ? {
+        ...current,
+        steps: moveItem(current.steps, stepIndex, stepIndex + direction)
+      } : current
+    );
+  };
+  const moveField = (stepIndex, fieldIndex, direction) => {
+    setEditorState((current) => {
+      if (!current) return current;
+      return {
+        ...current,
+        steps: current.steps.map(
+          (step, index) => index === stepIndex ? { ...step, fields: moveItem(getFields(step), fieldIndex, fieldIndex + direction) } : step
+        )
+      };
+    });
+  };
   return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(StudioSectionLayout, { navProps: props, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(
     AdminPage,
     {
@@ -8527,10 +8462,9 @@ function AdminStudioFormDetailView(props) {
             /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { style: { display: "grid", gap: "1rem" }, children: [
               /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: "orion-admin-card", children: [
                 /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("strong", { children: "Step preview" }),
-                /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("span", { children: "Review the configured workflow structure before editing the JSON source." }),
-                /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { style: { display: "grid", gap: "0.85rem", marginTop: "1rem" }, children: Array.isArray(doc.steps) && doc.steps.length > 0 ? doc.steps.map((step, stepIndex) => {
-                  const record = step && typeof step === "object" && !Array.isArray(step) ? step : null;
-                  const fields = Array.isArray(record?.fields) ? record.fields : [];
+                /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("span", { children: "Review the public workflow as visitors will move through it." }),
+                /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { style: { display: "grid", gap: "0.85rem", marginTop: "1rem" }, children: editorState.steps.length > 0 ? editorState.steps.map((record, stepIndex) => {
+                  const fields = getFields(record);
                   return /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: "orion-admin-form", children: [
                     /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { children: [
                       /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("strong", { children: [
@@ -8582,7 +8516,7 @@ function AdminStudioFormDetailView(props) {
                   ] }, `step-${stepIndex}`);
                 }) : /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: "orion-admin-empty-state", children: [
                   /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("strong", { children: "No steps configured" }),
-                  /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("span", { children: "Add at least one step in the JSON editor to publish this form." })
+                  /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("span", { children: "Add at least one step in Form settings to publish this form." })
                 ] }) })
               ] }),
               /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: "orion-admin-card", children: [
@@ -8764,32 +8698,296 @@ function AdminStudioFormDetailView(props) {
                   ] })
                 ] })
               ] }),
-              /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("label", { children: [
-                "Structure JSON",
-                /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
-                  "textarea",
-                  {
-                    onChange: (event) => setEditorState(
-                      (current) => current ? { ...current, stepsText: event.target.value } : current
-                    ),
-                    rows: 18,
-                    spellCheck: false,
-                    style: {
-                      fontFamily: "ui-monospace, SFMono-Regular, Menlo, monospace",
-                      minHeight: "24rem"
-                    },
-                    value: editorState.stepsText
-                  }
-                )
+              /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: "orion-admin-card orion-admin-workflow-editor", children: [
+                /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: "orion-admin-workflow-editor-header", children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { children: [
+                    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("strong", { children: "Form steps" }),
+                    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("span", { children: "Build the visitor flow, then edit each step's fields below." })
+                  ] }),
+                  /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+                    "button",
+                    {
+                      className: "orion-admin-action-button orion-admin-action-button--ghost",
+                      onClick: () => setEditorState(
+                        (current) => current ? { ...current, steps: [...current.steps, blankStep()] } : current
+                      ),
+                      type: "button",
+                      children: "Add step"
+                    }
+                  )
+                ] }),
+                editorState.steps.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: "orion-admin-empty-state", children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("strong", { children: "No steps configured" }),
+                  /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("span", { children: "Add a first step to start building the public form flow." })
+                ] }) : null,
+                /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { className: "orion-admin-step-editor-list", children: editorState.steps.map((step, stepIndex) => {
+                  const fields = getFields(step);
+                  const requiredCount = fields.filter((field) => field.required === true).length;
+                  return /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("details", { className: "orion-admin-step-editor", open: true, children: [
+                    /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("summary", { className: "orion-admin-step-editor-summary", children: [
+                      /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("span", { className: "orion-admin-workflow-node-number", children: stepIndex + 1 }),
+                      /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("span", { className: "orion-admin-step-editor-title", children: getStepTitle(step, stepIndex) }),
+                      /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("span", { className: "orion-admin-step-editor-meta", children: [
+                        fields.length,
+                        " field",
+                        fields.length === 1 ? "" : "s",
+                        requiredCount > 0 ? ` \xB7 ${requiredCount} required` : ""
+                      ] }),
+                      /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("span", { className: "orion-admin-workflow-node-destination", children: getStepDestination(stepIndex, editorState.steps.length) })
+                    ] }),
+                    /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: "orion-admin-step-editor-body", children: [
+                      /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: "orion-admin-step-editor-actions", children: [
+                        /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+                          "button",
+                          {
+                            className: "orion-admin-action-button orion-admin-action-button--ghost",
+                            disabled: stepIndex === 0,
+                            onClick: () => moveStep(stepIndex, -1),
+                            type: "button",
+                            children: "Move up"
+                          }
+                        ),
+                        /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+                          "button",
+                          {
+                            className: "orion-admin-action-button orion-admin-action-button--ghost",
+                            disabled: stepIndex === editorState.steps.length - 1,
+                            onClick: () => moveStep(stepIndex, 1),
+                            type: "button",
+                            children: "Move down"
+                          }
+                        ),
+                        /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+                          "button",
+                          {
+                            className: "orion-admin-action-button orion-admin-action-button--ghost",
+                            onClick: () => setEditorState(
+                              (current) => current ? {
+                                ...current,
+                                steps: current.steps.filter((_, index) => index !== stepIndex)
+                              } : current
+                            ),
+                            type: "button",
+                            children: "Remove step"
+                          }
+                        )
+                      ] }),
+                      /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: "orion-admin-step-settings-grid", children: [
+                        /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("label", { children: [
+                          "Step title",
+                          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+                            "input",
+                            {
+                              onChange: (event) => updateStep(stepIndex, { title: event.target.value }),
+                              type: "text",
+                              value: getNonEmptyText(step.title)
+                            }
+                          )
+                        ] }),
+                        /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("label", { children: [
+                          "Next button label",
+                          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+                            "input",
+                            {
+                              onChange: (event) => updateStep(stepIndex, { nextLabel: event.target.value }),
+                              placeholder: "Next",
+                              type: "text",
+                              value: getNonEmptyText(step.nextLabel)
+                            }
+                          )
+                        ] })
+                      ] }),
+                      /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("label", { children: [
+                        "Step intro text",
+                        /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+                          "textarea",
+                          {
+                            onChange: (event) => updateStep(stepIndex, { subtitle: event.target.value }),
+                            rows: 3,
+                            value: getNonEmptyText(step.subtitle)
+                          }
+                        )
+                      ] }),
+                      /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("label", { style: checkboxLabelStyle, children: [
+                        /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+                          "input",
+                          {
+                            checked: step.allowSkip === true,
+                            onChange: (event) => updateStep(stepIndex, { allowSkip: event.target.checked }),
+                            type: "checkbox"
+                          }
+                        ),
+                        "Allow visitors to skip this step"
+                      ] }),
+                      /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: "orion-admin-field-list-header", children: [
+                        /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { children: [
+                          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("strong", { children: "Fields in this step" }),
+                          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("span", { children: "These appear together before the visitor moves to the next step." })
+                        ] }),
+                        /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+                          "button",
+                          {
+                            className: "orion-admin-action-button orion-admin-action-button--ghost",
+                            onClick: () => setEditorState(
+                              (current) => current ? {
+                                ...current,
+                                steps: current.steps.map(
+                                  (currentStep, index) => index === stepIndex ? { ...currentStep, fields: [...getFields(currentStep), blankField()] } : currentStep
+                                )
+                              } : current
+                            ),
+                            type: "button",
+                            children: "Add field"
+                          }
+                        )
+                      ] }),
+                      fields.length > 0 ? /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { className: "orion-admin-field-editor-list", children: fields.map((field, fieldIndex) => {
+                        const label = getFieldLabel(field, fieldIndex);
+                        const fieldType = getNonEmptyText(field.type, "text");
+                        return /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("details", { className: "orion-admin-field-editor", children: [
+                          /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("summary", { className: "orion-admin-field-editor-summary", children: [
+                            /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("span", { className: "orion-admin-field-order", children: fieldIndex + 1 }),
+                            /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("span", { className: "orion-admin-field-editor-title", children: label }),
+                            /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("span", { className: "orion-admin-field-editor-meta", children: [
+                              formatFieldTypeLabel(fieldType),
+                              field.required === true ? " \xB7 Required" : ""
+                            ] })
+                          ] }),
+                          /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: "orion-admin-field-editor-body", children: [
+                            /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: "orion-admin-step-editor-actions", children: [
+                              /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+                                "button",
+                                {
+                                  className: "orion-admin-action-button orion-admin-action-button--ghost",
+                                  disabled: fieldIndex === 0,
+                                  onClick: () => moveField(stepIndex, fieldIndex, -1),
+                                  type: "button",
+                                  children: "Move up"
+                                }
+                              ),
+                              /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+                                "button",
+                                {
+                                  className: "orion-admin-action-button orion-admin-action-button--ghost",
+                                  disabled: fieldIndex === fields.length - 1,
+                                  onClick: () => moveField(stepIndex, fieldIndex, 1),
+                                  type: "button",
+                                  children: "Move down"
+                                }
+                              ),
+                              /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+                                "button",
+                                {
+                                  className: "orion-admin-action-button orion-admin-action-button--ghost",
+                                  onClick: () => setEditorState((current) => {
+                                    if (!current) return current;
+                                    return {
+                                      ...current,
+                                      steps: current.steps.map(
+                                        (currentStep, index) => index === stepIndex ? {
+                                          ...currentStep,
+                                          fields: getFields(currentStep).filter(
+                                            (_, currentFieldIndex) => currentFieldIndex !== fieldIndex
+                                          )
+                                        } : currentStep
+                                      )
+                                    };
+                                  }),
+                                  type: "button",
+                                  children: "Remove field"
+                                }
+                              )
+                            ] }),
+                            /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: "orion-admin-step-settings-grid", children: [
+                              /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("label", { children: [
+                                "Field label",
+                                /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+                                  "input",
+                                  {
+                                    onChange: (event) => {
+                                      const nextLabel = event.target.value;
+                                      const currentName = getNonEmptyText(field.name);
+                                      updateField(stepIndex, fieldIndex, {
+                                        label: nextLabel,
+                                        name: currentName || slugifyFieldName(nextLabel)
+                                      });
+                                    },
+                                    type: "text",
+                                    value: label
+                                  }
+                                )
+                              ] }),
+                              /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("label", { children: [
+                                "Field type",
+                                /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+                                  "select",
+                                  {
+                                    onChange: (event) => updateField(stepIndex, fieldIndex, { type: event.target.value }),
+                                    value: fieldType,
+                                    children: fieldTypeOptions.map((option) => /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("option", { value: option, children: formatFieldTypeLabel(option) }, option))
+                                  }
+                                )
+                              ] })
+                            ] }),
+                            /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("label", { children: [
+                              "Field key",
+                              /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+                                "input",
+                                {
+                                  onChange: (event) => updateField(stepIndex, fieldIndex, { name: event.target.value }),
+                                  type: "text",
+                                  value: getNonEmptyText(field.name)
+                                }
+                              )
+                            ] }),
+                            /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("label", { style: checkboxLabelStyle, children: [
+                              /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+                                "input",
+                                {
+                                  checked: field.required === true,
+                                  onChange: (event) => updateField(stepIndex, fieldIndex, { required: event.target.checked }),
+                                  type: "checkbox"
+                                }
+                              ),
+                              "Required"
+                            ] }),
+                            /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("label", { children: [
+                              "Help text",
+                              /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+                                "textarea",
+                                {
+                                  onChange: (event) => updateField(stepIndex, fieldIndex, { helpText: event.target.value }),
+                                  rows: 2,
+                                  value: getNonEmptyText(field.helpText)
+                                }
+                              )
+                            ] }),
+                            ["select", "radio", "checkbox-group"].includes(fieldType) ? /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("label", { children: [
+                              "Options",
+                              /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+                                "textarea",
+                                {
+                                  onChange: (event) => updateField(stepIndex, fieldIndex, {
+                                    options: fromOptionsText(event.target.value)
+                                  }),
+                                  placeholder: "Option one\nOption two",
+                                  rows: 4,
+                                  value: toOptionsText(field.options)
+                                }
+                              )
+                            ] }) : null
+                          ] })
+                        ] }, `edit-field-${stepIndex}-${fieldIndex}`);
+                      }) }) : /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: "orion-admin-empty-state", children: [
+                        /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("strong", { children: "No fields in this step" }),
+                        /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("span", { children: "Add a field so visitors have something to answer here." })
+                      ] })
+                    ] })
+                  ] }, `edit-step-${stepIndex}`);
+                }) })
               ] }),
-              /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { className: "orion-admin-list-meta", children: "Edit the public workflow as JSON. The saved payload must remain an array of step objects compatible with the form collection schema." }),
               /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("button", { disabled: saving, type: "submit", children: saving ? "Saving..." : "Save Form" })
             ] })
-          ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: "orion-admin-card", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("strong", { children: "Current structure payload" }),
-            /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("span", { children: "Reference snapshot of the form steps that will be written back on save." }),
-            /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("pre", { style: { ...codeStyle, marginTop: "1rem" }, children: editorState.stepsText })
           ] })
         ] }) : null
       ]
@@ -8801,25 +8999,17 @@ function AdminStudioFormDetailView(props) {
 var import_link5 = __toESM(require("next/link"));
 var import_react33 = require("react");
 var import_jsx_runtime42 = require("react/jsx-runtime");
-var codeStyle2 = {
-  background: "color-mix(in srgb, var(--orion-admin-card-bg) 82%, black)",
-  border: "1px solid var(--orion-admin-card-border)",
-  borderRadius: "var(--orion-admin-radius-sm)",
-  color: "var(--orion-admin-text)",
-  fontFamily: "ui-monospace, SFMono-Regular, Menlo, monospace",
-  fontSize: "0.86rem",
-  lineHeight: 1.55,
-  margin: 0,
-  maxHeight: "28rem",
-  overflow: "auto",
-  padding: "0.9rem",
-  whiteSpace: "pre-wrap"
-};
 var sectionGridStyle2 = {
   display: "grid",
   gap: "1rem",
   gridTemplateColumns: "repeat(auto-fit, minmax(320px, 1fr))"
 };
+var nestedListStyle = {
+  display: "grid",
+  gap: "0.45rem",
+  margin: 0,
+  padding: 0
+};
 var renderFieldValue = (value) => {
   if (value === null || value === void 0) {
     return /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("span", { className: "orion-admin-list-meta", children: "No value" });
@@ -8833,7 +9023,26 @@ var renderFieldValue = (value) => {
   if (typeof value === "string") {
     return value.trim().length > 0 ? value : /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("span", { className: "orion-admin-list-meta", children: "No value" });
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("pre", { style: codeStyle2, children: JSON.stringify(value, null, 2) });
+  if (Array.isArray(value)) {
+    const entries = value.filter((entry) => entry !== null && entry !== void 0 && entry !== "");
+    if (entries.length === 0) {
+      return /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("span", { className: "orion-admin-list-meta", children: "No value" });
+    }
+    return /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("ul", { style: nestedListStyle, children: entries.map((entry, index) => /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("li", { children: renderFieldValue(entry) }, index)) });
+  }
+  if (typeof value === "object") {
+    const entries = Object.entries(value).filter(
+      ([, entryValue]) => entryValue !== null && entryValue !== void 0 && entryValue !== ""
+    );
+    if (entries.length === 0) {
+      return /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("span", { className: "orion-admin-list-meta", children: "No value" });
+    }
+    return /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("div", { style: { display: "grid", gap: "0.65rem" }, children: entries.map(([key, entryValue]) => /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("div", { className: "orion-admin-meta-row", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("span", { className: "orion-admin-meta-label", children: humanizeKey2(key) }),
+      /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("span", { className: "orion-admin-meta-value", children: renderFieldValue(entryValue) })
+    ] }, key)) });
+  }
+  return String(value);
 };
 function getSubmissionIDFromPathname(pathname) {
   return getIDFromPathname(pathname, "/forms/submissions/");
@@ -8985,31 +9194,24 @@ function AdminStudioFormSubmissionView(props) {
             /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("article", { className: "orion-admin-overview-stat", children: [
               /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("span", { className: "orion-admin-overview-stat-label", children: "Highlighted answers" }),
               /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("strong", { children: previewFields.length }),
-              /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("p", { children: "Readable answer previews surfaced from the structured payload." })
+              /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("p", { children: "Readable answer previews from this response." })
             ] })
           ] }),
           /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("div", { style: sectionGridStyle2, children: [
-            /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("div", { style: { display: "grid", gap: "1rem" }, children: [
-              /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("div", { className: "orion-admin-card", children: [
-                /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("strong", { children: "Response details" }),
-                /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("span", { children: "Formatted answers using the current form field labels when available." }),
-                /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("div", { style: { display: "grid", gap: "0.85rem", marginTop: "1rem" }, children: answerEntries.length > 0 ? answerEntries.map(([key, value]) => /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("div", { className: "orion-admin-form", children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("div", { children: [
-                    /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("strong", { children: fieldLabels.get(key) || humanizeKey2(key) }),
-                    /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("div", { className: "orion-admin-list-meta", children: key })
-                  ] }),
-                  /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("div", { children: renderFieldValue(value) })
-                ] }, key)) : /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("div", { className: "orion-admin-empty-state", children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("strong", { children: "No response payload" }),
-                  /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("span", { children: "This submission does not contain a structured data object." })
-                ] }) })
-              ] }),
-              /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("div", { className: "orion-admin-card", children: [
-                /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("strong", { children: "Raw payload" }),
-                /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("span", { children: "Verbatim submission data for troubleshooting or export checks." }),
-                /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("pre", { style: { ...codeStyle2, marginTop: "1rem" }, children: JSON.stringify(doc.data ?? {}, null, 2) })
-              ] })
-            ] }),
+            /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("div", { style: { display: "grid", gap: "1rem" }, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("div", { className: "orion-admin-card", children: [
+              /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("strong", { children: "Response details" }),
+              /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("span", { children: "Formatted answers using the current form field labels when available." }),
+              /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("div", { style: { display: "grid", gap: "0.85rem", marginTop: "1rem" }, children: answerEntries.length > 0 ? answerEntries.map(([key, value]) => /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("div", { className: "orion-admin-form", children: [
+                /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("div", { children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("strong", { children: fieldLabels.get(key) || humanizeKey2(key) }),
+                  /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("div", { className: "orion-admin-list-meta", children: key })
+                ] }),
+                /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("div", { children: renderFieldValue(value) })
+              ] }, key)) : /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("div", { className: "orion-admin-empty-state", children: [
+                /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("strong", { children: "No answers available" }),
+                /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("span", { children: "This submission does not contain visible response details." })
+              ] }) })
+            ] }) }),
             /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("div", { style: { display: "grid", gap: "1rem" }, children: [
               /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("div", { className: "orion-admin-card orion-admin-meta-table", children: [
                 /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("div", { className: "orion-admin-meta-row", children: [
@@ -9299,7 +9501,7 @@ var import_react35 = require("react");
 var import_ui12 = require("@payloadcms/ui");
 var import_jsx_runtime44 = require("react/jsx-runtime");
 var userRoles = ["admin", "developer", "editor", "client"];
-var hasAdminAccess4 = (user) => {
+var hasAdminAccess3 = (user) => {
   if (!user || typeof user !== "object") return false;
   const role = user.role;
   return typeof role === "string" && (role === "admin" || role === "developer");
@@ -9314,7 +9516,7 @@ function AdminStudioToolsView(props) {
   const [savedMessage, setSavedMessage] = (0, import_react35.useState)(null);
   const [createSubmitting, setCreateSubmitting] = (0, import_react35.useState)(false);
   const [updatingUserID, setUpdatingUserID] = (0, import_react35.useState)(null);
-  if (!hasAdminAccess4(user)) {
+  if (!hasAdminAccess3(user)) {
     return /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(StudioSectionLayout, { navProps: props, children: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(
       AdminPage,
       {