@akinon/projectzero 1.102.0-rc.79 → 1.103.0-rc.80

package/CHANGELOG.md

@@ -1,10 +1,6 @@
 # @akinon/projectzero
 
-## 1.102.0-rc.79
-
-## 1.102.0-rc.78
-
-## 1.102.0-rc.77
+## 1.103.0-rc.80
 
 ### Minor Changes
 
@@ -21,6 +17,8 @@
 - d99a6a7d: ZERO-3457: Fixed the settings prop and made sure everything is customizable.
 - 33377cfd: ZERO-3267: Refactor import statement for ROUTES in error-page component
 
+## 1.102.0
+
 ## 1.101.0
 
 ## 1.100.0

package/app-template/CHANGELOG.md

@@ -1,54 +1,6 @@
 # projectzeronext
 
-## 1.102.0-rc.79
-
-### Patch Changes
-
-- Updated dependencies [9a3885b]
-  - @akinon/next@1.102.0-rc.79
-  - @akinon/pz-akifast@1.102.0-rc.79
-  - @akinon/pz-b2b@1.102.0-rc.79
-  - @akinon/pz-basket-gift-pack@1.102.0-rc.79
-  - @akinon/pz-bkm@1.102.0-rc.79
-  - @akinon/pz-checkout-gift-pack@1.102.0-rc.79
-  - @akinon/pz-click-collect@1.102.0-rc.79
-  - @akinon/pz-credit-payment@1.102.0-rc.79
-  - @akinon/pz-gpay@1.102.0-rc.79
-  - @akinon/pz-hepsipay@1.102.0-rc.79
-  - @akinon/pz-masterpass@1.102.0-rc.79
-  - @akinon/pz-one-click-checkout@1.102.0-rc.79
-  - @akinon/pz-otp@1.102.0-rc.79
-  - @akinon/pz-pay-on-delivery@1.102.0-rc.79
-  - @akinon/pz-saved-card@1.102.0-rc.79
-  - @akinon/pz-similar-products@1.102.0-rc.79
-  - @akinon/pz-tabby-extension@1.102.0-rc.79
-  - @akinon/pz-tamara-extension@1.102.0-rc.79
-
-## 1.102.0-rc.78
-
-### Patch Changes
-
-- Updated dependencies [d512ea2]
-  - @akinon/next@1.102.0-rc.78
-  - @akinon/pz-akifast@1.102.0-rc.78
-  - @akinon/pz-b2b@1.102.0-rc.78
-  - @akinon/pz-basket-gift-pack@1.102.0-rc.78
-  - @akinon/pz-bkm@1.102.0-rc.78
-  - @akinon/pz-checkout-gift-pack@1.102.0-rc.78
-  - @akinon/pz-click-collect@1.102.0-rc.78
-  - @akinon/pz-credit-payment@1.102.0-rc.78
-  - @akinon/pz-gpay@1.102.0-rc.78
-  - @akinon/pz-hepsipay@1.102.0-rc.78
-  - @akinon/pz-masterpass@1.102.0-rc.78
-  - @akinon/pz-one-click-checkout@1.102.0-rc.78
-  - @akinon/pz-otp@1.102.0-rc.78
-  - @akinon/pz-pay-on-delivery@1.102.0-rc.78
-  - @akinon/pz-saved-card@1.102.0-rc.78
-  - @akinon/pz-similar-products@1.102.0-rc.78
-  - @akinon/pz-tabby-extension@1.102.0-rc.78
-  - @akinon/pz-tamara-extension@1.102.0-rc.78
-
-## 1.102.0-rc.77
+## 1.103.0-rc.80
 
 ### Minor Changes
 
@@ -83,7 +35,7 @@
 
 ### Patch Changes
 
-- Updated dependencies [4c23847]
+- Updated dependencies [4c238479]
 - Updated dependencies [4ca44c7]
 - Updated dependencies [5dfeea04a]
 - Updated dependencies [823d82f9]
@@ -140,6 +92,7 @@
 - Updated dependencies [33377cfd]
 - Updated dependencies [6bfbdc2]
 - Updated dependencies [43c182eef]
+- Updated dependencies [d512ea2]
 - Updated dependencies [c480272c]
 - Updated dependencies [08c3caec]
 - Updated dependencies [facf1ada]
@@ -162,23 +115,51 @@
 - Updated dependencies [49eeebfaa]
 - Updated dependencies [3f9b8d7e7]
 - Updated dependencies [0e823010]
-- Updated dependencies [e9af4e2]
-  - @akinon/pz-gpay@1.102.0-rc.77
-  - @akinon/pz-saved-card@1.102.0-rc.77
-  - @akinon/next@1.102.0-rc.77
-  - @akinon/pz-pay-on-delivery@1.102.0-rc.77
-  - @akinon/pz-basket-gift-pack@1.102.0-rc.77
-  - @akinon/pz-bkm@1.102.0-rc.77
-  - @akinon/pz-checkout-gift-pack@1.102.0-rc.77
-  - @akinon/pz-one-click-checkout@1.102.0-rc.77
-  - @akinon/pz-tamara-extension@1.102.0-rc.77
-  - @akinon/pz-tabby-extension@1.102.0-rc.77
-  - @akinon/pz-credit-payment@1.102.0-rc.77
-  - @akinon/pz-click-collect@1.102.0-rc.77
-  - @akinon/pz-masterpass@1.102.0-rc.77
-  - @akinon/pz-akifast@1.102.0-rc.77
-  - @akinon/pz-b2b@1.102.0-rc.77
-  - @akinon/pz-otp@1.102.0-rc.77
+- Updated dependencies [e9af4e24]
+  - @akinon/pz-gpay@1.103.0-rc.80
+  - @akinon/pz-saved-card@1.103.0-rc.80
+  - @akinon/next@1.103.0-rc.80
+  - @akinon/pz-pay-on-delivery@1.103.0-rc.80
+  - @akinon/pz-basket-gift-pack@1.103.0-rc.80
+  - @akinon/pz-bkm@1.103.0-rc.80
+  - @akinon/pz-checkout-gift-pack@1.103.0-rc.80
+  - @akinon/pz-one-click-checkout@1.103.0-rc.80
+  - @akinon/pz-tamara-extension@1.103.0-rc.80
+  - @akinon/pz-tabby-extension@1.103.0-rc.80
+  - @akinon/pz-credit-payment@1.103.0-rc.80
+  - @akinon/pz-click-collect@1.103.0-rc.80
+  - @akinon/pz-masterpass@1.103.0-rc.80
+  - @akinon/pz-akifast@1.103.0-rc.80
+  - @akinon/pz-b2b@1.103.0-rc.80
+  - @akinon/pz-otp@1.103.0-rc.80
+
+## 1.102.0
+
+### Minor Changes
+
+- 6b949cb: ZERO-3615: Refactor product data handling and improve 404 error handling
+- 7302f5e: ZERO-3615: Add error handling for 404 status in page components and create NotFound component
+
+### Patch Changes
+
+- Updated dependencies [6b949cb]
+- Updated dependencies [9a3885b]
+  - @akinon/next@1.102.0
+  - @akinon/pz-akifast@1.102.0
+  - @akinon/pz-b2b@1.102.0
+  - @akinon/pz-basket-gift-pack@1.102.0
+  - @akinon/pz-bkm@1.102.0
+  - @akinon/pz-checkout-gift-pack@1.102.0
+  - @akinon/pz-click-collect@1.102.0
+  - @akinon/pz-credit-payment@1.102.0
+  - @akinon/pz-gpay@1.102.0
+  - @akinon/pz-masterpass@1.102.0
+  - @akinon/pz-one-click-checkout@1.102.0
+  - @akinon/pz-otp@1.102.0
+  - @akinon/pz-pay-on-delivery@1.102.0
+  - @akinon/pz-saved-card@1.102.0
+  - @akinon/pz-tabby-extension@1.102.0
+  - @akinon/pz-tamara-extension@1.102.0
 
 ## 1.101.0
 

package/app-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "projectzeronext",
-  "version": "1.102.0-rc.79",
+  "version": "1.103.0-rc.80",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -24,24 +24,22 @@
     "test:middleware": "jest middleware-matcher.test.ts --bail"
   },
   "dependencies": {
-    "@akinon/next": "1.102.0-rc.79",
-    "@akinon/pz-akifast": "1.102.0-rc.79",
-    "@akinon/pz-b2b": "1.102.0-rc.79",
-    "@akinon/pz-basket-gift-pack": "1.102.0-rc.79",
-    "@akinon/pz-bkm": "1.102.0-rc.79",
-    "@akinon/pz-checkout-gift-pack": "1.102.0-rc.79",
-    "@akinon/pz-click-collect": "1.102.0-rc.79",
-    "@akinon/pz-credit-payment": "1.102.0-rc.79",
-    "@akinon/pz-gpay": "1.102.0-rc.79",
-    "@akinon/pz-hepsipay": "1.102.0-rc.79",
-    "@akinon/pz-masterpass": "1.102.0-rc.79",
-    "@akinon/pz-one-click-checkout": "1.102.0-rc.79",
-    "@akinon/pz-otp": "1.102.0-rc.79",
-    "@akinon/pz-pay-on-delivery": "1.102.0-rc.79",
-    "@akinon/pz-saved-card": "1.102.0-rc.79",
-    "@akinon/pz-similar-products": "1.102.0-rc.79",
-    "@akinon/pz-tabby-extension": "1.102.0-rc.79",
-    "@akinon/pz-tamara-extension": "1.102.0-rc.79",
+    "@akinon/next": "1.103.0-rc.80",
+    "@akinon/pz-akifast": "1.103.0-rc.80",
+    "@akinon/pz-b2b": "1.103.0-rc.80",
+    "@akinon/pz-basket-gift-pack": "1.103.0-rc.80",
+    "@akinon/pz-bkm": "1.103.0-rc.80",
+    "@akinon/pz-checkout-gift-pack": "1.103.0-rc.80",
+    "@akinon/pz-click-collect": "1.103.0-rc.80",
+    "@akinon/pz-credit-payment": "1.103.0-rc.80",
+    "@akinon/pz-gpay": "1.103.0-rc.80",
+    "@akinon/pz-masterpass": "1.103.0-rc.80",
+    "@akinon/pz-one-click-checkout": "1.103.0-rc.80",
+    "@akinon/pz-otp": "1.103.0-rc.80",
+    "@akinon/pz-pay-on-delivery": "1.103.0-rc.80",
+    "@akinon/pz-saved-card": "1.103.0-rc.80",
+    "@akinon/pz-tabby-extension": "1.103.0-rc.80",
+    "@akinon/pz-tamara-extension": "1.103.0-rc.80",
     "@hookform/resolvers": "2.9.0",
     "@next/third-parties": "14.1.0",
     "@react-google-maps/api": "2.17.1",
@@ -64,7 +62,7 @@
     "yup": "0.32.11"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.102.0-rc.79",
+    "@akinon/eslint-plugin-projectzero": "1.103.0-rc.80",
     "@semantic-release/changelog": "6.0.2",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",

package/app-template/src/app/[commerce]/[locale]/[currency]/category/[pk]/page.tsx

@@ -5,28 +5,23 @@ import CategoryLayout from '@theme/views/category/layout';
 import { notFound } from 'next/navigation';
 
 async function Page({ params, searchParams }: PageProps<{ pk: number }>) {
-  let categoryData;
-
   try {
-    categoryData = await getCategoryData({
+    const { data, breadcrumbData } = await getCategoryData({
       pk: params.pk,
       searchParams
     });
-  } catch (error) {
-    return notFound();
-  }
 
-  if (!categoryData || !categoryData.data) {
-    return notFound();
+    return (
+      <>
+        <CategoryLayout data={data} breadcrumbData={breadcrumbData} />
+      </>
+    );
+  } catch (error: unknown) {
+    if ((error as Error & { status?: number })?.status === 404) {
+      notFound();
+    }
+    throw error;
   }
-
-  const { data, breadcrumbData } = categoryData;
-
-  return (
-    <>
-      <CategoryLayout data={data} breadcrumbData={breadcrumbData} />
-    </>
-  );
 }
 
 export default withSegmentDefaults(Page, { segmentType: 'page' });

package/app-template/src/app/[commerce]/[locale]/[currency]/flat-page/[pk]/page.tsx

@@ -4,26 +4,20 @@ import { PageProps } from '@akinon/next/types';
 import { notFound } from 'next/navigation';
 
 async function Page({ params }: PageProps<{ pk: number }>) {
-  let data;
-
   try {
-    data = await getFlatPageData({ pk: params.pk });
-  } catch (error) {
-    return notFound();
-  }
+    const data = await getFlatPageData({ pk: params.pk });
 
-  if (!data || !data.flat_page) {
-    return notFound();
+    return (
+      <div className="container mx-auto py-6">
+        <div
+          className="mx-auto prose prose-headings:text-primary"
+          dangerouslySetInnerHTML={{ __html: data.flat_page.content }}
+        />
+      </div>
+    );
+  } catch (error) {
+    notFound();
   }
-
-  return (
-    <div className="container mx-auto py-6">
-      <div
-        className="mx-auto prose prose-headings:text-primary"
-        dangerouslySetInnerHTML={{ __html: data.flat_page.content }}
-      />
-    </div>
-  );
 }
 
 export default withSegmentDefaults(Page, { segmentType: 'page' });

package/app-template/src/app/[commerce]/[locale]/[currency]/group-product/[pk]/page.tsx

@@ -13,46 +13,50 @@ export async function generateMetadata({
   let result: Metadata = {};
 
   try {
-    const productData = await getProductData({
+    const { data } = await getProductData({
       pk: params.pk,
       searchParams,
       groupProduct: true
     });
 
-    // If product data is not found, return empty metadata
-    if (!productData || !productData.data || !productData.data.product) {
-      return result;
-    }
+    const product = data?.product;
 
-    const { product } = productData.data;
+    if (!product) {
+      return {};
+    }
 
     result = {
       title: product.name,
-      description: String(product.attributes.description),
+      description: String(product.attributes?.description),
       twitter: {
         title: product.name,
-        description: String(product.attributes.description)
+        description: String(product.attributes?.description)
       },
       openGraph: {
         title: product.name,
-        description: String(product.attributes.description),
+        description: String(product.attributes?.description),
         images: product.productimage_set?.map((item) => ({
           url: item.image
         }))
       }
     };
-    // eslint-disable-next-line no-empty
-  } catch (error) {}
+  } catch (error: unknown) {
+    if ((error as Error & { status?: number })?.status === 404) {
+      notFound();
+    }
+    throw error;
+  }
 
   return result;
 }
 
 async function Page({ params, searchParams }: PageProps<{ pk: number }>) {
-  let productData;
-  let deliveryReturn;
+  if (params.pk === undefined || isNaN(Number(params.pk))) {
+    notFound();
+  }
 
   try {
-    [productData, deliveryReturn] = await Promise.all([
+    const [{ data, breadcrumbData }, deliveryReturn] = await Promise.all([
       getProductData({
         pk: params.pk,
         searchParams,
@@ -60,31 +64,29 @@ async function Page({ params, searchParams }: PageProps<{ pk: number }>) {
       }),
       getWidgetData({ slug: 'product-delivery-returns' })
     ]);
-  } catch (error) {
-    return notFound();
-  }
-
-  if (!productData || !productData.data || !productData.data.product) {
-    return notFound();
-  }
 
-  const { data, breadcrumbData } = productData;
-  const jsonLd = generateJsonLd(data.product);
+    const jsonLd = generateJsonLd(data.product);
 
-  return (
-    <>
-      <ProductLayout data={data} breadcrumbData={breadcrumbData}>
-        <ProductGroupInfo
-          data={data}
-          deliveryReturn={deliveryReturn?.attributes}
+    return (
+      <>
+        <ProductLayout data={data} breadcrumbData={breadcrumbData}>
+          <ProductGroupInfo
+            data={data}
+            deliveryReturn={deliveryReturn?.attributes}
+          />
+        </ProductLayout>
+        <script
+          type="application/ld+json"
+          dangerouslySetInnerHTML={{ __html: JSON.stringify(jsonLd) }}
         />
-      </ProductLayout>
-      <script
-        type="application/ld+json"
-        dangerouslySetInnerHTML={{ __html: JSON.stringify(jsonLd) }}
-      />
-    </>
-  );
+      </>
+    );
+  } catch (error: unknown) {
+    if ((error as Error & { status?: number })?.status === 404) {
+      notFound();
+    }
+    throw error;
+  }
 }
 
 export default withSegmentDefaults(Page, { segmentType: 'page' });

package/app-template/src/app/[commerce]/[locale]/[currency]/{pz-not-found/page.tsx → not-found.tsx}

@@ -4,14 +4,14 @@ import React from 'react';
 import { Button, Link } from '@theme/components';
 import { useLocalization } from '@akinon/next/hooks';
 
-const NotFound = () => {
+export default function NotFound() {
   const { t } = useLocalization();
 
   return (
-    <div className="py-6 flex flex-col items-center justify-center">
-      <div className="text-8xl font-bold">404</div>
+    <div className="py-10 flex flex-col items-center justify-center">
+      <div className="text-8xl font-bold text-gray-400">404</div>
       <h1 className="text-4xl font-bold mb-4">{t('not_found.title')}</h1>
-      <p className="text-lg mb-6">{t('not_found.sub_title')}</p>
+      <p className="text-lg mb-6 text-gray-600">{t('not_found.sub_title')}</p>
       <Link href={'/'}>
         <Button className="h-auto mt-4 text-base py-3 px-6">
           {t('not_found.button')}
@@ -19,6 +19,4 @@ const NotFound = () => {
       </Link>
     </div>
   );
-};
-
-export default NotFound;
+}

package/app-template/src/app/[commerce]/[locale]/[currency]/product/[pk]/page.tsx

@@ -13,87 +13,89 @@ export async function generateMetadata({
   let result: Metadata = {};
 
   try {
-    const productData = await getProductData({
+    const { data } = await getProductData({
       pk: params.pk,
       searchParams
     });
 
-    if (!productData || !productData.data || !productData.data.product) {
-      return result;
-    }
+    const product = data?.product;
 
-    const { product } = productData.data;
+    if (!product) {
+      return {};
+    }
 
     result = {
       title: product.name,
-      description: String(product.attributes.description),
+      description: String(product.attributes?.description),
       twitter: {
         title: product.name,
-        description: String(product.attributes.description)
+        description: String(product.attributes?.description)
       },
       openGraph: {
         title: product.name,
-        description: String(product.attributes.description),
+        description: String(product.attributes?.description),
         images: product.productimage_set?.map((item) => ({
           url: item.image
         }))
       }
     };
-    // eslint-disable-next-line no-empty
-  } catch (error) {}
+  } catch (error: unknown) {
+    if ((error as Error & { status?: number })?.status === 404) {
+      notFound();
+    }
+    throw error;
+  }
 
   return result;
 }
 
 async function Page({ params, searchParams }: PageProps<{ pk: number }>) {
-  let productData;
-  let deliveryReturn;
+  if (params.pk === undefined || isNaN(Number(params.pk))) {
+    notFound();
+  }
 
   try {
-    [productData, deliveryReturn] = await Promise.all([
+    const [{ data, breadcrumbData }, deliveryReturn] = await Promise.all([
       getProductData({
         pk: params.pk,
         searchParams
       }),
       getWidgetData({ slug: 'product-delivery-returns' })
     ]);
-  } catch (error) {
-    return notFound();
-  }
-
-  // If product data is not found, return 404
-  if (!productData || !productData.data || !productData.data.product) {
-    return notFound();
-  }
 
-  const { data, breadcrumbData } = productData;
-  const jsonLd = generateJsonLd(data.product);
+    const jsonLd = generateJsonLd(data.product);
 
-  return (
-    <>
-      <ProductLayout data={data} breadcrumbData={breadcrumbData}>
-        <div className="flex flex-col items-center">
-          <h1
-            className="mt-4 text-2xl text-center md:mt-0"
-            data-testid="product-name"
-          >
-            {data.product.name}
-          </h1>
+    return (
+      <>
+        <ProductLayout data={data} breadcrumbData={breadcrumbData}>
+          <div className="flex flex-col items-center">
+            <h1
+              className="mt-4 text-2xl text-center md:mt-0"
+              data-testid="product-name"
+            >
+              {data.product.name}
+            </h1>
 
-          <ProductInfo data={data} />
+            <ProductInfo data={data} />
 
-          <AccordionWrapper
-            data={data}
-            deliveryReturn={deliveryReturn?.attributes}
-          />
-        </div>
-      </ProductLayout>
-      <script
-        type="application/ld+json"
-        dangerouslySetInnerHTML={{ __html: JSON.stringify(jsonLd) }}
-      />
-    </>
-  );
+            <AccordionWrapper
+              data={data}
+              deliveryReturn={deliveryReturn?.attributes}
+            />
+          </div>
+        </ProductLayout>
+        <script
+          type="application/ld+json"
+          dangerouslySetInnerHTML={{ __html: JSON.stringify(jsonLd) }}
+        />
+      </>
+    );
+  } catch (error: unknown) {
+    if ((error as Error & { status?: number })?.status === 404) {
+      notFound();
+    }
+    throw error;
+  }
 }
 
 export default withSegmentDefaults(Page, { segmentType: 'page' });

package/app-template/src/app/[commerce]/[locale]/[currency]/special-page/[pk]/page.tsx

@@ -7,30 +7,29 @@ import SpecialPageCarousel from '@theme/widgets/special-page-carousel';
 import { notFound } from 'next/navigation';
 
 async function Page({ params, searchParams }: PageProps<{ pk: number }>) {
-  let data;
-
   try {
-    data = await getSpecialPageData({ pk: params.pk, searchParams });
-  } catch (error) {
-    return notFound();
-  }
+    const data = await getSpecialPageData({ pk: params.pk, searchParams });
 
-  if (!data) {
-    return notFound();
+    return (
+      <>
+        <CategoryLayout data={data}>
+          {data.special_page && (
+            <>
+              <SpecialPageBanner data={data.special_page} />
+              <SpecialPageCarousel
+                slug={data.special_page.video_embedded_code}
+              />
+            </>
+          )}
+        </CategoryLayout>
+      </>
+    );
+  } catch (error: unknown) {
+    if ((error as Error & { status?: number })?.status === 404) {
+      notFound();
+    }
+    throw error;
   }
-
-  return (
-    <>
-      <CategoryLayout data={data}>
-        {data.special_page && (
-          <>
-            <SpecialPageBanner data={data.special_page} />
-            <SpecialPageCarousel slug={data.special_page.video_embedded_code} />
-          </>
-        )}
-      </CategoryLayout>
-    </>
-  );
 }
 
 export default withSegmentDefaults(Page, { segmentType: 'page' });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akinon/projectzero",
-  "version": "1.102.0-rc.79",
+  "version": "1.103.0-rc.80",
   "private": false,
   "description": "CLI tool to manage your Project Zero Next project",
   "bin": {