@orion-studios/cms 0.5.1 → 0.5.2

package/dist/studio/index.js

@@ -58,7 +58,11 @@ function createStudioApi(options) {
     getPage: (id) => call("GET", `/pages/${id}`),
     createPage: (input) => call("POST", "/pages", input),
     saveDraft: (id, input) => call("PATCH", `/pages/${id}`, input),
-    publish: (id) => call("POST", `/pages/${id}/publish`),
+    publish: (id, expectedVersionId) => call("POST", `/pages/${id}/publish`, { expectedVersionId }),
+    schedulePublish: (id, publishAt, expectedVersionId) => call("PATCH", `/pages/${id}`, {
+      publishAt,
+      ...expectedVersionId !== void 0 ? { expectedVersionId } : {}
+    }),
     unpublish: (id) => call("POST", `/pages/${id}/unpublish`),
     duplicatePage: (id) => call("POST", `/pages/${id}/duplicate`),
     deletePage: (id) => call("DELETE", `/pages/${id}`),
@@ -129,6 +133,75 @@ function createStudioApi(options) {
   };
 }
 
+// src/server/permissions.ts
+var ROLE_RANK = {
+  content: 0,
+  editor: 1,
+  admin: 2,
+  developer: 3
+};
+var MIN_ROLE = {
+  "pages.read": "content",
+  "pages.saveDraft": "content",
+  "pages.changeStructure": "editor",
+  "pages.publish": "editor",
+  "pages.create": "editor",
+  "pages.delete": "admin",
+  "pages.restore": "editor",
+  "globals.read": "content",
+  "globals.write": "content",
+  "media.read": "content",
+  "media.upload": "content",
+  "media.update": "content",
+  "media.replace": "editor",
+  "media.delete": "editor",
+  "forms.read": "content",
+  "forms.write": "editor",
+  "forms.delete": "admin",
+  "submissions.read": "editor",
+  "submissions.manage": "editor",
+  "redirects.manage": "editor",
+  "activity.read": "editor",
+  "analytics.read": "editor",
+  "sync.run": "admin",
+  "users.manage": "admin"
+};
+function can(user, action) {
+  if (!user) return false;
+  return ROLE_RANK[user.role] >= ROLE_RANK[MIN_ROLE[action]];
+}
+
+// src/studio/access.ts
+var SECTION_ACTION = {
+  dashboard: "pages.read",
+  pages: "pages.read",
+  media: "media.read",
+  forms: "forms.read",
+  submissions: "submissions.read",
+  analytics: "analytics.read",
+  globals: "globals.read",
+  redirects: "redirects.manage",
+  users: "users.manage"
+};
+var userForRole = (role) => ({ id: "", email: null, name: "", role });
+var studioCan = (role, action) => can(userForRole(role), action);
+var canViewStudioSection = (role, section) => studioCan(role, SECTION_ACTION[section]);
+var studioAccess = (role) => ({
+  changePageStructure: studioCan(role, "pages.changeStructure"),
+  publishPages: studioCan(role, "pages.publish"),
+  createPages: studioCan(role, "pages.create"),
+  deletePages: studioCan(role, "pages.delete"),
+  replaceMedia: studioCan(role, "media.replace"),
+  deleteMedia: studioCan(role, "media.delete"),
+  writeForms: studioCan(role, "forms.write"),
+  deleteForms: studioCan(role, "forms.delete"),
+  readSubmissions: studioCan(role, "submissions.read"),
+  manageSubmissions: studioCan(role, "submissions.manage"),
+  readAnalytics: studioCan(role, "analytics.read"),
+  manageRedirects: studioCan(role, "redirects.manage"),
+  manageUsers: studioCan(role, "users.manage")
+});
+
 // src/studio/auth.tsx
 import { createClient } from "@supabase/supabase-js";
 import { useCallback, useEffect, useMemo, useState as useState2 } from "react";
@@ -196,14 +269,14 @@ function getBrowserSupabase() {
   }
   return browserClient;
 }
-var isMemoryMode = () => (!process.env.NEXT_PUBLIC_SUPABASE_URL || !process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY) && (process.env.NODE_ENV !== "production" || process.env.NEXT_PUBLIC_CMS_MEMORY === "true");
+var isStudioMemoryMode = () => (!process.env.NEXT_PUBLIC_SUPABASE_URL || !process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY) && process.env.NODE_ENV !== "production";
 var MEMORY_DEV_TOKEN = "orion-dev-token";
 var memorySession = {
   access_token: MEMORY_DEV_TOKEN,
   user: { id: "dev", email: "dev@local" }
 };
 function useStudioSession() {
-  const memory = isMemoryMode();
+  const memory = isStudioMemoryMode();
   const supabase = useMemo(() => memory ? null : getBrowserSupabase(), [memory]);
   const [session, setSession] = useState2(memory ? memorySession : null);
   const [loading, setLoading] = useState2(!memory);
@@ -634,24 +707,28 @@ function DashboardView({
   api,
   siteName,
   onOpenPage,
-  onOpenSubmissions
+  onOpenSubmissions,
+  canReadAnalytics,
+  canReadSubmissions
 }) {
   const [data, setData] = useState4(null);
   const [week, setWeek] = useState4(null);
   const [error, setError] = useState4("");
   useEffect3(() => {
     api.dashboard().then(setData, (e) => setError(e.message));
-    const to = /* @__PURE__ */ new Date();
-    const from = new Date(to.getTime() - 7 * 864e5);
-    api.analytics({ from: from.toISOString(), to: to.toISOString() }).then(
-      (summary) => setWeek({
-        visitors: summary.kpis.visitors,
-        calls: summary.kpis.calls,
-        formSubmits: summary.kpis.formSubmits
-      }),
-      () => void 0
-    );
-  }, [api]);
+    if (canReadAnalytics) {
+      const to = /* @__PURE__ */ new Date();
+      const from = new Date(to.getTime() - 7 * 864e5);
+      api.analytics({ from: from.toISOString(), to: to.toISOString() }).then(
+        (summary) => setWeek({
+          visitors: summary.kpis.visitors,
+          calls: summary.kpis.calls,
+          formSubmits: summary.kpis.formSubmits
+        }),
+        () => void 0
+      );
+    }
+  }, [api, canReadAnalytics]);
   if (error) return /* @__PURE__ */ jsx4("div", { className: "ost-view", children: /* @__PURE__ */ jsx4("div", { className: "ost-error", children: error }) });
   if (!data) return /* @__PURE__ */ jsx4("div", { className: "ost-view", children: /* @__PURE__ */ jsx4("div", { className: "ost-loading", children: "Loading\u2026" }) });
   const { pages, submissions, activity } = data;
@@ -681,7 +758,7 @@ function DashboardView({
     ] }) }),
     /* @__PURE__ */ jsxs4("div", { className: "ost-dash-columns", children: [
       /* @__PURE__ */ jsxs4("div", { className: "ost-dash-column", children: [
-        /* @__PURE__ */ jsxs4("section", { className: "ost-card ost-dash-card", children: [
+        canReadSubmissions && submissions ? /* @__PURE__ */ jsxs4("section", { className: "ost-card ost-dash-card", children: [
           /* @__PURE__ */ jsxs4("header", { className: "ost-dash-card-head", children: [
             /* @__PURE__ */ jsx4("h3", { children: "Submissions" }),
             /* @__PURE__ */ jsx4("button", { className: "ost-btn", onClick: onOpenSubmissions, type: "button", children: "Open inbox" })
@@ -706,7 +783,7 @@ function DashboardView({
             },
             submission.id
           ))
-        ] }),
+        ] }) : null,
         /* @__PURE__ */ jsxs4("section", { className: "ost-card ost-dash-card", children: [
           /* @__PURE__ */ jsx4("header", { className: "ost-dash-card-head", children: /* @__PURE__ */ jsx4("h3", { children: "Waiting to publish" }) }),
           pages.pendingDrafts.length === 0 ? /* @__PURE__ */ jsx4("p", { className: "ost-muted", children: "Every page is live and up to date." }) : pages.pendingDrafts.map((page) => /* @__PURE__ */ jsxs4("button", { className: "ost-dash-row", onClick: () => onOpenPage(page.id), type: "button", children: [
@@ -805,6 +882,7 @@ function FormsView({
   api,
   canWrite,
   canDelete,
+  canReadSubmissions,
   onOpenSubmissions
 }) {
   const [forms, setForms] = useState5(null);
@@ -870,19 +948,19 @@ function FormsView({
         ] })
       ] }),
       /* @__PURE__ */ jsxs5("span", { className: "ost-row", children: [
-        /* @__PURE__ */ jsxs5("button", { className: "ost-btn", onClick: () => onOpenSubmissions(form.id), type: "button", children: [
+        canReadSubmissions ? /* @__PURE__ */ jsxs5("button", { className: "ost-btn", onClick: () => onOpenSubmissions(form.id), type: "button", children: [
           form.submissionCount ?? 0,
           " submission",
           (form.submissionCount ?? 0) === 1 ? "" : "s",
           form.unreadCount ? ` (${form.unreadCount} new)` : ""
-        ] }),
+        ] }) : null,
         canDelete ? /* @__PURE__ */ jsx5(
           "button",
           {
             className: "ost-btn ost-btn-danger",
             onClick: async () => {
               if (!window.confirm(
-                `Delete "${form.title}" and its ${form.submissionCount ?? 0} submissions? This cannot be undone.`
+                canReadSubmissions ? `Delete "${form.title}" and its ${form.submissionCount ?? 0} submissions? This cannot be undone.` : `Delete "${form.title}"? This cannot be undone.`
               ))
                 return;
               await api.deleteForm(form.slug).catch(() => void 0);
@@ -2043,8 +2121,8 @@ function PageEditor({
   const changedSincePublish = useMemo3(() => {
     if (!page) return false;
     if (page.status !== "published") return true;
-    return dirty || JSON.stringify(layout) !== JSON.stringify(page.published_layout ?? []);
-  }, [page, layout, dirty]);
+    return dirty || title !== (page.published_title ?? "") || JSON.stringify(seo) !== JSON.stringify(page.published_seo ?? {}) || JSON.stringify(layout) !== JSON.stringify(page.published_layout ?? []);
+  }, [page, title, seo, layout, dirty]);
   const canvasRef = useRef(null);
   const layoutRef = useRef(layout);
   layoutRef.current = layout;
@@ -2094,22 +2172,24 @@ function PageEditor({
     };
   }, [layout, registry, commitInline]);
   const save = useCallback2(async () => {
-    const prior = savePromiseRef.current ?? Promise.resolve(true);
-    const run = prior.catch(() => void 0).then(async () => {
+    const prior = savePromiseRef.current ?? Promise.resolve(null);
+    const run = prior.catch(() => null).then(async () => {
       const revAtStart = editRevRef.current;
       setBusy("save");
       setError("");
       try {
         const { page: saved } = await api.saveDraft(pageId, { title, seo, layout });
-        setPage(saved);
-        if (editRevRef.current === revAtStart) {
-          setDirty(false);
-          setMessage("Draft saved.");
+        if (editRevRef.current !== revAtStart) {
+          setError("The draft changed while saving. Save again before publishing or scheduling.");
+          return null;
         }
-        return true;
+        setPage(saved);
+        setDirty(false);
+        setMessage("Draft saved.");
+        return saved;
       } catch (saveError) {
         setError(saveError instanceof Error ? saveError.message : "Save failed.");
-        return false;
+        return null;
       } finally {
         setBusy(null);
       }
@@ -2122,13 +2202,17 @@ function PageEditor({
     }
   }, [api, pageId, title, seo, layout]);
   const publish = async () => {
-    if (dirty && !await save()) return;
+    const reviewed = dirty ? await save() : page;
+    if (!reviewed?.draft_version_id) {
+      setError("Save the draft again before publishing.");
+      return;
+    }
     setBusy("publish");
     setError("");
     try {
-      const { page: published } = await api.publish(pageId);
+      const { page: published } = await api.publish(pageId, reviewed.draft_version_id);
       setPage(published);
-      setMessage("Published \u2014 live on the site.");
+      setMessage("Published. The reviewed version is live on the site.");
     } catch (publishError) {
       setError(publishError instanceof Error ? publishError.message : "Publish failed.");
     } finally {
@@ -2540,17 +2624,20 @@ function PageSettings({
   const schedule = async (value) => {
     setError("");
     setNotice("");
-    if (value && !await onFlushDraft()) {
+    const reviewed = value ? await onFlushDraft() : null;
+    if (value && !reviewed?.draft_version_id) {
       setError("Could not save the current draft before scheduling.");
       return;
     }
     try {
-      const { page: updated } = await api.saveDraft(page.id, {
-        publishAt: value ? new Date(value).toISOString() : null
-      });
+      const { page: updated } = await api.schedulePublish(
+        page.id,
+        value ? new Date(value).toISOString() : null,
+        reviewed?.draft_version_id ?? void 0
+      );
       onPageChanged(updated);
       setPublishAt(updated.publish_at ? updated.publish_at.slice(0, 16) : "");
-      setNotice(value ? "Publish scheduled." : "Schedule cleared.");
+      setNotice(value ? `Saved version ${updated.scheduled_version_id} is scheduled.` : "Schedule cleared.");
     } catch (scheduleError) {
       setError(scheduleError instanceof Error ? scheduleError.message : "Could not schedule.");
     }
@@ -2650,7 +2737,7 @@ function PageSettings({
         /* @__PURE__ */ jsx7("button", { className: "ost-btn", disabled: !publishAt, onClick: () => schedule(publishAt), type: "button", children: "Schedule" }),
         page.publish_at ? /* @__PURE__ */ jsx7("button", { className: "ost-btn", onClick: () => schedule(null), type: "button", children: "Clear" }) : null
       ] }),
-      /* @__PURE__ */ jsx7("p", { className: "ost-muted", children: "The current draft goes live automatically at the chosen time." })
+      /* @__PURE__ */ jsx7("p", { className: "ost-muted", children: "The saved version selected when you schedule goes live at the chosen time. Later draft edits stay private." })
     ] }) : null,
     /* @__PURE__ */ jsxs7("section", { className: "ost-settings-section", children: [
       /* @__PURE__ */ jsx7("h4", { children: "Actions" }),
@@ -3249,6 +3336,7 @@ function MediaView({
   media,
   mediaUrl,
   canDelete,
+  canReplace,
   onUpload,
   onChanged
 }) {
@@ -3331,6 +3419,7 @@ function MediaView({
       {
         api,
         canDelete,
+        canReplace,
         media: selected,
         mediaUrl,
         onChanged: () => {
@@ -3348,6 +3437,7 @@ function MediaDetail({
   media,
   mediaUrl,
   canDelete,
+  canReplace,
   onChanged,
   onClose,
   onError
@@ -3402,7 +3492,7 @@ function MediaDetail({
           children: saving ? "Saving\u2026" : "Save details"
         }
       ),
-      /* @__PURE__ */ jsxs11("label", { className: "ost-btn", title: "The new file keeps every existing reference. CDN caching can take up to an hour to show the new version everywhere.", children: [
+      canReplace ? /* @__PURE__ */ jsxs11("label", { className: "ost-btn", title: "The new file keeps every existing reference. CDN caching can take up to an hour to show the new version everywhere.", children: [
         replacing ? "Replacing\u2026" : "Replace file",
         /* @__PURE__ */ jsx11(
           "input",
@@ -3428,7 +3518,7 @@ function MediaDetail({
             type: "file"
           }
         )
-      ] }),
+      ] }) : null,
       canDelete ? /* @__PURE__ */ jsx11(
         "button",
         {
@@ -3590,8 +3680,8 @@ var NAV = [
   { key: "submissions", label: "Submissions" },
   { key: "analytics", label: "Analytics" },
   { key: "globals", label: "Globals" },
-  { key: "redirects", label: "Redirects", minRole: "editor" },
-  { key: "users", label: "Users", minRole: "admin" }
+  { key: "redirects", label: "Redirects" },
+  { key: "users", label: "Users" }
 ];
 function Studio({ registry, globals, siteName, logoUrl, supabaseUrl }) {
   const { session, loading, getToken, signOut } = useStudioSession();
@@ -3692,20 +3782,8 @@ function Studio({ registry, globals, siteName, logoUrl, supabaseUrl }) {
     ] }) });
   }
   if (!role) return /* @__PURE__ */ jsx12("div", { className: "ost-root ost-loading", children: "Loading Studio\u2026" });
-  const canChangeStructure = role !== "content";
-  const canPublish = role !== "content";
-  const canCreatePages = role !== "content";
-  const canDeleteMedia = role !== "content";
-  const canWriteForms = role !== "content";
-  const canManageSubmissions = role !== "content";
-  const canManageUsers = role === "admin" || role === "developer";
-  const canManageRedirects = role !== "content";
-  const canDeleteForms = role === "admin" || role === "developer";
-  const nav = NAV.filter((item) => {
-    if (item.minRole === "admin") return canManageUsers;
-    if (item.minRole === "editor") return role !== "content";
-    return true;
-  });
+  const access = studioAccess(role);
+  const nav = NAV.filter((item) => canViewStudioSection(role, item.key));
   const goTo = (key) => {
     setSection(key);
     setOpenPageId(null);
@@ -3748,8 +3826,8 @@ function Studio({ registry, globals, siteName, logoUrl, supabaseUrl }) {
       PageEditor,
       {
         api,
-        canChangeStructure,
-        canPublish,
+        canChangeStructure: access.changePageStructure,
+        canPublish: access.publishPages,
         media,
         mediaUrl,
         onBack: () => {
@@ -3763,11 +3841,12 @@ function Studio({ registry, globals, siteName, logoUrl, supabaseUrl }) {
         role
       },
       openPageId
-    ) : section === "pages" ? /* @__PURE__ */ jsx12(PagesView, { api, canCreate: canCreatePages, onOpen: openPage }) : section === "media" ? /* @__PURE__ */ jsx12(
+    ) : section === "pages" ? /* @__PURE__ */ jsx12(PagesView, { api, canCreate: access.createPages, onOpen: openPage }) : section === "media" ? /* @__PURE__ */ jsx12(
       MediaView,
       {
         api,
-        canDelete: canDeleteMedia,
+        canDelete: access.deleteMedia,
+        canReplace: access.replaceMedia,
         media,
         mediaUrl,
         onChanged: refreshMedia,
@@ -3777,23 +3856,24 @@ function Studio({ registry, globals, siteName, logoUrl, supabaseUrl }) {
       FormsView,
       {
         api,
-        canDelete: canDeleteForms,
-        canWrite: canWriteForms,
+        canDelete: access.deleteForms,
+        canReadSubmissions: access.readSubmissions,
+        canWrite: access.writeForms,
         onOpenSubmissions: (formId) => {
           setSubmissionsFormId(formId);
           setSection("submissions");
         }
       }
-    ) : section === "submissions" ? /* @__PURE__ */ jsx12(
+    ) : section === "submissions" && access.readSubmissions ? /* @__PURE__ */ jsx12(
       SubmissionsView,
       {
         api,
-        canManage: canManageSubmissions,
+        canManage: access.manageSubmissions,
         initialFormId: submissionsFormId,
         onUnreadChanged: refreshUnread
       },
       submissionsFormId || "all"
-    ) : section === "analytics" ? /* @__PURE__ */ jsx12(AnalyticsView, { api }) : section === "globals" ? /* @__PURE__ */ jsx12(
+    ) : section === "analytics" && access.readAnalytics ? /* @__PURE__ */ jsx12(AnalyticsView, { api }) : section === "globals" ? /* @__PURE__ */ jsx12(
       GlobalsView,
       {
         api,
@@ -3803,10 +3883,12 @@ function Studio({ registry, globals, siteName, logoUrl, supabaseUrl }) {
         onUploadMedia: uploadMedia,
         pages
       }
-    ) : section === "redirects" && canManageRedirects ? /* @__PURE__ */ jsx12(RedirectsView, { api }) : section === "users" && canManageUsers ? /* @__PURE__ */ jsx12(UsersView, { api, meId: session.user.id }) : /* @__PURE__ */ jsx12(
+    ) : section === "redirects" && access.manageRedirects ? /* @__PURE__ */ jsx12(RedirectsView, { api }) : section === "users" && access.manageUsers ? /* @__PURE__ */ jsx12(UsersView, { api, meId: session.user.id }) : /* @__PURE__ */ jsx12(
       DashboardView,
       {
         api,
+        canReadAnalytics: access.readAnalytics,
+        canReadSubmissions: access.readSubmissions,
         onOpenPage: openPage,
         onOpenSubmissions: () => goTo("submissions"),
         siteName

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-studios/cms",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Orion CMS v2 core engine \u2014 JSONB content model on Supabase primitives",
   "type": "module",
   "exports": {