@actuate-media/cms-admin 0.79.0 → 0.80.0

package/src/__tests__/lib/post-editor-service.test.ts

@@ -15,6 +15,7 @@ const {
   fetchTemplateForEditor,
   missingPostFields,
   savePostDraft,
+  parseFeaturedImage,
 } = await import('../../lib/post-editor-service.js')
 
 type EditorPostT = Awaited<ReturnType<typeof emptyPostFromTemplate>>
@@ -459,4 +460,49 @@ describe('tags round-trip', () => {
     const post = await fetchPostForEditor('blog', 'p1')
     expect(post.tags).toEqual(['AI', 'Nextjs'])
   })
+
+  it('parseFeaturedImage / fetchPostForEditor keep denormalized media objects (#671)', async () => {
+    const mediaId = 'cmry1z9yr000004l832th7bf2'
+    expect(
+      parseFeaturedImage({
+        id: mediaId,
+        url: 'https://cdn.example.com/hero.webp',
+        alt: 'Hero',
+      }),
+    ).toBe(mediaId)
+    expect(parseFeaturedImage('https://cdn.example.com/hero.webp')).toBe(
+      'https://cdn.example.com/hero.webp',
+    )
+    expect(parseFeaturedImage({ url: 'https://cdn.example.com/hero.webp' })).toBe(
+      'https://cdn.example.com/hero.webp',
+    )
+
+    cmsApiMock.mockResolvedValueOnce({
+      data: {
+        id: 'p1',
+        title: 'Hello',
+        slug: 'hello',
+        status: 'DRAFT',
+        data: {
+          featuredImage: {
+            id: mediaId,
+            url: 'https://cdn.example.com/hero.webp',
+            alt: 'Hero',
+          },
+        },
+      },
+    })
+    const post = await fetchPostForEditor('blog', 'p1')
+    expect(post.featuredImage).toBe(mediaId)
+
+    cmsApiMock.mockResolvedValueOnce({
+      data: { id: 'p1', title: 'Hello', slug: 'hello', status: 'DRAFT', data: {} },
+    })
+    await savePostDraft(basePost({ id: 'p1', featuredImage: mediaId }))
+    const body = JSON.parse(cmsApiMock.mock.calls[1]![1].body as string) as {
+      featuredImage: string
+    }
+    expect(body.featuredImage).toBe(mediaId)
+    expect(body.featuredImage).not.toBe('')
+  })
 })

package/src/components/Breadcrumbs.tsx

@@ -17,6 +17,8 @@ const LABEL_MAP: Record<string, string> = {
   profile: 'Your Profile',
   collections: 'Collections',
   submissions: 'Submissions',
+  entries: 'All Entries',
+  deliveries: 'Deliveries',
   new: 'New',
   edit: 'Edit',
 }

package/src/components/SEOPanel.tsx

@@ -27,6 +27,12 @@ import { Toggle } from './ui/Toggle.js'
 export interface SEOData {
   metaTitle?: string
   metaDescription?: string
+  /** Canonical stored key (API / audit / SeoEditorPane). */
+  focusKeyword?: string
+  /**
+   * @deprecated Legacy DocumentEdit alias — normalized to `focusKeyword` on save.
+   * Still accepted on load for older documents.
+   */
   focusKeyphrase?: string
   keyTakeaway?: string
   canonical?: string
@@ -48,6 +54,12 @@ export interface SEOData {
   schemaType?: string
 }
 
+/** Resolve focus keyphrase from either the canonical or legacy field name. */
+export function resolveFocusKeyword(seo: Pick<SEOData, 'focusKeyword' | 'focusKeyphrase'>): string {
+  const v = seo.focusKeyword ?? seo.focusKeyphrase
+  return typeof v === 'string' ? v : ''
+}
+
 export interface SEOPanelProps {
   title: string
   slug: string
@@ -176,7 +188,7 @@ function runSEOChecks(seoData: SEOData, title: string, slug: string, content: st
   const checks: SEOCheck[] = []
   const plainText = stripHtml(content)
   const wordCount = countWords(plainText)
-  const keyphrase = (seoData.focusKeyphrase ?? '').toLowerCase().trim()
+  const keyphrase = resolveFocusKeyword(seoData).toLowerCase().trim()
   const metaTitle = seoData.metaTitle ?? ''
   const metaDesc = seoData.metaDescription ?? ''
 
@@ -741,8 +753,8 @@ export function SEOPanel({
             />
             <InputField
               label="Focus Keyphrase"
-              value={seoData.focusKeyphrase ?? ''}
-              onChange={(v) => update({ focusKeyphrase: v })}
+              value={resolveFocusKeyword(seoData)}
+              onChange={(v) => update({ focusKeyword: v, focusKeyphrase: undefined })}
               placeholder="Primary keyword or phrase"
             />
             <TextareaField

package/src/index.ts

@@ -59,6 +59,8 @@ export { Forms } from './views/Forms.js'
 export { FormEditor } from './views/FormEditor.js'
 export type { FormEditorProps } from './views/FormEditor.js'
 export { FormSubmissions } from './views/FormSubmissions.js'
+export { FormDeliveries } from './views/FormDeliveries.js'
+export type { FormDeliveriesProps } from './views/FormDeliveries.js'
 /** @deprecated Superseded by the Redirects tab inside the `SEO` view; will be removed in the next major. */
 export { Redirects } from './views/Redirects.js'
 export { Users } from './views/Users.js'
@@ -97,7 +99,7 @@ export type {
   SmartFolder,
 } from './components/FolderTree.js'
 export { TipTapEditor } from './components/TipTapEditor.js'
-export { SEOPanel } from './components/SEOPanel.js'
+export { SEOPanel, resolveFocusKeyword } from './components/SEOPanel.js'
 export type { SEOData, SEOPanelProps } from './components/SEOPanel.js'
 export { LivePreview } from './components/LivePreview.js'
 export { VersionHistory } from './components/VersionHistory.js'

package/src/layout/Sidebar.tsx

@@ -16,6 +16,7 @@ import {
   ChevronDown,
   ClipboardList,
   Inbox,
+  AlertTriangle,
   Search as SearchIcon,
   Briefcase,
   FolderOpen,
@@ -355,6 +356,7 @@ function applyFormsNav(items: NavItem[], state: FormsSidebarState): NavItem[] {
     if (item.path !== '/forms') return item
     const children: NavItem[] = [
       { path: '/forms/entries', label: 'All Entries', icon: Inbox },
+      { path: '/forms/deliveries', label: 'Deliveries', icon: AlertTriangle },
       ...state.forms.map((f) => ({
         path: `/forms/${f.formId}/submissions`,
         label: f.name,

package/src/lib/forms-service.ts

@@ -493,3 +493,77 @@ export async function downloadEntriesExport(
   URL.revokeObjectURL(url)
   return {}
 }
+
+// ─── Delivery attempts (#675) ─────────────────────────────────────────────
+
+export type FormDeliveryChannel = 'email_notify' | 'email_autoresponder' | 'form_webhook'
+export type FormDeliveryStatus = 'pending' | 'retrying' | 'success' | 'failed' | 'skipped'
+
+export interface FormDeliveryAttempt {
+  id: string
+  submissionId: string
+  formId: string
+  channel: FormDeliveryChannel
+  destination: string
+  webhookId: string | null
+  status: FormDeliveryStatus
+  attempts: number
+  maxAttempts: number
+  lastAttemptAt: string | null
+  nextRetryAt: string | null
+  error: string | null
+  responseStatus: number | null
+  skippedReason: string | null
+  alertedAt: string | null
+  createdAt: string
+  updatedAt: string
+  entryNumber?: number | null
+  formName?: string | null
+}
+
+export interface FormDeliveriesPage {
+  docs: FormDeliveryAttempt[]
+  total: number
+  page: number
+  pageSize: number
+}
+
+export interface FetchFormDeliveriesParams {
+  formId?: string
+  submissionId?: string
+  status?: string
+  page?: number
+  pageSize?: number
+}
+
+export async function fetchFormDeliveries(
+  params: FetchFormDeliveriesParams = {},
+): Promise<FormDeliveriesPage> {
+  const qs = new URLSearchParams()
+  if (params.formId) qs.set('formId', params.formId)
+  if (params.submissionId) qs.set('submissionId', params.submissionId)
+  if (params.status) qs.set('status', params.status)
+  if (params.page) qs.set('page', String(params.page))
+  if (params.pageSize) qs.set('pageSize', String(params.pageSize))
+  const suffix = qs.toString() ? `?${qs.toString()}` : ''
+  const res = await cmsApi<FormDeliveriesPage>(`/forms/deliveries${suffix}`)
+  throwIfError(res)
+  return res.data ?? { docs: [], total: 0, page: 1, pageSize: 25 }
+}
+
+export async function retryFormDelivery(
+  attemptId: string,
+): Promise<{ data?: FormDeliveryAttempt; error?: string }> {
+  const res = await cmsApi<FormDeliveryAttempt>(
+    `/forms/deliveries/${encodeURIComponent(attemptId)}/retry`,
+    { method: 'POST' },
+  )
+  return { data: res.data, error: res.error }
+}
+
+export async function fetchFailedDeliveryCount(formId?: string): Promise<number> {
+  const qs = formId ? `?formId=${encodeURIComponent(formId)}` : ''
+  const res = await cmsApi<{ count: number }>(`/forms/deliveries/failed-count${qs}`)
+  throwIfError(res)
+  return res.data?.count ?? 0
+}

package/src/lib/pages-service.ts

@@ -528,9 +528,11 @@ export async function movePage(
   id: string,
   parentPageId: string | null,
 ): Promise<{ error?: string }> {
+  // Flat field map — nested `{ data: { parentPageId } }` is stripped by
+  // field-access (undeclared `data` key) and silently no-ops.
   const res = await cmsApi(`/collections/${PAGES_COLLECTION}/${encodeURIComponent(id)}`, {
     method: 'PUT',
-    body: JSON.stringify({ data: { parentPageId } }),
+    body: JSON.stringify({ parentPageId }),
   })
   return res.error ? { error: res.error } : {}
 }
@@ -573,7 +575,7 @@ export async function bulkChangePageTags(
       p.primaryTagId && next.has(p.primaryTagId) ? p.primaryTagId : (tags[0] ?? null)
     const res = await cmsApi(`/collections/${PAGES_COLLECTION}/${encodeURIComponent(p.id)}`, {
       method: 'PUT',
-      body: JSON.stringify({ data: { tags, primaryTag } }),
+      body: JSON.stringify({ tags, primaryTag }),
     })
     return !res.error
   })
@@ -607,12 +609,10 @@ export async function createPageTag(input: PageTagInput): Promise<{ error?: stri
       title: input.name,
       slug,
       status: 'PUBLISHED',
-      data: {
-        color: input.color ?? 'gray',
-        description: input.description ?? '',
-        sortOrder: input.sortOrder ?? 0,
-        active: input.active !== false,
-      },
+      color: input.color ?? 'gray',
+      description: input.description ?? '',
+      sortOrder: input.sortOrder ?? 0,
+      active: input.active !== false,
     }),
   })
   return res.error ? { error: res.error } : {}
@@ -622,12 +622,11 @@ export async function updatePageTag(
   tagDocId: string,
   input: Partial<PageTagInput>,
 ): Promise<{ error?: string }> {
-  const data: Record<string, unknown> = {}
-  if (input.color !== undefined) data.color = input.color
-  if (input.description !== undefined) data.description = input.description
-  if (input.sortOrder !== undefined) data.sortOrder = input.sortOrder
-  if (input.active !== undefined) data.active = input.active
-  const body: Record<string, unknown> = { data }
+  const body: Record<string, unknown> = {}
+  if (input.color !== undefined) body.color = input.color
+  if (input.description !== undefined) body.description = input.description
+  if (input.sortOrder !== undefined) body.sortOrder = input.sortOrder
+  if (input.active !== undefined) body.active = input.active
   if (input.name !== undefined) body.title = input.name
   const res = await cmsApi(`/collections/${PAGE_TAGS_COLLECTION}/${encodeURIComponent(tagDocId)}`, {
     method: 'PUT',
@@ -677,7 +676,7 @@ export async function mergePageTags(source: PageTag, target: PageTag): Promise<{
     const primaryTag = p.primaryTagId === source.slug ? target.slug : p.primaryTagId
     const put = await cmsApi(`/collections/${PAGES_COLLECTION}/${encodeURIComponent(p.id)}`, {
       method: 'PUT',
-      body: JSON.stringify({ data: { tags, primaryTag } }),
+      body: JSON.stringify({ tags, primaryTag }),
     })
     if (put.error) return { error: put.error }
   }

package/src/lib/post-editor-service.ts

@@ -202,6 +202,22 @@ function dataStr(data: Record<string, unknown>, key: string): string {
   return typeof v === 'string' ? v : ''
 }
 
+/**
+ * Media fields are stored denormalized as `{ id, url, alt, … }` after headless
+ * writes / admin picker. The editor state is a string (id or URL). Never coerce
+ * an object to `""` — that wiped featured images on the next save (#671).
+ */
+export function parseFeaturedImage(raw: unknown): string {
+  if (typeof raw === 'string') return raw.trim()
+  if (raw && typeof raw === 'object' && !Array.isArray(raw)) {
+    const obj = raw as Record<string, unknown>
+    if (typeof obj.id === 'string' && obj.id.trim()) return obj.id.trim()
+    const url = obj.url ?? obj.publicUrl ?? obj.src
+    if (typeof url === 'string' && url.trim()) return url.trim()
+  }
+  return ''
+}
+
 /**
  * Read stored tags into plain strings. The `tagsField` preset stores
  * `[{ tag: 'AI' }]` rows; older/hand-rolled configs may store `['AI']`
@@ -233,7 +249,7 @@ function rowToEditorPost(postType: string, doc: DocumentApiRow): EditorPost {
     title: dataTitle || (doc.title ?? ''),
     slug: doc.slug ?? dataStr(data, 'slug'),
     excerpt: dataStr(data, 'excerpt'),
-    featuredImage: dataStr(data, 'featuredImage'),
+    featuredImage: parseFeaturedImage(data.featuredImage),
     body: dataStr(data, 'body'),
     category: dataStr(data, 'category'),
     tags: parseTags(data.tags),

package/src/router/admin-routes.ts

@@ -31,6 +31,7 @@ export const ADMIN_STATIC_ROUTE_PATTERNS: readonly string[] = [
   '/forms/:id/edit',
   '/forms/:id/submissions',
   '/forms/entries',
+  '/forms/deliveries',
   '/forms/new',
   '/media',
   '/page-builder/:id',

package/src/views/DocumentEdit.tsx

@@ -109,7 +109,7 @@ export function DocumentEdit({
   const SEO_FIELDS: (keyof SEOData)[] = [
     'metaTitle',
     'metaDescription',
-    'focusKeyphrase',
+    'focusKeyword',
     'keyTakeaway',
     'canonical',
     'robotsPolicy',
@@ -148,6 +148,10 @@ export function DocumentEdit({
           ;(loadedSeo as any)[key] = docData[key]
         }
       }
+      // Legacy docs may only have `focusKeyphrase` — promote on load.
+      if (!loadedSeo.focusKeyword && typeof docData.focusKeyphrase === 'string') {
+        loadedSeo.focusKeyword = docData.focusKeyphrase
+      }
       setSeoData(loadedSeo)
       setInitialSeoData(loadedSeo)
 

package/src/views/FormDeliveries.tsx

@@ -0,0 +1,214 @@
+'use client'
+
+/**
+ * Failed / retrying form delivery attempts (#675).
+ * Operators can see silent notify/webhook failures and retry without
+ * re-submitting the lead.
+ */
+import { useCallback, useEffect, useState } from 'react'
+import { AlertTriangle, RefreshCw, RotateCcw } from 'lucide-react'
+import { toast } from 'sonner'
+import {
+  fetchFormDeliveries,
+  retryFormDelivery,
+  type FormDeliveryAttempt,
+} from '../lib/forms-service.js'
+import {
+  FormsEmptyState,
+  FormsErrorState,
+  FormsLoading,
+  FormsPagination,
+} from '../components/forms/primitives.js'
+
+export interface FormDeliveriesProps {
+  onNavigate?: (path: string) => void
+}
+
+const PAGE_SIZE = 25
+
+function channelLabel(channel: string): string {
+  switch (channel) {
+    case 'email_notify':
+      return 'Admin email'
+    case 'email_autoresponder':
+      return 'Autoresponder'
+    case 'form_webhook':
+      return 'Webhook'
+    default:
+      return channel
+  }
+}
+
+function statusClass(status: string): string {
+  switch (status) {
+    case 'failed':
+      return 'bg-destructive/10 text-destructive'
+    case 'retrying':
+      return 'bg-accent text-accent-foreground'
+    case 'success':
+      return 'bg-primary/10 text-primary'
+    default:
+      return 'bg-muted text-muted-foreground'
+  }
+}
+
+export function FormDeliveries({ onNavigate }: FormDeliveriesProps) {
+  const [docs, setDocs] = useState<FormDeliveryAttempt[]>([])
+  const [total, setTotal] = useState(0)
+  const [page, setPage] = useState(1)
+  const [loading, setLoading] = useState(true)
+  const [error, setError] = useState<string | null>(null)
+  const [retryingId, setRetryingId] = useState<string | null>(null)
+
+  const load = useCallback(async () => {
+    setLoading(true)
+    setError(null)
+    try {
+      const result = await fetchFormDeliveries({
+        status: 'failed,retrying',
+        page,
+        pageSize: PAGE_SIZE,
+      })
+      setDocs(result.docs)
+      setTotal(result.total)
+    } catch (err) {
+      setError(err instanceof Error ? err.message : 'Failed to load deliveries')
+    } finally {
+      setLoading(false)
+    }
+  }, [page])
+
+  useEffect(() => {
+    void load()
+  }, [load])
+
+  async function handleRetry(id: string) {
+    setRetryingId(id)
+    const res = await retryFormDelivery(id)
+    setRetryingId(null)
+    if (res.error) {
+      toast.error(res.error)
+      return
+    }
+    if (res.data?.status === 'success') {
+      toast.success('Delivery succeeded')
+    } else if (res.data?.status === 'retrying') {
+      toast.message('Delivery still failing — scheduled for another retry')
+    } else {
+      toast.error(res.data?.error ?? 'Delivery failed again')
+    }
+    void load()
+  }
+
+  return (
+    <div className="flex h-full flex-col gap-4 p-6">
+      <div className="flex items-start justify-between gap-4">
+        <div>
+          <h1 className="text-foreground text-2xl font-medium">Deliveries</h1>
+          <p className="text-muted-foreground text-sm">
+            Failed or retrying notification and webhook deliveries. Leads stay saved — retry here
+            without re-submitting the form.
+          </p>
+        </div>
+        <button
+          type="button"
+          onClick={() => void load()}
+          className="border-border bg-card text-foreground hover:bg-muted inline-flex h-10 items-center gap-2 rounded-md border px-3 text-sm font-medium"
+          aria-label="Refresh deliveries"
+        >
+          <RefreshCw size={16} />
+          Refresh
+        </button>
+      </div>
+
+      {loading ? (
+        <FormsLoading />
+      ) : error ? (
+        <FormsErrorState message={error} onRetry={() => void load()} />
+      ) : docs.length === 0 ? (
+        <FormsEmptyState
+          icon={<AlertTriangle size={24} />}
+          title="No failed deliveries"
+          description="When a notify email or webhook fails after a submission is saved, it will appear here."
+        />
+      ) : (
+        <>
+          <div className="border-border overflow-hidden rounded-lg border">
+            <table className="w-full text-left text-sm" aria-label="Failed form deliveries">
+              <thead className="bg-muted/50 border-border border-b">
+                <tr>
+                  <th className="text-muted-foreground px-4 py-3 font-medium">Form</th>
+                  <th className="text-muted-foreground px-4 py-3 font-medium">Entry</th>
+                  <th className="text-muted-foreground px-4 py-3 font-medium">Channel</th>
+                  <th className="text-muted-foreground px-4 py-3 font-medium">Destination</th>
+                  <th className="text-muted-foreground px-4 py-3 font-medium">Status</th>
+                  <th className="text-muted-foreground px-4 py-3 font-medium">Error</th>
+                  <th className="text-muted-foreground px-4 py-3 font-medium">Attempts</th>
+                  <th className="text-muted-foreground px-4 py-3 font-medium">
+                    <span className="sr-only">Actions</span>
+                  </th>
+                </tr>
+              </thead>
+              <tbody>
+                {docs.map((row) => (
+                  <tr key={row.id} className="border-border border-b last:border-b-0">
+                    <td className="text-foreground px-4 py-3">
+                      <button
+                        type="button"
+                        className="hover:text-primary font-medium"
+                        onClick={() => onNavigate?.(`/forms/${row.formId}/submissions`)}
+                      >
+                        {row.formName ?? row.formId}
+                      </button>
+                    </td>
+                    <td className="text-muted-foreground px-4 py-3">
+                      {row.entryNumber != null
+                        ? `#${String(row.entryNumber).padStart(5, '0')}`
+                        : '—'}
+                    </td>
+                    <td className="text-foreground px-4 py-3">{channelLabel(row.channel)}</td>
+                    <td
+                      className="text-muted-foreground max-w-[220px] truncate px-4 py-3"
+                      title={row.destination}
+                    >
+                      {row.destination}
+                    </td>
+                    <td className="px-4 py-3">
+                      <span
+                        className={`inline-flex rounded-md px-2 py-0.5 text-xs font-medium ${statusClass(row.status)}`}
+                      >
+                        {row.status}
+                      </span>
+                    </td>
+                    <td
+                      className="text-muted-foreground max-w-[240px] truncate px-4 py-3"
+                      title={row.error ?? row.skippedReason ?? undefined}
+                    >
+                      {row.error ?? row.skippedReason ?? '—'}
+                    </td>
+                    <td className="text-muted-foreground px-4 py-3">
+                      {row.attempts}/{row.maxAttempts}
+                    </td>
+                    <td className="px-4 py-3">
+                      <button
+                        type="button"
+                        disabled={retryingId === row.id}
+                        onClick={() => void handleRetry(row.id)}
+                        className="border-border bg-card text-foreground hover:bg-muted inline-flex h-9 items-center gap-1.5 rounded-md border px-2.5 text-sm font-medium disabled:opacity-50"
+                        aria-label={`Retry delivery to ${row.destination}`}
+                      >
+                        <RotateCcw size={14} />
+                        Retry
+                      </button>
+                    </td>
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          </div>
+          <FormsPagination page={page} pageSize={PAGE_SIZE} total={total} onPageChange={setPage} />
+        </>
+      )}
+    </div>
+  )
+}