diff --git a/frontend/application/app/shop/[slug]/page.tsx b/frontend/application/app/shop/[slug]/page.tsx
index f1fb4528..db415e8c 100644
--- a/frontend/application/app/shop/[slug]/page.tsx
+++ b/frontend/application/app/shop/[slug]/page.tsx
@@ -133,7 +133,7 @@ export default async function ShopProductPage({ params }: { params: Promise<{ sl
const product = await productService.getProductBySlug(resolvedParams.slug);
if (!product) {
- return ;
+ return ;
}
const siteUrl = process.env.NEXT_PUBLIC_SITE_URL || 'https://canina.ir';
@@ -349,7 +349,7 @@ export default async function ShopProductPage({ params }: { params: Promise<{ sl
}>
-
+
>
);
diff --git a/frontend/application/components/ProductPage.tsx b/frontend/application/components/ProductPage.tsx
index 4b3cb003..d8fe376d 100644
--- a/frontend/application/components/ProductPage.tsx
+++ b/frontend/application/components/ProductPage.tsx
@@ -126,9 +126,15 @@ function isVideoUrl(url?: string): boolean {
);
}
-export default function ProductPage({ productSlug }: { productSlug: string }) {
+export default function ProductPage({
+ productSlug,
+ initialProduct,
+}: {
+ productSlug: string;
+ initialProduct?: Product | null;
+}) {
const router = useRouter();
- const [product, setProduct] = useState(null);
+ const [product, setProduct] = useState(initialProduct ?? null);
const [allProducts, setAllProducts] = useState([]);
const [isLoading, setIsLoading] = useState(true);
const [itemQuantity, setItemQuantity] = useState(1);
@@ -167,18 +173,28 @@ export default function ProductPage({ productSlug }: { productSlug: string }) {
}, []);
useEffect(() => {
+ const loadRelatedProducts = () => productService.getProducts({ limit: 50 })
+ .then(res => {
+ if (res && res.data) setAllProducts(res.data);
+ });
+
+ if (initialProduct) {
+ if (initialProduct.image) setActiveImage(initialProduct.image);
+ loadRelatedProducts()
+ .catch(err => console.error("Error fetching related products in ProductPage:", err))
+ .finally(() => setIsLoading(false));
+ return;
+ }
+
productService.getProductBySlug(productSlug)
.then(p => {
setProduct(p);
if (p?.image) setActiveImage(p.image);
- return productService.getProducts({ limit: 50 });
- })
- .then(res => {
- if (res && res.data) setAllProducts(res.data);
+ return loadRelatedProducts();
})
.catch(err => console.error("Error fetching products in ProductPage:", err))
.finally(() => setIsLoading(false));
- }, [productSlug]);
+ }, [productSlug, initialProduct]);
useEffect(() => {
if (product && product.id) {
diff --git a/frontend/application/components/__tests__/ProductPage.test.tsx b/frontend/application/components/__tests__/ProductPage.test.tsx
index ffaaf52a..4a1f29bd 100644
--- a/frontend/application/components/__tests__/ProductPage.test.tsx
+++ b/frontend/application/components/__tests__/ProductPage.test.tsx
@@ -26,6 +26,11 @@ vi.mock('../../lib/useCatalogMode',()=>({useCatalogMode:()=>state.catalog}));
const product={id:'p1',slug:'joint',artNo:'001',name:'Joint Support',scientificTagline:'Daily care',description:'Clinical description',price:'100 تومان',priceValue:100,category:'joints',unit:'tablets',packageSize:100,main_ingredients:[],dosage_logic:'Daily',benefits:'Mobility',symptoms:[],suitableFor:'سگ',analysis:{},feedingAdvice:'With food',image:'/p.png'};
beforeEach(()=>{vi.clearAllMocks();Element.prototype.scrollIntoView=vi.fn();state.catalog={isCatalogOnly:false,allowCart:true,showPrices:true,showPreorderBtn:false};vi.mocked(productService.getProductBySlug).mockResolvedValue(product as any);vi.mocked(productService.getProducts).mockResolvedValue({data:[]} as any);});
describe('ProductPage',()=>{
+ it('renders server-provided product without waiting for a client product fetch',async()=>{
+ render();
+ expect((await screen.findAllByText('Joint Support')).length).toBeGreaterThan(0);
+ expect(productService.getProductBySlug).not.toHaveBeenCalled();
+ });
it('shows loading state until product and related catalog settle',async()=>{let resolve!:(v:any)=>void;vi.mocked(productService.getProductBySlug).mockReturnValueOnce(new Promise(r=>{resolve=r;}));const {container}=render();expect(container.querySelector('.animate-pulse')).toBeInTheDocument();resolve(product);await screen.findByTestId('product-desktop-add-to-cart-btn');expect(container.querySelector('.animate-pulse')).not.toBeInTheDocument();expect(productService.getProductBySlug).toHaveBeenCalledWith('joint');});
it.each([null,undefined])('handles absent product %s',async value=>{vi.mocked(productService.getProductBySlug).mockResolvedValueOnce(value as any);render();expect(await screen.findByText('محصول یافت نشد')).toBeInTheDocument();expect(state.addItem).not.toHaveBeenCalled();});
it('handles rejected product request',async()=>{const err=vi.spyOn(console,'error').mockImplementation(()=>{});vi.mocked(productService.getProductBySlug).mockRejectedValueOnce(new Error('offline'));render();await screen.findByText('محصول یافت نشد');expect(err).toHaveBeenCalled();err.mockRestore();});