@prenta/admin 1.3.2 → 1.5.1

package/src/layout/Sidebar.tsx

@@ -31,6 +31,7 @@ import {
   Menu as MenuIcon,
   PanelLeftClose,
   PanelLeftOpen,
+  Trash2,
 } from 'lucide-react'
 import type { LucideIcon } from 'lucide-react'
 import { PrentaBrandLogo } from '../assets/prenta-logo.js'
@@ -206,6 +207,7 @@ const defaultNavItems: NavItem[] = [
   { path: '/forms', label: 'Forms', icon: ClipboardList, group: 'Content' },
   { path: '/seo', label: 'SEO', icon: SearchIcon, group: 'Content' },
   { path: '/script-tags', label: 'Script Tags', icon: Code2, group: 'Content' },
+  { path: '/trash', label: 'Trash', icon: Trash2, group: 'Content' },
   { path: '/settings', label: 'Settings', icon: Settings, group: 'Settings' },
 ]
 
@@ -825,6 +827,7 @@ export function buildNavItems(config: any): NavItem[] {
     { path: '/forms', label: 'Forms', icon: ClipboardList, group: 'Content' },
     { path: '/seo', label: 'SEO', icon: SearchIcon, group: 'Content' },
     { path: '/script-tags', label: 'Script Tags', icon: Code2, group: 'Content' },
+    { path: '/trash', label: 'Trash', icon: Trash2, group: 'Content' },
   )
 
   // Plugin-contributed custom nav links (PluginDefinition.adminNavItems,

package/src/lib/open-public-site-tab.ts

@@ -1,4 +1,5 @@
 import { toast } from 'sonner'
+import type { TrailingSlashPolicy } from '@prenta/core/client'
 import { buildPublicPreviewUrl, buildPublicUrl, createPreviewToken } from './preview-link.js'
 import { NO_PUBLIC_SITE_URL_REASON, type ViewSiteIntent } from './view-site-chrome.js'
 
@@ -11,6 +12,7 @@ export async function openPublicSiteTab(opts: {
   path?: string | null
   urlPrefix?: string
   data?: Record<string, unknown> | null
+  trailingSlash?: TrailingSlashPolicy | null
   dirty: boolean
   saveDraft: () => Promise<boolean>
 }): Promise<void> {
@@ -23,6 +25,7 @@ export async function openPublicSiteTab(opts: {
     slug: opts.slug,
     path: opts.path,
     data: opts.data,
+    trailingSlash: opts.trailingSlash,
   }
 
   if (opts.intent === 'view-live') {

package/src/lib/preview-link.ts

@@ -1,4 +1,8 @@
-import { documentPublicPath } from '@prenta/core/client'
+import {
+  documentPublicPath,
+  resolveDocumentUrl,
+  type TrailingSlashPolicy,
+} from '@prenta/core/client'
 import { cmsApi } from './api.js'
 
 /**
@@ -40,6 +44,8 @@ export interface PublicUrlParts {
   path?: string | null
   /** Document `data` bag; `data.path` wins when `path` is omitted. */
   data?: Record<string, unknown> | null
+  /** Must match `seo.trailingSlash` so View live opens the adapter URL. */
+  trailingSlash?: TrailingSlashPolicy | null
 }
 
 export interface PublicPreviewUrlParts extends PublicUrlParts {
@@ -47,10 +53,12 @@ export interface PublicPreviewUrlParts extends PublicUrlParts {
   token: string
 }
 
-function absolutePublicUrl(siteUrl: string, path: string): string {
-  const base = (siteUrl ?? '').replace(/\/+$/, '')
-  if (path === '/') return base || '/'
-  return `${base}${path}`
+function absolutePublicUrl(
+  siteUrl: string,
+  path: string,
+  trailingSlash?: TrailingSlashPolicy | null,
+): string {
+  return resolveDocumentUrl({ siteUrl, path, trailingSlash })
 }
 
 /**
@@ -65,6 +73,7 @@ export function buildPublicPreviewUrl({
   token,
   path,
   data,
+  trailingSlash,
 }: PublicPreviewUrlParts): string {
   const publicPath = documentPublicPath({ urlPrefix, slug, path, data })
   // Home → `https://example.com/?preview=` (slash before query keeps relative
@@ -73,7 +82,7 @@ export function buildPublicPreviewUrl({
     const root = (siteUrl ?? '').replace(/\/+$/, '')
     return `${root || ''}/?preview=${encodeURIComponent(token)}`
   }
-  return `${absolutePublicUrl(siteUrl, publicPath)}?preview=${encodeURIComponent(token)}`
+  return `${absolutePublicUrl(siteUrl, publicPath, trailingSlash)}?preview=${encodeURIComponent(token)}`
 }
 
 /**
@@ -81,8 +90,15 @@ export function buildPublicPreviewUrl({
  * {@link buildPublicPreviewUrl} without a preview token. Home-style slugs and
  * `data.path` are handled by {@link documentPublicPath}.
  */
-export function buildPublicUrl({ siteUrl, urlPrefix, slug, path, data }: PublicUrlParts): string {
-  return absolutePublicUrl(siteUrl, documentPublicPath({ urlPrefix, slug, path, data }))
+export function buildPublicUrl({
+  siteUrl,
+  urlPrefix,
+  slug,
+  path,
+  data,
+  trailingSlash,
+}: PublicUrlParts): string {
+  return resolveDocumentUrl({ siteUrl, urlPrefix, slug, path, data, trailingSlash })
 }
 
 /**

package/src/router/admin-routes.ts

@@ -59,6 +59,7 @@ export const ADMIN_STATIC_ROUTE_PATTERNS: readonly string[] = [
   '/script-tags/:id',
   '/script-tags/new',
   '/settings',
+  '/trash',
   '/users',
   '/widgets',
 ]
@@ -76,6 +77,7 @@ export const RESERVED_COLLECTION_SLUGS: ReadonlySet<string> = new Set([
   'saved-sections',
   'page-templates',
   'widgets',
+  'trash',
   'users',
   'settings',
   'profile',

package/src/views/ApiKeys.tsx

@@ -285,7 +285,6 @@ interface CreateApiKeyDialogProps {
 function CreateApiKeyDialog({ open, onClose, onCreated }: CreateApiKeyDialogProps) {
   const [name, setName] = useState('')
   const [preset, setPreset] = useState<'admin' | 'content' | 'readonly' | 'custom'>('content')
-  const [pageBuilder, setPageBuilder] = useState(true)
   const [media, setMedia] = useState(true)
   const [expiresInDays, setExpiresInDays] = useState<string>('')
   const [password, setPassword] = useState('')
@@ -299,7 +298,6 @@ function CreateApiKeyDialog({ open, onClose, onCreated }: CreateApiKeyDialogProp
         actions: ['read'],
         globals: ['*'],
         media: false,
-        pageBuilder: false,
       }
     }
     if (preset === 'content') {
@@ -308,14 +306,12 @@ function CreateApiKeyDialog({ open, onClose, onCreated }: CreateApiKeyDialogProp
         actions: ['read', 'create', 'update'],
         globals: ['*'],
         media,
-        pageBuilder,
       }
     }
     return {
       collections: ['*'],
       actions: ['read'],
       media,
-      pageBuilder,
     }
   }
 
@@ -418,15 +414,6 @@ function CreateApiKeyDialog({ open, onClose, onCreated }: CreateApiKeyDialogProp
                   />
                   Allow media uploads
                 </label>
-                <label className="text-foreground flex items-center gap-2 text-sm">
-                  <input
-                    type="checkbox"
-                    checked={pageBuilder}
-                    onChange={(e) => setPageBuilder(e.target.checked)}
-                    className="accent-brand h-4 w-4"
-                  />
-                  Allow AI page generation
-                </label>
               </div>
             )}
 

package/src/views/SEO.tsx

@@ -241,11 +241,6 @@ export function SEO({ onNavigate, initialTab = 'overview' }: SEOProps) {
                 <OverviewTab
                   resource={overviewResource}
                   onOpenIssue={(issueId) => onNavigate?.(`/seo?tab=audit&issueId=${issueId}`)}
-                  onConnectSearchConsole={() =>
-                    toast.info(
-                      'Google Search Console integration is coming soon. Demo performance data is available in local development.',
-                    )
-                  }
                 />
               )}
             </Tabs.Content>

package/src/views/Trash.tsx

@@ -0,0 +1,207 @@
+'use client'
+
+import { useCallback, useEffect, useMemo, useState } from 'react'
+import { Loader2, RotateCcw, Trash2 } from 'lucide-react'
+import { toast } from 'sonner'
+import { cmsApi } from '../lib/api.js'
+import { EmptyState } from '../components/ui/EmptyState.js'
+
+export interface TrashProps {
+  onNavigate: (path: string) => void
+  config?: {
+    collections?:
+      | Record<string, { slug?: string; admin?: { hidden?: boolean } } | undefined>
+      | Array<{ slug?: string; admin?: { hidden?: boolean } }>
+  }
+}
+
+interface TrashRow {
+  id: string
+  collection: string
+  title: string
+  slug: string | null
+  deletedAt: string | null
+  updatedAt: string | null
+}
+
+interface ListEnvelope {
+  docs?: Array<Record<string, unknown>>
+}
+
+function editorPath(collection: string, id: string): string {
+  if (collection === 'pages') return `/pages/${id}`
+  if (collection === 'posts') return `/posts/posts/${id}/edit`
+  return `/collections/${collection}/${id}`
+}
+
+function formatWhen(value: string | null): string {
+  if (!value) return '—'
+  const date = new Date(value)
+  if (Number.isNaN(date.getTime())) return '—'
+  return date.toLocaleString(undefined, {
+    month: 'short',
+    day: 'numeric',
+    year: 'numeric',
+    hour: 'numeric',
+    minute: '2-digit',
+  })
+}
+
+function asRow(collection: string, doc: Record<string, unknown>): TrashRow {
+  const data = doc.data && typeof doc.data === 'object' ? (doc.data as Record<string, unknown>) : {}
+  const title =
+    (typeof doc.title === 'string' && doc.title) ||
+    (typeof data.title === 'string' && data.title) ||
+    'Untitled'
+  const slug =
+    (typeof doc.slug === 'string' && doc.slug) ||
+    (typeof data.slug === 'string' && data.slug) ||
+    null
+  return {
+    id: String(doc.id ?? ''),
+    collection,
+    title,
+    slug,
+    deletedAt: typeof doc.deletedAt === 'string' ? doc.deletedAt : null,
+    updatedAt: typeof doc.updatedAt === 'string' ? doc.updatedAt : null,
+  }
+}
+
+export function Trash({ onNavigate, config }: TrashProps) {
+  const collections = useMemo(() => {
+    const raw = config?.collections
+    const list = Array.isArray(raw) ? raw : Object.values(raw ?? {})
+    const fromConfig = list
+      .filter((c): c is { slug: string; admin?: { hidden?: boolean } } => {
+        if (!c?.slug) return false
+        return !c.admin?.hidden
+      })
+      .map((c) => c.slug)
+    return [...new Set(['pages', 'posts', ...fromConfig])]
+  }, [config])
+
+  const [rows, setRows] = useState<TrashRow[]>([])
+  const [loading, setLoading] = useState(true)
+  const [error, setError] = useState<string | null>(null)
+  const [restoringId, setRestoringId] = useState<string | null>(null)
+
+  const load = useCallback(async () => {
+    setLoading(true)
+    setError(null)
+    const results = await Promise.all(
+      collections.map(async (slug) => {
+        const res = await cmsApi<ListEnvelope>(
+          `/collections/${encodeURIComponent(slug)}?includeDeleted=true&pageSize=50&sort=updatedAt&order=desc`,
+        )
+        if (res.error) return [] as TrashRow[]
+        return (res.data?.docs ?? []).map((doc) => asRow(slug, doc))
+      }),
+    )
+    const merged = results.flat().filter((row) => row.id)
+    merged.sort((a, b) => {
+      const aTime = a.deletedAt ?? a.updatedAt ?? ''
+      const bTime = b.deletedAt ?? b.updatedAt ?? ''
+      return bTime.localeCompare(aTime)
+    })
+    setRows(merged)
+    setLoading(false)
+  }, [collections])
+
+  useEffect(() => {
+    void load()
+  }, [load])
+
+  async function handleRestore(row: TrashRow) {
+    setRestoringId(row.id)
+    const res = await cmsApi<{
+      document?: { id?: string }
+      slugConflict?: boolean
+      previousSlug?: string | null
+    }>(`/collections/${encodeURIComponent(row.collection)}/${encodeURIComponent(row.id)}/restore`, {
+      method: 'POST',
+    })
+    setRestoringId(null)
+    if (res.error) {
+      toast.error(res.error)
+      return
+    }
+    if (res.data?.slugConflict) {
+      toast.success(
+        `Restored "${row.title}". The slug "${res.data.previousSlug ?? row.slug}" is in use — set a new URL before publishing.`,
+      )
+    } else {
+      toast.success(`Restored "${row.title}"`)
+    }
+    onNavigate(editorPath(row.collection, row.id))
+  }
+
+  return (
+    <div className="p-4 pr-8">
+      <div className="mb-4">
+        <h1 className="text-foreground mb-1">Trash</h1>
+        <p className="text-muted-foreground text-sm">
+          Soft-deleted pages and posts stay here for 30 days, then are permanently removed.
+        </p>
+      </div>
+
+      {loading ? (
+        <div className="text-muted-foreground flex items-center gap-2 py-12 text-sm">
+          <Loader2 className="h-4 w-4 animate-spin" aria-hidden />
+          Loading trash…
+        </div>
+      ) : error ? (
+        <p className="text-destructive text-sm">{error}</p>
+      ) : rows.length === 0 ? (
+        <EmptyState
+          icon={<Trash2 size={24} />}
+          title="Trash is empty"
+          description="Deleted pages and posts will appear here so you can restore them."
+        />
+      ) : (
+        <div className="border-border overflow-x-auto rounded-lg border">
+          <table className="w-full min-w-[640px] text-sm" aria-label="Deleted documents">
+            <thead>
+              <tr className="text-muted-foreground border-border border-b text-left">
+                <th className="px-4 py-2.5 font-medium">Title</th>
+                <th className="px-4 py-2.5 font-medium">Collection</th>
+                <th className="px-4 py-2.5 font-medium">Slug</th>
+                <th className="px-4 py-2.5 font-medium">Deleted</th>
+                <th className="px-4 py-2.5 text-right font-medium">
+                  <span className="sr-only">Actions</span>
+                </th>
+              </tr>
+            </thead>
+            <tbody className="divide-border divide-y">
+              {rows.map((row) => (
+                <tr key={`${row.collection}:${row.id}`}>
+                  <td className="text-foreground px-4 py-2.5 font-medium">{row.title}</td>
+                  <td className="text-muted-foreground px-4 py-2.5">{row.collection}</td>
+                  <td className="text-muted-foreground px-4 py-2.5">{row.slug ?? '—'}</td>
+                  <td className="text-muted-foreground px-4 py-2.5">
+                    {formatWhen(row.deletedAt ?? row.updatedAt)}
+                  </td>
+                  <td className="px-4 py-2.5 text-right">
+                    <button
+                      type="button"
+                      className="text-foreground hover:bg-accent focus-visible:ring-ring inline-flex min-h-11 items-center gap-1.5 rounded-md px-3 py-2 text-sm font-medium focus-visible:ring-2 focus-visible:outline-none disabled:opacity-50"
+                      onClick={() => void handleRestore(row)}
+                      disabled={restoringId === row.id}
+                      aria-label={`Restore ${row.title}`}
+                    >
+                      {restoringId === row.id ? (
+                        <Loader2 className="h-4 w-4 animate-spin" aria-hidden />
+                      ) : (
+                        <RotateCcw className="h-4 w-4" aria-hidden />
+                      )}
+                      Restore
+                    </button>
+                  </td>
+                </tr>
+              ))}
+            </tbody>
+          </table>
+        </div>
+      )}
+    </div>
+  )
+}

package/src/views/page-editor/PageSectionEditor.tsx

@@ -218,7 +218,11 @@ export function PageSectionEditor({
 
   const { canEdit, canPublish, canCreateRedirect } = useMemo(() => deriveCan(session), [session])
   const customRenderers = useAdminSectionRenderers()
-  const { siteUrl: publicSiteUrl, matchesAdminOrigin } = usePublicSiteUrl(config?.seo?.siteUrl)
+  const {
+    siteUrl: publicSiteUrl,
+    trailingSlash,
+    matchesAdminOrigin,
+  } = usePublicSiteUrl(config?.seo?.siteUrl)
 
   // A misconfigured `pages` collection (missing the fields the editor
   // writes) would silently drop content on save — detect it up front.
@@ -748,13 +752,14 @@ export function PageSectionEditor({
         documentId: page.id,
         slug: page.slug,
         path: page.path,
+        trailingSlash,
         dirty,
         saveDraft: handleSaveDraft,
       }).catch((err) => {
         toast.error(err instanceof Error ? err.message : 'Failed to open the site')
       })
     },
-    [page, dirty, handleSaveDraft, publicSiteUrl],
+    [page, dirty, handleSaveDraft, publicSiteUrl, trailingSlash],
   )
 
   const handleShare = useCallback(async () => {

package/src/views/post-editor/PostSectionEditor.tsx

@@ -182,7 +182,11 @@ export function PostSectionEditor({
 
   const { canEdit, canPublish } = useMemo(() => deriveCan(session), [session])
   const customRenderers = useAdminSectionRenderers()
-  const { siteUrl: publicSiteUrl, matchesAdminOrigin } = usePublicSiteUrl(config?.seo?.siteUrl)
+  const {
+    siteUrl: publicSiteUrl,
+    trailingSlash,
+    matchesAdminOrigin,
+  } = usePublicSiteUrl(config?.seo?.siteUrl)
 
   const typeLabel = useMemo(() => {
     const col = config?.collections?.[postType]
@@ -610,13 +614,14 @@ export function PostSectionEditor({
         slug: post.slug,
         urlPrefix,
         data: { path: (post as { path?: string }).path },
+        trailingSlash,
         dirty,
         saveDraft: handleSaveDraft,
       }).catch((err) => {
         toast.error(err instanceof Error ? err.message : 'Failed to open the site')
       })
     },
-    [post, postType, urlPrefix, dirty, handleSaveDraft, publicSiteUrl],
+    [post, postType, urlPrefix, dirty, handleSaveDraft, publicSiteUrl, trailingSlash],
   )
 
   const handleShare = useCallback(async () => {

package/src/views/seo/OverviewTab.tsx

@@ -19,7 +19,6 @@ import {
   SeoEmptyState,
   SeoErrorState,
   gradeMeta,
-  btnSecondary,
 } from '../../components/seo/primitives.js'
 import type { SeoResource } from './useSeoResource.js'
 
@@ -36,11 +35,9 @@ function impactTone(impact: QuickWin['impact']): 'good' | 'fair' | 'poor' {
 export function OverviewTab({
   resource,
   onOpenIssue,
-  onConnectSearchConsole,
 }: {
   resource: SeoResource<SeoOverview>
   onOpenIssue?: (issueId: string) => void
-  onConnectSearchConsole?: () => void
 }) {
   const { data, loading, error, refetch } = resource
 
@@ -203,14 +200,7 @@ export function OverviewTab({
           <SeoEmptyState
             icon={<BarChart3 size={24} />}
             title="Search Console not connected"
-            description="Connect Google Search Console to see real impressions, clicks, CTR, and average position."
-            action={
-              onConnectSearchConsole ? (
-                <button className={btnSecondary} onClick={onConnectSearchConsole}>
-                  Connect Search Console
-                </button>
-              ) : undefined
-            }
+            description="Add a Google Search Console verification token in Settings → SEO. Performance charts will appear here when the Search Analytics API is wired."
           />
         ) : searchPerformance.length === 0 ? (
           <SeoEmptyState title="No search performance data" />

package/src/views/settings/SiteInformationCard.tsx

@@ -33,6 +33,7 @@ export function SiteInformationCard({
   const taglineId = useId()
   const urlId = useId()
   const urlErrId = useId()
+  const slashId = useId()
 
   const titleIssue = issues.find((i) => i.field === 'siteTitle')
   const urlIssue = issues.find((i) => i.field === 'siteUrl')
@@ -121,6 +122,28 @@ export function SiteInformationCard({
             this URL.
           </p>
         </div>
+
+        <div>
+          <label htmlFor={slashId} className={LABEL_CLASS}>
+            Trailing slashes
+          </label>
+          <select
+            id={slashId}
+            value={form.trailingSlash}
+            disabled={!canEdit}
+            onChange={(e) =>
+              setField('trailingSlash', e.target.value === 'always' ? 'always' : 'never')
+            }
+            className={INPUT_CLASS}
+          >
+            <option value="never">Never — /about (Next.js default)</option>
+            <option value="always">Always — /about/ (Astro trailingSlash: always)</option>
+          </select>
+          <p className="text-muted-foreground mt-1 text-sm">
+            Must match the public adapter. Drives sitemap, canonical / OG URLs, href rewrite on
+            save, and link-health.
+          </p>
+        </div>
       </div>
     </SettingsCard>
   )

package/src/views/settings/useGeneralSettings.ts

@@ -8,6 +8,7 @@ export interface GeneralSettingsForm {
   siteTitle: string
   tagline: string
   siteUrl: string
+  trailingSlash: 'always' | 'never'
   language: string
   timezone: string
   defaultNoIndex: boolean
@@ -59,6 +60,7 @@ const EMPTY_FORM: GeneralSettingsForm = {
   siteTitle: '',
   tagline: '',
   siteUrl: '',
+  trailingSlash: 'never',
   language: 'en',
   timezone: 'UTC',
   defaultNoIndex: false,
@@ -212,6 +214,7 @@ export function useGeneralSettings(canEdit: boolean): UseGeneralSettings {
           siteTitle: String(settingsData.siteTitle ?? ''),
           tagline: String(settingsData.tagline ?? ''),
           siteUrl: String(effectiveSite.siteUrl ?? settingsData.siteUrl ?? ''),
+          trailingSlash: effectiveSite.trailingSlash === 'always' ? 'always' : 'never',
           language: String(settingsData.language ?? 'en'),
           timezone: String(settingsData.timezone ?? 'UTC'),
           defaultNoIndex: robots.defaultNoIndex === true,
@@ -302,6 +305,7 @@ export function useGeneralSettings(canEdit: boolean): UseGeneralSettings {
       form.language !== baseline.language ||
       form.timezone !== baseline.timezone
     const siteUrlChanged = siteUrlEditable && form.siteUrl !== baseline.siteUrl
+    const trailingSlashChanged = form.trailingSlash !== baseline.trailingSlash
     const robotsChanged =
       form.defaultNoIndex !== baseline.defaultNoIndex ||
       form.defaultNoFollow !== baseline.defaultNoFollow ||
@@ -336,9 +340,10 @@ export function useGeneralSettings(canEdit: boolean): UseGeneralSettings {
 
       // 2. Site URL + robots defaults → the SHARED SEO config (merge over the
       //    current override site so SEO-tab fields aren't lost).
-      if (siteUrlChanged || robotsChanged) {
+      if (siteUrlChanged || trailingSlashChanged || robotsChanged) {
         const nextSite: Record<string, any> = { ...overrideSite }
         if (siteUrlChanged) nextSite.siteUrl = form.siteUrl.trim() || undefined
+        if (trailingSlashChanged) nextSite.trailingSlash = form.trailingSlash
         if (robotsChanged) {
           nextSite.robots = {
             ...(overrideSite.robots ?? {}),