create-nextblock 0.2.78 → 0.8.1

package/templates/nextblock-template/app/cms/posts/components/PostForm.tsx

@@ -1,9 +1,8 @@
 // app/cms/posts/components/PostForm.tsx
 "use client";
 
-import { useEffect, useState, useTransition, useCallback } from "react";
+import { useEffect, useRef, useState, useTransition } from "react";
 import { useRouter, useSearchParams } from "next/navigation";
-import Image from "next/image";
 import { Button } from "@nextblock-cms/ui";
 import { Input } from "@nextblock-cms/ui";
 import { Label } from "@nextblock-cms/ui";
@@ -16,39 +15,46 @@ import {
 } from "@nextblock-cms/ui";
 import { Spinner, Alert, AlertDescription } from "@nextblock-cms/ui";
 import { Textarea } from "@nextblock-cms/ui";
-import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-  DialogFooter,
-  DialogClose,
-} from "@nextblock-cms/ui";
 import type { Database } from "@nextblock-cms/db";
-import { useAuth } from "@/context/AuthContext";
+import { useAuth } from '../../../../context/AuthContext';
+import FeatureImageField from "../../components/FeatureImageField";
 
 type Post = Database['public']['Tables']['posts']['Row'];
 type PageStatus = Database['public']['Enums']['page_status'];
 type Language = Database['public']['Tables']['languages']['Row'];
-type Media = Database['public']['Tables']['media']['Row'];
-// import MediaGridClient from "@/app/cms/media/components/MediaGridClient"; // Will render a custom grid instead
-import MediaImage from "@/app/cms/media/components/MediaImage"; // For displaying images in the modal
-import { getMediaItems } from "@/app/cms/media/actions";
-import MediaUploadForm from "@/app/cms/media/components/MediaUploadForm";
-import { Separator } from "@nextblock-cms/ui";
-import { useRef } from "react";
-import { useHotkeys } from "@/hooks/use-hotkeys";
+import { useHotkeys } from '../../../../hooks/use-hotkeys';
 
 
 interface PostFormProps {
-  post?: Post & { feature_image_id?: string | null }; // Assuming feature_image_id can be string
+  post?: Post & { feature_image_id?: string | null };
   formAction: (formData: FormData) => Promise<{ error?: string } | void>;
   actionButtonText?: string;
   isEditing?: boolean;
   availableLanguagesProp?: Language[]; // Make optional
   initialFeatureImageUrl?: string | null;
-  initialFeatureImageId?: string | null; // Pass initial ID as string
+  initialFeatureImageId?: string | null;
+}
+
+function formatDateTimeLocal(value: string | null | undefined) {
+  if (!value) {
+    return "";
+  }
+
+  try {
+    const date = new Date(value);
+    if (Number.isNaN(date.getTime())) {
+      return "";
+    }
+
+    const year = date.getFullYear();
+    const month = (date.getMonth() + 1).toString().padStart(2, '0');
+    const day = date.getDate().toString().padStart(2, '0');
+    const hours = date.getHours().toString().padStart(2, '0');
+    const minutes = date.getMinutes().toString().padStart(2, '0');
+    return `${year}-${month}-${day}T${hours}:${minutes}`;
+  } catch {
+    return "";
+  }
 }
 
 export default function PostForm({
@@ -67,108 +73,35 @@ export default function PostForm({
 
   const [title, setTitle] = useState(post?.title || "");
   const [slug, setSlug] = useState(post?.slug || "");
+  const [label, setLabel] = useState(post?.label || "");
   const [languageId, setLanguageId] = useState<string>(
     post?.language_id?.toString() || ""
   );
   const [status, setStatus] = useState<PageStatus>(post?.status || "draft");
   const [excerpt, setExcerpt] = useState(post?.excerpt || "");
-  const [publishedAt, setPublishedAt] = useState<string>(() => {
-    if (post?.published_at) {
-      try {
-        const date = new Date(post.published_at);
-        const year = date.getFullYear();
-        const month = (date.getMonth() + 1).toString().padStart(2, '0');
-        const day = date.getDate().toString().padStart(2, '0');
-        const hours = date.getHours().toString().padStart(2, '0');
-        const minutes = date.getMinutes().toString().padStart(2, '0');
-        return `${year}-${month}-${day}T${hours}:${minutes}`;
-      } catch {
-        return "";
-      }
-    }
-    return "";
-  });
-  const [metaTitle, setMetaTitle] = useState(post?.meta_title || "");
-  const [metaDescription, setMetaDescription] = useState(
-    post?.meta_description || ""
+  const [subtitle, setSubtitle] = useState(post?.subtitle || "");
+  const [publishedAt, setPublishedAt] = useState<string>(() =>
+    formatDateTimeLocal(post?.published_at)
   );
+  const [metaTitle, setMetaTitle] = useState(post?.meta_title || "");
+  const [metaDescription, setMetaDescription] = useState(
+    post?.meta_description || ""
+  );
+  const [featureImageId, setFeatureImageId] = useState<string | null>(
+    initialFeatureImageId || post?.feature_image_id || null
+  );
 
   // Use the passed-in languages directly
   const [availableLanguages] = useState<Language[]>(availableLanguagesProp);
 
-  const [selectedFeatureImage, setSelectedFeatureImage] = useState<{ id: string | null; url: string | null }>({
-    id: initialFeatureImageId || post?.feature_image_id || null, // Prioritize prop, then post data
-    url: initialFeatureImageUrl || null,
-  });
-  const [isModalOpen, setIsModalOpen] = useState(false);
-  const [mediaItems, setMediaItems] = useState<Media[]>([]);
-  const [mediaLoading, setMediaLoading] = useState(false);
-  const [mediaError, setMediaError] = useState<string | null>(null);
-  const [mediaPage, setMediaPage] = useState(1);
-  const [hasMoreMedia, setHasMoreMedia] = useState(true);
-
   const [formMessage, setFormMessage] = useState<{ type: 'success' | 'error', text: string } | null>(null);
+  const formRef = useRef<HTMLFormElement>(null);
+  const [isSaving, setIsSaving] = useState(false);
+  const [saveError, setSaveError] = useState<string | null>(null);
+  const [lastSaved, setLastSaved] = useState<Date | null>(null);
+  const isFirstRender = useRef(true);
 
-  useEffect(() => {
-    // Update selectedFeatureImage if initial props change
-    setSelectedFeatureImage({
-        id: initialFeatureImageId || post?.feature_image_id || null,
-        url: initialFeatureImageUrl || null,
-    });
-  }, [initialFeatureImageId, initialFeatureImageUrl, post?.feature_image_id]);
-
-  const loadMedia = useCallback(async (pageToLoad = 1, append = false) => {
-    if (!hasMoreMedia && append && pageToLoad > mediaPage) return;
-    setMediaLoading(true);
-    setMediaError(null);
-    try {
-      const result = await getMediaItems(pageToLoad, 20); // Fetch 20 items per page
-      if (result.error) {
-        setMediaError(result.error);
-        if (!append) setMediaItems([]); // Clear if not appending on error
-      } else if (result.data) {
-        setMediaItems(prev => append ? [...prev, ...(result.data || [])] : (result.data || []));
-        setHasMoreMedia(result.hasMore !== undefined ? result.hasMore : false);
-        setMediaPage(pageToLoad);
-      }
-    } catch {
-      setMediaError("An unexpected error occurred while fetching media.");
-      if (!append) setMediaItems([]);
-    } finally {
-      setMediaLoading(false);
-    }
-  }, [hasMoreMedia, mediaPage]);
-
-  // Load initial media when modal is opened
-  useEffect(() => {
-    if (isModalOpen) {
-        // Reset and load fresh if opening modal, or if mediaItems is empty
-        if (mediaItems.length === 0 || !hasMoreMedia || mediaPage !==1) {
-            setMediaPage(1);
-            setHasMoreMedia(true); // Assume there might be more media on fresh open
-            loadMedia(1, false);
-        }
-    }
-  }, [isModalOpen, hasMoreMedia, loadMedia, mediaItems.length, mediaPage]);
-
-  const handleImageSelectInModal = (image: Media) => {
-    const r2BaseUrl = process.env.NEXT_PUBLIC_R2_BASE_URL;
-    if (!r2BaseUrl) {
-      console.error("NEXT_PUBLIC_R2_PUBLIC_URL is not set. Cannot construct image URL.");
-      setMediaError("Image server configuration is missing. Cannot display images.");
-      return;
-    }
-    const imageUrl = image.object_key ? `${r2BaseUrl}/${image.object_key}` : null;
-
-    if (!imageUrl) {
-        console.error("Selected image does not have an object_key:", image);
-        setMediaError("Selected image is missing a valid identifier.");
-        return;
-    }
-
-    setSelectedFeatureImage({ id: image.id, url: imageUrl }); // image.id is already string (uuid)
-    setIsModalOpen(false);
-  };
+  useHotkeys('ctrl+s', () => formRef.current?.requestSubmit());
 
 
   useEffect(() => {
@@ -181,6 +114,38 @@ export default function PostForm({
     }
   }, [searchParams]);
 
+  useEffect(() => {
+    if (!post) {
+      return;
+    }
+
+    setTitle(post.title || "");
+    setSlug(post.slug || "");
+    setLabel(post.label || "");
+    setLanguageId(post.language_id?.toString() || "");
+    setStatus(post.status || "draft");
+    setExcerpt(post.excerpt || "");
+    setSubtitle(post.subtitle || "");
+    setPublishedAt(formatDateTimeLocal(post.published_at));
+    setMetaTitle(post.meta_title || "");
+    setMetaDescription(post.meta_description || "");
+    setFeatureImageId(initialFeatureImageId || post.feature_image_id || null);
+  }, [
+    initialFeatureImageId,
+    post?.excerpt,
+    post?.id,
+    post?.label,
+    post?.language_id,
+    post?.meta_description,
+    post?.meta_title,
+    post?.published_at,
+    post?.slug,
+    post?.status,
+    post?.subtitle,
+    post?.title,
+    post?.updated_at,
+  ]);
+
   // Initialize languageId if creating new post and languages are available
   useEffect(() => {
     if (!isEditing && availableLanguages.length > 0 && !languageId) { // check !isEditing too
@@ -200,20 +165,110 @@ export default function PostForm({
     }
   };
 
-  const handleSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
-    event.preventDefault();
-    setFormMessage(null);
-    const formData = new FormData(event.currentTarget);
+  const saveDraft = async (customFormData?: FormData) => {
+    if (!title.trim() || !slug.trim()) {
+      return;
+    }
+    setIsSaving(true);
+    setSaveError(null);
+
+    const formData = customFormData || (formRef.current ? new FormData(formRef.current) : new FormData());
+    if (!customFormData && !formRef.current) {
+      formData.append("title", title);
+      formData.append("slug", slug);
+      formData.append("language_id", languageId);
+      formData.append("label", label);
+      formData.append("status", status);
+      formData.append("excerpt", excerpt);
+      formData.append("subtitle", subtitle);
+      formData.append("published_at", publishedAt);
+      formData.append("meta_title", metaTitle);
+      formData.append("meta_description", metaDescription);
+      formData.append("feature_image_id", featureImageId || "");
+    }
 
-    startTransition(async () => {
+    try {
       const result = await formAction(formData);
-      if (result?.error) {
+      if (result && 'error' in result && result.error) {
+        setSaveError(result.error);
         setFormMessage({ type: 'error', text: result.error });
+      } else {
+        setLastSaved(new Date());
+        setFormMessage(null);
+        router.refresh();
       }
-      // Success is handled by redirect with query param in server action
-    });
+    } catch (err: any) {
+      const msg = err.message || "Failed to save draft";
+      setSaveError(msg);
+      setFormMessage({ type: 'error', text: msg });
+    } finally {
+      setIsSaving(false);
+    }
+  };
+
+  const handleSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
+    if (!isEditing) {
+      setFormMessage(null);
+      const formData = new FormData(event.currentTarget);
+
+      startTransition(async () => {
+        const result = await formAction(formData);
+        if (result?.error) {
+          setFormMessage({ type: 'error', text: result.error });
+        }
+      });
+    } else {
+      await saveDraft();
+    }
   };
 
+  useEffect(() => {
+    if (!isEditing) return;
+
+    if (isFirstRender.current) {
+      isFirstRender.current = false;
+      return;
+    }
+
+    const dbPublishedAt = formatDateTimeLocal(post?.published_at);
+
+    const hasChanges =
+      title !== (post?.title || "") ||
+      slug !== (post?.slug || "") ||
+      label !== (post?.label || "") ||
+      languageId !== (post?.language_id?.toString() || "") ||
+      status !== (post?.status || "draft") ||
+      excerpt !== (post?.excerpt || "") ||
+      subtitle !== (post?.subtitle || "") ||
+      publishedAt !== dbPublishedAt ||
+      metaTitle !== (post?.meta_title || "") ||
+      metaDescription !== (post?.meta_description || "") ||
+      featureImageId !== (post?.feature_image_id || null);
+
+    if (!hasChanges) return;
+
+    const timer = setTimeout(() => {
+      saveDraft();
+    }, 1000);
+
+    return () => clearTimeout(timer);
+  }, [
+    title,
+    slug,
+    label,
+    languageId,
+    status,
+    excerpt,
+    subtitle,
+    publishedAt,
+    metaTitle,
+    metaDescription,
+    featureImageId,
+    post,
+    isEditing,
+  ]);
+
   // Remove languagesLoading from this condition
   if (authLoading) {
     return <div>Loading form...</div>;
@@ -222,11 +277,32 @@ export default function PostForm({
     return <div>Please log in to manage posts.</div>;
   }
 
-  const formRef = useRef<HTMLFormElement>(null);
-  useHotkeys('ctrl+s', () => formRef.current?.requestSubmit());
-
   return (
     <form ref={formRef} onSubmit={handleSubmit} className="space-y-6 w-full mx-auto px-6">
+      {isEditing && (
+        <div className="flex items-center justify-between text-xs text-muted-foreground pb-2 border-b border-border/40 mb-2">
+          <span className="font-semibold text-[11px] uppercase tracking-wider text-muted-foreground/80">Post Settings</span>
+          <div className="flex items-center gap-1.5 min-h-[16px]">
+            {isSaving ? (
+              <>
+                <div className="relative flex h-2 w-2">
+                  <span className="animate-ping absolute inline-flex h-full w-full rounded-full bg-amber-400 opacity-75"></span>
+                  <span className="relative inline-flex rounded-full h-2 w-2 bg-amber-500"></span>
+                </div>
+                <span className="text-amber-600 dark:text-amber-400 font-medium">Autosaving settings...</span>
+              </>
+            ) : saveError ? (
+              <span className="text-red-500 font-medium">Error saving settings: {saveError}</span>
+            ) : lastSaved ? (
+              <span className="text-emerald-600 dark:text-emerald-400 font-medium">
+                Settings autosaved at {lastSaved.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit', second: '2-digit' })}
+              </span>
+            ) : (
+              <span className="text-muted-foreground/60">Settings autosave in draft mode</span>
+            )}
+          </div>
+        </div>
+      )}
       {formMessage && (
         <Alert variant={formMessage.type === 'success' ? 'success' : 'destructive'} className="mb-4">
            <AlertDescription>{formMessage.text}</AlertDescription>
@@ -258,9 +334,45 @@ export default function PostForm({
         )}
       </div>
 
+      <div>
+        <Label htmlFor="label">Label</Label>
+        <Input
+          id="label"
+          name="label"
+          value={label}
+          onChange={(e) => setLabel(e.target.value)}
+          className="mt-1"
+          placeholder="e.g. Architecture"
+        />
+        <p className="text-xs text-muted-foreground mt-1">Short pill text shown on the article hero and post cards.</p>
+      </div>
+
       <div>
         <Label htmlFor="excerpt">Excerpt</Label>
-        <Textarea id="excerpt" name="excerpt" value={excerpt} onChange={(e) => setExcerpt(e.target.value)} className="mt-1" rows={3} />
+        <Textarea
+          id="excerpt"
+          name="excerpt"
+          value={excerpt}
+          onChange={(e) => setExcerpt(e.target.value)}
+          className="mt-1"
+          rows={3}
+          placeholder="Short editorial summary for the hero metadata row and article cards"
+        />
+        <p className="text-xs text-muted-foreground mt-1">Used as the short summary above the hero and on public post cards.</p>
+      </div>
+
+      <div>
+        <Label htmlFor="subtitle">Subtitle</Label>
+        <Textarea
+          id="subtitle"
+          name="subtitle"
+          value={subtitle}
+          onChange={(e) => setSubtitle(e.target.value)}
+          className="mt-1"
+          rows={4}
+          placeholder="Longer deck shown under the article title"
+        />
+        <p className="text-xs text-muted-foreground mt-1">Displayed as the larger deck under the article title.</p>
       </div>
 
       <div>
@@ -298,128 +410,27 @@ export default function PostForm({
         <Textarea id="meta_description" name="meta_description" value={metaDescription} onChange={(e) => setMetaDescription(e.target.value)} className="mt-1" rows={3} />
       </div>
     
-      {/* Feature Image Selection */}
-      <div>
-        <Label htmlFor="feature_image">Feature Image</Label>
-        <Input type="hidden" name="feature_image_id" value={selectedFeatureImage.id || ""} />
-        <div className="mt-2">
-          {selectedFeatureImage.url && (
-            <div className="mb-4">
-              <Image
-                src={selectedFeatureImage.url}
-                alt="Selected feature image"
-                width={200}
-                height={200}
-                className="rounded-md object-cover"
-              />
-              <Button
-                type="button"
-                variant="link"
-                className="mt-2 text-red-600 px-0"
-                onClick={() => setSelectedFeatureImage({ id: null, url: null })}
-              >
-                Remove Image
-              </Button>
-            </div>
-          )}
-          <Dialog open={isModalOpen} onOpenChange={setIsModalOpen}>
-            <DialogTrigger asChild>
-              <Button type="button" variant="outline">
-                {selectedFeatureImage.id ? "Change Feature Image" : "Select Feature Image"}
-              </Button>
-            </DialogTrigger>
-            <DialogContent className="sm:max-w-[90vw] max-h-[90vh] flex flex-col">
-              <DialogHeader>
-                <DialogTitle>Select Feature Image</DialogTitle>
-              </DialogHeader>
-              <div className="p-1">
-                <MediaUploadForm
-                  returnJustData={true}
-                  defaultFolder={`posts/${(slug || 'untitled').toLowerCase().replace(/\s+/g, '-').replace(/[^a-z0-9-_]/g, '')}/`}
-                  onUploadSuccess={(newlyUploadedMedia) => {
-                    setMediaItems(prevItems => [newlyUploadedMedia, ...prevItems.filter(item => item.id !== newlyUploadedMedia.id)]);
-                    handleImageSelectInModal(newlyUploadedMedia);
-                  }}
-                />
-              </div>
-              <Separator className="my-4" />
-              <div className="py-4 flex-grow overflow-y-auto" id="media-modal-scroll-area">
-                {mediaLoading && mediaItems.length === 0 && <p className="text-center text-muted-foreground">Loading media...</p>}
-                {mediaError && <p className="text-red-600 text-center">{mediaError}</p>}
-                {!mediaLoading && !mediaError && mediaItems.length === 0 && <p className="text-center text-muted-foreground">No media items found. Try uploading some first.</p>}
-                
-                {mediaItems.length > 0 && (
-                  <div className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-4 gap-3">
-                    {mediaItems.map((item) => {
-                      const r2BaseUrl = process.env.NEXT_PUBLIC_R2_BASE_URL;
-                      if (!r2BaseUrl && item.object_key) {
-                         // This check is more for safety, error primarily handled in handleImageSelectInModal
-                        if (!mediaError) setMediaError("Image server configuration is missing. Cannot display images.");
-                        return null; // Or a placeholder
-                      }
-                      const imageUrl = item.object_key ? `${r2BaseUrl}/${item.object_key}` : null;
-
-                      // Only render image-type media for selection
-                      if (!item.file_type?.startsWith("image/") || !imageUrl) {
-                        return null;
-                      }
-
-                      return (
-                        <div
-                          key={item.id}
-                          className="group relative border rounded-lg overflow-hidden shadow-sm aspect-square bg-muted/20 transition-all cursor-pointer hover:ring-2 hover:ring-primary"
-                          onClick={() => handleImageSelectInModal(item)}
-                          onKeyDown={(e) => e.key === 'Enter' && handleImageSelectInModal(item)}
-                          tabIndex={0}
-                          role="button"
-                          aria-label={`Select ${item.file_name}`}
-                        >
-                          <MediaImage
-                            src={imageUrl}
-                            alt={item.description || item.file_name}
-                            width={item.width || 300} // Provide a fallback or ensure width is always present
-                            height={item.height || 300} // Provide a fallback or ensure height is always present
-                            blurDataURL={item.blur_data_url}
-                            className="h-full w-full object-cover transition-transform group-hover:scale-105"
-                          />
-                           <div className="absolute inset-0 bg-gradient-to-t from-black/60 via-black/10 to-transparent opacity-0 group-hover:opacity-100 transition-opacity flex flex-col justify-end p-2">
-                            <p className="text-xs text-white truncate" title={item.file_name}>{item.file_name}</p>
-                          </div>
-                        </div>
-                      );
-                    })}
-                  </div>
-                )}
-                {!mediaLoading && hasMoreMedia && mediaItems.length > 0 && (
-                  <div className="text-center mt-6">
-                    <Button onClick={() => loadMedia(mediaPage + 1, true)} variant="outline" disabled={mediaLoading}>
-                      {mediaLoading ? <><Spinner className="mr-2 h-4 w-4" /> Loading...</> : "Load More"}
-                    </Button>
-                  </div>
-                )}
-              </div>
-              <DialogFooter className="mt-auto pt-4 border-t">
-                <DialogClose asChild>
-                  <Button type="button" variant="outline" onClick={() => { setMediaError(null); }}>Cancel</Button>
-                </DialogClose>
-              </DialogFooter>
-            </DialogContent>
-          </Dialog>
-        </div>
-      </div>
+      <FeatureImageField
+        initialImageId={initialFeatureImageId || post?.feature_image_id || null}
+        initialImageUrl={initialFeatureImageUrl || null}
+        onImageIdChange={setFeatureImageId}
+        uploadFolder={`posts/${(slug || 'untitled').toLowerCase().replace(/\s+/g, '-').replace(/[^a-z0-9-_]/g, '')}/`}
+      />
     
-      <div className="flex justify-end space-x-3 pt-6"> {/* Increased pt for spacing */}
-        <Button type="button" variant="outline" onClick={() => router.push("/cms/posts")} disabled={isPending}>Cancel</Button>
-        <Button type="submit" disabled={isPending || authLoading || availableLanguages.length === 0}>
-          {isPending ? (
-            <>
-              <Spinner className="mr-2 h-4 w-4" /> Saving...
-            </>
-          ) : (
-            actionButtonText
-          )}
-        </Button>
-      </div>
+      {!isEditing && (
+        <div className="flex justify-end space-x-3 pt-6"> {/* Increased pt for spacing */}
+          <Button type="button" variant="outline" onClick={() => router.push("/cms/posts")} disabled={isPending}>Cancel</Button>
+          <Button type="submit" disabled={isPending || authLoading || availableLanguages.length === 0}>
+            {isPending ? (
+              <>
+                <Spinner className="mr-2 h-4 w-4" /> Saving...
+              </>
+            ) : (
+              actionButtonText
+            )}
+          </Button>
+        </div>
+      )}
     </form>
   );
 }

package/templates/nextblock-template/app/cms/posts/new/page.tsx

@@ -1,7 +1,7 @@
 // app/cms/posts/new/page.tsx
 import PostForm from "../components/PostForm";
 import { createPost } from "../actions";
-import { getLanguages } from "@/app/cms/settings/languages/actions";
+import { getLanguages } from '../../settings/languages/actions';
 
 export default async function NewPostPage() {
   const languagesResult = await getLanguages();

package/templates/nextblock-template/app/cms/posts/page.tsx

@@ -22,12 +22,14 @@ import {
   DropdownMenuSeparator,
 } from "@nextblock-cms/ui";
 // deletePost server action is now used by DeletePostButtonClient
-import type { Database } from "@nextblock-cms/db";
-import { getActiveLanguagesServerSide } from "@nextblock-cms/db/server";
-
-type Post = Database['public']['Tables']['posts']['Row'] & { feature_image_url?: string | null };
-import LanguageFilterSelect from "@/app/cms/components/LanguageFilterSelect";
-import DeletePostButtonClient from "./components/DeletePostButtonClient"; // Import the new client component
+import type { Database } from "@nextblock-cms/db";
+import { getActiveLanguagesServerSide } from "@nextblock-cms/db/server";
+import { resolveMediaUrl } from "../../../lib/media/resolveMediaUrl";
+
+type Post = Database['public']['Tables']['posts']['Row'] & { feature_image_url?: string | null };
+import LanguageFilterSelect from "../components/LanguageFilterSelect";
+import DeletePostButtonClient from "./components/DeletePostButtonClient"; // Import the new client component
+import { ContentTransferControls } from "../import-export/ContentTransferControls";
 
 async function getPostsWithDetails(filterLanguageId?: number): Promise<{ post: Post; languageCode: string }[]> {
   const supabase = createClient();
@@ -54,7 +56,7 @@ async function getPostsWithDetails(filterLanguageId?: number): Promise<{ post: P
   return postsData.map(p => {
     const langInfo = p.languages as unknown as { code: string } | null;
     return {
-      post: { ...p, feature_image_url: p.media?.object_key ? `${process.env.NEXT_PUBLIC_R2_BASE_URL}/${p.media.object_key}` : null } as Post,
+      post: { ...p, feature_image_url: resolveMediaUrl(p.media?.object_key) } as Post,
       languageCode: langInfo?.code?.toUpperCase() || langMap.get(p.language_id)?.toUpperCase() || 'N/A',
     };
   });
@@ -80,11 +82,16 @@ export default async function CmsPostsListPage(props: CmsPostsListPageProps) {
   return (
     <div className="w-full">
       <div className="flex justify-between items-center mb-6 flex-wrap gap-4">
-        <h1 className="text-2xl font-semibold">Manage Posts</h1>
-        <div className="flex items-center gap-3">
-          <LanguageFilterSelect
-            allLanguages={allLanguages}
-            currentFilterLangId={filterLangId}
+        <h1 className="text-2xl font-semibold">Manage Posts</h1>
+        <div className="flex items-center gap-3">
+          <ContentTransferControls
+            contentType="posts"
+            label="Posts"
+            languageId={filterLangId}
+          />
+          <LanguageFilterSelect
+            allLanguages={allLanguages}
+            currentFilterLangId={filterLangId}
             basePath="/cms/posts"
           />
           <Button variant="default" asChild>
@@ -168,7 +175,7 @@ export default async function CmsPostsListPage(props: CmsPostsListPageProps) {
                   <TableCell className="text-right">
                     <DropdownMenu>
                       <DropdownMenuTrigger asChild>
-                        <Button variant="ghost" size="icon">
+                        <Button id={`post-trigger-${post.id}`} variant="ghost" size="icon">
                           <MoreHorizontal className="h-4 w-4" />
                            <span className="sr-only">Post actions for {post.title}</span>
                         </Button>