create-nextblock 0.12.9 → 0.12.12

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

@@ -22,14 +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";
-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";
+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();
@@ -82,16 +82,17 @@ 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">
-          <ContentTransferControls
-            contentType="posts"
-            label="Posts"
-            languageId={filterLangId}
-          />
-          <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}
+            hasContent={postsWithDetails.length > 0}
+          />
+          <LanguageFilterSelect
+            allLanguages={allLanguages}
+            currentFilterLangId={filterLangId}
             basePath="/cms/posts"
           />
           <Button variant="default" asChild>

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

@@ -157,9 +157,21 @@ export default async function EditProductPage({
       }
     }
 
+    // Product drafts persist prices in major units (dollars, the ProductForm
+    // value shape), but ProductForm re-divides the top-level price/sale_price by
+    // 100 because it expects a raw product row (minor units/cents). Convert the
+    // draft's dollars back to cents so the form shows the saved amount instead of
+    // 1/100th of it (e.g. an imported $29.50 draft otherwise renders as $0.30).
+    // The prices maps and variant prices are already in the dollar shape the form
+    // consumes directly, so only these two scalars need converting.
+    const draftDollarsToStoredCents = (value: unknown) =>
+      typeof value === 'number' && Number.isFinite(value) ? Math.round(value * 100) : value;
+
     normalizedInitialData = {
       ...meta,
       id: product.id,
+      price: draftDollarsToStoredCents(meta.price),
+      sale_price: draftDollarsToStoredCents(meta.sale_price),
       product_media: hydratedProductMedia,
       category_ids: meta.category_ids ?? assignedCategories.map((c: any) => c.id),
     };

package/templates/nextblock-template/app/cms/products/attributes/page.tsx

@@ -1,12 +1,12 @@
-import { redirect } from 'next/navigation';
-import { verifyPackageOnline } from '@nextblock-cms/db/server';
-import { AttributeManagementPage as AttributeManagementPageUI } from '@nextblock-cms/ecommerce/server';
-
-export default async function AttributeManagementPage() {
-  const isOnline = await verifyPackageOnline('ecommerce');
-  if (!isOnline) {
-    redirect('/cms/settings/packages');
-  }
-
-  return <AttributeManagementPageUI />;
-}
+import { redirect } from 'next/navigation';
+import { verifyPackageOnline } from '@nextblock-cms/db/server';
+import { AttributeManagementPage as AttributeManagementPageUI } from '@nextblock-cms/ecommerce/server';
+
+export default async function AttributeManagementPage() {
+  const isOnline = await verifyPackageOnline('ecommerce');
+  if (!isOnline) {
+    redirect('/cms/settings/packages');
+  }
+
+  return <AttributeManagementPageUI />;
+}

package/templates/nextblock-template/app/cms/products/categories/page.tsx

@@ -1,12 +1,12 @@
-import { redirect } from 'next/navigation';
-import { verifyPackageOnline } from '@nextblock-cms/db/server';
-import { CategoryManagementPage as CategoryManagementPageUI } from '@nextblock-cms/ecommerce/server';
-
-export default async function CategoryManagementPage() {
-  const isOnline = await verifyPackageOnline('ecommerce');
-  if (!isOnline) {
-    redirect('/cms/settings/packages');
-  }
-
-  return <CategoryManagementPageUI />;
-}
+import { redirect } from 'next/navigation';
+import { verifyPackageOnline } from '@nextblock-cms/db/server';
+import { CategoryManagementPage as CategoryManagementPageUI } from '@nextblock-cms/ecommerce/server';
+
+export default async function CategoryManagementPage() {
+  const isOnline = await verifyPackageOnline('ecommerce');
+  if (!isOnline) {
+    redirect('/cms/settings/packages');
+  }
+
+  return <CategoryManagementPageUI />;
+}

package/templates/nextblock-template/app/cms/products/inventory/page.tsx

@@ -1,13 +1,13 @@
-import { verifyPackageOnline } from '@nextblock-cms/db/server';
-import { InventoryPage as InventoryPageUI } from '@nextblock-cms/ecommerce/server';
-import { redirect } from 'next/navigation';
-
-export default async function InventoryPage() {
-  const isOnline = await verifyPackageOnline('ecommerce');
-
-  if (!isOnline) {
-    redirect('/cms/settings/packages');
-  }
-
-  return <InventoryPageUI />;
-}
+import { verifyPackageOnline } from '@nextblock-cms/db/server';
+import { InventoryPage as InventoryPageUI } from '@nextblock-cms/ecommerce/server';
+import { redirect } from 'next/navigation';
+
+export default async function InventoryPage() {
+  const isOnline = await verifyPackageOnline('ecommerce');
+
+  if (!isOnline) {
+    redirect('/cms/settings/packages');
+  }
+
+  return <InventoryPageUI />;
+}

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

@@ -1,143 +1,143 @@
-import { verifyPackageOnline } from '@nextblock-cms/db/server';
-import { redirect } from 'next/navigation';
-import { getActiveLanguagesServerSide } from '@nextblock-cms/db/server';
-import { createClient } from '@nextblock-cms/db/server';
-import Link from 'next/link';
-import {
-  createProductAction,
-  getGlobalProductAttributes,
-  getEnabledPaymentProviders,
-  getProduct,
-  getStoreConfigStatus,
-  normalizeCurrencyRecord,
-  getCategoriesWithCount,
-} from '@nextblock-cms/ecommerce/server';
-import { ArrowLeft } from 'lucide-react';
-import { Badge, Button } from '@nextblock-cms/ui';
-import ProductFormClientShell from '../ProductFormClientShell';
-import {
-  buildGlobalAttributesForForm,
-  buildProductFormInitialData,
-  buildTranslationSourceInitialData,
-} from '../productFormData';
+import { verifyPackageOnline } from '@nextblock-cms/db/server';
+import { redirect } from 'next/navigation';
+import { getActiveLanguagesServerSide } from '@nextblock-cms/db/server';
+import { createClient } from '@nextblock-cms/db/server';
+import Link from 'next/link';
+import {
+  createProductAction,
+  getGlobalProductAttributes,
+  getEnabledPaymentProviders,
+  getProduct,
+  getStoreConfigStatus,
+  normalizeCurrencyRecord,
+  getCategoriesWithCount,
+} from '@nextblock-cms/ecommerce/server';
+import { ArrowLeft } from 'lucide-react';
+import { Badge, Button } from '@nextblock-cms/ui';
+import ProductFormClientShell from '../ProductFormClientShell';
+import {
+  buildGlobalAttributesForForm,
+  buildProductFormInitialData,
+  buildTranslationSourceInitialData,
+} from '../productFormData';
 
-export default async function NewProductPage({ 
-  searchParams 
-}: { 
-  searchParams: Promise<{ from_group?: string; target_lang_id?: string }> 
-}) {
-  const [
-    isOnline,
-    languages,
-    enabledProviders,
-    configStatus,
-    globalAttributesRaw,
-    currenciesResult,
-    categories,
-    { from_group, target_lang_id },
-  ] = await Promise.all([
-    verifyPackageOnline('ecommerce'),
-    getActiveLanguagesServerSide(),
-    getEnabledPaymentProviders(),
-    getStoreConfigStatus(),
-    getGlobalProductAttributes(),
-    createClient()
-      .from('currencies')
-      .select(
-        'code, symbol, exchange_rate, is_default, is_active, auto_sync_product_prices, auto_update_exchange_rate, exchange_rate_source, exchange_rate_updated_at, rounding_mode, rounding_increment, rounding_charm_amount'
-      )
-      .eq('is_active', true)
-      .order('code', { ascending: true }),
-    getCategoriesWithCount(),
-    searchParams,
-  ]);
-
-  if (!isOnline) {
-      redirect('/cms/settings/packages');
-  }
-
-  let initialData = null;
-  if (from_group) {
-    try {
-      const supabase = createClient();
+export default async function NewProductPage({ 
+  searchParams 
+}: { 
+  searchParams: Promise<{ from_group?: string; target_lang_id?: string }> 
+}) {
+  const [
+    isOnline,
+    languages,
+    enabledProviders,
+    configStatus,
+    globalAttributesRaw,
+    currenciesResult,
+    categories,
+    { from_group, target_lang_id },
+  ] = await Promise.all([
+    verifyPackageOnline('ecommerce'),
+    getActiveLanguagesServerSide(),
+    getEnabledPaymentProviders(),
+    getStoreConfigStatus(),
+    getGlobalProductAttributes(),
+    createClient()
+      .from('currencies')
+      .select(
+        'code, symbol, exchange_rate, is_default, is_active, auto_sync_product_prices, auto_update_exchange_rate, exchange_rate_source, exchange_rate_updated_at, rounding_mode, rounding_increment, rounding_charm_amount'
+      )
+      .eq('is_active', true)
+      .order('code', { ascending: true }),
+    getCategoriesWithCount(),
+    searchParams,
+  ]);
+
+  if (!isOnline) {
+      redirect('/cms/settings/packages');
+  }
+
+  let initialData = null;
+  if (from_group) {
+    try {
+      const supabase = createClient();
       const { data: groupProducts } = await supabase
         .from('products')
         .select('id')
         .eq('translation_group_id', from_group)
         .limit(1);
       
-      if (groupProducts && groupProducts[0]) {
-        const { data: sourceProduct, error: fetchError } = await getProduct(supabase, groupProducts[0].id);
-        if (sourceProduct && !fetchError) {
-          initialData = buildTranslationSourceInitialData(
-            sourceProduct,
-            from_group,
-            target_lang_id
-          );
-        }
-      }
-    } catch (e) {
-      console.error('Error pre-filling translation data:', e);
-    }
-  }
-
-  const targetLanguageId = target_lang_id ? Number.parseInt(target_lang_id, 10) : undefined;
-  const targetLanguage =
-    Number.isFinite(targetLanguageId)
-      ? languages.find((language) => language.id === targetLanguageId)
-      : null;
-  const globalAttributes = buildGlobalAttributesForForm(globalAttributesRaw || []);
-  const currencies = (currenciesResult.data ?? []).map((currency) =>
-    normalizeCurrencyRecord(currency)
-  );
-  const normalizedInitialData = buildProductFormInitialData(
-    initialData,
-    languages,
-    targetLanguageId
-  );
-
-  return (
-    <div className="space-y-8 w-full max-w-[1400px] mx-auto px-6 py-8">
-      <div className="flex justify-between items-start flex-wrap gap-4 w-full">
-        <div className="flex items-start gap-3">
-          <Button variant="outline" size="icon" aria-label="Back to products" asChild>
-            <Link href="/cms/products">
-              <ArrowLeft className="h-4 w-4" />
-            </Link>
-          </Button>
-          <div className="space-y-2">
-            <div className="flex items-center gap-2 flex-wrap">
-              <h1 className="text-2xl font-bold">
-                {targetLanguage ? `Create ${targetLanguage.name} Translation` : 'Create Product'}
-              </h1>
-              {targetLanguage ? (
-                <Badge variant="secondary">
-                  {targetLanguage.code.toUpperCase()}
-                </Badge>
-              ) : null}
-            </div>
-            <p className="text-sm text-muted-foreground max-w-3xl">
-              {targetLanguage
-                ? 'We prefilled this draft from the source product so you can localize the content and fine-tune pricing, media, and variations faster.'
-                : 'Build a catalog-ready product with structured information, media, pricing, inventory, and optional variations.'}
-            </p>
-          </div>
-        </div>
-      </div>
-
-      <ProductFormClientShell
-        availableLanguagesProp={languages}
-        globalAttributesProp={globalAttributes}
-        currenciesProp={currencies}
-        translationGroupId={from_group}
-        targetLanguageId={target_lang_id}
-        initialData={normalizedInitialData}
-        enabledProviders={enabledProviders}
-        configStatus={configStatus}
-        createAction={createProductAction}
-        availableCategoriesProp={categories}
-      />
-    </div>
-  );
-}
+      if (groupProducts && groupProducts[0]) {
+        const { data: sourceProduct, error: fetchError } = await getProduct(supabase, groupProducts[0].id);
+        if (sourceProduct && !fetchError) {
+          initialData = buildTranslationSourceInitialData(
+            sourceProduct,
+            from_group,
+            target_lang_id
+          );
+        }
+      }
+    } catch (e) {
+      console.error('Error pre-filling translation data:', e);
+    }
+  }
+
+  const targetLanguageId = target_lang_id ? Number.parseInt(target_lang_id, 10) : undefined;
+  const targetLanguage =
+    Number.isFinite(targetLanguageId)
+      ? languages.find((language) => language.id === targetLanguageId)
+      : null;
+  const globalAttributes = buildGlobalAttributesForForm(globalAttributesRaw || []);
+  const currencies = (currenciesResult.data ?? []).map((currency) =>
+    normalizeCurrencyRecord(currency)
+  );
+  const normalizedInitialData = buildProductFormInitialData(
+    initialData,
+    languages,
+    targetLanguageId
+  );
+
+  return (
+    <div className="space-y-8 w-full max-w-[1400px] mx-auto px-6 py-8">
+      <div className="flex justify-between items-start flex-wrap gap-4 w-full">
+        <div className="flex items-start gap-3">
+          <Button variant="outline" size="icon" aria-label="Back to products" asChild>
+            <Link href="/cms/products">
+              <ArrowLeft className="h-4 w-4" />
+            </Link>
+          </Button>
+          <div className="space-y-2">
+            <div className="flex items-center gap-2 flex-wrap">
+              <h1 className="text-2xl font-bold">
+                {targetLanguage ? `Create ${targetLanguage.name} Translation` : 'Create Product'}
+              </h1>
+              {targetLanguage ? (
+                <Badge variant="secondary">
+                  {targetLanguage.code.toUpperCase()}
+                </Badge>
+              ) : null}
+            </div>
+            <p className="text-sm text-muted-foreground max-w-3xl">
+              {targetLanguage
+                ? 'We prefilled this draft from the source product so you can localize the content and fine-tune pricing, media, and variations faster.'
+                : 'Build a catalog-ready product with structured information, media, pricing, inventory, and optional variations.'}
+            </p>
+          </div>
+        </div>
+      </div>
+
+      <ProductFormClientShell
+        availableLanguagesProp={languages}
+        globalAttributesProp={globalAttributes}
+        currenciesProp={currencies}
+        translationGroupId={from_group}
+        targetLanguageId={target_lang_id}
+        initialData={normalizedInitialData}
+        enabledProviders={enabledProviders}
+        configStatus={configStatus}
+        createAction={createProductAction}
+        availableCategoriesProp={categories}
+      />
+    </div>
+  );
+}
 

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

@@ -2,9 +2,9 @@ import { ProductsPage as ProductsPageUI } from '@nextblock-cms/ecommerce/server'
 import { verifyPackageOnline } from '@nextblock-cms/db/server';
 import { redirect } from 'next/navigation';
 
-import { getActiveLanguagesServerSide } from '@nextblock-cms/db/server';
-import LanguageFilterSelect from '../components/LanguageFilterSelect';
-import { ContentTransferControls } from '../import-export/ContentTransferControls';
+import { getActiveLanguagesServerSide, getServiceRoleSupabaseClient } from '@nextblock-cms/db/server';
+import LanguageFilterSelect from '../components/LanguageFilterSelect';
+import { ContentTransferControls } from '../import-export/ContentTransferControls';
 
 export default async function ProductsPage({ searchParams }: { searchParams: Promise<{ lang?: string }> }) {
   const isOnline = await verifyPackageOnline('ecommerce');
@@ -13,30 +13,42 @@ export default async function ProductsPage({ searchParams }: { searchParams: Pro
   }
 
   const resolvedSearchParams = await searchParams;
-  const allLanguages = await getActiveLanguagesServerSide();
-  const selectedLangId = resolvedSearchParams?.lang ? parseInt(resolvedSearchParams.lang, 10) : undefined;
-  const isValidLangId = selectedLangId
-    ? allLanguages.some((language) => language.id === selectedLangId)
-    : true;
-  const filterLangId = isValidLangId ? selectedLangId : undefined;
-
-  return (
-    <ProductsPageUI 
-      searchParams={resolvedSearchParams} 
-      transferControlsNode={
-        <ContentTransferControls
-          contentType="products"
-          label="Products"
-          languageId={filterLangId}
-        />
-      }
-      languageFilterNode={
-        <LanguageFilterSelect 
-          allLanguages={allLanguages}
-          currentFilterLangId={filterLangId}
-          basePath="/cms/products"
-        />
-      }
+  const allLanguages = await getActiveLanguagesServerSide();
+  const selectedLangId = resolvedSearchParams?.lang ? parseInt(resolvedSearchParams.lang, 10) : undefined;
+  const isValidLangId = selectedLangId
+    ? allLanguages.some((language) => language.id === selectedLangId)
+    : true;
+  const filterLangId = isValidLangId ? selectedLangId : undefined;
+
+  // Cheap existence check so the Export button can disable when there is nothing
+  // to export. Filtered by language to match what the export action produces.
+  const supabase = getServiceRoleSupabaseClient();
+  let productCountQuery = supabase
+    .from('products')
+    .select('id', { count: 'exact', head: true });
+  if (filterLangId) {
+    productCountQuery = productCountQuery.eq('language_id', filterLangId);
+  }
+  const { count: productCount } = await productCountQuery;
+
+  return (
+    <ProductsPageUI
+      searchParams={resolvedSearchParams}
+      transferControlsNode={
+        <ContentTransferControls
+          contentType="products"
+          label="Products"
+          languageId={filterLangId}
+          hasContent={(productCount ?? 0) > 0}
+        />
+      }
+      languageFilterNode={
+        <LanguageFilterSelect 
+          allLanguages={allLanguages}
+          currentFilterLangId={filterLangId}
+          basePath="/cms/products"
+        />
+      }
     />
   );
 }