@prenta/admin 1.4.0 → 1.6.0

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

@@ -22,16 +22,17 @@ import {
   emptyPage,
   fetchPageForEditor,
   missingPageFields,
-  publishPage,
   PAGES_COLLECTION,
   savePageDraft,
   toggleSectionVisibility,
+  transitionPageWorkflow,
   updateSectionContent,
   updateSectionMeta,
   validatePage,
   type EditorPage,
   type ValidationResult,
 } from '../../lib/page-editor-service.js'
+import { resolveWorkflowChrome, type WorkflowStage } from '../../lib/workflow-chrome.js'
 import { SharePreviewLinkDialog } from '../../components/SharePreviewLinkDialog.js'
 import { openPublicSiteTab } from '../../lib/open-public-site-tab.js'
 import type { ViewSiteIntent } from '../../lib/view-site-chrome.js'
@@ -210,13 +211,13 @@ export function PageSectionEditor({
   /** Index into `versions`; 0 is the newest, which is the current content. */
   const [versionIndex, setVersionIndex] = useState(0)
   const [restoring, setRestoring] = useState(false)
-  const [confirmPublish, setConfirmPublish] = useState(false)
   const [scheduleOpen, setScheduleOpen] = useState(false)
   const [shareOpen, setShareOpen] = useState(false)
   const [leaveTarget, setLeaveTarget] = useState<string | null>(null)
   const [validation, setValidation] = useState<ValidationResult | null>(null)
 
-  const { canEdit, canPublish, canCreateRedirect } = useMemo(() => deriveCan(session), [session])
+  const { canEdit, canCreateRedirect } = useMemo(() => deriveCan(session), [session])
+  const sessionRole = String(session?.user?.role ?? '')
   const customRenderers = useAdminSectionRenderers()
   const {
     siteUrl: publicSiteUrl,
@@ -535,43 +536,115 @@ export function PageSectionEditor({
     [directives, reloadAudit],
   )
 
-  const handleSaveDraft = useCallback(async (): Promise<boolean> => {
-    if (!page) return false
-    const result = validatePage(page, false)
-    if (result.errors.length > 0) {
-      setValidation(result)
-      toast.error(result.errors[0]!)
-      setSettingsOpen(true)
-      return false
-    }
-    setSaveState('saving')
-    try {
-      const saved = await savePageDraft(page)
-      if (saved.id) await saveDirectives(saved.id)
-      acceptPage(saved)
-      setDirty(false)
-      setSaveState('saved')
-      setValidation(null)
-      toast.success('Draft saved')
-      if (!documentId && saved.id) onNavigate(`/pages/${saved.id}/edit`)
-      return true
-    } catch (err) {
-      setSaveState('error')
-      toast.error(err instanceof Error ? err.message : 'Failed to save draft')
-      return false
-    }
-  }, [page, documentId, onNavigate, saveDirectives, acceptPage])
+  const handleSaveDraft = useCallback(
+    async (options?: { navigate?: boolean }): Promise<EditorPage | false> => {
+      if (!page) return false
+      const result = validatePage(page, false)
+      if (result.errors.length > 0) {
+        setValidation(result)
+        toast.error(result.errors[0]!)
+        setSettingsOpen(true)
+        return false
+      }
+      setSaveState('saving')
+      try {
+        const saved = await savePageDraft(page)
+        if (saved.id) await saveDirectives(saved.id)
+        acceptPage(saved)
+        setDirty(false)
+        setSaveState('saved')
+        setValidation(null)
+        toast.success('Draft saved')
+        if ((options?.navigate ?? true) && !documentId && saved.id) {
+          onNavigate(`/pages/${saved.id}/edit`)
+        }
+        return saved
+      } catch (err) {
+        setSaveState('error')
+        toast.error(err instanceof Error ? err.message : 'Failed to save draft')
+        return false
+      }
+    },
+    [page, documentId, onNavigate, saveDirectives, acceptPage],
+  )
+
+  const runWorkflow = useCallback(
+    async (stage: WorkflowStage, note?: string, toastOk?: string) => {
+      if (!page) return
+      let current = page
+      if (dirty || !current.id) {
+        const saved = await handleSaveDraft({ navigate: false })
+        if (!saved) return
+        current = saved
+      }
+      setPublishing(true)
+      try {
+        // The move has to be read BEFORE the transition — `acceptPage` moves
+        // the published path to the new one, after which there is nothing to
+        // detect. Same block as the old `doPublish`.
+        const move =
+          stage === 'PUBLISHED' && redirectOnPublish && canCreateRedirect
+            ? pendingSlugChange(publishedPath, current.path)
+            : null
+
+        const next = await transitionPageWorkflow(current, stage, note)
+
+        if (move) {
+          const { error } = await createPublishRedirect(move)
+          if (error) {
+            // Loud, and naming both paths: the page has already moved, so a
+            // silently-failed redirect leaves exactly the broken links the
+            // switch promised to prevent.
+            toast.error(`Published, but the redirect ${move.from} → ${move.to} failed: ${error}`)
+          } else {
+            toast.success(`Redirect created: ${move.from} → ${move.to}`)
+          }
+        }
+
+        if (stage === 'PUBLISHED' && next.id) await saveDirectives(next.id)
+
+        acceptPage(next)
+        if (!documentId && next.id) onNavigate(`/pages/${next.id}/edit`)
+        if (toastOk) toast.success(toastOk)
+      } catch (err) {
+        toast.error(err instanceof Error ? err.message : 'Transition failed')
+      } finally {
+        setPublishing(false)
+      }
+    },
+    [
+      page,
+      dirty,
+      documentId,
+      handleSaveDraft,
+      redirectOnPublish,
+      canCreateRedirect,
+      publishedPath,
+      acceptPage,
+      saveDirectives,
+      onNavigate,
+    ],
+  )
 
-  const requestPublish = useCallback(() => {
+  const handleSubmitForReview = useCallback(
+    () => runWorkflow('IN_REVIEW', undefined, 'Submitted for review.'),
+    [runWorkflow],
+  )
+
+  const handleApprove = useCallback(() => {
     if (!page) return
     const result = validatePage(page, true)
-    setValidation(result.errors.length || result.warnings.length ? result : null)
     if (result.errors.length > 0) {
       toast.error('Resolve the listed issues before publishing')
       return
     }
-    setConfirmPublish(true)
-  }, [page])
+    void runWorkflow('PUBLISHED', undefined, 'Published.')
+  }, [page, runWorkflow])
+
+  const handleRequestChanges = useCallback(
+    (note: string) => runWorkflow('DRAFT', note || undefined, 'Sent back to draft.'),
+    [runWorkflow],
+  )
 
   const requestSchedule = useCallback(async () => {
     if (!page) return
@@ -589,8 +662,15 @@ export function PageSectionEditor({
       const ok = await handleSaveDraft()
       if (!ok) return
     }
+    const chrome = resolveWorkflowChrome({
+      stage: page.workflowStage,
+      status: page.status,
+      role: sessionRole,
+      canEdit: effectiveCanEdit,
+    })
+    if (!chrome.showSchedule) return
     setScheduleOpen(true)
-  }, [page, dirty, handleSaveDraft])
+  }, [page, dirty, handleSaveDraft, sessionRole, effectiveCanEdit])
 
   const handleScheduled = useCallback(
     (next: { status: string; scheduledAt: string | null; scheduledUnpublishAt: string | null }) => {
@@ -609,52 +689,6 @@ export function PageSectionEditor({
     [],
   )
 
-  const doPublish = useCallback(async () => {
-    if (!page) return
-    setPublishing(true)
-    try {
-      // The move has to be read BEFORE publishing — `acceptPage` moves the
-      // published path to the new one, after which there is nothing to detect.
-      const move =
-        redirectOnPublish && canCreateRedirect ? pendingSlugChange(publishedPath, page.path) : null
-
-      const published = await publishPage(page)
-      if (published.id) await saveDirectives(published.id)
-
-      if (move) {
-        const { error } = await createPublishRedirect(move)
-        if (error) {
-          // Loud, and naming both paths: the page has already moved, so a
-          // silently-failed redirect leaves exactly the broken links the switch
-          // promised to prevent.
-          toast.error(`Published, but the redirect ${move.from} → ${move.to} failed: ${error}`)
-        } else {
-          toast.success(`Redirect created: ${move.from} → ${move.to}`)
-        }
-      }
-
-      acceptPage(published)
-      setDirty(false)
-      setSaveState('saved')
-      setValidation(null)
-      toast.success('Page published')
-      if (!documentId && published.id) onNavigate(`/pages/${published.id}/edit`)
-    } catch (err) {
-      toast.error(err instanceof Error ? err.message : 'Failed to publish page')
-    } finally {
-      setPublishing(false)
-    }
-  }, [
-    page,
-    documentId,
-    onNavigate,
-    saveDirectives,
-    redirectOnPublish,
-    canCreateRedirect,
-    publishedPath,
-    acceptPage,
-  ])
-
   const handleDuplicate = useCallback(async () => {
     if (!page?.id) return
     const { id, error } = await duplicatePage(page.id)
@@ -754,7 +788,7 @@ export function PageSectionEditor({
         path: page.path,
         trailingSlash,
         dirty,
-        saveDraft: handleSaveDraft,
+        saveDraft: async () => Boolean(await handleSaveDraft()),
       }).catch((err) => {
         toast.error(err instanceof Error ? err.message : 'Failed to open the site')
       })
@@ -833,11 +867,13 @@ export function PageSectionEditor({
         <EditorTopBar
           title={page.title}
           status={page.status}
+          workflowStage={page.workflowStage}
+          reviewNote={page.reviewNote}
+          role={sessionRole}
           dirty={dirty}
           saveState={saveState}
           publishing={publishing}
           canEdit={effectiveCanEdit}
-          canPublish={canPublish && effectiveCanEdit}
           publishReady={publishReady}
           publishDisabledReason={publishDisabledReason}
           viewport={viewport}
@@ -863,7 +899,9 @@ export function PageSectionEditor({
             typeof audit?.seo.score === 'number' ? scoreBand(audit.seo.score) : undefined
           }
           onSaveDraft={handleSaveDraft}
-          onPublish={requestPublish}
+          onSubmitForReview={handleSubmitForReview}
+          onApprove={handleApprove}
+          onRequestChanges={handleRequestChanges}
           onSchedule={page.id ? requestSchedule : undefined}
           scheduleReady={Boolean(page.id)}
           scheduledAt={page.scheduledAt}
@@ -1037,15 +1075,6 @@ export function PageSectionEditor({
         onSave={handlePageSettings}
       />
 
-      <ConfirmDialog
-        open={confirmPublish}
-        onClose={() => setConfirmPublish(false)}
-        onConfirm={doPublish}
-        title="Publish this page?"
-        description="The current content will go live and replace the published version."
-        confirmLabel="Publish"
-      />
-
       {page.id && (
         <SchedulePublishDialog
           collectionSlug={PAGES_COLLECTION}

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

@@ -25,9 +25,9 @@ import {
   fetchPostForEditor,
   fetchTemplateForEditor,
   missingPostFields,
-  publishPost,
   savePostDraft,
   toggleSectionVisibility,
+  transitionPostWorkflow,
   updateSectionContent,
   updateSectionMeta,
   validatePost,
@@ -35,6 +35,7 @@ import {
   type PostHeaderConfig,
   type ValidationResult,
 } from '../../lib/post-editor-service.js'
+import { resolveWorkflowChrome, type WorkflowStage } from '../../lib/workflow-chrome.js'
 import { SharePreviewLinkDialog } from '../../components/SharePreviewLinkDialog.js'
 import { defaultPostHeader } from '@prenta/core/page-sections'
 import { openPublicSiteTab } from '../../lib/open-public-site-tab.js'
@@ -160,7 +161,6 @@ export function PostSectionEditor({
    * audit so the header chip and tab dot always have a number.
    */
   const [liveAudit, setLiveAudit] = useState<PageAuditResult | null>(null)
-  const [confirmPublish, setConfirmPublish] = useState(false)
   const [scheduleOpen, setScheduleOpen] = useState(false)
   const [shareOpen, setShareOpen] = useState(false)
   const [leaveTarget, setLeaveTarget] = useState<string | null>(null)
@@ -180,7 +180,8 @@ export function PostSectionEditor({
     setBaseline(snapshotBaseline(p.sections, p.status))
   }, [])
 
-  const { canEdit, canPublish } = useMemo(() => deriveCan(session), [session])
+  const { canEdit } = useMemo(() => deriveCan(session), [session])
+  const sessionRole = String(session?.user?.role ?? '')
   const customRenderers = useAdminSectionRenderers()
   const {
     siteUrl: publicSiteUrl,
@@ -391,61 +392,36 @@ export function PostSectionEditor({
   }, [])
 
   // ─── Save / publish ──────────────────────────────────────────────────
-  const handleSaveDraft = useCallback(async (): Promise<boolean> => {
-    if (!post) return false
-    const result = validatePost(post, false)
-    if (result.errors.length > 0) {
-      setValidation(result)
-      toast.error(result.errors[0]!)
-      setFieldsOpen(true)
-      return false
-    }
-    setSaveState('saving')
-    try {
-      const saved = await savePostDraft(post)
-      acceptPost(saved)
-      setDirty(false)
-      setSaveState('saved')
-      setValidation(null)
-      toast.success('Draft saved')
-      if (!documentId && saved.id) onNavigate(`/posts/${postType}/${saved.id}/edit`)
-      return true
-    } catch (err) {
-      setSaveState('error')
-      toast.error(err instanceof Error ? err.message : 'Failed to save draft')
-      return false
-    }
-  }, [post, documentId, postType, onNavigate])
-
-  const requestPublish = useCallback(() => {
-    if (!post) return
-    const result = validatePost(post, true)
-    setValidation(result.errors.length || result.warnings.length ? result : null)
-    if (result.errors.length > 0) {
-      toast.error('Resolve the listed issues before publishing')
-      return
-    }
-    setConfirmPublish(true)
-  }, [post])
-
-  const requestSchedule = useCallback(async () => {
-    if (!post) return
-    if (!post.id) {
-      toast.error('Save the post before scheduling')
-      return
-    }
-    const result = validatePost(post, true)
-    setValidation(result.errors.length || result.warnings.length ? result : null)
-    if (result.errors.length > 0) {
-      toast.error('Resolve the listed issues before scheduling')
-      return
-    }
-    if (dirty) {
-      const ok = await handleSaveDraft()
-      if (!ok) return
-    }
-    setScheduleOpen(true)
-  }, [post, dirty, handleSaveDraft])
+  const handleSaveDraft = useCallback(
+    async (options?: { navigate?: boolean }): Promise<EditorPost | false> => {
+      if (!post) return false
+      const result = validatePost(post, false)
+      if (result.errors.length > 0) {
+        setValidation(result)
+        toast.error(result.errors[0]!)
+        setFieldsOpen(true)
+        return false
+      }
+      setSaveState('saving')
+      try {
+        const saved = await savePostDraft(post)
+        acceptPost(saved)
+        setDirty(false)
+        setSaveState('saved')
+        setValidation(null)
+        toast.success('Draft saved')
+        if ((options?.navigate ?? true) && !documentId && saved.id) {
+          onNavigate(`/posts/${postType}/${saved.id}/edit`)
+        }
+        return saved
+      } catch (err) {
+        setSaveState('error')
+        toast.error(err instanceof Error ? err.message : 'Failed to save draft')
+        return false
+      }
+    },
+    [post, documentId, postType, onNavigate, acceptPost],
+  )
 
   const handleScheduled = useCallback(
     (next: { status: string; scheduledAt: string | null; scheduledUnpublishAt: string | null }) => {
@@ -465,24 +441,6 @@ export function PostSectionEditor({
     [],
   )
 
-  const doPublish = useCallback(async () => {
-    if (!post) return
-    setPublishing(true)
-    try {
-      const published = await publishPost(post)
-      acceptPost(published)
-      setDirty(false)
-      setSaveState('saved')
-      setValidation(null)
-      toast.success('Post published')
-      if (!documentId && published.id) onNavigate(`/posts/${postType}/${published.id}/edit`)
-    } catch (err) {
-      toast.error(err instanceof Error ? err.message : 'Failed to publish post')
-    } finally {
-      setPublishing(false)
-    }
-  }, [post, documentId, postType, onNavigate])
-
   // ─── Version history ─────────────────────────────────────────────────
   // History is a MODE, not a dialog: it overlays the rail and drives the
   // canvas, so the version being reviewed is editor state rather than
@@ -555,6 +513,76 @@ export function PostSectionEditor({
   const effectiveCanEdit = canEdit && !reviewing
   const canRestoreVersion = canEdit
 
+  const runWorkflow = useCallback(
+    async (stage: WorkflowStage, note?: string, toastOk?: string) => {
+      if (!post) return
+      let current = post
+      if (dirty || !current.id) {
+        const saved = await handleSaveDraft({ navigate: false })
+        if (!saved) return
+        current = saved
+      }
+      setPublishing(true)
+      try {
+        const next = await transitionPostWorkflow(current, stage, note)
+        acceptPost(next)
+        if (!documentId && next.id) onNavigate(`/posts/${postType}/${next.id}/edit`)
+        if (toastOk) toast.success(toastOk)
+      } catch (err) {
+        toast.error(err instanceof Error ? err.message : 'Transition failed')
+      } finally {
+        setPublishing(false)
+      }
+    },
+    [post, dirty, documentId, postType, handleSaveDraft, acceptPost, onNavigate],
+  )
+
+  const handleSubmitForReview = useCallback(
+    () => runWorkflow('IN_REVIEW', undefined, 'Submitted for review.'),
+    [runWorkflow],
+  )
+
+  const handleApprove = useCallback(() => {
+    if (!post) return
+    const result = validatePost(post, true)
+    if (result.errors.length > 0) {
+      toast.error('Resolve the listed issues before publishing')
+      return
+    }
+    void runWorkflow('PUBLISHED', undefined, 'Published.')
+  }, [post, runWorkflow])
+
+  const handleRequestChanges = useCallback(
+    (note: string) => runWorkflow('DRAFT', note || undefined, 'Sent back to draft.'),
+    [runWorkflow],
+  )
+
+  const requestSchedule = useCallback(async () => {
+    if (!post) return
+    if (!post.id) {
+      toast.error('Save the post before scheduling')
+      return
+    }
+    const result = validatePost(post, true)
+    setValidation(result.errors.length || result.warnings.length ? result : null)
+    if (result.errors.length > 0) {
+      toast.error('Resolve the listed issues before scheduling')
+      return
+    }
+    if (dirty) {
+      const ok = await handleSaveDraft()
+      if (!ok) return
+    }
+    const chrome = resolveWorkflowChrome({
+      stage: post.workflowStage,
+      status: post.status,
+      role: sessionRole,
+      canEdit: effectiveCanEdit,
+    })
+    if (!chrome.showSchedule) return
+    setScheduleOpen(true)
+  }, [post, dirty, handleSaveDraft, sessionRole, effectiveCanEdit])
+
   const handleSeoSaved = useCallback(() => {
     if (!post?.id) return
     fetchPostForEditor(postType, post.id)
@@ -616,7 +644,7 @@ export function PostSectionEditor({
         data: { path: (post as { path?: string }).path },
         trailingSlash,
         dirty,
-        saveDraft: handleSaveDraft,
+        saveDraft: async () => Boolean(await handleSaveDraft()),
       }).catch((err) => {
         toast.error(err instanceof Error ? err.message : 'Failed to open the site')
       })
@@ -688,11 +716,13 @@ export function PostSectionEditor({
         <EditorTopBar
           title={post.title || `New ${typeLabel}`}
           status={post.status}
+          workflowStage={post.workflowStage}
+          reviewNote={post.reviewNote}
+          role={sessionRole}
           dirty={dirty}
           saveState={saveState}
           publishing={publishing}
           canEdit={effectiveCanEdit}
-          canPublish={canPublish && effectiveCanEdit}
           publishReady={publishReady}
           publishDisabledReason={publishDisabledReason}
           viewport={viewport}
@@ -716,7 +746,9 @@ export function PostSectionEditor({
             typeof audit?.seo.score === 'number' ? scoreBand(audit.seo.score) : undefined
           }
           onSaveDraft={handleSaveDraft}
-          onPublish={requestPublish}
+          onSubmitForReview={handleSubmitForReview}
+          onApprove={handleApprove}
+          onRequestChanges={handleRequestChanges}
           onSchedule={post.id ? requestSchedule : undefined}
           scheduleReady={Boolean(post.id)}
           scheduledAt={post.scheduledAt}
@@ -889,15 +921,6 @@ export function PostSectionEditor({
         onSave={handleFields}
       />
 
-      <ConfirmDialog
-        open={confirmPublish}
-        onClose={() => setConfirmPublish(false)}
-        onConfirm={doPublish}
-        title="Publish this post?"
-        description="The current content will go live and replace the published version."
-        confirmLabel="Publish"
-      />
-
       {post.id && (
         <SchedulePublishDialog
           collectionSlug={postType}

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" />