@btst/stack 3.0.0-rc.1 → 3.0.0-rc.3

package/dist/packages/stack/src/plugins/cms/client/components/forms/content-form.cjs

@@ -11,6 +11,7 @@ const input = require('../../../../../../../ui/src/components/input.cjs');
 const label = require('../../../../../../../ui/src/components/label.cjs');
 const badge = require('../../../../../../../ui/src/components/badge.cjs');
 const context = require('@btst/stack/context');
+const constants = require('../../constants.cjs');
 const utils = require('../../../utils.cjs');
 const fileUpload = require('./file-upload.cjs');
 const relationField = require('./relation-field.cjs');
@@ -136,7 +137,7 @@ function ContentForm({
     imagePicker,
     imageInputField,
     fieldComponents
-  } = context.usePluginOverrides("cms");
+  } = context.usePluginOverrides(constants.CMS_PLUGIN_ID);
   const [slug, setSlug] = React.useState(initialSlug);
   const [slugManuallyEdited, setSlugManuallyEdited] = React.useState(isEditing);
   const [isSubmittingLocal, setIsSubmittingLocal] = React.useState(false);

package/dist/packages/stack/src/plugins/cms/client/components/forms/content-form.mjs

@@ -9,6 +9,7 @@ import { Input } from '../../../../../../../ui/src/components/input.mjs';
 import { Label } from '../../../../../../../ui/src/components/label.mjs';
 import { Badge } from '../../../../../../../ui/src/components/badge.mjs';
 import { useTranslate, usePluginOverrides } from '@btst/stack/context';
+import { CMS_PLUGIN_ID } from '../../constants.mjs';
 import { slugify } from '../../../utils.mjs';
 import { CMSFileUpload } from './file-upload.mjs';
 import { RelationField } from './relation-field.mjs';
@@ -134,7 +135,7 @@ function ContentForm({
     imagePicker,
     imageInputField,
     fieldComponents
-  } = usePluginOverrides("cms");
+  } = usePluginOverrides(CMS_PLUGIN_ID);
   const [slug, setSlug] = useState(initialSlug);
   const [slugManuallyEdited, setSlugManuallyEdited] = useState(isEditing);
   const [isSubmittingLocal, setIsSubmittingLocal] = useState(false);

package/dist/packages/stack/src/plugins/cms/client/components/forms/file-upload.cjs

@@ -4,6 +4,7 @@
 const jsxRuntime = require('react/jsx-runtime');
 const React = require('react');
 const context = require('@btst/stack/context');
+const constants = require('../../constants.cjs');
 const input = require('../../../../../../../ui/src/components/input.cjs');
 const button = require('../../../../../../../ui/src/components/button.cjs');
 const form = require('../../../../../../../ui/src/components/form.cjs');
@@ -29,7 +30,7 @@ function CMSFileUpload({
   const showLabel = _showLabel === void 0 ? true : _showLabel;
   const t = context.useTranslate();
   const notify = context.useNotify();
-  const { localization } = context.usePluginOverrides("cms");
+  const { localization } = context.usePluginOverrides(constants.CMS_PLUGIN_ID);
   const [isUploading, setIsUploading] = React.useState(false);
   const [previewUrl, setPreviewUrl] = React.useState(
     field.value || null

package/dist/packages/stack/src/plugins/cms/client/components/forms/file-upload.mjs

@@ -2,6 +2,7 @@
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { useState, useEffect, useCallback } from 'react';
 import { useTranslate, useNotify, usePluginOverrides } from '@btst/stack/context';
+import { CMS_PLUGIN_ID } from '../../constants.mjs';
 import { Input } from '../../../../../../../ui/src/components/input.mjs';
 import { Button } from '../../../../../../../ui/src/components/button.mjs';
 import { FormItem, FormControl, FormMessage } from '../../../../../../../ui/src/components/form.mjs';
@@ -27,7 +28,7 @@ function CMSFileUpload({
   const showLabel = _showLabel === void 0 ? true : _showLabel;
   const t = useTranslate();
   const notify = useNotify();
-  const { localization } = usePluginOverrides("cms");
+  const { localization } = usePluginOverrides(CMS_PLUGIN_ID);
   const [isUploading, setIsUploading] = useState(false);
   const [previewUrl, setPreviewUrl] = useState(
     field.value || null

package/dist/packages/stack/src/plugins/cms/client/components/forms/relation-field.cjs

@@ -4,6 +4,7 @@
 const jsxRuntime = require('react/jsx-runtime');
 const React = require('react');
 const context = require('@btst/stack/context');
+const constants = require('../../constants.cjs');
 const multiSelect = require('../../../../../../../ui/src/components/multi-select.cjs');
 const button = require('../../../../../../../ui/src/components/button.cjs');
 const LucideIcons = require('lucide-react');
@@ -25,7 +26,7 @@ function RelationField({
   const [newItemName, setNewItemName] = React.useState("");
   const [newItemDescription, setNewItemDescription] = React.useState("");
   const [createError, setCreateError] = React.useState(null);
-  const { localization } = context.usePluginOverrides("cms");
+  const { localization } = context.usePluginOverrides(constants.CMS_PLUGIN_ID);
   const isSingleSelect = relation.type === "belongsTo";
   const normalizedValue = React.useMemo(() => {
     if (!field.value) return [];

package/dist/packages/stack/src/plugins/cms/client/components/forms/relation-field.mjs

@@ -2,6 +2,7 @@
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { useState, useMemo, useCallback } from 'react';
 import { useTranslate, usePluginOverrides } from '@btst/stack/context';
+import { CMS_PLUGIN_ID } from '../../constants.mjs';
 import MultipleSelector from '../../../../../../../ui/src/components/multi-select.mjs';
 import { Button } from '../../../../../../../ui/src/components/button.mjs';
 import { Plus, X } from 'lucide-react';
@@ -23,7 +24,7 @@ function RelationField({
   const [newItemName, setNewItemName] = useState("");
   const [newItemDescription, setNewItemDescription] = useState("");
   const [createError, setCreateError] = useState(null);
-  const { localization } = usePluginOverrides("cms");
+  const { localization } = usePluginOverrides(CMS_PLUGIN_ID);
   const isSingleSelect = relation.type === "belongsTo";
   const normalizedValue = useMemo(() => {
     if (!field.value) return [];

package/dist/packages/stack/src/plugins/cms/client/components/inverse-relations-panel.cjs

@@ -7,6 +7,8 @@ const LucideIcons = require('lucide-react');
 const button = require('../../../../../../ui/src/components/button.cjs');
 const card = require('../../../../../../ui/src/components/card.cjs');
 const context = require('@btst/stack/context');
+const plugins_cms_permissions = require('../../../../../../../plugins/cms/permissions.cjs');
+const constants = require('../constants.cjs');
 const alertDialog = require('../../../../../../ui/src/components/alert-dialog.cjs');
 const cmsHooks = require('../hooks/cms-hooks.cjs');
 
@@ -15,11 +17,11 @@ function InverseRelationsPanel({
   itemId
 }) {
   const t = context.useTranslate();
-  const { localization } = context.usePluginOverrides("cms");
-  const { router } = context.useStack();
+  const { localization } = context.usePluginOverrides(constants.CMS_PLUGIN_ID);
+  const { router, plugins, basePath: stackBasePath } = context.useStack();
   const navigate = router?.navigate;
   const Link = router?.Link;
-  const basePath = context.useBasePath();
+  const basePath = plugins?.[constants.CMS_PLUGIN_ID]?.site.basePath ?? stackBasePath;
   const { inverseRelations, isLoading } = cmsHooks.useInverseRelations(
     contentTypeSlug,
     itemId
@@ -107,7 +109,10 @@ function InverseRelationSection({
     }
   };
   const handleAddNew = () => {
-    const createUrl = `${basePath}/cms/${relation.sourceType}/new?prefill_${relation.fieldName}=${itemId}`;
+    const createUrl = context.joinBasePath(
+      basePath,
+      `/cms/${relation.sourceType}/new?prefill_${relation.fieldName}=${itemId}`
+    );
     void navigate?.(createUrl);
   };
   const LinkComponent = Link ?? "a";
@@ -143,7 +148,10 @@ function InverseRelationSection({
         relation.sourceTypeName.toLowerCase()
       ) }) : /* @__PURE__ */ jsxRuntime.jsx("ul", { className: "space-y-2", children: items.map((item) => {
         const displayValue = getDisplayValue(item);
-        const editUrl = `${basePath}/cms/${relation.sourceType}/${item.id}`;
+        const editUrl = context.joinBasePath(
+          basePath,
+          `/cms/${relation.sourceType}/${item.id}`
+        );
         return /* @__PURE__ */ jsxRuntime.jsxs(
           "li",
           {
@@ -161,11 +169,13 @@ function InverseRelationSection({
                 }
               ),
               /* @__PURE__ */ jsxRuntime.jsx(
-                context.CanAccess,
+                context.PermissionAccess,
                 {
-                  resource: "cms:content",
-                  action: "delete",
-                  params: { typeSlug: relation.sourceType, id: item.id },
+                  permission: plugins_cms_permissions.cmsPermissions.record.delete({
+                    contentType: item.contentType?.slug ?? relation.sourceType,
+                    recordId: item.id,
+                    ...item.authorId ? { authorId: item.authorId } : {}
+                  }),
                   children: /* @__PURE__ */ jsxRuntime.jsx(
                     button.Button,
                     {
@@ -184,11 +194,11 @@ function InverseRelationSection({
         );
       }) }),
       /* @__PURE__ */ jsxRuntime.jsx("div", { className: "mt-3 pt-3 border-t", children: /* @__PURE__ */ jsxRuntime.jsx(
-        context.CanAccess,
+        context.PermissionAccess,
         {
-          resource: "cms:content",
-          action: "create",
-          params: { typeSlug: relation.sourceType },
+          permission: plugins_cms_permissions.cmsPermissions.record.create({
+            contentType: relation.sourceType
+          }),
           children: /* @__PURE__ */ jsxRuntime.jsxs(
             button.Button,
             {

package/dist/packages/stack/src/plugins/cms/client/components/inverse-relations-panel.mjs

@@ -4,7 +4,9 @@ import { useState } from 'react';
 import { ChevronDown, ChevronRight, ExternalLink, Trash2, Plus } from 'lucide-react';
 import { Button } from '../../../../../../ui/src/components/button.mjs';
 import { Card, CardHeader, CardTitle, CardContent } from '../../../../../../ui/src/components/card.mjs';
-import { useTranslate, usePluginOverrides, useStack, useBasePath, CanAccess } from '@btst/stack/context';
+import { useTranslate, usePluginOverrides, useStack, joinBasePath, PermissionAccess } from '@btst/stack/context';
+import { cmsPermissions } from '../../../../../../../plugins/cms/permissions.mjs';
+import { CMS_PLUGIN_ID } from '../constants.mjs';
 import { AlertDialog, AlertDialogContent, AlertDialogHeader, AlertDialogTitle, AlertDialogDescription, AlertDialogFooter, AlertDialogCancel, AlertDialogAction } from '../../../../../../ui/src/components/alert-dialog.mjs';
 import { useInverseRelations, useDeleteContent, useInverseRelationItems } from '../hooks/cms-hooks.mjs';
 
@@ -13,11 +15,11 @@ function InverseRelationsPanel({
   itemId
 }) {
   const t = useTranslate();
-  const { localization } = usePluginOverrides("cms");
-  const { router } = useStack();
+  const { localization } = usePluginOverrides(CMS_PLUGIN_ID);
+  const { router, plugins, basePath: stackBasePath } = useStack();
   const navigate = router?.navigate;
   const Link = router?.Link;
-  const basePath = useBasePath();
+  const basePath = plugins?.[CMS_PLUGIN_ID]?.site.basePath ?? stackBasePath;
   const { inverseRelations, isLoading } = useInverseRelations(
     contentTypeSlug,
     itemId
@@ -105,7 +107,10 @@ function InverseRelationSection({
     }
   };
   const handleAddNew = () => {
-    const createUrl = `${basePath}/cms/${relation.sourceType}/new?prefill_${relation.fieldName}=${itemId}`;
+    const createUrl = joinBasePath(
+      basePath,
+      `/cms/${relation.sourceType}/new?prefill_${relation.fieldName}=${itemId}`
+    );
     void navigate?.(createUrl);
   };
   const LinkComponent = Link ?? "a";
@@ -141,7 +146,10 @@ function InverseRelationSection({
         relation.sourceTypeName.toLowerCase()
       ) }) : /* @__PURE__ */ jsx("ul", { className: "space-y-2", children: items.map((item) => {
         const displayValue = getDisplayValue(item);
-        const editUrl = `${basePath}/cms/${relation.sourceType}/${item.id}`;
+        const editUrl = joinBasePath(
+          basePath,
+          `/cms/${relation.sourceType}/${item.id}`
+        );
         return /* @__PURE__ */ jsxs(
           "li",
           {
@@ -159,11 +167,13 @@ function InverseRelationSection({
                 }
               ),
               /* @__PURE__ */ jsx(
-                CanAccess,
+                PermissionAccess,
                 {
-                  resource: "cms:content",
-                  action: "delete",
-                  params: { typeSlug: relation.sourceType, id: item.id },
+                  permission: cmsPermissions.record.delete({
+                    contentType: item.contentType?.slug ?? relation.sourceType,
+                    recordId: item.id,
+                    ...item.authorId ? { authorId: item.authorId } : {}
+                  }),
                   children: /* @__PURE__ */ jsx(
                     Button,
                     {
@@ -182,11 +192,11 @@ function InverseRelationSection({
         );
       }) }),
       /* @__PURE__ */ jsx("div", { className: "mt-3 pt-3 border-t", children: /* @__PURE__ */ jsx(
-        CanAccess,
+        PermissionAccess,
         {
-          resource: "cms:content",
-          action: "create",
-          params: { typeSlug: relation.sourceType },
+          permission: cmsPermissions.record.create({
+            contentType: relation.sourceType
+          }),
           children: /* @__PURE__ */ jsxs(
             Button,
             {

package/dist/packages/stack/src/plugins/cms/client/components/pages/404-page.cjs

@@ -4,12 +4,13 @@
 const jsxRuntime = require('react/jsx-runtime');
 const button = require('../../../../../../../ui/src/components/button.cjs');
 const context = require('@btst/stack/context');
+const constants = require('../../constants.cjs');
 
 function NotFoundPage() {
   const t = context.useTranslate();
-  const { localization } = context.usePluginOverrides("cms");
-  const { router } = context.useStack();
-  const basePath = context.useBasePath();
+  const { localization } = context.usePluginOverrides(constants.CMS_PLUGIN_ID);
+  const { router, plugins, basePath: stackBasePath } = context.useStack();
+  const basePath = plugins?.[constants.CMS_PLUGIN_ID]?.site.basePath ?? stackBasePath;
   const LinkComponent = router?.Link ?? "a";
   return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col items-center justify-center py-12 px-4 text-center", children: [
     /* @__PURE__ */ jsxRuntime.jsx("h1", { className: "text-6xl font-bold text-muted-foreground mb-4", children: "404" }),
@@ -18,7 +19,7 @@ function NotFoundPage() {
       "cms.common.404Description",
       "The page you're looking for doesn't exist or has been moved."
     ) }),
-    /* @__PURE__ */ jsxRuntime.jsx(button.Button, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(LinkComponent, { href: `${basePath}/cms`, children: localization?.CMS_404_BACK ?? t("cms.common.404Back", "Back to CMS") }) })
+    /* @__PURE__ */ jsxRuntime.jsx(button.Button, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(LinkComponent, { href: context.joinBasePath(basePath, "/cms"), children: localization?.CMS_404_BACK ?? t("cms.common.404Back", "Back to CMS") }) })
   ] });
 }
 

package/dist/packages/stack/src/plugins/cms/client/components/pages/404-page.mjs

@@ -1,13 +1,14 @@
 "use client";
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { Button } from '../../../../../../../ui/src/components/button.mjs';
-import { useTranslate, usePluginOverrides, useStack, useBasePath } from '@btst/stack/context';
+import { useTranslate, usePluginOverrides, useStack, joinBasePath } from '@btst/stack/context';
+import { CMS_PLUGIN_ID } from '../../constants.mjs';
 
 function NotFoundPage() {
   const t = useTranslate();
-  const { localization } = usePluginOverrides("cms");
-  const { router } = useStack();
-  const basePath = useBasePath();
+  const { localization } = usePluginOverrides(CMS_PLUGIN_ID);
+  const { router, plugins, basePath: stackBasePath } = useStack();
+  const basePath = plugins?.[CMS_PLUGIN_ID]?.site.basePath ?? stackBasePath;
   const LinkComponent = router?.Link ?? "a";
   return /* @__PURE__ */ jsxs("div", { className: "flex flex-col items-center justify-center py-12 px-4 text-center", children: [
     /* @__PURE__ */ jsx("h1", { className: "text-6xl font-bold text-muted-foreground mb-4", children: "404" }),
@@ -16,7 +17,7 @@ function NotFoundPage() {
       "cms.common.404Description",
       "The page you're looking for doesn't exist or has been moved."
     ) }),
-    /* @__PURE__ */ jsx(Button, { asChild: true, children: /* @__PURE__ */ jsx(LinkComponent, { href: `${basePath}/cms`, children: localization?.CMS_404_BACK ?? t("cms.common.404Back", "Back to CMS") }) })
+    /* @__PURE__ */ jsx(Button, { asChild: true, children: /* @__PURE__ */ jsx(LinkComponent, { href: joinBasePath(basePath, "/cms"), children: localization?.CMS_404_BACK ?? t("cms.common.404Back", "Back to CMS") }) })
   ] });
 }
 

package/dist/packages/stack/src/plugins/cms/client/components/pages/content-editor-page.cjs

@@ -4,10 +4,13 @@
 const jsxRuntime = require('react/jsx-runtime');
 const React = require('react');
 const context = require('@btst/stack/context');
+const constants = require('../../constants.cjs');
 const components = require('@btst/stack/client/components');
 const defaultError = require('../shared/default-error.cjs');
 const _404Page = require('./404-page.cjs');
+const plugins_cms_permissions = require('../../../../../../../../plugins/cms/permissions.cjs');
 const editorSkeleton = require('../loading/editor-skeleton.cjs');
+const cmsHooks = require('../../hooks/cms-hooks.cjs');
 
 const ContentEditorPageInternal = React.lazy(
   () => import('./content-editor-page.internal.cjs').then((m) => ({
@@ -18,22 +21,17 @@ function ContentEditorPageComponent({
   typeSlug,
   id
 }) {
-  const { onRouteError } = context.usePluginOverrides("cms");
+  const { onRouteError } = context.usePluginOverrides(constants.CMS_PLUGIN_ID);
   const isNew = !id;
   const path = isNew ? `/cms/${typeSlug}/new` : `/cms/${typeSlug}/${id}`;
   return /* @__PURE__ */ jsxRuntime.jsx(
     components.ComposedRoute,
     {
       path,
-      PageComponent: ContentEditorPageInternal,
+      PageComponent: AuthorizedContentEditorPage,
       ErrorComponent: defaultError.DefaultError,
       LoadingComponent: editorSkeleton.EditorSkeleton,
       NotFoundComponent: _404Page.NotFoundPage,
-      permission: isNew ? { resource: "cms:content", action: "create", params: { typeSlug } } : {
-        resource: "cms:content",
-        action: "update",
-        params: { typeSlug, id }
-      },
       props: { typeSlug, id },
       onError: (error) => {
         if (onRouteError) {
@@ -47,5 +45,40 @@ function ContentEditorPageComponent({
     }
   );
 }
+function AuthorizedContentEditorPage({
+  typeSlug,
+  id
+}) {
+  if (!id) {
+    return /* @__PURE__ */ jsxRuntime.jsx(
+      components.PermissionRouteAccess,
+      {
+        permission: plugins_cms_permissions.cmsPermissions.record.create({ contentType: typeSlug }),
+        LoadingComponent: editorSkeleton.EditorSkeleton,
+        children: /* @__PURE__ */ jsxRuntime.jsx(ContentEditorPageInternal, { typeSlug })
+      }
+    );
+  }
+  return /* @__PURE__ */ jsxRuntime.jsx(AuthorizedExistingContentEditorPage, { typeSlug, id });
+}
+function AuthorizedExistingContentEditorPage({
+  typeSlug,
+  id
+}) {
+  const { item } = cmsHooks.useSuspenseContentItem(typeSlug, id);
+  if (!item) return /* @__PURE__ */ jsxRuntime.jsx(ContentEditorPageInternal, { typeSlug, id });
+  return /* @__PURE__ */ jsxRuntime.jsx(
+    components.PermissionRouteAccess,
+    {
+      permission: plugins_cms_permissions.cmsPermissions.record.update({
+        contentType: item.contentType?.slug ?? typeSlug,
+        recordId: item.id,
+        ...item.authorId ? { authorId: item.authorId } : {}
+      }),
+      LoadingComponent: editorSkeleton.EditorSkeleton,
+      children: /* @__PURE__ */ jsxRuntime.jsx(ContentEditorPageInternal, { typeSlug, id })
+    }
+  );
+}
 
 exports.ContentEditorPageComponent = ContentEditorPageComponent;

package/dist/packages/stack/src/plugins/cms/client/components/pages/content-editor-page.internal.cjs

@@ -6,6 +6,8 @@ const React = require('react');
 const LucideIcons = require('lucide-react');
 const button = require('../../../../../../../ui/src/components/button.cjs');
 const context = require('@btst/stack/context');
+const overrides = require('../../overrides.cjs');
+const constants = require('../../constants.cjs');
 const contentForm = require('../forms/content-form.cjs');
 const inverseRelationsPanel = require('../inverse-relations-panel.cjs');
 const emptyState = require('../shared/empty-state.cjs');
@@ -63,11 +65,11 @@ function convertPrefillToFormData(prefillParams, jsonSchema) {
 }
 function ContentEditorPage({ typeSlug, id }) {
   const t = context.useTranslate();
-  const overrides = context.usePluginOverrides("cms");
-  const { localization } = overrides;
-  const { router } = context.useStack();
+  const overrides$1 = context.usePluginOverrides(constants.CMS_PLUGIN_ID);
+  const { localization } = overrides$1;
+  const { router, plugins, basePath: stackBasePath } = context.useStack();
   const navigate = router?.navigate;
-  const basePath = context.useBasePath();
+  const basePath = plugins?.[constants.CMS_PLUGIN_ID]?.site.basePath ?? stackBasePath;
   const prefillParams = usePrefillParams();
   useRouteLifecycle.useRouteLifecycle({
     routeName: "contentEditor",
@@ -76,9 +78,13 @@ function ContentEditorPage({ typeSlug, id }) {
       params: id ? { typeSlug, id } : { typeSlug },
       isSSR: typeof window === "undefined"
     },
-    overrides
+    overrides: overrides$1
   });
-  const { contentTypes } = cmsHooks.useSuspenseContentTypes();
+  const { contentTypes: serverContentTypes } = cmsHooks.useSuspenseContentTypes();
+  const contentTypes = overrides.orderCMSContentTypes(
+    serverContentTypes,
+    plugins?.[constants.CMS_PLUGIN_ID]?.config
+  );
   const contentType = contentTypes.find((ct) => ct.slug === typeSlug);
   const isEditing = !!id;
   const { item, isLoading: isLoadingItem } = cmsHooks.useContentItem(typeSlug, id ?? "");
@@ -97,7 +103,7 @@ function ContentEditorPage({ typeSlug, id }) {
       data: { slug: values.slug, data: values.data }
     }),
     onSuccess: () => {
-      void navigate?.(`${basePath}/cms/${typeSlug}`);
+      void navigate?.(context.joinBasePath(basePath, `/cms/${typeSlug}`));
     }
   });
   if (!contentType) {
@@ -133,7 +139,7 @@ function ContentEditorPage({ typeSlug, id }) {
         {
           variant: "ghost",
           size: "icon",
-          onClick: () => void navigate?.(`${basePath}/cms/${typeSlug}`),
+          onClick: () => void navigate?.(context.joinBasePath(basePath, `/cms/${typeSlug}`)),
           children: /* @__PURE__ */ jsxRuntime.jsx(LucideIcons.ArrowLeft, { className: "h-4 w-4" })
         }
       ),
@@ -150,7 +156,7 @@ function ContentEditorPage({ typeSlug, id }) {
         initialSlug: item?.slug,
         isEditing,
         onSubmit: handleSubmit,
-        onCancel: () => void navigate?.(`${basePath}/cms/${typeSlug}`),
+        onCancel: () => void navigate?.(context.joinBasePath(basePath, `/cms/${typeSlug}`)),
         fieldErrors: resourceForm.fieldErrors,
         errorMessage: hasFieldErrors ? void 0 : resourceForm.error?.message,
         isSubmitting: resourceForm.isSubmitting

package/dist/packages/stack/src/plugins/cms/client/components/pages/content-editor-page.internal.mjs

@@ -3,7 +3,9 @@ import { jsx, jsxs } from 'react/jsx-runtime';
 import { useState, useEffect } from 'react';
 import { ArrowLeft } from 'lucide-react';
 import { Button } from '../../../../../../../ui/src/components/button.mjs';
-import { useTranslate, usePluginOverrides, useStack, useBasePath } from '@btst/stack/context';
+import { useTranslate, usePluginOverrides, useStack, joinBasePath } from '@btst/stack/context';
+import { orderCMSContentTypes } from '../../overrides.mjs';
+import { CMS_PLUGIN_ID } from '../../constants.mjs';
 import { ContentForm } from '../forms/content-form.mjs';
 import { InverseRelationsPanel } from '../inverse-relations-panel.mjs';
 import { EmptyState } from '../shared/empty-state.mjs';
@@ -61,11 +63,11 @@ function convertPrefillToFormData(prefillParams, jsonSchema) {
 }
 function ContentEditorPage({ typeSlug, id }) {
   const t = useTranslate();
-  const overrides = usePluginOverrides("cms");
+  const overrides = usePluginOverrides(CMS_PLUGIN_ID);
   const { localization } = overrides;
-  const { router } = useStack();
+  const { router, plugins, basePath: stackBasePath } = useStack();
   const navigate = router?.navigate;
-  const basePath = useBasePath();
+  const basePath = plugins?.[CMS_PLUGIN_ID]?.site.basePath ?? stackBasePath;
   const prefillParams = usePrefillParams();
   useRouteLifecycle({
     routeName: "contentEditor",
@@ -76,7 +78,11 @@ function ContentEditorPage({ typeSlug, id }) {
     },
     overrides
   });
-  const { contentTypes } = useSuspenseContentTypes();
+  const { contentTypes: serverContentTypes } = useSuspenseContentTypes();
+  const contentTypes = orderCMSContentTypes(
+    serverContentTypes,
+    plugins?.[CMS_PLUGIN_ID]?.config
+  );
   const contentType = contentTypes.find((ct) => ct.slug === typeSlug);
   const isEditing = !!id;
   const { item, isLoading: isLoadingItem } = useContentItem(typeSlug, id ?? "");
@@ -95,7 +101,7 @@ function ContentEditorPage({ typeSlug, id }) {
       data: { slug: values.slug, data: values.data }
     }),
     onSuccess: () => {
-      void navigate?.(`${basePath}/cms/${typeSlug}`);
+      void navigate?.(joinBasePath(basePath, `/cms/${typeSlug}`));
     }
   });
   if (!contentType) {
@@ -131,7 +137,7 @@ function ContentEditorPage({ typeSlug, id }) {
         {
           variant: "ghost",
           size: "icon",
-          onClick: () => void navigate?.(`${basePath}/cms/${typeSlug}`),
+          onClick: () => void navigate?.(joinBasePath(basePath, `/cms/${typeSlug}`)),
           children: /* @__PURE__ */ jsx(ArrowLeft, { className: "h-4 w-4" })
         }
       ),
@@ -148,7 +154,7 @@ function ContentEditorPage({ typeSlug, id }) {
         initialSlug: item?.slug,
         isEditing,
         onSubmit: handleSubmit,
-        onCancel: () => void navigate?.(`${basePath}/cms/${typeSlug}`),
+        onCancel: () => void navigate?.(joinBasePath(basePath, `/cms/${typeSlug}`)),
         fieldErrors: resourceForm.fieldErrors,
         errorMessage: hasFieldErrors ? void 0 : resourceForm.error?.message,
         isSubmitting: resourceForm.isSubmitting

package/dist/packages/stack/src/plugins/cms/client/components/pages/content-editor-page.mjs

@@ -2,10 +2,13 @@
 import { jsx } from 'react/jsx-runtime';
 import { lazy } from 'react';
 import { usePluginOverrides } from '@btst/stack/context';
-import { ComposedRoute } from '@btst/stack/client/components';
+import { CMS_PLUGIN_ID } from '../../constants.mjs';
+import { ComposedRoute, PermissionRouteAccess } from '@btst/stack/client/components';
 import { DefaultError } from '../shared/default-error.mjs';
 import { NotFoundPage } from './404-page.mjs';
+import { cmsPermissions } from '../../../../../../../../plugins/cms/permissions.mjs';
 import { EditorSkeleton } from '../loading/editor-skeleton.mjs';
+import { useSuspenseContentItem } from '../../hooks/cms-hooks.mjs';
 
 const ContentEditorPageInternal = lazy(
   () => import('./content-editor-page.internal.mjs').then((m) => ({
@@ -16,22 +19,17 @@ function ContentEditorPageComponent({
   typeSlug,
   id
 }) {
-  const { onRouteError } = usePluginOverrides("cms");
+  const { onRouteError } = usePluginOverrides(CMS_PLUGIN_ID);
   const isNew = !id;
   const path = isNew ? `/cms/${typeSlug}/new` : `/cms/${typeSlug}/${id}`;
   return /* @__PURE__ */ jsx(
     ComposedRoute,
     {
       path,
-      PageComponent: ContentEditorPageInternal,
+      PageComponent: AuthorizedContentEditorPage,
       ErrorComponent: DefaultError,
       LoadingComponent: EditorSkeleton,
       NotFoundComponent: NotFoundPage,
-      permission: isNew ? { resource: "cms:content", action: "create", params: { typeSlug } } : {
-        resource: "cms:content",
-        action: "update",
-        params: { typeSlug, id }
-      },
       props: { typeSlug, id },
       onError: (error) => {
         if (onRouteError) {
@@ -45,5 +43,40 @@ function ContentEditorPageComponent({
     }
   );
 }
+function AuthorizedContentEditorPage({
+  typeSlug,
+  id
+}) {
+  if (!id) {
+    return /* @__PURE__ */ jsx(
+      PermissionRouteAccess,
+      {
+        permission: cmsPermissions.record.create({ contentType: typeSlug }),
+        LoadingComponent: EditorSkeleton,
+        children: /* @__PURE__ */ jsx(ContentEditorPageInternal, { typeSlug })
+      }
+    );
+  }
+  return /* @__PURE__ */ jsx(AuthorizedExistingContentEditorPage, { typeSlug, id });
+}
+function AuthorizedExistingContentEditorPage({
+  typeSlug,
+  id
+}) {
+  const { item } = useSuspenseContentItem(typeSlug, id);
+  if (!item) return /* @__PURE__ */ jsx(ContentEditorPageInternal, { typeSlug, id });
+  return /* @__PURE__ */ jsx(
+    PermissionRouteAccess,
+    {
+      permission: cmsPermissions.record.update({
+        contentType: item.contentType?.slug ?? typeSlug,
+        recordId: item.id,
+        ...item.authorId ? { authorId: item.authorId } : {}
+      }),
+      LoadingComponent: EditorSkeleton,
+      children: /* @__PURE__ */ jsx(ContentEditorPageInternal, { typeSlug, id })
+    }
+  );
+}
 
 export { ContentEditorPageComponent };

package/dist/packages/stack/src/plugins/cms/client/components/pages/content-list-page.cjs

@@ -4,9 +4,11 @@
 const jsxRuntime = require('react/jsx-runtime');
 const React = require('react');
 const context = require('@btst/stack/context');
+const constants = require('../../constants.cjs');
 const components = require('@btst/stack/client/components');
 const defaultError = require('../shared/default-error.cjs');
 const _404Page = require('./404-page.cjs');
+const plugins_cms_permissions = require('../../../../../../../../plugins/cms/permissions.cjs');
 const listSkeleton = require('../loading/list-skeleton.cjs');
 
 const ContentListPageInternal = React.lazy(
@@ -17,11 +19,15 @@ const ContentListPageInternal = React.lazy(
 function ContentListPageComponent({
   typeSlug
 }) {
-  const { onRouteError } = context.usePluginOverrides("cms");
+  const { onRouteError } = context.usePluginOverrides(constants.CMS_PLUGIN_ID);
   return /* @__PURE__ */ jsxRuntime.jsx(
     components.ComposedRoute,
     {
       path: `/cms/${typeSlug}`,
+      permission: plugins_cms_permissions.cmsPermissions.record.read({
+        contentType: typeSlug,
+        scope: "collection"
+      }),
       PageComponent: ContentListPageInternal,
       ErrorComponent: defaultError.DefaultError,
       LoadingComponent: listSkeleton.ListSkeleton,