@akinon/next 1.93.0 → 1.95.0-rc.54

package/data/server/product.ts

@@ -35,57 +35,84 @@ const getProductDataHandler = ({
           .join('&');
     }
 
-    const data = await appFetch<ProductResult>({
-      url,
-      locale,
-      currency,
-      init: {
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json',
-          ...(headers ?? {})
+    let data: ProductResult;
+
+    try {
+      data = await appFetch<ProductResult>({
+        url,
+        locale,
+        currency,
+        init: {
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json',
+            ...(headers ?? {})
+          }
         }
-      }
-    });
+      });
+    } catch (error) {
+      logger.error('Failed to fetch product data', {
+        handler: 'getProductDataHandler',
+        pk,
+        error: error.message,
+        url
+      });
+      return null;
+    }
 
     const categoryUrl = product.categoryUrl(data.product.pk);
 
-    const productCategoryData = await appFetch<ProductCategoryResult>({
-      url: categoryUrl,
-      locale,
-      currency,
-      init: {
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json'
+    let productCategoryData: ProductCategoryResult;
+    let breadcrumbData: { menu?: unknown } = {};
+
+    try {
+      productCategoryData = await appFetch<ProductCategoryResult>({
+        url: categoryUrl,
+        locale,
+        currency,
+        init: {
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json'
+          }
         }
+      });
+
+      const menuItemModel = productCategoryData?.results[0]?.menuitemmodel;
+
+      if (!menuItemModel) {
+        logger.warn(
+          'menuItemModel is undefined, skipping breadcrumbData fetch',
+          {
+            handler: 'getProductDataHandler',
+            pk
+          }
+        );
+        return { data, breadcrumbData: undefined };
       }
-    });
 
-    const menuItemModel = productCategoryData?.results[0]?.menuitemmodel;
+      const breadcrumbUrl = product.breadcrumbUrl(menuItemModel);
 
-    if (!menuItemModel) {
-      logger.warn('menuItemModel is undefined, skipping breadcrumbData fetch', {
+      breadcrumbData = await appFetch<{ menu?: unknown }>({
+        url: breadcrumbUrl,
+        locale,
+        currency,
+        init: {
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json'
+          }
+        }
+      });
+    } catch (error) {
+      logger.warn('Failed to fetch breadcrumb data', {
         handler: 'getProductDataHandler',
-        pk
+        pk,
+        error: error.message
       });
-      return { data, breadcrumbData: undefined };
+      // Continue without breadcrumb data
     }
 
-    const breadcrumbUrl = product.breadcrumbUrl(menuItemModel);
-
-    const breadcrumbData = await appFetch<any>({
-      url: breadcrumbUrl,
-      locale,
-      currency,
-      init: {
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json'
-        }
-      }
-    });
-
     return {
       data,
       breadcrumbData: breadcrumbData?.menu

package/data/server/special-page.ts

@@ -15,20 +15,24 @@ const getSpecialPageDataHandler = (
   return async function () {
     const params = generateCommerceSearchParams(searchParams);
 
-    const data: GetCategoryResponse = await appFetch({
-      url: `${category.getSpecialPageByPk(pk)}${params}`,
-      locale,
-      currency,
-      init: {
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json',
-          ...(headers ?? {})
+    try {
+      const data: GetCategoryResponse = await appFetch({
+        url: `${category.getSpecialPageByPk(pk)}${params}`,
+        locale,
+        currency,
+        init: {
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json',
+            ...(headers ?? {})
+          }
         }
-      }
-    });
+      });
 
-    return data;
+      return data;
+    } catch (error) {
+      return null;
+    }
   };
 };
 

package/data/urls.ts

@@ -142,7 +142,8 @@ export const checkout = {
   setOrderSelectionPage: '/orders/checkout/?page=OrderSelectionPage',
   loyaltyCardPage: '/orders/checkout/?page=LoyaltyCardPage',
   sendSmsPage: '/orders/checkout/?page=SendSmsPage',
-  verifySmsPage: '/orders/checkout/?page=VerifySmsPage'
+  verifySmsPage: '/orders/checkout/?page=VerifySmsPage',
+  saveSampleProducts: '/orders/checkout/?page=SampleProductPage'
 };
 
 export const flatpage = {
@@ -182,7 +183,11 @@ export const product = {
   breadcrumbUrl: (menuitemmodel: string) =>
     `/menus/generate_breadcrumb/?item=${menuitemmodel}&generator_name=menu_item`,
   bundleProduct: (productPk: string, queryString: string) =>
-    `/bundle-product/${productPk}/?${queryString}`
+    `/bundle-product/${productPk}/?${queryString}`,
+  similarProducts: (params?: string) =>
+    `/similar-products${params ? `?${params}` : ''}`,
+  similarProductsList: (params?: string) =>
+    `/similar-product-list${params ? `?${params}` : ''}`
 };
 
 export const wishlist = {

package/hocs/server/with-segment-defaults.tsx

@@ -72,10 +72,13 @@ const addRootLayoutProps = async (componentProps: RootLayoutProps) => {
 const checkRedisVariables = () => {
   const requiredVariableValues = [
     process.env.CACHE_HOST,
-    process.env.CACHE_PORT,
-    process.env.CACHE_SECRET
+    process.env.CACHE_PORT
   ];
 
+  if (!settings.usePrettyUrlRoute) {
+    requiredVariableValues.push(process.env.CACHE_SECRET);
+  }
+
   if (
     !requiredVariableValues.every((v) => v) &&
     process.env.NODE_ENV === 'production'

package/hooks/use-localization.ts

@@ -4,7 +4,6 @@ import { LocalizationContext } from '../localization/provider';
 import { useContext } from 'react';
 import { setCookie, urlLocaleMatcherRegex } from '../utils';
 import { LocaleUrlStrategy } from '../localization';
-import { useRouter } from 'next/navigation';
 
 export const useLocalization = () => {
   const {
@@ -18,8 +17,6 @@ export const useLocalization = () => {
     localeUrlStrategy
   } = useContext(LocalizationContext);
 
-  const router = useRouter();
-
   /**
    * Sets the locale in the URL.
    * @param locale Locale value defined in the settings.
@@ -30,6 +27,8 @@ export const useLocalization = () => {
 
     let targetUrl;
 
+    setCookie('pz-locale', locale);
+
     if (localeUrlStrategy === LocaleUrlStrategy.Subdomain) {
       const hostParts = hostname.split('.');
       const subDomain = hostParts[0];

package/hooks/use-loyalty-availability.ts

@@ -0,0 +1,21 @@
+import { useAppSelector } from '../redux/hooks';
+
+export const useLoyaltyAvailability = () => {
+  const { paymentOptions, unavailablePaymentOptions } = useAppSelector(
+    (state) => state.checkout
+  );
+
+  const hasLoyaltyInAvailable = paymentOptions.some(
+    (option) =>
+      option.payment_type === 'loyalty_money' ||
+      option.payment_type === 'loyalty'
+  );
+
+  const hasLoyaltyInUnavailable = unavailablePaymentOptions.some(
+    (option) =>
+      option.payment_type === 'loyalty_money' ||
+      option.payment_type === 'loyalty'
+  );
+
+  return hasLoyaltyInAvailable || hasLoyaltyInUnavailable;
+};

package/instrumentation/node.ts

@@ -4,17 +4,19 @@ import { Resource } from '@opentelemetry/resources';
 import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
 import { SimpleSpanProcessor } from '@opentelemetry/sdk-trace-node';
 
-const sdk = new NodeSDK({
-  resource: new Resource({
-    [SemanticResourceAttributes.SERVICE_NAME]: 'pz-next-app'
-  }),
-  spanProcessor: new SimpleSpanProcessor(
-    new OTLPTraceExporter({
-      url: `${
-        process.env.PZ_DASHBOARD_URL ?? 'http://localhost:3005'
-      }/api/traces`
-    })
-  )
-});
+if (process.env.NODE_ENV === 'development') {
+  const sdk = new NodeSDK({
+    resource: new Resource({
+      [SemanticResourceAttributes.SERVICE_NAME]: 'pz-next-app'
+    }),
+    spanProcessor: new SimpleSpanProcessor(
+      new OTLPTraceExporter({
+        url: `${
+          process.env.PZ_DASHBOARD_URL ?? 'http://localhost:3005'
+        }/api/traces`
+      })
+    )
+  });
 
-sdk.start();
+  sdk.start();
+}

package/jest.config.js

@@ -1,13 +1,19 @@
 const path = require('path');
+const findBaseDir = require('./utils/find-base-dir');
+
+const baseDir = findBaseDir();
 
 module.exports = {
   preset: 'ts-jest',
   testEnvironment: 'node',
   rootDir: path.resolve(__dirname),
-  roots: [],
   testMatch: ['**/*.test.ts'],
   testPathIgnorePatterns: [],
+  roots: [path.resolve(__dirname)],
   transformIgnorePatterns: [],
+  moduleNameMapper: {
+    '^settings$': path.resolve(baseDir, 'src/settings.js')
+  },
   transform: {
     '^.+\\.(tsx?|jsx?|mjs?)$': [
       'ts-jest',

package/lib/cache.ts

@@ -31,6 +31,8 @@ export const CacheKey = {
     `category_${pk}_${encodeURIComponent(
       JSON.stringify(searchParams)
     )}${hashCacheKey(headers)}`,
+  Basket: (namespace?: string) => `basket${namespace ? `_${namespace}` : ''}`,
+  AllBaskets: () => 'all_baskets',
   CategorySlug: (slug: string) => `category_${slug}`,
   SpecialPage: (
     pk: number,

package/middlewares/checkout-provider.ts

@@ -64,7 +64,7 @@ const withCheckoutProvider =
           const location = request.headers.get('location');
           const redirectUrl = new URL(
             request.headers.get('location'),
-            location.startsWith('http') ? '' : process.env.NEXT_PUBLIC_URL
+            location.startsWith('http') ? '' : url.origin
           );
 
           redirectUrl.pathname = getUrlPathWithLocale(

package/middlewares/complete-gpay.ts

@@ -34,6 +34,7 @@ const withCompleteGpay =
     const url = req.nextUrl.clone();
     const ip = req.headers.get('x-forwarded-for') ?? '';
     const sessionId = req.cookies.get('osessionid');
+    const currentLocale = req.middlewareParams?.rewrites?.locale;
 
     if (url.search.indexOf('GPayCompletePage') === -1) {
       return middleware(req, event);
@@ -45,7 +46,9 @@ const withCompleteGpay =
       'Content-Type': 'application/x-www-form-urlencoded',
       Cookie: req.headers.get('cookie') ?? '',
       'x-currency': req.cookies.get('pz-currency')?.value ?? '',
-      'x-forwarded-for': ip
+      'x-forwarded-for': ip,
+      'Accept-Language':
+        currentLocale ?? req.cookies.get('pz-locale')?.value ?? ''
     };
 
     try {
@@ -145,7 +148,8 @@ const withCompleteGpay =
       logger.info('Redirecting to order success page', {
         middleware: 'complete-gpay',
         redirectUrlWithLocale,
-        ip
+        ip,
+        setCookie: request.headers.get('set-cookie')
       });
 
       // Using POST method while redirecting causes an error,

package/middlewares/complete-masterpass.ts

@@ -4,6 +4,7 @@ import { Buffer } from 'buffer';
 import logger from '../utils/log';
 import { getUrlPathWithLocale } from '../utils/localization';
 import { PzNextRequest } from '.';
+import { ServerVariables } from '../utils/server-variables';
 
 const streamToString = async (stream: ReadableStream<Uint8Array> | null) => {
   if (stream) {
@@ -34,6 +35,7 @@ const withCompleteMasterpass =
     const url = req.nextUrl.clone();
     const ip = req.headers.get('x-forwarded-for') ?? '';
     const sessionId = req.cookies.get('osessionid');
+    const currentLocale = req.middlewareParams?.rewrites?.locale;
 
     if (url.search.indexOf('MasterpassCompletePage') === -1) {
       return middleware(req, event);
@@ -45,7 +47,9 @@ const withCompleteMasterpass =
       'Content-Type': 'application/x-www-form-urlencoded',
       Cookie: req.headers.get('cookie') ?? '',
       'x-currency': req.cookies.get('pz-currency')?.value ?? '',
-      'x-forwarded-for': ip
+      'x-forwarded-for': ip,
+      'Accept-Language':
+        currentLocale ?? req.cookies.get('pz-locale')?.value ?? ''
     };
 
     try {
@@ -145,7 +149,8 @@ const withCompleteMasterpass =
       logger.info('Redirecting to order success page', {
         middleware: 'complete-masterpass',
         redirectUrlWithLocale,
-        ip
+        ip,
+        setCookie: request.headers.get('set-cookie')
       });
 
       // Using POST method while redirecting causes an error,