create-nextblock 0.13.10 → 0.13.11

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/productFormData.ts

@@ -1,133 +1,133 @@
-import { mapRawVariantRelations } from '@nextblock-cms/ecommerce';
-import type { ProductAttribute } from '@nextblock-cms/ecommerce';
-import { minorUnitAmountToMajor } from '@nextblock-cms/utils';
-
-type LanguageOption = {
-  id: number;
-  code: string;
-  is_default?: boolean;
-};
-
-export function buildGlobalAttributesForForm(globalAttributesRaw: any[]): ProductAttribute[] {
-  return (globalAttributesRaw || []).map((attribute: any) => ({
-    id: attribute.id,
-    name: attribute.name,
-    name_translations: attribute.name_translations || {},
-    slug: attribute.slug,
-    terms: (attribute.product_attribute_terms || []).map((term: any) => ({
-      ...term,
-      value_translations: term.value_translations || {},
-    })),
-  }));
-}
-
-export function resolveProductFormLanguageCode(
-  availableLanguages: LanguageOption[],
-  languageId?: number
-) {
-  return (
-    availableLanguages.find((language) => language.id === languageId)?.code ||
-    availableLanguages.find((language) => language.is_default)?.code ||
-    availableLanguages[0]?.code
-  );
-}
-
-export function buildTranslationSourceInitialData(
-  sourceProduct: any,
-  translationGroupId: string,
-  targetLanguageId?: string
-) {
-  if (!sourceProduct) {
-    return null;
-  }
-
-  return {
-    ...sourceProduct,
-    id: undefined,
-    slug: sourceProduct.slug || '',
-    sku: sourceProduct.sku || '',
-    status: 'draft',
-    language_id: targetLanguageId ? parseInt(targetLanguageId, 10) : sourceProduct.language_id,
-    translation_group_id: translationGroupId,
-    created_at: undefined,
-    updated_at: undefined,
-  };
-}
-
-export function buildProductFormInitialData(
-  product: any,
-  availableLanguages: LanguageOption[],
-  languageIdOverride?: number
-) {
-  if (!product) {
-    return undefined;
-  }
-
-  const resolvedLanguageId = languageIdOverride ?? product.language_id;
-  const currentLanguageCode = resolveProductFormLanguageCode(
-    availableLanguages,
-    resolvedLanguageId
-  );
-  const { attributes: productAttributes, variants } = mapRawVariantRelations(
-    product.product_variants || [],
-    currentLanguageCode
-  );
-
-  return {
-    ...product,
-    language_id: resolvedLanguageId,
-    prices: Object.entries(product.prices || {}).reduce<Record<string, number>>(
-      (accumulator, [currencyCode, amount]) => {
-        if (typeof amount === 'number') {
-          accumulator[currencyCode] = minorUnitAmountToMajor(amount, currencyCode);
-        }
-        return accumulator;
-      },
-      {}
-    ),
-    sale_prices: Object.entries(product.sale_prices || {}).reduce<Record<string, number | null>>(
-      (accumulator, [currencyCode, amount]) => {
-        if (typeof amount === 'number') {
-          accumulator[currencyCode] = minorUnitAmountToMajor(amount, currencyCode);
-        }
-        return accumulator;
-      },
-      {}
-    ),
-    variation_attributes:
-      product.variation_attributes ||
-      productAttributes.map((attribute) => ({
-        attribute_id: attribute.id,
-        term_ids: attribute.terms.map((term) => term.id),
-      })),
-    variants:
-      product.variants ||
-      variants.map((variant) => ({
-        ...variant,
-        upc: variant.upc ?? null,
-        price: variant.price / 100,
-        prices: Object.entries(variant.prices || {}).reduce<Record<string, number>>(
-          (accumulator, [currencyCode, amount]) => {
-            if (typeof amount === 'number') {
-              accumulator[currencyCode] = minorUnitAmountToMajor(amount, currencyCode);
-            }
-            return accumulator;
-          },
-          {}
-        ),
-        sale_price:
-          typeof variant.sale_price === 'number' ? variant.sale_price / 100 : null,
-        sale_prices: Object.entries(variant.sale_prices || {}).reduce<Record<string, number | null>>(
-          (accumulator, [currencyCode, amount]) => {
-            if (typeof amount === 'number') {
-              accumulator[currencyCode] = minorUnitAmountToMajor(amount, currencyCode);
-            }
-            return accumulator;
-          },
-          {}
-        ),
-        main_media_id: variant.main_media_id ?? null,
-        main_image_url: variant.image_url ?? null,
-      })),
-  };
-}
+import { mapRawVariantRelations } from '@nextblock-cms/ecommerce';
+import type { ProductAttribute } from '@nextblock-cms/ecommerce';
+import { minorUnitAmountToMajor } from '@nextblock-cms/utils';
+
+type LanguageOption = {
+  id: number;
+  code: string;
+  is_default?: boolean;
+};
+
+export function buildGlobalAttributesForForm(globalAttributesRaw: any[]): ProductAttribute[] {
+  return (globalAttributesRaw || []).map((attribute: any) => ({
+    id: attribute.id,
+    name: attribute.name,
+    name_translations: attribute.name_translations || {},
+    slug: attribute.slug,
+    terms: (attribute.product_attribute_terms || []).map((term: any) => ({
+      ...term,
+      value_translations: term.value_translations || {},
+    })),
+  }));
+}
+
+export function resolveProductFormLanguageCode(
+  availableLanguages: LanguageOption[],
+  languageId?: number
+) {
+  return (
+    availableLanguages.find((language) => language.id === languageId)?.code ||
+    availableLanguages.find((language) => language.is_default)?.code ||
+    availableLanguages[0]?.code
+  );
+}
+
+export function buildTranslationSourceInitialData(
+  sourceProduct: any,
+  translationGroupId: string,
+  targetLanguageId?: string
+) {
+  if (!sourceProduct) {
+    return null;
+  }
+
+  return {
+    ...sourceProduct,
+    id: undefined,
+    slug: sourceProduct.slug || '',
+    sku: sourceProduct.sku || '',
+    status: 'draft',
+    language_id: targetLanguageId ? parseInt(targetLanguageId, 10) : sourceProduct.language_id,
+    translation_group_id: translationGroupId,
+    created_at: undefined,
+    updated_at: undefined,
+  };
+}
+
+export function buildProductFormInitialData(
+  product: any,
+  availableLanguages: LanguageOption[],
+  languageIdOverride?: number
+) {
+  if (!product) {
+    return undefined;
+  }
+
+  const resolvedLanguageId = languageIdOverride ?? product.language_id;
+  const currentLanguageCode = resolveProductFormLanguageCode(
+    availableLanguages,
+    resolvedLanguageId
+  );
+  const { attributes: productAttributes, variants } = mapRawVariantRelations(
+    product.product_variants || [],
+    currentLanguageCode
+  );
+
+  return {
+    ...product,
+    language_id: resolvedLanguageId,
+    prices: Object.entries(product.prices || {}).reduce<Record<string, number>>(
+      (accumulator, [currencyCode, amount]) => {
+        if (typeof amount === 'number') {
+          accumulator[currencyCode] = minorUnitAmountToMajor(amount, currencyCode);
+        }
+        return accumulator;
+      },
+      {}
+    ),
+    sale_prices: Object.entries(product.sale_prices || {}).reduce<Record<string, number | null>>(
+      (accumulator, [currencyCode, amount]) => {
+        if (typeof amount === 'number') {
+          accumulator[currencyCode] = minorUnitAmountToMajor(amount, currencyCode);
+        }
+        return accumulator;
+      },
+      {}
+    ),
+    variation_attributes:
+      product.variation_attributes ||
+      productAttributes.map((attribute) => ({
+        attribute_id: attribute.id,
+        term_ids: attribute.terms.map((term) => term.id),
+      })),
+    variants:
+      product.variants ||
+      variants.map((variant) => ({
+        ...variant,
+        upc: variant.upc ?? null,
+        price: variant.price / 100,
+        prices: Object.entries(variant.prices || {}).reduce<Record<string, number>>(
+          (accumulator, [currencyCode, amount]) => {
+            if (typeof amount === 'number') {
+              accumulator[currencyCode] = minorUnitAmountToMajor(amount, currencyCode);
+            }
+            return accumulator;
+          },
+          {}
+        ),
+        sale_price:
+          typeof variant.sale_price === 'number' ? variant.sale_price / 100 : null,
+        sale_prices: Object.entries(variant.sale_prices || {}).reduce<Record<string, number | null>>(
+          (accumulator, [currencyCode, amount]) => {
+            if (typeof amount === 'number') {
+              accumulator[currencyCode] = minorUnitAmountToMajor(amount, currencyCode);
+            }
+            return accumulator;
+          },
+          {}
+        ),
+        main_media_id: variant.main_media_id ?? null,
+        main_image_url: variant.image_url ?? null,
+      })),
+  };
+}

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

@@ -1,5 +1,5 @@
-import { redirect } from 'next/navigation';
-
-export default async function ProductsSettingsPageRedirect() {
-  redirect('/cms/shipping');
-}
+import { redirect } from 'next/navigation';
+
+export default async function ProductsSettingsPageRedirect() {
+  redirect('/cms/shipping');
+}