create-nextblock 0.15.8 → 0.15.10

package/templates/nextblock-template/components/blocks/renderers/ProductDetailsBlockRenderer.tsx

@@ -1,92 +1,157 @@
-import React from 'react';
-import { ProductDetailsLayout } from '@nextblock-cms/ecommerce/components/ProductDetailsLayout';
-import type { VisualEditAttributes, VisualEditingDocumentContext } from '../../../lib/visual-editing/types';
-import { createClient } from "@nextblock-cms/db/server";
-import BlockRenderer from "../../BlockRenderer";
-import ProductReviewsSection from "../../ProductReviewsSection";
-
-interface ProductDetailsBlockRendererProps {
-  visualEditAttributes?: VisualEditAttributes;
-  productVisualEditingEnabled?: boolean;
-  excludeProductId?: string;
-  languageId: number;
-  visualEditing?: VisualEditingDocumentContext;
-}
-
-export default async function ProductDetailsBlockRenderer({
-  visualEditAttributes,
-  productVisualEditingEnabled = false,
-  excludeProductId,
-  languageId,
-  visualEditing,
-}: ProductDetailsBlockRendererProps) {
-  const supabase = createClient();
-  
-  let descriptionBlocks: any[] = [];
-  let productSlug = "";
-  let productDraftId: number | null = null;
-  
-  if (excludeProductId) {
-    const { data: productInfo } = await supabase
-      .from('products')
-      .select('slug')
-      .eq('id', excludeProductId)
-      .maybeSingle();
-
-    if (productInfo) {
-      productSlug = productInfo.slug;
-    }
-
-    if (productVisualEditingEnabled) {
-      const { data: draftData } = await supabase
-        .from('product_drafts')
-        .select('id, blocks')
-        .eq('product_id', excludeProductId)
-        .maybeSingle();
-        
-      if (draftData) {
-        productDraftId = draftData.id;
-        if (draftData.blocks && Array.isArray(draftData.blocks)) {
-          descriptionBlocks = draftData.blocks;
-        }
-      }
-    }
-    
-    if (descriptionBlocks.length === 0) {
-      const { data: liveBlocks } = await supabase
-        .from('blocks')
-        .select('*')
-        .eq('product_id', excludeProductId)
-        .order('order', { ascending: true });
-      descriptionBlocks = liveBlocks || [];
-    }
-  }
-
-  const productDescriptionVisualEditing = {
-    enabled: productVisualEditingEnabled,
-    documentType: "product" as const,
-    documentId: excludeProductId!,
-    slug: productSlug,
-    languageId: languageId,
-    draftId: productDraftId,
-  };
-
-  const descriptionNode = descriptionBlocks.length > 0 ? (
-    <BlockRenderer 
-      blocks={descriptionBlocks} 
-      languageId={languageId} 
-      productVisualEditingEnabled={productVisualEditingEnabled}
-      visualEditing={productDescriptionVisualEditing}
-    />
-  ) : undefined;
-
-  return (
-    <div {...visualEditAttributes}>
-      <ProductDetailsLayout 
-        visualEditingEnabled={productVisualEditingEnabled} 
-        descriptionNode={descriptionNode}
-        reviewsNode={excludeProductId ? <ProductReviewsSection productId={excludeProductId} /> : undefined}
-      />
-    </div>
-  );
-}
+import React from 'react';
+import { ProductDetailsLayout } from '@nextblock-cms/ecommerce/components/ProductDetailsLayout';
+import type { VisualEditAttributes, VisualEditingDocumentContext } from '../../../lib/visual-editing/types';
+import { headers } from 'next/headers';
+import { createClient } from "@nextblock-cms/db/server";
+import { getProviderReadiness } from "@nextblock-cms/ecommerce/server";
+import BlockRenderer from "../../BlockRenderer";
+import ProductReviewsSection from "../../ProductReviewsSection";
+import ContactSellerSection from "../../ContactSellerSection";
+import PaymentReadinessBoundary from "../../commerce/PaymentReadinessBoundary";
+
+interface ProductDetailsBlockRendererProps {
+  visualEditAttributes?: VisualEditAttributes;
+  productVisualEditingEnabled?: boolean;
+  excludeProductId?: string;
+  languageId: number;
+  visualEditing?: VisualEditingDocumentContext;
+}
+
+export default async function ProductDetailsBlockRenderer({
+  visualEditAttributes,
+  productVisualEditingEnabled = false,
+  excludeProductId,
+  languageId,
+  visualEditing,
+}: ProductDetailsBlockRendererProps) {
+  const supabase = createClient();
+  
+  let descriptionBlocks: any[] = [];
+  let productSlug = "";
+  let productDraftId: number | null = null;
+  // Default to purchasable: a store that is set up correctly must never be degraded by
+  // a lookup that failed for some unrelated reason.
+  let canPurchase = true;
+  
+  if (excludeProductId) {
+    const { data: productInfo } = await supabase
+      .from('products')
+      .select('slug, payment_provider')
+      .eq('id', excludeProductId)
+      .maybeSingle();
+
+    if (productInfo) {
+      productSlug = productInfo.slug;
+
+      const provider = productInfo.payment_provider;
+      if (provider === 'stripe' || provider === 'freemius') {
+        try {
+          const readiness = await getProviderReadiness(provider);
+          canPurchase = readiness.ready;
+        } catch (error) {
+          console.error('[ProductDetails] Could not resolve payment readiness:', error);
+        }
+      }
+    }
+
+    if (productVisualEditingEnabled) {
+      const { data: draftData } = await supabase
+        .from('product_drafts')
+        .select('id, blocks')
+        .eq('product_id', excludeProductId)
+        .maybeSingle();
+        
+      if (draftData) {
+        productDraftId = draftData.id;
+        if (draftData.blocks && Array.isArray(draftData.blocks)) {
+          descriptionBlocks = draftData.blocks;
+        }
+      }
+    }
+    
+    if (descriptionBlocks.length === 0) {
+      const { data: liveBlocks } = await supabase
+        .from('blocks')
+        .select('*')
+        .eq('product_id', excludeProductId)
+        .order('order', { ascending: true });
+      descriptionBlocks = liveBlocks || [];
+    }
+  }
+
+  const productDescriptionVisualEditing = {
+    enabled: productVisualEditingEnabled,
+    documentType: "product" as const,
+    documentId: excludeProductId!,
+    slug: productSlug,
+    languageId: languageId,
+    draftId: productDraftId,
+  };
+
+  // Bot protection for the enquiry form, resolved the same way BlockRenderer does for
+  // the contact-form block. Only read when the form will actually render.
+  let botProtection: { provider: 'none' | 'turnstile' | 'recaptcha'; siteKey: string } = {
+    provider: 'none',
+    siteKey: '',
+  };
+  let scriptNonce = '';
+
+  if (!canPurchase && excludeProductId) {
+    try {
+      scriptNonce = (await headers()).get('x-nonce') || '';
+    } catch (error) {
+      console.error('[Bot Protection] Error loading CSP nonce in ProductDetails:', error);
+    }
+
+    try {
+      const { data: publicSetting } = await supabase
+        .from('site_settings')
+        .select('value')
+        .eq('key', 'bot_protection_public')
+        .maybeSingle();
+      if (publicSetting?.value) {
+        const publicVal = publicSetting.value as Record<string, any>;
+        botProtection = {
+          provider: publicVal.provider || 'none',
+          siteKey: publicVal.siteKey || '',
+        };
+      }
+    } catch (error) {
+      console.error('[Bot Protection] Error loading settings in ProductDetails:', error);
+    }
+  }
+
+  const descriptionNode = descriptionBlocks.length > 0 ? (
+    <BlockRenderer 
+      blocks={descriptionBlocks} 
+      languageId={languageId} 
+      productVisualEditingEnabled={productVisualEditingEnabled}
+      visualEditing={productDescriptionVisualEditing}
+    />
+  ) : undefined;
+
+  // Only resolved when actually needed — a working store pays nothing for this.
+  const purchaseFallbackNode =
+    !canPurchase && excludeProductId ? (
+      <ContactSellerSection
+        productId={excludeProductId}
+        botProtectionProvider={botProtection.provider}
+        botProtectionSiteKey={botProtection.siteKey}
+        scriptNonce={scriptNonce}
+      />
+    ) : undefined;
+
+  return (
+    <div {...visualEditAttributes}>
+      <PaymentReadinessBoundary>
+      <ProductDetailsLayout 
+        visualEditingEnabled={productVisualEditingEnabled} 
+        descriptionNode={descriptionNode}
+        reviewsNode={excludeProductId ? <ProductReviewsSection productId={excludeProductId} /> : undefined}
+        canPurchase={canPurchase}
+        purchaseFallbackNode={purchaseFallbackNode}
+      />
+      </PaymentReadinessBoundary>
+    </div>
+  );
+}

package/templates/nextblock-template/components/blocks/renderers/ProductGridBlockRenderer.tsx

@@ -1,31 +1,34 @@
-import React from 'react';
-import { ProductGridBlock } from '../../../lib/blocks/ProductGridBlock';
-import type { ProductGridBlockContent } from '../../../lib/blocks/ecommerce-block-schemas';
-import type { VisualEditAttributes } from '../../../lib/visual-editing/types';
-
-interface ProductGridBlockRendererProps {
-  content: ProductGridBlockContent;
-  languageId: number;
-  excludeProductId?: string;
-  excludeTranslationGroupId?: string | null;
-  visualEditAttributes?: VisualEditAttributes;
-}
-
-export default function ProductGridBlockRenderer({ 
-  content, 
-  languageId,
-  excludeProductId,
-  excludeTranslationGroupId,
-  visualEditAttributes,
-}: ProductGridBlockRendererProps) {
-  return (
-    <div {...visualEditAttributes}>
-      <ProductGridBlock
-        content={content}
-        languageId={languageId}
-        excludeProductId={excludeProductId}
-        excludeTranslationGroupId={excludeTranslationGroupId}
-      />
-    </div>
-  );
-}
+import React from 'react';
+import PaymentReadinessBoundary from '../../commerce/PaymentReadinessBoundary';
+import { ProductGridBlock } from '../../../lib/blocks/ProductGridBlock';
+import type { ProductGridBlockContent } from '../../../lib/blocks/ecommerce-block-schemas';
+import type { VisualEditAttributes } from '../../../lib/visual-editing/types';
+
+interface ProductGridBlockRendererProps {
+  content: ProductGridBlockContent;
+  languageId: number;
+  excludeProductId?: string;
+  excludeTranslationGroupId?: string | null;
+  visualEditAttributes?: VisualEditAttributes;
+}
+
+export default function ProductGridBlockRenderer({ 
+  content, 
+  languageId,
+  excludeProductId,
+  excludeTranslationGroupId,
+  visualEditAttributes,
+}: ProductGridBlockRendererProps) {
+  return (
+    <div {...visualEditAttributes}>
+      <PaymentReadinessBoundary>
+      <ProductGridBlock
+        content={content}
+        languageId={languageId}
+        excludeProductId={excludeProductId}
+        excludeTranslationGroupId={excludeTranslationGroupId}
+      />
+      </PaymentReadinessBoundary>
+    </div>
+  );
+}