From 5e0541c7390a38ad980f52e9c3c30a9e6baaf0de Mon Sep 17 00:00:00 2001 From: devops Date: Tue, 13 Oct 2026 16:42:46 +0000 Subject: [PATCH] fix(frontend): remove static fallback data and mock fallbacks across storefront --- .../app/api/torob/products/route.ts | 8 ++--- .../application/app/shop/feed.xml/route.ts | 8 ++--- .../app/sitemap-products.xml/route.ts | 8 ++--- frontend/application/app/sitemap.ts | 13 +++----- .../application/components/ArchivePage.tsx | 2 +- .../application/components/CheckoutPage.tsx | 1 - .../components/FeaturedProducts.tsx | 2 +- .../application/components/IngredientWiki.tsx | 10 +++---- .../application/components/SmartAdvisor.tsx | 8 ++--- .../application/components/VetGallery.tsx | 30 ------------------- .../__tests__/IngredientWiki.test.tsx | 6 ++-- 11 files changed, 28 insertions(+), 68 deletions(-) diff --git a/frontend/application/app/api/torob/products/route.ts b/frontend/application/app/api/torob/products/route.ts index ea60a634..37eb2ed7 100644 --- a/frontend/application/app/api/torob/products/route.ts +++ b/frontend/application/app/api/torob/products/route.ts @@ -1,6 +1,5 @@ import { NextRequest, NextResponse } from 'next/server'; import { productService } from '../../../../lib/services/productService'; -import { PRODUCTS } from '../../../../lib/data/products'; import { getMediaUrl } from '../../../../lib/media'; export const dynamic = 'force-dynamic'; @@ -112,9 +111,10 @@ export async function GET(request: NextRequest) { let allProducts: any[] = []; try { const res = await productService.getProducts({ limit: 999 }); - allProducts = res.data && res.data.length > 0 ? res.data : PRODUCTS; - } catch { - allProducts = PRODUCTS; + allProducts = res.data || []; + } catch (err) { + console.error("Failed to fetch products for Torob:", err); + allProducts = []; } // Filter indexable active products diff --git a/frontend/application/app/shop/feed.xml/route.ts b/frontend/application/app/shop/feed.xml/route.ts index a0cd44d1..3323178d 100644 --- a/frontend/application/app/shop/feed.xml/route.ts +++ b/frontend/application/app/shop/feed.xml/route.ts @@ -1,6 +1,5 @@ import { NextResponse } from 'next/server'; import { productService } from '../../../lib/services/productService'; -import { PRODUCTS } from '../../../lib/data/products'; import { getMediaUrl } from '../../../lib/media'; export const dynamic = 'force-dynamic'; @@ -12,9 +11,10 @@ export async function GET() { let productsList: any[] = []; try { const res = await productService.getProducts({ limit: 999 }); - productsList = res.data && res.data.length > 0 ? res.data : PRODUCTS; - } catch { - productsList = PRODUCTS; + productsList = res.data || []; + } catch (err) { + console.error("Failed to fetch products for feed.xml:", err); + productsList = []; } // Only active, indexable products diff --git a/frontend/application/app/sitemap-products.xml/route.ts b/frontend/application/app/sitemap-products.xml/route.ts index 6165f59b..d7b1fa52 100644 --- a/frontend/application/app/sitemap-products.xml/route.ts +++ b/frontend/application/app/sitemap-products.xml/route.ts @@ -1,6 +1,5 @@ import { NextResponse } from 'next/server'; import { productService } from '../../lib/services/productService'; -import { PRODUCTS } from '../../lib/data/products'; export const dynamic = 'force-dynamic'; export const revalidate = 3600; // Revalidate every hour @@ -11,9 +10,10 @@ export async function GET() { let productsList: any[] = []; try { const res = await productService.getProducts({ limit: 999 }); - productsList = res.data && res.data.length > 0 ? res.data : PRODUCTS; - } catch { - productsList = PRODUCTS; + productsList = res.data || []; + } catch (err) { + console.error("Failed to fetch products for sitemap-products.xml:", err); + productsList = []; } // Filter out noIndex products diff --git a/frontend/application/app/sitemap.ts b/frontend/application/app/sitemap.ts index b6879c9f..7868a4f8 100644 --- a/frontend/application/app/sitemap.ts +++ b/frontend/application/app/sitemap.ts @@ -1,6 +1,5 @@ import { MetadataRoute } from 'next'; import { productService } from '../lib/services/productService'; -import { PRODUCTS } from '../lib/data/products'; export default async function sitemap(): Promise { const baseUrl = process.env.NEXT_PUBLIC_SITE_URL || 'https://canina.ir'; @@ -55,7 +54,7 @@ export default async function sitemap(): Promise { let productRoutes: MetadataRoute.Sitemap = []; try { const res = await productService.getProducts({ limit: 999 }); - const products = res.data && res.data.length > 0 ? res.data : PRODUCTS; + const products = res.data || []; productRoutes = products .filter((product) => !product.noIndex) @@ -65,13 +64,9 @@ export default async function sitemap(): Promise { changeFrequency: 'daily', priority: 0.9, })); - } catch { - productRoutes = PRODUCTS.map((product) => ({ - url: `${baseUrl}/shop/${product.slug || product.artNo || product.id}`, - lastModified: new Date(), - changeFrequency: 'daily', - priority: 0.9, - })); + } catch (error) { + console.error("Failed to fetch products for sitemap:", error); + productRoutes = []; } // Dynamic shop categories diff --git a/frontend/application/components/ArchivePage.tsx b/frontend/application/components/ArchivePage.tsx index 6bcf1aea..aeab7871 100644 --- a/frontend/application/components/ArchivePage.tsx +++ b/frontend/application/components/ArchivePage.tsx @@ -76,7 +76,7 @@ const CATEGORY_MAP: Record = ({ product }) => { +export const ArchiveProductCard: React.FC<{ product: Product }> = ({ product }) => { const { addItem } = useCartStore(); const cartItem = useCartStore((s) => s.items.find(i => i.product.id === product.id)); const [isAdding, setIsAdding] = useState(false); diff --git a/frontend/application/components/CheckoutPage.tsx b/frontend/application/components/CheckoutPage.tsx index dedd015e..12b0b510 100644 --- a/frontend/application/components/CheckoutPage.tsx +++ b/frontend/application/components/CheckoutPage.tsx @@ -18,7 +18,6 @@ import { Edit2 } from "lucide-react"; import { toPersian, cn } from "../lib/utils"; -import { PRODUCTS } from "../lib/data/products"; import { useCartStore } from "../lib/store/cartStore"; import { usePetStore } from "../lib/store/usePetStore"; import { useUserStore } from "../lib/store/userStore"; diff --git a/frontend/application/components/FeaturedProducts.tsx b/frontend/application/components/FeaturedProducts.tsx index f7d04f7b..ee9b7418 100644 --- a/frontend/application/components/FeaturedProducts.tsx +++ b/frontend/application/components/FeaturedProducts.tsx @@ -16,7 +16,7 @@ import { toast } from "sonner"; import { useCatalogMode } from "../lib/useCatalogMode"; import { isSuitableForDog, isSuitableForCat, isSuitableForBoth, isSpeciesCompatible, matchesMedicalSymptom } from "../lib/petCompatibility"; -function ProductCard({ product, priority = false }: { product: Product; priority?: boolean }) { +export function ProductCard({ product, priority = false }: { product: Product; priority?: boolean }) { const router = useRouter(); const { getText } = useSettingsStore(); const { getActivePet } = usePetStore(); diff --git a/frontend/application/components/IngredientWiki.tsx b/frontend/application/components/IngredientWiki.tsx index 70170ff8..2caeee02 100644 --- a/frontend/application/components/IngredientWiki.tsx +++ b/frontend/application/components/IngredientWiki.tsx @@ -1,6 +1,6 @@ "use client"; import { useState, useEffect, useMemo } from "react"; -import { Product, IngredientInfo, PRODUCTS, INGREDIENTS_WIKI } from "../lib/data/products"; +import { Product, IngredientInfo } from "../lib/data/products"; import { motion } from "motion/react"; import { FlaskConical, CheckCircle2, ChevronRight, ChevronLeft, Beaker, Search } from "lucide-react"; import { productService } from "../lib/services/productService"; @@ -64,8 +64,8 @@ export default function IngredientWiki() { const router = useRouter(); const searchParams = useSearchParams(); const termParam = searchParams.get('term'); - const [ingredientsWiki, setIngredientsWiki] = useState(INGREDIENTS_WIKI); - const [products, setProducts] = useState(PRODUCTS); + const [ingredientsWiki, setIngredientsWiki] = useState([]); + const [products, setProducts] = useState([]); const [searchQuery, setSearchQuery] = useState(""); useEffect(() => { @@ -76,7 +76,7 @@ export default function IngredientWiki() { } }) .catch(err => { - console.warn('[IngredientWiki] Using static fallback products:', err); + console.warn('[IngredientWiki] Products fetch failed:', err); setProducts([]); }); }, []); @@ -95,7 +95,7 @@ export default function IngredientWiki() { } }) .catch((err) => { - console.warn('[IngredientWiki] Using static INGREDIENTS_WIKI fallback:', err); + console.warn('[IngredientWiki] Ingredients fetch failed:', err); setIngredientsWiki([]); }); }, []); diff --git a/frontend/application/components/SmartAdvisor.tsx b/frontend/application/components/SmartAdvisor.tsx index dd958b8e..5b3b0ea6 100644 --- a/frontend/application/components/SmartAdvisor.tsx +++ b/frontend/application/components/SmartAdvisor.tsx @@ -16,7 +16,6 @@ import { Download } from "lucide-react"; import { cn } from "../lib/utils"; -import { PRODUCTS } from "../lib/data/products"; import { productService } from "../lib/services/productService"; import { useRouter } from "next/navigation"; @@ -177,14 +176,11 @@ export default function SmartAdvisor({ onComplete, rules = [] }: SmartAdvisorPro matchedProd = (found || liveRes.data[0]) as unknown as Record; } } catch (e) { - console.error("[SmartAdvisor] Dynamic product fetch failed, using fallback", e); + console.error("[SmartAdvisor] Dynamic product fetch failed:", e); } } - if (!matchedProd) { - const fallback = PRODUCTS.find(p => p.suitableFor === "هر دو" || p.suitableFor === type) || PRODUCTS[0]; - matchedProd = fallback as unknown as Record; - } + // No fallback to static PRODUCTS: matchedProd remains null if not found }; const handleSubmit = () => { diff --git a/frontend/application/components/VetGallery.tsx b/frontend/application/components/VetGallery.tsx index 1b8a2c99..d0973fd0 100644 --- a/frontend/application/components/VetGallery.tsx +++ b/frontend/application/components/VetGallery.tsx @@ -25,36 +25,6 @@ export interface TestimonialItem { isActive?: boolean; } -const FALLBACK_VIDEOS = [ - { - id: "v1", - title: "نحوه آماده‌سازی کانی‌هیدروکس GAG", - doctor: "دکتر کلاوس هنینگ", - duration: "۰۱:۴۵", - thumbnail: "https://images.unsplash.com/photo-1576091160550-217359f42f8c?auto=format&fit=crop&q=80&w=400", - videoUrl: "https://www.w3schools.com/html/mov_bbb.mp4", - description: "آموزش گام به گام آماده‌سازی پودر Canhydrox GAG برای جذب حداکثری در دستگاه گوارش." - }, - { - id: "v2", - title: "اهمیت صدف لب‌سبز", - doctor: "دکتر النا اشمیت", - duration: "۰۲:۲۰", - thumbnail: "https://images.unsplash.com/photo-1599443015574-be5fe8a05783?auto=format&fit=crop&q=80&w=400", - videoUrl: "https://www.w3schools.com/html/movie.mp4", - description: "چرا صدف لب‌سبز نیوزیلندی نایاب‌ترین و موثرترین ماده برای بازسازی مفصل است؟" - }, - { - id: "v3", - title: "تغذیه هوشمند توله‌سگ‌ها", - doctor: "دکتر هلگا فیشر", - duration: "۰۳:۱۰", - thumbnail: "/assets/images/regenerated_image_1779109861747.png", - videoUrl: "https://www.w3schools.com/html/mov_bbb.mp4", - description: "دوز مصرفی مکمل‌های کلسیم در نژادهای بزرگ برای جلوگیری از بدشکلی‌های استخوانی." - } -]; - interface DisplayVideoItem { id: string; title?: string; diff --git a/frontend/application/components/__tests__/IngredientWiki.test.tsx b/frontend/application/components/__tests__/IngredientWiki.test.tsx index 3e45096c..99ede074 100644 --- a/frontend/application/components/__tests__/IngredientWiki.test.tsx +++ b/frontend/application/components/__tests__/IngredientWiki.test.tsx @@ -58,7 +58,7 @@ describe('IngredientWiki Component', () => { mockSearchParamsGet.mockReturnValue(null); }); - it('renders default static wiki content when api call fails or returns empty', async () => { + it('renders empty state without static fallback when api call fails or returns empty', async () => { (productService.getProducts as any).mockRejectedValueOnce(new Error('fail')); (api.get as any).mockRejectedValueOnce(new Error('fail')); @@ -71,9 +71,9 @@ describe('IngredientWiki Component', () => { expect(screen.getByText(/۱۰۰٪ فاقد قند افزوده/)).toBeInTheDocument(); expect(screen.getByText(/مطابق استانداردهای دارویی و بالینی آلمان/)).toBeInTheDocument(); - // Default static wiki ingredient should be rendered (e.g. green-mussel / صدف لب‌سبز) + // Verify empty state is rendered (no static fallback data shown) await waitFor(() => { - expect(screen.getByText(/صدف لب‌سبز/)).toBeInTheDocument(); + expect(screen.getByText('ماده‌ای یافت نشد')).toBeInTheDocument(); }); });