create-nextblock 0.12.16 → 0.13.2

package/templates/nextblock-template/app/cms/pages/actions.ts

@@ -7,6 +7,7 @@ import { redirect } from "next/navigation";
 import type { Database } from "@nextblock-cms/db";
 import { v4 as uuidv4 } from 'uuid';
 import { getOrCreateContentDraft } from "../../../lib/visual-editing/draft-content";
+import { getHomepageTranslationGroupId } from "../../lib/homepage";
 
 type PageStatus = Database['public']['Enums']['page_status'];
 import { encodedRedirect } from "@nextblock-cms/utils/server";
@@ -18,11 +19,16 @@ function getOptionalFeatureImageId(formData: FormData) {
   return typeof value === "string" && value.trim() !== "" ? value.trim() : null;
 }
 
-function revalidatePublicPageSlug(slug: string | null | undefined) {
+function revalidatePublicPageSlug(
+  slug: string | null | undefined,
+  isHomepage = false
+) {
   if (!slug) return;
 
   revalidatePath(`/${slug}`);
-  if (slug === "home" || slug === "accueil") {
+  // Any language variation of the homepage is also served at "/", regardless of
+  // its slug — bust that cache too (the literal-slug check is a cheap fallback).
+  if (isHomepage || slug === "home" || slug === "accueil") {
     revalidatePath("/");
   }
 }
@@ -91,7 +97,11 @@ export async function createPage(formData: FormData) {
   }
 
   revalidatePath("/cms/pages");
-  revalidatePublicPageSlug(newPage?.slug);
+  const createHomepageGroupId = await getHomepageTranslationGroupId(supabase);
+  revalidatePublicPageSlug(
+    newPage?.slug,
+    !!createHomepageGroupId && newPage?.translation_group_id === createHomepageGroupId
+  );
 
   if (newPage?.id) {
     redirect(`/cms/pages/${newPage.id}/edit?success=${encodeURIComponent("Page created successfully.")}`);
@@ -168,9 +178,12 @@ export async function updatePage(pageId: number, formData: FormData) {
   }
 
   revalidatePath("/cms/pages");
-  revalidatePublicPageSlug(existingPage.slug);
+  const updateHomepageGroupId = await getHomepageTranslationGroupId(supabase);
+  const updateIsHomepage =
+    !!updateHomepageGroupId && existingPage.translation_group_id === updateHomepageGroupId;
+  revalidatePublicPageSlug(existingPage.slug, updateIsHomepage);
   if (rawFormData.slug && rawFormData.slug !== existingPage.slug) {
-      revalidatePublicPageSlug(rawFormData.slug);
+      revalidatePublicPageSlug(rawFormData.slug, updateIsHomepage);
   }
 
   revalidatePath(pageEditPath);
@@ -178,6 +191,39 @@ export async function updatePage(pageId: number, formData: FormData) {
 }
 
 
+/**
+ * Publish a page directly (status -> "published") so it becomes visible on the
+ * live site. Used by the draft-aware "View Live" button when an admin chooses to
+ * publish a still-draft page. Revalidates the public surfaces, including "/" when
+ * the page belongs to the homepage translation group.
+ */
+export async function publishPage(pageId: number): Promise<{ error?: string } | void> {
+  const supabase = createClient();
+  const { data: { user } } = await supabase.auth.getUser();
+  if (!user) return { error: "User not authenticated." };
+
+  const { data: page, error } = await supabase
+    .from("pages")
+    .update({ status: "published", updated_at: new Date().toISOString() })
+    .eq("id", pageId)
+    .select("slug, translation_group_id")
+    .single();
+
+  if (error || !page) {
+    return { error: error?.message || "Could not publish the page." };
+  }
+
+  revalidatePath("/cms/pages");
+  revalidatePath(`/cms/pages/${pageId}/edit`);
+  const homepageGroupId = await getHomepageTranslationGroupId(supabase);
+  revalidatePublicPageSlug(
+    page.slug,
+    !!homepageGroupId && page.translation_group_id === homepageGroupId
+  );
+
+  return {};
+}
+
 export async function deletePage(pageId: number) {
   const supabase = createClient();
 
@@ -195,6 +241,13 @@ export async function deletePage(pageId: number) {
 
   const { translation_group_id } = page;
 
+  // Resolve whether this is the homepage BEFORE deleting the group rows — once
+  // the default-language "home" page is gone, the lookup would return null and a
+  // homepage with a non-literal slug wouldn't get "/" revalidated.
+  const deleteHomepageGroupId = await getHomepageTranslationGroupId(supabase);
+  const deleteIsHomepage =
+    !!deleteHomepageGroupId && translation_group_id === deleteHomepageGroupId;
+
   // 2. Find All Related Pages
   const { data: relatedPages, error: relatedPagesError } = await supabase
     .from("pages")
@@ -239,7 +292,7 @@ export async function deletePage(pageId: number) {
   revalidatePath("/cms/navigation");
   if (relatedPages) {
     relatedPages.forEach(p => {
-      revalidatePublicPageSlug(p.slug);
+      revalidatePublicPageSlug(p.slug, deleteIsHomepage);
     });
   }
 

package/templates/nextblock-template/app/cms/posts/[id]/edit/page.tsx

@@ -3,13 +3,13 @@ import React from "react";
 import { Separator } from "@nextblock-cms/ui";
 import { createClient } from "@nextblock-cms/db/server";
 import PostForm from "../../components/PostForm";
-import { updatePost } from "../../actions";
+import { updatePost, publishPost } from "../../actions";
 import type { Database } from "@nextblock-cms/db";
 import { notFound, redirect } from "next/navigation";
 import BlockEditorArea from "../../../blocks/components/BlockEditorArea";
 import Link from "next/link";
-import { Button } from "@nextblock-cms/ui";
-import { ArrowLeft, Eye, FilePenLine } from "lucide-react";
+import { Button, ViewLiveButton } from "@nextblock-cms/ui";
+import { ArrowLeft, FilePenLine } from "lucide-react";
 import ContentLanguageSwitcher from "../../../components/ContentLanguageSwitcher";
 import { getActiveLanguagesServerSide } from "@nextblock-cms/db/server";
 import { normalizeContentDraftRow } from "../../../../../lib/visual-editing/draft-content";
@@ -30,7 +30,7 @@ interface PostWithBlocks extends PostType {
   translation_group_id: string;
 }
 
-async function getPostDataWithBlocks(id: number): Promise<{ post: PostWithBlocks; hasDraft: boolean } | null> {
+async function getPostDataWithBlocks(id: number): Promise<{ post: PostWithBlocks; hasDraft: boolean; liveStatus: string; liveSlug: string } | null> {
   const supabase = createClient();
   const { data: postData, error: postError } = await supabase
     .from("posts")
@@ -86,7 +86,14 @@ async function getPostDataWithBlocks(id: number): Promise<{ post: PostWithBlocks
     };
   }
 
-  return { post: postWithBlocks, hasDraft };
+  return {
+    post: postWithBlocks,
+    hasDraft,
+    // The LIVE row's status/slug (before the draft overlay above) — the "View
+    // Live" button must reflect what is actually published, not the draft.
+    liveStatus: postData.status as string,
+    liveSlug: postData.slug as string,
+  };
 }
 
 export default async function EditPostPage(props: { params: Promise<{ id: string }> }) {
@@ -113,7 +120,7 @@ export default async function EditPostPage(props: { params: Promise<{ id: string
     return notFound();
   }
 
-  const { post: postWithBlocks, hasDraft } = postDataResult;
+  const { post: postWithBlocks, hasDraft, liveStatus, liveSlug } = postDataResult;
 
   let initialFeatureImageUrl: string | null = null;
   let initialFeatureImageIdProp: string | null = null;
@@ -138,6 +145,8 @@ export default async function EditPostPage(props: { params: Promise<{ id: string
   const updatePostWithId = updatePost.bind(null, postId);
   const publicPostUrl = `/article/${postWithBlocks.slug}`;
   const draftModeUrl = `/api/draft/start?path=${encodeURIComponent(publicPostUrl)}`;
+  const isLive = liveStatus === "published";
+  const liveViewUrl = `/article/${liveSlug}`;
   
   return (
     <UploadFolderProvider defaultFolder={`posts/${postWithBlocks.slug}/`}>
@@ -181,11 +190,12 @@ export default async function EditPostPage(props: { params: Promise<{ id: string
                   allSiteLanguages={allSiteLanguages}
                 />
               )}
-              <Button variant="outline" asChild>
-                <Link href={publicPostUrl} target="_blank" rel="noopener noreferrer">
-                  <Eye className="mr-2 h-4 w-4" /> View Live Post
-                </Link>
-              </Button>
+              <ViewLiveButton
+                href={liveViewUrl}
+                isLive={isLive}
+                label="post"
+                publishAction={publishPost.bind(null, postId)}
+              />
               <Button variant="secondary" asChild>
                 <a href={draftModeUrl} target="_blank" rel="noopener noreferrer">
                   <FilePenLine className="mr-2 h-4 w-4" />

package/templates/nextblock-template/app/cms/posts/actions.ts

@@ -12,6 +12,51 @@ type PageStatus = Database['public']['Enums']['page_status'];
 import { encodedRedirect } from "@nextblock-cms/utils/server"; // Ensure this is correctly imported
 // --- createPost and updatePost functions to be updated similarly for error returns ---
 
+/**
+ * Publish a post directly (status -> "published") so it becomes visible on the
+ * live site. Used by the draft-aware "View Live" button when an admin chooses to
+ * publish a still-draft post.
+ */
+export async function publishPost(postId: number): Promise<{ error?: string } | void> {
+  const supabase = createClient();
+  const { data: { user } } = await supabase.auth.getUser();
+  if (!user) return { error: "User not authenticated." };
+
+  const nowIso = new Date().toISOString();
+  const { data: existing } = await supabase
+    .from("posts")
+    .select("published_at")
+    .eq("id", postId)
+    .maybeSingle();
+
+  // Publishing "now": if the post has no publish date or a future-scheduled one,
+  // set it to now so it isn't withheld by the public "published_at <= now" filter.
+  const currentPublishedAt = existing?.published_at;
+  const setPublishedNow =
+    !currentPublishedAt || new Date(currentPublishedAt).getTime() > Date.now();
+
+  const { data: post, error } = await supabase
+    .from("posts")
+    .update({
+      status: "published",
+      updated_at: nowIso,
+      ...(setPublishedNow ? { published_at: nowIso } : {}),
+    })
+    .eq("id", postId)
+    .select("slug")
+    .single();
+
+  if (error || !post) {
+    return { error: error?.message || "Could not publish the post." };
+  }
+
+  revalidatePath("/cms/posts");
+  revalidatePath(`/cms/posts/${postId}/edit`);
+  revalidatePath(`/article/${post.slug}`);
+  revalidatePath("/articles");
+  return {};
+}
+
 export async function createPost(formData: FormData) {
   const supabase = createClient();
   const { data: { user } } = await supabase.auth.getUser();

package/templates/nextblock-template/app/cms/products/[id]/edit/page.tsx

@@ -1,7 +1,7 @@
 import { verifyPackageOnline, getActiveLanguagesServerSide } from '@nextblock-cms/db/server';
 import { redirect, notFound } from 'next/navigation';
 import Link from 'next/link';
-import { ArrowLeft, ChevronDown, ExternalLink } from 'lucide-react';
+import { ArrowLeft, ChevronDown } from 'lucide-react';
 import {
   Badge,
   Button,
@@ -11,6 +11,7 @@ import {
   DropdownMenuLabel,
   DropdownMenuSeparator,
   DropdownMenuTrigger,
+  ViewLiveButton,
 } from '@nextblock-cms/ui';
 import ProductFormClientShell from '../../ProductFormClientShell';
 import {
@@ -21,6 +22,7 @@ import {
   getStoreConfigStatus,
   normalizeCurrencyRecord,
   updateProductAction,
+  publishProductAction,
   getCategoriesWithCount,
   getProductCategories,
 } from '@nextblock-cms/ecommerce/server';
@@ -265,14 +267,14 @@ export default async function EditProductPage({
             </DropdownMenu>
           ) : null}
 
-          {product.slug && product.status === 'active' && (
-            <Button variant="outline" asChild>
-              <Link href={`/product/${product.slug}`} target="_blank">
-                <ExternalLink className="w-4 h-4 mr-2" />
-                View
-              </Link>
-            </Button>
-          )}
+          {product.slug ? (
+            <ViewLiveButton
+              href={`/product/${product.slug}`}
+              isLive={product.status === 'active'}
+              label="product"
+              publishAction={publishProductAction.bind(null, product.id)}
+            />
+          ) : null}
         </div>
       </div>